From 18188947fa36358fac213245d41206edf2c3c7e7 Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Mon, 14 Nov 2016 14:56:24 +0100 Subject: [PATCH 0001/2806] service-wrapper: init at 16.04.0 --- .../linux/service-wrapper/default.nix | 25 ++ .../linux/service-wrapper/service-wrapper.sh | 247 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 274 insertions(+) create mode 100644 pkgs/os-specific/linux/service-wrapper/default.nix create mode 100755 pkgs/os-specific/linux/service-wrapper/service-wrapper.sh diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix new file mode 100644 index 00000000000..07a9b06ae76 --- /dev/null +++ b/pkgs/os-specific/linux/service-wrapper/default.nix @@ -0,0 +1,25 @@ +{ lib, runCommand, substituteAll, fetchurl, systemd, coreutils }: + +let + name = "service-wrapper-${version}"; + version = "16.04.0"; # Ajar to Ubuntu Release +in +runCommand "${name}" { + script = substituteAll { + src = ./service-wrapper.sh; + inherit coreutils; + }; + + meta = with lib; { + description = "A convenient wrapper for the systemctl commands, borrow from Ubuntu"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ DerTim1 ]; + }; +} +'' + mkdir -p $out/bin + ln -s $out/bin $out/sbin + cp $script $out/bin/service + chmod a+x $out/bin/service +'' diff --git a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh new file mode 100755 index 00000000000..373d86443f0 --- /dev/null +++ b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh @@ -0,0 +1,247 @@ +#!/bin/sh + +########################################################################### +# /usr/bin/service +# +# A convenient wrapper for the /etc/init.d init scripts. +# +# This script is a modified version of the /sbin/service utility found on +# Red Hat/Fedora systems (licensed GPLv2+). +# +# Copyright (C) 2006 Red Hat, Inc. All rights reserved. +# Copyright (C) 2008 Canonical Ltd. +# * August 2008 - Dustin Kirkland +# Copyright (C) 2013 Michael Stapelberg +# +# 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 2 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# On Debian GNU/Linux systems, the complete text of the GNU General +# Public License can be found in `/usr/share/common-licenses/GPL-2'. +########################################################################### + + +is_ignored_file() { + case "$1" in + skeleton | README | *.dpkg-dist | *.dpkg-old | rc | rcS | single | reboot | bootclean.sh) + return 0 + ;; + esac + return 1 +} + +VERSION=$(@coreutils@/bin/basename $0)" ver. 0.91-ubuntu1" +USAGE="Usage: "$(@coreutils@/bin/basename $0)" < option > | --status-all | \ +[ service_name [ command | --full-restart ] ]" +SERVICE= +ACTION= +SERVICEDIR="/etc/init.d" +OPTIONS= +is_systemd= + + +if [ $# -eq 0 ]; then + echo "${USAGE}" >&2 + exit 1 +fi + +if [ -d /run/systemd/system ]; then + is_systemd=1 +fi + +cd / +while [ $# -gt 0 ]; do + case "${1}" in + --help | -h | --h* ) + echo "${USAGE}" >&2 + exit 0 + ;; + --version | -V ) + echo "${VERSION}" >&2 + exit 0 + ;; + *) + if [ -z "${SERVICE}" -a $# -eq 1 -a "${1}" = "--status-all" ]; then + if [ -d "${SERVICEDIR}" ]; then + cd ${SERVICEDIR} + for SERVICE in * ; do + case "${SERVICE}" in + functions | halt | killall | single| linuxconf| kudzu) + ;; + *) + if ! is_ignored_file "${SERVICE}" \ + && [ -x "${SERVICEDIR}/${SERVICE}" ]; then + out=$(env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status 2>&1) + retval=$? + if echo "$out" | egrep -iq "usage:"; then + #printf " %s %-60s %s\n" "[?]" "$SERVICE:" "unknown" 1>&2 + echo " [ ? ] $SERVICE" 1>&2 + continue + else + if [ "$retval" = "0" -a -n "$out" ]; then + #printf " %s %-60s %s\n" "[+]" "$SERVICE:" "running" + echo " [ + ] $SERVICE" + continue + else + #printf " %s %-60s %s\n" "[-]" "$SERVICE:" "NOT running" + echo " [ - ] $SERVICE" + continue + fi + fi + #env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status + fi + ;; + esac + done + else + systemctl $sctl_args list-units + fi + exit 0 + elif [ $# -eq 2 -a "${2}" = "--full-restart" ]; then + SERVICE="${1}" + # On systems using systemd, we just perform a normal restart: + # A restart with systemd is already a full restart. + if [ -n "$is_systemd" ]; then + ACTION="restart" + else + if [ -x "${SERVICEDIR}/${SERVICE}" ]; then + env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" stop + env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" start + exit $? + fi + fi + elif [ -z "${SERVICE}" ]; then + SERVICE="${1}" + elif [ -z "${ACTION}" ]; then + ACTION="${1}" + else + OPTIONS="${OPTIONS} ${1}" + fi + shift + ;; + esac +done + +# Operate against system upstart, not session +unset UPSTART_SESSION +if [ -r "/etc/init/${SERVICE}.conf" ] && which initctl >/dev/null \ + && initctl version 2>/dev/null | grep -q upstart \ + && initctl status ${SERVICE} 2>/dev/null 1>/dev/null +then + # Upstart configuration exists for this job and we're running on upstart + case "${ACTION}" in + start|stop|status|reload) + # Action is a valid upstart action + exec ${ACTION} ${SERVICE} ${OPTIONS} + ;; + restart|force-reload) + # Map restart to the usual sysvinit behavior. + # Map force-reload to restart as per Debian policy 9.3.2, + # since there is no way to know if "reload" is supported + stop ${SERVICE} ${OPTIONS} || : + exec start ${SERVICE} ${OPTIONS} + ;; + esac +fi + + +run_via_sysvinit() { + # Otherwise, use the traditional sysvinit + if [ -x "${SERVICEDIR}/${SERVICE}" ]; then + exec env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" ${ACTION} ${OPTIONS} + else + echo "${SERVICE}: unrecognized service" >&2 + exit 1 + fi +} + +update_openrc_started_symlinks() { + # maintain the symlinks of /run/openrc/started so that + # rc-status works with the service command as well + if [ -d /run/openrc/started ] ; then + case "${ACTION}" in + start) + if [ ! -h /run/openrc/started/$SERVICE ] ; then + ln -s $SERVICEDIR/$SERVICE /run/openrc/started/$SERVICE || true + fi + ;; + stop) + rm /run/openrc/started/$SERVICE || true + ;; + esac + fi +} + +# When this machine is running systemd, standard service calls are turned into +# systemctl calls. +if [ -n "$is_systemd" ] +then + UNIT="${SERVICE%.sh}.service" + # avoid deadlocks during bootup and shutdown from units/hooks + # which call "invoke-rc.d service reload" and similar, since + # the synchronous wait plus systemd's normal behaviour of + # transactionally processing all dependencies first easily + # causes dependency loops + if ! systemctl --quiet is-active multi-user.target; then + sctl_args="--job-mode=ignore-dependencies" + fi + + case "${ACTION}" in + restart|status) + exec systemctl $sctl_args ${ACTION} ${UNIT} + ;; + start|stop) + # Follow the principle of least surprise for SysV people: + # When running "service foo stop" and foo happens to be a service that + # has one or more .socket files, we also stop the .socket units. + # Users who need more control will use systemctl directly. + for unit in $(systemctl list-unit-files --full --type=socket 2>/dev/null | sed -ne 's/\.socket\s*[a-z]*\s*$/.socket/p'); do + if [ "$(systemctl -p Triggers show $unit)" = "Triggers=${UNIT}" ]; then + systemctl $sctl_args ${ACTION} $unit + fi + done + exec systemctl $sctl_args ${ACTION} ${UNIT} + ;; + reload) + _canreload="$(SYSTEMCTL -p CanReload show ${UNIT} 2>/dev/null)" + if [ "$_canreload" = "CanReload=no" ]; then + # The reload action falls back to the sysv init script just in case + # the systemd service file does not (yet) support reload for a + # specific service. + run_via_sysvinit + else + exec systemctl $sctl_args reload "${UNIT}" + fi + ;; + force-stop) + exec systemctl --signal=KILL kill "${UNIT}" + ;; + force-reload) + _canreload="$(systemctl -p CanReload show ${UNIT} 2>/dev/null)" + if [ "$_canreload" = "CanReload=no" ]; then + exec systemctl $sctl_args restart "${UNIT}" + else + exec systemctl $sctl_args reload "${UNIT}" + fi + ;; + *) + # We try to run non-standard actions by running + # the init script directly. + run_via_sysvinit + ;; + esac +fi + +update_openrc_started_symlinks +run_via_sysvinit diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3a881fc9ad..1f9a9509254 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15786,6 +15786,8 @@ in sdlmame = callPackage ../games/sdlmame { }; + service-wrapper = callPackage ../os-specific/linux/service-wrapper { }; + sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { }; sienna = callPackage ../games/sienna { love = love_0_10; }; From a4a63800c858767971b696a856f1565807862f8a Mon Sep 17 00:00:00 2001 From: Anton Schirg Date: Sat, 6 May 2017 14:54:29 +0200 Subject: [PATCH 0002/2806] portaudio: add enable-cxx option --- pkgs/development/libraries/portaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 3882e1fb08a..4185e29a442 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; - configureFlags = [ "--disable-mac-universal" ]; + configureFlags = [ "--disable-mac-universal --enable-cxx" ]; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; From 7a9efec8edd064dec5fbd08bb3fa358a4844d746 Mon Sep 17 00:00:00 2001 From: Anton Schirg Date: Sat, 6 May 2017 14:55:13 +0200 Subject: [PATCH 0003/2806] lightworks: init at 14.0.0 --- lib/maintainers.nix | 1 + .../applications/video/lightworks/default.nix | 87 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 90 insertions(+) create mode 100644 pkgs/applications/video/lightworks/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ee0697ed6e4..72090dbdc4a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -43,6 +43,7 @@ andsild = "Anders Sildnes "; aneeshusa = "Aneesh Agrawal "; antono = "Antono Vasiljev "; + antonxy = "Anton Schirg "; apeschar = "Albert Peschar "; apeyroux = "Alexandre Peyroux "; ardumont = "Antoine R. Dumont "; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix new file mode 100644 index 00000000000..9c6a49c5513 --- /dev/null +++ b/pkgs/applications/video/lightworks/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv +, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, mesa_glu +, nvidia_cg_toolkit, zlib, openssl, portaudio +}: +let + fullPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc + gnome3.gtk + gdk_pixbuf + cairo + libjpeg_original + glib + gnome2.pango + mesa_glu + nvidia_cg_toolkit + zlib + openssl + portaudio + ]; + + lightworks = stdenv.mkDerivation rec { + version = "14.0.0"; + name = "lightworks-${version}"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb"; + sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033"; + } + else throw "${name} is not supported on ${stdenv.system}"; + + buildInputs = [ dpkg makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" ]; + unpackPhase = "dpkg-deb -x ${src} ./"; + + installPhase = '' + mkdir -p $out/bin + substitute usr/bin/lightworks $out/bin/lightworks \ + --replace "/usr/lib/lightworks" "$out/lib/lightworks" + chmod +x $out/bin/lightworks + + cp -r usr/lib $out + + # /usr/share/fonts is not normally searched + # This adds it to lightworks' search path while keeping the default + # using the FONTCONFIG_FILE env variable + echo " + + + /usr/share/fonts/truetype + /etc/fonts/fonts.conf + " > $out/lib/lightworks/fonts.conf + + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/lib/lightworks/ntcardvt + + wrapProgram $out/lib/lightworks/ntcardvt \ + --prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib/lightworks \ + --set FONTCONFIG_FILE $out/lib/lightworks/fonts.conf + + cp -r usr/share $out/share + ''; + + dontPatchELF = true; + + meta = { + description = "Professional Non-Linear Video Editor"; + homepage = "https://www.lwks.com/"; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.antonxy ]; + platforms = [ "x86_64-linux" ]; + }; + }; + +# Lightworks expects some files in /usr/share/lightworks +in buildFHSUserEnv rec { + name = "lightworks"; + + targetPkgs = pkgs: [ + lightworks + ]; + + runScript = "lightworks"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 944db15e148..508eb96b15a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14611,6 +14611,8 @@ with pkgs; inherit (gnome3) libpeas gsettings_desktop_schemas dconf; }; + lightworks = callPackage ../applications/video/lightworks { }; + lingot = callPackage ../applications/audio/lingot { inherit (gnome2) libglade; }; From 08021dd8253b6fa6ab625cd925e4bd3f09f1d8b4 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 11 Jul 2017 21:33:26 -0400 Subject: [PATCH 0004/2806] Added `makeExtensibleWithInterface` --- lib/fixed-points.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index a11b5a6f4bd..5039a45cc3f 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -71,8 +71,19 @@ rec { # Same as `makeExtensible` but the name of the extending attribute is # customized. - makeExtensibleWithCustomName = extenderName: rattrs: - fix' rattrs // { - ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs); - }; + makeExtensibleWithCustomName = extenderName: makeExtensibleWithInterface + (fixedPoint: extend: fixedPoint // { ${extenderName} = extend; }); + + # Similar to `makeExtensible`, but expects you to implement the + # final interface for the result. Specifically, it takes an extra + # argument: a function that takes the final result and the `extend` + # function as arguments, and returns a transformed result + # (preferably one that contains the `extend` function). This is + # mainly useful for getting to choose what to name the `extend` + # function in the resulting attribute set. But it's also useful for + # having an internal structure that extensions can see, but the user + # facing code cannot. + makeExtensibleWithInterface = interface: fext: interface + (fix' fext) + (f: makeExtensibleWithInterface interface (extends f fext)); } From 927c4f83d8d62b45229a931d9c295ad9a2d6d541 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 11 Jul 2017 22:12:32 -0400 Subject: [PATCH 0005/2806] Improved `makeOverridable` with `extend` and `overridePackage` --- lib/customisation.nix | 115 +++++++++++++++++++++++++++++++++--------- 1 file changed, 91 insertions(+), 24 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 98a46ca6c61..124e8596f49 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -51,9 +51,46 @@ rec { else { })); - /* `makeOverridable` takes a function from attribute set to attribute set and - injects `override` attibute which can be used to override arguments of - the function. + # Like `makeOverridable`, but provides the function with the `self` + # argument. `f` is called with the new `self` whenever an override + # or extension is added. + makeOverridableWithSelf = f: origArgs: let + + interface = {val, args, ...}: overridePackage: + (lib.optionalAttrs (builtins.isAttrs val) (val // { + extend = f: overridePackage (self: super: { + val = super.val // f self.val super.val; + }); + + overrideDerivation = newArgs: overridePackage (self: super: { + val = lib.overrideDerivation super.val newArgs; + }); + })) // (lib.optionalAttrs (builtins.isFunction val) { + __functor = _: val; + extend = throw "extend not yet supported for functors"; + overrideDerivation = throw "overrideDerivation not yet supported for functors"; + }) // { + inherit overridePackage; + + override = newArgs: overridePackage (self: super: { + args = super.args // + (if builtins.isFunction newArgs then newArgs super.args else newArgs); + }); + }; + + in lib.makeExtensibleWithInterface interface (self: { + args = origArgs; + val = f self.args self.val; + }); + + + /* `makeOverridable` takes a function from attribute set to + attribute set and injects 4 attributes which can be used to + override arguments and return values of the function. + + + 1. `override` allows you to change what arguments were passed to + the function and acquire the new result. nix-repl> x = {a, b}: { result = a + b; } @@ -65,28 +102,58 @@ rec { nix-repl> y.override { a = 10; } { override = «lambda»; overrideDerivation = «lambda»; result = 12; } - Please refer to "Nixpkgs Contributors Guide" section - ".overrideDerivation" to learn about `overrideDerivation` and caveats - related to its use. + + 2. `extend` changes the results of the function, giving you a + view of the original result and a view of the eventual final + result. It is meant to do the same thing as + `makeExtensible`. That is, it lets you add to or change the + return value, such that previous extensions are consistent with + the final view, rather than being based on outdated + values. "Outdated" values come from the `super` argument, which + must be used when you are attempting to modify and old value. And + the final values come from the `self` argument, which recursively + refers to what all extensions combined return. + + nix-repl> obj = makeOverridable (args: { }) { } + + nix-repl> obj = obj.extend (self: super: { foo = "foo"; }) + + nix-repl> obj.foo + "foo" + + nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; }) + + nix-repl> obj + { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; ... } # Excess omitted + + + 3. `overrideDerivation`: Please refer to "Nixpkgs Contributors + Guide" section ".overrideDerivation" to learn about + `overrideDerivation` and caveats related to its use. + + + 4. `overridePackage` is by far the most powerful of the four, as + it exposes a deeper structure. It provides `self` and `super` + views of both the arguments and return value of the function, + allowing you to change both in one override; you can even have + overrides for one based on overrides for the other. The type of + `self`, `super`, and the return value are all: + `{ args :: argumentsToF, val :: returnValueOfF }` + + nix-repl> obj = makeOverridable ({a, b}: {inherit a b;}) {a = 1; b = 3;} + + nix-repl> obj = obj.overridePackage (self: super: { args = super.args // {b = self.val.a;}; }) + + nix-repl> obj.b + 1 + + nix-repl> obj = obj.overridePackage (self: super: { val = super.val // {a = self.args.a + 10;}; }) + + nix-repl> obj.b + 11 + */ - makeOverridable = f: origArgs: - let - ff = f origArgs; - overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); - in - if builtins.isAttrs ff then (ff // { - override = newArgs: makeOverridable f (overrideWith newArgs); - overrideDerivation = fdrv: - makeOverridable (args: overrideDerivation (f args) fdrv) origArgs; - ${if ff ? overrideAttrs then "overrideAttrs" else null} = fdrv: - makeOverridable (args: (f args).overrideAttrs fdrv) origArgs; - }) - else if builtins.isFunction ff then { - override = newArgs: makeOverridable f (overrideWith newArgs); - __functor = self: ff; - overrideDerivation = throw "overrideDerivation not yet supported for functors"; - } - else ff; + makeOverridable = fn: makeOverridableWithSelf (args: _: fn args); /* Call the package function in the file `fn' with the required From af479c182ff0391aefd070f5219e79d15d655c75 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 11 Jul 2017 22:27:05 -0400 Subject: [PATCH 0006/2806] Added `callPackageWithSelfWith` and `callPackageWithSelf` --- lib/customisation.nix | 9 +++++++++ pkgs/top-level/splice.nix | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/lib/customisation.nix b/lib/customisation.nix index 124e8596f49..66260c8a486 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -183,6 +183,15 @@ rec { auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; in makeOverridable f (auto // args); + # Like `callPackageWith`, but provides the function with the `self` + # argument. `fn` is called with the new `self` whenever an override + # or extension is added. + callPackageWithSelfWith = autoArgs: fn: args: + let + f = if builtins.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + in makeOverridableWithSelf f (auto // args); + /* Like callPackage, but for a function that returns an attribute set of derivations. The override function is added to the diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 43951100de3..329a83e5a31 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -79,7 +79,11 @@ in # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). callPackage = pkgs.newScope {}; + callPackageWithSelf = pkgs.newScopeWithSelf {}; + callPackages = lib.callPackagesWith splicedPackages; newScope = extra: lib.callPackageWith (splicedPackages // extra); + + newScopeWithSelf = extra: lib.callPackageWithSelfWith (splicedPackages // extra); } From e11dbc37103687fb0c57dce85209086b0d691a34 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 11 Jul 2017 22:27:44 -0400 Subject: [PATCH 0007/2806] Update `haskellPackages` to use new features of `makeOverridable` Instead of manually using `makeExtensible`, which broke `override`. Fixes #26561 --- pkgs/development/haskell-modules/default.nix | 20 +++++----- pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/haskell-packages.nix | 40 ++++++++++---------- 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 32fa46f111d..d68b10b386e 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -7,6 +7,8 @@ , configurationNix ? import ./configuration-nix.nix }: +self: # Provided by `callPackageWithSelf` + let inherit (stdenv.lib) extends makeExtensible; @@ -14,19 +16,15 @@ let haskellPackages = makePackageSet { package-set = initialPackages; - inherit ghc extensible-self; + extensible-self = self; + inherit ghc; }; commonConfiguration = configurationCommon { inherit pkgs; }; nixConfiguration = configurationNix { inherit pkgs; }; - extensible-self = makeExtensible - (extends overrides - (extends packageSetConfig - (extends compilerConfig - (extends commonConfiguration - (extends nixConfiguration haskellPackages))))); - -in - - extensible-self +in (extends overrides + (extends packageSetConfig + (extends compilerConfig + (extends commonConfiguration + (extends nixConfiguration haskellPackages))))) self diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c783b3cb916..30e9d327c6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5481,9 +5481,7 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc802.override { - overrides = config.haskellPackageOverrides or (self: super: {}); - }; + haskellPackages = haskell.packages.ghc802.extend (config.haskellPackageOverrides or (self: super: {})); inherit (haskellPackages) ghc; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 099e45f1022..36ae1979ba0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, callPackage, stdenv, buildPlatform, targetPlatform }: +{ pkgs, callPackage, callPackageWithSelf, stdenv, buildPlatform, targetPlatform }: let # These are attributes in compiler and packages that don't support integer-simple. integerSimpleExcludes = [ @@ -118,79 +118,79 @@ in rec { packages = { # Support for this compiler is broken, because it can't deal with directory-based package databases. - # ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; }; - ghc6123 = callPackage ../development/haskell-modules { + # ghc6104 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc6104; }; + ghc6123 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc6123; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { }; }; - ghc704 = callPackage ../development/haskell-modules { + ghc704 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc704; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { }; }; - ghc722 = callPackage ../development/haskell-modules { + ghc722 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc722; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { }; }; - ghc742 = callPackage ../development/haskell-modules { + ghc742 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc742; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { }; }; - ghc763 = callPackage ../development/haskell-modules { + ghc763 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc763; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { }; }; - ghc783 = callPackage ../development/haskell-modules { + ghc783 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc783; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; - ghc784 = callPackage ../development/haskell-modules { + ghc784 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc784; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; - ghc7102 = callPackage ../development/haskell-modules { + ghc7102 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc7102; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; - ghc7103 = callPackage ../development/haskell-modules { + ghc7103 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc7103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; - ghc801 = callPackage ../development/haskell-modules { + ghc801 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc801; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; - ghc802 = callPackage ../development/haskell-modules { + ghc802 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc802; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; - ghc821 = callPackage ../development/haskell-modules { + ghc821 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc821; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghcHEAD = callPackage ../development/haskell-modules { + ghcHEAD = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; # TODO Support for multiple variants here - ghcCross = callPackage ../development/haskell-modules { + ghcCross = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghcHEAD.crossCompiler; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcCross821 = callPackage ../development/haskell-modules { + ghcCross821 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc821.crossCompiler; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghcjs = callPackage ../development/haskell-modules { + ghcjs = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghcjs; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcjsHEAD = callPackage ../development/haskell-modules { + ghcjsHEAD = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghcjsHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcHaLVM240 = callPackage ../development/haskell-modules { + ghcHaLVM240 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghcHaLVM240; compilerConfig = callPackage ../development/haskell-modules/configuration-halvm-2.4.0.nix { }; }; From 5a5f8613e09b9a94466e564b0d8fa18da022c34d Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 12 Jul 2017 18:38:22 -0400 Subject: [PATCH 0008/2806] Re-added `overrideAttrs` in `makeOverridable` --- lib/customisation.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/customisation.nix b/lib/customisation.nix index 66260c8a486..35538641aa8 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -65,6 +65,11 @@ rec { overrideDerivation = newArgs: overridePackage (self: super: { val = lib.overrideDerivation super.val newArgs; }); + + ${if val ? overrideAttrs then "overrideAttrs" else null} = fdrv: + overridePackage (self: super: { + val = super.val.overrideAttrs fdrv; + }); })) // (lib.optionalAttrs (builtins.isFunction val) { __functor = _: val; extend = throw "extend not yet supported for functors"; From 8b764960e93f60cb0896a8866f8e53e331726985 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 12 Jul 2017 23:58:54 -0400 Subject: [PATCH 0009/2806] Added `overrideScope` for `callPackageWith` Consequently removing several ad-hoc definitions of the same concept. --- lib/customisation.nix | 64 ++++++++++++++----- pkgs/development/beam-modules/default.nix | 7 +- .../haskell-modules/make-package-set.nix | 34 +--------- pkgs/development/idris-modules/default.nix | 11 +--- 4 files changed, 52 insertions(+), 64 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 35538641aa8..425c4523354 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -50,13 +50,17 @@ rec { } else { })); + # Like `makeOverridable`, except a `self` argument is passed to `f`, + # which represents the fixed point result, even after using `extend` + # or `override`. + # + # Also, an `interface` function is taken as an argument, paralleling + # the `interface` argument to `makeExtensibleWithInterface`. This Is + # mostly useful for adding new `override` style functions, + # e.g. `overrideScope`. + makeOverridableWithInterface = interface: f: origArgs: let - # Like `makeOverridable`, but provides the function with the `self` - # argument. `f` is called with the new `self` whenever an override - # or extension is added. - makeOverridableWithSelf = f: origArgs: let - - interface = {val, args, ...}: overridePackage: + addOverrideFuncs = {val, args, ...}: overridePackage: (lib.optionalAttrs (builtins.isAttrs val) (val // { extend = f: overridePackage (self: super: { val = super.val // f self.val super.val; @@ -83,7 +87,7 @@ rec { }); }; - in lib.makeExtensibleWithInterface interface (self: { + in lib.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (self: { args = origArgs; val = f self.args self.val; }); @@ -158,7 +162,22 @@ rec { 11 */ - makeOverridable = fn: makeOverridableWithSelf (args: _: fn args); + makeOverridable = fn: makeOverridableWithInterface (x: _: x) (args: _: fn args); + + callPackageCommon = functionArgs: scope: f: args: + let + intersect = builtins.intersectAttrs functionArgs; + interface = val: overridePackage: val // { + overrideScope = newScope: overridePackage (self: super: { + scope = super.scope.extend newScope; + }); + }; + in (makeOverridableWithInterface interface f (intersect scope // args)) + .overridePackage (self: super: { + inherit scope; + # Don't use super.args because that contains the original scope. + args = intersect self.scope // args; + }); /* Call the package function in the file `fn' with the required @@ -181,21 +200,34 @@ rec { libfoo = null; enableX11 = true; }; + + On top of the additions from `makeOverridable`, an `overrideScope` + function is also added to the result. It is similar to `override`, + except that it provides `self` and `super` views to the + scope. This can't be done in `makeOverridable` because the scope + is filtered to just the arguments needed by the function before + entering `makeOverridable`. It is useful to have a view of the + scope before restriction; for example, to change versions for a + particular dependency. + + foo.overrideScope (self: super: { + llvm = self.llvm_37; + }) + + `llvm_37` would not exist in the scope after restriction. + */ callPackageWith = autoArgs: fn: args: - let - f = if builtins.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; - in makeOverridable f (auto // args); + let f = if builtins.isFunction fn then fn else import fn; + in callPackageCommon (builtins.functionArgs f) autoArgs (x: _: f x) args; + # Like `callPackageWith`, but provides the function with the `self` # argument. `fn` is called with the new `self` whenever an override # or extension is added. callPackageWithSelfWith = autoArgs: fn: args: - let - f = if builtins.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; - in makeOverridableWithSelf f (auto // args); + let f = if builtins.isFunction fn then fn else import fn; + in callPackageCommon (builtins.functionArgs f) autoArgs f args; /* Like callPackage, but for a function that returns an attribute diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index f0a049bb4b2..78ab61f73a4 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -5,14 +5,9 @@ let lib = pkgs.callPackage ./lib.nix {}; - # FIXME: add support for overrideScope - callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args; - mkScope = scope: pkgs // scope; - packages = self: let - defaultScope = mkScope self; - callPackage = drv: args: callPackageWithScope defaultScope drv args; + callPackage = stdenv.lib.callPackageWith (pkgs // self); in import ./hex-packages.nix { inherit pkgs stdenv callPackage; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 6ed8d0864ca..b259192ce24 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -13,7 +13,7 @@ # return value: a function from self to the package set self: let - inherit (stdenv.lib) fix' extends makeOverridable; + inherit (stdenv.lib) fix' extends makeOverridable callPackageWith; inherit (import ./lib.nix { inherit pkgs; }) overrideCabal; mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { @@ -45,39 +45,9 @@ self: let mkDerivation = makeOverridable mkDerivationImpl; - # manualArgs are the arguments that were explictly passed to `callPackage`, like: - # - # callPackage foo { bar = null; }; - # - # here `bar` is a manual argument. - callPackageWithScope = scope: fn: manualArgs: - let - # this code is copied from callPackage in lib/customisation.nix - # - # we cannot use `callPackage` here because we want to call `makeOverridable` - # on `drvScope` (we cannot add `overrideScope` after calling `callPackage` because then it is - # 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; - - # this wraps the `drv` function to add a `overrideScope` function to the result. - drvScope = allArgs: drv allArgs // { - overrideScope = f: - let newScope = mkScope (fix' (extends f scope.__unfix__)); - # note that we have to be careful here: `allArgs` includes the auto-arguments that - # weren't manually specified. If we would just pass `allArgs` to the recursive call here, - # then we wouldn't look up any packages in the scope in the next interation, because it - # appears as if all arguments were already manually passed, so the scope change would do - # nothing. - in callPackageWithScope newScope drv manualArgs; - }; - in stdenv.lib.makeOverridable drvScope (auto // manualArgs); - mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope; defaultScope = mkScope self; - callPackage = drv: args: callPackageWithScope defaultScope drv args; + callPackage = drv: args: callPackageWith defaultScope drv args; withPackages = packages: callPackage ./with-packages-wrapper.nix { inherit (self) llvmPackages; diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 3d0ea511e10..9d2ebda00c4 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -1,17 +1,8 @@ { pkgs, idris, overrides ? (self: super: {}) }: let inherit (pkgs.lib) callPackageWith fix' extends; - /* Taken from haskell-modules/default.nix, should probably abstract this away */ - callPackageWithScope = scope: drv: args: (callPackageWith scope drv args) // { - overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; - }; - - mkScope = scope : pkgs // pkgs.xorg // pkgs.gnome2 // scope; - idrisPackages = self: let - defaultScope = mkScope self; - - callPackage = callPackageWithScope defaultScope; + callPackage = callPackageWith (pkgs // pkgs.xorg // pkgs.gnome2 // self); builtins_ = pkgs.lib.mapAttrs self.build-builtin-package { prelude = []; From 05f9db601abd582be51f096affbb97eff49f2ccb Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 13 Jul 2017 18:54:04 -0400 Subject: [PATCH 0010/2806] Added `self` views of the interface in `makeExtensibleWithInterface` Fixing the `overrideScope` in `haskellpackages`. --- lib/customisation.nix | 51 +++++++++----------- lib/fixed-points.nix | 43 +++++++++++------ pkgs/development/haskell-modules/default.nix | 2 +- pkgs/top-level/haskell-packages.nix | 40 +++++++-------- pkgs/top-level/splice.nix | 4 +- 5 files changed, 76 insertions(+), 64 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 425c4523354..91aed8b9ca8 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -50,28 +50,22 @@ rec { } else { })); - # Like `makeOverridable`, except a `self` argument is passed to `f`, - # which represents the fixed point result, even after using `extend` - # or `override`. - # - # Also, an `interface` function is taken as an argument, paralleling - # the `interface` argument to `makeExtensibleWithInterface`. This Is - # mostly useful for adding new `override` style functions, - # e.g. `overrideScope`. + # A more powerful version of `makeOverridable` with features similar + # to `makeExtensibleWithInterface`. makeOverridableWithInterface = interface: f: origArgs: let addOverrideFuncs = {val, args, ...}: overridePackage: (lib.optionalAttrs (builtins.isAttrs val) (val // { - extend = f: overridePackage (self: super: { + extend = f: overridePackage (_: self: super: { val = super.val // f self.val super.val; }); - overrideDerivation = newArgs: overridePackage (self: super: { + overrideDerivation = newArgs: overridePackage (_: self: super: { val = lib.overrideDerivation super.val newArgs; }); ${if val ? overrideAttrs then "overrideAttrs" else null} = fdrv: - overridePackage (self: super: { + overridePackage (_: self: super: { val = super.val.overrideAttrs fdrv; }); })) // (lib.optionalAttrs (builtins.isFunction val) { @@ -81,15 +75,15 @@ rec { }) // { inherit overridePackage; - override = newArgs: overridePackage (self: super: { + override = newArgs: overridePackage (_: self: super: { args = super.args // (if builtins.isFunction newArgs then newArgs super.args else newArgs); }); }; - in lib.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (self: { + in lib.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: { args = origArgs; - val = f self.args self.val; + val = f output self.args self.val; }); @@ -145,35 +139,37 @@ rec { it exposes a deeper structure. It provides `self` and `super` views of both the arguments and return value of the function, allowing you to change both in one override; you can even have - overrides for one based on overrides for the other. The type of - `self`, `super`, and the return value are all: - `{ args :: argumentsToF, val :: returnValueOfF }` + overrides for one based on overrides for the other. It also + provides the `output` view, which is the view of `self` after + passing it through the `makeOverridable` interface and adding all + the `overrideX` functions. `output` is necessary when your + overrides depend on the overridable structure of `output`. nix-repl> obj = makeOverridable ({a, b}: {inherit a b;}) {a = 1; b = 3;} - nix-repl> obj = obj.overridePackage (self: super: { args = super.args // {b = self.val.a;}; }) + nix-repl> obj = obj.overridePackage (output: self: super: { args = super.args // {b = self.val.a;}; }) nix-repl> obj.b 1 - nix-repl> obj = obj.overridePackage (self: super: { val = super.val // {a = self.args.a + 10;}; }) + nix-repl> obj = obj.overridePackage (output: self: super: { val = super.val // {a = self.args.a + 10;}; }) nix-repl> obj.b 11 */ - makeOverridable = fn: makeOverridableWithInterface (x: _: x) (args: _: fn args); + makeOverridable = fn: makeOverridableWithInterface (x: _: x) (_: args: _: fn args); callPackageCommon = functionArgs: scope: f: args: let intersect = builtins.intersectAttrs functionArgs; interface = val: overridePackage: val // { - overrideScope = newScope: overridePackage (self: super: { + overrideScope = newScope: overridePackage (_: self: super: { scope = super.scope.extend newScope; }); }; in (makeOverridableWithInterface interface f (intersect scope // args)) - .overridePackage (self: super: { + .overridePackage (output: self: super: { inherit scope; # Don't use super.args because that contains the original scope. args = intersect self.scope // args; @@ -219,15 +215,16 @@ rec { */ callPackageWith = autoArgs: fn: args: let f = if builtins.isFunction fn then fn else import fn; - in callPackageCommon (builtins.functionArgs f) autoArgs (x: _: f x) args; + in callPackageCommon (builtins.functionArgs f) autoArgs (output: x: _: f x) args; - # Like `callPackageWith`, but provides the function with the `self` - # argument. `fn` is called with the new `self` whenever an override + # Like `callPackageWith`, but provides the function with a `self` + # view of the output, which has the override functions + # injected. `fn` is called with the new output whenever an override # or extension is added. - callPackageWithSelfWith = autoArgs: fn: args: + callPackageWithOutputWith = autoArgs: fn: args: let f = if builtins.isFunction fn then fn else import fn; - in callPackageCommon (builtins.functionArgs f) autoArgs f args; + in callPackageCommon (builtins.functionArgs f) autoArgs (output: args: _: f args output ) args; /* Like callPackage, but for a function that returns an attribute diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 5039a45cc3f..910dd24b202 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -71,19 +71,34 @@ rec { # Same as `makeExtensible` but the name of the extending attribute is # customized. - makeExtensibleWithCustomName = extenderName: makeExtensibleWithInterface - (fixedPoint: extend: fixedPoint // { ${extenderName} = extend; }); + makeExtensibleWithCustomName = extenderName: f: makeExtensibleWithInterface + (fixedPoint: extend: fixedPoint // { ${extenderName} = ext: extend (_: ext); }) + (_: f); - # Similar to `makeExtensible`, but expects you to implement the - # final interface for the result. Specifically, it takes an extra - # argument: a function that takes the final result and the `extend` - # function as arguments, and returns a transformed result - # (preferably one that contains the `extend` function). This is - # mainly useful for getting to choose what to name the `extend` - # function in the resulting attribute set. But it's also useful for - # having an internal structure that extensions can see, but the user - # facing code cannot. - makeExtensibleWithInterface = interface: fext: interface - (fix' fext) - (f: makeExtensibleWithInterface interface (extends f fext)); + # A version of `makeExtensible` that allows the function being fixed + # to return a different interface than the interface returned to the + # user. Along with `self` and `super` views of the internal + # interface, a `self` view of the output interface is also + # provided. `extend` is not added to the output by default. This is + # the job of the interface. + # + # nix-repl> foo = {a, b}: {c = a + b;} + # + # nix-repl> interface = {args, val, ...}: extend: val // {inherit extend;} + # + # nix-repl> obj = makeExtensibleWithInterface interface (output: self: { args = {a = 1; b = 2;}; val = foo self.args; }) + # + # nix-repl> obj.c + # 3 + # + # nix-repl> obj = obj.extend (output: self: super: { args = super.args // { b = output.d; }; }) + # + # nix-repl> obj = obj.extend (output: self: super: { val = super.val // { d = 10; }; }) + # + # nix-repl> { inherit (obj) c d; } + # { c = 11; d = 10; } + makeExtensibleWithInterface = interface: f: let i = interface + (fix' (f i)) + (fext: makeExtensibleWithInterface interface (i': (extends (fext i') (f i')))); + in i; } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index d68b10b386e..9a67adf57ac 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -7,7 +7,7 @@ , configurationNix ? import ./configuration-nix.nix }: -self: # Provided by `callPackageWithSelf` +self: # Provided by `callPackageWithOutput` let diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 36ae1979ba0..dde5aa52278 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, callPackage, callPackageWithSelf, stdenv, buildPlatform, targetPlatform }: +{ pkgs, callPackage, callPackageWithOutput, stdenv, buildPlatform, targetPlatform }: let # These are attributes in compiler and packages that don't support integer-simple. integerSimpleExcludes = [ @@ -118,79 +118,79 @@ in rec { packages = { # Support for this compiler is broken, because it can't deal with directory-based package databases. - # ghc6104 = callPackageWithSelf ../development/haskell-modules { ghc = compiler.ghc6104; }; - ghc6123 = callPackageWithSelf ../development/haskell-modules { + # ghc6104 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc6104; }; + ghc6123 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc6123; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { }; }; - ghc704 = callPackageWithSelf ../development/haskell-modules { + ghc704 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc704; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { }; }; - ghc722 = callPackageWithSelf ../development/haskell-modules { + ghc722 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc722; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { }; }; - ghc742 = callPackageWithSelf ../development/haskell-modules { + ghc742 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc742; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { }; }; - ghc763 = callPackageWithSelf ../development/haskell-modules { + ghc763 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc763; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { }; }; - ghc783 = callPackageWithSelf ../development/haskell-modules { + ghc783 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc783; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; - ghc784 = callPackageWithSelf ../development/haskell-modules { + ghc784 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc784; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; - ghc7102 = callPackageWithSelf ../development/haskell-modules { + ghc7102 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc7102; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; - ghc7103 = callPackageWithSelf ../development/haskell-modules { + ghc7103 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc7103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; - ghc801 = callPackageWithSelf ../development/haskell-modules { + ghc801 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc801; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; - ghc802 = callPackageWithSelf ../development/haskell-modules { + ghc802 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc802; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; - ghc821 = callPackageWithSelf ../development/haskell-modules { + ghc821 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc821; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghcHEAD = callPackageWithSelf ../development/haskell-modules { + ghcHEAD = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; # TODO Support for multiple variants here - ghcCross = callPackageWithSelf ../development/haskell-modules { + ghcCross = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghcHEAD.crossCompiler; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcCross821 = callPackageWithSelf ../development/haskell-modules { + ghcCross821 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc821.crossCompiler; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghcjs = callPackageWithSelf ../development/haskell-modules { + ghcjs = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghcjs; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcjsHEAD = callPackageWithSelf ../development/haskell-modules { + ghcjsHEAD = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghcjsHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcHaLVM240 = callPackageWithSelf ../development/haskell-modules { + ghcHaLVM240 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghcHaLVM240; compilerConfig = callPackage ../development/haskell-modules/configuration-halvm-2.4.0.nix { }; }; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 329a83e5a31..36596ec5961 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -79,11 +79,11 @@ in # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). callPackage = pkgs.newScope {}; - callPackageWithSelf = pkgs.newScopeWithSelf {}; + callPackageWithOutput = pkgs.newScopeWithOutput {}; callPackages = lib.callPackagesWith splicedPackages; newScope = extra: lib.callPackageWith (splicedPackages // extra); - newScopeWithSelf = extra: lib.callPackageWithSelfWith (splicedPackages // extra); + newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra); } From eabe2efa10b909de0f185f8c74cd4a71bafc58e1 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 7 Aug 2017 17:32:30 +0300 Subject: [PATCH 0011/2806] qt5: Fallback to mktemp -d for temporary QT root. Fallback to `mktemp -d` for temporary QT root, if invoked in shell mode. Should fix problem from #27174. --- pkgs/development/libraries/qt-5/qtbase-setup-hook.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh index e7752af4397..4b0bad58335 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh @@ -116,7 +116,11 @@ fi if [ -z "$NIX_QT5_TMP" ]; then if [ -z "$NIX_QT_SUBMODULE" ]; then - NIX_QT5_TMP=$(pwd)/__nix_qt5__ + if [ -z "$IN_NIX_SHELL" ]; then + NIX_QT5_TMP=$(pwd)/__nix_qt5__ + else + NIX_QT5_TMP=$(mktemp -d) + fi else NIX_QT5_TMP=$out fi From 137db3efb5180889dfb8b0ba786eaae0dc7676d9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Sep 2017 17:17:42 +0200 Subject: [PATCH 0012/2806] gnome3.at-spi2-core: fix service not found error The service was not registered as a systemd service resulting in errors in the system journal every time a GNOME application was launched. See: #16327 --- nixos/modules/services/desktops/gnome3/at-spi2-core.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 6e4c59f4bb3..55ed2d9ee21 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -34,6 +34,8 @@ with lib; services.dbus.packages = [ pkgs.at_spi2_core ]; + systemd.packages = [ pkgs.at_spi2_core ]; + }; } From 33dc8ced657188aeb3f1a28ac5cdff107f99b81d Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Wed, 30 Aug 2017 22:55:53 -0400 Subject: [PATCH 0013/2806] vscode-extension-ms-vscode-cpptools: Init at 0.12.3 --- .../vscode-extensions/cpptools/default.nix | 128 ++++++++++++++++++ .../vscode-cpptools-0-12-3-package-json.patch | 82 +++++++++++ pkgs/misc/vscode-extensions/default.nix | 4 +- 3 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/vscode-extensions/cpptools/default.nix create mode 100644 pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix new file mode 100644 index 00000000000..87c782222fc --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -0,0 +1,128 @@ +{ stdenv, lib, fetchurl, vscode-utils, unzip, dos2unix, mono46, clang-tools, writeScript +, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. +}: + +assert gdbUseFixed -> null != gdb; + +/* + Note that this version of the extension still has some nix specific issues + which could not be fixed merely by patching (inside a C# dll). + + In particular, the debugger requires either gnome-terminal or xterm. However + instead of looking for the terminal executable in `PATH`, for any linux platform + the dll uses an hardcoded path to one of these. + + So, in order for debugging to work properly, you merely need to create symlinks + to one of these terminals at the appropriate location. + + The good news is the the utility library is open source and with some effort + we could build a patched version ourselves. See: + + + + Also, the extension should eventually no longer require an external terminal. See: + + + + Once the symbolic link temporary solution taken, everything shoud run smootly. +*/ + +let + gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; + + langComponentBinaries = stdenv.mkDerivation { + name = "cpptools-language-component-binaries"; + + src = fetchurl { + url = https://download.visualstudio.microsoft.com/download/pr/11151953/d3cc8b654bffb8a2f3896d101f3c3155/Bin_Linux.zip; + sha256 = "12qbxsrdc73cqjb84xdck1xafzhfkcyn6bqbpcy1bxxr3b7hxbii"; + }; + + buildInputs = [ unzip ]; + + patchPhase = '' + elfInterpreter="${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2" + patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.Extension.linux + patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.IntelliSense.Msvc.linux + chmod a+x ./Microsoft.VSCode.CPP.Extension.linux ./Microsoft.VSCode.CPP.IntelliSense.Msvc.linux + ''; + + installPhase = '' + mkdir -p "$out/bin" + find . -mindepth 1 -maxdepth 1 | xargs cp -a -t "$out/bin" + ''; + }; + + cpptoolsJsonFile = fetchurl { + url = https://download.visualstudio.microsoft.com/download/pr/11070848/7b97d6724d52cae8377c61bb4601c989/cpptools.json; + sha256 = "124f091aic92rzbg2vg831y22zr5wi056c1kh775djqs3qv31ja6"; + }; + + + + openDebugAD7Script = writeScript "OpenDebugAD7" '' + #!${stdenv.shell} + BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" + ${if gdbUseFixed + then '' + export PATH=''${PATH}''${PATH:+:}${gdb}/bin + '' + else ""} + ${mono46}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $* + ''; +in + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "cpptools"; + publisher = "ms-vscode"; + version = "0.12.3"; + sha256 = "1dcqy54n1w29xhbvxscd41hdrbdwar6g12zx02f6kh2f1kw34z5z"; + }; + + buildInputs = [ + dos2unix + ]; + + prePatch = '' + dos2unix package.json + ''; + + patches = [ + ./vscode-cpptools-0-12-3-package-json.patch + ]; + + postPatch = '' + # Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. + substituteInPlace "./package.json" \ + --replace "\"default\": \"/usr/bin/gdb\"" "\"default\": \"${gdbDefaultsTo}\"" + + # Prevent download/install of extensions + touch "./install.lock" + + # Move unused files out of the way. + mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused + + # Bring the `cpptools.json` file at the root of the package, same as the extension would do. + cp -p "${cpptoolsJsonFile}" "./cpptools.json" + + # Combining the language component binaries as part of our package. + find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin" + + # Mono runtimes from nix package (used by generated `OpenDebugAD7`). + rm "./debugAdapters/OpenDebugAD7" + cp -p "${openDebugAD7Script}" "./debugAdapters/OpenDebugAD7" + + # Clang-format from nix package. + mkdir -p "./LLVM" + find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM" + ''; + + meta = with stdenv.lib; { + license = licenses.unfree; + maintainer = [ maintainers.jraygauthier ]; + # A 32 bit linux would also be possible with some effort (specific download of binaries + + # patching of the elf files with 32 bit interpreter). + platforms = [ "x86_64-linux" ]; + }; +} \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch new file mode 100644 index 00000000000..1873963f460 --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch @@ -0,0 +1,82 @@ +diff --git a/package.json b/package.json +index 518e839..1c17c35 100644 +--- a/package.json ++++ b/package.json +@@ -37,7 +37,26 @@ + "Linters" + ], + "activationEvents": [ +- "*" ++ "onLanguage:cpp", ++ "onLanguage:c", ++ "onCommand:extension.pickNativeProcess", ++ "onCommand:extension.pickRemoteNativeProcess", ++ "onCommand:extension.provideInitialConfigurations_cppvsdbg", ++ "onCommand:extension.provideInitialConfigurations_cppdbg", ++ "onCommand:C_Cpp.ConfigurationEdit", ++ "onCommand:C_Cpp.ConfigurationSelect", ++ "onCommand:C_Cpp.SwitchHeaderSource", ++ "onCommand:C_Cpp.UnloadLanguageServer", ++ "onCommand:C_Cpp.Navigate", ++ "onCommand:C_Cpp.GoToDeclaration", ++ "onCommand:C_Cpp.PeekDeclaration", ++ "onCommand:C_Cpp.ToggleErrorSquiggles", ++ "onCommand:C_Cpp.ToggleIncludeFallback", ++ "onCommand:C_Cpp.ShowReleaseNotes", ++ "onCommand:C_Cpp.ResetDatabase", ++ "workspaceContains:.vscode/c_cpp_properties.json", ++ "onDebug:cppdbg", ++ "onDebug:cppvsdbg" + ], + "main": "./out/src/main", + "contributes": { +@@ -281,8 +300,7 @@ + "cpp" + ] + }, +- "runtime": "node", +- "program": "./out/src/Debugger/Proxy/debugProxy.js", ++ "program": "./debugAdapters/OpenDebugAD7", + "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", + "variables": { + "pickProcess": "extension.pickNativeProcess", +@@ -722,7 +740,29 @@ + } + } + } +- } ++ }, ++ "configurationSnippets": [ ++ { ++ "label": "C/C++: (gdb) Launch", ++ "description": "Launch with gdb.", ++ "bodyText": "{\n\t\"name\": \"(gdb) Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t {\n\t \"description\": \"Enable pretty-printing for gdb\",\n\t \"text\": \"-enable-pretty-printing\",\n\t \"ignoreFailures\": true\n\t }\n\t]\n}" ++ }, ++ { ++ "label": "C/C++: (gdb) Attach", ++ "description": "Attach with gdb.", ++ "bodyText": "{ \n\t\"name\": \"(gdb) Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickProcess}\",\n\t\"MIMode\": \"gdb\"\n}" ++ }, ++ { ++ "label": "C/C++: (gdb) Pipe Launch", ++ "description": "Pipe Launch with gdb.", ++ "bodyText": "{\n\t\"name\": \"(gdb) Pipe Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t {\n\t \"description\": \"Enable pretty-printing for gdb\",\n\t \"text\": \"-enable-pretty-printing\",\n\t \"ignoreFailures\": true\n\t }\n\t]\n}" ++ }, ++ { ++ "label": "C/C++: (gdb) Pipe Attach", ++ "description": "Pipe Attach with gdb.", ++ "bodyText": "{\n\t\"name\": \"(gdb) Pipe Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickRemoteProcess}\",\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\"\n}" ++ } ++ ] + }, + { + "type": "cppvsdbg", +@@ -741,7 +781,7 @@ + "variables": { + "pickProcess": "extension.pickNativeProcess" + }, +- "initialConfigurations": "extension.provideInitialConfigurations_cppvsdbg", ++ "initialConfigurations": "", + "configurationAttributes": { + "launch": { + "required": [ diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index d357c43abd8..8047e29ad55 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, vscode-utils }: +{ stdenv, lib, fetchurl, callPackage, vscode-utils }: let inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension; @@ -22,4 +22,6 @@ rec { license = licenses.mit; }; }; + + ms-vscode.cpptools = callPackage ./cpptools {}; } \ No newline at end of file From a830aa3af026ea6186becb12a6ed612a2fda6186 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 4 Sep 2017 03:58:43 +0300 Subject: [PATCH 0014/2806] qt5: Cleanup temporary Qt root on nix-shell exit --- pkgs/development/libraries/qt-5/qtbase-setup-hook.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh index 4b0bad58335..a10da7ac2ee 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh @@ -146,3 +146,10 @@ EOF export QMAKE="$NIX_QT5_TMP/bin/qmake" fi +_qtShellCleanupHook () { + rm -fr $NIX_QT5_TMP +} + +if [ -n "$IN_NIX_SHELL" ]; then + trap _qtShellCleanupHook EXIT +fi From 35954ae8bab6f50999766747d8239febb33cef72 Mon Sep 17 00:00:00 2001 From: zraexy Date: Fri, 8 Sep 2017 23:31:47 -0800 Subject: [PATCH 0015/2806] kproperty: init at 3.0.2 --- .../libraries/kproperty/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/kproperty/default.nix diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix new file mode 100644 index 00000000000..52b5d944b41 --- /dev/null +++ b/pkgs/development/libraries/kproperty/default.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, + qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons +}: + +mkDerivation rec { + pname = "kproperty"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1hzkvdap7dzpnxlp4rfg5f24fhqjpqm2hlvv88gj4c0scbp73ynm"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons ]; + + propagatedBuildInputs = [ qtbase ]; + + meta = with lib; { + description = "A property editing framework with editor widget similar to what is known from Qt Designer"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d30e7f1fab..b0ef68de685 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10125,6 +10125,8 @@ with pkgs; kdiagram = callPackage ../development/libraries/kdiagram { }; + kproperty = callPackage ../development/libraries/kproperty { }; + kirigami = kirigami_1; libcommuni = callPackage ../development/libraries/libcommuni { }; From b3bbfd9fc49822c706b96d259920587b4e33d0d9 Mon Sep 17 00:00:00 2001 From: zraexy Date: Fri, 8 Sep 2017 23:33:41 -0800 Subject: [PATCH 0016/2806] kreport: init at 3.0.2 --- .../development/libraries/kreport/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/kreport/default.nix diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix new file mode 100644 index 00000000000..561e964c961 --- /dev/null +++ b/pkgs/development/libraries/kreport/default.nix @@ -0,0 +1,27 @@ +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, + qtbase, qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 +}: + +mkDerivation rec { + pname = "kreport"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1zd3vhf26cyp8xrq11awm9pmhnk88ppyc0riyr0gxj8y703ahkp0"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ qtdeclarative qtwebkit kconfig kcoreaddons kwidgetsaddons kguiaddons kproperty marble python2 ]; + + meta = with lib; { + description = "A framework for creation and generation of reports in multiple formats"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0ef68de685..67fc08c9d4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10127,6 +10127,8 @@ with pkgs; kproperty = callPackage ../development/libraries/kproperty { }; + kreport = callPackage ../development/libraries/kreport { }; + kirigami = kirigami_1; libcommuni = callPackage ../development/libraries/libcommuni { }; From 635c48de8f414ffa6a465f2cb5db29a87e4aabc9 Mon Sep 17 00:00:00 2001 From: zraexy Date: Fri, 8 Sep 2017 23:38:19 -0800 Subject: [PATCH 0017/2806] kdb: init at 3.0.2 --- pkgs/development/libraries/kdb/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/kdb/default.nix diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix new file mode 100644 index 00000000000..399d5914c2d --- /dev/null +++ b/pkgs/development/libraries/kdb/default.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, + qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysql +}: + +mkDerivation rec { + pname = "kdb"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1n11xhqk3sf4a5nzvnrnj7bj21yqqqkm2d1xzfx3q82fkyah8s49"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysql ]; + + propagatedBuildInputs = [ qtbase ]; + + meta = with lib; { + description = "A database connectivity and creation framework for various database vendors"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67fc08c9d4d..84ffd202669 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10123,6 +10123,8 @@ with pkgs; kirigami_1 kirigami_2; + kdb = callPackage ../development/libraries/kdb { }; + kdiagram = callPackage ../development/libraries/kdiagram { }; kproperty = callPackage ../development/libraries/kproperty { }; From eb903ccc31d0ac99153893ab8d6483858a9fba8a Mon Sep 17 00:00:00 2001 From: zraexy Date: Fri, 15 Sep 2017 09:04:00 -0800 Subject: [PATCH 0018/2806] kexi: init at 3.0.2 --- pkgs/applications/office/kexi/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/office/kexi/default.nix diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix new file mode 100644 index 00000000000..66aee6bd962 --- /dev/null +++ b/pkgs/applications/office/kexi/default.nix @@ -0,0 +1,47 @@ +{ + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, + boost, qttools, qtwebkit, + breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, + kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, + kwidgetsaddons, kxmlgui, + kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql +}: + +mkDerivation rec { + pname = "kexi"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1fjvjifi5ygx5gs2lzfg22j0x3r7kl4wk5jll09r8gc3dfxaiblf"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + buildInputs = [ + boost qttools qtwebkit + breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons + kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets + kwidgetsaddons kxmlgui + kdb kproperty kreport lcms2 libmysql marble postgresql + ]; + + propagatedUserEnvPkgs = [ kproperty ]; + + meta = with lib; { + description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; + longDescription = '' + Kexi is a visual database applications creator. + It can be used for creating database schemas, + inserting data, performing queries, and processing data. + Forms can be created to provide a custom interface to your data. + All database objects - tables, queries and forms - are stored in the database, + making it easy to share data and design. + ''; + homepage = http://kexi-project.org/; + maintainers = with maintainers; [ zraexy ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84ffd202669..31ff47663db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15019,6 +15019,8 @@ with pkgs; kermit = callPackage ../tools/misc/kermit { }; + kexi = libsForQt5.callPackage ../applications/office/kexi { }; + keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; From 3f2a3d299bf47ec49e19e079e394438129b1c6c5 Mon Sep 17 00:00:00 2001 From: zraexy Date: Fri, 15 Sep 2017 09:06:49 -0800 Subject: [PATCH 0019/2806] calligra: 2.9.11 -> 3.0.1 --- pkgs/applications/office/calligra/2.nix | 55 ++++++++++++++++ pkgs/applications/office/calligra/default.nix | 66 +++++++++++-------- pkgs/top-level/all-packages.nix | 7 +- 3 files changed, 99 insertions(+), 29 deletions(-) create mode 100644 pkgs/applications/office/calligra/2.nix diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix new file mode 100644 index 00000000000..76027f29a70 --- /dev/null +++ b/pkgs/applications/office/calligra/2.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen +, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg +, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql +, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs +, kactivities, okular, git, oxygen-icons5, makeWrapper +# TODO: not found +#, xbase, openjpeg +# TODO: package libWPS, Spnav, m2mml, LibEtonyek +}: + +stdenv.mkDerivation rec { + name = "calligra-2.9.11"; + + src = fetchurl { + url = "mirror://kde/stable/${name}/${name}.tar.xz"; + sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di"; + }; + + nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ]; + + buildInputs = [ + kdelibs4 lcms2 libpng eigen + exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg + libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql + freetds fftw glew libkdcraw opencolorio kdepimlibs + kactivities okular git + ]; + + enableParallelBuilding = true; + + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i \ + --prefix PATH ':' "${pstoedit.out}/bin" \ + --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share" + done + ''; + + meta = with stdenv.lib; { + description = "A suite of productivity applications"; + longDescription = '' + Calligra Suite is a set of applications written to help + you to accomplish your work. Calligra includes efficient + and capable office components: Words for text processing, + Sheets for computations, Stage for presentations, Plan for + planning, Flow for flowcharts, Kexi for database creation, + Krita for painting and raster drawing, and Karbon for + vector graphics. + ''; + homepage = http://calligra.org; + maintainers = with maintainers; [ phreedom ebzzry ]; + inherit (kdelibs4.meta) platforms; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 76027f29a70..bec19d675cb 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,55 +1,65 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen -, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg -, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql -, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs -, kactivities, okular, git, oxygen-icons5, makeWrapper -# TODO: not found -#, xbase, openjpeg -# TODO: package libWPS, Spnav, m2mml, LibEtonyek +{ + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, + boost, qtwebkit, qtx11extras, shared_mime_info, + breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, + kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, + kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross, + knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons, + kwindowsystem, kxmlgui, sonnet, threadweaver, + kcontacts, akonadi, akonadi-calendar, akonadi-contacts, + eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen, + librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon, + poppler, pstoedit, qca-qt5, vc +# TODO: package Spnav, m2mml LibEtonyek, Libqgit2 }: -stdenv.mkDerivation rec { - name = "calligra-2.9.11"; +mkDerivation rec { + pname = "calligra"; + version = "3.0.1"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di"; + url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; + sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5"; }; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ - kdelibs4 lcms2 libpng eigen - exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg - libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql - freetds fftw glew libkdcraw opencolorio kdepimlibs - kactivities okular git + boost qtwebkit qtx11extras shared_mime_info + kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons + kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews + kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts + ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver + kcontacts akonadi akonadi-calendar akonadi-contacts + eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge + libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc ]; - enableParallelBuilding = true; + propagatedUserEnvPkgs = [ kproperty ]; + + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; postInstall = '' for i in $out/bin/*; do wrapProgram $i \ --prefix PATH ':' "${pstoedit.out}/bin" \ - --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share" + --prefix XDG_DATA_DIRS ':' "${breeze-icons}/share" done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A suite of productivity applications"; longDescription = '' Calligra Suite is a set of applications written to help you to accomplish your work. Calligra includes efficient and capable office components: Words for text processing, - Sheets for computations, Stage for presentations, Plan for - planning, Flow for flowcharts, Kexi for database creation, - Krita for painting and raster drawing, and Karbon for + Sheets for computations, Plan for planning, and Karbon for vector graphics. ''; - homepage = http://calligra.org; - maintainers = with maintainers; [ phreedom ebzzry ]; - inherit (kdelibs4.meta) platforms; - license = licenses.gpl2; + homepage = https://www.calligra.org/; + maintainers = with maintainers; [ phreedom ebzzry zraexy ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31ff47663db..6d4e514328a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13674,10 +13674,15 @@ with pkgs; calibre = libsForQt5.callPackage ../applications/misc/calibre { }; - calligra = kde4.callPackage ../applications/office/calligra { + calligra2 = kde4.callPackage ../applications/office/calligra/2.nix { vc = vc_0_7; }; + calligra = libsForQt5.callPackage ../applications/office/calligra { + inherit (kdeApplications) akonadi-calendar akonadi-contacts; + openjpeg = openjpeg_1; + }; + camlistore = callPackage ../applications/misc/camlistore { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; From 362c84227332dddf536238e75acb7fd1c646714a Mon Sep 17 00:00:00 2001 From: timor Date: Sun, 10 Sep 2017 13:43:32 +0200 Subject: [PATCH 0020/2806] mpich2: 1.4 -> 3.2 --- pkgs/development/libraries/mpich2/default.nix | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index b80d549931c..d400712a6f9 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -1,33 +1,17 @@ { stdenv, fetchurl, python, perl, gfortran }: -let version = "1.4"; in -stdenv.mkDerivation { - name = "mpich2-${version}"; +stdenv.mkDerivation rec { + name = "mpich-${version}"; + version = "3.2"; src = fetchurl { - url = "http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${version}/mpich2-${version}.tar.gz"; + url = "http://www.mpich.org/static/downloads/3.2/mpich-3.2.tar.gz"; sha256 = "0bvvk4n9g4rmrncrgs9jnkcfh142i65wli5qp1akn9kwab1q80z6"; }; configureFlags = "--enable-shared --enable-sharedlib"; - buildInputs = [ python perl gfortran ]; - propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) stdenv.glibc; - - patchPhase = - '' for i in $(find -type f -not -name Makefile.\*) - do - if grep -q /usr/bin/env "$i" - then - interpreter="$(cat $i | grep /usr/bin/env | sed -'es|^.*/usr/bin/env \([^ ]\+\).*$|\1|g')" - echo "file \`$i' -> interpreter \`$interpreter'" - path="$(type -P $interpreter)" - echo "\`/usr/bin/env $interpreter' -> \`$path' in \`$i'..." - sed -i "$i" -e "s|/usr/bin/env $interpreter|$path|g" - fi - done - true - ''; + buildInputs = [ perl gfortran ]; meta = { description = "Implementation of the Message Passing Interface (MPI) standard"; From 7463ae4572f33983658e8c6dba9defb81c9edf83 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 18 Sep 2017 19:48:16 +0200 Subject: [PATCH 0021/2806] nixpkgs: add stdenv tests to unstable and darwin-tested --- pkgs/top-level/release.nix | 42 +++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 41ab5da8067..d6cefb8d184 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -38,13 +38,31 @@ let meta.description = "Release-critical builds for the Nixpkgs darwin channel"; constituents = [ jobs.tarball - jobs.stdenv.x86_64-darwin - jobs.ghc.x86_64-darwin jobs.cabal2nix.x86_64-darwin - jobs.ruby.x86_64-darwin - jobs.python.x86_64-darwin - jobs.rustc.x86_64-darwin + jobs.emacs.x86_64-darwin + jobs.ghc.x86_64-darwin + jobs.git.x86_64-darwin jobs.go.x86_64-darwin + jobs.mysql.x86_64-darwin + jobs.nix-repl.x86_64-darwin + jobs.nix.x86_64-darwin + jobs.nox.x86_64-darwin + jobs.openssh.x86_64-darwin + jobs.openssl.x86_64-darwin + jobs.postgresql.x86_64-darwin + jobs.python.x86_64-darwin + jobs.python3.x86_64-darwin + jobs.ruby.x86_64-darwin + jobs.rustc.x86_64-darwin + jobs.stdenv.x86_64-darwin + jobs.vim.x86_64-darwin + + jobs.tests.cc-wrapper.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-darwin + jobs.tests.cc-wrapper-libcxx.x86_64-darwin + jobs.tests.cc-wrapper-clang-39.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin + jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin ]; }; @@ -76,6 +94,20 @@ let jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin jobs.vim.x86_64-darwin + + jobs.tests.cc-wrapper.x86_64-linux + jobs.tests.cc-wrapper.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-linux + jobs.tests.cc-wrapper-clang.x86_64-darwin + jobs.tests.cc-wrapper-libcxx.x86_64-linux + jobs.tests.cc-wrapper-libcxx.x86_64-darwin + jobs.tests.cc-wrapper-clang-39.x86_64-linux + jobs.tests.cc-wrapper-clang-39.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-39.x86_64-linux + jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin + jobs.tests.stdenv-inputs.x86_64-linux + jobs.tests.stdenv-inputs.x86_64-darwin + jobs.tests.macOSSierraShared.x86_64-darwin ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; }; From 04dacfbf1c5b306875b8a136411e952771dc150d Mon Sep 17 00:00:00 2001 From: Volth Date: Sat, 12 Aug 2017 14:22:45 +0000 Subject: [PATCH 0022/2806] data/fonts: make derivations fixed-outputs (group of fontforge compiled fonts) --- pkgs/data/fonts/inconsolata/lgc.nix | 4 ++++ pkgs/data/fonts/libertine/default.nix | 9 ++++++++- pkgs/data/fonts/monoid/default.nix | 4 ++++ .../fonts/rictydiminished-with-firacode/default.nix | 11 +++++++++++ pkgs/data/fonts/unscii/default.nix | 5 +++++ pkgs/data/fonts/xits-math/default.nix | 8 ++++++++ 6 files changed, 40 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index e7445186b72..aa7d3d7def4 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "18brmw0h4hjq1m2l0abwc3zmib4rnfalpywdk68djm711zldxr76"; + meta = with stdenv.lib; { description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek"; longDescription = '' diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index c69cc7ae34d..c4ef852bde3 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -8,11 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; nativeBuildInputs = [ fontforge ]; buildPhase = '' + # set it to mtime of ./env-vars, i.e. the current time + export SOURCE_DATE_EPOCH=$(stat -c '%Y' ChangeLog.txt) + for i in *.sfd; do fontforge -lang=ff -c \ 'Open($1); @@ -40,6 +43,10 @@ stdenv.mkDerivation rec { cp *.map $out/share/texmf/fonts/map ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1mj0j0hkp8pn7jcs4pvcan6whba60bfd671g3vhx3s9kxwf7xjvr"; + meta = { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 5e9a2c21916..c745cb88359 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { cp -va Readme.md $out/share/doc ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0ml61zym03n175gpx1gr7812f45lyjm0vzgbqjx91fi58rqlazvm"; + meta = with stdenv.lib; { homepage = http://larsenwork.com/monoid; description = "Customisable coding font with alternates, ligatures and contextual positioning"; diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 074fceeac94..45618972c34 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { }; buildPhase = '' + substituteInPlace apply-feature.py --replace \ + 'ricty = ttLib.TTFont(options.in_font)' \ + 'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)' + substituteInPlace build-py3.py --replace \ + 'datetime.date.today()' \ + 'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))' + make ''; @@ -28,6 +35,10 @@ stdenv.mkDerivation rec { ])) ]; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "09ldviapljn4bb1mcxap2pkz7cq3wr2k2qialbnav5y7ii82acd4"; + meta = with stdenv.lib; { homepage = https://github.com/hakatashi/RictyDiminished-with-FiraCode; description = "The best Japanese programming font meets the awesone ligatures of Firacode"; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 64e01124a67..092537c216a 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { cp *.svg "$out/share/fonts/svg" cp *.woff "$out/share/fonts/web" ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "03zvczdka665zcyf9fjrnx434mwpr5q8396j34kjmc67w7nhc49r"; + meta = { inherit version; description = ''Bitmapped character-art-friendly Unicode fonts''; diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index c3ba435cbbf..25431c7f9d7 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { postPatch = '' rm *.otf + + substituteInPlace tools/postprocess.py --replace \ + 'font = ttLib.TTFont(sys.argv[1])' \ + 'font = ttLib.TTFont(sys.argv[1], recalcTimestamp=False)' ''; installPhase = '' @@ -22,6 +26,10 @@ stdenv.mkDerivation rec { cp *.otf $out/share/fonts/opentype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "00xycmb9ka67j5s66nkng53y8q6362igisxz04zb58r2717jk50m"; + meta = with stdenv.lib; { homepage = https://github.com/khaledhosny/xits-math; description = "OpenType implementation of STIX fonts with math support"; From e03c118b8c2dd1b0a92ab0758fc451b8da3c1e33 Mon Sep 17 00:00:00 2001 From: Volth Date: Mon, 18 Sep 2017 21:50:37 +0000 Subject: [PATCH 0023/2806] remove workaround as #28218 is fixed --- pkgs/data/fonts/libertine/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index c4ef852bde3..82a9a4a952a 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -13,9 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ fontforge ]; buildPhase = '' - # set it to mtime of ./env-vars, i.e. the current time - export SOURCE_DATE_EPOCH=$(stat -c '%Y' ChangeLog.txt) - for i in *.sfd; do fontforge -lang=ff -c \ 'Open($1); From 716849c97ee95164c0f99fee64478d98a64a89df Mon Sep 17 00:00:00 2001 From: Volth Date: Mon, 18 Sep 2017 23:42:16 +0000 Subject: [PATCH 0024/2806] timescaledb: init at 0.4.2 --- .../sql/postgresql/timescaledb/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/timescaledb/default.nix diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix new file mode 100644 index 00000000000..e68d06dcf1f --- /dev/null +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + name = "timescaledb-${version}"; + version = "0.4.2"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "timescale"; + repo = "timescaledb"; + rev = version; + sha256 = "0rwcd7wg3kv343b02330nlpqfm6jj5g0d2pkr1pc78cq8prhxx39"; + }; + + installPhase = '' + mkdir -p $out/bin + install -D timescaledb.so -t $out/lib + install -D timescaledb.control -t $out/share/extension + install -D sql/timescaledb--${version}.sql -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "TimescaleDB scales PostgreSQL for time-series data via automatic partitioning across time and space"; + homepage = https://www.timescale.com/; + maintainers = with maintainers; [ volth ]; + platforms = platforms.linux; + license = licenses.postgresql; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8262eb8dbd..0687cd138b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16492,6 +16492,8 @@ with pkgs; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { }; + timescaledb = callPackage ../servers/sql/postgresql/timescaledb {}; + timewarrior = callPackage ../applications/misc/timewarrior { }; timidity = callPackage ../tools/misc/timidity { }; From 1908e5efa4f3bb80d4447da594e4a68063e2d67b Mon Sep 17 00:00:00 2001 From: Sivaram Balakrishnan Date: Tue, 19 Sep 2017 09:36:11 +0530 Subject: [PATCH 0025/2806] add sivteck to maintainers list --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9f4c31a3e4d..2d4eaddc533 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -541,6 +541,7 @@ siddharthist = "Langston Barrett "; sigma = "Yann Hodique "; simonvandel = "Simon Vandel Sillesen "; + sivteck = "Sivaram Balakrishnan "; sjagoe = "Simon Jagoe "; sjmackenzie = "Stewart Mackenzie "; sjourdois = "Stéphane ‘kwisatz’ Jourdois "; From 62a884e0c70e437ce4d914493fcaeb8358944fc0 Mon Sep 17 00:00:00 2001 From: Sivaram Balakrishnan Date: Mon, 18 Sep 2017 18:56:08 +0530 Subject: [PATCH 0026/2806] vcstool: init at 0.1.31 Adds vcstool application. Initial work to get ROS2 packages on Nix. --- pkgs/development/tools/vcstool/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/vcstool/default.nix diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix new file mode 100644 index 00000000000..fae0ca88124 --- /dev/null +++ b/pkgs/development/tools/vcstool/default.nix @@ -0,0 +1,28 @@ +{ stdenv, python3Packages +, git, bazaar, subversion }: + +with python3Packages; + +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "vcstool"; + version = "0.1.31"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n2zkvy2km9ky9lljf1mq5nqyqi5qqzfy2a6sgkjg2grvsk7abxc"; + }; + + propagatedBuildInputs = [ pyyaml ]; + + makeWrapperArgs = ["--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ git bazaar subversion ]}"]; + + doCheck = false; # requires network + + meta = with stdenv.lib; { + description = "Provides a command line tool to invoke vcs commands on multiple repositories"; + homepage = https://github.com/dirk-thomas/vcstool; + license = licenses.asl20; + maintainer = with maintainers; [ sivteck ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4474b098c0..149026c8e9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4744,6 +4744,8 @@ with pkgs; inherit (perlPackages) ShellCommand TestMost; }; + vcstool = callPackage ../development/tools/vcstool { }; + verilator = callPackage ../applications/science/electronics/verilator {}; verilog = callPackage ../applications/science/electronics/verilog {}; From 29309da4a198d689ab27846490b674fa1cc579d8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 20 Sep 2017 08:41:14 -0400 Subject: [PATCH 0027/2806] atom: 1.20.0 -> 1.20.1 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 65df31aaa22..8c77687d875 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1jzpa44ny78djdxc8d2w4jz1m68xmi8bzq87q3wmdffa4g9z4aa0"; + sha256 = "0mr82m3yv18ljai3r4ncr65bqhjwxyf1si77iza4ijk5zv1llp7i"; name = "${name}.deb"; }; From a1767fa1abe9b928bceff6ab0ccdb80c6d821d28 Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Wed, 20 Sep 2017 15:54:08 +0200 Subject: [PATCH 0028/2806] vivaldi: 1.11.917.39-1 -> 1.12.955.36-1 vivaldi-ffmpeg-codecs: 60.0.3112.90 -> 61.0.3163.91 --- .../browsers/vivaldi/chromium-gcc-r1.patch | 14 ++++ .../browsers/vivaldi/chromium-gcc5-r1.patch | 66 +++++++++++++++++++ .../vivaldi/chromium-gn-bootstrap-r14.patch | 27 ++++++++ .../vivaldi/chromium-gn-bootstrap-r8.patch | 13 ---- .../networking/browsers/vivaldi/default.nix | 4 +- .../browsers/vivaldi/ffmpeg-codecs.nix | 8 ++- 6 files changed, 114 insertions(+), 18 deletions(-) create mode 100644 pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch create mode 100644 pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch create mode 100644 pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch delete mode 100644 pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r8.patch diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch new file mode 100644 index 00000000000..036d57b601d --- /dev/null +++ b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch @@ -0,0 +1,14 @@ +diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h +index 99f230ce7e9a..de2415d402f5 100644 +--- a/base/numerics/safe_math_shared_impl.h ++++ b/base/numerics/safe_math_shared_impl.h +@@ -21,8 +21,7 @@ + #if !defined(__native_client__) && \ + ((defined(__clang__) && \ + ((__clang_major__ > 3) || \ +- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ +- (defined(__GNUC__) && __GNUC__ >= 5)) ++ (__clang_major__ == 3 && __clang_minor__ >= 4)))) + #include "base/numerics/safe_math_clang_gcc_impl.h" + #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) + #else \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch new file mode 100644 index 00000000000..8d2886fbfa9 --- /dev/null +++ b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch @@ -0,0 +1,66 @@ +--- a/chrome/browser/devtools/devtools_file_system_indexer.cc ++++ b/chrome/browser/devtools/devtools_file_system_indexer.cc +@@ -34,7 +34,6 @@ using base::TimeDelta; + using base::TimeTicks; + using content::BrowserThread; + using std::map; +-using std::set; + using std::string; + using std::vector; + +@@ -191,7 +190,7 @@ vector Index::Search(const string& query) { + if (trigram != kUndefinedTrigram) + trigrams.push_back(trigram); + } +- set file_ids; ++ std::set file_ids; + bool first = true; + vector::const_iterator it = trigrams.begin(); + for (; it != trigrams.end(); ++it) { +@@ -203,7 +202,7 @@ vector Index::Search(const string& query) { + first = false; + continue; + } +- set intersection = base::STLSetIntersection >( ++ std::set intersection = base::STLSetIntersection >( + file_ids, index_[trigram]); + file_ids.swap(intersection); + } +diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +index 94bb9161ec85..e40c6387f72e 100644 +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 ++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include ++#include + #include + #include + \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch new file mode 100644 index 00000000000..62426715366 --- /dev/null +++ b/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch @@ -0,0 +1,27 @@ +commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685 +Author: Pawel Hajdan, Jr +Date: Wed Jul 26 21:51:54 2017 +0000 + + wip + +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 1390560f8e37..ff2ae57c46b0 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/metrics/histogram_base.cc', + 'base/metrics/histogram_functions.cc', + 'base/metrics/histogram_samples.cc', ++ 'base/metrics/histogram_snapshot_manager.cc', + 'base/metrics/metrics_hashes.cc', + 'base/metrics/persistent_histogram_allocator.cc', + 'base/metrics/persistent_memory_allocator.cc', +@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/trace_event/heap_profiler_allocation_context_tracker.cc', + 'base/trace_event/heap_profiler_allocation_register.cc', + 'base/trace_event/heap_profiler_event_filter.cc', +- 'base/trace_event/heap_profiler_event_writer.cc', ++ 'base/trace_event/heap_profiler_heap_dump_writer.cc', + 'base/trace_event/heap_profiler_serialization_state.cc', + 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', + 'base/trace_event/heap_profiler_type_name_deduplicator.cc', \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r8.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r8.patch deleted file mode 100644 index d9f389aaf58..00000000000 --- a/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r8.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tools/gn/bootstrap/bootstrap.py -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/sys_info.cc', - 'base/task_runner.cc', - 'base/task_scheduler/delayed_task_manager.cc', -+ 'base/task_scheduler/environment_config.cc', - 'base/task_scheduler/post_task.cc', - 'base/task_scheduler/priority_queue.cc', - 'base/task_scheduler/scheduler_lock_impl.cc', diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index a1238cb5964..5fc4ca8bd53 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.11.917.39-1"; + version = "1.12.955.36-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "0rsggp4ayj462g217zb9y9grhvbrcxa51a77l8l4qzhd9lg7zvx6"; + sha256 = "0fh6v4byqvyywlf9xsxn78kfypcqsmf4vypv5mwxh5nrpwim4xqj"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index b8b6bde50a4..1afb1fa3490 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi-ffmpeg-codecs"; - version = "60.0.3112.90"; + version = "61.0.3163.91"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "2p7pjjsxpglxjmh0asyykagqh33ccrjwj4b2aski4h31wkxv9b9najy8aqk6j1bi06n9wd35vis4hz4fr6kvgckllg1pjqrb3bpwmq5"; + sha512 = "3f07vwbxllrwy3agqxa6ndcix23vai18i178zscmk0y68flhzffyjdvrwlg7dzlwgiqypj2cyl21qb4qmcay2ilgw9vnr9fql2x0w7p"; }; buildInputs = [ ]; @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { ]; patches = [ - ./chromium-gn-bootstrap-r8.patch + ./chromium-gn-bootstrap-r14.patch + ./chromium-gcc-r1.patch + ./chromium-gcc5-r1.patch ]; configurePhase = '' From b390773310323be16befa3c30edd94d7d5924b6e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 21 Sep 2017 07:56:53 -0400 Subject: [PATCH 0029/2806] gradle: 4.1 -> 4.2 --- 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 45a4d8a8358..e5eda9c1956 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.1"; + name = "gradle-4.2"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0hzdz5cy5dmyqz73qy80q74aiy87jl5vnxcy3imahgaszffglpfm"; + sha256 = "1bifb3smmdxkfk94li2l63g2jxcl1bjca2bqcq2rqnp568yxcpai"; }; }; From 1e73b71e0309a033c373b322cc23b5776d76f7eb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 Sep 2017 22:23:00 -0400 Subject: [PATCH 0030/2806] synfig: Make pkg-config, autoreconfHook, and gettext nativeBuildInputs --- pkgs/applications/graphics/synfigstudio/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index ea0d2338252..9bb942d05f5 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -18,7 +18,7 @@ let postUnpack = "sourceRoot=\${sourceRoot}/ETL/"; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; }; synfig = stdenv.mkDerivation rec { @@ -38,9 +38,9 @@ let "--with-boost-libdir=${boost.out}/lib" ]; + nativeBuildInputs = [ pkgconfig autoreconfHook gettext ]; buildInputs = [ - ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libxmlxx pango - pkgconfig autoreconfHook + ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango ]; }; in @@ -99,10 +99,11 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap.sh"; + nativeBuildInputs = [ pkgconfig autoreconfHook gettext ]; buildInputs = [ - ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool - libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig - synfig autoreconfHook which defaultIconTheme + ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool + libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 + synfig which defaultIconTheme ]; postInstall = '' From 9f2e05662bf7a33c394fa7d707905154d20a0db2 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 Sep 2017 22:27:05 -0400 Subject: [PATCH 0031/2806] treewide: Manually fix miscategorized `autoreconfHook` `buildInputs` These are the ones with odd indentation my script will mess up on. --- pkgs/development/interpreters/ruby/default.nix | 5 +++-- pkgs/os-specific/linux/zfs/default.nix | 5 +++-- pkgs/top-level/lua-packages.nix | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b4cd9f3f418..5cb019891ff 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -66,8 +66,9 @@ let # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = "${groff}/bin/nroff"; - buildInputs = ops useRailsExpress [ autoreconfHook bison ] - ++ (op fiddleSupport libffi) + nativeBuildInputs = ops useRailsExpress [ autoreconfHook bison ]; + buildInputs = + (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ]) ++ (op docSupport groff) ++ (op zlibSupport zlib) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c3af49e08f2..feea51849cb 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -38,8 +38,9 @@ let patches = extraPatches; - buildInputs = [ autoreconfHook nukeReferences ] - ++ optionals buildKernel [ spl ] + nativeBuildInputs = [ autoreconfHook nukeReferences ]; + buildInputs = + optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 91efa306ce4..f940a5b646c 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -327,7 +327,7 @@ let url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; }; - buildInputs = [ autoreconfHook unzip ]; + nativeBuildInputs = [ autoreconfHook unzip ]; meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; platforms = stdenv.lib.platforms.linux; From fd9c7eb2e8c1755b606cb0d7dab2ba0bb93e36ed Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 5 Sep 2017 17:25:26 -0400 Subject: [PATCH 0032/2806] misc pkgs: Make solitary pkgconfig buildInputs nativeBuildInputs --- pkgs/applications/misc/xsw/default.nix | 4 +- pkgs/applications/video/quvi/scripts.nix | 2 +- pkgs/development/libraries/ccrtp/default.nix | 2 +- pkgs/development/libraries/flite/default.nix | 2 +- .../libraries/gtkdatabox/default.nix | 2 +- pkgs/development/libraries/libast/default.nix | 2 +- .../libraries/libavc1394/default.nix | 2 +- .../libraries/libiec61883/default.nix | 2 +- .../libraries/liblastfmSF/default.nix | 2 +- .../libraries/liblqr-1/default.nix | 2 +- .../development/libraries/libmrss/default.nix | 2 +- pkgs/development/libraries/libmtp/default.nix | 2 +- .../development/libraries/liboggz/default.nix | 2 +- pkgs/development/libraries/libtap/default.nix | 2 +- .../development/libraries/libusb1/default.nix | 2 +- .../libraries/loudmouth/default.nix | 2 +- .../libraries/mesa-glu/default.nix | 2 +- pkgs/development/libraries/srtp/default.nix | 2 +- .../development/libraries/ucommon/default.nix | 2 +- .../pure-modules/audio/default.nix | 2 +- .../pure-modules/avahi/default.nix | 2 +- pkgs/development/pure-modules/csv/default.nix | 2 +- .../pure-modules/fastcgi/default.nix | 2 +- .../pure-modules/faust/default.nix | 2 +- pkgs/development/pure-modules/ffi/default.nix | 2 +- pkgs/development/pure-modules/gl/default.nix | 2 +- .../pure-modules/gplot/default.nix | 2 +- pkgs/development/pure-modules/gsl/default.nix | 2 +- pkgs/development/pure-modules/gtk/default.nix | 2 +- .../pure-modules/liblo/default.nix | 2 +- .../development/pure-modules/lilv/default.nix | 2 +- pkgs/development/pure-modules/lv2/default.nix | 2 +- .../development/pure-modules/midi/default.nix | 2 +- .../development/pure-modules/mpfr/default.nix | 2 +- .../development/pure-modules/odbc/default.nix | 2 +- .../pure-modules/rational/default.nix | 2 +- .../pure-modules/readline/default.nix | 2 +- .../pure-modules/sockets/default.nix | 2 +- .../development/pure-modules/sql3/default.nix | 2 +- .../pure-modules/stldict/default.nix | 2 +- .../pure-modules/stllib/default.nix | 2 +- pkgs/development/pure-modules/tk/default.nix | 2 +- pkgs/development/pure-modules/xml/default.nix | 2 +- .../python-modules/html5-parser/default.nix | 2 +- .../python-modules/libsexy/default.nix | 2 +- .../sql/postgresql/tsearch_extras/default.nix | 2 +- pkgs/servers/x11/xorg/default.nix | 80 +++++++++---------- .../filesystems/nixpart/0.4/pyparted.nix | 2 +- pkgs/tools/misc/eot-utilities/default.nix | 2 +- pkgs/tools/networking/openconnect/default.nix | 2 +- 50 files changed, 90 insertions(+), 90 deletions(-) diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index b3a57e1cef2..3e8acff00f8 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -14,9 +14,9 @@ in stdenv.mkDerivation rec { sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g"; }; - nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_gfx flex bison ]; + nativeBuildInputs = [ pkgconfig flex bison ]; - buildInputs = [ pkgconfig ]; + buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ]; NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]; diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index cdc53367d11..6f4e6091339 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "Web video downloader"; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 13a9259fdec..5df7c2279c5 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ ucommon openssl libgcrypt ]; configureFlags = [ diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index bf690c020cb..483f02f823f 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "197cc2a1f045b1666a29a9b5f035b3d676db6db94a4439d99a03b65e551ae2e0"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = '' --enable-shared diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 82c4f25f66c..de5fd8343e3 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0h20685bzw5j5h6mw8c6apbrbrd9w518c6xdhr55147px11nhnkl"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ gtk2 ]; diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index 745736559ab..900bcac4156 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { description = "Library of Assorted Spiffy Things"; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index ab8b507e98b..726e9573d37 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libraw1394 ]; meta = { diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 2cba1b0dd3c..2ad59e698d0 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libraw1394 ]; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index efe93ec02df..73d996c5ec8 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "liblastfm-SF-0.5"; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ curl openssl ]; diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index e505871eb02..4b445c93175 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index 865330fdda7..b0adcf23754 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ curl libnxml ]; meta = { diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 8892b016fe8..9cac26bf2be 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; propagatedBuildInputs = [ libusb1 ]; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; # tried to install files to /lib/udev, hopefully OK configureFlags = [ "--with-udev=$$bin/lib/udev" ]; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index ed46919f26c..f6fe9ecd03a 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libogg ]; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = https://xiph.org/oggz/; diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index b1dfa5ba7e4..2671199ab0e 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ cmake perl ]; meta = { diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 5a76a93b8e3..dd2f1edc5f2 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # get rid of propagating systemd closure - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index 775b515dc7f..762d23e240a 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl libidn glib zlib ]; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "A lightweight C library for the Jabber protocol"; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 06d9994a529..9a6441956db 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { echo 'Cflags: -I''${includedir}' >> glu.pc.in ''; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ mesa_noglu ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index 27194aabd1b..d4ea531f886 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0s029m4iw0nsvnsm2hlz8yajrasdvf315iv2dw8mfm7nhbshwsqa"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; # libsrtp.pc references -lcrypto -lpcap without -L propagatedBuildInputs = [ openssl libpcap ]; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 315566851fb..8665be26925 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; # disable flaky networking test postPatch = '' diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index 7b14b20dc83..2cdab404c5f 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index e22e1fae220..f94ee8d7637 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure avahi ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index 6d41f2c5e6a..846fb7e3730 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index f1bc49c5ecc..ebd13743442 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure fcgi ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index 7f5c4801d5d..74ec8e49343 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure faust libtool ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index a9a3a56ebb8..efea0b4182c 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libffi ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index eb1c01e4eef..e3c7e6bc14a 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure freeglut mesa xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index e110afa1d24..d1657cdd445 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure gnuplot ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 10eddeeb797..08aa674eb6b 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure gsl ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index fd2460b5c1b..77fae1d0981 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure pure-ffi gtk2 ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index a68d04f901f..2dd0865f6ea 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure liblo ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index 4f2d5abba1e..7f3638fe5c9 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ]; makeFlags = "CFLAGS=-I${lilv}/include/lilv-0 libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index 63a8cafc474..98556acbf28 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure lv2 ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index bbf20b66c29..950c536e760 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure portmidi ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index ccc32739a49..63196fadf46 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index 666cf55044d..4ae1e58a7bc 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libiodbc ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index 42ead62b256..20d61e5c362 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index e93207943b0..a6bb2ed6167 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure readline ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index 522446104ff..235478a1776 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index f937b9eb530..91ff3a446c2 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure sqlite ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index 4ade515faa8..8c39b9791e0 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index 02c96d975ec..dd7a945182b 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index 0fe1667b040..03e322d74c0 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index ed08cdf5209..8e268611035 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libxml2 libxslt ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 6a579cffccf..faddfe2bfdd 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "b9f3a1d4cdb8742e8e4ecafab04bff541bde4ff09af233293ed0b94028ec1ab5"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ]; doCheck = false; # No such file or directory: 'run_tests.py' diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index 69d9dde6cba..a88a6097611 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pygtk libsexy gtk2 glib pango libxml2 diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix index d434fa98e09..c3a452132f2 100644 --- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix +++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1ivg9zn7f1ks31ixxwywifwhzxn6py8s5ky1djyxnb0s60zckfjg"; }; - nativebuildInputs = [ pkgconfig ]; + nativenativeBuildInputs = [ pkgconfig ]; buildInputs = [ postgresql ]; installPhase = '' diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7c052d8ef49..5fb5d1a6b62 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -26,7 +26,7 @@ let url = mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2; sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -59,7 +59,7 @@ let url = mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2; sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -70,7 +70,7 @@ let url = mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2; sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -81,7 +81,7 @@ let url = mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2; sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -92,7 +92,7 @@ let url = mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2; sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -103,7 +103,7 @@ let url = mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2; sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -114,7 +114,7 @@ let url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2; sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -125,7 +125,7 @@ let url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2; sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -202,7 +202,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2; sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -499,7 +499,7 @@ let url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2; sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -521,7 +521,7 @@ let url = mirror://xorg/individual/font/font-util-1.3.1.tar.bz2; sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -554,7 +554,7 @@ let url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2; sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -565,7 +565,7 @@ let url = mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2; sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -598,7 +598,7 @@ let url = mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2; sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -609,7 +609,7 @@ let url = mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2; sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1027,7 +1027,7 @@ let url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1104,7 +1104,7 @@ let url = mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2; sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1126,7 +1126,7 @@ let url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2; sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1148,7 +1148,7 @@ let url = mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2; sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1159,7 +1159,7 @@ let url = mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2; sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1170,7 +1170,7 @@ let url = mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2; sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1181,7 +1181,7 @@ let url = mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2; sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1192,7 +1192,7 @@ let url = mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2; sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1247,7 +1247,7 @@ let url = mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2; sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1258,7 +1258,7 @@ let url = mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2; sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1269,7 +1269,7 @@ let url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2; sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1313,7 +1313,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2; sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1423,7 +1423,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2; sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1522,7 +1522,7 @@ let url = mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2; sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1544,7 +1544,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2; sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1555,7 +1555,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2; sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1566,7 +1566,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2; sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1665,7 +1665,7 @@ let url = mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2; sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2127,7 +2127,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2; sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2182,7 +2182,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2; sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2347,7 +2347,7 @@ let url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2358,7 +2358,7 @@ let url = mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2; sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2380,7 +2380,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2; sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2413,7 +2413,7 @@ let url = mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2; sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2479,7 +2479,7 @@ let url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2; sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index 0d3370c4b1e..fd6c5b91309 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { PATH="${parted}/sbin:$PATH" ''; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ parted ]; diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index f773ae6caac..b44159be8ce 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0cb41riabss23hgfg7vxhky09d6zqwjy1nxdvr3l2bh5qzd4kvaf"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://www.w3.org/Tools/eot-utils/; diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 5e38aee7f83..0f1e45a10a7 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--without-openssl-version-check" ]; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ]; meta = { From 531e4b80c97002a542beb8fe356177ebd66cdd8e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 5 Sep 2017 17:26:13 -0400 Subject: [PATCH 0033/2806] misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs` Only acts on one-line dependency lists. --- pkgs/applications/altcoins/memorycoin.nix | 3 +- pkgs/applications/altcoins/primecoin.nix | 3 +- pkgs/applications/altcoins/stellar-core.nix | 3 +- pkgs/applications/altcoins/zcash/default.nix | 3 +- pkgs/applications/audio/a2jmidid/default.nix | 3 +- .../audio/aj-snapshot/default.nix | 3 +- pkgs/applications/audio/ams-lv2/default.nix | 3 +- pkgs/applications/audio/artyFX/default.nix | 3 +- pkgs/applications/audio/asunder/default.nix | 3 +- pkgs/applications/audio/bitmeter/default.nix | 3 +- pkgs/applications/audio/cmus/default.nix | 3 +- pkgs/applications/audio/eq10q/default.nix | 3 +- pkgs/applications/audio/espeak/edit.nix | 3 +- pkgs/applications/audio/faust/faust1.nix | 3 +- pkgs/applications/audio/faust/faust2.nix | 3 +- .../applications/audio/fluidsynth/default.nix | 3 +- pkgs/applications/audio/fmsynth/default.nix | 3 +- pkgs/applications/audio/fomp/default.nix | 3 +- pkgs/applications/audio/foo-yc20/default.nix | 3 +- pkgs/applications/audio/gmpc/default.nix | 3 +- pkgs/applications/audio/gnaural/default.nix | 3 +- pkgs/applications/audio/gtkpod/default.nix | 3 +- pkgs/applications/audio/iannix/default.nix | 3 +- .../audio/jack-capture/default.nix | 3 +- .../audio/jack-oscrolloscope/default.nix | 3 +- pkgs/applications/audio/jack-rack/default.nix | 3 +- pkgs/applications/audio/jackmeter/default.nix | 3 +- pkgs/applications/audio/klick/default.nix | 3 +- .../audio/ladspa-plugins/default.nix | 3 +- pkgs/applications/audio/lingot/default.nix | 3 +- pkgs/applications/audio/linuxband/default.nix | 3 +- pkgs/applications/audio/lv2bm/default.nix | 3 +- pkgs/applications/audio/mda-lv2/default.nix | 3 +- .../applications/audio/meters_lv2/default.nix | 3 +- pkgs/applications/audio/minimodem/default.nix | 3 +- pkgs/applications/audio/mp3info/default.nix | 3 +- pkgs/applications/audio/non/default.nix | 3 +- .../audio/nova-filters/default.nix | 3 +- .../applications/audio/openmpt123/default.nix | 3 +- .../audio/plugin-torture/default.nix | 3 +- pkgs/applications/audio/praat/default.nix | 3 +- .../applications/audio/qmidiroute/default.nix | 3 +- pkgs/applications/audio/qsampler/default.nix | 3 +- pkgs/applications/audio/rkrlv2/default.nix | 3 +- pkgs/applications/audio/sisco.lv2/default.nix | 3 +- pkgs/applications/audio/sorcer/default.nix | 3 +- .../audio/sound-juicer/default.nix | 3 +- .../audio/soundscape-renderer/default.nix | 3 +- .../audio/spectrojack/default.nix | 3 +- pkgs/applications/audio/spek/default.nix | 3 +- .../audio/streamripper/default.nix | 3 +- pkgs/applications/audio/swh-lv2/default.nix | 3 +- .../audio/timemachine/default.nix | 3 +- pkgs/applications/audio/uade123/default.nix | 3 +- pkgs/applications/audio/vimpc/default.nix | 3 +- .../audio/vorbis-tools/default.nix | 3 +- .../audio/x42-plugins/default.nix | 3 +- pkgs/applications/audio/xmp/default.nix | 3 +- pkgs/applications/audio/ympd/default.nix | 3 +- .../audio/zam-plugins/default.nix | 3 +- .../lightdm-gtk-greeter/default.nix | 3 +- .../editors/emacs-modes/emacs-w3m/default.nix | 3 +- .../editors/focuswriter/default.nix | 3 +- pkgs/applications/editors/gobby/default.nix | 3 +- pkgs/applications/editors/leafpad/default.nix | 3 +- .../editors/supertux-editor/default.nix | 3 +- pkgs/applications/editors/vanubi/default.nix | 3 +- pkgs/applications/editors/zile/default.nix | 3 +- pkgs/applications/gis/grass/default.nix | 3 +- .../graphics/exrdisplay/default.nix | 3 +- .../graphics/exrtools/default.nix | 3 +- .../applications/graphics/gcolor2/default.nix | 3 +- pkgs/applications/graphics/giv/default.nix | 3 +- .../graphics/gpicview/default.nix | 3 +- pkgs/applications/graphics/gqview/default.nix | 3 +- pkgs/applications/graphics/grafx2/default.nix | 3 +- pkgs/applications/graphics/ktikz/default.nix | 3 +- .../applications/graphics/mozjpeg/default.nix | 3 +- pkgs/applications/graphics/qiv/default.nix | 3 +- .../applications/graphics/rawtherapee/dev.nix | 3 +- pkgs/applications/graphics/sane/xsane.nix | 3 +- pkgs/applications/graphics/xzgv/default.nix | 3 +- pkgs/applications/graphics/zgv/default.nix | 3 +- pkgs/applications/misc/artha/default.nix | 3 +- pkgs/applications/misc/cataract/build.nix | 3 +- pkgs/applications/misc/clipit/default.nix | 3 +- pkgs/applications/misc/cmatrix/default.nix | 3 +- .../misc/deepin-terminal/default.nix | 3 +- pkgs/applications/misc/eaglemode/default.nix | 3 +- pkgs/applications/misc/eterm/default.nix | 3 +- pkgs/applications/misc/evtest/default.nix | 3 +- pkgs/applications/misc/fehlstart/default.nix | 3 +- pkgs/applications/misc/fme/default.nix | 3 +- .../misc/garmin-plugin/default.nix | 3 +- pkgs/applications/misc/girara/default.nix | 3 +- pkgs/applications/misc/gmrun/default.nix | 3 +- .../misc/green-pdfviewer/default.nix | 3 +- pkgs/applications/misc/grip/default.nix | 3 +- pkgs/applications/misc/gsimplecal/default.nix | 3 +- .../applications/misc/gtk2fontsel/default.nix | 3 +- pkgs/applications/misc/gxmessage/default.nix | 3 +- pkgs/applications/misc/lilyterm/default.nix | 3 +- .../applications/misc/ltwheelconf/default.nix | 3 +- .../misc/mysql-workbench/default.nix | 3 +- .../misc/netsurf/browser/default.nix | 3 +- .../misc/netsurf/libcss/default.nix | 3 +- .../misc/netsurf/libdom/default.nix | 3 +- .../misc/netsurf/libhubbub/default.nix | 3 +- .../misc/netsurf/libnsbmp/default.nix | 3 +- .../misc/netsurf/libnsfb/default.nix | 3 +- .../misc/netsurf/libnsgif/default.nix | 3 +- .../misc/netsurf/libnsutils/default.nix | 3 +- .../misc/netsurf/libutf8proc/default.nix | 3 +- .../misc/openbox-menu/default.nix | 3 +- pkgs/applications/misc/opencpn/default.nix | 3 +- .../applications/misc/pcmanx-gtk2/default.nix | 3 +- pkgs/applications/misc/pinfo/default.nix | 3 +- pkgs/applications/misc/posterazor/default.nix | 3 +- pkgs/applications/misc/rofi/default.nix | 3 +- pkgs/applications/misc/rtl-sdr/default.nix | 3 +- pkgs/applications/misc/rxvt/default.nix | 3 +- pkgs/applications/misc/sc-im/default.nix | 3 +- pkgs/applications/misc/sdcv/default.nix | 3 +- pkgs/applications/misc/st/default.nix | 3 +- pkgs/applications/misc/st/wayland.nix | 3 +- pkgs/applications/misc/st/xst.nix | 3 +- .../misc/syncthing-tray/default.nix | 3 +- pkgs/applications/misc/tangogps/default.nix | 3 +- pkgs/applications/misc/termite/default.nix | 3 +- pkgs/applications/misc/tilda/default.nix | 3 +- pkgs/applications/misc/tomboy/default.nix | 3 +- pkgs/applications/misc/truecrypt/default.nix | 3 +- pkgs/applications/misc/udevil/default.nix | 3 +- pkgs/applications/misc/urlview/default.nix | 3 +- pkgs/applications/misc/valauncher/default.nix | 3 +- pkgs/applications/misc/viking/default.nix | 3 +- pkgs/applications/misc/vym/default.nix | 3 +- pkgs/applications/misc/xautoclick/default.nix | 3 +- pkgs/applications/misc/xfe/default.nix | 3 +- pkgs/applications/misc/xfontsel/default.nix | 3 +- pkgs/applications/misc/xiphos/default.nix | 3 +- pkgs/applications/misc/yate/default.nix | 3 +- .../misc/zathura/djvu/default.nix | 3 +- .../misc/zathura/pdf-mupdf/default.nix | 3 +- .../misc/zathura/pdf-poppler/default.nix | 3 +- pkgs/applications/misc/zathura/ps/default.nix | 3 +- .../networking/browsers/dwb/default.nix | 3 +- .../networking/browsers/jumanji/default.nix | 3 +- .../esteidfirefoxplugin/default.nix | 3 +- .../mozilla-plugins/fribid/default.nix | 3 +- .../mplayerplug-in/default.nix | 3 +- .../nspluginwrapper/default.nix | 3 +- .../networking/browsers/vimb/default.nix | 3 +- .../browsers/vimprobable2/default.nix | 3 +- .../networking/browsers/w3m/default.nix | 3 +- .../networking/cluster/docker-machine/kvm.nix | 3 +- .../networking/dropbox-cli/default.nix | 3 +- .../instant-messengers/baresip/default.nix | 3 +- .../bitlbee-steam/default.nix | 3 +- .../instant-messengers/kadu/default.nix | 3 +- .../instant-messengers/mcabber/default.nix | 3 +- .../pidgin-plugins/carbons/default.nix | 3 +- .../pidgin-skypeweb/default.nix | 3 +- .../purple-facebook/default.nix | 3 +- .../pidgin-plugins/skype4pidgin/default.nix | 3 +- .../instant-messengers/pond/default.nix | 3 +- .../silc-client/default.nix | 3 +- .../telepathy/idle/default.nix | 3 +- .../telepathy/logger/default.nix | 3 +- .../networking/irc/irssi/fish/default.nix | 3 +- .../networking/irc/irssi/otr/default.nix | 3 +- .../networking/linssid/default.nix | 3 +- .../notmuch-addrlookup/default.nix | 3 +- .../mailreaders/notmuch/muchsync.nix | 3 +- .../networking/newsreaders/pan/default.nix | 3 +- .../networking/p2p/eiskaltdcpp/default.nix | 3 +- .../networking/p2p/transmission/default.nix | 3 +- .../networking/remote/putty/default.nix | 3 +- .../networking/remote/remmina/default.nix | 3 +- .../networking/sniffers/kismet/default.nix | 3 +- .../networking/tcpkali/default.nix | 3 +- .../networking/umurmur/default.nix | 3 +- pkgs/applications/office/pinpoint/default.nix | 3 +- .../science/astronomy/celestia/default.nix | 3 +- .../science/astronomy/xplanet/default.nix | 3 +- .../science/chemistry/gwyddion/default.nix | 3 +- .../science/electronics/adms/default.nix | 3 +- .../science/electronics/geda/default.nix | 3 +- .../science/electronics/gerbv/default.nix | 3 +- .../science/electronics/gtkwave/default.nix | 3 +- .../science/electronics/kicad/default.nix | 3 +- .../science/electronics/pcb/default.nix | 3 +- .../science/electronics/pulseview/default.nix | 3 +- .../science/electronics/qfsm/default.nix | 3 +- .../science/electronics/xoscope/default.nix | 3 +- pkgs/applications/science/logic/coq/8.4.nix | 3 +- pkgs/applications/science/logic/coq/HEAD.nix | 3 +- .../science/logic/coq/default.nix | 3 +- .../science/logic/cvc4/default.nix | 3 +- .../science/logic/ott/default.nix | 3 +- .../science/logic/prooftree/default.nix | 3 +- .../science/logic/twelf/default.nix | 3 +- .../science/logic/yices/default.nix | 3 +- .../science/math/pspp/default.nix | 3 +- .../science/misc/fityk/default.nix | 3 +- .../science/misc/root/default.nix | 3 +- .../version-management/guitone/default.nix | 3 +- .../monotone-viz/default.nix | 3 +- .../version-management/monotone/default.nix | 3 +- pkgs/applications/video/byzanz/default.nix | 3 +- pkgs/applications/video/coriander/default.nix | 3 +- .../video/gnome-mplayer/default.nix | 3 +- .../video/linuxstopmotion/default.nix | 3 +- pkgs/applications/video/makemkv/default.nix | 3 +- pkgs/applications/video/p2pvc/default.nix | 3 +- pkgs/applications/video/pitivi/default.nix | 3 +- pkgs/applications/video/quvi/library.nix | 3 +- pkgs/applications/video/quvi/tool.nix | 3 +- pkgs/applications/video/vlc/plugin.nix | 3 +- .../virtualization/runc/default.nix | 3 +- .../virtualization/singularity/default.nix | 3 +- .../virtualization/spice-vdagent/default.nix | 3 +- .../window-managers/afterstep/default.nix | 3 +- .../window-managers/cwm/default.nix | 3 +- .../window-managers/dzen2/default.nix | 3 +- .../window-managers/herbstluftwm/default.nix | 3 +- pkgs/applications/window-managers/i3/lock.nix | 3 +- .../window-managers/i3/status.nix | 3 +- .../window-managers/kbdd/default.nix | 3 +- .../window-managers/matchbox/default.nix | 3 +- .../window-managers/notion/default.nix | 3 +- .../window-managers/oroborus/default.nix | 3 +- .../window-managers/pekwm/default.nix | 3 +- .../window-managers/qtile/default.nix | 3 +- .../window-managers/sawfish/default.nix | 3 +- .../window-managers/trayer/default.nix | 3 +- .../window-managers/vwm/default.nix | 3 +- .../window-managers/windowlab/default.nix | 3 +- .../windowmaker/dockapps/alsamixer.app.nix | 3 +- .../windowmaker/dockapps/wmcalclock.nix | 3 +- .../windowmaker/dockapps/wmsm.app.nix | 3 +- .../windowmaker/dockapps/wmsystemtray.nix | 3 +- .../window-managers/wmii-hg/default.nix | 3 +- .../window-managers/wtftw/default.nix | 3 +- pkgs/build-support/build-pecl.nix | 3 +- pkgs/data/icons/tango-icon-theme/default.nix | 3 +- .../gnome-2/bindings/libglademm/default.nix | 3 +- .../desktop/gnome-control-center/default.nix | 3 +- .../gnome-2/desktop/gnome-desktop/default.nix | 3 +- .../gnome-2/desktop/gnome-menus/default.nix | 3 +- .../gnome-2/desktop/libgnomekbd/default.nix | 3 +- .../gnome-2/desktop/libgweather/default.nix | 3 +- .../desktop/mail-notification/default.nix | 3 +- .../gnome-2/desktop/rarian/default.nix | 3 +- .../gnome-2/desktop/scrollkeeper/default.nix | 3 +- pkgs/desktops/gnome-2/desktop/vte/default.nix | 3 +- .../gnome-2/platform/at-spi/default.nix | 3 +- .../platform/gnome-vfs-monikers/default.nix | 3 +- .../desktops/gnome-2/platform/gtkhtml/4.x.nix | 3 +- .../gnome-2/platform/gtkhtml/default.nix | 3 +- .../gnome-2/platform/libglade/default.nix | 3 +- .../platform/libgnomecanvasmm/default.nix | 3 +- .../gnome-2/platform/libgnomecups/default.nix | 3 +- .../platform/libgnomeprint/default.nix | 3 +- .../platform/libgnomeprintui/default.nix | 3 +- .../gnome-2/platform/libgtkhtml/default.nix | 3 +- .../gnome-3/3.24/apps/bijiben/default.nix | 3 +- .../gnome-3/3.24/apps/cheese/default.nix | 3 +- .../gnome-3/3.24/apps/glade/default.nix | 3 +- .../3.24/apps/gnome-clocks/default.nix | 3 +- .../3.24/apps/gnome-documents/default.nix | 3 +- .../gnome-3/3.24/apps/gnome-maps/default.nix | 3 +- .../gnome-3/3.24/apps/gnome-music/default.nix | 3 +- .../3.24/apps/gnome-photos/default.nix | 3 +- .../3.24/apps/nautilus-sendto/default.nix | 3 +- .../gnome-3/3.24/apps/polari/default.nix | 3 +- .../gnome-3/3.24/apps/seahorse/default.nix | 3 +- .../gnome-3/3.24/apps/vinagre/default.nix | 3 +- .../gnome-3/3.24/core/baobab/default.nix | 3 +- .../gnome-3/3.24/core/dconf/default.nix | 3 +- .../gnome-3/3.24/core/empathy/default.nix | 3 +- .../gnome-3/3.24/core/epiphany/default.nix | 3 +- .../gnome-3/3.24/core/gdm/default.nix | 3 +- .../gnome-3/3.24/core/gjs/default.nix | 3 +- .../3.24/core/gnome-bluetooth/default.nix | 3 +- .../3.24/core/gnome-contacts/default.nix | 3 +- .../3.24/core/gnome-desktop/default.nix | 3 +- .../3.24/core/gnome-dictionary/default.nix | 3 +- .../3.24/core/gnome-disk-utility/default.nix | 3 +- .../3.24/core/gnome-font-viewer/default.nix | 3 +- .../gnome-3/3.24/core/gnome-menus/default.nix | 3 +- .../core/gnome-online-accounts/default.nix | 3 +- .../3.24/core/gnome-online-miners/default.nix | 3 +- .../3.24/core/gnome-screenshot/default.nix | 3 +- .../core/gnome-shell-extensions/default.nix | 3 +- .../3.24/core/gnome-system-log/default.nix | 3 +- .../core/gnome-system-monitor/default.nix | 3 +- .../core/gnome-themes-standard/default.nix | 3 +- .../3.24/core/gnome-user-docs/default.nix | 3 +- .../3.24/core/gnome-user-share/default.nix | 3 +- .../3.24/core/grilo-plugins/default.nix | 3 +- .../gnome-3/3.24/core/grilo/default.nix | 3 +- .../gnome-3/3.24/core/gsound/default.nix | 3 +- .../3.24/core/gtksourceview/default.nix | 3 +- .../3.24/core/gtksourceviewmm/default.nix | 3 +- .../gnome-3/3.24/core/gucharmap/default.nix | 3 +- .../gnome-3/3.24/core/libgee/default.nix | 3 +- .../gnome-3/3.24/core/libgepub/default.nix | 3 +- .../gnome-3/3.24/core/libgnomekbd/default.nix | 3 +- .../gnome-3/3.24/core/libgxps/default.nix | 3 +- .../gnome-3/3.24/core/libpeas/default.nix | 3 +- .../gnome-3/3.24/core/libzapojit/default.nix | 3 +- .../gnome-3/3.24/core/rest/default.nix | 3 +- .../gnome-3/3.24/core/sushi/default.nix | 3 +- .../3.24/core/totem-pl-parser/default.nix | 3 +- .../gnome-3/3.24/core/totem/default.nix | 3 +- .../gnome-3/3.24/core/tracker/default.nix | 3 +- pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix | 3 +- .../gnome-3/3.24/core/vte/default.nix | 3 +- .../gnome-3/3.24/core/yelp-tools/default.nix | 3 +- .../gnome-3/3.24/core/yelp-xsl/default.nix | 3 +- .../gnome-3/3.24/core/yelp/default.nix | 3 +- .../gnome-3/3.24/desktop/rarian/default.nix | 3 +- .../gnome-3/3.24/devtools/anjuta/default.nix | 3 +- .../gnome-3/3.24/devtools/gdl/default.nix | 3 +- .../gnome-3/3.24/games/aisleriot/default.nix | 3 +- .../3.24/games/gnome-sudoku/default.nix | 3 +- .../gnome-3/3.24/games/iagno/default.nix | 3 +- .../gnome-3/3.24/games/lightsoff/default.nix | 3 +- .../3.24/games/quadrapassel/default.nix | 3 +- .../gnome-3/3.24/games/swell-foop/default.nix | 3 +- .../gnome-3/3.24/games/tali/default.nix | 3 +- .../gnome-3/3.24/misc/california/default.nix | 3 +- .../gnome-3/3.24/misc/geary/default.nix | 3 +- .../gnome-3/3.24/misc/gexiv2/default.nix | 3 +- .../gnome-3/3.24/misc/gfbgraph/default.nix | 3 +- .../3.24/misc/gnome-tweak-tool/default.nix | 3 +- .../3.24/misc/gnome-video-effects/default.nix | 3 +- .../gnome-3/3.24/misc/gspell/default.nix | 3 +- .../gnome-3/3.24/misc/gtkhtml/default.nix | 3 +- .../3.24/misc/libgames-support/default.nix | 3 +- .../gnome-3/3.24/misc/libgda/default.nix | 3 +- .../3.24/misc/libgit2-glib/default.nix | 3 +- .../gnome-3/3.24/misc/libmediaart/default.nix | 3 +- pkgs/desktops/gnustep/back/default.nix | 3 +- pkgs/desktops/rox/rox-filer/default.nix | 3 +- pkgs/desktops/xfce/applications/gigolo.nix | 3 +- pkgs/desktops/xfce/applications/terminal.nix | 3 +- .../xfce/applications/xfce4-notifyd.nix | 3 +- .../xfce/applications/xfce4-taskmanager.nix | 3 +- pkgs/desktops/xfce/art/xfce4-icon-theme.nix | 3 +- pkgs/desktops/xfce/core/garcon.nix | 3 +- pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 3 +- pkgs/desktops/xfce/core/libxfce4util.nix | 3 +- pkgs/desktops/xfce/core/xfce4-dev-tools.nix | 3 +- pkgs/desktops/xfce/core/xfconf.nix | 3 +- .../panel-plugins/xfce4-battery-plugin.nix | 3 +- .../panel-plugins/xfce4-clipman-plugin.nix | 3 +- .../panel-plugins/xfce4-cpugraph-plugin.nix | 3 +- .../panel-plugins/xfce4-datetime-plugin.nix | 3 +- .../xfce/panel-plugins/xfce4-dict-plugin.nix | 3 +- .../panel-plugins/xfce4-dockbarx-plugin.nix | 3 +- .../xfce/panel-plugins/xfce4-embed-plugin.nix | 3 +- .../xfce/panel-plugins/xfce4-eyes-plugin.nix | 3 +- .../panel-plugins/xfce4-fsguard-plugin.nix | 3 +- .../panel-plugins/xfce4-genmon-plugin.nix | 3 +- .../panel-plugins/xfce4-mailwatch-plugin.nix | 3 +- .../xfce/panel-plugins/xfce4-mpc-plugin.nix | 3 +- .../panel-plugins/xfce4-namebar-plugin.nix | 3 +- .../panel-plugins/xfce4-netload-plugin.nix | 3 +- .../xfce/panel-plugins/xfce4-notes-plugin.nix | 3 +- .../panel-plugins/xfce4-systemload-plugin.nix | 3 +- .../xfce/panel-plugins/xfce4-verve-plugin.nix | 3 +- .../panel-plugins/xfce4-windowck-plugin.nix | 3 +- .../xfce/panel-plugins/xfce4-xkb-plugin.nix | 3 +- pkgs/development/compilers/dale/default.nix | 3 +- .../compilers/factor-lang/default.nix | 3 +- pkgs/development/compilers/fsharp/default.nix | 3 +- pkgs/development/compilers/rust/cargo.nix | 3 +- pkgs/development/compilers/yosys/default.nix | 3 +- .../coq-modules/dpdgraph/default.nix | 3 +- .../guile-modules/guile-cairo/default.nix | 3 +- .../guile-modules/guile-xcb/default.nix | 3 +- .../interpreters/erlang/generic-builder.nix | 3 +- .../interpreters/falcon/default.nix | 3 +- .../interpreters/gtk-server/default.nix | 3 +- .../interpreters/nix-exec/default.nix | 3 +- pkgs/development/interpreters/php/default.nix | 3 +- .../interpreters/pixie/default.nix | 3 +- .../interpreters/python/pypy/2.7/default.nix | 3 +- .../interpreters/spidermonkey/1.8.5.nix | 3 +- .../interpreters/spidermonkey/17.nix | 3 +- .../libraries/SDL_sixel/default.nix | 3 +- pkgs/development/libraries/Xaw3d/default.nix | 3 +- pkgs/development/libraries/afflib/default.nix | 3 +- pkgs/development/libraries/agg/default.nix | 3 +- .../libraries/at-spi2-atk/default.nix | 3 +- .../libraries/audio/jamomacore/default.nix | 3 +- .../libraries/audio/libbs2b/default.nix | 3 +- .../libraries/audio/libsmf/default.nix | 3 +- .../libraries/audio/lilv/default.nix | 3 +- .../libraries/audio/lv2/default.nix | 3 +- .../libraries/audio/lv2/unstable.nix | 3 +- .../libraries/audio/raul/default.nix | 3 +- .../libraries/audio/rtmidi/default.nix | 3 +- .../libraries/audio/sratom/default.nix | 3 +- .../libraries/audio/suil/default.nix | 3 +- .../libraries/audio/vamp/default.nix | 3 +- .../libraries/biblesync/default.nix | 3 +- pkgs/development/libraries/blitz/default.nix | 3 +- pkgs/development/libraries/ccrtp/1.8.nix | 3 +- pkgs/development/libraries/ctl/default.nix | 3 +- pkgs/development/libraries/ctpl/default.nix | 3 +- pkgs/development/libraries/cwiid/default.nix | 3 +- .../libraries/dbus-cplusplus/default.nix | 3 +- .../libraries/directfb/default.nix | 3 +- .../development/libraries/dotconf/default.nix | 3 +- .../development/libraries/enchant/default.nix | 3 +- pkgs/development/libraries/exosip/default.nix | 3 +- pkgs/development/libraries/fflas-ffpack/1.nix | 3 +- .../libraries/fflas-ffpack/default.nix | 3 +- .../development/libraries/fontconfig/2.10.nix | 3 +- .../libraries/fontconfig/default.nix | 3 +- pkgs/development/libraries/frei0r/default.nix | 3 +- pkgs/development/libraries/ganv/default.nix | 3 +- pkgs/development/libraries/gcab/default.nix | 3 +- .../libraries/gdata-sharp/default.nix | 3 +- pkgs/development/libraries/gdome2/default.nix | 3 +- .../development/libraries/geoclue/default.nix | 3 +- pkgs/development/libraries/givaro/3.7.nix | 3 +- pkgs/development/libraries/givaro/3.nix | 3 +- pkgs/development/libraries/givaro/default.nix | 3 +- .../libraries/globalplatform/default.nix | 3 +- .../globalplatform/gppcscconnectionplugin.nix | 3 +- pkgs/development/libraries/gnet/default.nix | 3 +- .../libraries/gnome-sharp/default.nix | 3 +- .../gobject-introspection/default.nix | 3 +- .../libraries/goocanvas/default.nix | 3 +- pkgs/development/libraries/grail/default.nix | 3 +- .../development/libraries/granite/default.nix | 3 +- .../gstreamer/legacy/gnonlin/default.nix | 3 +- .../gstreamer/legacy/gstreamer/default.nix | 3 +- .../libraries/gtkimageview/default.nix | 3 +- .../libraries/gtkmathview/default.nix | 3 +- .../libraries/gtkspell/default.nix | 3 +- pkgs/development/libraries/gts/default.nix | 3 +- pkgs/development/libraries/hidapi/default.nix | 3 +- .../libraries/ignition-transport/generic.nix | 3 +- pkgs/development/libraries/ilixi/default.nix | 3 +- .../libraries/java/classpath/default.nix | 3 +- .../libraries/java/jzmq/default.nix | 3 +- .../libraries/languagemachines/frog.nix | 3 +- .../libraries/languagemachines/frogdata.nix | 3 +- .../libraries/languagemachines/libfolia.nix | 3 +- .../libraries/languagemachines/mbt.nix | 3 +- .../libraries/languagemachines/ticcutils.nix | 3 +- .../libraries/languagemachines/timbl.nix | 3 +- .../languagemachines/timblserver.nix | 3 +- .../libraries/languagemachines/ucto.nix | 3 +- .../libraries/languagemachines/uctodata.nix | 3 +- pkgs/development/libraries/lasso/default.nix | 3 +- .../development/libraries/lensfun/default.nix | 3 +- pkgs/development/libraries/libabw/default.nix | 3 +- .../libraries/libaudclient/default.nix | 3 +- pkgs/development/libraries/libav/default.nix | 3 +- .../libraries/libbladeRF/default.nix | 3 +- .../libraries/libcangjie/default.nix | 3 +- pkgs/development/libraries/libcdio/0.82.nix | 3 +- .../development/libraries/libcdio/default.nix | 3 +- pkgs/development/libraries/libcec/default.nix | 3 +- .../libraries/libchamplain/default.nix | 3 +- .../development/libraries/libcmis/default.nix | 3 +- .../libraries/libebur128/default.nix | 3 +- pkgs/development/libraries/libee/default.nix | 3 +- .../libraries/libfakekey/default.nix | 3 +- pkgs/development/libraries/libfm/default.nix | 3 +- .../libraries/libfreefare/default.nix | 3 +- pkgs/development/libraries/libftdi/1.x.nix | 3 +- pkgs/development/libraries/libgig/default.nix | 3 +- .../libraries/libgringotts/default.nix | 3 +- .../libraries/libgudev/default.nix | 3 +- .../libraries/libinfinity/default.nix | 3 +- .../libraries/libiodbc/default.nix | 3 +- .../libraries/libjreen/default.nix | 3 +- .../libraries/liblogging/default.nix | 3 +- .../development/libraries/liblscp/default.nix | 3 +- .../development/libraries/libmbim/default.nix | 3 +- pkgs/development/libraries/libmcs/default.nix | 3 +- .../libraries/libmesode/default.nix | 3 +- .../libraries/libmicrohttpd/default.nix | 3 +- .../libraries/libmongo-client/default.nix | 3 +- .../libraries/libmusicbrainz/5.x.nix | 3 +- .../libnetfilter_cthelper/default.nix | 3 +- .../libnetfilter_cttimeout/default.nix | 3 +- .../libraries/libnetfilter_queue/default.nix | 3 +- pkgs/development/libraries/libnih/default.nix | 3 +- pkgs/development/libraries/libofx/default.nix | 3 +- pkgs/development/libraries/libotr/default.nix | 3 +- .../development/libraries/libpar2/default.nix | 3 +- .../libraries/libpseudo/default.nix | 3 +- pkgs/development/libraries/libpst/default.nix | 3 +- pkgs/development/libraries/libqmi/default.nix | 3 +- .../libraries/libqrencode/default.nix | 3 +- pkgs/development/libraries/librdf/default.nix | 3 +- .../development/libraries/librelp/default.nix | 3 +- pkgs/development/libraries/librep/default.nix | 3 +- .../libraries/librevisa/default.nix | 3 +- .../libraries/libsearpc/default.nix | 3 +- .../libraries/libserialport/default.nix | 3 +- pkgs/development/libraries/libsigcxx/1.2.nix | 3 +- .../libraries/libsndfile/default.nix | 3 +- .../libraries/libspatialite/default.nix | 3 +- .../libraries/libspotify/default.nix | 3 +- .../libraries/libstrophe/default.nix | 3 +- pkgs/development/libraries/libtar/default.nix | 3 +- .../libraries/libtermkey/default.nix | 3 +- .../libraries/libtiger/default.nix | 3 +- .../libtorrent-rasterbar/generic.nix | 3 +- pkgs/development/libraries/libtsm/default.nix | 3 +- .../libraries/libtxc_dxtn/default.nix | 3 +- .../libraries/libtxc_dxtn_s2tc/default.nix | 3 +- pkgs/development/libraries/libui/default.nix | 3 +- pkgs/development/libraries/libunique/3.x.nix | 3 +- .../libraries/libunique/default.nix | 3 +- .../libraries/libvdpau/default.nix | 3 +- .../libraries/libviper/default.nix | 3 +- .../libraries/libvisual/default.nix | 3 +- .../libraries/libvterm/default.nix | 3 +- pkgs/development/libraries/libwmf/default.nix | 3 +- pkgs/development/libraries/libwnck/3.x.nix | 3 +- .../development/libraries/libwnck/default.nix | 3 +- pkgs/development/libraries/libwps/default.nix | 3 +- .../libraries/libxkbcommon/default.nix | 3 +- pkgs/development/libraries/luaffi/default.nix | 3 +- .../libraries/mediastreamer/msopenh264.nix | 3 +- pkgs/development/libraries/mongoc/default.nix | 3 +- .../libraries/mono-zeroconf/default.nix | 3 +- pkgs/development/libraries/movit/default.nix | 3 +- pkgs/development/libraries/mps/default.nix | 3 +- pkgs/development/libraries/mygui/default.nix | 3 +- .../development/libraries/ndn-cxx/default.nix | 3 +- .../development/libraries/neardal/default.nix | 3 +- pkgs/development/libraries/neon/0.29.nix | 3 +- pkgs/development/libraries/neon/default.nix | 3 +- .../libraries/nss_wrapper/default.nix | 3 +- pkgs/development/libraries/opal/default.nix | 3 +- .../libraries/opencollada/default.nix | 3 +- pkgs/development/libraries/openct/default.nix | 3 +- .../development/libraries/openexr/default.nix | 3 +- .../libraries/openwsman/default.nix | 3 +- .../libraries/pangox-compat/default.nix | 3 +- pkgs/development/libraries/pcl/default.nix | 3 +- .../libraries/pkcs11helper/default.nix | 3 +- .../libraries/pocketsphinx/default.nix | 3 +- .../libraries/portaudio/default.nix | 3 +- .../libraries/protobuf/generic-v3.nix | 3 +- .../libraries/protobuf/generic.nix | 3 +- .../libraries/protobufc/generic.nix | 3 +- pkgs/development/libraries/ptlib/default.nix | 3 +- .../libraries/qt-5/5.9/qtmultimedia.nix | 3 +- .../development/libraries/rdkafka/default.nix | 3 +- .../development/libraries/rep-gtk/default.nix | 3 +- .../libraries/rubberband/default.nix | 3 +- pkgs/development/libraries/serd/default.nix | 3 +- .../libraries/shibboleth-sp/default.nix | 3 +- .../libraries/silgraphite/default.nix | 22 + .../libraries/silgraphite/graphite2.nix | 3 +- pkgs/development/libraries/snack/default.nix | 3 +- pkgs/development/libraries/sord/default.nix | 3 +- .../libraries/spatialite-tools/default.nix | 3 +- .../libraries/sphinxbase/default.nix | 3 +- .../startup-notification/default.nix | 3 +- .../development/libraries/subunit/default.nix | 3 +- .../development/libraries/svrcore/default.nix | 3 +- pkgs/development/libraries/sword/default.nix | 3 +- .../libraries/telepathy/glib/default.nix | 3 +- pkgs/development/libraries/tk/generic.nix | 3 +- .../libraries/uhttpmock/default.nix | 3 +- .../libraries/unibilium/default.nix | 3 +- .../libraries/usbredir/default.nix | 3 +- .../libraries/vaapi-vdpau/default.nix | 3 +- pkgs/development/libraries/vmmlib/default.nix | 3 +- .../libraries/vulkan-loader/default.nix | 3 +- pkgs/development/libraries/wt/default.nix | 3 +- .../libraries/xml-security-c/default.nix | 3 +- pkgs/development/libraries/xmlsec/default.nix | 3 +- .../libraries/zeitgeist/default.nix | 3 +- pkgs/development/libraries/zimg/default.nix | 3 +- .../mobile/adbfs-rootless/default.nix | 3 +- .../ocaml-modules/ctypes/default.nix | 3 +- .../ocaml-modules/fontconfig/default.nix | 3 +- .../ocaml-modules/gmetadom/default.nix | 3 +- .../ocaml-modules/lablgtk/2.14.0.nix | 3 +- .../ocaml-modules/lablgtk/default.nix | 3 +- .../ocaml-modules/lablgtkmathview/default.nix | 3 +- .../development/ocaml-modules/lwt/default.nix | 3 +- .../ocaml-modules/ocaml-cairo/default.nix | 3 +- .../ocaml-modules/ocaml-cairo2/default.nix | 3 +- .../ocaml-modules/ocamlnet/default.nix | 3 +- .../ocaml-modules/ocamlsdl/default.nix | 3 +- .../ocaml-modules/ocplib-simplex/default.nix | 3 +- .../ocaml-modules/sqlite3/default.nix | 3 +- .../ocaml-modules/tsdl/default.nix | 3 +- .../ocaml-modules/zarith/default.nix | 3 +- pkgs/development/pharo/vm/build-vm.nix | 3 +- pkgs/development/pure-modules/doc/default.nix | 3 +- pkgs/development/pure-modules/gen/default.nix | 3 +- .../pure-modules/pandoc/default.nix | 3 +- .../python-modules/Cython/default.nix | 3 +- .../python-modules/dbus/default.nix | 3 +- .../python-modules/graph-tool/2.x.x.nix | 3 +- .../python-modules/h5py/default.nix | 3 +- .../python-modules/pycairo/default.nix | 3 +- .../python-modules/pygobject/3.nix | 3 +- .../python-modules/pygobject/default.nix | 3 +- .../python-modules/pygtk/default.nix | 3 +- .../pygtksourceview/default.nix | 3 +- pkgs/development/python-modules/pyqt/4.x.nix | 3 +- .../ruby-modules/gem-config/default.nix | 36 +- .../tools/analysis/kcov/default.nix | 3 +- .../tools/analysis/radare/default.nix | 3 +- .../tools/analysis/radare2/default.nix | 3 +- .../tools/analysis/smatch/default.nix | 3 +- .../tools/analysis/sparse/default.nix | 3 +- .../build-managers/gnumake/4.2/default.nix | 3 +- .../tools/build-managers/nant/default.nix | 6 +- .../tools/build-managers/tup/default.nix | 3 +- .../documentation/gnome-doc-utils/default.nix | 3 +- .../tools/guile/g-wrap/default.nix | 3 +- pkgs/development/tools/libsigrok/default.nix | 3 +- .../tools/libsigrokdecode/default.nix | 3 +- pkgs/development/tools/mdk/default.nix | 3 +- .../tools/misc/avarice/default.nix | 3 +- .../tools/misc/babeltrace/default.nix | 3 +- .../development/tools/misc/d-feet/default.nix | 3 +- .../development/tools/misc/distcc/default.nix | 3 +- .../tools/misc/eggdbus/default.nix | 3 +- .../tools/misc/fswatch/default.nix | 3 +- pkgs/development/tools/misc/gob2/default.nix | 3 +- .../tools/misc/gpshell/default.nix | 3 +- .../tools/misc/gtkdialog/default.nix | 3 +- .../tools/misc/kconfig-frontends/default.nix | 3 +- pkgs/development/tools/misc/lttv/default.nix | 3 +- .../tools/misc/msitools/default.nix | 3 +- .../tools/misc/openocd/default.nix | 3 +- .../tools/misc/patchelf/unstable.nix | 3 +- .../tools/misc/sysbench/default.nix | 3 +- .../tools/misc/universal-ctags/default.nix | 3 +- .../tools/parsing/hammer/default.nix | 3 +- .../tools/profiling/oprofile/default.nix | 3 +- .../tools/profiling/sysprof/default.nix | 3 +- .../tools/profiling/systemtap/default.nix | 3 +- pkgs/development/tools/sigrok-cli/default.nix | 3 +- pkgs/development/tools/simavr/default.nix | 3 +- pkgs/development/tools/skopeo/default.nix | 3 +- .../development/tools/sunxi-tools/default.nix | 3 +- pkgs/development/web/valum/default.nix | 3 +- pkgs/games/alienarena/default.nix | 3 +- pkgs/games/blobby/default.nix | 3 +- pkgs/games/chocolate-doom/default.nix | 3 +- pkgs/games/crack-attack/default.nix | 3 +- pkgs/games/d1x-rebirth/default.nix | 3 +- pkgs/games/d2x-rebirth/default.nix | 3 +- pkgs/games/exult/default.nix | 3 +- pkgs/games/fish-fillets-ng/default.nix | 3 +- pkgs/games/freecell-solver/default.nix | 3 +- pkgs/games/fsg/default.nix | 3 +- pkgs/games/gnubg/default.nix | 3 +- pkgs/games/instead/default.nix | 3 +- pkgs/games/klavaro/default.nix | 3 +- pkgs/games/liberal-crime-squad/default.nix | 3 +- pkgs/games/macopix/default.nix | 3 +- pkgs/games/megaglest/default.nix | 3 +- pkgs/games/odamex/default.nix | 3 +- pkgs/games/opendungeons/default.nix | 3 +- pkgs/games/openmw/default.nix | 3 +- pkgs/games/pingus/default.nix | 3 +- pkgs/games/pioneers/default.nix | 3 +- pkgs/games/rftg/default.nix | 3 +- pkgs/games/rigsofrods/default.nix | 3 +- pkgs/games/rili/default.nix | 3 +- pkgs/games/simutrans/default.nix | 3 +- pkgs/games/stuntrally/default.nix | 3 +- pkgs/games/ultimatestunts/default.nix | 3 +- pkgs/games/uqm/default.nix | 3 +- pkgs/games/vdrift/default.nix | 3 +- pkgs/games/warsow/default.nix | 3 +- pkgs/misc/cups/default.nix | 3 +- .../misc/drivers/foomatic-filters/default.nix | 3 +- pkgs/misc/drivers/xboxdrv/default.nix | 3 +- pkgs/misc/drivers/xwiimote/default.nix | 3 +- pkgs/misc/emulators/dolphin-emu/default.nix | 3 +- pkgs/misc/emulators/dolphin-emu/master.nix | 3 +- pkgs/misc/emulators/dosbox/unstable.nix | 3 +- .../emulators/emulationstation/default.nix | 3 +- pkgs/misc/emulators/fs-uae/default.nix | 3 +- pkgs/misc/emulators/gens-gs/default.nix | 3 +- pkgs/misc/emulators/mednaffe/default.nix | 3 +- pkgs/misc/emulators/mupen64plus/default.nix | 3 +- pkgs/misc/emulators/retroarch/default.nix | 3 +- pkgs/misc/emulators/snes9x-gtk/default.nix | 3 +- pkgs/misc/emulators/stella/default.nix | 3 +- pkgs/misc/emulators/uae/default.nix | 3 +- pkgs/misc/my-env/default.nix | 3 +- pkgs/misc/sailsd/default.nix | 3 +- .../screensavers/light-locker/default.nix | 3 +- pkgs/misc/screensavers/rss-glx/default.nix | 3 +- pkgs/misc/screensavers/xss-lock/default.nix | 3 +- pkgs/misc/screensavers/xssproxy/default.nix | 3 +- .../misc/screensavers/xtrlock-pam/default.nix | 3 +- pkgs/misc/seafile-shared/default.nix | 3 +- pkgs/misc/solfege/default.nix | 3 +- .../gtk2/gtk-engine-murrine/default.nix | 3 +- pkgs/misc/themes/gtk2/gtk-engines/default.nix | 3 +- pkgs/os-specific/linux/afuse/default.nix | 3 +- pkgs/os-specific/linux/alsa-tools/default.nix | 3 +- .../linux/bridge-utils/default.nix | 3 +- pkgs/os-specific/linux/conky/default.nix | 3 +- pkgs/os-specific/linux/criu/default.nix | 3 +- pkgs/os-specific/linux/cryptsetup/default.nix | 3 +- pkgs/os-specific/linux/dpdk/default.nix | 3 +- pkgs/os-specific/linux/fbterm/default.nix | 3 +- .../linux/firmware/fwupdate/default.nix | 3 +- .../linux/google-authenticator/default.nix | 3 +- pkgs/os-specific/linux/hal-flash/default.nix | 3 +- .../linux/ima-evm-utils/default.nix | 3 +- pkgs/os-specific/linux/iw/default.nix | 3 +- pkgs/os-specific/linux/jool/cli.nix | 3 +- pkgs/os-specific/linux/kernel/perf.nix | 3 +- pkgs/os-specific/linux/latencytop/default.nix | 3 +- .../os-specific/linux/libatasmart/default.nix | 3 +- pkgs/os-specific/linux/libselinux/default.nix | 3 +- pkgs/os-specific/linux/libsmbios/default.nix | 3 +- .../os-specific/linux/miraclecast/default.nix | 3 +- .../os-specific/linux/openvswitch/default.nix | 3 +- pkgs/os-specific/linux/pam_mount/default.nix | 3 +- pkgs/os-specific/linux/rewritefs/default.nix | 3 +- pkgs/os-specific/linux/rtkit/default.nix | 3 +- .../os-specific/linux/udisks-glue/default.nix | 3 +- pkgs/os-specific/linux/usbutils/default.nix | 3 +- pkgs/os-specific/linux/usermount/default.nix | 3 +- pkgs/servers/apcupsd/default.nix | 3 +- pkgs/servers/brickd/default.nix | 3 +- pkgs/servers/computing/torque/default.nix | 3 +- pkgs/servers/dns/powerdns/default.nix | 3 +- pkgs/servers/fcgiwrap/default.nix | 3 +- .../mod_auth_mellon/default.nix | 3 +- .../http/apache-modules/mod_dnssd/default.nix | 3 +- pkgs/servers/http/lighttpd/default.nix | 3 +- pkgs/servers/http/redstore/default.nix | 3 +- pkgs/servers/mail/exim/default.nix | 3 +- pkgs/servers/mail/freepops/default.nix | 3 +- pkgs/servers/mail/postfix/pfixtools.nix | 3 +- pkgs/servers/monitoring/net-snmp/default.nix | 3 +- pkgs/servers/monitoring/zabbix/2.0.nix | 3 +- pkgs/servers/monitoring/zabbix/2.2.nix | 3 +- pkgs/servers/monitoring/zabbix/default.nix | 3 +- pkgs/servers/neard/default.nix | 3 +- pkgs/servers/openpts/default.nix | 3 +- pkgs/servers/rippled/default.nix | 3 +- pkgs/servers/shellinabox/default.nix | 3 +- pkgs/servers/sip/sipwitch/default.nix | 3 +- .../sql/postgresql/pgroonga/default.nix | 3 +- pkgs/servers/tvheadend/default.nix | 3 +- pkgs/servers/uhub/default.nix | 3 +- pkgs/servers/x11/xorg/default.nix | 564 ++++++++++++------ .../x11/xorg/generate-expr-from-tarballs.pl | 3 +- pkgs/servers/x11/xorg/overrides.nix | 6 +- pkgs/servers/x11/xorg/xcb-util-xrm.nix | 3 +- pkgs/tools/X11/dragon-drop/default.nix | 3 +- pkgs/tools/X11/hsetroot/default.nix | 3 +- pkgs/tools/X11/keynav/default.nix | 3 +- pkgs/tools/X11/vdpauinfo/default.nix | 3 +- pkgs/tools/X11/wmctrl/default.nix | 3 +- pkgs/tools/X11/xbindkeys-config/default.nix | 3 +- pkgs/tools/X11/xinput_calibrator/default.nix | 3 +- pkgs/tools/X11/xrestop/default.nix | 3 +- pkgs/tools/X11/xsettingsd/default.nix | 3 +- pkgs/tools/X11/xtrace/default.nix | 3 +- pkgs/tools/archivers/cromfs/default.nix | 3 +- pkgs/tools/archivers/runzip/default.nix | 3 +- pkgs/tools/archivers/xarchive/default.nix | 3 +- pkgs/tools/archivers/xarchiver/default.nix | 3 +- .../audio/acoustid-fingerprinter/default.nix | 3 +- pkgs/tools/audio/mpdris2/default.nix | 3 +- pkgs/tools/audio/pasystray/default.nix | 3 +- pkgs/tools/audio/volumeicon/default.nix | 3 +- pkgs/tools/backup/attic/default.nix | 3 +- pkgs/tools/backup/partimage/default.nix | 3 +- .../bluetooth/obex-data-server/default.nix | 3 +- pkgs/tools/cd-dvd/cdrdao/default.nix | 3 +- pkgs/tools/cd-dvd/vobsub2srt/default.nix | 3 +- .../filesystems/archivemount/default.nix | 3 +- .../filesystems/bcache-tools/default.nix | 3 +- .../filesystems/bcachefs-tools/default.nix | 3 +- pkgs/tools/filesystems/bindfs/default.nix | 3 +- pkgs/tools/filesystems/ciopfs/default.nix | 3 +- pkgs/tools/filesystems/curlftpfs/default.nix | 3 +- pkgs/tools/filesystems/djmount/default.nix | 3 +- pkgs/tools/filesystems/duperemove/default.nix | 3 +- pkgs/tools/filesystems/fuse-7z-ng/default.nix | 3 +- pkgs/tools/filesystems/fuseiso/default.nix | 3 +- pkgs/tools/filesystems/genimage/default.nix | 3 +- pkgs/tools/filesystems/gocrypfs/default.nix | 3 +- pkgs/tools/filesystems/hubicfuse/default.nix | 3 +- pkgs/tools/filesystems/jmtpfs/default.nix | 3 +- pkgs/tools/filesystems/mhddfs/default.nix | 3 +- pkgs/tools/filesystems/mtpfs/default.nix | 3 +- pkgs/tools/filesystems/netatalk/default.nix | 3 +- .../filesystems/nixpart/0.4/cryptsetup.nix | 3 +- pkgs/tools/filesystems/nixpart/0.4/lvm2.nix | 3 +- pkgs/tools/filesystems/relfs/default.nix | 3 +- pkgs/tools/filesystems/smbnetfs/default.nix | 3 +- pkgs/tools/filesystems/snapraid/default.nix | 3 +- pkgs/tools/filesystems/sshfs-fuse/default.nix | 3 +- pkgs/tools/filesystems/wdfs/default.nix | 3 +- pkgs/tools/filesystems/zkfuse/default.nix | 3 +- pkgs/tools/graphics/editres/default.nix | 3 +- pkgs/tools/graphics/exif/default.nix | 3 +- pkgs/tools/graphics/ggobi/default.nix | 3 +- pkgs/tools/graphics/leela/default.nix | 3 +- pkgs/tools/graphics/logstalgia/default.nix | 3 +- pkgs/tools/graphics/pdf2svg/default.nix | 3 +- pkgs/tools/graphics/pngnq/default.nix | 3 +- pkgs/tools/graphics/pngquant/default.nix | 3 +- pkgs/tools/graphics/unpaper/default.nix | 3 +- .../fcitx-engines/fcitx-anthy/default.nix | 3 +- .../fcitx-engines/fcitx-chewing/default.nix | 3 +- .../fcitx-cloudpinyin/default.nix | 3 +- .../fcitx-engines/fcitx-hangul/default.nix | 3 +- .../fcitx-engines/fcitx-libpinyin/default.nix | 3 +- .../fcitx-engines/fcitx-m17n/default.nix | 3 +- .../fcitx-engines/fcitx-unikey/default.nix | 3 +- .../inputmethods/fcitx/fcitx-configtool.nix | 3 +- .../ibus-table-others/default.nix | 3 +- pkgs/tools/inputmethods/nabi/default.nix | 3 +- pkgs/tools/misc/appdata-tools/default.nix | 3 +- pkgs/tools/misc/blink1-tool/default.nix | 3 +- pkgs/tools/misc/brltty/default.nix | 3 +- pkgs/tools/misc/colord-gtk/default.nix | 3 +- pkgs/tools/misc/colord/default.nix | 3 +- pkgs/tools/misc/cunit/default.nix | 3 +- .../tools/misc/desktop-file-utils/default.nix | 3 +- pkgs/tools/misc/duc/default.nix | 3 +- pkgs/tools/misc/gbdfed/default.nix | 3 +- pkgs/tools/misc/grub/default.nix | 3 +- pkgs/tools/misc/gsmartcontrol/default.nix | 3 +- pkgs/tools/misc/kalibrate-rtl/default.nix | 3 +- pkgs/tools/misc/ldapvi/default.nix | 3 +- .../misc/libbitcoin/libbitcoin-client.nix | 3 +- .../misc/libbitcoin/libbitcoin-explorer.nix | 3 +- pkgs/tools/misc/libbitcoin/libbitcoin.nix | 3 +- pkgs/tools/misc/mc/default.nix | 3 +- pkgs/tools/misc/mdbtools/default.nix | 3 +- pkgs/tools/misc/mpdscribble/default.nix | 3 +- pkgs/tools/misc/mprime/default.nix | 3 +- pkgs/tools/misc/pal/default.nix | 3 +- pkgs/tools/misc/qjoypad/default.nix | 3 +- pkgs/tools/misc/riemann-c-client/default.nix | 3 +- pkgs/tools/misc/rmlint/default.nix | 3 +- pkgs/tools/misc/toilet/default.nix | 3 +- pkgs/tools/misc/urjtag/default.nix | 3 +- pkgs/tools/misc/wv/default.nix | 3 +- pkgs/tools/misc/wv2/default.nix | 3 +- pkgs/tools/misc/xsel/default.nix | 3 +- pkgs/tools/misc/yubico-piv-tool/default.nix | 3 +- pkgs/tools/networking/aircrack-ng/default.nix | 3 +- .../networking/argus-clients/default.nix | 3 +- pkgs/tools/networking/argus/default.nix | 3 +- pkgs/tools/networking/ccnet/default.nix | 3 +- pkgs/tools/networking/connmanui/default.nix | 3 +- pkgs/tools/networking/davix/default.nix | 3 +- pkgs/tools/networking/dhcpcd/default.nix | 3 +- pkgs/tools/networking/gftp/default.nix | 3 +- pkgs/tools/networking/gupnp-tools/default.nix | 3 +- pkgs/tools/networking/hyenae/default.nix | 3 +- pkgs/tools/networking/isync/default.nix | 3 +- pkgs/tools/networking/jnettop/default.nix | 3 +- pkgs/tools/networking/libreswan/default.nix | 3 +- pkgs/tools/networking/maildrop/default.nix | 3 +- pkgs/tools/networking/mosh/default.nix | 3 +- pkgs/tools/networking/ndjbdns/default.nix | 3 +- .../networking/nss-pam-ldapd/default.nix | 3 +- .../tools/networking/openfortivpn/default.nix | 3 +- pkgs/tools/networking/openssh/default.nix | 3 +- .../networking/p2p/libtorrent/default.nix | 3 +- pkgs/tools/networking/samplicator/default.nix | 3 +- pkgs/tools/networking/tlspool/default.nix | 3 +- pkgs/tools/networking/tracebox/default.nix | 3 +- .../package-management/disnix/default.nix | 3 +- .../disnix/disnixos/default.nix | 3 +- .../package-management/nix-index/default.nix | 3 +- pkgs/tools/package-management/rpm/default.nix | 3 +- pkgs/tools/security/crackxls/default.nix | 3 +- pkgs/tools/security/ecryptfs/default.nix | 3 +- pkgs/tools/security/fpm2/default.nix | 3 +- pkgs/tools/security/gencfsm/default.nix | 3 +- pkgs/tools/security/mfcuk/default.nix | 3 +- pkgs/tools/security/mfoc/default.nix | 3 +- pkgs/tools/security/nmap/default.nix | 3 +- pkgs/tools/security/qdigidoc/default.nix | 3 +- pkgs/tools/security/qesteidutil/default.nix | 3 +- pkgs/tools/security/sbsigntool/default.nix | 3 +- pkgs/tools/security/tpm-luks/default.nix | 3 +- pkgs/tools/security/trousers/default.nix | 3 +- pkgs/tools/system/bootchart/default.nix | 3 +- pkgs/tools/system/chase/default.nix | 3 +- pkgs/tools/system/das_watchdog/default.nix | 3 +- pkgs/tools/system/fakechroot/default.nix | 3 +- pkgs/tools/system/gdmap/default.nix | 3 +- pkgs/tools/system/hardinfo/default.nix | 3 +- pkgs/tools/system/illum/default.nix | 3 +- pkgs/tools/system/lshw/default.nix | 3 +- pkgs/tools/system/netdata/default.nix | 3 +- pkgs/tools/system/pciutils/default.nix | 3 +- pkgs/tools/system/thermald/default.nix | 3 +- pkgs/tools/system/vboot_reference/default.nix | 3 +- pkgs/tools/system/wsmancli/default.nix | 3 +- pkgs/tools/text/ebook-tools/default.nix | 3 +- pkgs/tools/text/qshowdiff/default.nix | 3 +- pkgs/tools/text/silver-searcher/default.nix | 3 +- pkgs/tools/text/xml/xml2/default.nix | 3 +- pkgs/tools/text/xml/xmlstarlet/default.nix | 3 +- pkgs/tools/typesetting/tex/texlive/bin.nix | 12 +- pkgs/tools/video/mjpegtools/default.nix | 3 +- pkgs/tools/video/swfmill/default.nix | 3 +- pkgs/top-level/emacs-packages.nix | 3 +- pkgs/top-level/emscripten-packages.nix | 6 +- pkgs/top-level/lua-packages.nix | 6 +- pkgs/top-level/perl-packages.nix | 6 +- pkgs/top-level/php-packages.nix | 9 +- pkgs/top-level/python-packages.nix | 33 +- 932 files changed, 2320 insertions(+), 1149 deletions(-) create mode 100644 pkgs/development/libraries/silgraphite/default.nix diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index 9efab9a8bab..24b891d60eb 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec{ sha256 = "1iyh6dqrg0mirwci5br5n5qw3ghp2cs23wd8ygr56bh9ml4dr1m8"; }; - buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl db48 boost zlib utillinux protobuf ] ++ optionals withGui [ qt4 qmake4Hook qrencode ]; qmakeFlags = ["USE_UPNP=-"]; diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index e6ed05dd27f..b1e3dc2dd93 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec{ qmakeFlags = ["USE_UPNP=-"]; makeFlags = ["USE_UPNP=-"]; - buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl db48 boost zlib utillinux protobuf ] ++ optionals withGui [ qt4 qmake4Hook qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix index 9942f0898a2..4a4665291d6 100644 --- a/pkgs/applications/altcoins/stellar-core.nix +++ b/pkgs/applications/altcoins/stellar-core.nix @@ -16,7 +16,8 @@ in stdenv.mkDerivation { leaveDotGit = true; }; - buildInputs = [ autoconf automake libtool pkgconfig git ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool git ]; propagatedBuildInputs = [ bison flex postgresql ]; diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix index 456ed41931c..f453f76e9d2 100644 --- a/pkgs/applications/altcoins/zcash/default.nix +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gtest gmock gmp libsnark openssl wget db62 boost zlib protobuf libevent libsodium librustzcash ] ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index efb69d4c481..ad12609429f 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -12,7 +12,8 @@ in stdenv.mkDerivation rec { sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7"; }; - buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper alsaLib dbus libjack2 python dbus-python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 06e14370422..115df15d2a5 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { doCheck = false; - buildInputs = [ alsaLib minixml jack2Full pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib minixml jack2Full ]; meta = with stdenv.lib; { description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index fbbb9f90f8a..bc72c3e1314 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x"; }; - buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cairo fftw gtkmm2 lv2 lvtk python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 568195c1dba..9a9095d2fc1 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9"; }; - buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ]; meta = with stdenv.lib; { homepage = http://openavproductions.com/artyfx/; diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index b5897c71cd9..99d6357e921 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq"; }; - buildInputs = [ gtk2 libcddb intltool pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libcddb intltool makeWrapper ]; runtimeDeps = optional mp3Support lame ++ diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index ca3148f0e0a..32daf000dc5 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; }; - buildInputs = [ libjack2 gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 gtk2 ]; meta = with stdenv.lib; { homepage = http://devel.tlrmx.org/audio/bitmeter/; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 633ba3832c2..c0dd2e92178 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -116,7 +116,8 @@ stdenv.mkDerivation rec { "CONFIG_WAV=y" ] ++ concatMap (a: a.flags) opts); - buildInputs = [ ncurses pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.cc.isClang clangGCC ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] ++ concatMap (a: a.deps) opts; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 35079ea2738..3faeeb12d4c 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk"; }; - buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; installFlags = '' DESTDIR=$(out) diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 11a0576bf43..8d7db50fd32 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; - buildInputs = [ pkgconfig unzip portaudio wxGTK ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip portaudio wxGTK ]; # TODO: # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index b9e98281a7c..946a1bdb225 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -158,7 +158,8 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - buildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 274f7c9c3b8..a86770315cb 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -187,7 +187,8 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - buildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index bb37cac5500..a8bf05187e3 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreAudio -framework CoreServices"; - buildInputs = [ glib libsndfile pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libsndfile ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ]; diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index 22944ffefe4..58d095080fe 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q"; }; - buildInputs = [ gtkmm2 lv2 lvtk pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtkmm2 lv2 lvtk ]; buildPhase = '' cd lv2 diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index bdac87aaf37..367b1db139d 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; }; - buildInputs = [ lv2 pkgconfig python2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lv2 python2 ]; installPhase = '' python waf configure --prefix=$out diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 073d28ef870..28b2cd98e02 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq"; }; - buildInputs = [ libjack2 gtk2 lv2 faust pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 gtk2 lv2 faust ]; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index ab6dd0eee72..b1689318d81 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; }; patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - buildInputs = [ pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; }; src = fetchurl { diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 2b78d1a4b6d..1791b82a6a0 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation rec { name = "gnaural-1.0.20110606"; - buildInputs = [ pkgconfig gtk2 libsndfile portaudio ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libsndfile portaudio ]; src = fetchurl { url = "mirror://sourceforge/gnaural/Gnaural/${name}.tar.gz"; sha256 = "0p9rasz1jmxf16vnpj17g3vzdjygcyz3l6nmbq6wr402l61f1vy5"; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 1b1bf437ce9..7ebdce78352 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; - buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta gnome.gdl gnome.defaultIconTheme hicolor_icon_theme ]; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index d56ac753405..097c66609bd 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake ]; - buildInputs = [ alsaLib pkgconfig qtbase qtscript ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib qtbase qtscript ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index ec7f7a5c32d..f1e00e87673 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; }; - buildInputs = [ libjack2 libsndfile pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 libsndfile ]; buildPhase = "PREFIX=$out make jack_capture"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 5f796a29035..a75513ff059 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; }; - buildInputs = [ SDL libjack2 mesa pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL libjack2 mesa ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 1d1925779f0..d68e67d19dd 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - buildInputs = [ pkgconfig libjack2 ladspaH gtk2 alsaLib libxml2 librdf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ]; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index c709483a3b2..060b7f703a3 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; - buildInputs = [ libjack2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 ]; meta = { description = "Console jack loudness meter"; diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index c51795e756c..3a0da876acf 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; }; - buildInputs = [ scons pkgconfig libsamplerate libsndfile liblo libjack2 boost ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons libsamplerate libsndfile liblo libjack2 boost ]; NIX_CFLAGS_COMPILE = "-fpermissive"; buildPhase = '' diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 1b68caccf4e..a60b3db2fb8 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i"; }; - buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perlPackages.perl perlPackages.XMLParser ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fftw ladspaH libxml2 perlPackages.perl perlPackages.XMLParser ]; patchPhase = '' patchShebangs . diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 47b65ff2b5a..65df1b89430 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ pkgconfig intltool gtk2 alsaLib libglade ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 alsaLib libglade ]; configureFlags = "--disable-jack"; diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index ba1d88373ff..a8e33c23dc0 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -11,7 +11,8 @@ in stdenv.mkDerivation rec { sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; - buildInputs = [ makeWrapper pkgconfig MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; patchPhase = '' sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index a7c8098dd79..d3821c51fbc 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1rrz5sp04zjal6v34ldkl6fjj9xqidb8xm1iscjyljf6z4l516cx"; }; - buildInputs = [ glib lilv lv2 pkgconfig serd sord sratom ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib lilv lv2 serd sord sratom ]; installPhase = '' make install PREFIX=$out diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 9d3cdc2eea3..c7d0caec8bf 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4"; }; - buildInputs = [ fftwSinglePrec lv2 pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fftwSinglePrec lv2 python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index e412f31f316..f4245b0a51e 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -25,7 +25,8 @@ in stdenv.mkDerivation { inherit name; - buildInputs = [ pkgconfig lv2 mesa gtk2 cairo pango fftw ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lv2 mesa gtk2 cairo pango fftw ]; srcs = [ src robtkSrc ]; sourceRoot = name; diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix index 025d216910e..2e293ee4552 100644 --- a/pkgs/applications/audio/minimodem/default.nix +++ b/pkgs/applications/audio/minimodem/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g"; }; - buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; meta = { description = "General-purpose software audio FSK modem"; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 5f1d2bfa93d..946f621fa68 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; }; - buildInputs = [ ncurses pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index f4e5998c037..3b429290f7c 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx"; }; - buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile ladspaH liblrdf liblo libsigcxx ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index b361e6c33ae..6b50ee1426c 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; - buildInputs = [ scons boost ladspaH pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons boost ladspaH ]; patchPhase = '' # remove TERM: diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index da0f7484888..5d13aa7daf4 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -8,7 +8,8 @@ in stdenv.mkDerivation rec { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz"; sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; }; - buildInputs = [ SDL2 pkgconfig flac libsndfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL2 flac libsndfile ]; makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ] ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0"; installFlags = "PREFIX=\${out}"; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index 556582c34f7..5529998803c 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1xyhvhm85d9z0kw716cjllrrzksn4s4bw34layg8hf4m5m31sp2p"; }; - buildInputs = [ boost ladspaH lilv lv2 pkgconfig serd sord sratom ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost ladspaH lilv lv2 serd sord sratom ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 52f2a0ff924..2bb2960afbf 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { cp praat $out/bin ''; - buildInputs = [ alsaLib gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib gtk2 ]; meta = { description = "Doing phonetics by computer"; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index badac0887a1..1e76e769937 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2"; }; - buildInputs = [ pkgconfig qt4 alsaLib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 alsaLib ]; meta = with stdenv.lib; { description = "MIDI event processor and router"; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 692938884b6..1211570f9bc 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx"; }; - buildInputs = [ autoconf automake liblscp libtool pkgconfig qt4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake liblscp libtool qt4 ]; preConfigure = "make -f Makefile.svn"; diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 40ff47b9ee1..3ebdce2b482 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; }; - buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with xorg; [ automake lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; meta = { description = "Rakarrak effects ported to LV2"; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 8ac7a9115ca..a60c3bef0da 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { srcs = [ src robtkSrc ]; sourceRoot = src.name; - buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lv2 pango cairo libjack2 mesa ]; postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; sisco_VERSION = version; diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index 979f15d4006..cf0b5db81f6 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp"; }; - buildInputs = [ boost cairomm cmake libsndfile lv2 ntk pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ]; installPhase = '' make install diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index ba550580cba..cbcdc0ecccd 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz"; }; - buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes makeWrapper (stdenv.lib.getLib gnome3.dconf) gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index c6609814ea0..7daae31a468 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; - buildInputs = [ autoreconfHook boost boost.dev ecasound mesa help2man pkgconfig libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ boost boost.dev ecasound mesa help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 # 2) Make it find ecasound headers diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 83848671a3e..86eefc39556 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { url = "http://sed.free.fr/spectrojack/${name}.tar.gz"; sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx"; }; - buildInputs = [ pkgconfig libjack2 fftwFloat gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 fftwFloat gtk2 ]; configurePhase= '' sed -i 's/.*home.*/#&/' ./Makefile substituteInPlace ./Makefile \ diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 32aac686043..8af7888f74b 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv"; }; - buildInputs = [ autoconf automake intltool pkgconfig ffmpeg wxGTK ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake intltool ffmpeg wxGTK ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 2df1e1e3b3b..ef1f766a65d 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1"; }; - buildInputs = [ pkgconfig glib libogg libvorbis ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libogg libvorbis ]; meta = with stdenv.lib; { homepage = http://streamripper.sourceforge.net/; diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index faa895e2e30..26ea4614920 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile ''; - buildInputs = [ fftwSinglePrec lv2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fftwSinglePrec lv2 ]; installPhase = "make install-system"; diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 55e95c0fc15..8837566b13d 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0w5alysixnvlkfl79wf7vs5wsw2vgxl3gqxxcm0zbmhjdpmjpcal"; }; - buildInputs = [ autoconf automake pkgconfig gtk2 libjack2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake gtk2 libjack2 libsndfile ]; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 0a07e97270c..de39c8ecc1c 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -8,7 +8,8 @@ in stdenv.mkDerivation rec { url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; }; - buildInputs = [ which libao pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which libao ]; meta = with stdenv.lib; { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 25292a4408f..0270fb24d9e 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1z9yx2pz84lyng1ig9y4z6pdalwxb80ig7nnzhqfy3pl36hq6shi"; }; - buildInputs = [ autoreconfHook mpd_clientlib ncurses pcre pkgconfig taglib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ mpd_clientlib ncurses pcre taglib ]; postInstall = '' mkdir -p $out/etc diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 1f85f442354..6b9af119859 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { done ''; - buildInputs = [ libogg libvorbis libao pkgconfig curl speex flac ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libogg libvorbis libao curl speex flac ]; meta = with stdenv.lib; { description = "Extra tools for Ogg-Vorbis audio codec"; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 75368c6633b..2b509d8db60 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg"; }; - buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver]; makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ]; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 10b5bc0c117..9aa24738c37 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n"; }; - buildInputs = [ pkgconfig alsaLib libxmp ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib libxmp ]; } diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 672237a8462..c3e8efae7fe 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq"; }; - buildInputs = [ cmake pkgconfig mpd_clientlib openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake mpd_clientlib openssl ]; meta = { homepage = http://www.ympd.org; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index ecb7d9bceec..6067c5b1c75 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1hyly5inis59cvh0r7lyi203h8v5jh84ca9jpaljm53cvw6d93px"; }; - buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 pkgconfig rubberband libsndfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 rubberband libsndfile ]; patchPhase = '' patchShebangs ./dpf/utils/generate-ttl.sh diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 235d4d16a40..9dd7eb2a299 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig lightdm intltool makeWrapper ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lightdm intltool makeWrapper ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index b4fb8d1937d..634c654d58f 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5"; }; - buildInputs = [ emacs w3m texinfo autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ emacs w3m texinfo ]; # XXX: Should we do the same for xpdf/evince, gv, gs, etc.? patchPhase = '' diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 28106cf876b..0c8a8e787fb 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1i58jxbiy95ijf81g8c3gwxhcg3irzssna3wv7vhrd57g4lcfj0w"; }; - buildInputs = [ qt4 qmake4Hook pkgconfig hunspell ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 qmake4Hook hunspell ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 32998700c23..de1e5e4c64b 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; }; - buildInputs = [ pkgconfig gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] ++ stdenv.lib.optional gnomeSupport gnome_vfs; configureFlags = '' diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 055816a798d..dd3fb542da7 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - buildInputs = [ intltool pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index a9f236a57ae..a6d624d4b1e 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; }; - buildInputs = [mono gtk-sharp-2_0 pkgconfig makeWrapper gnome2.libglade gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ]; installPhase = '' mkdir -p $out/bin $out/lib/supertux-editor diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix index 876bd145b72..273ef33250f 100644 --- a/pkgs/applications/editors/vanubi/default.nix +++ b/pkgs/applications/editors/vanubi/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq"; }; - buildInputs = [ pkgconfig vala_0_26 which autoconf automake + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vala_0_26 which autoconf automake libtool glib gtk3 libwnck3 asciidoc gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index fc2e8aa03de..73bdb8bcbf3 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7"; }; - buildInputs = [ pkgconfig ncurses boehmgc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses boehmgc ]; nativeBuildInputs = [ perl ] # `help2man' wants to run Zile, which won't work when the # newly-produced binary can't be run at build-time. diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 790997e328b..3728ff353cc 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf"; }; - buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index f1573087474..3386d75e81e 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl" ''; - buildInputs = [ openexr fltk pkgconfig mesa openexr_ctl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openexr fltk mesa openexr_ctl ]; meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index d49110d0069..097062a8258 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; - buildInputs = [ stdenv pkgconfig openexr libpng12 libjpeg ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv openexr libpng12 libjpeg ]; meta = with stdenv.lib; { description = "Collection of utilities for manipulating OpenEXR images"; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index b9cf229e8c8..3747b802e23 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { [ ./gcolor2-amd64.patch ] else [ ]; -buildInputs = [ gtk2 perl perlXMLParser pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; +buildInputs = [ gtk2 perl perlXMLParser ]; meta = { description = "Simple GTK+2 color selector"; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 6c892f1bfd4..af57115947e 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { installPhase = "scons install"; - buildInputs = [ gdk_pixbuf pkgconfig gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff json_glib ]; meta = { diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index 7e11c9dea3a..86867cd1cca 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { platforms = platforms.unix; }; - buildInputs = [ intltool pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 ]; } diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 801e9c5f502..a892f98ac47 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; - buildInputs = [pkgconfig gtk2 libpng]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libpng]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index ee9df683c0a..fd17ef69c99 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q"; }; - buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ]; preBuild = "cd src"; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 5d0bbcad54f..8817071e984 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -63,7 +63,8 @@ stdenv.mkDerivation rec { qmake PREFIX="$out" ./qtikz.pro ''; - buildInputs = [ gettext qt5.full poppler_qt5 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext qt5.full poppler_qt5 ]; enableParallelBuilding = true; } diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 0ca997adb78..33785a279c7 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure ''; - buildInputs = [ libpng pkgconfig nasm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng nasm ]; meta = { description = "Mozilla JPEG Encoder Project"; diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 9d147a635f3..f1a58d4e21b 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation (rec { sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"; }; - buildInputs = [ pkgconfig gtk2 imlib2 file lcms2 libexif ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 imlib2 file lcms2 libexif ]; preBuild='' substituteInPlace Makefile --replace /usr/local "$out" diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix index 71e41faaaef..fb73feb4a09 100644 --- a/pkgs/applications/graphics/rawtherapee/dev.nix +++ b/pkgs/applications/graphics/rawtherapee/dev.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz"; }; - buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ]; NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result"; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index de07a4f1a89..ad02e1a8023 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] ++ (if libusb != null then [libusb] else []) ++ stdenv.lib.optional gimpSupport gimp_2_8; diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index 99931442945..763b84d797e 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph"; }; - buildInputs = [ gtk2 pkgconfig texinfo ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 texinfo ]; patches = [ ./fix-linker-paths.patch ]; postPatch = '' substituteInPlace config.mk \ diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index e06b76e35b1..1af16536836 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj"; }; - buildInputs = [ SDL SDL_image pkgconfig libjpeg libpng libtiff ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL SDL_image libjpeg libpng libtiff ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index 3294d18e70b..cfd4d6b32de 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; }; - buildInputs = [ dbus_glib gtk2 pkgconfig wordnet ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus_glib gtk2 wordnet ]; meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 05c058f8a83..e48b32a783d 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { inherit sha256 rev; }; - buildInputs = [ autoreconfHook glib pkgconfig libxml2 exiv2 imagemagick ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib libxml2 exiv2 imagemagick ]; installPhase = '' mkdir $out/{bin,share} -p diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 06ebaa7c12d..d9ea487a83b 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; }; - buildInputs = [ intltool pkgconfig gtk2 xdotool hicolor_icon_theme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ]; meta = with stdenv.lib; { description = "Lightweight GTK+ Clipboard Manager"; diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix index c7a76ef00a6..28f14cc1435 100644 --- a/pkgs/applications/misc/cmatrix/default.nix +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0k06fw2n8nzp1pcdynhajp5prba03gfgsbj91bknyjr5xb5fd9hz"; }; - buildInputs = [ pkgconfig ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ]; meta = { description = "Simulates the falling characters theme from The Matrix movie"; diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index 1e024a16e81..0ee52b740f2 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" ''; - buildInputs = [ unzip gtk3 pkgconfig vala cmake vte gee wnck gettext libsecret json_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip gtk3 vala cmake vte gee wnck gettext libsecret json_glib ]; meta = { description = "The default terminal emulation for Deepin"; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 4b81bfd53f5..1e5bf8a48ed 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f"; }; - buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl libX11 libjpeg libpng libtiff librsvg glib gtk2 libXxf86vm libXext poppler xineLib ]; # The program tries to dlopen both Xxf86vm and Xext, so we use the diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix index 6344f40a291..98b47990314 100644 --- a/pkgs/applications/misc/eterm/default.nix +++ b/pkgs/applications/misc/eterm/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj"; }; - buildInputs = [ libX11 libXext libXaw pkgconfig imlib2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXaw imlib2 ]; propagatedBuildInputs = [ libast ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 10605b8b18d..73911bab6f6 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "evtest-1.33"; - buildInputs = [ autoreconfHook pkgconfig libxml2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libxml2 ]; src = fetchgit { url = "git://anongit.freedesktop.org/evtest"; diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index 548679e4b47..db78f2ec920 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { }; patches = [ ./use-nix-profiles.patch ]; - buildInputs = [ pkgconfig gtk2 keybinder ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 keybinder ]; preConfigure = '' export PREFIX=$out diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 30169588501..4e786bfb36f 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec{ sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; }; - buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index db954a25463..b97b079ab66 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; }; sourceRoot = "GarminPlugin-0.3.26/src"; - buildInputs = [ garmintools libusb libgcrypt pkgconfig tinyxml zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ garmintools libusb libgcrypt tinyxml zlib ]; configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-garmintools-incdir=${garmintools}/include" diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index cef8640d958..b6bb3c2fd83 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)' ''; - buildInputs = [ pkgconfig gtk gettext libintlOrEmpty ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk gettext libintlOrEmpty ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 3be2704896e..053da375ab1 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; }; - buildInputs = [ glib gtk2 pkgconfig popt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 popt ]; doCheck = true; diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 623cb12f932..00421a2e033 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj"; }; - buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ poppler gdk_pixbuf SDL gtk2 ]; patches = [ ./gdk-libs.patch diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 85d95c7b3f9..cb407fca66c 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl"; }; - buildInputs = [ gtk2 glib pkgconfig libgnome libgnomeui vte curl cdparanoia + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 glib libgnome libgnomeui vte curl cdparanoia libid3tag ncurses libtool ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index 9115fe026da..7f3b3a8d6dc 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig automake autoconf gtk3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf gtk3 ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index ea3f4b8f2b9..347d76860ef 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw"; }; - buildInputs = [ stdenv pkgconfig gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv gtk ]; preferLocalBuild = true; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index 08ae34f9705..a61d532f1f8 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; - buildInputs = [ intltool gnome3.gtk pkgconfig texinfo ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gnome3.gtk texinfo ]; meta = { description = "A GTK enabled dropin replacement for xmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 2fa4ba9ae64..3729978dddb 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { inherit (stuff) src version; - buildInputs = [ pkgconfig autoconf automake intltool gettext gtk vte ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake intltool gettext gtk vte ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 5450f5f2fc8..4972aa28e58 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w"; }; - buildInputs = [ libusb1 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 9ab12367903..e8c6c9f2430 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -20,7 +20,8 @@ in stdenv.mkDerivation rec { sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka"; }; - buildInputs = [ cmake pkgconfig gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix index 55cd17c2c0b..1b800f65434 100644 --- a/pkgs/applications/misc/netsurf/browser/default.nix +++ b/pkgs/applications/misc/netsurf/browser/default.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { sha256 = "1k0x8mzgavfy7q9kywl6kzsc084g1xlymcnsxi5v6jp279nsdwwq"; }; - buildInputs = [ pkgconfig libpng openssl curl gtk2 check libxml2 libidn perl + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng openssl curl gtk2 check libxml2 libidn perl nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper SDL buildsystem nsgenbind diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix index 536dbbe80d3..02bb593ce71 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0qp4p1q1dwgdra4pkrzd081zjzisxkgwx650ijx323j8bj725daf"; }; - buildInputs = [ pkgconfig perl + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl buildsystem libwapcaplet libparserutils diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix index 71445fd17a0..50a6dadadb5 100644 --- a/pkgs/applications/misc/netsurf/libdom/default.nix +++ b/pkgs/applications/misc/netsurf/libdom/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1kk6qbqagx5ypiy9kf0059iqdzyz8fqaw336vzhb5gnrzjw3wv4a"; }; - buildInputs = [ pkgconfig expat + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ expat buildsystem libparserutils libwapcaplet diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix index 3e9210589ea..71519687151 100644 --- a/pkgs/applications/misc/netsurf/libhubbub/default.nix +++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "101781iw32p47386fxqr01nrkywi12w17ajh02k2vlga4z8zyv86"; }; - buildInputs = [ pkgconfig perl + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl buildsystem libparserutils ]; diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix index 040f1c55883..7e99f8f5b86 100644 --- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix +++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0gmvzw1whh7553d6s98vr4ri2whjwrgggcq1z5b160gwjw20mzyy"; }; - buildInputs = [ pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ buildsystem ]; diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix index c627a769bbb..24235f43a11 100644 --- a/pkgs/applications/misc/netsurf/libnsfb/default.nix +++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "176f8why9gzbaca9nnxjqasl02qzc6g507z5w3dzkcjifnkz4mzl"; }; - buildInputs = [ pkgconfig buildsystem SDL ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ buildsystem SDL ]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix index a834d77c8eb..836bfd5f3e0 100644 --- a/pkgs/applications/misc/netsurf/libnsgif/default.nix +++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1a4z45gh0fw4iybf34fig725av25h31ffk0azi0snzh4130cklnk"; }; - buildInputs = [ buildsystem pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ buildsystem]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix index a18f91ba264..1e8dbe27137 100644 --- a/pkgs/applications/misc/netsurf/libnsutils/default.nix +++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "03p4xmd08yhj70nyj7acjccmmshs59lv4n4zsqpsn5lgkwa23lzy"; }; - buildInputs = [ buildsystem pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ buildsystem]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix index 63052e080a5..a905f3a12a8 100644 --- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix +++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0xf659y3c6ikjnip47r30wv796a34d71p6qhc4xjs64iqszm1sbq"; }; - buildInputs = [ buildsystem pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ buildsystem]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 000af950bf1..8ff9a2f44d5 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l"; }; - buildInputs = [ pkgconfig glib gtk2 menu-cache ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 menu-cache ]; patches = [ ./with-svg.patch ]; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 056649ad3d2..3420d6365b4 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1m6fp9lf9ki9444h0dq6bj0vr7d0pcxkbjv3j2v76p0ksk2l8kw3"; }; - buildInputs = [ pkgconfig cmake gtk2 wxGTK30 libpulseaudio curl gettext + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake gtk2 wxGTK30 libpulseaudio curl gettext glib portaudio ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 65366607c50..6ab54b447ae 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; }; - buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libXft intltool automake autoconf libtool ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 86dbfc0c5fe..6d0a348b1f7 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j"; }; - buildInputs = [ autoreconfHook gettext texinfo ncurses readline ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ gettext texinfo ncurses readline ]; configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ]; diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 0cd0d29e2f3..1347840ee67 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ cmake unzip pkgconfig libXpm fltk13 freeimage ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake unzip libXpm fltk13 freeimage ]; unpackPhase = '' unzip $src -d posterazor diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 3c4cf27308b..c5f4095e59a 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sed -i 's/~root/~nobody/g' test/helper-expand.c ''; - buildInputs = [ autoreconfHook pkgconfig libxkbcommon pango cairo git + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libxkbcommon pango cairo git libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; doCheck = true; diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix index fb6e9e86e59..652dd9d5e65 100644 --- a/pkgs/applications/misc/rtl-sdr/default.nix +++ b/pkgs/applications/misc/rtl-sdr/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1dh52xcvxkjb3mj80wlm20grz8cqf5wipx2ksi91ascz12b5pym6"; }; - buildInputs = [ cmake pkgconfig libusb1 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libusb1 ]; # TODO: get these fixes upstream: # * Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix index e8914b75b8a..8e63cdb6d16 100644 --- a/pkgs/applications/misc/rxvt/default.nix +++ b/pkgs/applications/misc/rxvt/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1"; }; - buildInputs = [ pkgconfig libtool libX11 libXt libXpm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libtool libX11 libXt libXpm ]; configurePhase = '' LIBTOOL=${libtool}/bin/libtool ./configure --prefix=$out --enable-everything --enable-smart-resize --enable-256-color diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 1ed6e4d70c9..c093a751603 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj"; }; - buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ yacc ncurses libxml2 libzip libxls ]; buildPhase = '' cd src diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index f808ec611a3..a538e53276b 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { then [ ./sdcv.cpp.patch-darwin ./utils.hpp.patch ] else [ ./sdcv.cpp.patch ] ); - buildInputs = [ pkgconfig glib gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gettext ]; preBuild = '' sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 16d6ca2e26f..f44ed8a1a3e 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -17,7 +17,8 @@ in stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix index ab890c8db71..69794b1cffb 100644 --- a/pkgs/applications/misc/st/wayland.nix +++ b/pkgs/applications/misc/st/wayland.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ pkgconfig ncurses wayland wld libxkbcommon fontconfig pixman ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses wayland wld libxkbcommon fontconfig pixman ]; NIX_LDFLAGS = "-lfontconfig"; diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix index 05e34cc5c30..877990861fd 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/pkgs/applications/misc/st/xst.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation { sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc"; }; - buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index f9d1039a292..f16a0d29c40 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -15,7 +15,8 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildInputs = [ pkgconfig libappindicator-gtk3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libappindicator-gtk3 ]; meta = with stdenv.lib; { description = "Simple application tray for syncthing"; diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 584b8f6a296..bde30d9041a 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516"; }; - buildInputs = [ pkgconfig gettext gtk2 gconf curl libexif sqlite libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ]; # bogus includes fail with newer library version postPatch = '' diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 837d736d10d..c54b6cff133 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -17,7 +17,8 @@ let makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - buildInputs = [ pkgconfig vte gtk3 ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vte gtk3 ncurses ]; outputs = [ "out" "terminfo" ]; diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index a64ab0ea2ca..7378950b189 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki"; }; - buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gettext confuse vte gtk makeWrapper ]; LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index 357713df384..ba6e97d61fb 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q"; }; - buildInputs = [ itstool intltool pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ itstool intltool libxml2 gnome2.GConf atk gtk2 mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0 makeWrapper ]; diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 4787516cedd..9df2a2dde76 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -85,7 +85,8 @@ stdenv.mkDerivation { sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8"; }; - buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse devicemapper wxGTK nasm ]; meta = { description = "Free Open-Source filesystem on-the-fly encryption"; diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 9a4b795061b..3cc4fcc1517 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation { url = https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz; sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd"; }; - buildInputs = [ intltool glib pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib udev ]; configurePhase = '' substituteInPlace src/Makefile.in --replace "-o root -g root" "" # do not set setuid bit in nix store diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index f745bf3ad60..0a651906cd8 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42"; }; - buildInputs = [ ncurses autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ncurses ]; preAutoreconf = '' touch NEWS diff --git a/pkgs/applications/misc/valauncher/default.nix b/pkgs/applications/misc/valauncher/default.nix index 7d35f1f64a8..e0768a791ba 100644 --- a/pkgs/applications/misc/valauncher/default.nix +++ b/pkgs/applications/misc/valauncher/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1d1gfmzmr5ra2rnjc6rbz31mf3hk7q04lh4i1hljgk7fh90dacb6"; }; - buildInputs = [ cmake gtk3 vala_0_26 pkgconfig gnome3.libgee ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake gtk3 vala_0_26 gnome3.libgee ]; meta = with stdenv.lib; { description = "A fast dmenu-like gtk3 application launcher"; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 1e7c7f654b5..7f4adeb2be8 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz"; }; - buildInputs = [ makeWrapper pkgconfig intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite ]; diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 8e1514583a2..e06242f7a02 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ pkgconfig qt4 qmake4Hook ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 qmake4Hook ]; meta = with stdenv.lib; { description = "A mind-mapping software"; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 32daf108c1c..bb18da4d4ad 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; }; - buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext ] ++ stdenv.lib.optionals gtkSupport [ gtk2 ] ++ stdenv.lib.optionals qtSupport [ qt4 ]; patchPhase = '' diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index ad642ecec5e..bf1fdbb9a8a 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd"; }; - buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 15d054c2be2..7d22a160574 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p"; }; - buildInputs = [libX11 makeWrapper pkgconfig libXaw]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libX11 makeWrapper libXaw]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index ecd6ab8c2ad..54d61a047a7 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f"; }; - buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ]; diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index dd3903cde27..bd891ff8493 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; # TODO zaptel ? postgres ? - buildInputs = [ qt4 openssl autoconf automake pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 openssl autoconf automake ]; # /dev/null is used when linking which is a impure path for the wrapper preConfigure = diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 2e644453dcb..34508da0e37 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8"; }; - buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ djvulibre gettext zathura_core gtk girara ]; patches = [ ./gtkflags.patch ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 23a654b4d51..c9472f35667 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr"; }; - buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ]; makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 4912489d6b3..2dda88f409b 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi"; }; - buildInputs = [ pkgconfig poppler zathura_core girara ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ poppler zathura_core girara ]; makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 89d8d5badb0..a415cde3c7e 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9"; }; - buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libspectre gettext zathura_core gtk girara ]; patches = [ ./gtkflags.patch ]; diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 0aacbd2565b..137b463a1e1 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1wg7pslcx7z4fw595a3nbnygxy2bwfj0h377i48mxhddvl3wzzbq"; }; - buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper gsettings_desktop_schemas libsoup webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ]; # There are Xlib and gtk warnings therefore I have set Wno-error diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index 7383e0ec044..e013f54a39e 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1dsbyz489fx7dp07i29q1rjkl7nhrfscc8ks8an2rdyhx3457asg"; }; - buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ girara gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix index 1a0752c33c6..48d06d644dd 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { cd src ''; - buildInputs = [ gtk2 openssl pcsclite pkgconfig opensc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 openssl pcsclite opensc ]; buildPhase = '' sed -i "s|opensc-pkcs11.so|${opensc}/lib/pkcs11/opensc-pkcs11.so|" Makefile diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 81a05b36016..30bae8792c2 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649"; }; - buildInputs = [ pkgconfig openssl libX11 gtk2 glib gettext intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl libX11 gtk2 glib gettext intltool ]; patches = [ ./translation-xgettext-to-intltool.patch ./plugin-linkfix.patch diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 07e152e91db..a5bfda9f26c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { '' else ""); - buildInputs = [ pkgconfig browser (browser.gtk) libXpm gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ browser (browser.gtk) libXpm gettext ]; installPhase = '' mkdir -p $out/lib/mozilla/plugins diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index b3382ef0512..008c3596483 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { export configureFlags="$configureFlags --target-cpu=$(uname -m)" ''; - buildInputs = [which pkgconfig file glib gtk2 gtk3 curl libXt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [which file glib gtk2 gtk3 curl libXt]; preferLocalBuild = true; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 28a4de16ea0..c654723f4c2 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f"; }; - buildInputs = [ makeWrapper gtk2 libsoup pkgconfig webkit gsettings_desktop_schemas ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings_desktop_schemas ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 162ad8533bd..abb7013d106 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr"; }; - buildInputs = [ makeWrapper gtk2 libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings_desktop_schemas ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index e7641eb773d..f65e2fe1851 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { }) ] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ]; - buildInputs = [ pkgconfig ncurses boehmgc gettext zlib ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses boehmgc gettext zlib ] ++ optional sslSupport openssl ++ optional mouseSupport gpm-ncurses ++ optional graphicsSupport imlib2 diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index a73ec99cb9f..5d47302960f 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -15,7 +15,8 @@ buildGoPackage rec { sha256 = "1p7s340wlcjvna3xa2x13nsnixfhbn5b7dhf9cqvxds2slizlm3p"; }; - buildInputs = [ libvirt pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt ]; meta = with stdenv.lib; { homepage = https://github.com/dhiltgen/docker-machine-kvm; diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 18c55c80fc0..d3141675b41 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1ai6vi5227z2ryxl403693xi63b42ylyfmzh8hbv4shp69zszm9c"; }; - buildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python ]; phases = "unpackPhase installPhase"; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index f5406d9fe62..c2d17fd3308 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; sha256 = "0yi80gi2vb600n7wi6mk81zfdi1n5pg1dsz7458sb3z5cv5gj8yg"; }; - buildInputs = [zlib openssl libre librem pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [zlib openssl libre librem cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid ccache libvpx diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 61e7203a83c..fd05948864c 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1m91x3208z9zxppz998i6060alcalfly9ix9jxismj45xyp6mdx7"; }; - buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib libgcrypt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bitlbee autoconf automake libtool glib libgcrypt ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 904002c3b44..d5595fc85af 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn"; }; - buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon ]; configureFlags = "CPPFLAGS=-DQT_NO_DEBUG"; diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index dcffa2f14f4..607fdbc7e3e 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04"; }; - buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ]; configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 8bf94009335..60fd5af0a1a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ]; - buildInputs = [ libxml2 pidgin pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 pidgin ]; meta = with stdenv.lib; { homepage = https://github.com/gkdr/carbons; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index f68b8306fc8..53d1f30bee6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sourceRoot = "skype4pidgin-${version}-src/skypeweb"; - buildInputs = [ pkgconfig pidgin json_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin json_glib ]; makeFlags = [ "PLUGIN_DIR_PURPLE=/lib/pidgin/" diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index 6e96719fd89..632f2543f57 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -52,7 +52,8 @@ in stdenv.mkDerivation rec { cp pidgin/libpurple/protocols/facebook/.libs/*.so $out/lib/purple-2/ ''; - buildInputs = [pidgin glib json_glib mercurial autoreconfHook]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [pidgin glib json_glib mercurial]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index bb1ed52baba..d02c437945e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - buildInputs = [ pidgin pkgconfig libnotify gdk_pixbuf glib dbus dbus_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus_glib ]; meta = { homepage = https://github.com/novas0x2a/skype4pidgin; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 8190be65e75..002d0345a00 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -20,7 +20,8 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildInputs = [ trousers pkgconfig gtk3 gtkspell3 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ trousers gtk3 gtkspell3 ] ++ stdenv.lib.optional isx86_64 dclxvi ++ stdenv.lib.optionals gui [ wrapGAppsHook ]; buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui"; diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index df85c55dbee..dca7d1257f6 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation { configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" ''; - buildInputs = [ perl pkgconfig glib ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl glib ncurses ]; meta = { homepage = http://silcnet.org/; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 05ea0fda835..b4fd71b01d4 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 37d5ea2e17b..721e4eba84f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool makeWrapper + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool makeWrapper gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; nativeBuildInputs = [ libxslt ]; diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index 64e3d216ac0..aefc48d4a3e 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { cp src/.libs/libfish.so $out/lib/irssi/modules ''; - buildInputs = [ gmp automake autoconf libtool openssl glib pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gmp automake autoconf libtool openssl glib ]; meta = { homepage = https://github.com/falsovsky/FiSH-irssi; diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 1141f563918..8d7bf677983 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { preConfigure = "sh ./bootstrap"; - buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libotr automake autoconf libtool glib irssi ]; NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/"; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index ad571888a9c..34c1eae8144 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qtbase qtsvg boost qwt6 ]; patches = [ ./0001-unbundled-qwt.patch ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index ae6033556fa..f5d48d03c96 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk"; }; - buildInputs = [ pkgconfig glib notmuch ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib notmuch ]; # Required until notmuch-addrlookup can be compiled against notmuch >= 0.25 patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index c008c478d22..b865622efe4 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { url = "http://www.muchsync.org/src/${name}.tar.gz"; sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1"; }; - buildInputs = [ notmuch openssl pkgconfig sqlite xapian zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ notmuch openssl sqlite xapian zlib ]; meta = { description = "Synchronize maildirs and notmuch databases"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 8c0bb8a884f..63d7f29d7de 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz"; }; - buildInputs = [ pkgconfig gtk2 perl gmime gettext intltool dbus_glib libnotify ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 perl gmime gettext intltool dbus_glib libnotify ] ++ stdenv.lib.optional spellChecking gtkspell2; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index e8df906217a..48b2d883849 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682"; }; - buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 6feeacc675a..9b448f86736 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"; }; - buildInputs = [ pkgconfig intltool file openssl curl libevent zlib ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool file openssl curl libevent zlib ] ++ optionals enableGTK3 [ gtk3 makeWrapper ] ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.isLinux [ inotify-tools ]; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 5e675c148bc..6b765a0c9f1 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { cd unix ''; - buildInputs = [ gtk2 ncurses pkgconfig autoconf automake perl halibut libtool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ncurses autoconf automake perl halibut libtool ]; meta = with stdenv.lib; { description = "A Free Telnet/SSH Client"; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 66e0cef23f5..5cbee68551e 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -32,7 +32,8 @@ in stdenv.mkDerivation { sha256 = "1vfg8sfpj83ircp7ny6xsbn2ba5xbp3xrdl5wwyfcg1zrpdmi7f1"; }; - buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake wrapGAppsHook gsettings_desktop_schemas glib gtk3 gettext libxkbfile libgnome_keyring libX11 freerdp libssh libgcrypt gnutls pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 21bb95d45e8..803e35307fe 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx"; }; - buildInputs = [ pkgconfig libpcap ncurses expat pcre libnl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap ncurses expat pcre libnl ]; postConfigure = '' sed -e 's/-o $(INSTUSR)//' \ -e 's/-g $(INSTGRP)//' \ diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix index d28c162874e..79bc32dfa40 100644 --- a/pkgs/applications/networking/tcpkali/default.nix +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "03cbmnc60wkd7f4bapn5cbm3c4zas2l0znsbpci2mn8ms8agif82"; }; - buildInputs = [autoreconfHook bison]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ bison]; meta = { description = "High performance TCP and WebSocket load generator and sink"; license = stdenv.lib.licenses.bsd2; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 550445f7306..a1fe790b119 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "074px4ygmv4ydy2pqwxwnz17f0hfswqkz5kc9qfz0iby3h5i3fyl"; }; - buildInputs = [ autoreconfHook openssl protobufc libconfig ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl protobufc libconfig ]; configureFlags = [ "--with-ssl=openssl" diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index 28760602575..b59d55d3ea0 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz"; sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s"; }; - buildInputs = [ pkgconfig autoconf automake clutter clutter-gst gdk_pixbuf + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake clutter clutter-gst gdk_pixbuf cairo clutter_gtk ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 674aa666b7e..fe6a3a41a23 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation { sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk"; }; - buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa lua perl autoreconfHook ]; patchPhase = '' diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index ca5bbd4882c..7abd83b6dc1 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hml2v228wi2r61m1pgka7h96rl92b6apk0iigm62miyp4mp9ys4"; }; - buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype pango libpng libtiff giflib libjpeg netpbm ]; patches = [ ./giflib.patch diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index b98af36604a..80115f4f022 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz"; sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; }; - buildInputs = [ gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ]; meta = { homepage = http://gwyddion.net/; diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index d4ec974007c..99b7ef79594 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1pcwq5khzdq4x33lid9hq967gv78dr5i4f2sk8m8rwkfqb9vdzrg"; }; - buildInputs = [ autoreconfHook flex bison gperf libxml2 perl gd perlPackages.XMLLibXML ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ flex bison gperf libxml2 perl gd perlPackages.XMLLibXML ]; configureFlags = [ "--enable-maintainer-mode" ]; meta = { diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index b8406c3255c..e080569e56f 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; configureFlags = "--disable-update-xdg-database"; - buildInputs = [ pkgconfig guile gtk2 flex gawk perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ guile gtk2 flex gawk perl ]; meta = with stdenv.lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index 7cdcbb7fd19..c0821c8a9ab 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; - buildInputs = [ pkgconfig gettext libtool automake autoconf cairo gtk2 autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gettext libtool automake autoconf cairo gtk2 ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 657d20553b7..62d920d929a 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz"; }; - buildInputs = [ gtk2 gperf pkgconfig bzip2 tcl tk judy xz ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 gperf bzip2 tcl tk judy xz ]; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 4ebc25fa4e8..5e8c4e39d4a 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory - buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost pkgconfig doxygen ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ]; # They say they only support installs to /usr or /usr/local, # so we have to handle this. diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 1f510943400..6b792310e8b 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42"; }; - buildInputs = [ pkgconfig gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 1d61ee2dd16..f4d8d2bea5d 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q"; }; - buildInputs = [ pkgconfig cmake glib qt5.full boost libsigrok + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake glib qt5.full boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm ]; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 0e2295479af..6ca3f80cefd 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; - buildInputs = [ qt4 cmake graphviz pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 cmake graphviz ]; patches = [ ./drop-hardcoded-prefix.patch diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index f26b13c5e32..829caacb55c 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; }; - buildInputs = [ gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ]; # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 patches = [ ./gtkdepre.diff ]; diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 34505192021..1f7ef571eaf 100644 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ b/pkgs/applications/science/logic/coq/8.4.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation { sha256 = "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55"; }; - buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; patches = [ ./configure.patch ]; diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index 209cba07c43..968ea74e296 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation { sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7"; }; - buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; postPatch = '' UNAME=$(type -tp uname) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 7378aedc1be..bf1623e28cf 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -89,7 +89,8 @@ self = stdenv.mkDerivation { inherit sha256; }; - buildInputs = [ pkgconfig ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ]; postPatch = '' UNAME=$(type -tp uname) diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index acde7f6ae43..df7eac02513 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "085bjrrm33rl5pwqx13af9sgni9cfbg70wag6lm08jj41ws411xs"; }; - buildInputs = [ gmp cln pkgconfig readline swig libantlr3c antlr3_4 boost jdk autoreconfHook python2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python2 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 293381d2888..b10ec814ff5 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0i8ad1yrz9nrrgpi8db4z0aii5s0sy35mmzdfw5nq183mvbx8qqd"; }; - buildInputs = [ pkgconfig ocaml camlp5 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml camlp5 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 94b1d590762..b143fd98250 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation (rec { sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m"; }; - buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index ca2422558e9..74f8875fceb 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i"; }; - buildInputs = [ pkgconfig smlnj rsync ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ smlnj rsync ]; buildPhase = '' export SMLNJ_HOME=${smlnj} diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 5e2bf8d2624..aac72ba24f0 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { "--with-static-gmp-include-dir=${gmp-static.dev}/include" "--enable-mcsat" ]; - buildInputs = [ gmp-static gperf autoreconfHook libpoly ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ gmp-static gperf libpoly ]; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index e899548217f..486a2e69d26 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1r8smr5057993h90nx0mdnff8nxw9x546zzh6qpy4h3xblp1la5s"; }; - buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl gtksourceview pango gettext ]; doCheck = false; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 1c1cac203f8..8d0336f5828 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { sha256 = "0kmrjjjwrh6xgw590awcd52b86kksmv6rfgih75zvpiavr1ygwsi"; }; - buildInputs = [ autoreconfHook wxGTK30 boost lua zlib bzip2 xylib readline + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline gnuplot swig3 ]; meta = { diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index b220bb8a80c..ac04321ae0c 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0nwg4bw02v6vahm2rwfaj7fzp3ffhjg5jk7h20il4246swhxw6s6"; }; - buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 8f8750b98c2..bfaa62ebb66 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { branch = "net.venge.monotone.guitone"; }; - buildInputs = [ qt4 qmake4Hook pkgconfig graphviz ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 qmake4Hook graphviz ]; qmakeFlags = [ "guitone.pro" ]; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 7b8b0598925..c2006e9dd6b 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { version = "1.0.2"; name = "monotone-viz-${version}"; - buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper camlp4]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 6be36533ce6..8f8930424a9 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { patches = [ ]; - buildInputs = [ boost zlib botan libidn lua pcre sqlite pkgconfig expect + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost zlib botan libidn lua pcre sqlite expect openssl gmp bzip2 ]; postInstall = '' diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index ca9620a0eb0..b00aae61d36 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 xorg.xwininfo ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which gnome3.gnome_common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with stdenv.lib; { diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 60c31cf07f9..10a8f4019fc 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { cp ${automake}/share/automake-*/mkinstalldirs . ''; - buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { homepage = https://damien.douxchamps.net/ieee1394/coriander/; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index e2980c7108f..ba72e085bf7 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; }; - buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 dbus dbus_glib GConf]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix index fef2c135774..717853af745 100644 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "19v9d0v3laiwi0f1n92lvj2s5s1mxsrfygna0xyw9pkcnk3b26q6"; }; - buildInputs = [ pkgconfig qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ]; patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 1559535f342..d4cf4b6c420 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235"; }; - buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [openssl qt4 mesa zlib libav]; libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl mesa qt4 zlib ] + ":" + stdenv.cc.cc + "/lib64"; diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 1244421210e..d9eef7f4cd8 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { name = "p2pvc"; - buildInputs = [ pkgconfig opencv ncurses portaudio ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ opencv ncurses portaudio ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index c2c64bfa496..c4d80344080 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -18,7 +18,8 @@ let url = "https://github.com/pitivi/gst-transcoder/archive/1.8.0.tar.gz"; sha256 = "0iggr6idmp7cmfsf6pkhfl3jq1bkga37jl5prbcl1zapkzi26fg6"; }; - buildInputs = [ which meson ninja pkgconfig gobjectIntrospection ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which meson ninja gobjectIntrospection ] ++ (with gst; [ gstreamer gst-plugins-base ]); }; diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 26e0d947954..8b2a69acfcc 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd"; }; - buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lua5 curl quvi_scripts libproxy libgcrypt glib ]; meta = { description = "Web video downloader"; diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 29bb439dcf6..3f99258737c 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb"; }; - buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi glib makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lua5 curl quvi_scripts libquvi glib makeWrapper ]; postInstall = '' wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua" ''; diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix index bba4cdb6e36..583d978a551 100644 --- a/pkgs/applications/video/vlc/plugin.nix +++ b/pkgs/applications/video/vlc/plugin.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { preConfigure = "sh autogen.sh"; - buildInputs = [ vlc autoconf automake libtool pkgconfig npapi_sdk libxcb + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vlc autoconf automake libtool npapi_sdk libxcb xlibsWrapper gtk ]; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index f1d850cd62c..4fdb7421c3c 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { hardeningDisable = ["fortify"]; - buildInputs = [ removeReferencesTo go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ removeReferencesTo go-md2man go libseccomp libapparmor apparmor-parser ]; makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index e318a0b64d7..ddd8cf72b93 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = with stdenv.lib; { homepage = http://singularity.lbl.gov/; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 5608f4ed359..74da6c4ab16 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; - buildInputs = [ pkgconfig alsaLib spice_protocol glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib spice_protocol glib libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 962942905db..20deb2c2404 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz"; }; - buildInputs = [ pkgconfig libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ]; # A strange type of bug: dbus is not immediately found by pkgconfig preConfigure = '' diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index b2aa4de40c0..0b611906a46 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml"; }; - buildInputs = [ libX11 libXinerama libXrandr libXft yacc pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXinerama libXrandr libXft yacc ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index b3e970e90be..7bc76d5c2bf 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "dzen2-0.9.5"; - buildInputs = [ pkgconfig libX11 libXft libXinerama libXpm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXft libXinerama libXpm ]; src = fetchurl { url = "https://github.com/robm/dzen/tarball/master/dzen2-0.9.5git.tar.gz"; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 3bf089f8354..b2e34a016ad 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { --replace "/zsh/functions/Completion/X" "/zsh/site-functions" ''; - buildInputs = [ pkgconfig glib libX11 libXext libXinerama ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libX11 libXext libXinerama ]; meta = { description = "A manual tiling window manager for X"; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index a979797d080..20df6566b23 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1467ha4ssbfjk1jh0ya2i5ljzm554ln18nyrppvsipg8shb1cshh"; }; - buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile ]; makeFlags = "all"; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index bd79f6b8ff0..19c9f8c9835 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq"; }; - buildInputs = [ confuse yajl alsaLib libpulseaudio libnl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ confuse yajl alsaLib libpulseaudio libnl ]; makeFlags = [ "all" "PREFIX=$(out)" ]; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 9bbb8f16132..1c6b8a84c95 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1ys9w1lncsfg266g9sfnm95an2add3g51mryg0hnrzcqa4knz809"; }; - buildInputs = [ pkgconfig xorg.libX11 dbus_glib autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ xorg.libX11 dbus_glib ]; meta = { description = "Simple daemon and library to make per window layout using XKB"; diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index dc624f44986..17084d6a6a7 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "matchbox-${version}"; version = "1.2"; - buildInputs = [ libmatchbox pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmatchbox ]; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2"; diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 72947906d6f..ebe58e921dd 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation { substituteInPlace man/Makefile --replace "nroff -man -Tlatin1" "${mandoc}/bin/mandoc -T man" ''; - buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc pkgconfig which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; installFlags = "PREFIX=\${out}"; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 226b33be060..d2bf1e5a96d 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { name = "oroborus-${version}"; version = "2.0.20"; - buildInputs = [ pkgconfig freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ]; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index 60753e46840..bdf914fbd75 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa"; }; - buildInputs = [ pkgconfig libpng libjpeg + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng libjpeg libXext libXft libXpm libXrandr libXinerama ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 4b9da41b028..8f4d4858ca1 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -29,7 +29,8 @@ python27Packages.buildPythonApplication rec { substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out} ''; - buildInputs = [ pkgconfig glib libxcb cairo pango python27Packages.xcffib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxcb cairo pango python27Packages.xcffib ]; pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius ]; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 37596f5f212..d18ffb50795 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4"; }; - buildInputs = [ pkgconfig which autoreconfHook + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ which rep-gtk pango gdk_pixbuf imlib gettext texinfo libXinerama libXrandr libXtst libICE libSM makeWrapper ]; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 79c73d80789..020a7bbb357 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "trayer-1.1.7"; - buildInputs = [ pkgconfig gdk_pixbuf gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gdk_pixbuf gtk2 ]; src = fetchFromGitHub { owner = "sargon"; diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index b5d4733bae5..8ed144a32ea 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/include ''; - buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm libvterm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; meta = with stdenv.lib; { homepage = http://vwm.sourceforge.net/; diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix index 39865c4b3e7..caf97c6510d 100644 --- a/pkgs/applications/window-managers/windowlab/default.nix +++ b/pkgs/applications/window-managers/windowlab/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1fx4jwq4s98p2wpvawsiww7d6568bpjgcjpks61dzfj8p2j32s4d"; }; - buildInputs = [ pkgconfig libX11 libXext libXft ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXft ]; postPatch = '' diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix index 0102fb05d8e..e708682e303 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl"; }; - buildInputs = [ pkgconfig libX11 libXpm libXext alsaLib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXpm libXext alsaLib ]; postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app"; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix index 40e41407f7b..e2f17d11f64 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f"; }; - buildInputs = [ pkgconfig libX11 libXpm libXext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXpm libXext ]; postUnpack = "sourceRoot=\${sourceRoot}/Src"; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix index e211abe0ea5..28bff77ed62 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7"; }; - buildInputs = [ pkgconfig libX11 libXpm libXext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXpm libXext ]; postUnpack = "sourceRoot=\${sourceRoot}/wmsm"; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index 80a24635f67..e5eb2fc559d 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; }; - buildInputs = [ pkgconfig libX11 libXpm libXext libXfixes libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; meta = { description = "Systemtray for Windowmaker"; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index bea7c99a511..88c312bd265 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { EOF ''; - buildInputs = [ unzip pkgconfig libixp_hg txt2tags dash python which + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip libixp_hg txt2tags dash python which libX11 libXrender libXext libXinerama libXrandr libXft ]; # For some reason including mercurial in buildInputs did not help diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index 0ff3367e3ae..4a1404b711a 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { depsSha256 = "0z7h8ybh2db3xl8qxbzby5lncdaijixzmbn1j8a45lbky1xiix71"; - buildInputs = [ libXinerama libX11 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXinerama libX11 ]; libPath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; preInstall = '' diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index 5837d413abc..30a42fcc0fe 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation (args // { inherit src; - buildInputs = [ php autoreconfHook ] ++ buildInputs; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ php ] ++ buildInputs; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 0004302ab97..928c5396b61 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { patches = [ ./rsvg-convert.patch ]; - buildInputs = [ intltool pkgconfig iconnamingutils imagemagick librsvg ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; configureFlags = "--enable-png-creation"; diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix index c140eb944c6..8cf18b7018d 100644 --- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; }; - buildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool ]; propagatedBuildInputs = [ gtkmm libglade ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index ff4abf26ac8..c07dc9730e6 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0rkyg6naidql0nv74608mlsr2lzjgnndnxnxv3s0hp4f6mbqnmkw"; }; - buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon libSM diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix index 9f41a589220..63df026836f 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation { }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 gtk + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python libxml2Python libxslt which libX11 gtk intltool GConf gnome_doc_utils ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix index e114f72a21b..0dcb409e0aa 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation { sha256 = "1ajckii51spmkgfc0168c56x0syz5vwb2fp8b81c5s6n0r85dk3d"; }; - buildInputs = [ pkgconfig python glib intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python glib intltool ]; } diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix index ab01796197c..f0882e39a85 100644 --- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation { sha256 = "0mnjhdryx94c106fghzz01dyc1vlp16wn6sajvpxffnqqx62rmfx"; }; - buildInputs = [ pkgconfig dbus_glib libxklavier glib gtk intltool GConf libglade ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus_glib libxklavier glib gtk intltool GConf libglade ]; } diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix index 7a1b4d1f531..4b1daa3af90 100644 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix @@ -9,5 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0k16lpdyy8as8wgc5dqpy5b8i9i4mrl77qx8db23fgs2c533fddq"; }; configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo"; - buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ]; } diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 75db6255436..22604f214d4 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d"; }; - buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/desktops/gnome-2/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix index 77a2b710f44..d2bcaa7c5e1 100644 --- a/pkgs/desktops/gnome-2/desktop/rarian/default.nix +++ b/pkgs/desktops/gnome-2/desktop/rarian/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; }; - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl perlXMLParser libxml2 libxslt]; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; } diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index 8cd8635c85c..62a224eb504 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { cp ${automake}/share/automake*/config.{sub,guess} . "; - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt gettext]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl perlXMLParser libxml2 libxslt gettext]; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml"; } diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index dc8181414ce..e5d2489436e 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -18,7 +18,8 @@ in stdenv.mkDerivation rec { ./vte-0.28.2-limit-arguments.patch ]; - buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++ + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib gtk ncurses ] ++ stdenv.lib.optionals pythonSupport [python pygtk]; configureFlags = '' diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix index 6be2a440879..b0b669148ff 100644 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi intltool libbonobo ORBit2 GConf dbus_glib ]; } diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix index 0f811471fb0..029d751e719 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix @@ -6,5 +6,6 @@ stdenv.mkDerivation { url = mirror://gnome/sources/gnome-vfs-monikers/2.15/gnome-vfs-monikers-2.15.3.tar.bz2; sha256 = "0gpgk5vwhgqfhrd8pf1314kh7sv3jfqll2xbdbrs5s5sxy3v7b15"; }; - buildInputs = [ pkgconfig glib intltool gnome_vfs libbonobo ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib intltool gnome_vfs libbonobo ]; } diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 4525246c20e..49b8cc88f9d 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ]; - buildInputs = [pkgconfig intltool enchant isocodes ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index 49161c1a745..8927bd120f6 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html patches = [ ./01_remove-disable-deprecated.patch ]; - buildInputs = [pkgconfig gtk intltool GConf enchant isocodes gnome_icon_theme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ]; } diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index a20c419fe0f..5003215529e 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - buildInputs = [ pkgconfig gtk python gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk python gettext ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix index 4d0f3061c45..9d22488c25d 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation { sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918"; }; - buildInputs = [ pkgconfig libgnomecanvas gtkmm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgnomecanvas gtkmm ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index 7eef5af0adc..2365e166d5e 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { patches = [ ./glib.patch ./cups_1.6.patch ]; - buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk gettext intltool libart_lgpl ]; propagatedBuildInputs = [ libxml2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index 390059089fc..6945ad1f04b 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = [ ./bug653388.patch ]; - buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk gettext intltool libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index a19b20e86b5..a8072aa3752 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation { sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; - buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; } diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix index be288b809d4..b9db3422723 100644 --- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; }; - buildInputs = [ pkgconfig gtk gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk gettext ]; propagatedBuildInputs = [ libxml2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix index 00895f9a2bb..9aae9215650 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig glib intltool itstool libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib intltool itstool libxml2 clutter_gtk libuuid webkitgtk gnome3.tracker gnome3.gnome_online_accounts zeitgeist desktop_file_utils gnome3.gsettings_desktop_schemas makeWrapper diff --git a/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix index b5f70d84e52..a10864c347e 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop gst_all_1.gst-plugins-bad clutter_gtk clutter-gst diff --git a/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix index a0f8d966955..da49c36cd06 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxml2 python gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix index e39614e765d..68cd2a42fa6 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libcanberra_gtk3 gnome3.gsettings_desktop_schemas makeWrapper gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop gnome3.geocode_glib geoclue2 diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix index 4840d200cf9..d34334c4f64 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-getting-started" ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxslt docbook_xsl desktop_file_utils inkscape poppler_utils gnome3.gsettings_desktop_schemas makeWrapper gmp gdk_pixbuf gnome3.defaultIconTheme librsvg evince diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix index 5af407ef15c..bb8375d595e 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gobjectIntrospection wrapGAppsHook gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph gnome3.geocode_glib libchamplain file libsoup gdk_pixbuf librsvg libgweather autoreconfHook diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix index 4f11e7a2843..54e79872c67 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify python3Packages.pycairo python3Packages.dbus-python python3Packages.requests diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix index 6e8394950a6..61ec2ac446c 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart gdk_pixbuf gnome3.defaultIconTheme librsvg exempi gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo diff --git a/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix index 093900dcb7a..7d71d1b7adc 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; }; - buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gobjectIntrospection intltool makeWrapper ]; meta = with stdenv.lib; { description = "Integrates Evolution and Pidgin into the Nautilus file manager"; diff --git a/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix index fc97d1b6d6e..7c3da70edeb 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix index 58d5a5b8cdc..03dbdb1842a 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool gnome3.gcr gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme libsecret avahi libsoup p11_kit vala_0_32 diff --git a/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix index 8b8b6248642..e719fbf9f21 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret itstool makeWrapper gnome3.defaultIconTheme librsvg ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix index 15db270e80c..f94cb3c57c4 100644 --- a/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vala gtk3 glib libgtop intltool itstool libxml2 wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix index 9200c4180bd..402c6c1c355 100644 --- a/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; - buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 intltool docbook_xsl docbook_xsl_ns makeWrapper ]; postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix index 9a29d11f1ae..ea257ed69f0 100644 --- a/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { gnome_online_accounts shared_mime_info ]; propagatedBuildInputs = [ folks telepathy_logger evolution_data_server telepathy_mission_control ]; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib webkitgtk intltool itstool libxml2 libxslt icu file makeWrapper telepathy_glib clutter_gtk clutter-gst cogl gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix index ec8cf118815..ed76d726a4c 100644 --- a/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file webkitgtk libsoup libsecret gnome_desktop libnotify libtool sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix index 59f0381f2e8..09e27e7c0c5 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { "--with-plymouth=yes" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib itstool libxml2 intltool accountsservice gnome3.dconf systemd gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool plymouth librsvg ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix index 10d9c46123d..482d6ae64a4 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ]; propagatedBuildInputs = [ spidermonkey_38 ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix index 7fae0b5c67f..f237d745c1c 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme makeWrapper gnome3.gsettings_desktop_schemas itstool libnotify libcanberra_gtk3 ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix index 66cc2cb24c7..e69092a5712 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { touch src/*.vala ''; - buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool evolution_data_server gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib libxml2 libsoup gnome3.gnome_online_accounts nspr nss diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix index 7265f09731f..d56018bf1e8 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland gtk3 glib intltool gnome_doc_utils libxkbfile gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix index c94c178558d..77c4805a197 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxml2 file gnome3.gsettings_desktop_schemas makeWrapper ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix index aef58567387..f9380272f06 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bash gtk3 glib intltool itstool libxslt libtool libsecret libpwquality cracklib libnotify libdvdread libcanberra_gtk3 docbook_xsl gdk_pixbuf gnome3.defaultIconTheme diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix index 16d7151ea09..14aeb69e14c 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool gnome3.gnome_desktop gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix index ee8c3a902d5..fdd23d13459 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib gobjectIntrospection ]; meta = { homepage = http://www.gnome.org; diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix index 29f6ae3e860..9437a0d8a6b 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix index 90fc3a8737a..cb50494bb40 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix index 34f8cee625a..1f933e1b3c5 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bash gtk3 glib intltool itstool libcanberra_gtk3 gnome3.gsettings_desktop_schemas wrapGAppsHook ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix index 83305f440b1..fd90b8867d7 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib libgtop intltool itstool makeWrapper file ]; configureFlags = [ "--enable-extensions=all" ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix index aa6f48ac420..d66efca66d9 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bash gtk3 glib intltool itstool gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix index 3164e4dd74b..c32d9d95d88 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bash gtk3 glib intltool itstool libxml2 gtkmm3 libgtop wrapGAppsHook gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas systemd ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix index 5cc3385ad84..3db252d063f 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix index 4f02673e036..6ab72ab7826 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnome3.yelp itstool libxml2 intltool ]; meta = with stdenv.lib; { homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}"; diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix index 587165e107b..0b83f6eb226 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { "--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxml2 libtool wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg nautilus libnotify libcanberra_gtk3 systemd ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix index 4b8fc90adad..b6d9ccef666 100644 --- a/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ]; - buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts gnome3.totem-pl-parser gnome3.rest gmime json_glib avahi gnome3.libmediaart tracker intltool itstool ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix index b4a794812a5..18a4da4efe2 100644 --- a/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ pkgconfig file intltool glib libxml2 libsoup + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file intltool glib libxml2 libsoup gnome3.totem-pl-parser ]; propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix index 95785d9ed4d..8e72b7fb233 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix @@ -10,7 +10,8 @@ in stdenv.mkDerivation rec { sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; }; - buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libcanberra_gtk2 gobjectIntrospection libtool ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix index 3dfbe6fbf0b..a3946444948 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gtk3 ]; - buildInputs = [ pkgconfig atk cairo glib pango + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ atk cairo glib pango libxml2Python perl intltool gettext ]; preBuild = '' diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix index 43e27cdb481..7763867bcbf 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glibmm gtkmm gtksourceview ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix index 05aff866606..39c1181a52a 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 intltool itstool glib appdata-tools gnome3.yelp_tools libxml2 file desktop_file_utils gnome3.gsettings_desktop_schemas makeWrapper ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix index d4697c99a93..4d59a3f2013 100644 --- a/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { patches = [ ./fix_introspection_paths.patch ]; - buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf vala_0_32 glib gobjectIntrospection ]; meta = with stdenv.lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; diff --git a/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix index 47cb96de6c3..56159500228 100644 --- a/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ autoconf pkgconfig glib gobjectIntrospection webkitgtk libsoup + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf glib gobjectIntrospection webkitgtk libsoup libxml2 libarchive ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix index 2bcbefc8dbf..74636708988 100644 --- a/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file intltool glib gtk3 libxklavier makeWrapper ]; preFixup = '' wrapProgram $out/bin/gkbd-keyboard-display \ diff --git a/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix index b39e1f6fa56..5c1ffb45039 100644 --- a/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; }; - buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ]; propagatedBuildInputs = [ libarchive ]; configureFlags = "--without-liblcms2"; diff --git a/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix index 9f1f3096533..8fddd8f7d5a 100644 --- a/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-python3" ]; - buildInputs = [ intltool pkgconfig glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ]; meta = with stdenv.lib; { description = "A GObject-based plugins engine"; diff --git a/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix index 5a8117528b6..c5c75c166f7 100644 --- a/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; - buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.24/core/rest/default.nix b/pkgs/desktops/gnome-3/3.24/core/rest/default.nix index d467cad93b4..154e7221cc2 100644 --- a/pkgs/desktops/gnome-3/3.24/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/rest/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647"; }; - buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libsoup gobjectIntrospection]; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix index fb010756f29..638c0cbe7dc 100644 --- a/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file intltool gobjectIntrospection glib gtk3 clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper harfbuzz ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix index 63f36004bcd..794f3801333 100644 --- a/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; }; - buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file intltool gmime libxml2 libsoup ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; diff --git a/pkgs/desktops/gnome-3/3.24/core/totem/default.nix b/pkgs/desktops/gnome-3/3.24/core/totem/default.nix index b3e9e5dd1fe..34ec9b58116 100644 --- a/pkgs/desktops/gnome-3/3.24/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/totem/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxml2 gnome3.grilo clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav diff --git a/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix index a60c38015c0..0d3e8bd358d 100644 --- a/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vala_0_32 gtk3 glib intltool itstool libxml2 bzip2 gnome3.totem-pl-parser libxslt gnome3.gsettings_desktop_schemas wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix index 4f56439311e..7cd72ceee42 100644 --- a/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix +++ b/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gobjectIntrospection intltool gnome3.glib gnome3.gtk3 ncurses ]; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/default.nix b/pkgs/desktops/gnome-3/3.24/core/vte/default.nix index 7eabe6ad9d4..b3962015d3c 100644 --- a/pkgs/desktops/gnome-3/3.24/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/vte/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gobjectIntrospection intltool gnome3.glib gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ]; propagatedBuildInputs = [ gnutls pcre2 ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix index 9111802eb6a..eaceadcc85c 100644 --- a/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix index 0a3976f35a1..353b9ccb55e 100644 --- a/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool itstool libxml2 libxslt ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix index 4ee79bbc3dc..6b458598c29 100644 --- a/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl librsvg gdk_pixbuf gnome3.defaultIconTheme groff gnome3.gsettings_desktop_schemas wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix index a1b38b21869..c6927111ed4 100644 --- a/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix +++ b/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; }; - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl perlXMLParser libxml2 libxslt]; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix index 6a50834f105..9ff98c2825e 100644 --- a/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix index 156d91b3eae..f12bbb0ca41 100644 --- a/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gtk3 intltool ]; meta = with stdenv.lib; { description = "Gnome docking library"; diff --git a/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix index 9e5d256741f..40e1473b59e 100644 --- a/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-card-theme-formats=svg" ]; - buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf librsvg libxml2 desktop_file_utils guile_2_0 libcanberra_gtk3 ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix index c8ba82c7246..a0f83d48c3d 100644 --- a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool wrapGAppsHook gtk3 gnome3.libgee json_glib qqwing itstool libxml2 ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix index 1b6f08d1fd6..3836548b3ab 100644 --- a/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix index 8ec54b48972..7bd3ca95de9 100644 --- a/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix index f319608764d..514b2a03557 100644 --- a/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libcanberra_gtk3 itstool intltool clutter libxml2 clutter_gtk wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix index a4cad01488d..c6416960b7a 100644 --- a/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.24/games/tali/default.nix b/pkgs/desktops/gnome-3/3.24/games/tali/default.nix index c2b1f585712..6f6beee8961 100644 --- a/pkgs/desktops/gnome-3/3.24/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/tali/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libxml2 itstool intltool wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.24/misc/california/default.nix b/pkgs/desktops/gnome-3/3.24/misc/california/default.nix index ca0450dc7f9..b33488e34fc 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/california/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ makeWrapper intltool pkgconfig vala_0_32 glib gtk3 gnome3.libgee + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix index e0622b17621..498ced47a08 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix index 69d89bd5879..d0801714a0f 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ pkgconfig glib libtool m4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libtool m4 ]; propagatedBuildInputs = [ exiv2 ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix index 46fa9bc39e5..364a52ee5cd 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"; }; - buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gnome3.gnome_online_accounts ]; propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix index 1df3c1ffdb7..ad415368368 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=/" ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxml2 gnome3.gsettings_desktop_schemas file gdk_pixbuf gnome3.defaultIconTheme librsvg libnotify gnome3.gnome_shell python2Packages.pygobject3 diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix index c0bd2fed3f2..dfeefe0def8 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; }; - buildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; diff --git a/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix index 44573d1a5bb..71e3ff19dc3 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ enchant ]; # required for pkgconfig - buildInputs = [ pkgconfig glib gtk3 isocodes vala ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk3 isocodes vala ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix index 89703b61932..3f65ab36b0b 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme gnome3.gsettings_desktop_schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix index 98b71c9d9c9..90ee658fd09 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6"; }; - buildInputs = [ pkgconfig glib gtk3 libgee intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk3 libgee intltool ]; meta = with stdenv.lib; { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix index 2e5b0a4af84..e9249978d85 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool itstool libxml2 gtk3 openssl ]; meta = with stdenv.lib; { description = "Database access library"; diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix index 6915ede4ad5..a71dbf5494d 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ gnome3.gnome_common libtool pkgconfig vala_0_32 libssh2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnome3.gnome_common libtool vala_0_32 libssh2 gtk_doc gobjectIntrospection libgit2 glib ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix index 9988541e0f5..abdcdef9937 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v"; }; - buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gdk_pixbuf gobjectIntrospection ]; meta = with stdenv.lib; { description = "Library tasked with managing, extracting and handling media art caches"; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 6678b11df02..02f58f81200 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -16,7 +16,8 @@ gsmakeDerivation { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; }; - buildInputs = [ cairo base gui freetype pkgconfig x11 libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cairo base gui freetype x11 libXmu ]; meta = { description = "A generic backend for GNUstep"; }; diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 8624cac09ed..54b11292769 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -11,7 +11,8 @@ in stdenv.mkDerivation { sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8"; }; - buildInputs = [ pkgconfig libxml2 gtk shared_mime_info hicolor_icon_theme libSM ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gtk shared_mime_info hicolor_icon_theme libSM ]; patches = [ ./rox-filer-2.11-in-source-build.patch diff --git a/pkgs/desktops/xfce/applications/gigolo.nix b/pkgs/desktops/xfce/applications/gigolo.nix index 9badeb5370e..b29a50af365 100644 --- a/pkgs/desktops/xfce/applications/gigolo.nix +++ b/pkgs/desktops/xfce/applications/gigolo.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ python gettext intltool gtk pkgconfig gvfs]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python gettext intltool gtk gvfs]; meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index 1a6b585a22a..ad1727da3b9 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ]; meta = { homepage = http://www.xfce.org/projects/terminal; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index a447812f9a7..a0856b6a6d7 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libnotify gtk libxfce4util libxfce4ui xfconf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf ]; preFixup = '' rm $out/share/icons/hicolor/icon-theme.cache diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix index 1063cfca090..2de4f34fcf6 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ intltool pkgconfig gtk libwnck ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk libwnck ]; meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index 1bd257991c9..3c7c425e379 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 67c92dae5e8..46b9a372009 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ]; meta = with stdenv.lib; { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 6e5ac7c55ea..c4b2366e787 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3; configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 1c473b42d60..5a411bfbb5b 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - buildInputs = [ pkgconfig glib intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib intltool ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index de55509aa40..109c22f1e58 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2"; }; - buildInputs = [ pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; # not needed to build it but to use it propagatedBuildInputs = [ autoconf automake libtool intltool ]; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index edbc11b8605..fbf03cc4a81 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) - buildInputs = [ pkgconfig intltool glib libxfce4util ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib libxfce4util ]; propagatedBuildInputs = [ dbus_glib ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix index 3438791cd78..0dcdcda6994 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix index 4e173370428..6614d746b68 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index 7aca910b8a8..fb8b1bae83d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix index 4ca19d73449..0905a9bb16a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0b4yril07qgkmywjym1qp12r4g35bnh96879zbjps7cd3rkxld4p"; }; - buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 xfce4panel gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfcegui4 xfce4panel gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix index 3be77ab77ca..b6d0fc12db3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix index fbc841db1fc..438be7e8494 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { pythonPath = [ dockbarx ]; - buildInputs = [ pkgconfig python2 vala gtk2 pythonPackages.wrapPython ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ] ++ (with xfce; [ libxfce4util xfce4panel xfconf xfce4_dev_tools ]) ++ pythonPath; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index d7c5f53d2ee..a5cfc3659f6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 6e0f98156f0..81bff06500b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index 3e3861b7604..4f4f882d67b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index 8b6552e4e6c..c6252a48bff 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index dd80259db5f..2b43eaca4c0 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk exo gnutls libgcrypt ]; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 6a2f5bd5084..6f16561d41d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1kvgq1pq7cykqdc3227dq0izad093ppfw3nfsrcp9i8mi6i5f7z7"; }; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk exo ]; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index 5822ff173c9..e81289f26f6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad"; }; - buildInputs = [ pkgconfig python2 vala gtk2 libwnck libxfce4util xfce4panel ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4panel ]; postPatch = '' substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix index 710ca70b021..9650cafedec 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index eba05af69c0..c8c9c7735a9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk libunique ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk libunique ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 200e3ccb071..34677db81d1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix index 334d6f4943f..3c0d1a488f8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index 37ad643930a..32b2e651462 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${version}"; - buildInputs = [ pkgconfig intltool python3 imagemagick libwnck gtk2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool python3 imagemagick libwnck gtk2 exo libxfce4ui libxfce4util xfce4panel xfconf xfce4_dev_tools ]; preConfigure = '' diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix index 42c54bf46b3..453c09cfc70 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1"; }; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel garcon + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel garcon gtk libxklavier librsvg libwnck ]; meta = { diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index fae1c1d1b40..8bae6e2363f 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -20,7 +20,8 @@ in stdenv.mkDerivation { sha256 = "0dc5cjahv7lzlp92hidlh83rwgrpgb6xz2pnba2pm5xrv2pnsskl"; }; - buildInputs = [ cmake pkgconfig libffi llvm_35 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libffi llvm_35 ] ++ stdenv.lib.optional doCheck perl; patches = [ ./link-llvm.patch ]; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 85caa82a155..87572661635 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { name = "factorimage"; }; - buildInputs = [ git rlwrap curl pkgconfig perl makeWrapper + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ git rlwrap curl perl makeWrapper libX11 pango cairo gtk2 gdk_pixbuf gtkglext mesa libXmu libXt libICE libSM ]; diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 751d44a38a4..af33039d341 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0mvmvwwpl4zq0yvgzdizww8l9azvlrc82xm32nz1fi1nw8x5qfqk"; }; - buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mono dotnetbuildhelpers autoconf automake which ]; configurePhase = '' sed -i '988d' src/FSharpSource.targets diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index ac4102c9a63..97977ba3ed3 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { passthru.rustc = rustc; - buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper libgit2 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index ed374ea6822..35172dbd15b 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { ]; sourceRoot = "yosys"; - buildInputs = [ pkgconfig tcl readline libffi python3 bison flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ tcl readline libffi python3 bison flex ]; preBuild = '' chmod -R u+w ../yosys-abc ln -s ../yosys-abc abc diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 9dbc3a3f299..65be1f4e066 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { inherit (param) rev sha256; }; - buildInputs = [ autoreconfHook coq ] + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib ocamlgraph ]); preInstall = '' diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 6ba1a59d545..6611c074506 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x"; }; - buildInputs = [ guile pkgconfig cairo expat ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ guile cairo expat ] ++ stdenv.lib.optional doCheck guile_lib; doCheck = true; diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index a60a10c5c04..92d17fbe0db 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; }; - buildInputs = [ pkgconfig guile texinfo ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ guile texinfo ]; preConfigure = '' configureFlags=" diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 897f84f94ad..b41fa8a77c4 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -49,7 +49,8 @@ in stdenv.mkDerivation ({ nativeBuildInputs = [ autoreconfHook makeWrapper perl ]; - buildInputs = [ gnum4 ncurses openssl autoreconfHook libxslt libxml2 ] + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ gnum4 ncurses openssl libxslt libxml2 ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 4c4a4a0c894..857a1e5cd8d 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf"; }; - buildInputs = [ cmake pkgconfig pcre zlib sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake pcre zlib sqlite ]; meta = with stdenv.lib; { description = "Programming language with macros and syntax at once"; diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index 381144c68c2..ab295dab444 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0z8ng5rhxc7fpsj3d50h25wkgcnxjfy030jm8r9w9m729w2c9hxb"; }; - buildInputs = [ libffcall gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libffcall gtk2 ]; configureOptions = [ "--with-gtk2" ]; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index dea3f6ec633..7f38f388c35 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -8,7 +8,8 @@ in stdenv.mkDerivation { sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar"; }; - buildInputs = [ pkgconfig nix git ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ nix git ]; NIX_CFLAGS_COMPILE = "-std=c++1y"; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ed018a94227..49d48522186 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -20,7 +20,8 @@ let enableParallelBuilding = true; - buildInputs = [ flex bison pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ flex bison ] ++ lib.optional stdenv.isLinux systemd; flags = { diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 08ed8f0d468..9e9a99e5287 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -33,7 +33,8 @@ let name = "pixie-${version}"; version = "0-r${commit-count}-${variant}"; nativeBuildInputs = libs; - buildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper ]; PYTHON = if buildWithPypy then "${pypy}/pypy-c/.pypy-c-wrapped" else "${python2.interpreter}"; diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 0ea70cc022d..1d382207e98 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -37,7 +37,8 @@ in stdenv.mkDerivation rec { substituteInPlace "lib-python/2.7/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; - buildInputs = [ bzip2 openssl pkgconfig pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index ed09ac7467d..418ee90533f 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig perl python2 zip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl python2 zip ]; nativeBuildInputs = if stdenv.isArm then [ autoconf213 ] else []; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix index 33acb792f76..da5fc193a22 100644 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig perl python2 zip libffi readline ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl python2 zip libffi readline ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 5b8e887c2ee..6279bfcb428 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-video-sixel" ]; - buildInputs = [ pkgconfig libsixel ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsixel ]; meta = with stdenv.lib; { description = "A cross-platform multimedia library, that supports sixel graphics on consoles"; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 50399f62d0a..8cadc7290aa 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { ]; sha256 = "099kx6ni5vkgr3kf40glif8m6r1m1hq6hxqlqrblaj1w5cphh8hi"; }; - buildInputs = [imake gccmakedep libXpm libXp bison flex pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [imake gccmakedep libXpm libXp bison flex]; propagatedBuildInputs = [xlibsWrapper libXmu]; meta = { diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 7c697d3e60c..b398af0db34 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0piwkmg7jn64h57cjf5cybyvyqxj2k752g9vrf4ycds7nhvvbnb6"; }; - buildInputs = [ zlib curl expat fuse openssl autoreconfHook python ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib curl expat fuse openssl python ]; meta = { homepage = http://afflib.sourceforge.net/; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 8b8d3a29193..2edf4e23226 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { url = "http://www.antigrain.com/${name}.tar.gz"; sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; - buildInputs = [ autoconf automake libtool pkgconfig freetype SDL libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool freetype SDL libX11 ]; # fix build with new automake, from Gentoo ebuild preConfigure = '' diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 30fe8173e86..904c079c84d 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d"; }; - buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi intltool dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index 5dac4d8e592..7057b020d42 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln"; }; - buildInputs = [ pkgconfig alsaLib portaudio portmidi libsndfile cmake libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib portaudio portmidi libsndfile cmake libxml2 ]; meta = { description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media"; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index a21f698fa89..3a4c363e23c 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; }; - buildInputs = [ pkgconfig libsndfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsndfile ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index dce2e363cda..fe0e0854a32 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; }; - buildInputs = [ autoreconfHook glib pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib ]; meta = with stdenv.lib; { description = "A C library for reading and writing Standard MIDI Files"; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 87ff0bdb0b6..427625d6fc6 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p"; }; - buildInputs = [ lv2 pkgconfig python serd sord sratom ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lv2 python serd sord sratom ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index dafd39efee9..3df8f5e3078 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0chxwys3vnn3nxc9x2vchm74s9sx0vfra6y893byy12ci61jc1dq"; }; - buildInputs = [ gtk2 libsndfile pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libsndfile python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix index 034282c4f3a..595dd9e0a53 100644 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm"; }; - buildInputs = [ gtk2 libsndfile pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libsndfile python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 94102c38549..b0b0c6bc59a 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1lby508fb0n8ks6iz959sh18fc37br39d6pbapwvbcw5nckdrxwj"; }; - buildInputs = [ boost gtk2 pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost gtk2 python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index b41db495dba..022c5504596 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "11pl45lp8sq5xkpipwk622w508nw0qcxr03ibicqn1lsws0hva96"; }; - buildInputs = [ autoconf automake libtool libjack2 alsaLib pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool libjack2 alsaLib ]; preConfigure = '' ./autogen.sh --no-configure diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 816baa5221e..d30cb1d369e 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4"; }; - buildInputs = [ lv2 pkgconfig python serd sord ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lv2 python serd sord ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 8864d710174..b2cfb0be8be 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf"; }; - buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 lv2 python serd sord sratom ] ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix index f4c4220a879..8cae07e2949 100644 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ b/pkgs/development/libraries/audio/vamp/default.nix @@ -13,7 +13,8 @@ rec { sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv"; }; - buildInputs = [ pkgconfig libsndfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsndfile ]; meta = with stdenv.lib; { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 9cf4bb22e58..e6702d0db64 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec{ sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8"; }; - buildInputs = [ pkgconfig cmake libuuid ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libuuid ]; meta = { homepage = http://www.crosswire.org/wiki/BibleSync; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 498c8f005f0..5ae9ead9ced 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ]; - buildInputs = [ pkgconfig gfortran texinfo ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gfortran texinfo ] ++ optional (boost != null) boost; configureFlags = diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 0bdffc9d357..bd83a5c79d5 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0wr4dandlfajhmg90nqyvwv61ikn9vdycji001310y3c4zfysprn"; }; - buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl libgcrypt commoncpp2 ]; patches = [ ./gcc-4.6-fix.patch ]; diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index 4d30afe6818..a4f49dea59a 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { src = source.src; - buildInputs = [ cmake pkgconfig libtiff ilmbase openexr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libtiff ilmbase openexr ]; meta = with stdenv.lib; { description = "Color Transformation Language"; diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index 6ee04ae5795..fd8fa1a994d 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s"; }; - buildInputs = [ pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; meta = with stdenv.lib; { homepage = http://ctpl.tuxfamily.org/; diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index fb5431ff8d5..fe7c1314feb 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in ''; - buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ bison flex bluez gtk2 ]; postInstall = '' # Some programs (for example, cabal-install) have problems with the double 0 diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 5bf9832843b..ee7afbbf252 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g"; })]; - buildInputs = [ dbus glib pkgconfig expat ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus glib expat ]; configureFlags = "--disable-ecore"; diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index b4dd865dec0..7279d5c383c 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ perl ]; - buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL ++ stdenv.lib.optionals enableX11 (with xorg; [ xproto libX11 libXext #xextproto diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 61a85c7cd60..efadff6a113 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1sc95hw5k2xagpafny0v35filmcn05k1ds5ghkldfpf6xw4hakp7"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = with stdenv.lib; { description = "A configuration parser library"; diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix index 02a422c2c84..7363a023935 100644 --- a/pkgs/development/libraries/enchant/default.nix +++ b/pkgs/development/libraries/enchant/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g"; }; - buildInputs = [aspell pkgconfig glib hunspell hspell]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [aspell glib hunspell hspell]; meta = { homepage = http://www.abisource.com/enchant; diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index a5dba0c94f1..bd12dac4aaf 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libosip openssl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libosip openssl ]; meta = with stdenv.lib; { license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix index e5b0592daab..c723885a68b 100644 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/pkgs/development/libraries/fflas-ffpack/1.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { url = "http://linalg.org/fflas-ffpack-${version}.tar.gz"; sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9"; }; - buildInputs = [autoreconfHook givaro_3_7 openblas gmpxx]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ givaro_3_7 openblas gmpxx]; nativeBuildInputs = [pkgconfig]; configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}"; meta = { diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 22f4b6ceef0..f1d6e47f56e 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd"; }; - buildInputs = [autoreconfHook givaro (liblapack.override {shared = true;}) openblas]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; nativeBuildInputs = [pkgconfig]; configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack"; meta = { diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 7eaba8f75ec..3f3c04b15a3 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; - buildInputs = [ pkgconfig expat ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ expat ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index f176aa0878c..9c4116c8f0b 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; - buildInputs = [ pkgconfig expat ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ expat ]; configureFlags = [ "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 9614762ef2a..1c0c4c3ace8 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0"; }; - buildInputs = [ autoconf cairo opencv pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf cairo opencv ]; meta = with stdenv.lib; { homepage = http://frei0r.dyne.org; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 7530d82a7e3..5a21af6a2b3 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56"; }; - buildInputs = [ graphviz gtk2 gtkmm2 pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ graphviz gtk2 gtkmm2 python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 11308a93337..38a36fc4e54 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1vxdsiky3492zlyrym02sdwf09y19rl2z5h5iin7qm0wizw5wvm1"; }; - buildInputs = [ intltool gobjectIntrospection pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gobjectIntrospection ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index e9f5898e2ea..40e9b0ed90d 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -12,7 +12,8 @@ in stdenv.mkDerivation rec { sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk"; }; - buildInputs = [ pkgconfig mono newtonsoft-json ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mono newtonsoft-json ]; sourceRoot = "svn-r1217/clients/cs"; diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index e9643da221e..306f228051b 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [pkgconfig glib libxml2 gtkdoc]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 gtkdoc]; propagatedBuildInputs = [glib libxml2]; patches = [ ./xml-document.patch ]; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 433a1722e76..f7529000539 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; }; - buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt glib_networking ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ]; propagatedBuildInputs = [dbus glib dbus_glib]; diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index 9907ae24f2c..3101bc64333 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { url = "https://forge.imag.fr/frs/download.php/370/givaro-${version}.tar.gz"; sha256 = "0lf5cnbyr27fw7klc3zabkb1979dn67jmrjz6pa3jzw2ng74x9b3"; }; - buildInputs = [autoconf automake libtool autoreconfHook gmpxx]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [autoconf automake libtool gmpxx]; meta = { inherit version; description = ''A C++ library for arithmetic and algebraic computations''; diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index bb0fd0e0898..d73a448f166 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { url = "https://forge.imag.fr/frs/download.php/592/givaro-${version}.tar.gz"; sha256 = "1822ksv8653a84hvcz0vxl3nk8dqz7d41ys8rplq0zjjmvb2i5yq"; }; - buildInputs = [autoconf automake libtool autoreconfHook gmpxx]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [autoconf automake libtool gmpxx]; meta = { inherit version; description = ''A C++ library for arithmetic and algebraic computations''; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index d9a8624b2ea..335afa566db 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "04n1lyc823z3l1d7mnmqpc9z1pkn646szjchasbfkn74m7cb0qz7"; }; - buildInputs = [autoconf automake libtool autoreconfHook gmpxx]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [autoconf automake libtool gmpxx]; meta = { inherit version; description = ''A C++ library for arithmetic and algebraic computations''; diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index a7dd47aaeb4..5b55a09db62 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy"; }; - buildInputs = [ zlib pkgconfig openssl pcsclite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib openssl pcsclite ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index f147305220c..10df82196c2 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad"; }; - buildInputs = [ pkgconfig globalplatform openssl pcsclite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ globalplatform openssl pcsclite ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 6b05bda1b3a..c9431420194 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; }; - buildInputs = [ pkgconfig autoconf automake glib libtool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake glib libtool ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index f95d0720d83..d80144b3d71 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p"; }; - buildInputs = [ pkgconfig gtk2 mono gtk-sharp-2_0 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 mono gtk-sharp-2_0 ] ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); patches = [ ./Makefile.in.patch ]; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 4c1f6135b49..b26ae9c9d61 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { outputBin = "dev"; outputMan = "dev"; # tiny pages - buildInputs = [ flex bison pkgconfig python setupHook/*move .gir*/ ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ flex bison python setupHook/*move .gir*/ ] ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin cctools; propagatedBuildInputs = [ libffi glib ]; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 080b781ca31..0f9b3f85fcd 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; }; - buildInputs = [ gtk2 cairo glib pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 cairo glib ]; meta = { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index c8b1c0bdd9b..a48490ffae5 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay"; }; - buildInputs = [ pkgconfig python3 frame ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python3 frame ] ++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index ee453963376..be869063111 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1pf4jkz3xyn1sqv70063im80ayb5kdsqwqwx11dc7vgypsl458cm"; }; cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; - buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [perl cmake vala gobjectIntrospection glib gtk3 gnome3.libgee gettext]; meta = { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 608be653889..402074a4e5f 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4"; }; - buildInputs = [ gst-plugins-base gstreamer pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gst-plugins-base gstreamer ]; meta = { homepage = https://gstreamer.freedesktop.org/modules/gnonlin.html; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index c20d32e810c..55d34a3fada 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ perl bison flex pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl bison flex ]; propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty; patchPhase = '' diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index eb0ba2db103..20584c3850a 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37"; }; - buildInputs = [ pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ]; preConfigure = '' sed '/DEPRECATED_FLAGS/d' -i configure diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index e36d77142e9..12b9181a952 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx"; }; - buildInputs = [pkgconfig t1lib glib gmetadom libxml2 popt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ t1lib glib gmetadom libxml2 popt]; propagatedBuildInputs = [gtk2 t1lib]; patches = [ ./gcc-4.3-build-fixes.patch ./gcc-4.4-build-fixes.patch ]; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 22b96abf642..22094f3a3f6 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - buildInputs = [aspell pkgconfig gtk2 enchant intltool]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [aspell gtk2 enchant intltool]; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 17ab80ce586..59b3a34f7bd 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; }; - buildInputs = [ glib pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; meta = { homepage = http://gts.sourceforge.net/; diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 80085759a76..51c369f7c2d 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj"; }; - buildInputs = [ autoreconfHook pkgconfig ] + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ udev libusb ]; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 5edbf9e4551..8206338fb08 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { name = "ign-transport-${version}"; inherit src; - buildInputs = [ cmake protobuf zeromq pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake protobuf zeromq utillinux # we need utillinux/e2fsprogs uuid/uuid.h ]; diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index 6fd204c236f..0213148d693 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v"; }; - buildInputs = [ pkgconfig directfb libsigcxx libxml2 fontconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ directfb libsigcxx libxml2 fontconfig ]; configureFlags = '' --enable-log-debug --enable-debug --enable-trace --with-examples diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index 9fb2a2a2e3a..82e02d06906 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./missing-casts.patch ]; - buildInputs = [ javac jvm antlr pkgconfig gtk2 gconf ecj ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ javac jvm antlr gtk2 gconf ecj ]; configurePhase = '' # GCJ tries to compile all of Classpath during the `configure' run when diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index 9a5527b5a13..f86f2fcf214 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ pkgconfig zeromq3 jdk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zeromq3 jdk ]; preConfigure = '' ${if stdenv.system == "x86_64-darwin" then diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index c80c28eb14b..725bc714db2 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frog-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 icu languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index d9578c380e6..42d14d08335 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frogdata-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive ]; preConfigure = '' diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index 9cddbdd22d9..d5c232ae776 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive libxml2 icu languageMachines.ticcutils ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 0ba7e686e43..2ffabac1ede 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index f1cb62e6802..738e53556ba 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ticcutils-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 # optional: zlib bzip2 libtar # broken but optional: boost diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index 6a60996dc60..d12c970d4dc 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 languageMachines.ticcutils ]; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index d8659c9a86b..7a07e9f33a8 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index d60bca41272..5c12a2142cc 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive icu libxml2 languageMachines.ticcutils languageMachines.libfolia diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 33037dbb87f..56b6448d253 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "uctodata-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive ]; preConfigure = "sh bootstrap.sh"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index a16a1f431a6..09001b6a6f0 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; - buildInputs = [ autoconf automake autoreconfHook glib gobjectIntrospection gtk_doc libtool libxml2 libxslt openssl pkgconfig python27Packages.six xmlsec zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ autoconf automake glib gobjectIntrospection gtk_doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; configurePhase = '' ./configure --with-pkg-config=$PKG_CONFIG_PATH \ diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index bd740b75758..5791b0808b4 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf"; }; - buildInputs = [ pkgconfig glib zlib libpng cmake gnumake3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib zlib libpng cmake gnumake3 ]; configureFlags = "-v"; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 42abb3d297c..71a28085541 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in ''; - buildInputs = [ boost doxygen gperf pkgconfig librevenge libxml2 perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost doxygen gperf librevenge libxml2 perl ]; meta = with stdenv.lib; { homepage = https://wiki.documentfoundation.org/DLP/Libraries/libabw; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index 8b3522e2092..81e32ab2c93 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; }; - buildInputs = [ pkgconfig glib dbus_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib dbus_glib ]; meta = with stdenv.lib; { description = "Legacy D-Bus client library for Audacious"; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 0d075efcd96..1f2349835d5 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -70,7 +70,8 @@ let ++ optional freetypeSupport "--enable-libfreetype" ; - buildInputs = [ pkgconfig lame yasm zlib bzip2 SDL ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lame yasm zlib bzip2 SDL ] ++ [ perl ] # for install-man target ++ optional mp3Support lame ++ optional speexSupport speex diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 1411474195d..8948a74ad63 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1y00hqsmqaix4dql8mb75zx87zvn8b483yxv53x9qyjspksbs60c"; }; - buildInputs = [ pkgconfig cmake git doxygen help2man tecla libusb1 udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake git doxygen help2man tecla libusb1 udev ]; # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 4692cf6aac1..6838362c794 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg"; }; - buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool m4 sqlite ]; configureScript = "./autogen.sh"; diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix index 632ee916135..a4b2e6078d2 100644 --- a/pkgs/development/libraries/libcdio/0.82.nix +++ b/pkgs/development/libraries/libcdio/0.82.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs"; }; - buildInputs = [ libcddb pkgconfig ncurses help2man ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libcddb ncurses help2man ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; # Disabled because one test (check_paranoia.sh) fails. diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 74c95704bbf..f7596b9c702 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; }; - buildInputs = [ libcddb pkgconfig ncurses help2man ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libcddb ncurses help2man ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; # Disabled because one test (check_paranoia.sh) fails. diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 15c40b43040..e60f5e316bd 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "09xsw9hfymzl9fi9r2r8n5cxk80fc00x9drsy1r59pgbycqxvf5q"; }; - buildInputs = [ cmake pkgconfig udev libcec_platform ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake udev libcec_platform ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 67302f330b9..f6d6c5b803e 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi"; }; - buildInputs = [ pkgconfig gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gobjectIntrospection ]; propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ]; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 6e0007111bc..9ab42c7fd1d 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = [ ./gcc5.patch ]; - buildInputs = [ boost libxml2 pkgconfig curl autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ boost libxml2 curl ]; configureFlags = "--without-man --with-boost=${boost.dev} --disable-werror --disable-tests"; # Cppcheck cannot find all the include files (use --check-config for details) diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index e5461d90dd9..8281036e749 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm"; }; - buildInputs = [ cmake speexdsp pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake speexdsp ]; meta = with stdenv.lib; { description = "Implementation of the EBU R128 loudness standard"; diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index a34ff5edbe2..7eb5df4c7ec 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; - buildInputs = [pkgconfig libestr]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libestr]; meta = { homepage = http://www.libee.org/; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 4e74762f3f9..6aca1d2be6d 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; - buildInputs = [ libX11 libXi libXtst pkgconfig xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXi libXtst xextproto ]; meta = with stdenv.lib; { description = "X virtual keyboard library"; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index d42425c8e18..851ee7f326b 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7"; }; - buildInputs = [ glib gtk intltool pango pkgconfig vala_0_34 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk intltool pango vala_0_34 ] ++ optional (!extraOnly) menu-cache; configureFlags = [ (optional extraOnly "--with-extra-only") diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 291f20a5db2..2e8fad3db82 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; }; - buildInputs = [ pkgconfig libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; meta = with stdenv.lib; { description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations"; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 17cf93473d6..353c82aa193 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1x41mbzh4qy7mrv2n86r2cr176rx03iacn0a99c3dkzv9g4rb34s"; }; - buildInputs = with stdenv.lib; [ cmake pkgconfig confuse ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with stdenv.lib; [ cmake confuse ] ++ optionals cppSupport [ boost ] ++ optionals pythonSupport [ python swig ] ++ optionals docSupport [ doxygen ]; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index fd6e4a7aa48..4adb7e53578 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc"; }; - buildInputs = [ autoconf automake libsndfile libtool pkgconfig libuuid ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libsndfile libtool libuuid ]; preConfigure = "make -f Makefile.cvs"; diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 93ad88f0021..1da6cffe3f2 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1bzfnpf2gwc2bisbrw06s63g9z9v4mh1n9ksqr6pbgj2prz7bvlk"; }; - buildInputs = [ pkgconfig zlib bzip2 libmcrypt libmhash ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib bzip2 libmcrypt libmhash ]; meta = with stdenv.lib; { description = "A small library to encapsulate data in an encrypted structure"; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 5b29c23fa6e..ef2a44bf183 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv"; }; - buildInputs = [ pkgconfig udev glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev glib ]; # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. configureFlags = [ "--disable-umockdev" ]; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index b55e0104f70..835c7d6f226 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -18,7 +18,8 @@ in stdenv.mkDerivation rec { sha256 = "1idsxb6rz4i55g3vi2sv7hmm57psbccpb57yc4jgphaq6ydgqsr6"; }; - buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss libintlOrEmpty ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 gsasl libidn gss libintlOrEmpty ] ++ optional gtkWidgets gtk2 ++ optional documentation gtkdoc ++ optional avahiSupport avahi diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 6f833ec81a9..267d3097c99 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "16hjb6fcval85gnkgkxfhw4c5h3pgf86awyh8p2bhnnvzc0ma5hq"; }; - buildInputs = stdenv.lib.optionals useGTK [ gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = stdenv.lib.optionals useGTK [ gtk2 ]; preBuild = '' diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index d539c61a4c9..2167b447703 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582"; }; - buildInputs = [ cmake qt4 pkgconfig gsasl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake qt4 gsasl ]; enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index aa75acb7d6d..4667a6e7601 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "02w94j344q0ywlj4mdf9fnzwggdsn3j1yn43sdlsddvr29lw239i"; }; - buildInputs = [ pkgconfig systemd ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ systemd ]; configureFlags = [ "--enable-rfc3195" diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index a1cbf9250c4..c89b21de0d6 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0jgdy9gi9n8x2pqrbll9158vhx8293lnxv8vzl0szcincslgk7hi"; }; - buildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool ]; preConfigure = "make -f Makefile.svn"; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index f1625e6a33f..b7b05870702 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ pkgconfig glib udev libgudev python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib udev libgudev python ]; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/software/libmbim/; diff --git a/pkgs/development/libraries/libmcs/default.nix b/pkgs/development/libraries/libmcs/default.nix index 23f333562dc..a457adfed80 100644 --- a/pkgs/development/libraries/libmcs/default.nix +++ b/pkgs/development/libraries/libmcs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1knmgxrg2kxdlin8qyf6351943ldg8myllwf860af58x1wncxc74"; }; - buildInputs = [ pkgconfig libmowgli ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmowgli ]; meta = { description = "A library and set of userland tools which abstract the storage of configuration settings away from userland applications"; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 9dae423efd7..1becd0ee8ef 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh"; }; - buildInputs = [ autoreconfHook openssl expat libtool pkgconfig check ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ openssl expat libtool check ]; dontDisableStatic = true; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 23e6a37f918..b663d22f644 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" "devdoc" "info" ]; - buildInputs = [ libgcrypt curl gnutls pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgcrypt curl gnutls ]; preCheck = '' # Since `localhost' can't be resolved in a chroot, work around it. diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index 4cbc51ea678..343622e8d5c 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ glib ]; postPatch = '' diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 4765e90c6df..f197d5bcef9 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { version = "5.1.0"; name = "libmusicbrainz-${version}"; - buildInputs = [ cmake neon libdiscid libxml2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake neon libdiscid libxml2 ]; src = fetchFromGitHub { owner = "metabrainz"; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index 97319840975..fa94fa549e4 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; - buildInputs = [ pkgconfig libmnl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl ]; meta = { description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure"; diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index 2920cbd9785..f30e12a4163 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; }; - buildInputs = [ pkgconfig libmnl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl ]; meta = { description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure"; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index fa4a0f11ef4..5de9409b729 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0chsmj9ky80068vn458ijz9sh4sk5yc08dw2d6b8yddybpmr1143"; }; - buildInputs = [ pkgconfig libmnl libnfnetlink ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl libnfnetlink ]; meta = { homepage = http://www.netfilter.org/projects/libnetfilter_queue/; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index fdbc2ac8800..4903d54b4a3 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9"; }; - buildInputs = [ pkgconfig dbus expat ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus expat ]; meta = { description = "A small library for C application development"; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 7927dba8983..77c04994956 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; - buildInputs = [ opensp pkgconfig libxml2 curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ opensp libxml2 curl ]; meta = { description = "Opensource implementation of the Open Financial eXchange specification"; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index ba7a0af0bf5..9be217a800d 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; propagatedBuildInputs = [ libgcrypt ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 1c88167078f..6d7606428f6 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; }; - buildInputs = [ pkgconfig libsigcxx ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsigcxx ]; patches = [ ./libpar2-0.4-external-verification.patch ]; diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index 34e9bb12754..c04c8d724d0 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ pkgconfig glib ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { homepage = http://libpseudo.sourceforge.net/; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 9eb3d345ecb..b19008449ab 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1m378vxh1sf9ry8k11x773xpy5f6cab5gkzqglz0jp9hc431r60r"; }; - buildInputs = [ autoreconfHook boost python2 libgsf pkgconfig bzip2 + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ boost python2 libgsf bzip2 xmlto gettext imagemagick doxygen ]; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 2e316a30a01..afa8a0451ac 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ pkgconfig glib python libgudev libmbim ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib python libgudev libmbim ]; configureFlags = ["--enable-mbim-qmux" ]; diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix index a5e4c4410c0..337d9423aa3 100644 --- a/pkgs/development/libraries/libqrencode/default.nix +++ b/pkgs/development/libraries/libqrencode/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0wiagx7i8p9zal53smf5abrnh9lr31mv0p36wg017401jrmf5577"; }; - buildInputs = [ autoconf automake pkgconfig libtool SDL2 libpng ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool SDL2 libpng ]; propagatedBuildInputs = [ SDL2 libpng ]; diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 945e11d1bce..8f8a54337f2 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { preAutoreconf = "rm m4/*"; postPatch = "sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c"; - buildInputs = [ pkgconfig autoreconfHook ladspaH openssl zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ladspaH openssl zlib ]; propagatedBuildInputs = [ librdf_raptor2 ]; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index dce85331c1b..adc00b56a28 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1mvvxqfsfg96rb6xv3fw7mcsqmyfnsb74sc53gnhpcpp4h2p6m83"; }; - buildInputs = [ pkgconfig gnutls zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnutls zlib ]; meta = with stdenv.lib; { homepage = http://www.librelp.com/; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index cb61982da09..c74a7981458 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1k6c0hmyzxh8459r790slh9vv9vwy9d7w3nlmrqypbx9mk855hgy"; }; - buildInputs = [ pkgconfig autoreconfHook readline texinfo ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ readline texinfo ]; propagatedBuildInputs = [ gdbm gmp libffi ]; configureFlags = [ diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index 756a53d5ee5..bc39a077e0c 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq"; }; - buildInputs = [ pkgconfig libusb1 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1 ]; meta = with stdenv.lib; { description = "Implementation of the VISA standard (for instrument control)"; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 0457c0eb9c4..3898071c858 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec patches = [ ./libsearpc.pc.patch ]; - buildInputs = [ automake autoconf pkgconfig libtool python2Packages.python python2Packages.simplejson ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ]; propagatedBuildInputs = [ glib jansson ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index ab10e34e230..812847ea123 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; }; - buildInputs = [ pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ]; meta = with stdenv.lib; { description = "Cross-platform shared library for serial port access"; diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 842471a263d..9fc6ff86773 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; }; - buildInputs = [pkgconfig m4]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ m4]; meta = { homepage = http://libsigc.sourceforge.net/; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 21710375ed7..53d927219e2 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig flac libogg libvorbis ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ flac libogg libvorbis ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index d5e72cae5fc..19ccc9159a3 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz"; }; - buildInputs = [ pkgconfig libxml2 sqlite zlib proj geos libiconv ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 sqlite zlib proj geos libiconv ]; configureFlags = "--disable-freexl"; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 951a939cbfb..3a01ff2944d 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -63,7 +63,8 @@ else stdenv.mkDerivation { '' else stdenv.mkDerivation { name = "libspotify-samples-${version}"; src = libspotify.src; - buildInputs = [ pkgconfig libspotify readline ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libspotify readline ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; patchPhase = "cp ${apiKey} appkey.c"; diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index 76aa014392b..0d014cb22a8 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "099iv13c03y1dsn2ngdhfx2cnax0aj2gfh00w55hlzpvmjm8dsml"; }; - buildInputs = [ automake autoconf openssl expat libtool pkgconfig check ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf openssl expat libtool check ]; dontDisableStatic = true; diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index 212a3a23939..992bad020ea 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { (fp "th_get_size-unsigned-int" "1ravbs5yrfac98mnkrzciw9hd2fxq4dc07xl3wx8y2pv1bzkwm41") ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = with stdenv.lib; { description = "C library for manipulating POSIX tar files"; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 97bc98b22d8..429cc5d9f18 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - buildInputs = [ libtool pkgconfig ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libtool ncurses ]; meta = with lib; { description = "Terminal keypress reading library"; diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index deab3043035..3a67e1267e2 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; }; - buildInputs = [ libkate pango cairo pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libkate pango cairo ]; meta = { homepage = http://code.google.com/p/libtiger/; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index d0b69e0348f..4e1f0badd7a 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [automake autoconf libtool ]; - buildInputs = [ boost pkgconfig openssl zlib python libiconv geoip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost openssl zlib python libiconv geoip ]; preConfigure = "./autotool.sh"; diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index bac29bc0ca8..58b052b8fae 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"; }; - buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 170af8f172e..82aba6b89f5 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; - buildInputs = [ autoreconfHook mesa ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ mesa ]; meta = { homepage = http://dri.freedesktop.org/wiki/S3TC; diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index 654bdd2e61f..387dbb22a81 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ibfdib277fhbqvxzan0bmglwnsl1y1rw2g8skvz82l1sfmmn752"; }; - buildInputs = [ autoreconfHook mesa ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ mesa ]; meta = { description = "A patent-free S3TC compatible implementation"; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 4db64186850..2f8963db0cd 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -13,7 +13,8 @@ in sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn"; }; - buildInputs = [ cmake pkgconfig ] ++ + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ] ++ (if stdenv.isDarwin then [darwin.apple_sdk.frameworks.Cocoa] else [gtk3]); preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index 8d1077ee6a0..b0066fa75f2 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58"; }; - buildInputs = [ pkgconfig dbus dbus_glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus dbus_glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { homepage = https://wiki.gnome.org/Attic/LibUnique; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index ebf81c67be0..a5adaa9ac17 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { ./1.1.6-include-terminator.patch ]; - buildInputs = [ pkgconfig glib gtk2 dbus_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 dbus_glib ]; # don't make deprecated usages hard errors preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 79863f40dff..ceb42fe2bfc 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with xorg; [ dri2proto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index 90c1f07da5a..6ca3d997e65 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [pkgconfig glib ncurses gpm]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ncurses gpm]; meta = with stdenv.lib; { homepage = http://libviper.sourceforge.net/; diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 50a4c7c8f24..8bac0f41dde 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b"; }; - buildInputs = [ pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index e58d964a625..472539ea24b 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ pkgconfig glib ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { homepage = http://libvterm.sourceforge.net/; diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index 5683e88b020..eed0c77af80 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v"; }; - buildInputs = [ zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ]; patches = [ ./CVE-2006-3376.patch ./CVE-2009-1364.patch diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 094edc36bbb..ed775fb4593 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { patches = [ ./install_introspection_to_prefix.patch ]; - buildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool ]; propagatedBuildInputs = [ libX11 gtk3 ]; meta = { diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 6e0809664cf..25454137410 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - buildInputs = [ pkgconfig gtk2 intltool xorg.libX11 xorg.libXres ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index b165631e23e..73fe5b55ab4 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0v1a0hj96i4jhb5833336s4zcslzb6md5cnmnrvgywx8cmw40c0c"; }; - buildInputs = [ boost pkgconfig librevenge zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost librevenge zlib ]; meta = with stdenv.lib; { homepage = http://libwps.sourceforge.net/; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 486d52a2e27..fd61ae84028 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ yacc flex xkeyboard_config libxcb ]; configureFlags = [ "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" diff --git a/pkgs/development/libraries/luaffi/default.nix b/pkgs/development/libraries/luaffi/default.nix index 38dfba4c462..1e4cf11d1fa 100644 --- a/pkgs/development/libraries/luaffi/default.nix +++ b/pkgs/development/libraries/luaffi/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1hv1y9i66p473hfy36nqj220sfrxdmbd75c1gpjvpk8073vx55ac"; }; - buildInputs = [ lua pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lua ]; patches = [ ./makefile-errors.patch diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 47b7029927c..bc5dda6cff1 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "001km4xy1ifwbg1c19ncc75h867fzfcxy9pxvl4pxqb64169xc1k"; }; - buildInputs = [ autoreconfHook pkgconfig mediastreamer openh264 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ mediastreamer openh264 ]; nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 67d2bdf1559..ff3ec3df5ed 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ libbson ]; - buildInputs = [ openssl perl pkgconfig which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl perl which ]; meta = with stdenv.lib; { description = "The official C client library for MongoDB"; diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix index 12b15c4937d..444ec9dac2b 100644 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1qfp4qvsx7rc2shj1chi2y7fxn10rwi70rw2y54b2i8a4jq7gpkb"; }; - buildInputs = [ pkgconfig which mono ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which mono ]; dontStrip = true; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index a344b8fa92f..d85d4f44407 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ eigen epoxy ]; - buildInputs = [ SDL fftw gtest pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL fftw gtest ]; meta = with stdenv.lib; { description = "High-performance, high-quality video filters for the GPU"; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 852946e7e40..4e4ddfb6389 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1k7vnanpgawnj84x2xs6md57pfib9p7c3acngqzkl3c2aqw8qay0"; }; - buildInputs = [ autoreconfHook sqlite ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ sqlite ]; meta = { description = "A flexible memory management and garbage collection library"; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 6e4b3e6a862..715d2cb90f4 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -16,7 +16,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ libX11 unzip cmake ois freetype libuuid boost pkgconfig (if withOgre then ogre else mesa) ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 unzip cmake ois freetype libuuid boost (if withOgre then ogre else mesa) ]; # Tools are disabled due to compilation failures. cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 8df9715a4f4..ee7d4765fb2 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { rev = "4c32e748863d5165cc0e3d6b54a8383f4836cdf1"; sha256 = "18szs3j3ig8wlcqngran0daxaj7j2qsmch0212ids6fymj1hgax4"; }; - buildInputs = [ openssl doxygen boost sqlite cryptopp pkgconfig python pythonPackages.sphinx]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl doxygen boost sqlite cryptopp python pythonPackages.sphinx]; preConfigure = '' patchShebangs waf ./waf configure \ diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 9f46305c1b5..e0adb312677 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - buildInputs = [ autoconf automake libtool pkgconfig glib readline makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool glib readline makeWrapper ]; preConfigure = '' substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index fbd0c053f04..e393d50bf9d 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - buildInputs = [libxml2 pkgconfig openssl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; configureFlags = '' diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index e0156be5da5..2351e3b0800 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - buildInputs = [libxml2 pkgconfig openssl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; configureFlags = '' diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 8f3a313b21d..9051d96eff7 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0bysdijvi9n0jk74iklbfhbp0kvv81a727lcfd5q03q2hkzjfm18"; }; - buildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ]; meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index 36a4c3b0bb6..f86e4d12097 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864"; }; - buildInputs = [ pkgconfig ptlib srtp libtheora speex + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ptlib srtp libtheora speex ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ]; propagatedBuildInputs = [ speex ]; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 160599837c5..5ce30b03969 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0gpjvzcfyilb96x5ywajxgkw42ipwp4my36z9cq686bd9vpp3q0g"; }; - buildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ]; propagatedBuildInputs = [ libxml2 pcre ]; diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index aafdd60e415..5eb08ecd601 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ]; - buildInputs = [ autoreconfHook pkgconfig pcsclite libusb doxygen libxslt ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ pcsclite libusb doxygen libxslt ]; preInstall = '' mkdir -p $out/etc diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 22cc5b416e7..27a9860c868 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { ./bootstrap ''; - buildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool ]; propagatedBuildInputs = [ ilmbase zlib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 0eb940c119e..b179ca8803c 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0gw2dsjxzpchg3s85kplwgp9xhd9l7q4fh37iy7r203pvir4k6s4"; }; - buildInputs = [ autoconf automake libtool pkgconfig libxml2 curl cmake pam sblim-sfcc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool libxml2 curl cmake pam sblim-sfcc ]; cmakeFlags = [ "-DCMAKE_BUILD_RUBY_GEM=no" diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix index eb3c1202367..8154fca29e8 100644 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m"; }; - buildInputs = [ pkgconfig glib pango libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib pango libX11 ]; meta = { description = "A compatibility library for pango>1.30.*"; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index b9762e284e6..6b8ba68adb7 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake qhull flann boost eigen pkgconfig libusb1 libpcap + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake qhull flann boost eigen libusb1 libpcap libpng vtk qt4 libXt ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index f59c538856c..9d7d7552cfc 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17a2cssycl7fh44xikmhszigx57vvn0h2sjsnmsy3772kfj796b1"; }; - buildInputs = [ pkgconfig openssl autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ openssl ]; meta = with stdenv.lib; { homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index bc37cfb3d18..f892540ae5c 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ sphinxbase ]; - buildInputs = [ pkgconfig python27 swig2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python27 swig2 ]; meta = { description = "Voice recognition library written in C"; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 41f29a1a6b1..c55d1711321 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"; }; - buildInputs = [ pkgconfig libjack2 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; configureFlags = [ "--disable-mac-universal" ]; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 44ecdcb2f65..26941795906 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - buildInputs = [ autoreconfHook zlib ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index b7c456df85c..06154e0008b 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" ]; - buildInputs = [ autoreconfHook zlib ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib ]; # The generated C++ code uses static initializers which mutate a global data # structure. This causes problems for an executable when: diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index 3a03d5c8b4b..b9ad506e20a 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { inherit src; - buildInputs = [ autoreconfHook pkgconfig protobuf zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ protobuf zlib ]; meta = with stdenv.lib; { homepage = http://github.com/protobuf-c/protobuf-c/; diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index ecea72d2e8f..c5d3d741130 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-std=gnu++98"; - buildInputs = [ pkgconfig bison flex unixODBC openssl openldap + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bison flex unixODBC openssl openldap cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix index e133256e900..4fe9c90232a 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix @@ -8,7 +8,8 @@ with stdenv.lib; qtSubmodule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ pkgconfig gstreamer gst-plugins-base libpulseaudio] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gstreamer gst-plugins-base libpulseaudio] ++ optional (stdenv.isLinux) alsaLib; outputs = [ "out" "dev" "bin" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 1bd7305867d..ff017279dc6 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0yp8vmj3yc564hcmhx46ssyn8qayywnsrg4wg67qk6jw967qgwsn"; }; - buildInputs = [ zlib perl pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib perl python ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index bb709e952f8..5629164f160 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; }; - buildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ librep gtk2 ]; patchPhase = '' diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index b0707ad15f0..364a4d4794a 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0x9bm2nqd6w2f35w2sqcp7h5z34i4w7mdg53m0vzjhffnnq6637z"; }; - buildInputs = [ pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsamplerate libsndfile fftw vampSDK ladspaH ]; meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 0023427f1ba..96855067523 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "164j43am4hka2vbzw4n52zy7rafgp6kmkgbcbvap368az644mr73"; }; - buildInputs = [ pcre pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pcre python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index f15c72498b2..4bdc9503c9a 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj"; }; - buildInputs = [ boost fcgi openssl opensaml-cpp log4shib pkgconfig xercesc xml-security-c xml-tooling-c ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ]; nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix new file mode 100644 index 00000000000..9d0aca0ab14 --- /dev/null +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }: + +stdenv.mkDerivation rec { + version = "2.3.1"; + name = "silgraphite-2.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz"; + sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype libXft pango fontconfig]; + + NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; + + meta = { + description = "An advanced font engine"; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index a399db1b71f..a5dc1f41e98 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0xdg6bc02bl8yz39l5i2skczfg17q4lif0qqan0dhvk0mibpcpj7"; }; - buildInputs = [ pkgconfig freetype cmake ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype cmake ]; patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ]; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 9bae9feb693..17195febe13 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { postUnpack = ''sourceRoot="$sourceRoot/unix"''; - buildInputs = [ python tcl tk vorbis-tools pkgconfig xlibsWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 01ea4c4a162..57f81aa4613 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x"; }; - buildInputs = [ pkgconfig python serd ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python serd ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 6f7d154bbe8..ff461f1b8e6 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv"; }; - buildInputs = [ pkgconfig sqlite expat zlib proj geos libspatialite readosm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ]; configureFlags = "--disable-freexl"; diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index e82b2fe045b..57c3ae40fd9 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation (rec { sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp"; }; - buildInputs = [ swig2 python27 pkgconfig bison ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ swig2 python27 bison ]; meta = { description = "Support Library for Pocketsphinx"; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index b4b29b54881..ce4fca6da70 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; - buildInputs = [ libX11 libxcb pkgconfig xcbutil ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxcb xcbutil ]; meta = { homepage = http://www.freedesktop.org/software/startup-notification; diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index e4a767579ab..35bacff0525 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8"; }; - buildInputs = [ pkgconfig check cppunit perl pythonPackages.wrapPython ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ check cppunit perl pythonPackages.wrapPython ]; propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ]; diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index ddb880e6bf2..f1ae1ea5db0 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; }; - buildInputs = [ pkgconfig nss nspr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ nss nspr ]; meta = with stdenv.lib; { description = "Secure PIN handling using NSS crypto"; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 44f6cabd35a..13497f7727f 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr"; }; - buildInputs = [ pkgconfig icu clucene_core curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ icu clucene_core curl ]; prePatch = '' patchShebangs .; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index bc9e861df9c..ec26c9f567b 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = [dbus_glib glib gobjectIntrospection]; - buildInputs = [pkgconfig libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23; preConfigure = '' substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 2258f28b9c4..843c6157479 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { "--with-tcl=${tcl}/lib" ]; - buildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ] ++ stdenv.lib.optional stdenv.isDarwin fontconfig; propagatedBuildInputs = [ tcl libXft ]; diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 94223378151..26c040721bd 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4"; }; - buildInputs = [ autoconf gtk_doc automake libtool pkgconfig glib libsoup gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf gtk_doc automake libtool glib libsoup gobjectIntrospection ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index cf34c96a2fe..4742e217013 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - buildInputs = [ libtool pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libtool ]; meta = with lib; { description = "A very basic terminfo library"; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index f4ec0242224..e4e053805af 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { # Works around bunch of "format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'" warnings NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; - buildInputs = [ pkgconfig libusb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb ]; propagatedBuildInputs = [ libusb ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index c7b8ddd8d6f..4522ecc1bb6 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "166svcav6axkrlb3i4rbf6dkwjnqdf69xw339az1f5yabj72pqqs"; }) ]; - buildInputs = [ libvdpau mesa libva pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvdpau mesa libva ]; preConfigure = '' patch -p0 < ${libvdpau08patch} # use -p0 instead of -p1 diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 3a7f8770e6c..ee014fd46da 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { version = "1.6.2"; name = "vmmlib-${version}"; - buildInputs = [ stdenv pkgconfig cmake boost blas ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv cmake boost blas ]; src = fetchFromGitHub { owner = "VMML"; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index f62279786c6..15a9e98b04e 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { inherit version src; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake git python3 python3Packages.lxml glslang spirv-tools x11 libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index be661d0d270..5d4caed890a 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake boost pkgconfig doxygen qt48Full libharu + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake boost doxygen qt48Full libharu pango fcgi firebird libmysql postgresql graphicsmagick glew openssl pcre ]; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index 7ab6041e86d..bbbf9af29e5 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { "--disable-static" ]; - buildInputs = [ xalanc xercesc openssl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xalanc xercesc openssl ]; meta = { homepage = http://santuario.apache.org/; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index c64970f8f86..8553e4b2a9a 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n"; }; - buildInputs = [ makeWrapper libxml2 gnutls libxslt pkgconfig libgcrypt libtool openssl nss ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper libxml2 gnutls libxslt libgcrypt libtool openssl nss ]; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 252bcd02faf..e759e65dfc6 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; - buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib sqlite gnome3.gnome_common intltool libtool dbus_libs telepathy_glib vala_0_23 dbus_glib gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 961220bb783..2c9d27a8b6a 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec{ sha256 = "11pk8a5manr751jhy0xrql57jzab57lwqjxbpd8kvm9m8b51icwq"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = with stdenv.lib; { description = "Scaling, colorspace conversion and dithering library"; diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index 38ecfcdf9a9..091d1adfefb 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ fuse pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; postPatch = '' # very ugly way of replacing the adb calls diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 24a67a38f3c..b419971921b 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -11,7 +11,8 @@ buildOcaml rec { sha256 = "164gyrs6zxr5pyljwpjgd4knwlrkcmamsq3gvkkkvgf9rmhrl3zf"; }; - buildInputs = [ ncurses pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ libffi ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 635572ea9c8..4f586f2f99e 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; }; - buildInputs = [ ocaml pkgconfig fontconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml fontconfig ]; makeFlags = "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/ OCAML_HAVE_OCAMLOPT=yes"; meta = { diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 0f1facd6518..1d5aabf3004 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { ''; - buildInputs = [ocaml findlib pkgconfig gdome2 libxslt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ocaml findlib gdome2 libxslt]; propagatedBuildInputs = [gdome2]; meta = { diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 2aa0842c55f..5dc303b59f4 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - buildInputs = [ ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 67f579eb469..d6e56126018 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; }; - buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 58e93b4f837..b5bcb0de1ee 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0rgrpgwrgphw106l1xawxir002b7rmzc23rcxhv8ib6rymp1divx"; }; - buildInputs = [pkgconfig ocaml findlib gmetadom gtkmathview lablgtk]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib gmetadom gtkmathview lablgtk]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index fc721dc4c9a..99438cfc20c 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -26,7 +26,8 @@ buildOcaml rec { inherit sha256; }; - buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml_oasis which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] ++ stdenv.lib.optional ppxSupport ppx_tools; propagatedBuildInputs = [ result ] diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 80ae140a3fc..165dda1fa02 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; - buildInputs = [ ocaml automake gnum4 autoconf unzip pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml automake gnum4 autoconf unzip findlib freetype lablgtk cairo gdk_pixbuf gtk2 pango ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix index a4e4bf8674f..d9cab2a759d 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w"; }; - buildInputs = [ ocaml findlib ocamlbuild pkgconfig cairo ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib ocamlbuild cairo ] ++ optionals enableGtkSupport [ gtk2 ]; # lablgtk2 is marked as a propagated build input since loading the diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 51a30d7c91a..9944cf821c5 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6"; }; - buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index a5fd2d5076d..e8441cf6937 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; - buildInputs = [ocaml pkgconfig findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 4ce3ac6dff3..eb25982a69b 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { sha256 = "1fmz38w2cj9fny4adqqyil59dvndqkr59s7wk2gqs47r72b6sisa"; }; - buildInputs = [ autoreconfHook ocaml findlib ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ocaml findlib ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index cfa90226678..38e1b3c7467 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0rwsx1nfa3xqmbygim2qx45jqm1gwf08m70wmcwkx50f1qk3l551"; }; - buildInputs = [ ocaml findlib ocamlbuild pkgconfig sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib ocamlbuild sqlite ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 01fa5b7ba6a..1b90a539ac8 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { sha256 = "13af37w2wybx8yzgjr5zz5l50402ldl614qiwphl1q69hig5mag2"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg result pkgconfig opam ocb-stubblr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib ocamlbuild topkg result opam ocb-stubblr ]; propagatedBuildInputs = [ SDL2 ctypes ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 2cb4fdcd301..5dc6a9056ad 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { inherit (param) url sha256; }; - buildInputs = [ ocaml findlib pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; patchPhase = "patchShebangs ./z_pp.pl"; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 7e80acb97c4..74fa75e7aa5 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -103,7 +103,8 @@ stdenv.mkDerivation rec { # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html # # (stack protection is disabled above for gcc 4.8 compatibility.) - buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index 68a08334375..54f99bf8afc 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9"; }; - buildInputs = [ pkgconfig pure ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; meta = { diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 082a8c88c61..c29e508cc65 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]); - buildInputs = [ pkgconfig hsEnv pure ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ hsEnv pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; meta = { diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index b51f2ff5e87..d5b0a7dbde5 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda"; }; - buildInputs = [ pkgconfig pure ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pure ]; propagatedBuildInputs = [ pandoc gawk getopt ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; preInstall = '' diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 22f3579bae3..f94db1bdbe9 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -30,7 +30,8 @@ buildPythonPackage rec { tests/run/cpdef_enums.pyx ''; - buildInputs = [ glibcLocales pkgconfig gdb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glibcLocales gdb ]; # For testing nativeBuildInputs = [ numpy ncurses ]; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index ab6e70a9a64..c8f122098da 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -14,7 +14,8 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa postPatch = "patchShebangs ."; - buildInputs = [ pkgconfig dbus dbus_glib ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus dbus_glib ] ++ lib.optionals doCheck [ dbus_tools pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 4f39d1097b1..36181bfb3f9 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { "--enable-openmp" ]; - buildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ boost diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 9b2821380b9..e9bae3f8206 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -28,7 +28,8 @@ in buildPythonPackage rec { preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; - buildInputs = [ hdf5 cython pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ hdf5 cython ] ++ optional mpiSupport mpi ; propagatedBuildInputs = [ numpy six] diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 284736fd475..b4366ab791f 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -31,7 +31,8 @@ in buildPythonPackage rec { }) ]; - buildInputs = [ python pkgconfig cairo xlibsWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python cairo xlibsWrapper ]; configurePhase = '' ( diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index ce7210391c6..6afd10596bc 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -13,7 +13,8 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - buildInputs = [ pkgconfig glib gobjectIntrospection ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gobjectIntrospection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index b72bd8b9b52..63a21cb2bef 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -20,7 +20,8 @@ buildPythonPackage rec { configureFlags = "--disable-introspection"; - buildInputs = [ pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; # in a "normal" setup, pygobject and pygtk are installed into the # same site-packages: we need a pth file for both. pygtk.py would be diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 0940ef00ac9..9b9adc64b75 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -11,7 +11,8 @@ buildPythonPackage rec { sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d"; }; - buildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ] ++ stdenv.lib.optional (libglade != null) libglade; propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 499634236ac..7b89e6d1b28 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -13,7 +13,8 @@ buildPythonPackage { patches = [ ./codegendir.patch ]; - buildInputs = [ python pkgconfig pygobject2 glib pygtk gnome2.gtksourceview ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python pygobject2 glib pygtk gnome2.gtksourceview ]; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index cf1e17d3141..b4376730e62 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -37,7 +37,8 @@ in buildPythonPackage { ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" ''; - buildInputs = [ pkgconfig makeWrapper qt4 lndir dbus_libs ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper qt4 lndir dbus_libs ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index bf1f9d14b77..2b0b43478aa 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -39,7 +39,8 @@ let in { - atk = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + nativeBuildInputs = [ pkgconfig ]; + atk = attrs: { buildInputs = [ gtk2 pcre ]; }; bundler = attrs: let @@ -57,7 +58,8 @@ in }; cairo = attrs: { - buildInputs = [ gtk2 pcre pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; }; capybara-webkit = attrs: { @@ -81,29 +83,35 @@ in }; ffi = attrs: { - buildInputs = [ libffi pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libffi ]; }; gpgme = attrs: { buildInputs = [ gpgme ]; }; - gio2 = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + nativeBuildInputs = [ pkgconfig ]; + gio2 = attrs: { buildInputs = [ gtk2 pcre ]; }; gitlab-markup = attrs: { meta.priority = 1; }; - glib2 = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + nativeBuildInputs = [ pkgconfig ]; + glib2 = attrs: { buildInputs = [ gtk2 pcre ]; }; gtk2 = attrs: { - buildInputs = [ gtk2 pcre pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; }; - gobject-introspection = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + nativeBuildInputs = [ pkgconfig ]; + gobject-introspection = attrs: { buildInputs = [ gtk2 pcre ]; }; grpc = attrs: { - buildInputs = [ openssl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; }; hitimes = attrs: { @@ -166,7 +174,8 @@ in }; pango = attrs: { - buildInputs = [ gtk2 xlibs.libXdmcp pcre pkgconfig xlibs.libpthreadstubs ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 xlibs.libXdmcp pcre xlibs.libpthreadstubs ]; }; patron = attrs: { @@ -204,7 +213,8 @@ in }; rmagick = attrs: { - buildInputs = [ imagemagick pkgconfig which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ imagemagick which ]; }; ruby-lxc = attrs: { @@ -219,7 +229,8 @@ in ]; }; rugged = attrs: { - buildInputs = [ cmake pkgconfig openssl libssh2 zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake openssl libssh2 zlib ]; }; scrypt = attrs: @@ -296,7 +307,8 @@ in xapian-ruby = attrs: { # use the system xapian dontBuild = false; - buildInputs = [ xapian_1_2_22 pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xapian_1_2_22 zlib ]; postPatch = '' cp ${./xapian-Rakefile} Rakefile ''; diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index cbe6e5fdde9..c960f54ab20 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; preConfigure = "patchShebangs src/bin-to-c-source.py"; - buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake zlib curl elfutils python libiberty binutils ]; meta = with stdenv.lib; { description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index 6b7ba2a81cb..31530a2751b 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [pkgconfig readline libusb perl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ readline libusb perl] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 1572fff40b9..a4cf3bcd649 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { '(*info->fprintf_func) (info->stream, "%s", errmsg);' ''; - buildInputs = [pkgconfig readline libusb libewf perl zlib openssl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ readline libusb libewf perl zlib openssl] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index f5c5c616979..9dc1e2db8c0 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation { sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; - buildInputs = [sqlite pkgconfig perl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [sqlite perl] ++ stdenv.lib.optional buildllvmsparse llvm ++ stdenv.lib.optional buildc2xml libxml2; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 6898b7eee54..945f6c80af5 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g" ''; - buildInputs = [ pkgconfig libxml2 llvm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 llvm ]; doCheck = true; meta = { diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 56d4b831460..253aadb86d7 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { ./impure-dirs.patch ]; - buildInputs = stdenv.lib.optionals guileSupport [ guile pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = stdenv.lib.optionals guileSupport [ guile ]; configureFlags = stdenv.lib.optional guileSupport "--with-guile"; diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix index 858fc5b48df..5da32f2334a 100644 --- a/pkgs/development/tools/build-managers/nant/default.nix +++ b/pkgs/development/tools/build-managers/nant/default.nix @@ -15,7 +15,8 @@ let name = "nant-bootstrapped-${version}"; inherit src; - buildInputs = [ pkgconfig mono makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mono makeWrapper ]; buildFlags = "bootstrap"; @@ -35,7 +36,8 @@ in stdenv.mkDerivation { name = "nant-${version}"; inherit src; - buildInputs = [ pkgconfig mono makeWrapper nant-bootstrapped ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mono makeWrapper nant-bootstrapped ]; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 828fe20ecc5..fd27d927bd5 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0jzp1llq6635ldb7j9qb29j2k0x5mblimdqg3179dvva1hv0ia23"; }; - buildInputs = [ fuse pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; configurePhase = '' sed -i 's/`git describe`/v${version}/g' Tupfile diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index ef339d47ea0..5f0b6b628cb 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -11,6 +11,7 @@ python2Packages.buildPythonApplication { }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ libxslt pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxslt intltool ]; propagatedBuildInputs = [ libxml2Python ]; } diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 030693714f0..15b552fb4aa 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { # Note: Glib support is optional, but it's quite useful (e.g., it's # used by Guile-GNOME). - buildInputs = [ guile pkgconfig glib guile_lib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ guile glib guile_lib ]; propagatedBuildInputs = [ libffi ]; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index abfbc9a6c47..1f4c21cb7f9 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl"; }; - buildInputs = [ pkgconfig libzip glib libusb1 libftdi1 check libserialport + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa doxygen glibmm python ]; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index e421a709c89..57bb159c586 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a"; }; - buildInputs = [ pkgconfig glib python3 libsigrok check ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib python3 libsigrok check ]; meta = with stdenv.lib; { description = "Protocol decoding library for the sigrok signal analysis software suite"; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index ca8c2de9630..37c5dab8ce8 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = http://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc"; }; - buildInputs = [ intltool pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ cp -v ./misc/*.el $out/share/emacs/site-lisp diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index 77cb8676669..ca6cb14c2a4 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0jhh1h1k5b41v2ycq8kn43nkrkh0b9l7xjmw38rak871g3z3hix1"; }; - buildInputs = [ pkgconfig gcc perl libusb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gcc perl libusb ]; meta = { license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index a82fae13255..2adc61ce645 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0z0k4qvz4ypxs4dmgrzv9da7ylf6jr94ra6nylqpfrdspvjzwj92"; }; - buildInputs = [ pkgconfig glib libuuid popt elfutils ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libuuid popt elfutils ]; meta = with stdenv.lib; { description = "Command-line tool and library to read and convert LTTng tracefiles"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 4fec00a2fd7..bd08c6c4c05 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -13,7 +13,8 @@ in pythonPackages.buildPythonApplication rec { sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2"; }; - buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 itstool intltool glib gtk3 gnome3.defaultIconTheme makeWrapper libwnck3 ]; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 17ef6647050..cef399eb5c1 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -16,7 +16,8 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake pkgconfig which procps libiberty_static]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index a6de652f900..27dadd08e56 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - buildInputs = [ pkgconfig glib dbus dbus_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib dbus dbus_glib ]; meta = { homepage = https://hal.freedesktop.org/releases/; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index b8e2a9a189b..cdddad5155f 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1g329aapdvbzhr39wyh295shpfq5f0nlzsqkjnr8l6zzak7f4yrg"; }; - buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ gettext libtool makeWrapper texinfo ]; meta = with stdenv.lib; { description = "A cross-platform file change monitor with multiple backends"; diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index 4ea939b0156..ca8d0c6f717 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ glib bison flex pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib bison flex ]; meta = { description = "Preprocessor for making GObjects with inline C code"; diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index f552fe00566..25043f89463 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - buildInputs = [ pkgconfig globalplatform pcsclite makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ globalplatform pcsclite makeWrapper ]; postFixup = '' wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 2641a1ed04f..71e9ee27a9e 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - buildInputs = [ gtk2 pkgconfig hicolor_icon_theme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 hicolor_icon_theme ]; meta = { homepage = http://gtkdialog.googlecode.com/; diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index 8449cf9b6f3..d1415569ca3 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; }; - buildInputs = [ bison flex gperf ncurses pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bison flex gperf ncurses ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 5cf8b664941..45dd86db41b 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; - buildInputs = [ pkgconfig glib gtk2 popt babeltrace ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 popt babeltrace ]; meta = with stdenv.lib; { description = "Graphical trace viewer for LTTng trace files"; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index bdc7f4f0414..cace3e7f0a9 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0bndnm3mgcqkw5dhwy5l1zri4lqvjbhbn5rxz651fkxlkhab8bhm"; }; - buildInputs = [intltool glib pkgconfig libgsf libuuid gcab bzip2]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [intltool glib libgsf libuuid gcab bzip2]; meta = with stdenv.lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 3349213a741..2ab0dbd1b5f 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; }; - buildInputs = [ libftdi libusb1 pkgconfig hidapi ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libftdi libusb1 hidapi ]; configureFlags = [ "--enable-jtag_vpi" diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 2443c280443..cde8eae0f7f 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { setupHook = [ ./setup-hook.sh ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; doCheck = true; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 540db210eb4..45a31ad66f2 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "sysbench-1.0.6"; - buildInputs = [ autoreconfHook pkgconfig vim libmysql libaio ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ vim libmysql libaio ]; src = fetchFromGitHub { owner = "akopytov"; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index b0d5bcd28f7..544fc213273 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0nwcf5mh3ba0g23zw7ym73pgpfdass412k2fy67ryr9vnc709jkj"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; # remove when https://github.com/universal-ctags/ctags/pull/1267 is merged patches = [ ./sed-test.patch ]; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 84e14678924..27596878f34 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; }; - buildInputs = [ glib pkgconfig python scons ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib python scons ]; buildPhase = "scons prefix=$out"; installPhase = "scons prefix=$out install"; diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ac87870eb59..dc447465b23 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { --replace "/bin/cp" "${coreutils}/bin/cp" ''; - buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ binutils zlib popt linuxHeaders libiberty_static ] ++ stdenv.lib.optionals withGUI [ qt4 ]; configureFlags = [ diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 4be334e20ed..001560df0a0 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s"; }; - buildInputs = [ binutils pkgconfig gtk2 glib pango libglade ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ binutils gtk2 glib pango libglade ]; meta = { homepage = http://sysprof.com/; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index a16bdbc539a..89a1b5fe0aa 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -14,7 +14,8 @@ let stapBuild = stdenv.mkDerivation { name = "systemtap-${version}"; src = fetchgit { inherit url rev sha256; }; - buildInputs = [ elfutils pkgconfig gettext python2 pythonPackages.setuptools ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ elfutils gettext python2 pythonPackages.setuptools ]; # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs postPatch = '' substituteInPlace buildrun.cxx --replace \ diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index f2b7d67915a..2d36b09adb3 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan"; }; - buildInputs = [ pkgconfig glib libsigrok libsigrokdecode ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libsigrok libsigrokdecode ]; meta = with stdenv.lib; { description = "Command-line frontend for the sigrok signal analysis software suite"; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index c4dd8725a1c..e3dda509427 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" ''; - buildInputs = [ which git avrbinutils avrgcc avrlibc libelf pkgconfig freeglut mesa ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut mesa ]; meta = with stdenv.lib; { description = "A lean and mean Atmel AVR simulator"; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 9028a796381..a5625c225df 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -10,7 +10,8 @@ buildGoPackage rec { goPackagePath = "github.com/projectatomic/skopeo"; excludedPackages = "integration"; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs pkgconfig ostree ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree ]; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index 43256024254..59252a93863 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "02pqaaahra4wbv325264qh5i17mxwicmjx9nm33nw2dpmfmg9xhr"; }; - buildInputs = [ pkgconfig libusb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb ]; buildPhase = '' make all misc diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index c700fd81a24..ad11542f04b 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0ca067gg5z1798bazwzgg2yd2mbysvk8i2q2v3i8d0d188y2hj84"; }; - buildInputs = [ python pkgconfig glib vala_0_28 ctpl libgee libsoup fcgi ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python glib vala_0_28 ctpl libgee libsoup fcgi ]; configurePhase = ''python waf configure --prefix=$out''; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index a7d6bbc63d9..0c95aa98894 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "03nnv4m2xmswr0020hssajncdb8sy95jp5yccsm53sgxga4r8igg"; }; - buildInputs = [ pkgconfig libjpeg libX11 curl libogg libvorbis + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjpeg libX11 curl libogg libvorbis freetype openal mesa libXxf86vm ]; patchPhase = '' diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 77809f1095f..35f5699a231 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms"; }; - buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib unzip]; preConfigure='' diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 99f2b71b449..37176750763 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; sha256 = "0i57smxmbhxj0wgvxq845ba9zsn5nx5wmzkl71rdchyd4q5jmida"; }; - buildInputs = [ autoreconfHook pkgconfig SDL SDL_mixer SDL_net ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ SDL SDL_mixer SDL_net ]; patchPhase = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 2044782c1bd..3fceb796dde 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm"; }; - buildInputs = [ pkgconfig gtk2 freeglut SDL mesa libXi libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 freeglut SDL mesa libXi libXmu ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix index 1b587331371..52aec1b8a59 100644 --- a/pkgs/games/d1x-rebirth/default.nix +++ b/pkgs/games/d1x-rebirth/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "13p3nfqaa78h6bl0k8mdsn90ai99wbqaj6qlsjsgsn8imficivsv"; }; - buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons SDL mesa physfs SDL_mixer ]; installPhase = '' scons prefix=$out install diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix index 05d73a4eafe..566b6f8cc82 100644 --- a/pkgs/games/d2x-rebirth/default.nix +++ b/pkgs/games/d2x-rebirth/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "08mg831afc1v068c0ds70lhmxk8a54494jls7s9hwf02ffhv3sx8"; }; - buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons SDL mesa physfs SDL_mixer ]; installPhase = '' scons prefix=$out install diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 649d69c6fe6..28d273ad5cc 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { ./arch.patch ]; - buildInputs = [ pkgconfig SDL libogg libvorbis zlib unzip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL libogg libvorbis zlib unzip ]; enableParallelBuilding = true; diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index f5984806bd1..2ab6e04e2d8 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fillets/fillets-ng-data-${version}.tar.gz"; sha256 = "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh"; }; - buildInputs = [SDL lua5_1 pkgconfig SDL_mixer SDL_image SDL_ttf]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [SDL lua5_1 SDL_mixer SDL_image SDL_ttf]; postInstall='' mkdir -p "$out/share/games/fillets-ng/" tar -xf ${data} -C "$out/share/games/fillets-ng/" --strip-components=1 diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index 466cfda7c4a..dd14edf8eb1 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec{ sha256 = "0274l1p71ps222i62whqfkg80fcc8m4w2hmpbrbbd5gh8kfpman3"; }; - buildInputs = [ pkgconfig cmake perl gmp libtap gperf + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake perl gmp libtap gperf perlPackages.TemplateToolkit perlPackages.StringShellQuote perlPackages.GamesSolitaireVerify perlPackages.TaskFreecellSolverTesting python3Packages.python python3Packages.random2 ]; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 4269d3a74db..114eaa3027b 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ gtk2 glib pkgconfig mesa wxGTK libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 glib mesa wxGTK libX11 xproto ]; preBuild = '' sed -e ' diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index e74177a1ee3..1527a22b4ab 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0gsfl6qbj529d1jg3bkyj9m7bvb566wd7pq5fslgg5yn6c6rbjk6"; }; - buildInputs = [ pkgconfig python glib gtk2 readline ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python glib gtk2 readline ]; configureFlags = [ "--with-gtk" "--with--board3d" ]; diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 2c360241fb9..ffa414cac3a 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-llua -lgcc_s"; - buildInputs = [ SDL SDL_ttf SDL_image SDL_mixer pkgconfig lua zlib unzip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL SDL_ttf SDL_image SDL_mixer lua zlib unzip ]; configurePhase = '' { echo 2; echo $out; } | ./configure.sh diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 83f8f1a8be7..5ce50d6b463 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1dc75jd5bx5w3rr4zaqyf2cci3vzgac18fia0h04fzsfwlhrz5g0"; }; - buildInputs = [ makeWrapper pkgconfig intltool curl gtk3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper intltool curl gtk3 ]; postInstall = '' wrapProgram $out/bin/klavaro \ diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix index 1d50ea14551..d6a2afb26cb 100644 --- a/pkgs/games/liberal-crime-squad/default.nix +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0mcldn8ivlfyjfx22ygzcbbw3bzl0j6vi3g6jyj8jmcrni61mgmb"; }; - buildInputs = [ ncurses autoreconfHook SDL2 SDL2_mixer ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ncurses SDL2 SDL2_mixer ]; meta = with stdenv.lib; { description = "A humorous politically themed ncurses game"; diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 5718ed1918e..72b0b0d00cd 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0sgnr0wrw3hglcnsyvipll7icfv69ssmyw584zfhk1rgramlkzyb"; }; - buildInputs = [ pkgconfig gtk openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk openssl ]; meta = { description = "Mascot Constructive Pilot for X"; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 80769ab4f57..3fafcfddcbf 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation { sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv"; }; - buildInputs = [ cmake pkgconfig git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; configurePhase = '' diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index ab2cd1090fb..40915c98485 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a"; }; - buildInputs = [ cmake pkgconfig SDL SDL_mixer SDL_net ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 7c2d168d6c3..2a162525388 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./cmakepaths.patch ]; - buildInputs = [ cmake ogre cegui boost sfml openal ois pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ogre cegui boost sfml openal ois ]; meta = with stdenv.lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index b15406b1e3d..53c2cc5d073 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -23,7 +23,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph_ SDL2 unshield openal pkgconfig libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph_ SDL2 unshield openal libXt ]; meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 43cdc2031bf..8b8a6fed841 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig , mesa}: let - buildInputs = [scons SDL SDL_image boost libpng SDL_mixer pkgconfig mesa]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; s = # Generated upstream information rec { baseName="pingus"; diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 254b65cc4d9..3898ddba713 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "1yqypk5wmia8fqyrg9mn9xw6yfd0fpkxj1355csw1hgx8mh44y1d"; }; - buildInputs = [ gtk2 pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 intltool ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix index 27dabe1deac..b6a74ad8be6 100644 --- a/pkgs/games/rftg/default.nix +++ b/pkgs/games/rftg/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0j2y6ggpwdlvyqhirp010aix2g6aacj3kvggvpwzxhig30x9vgq8"; }; - buildInputs = [ gtk2.dev pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2.dev ]; meta = { homepage = http://keldon.net/rftg/; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index a118a75aefe..0d0602524e7 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin ''; - buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index abad2188a0d..df89f9dc743 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { CPPFLAGS = "-I${SDL.dev}/include -I${SDL.dev}/include/SDL -I${SDL_mixer}/include"; - buildInputs = [ SDL SDL_mixer autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ SDL SDL_mixer ]; meta = { homepage = http://ri-li.sourceforge.net; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 1288ff1a27f..02f6026371f 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -115,7 +115,8 @@ let sourceRoot = "."; - buildInputs = [ pkgconfig zlib libpng bzip2 SDL SDL_mixer unzip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; configurePhase = let # Configuration as per the readme.txt and config.template diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 70601200a24..c147bfb77ad 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { ./gcc6.patch ]; - buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis makeWrapper enet libXcursor bullet openal ]; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index c90972db66e..ce0fc3f6c90 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0rd565ml6l927gyq158klhni7myw8mgllhv0xl1fg9m8hlzssgrv"; }; - buildInputs = [ SDL mesa SDL_image freealut openal libvorbis pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL mesa SDL_image freealut openal libvorbis ]; postPatch = '' sed -e '1i#include ' -i $(find . -name '*.c' -o -name '*.cpp') diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index d1416b0685a..c6f4b57a033 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -59,7 +59,8 @@ in stdenv.mkDerivation rec { library can be found. Obviously, though, this is a hack. */ NIX_LDFLAGS="-lgcc_s"; - buildInputs = [SDL SDL_image libpng libvorbis libogg libmikmod unzip pkgconfig mesa]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [SDL SDL_image libpng libvorbis libogg libmikmod unzip mesa]; postUnpack = '' mkdir -p uqm-${version}/content/packages diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 98fe9d7c6f6..27eef261426 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1"; }; - buildInputs = [ pkgconfig scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; buildPhase = '' cp -r --reflink=auto $data data diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index f83c5ac360a..85246aea2d5 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace snd_openal/snd_main.c --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 ''; - buildInputs = [ unzip pkgconfig zlib curl libjpeg libpng libvorbis libtheora + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip zlib curl libjpeg libpng libvorbis libtheora libXxf86dga libXxf86vm libXinerama SDL mesa openal makeWrapper ]; installPhase = '' diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 1f8e559b415..d005f6becad 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] ++ optionals stdenv.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index bdba1eb7b81..799b14dec1d 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; - buildInputs = [ pkgconfig perl cups dbus enscript ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl cups dbus enscript ]; preConfigure = '' diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 4e0b609fdb0..ffb2052ca0c 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation { substituteInPlace Makefile --replace /usr/local "$out" ''; - buildInputs = [ scons libX11 pkgconfig libusb1 boost glib dbus_glib]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons libX11 libusb1 boost glib dbus_glib]; meta = with stdenv.lib; { homepage = http://pingus.seul.org/~grumbel/xboxdrv/; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 9cf70db471c..4fff6f6b8c1 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; }; - buildInputs = [ udev ncurses pkgconfig bluez ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ncurses bluez ]; configureFlags = "--with-doxygen=no"; diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index f606e352a7b..8025cf766f0 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal libevdev libXdmcp portaudio libusb libpulseaudio libevdev libXdmcp portaudio libusb libpulseaudio diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index ca36d16072d..41dbfd1999c 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib pcre + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gcc cmake bluez ffmpeg libao mesa gtk2 glib pcre gettext libpthreadstubs libXrandr libXext libSM readline openal libevdev libXdmcp portaudio libusb libpulseaudio ]; diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix index 95d03c425e3..a17dd6a775e 100644 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -14,7 +14,8 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ SDL SDL_net SDL_sound libpng mesa autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ SDL SDL_net SDL_sound libpng mesa ]; desktopItem = makeDesktopItem { name = "dosbox"; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 9f33305ae14..b700b22807c 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; }; - buildInputs = [ pkgconfig cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ]; buildPhase = "cmake . && make"; installPhase = '' diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 172b2a2eb3e..8b2409b74c3 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2"; }; - buildInputs = [ pkgconfig gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; meta = { description = "An accurate, customizable Amiga Emulator"; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 34507a25252..bfe43403bc6 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; - buildInputs = [ pkgconfig gtk2 SDL nasm zlib libpng mesa ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 SDL nasm zlib libpng mesa ]; # Work around build failures on recent GTK+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 21e75a72d61..2006b74bdc6 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = g_strdup( \"${mednafen}/bin/mednafen\" )" ''; - buildInputs = [ pkgconfig gtk2 mednafen ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 mednafen ]; meta = with stdenv.lib; { description = "A GTK based frontend for mednafen"; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index ea35ee8ac54..7de9b576ef3 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0rmsvfn4zfvbhz6gf1xkb7hnwflv6sbklwjz2xk4dlpj4vcbjxcw"; }; - buildInputs = [ boost dash freetype libpng pkgconfig SDL which zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost dash freetype libpng SDL which zlib ]; buildPhase = '' dash m64p_build.sh PREFIX="$out" COREDIR="$out/lib/" PLUGINDIR="$out/lib/mupen64plus" SHAREDIR="$out/share/mupen64plus" diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 171453b89d5..5e5ce9edca4 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; }; - buildInputs = [ pkgconfig ffmpeg mesa freetype libxml2 coreutils python34 which SDL ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ffmpeg mesa freetype libxml2 coreutils python34 which SDL ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optionals stdenv.isLinux [ udev alsaLib libX11 libXext libXxf86vm libXdmcp libv4l libpulseaudio ]; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index c6f4df1e5c0..a45bb0b2ba1 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk2 pkgconfig libxml2 xlibsWrapper libpulseaudio]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk2 libxml2 xlibsWrapper libpulseaudio]; sourceRoot = "snes9x-${version}-src/gtk"; diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index be872250d03..41ba5a3b2e6 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1"; }; - buildInputs = [ pkgconfig SDL2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL2 ]; meta = { description = "An open-source Atari 2600 VCS emulator"; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index ca1881bdd5f..318993d08b6 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; - buildInputs = [ pkgconfig gtk2 alsaLib SDL ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index aec79f1c5cf..2d210ca0098 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -6,7 +6,8 @@ packageOverrides = pkgs : with pkgs; { sdlEnv = pkgs.myEnvFun { name = "sdl"; - buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net]; }; }; } diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index 36593794ed7..25441a30d86 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "147cr4aw1kw4gv3bhn0cska855kmyah8m70vdw1q2lwz56lbf4mb"; }; - buildInputs = [ pkgconfig jansson libsailing ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ jansson libsailing ]; INSTALL_PATH = "$(out)"; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index b13e9c7866c..a0dac519a0b 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { # Patch so that systemd is "found" when configuring. patches = [ ./systemd.patch ]; - buildInputs = [ which xfce.xfce4_dev_tools glib systemd pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which xfce.xfce4_dev_tools glib systemd libX11 libXScrnSaver libXxf86misc gtk3 dbus_glib wrapGAppsHook ]; preConfigure = '' diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 25994ba3562..7b280d770b3 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mesa xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index 7aada471145..500f7a9c5a3 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "10hx7k7ga8g08akwz8qrsvj8iqr5nd4siiva6sjx789jvf0sak7r"; }; - buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake docutils glib libpthreadstubs libXau libXdmcp xcbutil ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix index e5b6bf0d167..a278e6dc949 100644 --- a/pkgs/misc/screensavers/xssproxy/default.nix +++ b/pkgs/misc/screensavers/xssproxy/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7"; }; - buildInputs = [ glib pkgconfig xorg.libX11 xorg.libXScrnSaver dbus ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib xorg.libX11 xorg.libXScrnSaver dbus ]; makeFlags = [ "bindir=$(out)/bin" diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 887c179c59d..1aa1f347ab4 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc"; }; - buildInputs = [ python pkgconfig xlibsWrapper pam ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python xlibsWrapper pam ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 6ce337855d9..d302fbe6d4b 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6"; }; - buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which automake autoconf libtool vala_0_23 python intltool fuse ]; propagatedBuildInputs = [ ccnet curl ]; preConfigure = '' diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 114e18dc93f..4fef8d08043 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -14,7 +14,8 @@ in stdenv.mkDerivation rec { sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4"; }; - buildInputs = [ pkgconfig python pygtk gettext texinfo + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python pygtk gettext texinfo ghostscript librsvg gdk_pixbuf txt2man makeWrapper ]; diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix index 81609eff55a..4ec5b5da0a4 100644 --- a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix +++ b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; }; - buildInputs = [ pkgconfig intltool gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 ]; meta = { description = "A very flexible theme engine"; diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/misc/themes/gtk2/gtk-engines/default.nix index e64b13f9305..966190a5e76 100644 --- a/pkgs/misc/themes/gtk2/gtk-engines/default.nix +++ b/pkgs/misc/themes/gtk2/gtk-engines/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; - buildInputs = [ pkgconfig intltool gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 ]; meta = { description = "Theme engines for GTK+ 2"; diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 4cf53311070..67c5ff14087 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; }; - buildInputs = [ autoreconfHook pkgconfig fuse ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fuse ]; meta = { description = "Automounter in userspace"; diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 23e1f430dec..940dde1f75d 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "02b75fyfmm9m2iz59d3xa97cas4f697a4pzdxn1i64kjd36iv3yq"; }; - buildInputs = [ alsaLib pkgconfig gtk2 gtk3 fltk13 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib gtk2 gtk3 fltk13 ]; patchPhase = '' export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control" diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index eb5d2a31e83..b8ece86c140 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { # Remove patch once the kernel headers are updated patches = [ ./add-ip6-header.patch ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; postInstall = '' # The bridge utils build does not fail even if the brctl binary diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 2eb1888a85f..c09fc0f7dc4 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -89,7 +89,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - buildInputs = [ pkgconfig glib cmake libXinerama ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib cmake libXinerama ] ++ optionals docsSupport [ docbook2x libxslt man less ] ++ optional ncursesSupport ncurses ++ optional x11Support xlibsWrapper diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index f04f6f89760..20b64907c22 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ]; patchPhase = '' chmod +w ./scripts/gen-offsets.sh diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 47f49a3da40..ef8c55853a3 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] ++ stdenv.lib.optional enablePython "--enable-python"; - buildInputs = [ devicemapper openssl libuuid pkgconfig popt ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ devicemapper openssl libuuid popt ] ++ stdenv.lib.optional enablePython python2; meta = { diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index cf4f0386b49..e44a50233c3 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld"; }; - buildInputs = [ pkgconfig libvirt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt ]; RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index e97f911534a..e7a540b6671 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -9,7 +9,8 @@ let url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; - buildInputs = [gpm freetype fontconfig pkgconfig ncurses libx86]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [gpm freetype fontconfig ncurses libx86]; in stdenv.mkDerivation { inherit (s) name version; diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index ee94ad4226e..f2bb9bddd57 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -14,7 +14,8 @@ let version = "8"; in "TARGETDIR=$(out)/boot/efi/nixos/" "prefix=$(out)/" ]; - buildInputs = [ gnu-efi libsmbios popt pkgconfig gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnu-efi libsmbios popt gettext ]; propagatedBuildInputs = [ efivar ]; # TODO: Just apply the disable to the efi subdir hardeningDisable = [ "all" ]; diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 119621d9278..1494d9f06a8 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7"; }; - buildInputs = [ autoreconfHook pam ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pam ]; preConfigure = '' sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index c385971104d..a299fd0f433 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "163pqy39cca8cnf8rm8zr63ndsnr7rki9pf9j7dl9gyxmi7sx88s"; }; - buildInputs = [ autoconf automake dbus glib libtool pkgconfig udisks2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake dbus glib libtool udisks2 ]; preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index c3730dd8de5..55bc80a173e 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1h3rydnaswcmlradafpw8q18zj88bbziad2vb6gn0q7ydr48f3jm"; }; - buildInputs = [ autoreconfHook pkgconfig openssl attr keyutils asciidoc libxslt ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ openssl attr keyutils asciidoc libxslt ]; buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 2a6294e3b5b..ac064d9647a 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1klpvv98bnx1zm6aqalnri2vd7w80scmdaxr2qnblb6mz82whk1j"; }; - buildInputs = [ libnl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libnl ]; makeFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 6b79045ac67..43edd8723a0 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sourceRoot = "Jool-v${sourceAttrs.version}-src/usr"; - buildInputs = [ autoreconfHook pkgconfig libnl ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libnl ]; postPatch = '' chmod u+w -R ../common diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index f01f3928950..4f63a1ea069 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation { # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison libiberty libaudit makeWrapper ]; - buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++ + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ elfutils python perl newt slang libunwind binutils zlib ] ++ stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 8c2badc3d68..93d2ac8b031 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; - buildInputs = [ ncurses glib pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses glib gtk2 ]; meta = { homepage = http://latencytop.org; diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 7fe0a2be10f..81333ce790e 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; - buildInputs = [ pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ]; meta = { homepage = http://0pointer.de/public/; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index c7da0fcca2a..f20efcb3237 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0yqg73ns97jwjh1iyv0jr5qxb8k5sqq5ywfkx11lzfn5yj8k0126"; }; - buildInputs = [ pkgconfig libsepol pcre ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsepol pcre ] ++ optionals enablePython [ swig python ]; # Avoid this false warning: diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 9f71b4a1ed3..98ec778e2c2 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0kvi36jrvhspyyq0pjfdyvzvimdn27fvbdpf429qm3xdmfi78y2j"; }; - buildInputs = [ pkgconfig libxml2 perl autoreconfHook doxygen ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libxml2 perl doxygen ]; # It tries to install some Python stuff even when Python is disabled. installFlags = "pkgpythondir=$(TMPDIR)/python"; diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index 3d5a76144af..0d79027d8b7 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { # INFO: It is important to list 'systemd' first as for now miraclecast # links against a customized systemd. Otherwise, a systemd package from # a propagatedBuildInput could take precedence. - buildInputs = [ systemd autoreconfHook pkgconfig udev glib readline ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ systemd udev glib readline ]; meta = { homepage = https://github.com/albfan/miraclecast; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 58dc3a48173..4b5e7bbf3e3 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -17,7 +17,8 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - buildInputs = [ makeWrapper pkgconfig utillinux openssl libcap_ng python27 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper utillinux openssl libcap_ng python27 perl procps which ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index a4f52517df4..dfcd53ec778 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "091aq5zyc60wh21m1ryanjwknwxlaj9nvlswn5vjrmcdir5gnkm5"; }; - buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; patches = [ ./insert_utillinux_path_hooks.patch ]; diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 8ec46d64600..3801036f9e5 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; }; - buildInputs = [ pkgconfig fuse pcre ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse pcre ]; prePatch = '' # do not set sticky bit in nix store diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index fa3c2fc4c7e..4fd716ab8db 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig dbus libcap ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus libcap ]; meta = { homepage = http://0pointer.de/blog/projects/rtkit; diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 2dfc8f1b520..8b3ebd46c32 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; - buildInputs = [ automake autoconf pkgconfig udisks dbus_glib glib confuse ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf udisks dbus_glib glib confuse ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 158ff2299b1..303d6bcdaa6 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "132clk14j4nm8crln2jymdbbc2vhzar2j2hnxyh05m79pbq1lx24"; }; - buildInputs = [ pkgconfig libusb1 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1 ]; postInstall = '' diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index b00fc7296a0..94e5d998cd0 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2"; }; - buildInputs = [ pkgconfig dbus libnotify udisks2 gdk_pixbuf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus libnotify udisks2 gdk_pixbuf ]; NIX_CFLAGS_COMPILE = [ "-DENABLE_NOTIFICATIONS" ]; diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index e5c545c37bb..3b67171a474 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv"; }; - buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; prePatch = '' sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \ diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index d83e32bcb39..4b71aaeca3a 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb"; }; - buildInputs = [ libusb pkgconfig pmutils udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb pmutils udev ]; # shell thing didn't work so i replaced it using nix prePatch = '' diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index d0b8567c748..9c4bc4bda73 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l"; }; - buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux libtool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl flex bison groff libxml2 utillinux libtool which ]; enableParallelBuilding = true; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index bcbb6bb120e..8a669d78d57 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "10p2m2zbydbd5xjdgf8z4zgvl8diyb4k3bq1hzsl32r71daj3yk0"; }; - buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ]; # nix destroy with-modules arguments, when using configureFlags preConfigure = '' diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 7ff0584818d..84c24e68478 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - buildInputs = [ autoreconfHook systemd fcgi pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ systemd fcgi ]; # systemd 230 no longer has libsystemd-daemon as a separate entity from libsystemd postPatch = '' diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index a99f081b24e..8a773631ee6 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { ./fixdeps.patch ]; - buildInputs = [ apacheHttpd autoconf autoreconfHook automake curl glib lasso libtool libxml2 libxslt openssl pkgconfig xmlsec ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"]; diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 80cbf12d2a6..d681146eee5 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; - buildInputs = [ pkgconfig apacheHttpd avahi apr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ apacheHttpd avahi apr ]; patches = [ (fetchpatch { url = "http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/mod-dnssd/vivid/download/package-import%40ubuntu.com-20130530193334-kqebiy78q534or5k/portforapache2.4.pat-20130530222510-7tlw5btqchd04edb-3/port-for-apache2.4.patch"; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index e5f4ada3301..c3e15ed846d 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0grsqh7pdqnjx6xicd96adsx84vryb7c4n21dnxfygm3xrfj55qw"; }; - buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 ++ stdenv.lib.optional enableMysql mysql.lib; diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index a4fd046e569..b2c80b3f88f 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; }; - buildInputs = [ gmp pkgconfig redland zlib librdf_raptor2 librdf_rasqal ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gmp redland zlib librdf_raptor2 librdf_rasqal ]; preConfigure = '' # Define _XOPEN_SOURCE to enable, e.g., getaddrinfo. diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index d503a4d7b57..b4cec18d030 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ coreutils db openssl pcre perl ]; preBuild = '' sed ' diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix index a96e4cb37c0..b4f671862f8 100644 --- a/pkgs/servers/mail/freepops/default.nix +++ b/pkgs/servers/mail/freepops/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz; sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae"; }; - buildInputs = [pkgconfig openssl lua5 curl readline bison expat]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl lua5 curl readline bison expat]; configurePhase = '' export WHERE=$prefix/ diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index a4186559e89..8c00bcdbee2 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation { patches = [ ./0001-Fix-build-with-unbound-1.6.1.patch ]; - buildInputs = [git gperf pcre unbound libev tokyocabinet pkgconfig bash libsrs2]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [git gperf pcre unbound libev tokyocabinet bash libsrs2]; postUnpack = '' cp -Rp ${libCommonSrc}/* ${srcRoot}/common; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 30c0681adb7..1d0b5fb8336 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { "--with-openssl=${openssl.dev}" ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; - buildInputs = [ autoreconfHook file perl unzip openssl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ file perl unzip openssl ]; enableParallelBuilding = true; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index b8253cf0ad4..afc6f4e3159 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -48,7 +48,8 @@ in -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c ''; - buildInputs = [ pkgconfig postgresql curl openssl zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql curl openssl zlib ]; postInstall = '' diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 6429d3fae53..e951d3706e9 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -57,7 +57,8 @@ in -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c ''; - buildInputs = [ pkgconfig postgresql curl openssl zlib ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql curl openssl zlib ] ++ stdenv.lib.optional enableSnmp net_snmp ++ stdenv.lib.optional enableSsh libssh2 ++ stdenv.lib.optional enableLdap openldap; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index cc54aa3b37a..cd541f82d23 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -29,7 +29,8 @@ in configureFlags = "--enable-agent --enable-server --with-pgsql --with-libcurl"; - buildInputs = [ pkgconfig postgresql curl openssl zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql curl openssl zlib ]; postInstall = '' diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index e3e3de36575..3a1e91b26eb 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "07dny1l8n46v0yn30zqa8bkyj8ay01xphc124nhf2sqwbff7nf2m"; }; - buildInputs = [ autoreconfHook pkgconfig systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix index b2126a69833..27731af3803 100644 --- a/pkgs/servers/openpts/default.nix +++ b/pkgs/servers/openpts/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { # patches from https://apps.fedoraproject.org/packages/openpts/sources/patches/ patches = [ ./bugs.patch ./zlib.patch ./tboot.patch ./ptsc.patch ]; - buildInputs = [ autoconf automake pkgconfig libtool trousers openssl libxml2 libuuid gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool trousers openssl libxml2 libuuid gettext ]; preConfigure = '' substituteInPlace include/Makefile.am --replace "./cvs2msg.pl" "${perl}/bin/perl cvs2msg.pl"; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 18cd936e8fc..c1d9655ef23 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sed -i -e "s@ENV = dict.*@ENV = os.environ@g" SConstruct ''; - buildInputs = [ scons pkgconfig openssl protobuf boost zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons openssl protobuf boost zlib ]; buildPhase = "scons"; diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index cad349c4b51..2a36e1f67a2 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./shellinabox-minus.patch ]; - buildInputs = [ autoreconfHook pam openssl openssh makeWrapper ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pam openssl openssh makeWrapper ]; # Disable GSSAPIAuthentication errors. Also, paths in certain source files are # hardcoded. Replace the hardcoded paths with correct paths. diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 3395be9b9c1..0ba5a3ee5ad 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482"; }; - buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ucommon libosip libexosip gnutls zlib ]; preConfigure = '' export configureFlags="--sysconfdir=$out/etc" diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index edd99aa9a69..78ad88bc904 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag"; }; - buildInputs = [ postgresql pkgconfig libmsgpack groonga ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql libmsgpack groonga ]; makeFlags = [ "HAVE_MSGPACK=1" ]; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 8b963e58663..851149ad7f7 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; - buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl pkgconfig python + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python which zlib ]; preConfigure = '' diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 8871c01e1a1..0ccf4c5bd0b 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5"; }; - buildInputs = [ cmake sqlite pkgconfig systemd ] ++ stdenv.lib.optional tlsSupport openssl; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl; outputs = [ "out" "mod_example" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5fb5d1a6b62..4e26d5f0410 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -37,7 +37,8 @@ let url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2; sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz"; }; - buildInputs = [pkgconfig libX11 xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXt ;}; @@ -48,7 +49,8 @@ let url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2; sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q"; }; - buildInputs = [pkgconfig libXfont ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXfont ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXfont ;}; @@ -136,7 +138,8 @@ let url = mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2; sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"; }; - buildInputs = [pkgconfig xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xextproto ;}; @@ -147,7 +150,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -158,7 +162,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -169,7 +174,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -180,7 +186,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -191,7 +198,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -213,7 +221,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -224,7 +233,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -235,7 +245,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -246,7 +257,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -257,7 +269,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -268,7 +281,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -279,7 +293,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -290,7 +305,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -301,7 +317,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -312,7 +329,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -323,7 +341,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -334,7 +353,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -345,7 +365,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -356,7 +377,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -367,7 +389,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -378,7 +401,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -389,7 +413,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -400,7 +425,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -411,7 +437,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -422,7 +449,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -433,7 +461,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -444,7 +473,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -455,7 +485,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -466,7 +497,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -477,7 +509,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -488,7 +521,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -510,7 +544,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -532,7 +567,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -543,7 +579,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -576,7 +613,8 @@ let url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2; sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"; }; - buildInputs = [pkgconfig libICE xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE xproto ;}; @@ -587,7 +625,8 @@ let url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2; sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -620,7 +659,8 @@ let url = mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2; sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; - buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ applewmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit applewmproto libX11 libXext xextproto ;}; @@ -631,7 +671,8 @@ let url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2; sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f"; }; - buildInputs = [pkgconfig fontsproto xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto xproto xtrans ;}; @@ -642,7 +683,8 @@ let url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2; sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g"; }; - buildInputs = [pkgconfig xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto xtrans ;}; @@ -653,7 +695,8 @@ let url = mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2; sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b"; }; - buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE libuuid xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libuuid xproto xtrans ;}; @@ -664,7 +707,8 @@ let url = mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; - buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ windowswmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit windowswmproto libX11 libXext xextproto ;}; @@ -675,7 +719,8 @@ let url = mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2; sha256 = "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d"; }; - buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; @@ -686,7 +731,8 @@ let url = mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2; sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"; }; - buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scrnsaverproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit scrnsaverproto libX11 libXext xextproto ;}; @@ -697,7 +743,8 @@ let url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -708,7 +755,8 @@ let url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2; sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; - buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto libXmu libXpm xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; @@ -719,7 +767,8 @@ let url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2; sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"; }; - buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ compositeproto libX11 libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit compositeproto libX11 libXfixes xproto ;}; @@ -730,7 +779,8 @@ let url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2; sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv"; }; - buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; @@ -741,7 +791,8 @@ let url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2; sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw"; }; - buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ damageproto fixesproto libX11 xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; @@ -752,7 +803,8 @@ let url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2; sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -763,7 +815,8 @@ let url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; }; - buildInputs = [pkgconfig libX11 xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xextproto xproto ;}; @@ -774,7 +827,8 @@ let url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2; sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv"; }; - buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fixesproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fixesproto libX11 xextproto xproto ;}; @@ -785,7 +839,8 @@ let url = mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2; sha256 = "0w8d07bkmjiarkx09579bl8zsq903mn8javc7qpi0ix4ink5x502"; }; - buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -796,7 +851,8 @@ let url = mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2; sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; }; - buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -807,7 +863,8 @@ let url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2; sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm"; }; - buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontconfig freetype libX11 xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; @@ -818,7 +875,8 @@ let url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2; sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"; }; - buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; @@ -829,7 +887,8 @@ let url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2; sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xineramaproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xineramaproto ;}; @@ -840,7 +899,8 @@ let url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2; sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -851,7 +911,8 @@ let url = mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2; sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; - buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ printproto libX11 libXau libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit printproto libX11 libXau libXext xextproto ;}; @@ -862,7 +923,8 @@ let url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -873,7 +935,8 @@ let url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2; sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; - buildInputs = [pkgconfig presentproto libX11 xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ presentproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit presentproto libX11 xextproto xproto ;}; @@ -884,7 +947,8 @@ let url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2; sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z"; }; - buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ randrproto renderproto libX11 libXext xextproto xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; @@ -895,7 +959,8 @@ let url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2; sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; - buildInputs = [pkgconfig renderproto libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ renderproto libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit renderproto libX11 xproto ;}; @@ -906,7 +971,8 @@ let url = mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2; sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296"; }; - buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ resourceproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit resourceproto libX11 libXext xextproto xproto ;}; @@ -917,7 +983,8 @@ let url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2; sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6"; }; - buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE kbproto libSM libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE kbproto libSM libX11 xproto ;}; @@ -928,7 +995,8 @@ let url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2; sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; - buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto recordproto libX11 libXext xextproto libXi ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; @@ -939,7 +1007,8 @@ let url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2; sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; - buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ videoproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit videoproto libX11 libXext xextproto xproto ;}; @@ -950,7 +1019,8 @@ let url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2; sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"; }; - buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ videoproto libX11 libXext xextproto xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; @@ -961,7 +1031,8 @@ let url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2; sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xf86dgaproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; @@ -972,7 +1043,8 @@ let url = mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2; sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xf86miscproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; @@ -983,7 +1055,8 @@ let url = mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2; sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xf86vidmodeproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; @@ -994,7 +1067,8 @@ let url = mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2; sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"; }; - buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dmxproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dmxproto libX11 libXext xextproto ;}; @@ -1005,7 +1079,8 @@ let url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2; sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"; }; - buildInputs = [pkgconfig xproto zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto zlib ;}; @@ -1016,7 +1091,8 @@ let url = mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2; sha256 = "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m"; }; - buildInputs = [pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit zlib ;}; @@ -1038,7 +1114,8 @@ let url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2; sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa"; }; - buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; @@ -1049,7 +1126,8 @@ let url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2; sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"; }; - buildInputs = [pkgconfig kbproto libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ kbproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit kbproto libX11 ;}; @@ -1060,7 +1138,8 @@ let url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2; sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1071,7 +1150,8 @@ let url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2; sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1082,7 +1162,8 @@ let url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2; sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"; }; - buildInputs = [pkgconfig libfontenc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc ;}; @@ -1093,7 +1174,8 @@ let url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2; sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1115,7 +1197,8 @@ let url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; }; - buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc freetype xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc freetype xproto zlib ;}; @@ -1137,7 +1220,8 @@ let url = mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2; sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"; }; - buildInputs = [pkgconfig libXau ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXau ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXau ;}; @@ -1203,7 +1287,8 @@ let url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2; sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1214,7 +1299,8 @@ let url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2; sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9"; }; - buildInputs = [pkgconfig libX11 libxkbfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile ;}; @@ -1225,7 +1311,8 @@ let url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2; sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; - buildInputs = [pkgconfig libICE libSM libXmu libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE libSM libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libSM libXmu libXt ;}; @@ -1236,7 +1323,8 @@ let url = mirror://xorg/individual/app/twm-1.0.9.tar.bz2; sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5"; }; - buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE libSM libX11 libXext libXmu xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; @@ -1280,7 +1368,8 @@ let url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2; sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78"; }; - buildInputs = [pkgconfig libX11 libXext libXft libXmu xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXft libXmu xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;}; @@ -1291,7 +1380,8 @@ let url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2; sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs"; }; - buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXau libXext libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXext libXmu xproto ;}; @@ -1302,7 +1392,8 @@ let url = mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2; sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp"; }; - buildInputs = [pkgconfig libxcb xcbutil ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb xcbutil ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb xcbutil ;}; @@ -1324,7 +1415,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2; sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr"; }; - buildInputs = [pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit python ;}; @@ -1335,7 +1427,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1346,7 +1439,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; - buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;}; @@ -1357,7 +1451,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; - buildInputs = [pkgconfig gperf m4 libxcb xcbproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xcbproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbproto xproto ;}; @@ -1368,7 +1463,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; - buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xcbutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbutil xproto ;}; @@ -1379,7 +1475,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1390,7 +1487,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1401,7 +1499,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1412,7 +1511,8 @@ let url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2; sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"; }; - buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;}; @@ -1434,7 +1534,8 @@ let url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2; sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; - buildInputs = [pkgconfig libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 ;}; @@ -1445,7 +1546,8 @@ let url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2; sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168"; }; - buildInputs = [pkgconfig libXcomposite libXdamage libXext libXfixes libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;}; @@ -1456,7 +1558,8 @@ let url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; }; - buildInputs = [pkgconfig libpng libX11 libXcursor ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng libX11 libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libpng libX11 libXcursor ;}; @@ -1467,7 +1570,8 @@ let url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2; sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3"; }; - buildInputs = [pkgconfig libXcursor ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXcursor ;}; @@ -1478,7 +1582,8 @@ let url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2; sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl"; }; - buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; @@ -1489,7 +1594,8 @@ let url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2; sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; - buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; @@ -1500,7 +1606,8 @@ let url = mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2; sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc"; }; - buildInputs = [pkgconfig glproto libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit glproto libX11 ;}; @@ -1511,7 +1618,8 @@ let url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2; sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"; }; - buildInputs = [pkgconfig libX11 xproto libXrandr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXrandr ;}; @@ -1533,7 +1641,8 @@ let url = mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2; sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp"; }; - buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXmu libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXmu libXrender libXt ;}; @@ -1577,7 +1686,8 @@ let url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2; sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly"; }; - buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto udev xorgserver xproto ;}; @@ -1588,7 +1698,8 @@ let url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; - buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto xorgserver xproto ;}; @@ -1599,7 +1710,8 @@ let url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1610,7 +1722,8 @@ let url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2; sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1621,7 +1734,8 @@ let url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1632,7 +1746,8 @@ let url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; }; - buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1643,7 +1758,8 @@ let url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2; sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; - buildInputs = [pkgconfig inputproto udev randrproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto udev randrproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto udev randrproto xorgserver xproto ;}; @@ -1654,7 +1770,8 @@ let url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2; sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; - buildInputs = [pkgconfig xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xorgserver xproto ;}; @@ -1676,7 +1793,8 @@ let url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2; sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1"; }; - buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1687,7 +1805,8 @@ let url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2; sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; - buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; @@ -1698,7 +1817,8 @@ let url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2; sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1709,7 +1829,8 @@ let url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2; sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1720,7 +1841,8 @@ let url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2; sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1731,7 +1853,8 @@ let url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2; sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1742,7 +1865,8 @@ let url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2; sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1753,7 +1877,8 @@ let url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2; sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; @@ -1764,7 +1889,8 @@ let url = mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2; sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1775,7 +1901,8 @@ let url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2; sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; - buildInputs = [pkgconfig xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xextproto xorgserver xproto ;}; @@ -1786,7 +1913,8 @@ let url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2; sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; - buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1797,7 +1925,8 @@ let url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2; sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1808,7 +1937,8 @@ let url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2; sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1819,7 +1949,8 @@ let url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz; sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8"; }; - buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; @@ -1830,7 +1961,8 @@ let url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2; sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1841,7 +1973,8 @@ let url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2; sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1852,7 +1985,8 @@ let url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2; sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j"; }; - buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess xorgserver xproto ;}; @@ -1863,7 +1997,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2; sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; @@ -1874,7 +2009,8 @@ let url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2; sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1885,7 +2021,8 @@ let url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2; sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1896,7 +2033,8 @@ let url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; @@ -1907,7 +2045,8 @@ let url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2; sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1918,7 +2057,8 @@ let url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2; sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; @@ -1929,7 +2069,8 @@ let url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2; sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -1940,7 +2081,8 @@ let url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1951,7 +2093,8 @@ let url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2; sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1962,7 +2105,8 @@ let url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2; sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; - buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; @@ -1973,7 +2117,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2; sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; @@ -1984,7 +2129,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2; sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; @@ -1995,7 +2141,8 @@ let url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2; sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; @@ -2006,7 +2153,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2; sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; @@ -2017,7 +2165,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2; sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; @@ -2028,7 +2177,8 @@ let url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -2039,7 +2189,8 @@ let url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2; sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2050,7 +2201,8 @@ let url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2; sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2061,7 +2213,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; - buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ randrproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit randrproto videoproto xorgserver xproto ;}; @@ -2072,7 +2225,8 @@ let url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2; sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -2083,7 +2237,8 @@ let url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; @@ -2094,7 +2249,8 @@ let url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2; sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2105,7 +2261,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2; sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; - buildInputs = [pkgconfig xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xorgserver xproto ;}; @@ -2116,7 +2273,8 @@ let url = mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2; sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; @@ -2138,7 +2296,8 @@ let url = mirror://xorg/individual/app/xfs-1.1.4.tar.bz2; sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4"; }; - buildInputs = [pkgconfig libXfont xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXfont xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXfont xproto xtrans ;}; @@ -2149,7 +2308,8 @@ let url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2; sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; - buildInputs = [pkgconfig libX11 xproto libXxf86vm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXxf86vm ;}; @@ -2160,7 +2320,8 @@ let url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2; sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; - buildInputs = [pkgconfig libXaw libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXaw libXt ;}; @@ -2171,7 +2332,8 @@ let url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2; sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"; }; - buildInputs = [pkgconfig libX11 libXau libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXau libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXmu xproto ;}; @@ -2193,7 +2355,8 @@ let url = mirror://xorg/individual/app/xinit-1.3.4.tar.bz2; sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2204,7 +2367,8 @@ let url = mirror://xorg/individual/app/xinput-1.6.2.tar.bz2; sha256 = "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n"; }; - buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; @@ -2215,7 +2379,8 @@ let url = mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2; sha256 = "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"; }; - buildInputs = [pkgconfig libX11 libxkbfile xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile xproto ;}; @@ -2226,7 +2391,8 @@ let url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2; sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; - buildInputs = [pkgconfig libX11 libxkbfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile ;}; @@ -2237,7 +2403,8 @@ let url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2; sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; - buildInputs = [pkgconfig libX11 libxkbfile xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile xproto ;}; @@ -2248,7 +2415,8 @@ let url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2; sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; - buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libX11 libXaw xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXaw xproto libXt ;}; @@ -2259,7 +2427,8 @@ let url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2; sha256 = "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2270,7 +2439,8 @@ let url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2; sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8"; }; - buildInputs = [pkgconfig libX11 libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2281,7 +2451,8 @@ let url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2; sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"; }; - buildInputs = [pkgconfig libxcb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb ;}; @@ -2292,7 +2463,8 @@ let url = mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2; sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx"; }; - buildInputs = [pkgconfig libxcb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb ;}; @@ -2303,7 +2475,8 @@ let url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2; sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2314,7 +2487,8 @@ let url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2; sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; - buildInputs = [pkgconfig libX11 libXaw libXmu libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXaw libXmu libXt ;}; @@ -2325,7 +2499,8 @@ let url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2; sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw"; }; - buildInputs = [pkgconfig libXaw libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXaw libXt ;}; @@ -2336,7 +2511,8 @@ let url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2; sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2369,7 +2545,8 @@ let url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2; sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; @@ -2391,7 +2568,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2; sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"; }; - buildInputs = [pkgconfig libX11 libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2402,7 +2580,8 @@ let url = mirror://xorg/individual/app/xprop-1.2.2.tar.bz2; sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2424,7 +2603,8 @@ let url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2; sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; }; - buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXrandr libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXrandr libXrender ;}; @@ -2435,7 +2615,8 @@ let url = mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2; sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk"; }; - buildInputs = [pkgconfig libX11 libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2446,7 +2627,8 @@ let url = mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2; sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2457,7 +2639,8 @@ let url = mirror://xorg/individual/app/xset-1.2.3.tar.bz2; sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3"; }; - buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXmu xproto libXxf86misc ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;}; @@ -2468,7 +2651,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2; sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; }; - buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xbitmaps libXcursor libXmu ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xbitmaps libXcursor libXmu ;}; @@ -2490,7 +2674,8 @@ let url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2; sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"; }; - buildInputs = [pkgconfig libX11 xproto libXv ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXv ;}; @@ -2501,7 +2686,8 @@ let url = mirror://xorg/individual/app/xwd-1.0.6.tar.bz2; sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2512,7 +2698,8 @@ let url = mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2; sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1"; }; - buildInputs = [pkgconfig libX11 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxcb xproto ;}; @@ -2523,7 +2710,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2; sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 74c5ae9d9b8..0e0afc7184f 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -281,7 +281,8 @@ foreach my $pkg (sort (keys %pkgURLs)) { url = $pkgURLs{$pkg}; sha256 = "$pkgHashes{$pkg}"; }; - buildInputs = [pkgconfig $inputs];$extraAttrs + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ $inputs];$extraAttrs meta.platforms = stdenv.lib.platforms.unix; }) // {inherit $inputs;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2f2270d536d..b43bc28d697 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -410,7 +410,8 @@ in url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2; sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; } else if (args.abiCompat == "1.18") then { name = "xorg-server-1.18.4"; @@ -419,7 +420,8 @@ in url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; } else throw "unsupported xorg abiCompat: ${args.abiCompat}"; diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index 060a6b18a89..dfc90feeb33 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l"; }; - buildInputs = [ pkgconfig m4 libxcb xcbutil ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ m4 libxcb xcbutil ] ++ stdenv.lib.optional doCheck libX11; doCheck = true; diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix index 3dfc7abbc77..232c4a636fb 100644 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ b/pkgs/tools/X11/dragon-drop/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "03vdbmqlbmk3j2ay1wy6snrm2y27faxz7qv81vyzjzngj345095a"; }; - buildInputs = [ gtk pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 9de29da9b44..5baf6a4b51f 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x"; }; - buildInputs = [ autoconf automake imlib2 libtool libX11 pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake imlib2 libtool libX11 xproto ]; patches = [ underlinkingPatch ]; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index edddf42d2c5..23e528297ee 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0v1m8w877fcrk918p6b6q3753dsz8i1f4mb9bi064cp11kh85nq5"; }; - buildInputs = [ pkgconfig libX11 xextproto libXtst libXi libXext libXinerama + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xextproto libXtst libXi libXext libXinerama glib cairo xdotool ]; patchPhase = '' diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 7a18a6a98b6..a20b7d69f3d 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1i2b0k9h8r0lnxlrkgqzmrjakgaw3f1ygqqwzx8w6676g85rcm20"; }; - buildInputs = [ pkgconfig libvdpau ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvdpau ]; meta = with stdenv.lib; { homepage = http://people.freedesktop.org/~aplattner/vdpau/; diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 2e23e7bd4de..e0118b8b27b 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - buildInputs = [ libX11 libXmu glib pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index cef071bb3b6..e3d9ecd5953 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "xbindkeys-config-${version}"; version = "0.1.3"; - buildInputs = [ gtk pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk makeWrapper ]; src = fetchurl { url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${version}.orig.tar.gz"; diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 9b50f00beef..8376b2041b3 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --with-gui=X11"; - buildInputs = [ inputproto libXi autoconf automake libtool m4 xlibsWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libXi autoconf automake libtool m4 xlibsWrapper ]; meta = { homepage = https://github.com/tias/xinput_calibrator; diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 2bd6392456e..76e502d7598 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; }; - buildInputs = [ pkgconfig xorg.libX11 xorg.libXres xorg.libXext ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorg.libX11 xorg.libXres xorg.libXext ncurses ]; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index c05aeff9337..239b01e1345 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { ./SConstruct.patch ]; - buildInputs = [ libX11 scons pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 scons ]; buildPhase = '' mkdir -p "$out" scons \ diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index 35342035c9d..1905ed9752c 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1g26hr6rl7bbb9cwqk606nbbapslq3wnsy8j28azrgi8hgfqhjfi"; }; - buildInputs = [ libX11 makeWrapper autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 makeWrapper ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 042880b39c9..00de2c2ec46 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { install util/unmkcromfs $out/bin ''; - buildInputs = [ pkgconfig fuse perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse perl ]; meta = { description = "FUSE Compressed ROM filesystem with lzma"; diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix index 1ed453f0d4f..f99ee963dbe 100644 --- a/pkgs/tools/archivers/runzip/default.nix +++ b/pkgs/tools/archivers/runzip/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { version = "1.4"; name = "runzip-${version}"; - buildInputs = [ libzip autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libzip ]; src = fetchFromGitHub { owner = "vlm"; diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index 0cb4fbbf3f0..07e76ea7f62 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4"; }; - buildInputs = [ gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 6ed6a7f2402..a257ece4877 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0w9lx8d8r50j48qfhn2r0dlcnwy3pjyy6xjvgpr0qagy5l1q1qj4"; }; - buildInputs = [ gtk2 pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 intltool ]; meta = { description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index ba029814f39..f68671bc6fb 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; }; - buildInputs = [ cmake pkgconfig qt4 taglib chromaprint ffmpeg ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake qt4 taglib chromaprint ffmpeg ]; cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${(builtins.parseDrvName taglib.name).version}" ]; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index c326533ece1..6596f1c34ff 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { intltoolize -f ''; - buildInputs = [ intltool autoreconfHook pythonPackages.wrapPython ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ intltool pythonPackages.wrapPython ]; propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ]; pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify mutagen ]; postInstall = "wrapPythonPrograms"; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 451424fb866..02235f727c5 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0k13s7pmz5ks3kli8pwhzd47hcjwv46gd2fgk7i4fbkfwf3z279h"; }; - buildInputs = [ autoconf automake makeWrapper pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake makeWrapper gnome3.defaultIconTheme avahi gtk3 libnotify libpulseaudio xlibsWrapper ]; diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index ea74d83ed9e..ed955876250 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "182xl2w8syv6ky2h2bc9imc6ap8pzh0p7rp63hh8nw0xm38c3f14"; }; - buildInputs = [ gtk3 pkgconfig intltool alsaLib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 intltool alsaLib ]; meta = with stdenv.lib; { description = "A lightweight volume control that sits in your systray"; diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index abfccb97641..754e12e7f77 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -10,7 +10,8 @@ let url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; sha256 = "1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa"; }; - buildInputs = with python3Packages; [ pytest pkgconfig fuse attr which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with python3Packages; [ pytest fuse attr which ]; propagatedBuildInputs = with python3Packages; [ contextlib2 ]; checkPhase = '' py.test diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index b0b9444a238..c902802abce 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { }; configureFlags = "--with-ssl-headers=${openssl.dev}/include/openssl"; - buildInputs = [bzip2 zlib newt newt openssl pkgconfig slang + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [bzip2 zlib newt newt openssl slang # automake autoconf libtool gettext ]; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 35f46b47bc8..53a193749d3 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; - buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex dbus_libs ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb glib dbus_glib bluez openobex dbus_libs ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 95dd58a59b4..3b8040e2b91 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { makeFlags = "RM=rm LN=ln MV=mv"; - buildInputs = [ lame libvorbis libmad pkgconfig libao ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lame libvorbis libmad libao ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index a345972b373..fe7a1a04414 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb"; }; - buildInputs = [ cmake libtiff pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libtiff ]; propagatedBuildInputs = [ tesseract ]; meta = { diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index dff66fe6bde..f4133f12541 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1zv1fvik76kpp1q5f2dz01f4fwg1m5a8rl168px47jy9nyl9k277"; }; - buildInputs = [ pkgconfig fuse libarchive ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse libarchive ]; meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 61c7f26db1e..efd48fb87fe 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; }; - buildInputs = [ pkgconfig utillinux ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ utillinux ]; # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need # anyway (it's distro specific stuff). diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 5c5779037ab..fc4d3f505cd 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "05ba1h09rrqj6vjr3q37ybca3nbrmnifmffdyk83622l28fpv350"; }; - buildInputs = [ pkgconfig attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; preConfigure = '' substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.lib.getDev stdenv.cc.libc}/include/dirent.h diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 80027c7a047..4d7ee75c006 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { dontStrip = true; - buildInputs = [ fuse pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs ''; diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 674f462b967..4a8c767e44a 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l"; }; - buildInputs = [ pkgconfig fuse glib attr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse glib attr ]; makeFlags = "DESTDIR=$(out) PREFIX="; diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 1897181e444..8797c21aa23 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz; sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; - buildInputs = [fuse curl pkgconfig glib zlib]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [fuse curl glib zlib]; meta = { platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index 7010a60bcbc..e8deeaf4b47 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; }; - buildInputs = [ pkgconfig fuse]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse]; meta = { homepage = http://djmount.sourceforge.net/; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index d333334d394..613ab7bab1e 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1fll0xjg1p3pabgjiddild4ragk9spbdmdzrkq0hv5pxb1qrv7lp"; }; - buildInputs = [ libgcrypt pkgconfig glib linuxHeaders sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index 8b3df52bcb7..82e2b404b82 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x"; }; - buildInputs = [ fuse autoconf automake pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse autoconf automake makeWrapper ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 7165789cf81..3ca46851306 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b"; }; - buildInputs = [ pkgconfig fuse zlib glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse zlib glib ]; patches = let fetchPatchFromDebian = { patch, sha256 }: fetchpatch { diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index b808573aa5b..792b2e2c75b 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9"; }; - buildInputs = [ pkgconfig libconfuse ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libconfuse ]; postInstall = '' # As there is no manpage or built-in --help, add the README file for diff --git a/pkgs/tools/filesystems/gocrypfs/default.nix b/pkgs/tools/filesystems/gocrypfs/default.nix index c156cd13244..b9314015cf5 100644 --- a/pkgs/tools/filesystems/gocrypfs/default.nix +++ b/pkgs/tools/filesystems/gocrypfs/default.nix @@ -21,7 +21,8 @@ in buildGoPackage rec { sha256 = "0p173x2s0km7a43h6ihir5p19fdlkkb9lc9120k9hccr33iws25z"; }; - buildInputs = [pkgconfig openssl]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl]; goDeps = ./deps.nix; diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index 88922d9ce94..e9d3df026b0 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1y4n63bk9vd6n1l5psjb9xm9h042kw4yh2ni33z7agixkanajv1s"; }; - buildInputs = [ pkgconfig curl openssl fuse libxml2 json_c file ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ curl openssl fuse libxml2 json_c file ]; postInstall = '' install hubic_token $out/bin mkdir -p $out/sbin diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 091270deab6..6044806a34b 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { owner = "JasonFerrara"; }; - buildInputs = [ file fuse libmtp pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file fuse libmtp ]; meta = with stdenv.lib; { description = "A FUSE filesystem for MTP devices like Android phones"; diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 54a8f845915..697256982bb 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "14ggmh91vv69fp2qpz0nxp0hprlw2wsijss2k2485hb0ci4cabvh"; }; - buildInputs = [ fuse pkgconfig attr uthash ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse attr uthash ]; patches = [ ./fix-format-security-error.patch diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index 7725b0d7af8..6d2b073d869 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "mtpfs-1.1"; - buildInputs = [ pkgconfig fuse libmtp glib libid3tag libmad ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse libmtp glib libid3tag libmad ]; # adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs preConfigure = '' diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 0214afce6d4..445e724e1a2 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec{ sha256 = "0wf09fyqzza024qr1s26z5x7rsvh9zb4pv598gw7gm77wjcr6174"; }; - buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl acl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ]; patches = ./omitLocalstatedirCreation.patch; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index c612512b8cc..24eec2f0dc4 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-cryptsetup-reencrypt" ] ++ stdenv.lib.optional enablePython "--enable-python"; - buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ devicemapper libgcrypt libuuid popt ] ++ stdenv.lib.optional enablePython python; meta = { diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 6301cbb6842..df14d7efda4 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib"; - buildInputs = [ pkgconfig systemd ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ systemd ]; preConfigure = '' diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 0c8e1c4ef81..9a8c3ecb0fc 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "949f8eff7e74ff2666cccf8a1efbfcce8d54bc41bec6ad6db8c029de7ca832a3"; }; - buildInputs = [ ocaml fuse postgresql pcre libuuid gnome_vfs pkgconfig GConf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml fuse postgresql pcre libuuid gnome_vfs GConf ]; buildPhase = '' cd deps diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 3bc13d43a36..fc504b3208d 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "16sikr81ipn8v1a1zrqgnsy2as3zcaxbzkr0bm5vxy012bq0plkd"; }; - buildInputs = [ fuse samba pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse samba glib ]; meta = with stdenv.lib; { description = "A FUSE FS for mounting Samba shares"; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index ccb20e9f1bd..c9f605ca69f 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = { homepage = http://www.snapraid.it/; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index c1502a3227d..488e2de07a6 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1dmw4kx6vyawcywiv8drrajnam0m29mxfswcp4209qafzx3mjlp1"; }; - buildInputs = [ pkgconfig glib fuse autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib fuse ]; postInstall = '' mkdir -p $out/sbin diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index a51f2d47172..dc725b5078f 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec url = "http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz"; sha256 = "fcf2e1584568b07c7f3683a983a9be26fae6534b8109e09167e5dff9114ba2e5"; }; - buildInputs = [fuse glib neon pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [fuse glib neon]; meta = { homepage = http://noedler.de/projekte/wdfs/; description = "User-space filesystem that allows to mount a webdav share"; diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 0738ee84cab..9dfb2deeaee 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { sourceRoot = "${zookeeper.name}/src/contrib/zkfuse"; - buildInputs = [ autoreconfHook zookeeper_mt log4cxx boost fuse ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zookeeper_mt log4cxx boost fuse ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 86848f95883..91dd85b0757 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45"; }; - buildInputs = [ pkgconfig libXt libXaw libXres utilmacros ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXt libXaw libXres utilmacros ]; configureFlags = "--with-appdefaultdir=$(out)/share/X11/app-defaults/editres"; diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 2534a9cbefa..537d1a8c7db 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1zb9hwdl783d4vd2s2rw642hg8hd6n0mfp6lrbiqmp9jmhlq5rsr"; }; - buildInputs = [ pkgconfig libexif popt ] ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libexif popt ] ++ libintlOrEmpty; meta = { homepage = http://libexif.sourceforge.net/; diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix index e7fb3e773c1..071c8f36079 100644 --- a/pkgs/tools/graphics/ggobi/default.nix +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7"; }; - buildInputs = [ pkgconfig libxml2 gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gtk2 ]; configureFlags = "--with-all-plugins"; diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index 333b0f95b72..d1b31f39152 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1k6n758r9dhjmc1pnpk6qzpg0q7pkq2hf18z3b0s2z198jpkg9s3"; }; - buildInputs = [ pkgconfig poppler ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ poppler ]; installFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index f7f9211b515..abebc0fc4ca 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1qghz1j3jmfj093br2hfyibayg3fmhg8fvp5ix9n9rbvzc1zslsm"; }; - buildInputs = [ glew SDL2 ftgl pkgconfig libpng libjpeg pcre SDL2_image mesa boost + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa boost glm freetype ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index dad611868bc..058900b8e23 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "14ffdm4y26imq99wjhkrhy9lp33165xci1l5ndwfia8hz53bl02k"; }; - buildInputs = [ autoreconfHook cairo pkgconfig poppler gtk2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ cairo poppler gtk2 ]; meta = with stdenv.lib; { description = "PDF converter to SVG format"; diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index 5676b37042d..e01f3ea2acc 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1"; }; - buildInputs = [ pkgconfig libpng zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng zlib ]; patchPhase = '' sed -i '/png.h/a \#include ' src/rwpng.c diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 78a2a7cb695..93f57f95e3e 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ."; - buildInputs = [ pkgconfig libpng zlib lcms2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng zlib lcms2 ]; meta = with stdenv.lib; { homepage = https://pngquant.org/; diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index 2b64cbcc1f5..b58114a61a5 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13"; }; - buildInputs = [ pkgconfig libav libxslt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libav libxslt ]; meta = with stdenv.lib; { homepage = https://www.flameeyes.eu/projects/unpaper; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index 9d8427e533c..7f09b488c28 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ayrzfx95670k86y19bzl6i6w98haaln3x8dxpb39a5dwgz59pf8"; }; - buildInputs = [ cmake fcitx anthy gettext pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx anthy gettext ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix index 58695434cb6..361355d1d68 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0l548xdx2fvjya1ixp37pn382yak0m4kwfh9lgh7l3y2sblqw9zs"; }; - buildInputs = [ cmake fcitx gettext libchewing pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx gettext libchewing ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index acd377441e2..ebb6627dcca 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "143x9gbswzfngvgfy77zskrzrpywj8qg2d19kisgfwfisk7yhcf1"; }; - buildInputs = [ cmake pkgconfig fcitx gettext curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx gettext curl ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix index 54b5335d9bb..41560227bca 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1jq78nczliw6pnhfac8hspffybrry6syk17y0wwcq05j3r3nd2lp"; }; - buildInputs = [ cmake fcitx libhangul gettext pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx libhangul gettext ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index c441a4964b8..6022bcebc3b 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "19h0p1s8bkw24v7x6v19fg7dqpz2kkjlvvrqhypi5bkkvfswf7xn"; }; - buildInputs = [ cmake pkgconfig fcitx gettext libpinyin glib pcre dbus qt4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx gettext libpinyin glib pcre dbus qt4 ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix index ff42bbbbcc8..c0c921f7b18 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ffyhsg7bc6525k94kfhnja1h6ajlfprq72d286dp54cksnakyc4"; }; - buildInputs = [ cmake fcitx gettext m17n_lib m17n_db pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx gettext m17n_lib m17n_db ]; preInstall = '' substituteInPlace im/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix index 4581f80a75e..ddfa41dda31 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf"; }; - buildInputs = [ cmake fcitx gettext pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx gettext ]; NIX_CFLAGS_COMPILE = "-Wno-narrowing"; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 83034222261..b5b394c5b6c 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1ypr2jr3vzs2shqfrvhqy69xvagrn9x507180i9wxy14hb97a82r"; }; - buildInputs = [ makeWrapper fcitx cmake isocodes pkgconfig gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper fcitx cmake isocodes gtk3 gnome3.defaultIconTheme ]; preFixup = '' diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index f3e3973a2c3..328c803e7db 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0vmz82il796062jbla5pawsr5dqyhs7ald7xjp84zfccc09dg9kx"; }; - buildInputs = [ ibus ibus-table pkgconfig python3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ibus ibus-table python3 ]; preBuild = '' export HOME=$(mktemp -d)/ibus-table-others diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index cb33abc3213..7ca5af555f9 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; - buildInputs = [ gtk2 libhangul pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libhangul ]; meta = with stdenv.lib; { description = "The Easy Hangul XIM"; diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix index cdb5abcf453..54c78874dd2 100644 --- a/pkgs/tools/misc/appdata-tools/default.nix +++ b/pkgs/tools/misc/appdata-tools/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1bzqg4gy8gqhbk2qjizsm0b78li9mv84fb3d8qwfpxh7c7p360x8"; }; - buildInputs = [ pkgconfig autoconf automake m4 intltool glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake m4 intltool glib libsoup gdk_pixbuf ]; configureScript = "./autogen.sh"; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 29b199e5866..9a09fba93e6 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb"; }; - buildInputs = [ libusb1 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1 ]; configurePhase = '' cd commandline diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index af9861ea6ed..ea1ac6d116b 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; }; - buildInputs = [ pkgconfig bluez ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bluez ] ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional systemdSupport systemd; diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index 96022d01ef7..c26f835c0ee 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18"; }; - buildInputs = [ intltool colord glib gtk3 pkgconfig lcms2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool colord glib gtk3 lcms2 ]; meta = { homepage = http://www.freedesktop.org/software/colord/intro.html; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 46f3786a6df..00407c47a1f 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} ''; - buildInputs = [ glib polkit pkgconfig gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection bash-completion argyllcms libgudev sane-backends ]; postInstall = '' diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index dfa6bf71bb4..6bbf049d244 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "CUnit-${version}"; version = "2.1-3"; - buildInputs = [autoconf automake libtool autoreconfHook]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [autoconf automake libtool]; src = fetchurl { url = "mirror://sourceforge/cunit/CUnit/${version}/${name}.tar.bz2"; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 039ec27947a..e5e3815481f 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4"; }; - buildInputs = [ pkgconfig glib libintlOrEmpty ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libintlOrEmpty ]; NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 06862a63423..7e98b7d64d2 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1h7vll8a78ijan9bmnimmsviywmc39x8h9iikx8vm98kwyxi4xif"; }; - buildInputs = [ autoreconfHook pkgconfig tokyocabinet cairo pango ncurses ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ tokyocabinet cairo pango ncurses ]; meta = with stdenv.lib; { homepage = http://duc.zevv.nl/; diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index 1ba4bceb787..6307d012deb 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; }; - buildInputs = [ pkgconfig freetype gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype gtk ]; patches = [ ./Makefile.patch ]; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index a690ef2084b..bb565bacfe7 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -34,7 +34,8 @@ stdenv.mkDerivation { ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); # autoreconfHook required for the splashimage patch. - buildInputs = [ autoreconfHook texinfo ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ texinfo ]; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index f362e7c53a2..d4322f051d0 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh"; }; - buildInputs = [ smartmontools gtkmm2 libglademm pkgconfig pcre ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ smartmontools gtkmm2 libglademm pcre ]; #installTargets = "install datainstall"; diff --git a/pkgs/tools/misc/kalibrate-rtl/default.nix b/pkgs/tools/misc/kalibrate-rtl/default.nix index 19870b8de5b..19ebd05e23c 100644 --- a/pkgs/tools/misc/kalibrate-rtl/default.nix +++ b/pkgs/tools/misc/kalibrate-rtl/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; }; - buildInputs = [ autoreconfHook pkgconfig fftw rtl-sdr libusb1 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fftw rtl-sdr libusb1 ]; meta = with stdenv.lib; { description = "Calculate local oscillator frequency offset in RTL-SDR devices"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index d96409809a6..72c9cecf540 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; }; - buildInputs = [ openldap openssl popt glib ncurses readline pkgconfig cyrus_sasl autoconf automake ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl autoconf automake ]; preConfigure = '' cd ldapvi diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 1f45626855f..989c1f57b6e 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation { sha256 = "1g79hl6jmf5dam7vq19h4dgdj7gcn19fa7q78vn573mg2rdyal53"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ libsodium czmqpp libbitcoin ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index fbfa385fc7f..7b6da9bdd3e 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation { sha256 = "00123vw7rxk0ypdfzk0xwk8q55ll31000mkjqdzl915krsbkbfvp"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ libbitcoin-client ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 61c462f7853..6d0c7b4e9c9 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation { sha256 = "1lpdjm13kgs4fbp579bwfvws8yf9mnr5dw3ph8zxg2gf110h85sy"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ secp256k1 ]; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 0828fea81e1..fb4093d89b8 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb"; }; - buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl glib slang zip unzip file gettext libX11 libICE libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; configureFlags = [ "--enable-vfs-smb" ]; diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 165780a5fa1..acb3bd9d377 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi"; }; - buildInputs = [glib readline bison flex pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [glib readline bison flex]; preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 1acdf6d7ddb..b00e630c70b 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; }; - buildInputs = [ mpd_clientlib curl glib pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mpd_clientlib curl glib ]; preConfigure = '' export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion} diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 9a435622c7d..2aea2530057 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { unpackCmd = "unzip -d src -q $curSrc"; - buildInputs = [ unzip pkgconfig curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip curl ]; patches = [ ./makefile.patch ]; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index f92069e7b9f..267b458cccc 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { makeFlags = "prefix=$(out)"; - buildInputs = [ glib gettext readline pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gettext readline ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 663c60d2856..6a5e674b698 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/qjoypad/${name}.tar.gz"; sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; }; - buildInputs = [ pkgconfig libX11 libXtst qt4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXtst qt4 ]; patchPhase = '' cd src substituteInPlace config --replace /bin/bash /bin/sh diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 54e5a3ab17e..07c14ac7626 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1j3wgf9xigsv6ckmv82gjj4wavi7xjn2zvj1f63fzbaa1rv7pf3s"; }; - buildInputs = [ autoreconfHook pkgconfig file protobufc ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ file protobufc ]; meta = with stdenv.lib; { homepage = https://github.com/algernon/riemann-c-client; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index e321670068c..2ff86f5cbdf 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { configurePhase = "scons config"; - buildInputs = [ gettext glib json_glib libelf pkgconfig scons sphinx utillinux ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext glib json_glib libelf scons sphinx utillinux ]; buildPhase = "scons"; diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index f9fee08d0dd..2b240e022d8 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49"; }; - buildInputs = [ pkgconfig libcaca ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libcaca ]; meta = { description = "Display large colourful characters in text mode"; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 8d9d0073b17..99cd407a9ae 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f"; }; - buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext autoconf automake libtool bison flex which subversion makeWrapper readline libftdi libusb python3 ]; configureFlags = '' diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index a18c03b126a..59efcaa1809 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; - buildInputs = [ zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib imagemagick libpng glib libgsf libxml2 bzip2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index f39eaf0b047..b9a8f70ff71 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-include.patch ]; - buildInputs = [ pkgconfig cmake libgsf glib libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libgsf glib libxml2 ]; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 350cb89846a..604868f8c49 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "04mrc8j0rr7iy1k6brfxnx26pmxm800gh4nqrxn6j2lz6vd5y9m5"; }; - buildInputs = [ libX11 autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 ]; # We need a README file, otherwise autoconf complains. postUnpack = '' diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 6ff08e4ac3f..c01e419ab23 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0l9lkzwi2227y5y02i5g1d701bmlyaj8lffv72jks1w4mkh7q7qh"; }; - buildInputs = [ pkgconfig openssl pcsclite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl pcsclite ]; configureFlags = [ "--with-backend=pcsc" ]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 3b7c2926bd4..5a56430c20e 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr"; }; - buildInputs = [ libpcap openssl zlib libnl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap openssl zlib libnl ]; patchPhase = '' sed -e 's@^prefix.*@prefix = '$out@ -i common.mak diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index fe30a1eab82..766ae411606 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { configureFlags = "--with-perl=${perl}/bin/perl"; - buildInputs = [ libpcap pkgconfig bison cyrus_sasl tcp_wrappers flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; meta = with stdenv.lib; { description = "Clients for ARGUS"; diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index 673f98e2f3a..e5c2aace400 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna"; }; - buildInputs = [ libpcap pkgconfig bison cyrus_sasl tcp_wrappers flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; propagatedBuildInputs = [ procps which wget lsof net_snmp ]; patchPhase = '' diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 22237794f07..24c86f4fa9a 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb"; }; - buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which automake autoconf libtool vala_0_23 python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; preConfigure = '' diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix index b5866c2ee13..7c42cc965a0 100644 --- a/pkgs/tools/networking/connmanui/default.nix +++ b/pkgs/tools/networking/connmanui/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0ixx8c9cfdp480z21xfjb7n1x27sf1g8gmgbmcfhr0k888dmziyy"; }; - buildInputs = [ autoconf automake libtool glib gtk3 dbus pkgconfig file intltool connman ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool glib gtk3 dbus file intltool connman ]; preConfigure = '' rm m4/intltool.m4 diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 37226d3dd7b..3be2b0401bc 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation rec { name = "davix-0.6.4"; - buildInputs = [ stdenv pkgconfig cmake openssl libxml2 boost ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv cmake openssl libxml2 boost ]; src = fetchFromGitHub { owner = "cern-it-sdc-id"; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 7204ddd5e06..d8316c66203 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg"; }; - buildInputs = [ pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index b122f532630..312906f9510 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; - buildInputs = [ gtk2 readline ncurses gettext openssl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 readline ncurses gettext openssl ]; meta = { description = "GTK+-based FTP client"; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index ea78cdd106a..fcbf5a4e1b2 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda"; }; - buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp_av gnome2.gnome_icon_theme makeWrapper]; postInstall = '' diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index a7d42b77317..cbcaee4de78 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; }; - buildInputs = [libdnet pkgconfig libpcap]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libdnet libpcap]; meta = { description = ""; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 761dc01d2f9..8b81e0696c2 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1bij6nm06ghkg98n2pdyacam2fyg5y8f7ajw0d5653m0r4ldw5p7"; }; - buildInputs = [ openssl pkgconfig db cyrus_sasl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl db cyrus_sasl ]; meta = with stdenv.lib; { homepage = http://isync.sourceforge.net/; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index ec2f34f5601..19626174ba4 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; }; - buildInputs = [ autoconf libpcap ncurses pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf libpcap ncurses glib ]; patches = [ ./no-dns-resolution.patch diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index de7f38314fc..096a25e9971 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pkgconfig bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent libcap_ng curl nspr nss python ] ++ optional docs xmlto; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index da36ef727c2..950a6e310eb 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg"; }; - buildInputs = [ pkgconfig pcre perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pcre perl ]; patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 1f465bc4f8a..e66209c7ce9 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ protobuf ncurses zlib IOTty makeWrapper perl openssl ]; patches = [ ./ssh_path.patch ]; postPatch = '' diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 3269f92d7f4..255d430a3a5 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0gjyvn8r66kp49gasd6sqfvg2pj0c6v67hnq7cqwl04kj69rfy86"; }; - buildInputs = [ autoreconfHook pkgconfig ] + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ] ++ optional stdenv.isLinux systemd; meta = { diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 9e7282c40bd..93646d58cd3 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1sw36w6zkzvabvjckqick032j5p5xi0qi3sgnh0znzxz31jqvf0d"; }; - buildInputs = [ makeWrapper pkgconfig python openldap pam ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper python openldap pam ]; preConfigure = '' substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: " diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 3854d94f909..1927d47582d 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation { sha256 = "1a1l9f6zivfyxg9g2x7kzkvcyh84s7l6v0kimihhrd19zl0m41jn"; }; - buildInputs = [ openssl ppp autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl ppp ]; NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8343f23a1a0..79f203f7747 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -56,7 +56,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' ''; - buildInputs = [ zlib openssl libedit pkgconfig pam ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib openssl libedit pam ] ++ optional withKerberos kerberos ++ optional hpnSupport autoreconfHook; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index d1827a6045d..0690fe18bde 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1rvrxgb131snv9r6ksgzmd74rd9z7q46bhky0zazz7dwqqywffcp"; }; - buildInputs = [ pkgconfig libtool autoconf automake cppunit openssl libsigcxx zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libtool autoconf automake cppunit openssl libsigcxx zlib ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 1b537870b09..5cb65b78ee8 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "samplicator-${version}"; version = "1.3.8rc1"; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; src = fetchFromGitHub { owner = "sleinen"; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index 53465a0242d..acb5a042ffc 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ python softhsm openldap p11_kit.dev p11_kit.out gnupg ]; - buildInputs = [ unbound pkgconfig unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unbound unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ] ++ stdenv.lib.optional useSystemd systemd; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 8c443282e5c..c3abdd49e13 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns"; }; - buildInputs = [ autoreconfHook libcrafter lua ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libcrafter lua ]; configureFlags = [ "--with-lua=yes" ]; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index f260241fe6b..830c576c406 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1cgf7hgqrwsqgyc77sis0hr7cwgk3vx8cd4msgq11qbwywi3b6id"; }; - buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; meta = { description = "A Nix-based distributed service deployment tool"; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 2a6a0dcc78a..98d1802f881 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0pqv8n9942vjwmb32m1af29fi0vjlsbwkj2c7h1xs28z6wahr7wa"; }; - buildInputs = [ socat pkgconfig dysnomia disnix getopt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ socat dysnomia disnix getopt ]; meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 388942f6ad8..70cd83b87a3 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -13,7 +13,8 @@ buildRustPackage rec { sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5"; }; depsSha256 = "0v145fi9bfiwvsdy7hz9lw4m2f2j8sxvixfzmjwfnq4klm51c8yl"; - buildInputs = [pkgconfig openssl curl]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl curl]; postInstall = '' mkdir -p $out/etc/profile.d diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 78d815eb7c1..860be0e1f79 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive binutils ]; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index f4c92ac701f..2a88e4462b6 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; - buildInputs = [ pkgconfig autoconf automake openssl libgsf gmp ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake openssl libgsf gmp ]; installPhase = '' diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index f8ef409813c..91546f1a78f 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ pkgconfig perl nss nspr python2 pam intltool makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl nss nspr python2 pam intltool makeWrapper ]; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; postInstall = '' diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 8bb3cba15c4..69b4b36fb9b 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7"; }; - buildInputs = [ pkgconfig gnupg gtk2 libxml2 intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnupg gtk2 libxml2 intltool ]; meta = { description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index fbd32cdc22d..c180ca6c720 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1rpf683lxa78fmxxb0hnq7vdh3yn7qid2gqq67q9mk65sp9vdhdj"; }; - buildInputs = [ autoconf automake intltool libtool pkgconfig vala glib encfs + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake intltool libtool vala glib encfs gtk3 libgnome_keyring gnome3.libgee xorg.libSM xorg.libICE wrapGAppsHook ]; diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index 9a593907a53..ebd9a6d5e7e 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp"; }; - buildInputs = [ pkgconfig libnfc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libnfc ]; meta = with stdenv.lib; { description = "MiFare Classic Universal toolKit"; diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index a223b3e835a..8a454ca67fd 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = [./mf_mini.patch]; - buildInputs = [ pkgconfig libnfc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libnfc ]; meta = with stdenv.lib; { description = "Mifare Classic Offline Cracker"; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index b3c1a32f22b..45f995a5935 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -46,7 +46,8 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath $pygtk)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pygobject)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pycairo)/gtk-2.0 ''; - buildInputs = with python2Packages; [ libpcap pkgconfig openssl ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with python2Packages; [ libpcap openssl ] ++ optionals pythonSupport [ makeWrapper python ] ++ optionals graphicalSupport [ libX11 gtk2 pygtk pysqlite pygobject2 pycairo diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index e4141d1a61b..1e626084ee3 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/ ''; - buildInputs = [ cmake ccid qttools pkgconfig pcsclite qttranslations + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ccid qttools pcsclite qttranslations hicolor_icon_theme libdigidocpp opensc shared_mime_info openldap gettext desktop_file_utils makeWrapper ]; diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index 04f6cbf6d11..f2a997db05f 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { cd src ''; - buildInputs = [ cmake ccid qttools pkgconfig pcsclite qttranslations + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ccid qttools pcsclite qttranslations hicolor_icon_theme ]; diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index bca93887bd4..b66564d58ce 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { prePatch = "patchShebangs ."; - buildInputs = [ autoconf automake utillinux openssl libuuid gnu-efi binutils pkgconfig help2man ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake utillinux openssl libuuid gnu-efi binutils help2man ]; configurePhase = '' substituteInPlace configure.ac --replace "@@NIX_GNUEFI@@" "${gnu-efi}" diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 40829df56ca..7d0ff797336 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1ms2v57f13r9km6mvf9rha5ndmlmjvrz3mcikai6nzhpj0nrjz0w"; }; - buildInputs = [ autoreconfHook gawk trousers cryptsetup openssl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ gawk trousers cryptsetup openssl ]; installPhase = '' mkdir -p $out diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index d57aa8c63a9..d9bee3de7f3 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v"; }; - buildInputs = [ openssl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; patches = [ ./allow-non-tss-config-file-owner.patch ]; diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 34da8d40081..f99d22becdb 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb"; }; - buildInputs = [ pkgconfig glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ]; pythonPath = with python2Packages; [ pygtk pycairo ]; installPhase = '' diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix index e1c163f4170..6dcaeed325a 100644 --- a/pkgs/tools/system/chase/default.nix +++ b/pkgs/tools/system/chase/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "chase-${version}"; version = "0.5.2"; - buildInputs = [ pkgconfig libatomic_ops boehmgc ] ; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libatomic_ops boehmgc ] ; src = fetchurl { url = "mirror://debian/pool/main/c/chase/chase_${version}.orig.tar.gz"; sha256 = "68d95c2d4dc45553b75790fcea4413b7204a2618dff148116ca9bdb0310d737f"; diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index fbca63b0e0a..bcea40b1193 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr"; }; - buildInputs = [ libgtop xmessage which pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgtop xmessage which ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index be3a32de251..25470af9bb3 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1ls3y97qqfcfd3z0balz94xq1gskfk04pg85x6b7wjw8dm4030qd"; }; - buildInputs = [ autoreconfHook perl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ perl ]; meta = with stdenv.lib; { homepage = https://github.com/dex4er/fakechroot; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 1d33e5fb09f..a74ded1fed0 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; - buildInputs = [ gtk2 pkgconfig libxml2 intltool gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libxml2 intltool gettext ]; patches = [ ./get_sensitive.patch ./set_flags.patch ]; diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix index 11236b7a9d1..a2bffab3a98 100644 --- a/pkgs/tools/system/hardinfo/default.nix +++ b/pkgs/tools/system/hardinfo/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { # Not adding 'hostname' command, the build shouldn't depend on what the build # host is called. - buildInputs = [ which pkgconfig gtk2 pcre glib libxml2 libsoup ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which gtk2 pcre glib libxml2 libsoup ]; # Fixes '#error You must compile this program without "-O"' hardeningDisable = [ "all" ]; diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index d8faeea19d8..03373300a94 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "05v3hz7n6b1mlhc6zqijblh1vpl0ja1y8y0lafw7mjdz03wxhfdb"; }; - buildInputs = [ pkgconfig ninja libevdev libev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ninja libevdev libev ]; configurePhase = '' bash ./configure diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index dc5b75b0f4a..40c17e1d1f2 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3"; })]; - buildInputs = lib.optionals withGUI [ gtk2 pkgconfig sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = lib.optionals withGUI [ gtk2 sqlite ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 236474343b4..ed177820b64 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec{ sha256 = "1fv01jnbgwbafsxavlji90zdqizn8m4nfg9ivc4sbi05j036bg6n"; }; - buildInputs = [ autoreconfHook zlib pkgconfig libuuid ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ zlib libuuid ]; # Allow UI to load when running as non-root patches = [ ./web_access.patch ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 8a4fe6cb3cf..7508b4fc56c 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5"; }; - buildInputs = [ pkgconfig zlib kmod which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib kmod which ]; makeFlags = "SHARED=yes PREFIX=\${out}"; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 7c81a028810..a3e90f32c0a 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1qzvmzkzdrmwrzfbxb2rz1i39j5zskjxiiv1w9m0xyg08p2wr7h3"; }; - buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool dbus_libs dbus_glib libxml2 ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index a9a034ebde9..6dfc6d1349d 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; }; - buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl stdenv.cc.libc.static ] ++ stdenv.lib.optional (libuuid != null) (libuuid.overrideAttrs (attrs: { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; })); diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index c1c62718de2..bd6ec17ceec 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "03ay6sa4ii8h6rr3l2qiqqml8xl6gplrlg4v2avdh9y6sihfyvvn"; }; - buildInputs = [ autoconf automake libtool pkgconfig openwsman openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool openwsman openssl ]; preConfigure = '' ./bootstrap diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index e9abae3ac84..7dcd94e5363 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; - buildInputs = [ cmake pkgconfig libxml2 libzip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libxml2 libzip ]; preConfigure = '' diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index 63759184ba4..761a498bcfb 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "027959xbzvi5c2w9y1x122sr5i26k9mvp43banz2wln6gd860n1a"; }; - buildInputs = [ qt4 perl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 perl ]; configurePhase = '' mkdir -p $out/{bin,man/man1} diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 34aa0e9c7ed..156a8bd8f64 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ pcre zlib lzma ]; meta = with stdenv.lib; { homepage = https://github.com/ggreer/the_silver_searcher/; diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 203f0940990..e96644b6d3c 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; - buildInputs = [ pkgconfig libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 ]; meta = with stdenv.lib; { homepage = http://ofb.net/~egnor/xml2/; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 5ad62cd7140..4fe6ad6b3dc 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"; }; - buildInputs = [ pkgconfig libxml2 libxslt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 libxslt ]; preConfigure = '' diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index c15f165013b..95ee3ab3b71 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -209,7 +209,8 @@ dvisvgm = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ ghostscript zlib freetype potrace ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype potrace ]; preConfigure = "cd texk/dvisvgm"; @@ -225,7 +226,8 @@ dvipng = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; preConfigure = "cd texk/dvipng"; @@ -247,7 +249,8 @@ bibtex8 = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ icu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ icu ]; preConfigure = "cd texk/bibtex-x"; @@ -263,7 +266,8 @@ xdvi = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ freetype ghostscript ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ freetype ghostscript ] ++ (with xorg; [ libX11 libXaw libXi libXpm libXmu libXaw libXext libXfixes ]); preConfigure = "cd texk/xdvik"; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 3b02f0d3e2c..197caca0d86 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ libdv libjpeg libpng pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libdv libjpeg libpng ] ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL"; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 0c8a34c5763..3832f3c3be0 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { # Fixes build with GCC 6 NIX_CFLAGS_COMPILE = "-std=c++03"; - buildInputs = [ pkgconfig libxslt freetype libpng libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxslt freetype libpng libxml2 ]; meta = { description = "An xml2swf and swf2xml processor with import functionalities"; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 4734b51046f..3e447aa653c 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -94,7 +94,8 @@ let rev = "v${version}"; sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl"; }; - buildInputs = with external; [ autoconf automake libpng zlib poppler pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with external; [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; fileSpecs = [ "lisp/pdf-*.el" "server/epdfinfo" ]; packageRequires = [ tablist let-alist ]; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index ed9e09802b7..c077ae5016b 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -13,7 +13,8 @@ with pkgs; rec { pythonSupport = false; }).overrideDerivation (old: { - buildInputs = old.buildInputs ++ [ autoreconfHook pkgconfig zlib nodejs ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = old.buildInputs ++ [ zlib nodejs ]; nativeBuildInputs = old.nativeBuildInputs ++ [ zlib pkgconfig ]; # just override it with nothing so it does not fail autoreconfPhase = "echo autoreconfPhase not used..."; @@ -39,7 +40,8 @@ with pkgs; rec { xmlmirror = buildEmscriptenPackage rec { name = "xmlmirror"; - buildInputs = [ autoconf automake libtool pkgconfig gnumake libxml2 nodejs + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool gnumake libxml2 nodejs python openjdk json_c zlib ]; src = fetchgit { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index f940a5b646c..53a3e2eb0de 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -456,7 +456,8 @@ let platforms = platforms.unix; }; - buildInputs = [ glib gobjectIntrospection lua pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gobjectIntrospection lua ]; makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; @@ -469,7 +470,8 @@ let name = "lua-mpack-${libmpack.version}"; src = libmpack.src; sourceRoot = "libmpack-${libmpack.rev}-src/binding/lua"; - buildInputs = [ libmpack ]; #libtool lua pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmpack ]; #libtool lua ]; dontBuild = true; preInstall = '' mkdir -p $out/lib/lua/${lua.luaversion} diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 83175a4ee4c..0986dde9875 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9896,7 +9896,8 @@ let self = _self // overrides; _self = with self; { patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; doCheck = false; # The main test performs network access #buildInputs = [ TestMore TestPod ]; - buildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pkgs. ]; propagatedBuildInputs = [ pkgs.libdiscid ]; }; @@ -12786,7 +12787,8 @@ let self = _self // overrides; _self = with self; { sha256 = "18v8x0514in0zpvq1rv78hmvhpij1xjh5xn0wa6wmg2swky54sp4"; }; propagatedBuildInputs = [XMLXPath]; - buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs.pkgconfig pkgs.libvirt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs. pkgs.libvirt]; meta = { platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d7ad2eb85b6..5166f8f3eda 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -91,7 +91,8 @@ let "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with pkgs; [ cyrus_sasl zlib ]; }; # Not released yet @@ -109,7 +110,8 @@ let "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with pkgs; [ cyrus_sasl zlib ]; }; pcs = buildPecl rec { @@ -197,7 +199,8 @@ let "--with-zmq=${pkgs.zeromq}" ]; - buildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pkgs. ]; }; # No support for PHP 7 and probably never will be diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2584b6f2810..25f8685062a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7166,7 +7166,8 @@ in { }; NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/"; - buildInputs = [ pkgs.pkgconfig pkgs.poppler.dev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pkgs. pkgs.poppler.dev ]; propagatedBuildInputs = with self; [ pycairo pygobject2 ]; patches = [ @@ -9447,7 +9448,8 @@ in { sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; }; - buildInputs = with self; [ pkgs.pkgconfig pkgs.fuse ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with self; [ pkgs. pkgs.fuse ]; meta = { description = "Python bindings for FUSE"; @@ -11191,7 +11193,8 @@ in { sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; }; - buildInputs = with self; [ pytest pkgs.pkgconfig pkgs.fuse pkgs.attr pkgs.which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with self; [ pytest pkgs. pkgs.fuse pkgs.attr pkgs.which ]; propagatedBuildInputs = with self; [ contextlib2 ]; @@ -13135,7 +13138,8 @@ in { configure ''; - buildInputs = with self; [ python pkgs.pkgconfig pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with self; [ python pkgs. pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -16420,7 +16424,8 @@ in { patchShebangs . ''; - buildInputs = [ self.setuptools self.nose pkgs.pkgconfig pkgs.swig pkgs.libcdio ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ self.setuptools self.nose pkgs. pkgs.swig pkgs.libcdio ] ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv; patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ]; @@ -17120,7 +17125,8 @@ in { PATH="${pkgs.parted}/sbin:$PATH" ''; - buildInputs = with self; [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with self; [ pkgs. ]; propagatedBuildInputs = with self; [ pkgs.parted ]; @@ -20284,7 +20290,8 @@ in { sha256 = "0zrjxvzxqm4bz2jcy8sras8jircgbs6dkrw8j3nc6jhvzlikwwxl"; }; - buildInputs = [ pkgs.pkgconfig self.pytest_28 self.pytestrunner ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pkgs. self.pytest_28 self.pytestrunner ]; propagatedBuildInputs = [ self.cffi pkgs.secp256k1 ]; # Tests are not included in archive @@ -20367,7 +20374,8 @@ in { }; propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ]; - buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite libvpx ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; }; @@ -20956,7 +20964,8 @@ in { src = pkgs.subunit.src; propagatedBuildInputs = with self; [ testtools testscenarios ]; - buildInputs = [ pkgs.pkgconfig pkgs.check pkgs.cppunit ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pkgs. pkgs.check pkgs.cppunit ]; patchPhase = '' sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py @@ -24100,7 +24109,8 @@ EOF sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc"; }; - buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with self; [ python pkgs. pkgs.libvirt lxml ]; buildPhase = "${python.interpreter} setup.py build"; @@ -24239,7 +24249,8 @@ EOF preBuild = "${python}/bin/${python.executable} setup.py build_ext"; installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; - buildInputs = with self; [ pkgs.pkgconfig pkgs.enlightenment.efl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with self; [ pkgs. pkgs.enlightenment.efl ]; doCheck = false; meta = { From f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 5 Sep 2017 18:03:42 -0400 Subject: [PATCH 0034/2806] misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed Importantly, this included regenerating pkgs/servers/x11/xorg, to clobber the old sed. --- pkgs/applications/audio/iannix/default.nix | 3 +- pkgs/applications/editors/zile/default.nix | 6 +- .../telepathy/logger/default.nix | 6 +- .../networking/linssid/default.nix | 3 +- .../gnome-3/3.24/core/epiphany/default.nix | 1 - .../interpreters/erlang/generic-builder.nix | 5 +- .../interpreters/pixie/default.nix | 5 +- .../interpreters/spidermonkey/1.8.5.nix | 3 +- .../libraries/directfb/default.nix | 3 +- pkgs/development/libraries/exosip/default.nix | 1 - pkgs/development/libraries/fflas-ffpack/1.nix | 3 +- .../libraries/fflas-ffpack/default.nix | 3 +- .../libraries/java/jzmq/default.nix | 3 +- .../libtorrent-rasterbar/generic.nix | 4 +- .../libraries/mediastreamer/msopenh264.nix | 3 +- .../libraries/shibboleth-sp/default.nix | 3 +- .../libraries/vulkan-loader/default.nix | 3 +- .../python-modules/Cython/default.nix | 11 +- .../ruby-modules/gem-config/default.nix | 22 +- pkgs/os-specific/linux/kernel/perf.nix | 3 +- pkgs/servers/x11/xorg/default.nix | 422 ++++++++++-------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 +- pkgs/servers/x11/xorg/overrides.nix | 12 +- pkgs/tools/misc/colord/default.nix | 4 +- pkgs/tools/networking/libreswan/default.nix | 3 +- pkgs/top-level/emscripten-packages.nix | 3 +- pkgs/top-level/perl-packages.nix | 7 +- pkgs/top-level/php-packages.nix | 15 +- pkgs/top-level/python-packages.nix | 43 +- 29 files changed, 312 insertions(+), 293 deletions(-) diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 097c66609bd..c26980e1bb2 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; }; - nativeBuildInputs = [ qmake ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ alsaLib qtbase qtscript ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 73bdb8bcbf3..9274eb6889d 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses boehmgc ]; - nativeBuildInputs = [ perl ] + nativeBuildInputs = [ pkgconfig perl ] # `help2man' wants to run Zile, which won't work when the # newly-produced binary can't be run at build-time. ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man; + buildInputs = [ ncurses boehmgc ]; + # Tests can't be run because most of them rely on the ability to # fiddle with the terminal. doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 721e4eba84f..0bd6c2e5f2b 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -12,12 +12,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool makeWrapper + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; - nativeBuildInputs = [ libxslt ]; - configureFlags = "--enable-call"; preFixup = '' diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 34c1eae8144..109ab2417af 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - nativeBuildInputs = [ qmake ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ qtbase qtsvg boost qwt6 ]; patches = [ ./0001-unbundled-qwt.patch ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix index ed76d726a4c..35aae8cc9eb 100644 --- a/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file webkitgtk libsoup libsecret gnome_desktop libnotify libtool sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index b41fa8a77c4..af728b942eb 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -47,10 +47,9 @@ in stdenv.mkDerivation ({ inherit src version; - nativeBuildInputs = [ autoreconfHook makeWrapper perl ]; + nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ gnum4 ncurses openssl libxslt libxml2 ] + buildInputs = [ ncurses openssl ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 9e9a99e5287..b196af8e3ae 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -32,9 +32,8 @@ let build = {flags, target}: stdenv.mkDerivation rec { name = "pixie-${version}"; version = "0-r${commit-count}-${variant}"; - nativeBuildInputs = libs; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = libs; PYTHON = if buildWithPypy then "${pypy}/pypy-c/.pypy-c-wrapped" else "${python2.interpreter}"; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 418ee90533f..9a14beb856b 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isArm autoconf213; buildInputs = [ perl python2 zip ]; - nativeBuildInputs = if stdenv.isArm then [ autoconf213 ] else []; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 7279d5c383c..fc533c277bb 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation { inherit (s) url sha256; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl pkgconfig ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL ++ stdenv.lib.optionals enableX11 (with xorg; [ diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index bd12dac4aaf..240f3c136ef 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw"; }; - nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libosip openssl ]; diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix index c723885a68b..5efa378ff5f 100644 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/pkgs/development/libraries/fflas-ffpack/1.nix @@ -7,9 +7,8 @@ stdenv.mkDerivation rec { url = "http://linalg.org/fflas-ffpack-${version}.tar.gz"; sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ givaro_3_7 openblas gmpxx]; - nativeBuildInputs = [pkgconfig]; configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}"; meta = { inherit version; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index f1d6e47f56e..0e4e897e27a 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; - nativeBuildInputs = [pkgconfig]; configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack"; meta = { inherit version; diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index f86f2fcf214..7d229d2577a 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63"; }; - nativeBuildInputs = [ autoreconfHook ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ zeromq3 jdk ]; preConfigure = '' diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index 4e1f0badd7a..351ec3e7733 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [automake autoconf libtool ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boost openssl zlib python libiconv geoip ]; preConfigure = "./autotool.sh"; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index bc5dda6cff1..f49b7ba2c4b 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -12,9 +12,8 @@ stdenv.mkDerivation rec { sha256 = "001km4xy1ifwbg1c19ncc75h867fzfcxy9pxvl4pxqb64169xc1k"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; buildInputs = [ mediastreamer openh264 ]; - nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "H.264 encoder/decoder plugin for mediastreamer2"; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 4bdc9503c9a..219cda38bc2 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ]; - nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--without-apxs" diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 15a9e98b04e..8330f7f44f3 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; inherit version src; - nativeBuildInputs = [ makeWrapper ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ cmake git python3 python3Packages.lxml glslang spirv-tools x11 libxcb libXrandr libXext wayland ]; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index f94db1bdbe9..0513f67e569 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -30,11 +30,12 @@ buildPythonPackage rec { tests/run/cpdef_enums.pyx ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + # For testing + numpy ncurses + ]; buildInputs = [ glibcLocales gdb ]; - # For testing - nativeBuildInputs = [ numpy ncurses ]; - LC_ALL = "en_US.UTF-8"; # cython's testsuite is not working very well with libc++ @@ -55,4 +56,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 2b0b43478aa..52bdf202768 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -39,8 +39,10 @@ let in { - nativeBuildInputs = [ pkgconfig ]; - atk = attrs: { buildInputs = [ gtk2 pcre ]; }; + atk = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre ]; + }; bundler = attrs: let @@ -58,7 +60,7 @@ in }; cairo = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; }; @@ -91,16 +93,20 @@ in buildInputs = [ gpgme ]; }; - nativeBuildInputs = [ pkgconfig ]; - gio2 = attrs: { buildInputs = [ gtk2 pcre ]; }; + gio2 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre ]; + }; gitlab-markup = attrs: { meta.priority = 1; }; - nativeBuildInputs = [ pkgconfig ]; - glib2 = attrs: { buildInputs = [ gtk2 pcre ]; }; + glib2 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre ]; + }; gtk2 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 4f63a1ea069..b64242e911d 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation { # perf refers both to newt and slang # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty libaudit makeWrapper ]; - nativeBuildInputs = [ pkgconfig ]; + flex bison libiberty libaudit makeWrapper pkgconfig ]; buildInputs = [ elfutils python perl newt slang libunwind binutils zlib ] ++ stdenv.lib.optional withGtk gtk2; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4e26d5f0410..b7d779f8812 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -27,6 +27,7 @@ let sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -37,7 +38,7 @@ let url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2; sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXt ;}; @@ -49,7 +50,7 @@ let url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2; sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXfont ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXfont ;}; @@ -62,6 +63,7 @@ let sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -73,6 +75,7 @@ let sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -84,6 +87,7 @@ let sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -95,6 +99,7 @@ let sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -106,6 +111,7 @@ let sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -117,6 +123,7 @@ let sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -128,6 +135,7 @@ let sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -138,7 +146,7 @@ let url = mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2; sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xextproto ;}; @@ -150,7 +158,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -162,7 +170,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -174,7 +182,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -186,7 +194,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -198,7 +206,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -211,6 +219,7 @@ let sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -221,7 +230,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -233,7 +242,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -245,7 +254,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -257,7 +266,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -269,7 +278,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -281,7 +290,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -293,7 +302,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -305,7 +314,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -317,7 +326,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -329,7 +338,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -341,7 +350,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -353,7 +362,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -365,7 +374,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -377,7 +386,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -389,7 +398,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -401,7 +410,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -413,7 +422,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -425,7 +434,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -437,7 +446,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -449,7 +458,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -461,7 +470,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -473,7 +482,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -485,7 +494,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -497,7 +506,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -509,7 +518,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -521,7 +530,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -534,6 +543,7 @@ let sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -544,7 +554,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -557,6 +567,7 @@ let sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -567,7 +578,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -579,7 +590,7 @@ let url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -592,6 +603,7 @@ let sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -603,6 +615,7 @@ let sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -613,7 +626,7 @@ let url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2; sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE xproto ;}; @@ -625,7 +638,7 @@ let url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2; sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -638,6 +651,7 @@ let sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -649,6 +663,7 @@ let sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -659,7 +674,7 @@ let url = mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2; sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ applewmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit applewmproto libX11 libXext xextproto ;}; @@ -671,7 +686,7 @@ let url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2; sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto xproto xtrans ;}; @@ -683,7 +698,7 @@ let url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2; sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto xtrans ;}; @@ -695,7 +710,7 @@ let url = mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2; sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libuuid xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libuuid xproto xtrans ;}; @@ -707,7 +722,7 @@ let url = mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ windowswmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit windowswmproto libX11 libXext xextproto ;}; @@ -719,7 +734,7 @@ let url = mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2; sha256 = "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; @@ -731,7 +746,7 @@ let url = mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2; sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ scrnsaverproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit scrnsaverproto libX11 libXext xextproto ;}; @@ -743,7 +758,7 @@ let url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -755,7 +770,7 @@ let url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2; sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto libXmu libXpm xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; @@ -767,7 +782,7 @@ let url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2; sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ compositeproto libX11 libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit compositeproto libX11 libXfixes xproto ;}; @@ -779,7 +794,7 @@ let url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2; sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; @@ -791,7 +806,7 @@ let url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2; sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ damageproto fixesproto libX11 xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; @@ -803,7 +818,7 @@ let url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2; sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -815,7 +830,7 @@ let url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xextproto xproto ;}; @@ -827,7 +842,7 @@ let url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2; sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fixesproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fixesproto libX11 xextproto xproto ;}; @@ -839,7 +854,7 @@ let url = mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2; sha256 = "0w8d07bkmjiarkx09579bl8zsq903mn8javc7qpi0ix4ink5x502"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -851,7 +866,7 @@ let url = mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2; sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -863,7 +878,7 @@ let url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2; sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontconfig freetype libX11 xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; @@ -875,7 +890,7 @@ let url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2; sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; @@ -887,7 +902,7 @@ let url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2; sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xineramaproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xineramaproto ;}; @@ -899,7 +914,7 @@ let url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2; sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -911,7 +926,7 @@ let url = mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2; sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ printproto libX11 libXau libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit printproto libX11 libXau libXext xextproto ;}; @@ -923,7 +938,7 @@ let url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -935,7 +950,7 @@ let url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2; sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ presentproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit presentproto libX11 xextproto xproto ;}; @@ -947,7 +962,7 @@ let url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2; sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ randrproto renderproto libX11 libXext xextproto xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; @@ -959,7 +974,7 @@ let url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2; sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ renderproto libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit renderproto libX11 xproto ;}; @@ -971,7 +986,7 @@ let url = mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2; sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ resourceproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit resourceproto libX11 libXext xextproto xproto ;}; @@ -983,7 +998,7 @@ let url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2; sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE kbproto libSM libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE kbproto libSM libX11 xproto ;}; @@ -995,7 +1010,7 @@ let url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2; sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto recordproto libX11 libXext xextproto libXi ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; @@ -1007,7 +1022,7 @@ let url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2; sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ videoproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit videoproto libX11 libXext xextproto xproto ;}; @@ -1019,7 +1034,7 @@ let url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2; sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ videoproto libX11 libXext xextproto xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; @@ -1031,7 +1046,7 @@ let url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2; sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xf86dgaproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; @@ -1043,7 +1058,7 @@ let url = mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2; sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xf86miscproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; @@ -1055,7 +1070,7 @@ let url = mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2; sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xf86vidmodeproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; @@ -1067,7 +1082,7 @@ let url = mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2; sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dmxproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dmxproto libX11 libXext xextproto ;}; @@ -1079,7 +1094,7 @@ let url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2; sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto zlib ;}; @@ -1091,7 +1106,7 @@ let url = mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2; sha256 = "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit zlib ;}; @@ -1104,6 +1119,7 @@ let sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1114,7 +1130,7 @@ let url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2; sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; @@ -1126,7 +1142,7 @@ let url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2; sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ kbproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit kbproto libX11 ;}; @@ -1138,7 +1154,7 @@ let url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2; sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1150,7 +1166,7 @@ let url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2; sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1162,7 +1178,7 @@ let url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2; sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc ;}; @@ -1174,7 +1190,7 @@ let url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2; sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1187,6 +1203,7 @@ let sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1197,7 +1214,7 @@ let url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc freetype xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc freetype xproto zlib ;}; @@ -1210,6 +1227,7 @@ let sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1220,7 +1238,7 @@ let url = mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2; sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXau ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXau ;}; @@ -1233,6 +1251,7 @@ let sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1244,6 +1263,7 @@ let sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1255,6 +1275,7 @@ let sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1266,6 +1287,7 @@ let sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1277,6 +1299,7 @@ let sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1287,7 +1310,7 @@ let url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2; sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1299,7 +1322,7 @@ let url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2; sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile ;}; @@ -1311,7 +1334,7 @@ let url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2; sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libSM libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libSM libXmu libXt ;}; @@ -1323,7 +1346,7 @@ let url = mirror://xorg/individual/app/twm-1.0.9.tar.bz2; sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libSM libX11 libXext libXmu xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; @@ -1336,6 +1359,7 @@ let sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1347,6 +1371,7 @@ let sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1358,6 +1383,7 @@ let sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1368,7 +1394,7 @@ let url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2; sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXft libXmu xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;}; @@ -1380,7 +1406,7 @@ let url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2; sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXext libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXext libXmu xproto ;}; @@ -1392,7 +1418,7 @@ let url = mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2; sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb xcbutil ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb xcbutil ;}; @@ -1405,6 +1431,7 @@ let sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1415,7 +1442,7 @@ let url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2; sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit python ;}; @@ -1427,7 +1454,7 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1439,7 +1466,7 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;}; @@ -1451,7 +1478,7 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xcbproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbproto xproto ;}; @@ -1463,7 +1490,7 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xcbutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbutil xproto ;}; @@ -1475,7 +1502,7 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1487,7 +1514,7 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1499,7 +1526,7 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1511,7 +1538,7 @@ let url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2; sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;}; @@ -1524,6 +1551,7 @@ let sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1534,7 +1562,7 @@ let url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2; sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 ;}; @@ -1546,7 +1574,7 @@ let url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2; sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;}; @@ -1558,7 +1586,7 @@ let url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpng libX11 libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libpng libX11 libXcursor ;}; @@ -1570,7 +1598,7 @@ let url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2; sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXcursor ;}; @@ -1582,7 +1610,7 @@ let url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2; sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; @@ -1594,7 +1622,7 @@ let url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2; sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; @@ -1606,7 +1634,7 @@ let url = mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2; sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit glproto libX11 ;}; @@ -1618,7 +1646,7 @@ let url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2; sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXrandr ;}; @@ -1631,6 +1659,7 @@ let sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1641,7 +1670,7 @@ let url = mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2; sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXmu libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXmu libXrender libXt ;}; @@ -1654,6 +1683,7 @@ let sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1665,6 +1695,7 @@ let sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1676,6 +1707,7 @@ let sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1686,7 +1718,7 @@ let url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2; sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto udev xorgserver xproto ;}; @@ -1698,7 +1730,7 @@ let url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto xorgserver xproto ;}; @@ -1710,7 +1742,7 @@ let url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1722,7 +1754,7 @@ let url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2; sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1734,7 +1766,7 @@ let url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1746,7 +1778,7 @@ let url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1758,7 +1790,7 @@ let url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2; sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto udev randrproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto udev randrproto xorgserver xproto ;}; @@ -1770,7 +1802,7 @@ let url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2; sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xorgserver xproto ;}; @@ -1783,6 +1815,7 @@ let sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1793,7 +1826,7 @@ let url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2; sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1805,7 +1838,7 @@ let url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2; sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; @@ -1817,7 +1850,7 @@ let url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2; sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1829,7 +1862,7 @@ let url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2; sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1841,7 +1874,7 @@ let url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2; sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1853,7 +1886,7 @@ let url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2; sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1865,7 +1898,7 @@ let url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2; sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1877,7 +1910,7 @@ let url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2; sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; @@ -1889,7 +1922,7 @@ let url = mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2; sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1901,7 +1934,7 @@ let url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2; sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xextproto xorgserver xproto ;}; @@ -1913,7 +1946,7 @@ let url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2; sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1925,7 +1958,7 @@ let url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2; sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1937,19 +1970,19 @@ let url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2; sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2017-04-18"; + name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz; - sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2; + sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; @@ -1961,7 +1994,7 @@ let url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2; sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1973,7 +2006,7 @@ let url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2; sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1985,7 +2018,7 @@ let url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2; sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess xorgserver xproto ;}; @@ -1997,7 +2030,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2; sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; @@ -2009,7 +2042,7 @@ let url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2; sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -2021,7 +2054,7 @@ let url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2; sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -2033,7 +2066,7 @@ let url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; @@ -2045,7 +2078,7 @@ let url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2; sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -2057,7 +2090,7 @@ let url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2; sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; @@ -2069,7 +2102,7 @@ let url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2; sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -2081,7 +2114,7 @@ let url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -2093,7 +2126,7 @@ let url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2; sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -2105,7 +2138,7 @@ let url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2; sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; @@ -2117,7 +2150,7 @@ let url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2; sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; @@ -2129,7 +2162,7 @@ let url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2; sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; @@ -2141,7 +2174,7 @@ let url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2; sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; @@ -2153,7 +2186,7 @@ let url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2; sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; @@ -2165,7 +2198,7 @@ let url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2; sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; @@ -2177,7 +2210,7 @@ let url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -2189,7 +2222,7 @@ let url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2; sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2201,7 +2234,7 @@ let url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2; sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2213,7 +2246,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ randrproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit randrproto videoproto xorgserver xproto ;}; @@ -2225,7 +2258,7 @@ let url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2; sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -2237,7 +2270,7 @@ let url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; @@ -2249,7 +2282,7 @@ let url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2; sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2261,7 +2294,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2; sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xorgserver xproto ;}; @@ -2273,7 +2306,7 @@ let url = mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2; sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; @@ -2286,6 +2319,7 @@ let sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2296,7 +2330,7 @@ let url = mirror://xorg/individual/app/xfs-1.1.4.tar.bz2; sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXfont xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXfont xproto xtrans ;}; @@ -2308,7 +2342,7 @@ let url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2; sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXxf86vm ;}; @@ -2320,7 +2354,7 @@ let url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2; sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXaw libXt ;}; @@ -2332,7 +2366,7 @@ let url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2; sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXmu xproto ;}; @@ -2345,6 +2379,7 @@ let sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2355,7 +2390,7 @@ let url = mirror://xorg/individual/app/xinit-1.3.4.tar.bz2; sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2367,7 +2402,7 @@ let url = mirror://xorg/individual/app/xinput-1.6.2.tar.bz2; sha256 = "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; @@ -2379,7 +2414,7 @@ let url = mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2; sha256 = "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile xproto ;}; @@ -2391,7 +2426,7 @@ let url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2; sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile ;}; @@ -2403,7 +2438,7 @@ let url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2; sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile xproto ;}; @@ -2415,7 +2450,7 @@ let url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2; sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto libX11 libXaw xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXaw xproto libXt ;}; @@ -2427,7 +2462,7 @@ let url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2; sha256 = "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2439,7 +2474,7 @@ let url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2; sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2451,7 +2486,7 @@ let url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2; sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb ;}; @@ -2463,7 +2498,7 @@ let url = mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2; sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb ;}; @@ -2475,7 +2510,7 @@ let url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2; sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2487,7 +2522,7 @@ let url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2; sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXaw libXmu libXt ;}; @@ -2499,7 +2534,7 @@ let url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2; sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXaw libXt ;}; @@ -2511,7 +2546,7 @@ let url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2; sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2524,6 +2559,7 @@ let sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2535,6 +2571,7 @@ let sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2545,7 +2582,7 @@ let url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2; sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; @@ -2558,6 +2595,7 @@ let sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2568,7 +2606,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2; sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2580,7 +2618,7 @@ let url = mirror://xorg/individual/app/xprop-1.2.2.tar.bz2; sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2593,6 +2631,7 @@ let sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2603,7 +2642,7 @@ let url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2; sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXrandr libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXrandr libXrender ;}; @@ -2615,7 +2654,7 @@ let url = mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2; sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2627,7 +2666,7 @@ let url = mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2; sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2639,7 +2678,7 @@ let url = mirror://xorg/individual/app/xset-1.2.3.tar.bz2; sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXmu xproto libXxf86misc ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;}; @@ -2651,7 +2690,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2; sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xbitmaps libXcursor libXmu ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xbitmaps libXcursor libXmu ;}; @@ -2664,6 +2703,7 @@ let sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2674,7 +2714,7 @@ let url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2; sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXv ;}; @@ -2686,7 +2726,7 @@ let url = mirror://xorg/individual/app/xwd-1.0.6.tar.bz2; sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2698,7 +2738,7 @@ let url = mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2; sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxcb xproto ;}; @@ -2710,7 +2750,7 @@ let url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2; sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 0e0afc7184f..1f3557dff66 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -281,7 +281,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { url = $pkgURLs{$pkg}; sha256 = "$pkgHashes{$pkg}"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ $inputs];$extraAttrs meta.platforms = stdenv.lib.platforms.unix; }) // {inherit $inputs;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b43bc28d697..20b75867948 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -71,13 +71,13 @@ in }; libxcb = attrs : attrs // { - nativeBuildInputs = [ args.python ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ]; configureFlags = "--enable-xkb --enable-xinput"; outputs = [ "out" "dev" "man" "doc" ]; }; xcbproto = attrs : attrs // { - nativeBuildInputs = [ args.python ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ]; }; libX11 = attrs: attrs // { @@ -410,7 +410,7 @@ in url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2; sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; } else if (args.abiCompat == "1.18") then { @@ -420,7 +420,7 @@ in url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; } else throw "unsupported xorg abiCompat: ${args.abiCompat}"; @@ -541,7 +541,7 @@ in }; twm = attrs: attrs // { - nativeBuildInputs = [args.bison args.flex]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex]; }; xcursorthemes = attrs: attrs // { @@ -568,7 +568,7 @@ in xf86videointel = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; - nativeBuildInputs = [args.autoreconfHook xorg.utilmacros]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros]; configureFlags = "--with-default-dri=3 --enable-tools"; }; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 00407c47a1f..40ea672296d 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m"; }; - nativeBuildInputs = [ autoreconfHook intltool ]; enableParallelBuilding = true; @@ -34,7 +33,8 @@ stdenv.mkDerivation rec { sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection bash-completion argyllcms libgudev sane-backends ]; diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 096a25e9971..59e33e81870 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -24,8 +24,7 @@ stdenv.mkDerivation { sha256 = "0zginnakxw7m79zrdvfdvliaiyg78zgqfqkks9z5d1rjj5w13xig"; }; - nativeBuildInputs = [ makeWrapper ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent libcap_ng curl nspr nss python ] ++ optional docs xmlto; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index c077ae5016b..7e63041867d 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -13,9 +13,8 @@ with pkgs; rec { pythonSupport = false; }).overrideDerivation (old: { - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ autoreconfHook pkgconfig ]; buildInputs = old.buildInputs ++ [ zlib nodejs ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ zlib pkgconfig ]; # just override it with nothing so it does not fail autoreconfPhase = "echo autoreconfPhase not used..."; checkPhase = '' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0986dde9875..77f782fbedf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9895,9 +9895,8 @@ let self = _self // overrides; _self = with self; { # Build.PL in this package uses which to find pkg-config -- make it use path instead patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; doCheck = false; # The main test performs network access + nativeBuildInputs = [ pkgs.pkgconfig ]; #buildInputs = [ TestMore TestPod ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pkgs. ]; propagatedBuildInputs = [ pkgs.libdiscid ]; }; @@ -12787,8 +12786,8 @@ let self = _self // overrides; _self = with self; { sha256 = "18v8x0514in0zpvq1rv78hmvhpij1xjh5xn0wa6wmg2swky54sp4"; }; propagatedBuildInputs = [XMLXPath]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs. pkgs.libvirt]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs.libvirt]; meta = { platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5166f8f3eda..20b8c15f388 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -91,7 +91,7 @@ let "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; }; @@ -110,7 +110,7 @@ let "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; }; @@ -164,9 +164,7 @@ let "--with-yaml=${pkgs.libyaml}" ]; - buildInputs = [ - pkgs.pkgconfig - ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; }; yaml20 = assert isPhp7; buildPecl { @@ -178,9 +176,7 @@ let "--with-yaml=${pkgs.libyaml}" ]; - buildInputs = [ - pkgs.pkgconfig - ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; }; # Since PHP 5.5 OPcache is integrated in the core and has to be enabled via --enable-opcache during compilation. @@ -199,8 +195,7 @@ let "--with-zmq=${pkgs.zeromq}" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pkgs. ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; }; # No support for PHP 7 and probably never will be diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 25f8685062a..48124ced008 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7166,8 +7166,8 @@ in { }; NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pkgs. pkgs.poppler.dev ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.poppler.dev ]; propagatedBuildInputs = with self; [ pycairo pygobject2 ]; patches = [ @@ -9448,8 +9448,8 @@ in { sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with self; [ pkgs. pkgs.fuse ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ pkgs.fuse ]; meta = { description = "Python bindings for FUSE"; @@ -11193,8 +11193,8 @@ in { sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with self; [ pytest pkgs. pkgs.fuse pkgs.attr pkgs.which ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ pytest pkgs.fuse pkgs.attr pkgs.which ]; propagatedBuildInputs = with self; [ contextlib2 ]; @@ -13138,8 +13138,8 @@ in { configure ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with self; [ python pkgs. pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ python pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -16424,8 +16424,8 @@ in { patchShebangs . ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ self.setuptools self.nose pkgs. pkgs.swig pkgs.libcdio ] + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ self.setuptools self.nose pkgs.swig pkgs.libcdio ] ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv; patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ]; @@ -17125,8 +17125,7 @@ in { PATH="${pkgs.parted}/sbin:$PATH" ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with self; [ pkgs. ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; propagatedBuildInputs = with self; [ pkgs.parted ]; @@ -20290,8 +20289,8 @@ in { sha256 = "0zrjxvzxqm4bz2jcy8sras8jircgbs6dkrw8j3nc6jhvzlikwwxl"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pkgs. self.pytest_28 self.pytestrunner ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ self.pytest_28 self.pytestrunner ]; propagatedBuildInputs = [ self.cffi pkgs.secp256k1 ]; # Tests are not included in archive @@ -20373,9 +20372,9 @@ in { sha256 = "1q35kgz151rr99240jq55rs39y741m8shh9yihl3x95rkjxchji4"; }; - propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; + propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ]; }; @@ -20964,8 +20963,8 @@ in { src = pkgs.subunit.src; propagatedBuildInputs = with self; [ testtools testscenarios ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pkgs. pkgs.check pkgs.cppunit ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.check pkgs.cppunit ]; patchPhase = '' sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py @@ -24109,8 +24108,8 @@ EOF sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with self; [ python pkgs. pkgs.libvirt lxml ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ python pkgs.libvirt lxml ]; buildPhase = "${python.interpreter} setup.py build"; @@ -24249,8 +24248,8 @@ EOF preBuild = "${python}/bin/${python.executable} setup.py build_ext"; installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with self; [ pkgs. pkgs.enlightenment.efl ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ pkgs.enlightenment.efl ]; doCheck = false; meta = { From 7a733ceda45d9e7842685523cfebeee07aaa3f97 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 5 Sep 2017 18:25:27 -0400 Subject: [PATCH 0035/2806] cross stdenv: No more native-fishing hack. The comment says it was put there for pkgconfig, but now pkgconfig has been dealt with. --- pkgs/stdenv/adapters.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 25ee9adfd9d..1a55b06ef36 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -88,20 +88,9 @@ rec { # buildInputs should be built with the usual gcc-wrapper # And the same for propagatedBuildInputs. nativeDrv = stdenv.mkDerivation args; - - # Temporary expression until the cross_renaming, to handle the - # case of pkgconfig given as buildInput, but to be used as - # nativeBuildInput. - hostAsNativeDrv = drv: - builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath - == builtins.unsafeDiscardStringContext drv.crossDrv.drvPath; - buildInputsNotNull = stdenv.lib.filter - (drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs; - nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull; in stdenv.mkDerivation (args // { nativeBuildInputs = nativeBuildInputs - ++ nativeInputsFromBuildInputs ++ stdenv.lib.optional selfNativeBuildInput nativeDrv # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs From ed14223f8c30c014190e87914126578babd94c3e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 14 Sep 2017 15:24:37 -0400 Subject: [PATCH 0036/2806] treewide: Manual fix more pkg-config build-inputs --- pkgs/applications/audio/ario/default.nix | 3 ++- pkgs/applications/audio/audacity/default.nix | 3 ++- pkgs/applications/audio/bristol/default.nix | 3 ++- pkgs/applications/audio/distrho/default.nix | 3 ++- pkgs/applications/audio/gmpc/default.nix | 6 ++++-- pkgs/applications/audio/hydrogen/default.nix | 3 ++- pkgs/applications/audio/ingen/default.nix | 3 ++- pkgs/applications/audio/jackmix/default.nix | 2 +- pkgs/applications/audio/jalv/default.nix | 3 ++- pkgs/applications/audio/jamin/default.nix | 3 ++- pkgs/applications/audio/pianobar/default.nix | 3 ++- pkgs/applications/audio/rhythmbox/default.nix | 3 +-- pkgs/applications/audio/rosegarden/default.nix | 3 ++- pkgs/applications/audio/setbfree/default.nix | 3 ++- pkgs/applications/audio/sonata/default.nix | 3 ++- pkgs/applications/audio/tomahawk/default.nix | 3 ++- .../editors/monodevelop/default.nix | 4 ++-- .../applications/editors/textadept/default.nix | 3 ++- pkgs/applications/editors/vim/macvim.nix | 3 ++- pkgs/applications/graphics/ao/default.nix | 6 ++++-- pkgs/applications/graphics/geeqie/default.nix | 3 ++- .../applications/graphics/inkscape/default.nix | 3 ++- pkgs/applications/graphics/mtpaint/default.nix | 2 +- .../graphics/rawtherapee/default.nix | 6 +++--- .../graphics/solvespace/default.nix | 3 ++- pkgs/applications/misc/apvlv/default.nix | 11 ++++++----- .../misc/bitcoinarmory/default.nix | 2 +- pkgs/applications/misc/cgminer/default.nix | 3 ++- pkgs/applications/misc/fbreader/default.nix | 3 ++- .../applications/misc/gnuradio-ais/default.nix | 3 ++- .../applications/misc/gnuradio-gsm/default.nix | 3 ++- .../misc/gnuradio-nacl/default.nix | 3 ++- .../misc/gnuradio-osmosdr/default.nix | 3 ++- .../applications/misc/gnuradio-rds/default.nix | 3 ++- pkgs/applications/misc/gnuradio/default.nix | 3 ++- pkgs/applications/misc/goldendict/default.nix | 5 ++--- pkgs/applications/misc/gphoto2/gphotofs.nix | 3 ++- pkgs/applications/misc/gxneur/default.nix | 3 ++- pkgs/applications/misc/hackrf/default.nix | 3 ++- pkgs/applications/misc/inspectrum/default.nix | 2 +- pkgs/applications/misc/kiwix/default.nix | 3 ++- pkgs/applications/misc/lenmus/default.nix | 2 +- pkgs/applications/misc/libosmocore/default.nix | 3 ++- pkgs/applications/misc/lighthouse/default.nix | 3 ++- pkgs/applications/misc/lyx/default.nix | 3 ++- pkgs/applications/misc/milu/default.nix | 2 +- pkgs/applications/misc/notify-osd/default.nix | 3 ++- pkgs/applications/misc/pdfmod/default.nix | 3 ++- pkgs/applications/misc/qpdfview/default.nix | 5 +++-- .../applications/misc/quicksynergy/default.nix | 3 ++- .../misc/redis-desktop-manager/default.nix | 5 ++--- pkgs/applications/misc/spacefm/default.nix | 3 ++- pkgs/applications/misc/synapse/default.nix | 3 ++- .../applications/misc/zathura/core/default.nix | 3 ++- .../instant-messengers/freetalk/default.nix | 3 ++- .../instant-messengers/profanity/default.nix | 3 ++- .../networking/mailreaders/lumail/default.nix | 3 ++- .../networking/mailreaders/notmuch/default.nix | 3 ++- .../networking/p2p/transgui/default.nix | 3 ++- .../networking/p2p/twister/default.nix | 3 ++- .../networking/sniffers/etherape/default.nix | 4 +++- .../networking/sniffers/wireshark/default.nix | 4 ++-- pkgs/applications/office/gnucash/default.nix | 3 ++- pkgs/applications/office/gnumeric/default.nix | 4 +++- .../science/robotics/gazebo/default.nix | 10 +++++----- .../version-management/bitkeeper/default.nix | 3 ++- .../git-and-tools/cgit/default.nix | 3 ++- .../version-management/gource/default.nix | 3 ++- .../monotone-viz/graphviz-2.0.nix | 3 ++- .../version-management/redmine/bootstrap.nix | 4 +++- pkgs/applications/video/natron/default.nix | 18 ++++++++++-------- .../video/simplescreenrecorder/default.nix | 5 +++-- pkgs/applications/video/xvidcap/default.nix | 4 +++- .../virtualization/docker/default.nix | 3 ++- .../virtualization/xen/generic.nix | 3 ++- .../window-managers/fvwm/default.nix | 3 ++- .../window-managers/openbox/default.nix | 3 ++- .../build-dotnet-package/default.nix | 2 +- .../gnome-2/desktop/gtksourceview/default.nix | 3 ++- .../gnome-3/3.24/apps/accerciser/default.nix | 3 ++- .../3.24/apps/gnome-calendar/default.nix | 3 ++- .../3.24/apps/gnome-characters/default.nix | 3 ++- .../gnome-3/3.24/apps/gnome-logs/default.nix | 3 ++- .../3.24/apps/gnome-nettool/default.nix | 3 ++- .../3.24/apps/gnome-weather/default.nix | 3 ++- .../desktops/gnome-3/3.24/core/gcr/default.nix | 3 ++- .../gnome-3/3.24/devtools/devhelp/default.nix | 3 ++- .../3.24/games/five-or-more/default.nix | 3 ++- .../3.24/games/four-in-a-row/default.nix | 3 ++- .../gnome-3/3.24/games/gnome-chess/default.nix | 3 ++- .../3.24/games/gnome-klotski/default.nix | 3 ++- .../3.24/games/gnome-mahjongg/default.nix | 3 ++- .../gnome-3/3.24/games/gnome-mines/default.nix | 3 ++- .../3.24/games/gnome-nibbles/default.nix | 3 ++- .../3.24/games/gnome-robots/default.nix | 3 ++- .../3.24/games/gnome-taquin/default.nix | 3 ++- .../3.24/games/gnome-tetravex/default.nix | 3 ++- .../gnome-3/3.24/games/hitori/default.nix | 3 ++- .../gnome-3/3.24/misc/pomodoro/default.nix | 3 ++- pkgs/desktops/xfce/core/thunar-build.nix | 3 ++- pkgs/desktops/xfce/core/tumbler.nix | 3 ++- .../xfce/thunar-plugins/archive/default.nix | 2 +- .../xfce/thunar-plugins/dropbox/default.nix | 2 +- pkgs/development/compilers/boo/default.nix | 3 ++- .../development/compilers/fsharp41/default.nix | 2 +- .../compilers/gnu-smalltalk/default.nix | 3 ++- pkgs/development/interpreters/love/0.10.nix | 3 ++- pkgs/development/interpreters/love/0.7.nix | 3 ++- pkgs/development/interpreters/love/0.8.nix | 3 ++- pkgs/development/interpreters/love/0.9.nix | 3 ++- .../development/interpreters/renpy/default.nix | 3 ++- .../libraries/at-spi2-core/default.nix | 3 ++- .../libraries/audio/ntk/default.nix | 3 ++- pkgs/development/libraries/box2d/default.nix | 3 ++- .../libraries/ffmpeg-sixel/default.nix | 2 +- pkgs/development/libraries/goffice/0.8.nix | 3 ++- .../development/libraries/gtdialog/default.nix | 5 +++-- pkgs/development/libraries/gtk-sharp/2.0.nix | 3 ++- pkgs/development/libraries/gtk-sharp/3.0.nix | 3 ++- .../libraries/gtkspellmm/default.nix | 2 +- pkgs/development/libraries/gusb/default.nix | 3 ++- pkgs/development/libraries/hivex/default.nix | 3 ++- pkgs/development/libraries/hyena/default.nix | 3 ++- .../libraries/keybinder/default.nix | 3 ++- .../libraries/keybinder3/default.nix | 3 ++- pkgs/development/libraries/ldb/default.nix | 3 ++- .../libraries/libcanberra/default.nix | 3 ++- .../libraries/libe-book/default.nix | 6 ++++-- .../libraries/libguestfs/default.nix | 3 ++- pkgs/development/libraries/libmwaw/default.nix | 6 ++++-- pkgs/development/libraries/libmx/default.nix | 3 ++- .../libraries/libodfgen/default.nix | 5 +++-- .../libraries/libosinfo/default.nix | 3 ++- .../libraries/librevenge/default.nix | 5 +++-- .../libraries/libvirt-glib/default.nix | 3 ++- .../libraries/mailcore2/default.nix | 3 ++- pkgs/development/libraries/ntdb/default.nix | 3 ++- .../development/libraries/pangoxsl/default.nix | 2 +- .../libraries/qt-5/5.6/qtmultimedia.nix | 3 ++- pkgs/development/libraries/talloc/default.nix | 3 ++- pkgs/development/libraries/tdb/default.nix | 3 ++- pkgs/development/libraries/tevent/default.nix | 3 ++- pkgs/development/libraries/thrift/default.nix | 3 ++- .../libraries/vapoursynth-mvtools/default.nix | 3 ++- .../libraries/vapoursynth/default.nix | 3 ++- .../python-modules/pycangjie/default.nix | 3 ++- pkgs/development/tools/analysis/rr/default.nix | 3 ++- pkgs/development/tools/glslviewer/default.nix | 3 ++- pkgs/development/tools/godot/default.nix | 3 ++- pkgs/games/ezquake/default.nix | 3 ++- pkgs/games/hedgewars/default.nix | 3 ++- pkgs/games/robotfindskitten/default.nix | 4 ++-- pkgs/games/spring/springlobby.nix | 3 ++- pkgs/games/super-tux-kart/default.nix | 3 ++- pkgs/misc/drivers/epkowa/default.nix | 2 +- pkgs/misc/emulators/fceux/default.nix | 3 ++- pkgs/misc/screensavers/alock/default.nix | 3 ++- pkgs/os-specific/linux/btfs/default.nix | 3 ++- pkgs/os-specific/linux/directvnc/default.nix | 3 ++- pkgs/os-specific/linux/eudev/default.nix | 6 ++++-- pkgs/os-specific/linux/xsensors/default.nix | 3 ++- pkgs/servers/dns/pdns-recursor/default.nix | 3 ++- pkgs/servers/ldap/389/default.nix | 3 ++- pkgs/servers/search/sphinxsearch/default.nix | 2 +- pkgs/servers/sip/freeswitch/default.nix | 3 ++- pkgs/tools/X11/ksuperkey/default.nix | 3 ++- pkgs/tools/X11/obconf/default.nix | 3 ++- pkgs/tools/X11/xpra/default.nix | 3 ++- pkgs/tools/X11/xpra/gtk3.nix | 3 +-- pkgs/tools/X11/xwinmosaic/default.nix | 14 +++++++------- pkgs/tools/admin/gtk-vnc/default.nix | 6 ++++-- pkgs/tools/audio/gvolicon/default.nix | 3 ++- pkgs/tools/audio/pa-applet/default.nix | 3 ++- pkgs/tools/audio/playerctl/default.nix | 3 ++- pkgs/tools/compression/pixz/default.nix | 3 ++- pkgs/tools/filesystems/btrfs-progs/4.4.1.nix | 3 ++- pkgs/tools/filesystems/btrfs-progs/default.nix | 3 ++- pkgs/tools/graphics/dmtx-utils/default.nix | 3 ++- pkgs/tools/graphics/glmark2/default.nix | 3 ++- pkgs/tools/graphics/gromit-mpx/default.nix | 3 ++- pkgs/tools/graphics/quirc/default.nix | 3 ++- pkgs/tools/inputmethods/ibus/ibus-qt.nix | 3 ++- pkgs/tools/misc/dbus-map/default.nix | 3 ++- pkgs/tools/misc/fontforge/default.nix | 3 ++- pkgs/tools/misc/goaccess/default.nix | 2 +- pkgs/tools/misc/mdbtools/git.nix | 3 ++- pkgs/tools/misc/rpm-ostree/default.nix | 3 ++- pkgs/tools/networking/badvpn/default.nix | 4 +++- pkgs/tools/networking/driftnet/default.nix | 3 ++- pkgs/tools/networking/p2p/rtorrent/default.nix | 3 ++- pkgs/tools/package-management/apt/default.nix | 4 +++- pkgs/tools/security/gnupg/22.nix | 3 ++- pkgs/tools/security/opensc/default.nix | 3 ++- pkgs/tools/security/stoken/default.nix | 4 +++- pkgs/tools/system/collectd/default.nix | 3 ++- pkgs/tools/typesetting/tex/texlive/bin.nix | 2 +- pkgs/tools/typesetting/xmlroff/default.nix | 2 +- pkgs/top-level/python-packages.nix | 5 +++-- 198 files changed, 422 insertions(+), 242 deletions(-) diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index 29d0241fa02..afb3c834273 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { patches = [ ./glib-single-include.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls + gettext gtk2 expat intltool libgcrypt libunique gnutls libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib ]; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 3fb9faa2667..07385e2a8b8 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -51,8 +51,9 @@ stdenv.mkDerivation rec { "-lswscale" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig file gettext wxGTK30 expat alsaLib + file gettext wxGTK30 expat alsaLib libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2 ffmpeg libmad lame libvorbis flac soundtouch autoconf automake libtool # for the preConfigure phase diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 28155fd2317..42e99fa5186 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext + alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext xorg.xproto ]; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 9d157833c0d..a80cc36b216 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { sed -e "s#@./scripts#sh scripts#" -i Makefile ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3 + alsaLib fftwSinglePrec freetype libjack2 premake3 xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender ladspa-sdk ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index b1689318d81..50b1bcde58f 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; }; patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib ]; }; @@ -23,8 +24,9 @@ stdenv.mkDerivation rec { sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup + libtool intltool glib gtk2 curl mpd_clientlib libsoup libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme wrapGAppsHook ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 686a6b67e6a..d68bfbf2ae4 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile pkgconfig qt4 + alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile qt4 ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 0b0df0b55e4..ca806aad02f 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper pkgconfig + boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper python raul serd sord sratom suil ]; diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index f0cd3bd0427..aa78527d787 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { patches = [ ./no_error.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig scons qt4 lash diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index e2c86256ce6..99c3e48ae84 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil + gtk2 libjack2 lilv lv2 python serd sord sratom suil ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 4af53389ffd..77946fc41cc 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation { sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 pkgconfig perl + fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 perl perlXMLParser makeWrapper ]; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 7dc3e00ebf7..8e591487111 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0n9544bfsdp04xqcjm4nhfvp357dx0c3gpys0rjkq09nzv8b1vy6"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libao json_c libgcrypt libav curl + libao json_c libgcrypt libav curl ]; makeFlags="PREFIX=$(out)"; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index e8bea3ec71c..534fd2f0edb 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -26,9 +26,8 @@ in stdenv.mkDerivation rec { sha256 = "0f3radhlji7rxl760yl2vm49fvfslympxrpm8497acbmbd7wlhxz"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig - python3 perl perlPackages.XMLParser diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 4fec0d0c37b..d29e731e043 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation (rec { QTDIR = qt4; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec + cmake qt4 ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec libsndfile libsamplerate perl makedepend libjack2 ] ++ stdenv.lib.optional withLirc [ lirc ]; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 2a534047ae3..0eaa9bde14f 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { -i b_synth/Makefile ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib freetype ftgl libjack2 libX11 lv2 mesa pkgconfig + alsaLib freetype ftgl libjack2 libX11 lv2 mesa ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 9f8ad3e649b..e91c08c30b7 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -16,8 +16,9 @@ in buildPythonApplication rec { disabled = !isPy3k; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig intltool wrapGAppsHook + intltool wrapGAppsHook gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 2787c65fc54..364949b2241 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon + cmake attica boost gnutls libechonest liblastfm lucenepp phonon qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 44c61d16ec8..53ea9741c03 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake pkgconfig shared_mime_info intltool + autoconf automake shared_mime_info intltool mono gtk-sharp-2_0 gnome-sharp unzip - pkgconfig dotnetPackages.NUnit dotnetPackages.NUnitRunners dotnetPackages.Nuget diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index d1fa03c5479..db74a58da43 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -112,8 +112,9 @@ stdenv.mkDerivation rec { version = "9.3"; name = "textadept-${version}"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk2 glib pkgconfig unzip ncurses zip + gtk2 glib unzip ncurses zip ]; src = fetchhg { diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index bb265e90b77..144fb5428a5 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gettext ncurses pkgconfig luajit ruby tcl perl python + gettext ncurses luajit ruby tcl perl python ]; patches = [ ./macvim.patch ]; diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index 7396fdc045f..990fee8cc37 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -5,11 +5,13 @@ stdenv.mkDerivation rec { version = "0.0pre20160820"; name = "ao-${version}"; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake ninja boost libpng glfw3 epoxy guile pkgconfig mesa libX11 + cmake ninja boost libpng glfw3 epoxy guile mesa libX11 libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm libXcursor libXfixes - ]; + ]; src = fetchgit { url = https://github.com/mkeeter/ao; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 9149e19819f..1e8f0e209c0 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gps" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoconf automake gtk2 libpng exiv2 lcms intltool gettext + autoconf automake gtk2 libpng exiv2 lcms intltool gettext ]; postInstall = '' diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 678ee79459b..889d710f043 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -33,8 +33,9 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc + perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper gsl poppler imagemagick libwpg librevenge libvisio libcdr libexif potrace cmake python2Env diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 51bfa603a05..8a2a218d989 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle ]; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 3edb97e3e20..22e56521658 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { sha256 = "0i3cr3335bw8yxxzn6kcdx6ccinlnxzrdbgl3ld1kym1w2n5449k"; }; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ - pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp + cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx ]; - nativeBuildInputs = [ wrapGAppsHook ]; - cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index f8db30675b1..7b30c467b19 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig zlib libpng cairo freetype + cmake zlib libpng cairo freetype json_c fontconfig gtkmm3 pangomm glew mesa_glu xlibs.libpthreadstubs xlibs.libXdmcp pcre ]; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 350a64ba3e4..f1d84a91972 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -15,17 +15,18 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + ]; + buildInputs = [ - pkgconfig cmake + cmake poppler pcre libxkbcommon epoxy freetype gtk3 libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation ]; - nativeBuildInputs = [ - wrapGAppsHook - ]; - patches = [ (fetchpatch { url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch"; diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index 78ac55088a4..f4547c69dc4 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -24,8 +24,8 @@ in mkPythonDerivation { # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. #patches = [ ./shutdown-fix.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoreconfHook swig qt4 diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index d4884bb1709..acd38d74dca 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1xfzx91dpwjj1vmhas3v9ybs0p2i74lrhinijmpav15acfggm9fq"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk + autoconf automake libtool curl ncurses amdappsdk amdadlsdk xorg.libX11 xorg.libXext xorg.libXinerama jansson ]; configureScript = "./autogen.sh"; diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 6cfd1e05279..80f76bc27c8 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation { sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig bzip2 curl expat fribidi libunibreak + bzip2 curl expat fribidi libunibreak qt4 sqlite zlib ]; diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio-ais/default.nix index eda95bc0c5e..a67a8a44fce 100644 --- a/pkgs/applications/misc/gnuradio-ais/default.nix +++ b/pkgs/applications/misc/gnuradio-ais/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig boost gnuradio makeWrapper cppunit gnuradio-osmosdr + cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio-gsm/default.nix index a47925cab90..bbdc74510ea 100644 --- a/pkgs/applications/misc/gnuradio-gsm/default.nix +++ b/pkgs/applications/misc/gnuradio-gsm/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr + cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio-nacl/default.nix index 6298e083617..cd3630c842c 100644 --- a/pkgs/applications/misc/gnuradio-nacl/default.nix +++ b/pkgs/applications/misc/gnuradio-nacl/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig boost gnuradio uhd makeWrapper libsodium cppunit + cmake boost gnuradio uhd makeWrapper libsodium cppunit ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix index 5fc6eb2c274..e2d3e808476 100644 --- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix +++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper hackrf + cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio-rds/default.nix index 5e729a75557..3d09441a7f0 100644 --- a/pkgs/applications/misc/gnuradio-rds/default.nix +++ b/pkgs/applications/misc/gnuradio-rds/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig boost gnuradio makeWrapper + cmake boost gnuradio makeWrapper ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index e10cb30d187..f4f7ebadef2 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -30,8 +30,9 @@ stdenv.mkDerivation rec { sha256 = "1m2jf8lafr6pr2dlm40nbvr6az8gwjfkzpbs4fxzv3l5hcqvmnc7"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig git boost cppunit fftw python swig2 orc lxml qt4 + cmake git boost cppunit fftw python swig2 orc lxml qt4 qwt alsaLib SDL libusb1 uhd gsl makeWrapper ]; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 278c685b7cf..f552a74f4c1 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -9,13 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1pizz39l61rbps0wby75fkvzyrah805257j33siqybwhsfiy1kmw"; }; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools + qtbase qtsvg qtwebkit qtx11extras qttools libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff ]; - nativeBuildInputs = [ qmake ]; - qmakeFlags = [ "CONFIG+=zim_support" ]; meta = { diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index 230e0ff7414..6fa11667cf3 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libgphoto2 fuse pkgconfig glib libtool + libgphoto2 fuse glib libtool ]; meta = { diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 1132f6b12f9..f581b302c3f 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - xorg.libX11 pkgconfig glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13 + xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13 libglade GConf pcre ]; diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix index 1b8257ca5e5..6186ed6f8f4 100644 --- a/pkgs/applications/misc/hackrf/default.nix +++ b/pkgs/applications/misc/hackrf/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig libusb fftwSinglePrec + cmake libusb fftwSinglePrec ]; cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ]; diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix index 5097496d399..e2232c4b2ec 100644 --- a/pkgs/applications/misc/inspectrum/default.nix +++ b/pkgs/applications/misc/inspectrum/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig cmake qt5.qtbase fftwFloat diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index c5b75a0be55..8479c4e16ac 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -62,8 +62,9 @@ stdenv.mkDerivation rec { sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - zip pkgconfig python zlib xapian which icu libmicrohttpd + zip python zlib xapian which icu libmicrohttpd lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml ]; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index b78a226b614..9018a592642 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig cmake boost portmidi sqlite freetype libpng pngpp zlib diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 7a0eadf74e5..47bcbb6fce9 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "08mcpy9ljwb1i3l4cmlwn024q2psk5gg9f0ylgh99hy1ffx0n7am"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - autoreconfHook pcsclite pkgconfig + pcsclite ]; preConfigure = '' diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index f6bfe61e5aa..7b5b40d65a3 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libX11 libxcb cairo gtk2 pango python27 python3 + libX11 libxcb cairo gtk2 pango python27 python3 ]; makeFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 964617e20f1..0c08929417e 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig qtbase qtsvg python file/*for libmagic*/ bc + qtbase qtsvg python file/*for libmagic*/ bc hunspell makeWrapper # enchant ]; diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 9f98376a51b..d8d1cff6040 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { cp bin/milu $out/bin ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig glib unzip clang diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index dfeae77d343..2aa04ce83e5 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig glib libwnck3 libnotify dbus_glib makeWrapper + glib libwnck3 libnotify dbus_glib makeWrapper gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index ba4a57a191c..691f3188b08 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81"; }) ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp + gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 5cbf9411435..e3e7ff950b0 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -10,13 +10,14 @@ let url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript + qt4 poppler_qt4 djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index bed1d1fc97c..f7722053401 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz"; sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk2 synergy ]; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 8bbfbaf7cf0..59d22b967b5 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -24,10 +24,9 @@ stdenv.mkDerivation rec { sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr"; }; - nativeBuildInputs = [ qmake ]; - + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats + libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats qtquick1 qtquickcontrols qtsvg qttools ]; diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index f4e1eef2836..5fffa6681cb 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig + gtk3 udev desktop_file_utils shared_mime_info intltool wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks ] ++ (if ifuseSupport then [ ifuse ] else []); # Introduced because ifuse doesn't build due to CVEs in libplist diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index e7d2a595684..2533014c560 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist + intltool glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist vala_0_23 hicolor_icon_theme ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index a646cd10b6d..8a460f89016 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { icon = ./icon.xpm; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig file gtk girara + file gtk girara gettext makeWrapper sqlite glib ] ++ optional synctexSupport texlive.bin.core; diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index ca8d7f2076e..5146f3a0e39 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { ./autogen.sh ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - guile pkgconfig glib loudmouth gmp libidn readline libtool + guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson texinfo autoconf automake ]; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 68f632d4b6f..79fb9b5c7f9 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig readline libuuid libmesode + readline libuuid libmesode glib openssl expat ncurses libotr curl ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ optionals notifySupport [ libnotify gdk_pixbuf ] diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index d28144f92ba..2c1678e994f 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation { sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig lua5_2 file ncurses gmime pcre-cpp + lua5_2 file ncurses gmime pcre-cpp perl perlPackages.JSON perlPackages.NetIMAPClient ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 74e43a728d7..93d180a327b 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { sha256 = "02z6d87ip1hkipz8d7w0sfklg8dd5fd5vlgp768640ixg0gqvlk5"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gnupg # undefined dependencies + gnupg # undefined dependencies xapian gmime talloc zlib # dependencies described in INSTALL doxygen perl # (optional) api docs pythonPackages.sphinx pythonPackages.python # (optional) documentation -> doc/INSTALL diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 3a6a71843a2..a33f85551f3 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0z83hvlhllm6p1z4gkcfi1x3akgn2xkssnfhwp74qynb0n5362pi"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig unzip fpc lazarus stdenv.cc + unzip fpc lazarus stdenv.cc libX11 glib gtk2 gdk_pixbuf pango atk cairo openssl ]; diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index e5a242662ce..d30527ca609 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -32,8 +32,9 @@ in stdenv.mkDerivation rec { "--with-boost-libdir=${boost.out}/lib" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig python2 + autoconf automake libtool python2 boost db openssl geoip miniupnpc libiconv ]; diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 5bc5bafe7db..f01a36cc65f 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--disable-scrollkeeper" ]; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils + libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils scrollkeeper libxslt ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index a4a3741aeee..8e35cb029e9 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation { cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; nativeBuildInputs = [ - bison cmake extra-cmake-modules flex + bison cmake extra-cmake-modules flex pkgconfig ] ++ optional withGtk wrapGAppsHook; buildInputs = [ - gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt + gettext pcre perl libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls geoip c-ares python glib zlib ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ] diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 4ed15081312..f6c4728eb53 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml + libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 69a96c6148e..c6458e47718 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -25,9 +25,11 @@ in stdenv.mkDerivation rec { --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1} ''; + nativeBuildInputs = [ pkgconfig ]; + # ToDo: optional libgda, introspection? buildInputs = [ - pkgconfig intltool perl perlXMLParser bison + intltool perl perlXMLParser bison goffice gtk3 makeWrapper gnome3.defaultIconTheme python pygobject3 itstool ]; diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index 6cefb156d1d..3edf75a4bff 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -38,8 +38,12 @@ stdenv.mkDerivation rec { ++ optional withLowMemorySupport [ "-DUSE_LOW_MEMORY_TESTS=True" ] ++ optional withHeadless [ "-DENABLE_SCREEN_TESTS=False" ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + propagatedNativeBuildInputs = [ boost boost-build boost_process protobuf ]; + buildInputs = [ - #cmake pkgconfig boost protobuf + #cmake boost protobuf freeimage xorg_sys_opengl tbb @@ -69,10 +73,6 @@ stdenv.mkDerivation rec { ++ optional withConstructiveSolidGeometrySupport gts ++ optional withHdf5Support hdf5; - nativeBuildInputs = [ cmake pkgconfig ]; - - propagatedNativeBuildInputs = [ boost boost-build boost_process protobuf ]; - meta = with stdenv.lib; { homepage = http://gazebosim.org/; description = "Multi-robot simulator for outdoor environments"; diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index d8597913c24..06cfc90e65f 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - perl gperf bison groff libXft pkgconfig + perl gperf bison groff libXft pcre libtomcrypt libtommath lz4 ]; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 518db7708b7..3c7d0a86be0 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt pkgconfig luajit + openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit ]; postPatch = '' diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 2aadfd21fb5..5b228847eb3 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0z095zsf5pz8czh7nmlkdy29rm93w83sqyqspg2zsprh892cl116"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa + glew SDL ftgl libpng libjpeg pcre SDL_image mesa boost glm freetype ]; diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index 32cc283bc3c..73acc3a6b36 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc + xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp ]; diff --git a/pkgs/applications/version-management/redmine/bootstrap.nix b/pkgs/applications/version-management/redmine/bootstrap.nix index 82643f18a55..53757c37ed8 100644 --- a/pkgs/applications/version-management/redmine/bootstrap.nix +++ b/pkgs/applications/version-management/redmine/bootstrap.nix @@ -13,8 +13,10 @@ in stdenv.mkDerivation rec { url = "http://www.redmine.org/releases/${name}.tar.gz"; sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - ruby bundler libiconv libxslt libxml2 pkgconfig + ruby bundler libiconv libxslt libxml2 libffi imagemagickBig postgresql which stdenv ]; installPhase = '' diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 75dccbafd3f..e2f5d4ba598 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -20,14 +20,14 @@ let nativeBuildInputs = [ cmake ]; buildInputs = [ libpng flex bison ]; }; - buildPlugin = { pluginName, sha256, buildInputs, preConfigure ? "" }: + buildPlugin = { pluginName, sha256, nativeBuildInputs ? [], buildInputs ? [], preConfigure ? "" }: stdenv.mkDerivation { name = "openfx-${pluginName}-${version}"; src = fetchurl { url = "https://github.com/MrKepzie/Natron/releases/download/${version}/openfx-${pluginName}-${version}.tar.xz"; inherit sha256; }; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; preConfigure = '' makeFlagsArray+=("CONFIG=release") makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron") @@ -50,8 +50,9 @@ let ({ pluginName = "arena"; sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig pango librsvg librevenge libcdr opencolorio libxml2 libzip + pango librsvg librevenge libcdr opencolorio libxml2 libzip poppler imagemagick ]; preConfigure = '' @@ -65,8 +66,9 @@ let ({ pluginName = "io"; sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu + libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu seexpr ]; }) @@ -91,11 +93,11 @@ stdenv.mkDerivation { sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp"; }; - buildInputs = [ - pkgconfig qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken - ]; + nativeBuildInputs = [ qmake4Hook pkgconfig python2Packages.wrapPython ]; - nativeBuildInputs = [ qmake4Hook python2Packages.wrapPython ]; + buildInputs = [ + qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken + ]; preConfigure = '' export MAKEFLAGS=-j$NIX_BUILD_CORES diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 571f46de385..447518d008b 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -24,8 +24,9 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ - alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa libpulseaudio qt4 ]; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index c8414bbb83a..663f89b325a 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation { }; patches = [ ./xlib.patch ]; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - perl perlXMLParser pkgconfig gtk2 scrollkeeper + perl perlXMLParser gtk2 scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11 ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 043f27e13d2..5df6f011dc7 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -66,8 +66,9 @@ rec { # Optimizations break compilation of libseccomp c bindings hardeningDisable = [ "fortify" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper removeReferencesTo pkgconfig go-md2man go + makeWrapper removeReferencesTo go-md2man go sqlite devicemapper btrfs-progs systemd libtool libseccomp ]; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 434853b7cc1..9efcc45be35 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -53,8 +53,9 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "stackprotector" "fortify" "pic" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig which + cmake which # Xen bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 7587dcb490a..0b9c286aa9d 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "01654d5abdcde6dac131cae9befe5cf6f01f9f7524d097c3b0f316e39f84ef73"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig cairo fontconfig freetype + cairo fontconfig freetype libXft libXcursor libXinerama libXpm libXt librsvg libpng fribidi perl ] ++ stdenv.lib.optional gestures libstroke; diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 7b60d573d1e..ead78bf4efd 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -6,8 +6,9 @@ stdenv.mkDerivation rec { name = "openbox-${version}"; version = "3.6.1"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libxml2 + libxml2 libXinerama libXcursor libXau libXrandr libICE libSM libstartup_notification makeWrapper python2.pkgs.wrapPython diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index 2b1b34429c5..f36c69e4339 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -19,8 +19,8 @@ attrsOrig @ attrs = { name = "${baseName}-${version}"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig mono dotnetbuildhelpers makeWrapper diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 7c9cd42a0e9..bd8b71d0dac 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig atk cairo glib gtk + atk cairo glib gtk pango libxml2Python perl intltool gettext ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix index 7a5ab769cc9..545e89a8512 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix @@ -5,8 +5,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) src name; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi + gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix index fbd5d748f5e..618d6152d81 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server + gtk3 wrapGAppsHook intltool evolution_data_server sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix index 0c7adcb0319..15f1f58b558 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf + gtk3 wrapGAppsHook intltool gjs gdk_pixbuf librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix index 2fc27617d98..91d5f7d00e4 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix @@ -6,8 +6,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-tests" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + gtk3 wrapGAppsHook intltool itstool libxml2 systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix index 4c152777f2c..dcee87dc799 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2 + gtk3 wrapGAppsHook libgtop intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix index 3b5542544d5..d6804e09a48 100644 --- a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook gjs intltool itstool + gtk3 wrapGAppsHook gjs intltool itstool libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix index 55eebf77be5..725388e336a 100644 --- a/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix @@ -5,8 +5,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig intltool gnupg glib gobjectIntrospection libxslt + intltool gnupg glib gobjectIntrospection libxslt libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32 ]; diff --git a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix index f6e67be8d53..08dbade67fb 100644 --- a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme + gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix index 50a7d2906a7..48b2b382372 100644 --- a/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gtk3 wrapGAppsHook librsvg intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix index 68228750cd8..486fe5c486e 100644 --- a/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg + gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix index a96dae3c12c..bfa345c4a40 100644 --- a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 + gtk3 wrapGAppsHook intltool itstool librsvg libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix index dc2289daff8..13afae2eb2c 100644 --- a/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support + gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix index 43db32e8857..3d0d5d6df46 100644 --- a/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gtk3 wrapGAppsHook librsvg intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix index c55650e705a..d76e585bb4e 100644 --- a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gtk3 wrapGAppsHook librsvg intltool itstool libxml2 gnome3.defaultIconTheme libgames-support libgee ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix index cf228218878..90fdccc1186 100644 --- a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix @@ -5,8 +5,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + gtk3 wrapGAppsHook intltool itstool libxml2 librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme libgee libgames-support ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix index 9eafb166eee..cd13e6ab958 100644 --- a/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix @@ -5,8 +5,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 libxml2 gnome3.defaultIconTheme libgames-support libgee ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix index 78eaa23e63b..d456abe6dc1 100644 --- a/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook librsvg libcanberra_gtk3 intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix index d6feab93dba..37218776f12 100644 --- a/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme + gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix index bd6be7d43c5..21d4ed6f520 100644 --- a/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix index 37cdfc730ab..8bd611aaefc 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { configureScript = ''./autogen.sh''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - which intltool glib gobjectIntrospection pkgconfig libtool + which intltool glib gobjectIntrospection libtool makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix index a68686219ba..2996040bbd0 100644 --- a/pkgs/desktops/xfce/core/thunar-build.nix +++ b/pkgs/desktops/xfce/core/thunar-build.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig intltool + intltool gtk dbus_glib libstartup_notification libnotify libexif pcre udev exo libxfce4util xfconf xfce4panel ]; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 9b29835cdc9..6e785c9438b 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig intltool dbus_glib gdk_pixbuf curl freetype + intltool dbus_glib gdk_pixbuf curl freetype poppler libgsf bzip2 ]; diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index b954cc4980d..8ff4a74e6bf 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { sha256 = "0l8715x23qmk0jkywiza3qx0xxmafxi4grp7p82kkc5df5ccs8kx"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig xfce4_dev_tools thunarx-2-dev exo gtk libxfce4util libxfce4ui diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index e3cdfc13812..d44281d052d 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sha256 = "08vhzzzwshyz371yl7fzfylmhvchhv3s5kml3dva4v39jhvrpnkf"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk thunarx-2-dev python2 ]; diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index 5fa88ab87e9..d27f498842e 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -16,8 +16,9 @@ in stdenv.mkDerivation rec { sha256 = "174abdwfpq8i3ijx6bwqll16lx7xwici374rgsbymyk8g8mla094"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig mono makeWrapper nant shared_mime_info gtksourceview + mono makeWrapper nant shared_mime_info gtksourceview gtk2 ]; diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index 488aaa228da..354723dfa74 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0rfkrk4mzi4w54mfqilvng9ar5swhmnwhsyjc54rx3fd0np3jiyl"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoconf automake which diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index b75b57d0f47..21c0a5ede91 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -25,8 +25,9 @@ in stdenv.mkDerivation rec { # The dependencies and their justification are explained at # http://smalltalk.gnu.org/download + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk + libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk cairo SDL sqlite ] ++ stdenv.lib.optional emacsSupport emacs; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index a7be084991b..255bd035129 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 + SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake ]; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 09f7e39196c..114749e90da 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig SDL mesa openal lua + SDL mesa openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 2b19f18b3ef..4e999eca9ee 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig SDL mesa openal lua + SDL mesa openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 9a9de2ad6f5..83c485f065d 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig SDL2 mesa openal luajit + SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index c2eae32c5b6..cc3eba52bf2 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -23,8 +23,9 @@ stdenv.mkDerivation { sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python cython pkgconfig wrapPython + python cython wrapPython SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib ]; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 4d496932f66..a24e792cdd2 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig popt intltool dbus_glib + python popt intltool dbus_glib libX11 xextproto libSM libICE libXtst libXi gobjectIntrospection ]; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index 35144862ce9..9e9dbad74a0 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0pph7hf07xaa011zr40cs62f3f7hclfbv5kcrl757gcp2s5pi2iq"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cairo libjpeg libXft pkgconfig python2 + cairo libjpeg libXft python2 ]; buildPhase = '' diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 25d291da332..61f0fac7ffd 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sourceRoot = "Box2D-${version}/Box2D"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - unzip cmake mesa freeglut libX11 xproto inputproto libXi pkgconfig + unzip cmake mesa freeglut libX11 xproto inputproto libXi ]; cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ]; diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index dced5582cf6..a3ce9ea9c2b 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libsixel yasm ]; diff --git a/pkgs/development/libraries/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix index 2da683fcbeb..e050a615dd1 100644 --- a/pkgs/development/libraries/goffice/0.8.nix +++ b/pkgs/development/libraries/goffice/0.8.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { # fix linking error: undefined reference to pcre_info patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986 + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libglade bzip2 libart intltool gettext + libglade bzip2 libart intltool gettext gconf libgnomeui pcre ]; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 8a023be5629..d6f745d399d 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -9,13 +9,14 @@ let url="http://foicica.com/gtdialog/download/gtdialog_1.3.zip"; sha256="0y7sln877940bpj0s38cs5s97xg8csnaihh18lmnchf7c2kkbxpq"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cdk unzip gtk2 glib ncurses pkgconfig + cdk unzip gtk2 glib ncurses ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index ca6c4d0dfa6..5b3ca828a3f 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -32,8 +32,9 @@ stdenv.mkDerivation { done ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig mono glib pango gtk2 GConf libglade libgnomecanvas + mono glib pango gtk2 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 459f37afc7f..3a473d6303a 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -31,8 +31,9 @@ stdenv.mkDerivation { # done # ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig mono glib pango gtk3 GConf libglade libgnomecanvas + mono glib pango gtk3 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index be2ae044022..04456b44019 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { gtkspell3 ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 glib glibmm gtkmm3 ]; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 0157fa1762c..93f24b0f722 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt + autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt systemd vala_0_23 glib ]; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index eced02fd33e..7b4b9866d04 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoreconfHook makeWrapper + autoreconfHook makeWrapper perl libxml2 IOStringy ]; diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 2c1ca6aeb1e..edd35bd27e4 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig mono gtk-sharp-2_0 + mono gtk-sharp-2_0 ]; postPatch = '' diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 838affca77a..5ce1b8ec13c 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -14,8 +14,9 @@ in stdenv.mkDerivation rec { sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig gnome3.gnome_common gtk_doc gnome3.gtk3 + autoconf automake libtool gnome3.gnome_common gtk_doc gnome3.gtk3 python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2 ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index cfc8590c639..f4158f7edbb 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1jdcrfhvqffhc2h69197wkpc5j5synk5mm8rqhz27qfrfhh4vf0q"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig gnome3.gnome_common gtk_doc + autoconf automake libtool gnome3.gnome_common gtk_doc libX11 libXext libXrender gobjectIntrospection gtk3 ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 54196ae48ff..4f2785675f0 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig readline tdb talloc tevent popt + python readline tdb talloc tevent popt libxslt docbook_xsl docbook_xml_dtd_42 ]; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 25be4802699..1b2cf4084f9 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libtool alsaLib libpulseaudio libvorbis gtk libcap + libtool alsaLib libpulseaudio libvorbis gtk libcap /*gstreamer gst-plugins-base*/ # ToDo: gstreamer not found (why?), add (g)udev? ]; diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 1e374b8ad1f..3c900f86917 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -12,8 +12,10 @@ let url="mirror://sourceforge/project/libebook/libe-book-0.1.2/libe-book-0.1.2.tar.xz"; sha256="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gperf pkgconfig librevenge libxml2 boost icu cppunit zlib + gperf librevenge libxml2 boost icu cppunit zlib ]; # Boost 1.59 compatability fix @@ -24,7 +26,7 @@ let in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs postPatch; + inherit nativeBuildInputs buildInputs postPatch; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 73424902cd0..bfdd0cf8fd7 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl + makeWrapper autoreconfHook ncurses cpio gperf perl cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index b833945d511..e1ac659683c 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -9,13 +9,15 @@ let url="https://netcologne.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.10/libmwaw-0.3.10.tar.xz"; sha256="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost pkgconfig cppunit zlib libwpg libwpd librevenge + boost cppunit zlib libwpg libwpd librevenge ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 49760f7fc53..897a769b014 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig automake autoconf libtool + automake autoconf libtool intltool gobjectIntrospection glib gtk2 gtk_doc clutter clutter_gtk diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index 341ef372351..8a3e22ef31f 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -9,13 +9,14 @@ let url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.6/libodfgen-0.1.6.tar.xz"; sha256="1sdr42f0bigip14zhs51m0zdwwzzl1mwmk882l4khpph8jmi1ch3"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost pkgconfig cppunit zlib libwpg libwpd librevenge + boost cppunit zlib libwpg libwpd librevenge ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index b0b22aa18e7..db534d20c89 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1vcg8ylh7q69s9y6hj94dqfffwfbann3i28yqgfc01navf6yl07s"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig intltool gobjectIntrospection libsoup libxslt check vala_0_23 + intltool gobjectIntrospection libsoup libxslt check vala_0_23 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index ac5feb1ddc8..3523eb5c37b 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -9,13 +9,14 @@ let url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz"; sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost pkgconfig cppunit zlib + boost cppunit zlib ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 8cebaeee2af..e41ab5fe5a3 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -13,8 +13,9 @@ in stdenv.mkDerivation rec { sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt + libvirt glib libxml2 intltool libtool yajl nettle libgcrypt python pygobject2 gobjectIntrospection libcap_ng numactl xen libapparmor ]; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 03a940801e9..0a64c7c0429 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1k0l59cdk8np4pff1my07dp7ivf3nchlhcpvm9xizp0my9rqgbxb"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libetpan cmake icu cyrus_sasl libctemplate libuchardet pkgconfig glib + libetpan cmake icu cyrus_sasl libctemplate libuchardet glib libtidy libxml2 libuuid openssl ]; diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index 80e683a32ae..d26b15176aa 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig readline gettext libxslt docbook_xsl docbook_xml_dtd_42 + python readline gettext libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index 38f1496062e..aae6ed0f688 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig glib pango ]; diff --git a/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix index 7c1cc5da07e..20e6e364799 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix @@ -5,8 +5,9 @@ qtSubmodule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio + alsaLib gstreamer gst-plugins-base libpulseaudio ]; qmakeFlags = [ "GST_VERSION=1.0" ]; } diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 125e6b389e3..1e7448b6605 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0c3ihyb0jd8mhvi7gg2mr5w1zl2habx6jlkbyxzyckad2q8lkl92"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig readline libxslt docbook_xsl docbook_xml_dtd_42 + python readline libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index f7449dcf1ab..7ccd98856f6 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0i1l38h0vyck6zkcj4fn2l03spadlmyr1qa1xpdp9dy2ccbm3s1r"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig readline libxslt docbook_xsl docbook_xml_dtd_42 + python readline libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 2856f025a88..2982d33e996 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1gccqiibf6ia129xhqrg18anax3sxwfbwm8h4pvsga3ndxg931ap"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig readline talloc libxslt docbook_xsl docbook_xml_dtd_42 + python readline talloc libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 4b299eedbd9..55855d05d16 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost zlib libevent openssl python pkgconfig bison flex twisted + boost zlib libevent openssl python bison flex twisted ]; preConfigure = "export PY_PREFIX=$out"; diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 1a1e70d89bc..2fa6710c4fa 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1wjwf1lgfkqz87s0j251g625mw9xmx79zzgrjyhq3wlii73m6qwp"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoreconfHook + autoreconfHook yasm vapoursynth fftwFloat ]; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index b37f28f868e..6bbf0d066b3 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoreconfHook + autoreconfHook zimg libass tesseract yasm (python3.withPackages (ps: with ps; [ sphinx cython ])) ] ++ optional ocrSupport tesseract diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index f8ca06eec86..4995a714693 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig libcangjie sqlite python cython + autoconf automake libtool libcangjie sqlite python cython ]; preConfigure = '' diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index e9d7f4ea194..4cbc3e62676 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { patchShebangs . ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb capnproto + cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto ]; cmakeFlags = [ "-DCMAKE_C_FLAGS_RELEASE:STRING=" diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index a971ae83e63..86f78891b2f 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glfw mesa_glu pkgconfig glfw libXrandr libXdamage + glfw mesa_glu glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm libXi libX11 ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index d9171ca09f2..3100b2c84df 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "04qbab0icpv3ascr4dqgj18sqvw04a1jypcngb0ji8npa8q9wxb2"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gcc scons pkgconfig libX11 libXcursor libXinerama libXrandr libXrender + gcc scons libX11 libXcursor libXinerama libXrandr libXrender freetype openssl alsaLib libpulseaudio mesa_glu zlib ]; diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 85def0596dc..2c544abddd0 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { sha256 = "14wck0r64z5haacp7g7qb2qrbhff3x6jfjmn4268dyb9dl5663f2"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - expat curl jansson libpng libjpeg mesa pcre pkgconfig SDL2 vimNox + expat curl jansson libpng libjpeg mesa pcre SDL2 vimNox ]; installPhase = with stdenv.lib; let diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 296687c5d92..8aba24dd346 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "14i1wvqbqib9h9092z10g4g0y14r5sp2fdaksvnw687l3ybwi6dn"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc + SDL_ttf SDL_net cmake lua5_1 SDL SDL_mixer SDL_image fpc qt4 ghc ffmpeg freeglut makeWrapper physfs ]; diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix index 14af1e3c788..16e36a03dce 100644 --- a/pkgs/games/robotfindskitten/default.nix +++ b/pkgs/games/robotfindskitten/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "06fp6b4li50mzw83j3pkzqspm6dpgxgxw03b60xkxlkgg5qa6jbp"; }; - buildInputs = - [ pkgconfig ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ]; meta = { description = "Yet another zen simulation; A simple find-the-kitten game"; diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 6ba91feced8..36256d31fda 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "12iv6h1mz998lzxc2jwkza0m1yvaaq8h05k36i85xyp7g90197jw"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake wxGTK30 openal pkgconfig curl gettext libtorrentRasterbar pcre jsoncpp + cmake wxGTK30 openal curl gettext libtorrentRasterbar pcre jsoncpp boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure ]; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 4d2db9d293f..e05f5a92a33 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -25,8 +25,9 @@ in stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake libtool pkgconfig + cmake libtool libX11 libXrandr openal freealut mesa libvorbis libogg gettext zlib freetype curl fribidi bluez libjpeg libpng diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 38cfb75fa09..114568fdd52 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -91,8 +91,8 @@ stdenv.mkDerivation rec { sha256 = "0ryy946h7ddmxh866hfszqfyff1qy4svpsk7w3739v75f4awr9li"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk2 libxml2 libtool diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 42469c5daf4..ce8f8e030e3 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "1qg5bygla8ka30b7wqvq6dv84xc7pq0jspffh2jz75d1njyi2kc0"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - scons zlib SDL lua5_1 pkgconfig + scons zlib SDL lua5_1 ]; phases = "unpackPhase buildPhase"; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index f05073469b7..1dc03e1e9f0 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { "--enable-imlib2" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoreconfHook libX11 + autoreconfHook libX11 pam libgcrypt libXrender imlib2 ]; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index e51cc582ccf..6cc4dc6f6d5 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0v0mypwnx832f7vg52wmiw0lyz7rrkhqsgi7zc261ak1gfaw4nwd"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost autoreconfHook pkgconfig + boost autoreconfHook fuse libtorrentRasterbar curl ]; diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index 4c47104c5b6..a63aceedee3 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig directfb zlib libjpeg xproto + directfb zlib libjpeg xproto ]; meta = { diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 9e61c377ecf..091a0d4b46f 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -8,13 +8,15 @@ let url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; sha256 = "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib pkgconfig gperf utillinux + glib gperf utillinux ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index a392d065e41..5f7bca097bf 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz"; sha256 = "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk2 pkgconfig lm_sensors + gtk2 lm_sensors ]; patches = [ ./remove-unused-variables.patch diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 70deadb74e1..0e8d1e70bc7 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0k8y9zxj2lz4rq782vgzr28yd43q0hwlnvszwq0k9l6c967pff13"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost openssl pkgconfig systemd + boost openssl systemd ] ++ optional enableLua [ lua luajit ] ++ optional enableProtoBuf protobuf; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index a2571600dfe..637b7dd8b92 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1r1n44xfvy51r4r1180dfmjziyj3pqxwmnv6rjvvvjjm87fslmdd"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu + perl pam nspr nss openldap db cyrus_sasl svrcore icu net_snmp kerberos pcre ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 17095750dbf..ead0c095d5c 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "--enable-id64" ]; - buildInputs = [ + nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 9f7e2b297ee..9a1ea5b5580 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { --replace AS=\''${AS} AS=yasm ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - openssl ncurses curl pkgconfig gnutls readline perl libjpeg + openssl ncurses curl gnutls readline perl libjpeg sqlite pcre speex ldns libedit yasm which lua libopus libsndfile ]; diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index a753f9bd170..cd80e328657 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -3,8 +3,9 @@ stdenv.mkDerivation rec { name = "ksuperkey-git-2015-07-21"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libX11 libXtst pkgconfig inputproto libXi xproto xextproto + libX11 libXtst inputproto libXi xproto xextproto ]; src = fetchgit { diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index e25fa43f180..2e02338631b 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk2 libglade libSM openbox imlib2 libstartup_notification + gtk2 libglade libSM openbox imlib2 libstartup_notification makeWrapper ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index aa0ae36fdd2..00f28c2c7ba 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -18,8 +18,9 @@ in buildPythonApplication rec { sha256 = "09hzgbsj9v5qyh41rbz968ipi7016jk66b60vm6piryna9kbnha3"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cython pkgconfig + cython xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index f66b7389f31..92f1827156b 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -19,9 +19,8 @@ buildPythonApplication rec { substituteInPlace xpra/client/gtk3/cairo_workaround.pyx --replace 'pycairo/pycairo.h' 'py3cairo.h' ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig - xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 40956f2acc4..e36808db0b8 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchgit, gtk2, cmake, pkgconfig}: -let - buildInputs = [ - gtk2 cmake pkgconfig - ]; -in +{ stdenv, fetchgit, gtk2, cmake, pkgconfig }: + stdenv.mkDerivation rec { version = "0.4.2"; name = "xwinmosaic-${version}"; - inherit buildInputs; + src = fetchgit { url = "https://github.com/soulthreads/xwinmosaic/"; rev = "refs/tags/v0.4.2"; sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ gtk2 ]; + meta = { inherit version; description = ''X window switcher drawing a colourful grid''; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index da269049b2c..59a5ec8d4da 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -15,11 +15,13 @@ in stdenv.mkDerivation rec { sha256 = "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python gnutls cairo libtool pkgconfig glib libffi libgcrypt + python gnutls cairo libtool glib libffi libgcrypt intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV gobjectIntrospection libogg libgpgerror - gtk3 vala_0_32 pygobject3 ]; + gtk3 vala_0_32 pygobject3 + ]; NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 7354b92aaf9..8fed569f140 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "1sr9wyy7w898vq63yd003yp3k66hd4vm8b0qsm9zvmwmpiz4wvln"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme + makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 6e3e5617b31..239e4b3fcca 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 libpulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev + gtk3 libpulseaudio glibc automake autoconf libnotify libX11 xf86inputevdev ]; preConfigure = '' diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 38df702cb16..b04e449835d 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0b4pg5pwblgbf6kvvynzh9dshfikxy5c2ks7733n7wza5wkpgmng"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - which autoconf automake libtool gnome2.gtkdoc glib pkgconfig + which autoconf automake libtool gnome2.gtkdoc glib gobjectIntrospection ]; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index 5ce79cbf412..2a5250a95ac 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { version = "1.0.6"; name = "${baseName}-${version}"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig asciidoc libxslt libxml2 + autoconf automake libtool asciidoc libxslt libxml2 docbook_xml_dtd_45 docbook_xml_xslt libarchive lzma ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix index afafa4ec174..5bbdbfba188 100644 --- a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix +++ b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig attr acl zlib libuuid e2fsprogs lzo + attr acl zlib libuuid e2fsprogs lzo asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index d9b01eb5239..87df30bba1c 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig attr acl zlib libuuid e2fsprogs lzo + attr acl zlib libuuid e2fsprogs lzo asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index 3e4e3e9312e..4cf4f8c791c 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -9,8 +9,9 @@ let url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz"; sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libdmtx pkgconfig imagemagick + libdmtx imagemagick ]; in stdenv.mkDerivation { diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index e37ebb50bf7..0d31f8f1a6f 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "076l75rfl6pnp1wgiwlaihy1vg2advg1z8bi0x84kk259kldgvwn"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland libudev + libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland libudev ]; buildPhase = '' diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 376d1bc134d..7261326633a 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1dkmp5rhzp56sz9cfxill2pkdz2anwb8kkxkypvk2xhqi64cvkrs"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake autoreconfHook pkgconfig + autoconf automake autoreconfHook gtk glib pcre libappindicator libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core dbus libdbusmenu-glib diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index a801dd8ebda..caff97f0e32 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -10,8 +10,9 @@ let rev = "5b262480091d5f84a67a4a56c728fc8b39844339"; sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL SDL_gfx libjpeg pkgconfig libpng + SDL SDL_gfx libjpeg libpng ]; in stdenv.mkDerivation { diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix index 95c32532e40..8d02d4edde8 100644 --- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - ibus cmake pkgconfig qt4 icu doxygen + ibus cmake qt4 icu doxygen ]; cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index b6f483fb4ef..8dcaecf9851 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { rev = "43703fc5e15743309b67131b5ba457b0d6ea7667"; sha256 = "1pjqn6w29ci8hfxkn1aynzfc8nvy3pqv3hixbxwr7qx20g4rwvdc"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig glib procps libxml2 + glib procps libxml2 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index ee7854c539e..c7fd29da8ac 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -32,8 +32,9 @@ stdenv.mkDerivation rec { # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-msse2" "-mfpmath=sse" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake gnum4 libtool perl pkgconfig gettext uthash + autoconf automake gnum4 libtool perl gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [libspiro] diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 424a84637a5..8586244b415 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { "--enable-utf8" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig geoipWithDatabase ncurses glib diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 4f76306ab5f..6289c35f35a 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation { sha256 = "0hlf5lk86xm0bpdlpk4a1zyfvbim76dhvmybxga2p7mbb1jc825l"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib readline bison flex autoreconfHook pkgconfig which txt2man + glib readline bison flex autoreconfHook which txt2man gnome_doc_utils scrollkeeper libiconv ]; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 3e2953c5733..d6cad51ce75 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -28,8 +28,9 @@ in stdenv.mkDerivation { sha256 = "0a0wwklzk1kvk3bbxxfvxgk4ck5dn7a7v32shqidb674fr2d5pvb"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - which autoconf automake pkgconfig libtool libcap ostree rpm glib libgsystem gperf + which autoconf automake libtool libcap ostree rpm glib libgsystem gperf json_glib libarchive libsolv librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 cmake pcre check python # FIXME: get rid of this once libarchive properly propagates this diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index 22da8486a80..632b52fd156 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -9,8 +9,10 @@ let url="https://github.com/ambrop72/badvpn/archive/1.999.130.tar.gz"; sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake openssl nss pkgconfig nspr + cmake openssl nss nspr ]; compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}"; in diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index 1f34952ad24..5b39ca46460 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { name = "driftnet-${version}"; version = "1.1.5"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libpcap libjpeg libungif libpng giflib + libpcap libjpeg libungif libpng giflib glib gtk2 glib cairo pango gdk_pixbuf atk autoreconfHook ]; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 2883043f8b7..d96b5fe49a9 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0iyxmjr1984vs7hrnxkfwgrgckacqml0kv4bhj185w9bhjqvgfnf"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libtool autoconf automake cppunit + libtool autoconf automake cppunit libtorrent ncurses libsigcxx curl zlib openssl xmlrpc_c ]; diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 8082565361b..fe7327e7d85 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -24,8 +24,10 @@ stdenv.mkDerivation rec { sha256 = "0ahwhmscrmnpvl1r732wg93dzkhv8c1sph2yrqgsrhr73c1616ix"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ - pkgconfig cmake perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin + cmake perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin ] ++ lib.optionals withDocs [ doxygen Po4a w3m ] ++ lib.optionals withNLS [ diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 7080cda57f4..7bba249db93 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { sha256 = "1rj538kp3wsdq7rhl8sy1wpwhlsbxcch0cwk64kgz8gpw05lllfl"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libgcrypt libassuan libksba libiconv npth gettext texinfo + libgcrypt libassuan libksba libiconv npth gettext texinfo readline libusb gnutls adns openldap zlib bzip2 sqlite ]; diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 2b606d505bd..ce310eec5ae 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sha256 = "16y3ryx606nry2li05hm88bllrragdj3sfl3yh7pf71777n4lsk4"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoreconfHook pkgconfig zlib readline openssl pcsclite libassuan + autoreconfHook zlib readline openssl pcsclite libassuan libXt libxslt libiconv docbook_xml_dtd_412 ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 17652e220da..464f6d21584 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { automake --add-missing --copy autoconf ''; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig + autoconf automake libtool libxml2 nettle ] ++ stdenv.lib.optional withGTK3 gtk3; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 824eb74b72e..4eb7400d7de 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -43,8 +43,9 @@ stdenv.mkDerivation rec { sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached + curl iptables libatasmart libcredis libdbi libgcrypt libmemcached cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool varnish yajl jdk libtool python udev net_snmp hiredis libmnl libmicrohttpd diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 95ee3ab3b71..f1aa861b9c1 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -61,8 +61,8 @@ core = stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig /*teckit*/ zziplib poppler mpfr gmp pixman potrace gd freetype libpng libpaper zlib perl diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 05ce5057347..2177937221a 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoconf automake libxml2 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48124ced008..16aac40f281 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6130,13 +6130,13 @@ in { sha256 = "0i14bc67200zhzxc41g5dfp2m0pr1zaa2gv59p2va1xw0ji2dc0f"; }; + nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with self; [ nose pkgs.libjpeg pkgs.libpng pkgs.libtiff pkgs.libwebp - pkgs.pkgconfig ]; propagatedBuildInputs = with self; [ numpy ]; @@ -18097,8 +18097,9 @@ in { sha256 = "1svlwyl61rvbqbcbalkg6pbf38yjyv7qkq9sx4x35yk69lscaac2"; }; + nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ - pkgs.pkgconfig pkgs.gtk2 self.pygtk pkgs.libxml2 + pkgs.gtk2 self.pygtk pkgs.libxml2 pkgs.libxslt pkgs.libsoup pkgs.webkitgtk24x-gtk2 pkgs.icu ]; From 1b3581b7ba68cf9c69435a1fab49adf27fbed68f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 Sep 2017 15:00:50 -0400 Subject: [PATCH 0037/2806] faust: Fix nativeBuildInputs indent --- pkgs/applications/audio/faust/faust1.nix | 2 +- pkgs/applications/audio/faust/faust2.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 946a1bdb225..4875ee8b57d 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -158,7 +158,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index a86770315cb..901df19ebf5 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -187,7 +187,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; From bac21681a16ac71bf21f69697783b5d2b259305d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 Sep 2017 21:55:15 -0400 Subject: [PATCH 0038/2806] systemd: Use some nativeBuildInputs I erred on the side of caution when changing these. --- pkgs/os-specific/linux/systemd/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fdd5ada19cb..7c8ffef86ee 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -21,16 +21,19 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" "dev" ]; - buildInputs = - [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl - /* cryptsetup */ libuuid m4 glib libxslt libgcrypt libgpgerror - libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor - iptables gnu-efi + nativeBuildInputs = + [ pkgconfig intltool gperf libxslt /* FIXME: we may be able to prevent the following dependencies by generating an autoconf'd tarball, but that's probably not worth it. */ autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 ]; + buildInputs = + [ linuxHeaders libcap kmod xz pam acl + /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror + libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor + iptables gnu-efi + ]; configureFlags = [ "--localstatedir=/var" From abec0e764571b99b85745335f7669666f8a43a28 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 19 Sep 2017 12:29:30 -0400 Subject: [PATCH 0039/2806] polkit: Recategorize some dependencies --- pkgs/development/libraries/polkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 804bca5f8a5..aef627f8f1f 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ gtk_doc pkgconfig autoreconfHook ] + [ gtk_doc pkgconfig autoreconfHook intltool gobjectIntrospection ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = - [ glib expat pam intltool spidermonkey_17 gobjectIntrospection ] + [ glib expat pam spidermonkey_17 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; # Ugly hack to overwrite hardcoded directories From 03d3788cdf834c16d497e70364547a6c4352939c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 19 Sep 2017 13:20:24 -0400 Subject: [PATCH 0040/2806] mesa: Recategorize dependencies --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c9cb0b36bc5..00af3b984ad 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -140,14 +140,14 @@ stdenv.mkDerivation { "--disable-opencl" ]; - nativeBuildInputs = [ pkgconfig file ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig file ]; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ] ++ optional stdenv.isLinux libdrm; buildInputs = with xorg; [ - autoreconfHook intltool expat llvmPackages.llvm + expat llvmPackages.llvm glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland libvdpau libelf libXvMC From d33360c388bf318958850fdeb59d12de87f66b77 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 19 Sep 2017 13:20:57 -0400 Subject: [PATCH 0041/2806] gvfs: Recategorize dependendencies --- pkgs/development/libraries/gvfs/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 11c3134e10b..6eb341d66bc 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -16,12 +16,15 @@ stdenv.mkDerivation rec { sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b"; }; - nativeBuildInputs = [ pkgconfig intltool libtool ]; + nativeBuildInputs = [ + pkgconfig intltool libtool + libxml2 libxslt docbook_xsl + ]; buildInputs = [ makeWrapper glib dbus udev libgudev udisks2 libgcrypt libgphoto2 avahi libarchive fuse libcdio - libxml2 libxslt docbook_xsl samba libmtp libcap polkit + samba libmtp libcap polkit # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ gtk libsoup libgnome_keyring gconf gcr From 7c73ff4e92d9f49b35775b8ce37e4848ab88c152 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 19 Sep 2017 13:21:26 -0400 Subject: [PATCH 0042/2806] gnome-vfs: Recategorize dependencies --- pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 48523f512b3..06af8a63200 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = - [ pkgconfig libxml2 bzip2 openssl dbus_glib fam cdparanoia - intltool gnome_mime_data avahi acl + [ libxml2 bzip2 openssl dbus_glib fam cdparanoia + gnome_mime_data avahi acl ]; propagatedBuildInputs = [ GConf glib ]; From 6810ae793562ba59c100e67a5d12521ce12557ea Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 19 Sep 2017 16:28:01 -0400 Subject: [PATCH 0043/2806] pulseaudio: Add separate runtime libtool dep for dynamic linking --- pkgs/servers/pulseaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index bd80560a0cb..85ee3ddcf74 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ libcap ]; buildInputs = - [ libsndfile speexdsp fftwFloat ] + [ libtool libsndfile speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals (!libOnly) ( From 139b4cd0e3f9ea4c7e1ea56e97faa18f537697b3 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 20 Sep 2017 15:48:29 -0400 Subject: [PATCH 0044/2806] haskell generic-builder: Fix pkg-config dependency It should be a nativeBuidInput --- pkgs/development/haskell-modules/generic-builder.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 06903d83358..5d8a28f5c2b 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -152,10 +152,11 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; - nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]; + nativeBuildInputs = optional (allPkgconfigDepends != []) pkgconfig ++ + buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ - optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ + optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ # ghcjs's hsc2hs calls out to the native hsc2hs optional isGhcjs nativeGhc ++ From 65197a15b00c7990516ceb9eaaeb1d78993e5652 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 21 Sep 2017 18:56:54 -0400 Subject: [PATCH 0045/2806] zulu: init 9.0.0.15 --- pkgs/development/compilers/zulu/8.nix | 82 +++++++++++++++++++++ pkgs/development/compilers/zulu/default.nix | 21 +++--- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/compilers/zulu/8.nix diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix new file mode 100644 index 00000000000..f7638757ff7 --- /dev/null +++ b/pkgs/development/compilers/zulu/8.nix @@ -0,0 +1,82 @@ +{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath +, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib +, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg +, swingSupport ? true }: + +let + version = "8.21.0.1"; + openjdk = "8.0.131"; + + sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p"; + sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7"; + + platform = if stdenv.isDarwin then "macosx" else "linux"; + hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; + extension = if stdenv.isDarwin then "zip" else "tar.gz"; + + libraries = [ + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu + xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango + gnome2.gtk cairo gdk_pixbuf atk + ] ++ (lib.optionals swingSupport (with xorg; [ + xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp + xorg.libXt xorg.libXrender stdenv.cc.cc + ])); + +in stdenv.mkDerivation rec { + inherit version openjdk platform hash extension; + + name = "zulu-${version}"; + + src = fetchurl { + url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}"; + sha256 = hash; + }; + + buildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin unzip; + + installPhase = '' + mkdir -p $out + cp -r ./* "$out/" + + jrePath="$out/jre" + + rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/jli + rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/server + rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/xawt + rpath=$rpath''${rpath:+:}$jrePath/lib/amd64 + + # set all the dynamic linkers + find $out -type f -perm -0100 \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$rpath" {} \; + + find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; + + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + rpath = stdenv.lib.strings.makeLibraryPath libraries; + + passthru = { + home = "${zulu}"; + }; + + meta = with stdenv.lib; { + homepage = https://www.azul.com/products/zulu/; + license = licenses.gpl2; + description = "Certified builds of OpenJDK"; + longDescription = '' + Certified builds of OpenJDK that can be deployed across multiple + operating systems, containers, hypervisors and Cloud platforms. + ''; + maintainers = with maintainers; [ nequissimus fpletz ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index f7638757ff7..92f1f0a111e 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath , zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib -, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg +, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg, zlib , swingSupport ? true }: let - version = "8.21.0.1"; - openjdk = "8.0.131"; + version = "9.0.0.15"; + openjdk = "9.0.0"; - sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p"; - sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7"; + sha256_linux = "0s9vr135yhdnxqds4hfafyrlh33j6g78v6l1v0ap2y6yqgabh9qi"; + sha256_darwin = "104w1msrwijf8dv3n65hjinp7i47z6ygzjipdzqriqam2zljxn4b"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; @@ -17,7 +17,7 @@ let libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango - gnome2.gtk cairo gdk_pixbuf atk + gnome2.gtk cairo gdk_pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc @@ -39,12 +39,9 @@ in stdenv.mkDerivation rec { mkdir -p $out cp -r ./* "$out/" - jrePath="$out/jre" - - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/jli - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/server - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/xawt - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64 + rpath=$rpath''${rpath:+:}$out/lib/jli + rpath=$rpath''${rpath:+:}$out/lib/server + rpath=$rpath''${rpath:+:}$out/lib # set all the dynamic linkers find $out -type f -perm -0100 \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63d30c22ff2..05df04e0817 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6244,8 +6244,9 @@ with pkgs; yosys = callPackage ../development/compilers/yosys { }; - zulu = callPackage ../development/compilers/zulu { }; - + zulu8 = callPackage ../development/compilers/zulu/8.nix { }; + zulu9 = callPackage ../development/compilers/zulu { }; + zulu = zulu9; ### DEVELOPMENT / INTERPRETERS From 0ece5fc50933ff7bd4d57c3d56b96540262674d4 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 24 Dec 2015 14:34:43 -0500 Subject: [PATCH 0046/2806] nixos/pfix-srsd: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/pfix-srsd.nix | 56 +++++++++++++++++++++++ nixos/modules/services/mail/postfix.nix | 14 ++++++ 3 files changed, 71 insertions(+) create mode 100644 nixos/modules/services/mail/pfix-srsd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 918d0f3b245..e0e806e690d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -263,6 +263,7 @@ ./services/mail/offlineimap.nix ./services/mail/opendkim.nix ./services/mail/opensmtpd.nix + ./services/mail/pfix-srsd.nix ./services/mail/postfix.nix ./services/mail/postsrsd.nix ./services/mail/postgrey.nix diff --git a/nixos/modules/services/mail/pfix-srsd.nix b/nixos/modules/services/mail/pfix-srsd.nix new file mode 100644 index 00000000000..ab5f4c39e8c --- /dev/null +++ b/nixos/modules/services/mail/pfix-srsd.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.pfix-srsd = { + enable = mkOption { + default = false; + type = types.bool; + description = "Whether to run the postfix sender rewriting scheme daemon."; + }; + + domain = mkOption { + description = "The domain for which to enable srs"; + type = types.str; + example = "example.com"; + }; + + secretsFile = mkOption { + description = '' + The secret data used to encode the SRS address. + to generate, use a command like: + for n in $(seq 5); do dd if=/dev/urandom count=1 bs=1024 status=none | sha256sum | sed 's/ -$//' | sed 's/^/ /'; done + ''; + type = types.path; + default = "/var/lib/pfix-srsd/secrets"; + }; + }; + }; + + ###### implementation + + config = mkIf config.services.pfix-srsd.enable { + environment = { + systemPackages = [ pkgs.pfixtools ]; + }; + + systemd.services."pfix-srsd" = { + description = "Postfix sender rewriting scheme daemon"; + before = [ "postfix.service" ]; + #note that we use requires rather than wants because postfix + #is unable to process (almost) all mail without srsd + requiredBy = [ "postfix.service" ]; + serviceConfig = { + Type = "forking"; + PIDFile = "/var/run/pfix-srsd.pid"; + ExecStart = "${pkgs.pfixtools}/bin/pfix-srsd -p /var/run/pfix-srsd.pid -I ${config.services.pfix-srsd.domain} ${config.services.pfix-srsd.secretsFile}"; + }; + }; + }; +} \ No newline at end of file diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 01ae49d4909..461d4a62138 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -79,6 +79,12 @@ let // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; } // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; } // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } + // optionalAttrs cfg.useSrs { + sender_canonical_maps = "tcp:127.0.0.1:10001"; + sender_canonical_classes = "envelope_sender"; + recipient_canonical_maps = "tcp:127.0.0.1:10002"; + recipient_canonical_classes= "envelope_recipient"; + } // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; } // optionalAttrs (cfg.sslCert != "") { smtp_tls_CAfile = cfg.sslCACert; @@ -626,6 +632,12 @@ in description = "Maps to be compiled and placed into /var/lib/postfix/conf."; }; + useSrs = mkOption { + type = types.bool; + default = false; + description = "Whether to enable sender rewriting scheme"; + }; + }; }; @@ -646,6 +658,8 @@ in systemPackages = [ pkgs.postfix ]; }; + services.pfix-srsd.enable = config.services.postfix.useSrs; + services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail { program = "sendmail"; source = "${pkgs.postfix}/bin/sendmail"; From 74edd2c5dbb77aa88ce9f4dc2ae35c9af54e5ed7 Mon Sep 17 00:00:00 2001 From: Mikael Brockman Date: Fri, 22 Sep 2017 07:50:11 +0300 Subject: [PATCH 0047/2806] hsevm: project was renamed to hevm This also upgrades the hsevm package from v0.6.4 to v0.8.5. The project `dapp` which depends on hsevm was also updated to use the new name, so I have also upgraded that package from version v0.5.3 to v0.5.7. I also added a `dontCheck` to a Hackage dependency because its test suite depends on Git and runs a bunch of Git repository manipulations. --- pkgs/applications/altcoins/dapp.nix | 8 ++--- pkgs/applications/altcoins/default.nix | 2 +- .../altcoins/{hsevm.nix => hevm.nix} | 35 +++++++++++-------- .../haskell-modules/configuration-common.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 28 insertions(+), 21 deletions(-) rename pkgs/applications/altcoins/{hsevm.nix => hevm.nix} (61%) diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix index 51de4d202e8..6ad66a24397 100644 --- a/pkgs/applications/altcoins/dapp.nix +++ b/pkgs/applications/altcoins/dapp.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, makeWrapper -, seth, git, solc, shellcheck, nodejs, hsevm }: +, seth, git, solc, shellcheck, nodejs, hevm }: stdenv.mkDerivation rec { name = "dapp"; - version = "0.5.3"; + version = "0.5.7"; src = fetchFromGitHub { owner = "dapphub"; repo = "dapp"; rev = "v${version}"; - sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird"; + sha256 = "128f35hczarihb263as391wr9zbyc1q1p49qbxh30via23r1brb0"; }; nativeBuildInputs = [makeWrapper shellcheck]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { checkPhase = "make test"; makeFlags = ["prefix=$(out)"]; postInstall = let path = lib.makeBinPath [ - nodejs solc git seth hsevm + nodejs solc git seth hevm ]; in '' wrapProgram "$out/bin/dapp" --prefix PATH : "${path}" ''; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 31dcc78d3d7..2c97a3a5310 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -43,7 +43,7 @@ rec { seth = callPackage ./seth.nix { }; dapp = callPackage ./dapp.nix { }; - hsevm = (haskellPackages.callPackage ./hsevm.nix {}); + hevm = (haskellPackages.callPackage ./hevm.nix {}); primecoin = callPackage ./primecoin.nix { withGui = true; }; primecoind = callPackage ./primecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hevm.nix similarity index 61% rename from pkgs/applications/altcoins/hsevm.nix rename to pkgs/applications/altcoins/hevm.nix index 173ac83a6db..51e5f6bcb29 100644 --- a/pkgs/applications/altcoins/hsevm.nix +++ b/pkgs/applications/altcoins/hevm.nix @@ -1,24 +1,28 @@ -{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, base +{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base , base16-bytestring, base64-bytestring, binary, brick, bytestring , cereal, containers, cryptonite, data-dword, deepseq, directory -, filepath, ghci-pretty, here, HUnit, lens, lens-aeson, memory -, monad-par, mtl, optparse-generic, process, QuickCheck -, quickcheck-text, readline, rosezipper, scientific, stdenv, tasty, tasty-hunit -, tasty-quickcheck, temporary, text, text-format -, unordered-containers, vector, vty +, filepath, ghci-pretty, here, HUnit, lens +, lens-aeson, memory, monad-par, mtl, optparse-generic, process +, QuickCheck, quickcheck-text, readline, rosezipper, scientific +, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text +, text-format, time, unordered-containers, vector, vty + +, restless-git + , fetchFromGitHub, lib, makeWrapper , ncurses, zlib, bzip2, solc, coreutils +, bash }: lib.overrideDerivation (mkDerivation rec { - pname = "hsevm"; - version = "0.6.4"; + pname = "hevm"; + version = "0.8.5"; src = fetchFromGitHub { owner = "dapphub"; - repo = "hsevm"; + repo = "hevm"; rev = "v${version}"; - sha256 = "01b67k9cam4gvsi07q3vx527m1w6p6xll64k1nl27bc8ik6jh8l9"; + sha256 = "1a27bh0azf2hdg5hp6s9azv2rhzy7vrlq1kmg688g9nfwwwhgkp0"; }; isLibrary = false; @@ -26,8 +30,9 @@ lib.overrideDerivation (mkDerivation rec { enableSharedExecutables = false; postInstall = '' - rm -rf $out/{lib,share} - wrapProgram $out/bin/hsevm --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' + wrapProgram $out/bin/hevm \ + --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' \ + --suffix PATH : "${lib.makeBinPath [bash coreutils]}" ''; extraLibraries = [ @@ -36,17 +41,17 @@ lib.overrideDerivation (mkDerivation rec { cryptonite data-dword deepseq directory filepath ghci-pretty lens lens-aeson memory monad-par mtl optparse-generic process QuickCheck quickcheck-text readline rosezipper scientific temporary text text-format - unordered-containers vector vty + unordered-containers vector vty restless-git ]; executableHaskellDepends = [ - readline zlib bzip2 + async readline zlib bzip2 ]; testHaskellDepends = [ base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck tasty tasty-hunit tasty-quickcheck text vector ]; - homepage = https://github.com/dapphub/hsevm; + homepage = https://github.com/dapphub/hevm; description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; maintainers = [stdenv.lib.maintainers.dbrock]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d983934e83a..850a61048f8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -957,4 +957,6 @@ self: super: { protolude = super.protolude_0_2; }; + # test suite requires git and does a bunch of git operations + restless-git = dontCheck super.restless-git; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ef812b388d..8723be45df7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13542,7 +13542,7 @@ with pkgs; ethrun = self.altcoins.ethrun; seth = self.altcoins.seth; dapp = self.altcoins.dapp; - hsevm = self.altcoins.hsevm; + hevm = self.altcoins.hevm; stellar-core = self.altcoins.stellar-core; From 4c09acad5c1fbae2ebe3ccb3fbf0115d61b3806b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 22 Sep 2017 06:50:54 -0500 Subject: [PATCH 0048/2806] hplip: remove 3.15.9 hplip-3.15.9 has not been buildable in some time due to changes in CUPS. --- pkgs/misc/drivers/hplip/3.15.9.nix | 197 ----------------------------- pkgs/top-level/all-packages.nix | 4 - 2 files changed, 201 deletions(-) delete mode 100644 pkgs/misc/drivers/hplip/3.15.9.nix diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix deleted file mode 100644 index ae96a946e79..00000000000 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ /dev/null @@ -1,197 +0,0 @@ -{ stdenv, fetchurl, substituteAll -, pkgconfig -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils -, net_snmp, polkit -, bash, coreutils, utillinux -, qtSupport ? true, qt4 -, withPlugin ? false -}: - -let - - name = "hplip-${version}"; - version = "3.15.9"; - - src = fetchurl { - url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0vcxz3gsqcamlzx61xm77h7c769ya8kdhzwafa9w2wvkf3l8zxd1"; - }; - - plugin = fetchurl { - url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1ahalw83xm8x0h6hljhnkknry1hny9flkrlzcymv8nmwgic0kjgs"; - }; - - hplipState = - substituteAll - { - inherit version; - src = ./hplip.state; - }; - - hplipPlatforms = - { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; - }; - - hplipArch = hplipPlatforms."${stdenv.system}" - or (throw "HPLIP not supported on ${stdenv.system}"); - - pluginArches = [ "x86_32" "x86_64" ]; - -in - -assert withPlugin -> builtins.elem hplipArch pluginArches - || throw "HPLIP plugin not supported on ${stdenv.system}"; - -stdenv.mkDerivation { - inherit name src version; - - buildInputs = [ - libjpeg - cups - libusb1 - pythonPackages.python - pythonPackages.wrapPython - sane-backends - dbus - net_snmp - ] ++ stdenv.lib.optionals qtSupport [ - qt4 - ]; - - nativeBuildInputs = [ - pkgconfig - ]; - - pythonPath = with pythonPackages; [ - dbus - pillow - pygobject2 - recursivePthLoader - reportlab - usbutils - ] ++ stdenv.lib.optionals qtSupport [ - pyqt4 - ]; - - 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, \ - {} + - ''; - - preConfigure = '' - export configureFlags="$configureFlags - --with-cupsfilterdir=$out/lib/cups/filter - --with-cupsbackenddir=$out/lib/cups/backend - --with-icondir=$out/share/applications - --with-systraydir=$out/xdg/autostart - --with-mimedir=$out/etc/cups - --enable-policykit - " - - export makeFlags=" - halpredir=$out/share/hal/fdi/preprobe/10osvendor - rulesdir=$out/etc/udev/rules.d - policykit_dir=$out/share/polkit-1/actions - policykit_dbus_etcdir=$out/etc/dbus-1/system.d - policykit_dbus_sharedir=$out/share/dbus-1/system-services - hplip_confdir=$out/etc/hp - hplip_statedir=$out/var/lib/hp - " - ''; - - enableParallelBuilding = true; - - postInstall = stdenv.lib.optionalString withPlugin '' - sh ${plugin} --noexec --keep - cd plugin_tmp - - cp plugin.spec $out/share/hplip/ - - mkdir -p $out/share/hplip/data/firmware - cp *.fw.gz $out/share/hplip/data/firmware - - mkdir -p $out/share/hplip/data/plugins - cp license.txt $out/share/hplip/data/plugins - - mkdir -p $out/share/hplip/prnt/plugins - for plugin in lj hbpl1; do - cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins - ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \ - $out/share/hplip/prnt/plugins/$plugin.so - done - - mkdir -p $out/share/hplip/scan/plugins - for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do - cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins - ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \ - $out/share/hplip/scan/plugins/$plugin.so - done - - 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 - ''; - - fixupPhase = '' - # Wrap the user-facing Python scripts in $out/bin without turning the - # ones in $out /share into shell scripts (they need to be importable). - # Note that $out/bin contains only symlinks to $out/share. - for bin in $out/bin/*; do - py=`readlink -m $bin` - rm $bin - cp $py $bin - wrapPythonProgramsIn $bin "$out $pythonPath" - sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin - done - - # Remove originals. Knows a little too much about wrapPythonProgramsIn. - rm -f $out/bin/.*-wrapped - - # Merely patching shebangs in $out/share does not cause trouble. - for i in $out/share/hplip{,/*}/*.py; do - substituteInPlace $i \ - --replace /usr/bin/python \ - ${pythonPackages.python}/bin/${pythonPackages.python.executable} \ - --replace "/usr/bin/env python" \ - ${pythonPackages.python}/bin/${pythonPackages.python.executable} - done - - wrapPythonProgramsIn $out/lib "$out $pythonPath" - - substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out - '' + stdenv.lib.optionalString (!withPlugin) '' - # A udev rule to notify users that they need the binary plugin. - # Needs a lot of patching but might save someone a bit of confusion: - substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \ - --replace {,${bash}}/bin/sh \ - --replace {/usr,${coreutils}}/bin/nohup \ - --replace {,${utillinux}/bin/}logger \ - --replace {/usr,$out}/bin - ''; - - meta = with stdenv.lib; { - description = "Print, scan and fax HP drivers for Linux"; - homepage = http://hplipopensource.com/; - license = if withPlugin - then licenses.unfree - else with licenses; [ mit bsd2 gpl2Plus ]; - platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; - maintainers = with maintainers; [ jgeerds nckx ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 924a5e8d7e0..1af674b1892 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18853,10 +18853,6 @@ with pkgs; hplipWithPlugin = hplip.override { withPlugin = true; }; - hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { }; - - hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; }; - epkowa = callPackage ../misc/drivers/epkowa { }; illum = callPackage ../tools/system/illum { }; From ec62d5462dce070f9a1587255e6d418e77a8612e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 22 Sep 2017 06:57:31 -0500 Subject: [PATCH 0049/2806] hplip: 3.16.11 -> 3.17.9 hplip-3.16.11 is retained as `hplip_3_16_11`. --- pkgs/misc/drivers/hplip/3.16.11.nix | 193 ++++++++++++++++++++++++++++ pkgs/misc/drivers/hplip/default.nix | 14 +- pkgs/top-level/all-packages.nix | 4 + 3 files changed, 204 insertions(+), 7 deletions(-) create mode 100644 pkgs/misc/drivers/hplip/3.16.11.nix diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix new file mode 100644 index 00000000000..9342c547a17 --- /dev/null +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -0,0 +1,193 @@ +{ stdenv, fetchurl, substituteAll +, pkgconfig +, makeWrapper +, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils +, net_snmp, openssl, polkit, nettools +, bash, coreutils, utillinux +, qtSupport ? true +, withPlugin ? false +}: + +let + + name = "hplip-${version}"; + version = "3.16.11"; + + src = fetchurl { + url = "mirror://sourceforge/hplip/${name}.tar.gz"; + sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn"; + }; + + plugin = fetchurl { + url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; + sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg"; + }; + + hplipState = substituteAll { + inherit version; + src = ./hplip.state; + }; + + hplipPlatforms = { + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "armv6l-linux" = "arm32"; + "armv7l-linux" = "arm32"; + }; + + hplipArch = hplipPlatforms."${stdenv.system}" + or (throw "HPLIP not supported on ${stdenv.system}"); + + pluginArches = [ "x86_32" "x86_64" "arm32" ]; + +in + +assert withPlugin -> builtins.elem hplipArch pluginArches + || throw "HPLIP plugin not supported on ${stdenv.system}"; + +pythonPackages.buildPythonApplication { + inherit name src; + format = "other"; + + buildInputs = [ + libjpeg + cups + libusb1 + sane-backends + dbus + net_snmp + openssl + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + pythonPath = with pythonPackages; [ + dbus + pillow + pygobject2 + reportlab + usbutils + ] ++ stdenv.lib.optionals qtSupport [ + pyqt4 + ]; + + makeWrapperArgs = [ ''--prefix PATH : "${nettools}/bin"'' ]; + + prePatch = '' + # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. + find . -type f -exec sed -i \ + -e s,/etc/hp,$out/etc/hp, \ + -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, \ + {} + + ''; + + preConfigure = '' + export configureFlags="$configureFlags + --with-hpppddir=$out/share/cups/model/HP + --with-cupsfilterdir=$out/lib/cups/filter + --with-cupsbackenddir=$out/lib/cups/backend + --with-icondir=$out/share/applications + --with-systraydir=$out/xdg/autostart + --with-mimedir=$out/etc/cups + --enable-policykit + " + + export makeFlags=" + halpredir=$out/share/hal/fdi/preprobe/10osvendor + rulesdir=$out/etc/udev/rules.d + policykit_dir=$out/share/polkit-1/actions + policykit_dbus_etcdir=$out/etc/dbus-1/system.d + policykit_dbus_sharedir=$out/share/dbus-1/system-services + hplip_confdir=$out/etc/hp + hplip_statedir=$out/var/lib/hp + " + ''; + + enableParallelBuilding = true; + + postInstall = stdenv.lib.optionalString withPlugin '' + sh ${plugin} --noexec --keep + cd plugin_tmp + + cp plugin.spec $out/share/hplip/ + + mkdir -p $out/share/hplip/data/firmware + cp *.fw.gz $out/share/hplip/data/firmware + + mkdir -p $out/share/hplip/data/plugins + cp license.txt $out/share/hplip/data/plugins + + mkdir -p $out/share/hplip/prnt/plugins + for plugin in lj hbpl1; do + cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins + ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/prnt/plugins/$plugin.so + done + + mkdir -p $out/share/hplip/scan/plugins + for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do + cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins + ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/scan/plugins/$plugin.so + done + + 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 + ''; + + # The installed executables are just symlinks into $out/share/hplip, + # but wrapPythonPrograms ignores symlinks. We cannot replace the Python + # modules in $out/share/hplip with wrapper scripts because they import + # each other as libraries. Instead, we emulate wrapPythonPrograms by + # 1. Calling patchPythonProgram on the original script in $out/share/hplip + # 2. Making our own wrapper pointing directly to the original script. + dontWrapPythonPrograms = true; + preFixup = '' + buildPythonPath "$out $pythonPath" + + for bin in $out/bin/*; do + py=$(readlink -m $bin) + rm $bin + echo "patching \`$py'..." + patchPythonScript "$py" + echo "wrapping \`$bin'..." + makeWrapper "$py" "$bin" \ + --prefix PATH ':' "$program_PATH" \ + --set PYTHONNOUSERSITE "true" \ + $makeWrapperArgs + done + ''; + + postFixup = '' + substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out + '' + stdenv.lib.optionalString (!withPlugin) '' + # A udev rule to notify users that they need the binary plugin. + # Needs a lot of patching but might save someone a bit of confusion: + substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \ + --replace {,${bash}}/bin/sh \ + --replace {/usr,${coreutils}}/bin/nohup \ + --replace {,${utillinux}/bin/}logger \ + --replace {/usr,$out}/bin + ''; + + meta = with stdenv.lib; { + description = "Print, scan and fax HP drivers for Linux"; + homepage = http://hplipopensource.com/; + license = if withPlugin + then licenses.unfree + else with licenses; [ mit bsd2 gpl2Plus ]; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; + maintainers = with maintainers; [ jgeerds nckx ]; + }; +} diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 9342c547a17..bf1078ef60c 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -4,23 +4,23 @@ , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , net_snmp, openssl, polkit, nettools , bash, coreutils, utillinux -, qtSupport ? true +, withQt5 ? true , withPlugin ? false }: let name = "hplip-${version}"; - version = "3.16.11"; + version = "3.17.9"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn"; + sha256 = "0y46jjq8jdfk9m4vjq55h8yggibvqbi9rl08vni7vbhxym1diamj"; }; plugin = fetchurl { - url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg"; + url = "http://hplipopensource.com/hplip-web/plugin/${name}-plugin.run"; + sha256 = "10z8vzwcwmwni7s4j9xp0fa7l4lwrhl4kp450dga3fj0cck1gxwq"; }; hplipState = substituteAll { @@ -69,8 +69,8 @@ pythonPackages.buildPythonApplication { pygobject2 reportlab usbutils - ] ++ stdenv.lib.optionals qtSupport [ - pyqt4 + ] ++ stdenv.lib.optionals withQt5 [ + pyqt5 ]; makeWrapperArgs = [ ''--prefix PATH : "${nettools}/bin"'' ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1af674b1892..5b49e95a416 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18853,6 +18853,10 @@ with pkgs; hplipWithPlugin = hplip.override { withPlugin = true; }; + hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { }; + + hplipWithPlugin_3_16_11 = hplip.override { withPlugin = true; }; + epkowa = callPackage ../misc/drivers/epkowa { }; illum = callPackage ../tools/system/illum { }; From a2b852caa0f1467948becc9a83db807ebfc09119 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 22 Sep 2017 06:58:52 -0500 Subject: [PATCH 0050/2806] hplip: change maintainers Remove nckx and add ttuegel --- pkgs/misc/drivers/hplip/3.16.11.nix | 2 +- pkgs/misc/drivers/hplip/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 9342c547a17..f538066e75c 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -188,6 +188,6 @@ pythonPackages.buildPythonApplication { then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; - maintainers = with maintainers; [ jgeerds nckx ]; + maintainers = with maintainers; [ jgeerds ttuegel ]; }; } diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index bf1078ef60c..a01fc74ce47 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -188,6 +188,6 @@ pythonPackages.buildPythonApplication { then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; - maintainers = with maintainers; [ jgeerds nckx ]; + maintainers = with maintainers; [ jgeerds ttuegel ]; }; } From 306a0d32dfb668f697e962206284f8df75964d0d Mon Sep 17 00:00:00 2001 From: xd1le Date: Fri, 22 Sep 2017 23:12:49 +1000 Subject: [PATCH 0051/2806] CONTRIBUTING.md: mention that the meta.license and meta.maintainers attributes must be set --- .github/CONTRIBUTING.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f7fac647f41..99c5e0e429b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -32,11 +32,13 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). * `meta.description` should: - * Be capitalized - * Not start with the package name - * Not have a dot at the end + * Be capitalized. + * Not start with the package name. + * Not have a period at the end. +* `meta.license` must be set and fit the upstream license. +* `meta.maintainers` must be set. -See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). +See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). ## Writing good commit messages From a6c50311971548247360ad99e415c49615232674 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 23 Sep 2017 00:34:41 +0200 Subject: [PATCH 0052/2806] gnuplot: 5.0.6 -> 5.2.0 --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 6100573153b..10170b41bbe 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.0.6"; + name = "gnuplot-5.2.0"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "0q5lr6nala3ln6f3yp6g17ziymb9r9gx9zylnw1y3hjmwl9lggjv"; + sha256 = "0hqyajcnlk822fk7hyl07sqk6a75n93awbdl3ydk9fd6l4jn9zkx"; }; buildInputs = From a557d3a8483d3f3771d8cfc591cf6841e33165b3 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 22 Sep 2017 20:00:06 +0930 Subject: [PATCH 0053/2806] networkmanager_openvpn: 1.2.8 -> 1.8.0 --- pkgs/tools/networking/network-manager/openvpn.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 3edbe7dba6e..47dca561d6c 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; - major = "1.2"; - version = "${major}.8"; + major = "1.8"; + version = "${major}.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "0m06sg2rnz764psvpsrx0pvll11nfn9hypgbp3s6vna8y83l02ry"; + sha256 = "1973n89g66a3jfx8r45a811fga4kadh6r1w35cb25cz1mlii2vhn"; }; buildInputs = [ openvpn networkmanager libsecret ] From 692fcd9f53cc2c19cfe485ef1a0d67437e52e544 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 23 Sep 2017 17:47:12 +0900 Subject: [PATCH 0054/2806] oraclejdk: add version 9 Oracle JDK 9 does not seems to contain jre directory, so oraclejre9 package now uses a dedicated archive file. There is no 32-bit version nor arm version (yet). If Oracle releases them, I will update the package. --- .../compilers/oraclejdk/jdk9-linux.nix | 175 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 15 +- 2 files changed, 188 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/oraclejdk/jdk9-linux.nix diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix new file mode 100644 index 00000000000..7f0a5750c0e --- /dev/null +++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix @@ -0,0 +1,175 @@ +{ swingSupport ? true +, stdenv +, requireFile +, makeWrapper +, unzip +, file +, xorg ? null +, packageType ? "JDK" # JDK, JRE, or ServerJRE +, pluginSupport ? true +, installjce ? false +, glib +, libxml2 +, ffmpeg_2 +, libxslt +, mesa_noglu +, freetype +, fontconfig +, gtk2 +, pango +, cairo +, alsaLib +, atk +, gdk_pixbuf +, zlib +, elfutils +, setJavaClassPath +}: + +assert stdenv.system == "x86_64-linux"; +assert swingSupport -> xorg != null; + +let + version = "9"; + + downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; + + jce = + if installjce then + requireFile { + name = "jce_policy-8.zip"; + url = "${downloadUrlBase}/jce8-download-2133166.html"; + sha256 = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; + } + else + ""; + + rSubPaths = [ + "lib/jli" + "lib/server" + "lib" + ]; + +in + +let result = stdenv.mkDerivation rec { + name = if packageType == "JDK" then "oraclejdk-${version}" + else if packageType == "JRE" then "oraclejre-${version}" + else if packageType == "ServerJRE" then "oracleserverjre-${version}" + else abort "unknown package Type ${packageType}"; + + src = + if packageType == "JDK" then + requireFile { + name = "jdk-${version}_linux-x64_bin.tar.gz"; + url = "${downloadUrlBase}/jdk9-downloads-3848520.html"; + sha256 = "0vbgy7h9h089l3xh6sl57v57g28x1djyiigqs4z6gh7wahx7hv8w"; + } + else if packageType == "JRE" then + requireFile { + name = "jre-${version}_linux-x64_bin.tar.gz"; + url = "${downloadUrlBase}/jre9-downloads-3848532.html"; + sha256 = "18i4jjb6sby67xg5ql6dkk3ja1nackbb23g1bnp522450nclpxdb"; + } + else if packageType == "ServerJRE" then + requireFile { + name = "serverjre-${version}_linux-x64_bin.tar.gz"; + url = "${downloadUrlBase}/server-jre9-downloads-3848530.html"; + sha256 = "01bxi7lx13lhlpbifw93b6r7a9bayiykw8kzwlyyqi8pz3pw8c5h"; + } + else abort "unknown package Type ${packageType}"; + + nativeBuildInputs = [ file ] + ++ stdenv.lib.optional installjce unzip; + + buildInputs = [ makeWrapper ]; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + # Set PaX markings + exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + for file in $exes; do + paxmark m "$file" + # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. + ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} + done + + mv $sourceRoot $out + + shopt -s extglob + for file in $out/* + do + if test -f $file ; then + rm $file + fi + done + + if test -n "${jce}"; then + unzip ${jce} + cp -v UnlimitedJCEPolicy*/*.jar $out/lib/security + fi + + if test -z "$pluginSupport"; then + rm -f $out/bin/javaws + fi + + mkdir $out/lib/plugins + ln -s $out/lib/libnpjp2.so $out/lib/plugins + + # for backward compatibility + ln -s $out $out/jre + + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + postFixup = '' + rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}" + + # set all the dynamic linkers + find $out -type f -perm -0100 \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$rpath" {} \; + + find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; + + # Oracle Java Mission Control needs to know where libgtk-x11 and related is + if test -x $out/bin/jmc; then + wrapProgram "$out/bin/jmc" \ + --suffix-each LD_LIBRARY_PATH ':' "$rpath" + fi + ''; + + /** + * libXt is only needed on amd64 + */ + libraries = + [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++ + (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); + + rpath = stdenv.lib.strings.makeLibraryPath libraries; + + passthru.mozillaPlugin = "/lib/plugins"; + + passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package + + passthru.home = result; + + # for backward compatibility + passthru.architecture = ""; + + meta = with stdenv.lib; { + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms + }; + +}; in result diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bffd358b18..da7dd1fcf36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5874,12 +5874,18 @@ with pkgs; oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; + oraclejdk9 = pkgs.oraclejdk9distro "JDK" false; + oraclejre = lowPrio (pkgs.jdkdistro false false); oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); + oraclejre9 = lowPrio (pkgs.oraclejdk9distro "JRE" false); + + oracleserverjre9 = lowPrio (pkgs.oraclejdk9distro "ServerJRE" false); + jrePlugin = jre8Plugin; jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); @@ -5894,12 +5900,17 @@ with pkgs; oraclejdk8distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk; }); + (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk pluginSupport; }); oraclejdk8psu_distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk; }); + (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); + + oraclejdk9distro = packageType: pluginSupport: + assert supportsJDK; + (if pluginSupport then appendToName "with-plugin" else x: x) + (callPackage ../development/compilers/oraclejdk/jdk9-linux.nix { inherit packageType pluginSupport; }); jikes = callPackage ../development/compilers/jikes { }; From 582c7d24fc978fb342f7d4e9ea8b818fc8006724 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Sat, 23 Sep 2017 16:02:52 +0200 Subject: [PATCH 0055/2806] ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions head_stage2.nix has been regenerated to reflect changes in ghcjs --- pkgs/development/compilers/ghcjs/ghcjs.patch | 18 - pkgs/development/compilers/ghcjs/head.nix | 16 +- .../compilers/ghcjs/head_stage2.nix | 552 +++++++++++------- 3 files changed, 355 insertions(+), 231 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch index 9f4fa3a8b7a..bbb5b30468c 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs.patch +++ b/pkgs/development/compilers/ghcjs/ghcjs.patch @@ -46,24 +46,6 @@ index db8b12e..7b815c5 100644 mapM_ patchPackage =<< allPackages preparePrimops buildGenPrim -@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do - globalFlags <- cabalGlobalFlags - flags <- cabalInstallFlags (length pkgs == 1) - let args = globalFlags ++ ("install" : pkgs) ++ -- [ "--solver=topdown" -- the modular solver refuses to install stage1 packages -+ [ "--allow-boot-library-installs" - ] ++ map ("--configure-option="<>) configureOpts ++ flags - checkInstallPlan pkgs args - cabal_ args -@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do - -- uses somewhat fragile parsing of --dry-run output, find a better way - checkInstallPlan :: [Package] -> [Text] -> B () - checkInstallPlan pkgs opts = do -- plan <- cabal (opts ++ ["-v2", "--dry-run"]) -+ plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"]) - when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan) - where - hasReinstalls = T.isInfixOf "(reinstall)" -- reject reinstalls @@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do , "--avoid-reinstalls" , "--builddir", "dist" diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 01b13262ef0..7f725a3a9ad 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -6,19 +6,15 @@ bootPkgs.callPackage ./base.nix { inherit bootPkgs; ghcjsSrc = fetchFromGitHub { - # TODO: switch back to the regular ghcjs repo - # when https://github.com/ghcjs/ghcjs/pull/573 is merged. - owner = "k0001"; + owner = "ghcjs"; repo = "ghcjs"; - rev = "600015e085a28da601b65a41c513d4a458fcd184"; - sha256 = "01kirrg0fnfwhllvwgfqjiwzwj4yv4lyig87x61n9jp6y5shzjdx"; + rev = "2b3759942fb5b2fc1a58d314d9b098d4622fa6b6"; + sha256 = "15asapg0va8dvcdycsx8dgk4xcpdnhml4h31wka6vvxf5anzz8aw"; }; ghcjsBootSrc = fetchgit { - # TODO: switch back to git://github.com/ghcjs/ghcjs-boot.git - # when https://github.com/ghcjs/ghcjs-boot/pull/41 is merged. - url = git://github.com/basvandijk/ghcjs-boot.git; - rev = "19a3b157ecb807c2224daffda5baecc92b76af35"; - sha256 = "16sgr8vfr1nx5ljnk8gckgjk70zpa67ix4dbr9aizkwyz41ilfrb"; + url = git://github.com/ghcjs/ghcjs-boot.git; + rev = "106e144cca6529a1b9612c11aea5d6ef65b96745"; + sha256 = "0gxg8iiwvm93x1dwhxypczn9qiz4m1xvj8i7cf4snfdy2jdyhi5l"; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix index aa19cfea971..18c7a76dd3a 100644 --- a/pkgs/development/compilers/ghcjs/head_stage2.nix +++ b/pkgs/development/compilers/ghcjs/head_stage2.nix @@ -2,117 +2,145 @@ { async = callPackage - ({ mkDerivation, base, HUnit, stm, test-framework - , test-framework-hunit, stdenv - }: - mkDerivation { - pname = "async"; - version = "2.1.1"; - src = "${ghcjsBoot}/boot/async"; - doCheck = false; - libraryHaskellDepends = [ base stm ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - jailbreak = true; - homepage = https://github.com/simonmar/async; - description = "Run IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, base, HUnit, stdenv, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "async"; + version = "2.1.1"; + src = "${ghcjsBoot}/boot/async"; + doCheck = false; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + jailbreak = true; + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + }) {}; aeson = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, directory - , dlist, fetchgit, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, HUnit, integer-logarithms, QuickCheck - , quickcheck-instances, scientific, stdenv, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, time-locale-compat - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "aeson"; - version = "1.1.1.0"; - src = "${ghcjsBoot}/boot/aeson"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable scientific tagged template-haskell text 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 - ]; - jailbreak = true; - homepage = https://github.com/bos/aeson; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; + , base16-bytestring, bytestring, containers, deepseq, directory + , dlist, filepath, generic-deriving, ghc-prim, hashable + , hashable-time, HUnit, integer-logarithms, QuickCheck + , quickcheck-instances, scientific, stdenv, 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.2.0"; + src = "${ghcjsBoot}/boot/aeson"; + doCheck = false; + 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 + ]; + jailbreak = true; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; 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, stdenv - }: - mkDerivation { - pname = "attoparsec"; - version = "0.13.1.0"; - src = "${ghcjsBoot}/boot/attoparsec"; - 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 - ]; - jailbreak = true; - homepage = https://github.com/bos/attoparsec; - description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; - }) {}; + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , stdenv, tasty, tasty-quickcheck, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.1.0"; + src = "${ghcjsBoot}/boot/attoparsec"; + doCheck = false; + 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 + ]; + jailbreak = true; + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + base-compat = callPackage + ({ mkDerivation, base, hspec, QuickCheck, stdenv, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.9.3"; + src = "${ghcjsBoot}/boot/base-compat"; + doCheck = false; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ base hspec QuickCheck ]; + jailbreak = true; + description = "A compatibility layer for base"; + license = stdenv.lib.licenses.mit; + }) {}; + bytestring-builder = callPackage + ({ mkDerivation, base, bytestring, deepseq, stdenv }: + mkDerivation { + pname = "bytestring-builder"; + version = "0.10.8.1.0"; + src = "${ghcjsBoot}/boot/bytestring-builder"; + doCheck = false; + libraryHaskellDepends = [ base bytestring deepseq ]; + jailbreak = true; + description = "The new bytestring builder, packaged outside of GHC"; + license = stdenv.lib.licenses.bsd3; + }) {}; case-insensitive = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hashable - , HUnit, test-framework, test-framework-hunit, text, stdenv - }: - mkDerivation { - pname = "case-insensitive"; - version = "1.2.0.8"; - src = "${ghcjsBoot}/boot/case-insensitive"; - doCheck = false; - libraryHaskellDepends = [ base bytestring deepseq hashable text ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit text - ]; - benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; - jailbreak = true; - homepage = https://github.com/basvandijk/case-insensitive; - description = "Case insensitive string comparison"; - license = stdenv.lib.licenses.bsd3; - }) {}; + , HUnit, stdenv, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "case-insensitive"; + version = "1.2.0.8"; + src = "${ghcjsBoot}/boot/case-insensitive"; + doCheck = false; + libraryHaskellDepends = [ base bytestring deepseq hashable text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + jailbreak = true; + homepage = "https://github.com/basvandijk/case-insensitive"; + description = "Case insensitive string comparison"; + license = stdenv.lib.licenses.bsd3; + }) {}; dlist = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }: - mkDerivation { - pname = "dlist"; - version = "0.8.0.2"; - src = "${ghcjsBoot}/boot/dlist"; - doCheck = false; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - jailbreak = true; - homepage = https://github.com/spl/dlist; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; + mkDerivation { + pname = "dlist"; + version = "0.8.0.2"; + src = "${ghcjsBoot}/boot/dlist"; + doCheck = false; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; extensible-exceptions = callPackage ({ mkDerivation, base, stdenv }: mkDerivation { @@ -125,10 +153,21 @@ description = "Extensible exceptions"; license = stdenv.lib.licenses.bsd3; }) {}; + fail = callPackage + ({ mkDerivation, stdenv }: + mkDerivation { + pname = "fail"; + version = "4.9.0.0"; + src = "${ghcjsBoot}/boot/fail"; + jailbreak = true; + homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail"; + description = "Forward-compatible MonadFail class"; + license = stdenv.lib.licenses.bsd3; + }) {}; hashable = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp - , QuickCheck, random, stdenv, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, unix + ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit + , integer-gmp, QuickCheck, random, siphash, stdenv, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; @@ -142,24 +181,58 @@ base bytestring ghc-prim HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 text unix ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim integer-gmp siphash text + ]; jailbreak = true; - homepage = http://github.com/tibbe/hashable; + homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; license = stdenv.lib.licenses.bsd3; }) {}; + integer-logarithms = callPackage + ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck + , smallcheck, stdenv, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "integer-logarithms"; + version = "1.0.2"; + src = "${ghcjsBoot}/boot/integer-logarithms"; + doCheck = false; + libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + jailbreak = true; + homepage = "https://github.com/phadej/integer-logarithms"; + description = "Integer logarithms"; + license = stdenv.lib.licenses.mit; + }) {}; mtl = callPackage ({ mkDerivation, base, stdenv, transformers }: mkDerivation { pname = "mtl"; - version = "2.2.2"; + version = "2.2.1"; src = "${ghcjsBoot}/boot/mtl"; doCheck = false; libraryHaskellDepends = [ base transformers ]; jailbreak = true; - homepage = http://github.com/ekmett/mtl; + homepage = "http://github.com/ekmett/mtl"; description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; + nats = callPackage + ({ mkDerivation, stdenv }: + mkDerivation { + pname = "nats"; + version = "1.1.1"; + src = "${ghcjsBoot}/boot/nats"; + jailbreak = true; + homepage = "http://github.com/ekmett/nats/"; + description = "Natural numbers"; + license = stdenv.lib.licenses.bsd3; + }) {}; old-time = callPackage ({ mkDerivation, base, old-locale, stdenv }: mkDerivation { @@ -184,30 +257,57 @@ description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; }) {}; + random = callPackage + ({ mkDerivation, base, stdenv, time }: + mkDerivation { + pname = "random"; + version = "1.1"; + src = "${ghcjsBoot}/boot/random"; + doCheck = false; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base ]; + jailbreak = true; + description = "random number library"; + license = stdenv.lib.licenses.bsd3; + }) {}; scientific = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion - , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms - , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, vector, stdenv - }: - mkDerivation { - pname = "scientific"; - version = "0.3.4.10"; - src = "${ghcjsBoot}/boot/scientific"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq ghc-prim hashable - integer-gmp integer-logarithms text vector - ]; - testHaskellDepends = [ - base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text - ]; - benchmarkHaskellDepends = [ base criterion ]; - jailbreak = true; - homepage = https://github.com/basvandijk/scientific; - description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; - }) {}; + , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms + , QuickCheck, smallcheck, stdenv, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, vector + }: + mkDerivation { + pname = "scientific"; + version = "0.3.4.10"; + src = "${ghcjsBoot}/boot/scientific"; + doCheck = false; + libraryHaskellDepends = [ + base binary bytestring containers deepseq ghc-prim hashable + integer-gmp integer-logarithms text vector + ]; + testHaskellDepends = [ + base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-smallcheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + jailbreak = true; + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + semigroups = callPackage + ({ mkDerivation, base, stdenv }: + mkDerivation { + pname = "semigroups"; + version = "0.18.3"; + src = "${ghcjsBoot}/boot/semigroups"; + doCheck = false; + libraryHaskellDepends = [ base ]; + jailbreak = true; + homepage = "http://github.com/ekmett/semigroups/"; + description = "Anything that associates"; + license = stdenv.lib.licenses.bsd3; + }) {}; stm = callPackage ({ mkDerivation, array, base, stdenv }: mkDerivation { @@ -230,27 +330,27 @@ libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers HUnit mtl ]; jailbreak = true; - homepage = http://www.cs.uu.nl/wiki/GenericProgramming/SYB; + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; license = stdenv.lib.licenses.bsd3; }) {}; tagged = callPackage - ({ mkDerivation, base, deepseq, template-haskell, transformers - , transformers-compat, stdenv - }: - mkDerivation { - pname = "tagged"; - version = "0.8.5"; - src = "${ghcjsBoot}/boot/tagged"; - doCheck = false; - libraryHaskellDepends = [ - base deepseq template-haskell transformers transformers-compat - ]; - jailbreak = true; - homepage = http://github.com/ekmett/tagged; - description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, base, deepseq, stdenv, template-haskell + , transformers, transformers-compat + }: + mkDerivation { + pname = "tagged"; + version = "0.8.5"; + src = "${ghcjsBoot}/boot/tagged"; + doCheck = false; + libraryHaskellDepends = [ + base deepseq template-haskell transformers transformers-compat + ]; + jailbreak = true; + homepage = "http://github.com/ekmett/tagged"; + description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; + license = stdenv.lib.licenses.bsd3; + }) {}; text = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq, directory , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode @@ -271,57 +371,104 @@ test-framework-hunit test-framework-quickcheck2 ]; jailbreak = true; - homepage = https://github.com/bos/text; + homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; license = stdenv.lib.licenses.bsd3; }) {}; + th-abstraction = callPackage + ({ mkDerivation, base, containers, ghc-prim, stdenv + , template-haskell + }: + mkDerivation { + pname = "th-abstraction"; + version = "0.2.6.0"; + src = "${ghcjsBoot}/boot/th-abstraction"; + doCheck = false; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + jailbreak = true; + homepage = "https://github.com/glguy/th-abstraction"; + description = "Nicer interface for reified information about data types"; + license = stdenv.lib.licenses.isc; + }) {}; + time-locale-compat = callPackage + ({ mkDerivation, base, old-locale, stdenv, time }: + mkDerivation { + pname = "time-locale-compat"; + version = "0.1.1.3"; + src = "${ghcjsBoot}/boot/time-locale-compat"; + doCheck = false; + libraryHaskellDepends = [ base old-locale time ]; + jailbreak = true; + homepage = "https://github.com/khibino/haskell-time-locale-compat"; + description = "Compatibility of TimeLocale between old-locale and time-1.5"; + license = stdenv.lib.licenses.bsd3; + }) {}; + transformers-compat = callPackage + ({ mkDerivation, base, ghc-prim, stdenv, transformers }: + mkDerivation { + pname = "transformers-compat"; + version = "0.5.1.4"; + src = "${ghcjsBoot}/boot/transformers-compat"; + doCheck = false; + libraryHaskellDepends = [ base ghc-prim transformers ]; + jailbreak = true; + homepage = "http://github.com/ekmett/transformers-compat/"; + description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; + license = stdenv.lib.licenses.bsd3; + }) {}; unordered-containers = callPackage ({ mkDerivation, base, bytestring, ChasingBottoms, containers - , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit - , mtl, QuickCheck, random, test-framework, test-framework-hunit - , test-framework-quickcheck2, stdenv - }: - mkDerivation { - pname = "unordered-containers"; - version = "0.2.7.2"; - src = "${ghcjsBoot}/boot/unordered-containers"; - libraryHaskellDepends = [ base deepseq hashable ]; - testHaskellDepends = [ - base ChasingBottoms containers hashable HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq deepseq-generics - hashable hashmap mtl random - ]; - jailbreak = true; - homepage = https://github.com/tibbe/unordered-containers; - description = "Efficient hashing-based container types"; - license = stdenv.lib.licenses.bsd3; - }) {}; + , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit + , mtl, QuickCheck, random, stdenv, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.7.2"; + src = "${ghcjsBoot}/boot/unordered-containers"; + doCheck = false; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq deepseq-generics + hashable hashmap mtl random + ]; + jailbreak = true; + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + }) {}; uuid-types = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion - , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty - , tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "uuid-types"; - version = "1.0.3"; - src = "${ghcjsBoot}/boot/uuid/uuid-types"; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable random text - ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq random - ]; - jailbreak = true; - homepage = https://github.com/aslatter/uuid; - description = "Type definitions for Universally Unique Identifiers"; - license = stdenv.lib.licenses.bsd3; - }) {}; + , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers + }: + mkDerivation { + pname = "uuid-types"; + version = "1.0.3"; + src = "${ghcjsBoot}/boot/uuid/uuid-types"; + doCheck = false; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable random text + ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq random + unordered-containers + ]; + jailbreak = true; + homepage = "https://github.com/hvr/uuid"; + description = "Type definitions for Universally Unique Identifiers"; + license = stdenv.lib.licenses.bsd3; + }) {}; vector = callPackage ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck , random, stdenv, template-haskell, test-framework @@ -338,7 +485,7 @@ test-framework-quickcheck2 transformers ]; jailbreak = true; - homepage = https://github.com/haskell/vector; + homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -366,16 +513,15 @@ test-framework-hunit test-framework-quickcheck2 text ]; jailbreak = true; - homepage = http://github.com/ghcjs/ghcjs-base; - description = "Base library for GHCJS"; + homepage = "http://github.com/ghcjs/ghcjs-base"; + description = "base library for GHCJS"; license = stdenv.lib.licenses.mit; }) {}; Cabal = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, extensible-exceptions, filepath, HUnit - , old-time, pretty, process, QuickCheck, regex-posix, stdenv - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , time, unix + , deepseq, directory, exceptions, filepath, old-time, pretty + , process, QuickCheck, regex-posix, stdenv, tagged, tasty + , tasty-hunit, tasty-quickcheck, time, transformers, unix }: mkDerivation { pname = "Cabal"; @@ -387,12 +533,12 @@ pretty process time unix ]; testHaskellDepends = [ - base bytestring containers directory extensible-exceptions filepath - HUnit old-time process QuickCheck regex-posix test-framework - test-framework-hunit test-framework-quickcheck2 unix + base bytestring containers directory exceptions filepath old-time + pretty process QuickCheck regex-posix tagged tasty tasty-hunit + tasty-quickcheck transformers unix ]; jailbreak = true; - homepage = http://www.haskell.org/cabal/; + homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; }) {}; From cea9a52dac2219ec91021d97077b15ccc39bf380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Sep 2017 13:56:24 +0200 Subject: [PATCH 0056/2806] cmake: maintenance 3.9.1 -> 3.9.2 --- pkgs/development/tools/build-managers/cmake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index a912b04d217..0cb9078aede 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "3.9"; - minorVersion = "1"; + 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.1-SHA-256.txt - sha256 = "d768ee83d217f91bb597b3ca2ac663da7a8603c97e1f1a5184bc01e0ad2b12bb"; + # from https://cmake.org/files/v3.9/cmake-3.9.2-SHA-256.txt + sha256 = "954a5801a456ee48e76f01107c9a4961677dd0f3e115275bbd18410dc22ba3c1"; }; prePatch = optionalString (!useSharedLibraries) '' From 81a074fbd651745a77dfde56e6361aa6aaa5f1a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Sep 2017 14:54:20 +0200 Subject: [PATCH 0057/2806] atk: 2.22.0 -> 2.26.0 --- pkgs/development/libraries/atk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index cd2ffe55664..1574d8d037c 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: let - ver_maj = "2.22"; + ver_maj = "2.26"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; - sha256 = "d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6"; + sha256 = "eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827"; }; enableParallelBuilding = true; From 7b5edfd2881cca7b314c69fb31534674a6cddf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Sep 2017 14:55:01 +0200 Subject: [PATCH 0058/2806] at-spi2-*: 2.24.1 -> 2.26.0 --- pkgs/development/libraries/at-spi2-atk/default.nix | 6 +++--- pkgs/development/libraries/at-spi2-core/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 30fe8173e86..3aef90594a1 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -2,14 +2,14 @@ , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { - versionMajor = "2.24"; - versionMinor = "1"; + versionMajor = "2.26"; + versionMinor = "0"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d"; + sha256 = "d25e528e1406a10c7d9b675aa15e638bcbf0a122ca3681f655a30cce83272fb9"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 4d496932f66..bd8588f9771 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -2,14 +2,14 @@ , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { - versionMajor = "2.24"; - versionMinor = "1"; + versionMajor = "2.26"; + versionMinor = "0"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b"; + sha256 = "511568a65fda11fdd5ba5d4adfd48d5d76810d0e6ba4f7460f1b2ec0dbbbc337"; }; outputs = [ "out" "dev" ]; From 40e163e4f24398249347b69ae7b85cdde395d076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Sep 2017 15:06:46 +0200 Subject: [PATCH 0059/2806] pango: maintenance 1.40.11 -> 1.40.12 The patch is included in this release. --- pkgs/development/libraries/pango/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 88a8ed1df4f..85032677aae 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -6,25 +6,16 @@ with stdenv.lib; let ver_maj = "1.40"; - ver_min = "11"; + ver_min = "12"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e"; + sha256 = "75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc"; }; - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=785978#c9 - (fetchpatch rec { - name = "pango-fix-gtk2-test-failures.patch"; - url = "https://bug785978.bugzilla-attachments.gnome.org/attachment.cgi?id=357690&action=diff&collapsed=&context=patch&format=raw&headers=1"; - sha256 = "055m2dllfr5pgw6bci72snw38f4hsyw1x7flj188c965ild8lq3a"; - }) - ]; - outputs = [ "bin" "dev" "out" "devdoc" ]; buildInputs = [ gobjectIntrospection ]; From 68bfcad289815f496ed42b722e591f743772b911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Sep 2017 15:10:48 +0200 Subject: [PATCH 0060/2806] libsoup: 2.59.90.1 -> 2.60.0 There are basically no changes, but the version number is much nicer ;-) Explicit deletion of gtk-goc isn't needed anymore (see doc/multiple-output.xml). --- pkgs/development/libraries/libsoup/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index d1b476d94d2..229a92d84bf 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -4,15 +4,15 @@ , libintlOrEmpty , intltool, python }: let - majorVersion = "2.59"; - version = "${majorVersion}.90.1"; + majorVersion = "2.60"; + version = "${majorVersion}.0"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "0bh8wa0szkm9bx2anfq655zshwf6jhxvrqwx8jyh8rqgi6z9dhz0"; + sha256 = "b324edbecda0884143c0853b4a2bd5bd37fb3761f12f293c621ff34b9acdc84c"; }; prePatch = '' @@ -38,8 +38,6 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - postInstall = "rm -rf $out/share/gtk-doc"; - meta = { inherit (glib.meta) maintainers platforms; }; From b4be1cb8e0525f4eb27cece49726dab5a746a73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Sep 2017 15:17:53 +0200 Subject: [PATCH 0061/2806] harfbuzz: 1.4.8 -> 1.5.1 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 8885f2a2c43..f5756d1f570 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.4.8"; + version = "1.5.1"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131"; + sha256 = "56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51"; }; outputs = [ "out" "dev" ]; From 00b4e2646cb07611944645d219bfe1202d34e20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Sep 2017 16:59:15 +0200 Subject: [PATCH 0062/2806] glib: 2.52.3 -> 2.54.0 License was updated upstream. Also tidy the expression a bit, and unify the nix coding style. --- pkgs/development/libraries/glib/default.nix | 84 +++++++++++---------- 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e76e48ad8fc..39140eaf519 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -42,8 +42,8 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - ver_maj = "2.52"; - ver_min = "3"; + ver_maj = "2.54"; + ver_min = "0"; in stdenv.mkDerivation rec { @@ -51,10 +51,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "0a71wkkhkvad84gm30w13micxxgqqw3sxhybj7nd9z60lwspdvi5"; + sha256 = "fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a"; }; - patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; + patches = optional stdenv.isDarwin ./darwin-compilation.patch + ++ optional doCheck ./skip-timer-test.patch; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; @@ -76,21 +77,23 @@ stdenv.mkDerivation rec { ++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu" ++ optional stdenv.isSunOS "--disable-dtrace"; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" - + optionalString stdenv.isSunOS " -DBSD_COMP"; + NIX_CFLAGS_COMPILE = optional stdenv.isDarwin "-lintl" + ++ optional stdenv.isSunOS "-DBSD_COMP"; - preConfigure = if !stdenv.isSunOS then null else - '' - sed -i -e 's|inotify.h|foobar-inotify.h|g' configure - ''; + preConfigure = optionalString stdenv.isSunOS '' + sed -i -e 's|inotify.h|foobar-inotify.h|g' configure + ''; + + postConfigure = '' + patchShebangs ./gobject/ + ''; LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}"; LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf"; - preBuild = optionalString stdenv.isDarwin - '' - export MACOSX_DEPLOYMENT_TARGET= - ''; + preBuild = optionalString stdenv.isDarwin '' + export MACOSX_DEPLOYMENT_TARGET= + ''; enableParallelBuilding = true; DETERMINISTIC_BUILD = 1; @@ -100,33 +103,36 @@ stdenv.mkDerivation rec { substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" '' - # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. - + '' - sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ - -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c - ''; + # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. + + '' + sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ + -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c + ''; inherit doCheck; - preCheck = optionalString doCheck - '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" - export TZDIR="${tzdata}/share/zoneinfo" - export XDG_CACHE_HOME="$TMP" - export XDG_RUNTIME_HOME="$TMP" - export HOME="$TMP" - export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" - export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" + preCheck = optionalString doCheck '' + export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" + export TZDIR="${tzdata}/share/zoneinfo" + export XDG_CACHE_HOME="$TMP" + export XDG_RUNTIME_HOME="$TMP" + export HOME="$TMP" + export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" + export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" + export PATH="$PATH:$(pwd)/gobject" + echo "PATH=$PATH" - substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true" - # Needs machine-id, comment the test - sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c - sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-unix-addresses.c - # All gschemas fail to pass the test, upstream bug? - sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c - # Cannot reproduce the failing test_associations on hydra - sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c - # Needed because of libtool wrappers - sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c - ''; + substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop \ + --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true" + # Needs machine-id, comment the test + sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c + sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-unix-addresses.c + # All gschemas fail to pass the test, upstream bug? + sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c + # Cannot reproduce the failing test_associations on hydra + sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c + # Needed because of libtool wrappers + sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c + ''; passthru = { gioModuleDir = "lib/gio/modules"; @@ -136,7 +142,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library of programming buildings blocks"; homepage = https://www.gtk.org/; - license = licenses.lgpl2Plus; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; From 665918c24a33d6a9c46d036352ee2b0c85c8d6ac Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sat, 8 Jul 2017 21:12:33 +0200 Subject: [PATCH 0063/2806] gn: init at 0.0.0.20170629 --- .../tools/build-managers/gn/default.nix | 73 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/development/tools/build-managers/gn/default.nix diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix new file mode 100644 index 00000000000..99215c0818d --- /dev/null +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -0,0 +1,73 @@ +{ stdenv, lib, fetchgit, fetchurl, libevent, ninja, python }: + +let + depsGit = { + "tools/gn" = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/tools/gn"; + rev = "d0c518db129975ce88ff1de26c857873b0619c4b"; + sha256 = "0l15vzmjyx6bwlz1qhn3fy7yx3qzzxr3drnkj3l0p0fmyxza52vx"; + }; + "base" = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/base"; + rev = "bc6e3ce8ca01b894751e1f7b22b561e3ae2e7f17"; + sha256 = "1yl49v6nxbrfms52xf7fiwh7d4301m2aj744pa3hzzh989c5j6g5"; + }; + "build" = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/build"; + rev = "e934a19ae908081fba13769924e4ea45a7a451ce"; + sha256 = "0jhy418vaiin7djg9zvk83f8zhasigki4442x5j7gkmgmgmyc4am"; + }; + "config" = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/build/config"; + rev = "df16c6a2c070704b0a25efe46ee9af16de1e65b3"; + sha256 = "1x18syzz1scwhd8lf448hy5lnfpq118l403x9qmwm0np318w09wg"; + }; + "testing/gtest" = fetchgit { + url = "https://chromium.googlesource.com/chromium/testing/gtest"; + rev = "585ec31ea716f08233a815e680fc0d4699843938"; + sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc"; + }; + }; + +in + stdenv.mkDerivation rec { + name = "gn"; + version = "0.0.0.20170629"; + sourceRoot = "."; + + unpackPhase = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + cp -r ${v}/* $sourceRoot/${n} + '') depsGit)} + ''; + + postPatch = '' + # Patch out Chromium-bundled libevent + chmod u+w tools/gn/bootstrap tools/gn/bootstrap/bootstrap.py + sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \ + tools/gn/bootstrap/bootstrap.py + ''; + + NIX_LDFLAGS = "-levent"; + + nativeBuildInputs = [ ninja python ]; + buildInputs = [ libevent ]; + + buildPhase = '' + python tools/gn/bootstrap/bootstrap.py -s + ''; + + installPhase = '' + install -vD out/Release/gn "$out/bin/gn" + ''; + + meta = with stdenv.lib; { + description = "A meta-build system that generates NinjaBuild files"; + homepage = https://chromium.googlesource.com/chromium/src/tools/gn; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.stesie ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b05d1d345c..31c5219b0f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7283,6 +7283,8 @@ with pkgs; ninja = callPackage ../development/tools/build-managers/ninja { }; + gn = callPackage ../development/tools/build-managers/gn { }; + nixbang = callPackage ../development/tools/misc/nixbang { pythonPackages = python3Packages; }; From 44a3f688571c98ad93ccb36405294b5b197a76d2 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Tue, 18 Jul 2017 20:33:52 +0200 Subject: [PATCH 0064/2806] v8_6_x: init at 6.2.414.15 --- pkgs/development/libraries/v8/6_x.nix | 167 ++++++++++++++++++++++++ pkgs/development/libraries/v8/update.sh | 47 +++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 218 insertions(+) create mode 100644 pkgs/development/libraries/v8/6_x.nix create mode 100755 pkgs/development/libraries/v8/update.sh diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix new file mode 100644 index 00000000000..8a48e224530 --- /dev/null +++ b/pkgs/development/libraries/v8/6_x.nix @@ -0,0 +1,167 @@ +{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig +, doCheck ? false +, snapshot ? true +}: + +let + arch = if stdenv.isArm + then if stdenv.is64bit + then"arm64" + else "arm" + else if stdenv.is64bit + then"x64" + else "ia32"; + git_url = "https://chromium.googlesource.com"; + + deps = { + "base/trace_event/common" = fetchgit { + url = "${git_url}/chromium/src/base/trace_event/common.git"; + rev = "65d1d42a5df6c0a563a6fdfa58a135679185e5d9"; + sha256 = "0ikk0dj12adzr0138jrmwzhx8n9sl5qzs86a3mc3gva08a8wc84p"; + }; + "build" = fetchgit { + url = "${git_url}/chromium/src/build.git"; + rev = "48a2b7b39debc7c77c868c9ddb0a360af1ebc367"; + sha256 = "0aj554dfdbwnikwaapznfq55wkwbvg4114h7qamixy8ryjkaiy0k"; + }; + "buildtools" = fetchgit { + url = "${git_url}/chromium/buildtools.git"; + rev = "5af0a3a8b89827a8634132080a39ab4b63dee489"; + sha256 = "1841803m40w1hmnmm7qzdpk4b6q1m8cb7q4hsflqfpddpf4lp3v1"; + }; + "test/benchmarks/data" = fetchgit { + url = "${git_url}/v8/deps/third_party/benchmarks.git"; + rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; + sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; + }; + "test/mozilla/data" = fetchgit { + url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; + rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; + sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; + }; + "test/test262/data" = fetchgit { + url = "${git_url}/external/github.com/tc39/test262.git"; + rev = "1b911a8f8abf4cb63882cfbe72dcd4c82bb8ad91"; + sha256 = "1hbp7vv41k7jka8azc78hhw4qng7gckr6dz1van7cyd067znwvr4"; + }; + "test/test262/harness" = fetchgit { + url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; + rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd"; + sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp"; + }; + "test/wasm-js" = fetchgit { + url = "${git_url}/external/github.com/WebAssembly/spec.git"; + rev = "17b4a4d98c80b1ec736649d5a73496a0e6d12d4c"; + sha256 = "03nyrrqffzj6xrmqi1v7f9m9395bdk53x301fy5mcq4hhpq6rsjr"; + }; + "testing/gmock" = fetchgit { + url = "${git_url}/external/googlemock.git"; + rev = "0421b6f358139f02e102c9c332ce19a33faf75be"; + sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp"; + }; + "testing/gtest" = fetchgit { + url = "${git_url}/external/github.com/google/googletest.git"; + rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; + sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; + }; + "third_party/icu" = fetchgit { + url = "${git_url}/chromium/deps/icu.git"; + rev = "08cb956852a5ccdba7f9c941728bb833529ba3c6"; + sha256 = "0vn2iv068kmcjqqx5cgyha80x9iraz11hpx3q4n3rkvrlvbb3d7b"; + }; + "third_party/instrumented_libraries" = fetchgit { + url = "${git_url}/chromium/src/third_party/instrumented_libraries.git"; + rev = "644afd349826cb68204226a16c38bde13abe9c3c"; + sha256 = "0d1vkwilgv1a4ghazn623gwmm7h51padpfi94qrmig1y748xfwfa"; + }; + # templates of code generator require jinja2 2.8 (while nixpkgs has 2.9.5, which breaks the template) + "third_party/jinja2" = fetchgit { + url = "${git_url}/chromium/src/third_party/jinja2.git"; + rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0"; + sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd"; + }; + "third_party/markupsafe" = fetchgit { + url = "${git_url}/chromium/src/third_party/markupsafe.git"; + rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; + sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; + }; + "tools/clang" = fetchgit { + url = "${git_url}/chromium/src/tools/clang.git"; + rev = "40f69660bf3cd407e72b8ae240fdd6c513dddbfe"; + sha256 = "1plkb9dcn34yd6lad7w59s9vqwmcc592dasgdk232spkafpg8qcf"; + }; + }; + +in + +stdenv.mkDerivation rec { + name = "v8-${version}"; + version = "6.2.414.15"; + + inherit doCheck; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = version; + sha256 = "1c1pjj72mj097rak2zsmm2iqn00iw93dc6gvxd89p4lbfaiilsn8"; + }; + + postUnpack = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + cp -r ${v}/* $sourceRoot/${n} + '') deps)} + ''; + + prePatch = '' + # use our gn, not the bundled one + sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py + + # disable tests + if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi + + chmod u+w build/config build/config/sysroot.gni + sed -i build/config/sysroot.gni \ + -e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }' + ''; + + configurePhase = '' + tools/dev/v8gen.py -vv ${arch}.release -- \ + is_component_build=true \ + ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false" } \ + is_clang=false \ + linux_use_bundled_binutils=false \ + treat_warnings_as_errors=false + ''; + + nativeBuildInputs = [ gn ninja pkgconfig ]; + buildInputs = [ python glib ]; + + buildPhase = '' + ninja -C out.gn/x64.release/ + ''; + + enableParallelBuilding = true; + + installPhase = '' + install -vD out.gn/x64.release/d8 "$out/bin/d8" + install -vD out.gn/x64.release/mksnapshot "$out/bin/mksnapshot" + mkdir -p "$out/lib" + for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do + install -vD out.gn/${arch}.release/$f "$out/lib/$f" + done + install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat" + mkdir -p "$out/include" + cp -vr include/*.h "$out/include" + cp -vr include/libplatform "$out/include" + ''; + + meta = with lib; { + description = "Google's open source JavaScript engine"; + maintainers = with maintainers; [ cstrahan proglodyte ]; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/v8/update.sh b/pkgs/development/libraries/v8/update.sh new file mode 100755 index 00000000000..f046bb8e688 --- /dev/null +++ b/pkgs/development/libraries/v8/update.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl -p nix-prefetch-git +VERSION_OVERVIEW=https://omahaproxy.appspot.com/all?os=linux +TARGET_CHANNEL=beta +FILE_PATH=6_x.nix + +set -eo pipefail + +v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }") + +echo "Using V8 version --> $v8_version" +sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${FILE_PATH} + +sha256=$(nix-prefetch-git --no-deepClone https://github.com/v8/v8.git "refs/tags/${v8_version}" \ + | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }') +sed -e "/repo = \"v8\"/ { n;n; s#\".*\"#\"${sha256}\"# }" -i ${FILE_PATH} + +deps="$(mktemp)" + +curl -s -o "$deps" "https://raw.githubusercontent.com/v8/v8/${v8_version}/DEPS" +echo $deps + +sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read dep; do + echo "Processing dependency --> $dep" + escaped_dep=$(echo "$dep" | sed -e 's#/#\\/#g') + dep_rev=$(sed -ne "/\"v8\/${escaped_dep}\":/ { n; s#.*+ \"##; s#\".*##; p }" "$deps") + + if [ "$dep_rev" = "" ]; then + echo "Failed to resolve dependency $dep, not listed in DEPS file" + rm -f "$deps" + exit 2 + fi + + repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }" ${FILE_PATH}) + sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }') + + if [ "$sha256" = "" ]; then + echo "Failed to get sha256 via nix-prefetch-git $repo_url $dep_rev" + rm -f "$deps" + exit 2 + fi + + sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/ }" -i ${FILE_PATH} +done + +rm -f "$deps" +echo done. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31c5219b0f1..8ada3c6169e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10726,6 +10726,10 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; + v8_6_x = callPackage ../development/libraries/v8/6_x.nix { + inherit (python2Packages) python; + }; + v8 = callPackage ../development/libraries/v8 { inherit (python2Packages) python gyp; cctools = darwin.cctools; From 6c196e37995869de365ddda6c39e2cc59616041a Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 24 Sep 2017 11:30:55 +0200 Subject: [PATCH 0065/2806] php71Packages.v8js: 1.3.2 -> 1.4.1 --- pkgs/top-level/php-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d7ad2eb85b6..56586cc20e0 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -300,13 +300,13 @@ let }; v8js = assert isPhp7; buildPecl rec { - version = "1.3.2"; + version = "1.4.1"; name = "v8js-${version}"; - sha256 = "1x7gxi70zgj3vaxs89nfbnwlqcxrps1inlyfzz66pbzdbfwvc8z8"; + sha256 = "0k5dc395gzva4l6n9mzvkhkjq914460cwk1grfandcqy73j6m89q"; - buildInputs = [ pkgs.v8 ]; - configureFlags = [ "--with-v8js=${pkgs.v8}" ]; + buildInputs = [ pkgs.v8_6_x ]; + configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; }; composer = pkgs.stdenv.mkDerivation rec { From 676c12356d65eb1aa2ff4bf55640368d06362f99 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 24 Sep 2017 11:36:55 +0200 Subject: [PATCH 0066/2806] php71Packages.v8: 0.1.0 -> 0.1.9 --- pkgs/top-level/php-packages.nix | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 56586cc20e0..4e25e8710a6 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -269,34 +269,13 @@ let }; v8 = assert isPhp7; buildPecl rec { - version = "0.1.0"; + version = "0.1.9"; name = "v8-${version}"; - src = pkgs.fetchurl { - url = "https://github.com/pinepain/php-v8/archive/v${version}.tar.gz"; - sha256 = "18smnxd34b486f5n8j0wk9z7r5x1w84v89mgf76z0bn7gxdxl0xj"; - }; + sha256 = "0bj77dfmld5wfwl4wgqnpa0i4f3mc1mpsp9dmrwqv050gs84m7h1"; - buildInputs = [ pkgs.v8 ]; - configureFlags = [ "--with-v8=${pkgs.v8}" ]; - - patches = [ - (builtins.toFile "link-libv8_libbase.patch" '' - Index: php-v8/config.m4 - =================================================================== - --- php-v8.orig/config.m4 - +++ php-v8/config.m4 - @@ -69,7 +69,7 @@ if test "$PHP_V8" != "no"; then - #static_link_extra="libv8_base.a libv8_libbase.a libv8_libplatform.a libv8_snapshot.a" - ;; - * ) - - static_link_extra="libv8_libplatform.a" - + static_link_extra="libv8_libplatform.a libv8_libbase.a" - #static_link_extra="libv8_base.a libv8_libbase.a libv8_libplatform.a libv8_snapshot.a" - ;; - esac - '' - )]; + buildInputs = [ pkgs.v8_6_x ]; + configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; }; v8js = assert isPhp7; buildPecl rec { From 62f4ded8d2ac537cb9755c390c7526f2933f72c2 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sat, 23 Sep 2017 16:12:44 +0100 Subject: [PATCH 0067/2806] bokeh: 0.12.7 -> 0.12.9 --- pkgs/development/python-modules/bokeh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 43c176a09ec..a1ae95e6d5d 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.7"; + version = "0.12.9"; src = fetchPypi { inherit pname version; - sha256 = "2c42c95bf1a418c758dbff8446b4f5e5fc72ac10ea5da4e6b5010067396d0880"; + sha256 = "00jx3yycy6fziihz45hwj1dsh520h3vmypp28mw0877rxpxl2yxg"; }; disabled = isPyPy; @@ -79,4 +79,4 @@ buildPythonPackage rec { homepage = "http://github.com/bokeh/bokeh"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} From 02d9d40d99d5a47e5e252dfe51451fe445cd2459 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 23 Sep 2017 11:48:51 +0200 Subject: [PATCH 0068/2806] testssl.sh: init at 2.9.5-1 Add testssl.sh which is a nice utility for testing TLS/SSL capabilities of servers without having to use any kind of web-service. It's very useful for testing setups of services before deployment and such. --- lib/maintainers.nix | 1 + .../networking/testssl/default.nix | 45 +++++++++++++++++++ .../networking/testssl/testssl.patch | 10 +++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 58 insertions(+) create mode 100644 pkgs/applications/networking/testssl/default.nix create mode 100644 pkgs/applications/networking/testssl/testssl.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9f4c31a3e4d..db3c93c7064 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -190,6 +190,7 @@ erikryb = "Erik Rybakken "; ertes = "Ertugrul Söylemez "; ethercrow = "Dmitry Ivanov "; + etu = "Elis Hirwing "; exi = "Reno Reckling "; exlevan = "Alexey Levan "; expipiplus1 = "Joe Hermaszewski "; diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix new file mode 100644 index 00000000000..dc7c961856d --- /dev/null +++ b/pkgs/applications/networking/testssl/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pkgs }: + +stdenv.mkDerivation rec { + version = "2.9.5-1"; + name = "testssl.sh-${version}"; + + src = fetchFromGitHub { + owner = "drwetter"; + repo = "testssl.sh"; + rev = "v${version}"; + sha256 = "0hz6g685jwl0c0jrdca746425xpwiwc8lnlc2gigga5hkcq8qzl9"; + }; + + nativeBuildInputs = with pkgs; [ + makeWrapper + ]; + + patches = [ ./testssl.patch ]; + + pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; + opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; + postPatch = '' + sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ + -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ + -e "s|OPENSSL:-\"\"|OPENSSL:-\"${opensslBinPath}\"|g" \ + testssl.sh + ''; + + installPhase = '' + mkdir -p $out/bin $out/etc + cp -r etc/ $out/ + cp testssl.sh $out/bin/testssl.sh + ''; + + meta = with stdenv.lib; { + description = "CLI tool to check a server's TLS/SSL capabilities"; + longDescription = '' + CLI tool which checks a server's service on any port for the support of + TLS/SSL ciphers, protocols as well as recent cryptographic flaws and more. + ''; + homepage = https://testssl.sh/; + license = licenses.gpl2; + maintainers = [ maintainers.etu ]; + }; +} diff --git a/pkgs/applications/networking/testssl/testssl.patch b/pkgs/applications/networking/testssl/testssl.patch new file mode 100644 index 00000000000..d5269c73708 --- /dev/null +++ b/pkgs/applications/networking/testssl/testssl.patch @@ -0,0 +1,10 @@ +--- testssl/testssl.sh 2017-09-24 16:53:29.395263437 +0200 ++++ testssl-new/testssl.sh 2017-09-24 16:53:41.221154492 +0200 +@@ -165,6 +165,7 @@ + # following variables make use of $ENV, e.g. OPENSSL= ./testssl.sh + # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help + declare -x OPENSSL OPENSSL_TIMEOUT ++OPENSSL=${OPENSSL:-""} + FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production + COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all + COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6163482cd40..bcd421ec61b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16549,6 +16549,8 @@ with pkgs; twmn = libsForQt5.callPackage ../applications/misc/twmn { }; + testssl = callPackage ../applications/networking/testssl { }; + umurmur = callPackage ../applications/networking/umurmur { }; unigine-valley = callPackage ../applications/graphics/unigine-valley { }; From 0f67947f329e6cb9ff48897408e3ee92749143bf Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 24 Sep 2017 15:39:55 +0000 Subject: [PATCH 0069/2806] timescaledb: 0.4.2 -> 0.5.0 --- pkgs/servers/sql/postgresql/timescaledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index e68d06dcf1f..8e646eb7271 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.4.2"; + version = "0.5.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "0rwcd7wg3kv343b02330nlpqfm6jj5g0d2pkr1pc78cq8prhxx39"; + sha256 = "01swgjw563c42azxsg55ry7cyiipxkcvfrxmw71jil5dxl3s0fkz"; }; installPhase = '' From a047e19c15ec7ee7f095657e9203fe292c26f57b Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 24 Sep 2017 15:56:22 +0000 Subject: [PATCH 0070/2806] timescaledb: include schema migration .sql scripts --- pkgs/servers/sql/postgresql/timescaledb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index 8e646eb7271..5810ae86891 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - install -D timescaledb.so -t $out/lib - install -D timescaledb.control -t $out/share/extension - install -D sql/timescaledb--${version}.sql -t $out/share/extension + install -D timescaledb.so -t $out/lib + install -D timescaledb.control -t $out/share/extension + cp -dpR sql/* $out/share/extension/ ''; meta = with stdenv.lib; { From e14ac35238c8733add6d785cae64d6e8fbfc469e Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 24 Sep 2017 18:10:31 +0200 Subject: [PATCH 0071/2806] v8_6_x: fix hard-coded architecture --- pkgs/development/libraries/v8/6_x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix index 8a48e224530..384c6d7d984 100644 --- a/pkgs/development/libraries/v8/6_x.nix +++ b/pkgs/development/libraries/v8/6_x.nix @@ -140,14 +140,14 @@ stdenv.mkDerivation rec { buildInputs = [ python glib ]; buildPhase = '' - ninja -C out.gn/x64.release/ + ninja -C out.gn/${arch}.release/ ''; enableParallelBuilding = true; installPhase = '' - install -vD out.gn/x64.release/d8 "$out/bin/d8" - install -vD out.gn/x64.release/mksnapshot "$out/bin/mksnapshot" + install -vD out.gn/${arch}.release/d8 "$out/bin/d8" + install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot" mkdir -p "$out/lib" for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do install -vD out.gn/${arch}.release/$f "$out/lib/$f" From 6e8b89157fcb935400e74ff32a2cb197896c31e9 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 24 Sep 2017 18:10:58 +0200 Subject: [PATCH 0072/2806] v8_6_x: fix sandbox build (/usr/bin/env dependency) --- pkgs/development/libraries/v8/6_x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix index 384c6d7d984..dc6a559d287 100644 --- a/pkgs/development/libraries/v8/6_x.nix +++ b/pkgs/development/libraries/v8/6_x.nix @@ -122,9 +122,13 @@ stdenv.mkDerivation rec { # disable tests if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi + # disable sysroot usage chmod u+w build/config build/config/sysroot.gni sed -i build/config/sysroot.gni \ -e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }' + + # patch shebangs (/usr/bin/env) + patchShebangs tools/dev/v8gen.py ''; configurePhase = '' From 4994e3f2c27df62c1f7f8f2fd7834ec5d282c341 Mon Sep 17 00:00:00 2001 From: Miguel de la Cruz Date: Sun, 24 Sep 2017 17:45:47 +0100 Subject: [PATCH 0073/2806] gpac: 0.5.0 -> 0.7.1 --- lib/maintainers.nix | 1 + pkgs/applications/video/gpac/default.nix | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ec0d49dd35d..6253197fd1f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -370,6 +370,7 @@ meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; metabar = "Celine Mercier "; + mgdelacroix = "Miguel de la Cruz "; mguentner = "Maximilian Güntner "; mic92 = "Jörg Thalheim "; michaelpj = "Michael Peyton Jones "; diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 927842916a1..c3f949ae5b7 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchsvn, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "gpac-0.5.0-svn"; + version = "0.7.1"; + name = "gpac-${version}"; - src = fetchsvn { - url = "http://svn.code.sf.net/p/gpac/code/trunk/gpac"; - rev = "4749"; - sha256 = "0y38pmp64a2l70y1yby90qzxfzx8y7r0cdmgjxzw86jh6si5ndhp"; + src = fetchFromGitHub { + owner = "gpac"; + repo = "gpac"; + rev = "v${version}"; + sha256 = "197c5968p5bzvk0ga347fwgkqh4j1v3z65wlx65c5m9gwfxz2k2q"; }; # this is the bare minimum configuration, as I'm only interested in MP4Box @@ -27,10 +29,13 @@ stdenv.mkDerivation rec { A multimedia packager, called MP4Box, And some server tools included in MP4Box and MP42TS applications. ''; - homepage = http://gpac.wp.mines-telecom.fr; + homepage = https://gpac.wp.imt.fr; license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + maintainers = [ + stdenv.lib.maintainers.bluescreen303 + stdenv.lib.maintainers.mgdelacroix + ]; platforms = stdenv.lib.platforms.linux; }; } From 24ab22bea89f5a522c81ca5a7c78e73023ab4d30 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 24 Sep 2017 19:23:20 +0200 Subject: [PATCH 0074/2806] gn: fix sandbox build --- pkgs/development/tools/build-managers/gn/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 99215c0818d..5e7dd5214a0 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -44,6 +44,10 @@ in ''; postPatch = '' + # Patch shebands (for sandbox build) + chmod u+w -R build + patchShebangs build + # Patch out Chromium-bundled libevent chmod u+w tools/gn/bootstrap tools/gn/bootstrap/bootstrap.py sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \ From 62597385c349068bf9421afb1f97af0576bca1d7 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 24 Sep 2017 21:04:33 +0200 Subject: [PATCH 0075/2806] oath-toolkit: 2.6.1 -> 2.6.2 --- pkgs/tools/security/oath-toolkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 98635f8cc85..965ecda164b 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -6,14 +6,14 @@ let else pam; in stdenv.mkDerivation rec { - name = "oath-toolkit-2.6.1"; + name = "oath-toolkit-2.6.2"; src = fetchurl { url = "mirror://savannah/oath-toolkit/${name}.tar.gz"; - sha256 = "0ybg0gnddmhxga0jwdipyz8jv5mxs0kiiflhvzffl9mw0wcq6mww"; + sha256 = "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h"; }; - + buildInputs = [ securityDependency ]; meta = { From 8cc240af22eb57284df4b5bca3c9f3332aa96025 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sat, 23 Sep 2017 16:39:04 +0100 Subject: [PATCH 0076/2806] flake8-future-import: Add patch to fix tests. --- .../flake8-future-import/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index f00c1fe2166..2ece8ba85ab 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six }: +{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six, + fetchurl }: buildPythonPackage rec { pname = "flake8-future-import"; @@ -11,6 +12,17 @@ buildPythonPackage rec { rev = version; sha256 = "0622bdcfa588m7g8igag6hf4rhjdwh74yfnrjwlxw4vlqhg344k4"; }; + + patches = [ + # Tests in 0.4.3 are broken. We can remove this patch after + # the next release. + (fetchurl { + url = "https://github.com/xZise/flake8-future-import/commit/b4f5a06b22c574fb5270574d1420715667768d5c.patch"; + sha256 = "06n9ggz9p9kiwjb3vmaj44pm5vi4nhgzjfn7i730m85xn67xzmyn"; + }) + ]; + + propagatedBuildInputs = [ flake8 six ]; meta = { homepage = https://github.com/xZise/flake8-future-import; From 83e48f770bcdbbe2479c8424a3a91adf620b2784 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sun, 24 Sep 2017 14:40:19 +0100 Subject: [PATCH 0077/2806] xarray: Add upstream patch to fix tests. (#28643) --- pkgs/development/python-modules/xarray/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 7b9712dfd02..1215e613f6f 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -5,6 +5,7 @@ , numpy , pandas , python +, fetchurl }: buildPythonPackage rec { @@ -17,6 +18,15 @@ buildPythonPackage rec { sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494"; }; + # Temporary patch until next release (later than 0.9.6) to fix + # a broken test case. + patches = [ + (fetchurl { + url = "https://github.com/pydata/xarray/commit/726c6a3638ecf95889c541d84e892a106c2f2f92.patch"; + sha256 = "1i2hsj5v5qlvqfj48vyn9931yndsf4k4wrk3qpqpywh32s7r007b"; + }) + ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [numpy pandas]; From 7055b4aa452f19a8b234e81eff46b6e4ff227135 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Sun, 24 Sep 2017 13:53:16 +0100 Subject: [PATCH 0078/2806] Fix tests for Sshuttle on Darwin. --- pkgs/tools/security/sshuttle/darwin.patch | 588 ++++++++++++++++++++++ pkgs/tools/security/sshuttle/default.nix | 2 +- 2 files changed, 589 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/security/sshuttle/darwin.patch diff --git a/pkgs/tools/security/sshuttle/darwin.patch b/pkgs/tools/security/sshuttle/darwin.patch new file mode 100644 index 00000000000..ccd2ab04747 --- /dev/null +++ b/pkgs/tools/security/sshuttle/darwin.patch @@ -0,0 +1,588 @@ +diff --git a/sshuttle/tests/client/test_firewall.py b/sshuttle/tests/client/test_firewall.py +index 6201601..927ea61 100644 +--- a/sshuttle/tests/client/test_firewall.py ++++ b/sshuttle/tests/client/test_firewall.py +@@ -7,17 +7,17 @@ import sshuttle.firewall + + def setup_daemon(): + stdin = io.StringIO(u"""ROUTES +-2,24,0,1.2.3.0,8000,9000 +-2,32,1,1.2.3.66,8080,8080 +-10,64,0,2404:6800:4004:80c::,0,0 +-10,128,1,2404:6800:4004:80c::101f,80,80 ++{inet},24,0,1.2.3.0,8000,9000 ++{inet},32,1,1.2.3.66,8080,8080 ++{inet6},64,0,2404:6800:4004:80c::,0,0 ++{inet6},128,1,2404:6800:4004:80c::101f,80,80 + NSLIST +-2,1.2.3.33 +-10,2404:6800:4004:80c::33 ++{inet},1.2.3.33 ++{inet6},2404:6800:4004:80c::33 + PORTS 1024,1025,1026,1027 + GO 1 + HOST 1.2.3.3,existing +-""") ++""".format(inet=socket.AF_INET, inet6=socket.AF_INET6)) + stdout = Mock() + return stdin, stdout + +@@ -117,18 +117,18 @@ def test_main(mock_get_method, mock_setup_daemon, mock_rewrite_etc_hosts): + call('not_auto'), + call().setup_firewall( + 1024, 1026, +- [(10, u'2404:6800:4004:80c::33')], +- 10, +- [(10, 64, False, u'2404:6800:4004:80c::', 0, 0), +- (10, 128, True, u'2404:6800:4004:80c::101f', 80, 80)], ++ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], ++ socket.AF_INET6, ++ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 0, 0), ++ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 80, 80)], + True), + call().setup_firewall( + 1025, 1027, +- [(2, u'1.2.3.33')], +- 2, +- [(2, 24, False, u'1.2.3.0', 8000, 9000), +- (2, 32, True, u'1.2.3.66', 8080, 8080)], ++ [(socket.AF_INET, u'1.2.3.33')], ++ socket.AF_INET, ++ [(socket.AF_INET, 24, False, u'1.2.3.0', 8000, 9000), ++ (socket.AF_INET, 32, True, u'1.2.3.66', 8080, 8080)], + True), +- call().restore_firewall(1024, 10, True), +- call().restore_firewall(1025, 2, True), ++ call().restore_firewall(1024, socket.AF_INET6, True), ++ call().restore_firewall(1025, socket.AF_INET, True), + ] +diff --git a/sshuttle/tests/client/test_helpers.py b/sshuttle/tests/client/test_helpers.py +index 67c6682..527983b 100644 +--- a/sshuttle/tests/client/test_helpers.py ++++ b/sshuttle/tests/client/test_helpers.py +@@ -132,10 +132,10 @@ nameserver 2404:6800:4004:80c::4 + + ns = sshuttle.helpers.resolvconf_nameservers() + assert ns == [ +- (2, u'192.168.1.1'), (2, u'192.168.2.1'), +- (2, u'192.168.3.1'), (2, u'192.168.4.1'), +- (10, u'2404:6800:4004:80c::1'), (10, u'2404:6800:4004:80c::2'), +- (10, u'2404:6800:4004:80c::3'), (10, u'2404:6800:4004:80c::4') ++ (socket.AF_INET, u'192.168.1.1'), (socket.AF_INET, u'192.168.2.1'), ++ (socket.AF_INET, u'192.168.3.1'), (socket.AF_INET, u'192.168.4.1'), ++ (socket.AF_INET6, u'2404:6800:4004:80c::1'), (socket.AF_INET6, u'2404:6800:4004:80c::2'), ++ (socket.AF_INET6, u'2404:6800:4004:80c::3'), (socket.AF_INET6, u'2404:6800:4004:80c::4') + ] + + +@@ -155,10 +155,10 @@ nameserver 2404:6800:4004:80c::4 + """) + ns = sshuttle.helpers.resolvconf_random_nameserver() + assert ns in [ +- (2, u'192.168.1.1'), (2, u'192.168.2.1'), +- (2, u'192.168.3.1'), (2, u'192.168.4.1'), +- (10, u'2404:6800:4004:80c::1'), (10, u'2404:6800:4004:80c::2'), +- (10, u'2404:6800:4004:80c::3'), (10, u'2404:6800:4004:80c::4') ++ (socket.AF_INET, u'192.168.1.1'), (socket.AF_INET, u'192.168.2.1'), ++ (socket.AF_INET, u'192.168.3.1'), (socket.AF_INET, u'192.168.4.1'), ++ (socket.AF_INET6, u'2404:6800:4004:80c::1'), (socket.AF_INET6, u'2404:6800:4004:80c::2'), ++ (socket.AF_INET6, u'2404:6800:4004:80c::3'), (socket.AF_INET6, u'2404:6800:4004:80c::4') + ] + + +diff --git a/sshuttle/tests/client/test_methods_nat.py b/sshuttle/tests/client/test_methods_nat.py +index 4ae571b..91d7e45 100644 +--- a/sshuttle/tests/client/test_methods_nat.py ++++ b/sshuttle/tests/client/test_methods_nat.py +@@ -84,10 +84,10 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): + with pytest.raises(Exception) as excinfo: + method.setup_firewall( + 1024, 1026, +- [(10, u'2404:6800:4004:80c::33')], +- 10, +- [(10, 64, False, u'2404:6800:4004:80c::', 0, 0), +- (10, 128, True, u'2404:6800:4004:80c::101f', 80, 80)], ++ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], ++ socket.AF_INET6, ++ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 0, 0), ++ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 80, 80)], + True) + assert str(excinfo.value) \ + == 'Address family "AF_INET6" unsupported by nat method_name' +@@ -98,10 +98,10 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): + with pytest.raises(Exception) as excinfo: + method.setup_firewall( + 1025, 1027, +- [(2, u'1.2.3.33')], +- 2, +- [(2, 24, False, u'1.2.3.0', 8000, 9000), +- (2, 32, True, u'1.2.3.66', 8080, 8080)], ++ [(socket.AF_INET, u'1.2.3.33')], ++ socket.AF_INET, ++ [(socket.AF_INET, 24, False, u'1.2.3.0', 8000, 9000), ++ (socket.AF_INET, 32, True, u'1.2.3.66', 8080, 8080)], + True) + assert str(excinfo.value) == 'UDP not supported by nat method_name' + assert mock_ipt_chain_exists.mock_calls == [] +@@ -110,10 +110,10 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): + + method.setup_firewall( + 1025, 1027, +- [(2, u'1.2.3.33')], +- 2, +- [(2, 24, False, u'1.2.3.0', 8000, 9000), +- (2, 32, True, u'1.2.3.66', 8080, 8080)], ++ [(socket.AF_INET, u'1.2.3.33')], ++ socket.AF_INET, ++ [(socket.AF_INET, 24, False, u'1.2.3.0', 8000, 9000), ++ (socket.AF_INET, 32, True, u'1.2.3.66', 8080, 8080)], + False) + assert mock_ipt_chain_exists.mock_calls == [ + call(2, 'nat', 'sshuttle-1025') +diff --git a/sshuttle/tests/client/test_methods_pf.py b/sshuttle/tests/client/test_methods_pf.py +index 5df57af..fef54e0 100644 +--- a/sshuttle/tests/client/test_methods_pf.py ++++ b/sshuttle/tests/client/test_methods_pf.py +@@ -180,10 +180,10 @@ def test_setup_firewall_darwin(mock_pf_get_dev, mock_ioctl, mock_pfctl): + + method.setup_firewall( + 1024, 1026, +- [(10, u'2404:6800:4004:80c::33')], +- 10, +- [(10, 64, False, u'2404:6800:4004:80c::', 8000, 9000), +- (10, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], ++ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], ++ socket.AF_INET6, ++ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 8000, 9000), ++ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], + False) + assert mock_ioctl.mock_calls == [ + call(mock_pf_get_dev(), 0xC4704433, ANY), +@@ -218,10 +218,10 @@ def test_setup_firewall_darwin(mock_pf_get_dev, mock_ioctl, mock_pfctl): + with pytest.raises(Exception) as excinfo: + method.setup_firewall( + 1025, 1027, +- [(2, u'1.2.3.33')], +- 2, +- [(2, 24, False, u'1.2.3.0', 0, 0), +- (2, 32, True, u'1.2.3.66', 80, 80)], ++ [(socket.AF_INET, u'1.2.3.33')], ++ socket.AF_INET, ++ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), ++ (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], + True) + assert str(excinfo.value) == 'UDP not supported by pf method_name' + assert mock_pf_get_dev.mock_calls == [] +@@ -230,9 +230,9 @@ def test_setup_firewall_darwin(mock_pf_get_dev, mock_ioctl, mock_pfctl): + + method.setup_firewall( + 1025, 1027, +- [(2, u'1.2.3.33')], +- 2, +- [(2, 24, False, u'1.2.3.0', 0, 0), (2, 32, True, u'1.2.3.66', 80, 80)], ++ [(socket.AF_INET, u'1.2.3.33')], ++ socket.AF_INET, ++ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], + False) + assert mock_ioctl.mock_calls == [ + call(mock_pf_get_dev(), 0xC4704433, ANY), +@@ -262,7 +262,7 @@ def test_setup_firewall_darwin(mock_pf_get_dev, mock_ioctl, mock_pfctl): + mock_ioctl.reset_mock() + mock_pfctl.reset_mock() + +- method.restore_firewall(1025, 2, False) ++ method.restore_firewall(1025, socket.AF_INET, False) + assert mock_ioctl.mock_calls == [] + assert mock_pfctl.mock_calls == [ + call('-a sshuttle-1025 -F all'), +@@ -286,10 +286,10 @@ def test_setup_firewall_freebsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): + + method.setup_firewall( + 1024, 1026, +- [(10, u'2404:6800:4004:80c::33')], +- 10, +- [(10, 64, False, u'2404:6800:4004:80c::', 8000, 9000), +- (10, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], ++ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], ++ socket.AF_INET6, ++ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 8000, 9000), ++ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], + False) + + assert mock_pfctl.mock_calls == [ +@@ -315,10 +315,10 @@ def test_setup_firewall_freebsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): + with pytest.raises(Exception) as excinfo: + method.setup_firewall( + 1025, 1027, +- [(2, u'1.2.3.33')], +- 2, +- [(2, 24, False, u'1.2.3.0', 0, 0), +- (2, 32, True, u'1.2.3.66', 80, 80)], ++ [(socket.AF_INET, u'1.2.3.33')], ++ socket.AF_INET, ++ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), ++ (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], + True) + assert str(excinfo.value) == 'UDP not supported by pf method_name' + assert mock_pf_get_dev.mock_calls == [] +@@ -327,9 +327,9 @@ def test_setup_firewall_freebsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): + + method.setup_firewall( + 1025, 1027, +- [(2, u'1.2.3.33')], +- 2, +- [(2, 24, False, u'1.2.3.0', 0, 0), (2, 32, True, u'1.2.3.66', 80, 80)], ++ [(socket.AF_INET, u'1.2.3.33')], ++ socket.AF_INET, ++ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], + False) + assert mock_ioctl.mock_calls == [ + call(mock_pf_get_dev(), 0xC4704433, ANY), +@@ -381,10 +381,10 @@ def test_setup_firewall_openbsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): + + method.setup_firewall( + 1024, 1026, +- [(10, u'2404:6800:4004:80c::33')], +- 10, +- [(10, 64, False, u'2404:6800:4004:80c::', 8000, 9000), +- (10, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], ++ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], ++ socket.AF_INET6, ++ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 8000, 9000), ++ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], + False) + + assert mock_ioctl.mock_calls == [ +@@ -416,10 +416,10 @@ def test_setup_firewall_openbsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): + with pytest.raises(Exception) as excinfo: + method.setup_firewall( + 1025, 1027, +- [(2, u'1.2.3.33')], +- 2, +- [(2, 24, False, u'1.2.3.0', 0, 0), +- (2, 32, True, u'1.2.3.66', 80, 80)], ++ [(socket.AF_INET, u'1.2.3.33')], ++ socket.AF_INET, ++ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), ++ (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], + True) + assert str(excinfo.value) == 'UDP not supported by pf method_name' + assert mock_pf_get_dev.mock_calls == [] +@@ -428,10 +428,10 @@ def test_setup_firewall_openbsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): + + method.setup_firewall( + 1025, 1027, +- [(2, u'1.2.3.33')], +- 2, +- [(2, 24, False, u'1.2.3.0', 0, 0), +- (2, 32, True, u'1.2.3.66', 80, 80)], ++ [(socket.AF_INET, u'1.2.3.33')], ++ socket.AF_INET, ++ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), ++ (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], + False) + assert mock_ioctl.mock_calls == [ + call(mock_pf_get_dev(), 0xcd48441a, ANY), +diff --git a/sshuttle/tests/client/test_methods_tproxy.py b/sshuttle/tests/client/test_methods_tproxy.py +index 268e60c..acc45fd 100644 +--- a/sshuttle/tests/client/test_methods_tproxy.py ++++ b/sshuttle/tests/client/test_methods_tproxy.py +@@ -1,3 +1,5 @@ ++import socket ++ + from mock import Mock, patch, call + + from sshuttle.methods import get_method +@@ -49,7 +51,7 @@ def test_send_udp(mock_socket): + assert sock.mock_calls == [] + assert mock_socket.mock_calls == [ + call(sock.family, 2), +- call().setsockopt(1, 2, 1), ++ call().setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1), + call().setsockopt(0, 19, 1), + call().bind('127.0.0.2'), + call().sendto("2222222", '127.0.0.1'), +@@ -100,71 +102,71 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): + + method.setup_firewall( + 1024, 1026, +- [(10, u'2404:6800:4004:80c::33')], +- 10, +- [(10, 64, False, u'2404:6800:4004:80c::', 8000, 9000), +- (10, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], ++ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], ++ socket.AF_INET6, ++ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 8000, 9000), ++ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], + True) + assert mock_ipt_chain_exists.mock_calls == [ +- call(10, 'mangle', 'sshuttle-m-1024'), +- call(10, 'mangle', 'sshuttle-t-1024'), +- call(10, 'mangle', 'sshuttle-d-1024') ++ call(socket.AF_INET6, 'mangle', 'sshuttle-m-1024'), ++ call(socket.AF_INET6, 'mangle', 'sshuttle-t-1024'), ++ call(socket.AF_INET6, 'mangle', 'sshuttle-d-1024') + ] + assert mock_ipt_ttl.mock_calls == [] + assert mock_ipt.mock_calls == [ +- call(10, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1024'), +- call(10, 'mangle', '-F', 'sshuttle-m-1024'), +- call(10, 'mangle', '-X', 'sshuttle-m-1024'), +- call(10, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1024'), +- call(10, 'mangle', '-F', 'sshuttle-t-1024'), +- call(10, 'mangle', '-X', 'sshuttle-t-1024'), +- call(10, 'mangle', '-F', 'sshuttle-d-1024'), +- call(10, 'mangle', '-X', 'sshuttle-d-1024'), +- call(10, 'mangle', '-N', 'sshuttle-m-1024'), +- call(10, 'mangle', '-F', 'sshuttle-m-1024'), +- call(10, 'mangle', '-N', 'sshuttle-d-1024'), +- call(10, 'mangle', '-F', 'sshuttle-d-1024'), +- call(10, 'mangle', '-N', 'sshuttle-t-1024'), +- call(10, 'mangle', '-F', 'sshuttle-t-1024'), +- call(10, 'mangle', '-I', 'OUTPUT', '1', '-j', 'sshuttle-m-1024'), +- call(10, 'mangle', '-I', 'PREROUTING', '1', '-j', 'sshuttle-t-1024'), +- call(10, 'mangle', '-A', 'sshuttle-d-1024', '-j', 'MARK', ++ call(socket.AF_INET6, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1024'), ++ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-m-1024'), ++ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-m-1024'), ++ call(socket.AF_INET6, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1024'), ++ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-t-1024'), ++ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-t-1024'), ++ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-d-1024'), ++ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-d-1024'), ++ call(socket.AF_INET6, 'mangle', '-N', 'sshuttle-m-1024'), ++ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-m-1024'), ++ call(socket.AF_INET6, 'mangle', '-N', 'sshuttle-d-1024'), ++ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-d-1024'), ++ call(socket.AF_INET6, 'mangle', '-N', 'sshuttle-t-1024'), ++ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-t-1024'), ++ call(socket.AF_INET6, 'mangle', '-I', 'OUTPUT', '1', '-j', 'sshuttle-m-1024'), ++ call(socket.AF_INET6, 'mangle', '-I', 'PREROUTING', '1', '-j', 'sshuttle-t-1024'), ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-d-1024', '-j', 'MARK', + '--set-mark', '1'), +- call(10, 'mangle', '-A', 'sshuttle-d-1024', '-j', 'ACCEPT'), +- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-m', 'socket', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-d-1024', '-j', 'ACCEPT'), ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-m', 'socket', + '-j', 'sshuttle-d-1024', '-m', 'tcp', '-p', 'tcp'), +- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-m', 'socket', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-m', 'socket', + '-j', 'sshuttle-d-1024', '-m', 'udp', '-p', 'udp'), +- call(10, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', + '--set-mark', '1', '--dest', u'2404:6800:4004:80c::33/32', + '-m', 'udp', '-p', 'udp', '--dport', '53'), +- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', + '--tproxy-mark', '0x1/0x1', + '--dest', u'2404:6800:4004:80c::33/32', + '-m', 'udp', '-p', 'udp', '--dport', '53', '--on-port', '1026'), +- call(10, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'RETURN', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'RETURN', + '--dest', u'2404:6800:4004:80c::101f/128', + '-m', 'tcp', '-p', 'tcp', '--dport', '8080:8080'), +- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'RETURN', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'RETURN', + '--dest', u'2404:6800:4004:80c::101f/128', + '-m', 'tcp', '-p', 'tcp', '--dport', '8080:8080'), +- call(10, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'RETURN', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'RETURN', + '--dest', u'2404:6800:4004:80c::101f/128', + '-m', 'udp', '-p', 'udp', '--dport', '8080:8080'), +- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'RETURN', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'RETURN', + '--dest', u'2404:6800:4004:80c::101f/128', + '-m', 'udp', '-p', 'udp', '--dport', '8080:8080'), +- call(10, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', + '--set-mark', '1', '--dest', u'2404:6800:4004:80c::/64', + '-m', 'tcp', '-p', 'tcp', '--dport', '8000:9000'), +- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', + '--tproxy-mark', '0x1/0x1', '--dest', u'2404:6800:4004:80c::/64', + '-m', 'tcp', '-p', 'tcp', '--dport', '8000:9000', + '--on-port', '1024'), +- call(10, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', + '--set-mark', '1', '--dest', u'2404:6800:4004:80c::/64', + '-m', 'udp', '-p', 'udp'), +- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', ++ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', + '--tproxy-mark', '0x1/0x1', '--dest', u'2404:6800:4004:80c::/64', + '-m', 'udp', '-p', 'udp', '--dport', '8000:9000', + '--on-port', '1024') +@@ -173,22 +175,22 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): + mock_ipt_ttl.reset_mock() + mock_ipt.reset_mock() + +- method.restore_firewall(1025, 10, True) ++ method.restore_firewall(1025, socket.AF_INET6, True) + assert mock_ipt_chain_exists.mock_calls == [ +- call(10, 'mangle', 'sshuttle-m-1025'), +- call(10, 'mangle', 'sshuttle-t-1025'), +- call(10, 'mangle', 'sshuttle-d-1025') ++ call(socket.AF_INET6, 'mangle', 'sshuttle-m-1025'), ++ call(socket.AF_INET6, 'mangle', 'sshuttle-t-1025'), ++ call(socket.AF_INET6, 'mangle', 'sshuttle-d-1025') + ] + assert mock_ipt_ttl.mock_calls == [] + assert mock_ipt.mock_calls == [ +- call(10, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), +- call(10, 'mangle', '-F', 'sshuttle-m-1025'), +- call(10, 'mangle', '-X', 'sshuttle-m-1025'), +- call(10, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), +- call(10, 'mangle', '-F', 'sshuttle-t-1025'), +- call(10, 'mangle', '-X', 'sshuttle-t-1025'), +- call(10, 'mangle', '-F', 'sshuttle-d-1025'), +- call(10, 'mangle', '-X', 'sshuttle-d-1025') ++ call(socket.AF_INET6, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), ++ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-m-1025'), ++ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-m-1025'), ++ call(socket.AF_INET6, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), ++ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-t-1025'), ++ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-t-1025'), ++ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-d-1025'), ++ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-d-1025') + ] + mock_ipt_chain_exists.reset_mock() + mock_ipt_ttl.reset_mock() +@@ -198,68 +200,68 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): + + method.setup_firewall( + 1025, 1027, +- [(2, u'1.2.3.33')], +- 2, +- [(2, 24, False, u'1.2.3.0', 0, 0), (2, 32, True, u'1.2.3.66', 80, 80)], ++ [(socket.AF_INET, u'1.2.3.33')], ++ socket.AF_INET, ++ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], + True) + assert mock_ipt_chain_exists.mock_calls == [ +- call(2, 'mangle', 'sshuttle-m-1025'), +- call(2, 'mangle', 'sshuttle-t-1025'), +- call(2, 'mangle', 'sshuttle-d-1025') ++ call(socket.AF_INET, 'mangle', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', 'sshuttle-d-1025') + ] + assert mock_ipt_ttl.mock_calls == [] + assert mock_ipt.mock_calls == [ +- call(2, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), +- call(2, 'mangle', '-F', 'sshuttle-m-1025'), +- call(2, 'mangle', '-X', 'sshuttle-m-1025'), +- call(2, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), +- call(2, 'mangle', '-F', 'sshuttle-t-1025'), +- call(2, 'mangle', '-X', 'sshuttle-t-1025'), +- call(2, 'mangle', '-F', 'sshuttle-d-1025'), +- call(2, 'mangle', '-X', 'sshuttle-d-1025'), +- call(2, 'mangle', '-N', 'sshuttle-m-1025'), +- call(2, 'mangle', '-F', 'sshuttle-m-1025'), +- call(2, 'mangle', '-N', 'sshuttle-d-1025'), +- call(2, 'mangle', '-F', 'sshuttle-d-1025'), +- call(2, 'mangle', '-N', 'sshuttle-t-1025'), +- call(2, 'mangle', '-F', 'sshuttle-t-1025'), +- call(2, 'mangle', '-I', 'OUTPUT', '1', '-j', 'sshuttle-m-1025'), +- call(2, 'mangle', '-I', 'PREROUTING', '1', '-j', 'sshuttle-t-1025'), +- call(2, 'mangle', '-A', 'sshuttle-d-1025', ++ call(socket.AF_INET, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-d-1025'), ++ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-d-1025'), ++ call(socket.AF_INET, 'mangle', '-N', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', '-N', 'sshuttle-d-1025'), ++ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-d-1025'), ++ call(socket.AF_INET, 'mangle', '-N', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', '-I', 'OUTPUT', '1', '-j', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', '-I', 'PREROUTING', '1', '-j', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-d-1025', + '-j', 'MARK', '--set-mark', '1'), +- call(2, 'mangle', '-A', 'sshuttle-d-1025', '-j', 'ACCEPT'), +- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-m', 'socket', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-d-1025', '-j', 'ACCEPT'), ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-m', 'socket', + '-j', 'sshuttle-d-1025', '-m', 'tcp', '-p', 'tcp'), +- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-m', 'socket', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-m', 'socket', + '-j', 'sshuttle-d-1025', '-m', 'udp', '-p', 'udp'), +- call(2, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', + '--set-mark', '1', '--dest', u'1.2.3.33/32', + '-m', 'udp', '-p', 'udp', '--dport', '53'), +- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', + '--tproxy-mark', '0x1/0x1', '--dest', u'1.2.3.33/32', + '-m', 'udp', '-p', 'udp', '--dport', '53', '--on-port', '1027'), +- call(2, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'RETURN', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'RETURN', + '--dest', u'1.2.3.66/32', '-m', 'tcp', '-p', 'tcp', + '--dport', '80:80'), +- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'RETURN', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'RETURN', + '--dest', u'1.2.3.66/32', '-m', 'tcp', '-p', 'tcp', + '--dport', '80:80'), +- call(2, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'RETURN', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'RETURN', + '--dest', u'1.2.3.66/32', '-m', 'udp', '-p', 'udp', + '--dport', '80:80'), +- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'RETURN', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'RETURN', + '--dest', u'1.2.3.66/32', '-m', 'udp', '-p', 'udp', + '--dport', '80:80'), +- call(2, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', + '--set-mark', '1', '--dest', u'1.2.3.0/24', + '-m', 'tcp', '-p', 'tcp'), +- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', + '--tproxy-mark', '0x1/0x1', '--dest', u'1.2.3.0/24', + '-m', 'tcp', '-p', 'tcp', '--on-port', '1025'), +- call(2, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', + '--set-mark', '1', '--dest', u'1.2.3.0/24', + '-m', 'udp', '-p', 'udp'), +- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', ++ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', + '--tproxy-mark', '0x1/0x1', '--dest', u'1.2.3.0/24', + '-m', 'udp', '-p', 'udp', '--on-port', '1025') + ] +@@ -267,22 +269,22 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): + mock_ipt_ttl.reset_mock() + mock_ipt.reset_mock() + +- method.restore_firewall(1025, 2, True) ++ method.restore_firewall(1025, socket.AF_INET, True) + assert mock_ipt_chain_exists.mock_calls == [ +- call(2, 'mangle', 'sshuttle-m-1025'), +- call(2, 'mangle', 'sshuttle-t-1025'), +- call(2, 'mangle', 'sshuttle-d-1025') ++ call(socket.AF_INET, 'mangle', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', 'sshuttle-d-1025') + ] + assert mock_ipt_ttl.mock_calls == [] + assert mock_ipt.mock_calls == [ +- call(2, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), +- call(2, 'mangle', '-F', 'sshuttle-m-1025'), +- call(2, 'mangle', '-X', 'sshuttle-m-1025'), +- call(2, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), +- call(2, 'mangle', '-F', 'sshuttle-t-1025'), +- call(2, 'mangle', '-X', 'sshuttle-t-1025'), +- call(2, 'mangle', '-F', 'sshuttle-d-1025'), +- call(2, 'mangle', '-X', 'sshuttle-d-1025') ++ call(socket.AF_INET, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-m-1025'), ++ call(socket.AF_INET, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-t-1025'), ++ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-d-1025'), ++ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-d-1025') + ] + mock_ipt_chain_exists.reset_mock() + mock_ipt_ttl.reset_mock() diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 2d663175ec9..dc8f5b25c41 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; }; - patches = [ ./sudo.patch ]; + patches = [ ./sudo.patch ./darwin.patch ]; nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ]; buildInputs = From 29dd3accf5542efed421fd43a0b6dfee7af1ec1f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 4 Sep 2017 00:20:06 +0200 Subject: [PATCH 0079/2806] gnome3.evolution-data-server: Re-add GNOME Online Accounts support In #26879, GNOME Online Accounts support was removed resulting in repeated authentication prompts for users relying on services like Google Calendar. This commit removes the build flag that disabled the support. --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 9d51dc969d3..e2472a40369 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libsecret nss nspr libical db ]; # uoa irrelevant for now - cmakeFlags = [ "-DENABLE_UOA=OFF" "-DENABLE_GOA=OFF" ] + cmakeFlags = [ "-DENABLE_UOA=OFF" ] ++ stdenv.lib.optionals valaSupport [ "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; From 0b1c73f4da6fcf88c544f3e15e56e282838df5ef Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 24 Sep 2017 22:49:22 -0400 Subject: [PATCH 0080/2806] mediawiki: 1.27.3 -> 1.29.1 --- .../modules/services/web-servers/apache-httpd/mediawiki.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index aa0fe4f1479..02695c1c43a 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -83,11 +83,11 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { - name= "mediawiki-1.27.3"; + name= "mediawiki-1.29.1"; src = pkgs.fetchurl { - url = "http://download.wikimedia.org/mediawiki/1.27/${name}.tar.gz"; - sha256 = "08x8mvc0y1gwq8rg0zm98wc6hc5j8imb6dcpx6s7392j5dc71m0i"; + url = "http://download.wikimedia.org/mediawiki/1.29/${name}.tar.gz"; + sha256 = "03mpazbxvb011s2nmlw5p6dc43yjgl5yrsilmj1imyykm57bwb3m"; }; skins = config.skins; From 5a9e28190cd69dc766c5b9c7308491ab030426a9 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 25 Sep 2017 05:01:16 +0200 Subject: [PATCH 0081/2806] xwinwrap: init at 4 --- lib/licenses.nix | 5 +++ pkgs/tools/X11/xwinwrap/default.nix | 54 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 61 insertions(+) create mode 100644 pkgs/tools/X11/xwinwrap/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index a790b576032..1bb153ce4c3 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -281,6 +281,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; }; + hpnd = spdx { + spdxId = "HPND"; + fullName = "Historic Permission Notice and Disclaimer"; + }; + # Intel's license, seems free iasl = { fullName = "iASL"; diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix new file mode 100644 index 00000000000..6ea24ad2c6a --- /dev/null +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchbzr, x11 }: + +let + version = "4"; +in +stdenv.mkDerivation { + name = "xwinwrap-${version}"; + + src = fetchbzr { + url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel; + rev = version; + sha256 = "1annhqc71jcgx5zvcy31c1c488ygx4q1ygrwyy2y0ww743smbchw"; + }; + + buildInputs = [ + x11 + ]; + + buildPhase = if stdenv.system == "x86_64-linux" then '' + make all64 + '' else if stdenv.system == "i686-linux" then '' + make all32 + '' else throw "xwinwrap is not supported on ${stdenv.system}"; + + installPhase = '' + mkdir -p $out/bin + mv */xwinwrap $out/bin + ''; + + meta = with stdenv.lib; { + description = "A utility that allows you to use an animated X window as the wallpaper"; + longDescription = '' + XWinWrap is a small utility written a loooong time ago that allowed you to + stick most of the apps to your desktop background. What this meant was you + could use an animated screensaver (like glmatrix, electric sheep, etc) or + even a movie, and use it as your wallpaper. But only one version of this + app was ever released, and it had a few problems, like: + + - Well, sticking didn’t work. So if you did a “minimize all” or “go to + desktop” kind of thing, your “wallpaper” got minimized as well. + + - The geometry option didn’t work, so you could not create, e.g., a small + matrix window surrounded by your original wallpaper. + + Seeing no-one picking it up, I decided to give it a bit of polish last + weekend by fixing the above problems and also add a few features. And here + it is, in its new avatar “Shantz XWinWrap”. + ''; + license = licenses.hpnd; + homepage = https://shantanugoel.com/2008/09/03/shantz-xwinwrap/; + maintainers = with maintainers; [ infinisil ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d406141c41d..ea8befd26ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5144,6 +5144,8 @@ with pkgs; xwinmosaic = callPackage ../tools/X11/xwinmosaic {}; + xwinwrap = callPackage ../tools/X11/xwinwrap {}; + yaft = callPackage ../applications/misc/yaft { }; yarn = callPackage ../development/tools/yarn { }; From ff4d7f0fd2122e0e8bffeb10bc32927c280a1fd9 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Mon, 25 Sep 2017 09:39:15 +0200 Subject: [PATCH 0082/2806] dockerTools.examples.nix: set NIX_PAGER=cat environment variable --- pkgs/build-support/docker/examples.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 1a8b9c7f8ed..498028fb088 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -107,11 +107,13 @@ rec { nix = buildImageWithNixDb { name = "nix"; contents = [ - # nix-store -qR uses the 'more' program which is not included in - # the pkgs.nix dependencies. We then have to manually get it - # from the 'eject' package:/ - pkgs.eject + # nix-store uses cat program to display results as specified by + # the image env variable NIX_PAGER. + pkgs.coreutils pkgs.nix ]; + config = { + Env = [ "NIX_PAGER=cat" ]; + }; }; } From de3d26165f15219dfd007798b2c8085ba4795c30 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Thu, 10 Aug 2017 09:46:29 +0200 Subject: [PATCH 0083/2806] FusionInventory: Init at 2.3.18 --- .../monitoring/fusion-inventory/default.nix | 67 ++++++++++++++ .../remove_software_test.patch | 25 ++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/perl-packages.nix | 90 +++++++++++++++++++ 4 files changed, 184 insertions(+) create mode 100644 pkgs/servers/monitoring/fusion-inventory/default.nix create mode 100644 pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix new file mode 100644 index 00000000000..8b3f902b00c --- /dev/null +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchurl, gnused, buildPerlPackage, perl, perlPackages +}: + +buildPerlPackage rec { + version = "2.3.18"; + name = "FusionInventory-Agent-${version}"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GROUSSE/${name}.tar.gz"; + sha256 = "543d96fa61b8f2a2bc599fe9f694f19d1f2094dc5506bc514d00b8a445bc5401"; + }; + + patches = [ ./remove_software_test.patch ]; + + postPatch = '' + patchShebangs bin + ''; + + buildTools = []; + buildInputs = with perlPackages; [ + CGI + DataStructureUtil + FileCopyRecursive + HTTPProxy + HTTPServerSimple + HTTPServerSimpleAuthen + IOCapture + IOSocketSSL + IPCRun + JSON + LWPProtocolhttps + NetSNMP + TestCompile + TestDeep + TestException + TestMockModule + TestMockObject + TestNoWarnings + ]; + propagatedBuildInputs = with perlPackages; [ + FileWhich + LWP + NetIP + TextTemplate + UNIVERSALrequire + XMLTreePP + ]; + + installPhase = '' + mkdir -p $out + + cp -r bin $out + cp -r lib $out + + for cur in $out/bin/*; do + sed -e "s|./lib|$out/lib|" -i "$cur" + done + ''; + + outputs = [ "out" ]; + + meta = with stdenv.lib; { + homepage = http://www.fusioninventory.org; + description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.phile314 ]; + }; +} diff --git a/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch b/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch new file mode 100644 index 00000000000..ba6fd54eb18 --- /dev/null +++ b/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch @@ -0,0 +1,25 @@ +diff --git a/t/apps/agent.t b/t/apps/agent.t +index c0f6fc52f..c83837d70 100755 +--- a/t/apps/agent.t ++++ b/t/apps/agent.t +@@ -12,7 +12,7 @@ use XML::TreePP; + use FusionInventory::Agent::Tools; + use FusionInventory::Test::Utils; + +-plan tests => 34; ++plan tests => 33; + + my ($content, $out, $err, $rc); + +@@ -72,11 +72,6 @@ subtest "first inventory execution and content" => sub { + }; + + ok( +- exists $content->{REQUEST}->{CONTENT}->{SOFTWARES}, +- 'inventory has software' +-); +- +-ok( + exists $content->{REQUEST}->{CONTENT}->{ENVS}, + 'inventory has environment variables' + ); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d406141c41d..42d29de1d76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11369,6 +11369,8 @@ with pkgs; openssl = openssl_1_0_2; }; + fusionInventory = callPackage ../servers/monitoring/fusion-inventory { }; + gatling = callPackage ../servers/http/gatling { }; glabels = callPackage ../applications/graphics/glabels { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed78f67739e..91cd9fc0575 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -549,6 +549,19 @@ let self = _self // overrides; _self = with self; { }; }; + AuthenSimple = buildPerlPackage rec { + name = "Authen-Simple-0.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/${name}.tar.gz"; + sha256 = "02cddab47f8bf1a1cbd4c9bf8d258f6d05111499c33f8315e7244812f72613aa"; + }; + propagatedBuildInputs = [ ClassAccessor ClassDataInheritable CryptPasswdMD5 ParamsValidate ]; + meta = { + description = "Simple Authentication"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + autobox = buildPerlPackage rec { name = "autobox-2.84"; src = fetchurl { @@ -3177,6 +3190,19 @@ let self = _self // overrides; _self = with self; { }; }; + DataStructureUtil = buildPerlPackage rec { + name = "Data-Structure-Util-0.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; + sha256 = "9cd42a13e65cb15f3a76296eb9a134da220168ec747c568d331a50ae7a2ddbc6"; + }; + buildInputs = [ TestPod ]; + meta = { + description = "Change nature of data within a structure"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DataTaxi = buildPerlPackage { name = "Data-Taxi-0.96"; propagatedBuildInputs = [DebugShowStuff]; @@ -6824,6 +6850,20 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestMore ]; }; + HTTPProxy = buildPerlPackage rec { + name = "HTTP-Proxy-0.304"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + sha256 = "b05290534ec73625c21a0565fc35170890dab163843d95331c292c23f504c69d"; + }; + buildInputs = [ HTMLParser ]; + propagatedBuildInputs = [ HTTPDaemon HTTPDate HTTPMessage LWP ]; + meta = { + description = "A pure Perl HTTP proxy"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTTPRequestAsCGI = buildPerlPackage rec { name = "HTTP-Request-AsCGI-1.2"; src = fetchurl { @@ -6857,6 +6897,18 @@ let self = _self // overrides; _self = with self; { }; }; + HTTPServerSimpleAuthen = buildPerlPackage rec { + name = "HTTP-Server-Simple-Authen-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + sha256 = "2dddc8ab9dc8986980151e4ba836a6bbf091f45cf195be1768ebdb4a993ed59b"; + }; + propagatedBuildInputs = [ AuthenSimple HTTPServerSimple ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTTPServerSimpleMason = buildPerlPackage { name = "HTTP-Server-Simple-Mason-0.14"; src = fetchurl { @@ -6995,6 +7047,17 @@ let self = _self // overrides; _self = with self; { }; }; + IOCapture = buildPerlPackage rec { + name = "IO-Capture-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RE/REYNOLDS/${name}.tar.gz"; + sha256 = "c2c15a254ca74fb8c57d25d7b6cbcaff77a3b4fb5695423f1f80bb423abffea9"; + }; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IOCaptureOutput = buildPerlPackage rec { name = "IO-CaptureOutput-1.1104"; src = fetchurl { @@ -13314,6 +13377,20 @@ let self = _self // overrides; _self = with self; { }; }; + TestCompile = buildPerlPackage rec { + name = "Test-Compile-v1.3.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EG/EGILES/${name}.tar.gz"; + sha256 = "77527e9477ac5260443c756367a7f7bc3d8f6c6ebbc561b0b2fb3f79303bad33"; + }; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ UNIVERSALrequire ]; + meta = { + description = "Check whether Perl files compile correctly"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestCPANMeta = buildPerlPackage { name = "Test-CPAN-Meta-0.23"; src = fetchurl { @@ -15852,6 +15929,19 @@ let self = _self // overrides; _self = with self; { }; }; + XMLTreePP = buildPerlPackage rec { + name = "XML-TreePP-0.43"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAWASAKI/${name}.tar.gz"; + sha256 = "7fbe2d6430860059894aeeebf75d4cacf1bf8d7b75294eb87d8e1502f81bd760"; + }; + propagatedBuildInputs = [ LWP ]; + meta = { + description = "Pure Perl implementation for parsing/writing XML documents"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLTwig = buildPerlPackage rec { name = "XML-Twig-3.49"; src = fetchurl { From 6b788e36dff4cdcb31c2e9ed526797e8fd1f0799 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Thu, 10 Aug 2017 13:13:35 +0200 Subject: [PATCH 0084/2806] FusionInventory: Add NixOS module. --- nixos/modules/module-list.nix | 1 + .../services/monitoring/fusion-inventory.nix | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 nixos/modules/services/monitoring/fusion-inventory.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d6684ad9511..c5fc71bcb01 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -355,6 +355,7 @@ ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix ./services/monitoring/dd-agent/dd-agent.nix + ./services/monitoring/fusion-inventory.nix ./services/monitoring/grafana.nix ./services/monitoring/graphite.nix ./services/monitoring/hdaps.nix diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix new file mode 100644 index 00000000000..fdd27938ea7 --- /dev/null +++ b/nixos/modules/services/monitoring/fusion-inventory.nix @@ -0,0 +1,71 @@ +# Fusion Inventory daemon. +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.fusionInventory; + + configFile = pkgs.writeText "fusion_inventory.conf" '' + server = ${concatStringsSep ", " cfg.servers} + + logger = stderr + + ${cfg.extraConfig} + ''; + +in { + + ###### interface + + options = { + + services.fusionInventory = { + + enable = mkOption { + default = false; + description = '' + Whether to run the Fusion Inventory agent on this machine. + ''; + }; + + servers = mkOption { + type = types.listOf types.string; + description = '' + The urls of the OCS/GLPI servers to connect to. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Configuration that is injected verbatim into the configuration file. + ''; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = "fusion-inventory"; + description = "FusionInventory user"; + }; + + systemd.services."fusion-inventory" = { + description = "Fusion Inventory Agent"; + wantedBy = [ "multi-user.target" ]; + + environment = { + OPTIONS = "--no-category=software"; + }; + serviceConfig = { + ExecStart = "${pkgs.fusionInventory}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork"; + }; + }; + }; +} From 1a23ff8a13e4f833d3d9eea2837394e712736149 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Fri, 25 Aug 2017 08:57:42 +0200 Subject: [PATCH 0085/2806] FusionInventory: Code cleanup --- nixos/modules/services/monitoring/fusion-inventory.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix index fdd27938ea7..1c00f3c299e 100644 --- a/nixos/modules/services/monitoring/fusion-inventory.nix +++ b/nixos/modules/services/monitoring/fusion-inventory.nix @@ -22,15 +22,10 @@ in { services.fusionInventory = { - enable = mkOption { - default = false; - description = '' - Whether to run the Fusion Inventory agent on this machine. - ''; - }; + enable = mkEnableOption "Fusion Inventory Agent"; servers = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; description = '' The urls of the OCS/GLPI servers to connect to. ''; From 2490dea9d0cb25979f738f5abaf02cfb9008c670 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Fri, 25 Aug 2017 13:59:51 +0200 Subject: [PATCH 0086/2806] FusionInventory: Disable tests requiring network access. --- .../remove_software_test.patch | 33 +++++++++++++++++-- pkgs/top-level/perl-packages.nix | 2 ++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch b/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch index ba6fd54eb18..5449f4d3740 100644 --- a/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch +++ b/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch @@ -1,5 +1,34 @@ +diff --git a/t/agent/snmp/live.t b/t/agent/snmp/live.t +index 8ee7ff02c..bd5551ab3 100755 +--- a/t/agent/snmp/live.t ++++ b/t/agent/snmp/live.t +@@ -11,7 +11,7 @@ use Test::More; + use FusionInventory::Agent::XML::Response; + use FusionInventory::Agent::SNMP::Live; + +-plan tests => 12; ++plan tests => 11; + + my $snmp; + throws_ok { +@@ -52,15 +52,6 @@ throws_ok { + } qr/^Unable to resolve the UDP\/IPv4 address "none"/, + 'instanciation: unresolvable host'; + +-throws_ok { +- $snmp = FusionInventory::Agent::SNMP::Live->new( +- version => 1, +- community => 'public', +- hostname => '1.1.1.1' +- ); +-} qr/no response from host 1.1.1.1/, +-'instanciation: unresponding host'; +- + SKIP: { + skip 'live SNMP test disabled', 6 unless $ENV{TEST_LIVE_SNMP}; + diff --git a/t/apps/agent.t b/t/apps/agent.t -index c0f6fc52f..c83837d70 100755 +index f417b4106..12207f192 100755 --- a/t/apps/agent.t +++ b/t/apps/agent.t @@ -12,7 +12,7 @@ use XML::TreePP; @@ -11,7 +40,7 @@ index c0f6fc52f..c83837d70 100755 my ($content, $out, $err, $rc); -@@ -72,11 +72,6 @@ subtest "first inventory execution and content" => sub { +@@ -73,11 +73,6 @@ subtest "first inventory execution and content" => sub { }; ok( diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 91cd9fc0575..4ee98ad2dd4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6862,6 +6862,8 @@ let self = _self // overrides; _self = with self; { description = "A pure Perl HTTP proxy"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + # tests fail because they require network access + doCheck = false; }; HTTPRequestAsCGI = buildPerlPackage rec { From 00bc46b72271c26d4af8df98c653335d38a18b6d Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Sun, 27 Aug 2017 11:51:02 +0200 Subject: [PATCH 0087/2806] FusionInventory: Remove unused parameters --- pkgs/servers/monitoring/fusion-inventory/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 8b3f902b00c..2e694ede497 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnused, buildPerlPackage, perl, perlPackages +{ stdenv, fetchurl, buildPerlPackage, perlPackages }: buildPerlPackage rec { From 5835b1a156d5df993404205a9a4e56792da6c009 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sun, 24 Sep 2017 22:49:44 +0200 Subject: [PATCH 0088/2806] ponyc: 0.19.1 -> 0.19.2 https://github.com/ponylang/ponyc/issues/2248 --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 69a8243b666..19ebd522a4f 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1zd051syn0n6ign4nnxb40xj2s5vqp0s349nkjqv7051xzvlzf1p"; + sha256 = "04vbhkkgpjh19pv2bq4b60lgnk5ck8axqs6fgw4l44j3lvxwlwrh"; }; buildInputs = [ llvm makeWrapper which ]; From cd501e33bab4979d7e46c0eb8d5ab3adfcb64bee Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Sat, 23 Sep 2017 17:02:58 +0100 Subject: [PATCH 0089/2806] gcj: use from gcc6 --- 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 f9074468095..a39d24ae9f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5602,8 +5602,8 @@ with pkgs; profiledCompiler = false; }); - gcj = gcj49; - gcj49 = wrapCC (gcc49.cc.override { + gcj = gcj6; + gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; langJava = true; langFortran = false; From 4429559aa15e59731462a91784d7c66b345d219e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 25 Sep 2017 14:00:48 +0200 Subject: [PATCH 0090/2806] mg: 20161005 -> 20170828 --- pkgs/applications/editors/mg/default.nix | 27 +++++++++++------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index b8bfd40c079..f4bdee830e1 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,33 +1,30 @@ -{ fetchurl, stdenv, ncurses, pkgconfig, libbsd }: +{ stdenv, fetchurl, pkgconfig, libbsd, ncurses }: + stdenv.mkDerivation rec { name = "mg-${version}"; - version = "20161005"; + version = "20170828"; src = fetchurl { url = "http://homepage.boetes.org/software/mg/${name}.tar.gz"; - sha256 = "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p"; + sha256 = "139nc58l5ifj3d3478nhqls0lic52skmxfxggznzxaz9camqd20z"; }; - NIX_CFLAGS_COMPILE = "-Wno-error"; - - preConfigure = '' - substituteInPlace GNUmakefile \ - --replace /usr/bin/pkg-config ${pkgconfig}/bin/pkg-config - ''; + enableParallelBuilding = true; + + makeFlags = [ "PKG_CONFIG=${pkgconfig}/bin/pkg-config" ]; installPhase = '' - mkdir -p $out/bin - cp mg $out/bin - mkdir -p $out/share/man/man1 - cp mg.1 $out/share/man/man1 + install -m 555 -Dt $out/bin mg + install -m 444 -Dt $out/share/man/man1 mg.1 ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses libbsd ]; + + buildInputs = [ libbsd ncurses ]; meta = with stdenv.lib; { - homepage = http://homepage.boetes.org/software/mg/; description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; + homepage = "https://homepage.boetes.org/software/mg"; license = licenses.publicDomain; platforms = platforms.all; }; From 3a670daa9882de4c7a95f81a36e988c5771c1724 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Sep 2017 15:55:02 +0200 Subject: [PATCH 0091/2806] nixos/network-interfaces: IPs must always be set Previously, depending on the environment and the type of interface that was created, the configured IPs of an interface wouldn't be applied on a nixos-rebuild switch. It works after a reboot. This patch ensures that the network-addresses service is started either via the network-link service or if the networking target is activated (i.e. on system activation). Fixes #28474 #16230. --- nixos/modules/tasks/network-interfaces-scripted.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 7ede8752bcc..26fba1d5adb 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -152,7 +152,11 @@ let in nameValuePair "network-addresses-${i.name}" { description = "Address configuration of ${i.name}"; - wantedBy = [ "network-setup.service" ]; + wantedBy = [ + "network-setup.service" + "network-link-${i.name}.service" + "network.target" + ]; # propagate stop and reload from network-setup partOf = [ "network-setup.service" ]; # order before network-setup because the routes that are configured From 13a110e69655d78930999ecb6b0a03a8991ab302 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Sep 2017 16:01:07 +0200 Subject: [PATCH 0092/2806] nixos/network-interfaces: cannot delay device units Systemd is complaining that it can't delay the startup of device units. We have a before dependency on the respective device unit for every netdev service, which doesn't make any sense because we create the actual interface in this service. --- nixos/modules/tasks/network-interfaces-scripted.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 26fba1d5adb..b432ef38d41 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -210,7 +210,7 @@ let after = [ "dev-net-tun.device" "network-pre.target" ]; wantedBy = [ "network-setup.service" (subsystemDevice i.name) ]; partOf = [ "network-setup.service" ]; - before = [ "network-setup.service" (subsystemDevice i.name) ]; + before = [ "network-setup.service" ]; path = [ pkgs.iproute ]; serviceConfig = { Type = "oneshot"; @@ -236,7 +236,7 @@ let partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service"; after = [ "network-pre.target" ] ++ deps ++ optional v.rstp "mstpd.service" ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces; - before = [ "network-setup.service" (subsystemDevice n) ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; @@ -335,7 +335,7 @@ let partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces; - before = [ "network-setup.service" (subsystemDevice n) ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute pkgs.gawk ]; @@ -373,7 +373,7 @@ let bindsTo = deps; partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" (subsystemDevice n) ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; @@ -398,7 +398,7 @@ let bindsTo = deps; partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" (subsystemDevice n) ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; @@ -426,7 +426,7 @@ let bindsTo = deps; partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" (subsystemDevice n) ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; From 263185aa6860f5a420171d02bfa05d7ba716fc32 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 24 Sep 2017 16:54:48 +0200 Subject: [PATCH 0093/2806] nixos/network-interfaces: ensure slave interfaces are up Fixes #28620. --- nixos/modules/tasks/network-interfaces-scripted.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index b432ef38d41..3512296dff4 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -9,6 +9,12 @@ let interfaces = attrValues cfg.interfaces; hasVirtuals = any (i: i.virtual) interfaces; + slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds) + ++ concatMap (i: i.interfaces) (attrValues cfg.bridges) + ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches) + ++ concatMap (i: [i.interface]) (attrValues cfg.macvlans) + ++ concatMap (i: [i.interface]) (attrValues cfg.vlans); + # We must escape interfaces due to the systemd interpretation subsystemDevice = interface: "sys-subsystem-net-devices-${escapeSystemdPath interface}.device"; @@ -469,5 +475,8 @@ in config = mkMerge [ bondWarnings (mkIf (!cfg.useNetworkd) normalConfig) + { # Ensure slave interfaces are brought up + networking.interfaces = genAttrs slaves (i: {}); + } ]; } From 9d9a28f0144a70651aa402c8caafc594471e4eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 25 Sep 2017 14:00:47 +0100 Subject: [PATCH 0094/2806] docs/python: more infos regarding failing tests --- doc/languages-frameworks/python.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 298da8f9f0d..7bdbbbd903a 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -785,7 +785,20 @@ example of such a situation is when `py.test` is used. #### Common issues -- Non-working tests can often be deselected. In the case of `py.test`: `py.test -k 'not function_name and not other_function'`. +- Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`. + Most python modules follows the standard test protocol where the pytest runner can be used instead. + `py.test` supports a `-k` parameter to ignore test methods or classes: + + ```nix + buildPythonPackage { + # ... + # assumes the tests are located in tests + checkInputs = [ pytest ]; + checkPhase = '' + py.test -k 'not function_name and not other_function' tests + ''; + } + ``` - Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`. - Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)` From b13a6d5720ba1de73d26f974f8bd3c927978b8d2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 25 Sep 2017 09:24:23 -0400 Subject: [PATCH 0095/2806] linux: 4.14-rc1 -> 4.14-rc2 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index e97d5c47da2..7d67bc2ff60 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc1"; - modDirVersion = "4.14.0-rc1"; + version = "4.14-rc2"; + modDirVersion = "4.14.0-rc2"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0dhcsjgcy28pyyzwf2s0862p92bwb324kapli2y9n90bw0kl53gi"; + sha256 = "0ahcmr0y9i47lwjn140w436hg68apnh8rl66y56qdvdic8f61mj4"; }; # Should the testing kernels ever be built on Hydra? From 23ef8261396c9b27b72461f32532a7f72e25588d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 25 Sep 2017 21:29:10 +0800 Subject: [PATCH 0096/2806] pywbem: hash keeps changing - why? Embed the patch --- .../python-modules/pywbem/default.nix | 7 +- .../make_cimdatetime_timezone_aware.patch | 491 ++++++++++++++++++ 2 files changed, 493 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index fed159380b8..8e10fbb2258 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -15,12 +15,9 @@ buildPythonPackage rec { }; patches = [ - # fix timezone handling so the tests pass again. Can go when 0.11.0 is released + # fix timezone handling so the tests pass again. Can go when 0.10.1 is released # https://github.com/pywbem/pywbem/issues/755#issuecomment-327508681 - (fetchpatch { - url = "https://github.com/pywbem/pywbem/commit/bb7fa19d636d999bf844d80939e155b8f212ef3e.patch"; - sha256 = "1zd5f9qrb8rnaahmazkjnf3hqsc4f7n63z44k0wcwhz7fskpqza0"; - }) + ./make_cimdatetime_timezone_aware.patch ]; propagatedBuildInputs = [ m2crypto ply pyyaml six ]; diff --git a/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch b/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch new file mode 100644 index 00000000000..55fb9bbb12d --- /dev/null +++ b/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch @@ -0,0 +1,491 @@ +From bb7fa19d636d999bf844d80939e155b8f212ef3e Mon Sep 17 00:00:00 2001 +From: Andreas Maier +Date: Fri, 23 Jun 2017 19:13:51 +0200 +Subject: [PATCH] Made CIMDateTime always timezone-aware, re-enabled + test_cim_types.py + +Details: +- Ensured that 'CIMDateTime' objects for point in time values are + timezone-aware when supplied with a timezone-naive 'datetime' + object. This does not change the behavior, but increases code + clarity. +- Clarified that in the documentation of 'CIMDateTime'. +- Added testcases for CIMDateTime. +- Re-enabled the testing of test_cim_types.py. Since its change + to using pytest it was not run because the test methods were + all static methods which apparently does not work. Not sure + this ever worked. + +Signed-off-by: Andreas Maier +--- + docs/changes.rst | 5 + + pywbem/cim_types.py | 22 +-- + testsuite/test_cim_types.py | 369 +++++++++++++++++++++++--------------------- + 3 files changed, 207 insertions(+), 189 deletions(-) + +diff --git a/docs/changes.rst b/docs/changes.rst +index 272ed30d..6fdfbcf4 100644 +--- a/docs/changes.rst ++++ b/docs/changes.rst +@@ -72,6 +72,11 @@ Enhancements + + * Added unit test for recorder. See issue #676 + ++* Ensured that `CIMDateTime` objects for point in time values are ++ timezone-aware when supplied with a timezone-naive `datetime` object. ++ This does not change the behavior, but increases code clarity. ++ Clarified that in the documentation of `CIMDateTime`. See issue #698. ++ + Bug fixes + ^^^^^^^^^ + +diff --git a/pywbem/cim_types.py b/pywbem/cim_types.py +index 6d1f140c..5ecc7707 100644 +--- a/pywbem/cim_types.py ++++ b/pywbem/cim_types.py +@@ -74,6 +74,7 @@ + import re + import warnings + import six ++import copy + + from . import config + +@@ -294,9 +295,11 @@ def __init__(self, dtarg): + * A :term:`string` object will be + interpreted as CIM datetime format (see :term:`DSP0004`) and + will result in a point in time or a time interval. +- * A :class:`py:datetime.datetime` object must be timezone-aware +- (see :class:`~pywbem.MinutesFromUTC`) and will result in a point +- in time. ++ * A :class:`py:datetime.datetime` object will result in a point ++ in time. If the :class:`py:datetime.datetime` object is ++ timezone-aware (see :class:`~pywbem.MinutesFromUTC`), the ++ specified timezone will be used. Otherwise, a default timezone ++ of UTC will be assumed. + * A :class:`py:datetime.timedelta` object will result in a time + interval. + * Another :class:`~pywbem.CIMDateTime` object will be copied. +@@ -342,14 +345,15 @@ def __init__(self, dtarg): + raise ValueError('dtarg argument "%s" has an invalid CIM ' + 'datetime format' % dtarg) + elif isinstance(dtarg, datetime): +- self.__datetime = dtarg ++ if dtarg.tzinfo is None: ++ self.__datetime = dtarg.replace(tzinfo=MinutesFromUTC(0)) ++ else: ++ self.__datetime = copy.copy(dtarg) + elif isinstance(dtarg, timedelta): +- self.__timedelta = dtarg ++ self.__timedelta = copy.copy(dtarg) + elif isinstance(dtarg, CIMDateTime): +- # pylint: disable=protected-access +- self.__datetime = dtarg.__datetime +- # pylint: disable=protected-access +- self.__timedelta = dtarg.__timedelta ++ self.__datetime = copy.copy(dtarg.datetime) ++ self.__timedelta = copy.copy(dtarg.timedelta) + else: + raise TypeError('dtarg argument "%s" has an invalid type: %s ' + '(expected datetime, timedelta, string, or ' +diff --git a/testsuite/test_cim_types.py b/testsuite/test_cim_types.py +index 4ae354d3..b1f54d06 100755 +--- a/testsuite/test_cim_types.py ++++ b/testsuite/test_cim_types.py +@@ -43,105 +43,99 @@ def integer_tuple(request): + return request.param + + +-class TestIntegers: +- """ +- Test CIM integer data type classes. +- """ +- +- @staticmethod +- def test_class_attrs_class(integer_tuple): +- """Test class attrs via class level""" +- obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple +- assert obj_type.cimtype == exp_cimtype +- assert obj_type.minvalue == exp_minvalue +- assert obj_type.maxvalue == exp_maxvalue +- +- @staticmethod +- def test_class_attrs_inst(integer_tuple): +- """Test class attrs via instance level""" +- obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple +- obj = obj_type(42) +- assert obj.cimtype == exp_cimtype +- assert obj.minvalue == exp_minvalue +- assert obj.maxvalue == exp_maxvalue +- +- @staticmethod +- def test_inheritance(integer_tuple): +- """Test inheritance""" +- obj_type = integer_tuple[0] +- obj = obj_type(42) +- assert isinstance(obj, obj_type) +- assert isinstance(obj, CIMType) +- assert isinstance(obj, CIMInt) +- assert not isinstance(obj, CIMFloat) +- +- @staticmethod +- def test_init_int(integer_tuple): +- """Test initialization from integer value""" +- obj_type = integer_tuple[0] +- obj = obj_type(42) +- assert obj == 42 +- +- @staticmethod +- def test_init_str(integer_tuple): +- """Test initialization from string value""" +- obj_type = integer_tuple[0] +- obj = obj_type('42') +- assert obj == 42 +- +- @staticmethod +- def test_init_str_base10(integer_tuple): +- """Test initialization from string value with base 10""" +- obj_type = integer_tuple[0] +- obj = obj_type('42', 10) +- assert obj == 42 +- +- @staticmethod +- def test_init_str_base16(integer_tuple): +- """Test initialization from string value with base 16""" +- obj_type = integer_tuple[0] +- obj = obj_type('2A', 16) +- assert obj == 42 +- +- @staticmethod +- def test_init_minimum(integer_tuple): +- """Test initialization from integer value at minimum""" +- obj_type = integer_tuple[0] +- exp_minvalue = integer_tuple[2] +- obj = obj_type(exp_minvalue) +- assert obj == exp_minvalue +- +- @staticmethod +- def test_init_maximum(integer_tuple): +- """Test initialization from integer value at maximum""" +- obj_type = integer_tuple[0] +- exp_maxvalue = integer_tuple[3] +- obj = obj_type(exp_maxvalue) +- assert obj == exp_maxvalue +- +- @staticmethod +- def test_init_too_low(integer_tuple): +- """Test initialization from integer value below minimum""" +- obj_type = integer_tuple[0] +- exp_minvalue = integer_tuple[2] +- try: +- obj_type(exp_minvalue - 1) +- except ValueError: +- pass +- else: +- raise AssertionError("ValueError was not raised.") +- +- @staticmethod +- def test_init_too_high(integer_tuple): +- """Test initialization from integer value above maximum""" +- obj_type = integer_tuple[0] +- exp_maxvalue = integer_tuple[3] +- try: +- obj_type(exp_maxvalue + 1) +- except ValueError: +- pass +- else: +- raise AssertionError("ValueError was not raised.") ++def test_integer_class_attrs_class(integer_tuple): ++ """Test class attrs via class level""" ++ obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple ++ assert obj_type.cimtype == exp_cimtype ++ assert obj_type.minvalue == exp_minvalue ++ assert obj_type.maxvalue == exp_maxvalue ++ ++ ++def test_integer_class_attrs_inst(integer_tuple): ++ """Test class attrs via instance level""" ++ obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple ++ obj = obj_type(42) ++ assert obj.cimtype == exp_cimtype ++ assert obj.minvalue == exp_minvalue ++ assert obj.maxvalue == exp_maxvalue ++ ++ ++def test_integer_inheritance(integer_tuple): ++ """Test inheritance""" ++ obj_type = integer_tuple[0] ++ obj = obj_type(42) ++ assert isinstance(obj, obj_type) ++ assert isinstance(obj, CIMType) ++ assert isinstance(obj, CIMInt) ++ assert not isinstance(obj, CIMFloat) ++ ++ ++def test_integer_init_int(integer_tuple): ++ """Test initialization from integer value""" ++ obj_type = integer_tuple[0] ++ obj = obj_type(42) ++ assert obj == 42 ++ ++ ++def test_integer_init_str(integer_tuple): ++ """Test initialization from string value""" ++ obj_type = integer_tuple[0] ++ obj = obj_type('42') ++ assert obj == 42 ++ ++ ++def test_integer_init_str_base10(integer_tuple): ++ """Test initialization from string value with base 10""" ++ obj_type = integer_tuple[0] ++ obj = obj_type('42', 10) ++ assert obj == 42 ++ ++ ++def test_integer_init_str_base16(integer_tuple): ++ """Test initialization from string value with base 16""" ++ obj_type = integer_tuple[0] ++ obj = obj_type('2A', 16) ++ assert obj == 42 ++ ++ ++def test_integer_init_minimum(integer_tuple): ++ """Test initialization from integer value at minimum""" ++ obj_type = integer_tuple[0] ++ exp_minvalue = integer_tuple[2] ++ obj = obj_type(exp_minvalue) ++ assert obj == exp_minvalue ++ ++ ++def test_integer_init_maximum(integer_tuple): ++ """Test initialization from integer value at maximum""" ++ obj_type = integer_tuple[0] ++ exp_maxvalue = integer_tuple[3] ++ obj = obj_type(exp_maxvalue) ++ assert obj == exp_maxvalue ++ ++ ++def test_integer_init_too_low(integer_tuple): ++ """Test initialization from integer value below minimum""" ++ obj_type = integer_tuple[0] ++ exp_minvalue = integer_tuple[2] ++ try: ++ obj_type(exp_minvalue - 1) ++ except ValueError: ++ pass ++ else: ++ raise AssertionError("ValueError was not raised.") ++ ++ ++def test_integer_init_too_high(integer_tuple): ++ """Test initialization from integer value above maximum""" ++ obj_type = integer_tuple[0] ++ exp_maxvalue = integer_tuple[3] ++ try: ++ obj_type(exp_maxvalue + 1) ++ except ValueError: ++ pass ++ else: ++ raise AssertionError("ValueError was not raised.") + + + # +@@ -164,47 +158,41 @@ def real_tuple(request): + return request.param + + +-class TestReals: +- """ +- Test CIM real data type classes. +- """ +- +- @staticmethod +- def test_class_attrs_class(real_tuple): +- """Test class attrs via class level""" +- obj_type, exp_cimtype = real_tuple +- assert obj_type.cimtype == exp_cimtype +- +- @staticmethod +- def test_class_attrs_inst(real_tuple): +- """Test class attrs via instance level""" +- obj_type, exp_cimtype = real_tuple +- obj = obj_type(42) +- assert obj.cimtype == exp_cimtype +- +- @staticmethod +- def test_inheritance(real_tuple): +- """Test inheritance""" +- obj_type = real_tuple[0] +- obj = obj_type(42) +- assert isinstance(obj, obj_type) +- assert isinstance(obj, CIMType) +- assert isinstance(obj, CIMFloat) +- assert not isinstance(obj, CIMInt) +- +- @staticmethod +- def test_init_float(real_tuple): +- """Test initialization from floating point value""" +- obj_type = real_tuple[0] +- obj = obj_type(42.0) +- assert obj == 42.0 +- +- @staticmethod +- def test_init_str(real_tuple): +- """Test initialization from string value""" +- obj_type = real_tuple[0] +- obj = obj_type('42.0') +- assert obj == 42.0 ++def test_real_class_attrs_class(real_tuple): ++ """Test class attrs via class level""" ++ obj_type, exp_cimtype = real_tuple ++ assert obj_type.cimtype == exp_cimtype ++ ++ ++def test_real_class_attrs_inst(real_tuple): ++ """Test class attrs via instance level""" ++ obj_type, exp_cimtype = real_tuple ++ obj = obj_type(42) ++ assert obj.cimtype == exp_cimtype ++ ++ ++def test_real_inheritance(real_tuple): ++ """Test inheritance""" ++ obj_type = real_tuple[0] ++ obj = obj_type(42) ++ assert isinstance(obj, obj_type) ++ assert isinstance(obj, CIMType) ++ assert isinstance(obj, CIMFloat) ++ assert not isinstance(obj, CIMInt) ++ ++ ++def test_real_init_float(real_tuple): ++ """Test initialization from floating point value""" ++ obj_type = real_tuple[0] ++ obj = obj_type(42.0) ++ assert obj == 42.0 ++ ++ ++def test_real_init_str(real_tuple): ++ """Test initialization from string value""" ++ obj_type = real_tuple[0] ++ obj = obj_type('42.0') ++ assert obj == 42.0 + + + # +@@ -271,6 +259,26 @@ def test_init_str(real_tuple): + '20140924193040.654321+120' + ), + ( ++ datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40, ++ microsecond=654321, tzinfo=MinutesFromUTC(0)), ++ 'timestamp', ++ datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40, ++ microsecond=654321, tzinfo=MinutesFromUTC(0)), ++ None, ++ 0, ++ '20140924193040.654321+000' ++ ), ++ ( ++ datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40, ++ microsecond=654321), ++ 'timestamp', ++ datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40, ++ microsecond=654321, tzinfo=MinutesFromUTC(0)), ++ None, ++ 0, ++ '20140924193040.654321+000' ++ ), ++ ( + '20140924193040.654321+120', + 'timestamp', + datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40, +@@ -325,46 +333,47 @@ def datetime_init_tuple(request): + return request.param + + +-class TestDatetime: +- """ +- Test CIM real data type classes. +- """ +- +- @staticmethod +- def test_class_attrs_class(): +- """Test class attrs via class level""" +- assert CIMDateTime.cimtype == 'datetime' +- +- @staticmethod +- def test_class_attrs_inst(): +- """Test class attrs via instance level""" +- obj = CIMDateTime('00000000000000.000000:000') +- assert obj.cimtype == 'datetime' +- +- @staticmethod +- def test_inheritance(): +- """Test inheritance""" +- obj = CIMDateTime('00000000000000.000000:000') +- assert isinstance(obj, CIMDateTime) +- assert isinstance(obj, CIMType) +- assert not isinstance(obj, CIMFloat) +- assert not isinstance(obj, CIMInt) +- +- @staticmethod +- def test_init(datetime_init_tuple): +- """Test initialization from all input types""" +- (dtarg, exp_kind, exp_datetime, exp_timedelta, exp_minutesfromutc, +- exp_str) = datetime_init_tuple +- try: +- obj = CIMDateTime(dtarg) +- except Exception as exc: +- assert isinstance(exc, exp_kind) +- else: +- assert obj.is_interval == (exp_kind == 'interval') +- assert obj.datetime == exp_datetime +- assert obj.timedelta == exp_timedelta +- assert obj.minutes_from_utc == exp_minutesfromutc +- assert str(obj) == exp_str ++def test_datetime_class_attrs_class(): ++ """Test class attrs via class level""" ++ assert CIMDateTime.cimtype == 'datetime' ++ ++ ++def test_datetime_class_attrs_inst(): ++ """Test class attrs via instance level""" ++ obj = CIMDateTime('00000000000000.000000:000') ++ assert obj.cimtype == 'datetime' ++ ++ ++def test_datetime_inheritance(): ++ """Test inheritance""" ++ obj = CIMDateTime('00000000000000.000000:000') ++ assert isinstance(obj, CIMDateTime) ++ assert isinstance(obj, CIMType) ++ assert not isinstance(obj, CIMFloat) ++ assert not isinstance(obj, CIMInt) ++ ++ ++def test_datetime_init(datetime_init_tuple): ++ """Test initialization from all input types""" ++ (dtarg, exp_kind, exp_datetime, exp_timedelta, exp_minutesfromutc, ++ exp_str) = datetime_init_tuple ++ try: ++ obj = CIMDateTime(dtarg) ++ except Exception as exc: ++ assert isinstance(exc, exp_kind) ++ else: ++ assert obj.is_interval == (exp_kind == 'interval') ++ assert obj.datetime == exp_datetime ++ if obj.datetime is not None: ++ assert isinstance(obj.datetime, datetime) ++ # We ensure that the datetime is always timezone-aware: ++ assert obj.datetime.tzinfo is not None ++ assert obj.timedelta == exp_timedelta ++ if obj.timedelta is not None: ++ assert isinstance(obj.timedelta, timedelta) ++ assert obj.minutes_from_utc == exp_minutesfromutc ++ assert str(obj) == exp_str ++ + + # TODO: Add testcases for get_local_utcoffset() + # TODO: Add testcases for now() From d706fc953d0afe6bd060459f23f5e41a83c63a59 Mon Sep 17 00:00:00 2001 From: Roberto Di Remigio Date: Mon, 25 Sep 2017 14:50:31 +0100 Subject: [PATCH 0097/2806] sort maintainers.nix --- lib/maintainers.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 32ec8be0a68..2d33a34a563 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -197,8 +197,8 @@ exlevan = "Alexey Levan "; expipiplus1 = "Joe Hermaszewski "; fadenb = "Tristan Helmich "; - fare = "Francois-Rene Rideau "; falsifian = "James Cook "; + fare = "Francois-Rene Rideau "; florianjacob = "Florian Jacob "; flosse = "Markus Kohlhase "; fluffynukeit = "Daniel Austin "; @@ -290,12 +290,12 @@ jonafato = "Jon Banafato "; jpierre03 = "Jean-Pierre PRUNARET "; jpotier = "Martin Potier "; - jyp = "Jean-Philippe Bernardy "; jraygauthier = "Raymond Gauthier "; jtojnar = "Jan Tojnar "; juliendehos = "Julien Dehos "; jwiegley = "John Wiegley "; jwilberding = "Jordan Wilberding "; + jyp = "Jean-Philippe Bernardy "; jzellner = "Jeff Zellner "; kaiha = "Kai Harries "; kamilchm = "Kamil Chmielewski "; @@ -335,6 +335,7 @@ lovek323 = "Jason O'Conal "; lowfatcomputing = "Andreas Wagner "; lsix = "Lancelot SIX "; + ltavard = "Laure Tavard "; lucas8 = "Luc Chabassier "; ludo = "Ludovic Courtès "; lufia = "Kyohei Kadota "; @@ -580,10 +581,9 @@ taku0 = "Takuo Yonezawa "; tari = "Peter Marheine "; tavyc = "Octavian Cerna "; - ltavard = "Laure Tavard "; teh = "Tom Hunger "; - teto = "Matthieu Coudron "; telotortium = "Robert Irelan "; + teto = "Matthieu Coudron "; thall = "Niclas Thall "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; @@ -612,6 +612,7 @@ #urkud = "Yury G. Kudryashov "; inactive since 2012 uwap = "uwap "; vaibhavsagar = "Vaibhav Sagar "; + valeriangalliat = "Valérian Galliat "; vandenoever = "Jos van den Oever "; vanschelven = "Klaas van Schelven "; vanzef = "Ivan Solyankin "; @@ -628,7 +629,6 @@ vlstill = "Vladimír Štill "; vmandela = "Venkateswara Rao Mandela "; vmchale = "Vanessa McHale "; - valeriangalliat = "Valérian Galliat "; volhovm = "Mikhail Volkhov "; volth = "Jaroslavas Pocepko "; vozz = "Oliver Hunt "; From d1aed97aa03cb1e28096a78a4dd90d0e56bdf9aa Mon Sep 17 00:00:00 2001 From: Roberto Di Remigio Date: Mon, 25 Sep 2017 14:50:51 +0100 Subject: [PATCH 0098/2806] maintainers.nix: add robertodr --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 2d33a34a563..ebbb801d590 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -508,6 +508,7 @@ robberer = "Longrin Wischnewski "; robbinch = "Robbin C. "; roberth = "Robert Hensing "; + robertodr = "Roberto Di Remigio "; robgssp = "Rob Glossop "; roblabla = "Robin Lambertz "; roconnor = "Russell O'Connor "; From 932bd985105a535d4f142449620a7df0f5a1de1b Mon Sep 17 00:00:00 2001 From: Roberto Di Remigio Date: Mon, 25 Sep 2017 14:51:16 +0100 Subject: [PATCH 0099/2806] watson-ruby: init at 1.6.3 --- .../development/tools/misc/watson-ruby/Gemfile | 2 ++ .../tools/misc/watson-ruby/Gemfile.lock | 15 +++++++++++++++ .../tools/misc/watson-ruby/default.nix | 18 ++++++++++++++++++ .../tools/misc/watson-ruby/gemset.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 55 insertions(+) create mode 100644 pkgs/development/tools/misc/watson-ruby/Gemfile create mode 100644 pkgs/development/tools/misc/watson-ruby/Gemfile.lock create mode 100644 pkgs/development/tools/misc/watson-ruby/default.nix create mode 100644 pkgs/development/tools/misc/watson-ruby/gemset.nix diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile b/pkgs/development/tools/misc/watson-ruby/Gemfile new file mode 100644 index 00000000000..fc739389e84 --- /dev/null +++ b/pkgs/development/tools/misc/watson-ruby/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'watson-ruby' diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock new file mode 100644 index 00000000000..fa157d794f7 --- /dev/null +++ b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + json (2.1.0) + watson-ruby (1.6.3) + json + +PLATFORMS + ruby + +DEPENDENCIES + watson-ruby + +BUNDLED WITH + 1.14.4 diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix new file mode 100644 index 00000000000..86035835454 --- /dev/null +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -0,0 +1,18 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "watson-ruby-${version}"; + + version = (import ./gemset.nix).watson-ruby.version; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemdir = ./.; + + meta = with lib; { + description = "An inline issue manager"; + homepage = http://goosecode.com/watson/; + license = with licenses; mit; + maintainers = with maintainers; [ robertodr ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/watson-ruby/gemset.nix b/pkgs/development/tools/misc/watson-ruby/gemset.nix new file mode 100644 index 00000000000..a3bb144899c --- /dev/null +++ b/pkgs/development/tools/misc/watson-ruby/gemset.nix @@ -0,0 +1,18 @@ +{ + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + watson-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d5m29nr0i030q8ygmbapwri5ndcg2q6lf8a15bk79lfcp9xyj9w"; + type = "gem"; + }; + version = "1.6.3"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ba0c3add19..e13a15d1b01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7574,6 +7574,8 @@ with pkgs; pythonPackages = python3Packages; }; + watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; + xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { From b790a31204e8fad49d95637ce298f2dcef1f2f67 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Sep 2017 14:32:27 +0200 Subject: [PATCH 0100/2806] kdoctools: Move bin stuff to the "out" output In particular, this moves share/kf5 to the "out" output. This prevents kdelibs4support from pulling kdoctools.dev into its closure (via share/kf5/kdoctools/customization/dtd/kdex.dtd, which references ${kdoctools}/share/kf5). This reduces the closure size of kdelibs4support by 156 MiB. --- .../development/libraries/kde-frameworks/kdoctools/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 55d719e8d8c..661e89e3078 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -14,9 +14,6 @@ mkDerivation { propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; patches = [ ./kdoctools-no-find-docbook-xml.patch ]; - preConfigure = '' - outputBin=dev - ''; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" From b0280f598e4b3f6ebf33ad2115734e4735df443a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Sep 2017 15:24:28 +0200 Subject: [PATCH 0101/2806] postgresql: Add dev output This reduces the closure size of postgresql.out by 72 MiB. --- pkgs/servers/sql/postgresql/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 8a3097ae9de..022ac15aee7 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -11,7 +11,7 @@ let inherit sha256; }; - outputs = [ "out" "lib" "doc" "man" ]; + outputs = [ "out" "dev" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = @@ -51,13 +51,11 @@ let postInstall = '' - moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it + moveToOutput "bin/pg_config" "$dev" + moveToOutput "lib/pgxs" "$dev" # looks strange, but not deleting it moveToOutput "lib/*.a" "$out" moveToOutput "lib/libecpg*" "$out" - # Prevent a retained dependency on gcc-wrapper. - substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld - # Remove static libraries in case dynamic are available. for i in $out/lib/*.a; do name="$(basename "$i")" From 60aaced9a0de31c3dd408732c1a848f5e096e5c0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Sep 2017 15:40:41 +0200 Subject: [PATCH 0102/2806] Add some dev outputs --- pkgs/applications/kde/dolphin-plugins.nix | 1 + pkgs/applications/kde/filelight.nix | 1 + pkgs/applications/kde/print-manager.nix | 1 + pkgs/desktops/plasma-5/polkit-kde-agent.nix | 1 + pkgs/development/libraries/webkitgtk/2.16.nix | 2 ++ pkgs/development/libraries/webkitgtk/2.17.nix | 2 ++ pkgs/tools/networking/network-manager-applet/default.nix | 2 ++ pkgs/tools/networking/openconnect/default.nix | 8 +++----- 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix index eb823641ae4..5580952f40a 100644 --- a/pkgs/applications/kde/dolphin-plugins.nix +++ b/pkgs/applications/kde/dolphin-plugins.nix @@ -14,4 +14,5 @@ mkDerivation { propagatedBuildInputs = [ dolphin kdelibs4support ki18n kio kxmlgui ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index 6eb219d8da9..a3be5be7f0a 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -14,4 +14,5 @@ mkDerivation { propagatedBuildInputs = [ kio kparts kxmlgui qtscript solid ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index 085b53de0f3..8ace4562cbd 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -19,4 +19,5 @@ mkDerivation { kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index bd3e5d6e1f4..c25b3d2744b 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -11,4 +11,5 @@ mkDerivation { kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes knotifications kwindowsystem polkit-qt ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix index 7d7424d914d..094c3596d4b 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -101,4 +101,6 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/webkitgtk/2.17.nix b/pkgs/development/libraries/webkitgtk/2.17.nix index 53718f696cb..fc0e13436bc 100644 --- a/pkgs/development/libraries/webkitgtk/2.17.nix +++ b/pkgs/development/libraries/webkitgtk/2.17.nix @@ -103,4 +103,6 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + + outputs = [ "out" "dev" ]; } diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 35678061b67..c0c4950f447 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { "--without-selinux" ]; + outputs = [ "out" "dev" ]; + buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 5e38aee7f83..4fccb107771 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,10 +1,6 @@ { stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib } : -let - xor = a: b: (a || b) && (!(a && b)); -in - -assert xor (openssl != null) (gnutls != null); +assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { name = "openconnect-7.08"; @@ -16,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w"; }; + outputs = [ "out" "dev" ]; + preConfigure = '' export PKG_CONFIG=${pkgconfig}/bin/pkg-config export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" From 799c1218cd31e9d16d3ff36d5ab0208c26250944 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 25 Sep 2017 15:37:56 +0200 Subject: [PATCH 0103/2806] tor-browser-bundle-bin: default to dmix To support multiple playback streams --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 28cc273c679..29a73beeec8 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -349,7 +349,7 @@ stdenv.mkDerivation rec { PULSE_SERVER="\''${PULSE_SERVER:-}" \ PULSE_COOKIE="\''${PULSE_COOKIE:-}" \ \ - APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plughw:0,0}" \ + APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \ \ TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \ TOR_CONTROL_PORT="\''${TOR_CONTROL_PORT:-}" \ From 30c380556ca5959da6732db5ee13cfb7b28a8a5e Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 25 Sep 2017 15:20:53 +0100 Subject: [PATCH 0104/2806] libproxy: 0.4.13 -> 0.4.15 reduces closure size from ~200mb to ~100mb fixes #29775 --- .../libraries/libproxy/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index c493dd678ad..614890e929f 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,28 +1,30 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, webkitgtk216x, pcre, python2 }: +, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 }: stdenv.mkDerivation rec { name = "libproxy-${version}"; - version = "0.4.13"; + version = "0.4.15"; src = fetchFromGitHub { owner = "libproxy"; repo = "libproxy"; rev = version; - sha256 = "0yg4wr44ync6x3p107ic00m1l04xqhni9jn1vzvkw3nfjd0k6f92"; + sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager webkitgtk216x pcre ]; + buildInputs = [ dbus networkmanager spidermonkey_38 pcre python2 python3 ]; - cmakeFlags = [ - "-DWITH_WEBKIT3=ON" - "-DWITH_MOZJS=OFF" - "-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}" - ]; + preConfigure = '' + cmakeFlagsArray+=( + "-DWITH_MOZJS=ON" + "-DPYTHON2_SITEPKG_DIR=$out/${python2.sitePackages}" + "-DPYTHON3_SITEPKG_DIR=$out/${python3.sitePackages}" + ) + ''; meta = with stdenv.lib; { platforms = platforms.linux; From 407d8dac85e9a1901091955e078345ee9d5313c6 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 25 Sep 2017 15:49:14 +0100 Subject: [PATCH 0105/2806] watson-ruby: hide bundlerEnv to avoid collisions bundlerEnv also comes with a bundle script and ruby libraries --- .../tools/misc/watson-ruby/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 86035835454..32f94a1f228 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -1,14 +1,25 @@ -{ lib, bundlerEnv, ruby }: +{ stdenv, bundlerEnv, ruby }: -bundlerEnv rec { + +stdenv.mkDerivation rec { name = "watson-ruby-${version}"; - version = (import ./gemset.nix).watson-ruby.version; - inherit ruby; - # expects Gemfile, Gemfile.lock and gemset.nix in the same directory - gemdir = ./.; - meta = with lib; { + env = bundlerEnv rec { + name = "watson-ruby-gems-${version}"; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemdir = ./.; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + ln -s ${env}/bin/watson $out/bin/watson + ''; + + meta = with stdenv.lib; { description = "An inline issue manager"; homepage = http://goosecode.com/watson/; license = with licenses; mit; From 0ef6f5f22ea97a187aaf6d5aaecebe27527adfbb Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sat, 23 Sep 2017 16:24:34 +0200 Subject: [PATCH 0106/2806] youtube-viewer: init at 3.3.0 --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/perl-packages.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fcf0f8fede..308499944a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17239,6 +17239,8 @@ with pkgs; inherit (pythonPackages) youtube-dl; + youtube-viewer = perlPackages.WWWYoutubeViewer; + zam-plugins = callPackage ../applications/audio/zam-plugins { }; zanshin = libsForQt5.callPackage ../applications/office/zanshin { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 14c00504d40..d8c69ae44e9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15580,6 +15580,32 @@ let self = _self // overrides; _self = with self; { }; }; + WWWYoutubeViewer = buildPerlPackage rec { + name = "WWW-YoutubeViewer-${version}"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "trizen"; + repo = "youtube-viewer"; + rev = "${version}"; + sha256 = "15xyrwv08fw8jmpydwzks26ipxnzliwddgyjcfqiaj0p7lwlhmx1"; + }; + + propagatedBuildInputs = [ + LWP + LWPProtocolHttps + DataDump + JSON + ]; + + meta = { + description = "A lightweight application for searching and streaming videos from YouTube"; + homepage = https://github.com/trizen/youtube-viewer; + maintainers = with maintainers; [ woffs ]; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + Want = buildPerlPackage rec { name = "Want-0.29"; src = fetchurl { From cf599d3f991d23b37dc3783f2b2539c8c0dc064f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Sep 2017 19:10:21 +0200 Subject: [PATCH 0107/2806] emacs: Clear the environment while dumping This reduces the closure size of Emacs from 575 to 279 MiB. Dumping Emacs had a chance of leaking parts of the environment (such as $PATH) into the dumped executable. This hopefully fixes it. (It's a bit hard to tell since the effect is not deterministic.) --- pkgs/applications/editors/emacs/clean-env.patch | 15 +++++++++++++++ pkgs/applications/editors/emacs/default.nix | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/editors/emacs/clean-env.patch diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch new file mode 100644 index 00000000000..f80efeeef70 --- /dev/null +++ b/pkgs/applications/editors/emacs/clean-env.patch @@ -0,0 +1,15 @@ +Dump temacs in an empty environment to prevent -dev paths from ending +up in the dumped image. + +diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in +--- emacs-25.3/src/Makefile.in 2017-04-14 17:02:47.000000000 +0200 ++++ emacs-25.3-new/src/Makefile.in 2017-09-25 19:03:02.173861038 +0200 +@@ -532,7 +532,7 @@ + ifeq ($(CANNOT_DUMP),yes) + ln -f temacs$(EXEEXT) $@ + else +- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump ++ env -i LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump + ifneq ($(PAXCTL_dumped),) + $(PAXCTL_dumped) $@ + endif diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index a00826b9821..af3298a5883 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -34,7 +34,11 @@ stdenv.mkDerivation rec { sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; }; - patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch); + enableParallelBuilding = true; + + patches = + [ ./clean-env.patch ] + ++ lib.optional stdenv.isDarwin ./at-fdcwd.patch; nativeBuildInputs = [ pkgconfig ] ++ lib.optionals srcRepo [ autoconf automake texinfo ] From 8ccce8de891923b40b897c11f9a494c6b3722a58 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Sep 2017 19:49:21 +0200 Subject: [PATCH 0108/2806] Add more dev outputs --- pkgs/desktops/gnome-2/platform/libbonoboui/default.nix | 2 ++ pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 2 ++ pkgs/development/libraries/xmlsec/default.nix | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix index efdc28aac42..a71d6eb789b 100644 --- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ]; propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 961fb1c0a19..d30c38a2cfc 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index c64970f8f86..c55a3020b44 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ makeWrapper libxml2 gnutls libxslt pkgconfig libgcrypt libtool openssl nss ]; + enableParallelBuilding = true; doCheck = true; @@ -23,6 +26,11 @@ stdenv.mkDerivation rec { # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909 NIX_LDFLAGS = [ "-lgcrypt" ]; + postInstall = '' + moveToOutput "bin/xmlsec1-config" "$dev" + moveToOutput "lib/xmlsec1Conf.sh" "$dev" + ''; + postFixup = '' wrapProgram "$out/bin/xmlsec1" --prefix LD_LIBRARY_PATH ":" "$out/lib" ''; From 846070e028a6ce6213dc4af3477dc67d73ec3364 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 22 Sep 2017 23:37:54 +0200 Subject: [PATCH 0109/2806] networking.wireguard: added `allowedIpsAsRoutes` boolean to control peer routes Sometimes (especially in the default route case) it is required to NOT add routes for all allowed IP ranges. One might run it's own custom routing on-top of wireguard and only use the wireguard addresses to exchange prefixes with the remote host. --- nixos/modules/services/networking/wireguard.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 4f54b45639f..27ca0bcc574 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -95,6 +95,14 @@ let type = with types; listOf (submodule peerOpts); }; + allowedIPsAsRoutes = mkOption { + example = false; + default = true; + type = types.bool; + description = '' + Determines whether to add allowed IPs as routes or not. + ''; + }; }; }; @@ -217,11 +225,11 @@ let "${ipCommand} link set up dev ${name}" - (map (peer: + (lib.optional (values.allowedIPsAsRoutes != false) (map (peer: (map (allowedIP: "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}" ) peer.allowedIPs) - ) values.peers) + ) values.peers)) values.postSetup ]); From 01d53df77f26d0e87fea568c612f3aec8280a266 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Mon, 11 Sep 2017 11:23:40 +0200 Subject: [PATCH 0110/2806] pythonPackages.tensorflow 1.1 -> 1.3 --- .../python-modules/tensorflow/default.nix | 58 ++++++++----------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 5019f17f788..e1cde4d7403 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , buildPythonPackage -, isPy36, isPy35, isPy27 +, isPy36, isPy27 , cudaSupport ? false , cudatoolkit ? null , cudnn ? null @@ -9,9 +9,8 @@ , numpy , six , protobuf -, swig -, werkzeug , mock +, backports_weakref , zlib }: @@ -29,10 +28,10 @@ assert ! (stdenv.isDarwin && cudaSupport); buildPythonPackage rec { pname = "tensorflow"; - version = "1.1.0"; + version = "1.3.0"; name = "${pname}-${version}"; format = "wheel"; - disabled = ! (isPy36 || isPy35 || isPy27); + disabled = ! (isPy36 || isPy27); src = let tfurl = sys: proc: pykind: @@ -47,59 +46,45 @@ buildPythonPackage rec { darwin.cpu = { py2 = { url = tfurl "mac" "cpu" "py2-none-any" ; - sha256 = "1fgf26lw0liqxc9pywc8y2mj8l1mv48nhkav0pag9vavdacb9mqr"; + sha256 = "0nkymqbqjx8rsmc8vkc26cfsg4hpr6lj9zrwhjnfizvkzbbsh5z4"; }; py3 = { url = tfurl "mac" "cpu" "py3-none-any" ; - sha256 = "0z5p1fra7bih0vqn618i2w3vyy8d1rkc72k7bmjq0rw8msl717ia"; + sha256 = "1rj4m817w3lajnb1lgn3bwfwwk3qwvypyx11dim1ybakbmsc1j20"; }; }; linux-x86_64.cpu = { py2 = { url = tfurl "linux" "cpu" "cp27-none-linux_x86_64"; - sha256 = "0ld3hqx3idxk0zcrvn3p9yqnmx09zsj3mw66jlfw6fkv5hznx8j2"; + sha256 = "09pcyx0yfil4dm6cij8n3907pfgva07a38avrbai4qk5h6hxm8w9"; }; - py35 = { - url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64"; - sha256 = "0ahz9222rzqrk43lb9w4m351klkm6mlnnvw8xfqip28vbmymw90b"; - }; - py36 = { + py3 = { url = tfurl "linux" "cpu" "cp36-cp36m-linux_x86_64"; - sha256 = "1a2cc8ihl94iqff76nxg6bq85vfb7sj5cvvi9sxy2f43k32fi4lv"; + sha256 = "1qm8lm2f6bf9d462ybgwrz0dn9i6cnisgwdvyq9ssmy2f1gp8hxk"; }; - }; linux-x86_64.cuda = { py2 = { url = tfurl "linux" "gpu" "cp27-none-linux_x86_64"; - sha256 = "1baa9jwr6f8f62dyx6isbw8yyrd0pi1dz1srjblfqsyk1x3pnfvh"; + sha256 = "10yyyn4g2fsv1xgmw99bbr0fg7jvykay4gb5pxrrylh7h38h6wah"; }; - py35 = { - url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64"; - sha256 = "0606m2awy0ifhniy8lsyhd0xc388dgrwksn87989xlgy90wpxi92"; - }; - py36 = { + py3 = { url = tfurl "linux" "gpu" "cp36-cp36m-linux_x86_64"; - sha256 = "0lvbmfa87qzrajadpsf13gi3l71vryzkryzqfvkykivqrdjsvj8q"; + sha256 = "12g3akkr083gs3sisjbmm0lpsk8phn3dvy7jjfadfxshqc7za14i"; }; - }; }; in fetchurl ( if stdenv.isDarwin then - if isPy27 then - dls.darwin.cpu.py2 - else + if isPy36 then dls.darwin.cpu.py3 + else + dls.darwin.cpu.py2 else if isPy36 then if cudaSupport then - dls.linux-x86_64.cuda.py36 - else dls.linux-x86_64.cpu.py36 - else if isPy35 then - if cudaSupport then - dls.linux-x86_64.cuda.py35 - else dls.linux-x86_64.cpu.py35 + dls.linux-x86_64.cuda.py3 + else dls.linux-x86_64.cpu.py3 else if cudaSupport then dls.linux-x86_64.cuda.py2 @@ -108,9 +93,16 @@ buildPythonPackage rec { ); propagatedBuildInputs = with stdenv.lib; - [ numpy six protobuf swig werkzeug mock ] + [ numpy six protobuf mock ] ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ]; + installFlags = "--no-dependencies"; + # tensorflow-gpu depends on tensorflow_tensorboard, which cannot be + # built at the moment (some of its dependencies do not build + # [htlm5lib9999999 (seven nines) -> tensorboard], and it depends on an old version of + # bleach) Hence we disable dependency checking for now. + + # Note that we need to run *after* the fixup phase because the # libraries are loaded at runtime. If we run in preFixup then # patchelf --shrink-rpath will remove the cuda libraries. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1af49ba3da3..5c68efa56fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26057,7 +26057,7 @@ EOF tensorflowWithCuda = callPackage ../development/python-modules/tensorflow { cudaSupport = true; cudatoolkit = pkgs.cudatoolkit8; - cudnn = pkgs.cudnn51_cudatoolkit80; + cudnn = pkgs.cudnn60_cudatoolkit80; }; tflearn = buildPythonPackage rec { From 3353de310dc18b468ca2483cd2ba275bb70d3f53 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 5 Sep 2017 22:48:21 +0300 Subject: [PATCH 0111/2806] Revert "pythonPkgs.html5lib_0_9999999: remove" This reverts commit 0b2f9d1ce12d49439472045df8da3acadacc6fea. Needed as a transitive dependency for tensorflow-tensorboard. Mark as broken on Python 3.6 --- pkgs/top-level/python-packages.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c68efa56fb..f4159f166c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1944,6 +1944,23 @@ in { blaze = callPackage ../development/python-modules/blaze { }; + # Needed for bleach 1.5.0 + html5lib_0_9999999 = self.html5lib.overridePythonAttrs rec { + name = "html5lib-${version}"; + disabled = isPy3k && pythonAtLeast "3.6"; + buildInputs = with self; [ nose flake8 ]; + propagatedBuildInputs = with self; [ six ]; + checkPhase = '' + nosetests + ''; + + version = "0.9999999"; + src = pkgs.fetchurl { + url = "https://github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz"; + sha256 = "1s6wdbrjzw5jhyfbskf4nj1i5bjpjqq9f89a7r1rl59rhpwmfhhq"; + }; + }; + html5-parser = callPackage ../development/python-modules/html5-parser {}; httpserver = callPackage ../development/python-modules/httpserver {}; @@ -16808,7 +16825,7 @@ in { }; disabled = !isPy3k; - + # No tests in archive doCheck = false; From c27dd88d804386e19b4e1003b97a97c784dbf7b2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 5 Sep 2017 18:11:54 +0300 Subject: [PATCH 0112/2806] python.pkgs.bleach1_5_0: init at 1.5.0 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4159f166c5..5c9e5a1e59e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1998,6 +1998,24 @@ in { }; }; + # needed for tensorflow-tensorboard + bleach_1_5_0 = self.bleach.overridePythonAttrs rec { + version = "1.5.0"; + pname = "bleach"; + name = "${pname}-${version}"; + + propagatedBuildInputs = with self; [ six html5lib_0_9999999 ]; + + preCheck = '' + sed -i 's,pytest==[0-9.]*,pytest,' setup.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "0rdwb3piwwl30wfqg4ywm07276w7090xfq71lb5d6k5mk62pb3lp"; + }; + }; + blinker = buildPythonPackage rec { name = "blinker-${version}"; version = "1.4"; From 3d11dc7ca26eecadf3f4720bff9c1a52e8bb7586 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 5 Sep 2017 18:12:59 +0300 Subject: [PATCH 0113/2806] python.pkgs.tensorflow-tensorboard: init at 0.1.5 --- .../tensorflow-tensorboard/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/tensorflow-tensorboard/default.nix diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix new file mode 100644 index 00000000000..9f48b8fb971 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, isPy3k +, bleach_1_5_0 +, numpy +, werkzeug +, protobuf +, markdown +}: + +# tensorflow is built from a downloaded wheel, because the upstream +# project's build system is an arcane beast based on +# bazel. Untangling it and building the wheel from source is an open +# problem. + +buildPythonPackage rec { + pname = "tensorflow-tensorboard"; + version = "0.1.5"; + name = "${pname}-${version}"; + format = "wheel"; + + src = fetchPypi ({ + pname = "tensorflow_tensorboard"; + inherit version; + format = "wheel"; + } // (if isPy3k then { + python = "py3"; + sha256 = "0sfia05y1mzgy371faj96vgzhag1rgpa3gnbz9w1fay13jryw26x"; + } else { + python = "py2"; + sha256 = "0qx4f55zp54x079kxir4zz5b1ckiglsdcb9afz5wcdj6af4a6czg"; + })); + + propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown ]; + + meta = with stdenv.lib; { + description = "TensorFlow helps the tensors flow"; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c9e5a1e59e..78394e5e88f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26085,6 +26085,8 @@ EOF }; }; + tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; + tensorflow = self.tensorflowWithoutCuda; tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { }; From 864643ba276ccd0af80f846e81d4f9be79ba9a81 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Sep 2017 18:00:48 +0300 Subject: [PATCH 0114/2806] tensorflow: support Python 3.5, fix dependencies TensorBoard on Python 3 only works with 3.5. --- .../python-modules/tensorflow/default.nix | 51 ++++++++++++------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index e1cde4d7403..ab604c17300 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,7 +1,8 @@ { stdenv +, lib , fetchurl , buildPythonPackage -, isPy36, isPy27 +, isPy3k, isPy35, isPy36, isPy27 , cudaSupport ? false , cudatoolkit ? null , cudnn ? null @@ -12,6 +13,7 @@ , mock , backports_weakref , zlib +, tensorflow-tensorboard }: assert cudaSupport -> cudatoolkit != null @@ -31,7 +33,7 @@ buildPythonPackage rec { version = "1.3.0"; name = "${pname}-${version}"; format = "wheel"; - disabled = ! (isPy36 || isPy27); + disabled = ! (isPy35 || isPy36 || isPy27); src = let tfurl = sys: proc: pykind: @@ -58,7 +60,11 @@ buildPythonPackage rec { url = tfurl "linux" "cpu" "cp27-none-linux_x86_64"; sha256 = "09pcyx0yfil4dm6cij8n3907pfgva07a38avrbai4qk5h6hxm8w9"; }; - py3 = { + py35 = { + url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64"; + sha256 = "0p10zcf41pi33bi025fibqkq9rpd3v0rrbdmc9i9yd7igy076a07"; + }; + py36 = { url = tfurl "linux" "cpu" "cp36-cp36m-linux_x86_64"; sha256 = "1qm8lm2f6bf9d462ybgwrz0dn9i6cnisgwdvyq9ssmy2f1gp8hxk"; }; @@ -68,7 +74,11 @@ buildPythonPackage rec { url = tfurl "linux" "gpu" "cp27-none-linux_x86_64"; sha256 = "10yyyn4g2fsv1xgmw99bbr0fg7jvykay4gb5pxrrylh7h38h6wah"; }; - py3 = { + py35 = { + url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64"; + sha256 = "0icwnhkcf3fxr6bmbihqzipnn4pxybd06qv7l3k0p4xdgycwzmzk"; + }; + py36 = { url = tfurl "linux" "gpu" "cp36-cp36m-linux_x86_64"; sha256 = "12g3akkr083gs3sisjbmm0lpsk8phn3dvy7jjfadfxshqc7za14i"; }; @@ -77,31 +87,38 @@ buildPythonPackage rec { in fetchurl ( if stdenv.isDarwin then - if isPy36 then + if isPy3k then dls.darwin.cpu.py3 else dls.darwin.cpu.py2 - else if isPy36 then - if cudaSupport then - dls.linux-x86_64.cuda.py3 - else dls.linux-x86_64.cpu.py3 else - if cudaSupport then - dls.linux-x86_64.cuda.py2 + if isPy35 then + if cudaSupport then + dls.linux-x86_64.cuda.py35 + else + dls.linux-x86_64.cpu.py35 + else if isPy36 then + if cudaSupport then + dls.linux-x86_64.cuda.py36 + else + dls.linux-x86_64.cpu.py36 else - dls.linux-x86_64.cpu.py2 + if cudaSupport then + dls.linux-x86_64.cuda.py2 + else + dls.linux-x86_64.cpu.py2 ); - propagatedBuildInputs = with stdenv.lib; - [ numpy six protobuf mock ] - ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ]; + propagatedBuildInputs = + [ numpy six protobuf mock backports_weakref ] + ++ lib.optional (!isPy36) tensorflow-tensorboard + ++ lib.optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ]; - installFlags = "--no-dependencies"; # tensorflow-gpu depends on tensorflow_tensorboard, which cannot be # built at the moment (some of its dependencies do not build # [htlm5lib9999999 (seven nines) -> tensorboard], and it depends on an old version of # bleach) Hence we disable dependency checking for now. - + installFlags = lib.optional isPy36 "--no-dependencies"; # Note that we need to run *after* the fixup phase because the # libraries are loaded at runtime. If we run in preFixup then From 74c3cdd893dd8d22875e713cde8bc0c12162787d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Sep 2017 18:07:49 +0300 Subject: [PATCH 0115/2806] python.buildEnv: add extraOutputsToInstall attribute --- pkgs/development/interpreters/python/wrapper.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 9f355ddefda..f42caf92c17 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,5 +1,6 @@ { stdenv, python, buildEnv, makeWrapper , extraLibs ? [] +, extraOutputsToInstall ? [] , postBuild ? "" , ignoreCollisions ? false }: @@ -12,7 +13,7 @@ let name = "${python.name}-env"; inherit paths; - inherit ignoreCollisions; + inherit ignoreCollisions extraOutputsToInstall; postBuild = '' . "${makeWrapper}/nix-support/setup-hook" From 194c4002b640b8f4023c05ecb6e932006bbea829 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 25 Sep 2017 20:39:37 +0100 Subject: [PATCH 0116/2806] wireguard: fix function for adding routes --- nixos/modules/services/networking/wireguard.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 27ca0bcc574..eb08e7f90c0 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -225,7 +225,7 @@ let "${ipCommand} link set up dev ${name}" - (lib.optional (values.allowedIPsAsRoutes != false) (map (peer: + (optionals (values.allowedIPsAsRoutes != false) (map (peer: (map (allowedIP: "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}" ) peer.allowedIPs) From 8d53efb19c0c9924afa5729340f29d9c6f23d6c0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 08:20:30 +0300 Subject: [PATCH 0117/2806] google-compute-engine: 20170523 -> 20170914 --- .../0001-allow-nologin-other-paths.patch | 27 ------------------- .../google-compute-engine/default.nix | 19 +++++++------ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 12 +-------- 4 files changed, 11 insertions(+), 49 deletions(-) delete mode 100644 pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch diff --git a/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch b/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch deleted file mode 100644 index 650e80c24fb..00000000000 --- a/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2e9ac201af238b742c7032962b9b12a8b66bab0c Mon Sep 17 00:00:00 2001 -From: zimbatm -Date: Mon, 29 May 2017 22:36:15 +0100 -Subject: [PATCH] allow nologin on other paths - ---- - google_compute_engine/accounts/accounts_utils.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/google_compute_engine/accounts/accounts_utils.py b/google_compute_engine/accounts/accounts_utils.py -index 57e62be..d7eda06 100644 ---- a/google_compute_engine/accounts/accounts_utils.py -+++ b/google_compute_engine/accounts/accounts_utils.py -@@ -295,8 +295,8 @@ class AccountsUtils(object): - # logins. This helps avoid problems caused by operator and root sharing - # a home directory in CentOS and RHEL. - pw_entry = self._GetUser(user) -- if pw_entry and pw_entry.pw_shell == '/sbin/nologin': -- message = 'Not updating user %s. User set /sbin/nologin as login shell.' -+ if pw_entry and os.path.basename(pw_entry.pw_shell) == 'nologin': -+ message = 'Not updating user %s. User set `nologin` as login shell.' - self.logger.debug(message, user) - return True - --- -2.13.0 - diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 7a5350fe2eb..bd766d7c5a9 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -1,27 +1,26 @@ { lib , fetchFromGitHub -, pythonPackages +, buildPythonApplication , bash , shadow , systemd , utillinux +, boto +, setuptools }: -let - version = "20170523"; -in -pythonPackages.buildPythonApplication { + +buildPythonApplication rec { name = "google-compute-engine-${version}"; + version = "20170914"; namePrefix = ""; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; rev = version; - sha256 = "1qxyj3lj9in6m8yi6y6wcmc3662h9z4qax07v97rdnay99mxdv68"; + sha256 = "0hlzcrf6yhzan25f4wzy1vbncak9whhqzrzza026ly3sq0smmjpg"; }; - patches = [ ./0001-allow-nologin-other-paths.patch ]; - postPatch = '' for file in $(find google_compute_engine -type f); do substituteInPlace "$file" \ @@ -44,11 +43,11 @@ pythonPackages.buildPythonApplication { cp -r google_config/udev/*.rules $out/lib/udev/rules.d ''; - propagatedBuildInputs = with pythonPackages; [ boto setuptools ]; + propagatedBuildInputs = [ boto setuptools ]; meta = with lib; { description = "Google Compute Engine tools and services"; - homepage = https://github.com/GoogleCloudPlatform/compute-image-packages; + homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87e83839d1d..4ed40d18c9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2305,7 +2305,7 @@ with pkgs; google-fonts = callPackage ../data/fonts/google-fonts { }; - google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + google-compute-engine = python2.pkgs.google-compute-engine; gource = callPackage ../applications/version-management/gource { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78394e5e88f..d7c1fb1fb62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5849,17 +5849,7 @@ in { }; }; - google-compute-engine = buildPythonPackage rec { - version = "2.3.0"; - name = "google-compute-engine-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/google-compute-engine/google-compute-engine-${version}.tar.gz"; - sha256 = "1pjj95b3l61h8xz5kjfcgnql066cr8bq5wl480a6dxd2inw8mynf"; - }; - - propagatedBuildInputs = with self; [ boto ]; - }; + google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; googlecl = buildPythonPackage rec { version = "0.9.14"; From 098c6825e0a343b66181950f49cd49bbb12ff3f2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 09:11:46 +0300 Subject: [PATCH 0118/2806] blas: 3.5.0 -> 3.7.1 --- .../libraries/science/math/blas/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index e7c25435994..4455a9488c0 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, gfortran }: -let - version = "3.5.0"; -in + stdenv.mkDerivation rec { name = "blas-${version}"; + version = "3.7.1"; + src = fetchurl { url = "http://www.netlib.org/blas/${name}.tgz"; - sha256 = "096a3apnh899abjymjjg8m34hncagkzp9qxw08cms98g71fpfzgg"; + sha256 = "1hvmwp488hd6sdxdbmhjhmyrrd4s1ds1cjzh5d86l10b3wsm99n5"; }; - buildInputs = [gfortran]; + buildInputs = [ gfortran ]; configurePhase = '' echo >make.inc "SHELL = ${stdenv.shell}" From 67bbe467a46e8614b8cf469399f944c491a94e70 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 19:35:47 +0300 Subject: [PATCH 0119/2806] mxnet: disable GPU autodetection --- pkgs/applications/science/math/mxnet/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 67183c9dd55..d2f3d0c5f33 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchgit, cmake , opencv, gtest, openblas, liblapack -, cudaSupport ? false, cudatoolkit +, cudaSupport ? false, cudatoolkit, nvidia_x11 , cudnnSupport ? false, cudnn }: @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ opencv gtest openblas liblapack ] - ++ lib.optional cudaSupport cudatoolkit + ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; - cmakeFlags = lib.optional (!cudaSupport) "-DUSE_CUDA=OFF" - ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; + cmakeFlags = [ + (if cudaSupport then "-DCUDA_ARCH_NAME=All" else "-DUSE_CUDA=OFF") + ] ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; installPhase = '' install -Dm755 libmxnet.so $out/lib/libmxnet.so diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ed40d18c9f..ffef24e0ff2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18559,7 +18559,9 @@ with pkgs; sbcl = null; }; - mxnet = callPackage ../applications/science/math/mxnet { }; + mxnet = callPackage ../applications/science/math/mxnet { + inherit (linuxPackages) nvidia_x11; + }; wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; From b241bcf38881be764180c66fa9c713d0d44135c5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 08:21:02 +0300 Subject: [PATCH 0120/2806] google-cloud-sdk: 161.0.0 -> 171.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 34 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index d31f3023c96..f1165f6172b 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -1,33 +1,33 @@ -{stdenv, fetchurl, python27, python27Packages, makeWrapper}: - -with python27Packages; +{ stdenv, lib, fetchurl, python, cffi, cryptography, pyopenssl, crcmod, google-compute-engine, makeWrapper }: # other systems not supported yet -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin"; +let + pythonInputs = [ cffi cryptography pyopenssl crcmod google-compute-engine ]; + pythonPath = lib.makeSearchPath python.sitePackages pythonInputs; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "161.0.0"; + version = "171.0.0"; src = if stdenv.system == "i686-linux" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "43a78a9d2c3ee9d9e50200b1e90512cd53ded40b56e05effe31fe9847b1bdd4c"; + sha256 = "0scp9nhd46mrnd02bw7skm5fa04i7azf68g08js8kawvjgbwq0sb"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; - sha256 = "0706dbea1279be2bc98a497d1bfed61a9cc29c305d908a376bcdb4403035b323"; + sha256 = "0xvrqsg0vqws9n20lvipxilb45aln5p9iy0ldjfxx8vvi0s42298"; } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "7aa6094d1f9c87f4c2c4a6bdad6a1113aac5e72ea673e659d9acbb059dfd037e"; + sha256 = "0b9rqhwd30hn5l82a2x10rz86jz1j03b19di7bc3bqn4x041qii5"; }; - buildInputs = [python27 makeWrapper]; + buildInputs = [ python makeWrapper ]; phases = [ "installPhase" "fixupPhase" ]; @@ -46,16 +46,13 @@ stdenv.mkDerivation rec { programPath="$out/google-cloud-sdk/bin/$program" binaryPath="$out/bin/$program" wrapProgram "$programPath" \ - --set CLOUDSDK_PYTHON "${python27}/bin/python" \ - --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl}):$(toPythonPath ${crcmod})" + --set CLOUDSDK_PYTHON "${python}/bin/python" \ + --prefix PYTHONPATH : "${pythonPath}" mkdir -p $out/bin ln -s $programPath $binaryPath done - # install man pages - mv "$out/google-cloud-sdk/help/man" "$out" - # setup bash completion mkdir -p "$out/etc/bash_completion.d/" mv "$out/google-cloud-sdk/completion.bash.inc" "$out/etc/bash_completion.d/gcloud.inc" @@ -68,11 +65,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for the google cloud platform"; longDescription = "The Google Cloud SDK. This package has the programs: gcloud, gsutil, and bq"; - version = version; # This package contains vendored dependencies. All have free licenses. license = licenses.free; - homepage = https://cloud.google.com/sdk/; - maintainers = with maintainers; [stephenmw zimbatm]; - platforms = with platforms; linux ++ darwin; + homepage = "https://cloud.google.com/sdk/"; + maintainers = with maintainers; [ stephenmw zimbatm ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffef24e0ff2..751aaf73216 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2301,7 +2301,7 @@ with pkgs; google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; - google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; + google-cloud-sdk = python2.pkgs.google-cloud-sdk; google-fonts = callPackage ../data/fonts/google-fonts { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7c1fb1fb62..b3269b5230c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5849,6 +5849,8 @@ in { }; }; + google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; + google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; googlecl = buildPythonPackage rec { From 332dc7c719f805812eb5f33ab3e4670bb5b10d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 25 Sep 2017 21:50:10 +0200 Subject: [PATCH 0121/2806] mesa: maintenance 17.1.9 -> 17.1.10 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c9cb0b36bc5..2d253f7cd45 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.1.9"; + version = "17.1.10"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -82,7 +82,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "5f51ad94341696097d5df7b838183534478216858ac0fc8de183671a36ffea1a"; + sha256 = "cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb"; }; prePatch = "patchShebangs ."; From cee657f9a338cb9fa7505fd02fb69e46449da16d Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Sat, 23 Sep 2017 14:56:26 +0700 Subject: [PATCH 0122/2806] nixos/gitolite: add enableGitAnnex option --- nixos/modules/services/misc/gitolite.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index 6bb8adeccf7..f395b9558b5 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -41,6 +41,15 @@ in ''; }; + enableGitAnnex = mkOption { + type = types.bool; + default = false; + description = '' + Enable git-annex support. Uses the extraGitoliteRc option + to apply the necessary configuration. + ''; + }; + commonHooks = mkOption { type = types.listOf types.path; default = []; @@ -75,6 +84,8 @@ in will need to take any customizations you may have in ~/.gitolite.rc, convert them to appropriate Perl statements, add them to this option, and remove the file. + + See also the enableGitAnnex option. ''; }; @@ -124,6 +135,11 @@ in ''} >>"$out/gitolite.rc" ''; in { + services.gitolite.extraGitoliteRc = optionalString cfg.enableGitAnnex '' + # Enable git-annex support: + push( @{$RC{ENABLE}}, 'git-annex-shell ua'); + ''; + users.extraUsers.${cfg.user} = { description = "Gitolite user"; home = cfg.dataDir; @@ -198,6 +214,7 @@ in ''; }; - environment.systemPackages = [ pkgs.gitolite pkgs.git ]; + environment.systemPackages = [ pkgs.gitolite pkgs.git ] + ++ optional cfg.enableGitAnnex pkgs.gitAndTools.git-annex; }); } From 5fb2184bd333d8ea72ebb452539955ee2b347835 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 25 Sep 2017 14:24:01 +0200 Subject: [PATCH 0123/2806] vim-plugins: add {pre,post}Install hooks to `buildVimPlugin` --- pkgs/misc/vim-plugins/vim-utils.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 87b2f9d3e18..b659266ace7 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -383,6 +383,8 @@ rec { unpackPhase ? "", configurePhase ? "", buildPhase ? "", + preInstall ? "", + postInstall ? "", path ? (builtins.parseDrvName name).name, addonInfo ? null, ... @@ -390,9 +392,11 @@ rec { addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // { name = namePrefix + name; - inherit unpackPhase configurePhase buildPhase addonInfo; + inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; installPhase = '' + runHook preInstall + target=$out/${rtpPath}/${path} mkdir -p $out/${rtpPath} cp -r . $target @@ -401,6 +405,8 @@ rec { if [ -n "$addonInfo" ]; then echo "$addonInfo" > $target/addon-info.json fi + + runHook postInstall ''; })); From 67a42ae2a12676376c44e0b3134475ca3a2c2443 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 25 Sep 2017 14:24:36 +0200 Subject: [PATCH 0124/2806] vim-plugins: document `nix-shell -I` usage for `vim-plugin-names-to-nix` usage I use my own fork for NixOS development/testing, but `nixos-unstable` for my system configuration. Whenever I add a new plugin and I regenerate the expressions I need to change the `NIX_PATH` variable to my own fork. As this is something I tend to forget I think it's better to document this. --- pkgs/misc/vim-plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 7944533c112..0bfa6c89a15 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -16,7 +16,7 @@ in # TL;DR # Add your plugin to ./vim-plugin-names -# Regenerate via `nix-shell -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix"` +# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix"` # Copy the generated expression(s) into this file. # If plugin is complicated then make changes to ./vim2nix/additional-nix-code From d757d8142e88187388fbea4e884feadb0e33d36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 25 Sep 2017 22:24:13 +0200 Subject: [PATCH 0125/2806] vimPlugins.robotframework-vim: init at 2017-04-14 --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 7944533c112..30c742c3218 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1173,6 +1173,17 @@ rec { }; + robotframework-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "robotframework-vim-2017-04-14"; + src = fetchgit { + url = "https://github.com/mfukar/robotframework-vim"; + rev = "75d5b371a4da2a090a2872d55bd0dead013f334e"; + sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad"; + }; + dependencies = []; + + }; + vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-startify-2017-06-15"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7e9802e050e..acde3cf2e5b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -92,6 +92,7 @@ "github:martinda/Jenkinsfile-vim-syntax" "github:megaannum/forms" "github:megaannum/self" +"github:mfukar/robotframework-vim" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" "github:mileszs/ack.vim" From 91983a3f2565d6c0a0daffc120048106247f8ba8 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 25 Sep 2017 20:35:35 +0000 Subject: [PATCH 0126/2806] latinmodern-math: init at 1.959 --- pkgs/data/fonts/lm-math/default.nix | 33 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/data/fonts/lm-math/default.nix diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lm-math/default.nix new file mode 100644 index 00000000000..348373b8927 --- /dev/null +++ b/pkgs/data/fonts/lm-math/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "latinmodern-math-${version}"; + version = "1.959"; + + src = fetchzip { + url = "www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; + sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype/ + mkdir -p $out/share/doc/${name}/ + cp otf/*.otf $out/share/fonts/opentype/ + cp doc/*.txt $out/share/doc/${name}/ + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; + + meta = with stdenv.lib; { + description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth."; + homepage = http://www.gust.org.pl/projects/e-foundry/lm-math; + # "The Latin Modern Math font is licensed under the GUST Font License (GFL), + # which is a free license, legally equivalent to the LaTeX Project Public + # License (LPPL), version 1.3c or later." - GUST website + license = licenses.lppl13c; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 751aaf73216..8d421aef44f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13170,6 +13170,8 @@ with pkgs; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + latinmodern-math = callPackage ../data/fonts/lm-math {}; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; From 714a138857e00b2a996a8b61e1b31f45f7cf4b60 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 25 Sep 2017 20:59:28 +0000 Subject: [PATCH 0127/2806] tex-gyre-termes-math: init at 1.543 --- .../fonts/tex-gyre-termes-math/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/data/fonts/tex-gyre-termes-math/default.nix diff --git a/pkgs/data/fonts/tex-gyre-termes-math/default.nix b/pkgs/data/fonts/tex-gyre-termes-math/default.nix new file mode 100644 index 00000000000..83b157b085b --- /dev/null +++ b/pkgs/data/fonts/tex-gyre-termes-math/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "tex-gyre-termes-math-${version}"; + version = "1.543"; + + src = fetchzip { + url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyretermes-math-1543.zip"; + sha256 = "10ayqfpryfn1l35hy0vwyjzw3a6mfsnzgf78vsnccgk2gz1g9vhz"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype/ + mkdir -p $out/share/doc/${name}/ + cp -v opentype/*.otf $out/share/fonts/opentype/ + cp -v doc/*.txt $out/share/doc/${name}/ + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm"; + + meta = with stdenv.lib; { + longDescription = '' + TeX Gyre Termes Math is a math companion for the TeX Gyre Termes family + of fonts (see http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in + the OpenType format. + ''; + homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; + # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), + # which is a free license, legally equivalent to the LaTeX Project Public + # License (LPPL), version 1.3c or later." - GUST website + license = licenses.lppl13c; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 751aaf73216..697cee222dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13377,6 +13377,8 @@ with pkgs; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; + tex-gyre-termes-math = callPackage ../data/fonts/tex-gyre-termes-math { }; + tipa = callPackage ../data/fonts/tipa { }; ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; From 72516990814a3636eac00cb0874dc29166d1e440 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 20 Sep 2017 14:52:04 +0200 Subject: [PATCH 0128/2806] oslo-config: 4.11.0 -> 4.12.0, fix build also updated the following dependencies: keystoneauth1: 3.1.0 -> 3.2.0 disabled tests which require oslo-config, oslo-test or requests-kerberos oslo-i18n: 2.7.0 -> 3.18.0 oslotest: 1.12.0 -> 2.18.0 os-client-config: 1.8.1 -> 1.28.0 needed to disable testing due to circular dependency with oslotest mox3: 0.11.0 -> 0.23.0 disable tests for py36 due to upstream bug debtcollector: 0.9.0 -> 1.17.0 tests enabled extra packages: requestsexceptions: init at 1.3.0 --- .../python-modules/keystoneauth1/default.nix | 9 ++-- .../python-modules/oslo-config/default.nix | 11 ++--- .../requestsexceptions/default.nix | 27 +++++++++++ pkgs/top-level/python-packages.nix | 47 ++++++++++--------- 4 files changed, 63 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/requestsexceptions/default.nix diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 17792723e4a..13067136048 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -6,20 +6,21 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "3.1.0"; + version = "3.2.0"; name = "${pname}-${version}"; disabled = isPyPy; # a test fails src = fetchPypi { inherit pname version; - sha256 = "e5abfa8bbe866d52ca56afbe528d15214a60033cc1dc9804478cae7424f0f8fb"; + sha256 = "0rg3harfyvai34lrjiqnl1crmvswjvj8nsviasnz4b9pcvp3d03n"; }; buildInputs = [ pbr testtools testresources testrepository mock pep8 fixtures mox3 requests-mock ]; - propagatedBuildInputs = [ iso8601 requests six stevedore - webob oslo-config ]; + propagatedBuildInputs = [ iso8601 requests six stevedore webob ]; + # oslo_config is required but would create a circular dependency + doCheck = false; postPatch = '' sed -i 's@python@${python.interpreter}@' .testr.conf substituteInPlace requirements.txt --replace "argparse" "" diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 51b2f0df75d..0e77f9b65f9 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -1,16 +1,17 @@ -{ buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock }: +{ buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock, +debtcollector, rfc3986, pyyaml, oslo-i18n }: buildPythonPackage rec { pname = "oslo.config"; - version = "4.11.0"; + version = "4.12.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1be8aaba466a3449fdb21ee8f7025b0d3d252c8c7568b8d5d05ceff58617cd05"; + sha256 = "1pa9lajsadyq47bmxx12dxlcmnqsqlgnb55hwqas26lgnb2073dx"; }; - propagatedBuildInputs = [ pbr six netaddr stevedore ]; + propagatedBuildInputs = [ pbr six netaddr stevedore debtcollector rfc3986 pyyaml oslo-i18n ]; buildInputs = [ mock ]; # TODO: circular import on oslo-i18n @@ -20,6 +21,4 @@ buildPythonPackage rec { substituteInPlace requirements.txt --replace "argparse" "" ''; - # Requires a bunch of new packages - meta.broken = true; } diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix new file mode 100644 index 00000000000..35d723836c9 --- /dev/null +++ b/pkgs/development/python-modules/requestsexceptions/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, pbr }: + +buildPythonPackage rec { + pname = "requestsexceptions"; + version = "1.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gim00vi7vfq16y8b9m1vpy01grqvrdrbh88jb98qx6n6sk1n54g"; + }; + + propagatedBuildInputs = [ pbr ]; + + # upstream hacking package is not required for functional testing + patchPhase = '' + sed -i '/^hacking/d' test-requirements.txt + ''; + + meta = with lib; { + description = "Import exceptions from potentially bundled packages in requests."; + homepage = "https://pypi.python.org/pypi/requestsexceptions"; + license = licenses.asl20; + maintainers = with maintainers; [ makefu ]; + patforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3269b5230c..d055af91fe4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14852,14 +14852,14 @@ in { oslo-i18n = buildPythonPackage rec { name = "oslo.i18n-${version}"; - version = "2.7.0"; + version = "3.18.0"; src = pkgs.fetchurl { url = "mirror://pypi/o/oslo.i18n/${name}.tar.gz"; - sha256 = "11jgcvj36g97awh7fpar4xxgwrvzfahq6rw7xxqac32ia790ylcz"; + sha256 = "19w6wil588fgppc7d42fqkrjs0y81ap62svzbij8hlb3w2d4a91n"; }; - propagatedBuildInputs = with self; [ pbr Babel six oslo-config ]; + propagatedBuildInputs = with self; [ pbr Babel six ]; buildInputs = with self; [ mock coverage oslotest ]; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf @@ -14870,11 +14870,11 @@ in { oslotest = buildPythonPackage rec { name = "oslotest-${version}"; - version = "1.12.0"; + version = "2.18.0"; src = pkgs.fetchurl { url = "mirror://pypi/o/oslotest/${name}.tar.gz"; - sha256 = "17i92hymw1dwmmb5yv90m2gam2x21mc960q1pr7bly93x49h8666"; + sha256 = "0a0zhpb4yp7g6d290jk7a4pfci4ciwhsrqzhbwbl2szi50gp7km1"; }; patchPhase = '' @@ -14882,28 +14882,27 @@ in { ''; propagatedBuildInputs = with self; [ pbr fixtures subunit six testrepository - testscenarios testtools mock mox3 oslo-config os-client-config ]; + os-client-config debtcollector testscenarios testtools mock mox3 os-client-config ]; }; os-client-config = buildPythonPackage rec { name = "os-client-config-${version}"; - version = "1.8.1"; + version = "1.28.0"; src = pkgs.fetchurl { url = "mirror://pypi/o/os-client-config/${name}.tar.gz"; - sha256 = "10hz4yp594mi1p7v1pvgsmx5w2rnb9y8d0jvb2lfv03ljnwzv8jz"; + sha256 = "1f7q384b9drp3fqcg0w8aihv9k4idaay8vr3an187zjpgbx9rgp5"; }; - buildInputs = with self; [ pbr testtools testscenarios testrepository fixtures ]; - propagatedBuildInputs = with self; [ appdirs pyyaml keystoneauth1 ]; + # requires oslotest but is a dependency of that package ... + doCheck = false; + + buildInputs = with self; [ pbr testtools testscenarios testrepository fixtures jsonschema ]; + propagatedBuildInputs = with self; [ appdirs pyyaml keystoneauth1 requestsexceptions ]; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf ''; - # TODO: circular import on oslotest - preCheck = '' - rm os_client_config/tests/{test_config,test_cloud_config,test_environ}.py - ''; }; keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 {}; @@ -14927,38 +14926,42 @@ in { mox3 = buildPythonPackage rec { name = "mox3-${version}"; - version = "0.11.0"; + version = "0.23.0"; src = pkgs.fetchurl { url = "mirror://pypi/m/mox3/${name}.tar.gz"; - sha256 = "09dkgki21v5zqrx575h1aazxsq5akkv0a90z644bk1ry9a4zg1pn"; + sha256 = "0q26sg0jasday52a7y0cch13l0ssjvr4yqnvswqxsinj1lv5ld88"; }; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf ''; + # FAIL: mox3.tests.test_mox.RegexTest.testReprWithFlags + # ValueError: cannot use LOCALE flag with a str pattern + doCheck = !isPy36; + buildInputs = with self; [ subunit testrepository testtools six ]; propagatedBuildInputs = with self; [ pbr fixtures ]; }; debtcollector = buildPythonPackage rec { name = "debtcollector-${version}"; - version = "0.9.0"; + version = "1.17.0"; src = pkgs.fetchurl { url = "mirror://pypi/d/debtcollector/${name}.tar.gz"; - sha256 = "1mvdxdrnwlgfqg26s5himkjq6f06r2khlrignx36kkbyaix6j9xb"; + sha256 = "0rh47fd5kgjcdv9dxr7xf0x308cvfic3h2zk03ifvb4pdc5kbqvi"; }; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf ''; buildInputs = with self; [ pbr ]; - propagatedBuildInputs = with self; [ wrapt Babel six doc8 ]; + propagatedBuildInputs = with self; [ wrapt Babel six doc8 ] ++ + (optional (isPy26 || isPy27) funcsigs); checkInputs = with self; [ pbr Babel six wrapt testtools testscenarios - testrepository subunit coverage oslotest ]; - doCheck = false; # oslo is broken + testrepository subunit coverage ]; }; doc8 = callPackage ../development/python-modules/doc8 { }; @@ -18363,6 +18366,8 @@ in { }; }; + requestsexceptions = callPackage ../development/python-modules/requestsexceptions {}; + requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { }; From 97644a9f4f160e4a5eba77e462701f516a46b5ad Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 20 Sep 2017 16:12:22 +0200 Subject: [PATCH 0129/2806] keystoneauth1: enable tests requires a later version of betamax, bumped to 0.8.0 --- .../python-modules/keystoneauth1/default.nix | 17 +++++++++++++---- pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 13067136048..7405f7f74cd 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -2,6 +2,7 @@ , pbr, testtools, testresources, testrepository, mock , pep8, fixtures, mox3, requests-mock , iso8601, requests, six, stevedore, webob, oslo-config +, pyyaml, betamax, oauthlib }: buildPythonPackage rec { @@ -15,12 +16,20 @@ buildPythonPackage rec { sha256 = "0rg3harfyvai34lrjiqnl1crmvswjvj8nsviasnz4b9pcvp3d03n"; }; - buildInputs = [ pbr testtools testresources testrepository mock - pep8 fixtures mox3 requests-mock ]; + buildInputs = [ pbr ]; + checkInputs = [ pyyaml betamax oauthlib testtools testresources + testrepository mock pep8 fixtures mox3 requests-mock ]; propagatedBuildInputs = [ iso8601 requests six stevedore webob ]; - # oslo_config is required but would create a circular dependency - doCheck = false; + doCheck = true; + # 1. oslo-config + # 2. oslo-utils + # 3. requests-kerberos + preCheck = '' + rm keystoneauth1/tests/unit/loading/test_{session,conf,adapter}.py + rm keystoneauth1/tests/unit/access/test_v{2,3}_access.py + rm keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py + ''; postPatch = '' sed -i 's@python@${python.interpreter}@' .testr.conf substituteInPlace requirements.txt --replace "argparse" "" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d055af91fe4..09365ce1423 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1313,11 +1313,11 @@ in { }; betamax = buildPythonPackage rec { - name = "betamax-0.6.0"; + name = "betamax-0.8.0"; src = pkgs.fetchurl { url = "mirror://pypi/b/betamax/${name}.tar.gz"; - sha256 = "0vw4d53jbbb2kdl7l891h8iyxklqcd6ldvgcyhw9hl40ljdhv1wz"; + sha256 = "18f8v5gng3j773jlbbzx4rg1i4y2zw3m2l1zpmbvp8bh5a2q1i42"; }; propagatedBuildInputs = [ self.requests ]; From 42edc6f35e817b4995530779f0f82ba37a76cb03 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 20 Sep 2017 16:12:46 +0200 Subject: [PATCH 0130/2806] sqlalchemy-migrate: re-enable tests --- .../python-modules/sqlalchemy-migrate/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 9b431f29acb..ec63bc3c71e 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6"; }; - checkInputs = [ unittest2 scripttest pytz pylint mock testtools ]; + checkInputs = [ unittest2 scripttest pytz pylint mock testtools tempest-lib ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; checkPhase = '' @@ -27,8 +27,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; - # Tests require tempest-lib which requires the broken oslo-config - doCheck = false; + doCheck = true; meta = with stdenv.lib; { homepage = http://code.google.com/p/sqlalchemy-migrate/; From 78621e384c3489c6d04b87e4e71a9508bff4c044 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 23 Sep 2017 14:53:23 +0200 Subject: [PATCH 0131/2806] oslo-service: 0.10.0 -> 1.26.0, with dependencies oslo-service: needs to disable tests due to network errors when importing eventlet for tests ( socket.getprotobyname('tcp') -> no such protocol ) eventlet: 0.17.4 -> 0.20.0 cannot update to 0.21.0 due to version pinning ( < 0.21.0 ) of oslo-service monotonic: 0.4 -> 1.3 oslo-serialization: 1.10.0 -> 2.20.0 oslo-utils: 2.6.0 -> 3.29.0 oslo-concurrency: 2.7.0 -> 3.22.0 oslo-log: 1.12.1 -> 3.31.0 oslo-context: 0.7.0 -> 2.18.1 routes: 1.12.3 -> 2.4.1 webob: 1.4.1 -> 1.7.3 when updating i rewrote the package to use fetchPypi for making future updating easier --- pkgs/top-level/python-packages.nix | 132 ++++++++++++++++------------- 1 file changed, 73 insertions(+), 59 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09365ce1423..ecd9e5d2a6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8856,18 +8856,21 @@ in { }; eventlet = buildPythonPackage rec { - name = "eventlet-0.17.4"; + pname = "eventlet"; + version = "0.20.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/e/eventlet/${name}.tar.gz"; - sha256 = "0vam0qfm8p5jkpp2cv12r5bnpnv902ld7q074h7x5y5g9rqyj8c7"; + src = fetchPypi { + inherit pname version; + sha256 = "15bq5ybbigxnp5xwkps53zyhlg15lmcnq3ny2dppj0r0bylcs5rf"; }; buildInputs = with self; [ nose httplib2 pyopenssl ]; doCheck = false; # too much transient errors to bother - propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ]; + propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ] ++ + (with self; [ enum-compat ]) ; meta = { homepage = http://pypi.python.org/pypi/eventlet/; @@ -12623,13 +12626,15 @@ in { }; monotonic = buildPythonPackage rec { - name = "monotonic-0.4"; + pname = "monotonic"; + version = "1.3"; + name = "${pname}-${version}"; __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; - src = pkgs.fetchurl { - url = "mirror://pypi/m/monotonic/${name}.tar.gz"; - sha256 = "1diab6hfh3jpa1f0scpqaqrawk4g97ss4v7gkn2yw8znvdm6abw5"; + src = fetchPypi { + inherit pname version; + sha256 = "06vw7jwq96106plhlc5vz1v1xvjismdgw9wjyzvzf0ylglnrwiib"; }; patchPhase = optionalString stdenv.isLinux '' @@ -13846,12 +13851,13 @@ in { }; oslo-serialization = buildPythonPackage rec { - name = "oslo.serialization-${version}"; - version = "1.10.0"; + pname = "oslo.serialization"; + version = "2.20.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.serialization/${name}.tar.gz"; - sha256 = "15k8aql2rx5jzv3hfvmd48vsyw172qa64bs3fmsyx25p37zyfy8a"; + src = fetchPypi { + inherit pname version; + sha256 = "00j8hn8f0shk4anzb6zwn8w1sfxcil9a3jgxljwalq6ma2rzp9pw"; }; patchPhase = '' @@ -13893,12 +13899,13 @@ in { oslo-utils = buildPythonPackage rec { - name = "oslo.utils-${version}"; - version = "2.6.0"; + pname = "oslo.utils"; + version = "3.29.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.utils/${name}.tar.gz"; - sha256 = "1prgi03nxkcykyja821qkycsqlnpyzw17mpvj8qf3pjmgb9gv1fy"; + src = fetchPypi { + inherit pname version; + sha256 = "0l90ijw96czjd6z8bw88983rsnq5753iw86rhk1wi064w4rs19ig"; }; propagatedBuildInputs = with self; [ pbr Babel six iso8601 pytz netaddr netifaces @@ -14254,12 +14261,14 @@ in { oslo-service = buildPythonPackage rec { - name = "oslo.service-${version}"; - version = "0.10.0"; + pname = "oslo.service"; + version = "1.26.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.service/oslo.service-0.10.0.tar.gz"; - sha256 = "1pcnimc2a50arcgq355ad9lramf6y1yv974swgfj6w90v5c6p9gz"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "083q7z6nrska5fq12vnd70blphxscd7ivca2d78jk84d99h0m5n5"; }; propagatedBuildInputs = with self; [ @@ -14267,16 +14276,15 @@ in { oslo-concurrency wrapt eventlet six oslo-serialization greenlet paste oslo-config monotonic iso8601 oslo-log pytz routes msgpack oslo-i18n argparse oslo-utils pbr enum34 netaddr stevedore netifaces - pyinotify webob retrying pyinotify ]; + pyinotify webob retrying pyinotify oslo-log ]; buildInputs = with self; [ oslosphinx oslotest pkgs.procps mock mox3 fixtures subunit testrepository testtools testscenarios ]; - # failing tests - preCheck = '' - rm oslo_service/tests/test_service.py - ''; + ## cannot import eventlet due to: + # _proto_tcp = socket.getprotobyname('tcp') + doCheck = false; meta = with stdenv.lib; { homepage = "http://wiki.openstack.org/wiki/Oslo#oslo.service"; @@ -14721,13 +14729,14 @@ in { oslo-concurrency = buildPythonPackage rec { - name = "oslo-concurrency-${version}"; - version = "2.7.0"; + pname = "oslo.concurrency"; + version = "3.22.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.concurrency/oslo.concurrency-2.7.0.tar.gz"; - sha256 = "1yp8c87yi6fx1qbq4y1xkx47iiifg7jqzpcghivhxqra8vna185d"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "0nh1ycc2s6w05g5w63bsmmda0gw7qsrwlax3as8a0piai99z4m51"; + }; propagatedBuildInputs = with self; [ oslo-i18n argparse six wrapt oslo-utils pbr enum34 Babel netaddr monotonic @@ -14735,8 +14744,8 @@ in { eventlet ]; buildInputs = with self; [ - oslosphinx fixtures futures coverage oslotest - ]; + oslosphinx fixtures coverage oslotest + ] ++ (optional (!isPy3k) futures); # too much magic in tests doCheck = false; @@ -14816,16 +14825,17 @@ in { olefile = callPackage ../development/python-modules/olefile { }; oslo-log = buildPythonPackage rec { - name = "oslo.log-${version}"; - version = "1.12.1"; + name = "${pname}-${version}"; + pname = "oslo.log"; + version = "3.31.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.log/${name}.tar.gz"; - sha256 = "10x596r19zjla5n1bf04j5vncx0c9gpc5wc2jlmgjbl3cyx3vgsv"; + src = fetchPypi { + inherit pname version; + sha256 = "1w08cl98n8592pvb2gw01mqlwi8nnnpg1zy10mvj6xdpvfk2yqzz"; }; propagatedBuildInputs = with self; [ - pbr Babel six iso8601 debtcollector + pbr Babel six iso8601 debtcollector dateutil oslo-utils oslo-i18n oslo-config oslo-serialization oslo-context ] ++ stdenv.lib.optional stdenv.isLinux pyinotify; buildInputs = with self; [ oslotest oslosphinx ]; @@ -14835,12 +14845,13 @@ in { }; oslo-context = buildPythonPackage rec { - name = "oslo.context-${version}"; - version = "0.7.0"; + name = "${pname}-${version}"; + pname = "oslo.context"; + version = "2.18.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.context/${name}.tar.gz"; - sha256 = "18fmg9dhgngshk63wfb3ddrgx5br8jxkk3x30z40741mslp1fdjy"; + src = fetchPypi { + inherit pname version; + sha256 = "1sc7qrwffsm15m91c17k0xiglv6bxh9sbksvxvrrgja82m57mgh6"; }; propagatedBuildInputs = with self; [ pbr Babel ]; @@ -19050,14 +19061,16 @@ in { ropper = callPackage ../development/python-modules/ropper { }; routes = buildPythonPackage rec { - name = "routes-1.12.3"; + pname = "Routes"; + version = "2.4.1"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/R/Routes/Routes-1.12.3.tar.gz; - sha256 = "eacc0dfb7c883374e698cebaa01a740d8c78d364b6e7f3df0312de042f77aa36"; + src = fetchPypi { + inherit pname version; + sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6"; }; - propagatedBuildInputs = with self; [ paste webtest ]; + propagatedBuildInputs = with self; [ paste webtest repoze_lru ]; meta = { description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions"; @@ -22492,15 +22505,16 @@ EOF }; webob = buildPythonPackage rec { - version = "1.4.1"; - name = "webob-${version}"; + pname = "WebOb"; + version = "1.7.3"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/W/WebOb/WebOb-${version}.tar.gz"; - sha256 = "1nz9m6ijf46wfn33zfza13c0k1n4kjnmn3icdlrlgz5yj21vky0j"; + src = fetchPypi { + inherit pname version; + sha256 = "10vjp2rvqiyvw157fk3sy7yds1gknzw97z4gk0qv1raskx5s2p76"; }; - propagatedBuildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ nose pytest ]; meta = { description = "WSGI request and response object"; From d7c26f24b95a3eb558722fe0f0b3bf16df6e446d Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 23 Sep 2017 15:08:28 +0200 Subject: [PATCH 0132/2806] oslo-config,sqlalchemy: add makefu to list of maintainers --- .../development/python-modules/oslo-config/default.nix | 10 +++++++++- .../python-modules/sqlalchemy-migrate/default.nix | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 0e77f9b65f9..fce8c21284c 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock, +{ lib, buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock, debtcollector, rfc3986, pyyaml, oslo-i18n }: buildPythonPackage rec { @@ -21,4 +21,12 @@ buildPythonPackage rec { substituteInPlace requirements.txt --replace "argparse" "" ''; + meta = with lib; { + description = "Oslo Configuration API"; + homepage = "https://docs.openstack.org/oslo.config/latest/"; + license = licenses.asl20; + maintainers = with maintainers; [ makefu ]; + }; + + } diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ec63bc3c71e..258f84e8c72 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -33,5 +33,6 @@ buildPythonPackage rec { homepage = http://code.google.com/p/sqlalchemy-migrate/; description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; + maintainers = with maintainers; [ makefu ]; }; } From d00ba8091f0a97e63ebdc426eb20eb95e42bba10 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 25 Sep 2017 11:11:43 +0200 Subject: [PATCH 0133/2806] celery: disable eventlet tests eventlet cannot be imported in any tests because it fails to be imported inside the sandboxed environment --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ecd9e5d2a6e..366145642da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2606,6 +2606,13 @@ in { # https://github.com/celery/celery/pull/3736#issuecomment-274155454 from upstream patches = [ ../development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch ]; + ## importing of eventlet fails because of: + # _proto_tcp = socket.getprotobyname('tcp') + ## raises an exception in the sandbox + preCheck = '' + rm ./t/unit/concurrency/test_eventlet.py + ''; + buildInputs = with self; [ pytest case ]; propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; From dcc36a4a043c9c7a94afedae2685f7df1c7356dc Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 25 Sep 2017 13:39:07 +0200 Subject: [PATCH 0134/2806] pyramid: 1.7 -> 1.9.1 --- .../python-modules/hupper/default.nix | 20 +++++++++++++++++ .../plaster-pastedeploy/default.nix | 22 +++++++++++++++++++ .../python-modules/plaster/default.nix | 20 +++++++++++++++++ pkgs/top-level/python-packages.nix | 19 ++++++++++++---- 4 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/hupper/default.nix create mode 100644 pkgs/development/python-modules/plaster-pastedeploy/default.nix create mode 100644 pkgs/development/python-modules/plaster/default.nix diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix new file mode 100644 index 00000000000..3a8426e201f --- /dev/null +++ b/pkgs/development/python-modules/hupper/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, fetchPypi, python +, pytest, pytestcov, watchdog, mock +}: + +buildPythonPackage rec { + pname = "hupper"; + version = "1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "02lj6kgaf9xpr0binxwac3gpdhljglyj9fr78s165jc7qd7mifdg"; + }; + + checkPhase = '' + py.test + ''; + + checkInputs = [ pytest pytestcov watchdog mock ]; +} diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix new file mode 100644 index 00000000000..330ecfc7c67 --- /dev/null +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, python +, plaster, PasteDeploy +, pytest, pytestcov +}: + +buildPythonPackage rec { + pname = "plaster_pastedeploy"; + version = "0.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lrbkya5birfmg9gnfcnsa9id28klmjcqbm33rcg69pv9sfld4jv"; + }; + + checkPhase = '' + py.test + ''; + + propagatedBuildInputs = [ plaster PasteDeploy ]; + checkInputs = [ pytest pytestcov ]; +} diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix new file mode 100644 index 00000000000..9f370a9c0fb --- /dev/null +++ b/pkgs/development/python-modules/plaster/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, fetchPypi, python +, pytest, pytestcov +}: + +buildPythonPackage rec { + pname = "plaster"; + version = "0.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z48pis4qyhyqj3ia82r04diaa153dw66wrpbly06hdzvhw8j0ia"; + }; + + checkPhase = '' + py.test + ''; + + checkInputs = [ pytest pytestcov ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 366145642da..d2f5fc934d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6061,6 +6061,8 @@ in { }; + hupper = callPackage ../development/python-modules/hupper {}; + hovercraft = buildPythonPackage rec { disabled = ! isPy3k; name = "hovercraft-${version}"; @@ -7049,6 +7051,10 @@ in { phpserialize = callPackage ../development/python-modules/phpserialize { }; + plaster = callPackage ../development/python-modules/plaster {}; + + plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; + plotly = callPackage ../development/python-modules/plotly { }; podcastparser = callPackage ../development/python-modules/podcastparser { }; @@ -7327,11 +7333,13 @@ in { }; pyramid = buildPythonPackage rec { - name = "pyramid-1.7"; + pname = "pyramid"; + version = "1.9.1"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyramid/${name}.tar.gz"; - sha256 = "161qacv7qqln3q02kcqll0q2mmaypm701hn1llwdwnkaywkb3xi6"; + src = fetchPypi { + inherit pname version; + sha256 = "0dhbzc4q0vsnv3aihy728aczg56xs6h9s1rmvr096q4lb6yln3w4"; }; buildInputs = with self; [ @@ -7340,6 +7348,9 @@ in { webtest zope_component zope_interface + plaster + plaster-pastedeploy + hupper ] ++ optional isPy26 unittest2; propagatedBuildInputs = with self; [ From 1b628fb02322f1cf6ada397361e19fde55834f85 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 25 Sep 2017 21:42:20 +0100 Subject: [PATCH 0135/2806] celery: fix eventlet tests --- pkgs/top-level/python-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2f5fc934d5..efd5e6d9039 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2606,11 +2606,13 @@ in { # https://github.com/celery/celery/pull/3736#issuecomment-274155454 from upstream patches = [ ../development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch ]; - ## importing of eventlet fails because of: - # _proto_tcp = socket.getprotobyname('tcp') - ## raises an exception in the sandbox + # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox preCheck = '' - rm ./t/unit/concurrency/test_eventlet.py + export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ + LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so + ''; + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD ''; buildInputs = with self; [ pytest case ]; From 032c50d45b3fd1ebb4af592b83e776ed7004b4c0 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 25 Sep 2017 23:22:18 +0200 Subject: [PATCH 0136/2806] gdal: fix path to pg_config --- pkgs/development/libraries/gdal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 984d3da8119..600e9314cd4 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--with-png=${libpng.dev}" # optional "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional - "--with-pg=${postgresql}/bin/pg_config" + "--with-pg=${postgresql.dev}/bin/pg_config" "--with-mysql=${mysql.lib.dev}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" From feb397d55f28c2b82dd2814104a3df25aa4d37ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 25 Sep 2017 23:42:00 +0200 Subject: [PATCH 0137/2806] gpx-viewer: init at 0.4.0 --- pkgs/applications/misc/gpx-viewer/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/misc/gpx-viewer/default.nix diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix new file mode 100644 index 00000000000..a7485c4ee68 --- /dev/null +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "gpx-viewer-${version}"; + version = "0.4.0"; + + src = fetchurl { + url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80"; + }; + + patches = fetchurl { + url = "https://code.launchpad.net/~chkr/gpx-viewer/gtk3-bugfix/+merge/260766/+preview-diff/628965/+files/preview.diff"; + sha256 = "1yl7jk7skkcx10nny5zdixswcymjd9s9c1zhm1i5y3aqhchvmfs7"; + }; + patchFlags = [ "-p0" ]; + + nativeBuildInputs = [ + intltool pkgconfig + shared_mime_info # For update-mime-database + desktop_file_utils # For update-desktop-database + wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + ]; + buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ]; + + meta = with stdenv.lib; { + homepage = https://blog.sarine.nl/tag/gpxviewer/; + description = "Simple tool to visualize tracks and waypoints stored in a gpx file"; + platforms = with platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 751aaf73216..9f290cda290 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14387,6 +14387,8 @@ with pkgs; gqrx = qt5.callPackage ../applications/misc/gqrx { }; + gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; + grass = callPackage ../applications/gis/grass { }; grepm = callPackage ../applications/search/grepm { }; From b8915ebcc7a5be0bc11a879c4c1f667c3ce8c8b1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 26 Sep 2017 00:31:02 +0200 Subject: [PATCH 0138/2806] pythonPackages.keyutils: init at 0.5 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3269b5230c..ed7af87bfed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10859,6 +10859,28 @@ in { keyring = callPackage ../development/python-modules/keyring { }; + keyutils = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "keyutils"; + version = "0.5"; + + src = pkgs.fetchurl { + url = "mirror://pypi/k/${pname}/${name}.tar.gz"; + sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; + }; + + buildInputs = with self; [ pkgs.keyutils pytestrunner ]; + + doCheck = false; + + meta = { + description = "A set of python bindings for keyutils"; + homepage = https://github.com/sassoftware/python-keyutils; + license = licenses.asl20; + maintainers = with maintainers; [ primeos ]; + }; + }; + klaus = buildPythonPackage rec { version = "0.9.1"; name = "klaus-${version}"; From 2ceb7ad9f99be5947cc46486951140ecb1d16cbe Mon Sep 17 00:00:00 2001 From: The Admin Date: Wed, 26 Apr 2017 00:57:08 +0200 Subject: [PATCH 0139/2806] numix-solarized-gtk-theme: init at 20160919 --- .../numix-solarized-gtk-theme/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix diff --git a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix b/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix new file mode 100644 index 00000000000..4ede14d3bb3 --- /dev/null +++ b/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, sass, glib, gdk_pixbuf }: + +stdenv.mkDerivation rec { + version = "20160919"; + name = "numix-solarized-gtk-theme-${version}"; + + src = fetchFromGitHub { + owner = "Ferdi265"; + repo = "numix-solarized-gtk-theme"; + rev = version; + sha256 = "0243w918ycmf9vnkzfvwnrxz9zc6xxk7167h8ywxj901pqy59kad"; + }; + + postPatch = '' + substituteInPlace Makefile --replace \ + 'INSTALL_DIR=$(DESTDIR)/usr/share/themes' "INSTALL_DIR=$out/share/themes" + patchShebangs . + ''; + + buildInputs = [sass glib gdk_pixbuf]; + + meta = with stdenv.lib; { + description = "GTK3.20-compatible version of bitterologist's Numix Solarized from deviantart"; + longDescription = '' + This is a fork of the Numix GTK theme that replaces the colors of the theme + and icons to use the solarized theme with a solarized green accent color. + This theme supports both the dark and light theme, just as Numix proper. + ''; + homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme; + downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases; + license = licenses.gpl3; + maintainers = [ maintainers.offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 257d116ec79..6cd98d23b4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18019,6 +18019,8 @@ with pkgs; numix-gtk-theme = callPackage ../misc/themes/numix { }; + numix-solarized-gtk-theme = callPackage ../misc/themes/gtk3/numix-solarized-gtk-theme { }; + numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; theme-vertex = callPackage ../misc/themes/vertex { }; From b196241f42a328b4f293887aa8a75c0a02e386c2 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 26 Sep 2017 00:57:48 +0200 Subject: [PATCH 0140/2806] reattach-to-user-namespace: 2.5 -> 2.6 --- .../reattach-to-user-namespace/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index e2776475432..b14008e11f1 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "reattach-to-user-namespace-2.5"; +stdenv.mkDerivation rec { + name = "reattach-to-user-namespace-${version}"; + version = "2.6"; - src = fetchgit { - url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git"; - sha256 = "0kv11vi54g6waf9941hy1pwmwyab0y7hbmbkcgwhzb5ja21ysc2a"; - rev = "3689998acce9990726c8a68a85298ab693a62458"; + src = fetchurl { + url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/archive/v2.6.tar.gz"; + sha256 = "1d8ynzkdlxyyky9f88f7z50g9lwdydkpb2n7gkw3jgl2ac569xc0"; }; buildFlags = "ARCHES=x86_64"; @@ -16,7 +16,10 @@ stdenv.mkDerivation { cp reattach-to-user-namespace $out/bin/ ''; - meta = { - platforms = stdenv.lib.platforms.darwin; + meta = with stdenv.lib; { + description = "A wrapper that provides access to the Mac OS X pasteboard service"; + license = licenses.bsd2; + maintainers = with maintainers; [ lnl7 ]; + platforms = platforms.darwin; }; } From b064137b7b1cca141ec9f8fee8bf820ce569a875 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 26 Sep 2017 00:15:22 +0100 Subject: [PATCH 0141/2806] sysdig: 0.17.0 -> 0.18.0 --- pkgs/os-specific/linux/sysdig/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index ca5cea0a012..fbd2cff1b17 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0xw4in2yb3ynpc8jwl95j92kbyr7fzda3mab8nyxcyld7gshrlvd"; + sha256 = "1hmkjvfg3371hp873mnkjq9cirqszw2ji4p7mb6jcn9ihwxil2z2"; }; buildInputs = [ @@ -29,12 +29,6 @@ stdenv.mkDerivation rec { "-DluaL_getn(L,i)=((int)lua_objlen(L,i))" ]; - postPatch = '' - sed 's|curl/curlbuild\.h|curl/system.h|' -i \ - userspace/libsinsp/marathon_http.cpp \ - userspace/libsinsp/mesos_http.cpp - ''; - preConfigure = '' export INSTALL_MOD_PATH="$out" '' + optionalString (kernel != null) '' From 3766637bddb20b80203441fc1cc1b196e2548c04 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Tue, 26 Sep 2017 01:20:22 +0100 Subject: [PATCH 0142/2806] gnuradio: fix build for gcc6 and newer boost (#29740) --- pkgs/applications/misc/gnuradio/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index e10cb30d187..bd951c2a9a7 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -41,8 +41,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = '' + substituteInPlace \ + gr-fec/include/gnuradio/fec/polar_decoder_common.h \ + --replace BOOST_CONSTEXPR_OR_CONST const + ''; + preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable -std=c++11" ''; # - Ensure we get an interactive backend for matplotlib. If not the gr_plot_* From 151b34460c9c2c75ad27290baf0bba8456737b60 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 23 Sep 2017 14:24:55 +0100 Subject: [PATCH 0143/2806] nixos/release-notes: MySQL declarative users/databases Documents a possible migration step required to use the new options. --- nixos/doc/manual/release-notes/rl-1709.xml | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 55b39209f0d..6fc84a57cff 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -202,6 +202,45 @@ rmdir /var/lib/ipfs/.ipfs gpgv, etc. + + + + services.mysql now has declarative + configuration of databases and users with the ensureDatabases and + ensureUsers options. + + + + These options will never delete existing databases and users, + especially not when the value of the options are changed. + + + + The MySQL users will be identified using + + Unix socket authentication. This authenticates the + Unix user with the same name only, and that without the need + for a password. + + + + If you have previously created a MySQL root + user with a password, you will need to add + root user for unix socket authentication + before using the new options. This can be done by running the + following SQL script: + + +CREATE USER 'root'@'%' IDENTIFIED BY ''; +GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; +FLUSH PRIVILEGES; + +-- Optionally, delete the password-authenticated user: +-- DROP USER 'root'@'localhost'; + + + + Other notable improvements: From 3414265efa7557bbc7ddd18876888011f2159cf5 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 26 Sep 2017 03:26:02 +0200 Subject: [PATCH 0144/2806] 17.09 release notes: add module changes --- nixos/doc/manual/release-notes/rl-1709.xml | 100 +++++++++++++++++++-- 1 file changed, 91 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 6fc84a57cff..c951934e623 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -45,6 +45,33 @@ has the following highlights: even though HDMI-0 is the first head in the list. + + + The handling of SSL in the nginx module has been cleaned up, renaming + the misnomed enableSSL to onlySSL + which reflects its original intention. This is not to be used with the + already existing forceSSL which creates a second + non-SSL virtual host redirecting to the SSL virtual host. This by + chance had worked earlier due to specific implementation details. In + case you had specified both please remove the enableSSL + option to keep the previous behaviour. + + + Another addSSL option has been introduced to configure + both a non-SSL virtual host and an SSL virtual host. + + + Options to configure resolvers and + upstreams have been introduced. See their information + for further details. + + + The port option has been replaced by a more generic + listen option which makes it possible to specify + multiple addresses, ports and SSL configs dependant on the new SSL + handling mentioned above. + + The following new services were added since the last release: @@ -62,10 +89,17 @@ following incompatible changes: - aiccu package was removed. This is due to SixXS + The aiccu package was removed. This is due to SixXS sunsetting its IPv6 tunnel. + + + The fanctl package and fan module + have been removed due to the developers not upstreaming their iproute2 + patches and lagging with compatibility to recent iproute2 versions. + + Top-level idea package collection was renamed. @@ -202,7 +236,6 @@ rmdir /var/lib/ipfs/.ipfs gpgv, etc. - services.mysql now has declarative @@ -238,7 +271,22 @@ FLUSH PRIVILEGES; -- Optionally, delete the password-authenticated user: -- DROP USER 'root'@'localhost'; - + + + + + sha256 argument value of + dockerTools.pullImage expression must be + updated since the mechanism to download the image has been + changed. Skopeo is now used to pull the image instead of the + Docker daemon. + + + + + Templated systemd services e.g container@name are + now handled currectly when switching to a new configuration, resulting + in them being reloaded. @@ -296,14 +344,48 @@ FLUSH PRIVILEGES; - sha256 argument value of - dockerTools.pullImage expression must be - updated since the mechanism to download the image has been - changed. Skopeo is now used to pull the image instead of the - Docker daemon. + Definitions for /etc/hosts can now be sped + declaratively with networking.hosts. + + + + + Two new options have been added to the installer loader, in addition + to the default having changed. The kernel log verbosity has been lowered + to the upstream default for the default options, in order to not spam + the console when e.g. joining a network. + + + This therefore leads to adding a new debug option + to set the log level to the previous verbose mode, to make debugging + easier, but still accessible easily. + + + Additionally a copytoram option has been added, + which makes it possible to remove the install medium after booting. + This allows tethering from your phone after booting from it. + + + services.gitlab-runner.configOptions has been added + to specify the configuration of gitlab-runners declaratively. + + + services.jenkins.plugins has been added + to install plugins easily, this can be generated with jenkinsPlugins2nix. + + + services.postfix.config has been added + to specify the main.cf with NixOS options. Additionally other options + have been added to the postfix module and has been improved further. + + + The GitLab package and module have been updated to the latest 9.5 release. + + + The systemd-boot boot loader now lists the NixOS + version, kernel version and build date of all bootable generations. - From 8ac4682e85248419c63402f7ebdd4cdd20ff7f8e Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Tue, 26 Sep 2017 11:58:36 +1000 Subject: [PATCH 0145/2806] purePackages.gen: Don't build on Hydra (#29763) Until https://github.com/agraef/pure-lang/issues/8 is resolved, this package can't be compiled. This patch turns off Hydra builds of this package as part of #28643 (zero Hydra failures) --- pkgs/development/pure-modules/gen/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 082a8c88c61..9bb65d042b9 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { homepage = http://puredocs.bitbucket.org/pure-gen.html; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; maintainers = with stdenv.lib.maintainers; [ asppsa ]; }; } From 08d05f1ef5fff39c89e1a53b53e83bfc119cc18b Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Tue, 26 Sep 2017 07:16:14 +0100 Subject: [PATCH 0146/2806] Fetch sshuttle-darwin patch from github --- pkgs/tools/security/sshuttle/darwin.patch | 588 ---------------------- pkgs/tools/security/sshuttle/default.nix | 14 +- 2 files changed, 10 insertions(+), 592 deletions(-) delete mode 100644 pkgs/tools/security/sshuttle/darwin.patch diff --git a/pkgs/tools/security/sshuttle/darwin.patch b/pkgs/tools/security/sshuttle/darwin.patch deleted file mode 100644 index ccd2ab04747..00000000000 --- a/pkgs/tools/security/sshuttle/darwin.patch +++ /dev/null @@ -1,588 +0,0 @@ -diff --git a/sshuttle/tests/client/test_firewall.py b/sshuttle/tests/client/test_firewall.py -index 6201601..927ea61 100644 ---- a/sshuttle/tests/client/test_firewall.py -+++ b/sshuttle/tests/client/test_firewall.py -@@ -7,17 +7,17 @@ import sshuttle.firewall - - def setup_daemon(): - stdin = io.StringIO(u"""ROUTES --2,24,0,1.2.3.0,8000,9000 --2,32,1,1.2.3.66,8080,8080 --10,64,0,2404:6800:4004:80c::,0,0 --10,128,1,2404:6800:4004:80c::101f,80,80 -+{inet},24,0,1.2.3.0,8000,9000 -+{inet},32,1,1.2.3.66,8080,8080 -+{inet6},64,0,2404:6800:4004:80c::,0,0 -+{inet6},128,1,2404:6800:4004:80c::101f,80,80 - NSLIST --2,1.2.3.33 --10,2404:6800:4004:80c::33 -+{inet},1.2.3.33 -+{inet6},2404:6800:4004:80c::33 - PORTS 1024,1025,1026,1027 - GO 1 - HOST 1.2.3.3,existing --""") -+""".format(inet=socket.AF_INET, inet6=socket.AF_INET6)) - stdout = Mock() - return stdin, stdout - -@@ -117,18 +117,18 @@ def test_main(mock_get_method, mock_setup_daemon, mock_rewrite_etc_hosts): - call('not_auto'), - call().setup_firewall( - 1024, 1026, -- [(10, u'2404:6800:4004:80c::33')], -- 10, -- [(10, 64, False, u'2404:6800:4004:80c::', 0, 0), -- (10, 128, True, u'2404:6800:4004:80c::101f', 80, 80)], -+ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], -+ socket.AF_INET6, -+ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 0, 0), -+ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 80, 80)], - True), - call().setup_firewall( - 1025, 1027, -- [(2, u'1.2.3.33')], -- 2, -- [(2, 24, False, u'1.2.3.0', 8000, 9000), -- (2, 32, True, u'1.2.3.66', 8080, 8080)], -+ [(socket.AF_INET, u'1.2.3.33')], -+ socket.AF_INET, -+ [(socket.AF_INET, 24, False, u'1.2.3.0', 8000, 9000), -+ (socket.AF_INET, 32, True, u'1.2.3.66', 8080, 8080)], - True), -- call().restore_firewall(1024, 10, True), -- call().restore_firewall(1025, 2, True), -+ call().restore_firewall(1024, socket.AF_INET6, True), -+ call().restore_firewall(1025, socket.AF_INET, True), - ] -diff --git a/sshuttle/tests/client/test_helpers.py b/sshuttle/tests/client/test_helpers.py -index 67c6682..527983b 100644 ---- a/sshuttle/tests/client/test_helpers.py -+++ b/sshuttle/tests/client/test_helpers.py -@@ -132,10 +132,10 @@ nameserver 2404:6800:4004:80c::4 - - ns = sshuttle.helpers.resolvconf_nameservers() - assert ns == [ -- (2, u'192.168.1.1'), (2, u'192.168.2.1'), -- (2, u'192.168.3.1'), (2, u'192.168.4.1'), -- (10, u'2404:6800:4004:80c::1'), (10, u'2404:6800:4004:80c::2'), -- (10, u'2404:6800:4004:80c::3'), (10, u'2404:6800:4004:80c::4') -+ (socket.AF_INET, u'192.168.1.1'), (socket.AF_INET, u'192.168.2.1'), -+ (socket.AF_INET, u'192.168.3.1'), (socket.AF_INET, u'192.168.4.1'), -+ (socket.AF_INET6, u'2404:6800:4004:80c::1'), (socket.AF_INET6, u'2404:6800:4004:80c::2'), -+ (socket.AF_INET6, u'2404:6800:4004:80c::3'), (socket.AF_INET6, u'2404:6800:4004:80c::4') - ] - - -@@ -155,10 +155,10 @@ nameserver 2404:6800:4004:80c::4 - """) - ns = sshuttle.helpers.resolvconf_random_nameserver() - assert ns in [ -- (2, u'192.168.1.1'), (2, u'192.168.2.1'), -- (2, u'192.168.3.1'), (2, u'192.168.4.1'), -- (10, u'2404:6800:4004:80c::1'), (10, u'2404:6800:4004:80c::2'), -- (10, u'2404:6800:4004:80c::3'), (10, u'2404:6800:4004:80c::4') -+ (socket.AF_INET, u'192.168.1.1'), (socket.AF_INET, u'192.168.2.1'), -+ (socket.AF_INET, u'192.168.3.1'), (socket.AF_INET, u'192.168.4.1'), -+ (socket.AF_INET6, u'2404:6800:4004:80c::1'), (socket.AF_INET6, u'2404:6800:4004:80c::2'), -+ (socket.AF_INET6, u'2404:6800:4004:80c::3'), (socket.AF_INET6, u'2404:6800:4004:80c::4') - ] - - -diff --git a/sshuttle/tests/client/test_methods_nat.py b/sshuttle/tests/client/test_methods_nat.py -index 4ae571b..91d7e45 100644 ---- a/sshuttle/tests/client/test_methods_nat.py -+++ b/sshuttle/tests/client/test_methods_nat.py -@@ -84,10 +84,10 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): - with pytest.raises(Exception) as excinfo: - method.setup_firewall( - 1024, 1026, -- [(10, u'2404:6800:4004:80c::33')], -- 10, -- [(10, 64, False, u'2404:6800:4004:80c::', 0, 0), -- (10, 128, True, u'2404:6800:4004:80c::101f', 80, 80)], -+ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], -+ socket.AF_INET6, -+ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 0, 0), -+ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 80, 80)], - True) - assert str(excinfo.value) \ - == 'Address family "AF_INET6" unsupported by nat method_name' -@@ -98,10 +98,10 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): - with pytest.raises(Exception) as excinfo: - method.setup_firewall( - 1025, 1027, -- [(2, u'1.2.3.33')], -- 2, -- [(2, 24, False, u'1.2.3.0', 8000, 9000), -- (2, 32, True, u'1.2.3.66', 8080, 8080)], -+ [(socket.AF_INET, u'1.2.3.33')], -+ socket.AF_INET, -+ [(socket.AF_INET, 24, False, u'1.2.3.0', 8000, 9000), -+ (socket.AF_INET, 32, True, u'1.2.3.66', 8080, 8080)], - True) - assert str(excinfo.value) == 'UDP not supported by nat method_name' - assert mock_ipt_chain_exists.mock_calls == [] -@@ -110,10 +110,10 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): - - method.setup_firewall( - 1025, 1027, -- [(2, u'1.2.3.33')], -- 2, -- [(2, 24, False, u'1.2.3.0', 8000, 9000), -- (2, 32, True, u'1.2.3.66', 8080, 8080)], -+ [(socket.AF_INET, u'1.2.3.33')], -+ socket.AF_INET, -+ [(socket.AF_INET, 24, False, u'1.2.3.0', 8000, 9000), -+ (socket.AF_INET, 32, True, u'1.2.3.66', 8080, 8080)], - False) - assert mock_ipt_chain_exists.mock_calls == [ - call(2, 'nat', 'sshuttle-1025') -diff --git a/sshuttle/tests/client/test_methods_pf.py b/sshuttle/tests/client/test_methods_pf.py -index 5df57af..fef54e0 100644 ---- a/sshuttle/tests/client/test_methods_pf.py -+++ b/sshuttle/tests/client/test_methods_pf.py -@@ -180,10 +180,10 @@ def test_setup_firewall_darwin(mock_pf_get_dev, mock_ioctl, mock_pfctl): - - method.setup_firewall( - 1024, 1026, -- [(10, u'2404:6800:4004:80c::33')], -- 10, -- [(10, 64, False, u'2404:6800:4004:80c::', 8000, 9000), -- (10, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], -+ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], -+ socket.AF_INET6, -+ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 8000, 9000), -+ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], - False) - assert mock_ioctl.mock_calls == [ - call(mock_pf_get_dev(), 0xC4704433, ANY), -@@ -218,10 +218,10 @@ def test_setup_firewall_darwin(mock_pf_get_dev, mock_ioctl, mock_pfctl): - with pytest.raises(Exception) as excinfo: - method.setup_firewall( - 1025, 1027, -- [(2, u'1.2.3.33')], -- 2, -- [(2, 24, False, u'1.2.3.0', 0, 0), -- (2, 32, True, u'1.2.3.66', 80, 80)], -+ [(socket.AF_INET, u'1.2.3.33')], -+ socket.AF_INET, -+ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), -+ (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], - True) - assert str(excinfo.value) == 'UDP not supported by pf method_name' - assert mock_pf_get_dev.mock_calls == [] -@@ -230,9 +230,9 @@ def test_setup_firewall_darwin(mock_pf_get_dev, mock_ioctl, mock_pfctl): - - method.setup_firewall( - 1025, 1027, -- [(2, u'1.2.3.33')], -- 2, -- [(2, 24, False, u'1.2.3.0', 0, 0), (2, 32, True, u'1.2.3.66', 80, 80)], -+ [(socket.AF_INET, u'1.2.3.33')], -+ socket.AF_INET, -+ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], - False) - assert mock_ioctl.mock_calls == [ - call(mock_pf_get_dev(), 0xC4704433, ANY), -@@ -262,7 +262,7 @@ def test_setup_firewall_darwin(mock_pf_get_dev, mock_ioctl, mock_pfctl): - mock_ioctl.reset_mock() - mock_pfctl.reset_mock() - -- method.restore_firewall(1025, 2, False) -+ method.restore_firewall(1025, socket.AF_INET, False) - assert mock_ioctl.mock_calls == [] - assert mock_pfctl.mock_calls == [ - call('-a sshuttle-1025 -F all'), -@@ -286,10 +286,10 @@ def test_setup_firewall_freebsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): - - method.setup_firewall( - 1024, 1026, -- [(10, u'2404:6800:4004:80c::33')], -- 10, -- [(10, 64, False, u'2404:6800:4004:80c::', 8000, 9000), -- (10, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], -+ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], -+ socket.AF_INET6, -+ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 8000, 9000), -+ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], - False) - - assert mock_pfctl.mock_calls == [ -@@ -315,10 +315,10 @@ def test_setup_firewall_freebsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): - with pytest.raises(Exception) as excinfo: - method.setup_firewall( - 1025, 1027, -- [(2, u'1.2.3.33')], -- 2, -- [(2, 24, False, u'1.2.3.0', 0, 0), -- (2, 32, True, u'1.2.3.66', 80, 80)], -+ [(socket.AF_INET, u'1.2.3.33')], -+ socket.AF_INET, -+ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), -+ (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], - True) - assert str(excinfo.value) == 'UDP not supported by pf method_name' - assert mock_pf_get_dev.mock_calls == [] -@@ -327,9 +327,9 @@ def test_setup_firewall_freebsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): - - method.setup_firewall( - 1025, 1027, -- [(2, u'1.2.3.33')], -- 2, -- [(2, 24, False, u'1.2.3.0', 0, 0), (2, 32, True, u'1.2.3.66', 80, 80)], -+ [(socket.AF_INET, u'1.2.3.33')], -+ socket.AF_INET, -+ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], - False) - assert mock_ioctl.mock_calls == [ - call(mock_pf_get_dev(), 0xC4704433, ANY), -@@ -381,10 +381,10 @@ def test_setup_firewall_openbsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): - - method.setup_firewall( - 1024, 1026, -- [(10, u'2404:6800:4004:80c::33')], -- 10, -- [(10, 64, False, u'2404:6800:4004:80c::', 8000, 9000), -- (10, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], -+ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], -+ socket.AF_INET6, -+ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 8000, 9000), -+ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], - False) - - assert mock_ioctl.mock_calls == [ -@@ -416,10 +416,10 @@ def test_setup_firewall_openbsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): - with pytest.raises(Exception) as excinfo: - method.setup_firewall( - 1025, 1027, -- [(2, u'1.2.3.33')], -- 2, -- [(2, 24, False, u'1.2.3.0', 0, 0), -- (2, 32, True, u'1.2.3.66', 80, 80)], -+ [(socket.AF_INET, u'1.2.3.33')], -+ socket.AF_INET, -+ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), -+ (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], - True) - assert str(excinfo.value) == 'UDP not supported by pf method_name' - assert mock_pf_get_dev.mock_calls == [] -@@ -428,10 +428,10 @@ def test_setup_firewall_openbsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): - - method.setup_firewall( - 1025, 1027, -- [(2, u'1.2.3.33')], -- 2, -- [(2, 24, False, u'1.2.3.0', 0, 0), -- (2, 32, True, u'1.2.3.66', 80, 80)], -+ [(socket.AF_INET, u'1.2.3.33')], -+ socket.AF_INET, -+ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), -+ (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], - False) - assert mock_ioctl.mock_calls == [ - call(mock_pf_get_dev(), 0xcd48441a, ANY), -diff --git a/sshuttle/tests/client/test_methods_tproxy.py b/sshuttle/tests/client/test_methods_tproxy.py -index 268e60c..acc45fd 100644 ---- a/sshuttle/tests/client/test_methods_tproxy.py -+++ b/sshuttle/tests/client/test_methods_tproxy.py -@@ -1,3 +1,5 @@ -+import socket -+ - from mock import Mock, patch, call - - from sshuttle.methods import get_method -@@ -49,7 +51,7 @@ def test_send_udp(mock_socket): - assert sock.mock_calls == [] - assert mock_socket.mock_calls == [ - call(sock.family, 2), -- call().setsockopt(1, 2, 1), -+ call().setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1), - call().setsockopt(0, 19, 1), - call().bind('127.0.0.2'), - call().sendto("2222222", '127.0.0.1'), -@@ -100,71 +102,71 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): - - method.setup_firewall( - 1024, 1026, -- [(10, u'2404:6800:4004:80c::33')], -- 10, -- [(10, 64, False, u'2404:6800:4004:80c::', 8000, 9000), -- (10, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], -+ [(socket.AF_INET6, u'2404:6800:4004:80c::33')], -+ socket.AF_INET6, -+ [(socket.AF_INET6, 64, False, u'2404:6800:4004:80c::', 8000, 9000), -+ (socket.AF_INET6, 128, True, u'2404:6800:4004:80c::101f', 8080, 8080)], - True) - assert mock_ipt_chain_exists.mock_calls == [ -- call(10, 'mangle', 'sshuttle-m-1024'), -- call(10, 'mangle', 'sshuttle-t-1024'), -- call(10, 'mangle', 'sshuttle-d-1024') -+ call(socket.AF_INET6, 'mangle', 'sshuttle-m-1024'), -+ call(socket.AF_INET6, 'mangle', 'sshuttle-t-1024'), -+ call(socket.AF_INET6, 'mangle', 'sshuttle-d-1024') - ] - assert mock_ipt_ttl.mock_calls == [] - assert mock_ipt.mock_calls == [ -- call(10, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1024'), -- call(10, 'mangle', '-F', 'sshuttle-m-1024'), -- call(10, 'mangle', '-X', 'sshuttle-m-1024'), -- call(10, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1024'), -- call(10, 'mangle', '-F', 'sshuttle-t-1024'), -- call(10, 'mangle', '-X', 'sshuttle-t-1024'), -- call(10, 'mangle', '-F', 'sshuttle-d-1024'), -- call(10, 'mangle', '-X', 'sshuttle-d-1024'), -- call(10, 'mangle', '-N', 'sshuttle-m-1024'), -- call(10, 'mangle', '-F', 'sshuttle-m-1024'), -- call(10, 'mangle', '-N', 'sshuttle-d-1024'), -- call(10, 'mangle', '-F', 'sshuttle-d-1024'), -- call(10, 'mangle', '-N', 'sshuttle-t-1024'), -- call(10, 'mangle', '-F', 'sshuttle-t-1024'), -- call(10, 'mangle', '-I', 'OUTPUT', '1', '-j', 'sshuttle-m-1024'), -- call(10, 'mangle', '-I', 'PREROUTING', '1', '-j', 'sshuttle-t-1024'), -- call(10, 'mangle', '-A', 'sshuttle-d-1024', '-j', 'MARK', -+ call(socket.AF_INET6, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1024'), -+ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-m-1024'), -+ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-m-1024'), -+ call(socket.AF_INET6, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1024'), -+ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-t-1024'), -+ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-t-1024'), -+ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-d-1024'), -+ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-d-1024'), -+ call(socket.AF_INET6, 'mangle', '-N', 'sshuttle-m-1024'), -+ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-m-1024'), -+ call(socket.AF_INET6, 'mangle', '-N', 'sshuttle-d-1024'), -+ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-d-1024'), -+ call(socket.AF_INET6, 'mangle', '-N', 'sshuttle-t-1024'), -+ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-t-1024'), -+ call(socket.AF_INET6, 'mangle', '-I', 'OUTPUT', '1', '-j', 'sshuttle-m-1024'), -+ call(socket.AF_INET6, 'mangle', '-I', 'PREROUTING', '1', '-j', 'sshuttle-t-1024'), -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-d-1024', '-j', 'MARK', - '--set-mark', '1'), -- call(10, 'mangle', '-A', 'sshuttle-d-1024', '-j', 'ACCEPT'), -- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-m', 'socket', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-d-1024', '-j', 'ACCEPT'), -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-m', 'socket', - '-j', 'sshuttle-d-1024', '-m', 'tcp', '-p', 'tcp'), -- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-m', 'socket', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-m', 'socket', - '-j', 'sshuttle-d-1024', '-m', 'udp', '-p', 'udp'), -- call(10, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', - '--set-mark', '1', '--dest', u'2404:6800:4004:80c::33/32', - '-m', 'udp', '-p', 'udp', '--dport', '53'), -- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', - '--tproxy-mark', '0x1/0x1', - '--dest', u'2404:6800:4004:80c::33/32', - '-m', 'udp', '-p', 'udp', '--dport', '53', '--on-port', '1026'), -- call(10, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'RETURN', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'RETURN', - '--dest', u'2404:6800:4004:80c::101f/128', - '-m', 'tcp', '-p', 'tcp', '--dport', '8080:8080'), -- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'RETURN', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'RETURN', - '--dest', u'2404:6800:4004:80c::101f/128', - '-m', 'tcp', '-p', 'tcp', '--dport', '8080:8080'), -- call(10, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'RETURN', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'RETURN', - '--dest', u'2404:6800:4004:80c::101f/128', - '-m', 'udp', '-p', 'udp', '--dport', '8080:8080'), -- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'RETURN', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'RETURN', - '--dest', u'2404:6800:4004:80c::101f/128', - '-m', 'udp', '-p', 'udp', '--dport', '8080:8080'), -- call(10, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', - '--set-mark', '1', '--dest', u'2404:6800:4004:80c::/64', - '-m', 'tcp', '-p', 'tcp', '--dport', '8000:9000'), -- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', - '--tproxy-mark', '0x1/0x1', '--dest', u'2404:6800:4004:80c::/64', - '-m', 'tcp', '-p', 'tcp', '--dport', '8000:9000', - '--on-port', '1024'), -- call(10, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-m-1024', '-j', 'MARK', - '--set-mark', '1', '--dest', u'2404:6800:4004:80c::/64', - '-m', 'udp', '-p', 'udp'), -- call(10, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', -+ call(socket.AF_INET6, 'mangle', '-A', 'sshuttle-t-1024', '-j', 'TPROXY', - '--tproxy-mark', '0x1/0x1', '--dest', u'2404:6800:4004:80c::/64', - '-m', 'udp', '-p', 'udp', '--dport', '8000:9000', - '--on-port', '1024') -@@ -173,22 +175,22 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): - mock_ipt_ttl.reset_mock() - mock_ipt.reset_mock() - -- method.restore_firewall(1025, 10, True) -+ method.restore_firewall(1025, socket.AF_INET6, True) - assert mock_ipt_chain_exists.mock_calls == [ -- call(10, 'mangle', 'sshuttle-m-1025'), -- call(10, 'mangle', 'sshuttle-t-1025'), -- call(10, 'mangle', 'sshuttle-d-1025') -+ call(socket.AF_INET6, 'mangle', 'sshuttle-m-1025'), -+ call(socket.AF_INET6, 'mangle', 'sshuttle-t-1025'), -+ call(socket.AF_INET6, 'mangle', 'sshuttle-d-1025') - ] - assert mock_ipt_ttl.mock_calls == [] - assert mock_ipt.mock_calls == [ -- call(10, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), -- call(10, 'mangle', '-F', 'sshuttle-m-1025'), -- call(10, 'mangle', '-X', 'sshuttle-m-1025'), -- call(10, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), -- call(10, 'mangle', '-F', 'sshuttle-t-1025'), -- call(10, 'mangle', '-X', 'sshuttle-t-1025'), -- call(10, 'mangle', '-F', 'sshuttle-d-1025'), -- call(10, 'mangle', '-X', 'sshuttle-d-1025') -+ call(socket.AF_INET6, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), -+ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-m-1025'), -+ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-m-1025'), -+ call(socket.AF_INET6, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), -+ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-t-1025'), -+ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-t-1025'), -+ call(socket.AF_INET6, 'mangle', '-F', 'sshuttle-d-1025'), -+ call(socket.AF_INET6, 'mangle', '-X', 'sshuttle-d-1025') - ] - mock_ipt_chain_exists.reset_mock() - mock_ipt_ttl.reset_mock() -@@ -198,68 +200,68 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): - - method.setup_firewall( - 1025, 1027, -- [(2, u'1.2.3.33')], -- 2, -- [(2, 24, False, u'1.2.3.0', 0, 0), (2, 32, True, u'1.2.3.66', 80, 80)], -+ [(socket.AF_INET, u'1.2.3.33')], -+ socket.AF_INET, -+ [(socket.AF_INET, 24, False, u'1.2.3.0', 0, 0), (socket.AF_INET, 32, True, u'1.2.3.66', 80, 80)], - True) - assert mock_ipt_chain_exists.mock_calls == [ -- call(2, 'mangle', 'sshuttle-m-1025'), -- call(2, 'mangle', 'sshuttle-t-1025'), -- call(2, 'mangle', 'sshuttle-d-1025') -+ call(socket.AF_INET, 'mangle', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', 'sshuttle-d-1025') - ] - assert mock_ipt_ttl.mock_calls == [] - assert mock_ipt.mock_calls == [ -- call(2, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), -- call(2, 'mangle', '-F', 'sshuttle-m-1025'), -- call(2, 'mangle', '-X', 'sshuttle-m-1025'), -- call(2, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), -- call(2, 'mangle', '-F', 'sshuttle-t-1025'), -- call(2, 'mangle', '-X', 'sshuttle-t-1025'), -- call(2, 'mangle', '-F', 'sshuttle-d-1025'), -- call(2, 'mangle', '-X', 'sshuttle-d-1025'), -- call(2, 'mangle', '-N', 'sshuttle-m-1025'), -- call(2, 'mangle', '-F', 'sshuttle-m-1025'), -- call(2, 'mangle', '-N', 'sshuttle-d-1025'), -- call(2, 'mangle', '-F', 'sshuttle-d-1025'), -- call(2, 'mangle', '-N', 'sshuttle-t-1025'), -- call(2, 'mangle', '-F', 'sshuttle-t-1025'), -- call(2, 'mangle', '-I', 'OUTPUT', '1', '-j', 'sshuttle-m-1025'), -- call(2, 'mangle', '-I', 'PREROUTING', '1', '-j', 'sshuttle-t-1025'), -- call(2, 'mangle', '-A', 'sshuttle-d-1025', -+ call(socket.AF_INET, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-d-1025'), -+ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-d-1025'), -+ call(socket.AF_INET, 'mangle', '-N', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', '-N', 'sshuttle-d-1025'), -+ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-d-1025'), -+ call(socket.AF_INET, 'mangle', '-N', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', '-I', 'OUTPUT', '1', '-j', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', '-I', 'PREROUTING', '1', '-j', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-d-1025', - '-j', 'MARK', '--set-mark', '1'), -- call(2, 'mangle', '-A', 'sshuttle-d-1025', '-j', 'ACCEPT'), -- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-m', 'socket', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-d-1025', '-j', 'ACCEPT'), -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-m', 'socket', - '-j', 'sshuttle-d-1025', '-m', 'tcp', '-p', 'tcp'), -- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-m', 'socket', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-m', 'socket', - '-j', 'sshuttle-d-1025', '-m', 'udp', '-p', 'udp'), -- call(2, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', - '--set-mark', '1', '--dest', u'1.2.3.33/32', - '-m', 'udp', '-p', 'udp', '--dport', '53'), -- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', - '--tproxy-mark', '0x1/0x1', '--dest', u'1.2.3.33/32', - '-m', 'udp', '-p', 'udp', '--dport', '53', '--on-port', '1027'), -- call(2, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'RETURN', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'RETURN', - '--dest', u'1.2.3.66/32', '-m', 'tcp', '-p', 'tcp', - '--dport', '80:80'), -- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'RETURN', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'RETURN', - '--dest', u'1.2.3.66/32', '-m', 'tcp', '-p', 'tcp', - '--dport', '80:80'), -- call(2, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'RETURN', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'RETURN', - '--dest', u'1.2.3.66/32', '-m', 'udp', '-p', 'udp', - '--dport', '80:80'), -- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'RETURN', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'RETURN', - '--dest', u'1.2.3.66/32', '-m', 'udp', '-p', 'udp', - '--dport', '80:80'), -- call(2, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', - '--set-mark', '1', '--dest', u'1.2.3.0/24', - '-m', 'tcp', '-p', 'tcp'), -- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', - '--tproxy-mark', '0x1/0x1', '--dest', u'1.2.3.0/24', - '-m', 'tcp', '-p', 'tcp', '--on-port', '1025'), -- call(2, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-m-1025', '-j', 'MARK', - '--set-mark', '1', '--dest', u'1.2.3.0/24', - '-m', 'udp', '-p', 'udp'), -- call(2, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', -+ call(socket.AF_INET, 'mangle', '-A', 'sshuttle-t-1025', '-j', 'TPROXY', - '--tproxy-mark', '0x1/0x1', '--dest', u'1.2.3.0/24', - '-m', 'udp', '-p', 'udp', '--on-port', '1025') - ] -@@ -267,22 +269,22 @@ def test_setup_firewall(mock_ipt_chain_exists, mock_ipt_ttl, mock_ipt): - mock_ipt_ttl.reset_mock() - mock_ipt.reset_mock() - -- method.restore_firewall(1025, 2, True) -+ method.restore_firewall(1025, socket.AF_INET, True) - assert mock_ipt_chain_exists.mock_calls == [ -- call(2, 'mangle', 'sshuttle-m-1025'), -- call(2, 'mangle', 'sshuttle-t-1025'), -- call(2, 'mangle', 'sshuttle-d-1025') -+ call(socket.AF_INET, 'mangle', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', 'sshuttle-d-1025') - ] - assert mock_ipt_ttl.mock_calls == [] - assert mock_ipt.mock_calls == [ -- call(2, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), -- call(2, 'mangle', '-F', 'sshuttle-m-1025'), -- call(2, 'mangle', '-X', 'sshuttle-m-1025'), -- call(2, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), -- call(2, 'mangle', '-F', 'sshuttle-t-1025'), -- call(2, 'mangle', '-X', 'sshuttle-t-1025'), -- call(2, 'mangle', '-F', 'sshuttle-d-1025'), -- call(2, 'mangle', '-X', 'sshuttle-d-1025') -+ call(socket.AF_INET, 'mangle', '-D', 'OUTPUT', '-j', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-m-1025'), -+ call(socket.AF_INET, 'mangle', '-D', 'PREROUTING', '-j', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-t-1025'), -+ call(socket.AF_INET, 'mangle', '-F', 'sshuttle-d-1025'), -+ call(socket.AF_INET, 'mangle', '-X', 'sshuttle-d-1025') - ] - mock_ipt_chain_exists.reset_mock() - mock_ipt_ttl.reset_mock() diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index dc8f5b25c41..960d11521a7 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,6 +1,6 @@ { stdenv, python3Packages, fetchurl, makeWrapper, pandoc -, coreutils, iptables, nettools, openssh, procps }: - +, coreutils, iptables, nettools, openssh, procps, fetchpatch }: + python3Packages.buildPythonApplication rec { name = "sshuttle-${version}"; version = "0.78.3"; @@ -10,7 +10,13 @@ python3Packages.buildPythonApplication rec { url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; }; - patches = [ ./sudo.patch ./darwin.patch ]; + patches = [ + ./sudo.patch + (fetchpatch { + url = "https://github.com/sshuttle/sshuttle/commit/91aa6ff625f7c89a19e6f8702425cfead44a146f.patch"; + sha256 = "0sqcc6kj53wlas2d3klbyilhns6vakzwbbp8y7j9wlmbnc530pks"; + }) + ]; nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ]; buildInputs = @@ -29,7 +35,7 @@ python3Packages.buildPythonApplication rec { wrapProgram $out/bin/sshuttle \ --prefix PATH : "${mapPath (x: "${x}/bin") buildInputs}" \ ''; - + meta = with stdenv.lib; { homepage = https://github.com/sshuttle/sshuttle/; description = "Transparent proxy server that works as a poor man's VPN"; From 95f3e6ca320556e8ced5582fd0ca46d726282ade Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 17 Sep 2017 15:32:51 +0200 Subject: [PATCH 0147/2806] stupidterm: init at 2017-03-15 Stupidterm is a simple and fast VTE-Based terminal emulator which is configured by a simple ini-file. fixes #29779 --- pkgs/applications/misc/stupidterm/default.nix | 36 +++++++++++++++++++ .../misc/stupidterm/stupidterm.desktop | 9 +++++ pkgs/top-level/all-packages.nix | 5 +++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/applications/misc/stupidterm/default.nix create mode 100644 pkgs/applications/misc/stupidterm/stupidterm.desktop diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix new file mode 100644 index 00000000000..5701997fd29 --- /dev/null +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: + +stdenv.mkDerivation rec { + name = "stupidterm-2017-03-15"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ vte gtk ]; + + src = fetchFromGitHub { + owner = "esmil"; + repo = "stupidterm"; + rev = "752316a783f52317ffd9f05d32e208dbcafc5ba6"; + sha256 = "1d8fyhr9sgpxgkwzkyiws0kvhmqfwwyycvcr1qf2wjldiax222lv"; + }; + + makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm"; + + installPhase = '' + mkdir -p $out/bin $out/share/applications $out/share/stupidterm + cp stupidterm $out/bin + substituteAll ${./stupidterm.desktop} $out/share/applications/stupidterm.desktop + substituteAll stupidterm.ini $out/share/stupidterm/stupidterm.ini + ''; + + meta = with stdenv.lib; { + description = "Simple wrapper around the VTE terminal emulator widget for GTK+"; + longDescription = '' + Simple wrapper around the VTE terminal emulator widget for GTK+ + ''; + homepage = https://github.com/esmil/stupidterm; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/stupidterm/stupidterm.desktop b/pkgs/applications/misc/stupidterm/stupidterm.desktop new file mode 100644 index 00000000000..c26d4606018 --- /dev/null +++ b/pkgs/applications/misc/stupidterm/stupidterm.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=20170315 +Name=stupidterm +Comment=VTE based terminal emulator +Exec=stupidterm +Icon=utilities-terminal +Terminal=false +Type=Application +Categories=System;TerminalEmulator; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77c449c9562..8b656248c3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16238,6 +16238,11 @@ with pkgs; ssvnc = callPackage ../applications/networking/remote/ssvnc { }; + stupidterm = callPackage ../applications/misc/stupidterm { + vte = gnome3.vte; + gtk = gtk3; + }; + styx = callPackage ../applications/misc/styx { }; tecoc = callPackage ../applications/editors/tecoc { }; From f1a2b8627e82326293d725bbd6be29eaf2c6ed5e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 26 Sep 2017 08:51:54 +0200 Subject: [PATCH 0148/2806] pythonPackages.channels: 1.1.6 -> 1.1.8 (#29772) --- pkgs/development/python-modules/channels/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 4dfe83f6758..e5c92ffcde2 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildPythonPackage, fetchurl, +{ stdenv, buildPythonPackage, fetchPypi, asgiref, django, daphne }: buildPythonPackage rec { pname = "channels"; name = "${pname}-${version}"; - version = "1.1.6"; + version = "1.1.8"; - src = fetchurl { - url = "mirror://pypi/c/channels/${name}.tar.gz"; - sha256 = "44ab9a1f610ecc9ac25d5f90e7a44f49b18de28a05a26fe34e935af257f1eefe"; + src = fetchPypi { + inherit pname version; + sha256 = "0gsy3hwn1vd709jkw8ay44qrm6aw7qggr312z8xwzq0x4ihjda02"; }; # Files are missing in the distribution From 9164517c18bce89df5ffbfd662b8f7e051de0820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 15 Sep 2017 16:18:09 +0100 Subject: [PATCH 0149/2806] nixos/zfs: import encrypted datasets by default for zfsUnstable --- nixos/modules/tasks/filesystems/zfs.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 145fae432c6..7fee9911532 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -140,6 +140,17 @@ in this once. ''; }; + + requestEncryptionCredentials = mkOption { + type = types.bool; + default = config.boot.zfs.enableUnstable; + description = '' + Request encryption keys or passwords for all encrypted datasets on import. + + Dataset encryption is only supported in zfsUnstable at the moment. + ''; + }; + }; services.zfs.autoSnapshot = { @@ -263,6 +274,10 @@ in assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot; message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot"; } + { + assertion = cfgZfs.requestEncryptionCredentials -> cfgZfs.enableUnstable; + message = "This feature is only available for zfs unstable. Set the NixOS option boot.zfs.enableUnstable."; + } ]; boot = { @@ -306,6 +321,9 @@ in done echo if [[ -n "$msg" ]]; then echo "$msg"; fi + ${lib.optionalString cfgZfs.requestEncryptionCredentials '' + zfs load-key -a + ''} '') rootPools)); }; From 8fcf95f102f6ff58a7363eb18a7aed4a3b1c54b5 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 26 Sep 2017 09:06:51 +0100 Subject: [PATCH 0150/2806] {zfsUnstable,splUnstable}: 2017-09-12 -> 2017-09-26 --- pkgs/os-specific/linux/spl/default.nix | 6 +++--- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 2d8ee2719da..31af8a49de1 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -68,8 +68,8 @@ in }; splUnstable = common { - version = "2017-08-11"; - rev = "9df9692637aeee416f509c7f39655beb2d35b549"; - sha256 = "1dggf6xqgk2f7vccv6cgvr8krj7h9f921szp1j2qbxnnq41m37mi"; + version = "2017-09-26"; + rev = "e8474f9ad3b3d23c3277535c4f53f8fd1e6cbd74"; + sha256 = "1hydfhmngpq31gxkxipqxnin74l760d1ia202h12vsgix9sp32h7"; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c3af49e08f2..6ab9063d719 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -157,10 +157,10 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2017-09-12"; + version = "2017-09-26"; - rev = "ded8f06a3cfee60b3a8ea5309e9c4d0e567ed3b5"; - sha256 = "0yn4fg4a00hpflmmr0jbbhfb921nygpw2xbbjy35abl57k6zk375"; + rev = "7e98073379353a05498ac5a2f1a5df2a2257d6b0"; + sha256 = "1hydfhmngpq31gxkxipqxnin74l760d1ia202h12vsgix9sp32h7"; isUnstable = true; extraPatches = [ From 2f23a83920107678ca1792a11d19e1cb37df3ace Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Tue, 26 Sep 2017 10:14:27 +0200 Subject: [PATCH 0151/2806] php: fix build wrt. new postgres.dev build output Refs commit b0280f598e4b3f6ebf33ad2115734e4735df443a --- 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 ed018a94227..7b832fa6eed 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -99,12 +99,12 @@ let }; postgresql = { - configureFlags = ["--with-pgsql=${postgresql}"]; + configureFlags = ["--with-pgsql=${postgresql.dev}"]; buildInputs = [ postgresql ]; }; pdo_pgsql = { - configureFlags = ["--with-pdo-pgsql=${postgresql}"]; + configureFlags = ["--with-pdo-pgsql=${postgresql.dev}"]; buildInputs = [ postgresql ]; }; From 844f57a5fb18259c70178b94cbd6bb218c3d5e02 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 23 Sep 2017 22:04:52 +0000 Subject: [PATCH 0152/2806] fonts/monoid: disable parallel build (some random fonts are missing) --- pkgs/data/fonts/monoid/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index c745cb88359..77c311ce364 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -13,15 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python fontforge ]; - enableParallelBuilding = true; - buildPhase = '' local _d="" local _l="" for _d in {Monoisome,Source}/*.sfdir; do _l="''${_d##*/}.log" echo "Building $_d (log at $_l)" - python Scripts/build.py ${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} 0 $_d > $_l + python Scripts/build.py 1 0 $_d > $_l done ''; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0ml61zym03n175gpx1gr7812f45lyjm0vzgbqjx91fi58rqlazvm"; + outputHash = "0lbipgygiva3gg1pqw07phpnnf0s6ka9vqdk1pw7bkybjw3f7wzm"; meta = with stdenv.lib; { homepage = http://larsenwork.com/monoid; From dd6591c5067cab6097ad1576ebfc14d55cfb5913 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 26 Sep 2017 08:14:37 +0800 Subject: [PATCH 0153/2806] uchiwa: 0.25.3 -> 0.26.0 --- pkgs/servers/monitoring/uchiwa/bower-packages.nix | 12 ++++++------ pkgs/servers/monitoring/uchiwa/src.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 8a4e0e571b1..95218c76ea7 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,15 +1,15 @@ # Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "0.25.3" "0.25.3" "065qyrm1vyi8fp5d5b0b8q5nk8gwh0kcrckl2q1d30c6zlqshg0v") - (fetchbower "angular" "1.6.5" "~1.6.3" "0iy7crwr2akh6pmfslbnsrw8m91rffqjibjmzza78xmpk1f4hs73") + (fetchbower "uchiwa-web" "0.26.0" "0.26.0" "1p091rsb78wixpj5h5n4sm0a5ad60w6wi1lq7ljy31x5c5srd3l8") + (fetchbower "angular" "1.6.6" "~1.6.3" "1h0irwglk6qybnn5j7g25m01fx61bzjb2ina4l50a73x617s8a7v") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7") - (fetchbower "angular-cookies" "1.6.5" "~1.6.3" "135yipc576gl9svsk30q62mbf70yp9hy0mbsmvx4jrl9kais495p") + (fetchbower "angular-cookies" "1.6.6" "~1.6.3" "0fkhm885mcqvy9c8hb072gby3yay1hcs5d391pshikwam98d093c") (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "19q40hsjhwz8y3phmyrrg27f20qpaknvw44cfx4gliin2zqwwsfk") (fetchbower "angular-moment" "1.0.1" "~1.0.1" "1ydnilyf6nysxxjir51lhn92k7mjqii5277xxdqnpcvc376la244") - (fetchbower "angular-resource" "1.6.5" "~1.6.3" "02jiqnkn14kn69ybb74ajhaxxwh71fh5b1g67fajhirkiimpnmxy") - (fetchbower "angular-route" "1.6.5" "~1.6.3" "1n1q9a9khvqjas0jb277pzk44zjziblrflvh6w0s6im3ljcb6a7g") - (fetchbower "angular-sanitize" "1.6.5" "~1.6.3" "0jj56xwrlyslr3pi94xnbz7xy5g7pwg47p2pnbwhr1a1piwfzh87") + (fetchbower "angular-resource" "1.6.6" "~1.6.3" "119ly273fa0ygb416d03av6z9zb78m618nbdqim7p6vhn07h3sww") + (fetchbower "angular-route" "1.6.6" "~1.6.3" "1gzndkaqjgg2cjmch71nlcf1l0lwkjjjh2xaq1yhgcbj47k0j878") + (fetchbower "angular-sanitize" "1.6.6" "~1.6.3" "1pyw0prnm6pca563kn0cg1sx0mxs7hyhmg06161mjr3n8c978x3y") (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1") (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1rr7xf3a2l15g2nmd9svq8ijy1v0igc5jdpwp21kna1kzc65jg3m") (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z") diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index c0ddf9cb7a4..4b14eea17ff 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "0.25.3-1"; - sha256 = "1sgr9fpjfx7qn7dbiaxhsw7iagcrqi39bjc0ba1lh1db5jh7ymks"; + version = "0.26.0-1"; + sha256 = "10f71wsv43jbbwvw3wicr8r1bml51smfakf4r10mi4zq1l37h77z"; } From 472bb9681d50f263ac092e634070ddd6fcb3f03f Mon Sep 17 00:00:00 2001 From: berdario Date: Tue, 26 Sep 2017 10:58:20 +0100 Subject: [PATCH 0154/2806] rhino: remove dependency on GCJ (#29759) --- pkgs/development/libraries/java/rhino/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index f106bbe6ebc..c3e80fe87f4 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -2,7 +2,6 @@ let version = "1.7R2"; - options = "-Dbuild.compiler=gcj"; # FIXME: We assume GCJ here. xbeans = fetchurl { url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; @@ -33,7 +32,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ant javac jvm ]; - buildPhase = "ant ${options} jar"; + buildPhase = "ant jar"; doCheck = false; # FIXME: Install javadoc as well. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b656248c3f..47f84558e3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10383,8 +10383,8 @@ with pkgs; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { - javac = gcj; - jvm = gcj; + javac = jdk; + jvm = jre; }; rlog = callPackage ../development/libraries/rlog { }; From 1d163835c8c681f3fc56fc488c67edbbf8f63fe4 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 26 Sep 2017 12:01:11 +0200 Subject: [PATCH 0155/2806] bash-supergenpass: init at 2012-11-02 (#29797) * Add fgaz to mantainers * bash-supergenpass: init at 2012-11-02 --- lib/maintainers.nix | 1 + .../security/bash-supergenpass/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 42 insertions(+) create mode 100644 pkgs/tools/security/bash-supergenpass/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 1feb528fd87..af1882f8c2c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -200,6 +200,7 @@ fadenb = "Tristan Helmich "; falsifian = "James Cook "; fare = "Francois-Rene Rideau "; + fgaz = "Francesco Gazzetta "; florianjacob = "Florian Jacob "; flosse = "Markus Kohlhase "; fluffynukeit = "Daniel Austin "; diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix new file mode 100644 index 00000000000..f85d847f5f9 --- /dev/null +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }: + +stdenv.mkDerivation rec { + name = "bash-supergenpass-unstable-${version}"; + version = "2012-11-02"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchFromGitHub { + owner = "lanzz"; + repo = "bash-supergenpass"; + rev = "c84eaa22fb59ab6c390e7f2de7984513347e3a9a"; + sha256 = "0d3l55kdrf6arb98vwwz9ww55ing5w323fg7546v56hlq3hs5qc9"; + }; + + installPhase = '' + install -m755 -D supergenpass.sh "$out/bin/supergenpass" + wrapProgram "$out/bin/supergenpass" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnugrep ]}" + ''; + + meta = with stdenv.lib; { + description = "Bash shell-script implementation of SuperGenPass password generation"; + longDescription = '' + Bash shell-script implementation of SuperGenPass password generation + Usage: ./supergenpass.sh [ ] + + Default is 10, which is also the original SuperGenPass default length. + + The parameter is also optional, but it does not make much sense to omit it. + + supergenpass will ask for your master password interactively, and it will not be displayed on your terminal. + ''; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ fgaz ]; + homepage = https://github.com/lanzz/bash-supergenpass; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47f84558e3f..9894612eab9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1152,6 +1152,8 @@ with pkgs; stagit = callPackage ../development/tools/stagit { }; + bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; + syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; syslogng = callPackage ../tools/system/syslog-ng { }; From 086c636eb7f894a55f752b6164dac4a87d8bcee9 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Tue, 26 Sep 2017 12:50:18 +0200 Subject: [PATCH 0156/2806] kea: fix path to pg_config refs commit b0280f598e4b3f6ebf33ad2115734e4735df443a --- pkgs/tools/networking/kea/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index e1829bcaf7d..cd4c4512169 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-botan-config=${botan}/bin/botan-config-1.10" - "--with-dhcp-pgsql=${postgresql}/bin/pg_config" + "--with-dhcp-pgsql=${postgresql.dev}/bin/pg_config" "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config" ]; From 8815b819264e17b094767e8dfdc49ccdc92070f7 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 26 Sep 2017 12:28:02 +0000 Subject: [PATCH 0157/2806] libmirage: add to top level --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 751aaf73216..44e9be12c29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9259,6 +9259,8 @@ with pkgs; libminc = callPackage ../development/libraries/libminc { }; + libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmkv = callPackage ../development/libraries/libmkv { }; libmms = callPackage ../development/libraries/libmms { }; From 2f3af251be07f7411b75e324eb025092f0c102df Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 26 Sep 2017 12:38:26 +0000 Subject: [PATCH 0158/2806] clojure: correct license (three-clause BSD -> EPLv1.0) This is retroactive. See: https://clojure.org/community/license --- pkgs/development/interpreters/clojure/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 8c724577359..ed2c4db20f7 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation { makeWrapper ${jdk.jre}/bin/java $out/bin/clojure --add-flags "-cp $out/share/java/clojure.jar clojure.main" ''; - meta = { + meta = with stdenv.lib; { description = "A Lisp dialect for the JVM"; homepage = https://clojure.org/; - license = stdenv.lib.licenses.bsd3; + license = licenses.epl10; longDescription = '' Clojure is a dynamic programming language that targets the Java Virtual Machine. It is designed to be a general-purpose language, @@ -43,7 +43,7 @@ stdenv.mkDerivation { offers a software transactional memory system and reactive Agent system that ensure clean, correct, multithreaded designs. ''; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = with stdenv.lib.platforms; unix; + maintainers = with maintainers; [ the-kenny ]; + platforms = platforms.unix; }; } From 5a2a35aef3fbb9f392ee8ac7e3d7727af86f0ceb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 26 Sep 2017 08:50:00 -0400 Subject: [PATCH 0159/2806] git: 2.14.1 -> 2.14.2 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 46c48fd1579..fcf35a9ca34 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.14.1"; + version = "2.14.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1iic3wiihxp3l3k6d4z886v3869c3dzgddjxnd5124wy1rnlqwkg"; + sha256 = "18f70gfzwqd210806hmf94blcd7yv5h9ka6xqkpd2jhijqwp5sah"; }; hardeningDisable = [ "format" ]; From bec98b765d90e209bff7cba7793fdc28df5c455b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 26 Sep 2017 08:52:44 -0400 Subject: [PATCH 0160/2806] kotlin: 1.1.4-2 -> 1.1.50 --- 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 65c2125dfbc..bc24cdfb87e 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.1.4-2"; + version = "1.1.50"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "09sikwk5xxn4b30icbq28mjs4lm9xbj0bv5yjx75r165iz65g2cv"; + sha256 = "01y7m0r5wa2apd05c38h77060javgbj8072vd08lz4qaw6c6445m"; }; propagatedBuildInputs = [ jre ] ; From 19ecb7f287c8a85775a099aec1ce5866fefd38b9 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 26 Sep 2017 04:58:12 +0200 Subject: [PATCH 0161/2806] tor-browser-bundle: init at 7.0.1 (from source) The original browser bundle expects to run from a bundled directory, typically under user's home. This version creates a firefox distribution with preloaded extensions and settings that functions more like an ordinary firefox installation. The approach used here could be generalized to allow specification of custom firefox distributions. Eventually, the code will be factored so that the tbb is just an instance of that more general construct (firefox base + extensions + prefs). Currently, we use the latest upstream versions of extensions and so on. Eventually we want to track the upstream bundle more closely and ideally use the exact same inputs (firefox source, extension sources). To avoid mixing up profile data, all runtime state is stored under $XDG_DATA_HOME/tor-browser. Major TODO items - Pluggable transports - Upstream TBB version parity - Avoid fetchgit - Build NoScript from source (no upstream source repo, however, must rely on third-parties) - Improved notation for packaging extensions - Feature parity with the binary bundle (apulse and runtime purity, in particular) --- .../browsers/tor-browser-bundle/default.nix | 209 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 + 2 files changed, 214 insertions(+) create mode 100644 pkgs/applications/networking/browsers/tor-browser-bundle/default.nix diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix new file mode 100644 index 00000000000..048017cae5b --- /dev/null +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -0,0 +1,209 @@ +{ stdenv +, lib +, fetchurl +, fetchgit + +, tor +, tor-browser-unwrapped + +# Extensions, common +, zip + +# HTTPS Everywhere +, git +, libxml2 # xmllint +, python27 +, python27Packages +, rsync +}: + +let + tor-browser-build_src = fetchgit { + url = "https://git.torproject.org/builders/tor-browser-build.git"; + rev = "refs/tags/tbb-7.5a5-build5"; + sha256 = "0j37mqldj33fnzghxifvy6v8vdwkcz0i4z81prww64md5s8qcsa9"; + }; + + firefoxExtensions = { + https-everywhere = stdenv.mkDerivation rec { + name = "https-everywhere-${version}"; + version = "5.2.21"; + + src = fetchgit { + url = "https://git.torproject.org/https-everywhere.git"; + rev = "refs/tags/${version}"; + sha256 = "0z9madihh4b4z4blvfmh6w1hsv8afyi0x7b243nciq9r4w55xgfa"; + }; + + nativeBuildInputs = [ + git + libxml2 # xmllint + python27 + python27Packages.lxml + rsync + zip + ]; + + buildCommand = '' + cp -dR --no-preserve=mode "$src" src + cd src + + sed -i makexpi.sh -e '104d' # cp -a translations/* fails because the dir is empty ... + $shell ./makexpi.sh ${version} --no-recurse + install -m 444 -Dt $out pkg"/"*.xpi + ''; + + meta = { + homepage = https://gitweb.torproject.org/https-everywhere.git/; + }; + }; + + noscript = fetchurl { + url = https://secure.informaction.com/download/releases/noscript-5.0.10.xpi; + sha256 = "18k5karbaj5mhd9cyjbqgik6044bw88rjalkh6anjanxbn503j6g"; + }; + + torbutton = stdenv.mkDerivation rec { + name = "torbutton-${version}"; + version = "1.9.8.1"; + + src = fetchgit { + url = "https://git.torproject.org/torbutton.git"; + rev = "refs/tags/${version}"; + sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l"; + }; + + nativeBuildInputs = [ zip ]; + + buildCommand = '' + cp -dR --no-preserve=mode "$src" src + cd src + + $shell ./makexpi.sh + install -m 444 -Dt $out pkg"/"*.xpi + ''; + }; + + tor-launcher = stdenv.mkDerivation rec { + name = "tor-launcher-${version}"; + version = "0.2.12.3"; + + src = fetchgit { + url = "https://git.torproject.org/tor-launcher.git"; + rev = "refs/tags/${version}"; + sha256 = "0126x48pjiy2zm4l8jzhk70w24hviaz560ffp4lb9x0ar615bc9q"; + }; + + nativeBuildInputs = [ zip ]; + + buildCommand = '' + cp -dR --no-preserve=mode "$src" src + cd src + + make package + install -m 444 -Dt $out pkg"/"*.xpi + ''; + }; + }; +in +stdenv.mkDerivation rec { + name = "tor-browser-bundle-${version}"; + version = tor-browser-unwrapped.version; + + buildInputs = [ tor-browser-unwrapped tor ]; + + unpackPhase = ":"; + + buildPhase = ":"; + + installPhase = '' + TBBUILD=${tor-browser-build_src}/projects/tor-browser + + self=$out/lib/tor-browser + mkdir -p $self && cd $self + + cp -dR ${tor-browser-unwrapped}/lib"/"*"/"* . + chmod -R +w . + + # Prepare for autoconfig + cat >defaults/pref/autoconfig.js <mozilla.cfg <> torrc-defaults + + cat \ + $TBBUILD/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js \ + $TBBUILD/Bundle-Data/PTConfigs/bridge_prefs.js >> defaults/pref/extension-overrides.js \ + >> defaults/pref/extension-overrides.js + + # Generate a suitable wrapper + mkdir -p $out/bin + cat >$out/bin/tor-browser < Date: Tue, 26 Sep 2017 08:58:58 -0400 Subject: [PATCH 0162/2806] oh-my-zsh: 2017-06-22 -> 2017-09-24 --- pkgs/shells/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 22f5aa48d61..8b8a67c2452 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2017-06-22"; + version = "2017-09-24"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "d848c94804918138375041a9f800f401bec12068"; - sha256 = "0mxmqkdpimwrskqjri3lp3haj1hzf583g7psnv34y3hyymzcx1h6"; + rev = "accdcb2f1c3cca40527fef1fe4ab2d39eb6cf897"; + sha256 = "0jrixz02mdab63yr0s16sr8gzwzhf9xnhad852swnfp3c7qlq06z"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 44beb565409b496fa6763a246e15edf5d0155ea0 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 26 Sep 2017 11:04:27 +0000 Subject: [PATCH 0163/2806] sct: fix segfault when DISPLAY is empty, clean up derivation --- pkgs/tools/X11/sct/DISPLAY-segfault.patch | 10 ++++++ pkgs/tools/X11/sct/default.nix | 41 ++++++++++------------- 2 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 pkgs/tools/X11/sct/DISPLAY-segfault.patch diff --git a/pkgs/tools/X11/sct/DISPLAY-segfault.patch b/pkgs/tools/X11/sct/DISPLAY-segfault.patch new file mode 100644 index 00000000000..6b83afa332b --- /dev/null +++ b/pkgs/tools/X11/sct/DISPLAY-segfault.patch @@ -0,0 +1,10 @@ +--- a/sct.c 2017-09-22 00:44:20.270421881 +0000 ++++ b/sct.c 2017-09-26 10:50:38.964562740 +0000 +@@ -36,6 +36,7 @@ + main(int argc, char **argv) + { + Display *dpy = XOpenDisplay(NULL); ++ if (!dpy) exit(1); + int screen = DefaultScreen(dpy); + Window root = RootWindow(dpy, screen); + diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix index 1890e9c5266..9f45bbe3087 100644 --- a/pkgs/tools/X11/sct/default.nix +++ b/pkgs/tools/X11/sct/default.nix @@ -1,31 +1,26 @@ -{stdenv, fetchurl, libX11, libXrandr}: +{ stdenv, fetchurl, libX11, libXrandr }: + stdenv.mkDerivation rec { name = "sct"; - buildInputs = [libX11 libXrandr]; + src = fetchurl { url = http://www.tedunangst.com/flak/files/sct.c; sha256 = "01f3ndx3s6d2qh2xmbpmhd4962dyh8yp95l87xwrs4plqdz6knhd"; - - # Discussion regarding the checksum and the source code can be found in issue #17163 - # The code seems unmaintained, yet an unknown (probably small change) in the code caused - # failed builds as the checksum had changed. - # The checksum is updated for now, however, this is unpractical and potentially unsafe - # so any future changes might warrant a fork of the (feature complete) project. - # The code is under public domain. - }; - phases = ["patchPhase" "buildPhase" "installPhase"]; - patchPhase = '' - sed -re "/Xlibint/d" ${src} > sct.c - ''; - buildPhase = "gcc -std=c99 sct.c -o sct -lX11 -lXrandr -lm"; - installPhase = '' - mkdir -p "$out/bin" - cp sct "$out/bin" - ''; - meta = { - description = ''A minimal utility to set display colour temperature''; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd; + + unpackPhase = "cat ${src} > sct.c"; + patches = [ ./DISPLAY-segfault.patch ]; + + buildInputs = [ libX11 libXrandr ]; + buildPhase = "cc sct.c -o sct -lm -lX11 -lXrandr"; + + installPhase = "install -Dt $out/bin sct"; + + meta = with stdenv.lib; { + homepage = https://www.tedunangst.com/flak/post/sct-set-color-temperature; + description = "A minimal utility to set display colour temperature"; + maintainers = [ maintainers.raskin ]; + license = licenses.publicDomain; + platforms = with platforms; linux ++ freebsd ++ openbsd; }; } From 4ec02cc3321b968ca265c3b0475d1e18485acfb2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 26 Sep 2017 10:12:22 -0400 Subject: [PATCH 0164/2806] skopeo: 0.1.22 -> 0.1.23 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 9028a796381..2c3fb763dc5 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.22"; + version = "0.1.23"; rev = "v${version}"; goPackagePath = "github.com/projectatomic/skopeo"; @@ -16,7 +16,7 @@ buildGoPackage rec { inherit rev; owner = "projectatomic"; repo = "skopeo"; - sha256 = "0aivs37bcvx3g22a9r3q1vj2ahw323g1vaq9jzbmifm9k0pb07jy"; + sha256 = "1axxnm87fpsd7q28v951ilhmzd42k8wyh741gdfdcajjwglfj0nn"; }; patches = [ From bfaf508f4f68a49aea636c7e29a16fc6dcddf640 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 26 Sep 2017 14:19:36 +0000 Subject: [PATCH 0165/2806] far2l: unstable-2017-07-13 -> unstable-2017-09-25 --- pkgs/applications/misc/far2l/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 1097780723e..3b63c90f060 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -2,15 +2,15 @@ xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }: stdenv.mkDerivation rec { - rev = "de5554dbc0ec69329b75777d4a3b2f01851fc5ed"; - build = "unstable-2017-07-13.git${builtins.substring 0 7 rev}"; + rev = "73e52ccbc7626631b6898c7324413ee1fc09bc0e"; + build = "unstable-2017-09-25.git${builtins.substring 0 7 rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = rev; - sha256 = "07l8w9p6zxm9qgh9wlci584lgv8gd4aw742jaqh9acgkxy9caih8"; + sha256 = "0pg1l2k5ycm6whr39gshpbgw62v51rfz3ddi6qhcx0nyzxcrczy5"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; From 186c120bed6b5d4a9b1549159aa567005402000c Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 30 Aug 2017 21:57:05 -0400 Subject: [PATCH 0166/2806] nixos-install: re-enable --chroot option I forgot to implement it the first time around. Whoops! --- .../modules/installer/tools/nixos-install.sh | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 087fbcd4512..bd6c342ee27 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -102,7 +102,7 @@ fi extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup") # Inherit binary caches from the host -# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not... +# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not... binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')" extraBuildFlags+=(--option "binary-caches" "$binary_caches") @@ -110,8 +110,33 @@ nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")" export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG" unset NIXOS_CONFIG -# TODO: do I need to set NIX_SUBSTITUTERS here or is the --option binary-caches above enough? +# These get created in nixos-prepare-root as well, but we want to make sure they're here in case we're +# running with --chroot. TODO: --chroot should just be split into a separate tool. +mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys" +# Set up some bind mounts we'll want regardless of chroot or not +mount --rbind /dev "$mountPoint/dev" +mount --rbind /proc "$mountPoint/proc" +mount --rbind /sys "$mountPoint/sys" + +# If we asked for a chroot, that means we're not actually installing anything (yeah I was confused too) +# and we just want to run a command in the context of a $mountPoint that we're assuming has already been +# set up by a previous nixos-install invocation. In that case we set up some remaining bind mounts and +# exec the requested command, skipping the rest of the installation procedure. +if [ -n "$runChroot" ]; then + mount -t tmpfs -o "mode=0755" none $mountPoint/run + rm -rf $mountPoint/var/run + ln -s /run $mountPoint/var/run + for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done + for f in /etc/passwd /etc/group; do touch $mountPoint/$f; [ -f "$f" ] && mount --rbind -o ro $f $mountPoint/$f; done + + if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then + echo "$0: installation not finished; cannot chroot into installation directory" + exit 1 + fi + ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system + exec chroot $mountPoint "${chrootCommand[@]}" +fi # A place to drop temporary closures trap "rm -rf $tmpdir" EXIT @@ -145,9 +170,7 @@ nix-store --export $channel_root > $channel_closure # nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store -mount --rbind /dev $mountPoint/dev -mount --rbind /proc $mountPoint/proc -mount --rbind /sys $mountPoint/sys + # Grub needs an mtab. ln -sfn /proc/mounts $mountPoint/etc/mtab From 6498ac609acb2db60a75556315de27bd982132af Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Tue, 26 Sep 2017 22:48:09 +0800 Subject: [PATCH 0167/2806] vim: 8.0.0442 -> 8.0.1150 --- 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 1d661014c77..18e1df4575d 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.0442"; + version = "8.0.1150"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1pyyrkb7k5vhm1ijrh4v2f50lxhrgga5mm0gvmz4v704z0h585yg"; + sha256 = "1k1qkmb2jbymqikrp99q1yjagdf508xzabrw7b08dlh926b2v23j"; }; enableParallelBuilding = true; From 4b85b235348698460f6b0f90b312c6c097d247a7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 26 Sep 2017 16:53:42 +0200 Subject: [PATCH 0168/2806] wlc: Refactor the code The code was a bit messy (unused parameters, etc.) and caused some warnings/errors which could potentially cause some problems. --- pkgs/development/libraries/wlc/default.nix | 35 +++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 832600fed87..2c0f8c78418 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,36 +1,37 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig -, glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs -, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm -, wayland-protocols +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa +, libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols +, libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm }: stdenv.mkDerivation rec { name = "wlc-${version}"; version = "0.0.9"; - src = fetchgit { - url = "https://github.com/Cloudef/wlc"; - rev = "refs/tags/v${version}"; - sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; + src = fetchFromGitHub { + owner = "Cloudef"; + repo = "wlc"; + rev = "v${version}"; fetchSubmodules = true; - }; + sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; + }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev - libX11 libXdamage systemd dbus_libs wayland-protocols + wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa + libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols + libpthreadstubs libXau libXdmcp libXext libXxf86vm ]; - doCheck = true; checkTarget = "test"; - meta = { + meta = with stdenv.lib; { description = "A library for making a simple Wayland compositor"; - homepage = https://github.com/Cloudef/wlc; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. }; } From 05d79c03ec36f8d49d1e2bf2b750c3943c348377 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 26 Sep 2017 17:06:33 +0200 Subject: [PATCH 0169/2806] wlc: 0.0.9 -> 0.0.10 Initially the build was failing but it seems like 4b85b235348698460f6b0f90b312c6c097d247a7 already fixed it. --- pkgs/development/libraries/wlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 2c0f8c78418..06e5af6cd5a 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "Cloudef"; repo = "wlc"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; + sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k"; }; nativeBuildInputs = [ cmake pkgconfig ]; From bc0aec5d974a6a3269aeb4cec582e51baa433853 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 20 Sep 2017 11:33:29 -0400 Subject: [PATCH 0170/2806] doc: Document forthcomming NIX_DEBUG degredations --- doc/stdenv.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index dac53bc2b80..a097762130a 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1,4 +1,3 @@ - @@ -188,11 +187,13 @@ genericBuild NIX_DEBUG - If set, stdenv will print some - debug information during the build. In particular, the - gcc and ld wrapper scripts - will print out the complete command line passed to the wrapped - tools. + + A natural number indicating how much information to log. + If set to 1 or higher, stdenv will print moderate debug information during the build. + In particular, the gcc and ld wrapper scripts will print out the complete command line passed to the wrapped tools. + If set to 6 or higher, the stdenv setup script will be run with set -x tracing. + If set to 7 or higher, the gcc and ld wrapper scripts will also be run with set -x tracing. + From 127a5f3357eeebc4797fdce66b99b02b831a3a3f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 19 Sep 2017 19:10:49 -0400 Subject: [PATCH 0171/2806] treewide: Use `(( "${NIX_DEBUG:-0}" >= 1) ))` consistently --- .../build-support/cc-wrapper/add-hardening.sh | 22 +++++++++---------- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 2 +- .../cc-wrapper/gnatlink-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/ld-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/utils.sh | 2 +- pkgs/stdenv/generic/setup.sh | 6 ++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 34358e04194..b0e39e455ff 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -16,14 +16,14 @@ do hardeningDisableMap[$flag]=1 done -if [[ -n "${NIX_DEBUG:-}" ]]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then printf 'HARDENING: disabled flags:' >&2 (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2 echo >&2 fi if [[ -z "${hardeningDisableMap[all]:-}" ]]; then - if [[ -n "${NIX_DEBUG:-}" ]]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; fi for flag in "${hardeningFlags[@]}" @@ -31,40 +31,40 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then case $flag in fortify) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling fortify >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2') ;; stackprotector) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling stackprotector >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') ;; pie) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling CFlags -fPIE >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi hardeningCFlags+=('-fPIE') if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi hardeningCFlags+=('-pie') hardeningLDFlags+=('-pie') fi ;; pic) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling pic >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi hardeningCFlags+=('-fPIC') ;; strictoverflow) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling strictoverflow >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi hardeningCFlags+=('-fno-strict-overflow') ;; format) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling format >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') ;; relro) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling relro >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi hardeningLDFlags+=('-z' 'relro') ;; bindnow) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling bindnow >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi hardeningLDFlags+=('-z' 'now') ;; *) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index aacaf196f31..f5bcfc9f985 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -161,7 +161,7 @@ if [ "$*" = -v ]; then fi # Optionally print debug info. -if [ -n "${NIX_DEBUG:-}" ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then # Old bash workaround, see ld-wrapper for explanation. echo "extra flags before to @prog@:" >&2 printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index f0c922a3d5b..42df660211b 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -109,7 +109,7 @@ fi #fi # Optionally print debug info. -if [ -n "${NIX_DEBUG:-}" ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "extra flags before to @prog@:" >&2 printf " %q\n" "${extraBefore[@]}" >&2 echo "original flags to @prog@:" >&2 diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh index 2de748b5f31..b0615731b28 100644 --- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh @@ -24,7 +24,7 @@ extraBefore=() #export NIX_@infixSalt@_LDFLAGS_SET=1 # Optionally print debug info. -if [ -n "${NIX_DEBUG:-}" ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "extra flags before to @prog@:" >&2 printf " %q\n" "${extraBefore[@]}" >&2 echo "original flags to @prog@:" >&2 diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index a9cc1e3f9e6..a849df86ef0 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -156,7 +156,7 @@ fi # Optionally print debug info. -if [ -n "${NIX_DEBUG:-}" ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then # Old bash workaround, see above. echo "extra flags before to @prog@:" >&2 printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index c84a094e26b..c43c2e12d74 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -1,5 +1,5 @@ skip () { - if [ -n "${NIX_DEBUG:-}" ]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "skipping impure path $1" >&2 fi } diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ce8c3ecef82..524caafc872 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -269,7 +269,7 @@ for i in $initialPath; do addToSearchPath PATH "$i/bin" done -if [ "${NIX_DEBUG:-}" = 1 ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "initial path: $PATH" fi @@ -429,7 +429,7 @@ fi PATH="${_PATH-}${_PATH:+${PATH:+:}}$PATH" -if [ "${NIX_DEBUG:-}" = 1 ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "final path: $PATH" fi @@ -539,7 +539,7 @@ substituteAll() { local -a args=() for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do - if [ "${NIX_DEBUG:-}" = "1" ]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then printf "@%s@ -> %q\n" "${varName}" "${!varName}" fi args+=("--subst-var" "$varName") From f6fcb9bc0d33e59b09d1b4b9e15d83260954f850 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 19 Sep 2017 19:11:29 -0400 Subject: [PATCH 0172/2806] stdenv: Turn on `set -x` if NIX_DEBUG >= 6 Why 6? It seems a decently high number, giving us room for more degrees of debugging before the `set -x` sledgehammer without incurring a mass-rebuild. --- pkgs/stdenv/generic/setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 524caafc872..02da3829c5a 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,6 +1,10 @@ set -eu set -o pipefail +if (( "${NIX_DEBUG:-0}" >= 6 )); then + set -x +fi + : ${outputs:=out} From 0d3d2a01d20d88dde3696ead43c557c1f3043ee7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 20 Sep 2017 11:35:58 -0400 Subject: [PATCH 0173/2806] cc-wrapper: Add `set -x` tracing for NIX_DEBUG >= 7 --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 4 ++++ pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 4 ++++ pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh | 4 ++++ pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh | 4 ++++ pkgs/build-support/cc-wrapper/ld-wrapper.sh | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index f5bcfc9f985..e6f5a5a9f7d 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + path_backup="$PATH" # That @-vars are substituted separately from bash evaluation makes diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index 42df660211b..b15f1e461e5 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + # N.B. Gnat is not used during bootstrapping, so we don't need to # worry about the old bash empty array `set -u` workarounds. diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh index b0615731b28..88e644dc54d 100644 --- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + # N.B. Gnat is not used during bootstrapping, so we don't need to # worry about the old bash empty array `set -u` workarounds. diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh index 72c999ff8bc..5d81e34a047 100755 --- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + declare -a args=("$@") # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index a849df86ef0..355ea881898 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + path_backup="$PATH" # phase separation makes this look useless From 2d854c4c920ed6e81bdf2a22548fc11272ad6944 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 26 Sep 2017 14:39:10 +0200 Subject: [PATCH 0174/2806] imagemagick: 6.9.9-7 -> 6.9.9-15 for multiple CVEs Too many CVEs to list because they are not tracked upstream by release versions. --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 1cf08f286ef..d01bfa1d950 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-7"; - sha256 = "1lwsz9b8clygdppgawv2hsry4aykgmawjlwhg3fj70rndv4a8rw4"; + version = "6.9.9-15"; + sha256 = "0bxgdc1qiyvag6a2iiqcbwp4ak0m1mzi9qhs51fbrvv6syy12m6c"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. From de4abf7054f677cc692c19dc0589b741d60d9bad Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 26 Sep 2017 14:45:22 +0200 Subject: [PATCH 0175/2806] imagemagick7: 7.0.6-4 -> 7.0.7-4 for multiple CVEs Too many CVEs to list because they are not tracked upstream by release versions. --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index cd99861ea7b..a70a67d548f 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.6-4"; - sha256 = "0fvkx9lf8g0sa9bccd9s5qyhcy0g1mqnkbpqly55ryxyg1ywxqaz"; + version = "7.0.7-4"; + sha256 = "074w4jm5s98b8dxwjl8lljvdhmm3mbg1ikgjy1mw3c1sb08z3nc8"; patches = []; }; in From 4d7d5c8c34e9324c557ddeb4bf9f31a5a72b5afe Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 26 Sep 2017 17:28:16 +0200 Subject: [PATCH 0176/2806] libressl_2_6: 2.6.0 -> 2.6.2 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 4ce1b664725..4818a720a30 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -33,7 +33,7 @@ in { }; libressl_2_6 = generic { - version = "2.6.0"; - sha256 = "0lwapvfda4zj4r0kxn9ys43l5wyfgpljmhq0j1lr45spfis5b3g4"; + version = "2.6.2"; + sha256 = "0y64grb2zx98rjp2lbwihyhbml4z5ih3v7ydbxdvmabj5d4x4adh"; }; } From 676f5cb02cdbb2761abdf7108ff35586eccf3e9a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 26 Sep 2017 17:24:13 +0200 Subject: [PATCH 0177/2806] sway: Fix the build While the last wlc upgrade (05d79c03ec36f8d49d1e2bf2b750c3943c348377) makes it possible to build sway 0.14.0 it also breaks the current build of sway 0.13.0. Unfortunately sway 0.14.0 segfaults on launch and I couldn't fix it yet (there are multiple upstream issues as well). I'll overwrite the wlc version for sway in order to have a usable version in nixpkgs for the meantime. --- .../window-managers/sway/default.nix | 83 ++++++++++++------- 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index ac725733d64..274325b6785 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,45 +1,64 @@ -{ stdenv, fetchFromGitHub, pango, libinput -, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo -, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap -, xwayland, pam, gdk_pixbuf +{ stdenv, fetchFromGitHub +, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl +, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs +, pango, cairo, libinput, libcap, xwayland, pam, gdk_pixbuf, libpthreadstubs +, libXdmcp }: let version = "0.13.0"; -in - stdenv.mkDerivation rec { - name = "sway-${version}"; + # Temporary workaround (0.14.0 segfaults) + wlc_009 = stdenv.lib.overrideDerivation wlc (oldAttrs: rec { + name = "wlc-${version}"; + version = "0.0.9"; src = fetchFromGitHub { - owner = "Sircmpwn"; - repo = "sway"; - rev = "${version}"; - sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q"; + owner = "Cloudef"; + repo = "wlc"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; }; + }); +in stdenv.mkDerivation rec { + name = "sway-${version}"; - nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; + src = fetchFromGitHub { + owner = "Sircmpwn"; + repo = "sway"; + rev = "${version}"; + sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q"; + }; - buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland pam gdk_pixbuf ]; + nativeBuildInputs = [ + makeWrapper cmake pkgconfig + asciidoc libxslt docbook_xsl + ]; + buildInputs = [ + wayland wlc_009 libxkbcommon pixman fontconfig pcre json_c dbus_libs + pango cairo libinput libcap xwayland pam gdk_pixbuf libpthreadstubs + libXdmcp + ]; - patchPhase = '' - sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; - ''; + patchPhase = '' + sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; + ''; - makeFlags = "PREFIX=$(out)"; - cmakeFlags = "-DVERSION=${version}"; - installPhase = "PREFIX=$out make install"; + makeFlags = "PREFIX=$(out)"; + cmakeFlags = "-DVERSION=${version}"; + installPhase = "PREFIX=$out make install"; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; - preFixup = '' - wrapProgram $out/bin/sway \ - --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; - ''; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc_009 dbus_libs ]; + preFixup = '' + wrapProgram $out/bin/sway \ + --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; + ''; - meta = with stdenv.lib; { - description = "i3-compatible window manager for Wayland"; - homepage = "http://swaywm.org"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; - }; - } + meta = with stdenv.lib; { + description = "i3-compatible window manager for Wayland"; + homepage = http://swaywm.org; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. + }; +} From 61fbdb47a69f78998f55207e64122a0798047b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Sep 2017 19:00:13 +0200 Subject: [PATCH 0178/2806] haskellPackages.foundation: disable tests on darwin --- pkgs/development/haskell-modules/configuration-nix.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6b0eb8c7002..91e95de94af 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -227,6 +227,12 @@ self: super: builtins.intersectAttrs super { # /homeless-shelter. Disabled. purescript = dontCheck super.purescript; + # https://github.com/haskell-foundation/foundation/pull/412 + foundation = + if pkgs.stdenv.isDarwin + then dontCheck super.foundation + else super.foundation; + # Hardcoded include path poppler = overrideCabal super.poppler (drv: { postPatch = '' From fbc8fa8b42447b0014d8838e36494f3aebe4dec1 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 21 Sep 2017 15:12:36 +0000 Subject: [PATCH 0179/2806] mba6x_bl: update to 2016-12-08 --- pkgs/os-specific/linux/mba6x_bl/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 3116c50435a..a656db30645 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -1,23 +1,16 @@ { fetchFromGitHub, kernel, stdenv }: -with stdenv.lib; - -let pkgName = "mba6x_bl"; -in - stdenv.mkDerivation rec { - name = "${pkgName}-${version}"; - version = "2016-04-22"; + name = "mba6x_bl-2016-12-08"; src = fetchFromGitHub { owner = "patjak"; - repo = pkgName; - rev = "d05c125efe182376ddab30d486994ec00e144650"; - sha256 = "15h90z3ijq4lv37nmx70xqggcvn21vr7mki2psk1jyj88in3j3xn"; + repo = "mba6x_bl"; + rev = "b96aafd30c18200b4ad1f6eb995bc19200f60c47"; + sha256 = "10payvfxahazdxisch4wm29fhl8y07ki72q4c78sl4rn73sj6yjq"; }; enableParallelBuilding = true; - hardeningDisable = [ "pic" ]; makeFlags = [ @@ -25,7 +18,7 @@ stdenv.mkDerivation rec { "INSTALL_MOD_PATH=$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "MacBook Air 6,1 and 6,2 (mid 2013) backlight driver"; homepage = https://github.com/patjak/mba6x_bl; license = licenses.gpl2; From a33402b89009094d7c7b43d9f3c542120a8b55d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 26 Sep 2017 19:31:30 +0200 Subject: [PATCH 0180/2806] wlc: fix homepage / eval --- pkgs/development/libraries/wlc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 06e5af6cd5a..936c88034aa 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for making a simple Wayland compositor"; - inherit (src.meta) homepage; + homepage = https://github.com/Cloudef/wlc; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. From d349f9a34006cc484b5e7509a3f227d52d6e2a5d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 20 Sep 2017 11:07:52 -0400 Subject: [PATCH 0181/2806] cc-wrapper: Use stdenvNoCC to build cc-wrapper may wrap a cc-compiler, but it doesn't need one to build itself. (c.f. expand-response-params is a separate derivation.) This helps avoid cycles on the cross stuff, in addition to removing a useless dependency edge. I could have been super careful with overrides in the stdenv to avoid the mass rebuild, but I don't think it's worth it. --- pkgs/build-support/cc-wrapper/default.nix | 7 ++++--- pkgs/stdenv/darwin/default.nix | 4 ++-- pkgs/stdenv/freebsd/default.nix | 2 +- pkgs/stdenv/linux/default.nix | 4 ++-- pkgs/stdenv/native/default.nix | 3 ++- pkgs/stdenv/nix/default.nix | 13 +++++-------- pkgs/top-level/all-packages.nix | 4 ++-- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 866be9cded9..489fb02dcb5 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -5,15 +5,15 @@ # script that sets up the right environment variables so that the # compiler and the linker just "work". -{ name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell +{ name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenvNoCC.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} , useMacosReexportHack ? false }: -with stdenv.lib; +with stdenvNoCC.lib; assert nativeTools -> nativePrefix != ""; assert !nativeTools -> @@ -25,6 +25,7 @@ assert (noLibc || nativeLibc) == (libc == null); assert cc.langVhdl or false -> zlib != null; let + stdenv = stdenvNoCC; inherit (stdenv) hostPlatform targetPlatform; # Prefix for binaries. Customarily ends with a dash separator. diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b7f750508e8..a67ca53e1c5 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -77,7 +77,7 @@ in rec { cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { inherit shell; - inherit (last) stdenv; + inherit (last) stdenvNoCC; nativeTools = false; nativeLibc = false; @@ -324,7 +324,7 @@ in rec { shell = "${pkgs.bash}/bin/bash"; cc = lib.callPackageWith {} ../../build-support/cc-wrapper { - inherit (pkgs) stdenv; + inherit (pkgs) stdenvNoCC; inherit shell; nativeTools = false; nativeLibc = false; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index c10d1515a3d..6ab8bf21726 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -77,7 +77,7 @@ let inherit (localSystem) system; in nativeTools = true; nativePrefix = "/usr"; nativeLibc = true; - inherit (prevStage) stdenv; + stdenvNoCC = prevStage.stdenv; cc = { name = "clang-9.9.9"; cc = "/usr"; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e79ec48e9f4..a114ab609e6 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -84,7 +84,7 @@ let libc = prevStage.glibc; inherit (prevStage) binutils coreutils gnugrep; name = name; - stdenv = prevStage.ccWrapperStdenv; + stdenvNoCC = prevStage.ccWrapperStdenv; }; extraAttrs = { @@ -244,7 +244,7 @@ in }; cc = prevStage.gcc-unwrapped; libc = self.glibc; - inherit (self) stdenv binutils coreutils gnugrep; + inherit (self) stdenvNoCC binutils coreutils gnugrep; name = ""; shell = self.bash + "/bin/bash"; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 9ecb56028bc..558a77281ed 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -117,6 +117,7 @@ in cc = null; fetchurl = null; }; + stdenvNoCC = stdenv; cc = import ../../build-support/cc-wrapper { name = "cc-native"; @@ -126,7 +127,7 @@ in "i686-solaris" = "/usr/gnu"; "x86_64-solaris" = "/opt/local/gcc47"; }.${system} or "/usr"; - inherit stdenv; + inherit stdenvNoCC; }; fetchurl = import ../../build-support/fetchurl { diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index c736442dc0a..ffff8bdf51d 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,5 +1,5 @@ { lib -, crossSystem, config +, crossSystem, config, overlays , bootStages , ... }: @@ -7,9 +7,7 @@ assert crossSystem == null; bootStages ++ [ - (prevStage: let - inherit (prevStage) stdenv; - in { + (prevStage: { inherit config overlays; stdenv = import ../generic rec { @@ -27,10 +25,9 @@ bootStages ++ [ cc = import ../../build-support/cc-wrapper { nativeTools = false; - nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr"; + nativePrefix = lib.optionalString hostPlatform.isSunOS "/usr"; nativeLibc = true; - inherit stdenv; - inherit (prevStage) binutils coreutils gnugrep; + inherit (prevStage) stdenvNoCC binutils coreutils gnugrep; cc = prevStage.gcc.cc; isGNU = true; shell = prevStage.bash + "/bin/sh"; @@ -38,7 +35,7 @@ bootStages ++ [ shell = prevStage.bash + "/bin/sh"; - fetchurlBoot = stdenv.fetchurlBoot; + fetchurlBoot = prevStage.stdenv.fetchurlBoot; overrides = self: super: { inherit cc; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 860567283b8..94aebfe7fb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6207,11 +6207,11 @@ with pkgs; wla-dx = callPackage ../development/compilers/wla-dx { }; - wrapCCWith = { name ? "", cc, libc, extraBuildCommands ? "" }: ccWrapperFun { + wrapCCWith = { name ? "", cc, libc, extraBuildCommands ? "" }: ccWrapperFun rec { nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false; nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; - noLibc = (libc == null); + noLibc = !nativeLibc && (libc == null); isGNU = cc.isGNU or false; isClang = cc.isClang or false; From f27feb548164a0b510f5f79feece1542ef7c4844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 20 Sep 2017 12:01:13 +0100 Subject: [PATCH 0182/2806] dino: 2017-06-21 -> 2017-09-20 --- .../networking/instant-messengers/dino/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index eff9b71daa6..80e6af9c1ef 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,7 +2,7 @@ , vala, cmake, wrapGAppsHook, pkgconfig, gettext , gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking , xorg, libXdmcp, libxkbcommon -, libnotify +, libnotify, libsoup , libgcrypt , epoxy , at_spi2_core @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2017-06-21"; + name = "dino-unstable-2017-09-26"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "3f0089db86e2057293a33453361678989919147f"; - sha256 = "011wd6qi8nagig8418hibgnsmznd76dvp3p2dzzr4wyrb7d6cgcb"; + rev = "9d8e1e88ec61403659a8cc410d5c4414e3bd3a96"; + sha256 = "1p8sda99n8zsb49qd6wzwb8hddlgrzr2hp7il5v7yqxjjm2vgqfl"; fetchSubmodules = true; }; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { libnotify gpgme libgcrypt + libsoup pcre xorg.libxcb xorg.libpthreadstubs From 0ddca0715acd90491db27286adb9b459e24403f8 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 26 Sep 2017 19:06:22 +0000 Subject: [PATCH 0183/2806] epsxe: init at 2.0.5 (#29810) * epsxe: init at 2.0.5 * epsxe: nitpicks --- lib/maintainers.nix | 1 + pkgs/misc/emulators/epsxe/default.nix | 55 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 58 insertions(+) create mode 100644 pkgs/misc/emulators/epsxe/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index af1882f8c2c..a978313c42c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -653,6 +653,7 @@ xvapx = "Marti Serra "; xwvvvvwx = "David Terry "; yarr = "Dmitry V. "; + yegortimoshenko = "Yegor Timoshenko "; yochai = "Yochai "; yorickvp = "Yorick van Pelt "; yuriaisaka = "Yuri Aisaka "; diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix new file mode 100644 index 00000000000..1d49dee5589 --- /dev/null +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, gcc, glib, gtk3, + libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "epsxe-${version}"; + version = "2.0.5"; + + src = with stdenv.lib; let + version2 = concatStrings (splitString "." version); + platform = "linux" + (optionalString stdenv.is64bit "_x64"); + in fetchurl { + url = "http://www.epsxe.com/files/ePSXe${version2}${platform}.zip"; + sha256 = if stdenv.is64bit + then "16fa9qc2xhaz1f6294m0b56s5l86cbmclwm9w3mqnch0yjsrvab0" + else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl"; + }; + + nativeBuildInputs = [ unzip wrapGAppsHook ]; + sourceRoot = "."; + + buildInputs = [ + alsaLib + curl + gdk_pixbuf + glib + gtk3 + libX11 + openssl + ncurses5 + SDL + SDL_ttf + stdenv.cc.cc.lib + zlib + ]; + + dontStrip = true; + + installPhase = '' + install -D epsxe${optionalString stdenv.is64bit "_x64"} $out/bin/epsxe + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath ${makeLibraryPath buildInputs} \ + $out/bin/epsxe + ''; + + meta = { + homepage = http://epsxe.com/; + description = "Enhanced PSX (PlayStation 1) emulator"; + license = licenses.unfree; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 833322f3fd2..bbd6a59088d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1883,6 +1883,8 @@ with pkgs; epstool = callPackage ../tools/graphics/epstool { }; + epsxe = callPackage ../misc/emulators/epsxe { }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; From c3e6e9b7656f9a77b5ad7015732f848dfba80b2d Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 26 Sep 2017 19:20:30 +0000 Subject: [PATCH 0184/2806] epsxe: fix install, 32-bit executable uses mixed case --- pkgs/misc/emulators/epsxe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 1d49dee5589..e367d6a1498 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { dontStrip = true; installPhase = '' - install -D epsxe${optionalString stdenv.is64bit "_x64"} $out/bin/epsxe + install -D ${if stdenv.is64bit then "epsxe_x64" else "ePSXe"} $out/bin/epsxe patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ --set-rpath ${makeLibraryPath buildInputs} \ From 2ba02c57e82651a8cfa9fcbe850b672787ca5b41 Mon Sep 17 00:00:00 2001 From: Unai Zalakain Date: Tue, 26 Sep 2017 20:35:11 +0100 Subject: [PATCH 0185/2806] AgdaStdlib: 0.13 -> 0.14 --- pkgs/development/libraries/agda/agda-stdlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 866bccd3fd6..815e0f20b54 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "0.13"; + version = "0.14"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "156xbqvqjck9izz613v52ppwk8s1y0kv7xkjpcm16vys2c3bh0x5"; + sha256 = "0qx72w6lwskp18q608f95j5dcxb9xr4q4mzdkxp01sgib8v2v56l"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; From 4ec3d311cb0271e72420045622688b701a3b61a3 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Tue, 26 Sep 2017 02:32:06 +0300 Subject: [PATCH 0186/2806] nvidia-x11: generate nvidia_icd.json from template --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 99813d38236..cd7733f43a4 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -46,7 +46,8 @@ installPhase() { # Install ICDs. install -Dm644 nvidia.icd $out/etc/OpenCL/vendors/nvidia.icd - if [ -e nvidia_icd.json ]; then + if [ -e nvidia_icd.json.template ]; then + sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json install -Dm644 nvidia_icd.json $out/share/vulkan/icd.d/nvidia.json fi if [ "$useGLVND" = "1" ]; then From 6ab200b066befbe86b3f9349531100edbf5130c4 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 26 Sep 2017 22:40:02 +0200 Subject: [PATCH 0187/2806] 17.09 release notes: fix typo --- nixos/doc/manual/release-notes/rl-1709.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index c951934e623..d5ab6ab0c24 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -344,7 +344,7 @@ FLUSH PRIVILEGES; - Definitions for /etc/hosts can now be sped + Definitions for /etc/hosts can now be specified declaratively with networking.hosts. From 8984a761234504e9866443c0458589acfb259233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 26 Sep 2017 22:52:14 +0200 Subject: [PATCH 0188/2806] clangWrapSelf: fixup evaluation after #29617 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43cec9a5a9f..e8c1c2b3e04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5351,7 +5351,7 @@ with pkgs; clangWrapSelf = build: ccWrapperFun { cc = build; isClang = true; - stdenv = clangStdenv; + inherit stdenvNoCC; libc = glibc; extraPackages = [ libcxx libcxxabi ]; nativeTools = false; From c03326445b067dca37ea323d998ffa3d520adb6d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Sep 2017 22:37:38 +0200 Subject: [PATCH 0189/2806] firefox: Remove about:buildconfig Storing the build configuration caused Firefox to retain a dependency on gcc, glibc.dev and icu4c.dev. This reduces the size of the firefox closure from 587 to 415 MiB. --- .../browsers/firefox/no-buildconfig.patch | 25 +++++++++++++++++++ .../networking/browsers/firefox/packages.nix | 10 +++++--- .../networking/browsers/firefox/wrapper.nix | 2 ++ 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/browsers/firefox/no-buildconfig.patch diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch new file mode 100644 index 00000000000..83f9a1329be --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch @@ -0,0 +1,25 @@ +diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp +--- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 ++++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 +@@ -40,10 +40,6 @@ + nsIAboutModule::ALLOW_SCRIPT + }, + { +- "buildconfig", "chrome://global/content/buildconfig.html", +- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT +- }, +- { + "checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT +diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolkit/content/jar.mn +--- firefox-55.0.3-orig/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200 ++++ firefox-55.0.3/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200 +@@ -40,7 +40,6 @@ + content/global/plugins.css + content/global/browser-child.js + content/global/browser-content.js +-* content/global/buildconfig.html + content/global/contentAreaUtils.js + #ifndef MOZ_FENNEC + content/global/customizeToolbar.css diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 83eb563a8e7..e2a8e201fef 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -12,10 +12,12 @@ rec { sha512 = "3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416"; }; - patches = lib.optional stdenv.isi686 (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; - sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; - }); + patches = + [ ./no-buildconfig.patch ] + ++ lib.optional stdenv.isi686 (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; + sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; + }); meta = { description = "A web browser built from Firefox source tree"; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 1dd5c9191f0..2413f1cfdca 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -129,6 +129,8 @@ in stdenv.mkDerivation { passthru = { unwrapped = browser; }; + disallowedRequisites = [ stdenv.cc ]; + meta = browser.meta // { description = browser.meta.description From af44f99dca62abc5d569cb824a64f766e308d419 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Sep 2017 23:07:10 +0200 Subject: [PATCH 0190/2806] ibus: Move ibus-setup to .dev This removes python3.buildEnv from the runtime closure. --- pkgs/tools/inputmethods/ibus/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 66d61b8c5e9..3b076bb8ff6 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -110,6 +110,10 @@ in stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = "$out/bin/ibus version"; + postInstall = '' + moveToOutput "bin/ibus-setup" "$dev" + ''; + meta = with stdenv.lib; { homepage = https://github.com/ibus/ibus; description = "Intelligent Input Bus for Linux / Unix OS"; From 3ee733aafb687c9a004bedfda8efb3da1af847cc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 27 Sep 2017 00:14:38 +0300 Subject: [PATCH 0191/2806] imlib2: Make 'bin' the first output --- pkgs/development/libraries/imlib2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 8c66dcec161..8d26cabc9b5 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = optional stdenv.isDarwin "--enable-amd64=no" ++ optional (!x11Support) "--without-x"; - outputs = [ "out" "bin" "dev" ]; + outputs = [ "bin" "out" "dev" ]; postInstall = '' moveToOutput bin/imlib2-config "$dev" From fe3b95e749ac851b1d0890f6fc6d8ae5d9004dd8 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 26 Sep 2017 20:26:13 +0200 Subject: [PATCH 0192/2806] tor-browser-bundle: customization via extraPrefs --- .../networking/browsers/tor-browser-bundle/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 048017cae5b..fb3e06a94be 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -15,6 +15,9 @@ , python27 , python27Packages , rsync + +# Customization +, extraPrefs ? "" }: let @@ -154,6 +157,9 @@ stdenv.mkDerivation rec { // Defaults to $XDG_RUNTIME_DIR/Tor/{socks,control}.socket lockPref("extensions.torlauncher.control_port_use_ipc", true); lockPref("extensions.torlauncher.socks_port_use_ipc", true); + + // User customization + ${extraPrefs} EOF # Preload extensions From 346661d77be29e01a05680fb51ed79049963be33 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 26 Sep 2017 20:28:12 +0200 Subject: [PATCH 0193/2806] tor-browser-bundle: redo extensions --- .../browsers/tor-browser-bundle/default.nix | 106 +++++++++++++----- 1 file changed, 78 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index fb3e06a94be..96d9feabc15 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -2,11 +2,13 @@ , lib , fetchurl , fetchgit +, symlinkJoin , tor , tor-browser-unwrapped # Extensions, common +, unzip , zip # HTTPS Everywhere @@ -27,11 +29,16 @@ let sha256 = "0j37mqldj33fnzghxifvy6v8vdwkcz0i4z81prww64md5s8qcsa9"; }; + # Each extension drv produces an output comprising an unpacked .xpi + # named after the extension uuid, as it would appear under + # `firefox/extensions'. firefoxExtensions = { https-everywhere = stdenv.mkDerivation rec { name = "https-everywhere-${version}"; version = "5.2.21"; + extid = "https-everywhere-eff@eff.org"; + src = fetchgit { url = "https://git.torproject.org/https-everywhere.git"; rev = "refs/tags/${version}"; @@ -44,16 +51,24 @@ let python27 python27Packages.lxml rsync + unzip zip ]; - buildCommand = '' + unpackPhase = '' cp -dR --no-preserve=mode "$src" src cd src + ''; - sed -i makexpi.sh -e '104d' # cp -a translations/* fails because the dir is empty ... + # Beware: the build expects translations/ to be non-empty (which it + # will be with submodules initialized). + buildPhase = '' $shell ./makexpi.sh ${version} --no-recurse - install -m 444 -Dt $out pkg"/"*.xpi + ''; + + installPhase = '' + mkdir $out + unzip -d "$out/$extid" "pkg/https-everywhere-$version-eff.xpi" ''; meta = { @@ -61,53 +76,98 @@ let }; }; - noscript = fetchurl { - url = https://secure.informaction.com/download/releases/noscript-5.0.10.xpi; - sha256 = "18k5karbaj5mhd9cyjbqgik6044bw88rjalkh6anjanxbn503j6g"; + noscript = stdenv.mkDerivation rec { + name = "noscript-${version}"; + version = "5.0.10"; + + extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}"; + + src = fetchurl { + url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi"; + sha256 = "18k5karbaj5mhd9cyjbqgik6044bw88rjalkh6anjanxbn503j6g"; + }; + + nativeBuildInputs = [ unzip ]; + + unpackPhase = ":"; + + installPhase = '' + mkdir $out + unzip -d "$out/$extid" "$src" + ''; }; torbutton = stdenv.mkDerivation rec { name = "torbutton-${version}"; version = "1.9.8.1"; + extid = "torbutton@torproject.org"; + src = fetchgit { url = "https://git.torproject.org/torbutton.git"; rev = "refs/tags/${version}"; sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l"; }; - nativeBuildInputs = [ zip ]; + nativeBuildInputs = [ unzip zip ]; - buildCommand = '' + unpackPhase = '' cp -dR --no-preserve=mode "$src" src cd src - - $shell ./makexpi.sh - install -m 444 -Dt $out pkg"/"*.xpi ''; + + buildPhase = '' + $shell ./makexpi.sh + ''; + + installPhase = '' + mkdir $out + unzip -d "$out/$extid" "pkg/torbutton-$version.xpi" + ''; + + meta = { + homepage = https://gitweb.torproject.org/torbutton.git/; + }; }; tor-launcher = stdenv.mkDerivation rec { name = "tor-launcher-${version}"; version = "0.2.12.3"; + extid = "tor-launcher@torproject.org"; + src = fetchgit { url = "https://git.torproject.org/tor-launcher.git"; rev = "refs/tags/${version}"; sha256 = "0126x48pjiy2zm4l8jzhk70w24hviaz560ffp4lb9x0ar615bc9q"; }; - nativeBuildInputs = [ zip ]; + nativeBuildInputs = [ unzip zip ]; - buildCommand = '' + unpackPhase = '' cp -dR --no-preserve=mode "$src" src cd src - - make package - install -m 444 -Dt $out pkg"/"*.xpi ''; + + buildPhase = '' + make package + ''; + + installPhase = '' + mkdir $out + unzip -d "$out/$extid" "pkg/tor-launcher-$version.xpi" + ''; + + meta = { + homepage = https://gitweb.torproject.org/tor-launcher.git/; + }; }; }; + + extensionsEnv = symlinkJoin { + name = "tor-browser-extensions"; + paths = with firefoxExtensions; [ https-everywhere noscript torbutton tor-launcher ]; + }; in stdenv.mkDerivation rec { name = "tor-browser-bundle-${version}"; @@ -163,18 +223,8 @@ stdenv.mkDerivation rec { EOF # Preload extensions - install -m 444 -D \ - ${firefoxExtensions.tor-launcher}/tor-launcher-*.xpi \ - browser/extensions/tor-launcher@torproject.org.xpi - install -m 444 -D \ - ${firefoxExtensions.torbutton}/torbutton-*.xpi \ - browser/extensions/torbutton@torproject.org.xpi - install -m 444 -D \ - ${firefoxExtensions.https-everywhere}/https-everywhere-*-eff.xpi \ - browser/extensions/https-everywhere-eff@eff.org.xpi - install -m 444 -D \ - ${firefoxExtensions.noscript} \ - browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi + # XXX: the fact that ln -s env browser/extensions fails, symlinkJoin seems a little redundant ... + ln -s -t browser/extensions ${extensionsEnv}"/"* # Copy bundle data cat \ From 0c26be5bd2babc22be978a5d3a9d2b69a2b3ce9a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 26 Sep 2017 20:31:27 +0200 Subject: [PATCH 0194/2806] tor-browser-bundle: improve organization of distribution dir Store TBB specific files under TorBrowser-Data --- .../browsers/tor-browser-bundle/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 96d9feabc15..8b741e76559 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -181,10 +181,13 @@ stdenv.mkDerivation rec { installPhase = '' TBBUILD=${tor-browser-build_src}/projects/tor-browser + TBDATA_PATH=TorBrowser-Data self=$out/lib/tor-browser mkdir -p $self && cd $self + TBDATA_IN_STORE=$self/$TBDATA_PATH + cp -dR ${tor-browser-unwrapped}/lib"/"*"/"* . chmod -R +w . @@ -207,7 +210,7 @@ stdenv.mkDerivation rec { // Where to find the Nixpkgs tor executable & config lockPref("extensions.torlauncher.tor_path", "${tor}/bin/tor"); - lockPref("extensions.torlauncher.torrc-defaults_path", "$self/torrc-defaults"); + lockPref("extensions.torlauncher.torrc-defaults_path", "$TBDATA_IN_STORE/torrc-defaults"); // Captures store paths clearPref("extensions.xpiState"); @@ -227,14 +230,15 @@ stdenv.mkDerivation rec { ln -s -t browser/extensions ${extensionsEnv}"/"* # Copy bundle data - cat \ - $TBBUILD/Bundle-Data/linux/Data/Tor/torrc-defaults \ - $TBBUILD/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix \ - >> torrc-defaults + bundlePlatform=linux + bundleData=$TBBUILD/Bundle-Data + mkdir -p $TBDATA_PATH cat \ - $TBBUILD/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js \ - $TBBUILD/Bundle-Data/PTConfigs/bridge_prefs.js >> defaults/pref/extension-overrides.js \ + $bundleData/$bundlePlatform/Data/Tor/torrc-defaults \ + >> $TBDATA_PATH/torrc-defaults + cat \ + $bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \ >> defaults/pref/extension-overrides.js # Generate a suitable wrapper From 93b9109b460b4ba18a6977fb1aa5e886f697513d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 26 Sep 2017 20:31:55 +0200 Subject: [PATCH 0195/2806] tor-browser-bundle: clear pref bootstrappedAddons for purity --- .../networking/browsers/tor-browser-bundle/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 8b741e76559..00c2656bc71 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -214,6 +214,7 @@ stdenv.mkDerivation rec { // Captures store paths clearPref("extensions.xpiState"); + clearPref("extensions.bootstrappedAddons"); // Insist on using IPC for communicating with Tor // From f05d50f36c879400a679498eb9677f8653a892e3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 26 Sep 2017 20:34:18 +0200 Subject: [PATCH 0196/2806] tor-browser-bundle: approximate upstream bundle & purity control --- .../browsers/tor-browser-bundle/default.nix | 97 ++++++++++++++++++- 1 file changed, 92 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 00c2656bc71..73c5dc6b3ee 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -7,6 +7,10 @@ , tor , tor-browser-unwrapped +# Wrapper runtime +, coreutils +, hicolor_icon_theme +, shared_mime_info # Extensions, common , unzip , zip @@ -217,8 +221,6 @@ stdenv.mkDerivation rec { clearPref("extensions.bootstrappedAddons"); // Insist on using IPC for communicating with Tor - // - // Defaults to $XDG_RUNTIME_DIR/Tor/{socks,control}.socket lockPref("extensions.torlauncher.control_port_use_ipc", true); lockPref("extensions.torlauncher.socks_port_use_ipc", true); @@ -243,18 +245,103 @@ stdenv.mkDerivation rec { >> defaults/pref/extension-overrides.js # Generate a suitable wrapper + wrapper_PATH=${lib.makeBinPath [ coreutils ]} + wrapper_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ + hicolor_icon_theme + shared_mime_info + ]} + mkdir -p $out/bin cat >$out/bin/tor-browser <&2 + exit 1 + fi + mkdir -p "\$TBB_HOME" HOME=\$TBB_HOME cd "\$HOME" - exec $self/firefox -no-remote about:tor + # Re-init XDG basedir envvars + XDG_CACHE_HOME=\$HOME/.cache + XDG_CONFIG_HOME=\$HOME/.config + XDG_DATA_HOME=\$HOME/.local/share + + # Initialize empty TBB runtime state directory hierarchy. Mirror the + # layout used by the official TBB, to avoid the hassle of working + # against the assumptions made by tor-launcher & co. + mkdir -p "\$HOME/TorBrowser" "\$HOME/TorBrowser/Data" + + # Initialize the Tor data directory. + mkdir -p "\$HOME/TorBrowser/Data/Tor" + + # TBB fails if ownership is too permissive + chmod 0700 "\$HOME/TorBrowser/Data/Tor" + + # Initialize the browser profile state. Expect TBB to generate all data. + mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default" + + # Files that capture store paths; re-generated by firefox at startup + rm -rf "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json,startupCache} + + # Clear out fontconfig caches + rm -f "\$HOME/.cache/fontconfig/"*.cache-* + + # Lift-off! + # + # TZ is set to avoid stat()ing /etc/localtime over and over ... + # + # DBUS_SESSION_BUS_ADDRESS is inherited to avoid auto-launching a new + # dbus instance; to prevent using the session bus, set the envvar to + # an empty/invalid value prior to running tor-browser. + # + # FONTCONFIG_FILE is required to make fontconfig read the TBB + # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 + # indicates the system fonts.conf being used instead. + # + # HOME, TMPDIR, XDG_*_HOME are set as a form of soft confinement; + # ideally, tor-browser should not write to any path outside TBB_HOME + # and should run even under strict confinement to TBB_HOME. + # + # XDG_DATA_DIRS is set to prevent searching system directories for + # mime and icon data. + # + # Parameters lacking a default value below are *required* (enforced by + # -o nounset). + exec env -i \ + TZ=":" \ + \ + DISPLAY="\$DISPLAY" \ + XAUTHORITY="\$XAUTHORITY" \ + DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ + \ + HOME="\$HOME" \ + TMPDIR="\$XDG_CACHE_HOME/tmp" \ + XDG_CONFIG_HOME="\$XDG_CONFIG_HOME" \ + XDG_DATA_HOME="\$XDG_DATA_HOME" \ + XDG_CACHE_HOME="\$XDG_CACHE_HOME" \ + \ + XDG_DATA_DIRS="$wrapper_XDG_DATA_DIRS" \ + \ + FONTCONFIG_FILE="$TBDATA_IN_STORE/fonts.conf" \ + \ + $self/firefox \ + -no-remote \ + -profile "\$HOME/TorBrowser/Data/Browser/profile.default" \ + "\$@" EOF chmod +x $out/bin/tor-browser ''; From fc44e91ad5fabde78aedc2cb3a5f8125f06ec4ee Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 26 Sep 2017 20:34:56 +0200 Subject: [PATCH 0197/2806] tor-browser-bundle: use fonts from Nixpkgs --- .../browsers/tor-browser-bundle/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 73c5dc6b3ee..979aac5b92f 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -11,6 +11,9 @@ , coreutils , hicolor_icon_theme , shared_mime_info +, noto-fonts +, noto-fonts-emoji + # Extensions, common , unzip , zip @@ -172,6 +175,13 @@ let name = "tor-browser-extensions"; paths = with firefoxExtensions; [ https-everywhere noscript torbutton tor-launcher ]; }; + + fontsEnv = symlinkJoin { + name = "tor-browser-fonts"; + paths = [ noto-fonts noto-fonts-emoji ]; + }; + + fontsDir = "${fontsEnv}/share/fonts"; in stdenv.mkDerivation rec { name = "tor-browser-bundle-${version}"; @@ -244,6 +254,11 @@ stdenv.mkDerivation rec { $bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \ >> defaults/pref/extension-overrides.js + # Hard-code path to TBB fonts; xref: FONTCONFIG_FILE in the wrapper below + sed $bundleData/$bundlePlatform/Data/fontconfig/fonts.conf \ + -e "s,fonts,${fontsDir}," \ + > $TBDATA_PATH/fonts.conf + # Generate a suitable wrapper wrapper_PATH=${lib.makeBinPath [ coreutils ]} wrapper_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ From 206e4a6d69f25e47254bbd33f935f85d97441259 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 26 Sep 2017 20:35:22 +0200 Subject: [PATCH 0198/2806] tor-browser-bundle: basic checks for the wrapper script --- .../networking/browsers/tor-browser-bundle/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 979aac5b92f..ca20125332a 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -359,6 +359,13 @@ stdenv.mkDerivation rec { "\$@" EOF chmod +x $out/bin/tor-browser + + echo "Syntax checking wrapper ..." + bash -n $out/bin/tor-browser + + echo "Checking wrapper ..." + DISPLAY="" XAUTHORITY="" DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$TMPDIR/tbb \ + $out/bin/tor-browser -version >/dev/null ''; meta = with stdenv.lib; { From 9824ca6975fcbf5a2da9e6ba98dacafaa12bb1b3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 27 Sep 2017 00:39:55 +0300 Subject: [PATCH 0199/2806] caffe: Make 'bin' the first output So ${caffe}/bin/foo always works in scripts. --- pkgs/applications/science/math/caffe/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 5c6fe9c573d..cb28d38bf1d 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -46,9 +46,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf; - outputs = [ "out" "bin" ]; - # Don't propagate bin. - outputBin = "out"; + outputs = [ "bin" "out"]; + propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle postInstall = '' # Internal static library. From fb7ebf3c93f3744b8893aa4e52dd93707b96ce81 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 15 Sep 2017 19:38:38 -0500 Subject: [PATCH 0200/2806] llvm: init 5.0 --- .../compilers/llvm/5/clang/default.nix | 97 +++++++++++ .../compilers/llvm/5/clang/purity.patch | 30 ++++ .../llvm/5/compiler-rt-codesign.patch | 155 ++++++++++++++++++ pkgs/development/compilers/llvm/5/default.nix | 81 +++++++++ .../compilers/llvm/5/libc++/default.nix | 44 +++++ .../compilers/llvm/5/libc++/setup-hook.sh | 3 + .../compilers/llvm/5/libc++abi.nix | 47 ++++++ pkgs/development/compilers/llvm/5/lld.nix | 33 ++++ pkgs/development/compilers/llvm/5/lldb.nix | 51 ++++++ .../compilers/llvm/5/llvm-outputs.patch | 26 +++ pkgs/development/compilers/llvm/5/llvm.nix | 153 +++++++++++++++++ pkgs/development/compilers/llvm/5/openmp.nix | 26 +++ pkgs/top-level/all-packages.nix | 13 +- 13 files changed, 758 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/llvm/5/clang/default.nix create mode 100644 pkgs/development/compilers/llvm/5/clang/purity.patch create mode 100644 pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch create mode 100644 pkgs/development/compilers/llvm/5/default.nix create mode 100644 pkgs/development/compilers/llvm/5/libc++/default.nix create mode 100644 pkgs/development/compilers/llvm/5/libc++/setup-hook.sh create mode 100644 pkgs/development/compilers/llvm/5/libc++abi.nix create mode 100644 pkgs/development/compilers/llvm/5/lld.nix create mode 100644 pkgs/development/compilers/llvm/5/lldb.nix create mode 100644 pkgs/development/compilers/llvm/5/llvm-outputs.patch create mode 100644 pkgs/development/compilers/llvm/5/llvm.nix create mode 100644 pkgs/development/compilers/llvm/5/openmp.nix diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix new file mode 100644 index 00000000000..fa8502ebd67 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -0,0 +1,97 @@ +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; + self = stdenv.mkDerivation { + name = "clang-${version}"; + + unpackPhase = '' + unpackFile ${fetch "cfe" "0w09s8fn3lkn6i04nj0cisgp821r815fk5b5fjn97xrd371277q1"} + mv cfe-${version}* clang + sourceRoot=$PWD/clang + unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + ''; + + nativeBuildInputs = [ cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + + buildInputs = [ libedit libxml2 llvm ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++11" + ] ++ stdenv.lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] + # Maybe with compiler-rt this won't be needed? + ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; + + patches = [ ./purity.patch ]; + + postBuild = stdenv.lib.optionalString enableManpages '' + cmake --build . --target docs-clang-man + ''; + + postPatch = '' + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + + # Patch for standalone doc building + sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt + ''; + + outputs = [ "out" "python" ] + ++ stdenv.lib.optional enableManpages "man"; + + # Clang expects to find LLVMgold in its own prefix + # Clang expects to find sanitizer libraries in its own prefix + postInstall = '' + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ + ln -sv $out/bin/clang $out/bin/cpp + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + + rm $out/bin/c-index-test + '' + + stdenv.lib.optionalString enableManpages '' + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + + # Move it and other man pages to 'man' output + moveToOutput "share/man" "$man" + ''; + + enableParallelBuilding = true; + + passthru = { + lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both + isClang = true; + inherit llvm; + } // stdenv.lib.optionalAttrs stdenv.isLinux { + inherit gcc; + }; + + meta = { + description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.ncsa; + platforms = stdenv.lib.platforms.all; + }; + }; +in self diff --git a/pkgs/development/compilers/llvm/5/clang/purity.patch b/pkgs/development/compilers/llvm/5/clang/purity.patch new file mode 100644 index 00000000000..b30d0d0b5d5 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/clang/purity.patch @@ -0,0 +1,30 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (!Args.hasArg(options::OPT_static)) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared)) { +- const std::string Loader = +- D.DyldPrefix + ToolChain.getDynamicLinker(Args); +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Loader)); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 + diff --git a/pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch new file mode 100644 index 00000000000..8f4c76bca1e --- /dev/null +++ b/pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch @@ -0,0 +1,155 @@ +From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 19 Sep 2017 13:13:06 -0500 +Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that + needs it + +--- + cmake/Modules/AddCompilerRT.cmake | 8 ------ + test/asan/CMakeLists.txt | 52 --------------------------------------- + test/tsan/CMakeLists.txt | 47 ----------------------------------- + 3 files changed, 107 deletions(-) + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index bc5fb9ff7..b64eb4246 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $ +- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- ) +- endif() + endif() + install(TARGETS ${libname} + ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} +diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt +index 8bfc15b5c..f23d0f71a 100644 +--- a/test/asan/CMakeLists.txt ++++ b/test/asan/CMakeLists.txt +@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH}) + endif() + endforeach() + +-# iOS and iOS simulator test suites +-# These are not added into "check-all", in order to run these tests, use +-# "check-asan-iossim-x86_64" and similar. They also require that an extra env +-# variable to select which iOS device or simulator to use, e.g.: +-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" +-if(APPLE) +- set(EXCLUDE_FROM_ALL ON) +- +- set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) +- set(ASAN_TEST_IOS "1") +- pythonize_bool(ASAN_TEST_IOS) +- set(ASAN_TEST_DYNAMIC True) +- +- foreach(arch ${DARWIN_iossim_ARCHS}) +- set(ASAN_TEST_IOSSIM "1") +- pythonize_bool(ASAN_TEST_IOSSIM) +- set(ASAN_TEST_TARGET_ARCH ${arch}) +- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") +- get_bits_for_arch(${arch} ASAN_TEST_BITS) +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${ASAN_TEST_DEPS}) +- endforeach() +- +- foreach (arch ${DARWIN_ios_ARCHS}) +- set(ASAN_TEST_IOSSIM "0") +- pythonize_bool(ASAN_TEST_IOSSIM) +- set(ASAN_TEST_TARGET_ARCH ${arch}) +- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios") +- get_bits_for_arch(${arch} ASAN_TEST_BITS) +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${ASAN_TEST_DEPS}) +- endforeach() +- +- set(EXCLUDE_FROM_ALL OFF) +-endif() +- + # Add unit tests. + if(COMPILER_RT_INCLUDE_TESTS) + set(ASAN_TEST_DYNAMIC False) +diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt +index a68908612..cde0accb5 100644 +--- a/test/tsan/CMakeLists.txt ++++ b/test/tsan/CMakeLists.txt +@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH}) + list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) + endforeach() + +-# iOS and iOS simulator test suites +-# These are not added into "check-all", in order to run these tests, use +-# "check-tsan-iossim-x86_64" and similar. They also require an extra environment +-# variable to select which iOS device or simulator to use, e.g.: +-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" +-if(APPLE) +- set(EXCLUDE_FROM_ALL ON) +- +- set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) +- set(TSAN_TEST_IOS "1") +- pythonize_bool(TSAN_TEST_IOS) +- +- set(arch "x86_64") +- set(TSAN_TEST_IOSSIM "1") +- pythonize_bool(TSAN_TEST_IOSSIM) +- set(TSAN_TEST_TARGET_ARCH ${arch}) +- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${TSAN_TEST_DEPS}) +- +- set(arch "arm64") +- set(TSAN_TEST_IOSSIM "0") +- pythonize_bool(TSAN_TEST_IOSSIM) +- set(TSAN_TEST_TARGET_ARCH ${arch}) +- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios") +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${TSAN_TEST_DEPS}) +- +- set(EXCLUDE_FROM_ALL OFF) +-endif() +- + if(COMPILER_RT_INCLUDE_TESTS) + configure_lit_site_cfg( + ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in +-- +2.14.1 + diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix new file mode 100644 index 00000000000..1d5cc0e504b --- /dev/null +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -0,0 +1,81 @@ +{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, darwin +}: + +let + callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + + release_version = "5.0.0"; + version = release_version; # differentiating these is important for rc's + + fetch = name: sha256: fetchurl { + url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz"; + inherit sha256; + }; + + compiler-rt_src = fetch "compiler-rt" "1cy0y389zxn7mk8vffqvfirk9bbcbc8ziwc1nf1a8d118rk55bfm"; + clang-tools-extra_src = fetch "clang-tools-extra" "1ikkv6k8cfgpjqlm24iqz52i5nyafzsc4dyikzzyb9n4b6wpil47"; + + # Add man output without introducing extra dependencies. + overrideManOutput = drv: + let drv-manpages = drv.override { enableManpages = true; }; in + drv // { man = drv-manpages.man; /*outputs = drv.outputs ++ ["man"];*/ }; + + llvm = callPackage ./llvm.nix { + inherit compiler-rt_src stdenv; + }; + + clang-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src stdenv; + }; + + self = { + llvm = overrideManOutput llvm; + clang-unwrapped = overrideManOutput clang-unwrapped; + + llvm-manpages = lowPrio self.llvm.man; + clang-manpages = lowPrio self.clang-unwrapped.man; + + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; + + libcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ self.libcxx self.libcxxabi ]; + }; + + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); + + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); + + lld = callPackage ./lld.nix {}; + + lldb = callPackage ./lldb.nix {}; + + libcxx = callPackage ./libc++ {}; + + libcxxabi = callPackage ./libc++abi.nix {}; + + openmp = callPackage ./openmp.nix {}; + }; + +in self diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix new file mode 100644 index 00000000000..036161f7b88 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetch, cmake, llvm, libcxxabi, fixDarwinDylibNames, version }: + +stdenv.mkDerivation rec { + name = "libc++-${version}"; + + src = fetch "libcxx" "1cf953msb0vwgjjrapw06950dnsdb2ps305czkn0vvr1k8g9irga"; + + postUnpack = '' + unpackFile ${libcxxabi.src} + export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" + ''; + + prePatch = '' + substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" + ''; + + preConfigure = '' + # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package + cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") + ''; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; + + enableParallelBuilding = true; + + linkCxxAbi = stdenv.isLinux; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = http://libcxx.llvm.org/; + description = "A new implementation of the C++ standard library, targeting C++11"; + license = with stdenv.lib.licenses; [ ncsa mit ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh new file mode 100644 index 00000000000..9022fced6ec --- /dev/null +++ b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh @@ -0,0 +1,3 @@ +linkCxxAbi="@linkCxxAbi@" +export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix new file mode 100644 index 00000000000..5a2a269345d --- /dev/null +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -0,0 +1,47 @@ +{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: + +stdenv.mkDerivation { + name = "libc++abi-${version}"; + + src = fetch "libcxxabi" "04c9dfmrr8diih73x0wq99dk9xb99mg0bvsnbhx5q912xg3ihs8p"; + + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + + postUnpack = '' + unpackFile ${libcxx.src} + unpackFile ${llvm.src} + export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + ''; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # http://www.cmake.org/Wiki/CMake_RPATH_handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/*.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.so.1.0 $out/lib + install -m 644 ../include/cxxabi.h $out/include + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = { + homepage = http://libcxxabi.llvm.org/; + description = "A new implementation of low level support for a standard C++ library"; + license = with stdenv.lib.licenses; [ ncsa mit ]; + maintainers = with stdenv.lib.maintainers; [ vlstill ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix new file mode 100644 index 00000000000..f19a9afc804 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetch +, cmake +, zlib +, llvm +, python +, version +}: + +stdenv.mkDerivation { + name = "lld-${version}"; + + src = fetch "lld" "15rqsmfw0jlsri7hszbs8l0j7v1030cy9xvvdb245397llh7k6ir"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvm ]; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + + postInstall = '' + moveToOutput include "$dev" + moveToOutput lib "$dev" + ''; + + meta = { + description = "The LLVM Linker"; + homepage = http://lld.llvm.org/; + license = stdenv.lib.licenses.ncsa; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix new file mode 100644 index 00000000000..fac23b290bc --- /dev/null +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetch +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, llvm +, clang-unwrapped +, python +, version +, darwin +}: + +stdenv.mkDerivation { + name = "lldb-${version}"; + + src = fetch "lldb" "0zcbav39srf6awv9znvzr7nqdrj704i8da3wdgc8362y20rcm860"; + + postPatch = '' + # Fix up various paths that assume llvm and clang are installed in the same place + sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ + cmake/modules/LLDBStandalone.cmake + sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \ + cmake/modules/LLDBStandalone.cmake + sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ + cmake/modules/LLDBStandalone.cmake + ''; + + nativeBuildInputs = [ cmake python which swig ]; + buildInputs = [ ncurses zlib libedit libxml2 llvm ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; + + CXXFLAGS = "-fno-rtti"; + hardeningDisable = [ "format" ]; + + cmakeFlags = [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A next-generation high-performance debugger"; + homepage = http://llvm.org/; + license = licenses.ncsa; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/5/llvm-outputs.patch b/pkgs/development/compilers/llvm/5/llvm-outputs.patch new file mode 100644 index 00000000000..40096fa3497 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/llvm-outputs.patch @@ -0,0 +1,26 @@ +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..37f7794 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,6 +333,21 @@ int main(int argc, char **argv) { + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + ++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared ++ if (!IsInDevelopmentTree) { ++ bool WantShared = true; ++ for (int i = 1; i < argc; ++i) { ++ StringRef Arg = argv[i]; ++ if (Arg == "--link-shared") ++ WantShared = true; ++ else if (Arg == "--link-static") ++ WantShared = false; // the last one wins ++ } ++ ++ if (WantShared) ++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; ++ } ++ + /// We only use `shared library` mode in cases where the static library form + /// of the components provided are not available; note however that this is + /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix new file mode 100644 index 00000000000..946c04a2ab4 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -0,0 +1,153 @@ +{ stdenv +, fetch +, fetchpatch +, perl +, groff +, cmake +, python +, libffi +, binutils +, libxml2 +, valgrind +, ncurses +, version +, release_version +, zlib +, compiler-rt_src +, libcxxabi +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? true +, darwin +}: + +let + src = fetch "llvm" "1nin64vz21hyng6jr19knxipvggaqlkl2l9jpd5czbc4c2pcnpg3"; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with stdenv.lib; + concatStringsSep "." (take 2 (splitString "." release_version)); +in stdenv.mkDerivation rec { + name = "llvm-${version}"; + + unpackPhase = '' + unpackFile ${src} + mv llvm-${version}* llvm + sourceRoot=$PWD/llvm + unpackFile ${compiler-rt_src} + mv compiler-rt-* $sourceRoot/projects/compiler-rt + ''; + + outputs = [ "out" ] + ++ stdenv.lib.optional enableSharedLibraries "lib" + ++ stdenv.lib.optional enableManpages "man"; + + nativeBuildInputs = [ perl groff cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + + buildInputs = [ libxml2 libffi ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + + propagatedBuildInputs = [ ncurses zlib ]; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + # Patch llvm-config to return correct library path based on --link-{shared,static}. + + stdenv.lib.optionalString (enableSharedLibraries) '' + substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib + patch -p1 < ./llvm-outputs.patch + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + + # Revert compiler-rt commit that makes codesign mandatory + patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + cmakeFlags = with stdenv; [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=ON" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_ENABLE_RTTI=ON" + "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code + ] + ++ stdenv.lib.optional enableSharedLibraries + "-DLLVM_LINK_LLVM_DYLIB=ON" + ++ stdenv.lib.optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] + ++ stdenv.lib.optional (!isDarwin) + "-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include" + ++ stdenv.lib.optionals (isDarwin) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ]; + + postBuild = '' + rm -fR $out + + paxmark m bin/{lli,llvm-rtdyld} + paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests + paxmark m unittests/ExecutionEngine/Orc/OrcJITTests + paxmark m unittests/Support/SupportTests + paxmark m bin/lli-child-target + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + ''; + + postInstall = stdenv.lib.optionalString enableManpages '' + moveToOutput "share/man" "$man" + '' + + stdenv.lib.optionalString enableSharedLibraries '' + moveToOutput "lib/libLLVM-*" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + '' + + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" + install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib + install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + ''; + + doCheck = stdenv.isLinux && (!stdenv.isi686); + + checkTarget = "check-all"; + + enableParallelBuilding = true; + + passthru.src = src; + + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.ncsa; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix new file mode 100644 index 00000000000..9ba42eed2e2 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetch +, cmake +, zlib +, llvm +, perl +, version +}: + +stdenv.mkDerivation { + name = "openmp-${version}"; + + src = fetch "openmp" "1igplg89bl6k6r9q88hnpcznq3g9lb79w7bix025lwp00ldhivy0"; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ llvm ]; + + enableParallelBuilding = true; + + meta = { + description = "Components required to build an executable OpenMP program"; + homepage = http://openmp.llvm.org/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42d7cde5225..f27217d13eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5297,6 +5297,7 @@ with pkgs; useMacosReexportHack = true; }; + clang_5 = llvmPackages_5.clang; clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; @@ -5916,13 +5917,17 @@ with pkgs; lizardfs = callPackage ../tools/filesystems/lizardfs { }; - lld = llvmPackages_4.lld; + lld = llvmPackages.lld; + lld_4 = llvmPackages_4.lld; + lld_5 = llvmPackages_5.lld; lldb = llvmPackages.lldb; lldb_4 = llvmPackages_4.lldb; + lldb_5 = llvmPackages_5.lldb; llvm = llvmPackages.llvm; + llvm_5 = llvmPackages_5.llvm; llvm_4 = llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; @@ -5964,6 +5969,10 @@ with pkgs; python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; }); + llvmPackages_5 = callPackage ../development/compilers/llvm/5 { + inherit (stdenvAdapters) overrideCC; + }; + manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( @@ -19440,6 +19449,8 @@ with pkgs; cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; }; cc-wrapper-libcxx-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; }; + cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; }; + cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; }; stdenv-inputs = callPackage ../test/stdenv-inputs { }; macOSSierraShared = callPackage ../test/macos-sierra-shared {}; From b200a3417b36f85e9e5fd97002e9e2bbc3657eab Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 26 Sep 2017 22:28:51 +0000 Subject: [PATCH 0201/2806] far2l: support darwin --- pkgs/applications/misc/far2l/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 3b63c90f060..ad1a1b951bd 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, - xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }: + xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: +with stdenv.lib; stdenv.mkDerivation rec { rev = "73e52ccbc7626631b6898c7324413ee1fc09bc0e"; build = "unstable-2017-09-25.git${builtins.substring 0 7 rev}"; @@ -15,15 +16,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; - buildInputs = [ wxGTK30 glib pcre ]; + buildInputs = [ wxGTK30 glib pcre ] + ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; patches = [ ./add-nix-syntax-highlighting.patch ]; - postPatch = '' - echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh - - substituteInPlace far2l/bootstrap/open.sh \ + postPatch = optionalString stdenv.isLinux '' + substituteInPlace far2l/bootstrap/open.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' + '' + optionalString stdenv.isDarwin '' + substituteInPlace far2l/CMakeLists.txt \ + --replace "-framework System" -lSystem + '' + '' + echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh substituteInPlace far2l/bootstrap/open.sh \ --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' substituteInPlace far2l/vtcompletor.cpp \ @@ -62,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { description = "An orthodox file manager"; homepage = https://github.com/elfmz/far2l; license = licenses.gpl2; From 1a681a6ecb51c4dc80ab9a6065870323ba3aa549 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Sep 2017 00:50:42 +0200 Subject: [PATCH 0202/2806] shotcut: 17.02 -> 17.09 fixes the previously broken build --- pkgs/applications/video/shotcut/default.nix | 25 ++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 72dbf87fdef..88cb43b4d91 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase, -qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols, -qtgraphicaleffects, -qmake, makeWrapper }: +{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase +, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols +, qtgraphicaleffects, libmlt +, qmake, makeWrapper }: stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "17.02"; + version = "17.09"; - src = fetchurl { - url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; - sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr"; + src = fetchFromGitHub { + owner = "mltframework"; + repo = "shotcut"; + rev = "v${version}"; + sha256 = "061jmk1g2h7p82kyk2zgk19g0y3dgx3lppfnm6cdmi550b51qllb"; }; - enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; buildInputs = [ - SDL frei0r gettext mlt + SDL2 frei0r gettext mlt libmlt qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols qtgraphicaleffects ]; + NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; + prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ - wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin + wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]} --prefix PATH : ${mlt}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbd6a59088d..ca9eb74ad9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15608,7 +15608,9 @@ with pkgs; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; - shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; + shotcut = libsForQt5.callPackage ../applications/video/shotcut { + libmlt = mlt; + }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; From 97e586b81233f09a33faebfa31e34c6d4f3d2675 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 26 Sep 2017 23:26:22 +0800 Subject: [PATCH 0203/2806] libnfs: init at 2.0.0 --- pkgs/development/libraries/libnfs/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libnfs/default.nix diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix new file mode 100644 index 00000000000..28069268022 --- /dev/null +++ b/pkgs/development/libraries/libnfs/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "libnfs-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "sahlberg"; + repo = "libnfs"; + rev = "libnfs-${version}"; + sha256 = "1xd1xb09jxwmx7hblv0f9gxv7i1glk3nbj2vyq50zpi158lnf2mb"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "NFS client library"; + homepage = https://github.com/sahlberg/libnfs; + license = with licenses; [ lgpl2 bsd gpl3]; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca9eb74ad9d..72ddcb185e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9143,6 +9143,8 @@ with pkgs; libnfc = callPackage ../development/libraries/libnfc { }; + libnfs = callPackage ../development/libraries/libnfs { }; + libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; libnice = callPackage ../development/libraries/libnice { }; From eba5dd84eff82f01a9867614544c7965736f8a3d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 26 Sep 2017 23:11:44 +0800 Subject: [PATCH 0204/2806] cwiid: boy scout cleanups --- pkgs/development/libraries/cwiid/default.nix | 28 +++++++++++--------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index fb5431ff8d5..606058da854 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,12 +1,14 @@ -{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk2 }: +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkgconfig, gtk2 }: stdenv.mkDerivation rec { - name = "cwiid-2010-02-21-git"; + name = "cwiid-${version}-git"; + version = "2010-02-21"; - src = fetchgit { - url = https://github.com/abstrakraft/cwiid; - sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; - rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; + src = fetchFromGitHub { + owner = "abstrakraft"; + repo = "cwiid"; + rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; + sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; }; hardeningDisable = [ "format" ]; @@ -17,18 +19,20 @@ stdenv.mkDerivation rec { sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in ''; - buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk2 ]; + buildInputs = [ bison flex bluez gtk2 ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; postInstall = '' # Some programs (for example, cabal-install) have problems with the double 0 sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc ''; - meta = { + meta = with stdenv.lib; { description = "Linux Nintendo Wiimote interface"; - homepage = http://cwiid.org; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.bennofs ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://cwiid.org; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ bennofs ]; + platforms = platforms.linux; }; } From 3d4ed0181e7a62d9376e04cdbe0160d7f4bf2119 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 27 Sep 2017 07:29:15 +0100 Subject: [PATCH 0205/2806] bower2nix: 3.1.1 -> 3.2.0 --- .../node-packages/node-packages-v6.nix | 8 ++++---- pkgs/top-level/node-packages-generated.nix | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index ba2a6c77ce2..bd4a3e5abcc 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -23701,10 +23701,10 @@ in bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; - sha1 = "77cc8f966a3595686f5d6fae30ad9bd2cc20bfe3"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz"; + sha1 = "nlzr17lidjf72s60vcsnqpjxgnnsn32s"; }; dependencies = [ sources."argparse-1.0.4" @@ -37338,4 +37338,4 @@ in }; production = true; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 432a367d153..3014273e5c3 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -5381,15 +5381,15 @@ cpu = [ ]; }; by-spec."bower2nix"."*" = - self.by-version."bower2nix"."3.1.1"; - by-version."bower2nix"."3.1.1" = self.buildNodePackage { - name = "bower2nix-3.1.1"; - version = "3.1.1"; + self.by-version."bower2nix"."3.2.0"; + by-version."bower2nix"."3.2.0" = self.buildNodePackage { + name = "bower2nix-3.2.0"; + version = "3.2.0"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; - name = "bower2nix-3.1.1.tgz"; - sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz"; + name = "bower2nix-3.2.0.tgz"; + sha1 = "nlzr17lidjf72s60vcsnqpjxgnnsn32s"; }; deps = { "argparse-1.0.4" = self.by-version."argparse"."1.0.4"; @@ -5410,7 +5410,7 @@ os = [ ]; cpu = [ ]; }; - "bower2nix" = self.by-version."bower2nix"."3.0.1"; + "bower2nix" = self.by-version."bower2nix"."3.2.0"; by-spec."bplist-creator"."0.0.4" = self.by-version."bplist-creator"."0.0.4"; by-version."bplist-creator"."0.0.4" = self.buildNodePackage { From e911e39c26b613d9f1222d76e7ad25ab771ec422 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Wed, 27 Sep 2017 09:37:41 +0200 Subject: [PATCH 0206/2806] mariadb: 10.1.25 -> 10.1.26 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 3ede229931e..a2e5fbb6df9 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.25"; + version = "10.1.26"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "1mm0n8sl6grajk5rbrx55333laz5dg2abyl8mlsn7h8vdymfq1bj"; + sha256 = "0ggpdcal0if9y6h9hp1yv2q65cbkjfl4p8rqk68a5pk7k75v325s"; name = "mariadb-${version}.tar.gz"; }; From 65b04b8bef07c710d6ec52b4f71854fabbbda2de Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Sep 2017 12:02:34 +0200 Subject: [PATCH 0207/2806] network-manager-applet: Don't depend on webkitgtk by default This added significant bloat to non-Gnome systems. --- pkgs/tools/networking/network-manager-applet/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index c0c4950f447..3220aebdfe4 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, librsvg , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk }: +, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk +, withGnome ? false }: stdenv.mkDerivation rec { name = "${pname}-${major}.${minor}"; @@ -24,8 +25,8 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring - modemmanager jansson librsvg glib_networking gnome3.dconf webkitgtk - ]; + modemmanager jansson librsvg glib_networking gnome3.dconf + ] ++ stdenv.lib.optional withGnome webkitgtk; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; From 28299f669adc41e5278372cad952fb1e1165b44b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Sep 2017 11:25:50 +0200 Subject: [PATCH 0208/2806] Add even more dev outputs --- pkgs/desktops/gnome-3/core/gcr/default.nix | 2 ++ pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 2 ++ pkgs/development/python-modules/cffi/default.nix | 2 ++ pkgs/development/python-modules/requests/default.nix | 2 ++ pkgs/development/python-modules/urllib3/default.nix | 2 ++ pkgs/top-level/python-packages.nix | 4 ++++ 6 files changed, 14 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 55eebf77be5..0798d69f9e6 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + outputs = [ "out" "dev" ]; + buildInputs = [ pkgconfig intltool gnupg glib gobjectIntrospection libxslt libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32 diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index df47c1a477b..4baafecadd0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + outputs = [ "out" "dev" ]; + buildInputs = with gnome3; [ dbus libgcrypt pam python gtk3 gconf libgnome_keyring pango gcr gdk_pixbuf atk p11_kit diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 5b0265601a3..cced78c0c6a 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -10,6 +10,8 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "1mffyilq4qycm8gs4wkgb18rnqil8a9blqq77chdlshzxc8jkc5k"; }; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index b85bb54a4f1..f3ff4a84f1e 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pytest ]; propagatedBuildInputs = [ urllib3 idna chardet certifi ]; # sadly, tests require networking diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 10021e14f12..f030ef74e63 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; }; + outputs = [ "out" "dev" ]; + NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c56fe5f1ab..7c6ca4bd1fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3295,6 +3295,8 @@ in { sha256 = "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ pkgs.openssl self.cryptography_vectors ] ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = with self; [ @@ -17817,6 +17819,8 @@ in { sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; }; + outputs = [ "out" "dev" ]; + preCheck = '' sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py # https://github.com/pyca/pyopenssl/issues/692 From cb3098b1357bb3a454a026146a3202f4a99a6595 Mon Sep 17 00:00:00 2001 From: Anish Tondwalkar Date: Wed, 27 Sep 2017 03:45:00 -0700 Subject: [PATCH 0209/2806] scudcloud: 1.58 -> 1.63 --- .../networking/instant-messengers/scudcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index a388b77dab9..f112d5f6110 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python3Packages }: -let version = "1.58"; +let version = "1.63"; in python3Packages.buildPythonPackage { name = "scudcloud-${version}"; src = fetchurl { url = "https://github.com/raelgc/scudcloud/archive/v${version}.tar.gz"; - sha256 = "1j84qdc2j3dvl1nhrjqm0blc8ww723p9a6hqprkkp8alw77myq1l"; + sha256 = "e0d1cb72115d0fda17db92d28be51558ad8fe250972683fac3086dbe8d350d22"; }; propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ]; From 56ab381973aa112d697847700269530ead137e20 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 20:59:56 +1000 Subject: [PATCH 0210/2806] guileLint: rename to guile-lint --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4fafdfb726c..343e10f55be 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -69,6 +69,7 @@ mapAliases (rec { guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24 guile_lib = guile-lib; # added 2017-09-24 + guileLint = guile-lint; # added 2017-09-27 guile_ncurses = guile-ncurses; # added 2017-09-24 gupnptools = gupnp-tools; # added 2015-12-19 gnustep-make = gnustep.make; # added 2016-7-6 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72ddcb185e0..5b41d7845ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7187,7 +7187,7 @@ with pkgs; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; - guileLint = callPackage ../development/tools/guile/guile-lint { }; + guile-lint = callPackage ../development/tools/guile/guile-lint { }; gwrap = callPackage ../development/tools/guile/g-wrap { }; From fc7f4f6fc3638ff7fdd7e296b1bb7d9409eb3402 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 27 Sep 2017 07:39:32 -0400 Subject: [PATCH 0211/2806] i3: 4.14 -> 4.14.1 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 54dfc08e3b5..19aa89a7f7e 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.14"; + version = "4.14.1"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "1mm5jazwv4dz3k8vl1lfrcw86agpws5k9lmav1ly51qvmzivsfmf"; + sha256 = "1cazmfbbx6n8c81h6x6pdayq3mxs2ml3adz165z8vapkc72kl1nh"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; From bee055fa96ee8a4d855ef20b92aef99a2b9e394d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 27 Sep 2017 07:39:48 -0400 Subject: [PATCH 0212/2806] i3-gaps: 4.14 -> 4.14.1 --- pkgs/applications/window-managers/i3/gaps.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 58ab5b1d676..b322c7da193 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideDerivation (super : rec { name = "i3-gaps-${version}"; - version = "4.14"; - releaseDate = "2017-09-04"; + version = "4.14.1"; + releaseDate = "2017-09-24"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "08y2m0afcm8mbzb92qz286fd1hnqfya2pvhpxbgv83sgjcsg6hlr"; + sha256 = "11fnkg4halplcnannfw3ishzwwbxbnjafmkxsim199jhlyjjd8j7"; }; nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ]; From b015f629659b20f408d7d78185932ce41c2a1fd7 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Wed, 27 Sep 2017 13:56:31 +0200 Subject: [PATCH 0213/2806] pythonPackages.phonenumbers: 8.8.1 -> 8.8.2 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 53ec2c292fc..5f54fb12ec2 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.8.1"; + version = "8.8.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "09f4b307v6wn5zs6spvp5icwad3dz9baf7d14hyvpnxn7cdqj2xy"; + sha256 = "0xwis5hvp2wmnzqxax8896vhyb3q2fs9l9ilvyr44jdh3342dxpx"; }; meta = { From 825e417457d803fbc5e7ae8bc19fa9dfc29c32c4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 27 Sep 2017 08:16:42 -0400 Subject: [PATCH 0214/2806] docker: add 17.09.0-ce --- .../virtualization/docker/default.nix | 23 ++++++++++++------- pkgs/top-level/all-packages.nix | 10 ++++---- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 043f27e13d2..f28ec6275b8 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -44,6 +44,13 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; + + # This should go into the containerd derivation once 1.0.0 is out + preBuild = '' + mkdir $(pwd)/vendor/src + mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ + ln -s $(pwd) vendor/src/github.com/containerd/containerd + ''; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { name = "docker-init"; @@ -188,14 +195,14 @@ rec { tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_17_07 = dockerGen rec { - version = "17.07.0-ce"; - rev = "87847530f7176a48348d196f7c23bbd058052af1"; # git commit - sha256 = "0zw9zlzbd7il33ch17ypwpa73gsb930sf2njnphg7ylvnqp8qzsp"; - runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4"; - runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq"; - containerdRev = "3addd840653146c90a254301d6c3a663c7fd6429"; - containerdSha256 = "0as4s5wd57pdh1cyavkccpgs46kvlhr41v07qrv0phzffdhq3d5j"; + docker_17_09 = dockerGen rec { + version = "17.09.0-ce"; + rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit + sha256 = "03g0imdcxqx9y4hhyymxqzvm8bqg4cqrmb7sjbxfdgrhzh9kcn1p"; + runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64"; + runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq"; + containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; + containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72ddcb185e0..5bd78b21e84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9281,8 +9281,8 @@ with pkgs; libminc = callPackage ../development/libraries/libminc { }; - libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; - + libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmkv = callPackage ../development/libraries/libmkv { }; libmms = callPackage ../development/libraries/libmms { }; @@ -13981,10 +13981,10 @@ with pkgs; inherit (callPackage ../applications/virtualization/docker { }) docker_17_06 - docker_17_07; + docker_17_09; - docker = docker_17_06; - docker-edge = docker_17_07; + docker = docker_17_09; + docker-edge = docker_17_09; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; From 3abee357e6e6eec105bb3125094ec0f78423a52a Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 27 Sep 2017 14:00:07 +0200 Subject: [PATCH 0215/2806] pyramid: fix propagated builds hupper and plaster need to be propagated to dependent packages --- pkgs/top-level/python-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c6ca4bd1fc..70c334dda0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7346,19 +7346,18 @@ in { sha256 = "0dhbzc4q0vsnv3aihy728aczg56xs6h9s1rmvr096q4lb6yln3w4"; }; - buildInputs = with self; [ + checkInputs = with self; [ docutils virtualenv webtest zope_component - zope_interface - plaster - plaster-pastedeploy - hupper ] ++ optional isPy26 unittest2; propagatedBuildInputs = with self; [ + hupper PasteDeploy + plaster + plaster-pastedeploy repoze_lru repoze_sphinx_autointerface translationstring From bfab392e6edf20be2cfa8a457a65c2e6b4cfedc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Sep 2017 14:34:47 +0200 Subject: [PATCH 0216/2806] nixos(spamassassin): provide /etc/spamassassin to fix sa-learn et al Spamassassin expects its system-wide configuration at /etc/spamassassin, and some user tools (like sa-learn) need to read those configuration files. Therefore, we provide a symlink from /etc/spamassassin to the appropriate Nix store path to make sure those tools work without the user having to pass an elaborate --siteconfig path that, potentially, changes every time the system updates. Fixes https://github.com/NixOS/nixpkgs/issues/29414. --- nixos/modules/services/mail/spamassassin.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index fc8396cd85e..ba0e5aeb0b5 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -122,7 +122,11 @@ in config = mkIf cfg.enable { # Allow users to run 'spamc'. - environment.systemPackages = [ pkgs.spamassassin ]; + + environment = { + etc = singleton { source = spamdEnv; target = "spamassassin"; }; + systemPackages = [ pkgs.spamassassin ]; + }; users.extraUsers = singleton { name = "spamd"; @@ -177,11 +181,6 @@ in # 0 and 1 no error, exitcode > 1 means error: # https://spamassassin.apache.org/full/3.1.x/doc/sa-update.html#exit_codes preStart = '' - # this abstraction requires no centralized config at all - if [ -d /etc/spamassassin ]; then - echo "This spamassassin does not support global '/etc/spamassassin' folder for configuration as this would be impure. Merge your configs into 'services.spamassassin' and remove the '/etc/spamassassin' folder to make this service work. Also see 'https://github.com/NixOS/nixpkgs/pull/26470'."; - exit 1 - fi echo "Recreating '/var/lib/spamasassin' with creating '3.004001' (or similar) and 'sa-update-keys'" mkdir -p /var/lib/spamassassin chown spamd:spamd /var/lib/spamassassin -R From 99e24590cbfbb1e82681c9a8dbb7d8d0acd6a1c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Sep 2017 14:37:56 +0200 Subject: [PATCH 0217/2806] nixos(spamassassin): fix trailing whitespace --- nixos/modules/services/mail/spamassassin.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index ba0e5aeb0b5..d483a8c3d67 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -42,7 +42,7 @@ in Then you can Use this sieve filter: require ["fileinto", "reject", "envelope"]; - + if header :contains "X-Spam-Flag" "YES" { fileinto "spam"; } @@ -67,11 +67,11 @@ in initPreConf = mkOption { type = types.str; description = "The SpamAssassin init.pre config."; - default = - '' + default = + '' # # to update this list, run this command in the rules directory: - # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq + # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq # #loadplugin Mail::SpamAssassin::Plugin::AccessDB @@ -142,7 +142,7 @@ in systemd.services.sa-update = { script = '' - set +e + set +e ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd v=$? @@ -157,7 +157,7 @@ in ''; }; - systemd.timers.sa-update = { + systemd.timers.sa-update = { description = "sa-update-service"; partOf = [ "sa-update.service" ]; wantedBy = [ "timers.target" ]; @@ -184,7 +184,7 @@ in echo "Recreating '/var/lib/spamasassin' with creating '3.004001' (or similar) and 'sa-update-keys'" mkdir -p /var/lib/spamassassin chown spamd:spamd /var/lib/spamassassin -R - set +e + set +e ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd v=$? set -e From fd0375830562aa41f0a9429e72f42ba9bbe0ac89 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:18:02 +1000 Subject: [PATCH 0218/2806] guile-lint: fix build by building with guile 1.8 [1] gives us the indication that guile-lint should be used with guile-1.8. [1]: https://www.gnu.org/software/guile/libraries/ --- pkgs/development/tools/guile/guile-lint/default.nix | 1 - pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 7ca54365be5..156def09187 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "Guile-Lint checks syntax and semantics in a Guile program or module"; homepage = http://user42.tuxfamily.org/guile-lint/index.html; license = "GPL"; - broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b41d7845ed..d46681b05a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7187,7 +7187,9 @@ with pkgs; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; - guile-lint = callPackage ../development/tools/guile/guile-lint { }; + guile-lint = callPackage ../development/tools/guile/guile-lint { + guile = guile_1_8; + }; gwrap = callPackage ../development/tools/guile/g-wrap { }; From 43b7e69d13de4702f7b27803ce1eb93ffe1e57fe Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 27 Sep 2017 14:47:21 +0200 Subject: [PATCH 0219/2806] splUnstable: fix hash --- pkgs/os-specific/linux/spl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 31af8a49de1..cd0c283edbb 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -70,6 +70,6 @@ in splUnstable = common { version = "2017-09-26"; rev = "e8474f9ad3b3d23c3277535c4f53f8fd1e6cbd74"; - sha256 = "1hydfhmngpq31gxkxipqxnin74l760d1ia202h12vsgix9sp32h7"; + sha256 = "0251cnffgx98nckgz6imwa8dnvba44wc02aacmr1n430gmq72xra"; }; } From 14befbf78d34b0d3ea251a2d0bcbc1665c10f2fa Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:27:26 +1000 Subject: [PATCH 0220/2806] guile-lint: code formatting nits --- .../tools/guile/guile-lint/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 156def09187..66891dea62a 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -1,15 +1,20 @@ -{stdenv, fetchurl, guile}: +{ stdenv, fetchurl, guile }: + +let + name = "guile-lint-${version}"; + version = "14"; +in stdenv.mkDerivation { + inherit name; -stdenv.mkDerivation rec { - name = "guile-lint-14"; src = fetchurl { - url = "http://download.tuxfamily.org/user42/" + name + ".tar.bz2"; + url = "http://download.tuxfamily.org/user42/${name}.tar.bz2"; sha256 = "5bfcf7a623338b2ef81ac097e3e136eaf32856dd0730b7eeaff3161067b5d0be"; }; buildInputs = [ guile ]; unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"''; + patchPhase = '' cat guile-lint.in | \ sed 's|^exec guile|exec $\{GUILE:-${guile}/bin/guile}|g' > ,,tmp && \ @@ -20,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Guile-Lint checks syntax and semantics in a Guile program or module"; - homepage = http://user42.tuxfamily.org/guile-lint/index.html; + homepage = "http://user42.tuxfamily.org/guile-lint/index.html"; license = "GPL"; }; } From f311898f671fde65af97a1c1e6eb138a55d7e033 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:28:07 +1000 Subject: [PATCH 0221/2806] guile-lint: remove package name prefix from meta.description --- pkgs/development/tools/guile/guile-lint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 66891dea62a..177e78f6555 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { doCheck = true; meta = { - description = "Guile-Lint checks syntax and semantics in a Guile program or module"; + description = "Checks syntax and semantics in a Guile program or module"; homepage = "http://user42.tuxfamily.org/guile-lint/index.html"; license = "GPL"; }; From 727fa0d81d9bba2329c032937d66af76750279ed Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:28:35 +1000 Subject: [PATCH 0222/2806] guile-lint: use https version of homepage --- pkgs/development/tools/guile/guile-lint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 177e78f6555..a2e4fd923f9 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { meta = { description = "Checks syntax and semantics in a Guile program or module"; - homepage = "http://user42.tuxfamily.org/guile-lint/index.html"; + homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; license = "GPL"; }; } From 5352a105f7189638a02ea918ddd807774f3b95bf Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:30:16 +1000 Subject: [PATCH 0223/2806] guile-lint: use correct license value, "GPL" -> gpl3Plus --- pkgs/development/tools/guile/guile-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index a2e4fd923f9..40aabaa04ec 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -23,9 +23,9 @@ in stdenv.mkDerivation { doCheck = true; - meta = { + meta = with stdenv.lib; { description = "Checks syntax and semantics in a Guile program or module"; homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; - license = "GPL"; + license = licenses.gpl3Plus; }; } From a4601f9f40498f24bcfff7448d68ed512de5a048 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:32:03 +1000 Subject: [PATCH 0224/2806] guile-lint: add meta.platforms, with the same value as for guile --- pkgs/development/tools/guile/guile-lint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 40aabaa04ec..219c1a40194 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -27,5 +27,6 @@ in stdenv.mkDerivation { description = "Checks syntax and semantics in a Guile program or module"; homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; license = licenses.gpl3Plus; + platforms = platforms.all; }; } From 3748013d226764ef974f2ec8cf6eadc15d5d1f22 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:33:01 +1000 Subject: [PATCH 0225/2806] guile-lint: add vyp as maintainer --- pkgs/development/tools/guile/guile-lint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 219c1a40194..91a7f73434e 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -27,6 +27,7 @@ in stdenv.mkDerivation { description = "Checks syntax and semantics in a Guile program or module"; homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ vyp ]; platforms = platforms.all; }; } From e7e52d4b83aafa62cae374a4f2d7bed7abdc9946 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:36:12 +1000 Subject: [PATCH 0226/2806] guile-lint: use https src url --- pkgs/development/tools/guile/guile-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 91a7f73434e..68173083c1d 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -7,8 +7,8 @@ in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://download.tuxfamily.org/user42/${name}.tar.bz2"; - sha256 = "5bfcf7a623338b2ef81ac097e3e136eaf32856dd0730b7eeaff3161067b5d0be"; + url = "https://download.tuxfamily.org/user42/${name}.tar.bz2"; + sha256 = "1gnhnmki05pkmzpbfc07vmb2iwza6vhy75y03bw2x2rk4fkggz2v"; }; buildInputs = [ guile ]; From 547dba10c01207dc1d9ebfcf53867d5d8ee26a8c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 27 Sep 2017 13:37:22 +0000 Subject: [PATCH 0227/2806] libmicrohttpd: fix darwin build --- pkgs/development/libraries/libmicrohttpd/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 23e6a37f918..ec03032105f 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig }: +{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintlOrEmpty }: stdenv.mkDerivation rec { name = "libmicrohttpd-0.9.55"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" "devdoc" "info" ]; - buildInputs = [ libgcrypt curl gnutls pkgconfig ]; + buildInputs = [ libgcrypt curl gnutls pkgconfig ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv libintlOrEmpty ]; preCheck = '' # Since `localhost' can't be resolved in a chroot, work around it. @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/libmicrohttpd/; maintainers = with maintainers; [ eelco vrthra fpletz ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } + From ea4adc5f5fa083b108591b425acf81f32c5fe1a2 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:42:16 +1000 Subject: [PATCH 0228/2806] guile-lint: patchPhase -> prePatch --- pkgs/development/tools/guile/guile-lint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 68173083c1d..07eb4779960 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"''; - patchPhase = '' + prePatch = '' cat guile-lint.in | \ sed 's|^exec guile|exec $\{GUILE:-${guile}/bin/guile}|g' > ,,tmp && \ mv ,,tmp guile-lint.in From 89238b8628a94b78e0f046c856008b17af020b34 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:48:42 +1000 Subject: [PATCH 0229/2806] guile-lint: use substituteInPlace instead of sed for prePatch --- pkgs/development/tools/guile/guile-lint/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 07eb4779960..543e30cca7b 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -16,9 +16,8 @@ in stdenv.mkDerivation { unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"''; prePatch = '' - cat guile-lint.in | \ - sed 's|^exec guile|exec $\{GUILE:-${guile}/bin/guile}|g' > ,,tmp && \ - mv ,,tmp guile-lint.in + substituteInPlace guile-lint.in --replace \ + "exec guile" "exec ${guile}/bin/guile" ''; doCheck = true; From 4398872523a4f204d061f7c72bbbfc5ad94018b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Sep 2017 16:17:15 +0200 Subject: [PATCH 0230/2806] libnfs: fix broken meta.license attribute A license called "bsd" does not exist. Ping @peterhoeg. --- pkgs/development/libraries/libnfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index 28069268022..ab59867283e 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NFS client library"; homepage = https://github.com/sahlberg/libnfs; - license = with licenses; [ lgpl2 bsd gpl3]; + license = with licenses; [ lgpl2 gpl3]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; From c0235ef611b5760d0d98005570142a3f3bd071d5 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Sep 2017 16:27:32 +0200 Subject: [PATCH 0231/2806] libnfs: fix eval --- pkgs/development/libraries/libnfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index ab59867283e..d9149a1fbac 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NFS client library"; homepage = https://github.com/sahlberg/libnfs; - license = with licenses; [ lgpl2 gpl3]; + license = with licenses; [ lgpl2 bsd2 gpl3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; From 71cc54300ef68ec2b211a848a7d41f3258b981a9 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Wed, 27 Sep 2017 13:47:35 +0200 Subject: [PATCH 0232/2806] emby: 3.2.30.0 -> 3.2.32.0 --- pkgs/servers/emby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 5b749b92c03..678fb42acd5 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.30.0"; + version = "3.2.32.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "1aqal7n4a9dvy97zw4aah9a8jm4l2v1qgjgs5kvskrvir2dbid27"; + sha256 = "0bwcqwh9g8yrkh1schfr30jf5m2w3r2raczq5x94vjfs8i6dmqh0"; }; buildInputs = with pkgs; [ From 76245e0b9dc0f13af031bf9ed2057046a16fb98f Mon Sep 17 00:00:00 2001 From: Peter Brottveit Bock Date: Wed, 27 Sep 2017 14:44:35 +0000 Subject: [PATCH 0233/2806] urweb: support darwin, depend on gcc, fix paths. 1. Add support for the darwing platform. 2. Depend on gcc, since the urweb executable will call gcc when it compiles an urweb-project. 3. Fix include path and link path for the dependencies. --- pkgs/development/compilers/urweb/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 7145a8f2fa0..bb8cb5f1746 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, file, openssl, mlton -, mysql, postgresql, sqlite +, mysql, postgresql, sqlite, gcc }: stdenv.mkDerivation rec { @@ -20,12 +20,14 @@ stdenv.mkDerivation rec { configureFlags = "--with-openssl=${openssl.dev}"; preConfigure = '' - export PGHEADER="${postgresql}/include/libpq-fe.h"; + export PGHEADER="${postgresql.dev}/include/libpq-fe.h"; export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h"; export SQHEADER="${sqlite.dev}/include/sqlite3.h"; + export CC="${gcc}/bin/gcc"; export CCARGS="-I$out/include \ - -L${lib.getLib mysql.client}/lib/mysql \ + -L${openssl.out}/lib \ + -L${lib.getLib mysql.client}/lib \ -L${postgresql.lib}/lib \ -L${sqlite.out}/lib"; ''; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { description = "Advanced purely-functional web programming language"; homepage = "http://www.impredicative.com/ur/"; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.thoughtpolice stdenv.lib.maintainers.sheganinans ]; }; } From d0d992a9a0c3f6129017b08326bef121db3b0a9d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Sep 2017 17:10:06 +0200 Subject: [PATCH 0234/2806] urllib3: revert multiple outputs only moved propagated build inputs to dev which broke packages depending on it e.g. glusterfs cc @edolstra --- pkgs/development/python-modules/urllib3/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index f030ef74e63..10021e14f12 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -12,8 +12,6 @@ buildPythonPackage rec { sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; }; - outputs = [ "out" "dev" ]; - NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" From 79d547b4bbf9aaa900bc90aa4e97ec4516530641 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Sep 2017 17:10:04 +0200 Subject: [PATCH 0235/2806] nix-daemon: Bump the default number of build users While it's annoying to pollute the user database with a lot of nixbld* users, 10 users is really too low for many modern systems. --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index bf1304ee7ac..efa3b5b6bd7 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -428,7 +428,7 @@ in fi ''; - nix.nrBuildUsers = mkDefault (lib.max 10 cfg.maxJobs); + nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs); users.extraUsers = nixbldUsers; From e253ae7d3a4ab992d2432c87514e3333a3cf744d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Sep 2017 17:25:14 +0200 Subject: [PATCH 0236/2806] rubyGems.pg: fix postgresql path --- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 6647d71bd00..a0d4b9adcbe 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -183,7 +183,7 @@ in pg = attrs: { buildFlags = [ - "--with-pg-config=${postgresql}/bin/pg_config" + "--with-pg-config=${postgresql.dev}/bin/pg_config" ]; }; From d82578addb1dee832c7758dbd4a3fbbf30c902b6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 27 Sep 2017 17:32:12 +0200 Subject: [PATCH 0237/2806] bitcoin-abc: init at 0.15.0 --- pkgs/applications/altcoins/bitcoin-abc.nix | 41 ++++++++++++++++++++++ pkgs/applications/altcoins/default.nix | 3 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/altcoins/bitcoin-abc.nix diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix new file mode 100644 index 00000000000..a14cccd2fdc --- /dev/null +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, withGui }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + + name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "bitcoin-ABC"; + repo = "bitcoin-abc"; + rev = "v${version}"; + sha256 = "1fygn6cc99iasg5g5jyps5ps873hfnn4ln4hsmcwlwiqd591qxyv"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib + miniupnpc utillinux protobuf libevent ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] + ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = { + description = "Peer-to-peer electronic cash system (Cash client)"; + longDescription= '' + Bitcoin ABC is the name of open source software which enables the use of Bitcoin. + It is designed to facilite a hard fork to increase Bitcoin's block size limit. + "ABC" stands for "Adjustable Blocksize Cap". + + Bitcoin ABC is a fork of the Bitcoin Core software project. + ''; + homepage = https://bitcoinabc.org/; + maintainers = with maintainers; [ lassulus ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 31dcc78d3d7..f83e565db91 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -5,6 +5,9 @@ rec { bitcoin = callPackage ./bitcoin.nix { withGui = true; }; bitcoind = callPackage ./bitcoin.nix { withGui = false; }; + bitcoin-abc = callPackage ./bitcoin-abc.nix { withGui = true; }; + bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; + bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; From b775b2cd4fd3d7ceeda1b0b7fd6f7110c2ffee68 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 27 Sep 2017 16:32:54 +0100 Subject: [PATCH 0238/2806] metasploit: use makeWrapper instead --- pkgs/tools/security/metasploit/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 15a30db522e..37796fef174 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -35,14 +35,14 @@ in stdenv.mkDerivation rec { cp -r * $out/share/msf - for i in $out/share/msf/msf*; do - bin=$out/bin/$(basename $i) - cat > $bin < Date: Wed, 27 Sep 2017 17:44:35 +0200 Subject: [PATCH 0239/2806] electron-cash: init at 2.9.3 --- .../misc/electron-cash/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/applications/misc/electron-cash/default.nix diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix new file mode 100644 index 00000000000..a45ab59ace8 --- /dev/null +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +python2Packages.buildPythonApplication rec { + version = "2.9.3"; + name = "electron-cash-${version}"; + + src = fetchFromGitHub { + owner = "fyookball"; + repo = "electrum"; + rev = version; + sha256 = "1r39b5ag5fipzgr84pzb53cfm8a4dy53257608754dwr1gfpma3v"; + }; + + propagatedBuildInputs = with python2Packages; [ + dns + ecdsa + jsonrpclib + pbkdf2 + pyaes + pycrypto + pyqt4 + pysocks + qrcode + requests + tlslite + + # plugins + keepkey + trezor + ]; + + preBuild = '' + sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py + pyrcc4 icons.qrc -o gui/qt/icons_rc.py + # Recording the creation timestamps introduces indeterminism to the build + sed -i '/Created: .*/d' gui/qt/icons_rc.py + ''; + + postInstall = '' + # Despite setting usr_share above, these files are installed under + # $out/nix ... + mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out + rm -rf $out/lib/python2.7/site-packages/nix + + substituteInPlace $out/share/applications/electron.desktop \ + --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/electrum help >/dev/null + ''; + + meta = with stdenv.lib; { + description = "A lightweight Bitcoin wallet"; + longDescription = '' + An easy-to-use Bitcoin client featuring wallets generated from + mnemonic seeds (in addition to other, more advanced, wallet options) + and the ability to perform transactions without downloading a copy + of the blockchain. + ''; + homepage = https://www.electroncash.org/; + maintainers = with maintainers; [ lassulus ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72ddcb185e0..48be843c86b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14050,6 +14050,8 @@ with pkgs; ekho = callPackage ../applications/audio/ekho { }; + electron-cash = callPackage ../applications/misc/electron-cash { }; + electrum = callPackage ../applications/misc/electrum { }; electrum-dash = callPackage ../applications/misc/electrum-dash { }; From ad8cb0917fabff0cffe3f3b003343bc84d55d93e Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 27 Sep 2017 15:59:51 +0100 Subject: [PATCH 0240/2806] nixos/tinc: do not add Device= by default tinc can figure this out based on DeviceType. I also got `/dev/net/tun FD in bad state` after a particular upgrade. --- nixos/modules/services/networking/tinc.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index d5db328310c..4b80185a649 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -141,7 +141,6 @@ in ${optionalString (data.ed25519PrivateKeyFile != null) "Ed25519PrivateKeyFile = ${data.ed25519PrivateKeyFile}"} ${optionalString (data.listenAddress != null) "ListenAddress = ${data.listenAddress}"} ${optionalString (data.bindToAddress != null) "BindToAddress = ${data.bindToAddress}"} - Device = /dev/net/tun Interface = tinc.${network} ${data.extraConfig} ''; From 75ba415fbcfe48fdf5fb88f2aa461ce83921303f Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 27 Sep 2017 16:02:23 +0100 Subject: [PATCH 0241/2806] nixos/tinc: remove useless script argument ExecStart is sufficient and more transparent to the user. --- nixos/modules/services/networking/tinc.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 4b80185a649..0354e76d74f 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -167,6 +167,7 @@ in Type = "simple"; Restart = "always"; RestartSec = "3"; + ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}"; }; preStart = '' mkdir -p /etc/tinc/${network}/hosts @@ -186,9 +187,6 @@ in [ -f "/etc/tinc/${network}/rsa_key.priv" ] || tincd -n ${network} -K 4096 fi ''; - script = '' - tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel} - ''; }) ); From 0a4704bd198bce12feb06985de69597274e88968 Mon Sep 17 00:00:00 2001 From: Brad Jensen Date: Tue, 26 Sep 2017 18:38:41 -0700 Subject: [PATCH 0242/2806] lispPackages.cl-protobufs: init at 20170403-git --- .../quicklisp-to-nix-output/cl-protobufs.nix | 30 +++++++++++++++++++ .../lisp-modules/quicklisp-to-nix-systems.txt | 1 + .../lisp-modules/quicklisp-to-nix.nix | 13 ++++++++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix new file mode 100644 index 00000000000..7ec440076c3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix @@ -0,0 +1,30 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-protobufs''; + version = ''20170403-git''; + + description = ''Protobufs for Common Lisp''; + + deps = [ args."alexandria" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-protobufs/2017-04-03/cl-protobufs-20170403-git.tgz''; + sha256 = ''0ibpl076k8gq79sacg96mzjf5hqkrxzi5wlx3bjap52pla53w4g5''; + }; + + packageName = "cl-protobufs"; + + asdFilesToKeep = ["cl-protobufs.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-protobufs DESCRIPTION Protobufs for Common Lisp SHA256 + 0ibpl076k8gq79sacg96mzjf5hqkrxzi5wlx3bjap52pla53w4g5 URL + http://beta.quicklisp.org/archive/cl-protobufs/2017-04-03/cl-protobufs-20170403-git.tgz + MD5 86c8da92b246b4b77d6107bc5dfaff08 NAME cl-protobufs FILENAME + cl-protobufs DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME closer-mop FILENAME closer-mop) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES (alexandria babel closer-mop trivial-features trivial-garbage) + VERSION 20170403-git SIBLINGS (cl-protobufs-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 32ef6367e27..49aa941094b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -33,6 +33,7 @@ closer-mop cl-ppcre cl-ppcre-template cl-ppcre-unicode +cl-protobufs cl-reexport cl-smtp clsql diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 22b58895747..86817e14f55 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -2012,6 +2012,19 @@ let quicklisp-to-nix-packages = rec { })); + "cl-protobufs" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-protobufs" or (x: {})) + (import ./quicklisp-to-nix-output/cl-protobufs.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + "cl-ppcre-unicode" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-ppcre-unicode" or (x: {})) From bbb26760a022bfcd17e368039e035b9c0b7d1e89 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 26 Sep 2017 22:19:56 +0000 Subject: [PATCH 0243/2806] closure-compiler: 20170218 -> 20170910 --- .../development/compilers/closure/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 86e04b491e5..8d1b06f52b7 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -1,31 +1,30 @@ -{ stdenv, fetchurl, jre, gnutar, bash }: +{ stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20170218"; + version = "20170910"; src = fetchurl { - url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "06snabmpy07x4xm8d1xgq5dfzbjli10xkxk3nx9jms39zkj493cd"; + url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; + sha256 = "0znzsks8ql9qajhcjzfkhmnpz8zs6b8cji04fhivyq973jpxxrak"; }; - phases = [ "installPhase" ]; + sourceRoot = "."; - buildInputs = [ gnutar ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; installPhase = '' mkdir -p $out/share/java $out/bin - tar -xzf $src - cp -r closure-compiler-v${version}.jar $out/share/java/ - echo "#!${bash}/bin/bash" > $out/bin/closure-compiler - echo "${jre}/bin/java -jar $out/share/java/closure-compiler-v${version}.jar \"\$@\"" >> $out/bin/closure-compiler - chmod +x $out/bin/closure-compiler + cp closure-compiler-v${version}.jar $out/share/java + makeWrapper ${jre}/bin/java $out/bin/closure-compiler \ + --add-flags "-jar $out/share/java/closure-compiler-v${version}.jar" ''; - meta = { + meta = with stdenv.lib; { description = "A tool for making JavaScript download and run faster"; homepage = https://developers.google.com/closure/compiler/; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = licenses.asl20; + platforms = platforms.all; }; } From 56eba66f77bb1d4711e824158e3b9a8d55a929f1 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 23 Sep 2017 15:58:07 +0100 Subject: [PATCH 0244/2806] mysqlBackup service: let it work with default settings * Grants enough privileges to the configured user so that it can run mysqldump. * Adds a nixos test. * Use systemd timers instead of a cronjob (by @fadenb). * Creates a new user for backups by default, instead of using mysql user. * Ensures that backup user has write permissions on backup location. * Write backup to a temporary file before renaming so that a failed backup won't overwrite the previous backup, and so that the backup location will never contain a partial backup. Breaking changes: * Renamed period to calendar to reflect the change in how to configure the backup time. * A failed backup will no longer result in cron sending an e-mail -- users' monitoring systems must be updated. Resolves #24728 --- .../modules/services/backup/mysql-backup.nix | 86 +++++++++++++++---- nixos/release.nix | 1 + nixos/tests/mysql-backup.nix | 42 +++++++++ nixos/tests/testdb.sql | 1 + 4 files changed, 112 insertions(+), 18 deletions(-) create mode 100644 nixos/tests/mysql-backup.nix diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 28f607861f7..3f533fa457d 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -6,10 +6,28 @@ let inherit (pkgs) mysql gzip; - cfg = config.services.mysqlBackup ; - location = cfg.location ; - mysqlBackupCron = db : '' - ${cfg.period} ${cfg.user} ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz + cfg = config.services.mysqlBackup; + defaultUser = "mysqlbackup"; + + backupScript = '' + set -o pipefail + failed="" + ${concatMapStringsSep "\n" backupDatabaseScript cfg.databases} + if [ -n "$failed" ]; then + echo "Backup of database(s) failed:$failed" + exit 1 + fi + ''; + backupDatabaseScript = db: '' + dest="${cfg.location}/${db}.gz" + if ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then + mv $dest.tmp $dest + echo "Backed up to $dest" + else + echo "Failed to back up to $dest" + rm -f $dest.tmp + failed="$failed ${db}" + fi ''; in @@ -26,17 +44,16 @@ in ''; }; - period = mkOption { - default = "15 01 * * *"; + calendar = mkOption { + type = types.str; + default = "01:15:00"; description = '' - This option defines (in the format used by cron) when the - databases should be dumped. - The default is to update at 01:15 (at night) every day. + Configured when to run the backup service systemd unit (DayOfWeek Year-Month-Day Hour:Minute:Second). ''; }; user = mkOption { - default = "mysql"; + default = defaultUser; description = '' User to be used to perform backup. ''; @@ -66,16 +83,49 @@ in }; - config = mkIf config.services.mysqlBackup.enable { + config = mkIf cfg.enable { + users.extraUsers = optionalAttrs (cfg.user == defaultUser) (singleton + { name = defaultUser; + isSystemUser = true; + createHome = false; + home = cfg.location; + group = "nogroup"; + }); - services.cron.systemCronJobs = map mysqlBackupCron config.services.mysqlBackup.databases; - - system.activationScripts.mysqlBackup = stringAfter [ "stdio" "users" ] - '' - mkdir -m 0700 -p ${config.services.mysqlBackup.location} - chown ${config.services.mysqlBackup.user} ${config.services.mysqlBackup.location} - ''; + services.mysql.ensureUsers = [{ + name = cfg.user; + ensurePermissions = with lib; + let + privs = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES"; + grant = db: nameValuePair "${db}.*" privs; + in + listToAttrs (map grant cfg.databases); + }]; + systemd = { + timers."mysql-backup" = { + description = "Mysql backup timer"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfg.calendar; + AccuracySec = "5m"; + Unit = "mysql-backup.service"; + }; + }; + services."mysql-backup" = { + description = "Mysql backup service"; + enable = true; + serviceConfig = { + User = cfg.user; + PermissionsStartOnly = true; + }; + preStart = '' + mkdir -m 0700 -p ${cfg.location} + chown -R ${cfg.user} ${cfg.location} + ''; + script = backupScript; + }; + }; }; } diff --git a/nixos/release.nix b/nixos/release.nix index ac7755a160f..06f1c73410c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -283,6 +283,7 @@ in rec { tests.mumble = callTest tests/mumble.nix {}; tests.munin = callTest tests/munin.nix {}; tests.mysql = callTest tests/mysql.nix {}; + tests.mysqlBackup = callTest tests/mysql-backup.nix {}; tests.mysqlReplication = callTest tests/mysql-replication.nix {}; tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; }; tests.nat.firewall-conntrack = callTest tests/nat.nix { withFirewall = true; withConntrackHelpers = true; }; diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix new file mode 100644 index 00000000000..f5bcc460cba --- /dev/null +++ b/nixos/tests/mysql-backup.nix @@ -0,0 +1,42 @@ +# Test whether mysqlBackup option works +import ./make-test.nix ({ pkgs, ... } : { + name = "mysql-backup"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ rvl ]; + }; + + nodes = { + master = { config, pkgs, ... }: { + services.mysql = { + enable = true; + initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + package = pkgs.mysql; + }; + + services.mysqlBackup = { + enable = true; + databases = [ "doesnotexist" "testdb" ]; + }; + }; + }; + + testScript = + '' startAll; + + # Need to have mysql started so that it can be populated with data. + $master->waitForUnit("mysql.service"); + + # Wait for testdb to be populated. + $master->sleep(10); + + # Do a backup and wait for it to finish. + $master->startJob("mysql-backup.service"); + $master->waitForJob("mysql-backup.service"); + + # Check that data appears in backup + $master->succeed("${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello"); + + # Check that a failed backup is logged + $master->succeed("journalctl -u mysql-backup.service | grep 'fail.*doesnotexist' > /dev/null"); + ''; +}) diff --git a/nixos/tests/testdb.sql b/nixos/tests/testdb.sql index 4fb28fea3df..3c68c49ae82 100644 --- a/nixos/tests/testdb.sql +++ b/nixos/tests/testdb.sql @@ -8,3 +8,4 @@ insert into tests values (1, 'a'); insert into tests values (2, 'b'); insert into tests values (3, 'c'); insert into tests values (4, 'd'); +insert into tests values (5, 'hello'); From 34eefdfb9df7205bf6f4c33bc26ef90064b1eee5 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 25 Sep 2017 08:20:47 +0100 Subject: [PATCH 0245/2806] nixos/release-notes: MySQL backup service breaking changes --- nixos/doc/manual/release-notes/rl-1709.xml | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index d5ab6ab0c24..c1ad853d544 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -289,6 +289,46 @@ FLUSH PRIVILEGES; in them being reloaded. + + + + services.mysqlBackup now works by default + without any user setup, including for users other than + mysql. + + + + By default, the mysql user is no longer the + user which performs the backup. Instead a system account + mysqlbackup is used. + + + + The mysqlBackup service is also now using + systemd timers instead of cron. + + + + Therefore, the services.mysqlBackup.period + option no longer exists, and has been replaced with + services.mysqlBackup.calendar, which is in + the format of systemd.time(7). + + + + If you expect to be sent an e-mail when the backup fails, + consider using a script which monitors the systemd journal for + errors. Regretfully, at present there is no built-in + functionality for this. + + + + You can check that backups still work by running + systemctl start mysql-backup then + systemctl status mysql-backup. + + Other notable improvements: From 964672dde516d1b9a5d2248db33253dc36fdb7db Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 27 Sep 2017 13:03:06 -0400 Subject: [PATCH 0246/2806] linux: Remove 4.12 (EOL) --- pkgs/os-specific/linux/kernel/linux-4.12.nix | 11 ----------- pkgs/top-level/all-packages.nix | 17 ----------------- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.12.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix deleted file mode 100644 index bff0f5db953..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.12.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.12.14"; - extraMeta.branch = "4.12"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "09zxmknh6awhqmj8dyq95bdlwcasryy35hkjxjlzixdgn52kzaw6"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bd78b21e84..b5aad1dcbc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12297,22 +12297,6 @@ with pkgs; ]; }; - linux_4_12 = callPackage ../os-specific/linux/kernel/linux-4.12.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_13 = callPackage ../os-specific/linux/kernel/linux-4.13.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12522,7 +12506,6 @@ with pkgs; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); - linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12); linuxPackages_4_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_13); # Don't forget to update linuxPackages_latest! From 2ca84cfa2922428267321bb8a7ed22b5da30a2c1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 27 Sep 2017 13:03:27 -0400 Subject: [PATCH 0247/2806] linux: 4.9.51 -> 4.9.52 --- 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 5033bb88f79..6531323c1d5 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.51"; + version = "4.9.52"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12mag09scyzi5a352y39y4b6rjh89qqca53hhmjc396q09hsdyl3"; + sha256 = "12h4w6x0zcl8kpia2y7myv7w7i0dihw4g8v638fs8bzk3d7h7pgz"; }; } // (args.argsOverride or {})) From ab3ff4af9fb3a32888730496a1561290a2621433 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 27 Sep 2017 13:08:21 -0400 Subject: [PATCH 0248/2806] linux: 4.13.3 -> 4.13.4 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index d1c4d8ba8e7..c45afd1cbeb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.3"; + version = "4.13.4"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ayai3i0jakxzszpijhknjiwwi055wa74bpmnr0n7dh2l5s2rlh3"; + sha256 = "087lv2laf4wx28z9zqg9s275nzygica0hc1g8vn5ql6yb7mrb7m0"; }; } // (args.argsOverride or {})) From 9636e754640dcc8f3357dfca6fd570228d64757e Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 27 Sep 2017 13:23:37 +0200 Subject: [PATCH 0249/2806] udpt: 2016-02-20 -> 2017-09-27 --- pkgs/servers/udpt/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index 97938de74a5..9e9816c941d 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, boost, sqlite }: +{ stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }: stdenv.mkDerivation rec { name = "udpt-${version}"; - version = "2016-02-20"; # v2.0-rc0 with sample config + version = "2017-09-27"; enableParallelBuilding = true; @@ -12,11 +12,21 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "naim94a"; repo = "udpt"; - rev = "0790558de8b5bb841bb10a9115bbf72c3b4711b5"; - sha256 = "0rgkjwvnqwbnqy7pm3dk176d3plb5lypaf12533yr0yfzcp6gnzk"; + rev = "e0dffc83c8ce76b08a41a4abbd5f8065535d534f"; + sha256 = "187dw96mzgcmh4k9pvfpb7ckbb8d4vlikamr2x8vkpwzgjs3xd6g"; }; - buildInputs = [ boost sqlite ]; + doCheck = true; + + checkPhase = '' + runHook preCheck + + make test + + runHook postCheck + ''; + + buildInputs = [ boost sqlite cmake gtest ]; postPatch = '' # Enabling optimization (implied by fortify hardening) causes htons @@ -27,7 +37,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/etc/ cp udpt $out/bin - cp udpt.conf $out/etc/ + cp ../udpt.conf $out/etc/ # without this, the resulting binary is unstripped. runHook postInstall ''; From 5e2815dfb733ea042cd64188cd91158356ca1a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 7 May 2017 00:30:29 +0200 Subject: [PATCH 0250/2806] glusterfs service: Don't make it a prerequisite of network-online.target. This introduces dependency cycles. A network file system to be running is not required for a network connection to be available. https://github.com/NixOS/nixpkgs/commit/19759cfeab0b749666dafdf52a0aad79123a2126#commitcomment-22044519 --- nixos/modules/services/network-filesystems/glusterfs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index e7f52bc4a7d..518ae74ee5a 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -106,7 +106,6 @@ in requires = [ "rpcbind.service" ]; after = [ "rpcbind.service" "network.target" "local-fs.target" ]; - before = [ "network-online.target" ]; preStart = '' install -m 0755 -d /var/log/glusterfs From 21998d597bd257c1a769e2be4b7a52b5b7e482a6 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Sep 2017 19:19:14 +0200 Subject: [PATCH 0251/2806] postgresql: fix pgxs dir in pg_config --- pkgs/servers/sql/postgresql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 022ac15aee7..980ed5056a1 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -46,7 +46,7 @@ let let path = if atLeast "9.6" then "src/common/config_info.c" else "src/bin/pg_config/pg_config.c"; in '' # Hardcode the path to pgxs so pg_config returns the path in $out - substituteInPlace "${path}" --replace HARDCODED_PGXS_PATH $out/lib + substituteInPlace "${path}" --replace HARDCODED_PGXS_PATH $dev/lib ''; postInstall = From e0771a241092deb0a09341607adf0f24c749c037 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Sep 2017 19:42:01 +0200 Subject: [PATCH 0252/2806] Revert "ibus: Move ibus-setup to .dev" This reverts commit af44f99dca62abc5d569cb824a64f766e308d419. ibus-with-plugins was broken by this. cc @edolstra --- pkgs/tools/inputmethods/ibus/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 3b076bb8ff6..66d61b8c5e9 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -110,10 +110,6 @@ in stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = "$out/bin/ibus version"; - postInstall = '' - moveToOutput "bin/ibus-setup" "$dev" - ''; - meta = with stdenv.lib; { homepage = https://github.com/ibus/ibus; description = "Intelligent Input Bus for Linux / Unix OS"; From bd54b72676893d1519b217b23b3b868c8421d04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 7 May 2017 00:32:41 +0200 Subject: [PATCH 0253/2806] glusterfs service: Add settings to disable rpcbind and the events daemon. See also https://github.com/NixOS/nixpkgs/pull/22225#pullrequestreview-26459886 --- .../network-filesystems/glusterfs.nix | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index 518ae74ee5a..a697bb25da5 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -41,6 +41,25 @@ in default = "INFO"; }; + useRpcbind = mkOption { + type = types.bool; + description = '' + Enable use of rpcbind. This is required for Gluster's NFS functionality. + + You may want to turn it off to reduce the attack surface for DDoS reflection attacks. + + See https://davelozier.com/glusterfs-and-rpcbind-portmap-ddos-reflection-attacks/ + and https://bugzilla.redhat.com/show_bug.cgi?id=1426842 for details. + ''; + default = true; + }; + + enableGlustereventsd = mkOption { + type = types.bool; + description = "Whether to enable the GlusterFS Events Daemon"; + default = true; + }; + extraFlags = mkOption { type = types.listOf types.str; description = "Extra flags passed to the GlusterFS daemon"; @@ -89,7 +108,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ pkgs.glusterfs ]; - services.rpcbind.enable = true; + services.rpcbind.enable = cfg.useRpcbind; environment.etc = mkIf (cfg.tlsSettings != null) { "ssl/glusterfs.pem".source = cfg.tlsSettings.tlsPem; @@ -104,8 +123,8 @@ in wantedBy = [ "multi-user.target" ]; - requires = [ "rpcbind.service" ]; - after = [ "rpcbind.service" "network.target" "local-fs.target" ]; + requires = lib.optional cfg.useRpcbind "rpcbind.service"; + after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind [ "rpcbind.service" ]; preStart = '' install -m 0755 -d /var/log/glusterfs @@ -133,7 +152,7 @@ in }; }; - systemd.services.glustereventsd = { + systemd.services.glustereventsd = mkIf cfg.enableGlustereventsd { inherit restartTriggers; description = "Gluster Events Notifier"; From 13c9cbacdded00558084fda7037ca80849208e99 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Sep 2017 20:09:40 +0200 Subject: [PATCH 0254/2806] bacula: fix after postgresql output splitting --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 374122814c5..7c368ce4d03 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { # acl relies on attr, which I can't get to build on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) acl; - configureFlags = [ + configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--with-postgresql=${postgresql}" + "--with-postgresql=${postgresql.dev}" ]; postInstall = '' From 4013b381b37212201f7c81bcee3a45b890489b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 27 Sep 2017 20:12:06 +0200 Subject: [PATCH 0255/2806] manuals: document removal of newStdcpp from steam /cc #29180. --- doc/package-notes.xml | 38 ++++++------------- .../manual/release-notes/release-notes.xml | 1 + nixos/doc/manual/release-notes/rl-1803.xml | 4 +- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index e1aea62f784..122acdc7f75 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -477,32 +477,18 @@ it. Place the resulting package.nix file into Using the FOSS Radeon or nouveau (nvidia) drivers - - Both the open source radeon drivers as well as the nouveau drivers (nvidia) - need a newer libc++ than is provided by the default runtime, which leads to a - crash on launch. Use environment.systemPackages = - [(pkgs.steam.override { newStdcpp = true; })]; in your config - if you get an error like - -libGL error: unable to load driver: radeonsi_dri.so -libGL error: driver pointer missing -libGL error: failed to load driver: radeonsi -libGL error: unable to load driver: swrast_dri.so -libGL error: failed to load driver: swrast - or - -libGL error: unable to load driver: nouveau_dri.so -libGL error: driver pointer missing -libGL error: failed to load driver: nouveau -libGL error: unable to load driver: swrast_dri.so -libGL error: failed to load driver: swrast - - Steam ships statically linked with a version of libcrypto that - conflics with the one dynamically loaded by radeonsi_dri.so. - If you get the error - steam.sh: line 713: 7842 Segmentation fault (core dumped) - have a look at this pull request. - + + The newStdcpp parameter + was removed after 17.09 release and should not be needed anymore. + + + + Steam ships statically linked with a version of libcrypto that + conflics with the one dynamically loaded by radeonsi_dri.so. + If you get the error + steam.sh: line 713: 7842 Segmentation fault (core dumped) + have a look at this pull request. + diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 6065a86f60d..5ed56bde665 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -9,6 +9,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index ce05cde7b08..8dded9aaefb 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -29,8 +29,8 @@ following incompatible changes: - - + Steam: the newStdcpp parameter + was removed and should not be needed anymore. From 2d640b9d6ee45e46ff510744e849175e9cb55d05 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 27 Sep 2017 20:17:58 +0200 Subject: [PATCH 0256/2806] wlc: Downgrade back to 0.0.9 Unfortunately wlc 0.0.10 seems to be the cause for segfaults on sway, way-cooler and orbment. This will also build wlc with all optional packages (i.e. zlib, valgrind and doxygen). --- .../window-managers/sway/default.nix | 18 +++--------------- pkgs/development/libraries/wlc/default.nix | 9 +++++---- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 274325b6785..2c94f7f6fec 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -6,20 +6,8 @@ }: let + # TODO: Sway 0.14.0 with wlc 0.0.10 segfaults version = "0.13.0"; - # Temporary workaround (0.14.0 segfaults) - wlc_009 = stdenv.lib.overrideDerivation wlc (oldAttrs: rec { - name = "wlc-${version}"; - version = "0.0.9"; - - src = fetchFromGitHub { - owner = "Cloudef"; - repo = "wlc"; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; - }; - }); in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -35,7 +23,7 @@ in stdenv.mkDerivation rec { asciidoc libxslt docbook_xsl ]; buildInputs = [ - wayland wlc_009 libxkbcommon pixman fontconfig pcre json_c dbus_libs + wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland pam gdk_pixbuf libpthreadstubs libXdmcp ]; @@ -48,7 +36,7 @@ in stdenv.mkDerivation rec { cmakeFlags = "-DVERSION=${version}"; installPhase = "PREFIX=$out make install"; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc_009 dbus_libs ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; preFixup = '' wrapProgram $out/bin/sway \ --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 936c88034aa..c67070094de 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -2,18 +2,19 @@ , wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa , libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols , libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm +, withOptionalPackages ? true, zlib, valgrind, doxygen }: stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "0.0.10"; + version = "0.0.9"; # 0.0.10 currently causes segfaults src = fetchFromGitHub { owner = "Cloudef"; repo = "wlc"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k"; + sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols - libpthreadstubs libXau libXdmcp libXext libXxf86vm - ]; + libpthreadstubs libXau libXdmcp libXext libXxf86vm ] + ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; doCheck = true; checkTarget = "test"; From 3378dbbeed1e69050308a4c45dd9eecc5b92567d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Sep 2017 20:23:38 +0200 Subject: [PATCH 0257/2806] Revert "Revert "ibus: Move ibus-setup to .dev"" This reverts commit e0771a241092deb0a09341607adf0f24c749c037. --- pkgs/tools/inputmethods/ibus/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 66d61b8c5e9..3b076bb8ff6 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -110,6 +110,10 @@ in stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = "$out/bin/ibus version"; + postInstall = '' + moveToOutput "bin/ibus-setup" "$dev" + ''; + meta = with stdenv.lib; { homepage = https://github.com/ibus/ibus; description = "Intelligent Input Bus for Linux / Unix OS"; From ba22ad45fef4cef2c180895ce1af4333d286be16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Sep 2017 20:27:15 +0200 Subject: [PATCH 0258/2806] ibus-wrapper: Fix build --- pkgs/tools/inputmethods/ibus/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 13035698827..d41ba1e791f 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -21,7 +21,7 @@ let done done - for prog in ibus ibus-setup; do + for prog in ibus; do wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ From be697dca4c28c2319faa1e66e0e441a53a138f77 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 14 Sep 2017 16:29:43 +0200 Subject: [PATCH 0259/2806] ibus-anthy: fix pygobject3 dependency --- pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index f93edffa7bd..53b2a3abf28 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t" ]; buildInputs = [ - anthy glib gobjectIntrospection gtk3 ibus python3 + anthy glib gobjectIntrospection gtk3 ibus (python3.withPackages (ps: [ps.pygobject3])) ]; nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ]; From f2955e4fdef822e27a9f1b262e145727e41eaea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 27 Sep 2017 20:31:36 +0200 Subject: [PATCH 0260/2806] manuals: fixup steam note, as the change is in 17.09 I didn't notice the cherry-pick, but Globin found out immediately. /cc #29180. --- doc/package-notes.xml | 2 +- nixos/doc/manual/release-notes/rl-1709.xml | 6 ++++++ nixos/doc/manual/release-notes/rl-1803.xml | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 122acdc7f75..4d87a3a67fe 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -479,7 +479,7 @@ it. Place the resulting package.nix file into Using the FOSS Radeon or nouveau (nvidia) drivers The newStdcpp parameter - was removed after 17.09 release and should not be needed anymore. + was removed since NixOS 17.09 and should not be needed anymore. diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index c1ad853d544..1d6e693f83c 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -329,6 +329,12 @@ FLUSH PRIVILEGES; systemctl status mysql-backup. + + + Steam: the newStdcpp parameter + was removed and should not be needed anymore. + + Other notable improvements: diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 8dded9aaefb..7acc689ed11 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -29,8 +29,7 @@ following incompatible changes: - Steam: the newStdcpp parameter - was removed and should not be needed anymore. + From f39ead7c748a1a2bed1046f7ff48c53b76af73ef Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 27 Sep 2017 12:29:11 +0200 Subject: [PATCH 0261/2806] ibus-engines.hangul: add python dependency --- pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index 74253fa09fc..f70c7d02e9f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2"; }; - buildInputs = [ gtk3 ibus libhangul ]; + buildInputs = [ gtk3 ibus libhangul python3 ]; nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ]; From e233a518bdd72ec2c8783faa6d8bddef1e47c0bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 15 May 2017 03:03:13 +0200 Subject: [PATCH 0262/2806] glusterfs service: Add killMode and stopKillTimeout options --- .../network-filesystems/glusterfs.nix | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index a697bb25da5..f888ae36d98 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -60,6 +60,38 @@ in default = true; }; + killMode = mkOption { + type = types.enum ["control-group" "process" "mixed" "none"]; + description = '' + The systemd KillMode to use for glusterd. + + glusterd spawns other daemons like gsyncd. + If you want these to stop when glusterd is stopped (e.g. to ensure + that NixOS config changes are reflected even for these sub-daemons), + set this to 'control-group'. + If however you want running volume processes (glusterfsd) and thus + gluster mounts not be interrupted when glusterd is restarted + (for example, when you want to restart them manually at a later time), + set this to 'process'. + ''; + default = "process"; + }; + + stopKillTimeout = mkOption { + type = types.str; + description = '' + The systemd TimeoutStopSec to use. + + After this time after having been asked to shut down, glusterd + (and depending on the killMode setting also its child processes) + are killed by systemd. + + The default is set low because GlusterFS (as of 3.10) is known to + not tell its children (like gsyncd) to terminate at all. + ''; + default = "5s"; + }; + extraFlags = mkOption { type = types.listOf types.str; description = "Extra flags passed to the GlusterFS daemon"; @@ -148,7 +180,8 @@ in PIDFile="/run/glusterd.pid"; LimitNOFILE=65536; ExecStart="${glusterfs}/sbin/glusterd -p /run/glusterd.pid --log-level=${cfg.logLevel} ${toString cfg.extraFlags}"; - KillMode="process"; + KillMode=cfg.killMode; + TimeoutStopSec=cfg.stopKillTimeout; }; }; From 08f7e4516c2dcc03813c767642327aa7c92ef189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Wed, 2 Aug 2017 23:07:23 +0200 Subject: [PATCH 0263/2806] glusterfs service: Ensure log directory exists for glustereventsd. Prevents glustereventsd failing at startup in case it starts before glusterd has started (whose `preStart` would also create the needed directory). --- nixos/modules/services/network-filesystems/glusterfs.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index f888ae36d98..e7f2de0a2dc 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -194,6 +194,10 @@ in after = [ "syslog.target" "network.target" ]; + preStart = '' + install -m 0755 -d /var/log/glusterfs + ''; + serviceConfig = { Type="simple"; Environment="PYTHONPATH=${glusterfs}/usr/lib/python2.7/site-packages"; From 18eecae4b620dc345c10b0af804591d635b4b358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Wed, 27 Sep 2017 20:54:13 +0200 Subject: [PATCH 0264/2806] glusterfs service: Change default killMode to "control-group". This is a better default for NixOS because it ensures that config changes happen fully when NixOS users expect it. --- nixos/modules/services/network-filesystems/glusterfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index e7f2de0a2dc..15777d45f78 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -74,7 +74,7 @@ in (for example, when you want to restart them manually at a later time), set this to 'process'. ''; - default = "process"; + default = "control-group"; }; stopKillTimeout = mkOption { From 50fb62994b3d188542f14aa7066e4675f2d94458 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Sep 2017 21:23:28 +0200 Subject: [PATCH 0265/2806] bluez: remove unneeded dependencies and fix test bins --- pkgs/os-specific/linux/bluez/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index f0a59f36e43..e9a1f314abc 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - pythonPackages, readline, libsndfile, udev, libical, + pythonPackages, readline, udev, libical, systemd, enableWiimote ? false }: assert stdenv.isLinux; @@ -15,13 +15,10 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ dbus pygobject2 pygobject3 recursivePthLoader ]; - buildInputs = - [ pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython - readline libsndfile udev libical - # Disables GStreamer; not clear what it gains us other than a - # zillion extra dependencies. - # gstreamer gst-plugins-base - ]; + buildInputs = [ + pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython + readline udev libical + ]; outputs = [ "out" "dev" "test" ]; @@ -51,10 +48,8 @@ stdenv.mkDerivation rec { makeFlags = "rulesdir=$(out)/lib/udev/rules.d"; - # FIXME: Move these into a separate package to prevent Bluez from - # depending on Python etc. postInstall = '' - mkdir -p $test/test + mkdir -p $test/{bin,test} cp -a test $test pushd $test/test for a in \ @@ -65,7 +60,7 @@ stdenv.mkDerivation rec { list-devices \ monitor-bluetooth \ ; do - ln -s ../test/$a $out/bin/bluez-$a + ln -s ../test/$a $test/bin/bluez-$a done popd wrapPythonProgramsIn $test/test "$test/test $pythonPath" From 6b05651c20fd0d73b11f8ab1f4ca984c1fd9fce8 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Sep 2017 21:48:39 +0200 Subject: [PATCH 0266/2806] Revert "postgresql: Add dev output" Firstly this creates a cycle in 9.6 .out <-> .dev after fixing the PGXS path. Secondly this breaks extension handling and the pg_config as it resolves a lot of paths relatively resulting in the following bogus output: BINDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/bin DOCDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc HTMLDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc INCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include PKGINCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include INCLUDEDIR-SERVER = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include/server LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib LOCALEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/locale MANDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/man SHAREDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share SYSCONFDIR = /etc/postgresql PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc' CC = gcc CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2 CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2 CFLAGS_SL = -fPIC LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags LDFLAGS_EX = LDFLAGS_SL = LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm VERSION = PostgreSQL 9.5.9 This can probably only be properly fixed by rewriting pg_config in large parts as it does not in any way respect splitting the postgres tree and assumes it can simply resolve paths relative to its location. This does not even handle symlinks: $ result-dev/bin/pg_config BINDIR = /home/robin/dev/nixpkgs-upstream/result-dev/bin DOCDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc HTMLDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc INCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include PKGINCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include INCLUDEDIR-SERVER = /home/robin/dev/nixpkgs-upstream/result-dev/include/server LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib LOCALEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/locale MANDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/man SHAREDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share SYSCONFDIR = /etc/postgresql PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc' CC = gcc CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2 CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2 CFLAGS_SL = -fPIC LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags LDFLAGS_EX = LDFLAGS_SL = LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm VERSION = PostgreSQL 9.5.9 cc @edolstra Revert "bacula: fix after postgresql output splitting" This reverts commit 13c9cbacdded00558084fda7037ca80849208e99. Revert "postgresql: fix pgxs dir in pg_config" This reverts commit 21998d597bd257c1a769e2be4b7a52b5b7e482a6. Revert "rubyGems.pg: fix postgresql path" This reverts commit e253ae7d3a4ab992d2432c87514e3333a3cf744d. Revert "kea: fix path to pg_config" This reverts commit 086c636eb7f894a55f752b6164dac4a87d8bcee9. Revert "php: fix build wrt. new postgres.dev build output" This reverts commit 2f23a83920107678ca1792a11d19e1cb37df3ace. Revert "gdal: fix path to pg_config" This reverts commit 032c50d45b3fd1ebb4af592b83e776ed7004b4c0. Revert "postgresql: Add dev output" This reverts commit b0280f598e4b3f6ebf33ad2115734e4735df443a. --- pkgs/development/interpreters/php/default.nix | 4 ++-- pkgs/development/libraries/gdal/default.nix | 2 +- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- pkgs/servers/sql/postgresql/default.nix | 10 ++++++---- pkgs/tools/backup/bacula/default.nix | 4 ++-- pkgs/tools/networking/kea/default.nix | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7b832fa6eed..ed018a94227 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -99,12 +99,12 @@ let }; postgresql = { - configureFlags = ["--with-pgsql=${postgresql.dev}"]; + configureFlags = ["--with-pgsql=${postgresql}"]; buildInputs = [ postgresql ]; }; pdo_pgsql = { - configureFlags = ["--with-pdo-pgsql=${postgresql.dev}"]; + configureFlags = ["--with-pdo-pgsql=${postgresql}"]; buildInputs = [ postgresql ]; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 600e9314cd4..984d3da8119 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--with-png=${libpng.dev}" # optional "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional - "--with-pg=${postgresql.dev}/bin/pg_config" + "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql.lib.dev}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a0d4b9adcbe..6647d71bd00 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -183,7 +183,7 @@ in pg = attrs: { buildFlags = [ - "--with-pg-config=${postgresql.dev}/bin/pg_config" + "--with-pg-config=${postgresql}/bin/pg_config" ]; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 980ed5056a1..8a3097ae9de 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -11,7 +11,7 @@ let inherit sha256; }; - outputs = [ "out" "dev" "lib" "doc" "man" ]; + outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = @@ -46,16 +46,18 @@ let let path = if atLeast "9.6" then "src/common/config_info.c" else "src/bin/pg_config/pg_config.c"; in '' # Hardcode the path to pgxs so pg_config returns the path in $out - substituteInPlace "${path}" --replace HARDCODED_PGXS_PATH $dev/lib + substituteInPlace "${path}" --replace HARDCODED_PGXS_PATH $out/lib ''; postInstall = '' - moveToOutput "bin/pg_config" "$dev" - moveToOutput "lib/pgxs" "$dev" # looks strange, but not deleting it + moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it moveToOutput "lib/*.a" "$out" moveToOutput "lib/libecpg*" "$out" + # Prevent a retained dependency on gcc-wrapper. + substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld + # Remove static libraries in case dynamic are available. for i in $out/lib/*.a; do name="$(basename "$i")" diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 7c368ce4d03..374122814c5 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { # acl relies on attr, which I can't get to build on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) acl; - configureFlags = [ + configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--with-postgresql=${postgresql.dev}" + "--with-postgresql=${postgresql}" ]; postInstall = '' diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index cd4c4512169..e1829bcaf7d 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-botan-config=${botan}/bin/botan-config-1.10" - "--with-dhcp-pgsql=${postgresql.dev}/bin/pg_config" + "--with-dhcp-pgsql=${postgresql}/bin/pg_config" "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config" ]; From 259df64ef564fe5f1890c884e8e4beeea95a6b5c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 27 Sep 2017 22:00:26 +0200 Subject: [PATCH 0267/2806] postgresql: default to 9.6 like in the nixos module --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5aad1dcbc5..04d73ec807a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11684,7 +11684,7 @@ with pkgs; libmemcached = null; # Detection is broken upstream }; - postgresql = postgresql95; + postgresql = postgresql96; inherit (callPackages ../servers/sql/postgresql { }) postgresql93 From 34750bb51cd337a96ca8ff82356ef100cd732c94 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Sep 2017 22:13:53 +0200 Subject: [PATCH 0268/2806] 17.09 release notes: redis cluster mass-restart needed see #29516 --- nixos/doc/manual/release-notes/rl-1709.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 1d6e693f83c..f91db4a154e 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -335,6 +335,13 @@ FLUSH PRIVILEGES; was removed and should not be needed anymore. + + + Redis has been updated to version 4 which mandates a cluster + mass-restart, due to changes in the network handling, in order + to ensure compatibility with networks NATing traffic. + + Other notable improvements: From dd50575d5a92eaf6cd9568ee53a86add0fe3aa7a Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Wed, 27 Sep 2017 21:16:22 +0200 Subject: [PATCH 0269/2806] znc: fix openFirewall option The current version is broken: - there's no `openFirewall` attribute directly in the `cfg` set - the `port` option is an attribute of the `confOptions` set I used the proper attribute for the firewall port and moved the `openFirewall` option directly up to the `services.znc` set, as it's rather a general option for the whole service than a znc-specific option (which are located inside the `confOptions` set). --- nixos/modules/services/networking/znc.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 763843fdec0..3d9cec46a58 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -212,6 +212,14 @@ in ''; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open ports in the firewall for ZNC. + ''; + }; + zncConf = mkOption { default = ""; example = "See: http://wiki.znc.in/Configuration"; @@ -276,14 +284,6 @@ in ''; }; - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Whether to open ports in the firewall for ZNC. - ''; - }; - passBlock = mkOption { example = defaultPassBlock; type = types.string; @@ -359,7 +359,7 @@ in config = mkIf cfg.enable { networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.port ]; + allowedTCPPorts = [ cfg.confOptions.port ]; }; systemd.services.znc = { From d68e9b4938c5b279b7d229fd6c29a0071ce3d492 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 27 Sep 2017 23:27:20 +0300 Subject: [PATCH 0270/2806] glfw2: don't use mesa --- pkgs/development/libraries/glfw/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index 00b9cff9576..a017ff3d988 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, libX11 }: +{ stdenv, fetchurl, mesa_glu, mesa_noglu, libX11, libXext }: stdenv.mkDerivation rec { name = "glfw-2.7.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; - buildInputs = [ mesa libX11 ]; + buildInputs = [ mesa_glu mesa_noglu libX11 libXext ]; buildPhase = '' make x11 From 98ef62e51a0e14fb836f00667832a208c16a8c80 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 27 Sep 2017 23:28:36 +0300 Subject: [PATCH 0271/2806] glfw3: cleanup dependencies, propagate mesa_noglu --- pkgs/development/libraries/glfw/3.x.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 52673061b72..c10b3c05986 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper -, libXinerama, libXcursor +{ stdenv, lib, fetchFromGitHub, cmake, mesa_noglu, libXrandr, libXinerama, libXcursor, libX11 , darwin, fixDarwinDylibNames }: @@ -16,12 +15,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ - cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper - libXinerama libXcursor - ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]); + propagatedBuildInputs = [ mesa_noglu ]; - cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libX11 libXrandr libXinerama libXcursor + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]); + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; From 47f099777cadb1110abde73279e0ebf148c05308 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 27 Sep 2017 23:29:38 +0300 Subject: [PATCH 0272/2806] mupdf: cleanup dependencies This slims down build inputs (notably not requiring mesa anymore). --- pkgs/applications/misc/mupdf/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index da5f3c3bf12..9fe275b490c 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig -, zlib, freetype, libjpeg, jbig2dec, openjpeg -, libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }: +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig +, freetype, harfbuzz, openjpeg, jbig2dec +, enableX11 ? true, libX11, libXext +, enableCurl ? true, curl, openssl +}: stdenv.mkDerivation rec { version = "1.11"; @@ -28,7 +30,9 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ]; + buildInputs = [ freetype harfbuzz openjpeg jbig2dec ] + ++ lib.optionals enableX11 [ libX11 libXext ] + ++ lib.optionals enableCurl [ curl openssl ]; outputs = [ "bin" "dev" "out" "man" "doc" ]; preConfigure = '' From 2651602c17c199fd70a7ef1b68f00b07fdef7fa9 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 27 Sep 2017 07:10:42 +0200 Subject: [PATCH 0273/2806] tor-browser-bundle: factor out extensions --- .../browsers/tor-browser-bundle/default.nix | 137 +----------------- .../tor-browser-bundle/extensions.nix | 122 ++++++++++++++++ 2 files changed, 125 insertions(+), 134 deletions(-) create mode 100644 pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index ca20125332a..7896270b604 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -15,7 +15,6 @@ , noto-fonts-emoji # Extensions, common -, unzip , zip # HTTPS Everywhere @@ -36,139 +35,9 @@ let sha256 = "0j37mqldj33fnzghxifvy6v8vdwkcz0i4z81prww64md5s8qcsa9"; }; - # Each extension drv produces an output comprising an unpacked .xpi - # named after the extension uuid, as it would appear under - # `firefox/extensions'. - firefoxExtensions = { - https-everywhere = stdenv.mkDerivation rec { - name = "https-everywhere-${version}"; - version = "5.2.21"; - - extid = "https-everywhere-eff@eff.org"; - - src = fetchgit { - url = "https://git.torproject.org/https-everywhere.git"; - rev = "refs/tags/${version}"; - sha256 = "0z9madihh4b4z4blvfmh6w1hsv8afyi0x7b243nciq9r4w55xgfa"; - }; - - nativeBuildInputs = [ - git - libxml2 # xmllint - python27 - python27Packages.lxml - rsync - unzip - zip - ]; - - unpackPhase = '' - cp -dR --no-preserve=mode "$src" src - cd src - ''; - - # Beware: the build expects translations/ to be non-empty (which it - # will be with submodules initialized). - buildPhase = '' - $shell ./makexpi.sh ${version} --no-recurse - ''; - - installPhase = '' - mkdir $out - unzip -d "$out/$extid" "pkg/https-everywhere-$version-eff.xpi" - ''; - - meta = { - homepage = https://gitweb.torproject.org/https-everywhere.git/; - }; - }; - - noscript = stdenv.mkDerivation rec { - name = "noscript-${version}"; - version = "5.0.10"; - - extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}"; - - src = fetchurl { - url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi"; - sha256 = "18k5karbaj5mhd9cyjbqgik6044bw88rjalkh6anjanxbn503j6g"; - }; - - nativeBuildInputs = [ unzip ]; - - unpackPhase = ":"; - - installPhase = '' - mkdir $out - unzip -d "$out/$extid" "$src" - ''; - }; - - torbutton = stdenv.mkDerivation rec { - name = "torbutton-${version}"; - version = "1.9.8.1"; - - extid = "torbutton@torproject.org"; - - src = fetchgit { - url = "https://git.torproject.org/torbutton.git"; - rev = "refs/tags/${version}"; - sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l"; - }; - - nativeBuildInputs = [ unzip zip ]; - - unpackPhase = '' - cp -dR --no-preserve=mode "$src" src - cd src - ''; - - buildPhase = '' - $shell ./makexpi.sh - ''; - - installPhase = '' - mkdir $out - unzip -d "$out/$extid" "pkg/torbutton-$version.xpi" - ''; - - meta = { - homepage = https://gitweb.torproject.org/torbutton.git/; - }; - }; - - tor-launcher = stdenv.mkDerivation rec { - name = "tor-launcher-${version}"; - version = "0.2.12.3"; - - extid = "tor-launcher@torproject.org"; - - src = fetchgit { - url = "https://git.torproject.org/tor-launcher.git"; - rev = "refs/tags/${version}"; - sha256 = "0126x48pjiy2zm4l8jzhk70w24hviaz560ffp4lb9x0ar615bc9q"; - }; - - nativeBuildInputs = [ unzip zip ]; - - unpackPhase = '' - cp -dR --no-preserve=mode "$src" src - cd src - ''; - - buildPhase = '' - make package - ''; - - installPhase = '' - mkdir $out - unzip -d "$out/$extid" "pkg/tor-launcher-$version.xpi" - ''; - - meta = { - homepage = https://gitweb.torproject.org/tor-launcher.git/; - }; - }; + firefoxExtensions = import ./extensions.nix { + inherit stdenv fetchurl fetchgit zip + git libxml2 python27 python27Packages rsync; }; extensionsEnv = symlinkJoin { diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix new file mode 100644 index 00000000000..4adf99365ba --- /dev/null +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -0,0 +1,122 @@ +{ stdenv +, fetchgit +, fetchurl + +# common +, zip + +# HTTPS Everywhere +, git +, libxml2 # xmllint +, python27 +, python27Packages +, rsync +}: + +{ + https-everywhere = stdenv.mkDerivation rec { + name = "https-everywhere-${version}"; + version = "5.2.21"; + + extid = "https-everywhere-eff@eff.org"; + + src = fetchgit { + url = "https://git.torproject.org/https-everywhere.git"; + rev = "refs/tags/${version}"; + sha256 = "0z9madihh4b4z4blvfmh6w1hsv8afyi0x7b243nciq9r4w55xgfa"; + }; + + nativeBuildInputs = [ + git + libxml2 # xmllint + python27 + python27Packages.lxml + rsync + zip + ]; + + unpackPhase = '' + cp -dR --no-preserve=mode "$src" src && cd src + ''; + + buildPhase = '' + $shell ./makexpi.sh ${version} --no-recurse + ''; + + installPhase = '' + install -m 444 -D pkg/https-everywhere-$version-eff.xpi "$out/$extid.xpi" + ''; + }; + + noscript = stdenv.mkDerivation rec { + name = "noscript-${version}"; + version = "5.0.10"; + + extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}"; + + src = fetchurl { + url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi"; + sha256 = "18k5karbaj5mhd9cyjbqgik6044bw88rjalkh6anjanxbn503j6g"; + }; + + unpackPhase = ":"; + + installPhase = '' + install -m 444 -D $src "$out/$extid.xpi" + ''; + }; + + torbutton = stdenv.mkDerivation rec { + name = "torbutton-${version}"; + version = "1.9.8.1"; + + extid = "torbutton@torproject.org"; + + src = fetchgit { + url = "https://git.torproject.org/torbutton.git"; + rev = "refs/tags/${version}"; + sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l"; + }; + + nativeBuildInputs = [ zip ]; + + unpackPhase = '' + cp -dR --no-preserve=mode "$src" src && cd src + ''; + + buildPhase = '' + $shell ./makexpi.sh + ''; + + installPhase = '' + install -m 444 -D pkg/torbutton-$version.xpi "$out/$extid.xpi" + ''; + }; + + tor-launcher = stdenv.mkDerivation rec { + name = "tor-launcher-${version}"; + version = "0.2.12.3"; + + extid = "tor-launcher@torproject.org"; + + src = fetchgit { + url = "https://git.torproject.org/tor-launcher.git"; + rev = "refs/tags/${version}"; + sha256 = "0126x48pjiy2zm4l8jzhk70w24hviaz560ffp4lb9x0ar615bc9q"; + }; + + nativeBuildInputs = [ zip ]; + + unpackPhase = '' + cp -dR --no-preserve=mode "$src" src && cd src + ''; + + buildPhase = '' + make package + ''; + + installPhase = '' + install -m 444 -D pkg/tor-launcher-$version.xpi "$out/$extid.xpi" + ''; + }; +} From 931da53e50401ef41f14911bc3af6f8287cfe7de Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 27 Sep 2017 07:40:40 +0200 Subject: [PATCH 0274/2806] tor-browser-bundle: support passing additional extensions --- .../networking/browsers/tor-browser-bundle/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 7896270b604..16182c8e4e7 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -26,6 +26,7 @@ # Customization , extraPrefs ? "" +, extraExtensions ? [ ] }: let @@ -42,7 +43,12 @@ let extensionsEnv = symlinkJoin { name = "tor-browser-extensions"; - paths = with firefoxExtensions; [ https-everywhere noscript torbutton tor-launcher ]; + paths = with firefoxExtensions; [ + https-everywhere + noscript + torbutton + tor-launcher + ] ++ extraExtensions; }; fontsEnv = symlinkJoin { From 672a402122535b944cd6f2819108a8bb041de839 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 21 Sep 2017 17:46:02 -0400 Subject: [PATCH 0275/2806] opencascade: remove 6.5.5 and 6.6.0 --- .../development/libraries/opencascade/6.5.nix | 47 ------------------- .../libraries/opencascade/default.nix | 35 ++++---------- .../development/libraries/opencascade/oce.nix | 28 ----------- pkgs/top-level/all-packages.nix | 13 +---- 4 files changed, 11 insertions(+), 112 deletions(-) delete mode 100644 pkgs/development/libraries/opencascade/6.5.nix delete mode 100644 pkgs/development/libraries/opencascade/oce.nix diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix deleted file mode 100644 index 252a6bb0ad1..00000000000 --- a/pkgs/development/libraries/opencascade/6.5.nix +++ /dev/null @@ -1,47 +0,0 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4, -ftgl, freetype}: - -stdenv.mkDerivation rec { - name = "opencascade-6.5.5"; - src = fetchurl { - url = http://files.opencascade.com/OCCT/OCC_6.5.5_release/OpenCASCADE655.tgz; - sha256 = "1dnik00adfh6dxvn9kgf35yjda8chbi05f71i9119idmmrcapipm"; - }; - - buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; - - preUnpack = '' - sourceRoot=`pwd`/ros - ''; - - preConfigure = '' - sh ./build_configure - ''; - - # -fpermissive helps building opencascade, although gcc detects a flaw in the code - # and reports an error otherwise. Further versions may fix that. - NIX_CFLAGS_COMPILE = "-fpermissive" - # https://bugzilla.redhat.com/show_bug.cgi?id=902561 - + " -DUSE_INTERP_RESULT" - # https://bugs.freedesktop.org/show_bug.cgi?id=83631 - + " -DGLX_GLXEXT_LEGACY"; - - hardeningDisable = [ "format" ]; - - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype.dev}" ]; - - postInstall = '' - mv $out/inc $out/include - mkdir -p $out/share/doc/${name} - cp -R ../doc $out/share/doc/${name} - ''; - - enableParallelBuilding = true; - - meta = { - description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = http://www.opencascade.org/; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 51581bca382..58f9019d6e0 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,39 +1,22 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}: +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, libtool, qt4, +ftgl, freetype}: stdenv.mkDerivation rec { - name = "opencascade-6.6.0"; + name = "opencascade-oce-0.17.2"; src = fetchurl { - url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz; - sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3"; + url = https://github.com/tpaviot/oce/archive/OCE-0.17.2.tar.gz; + sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd"; }; - buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ]; + buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; - sourceRoot = "ros/adm/cmake"; - - cmakeFlags = [ - "-D3RDPARTY_TCL_DIR=${tcl}" - "-D3RDPARTY_FREETYPE_DIR=${freetype.dev}" - - # Not used on Linux but must be defined during configuration. - "-D3RDPARTY_FREETYPE_DLL=${freetype.dev}" - ]; + preConfigure = '' + cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out" + ''; # https://bugs.freedesktop.org/show_bug.cgi?id=83631 NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; - hardeningDisable = [ "format" ]; - - preConfigure = '' - cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out" - ''; - - postInstall = '' - mv $out/inc $out/include - mkdir -p $out/share/doc/${name} - cp -R ../../../doc $out/share/doc/${name} - ''; - enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/opencascade/oce.nix b/pkgs/development/libraries/opencascade/oce.nix deleted file mode 100644 index 58f9019d6e0..00000000000 --- a/pkgs/development/libraries/opencascade/oce.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, libtool, qt4, -ftgl, freetype}: - -stdenv.mkDerivation rec { - name = "opencascade-oce-0.17.2"; - src = fetchurl { - url = https://github.com/tpaviot/oce/archive/OCE-0.17.2.tar.gz; - sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd"; - }; - - buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; - - preConfigure = '' - cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out" - ''; - - # https://bugs.freedesktop.org/show_bug.cgi?id=83631 - NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; - - enableParallelBuilding = true; - - meta = { - description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = http://www.opencascade.org/; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04d73ec807a..a3ccba21317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9906,17 +9906,9 @@ with pkgs; openbabel = callPackage ../development/libraries/openbabel { }; - opencascade = callPackage ../development/libraries/opencascade { - tcl = tcl-8_5; - tk = tk-8_5; - }; + opencascade = callPackage ../development/libraries/opencascade { }; - opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix { - automake = automake111x; - ftgl = ftgl212; - }; - - opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; + opencascade_oce = opencascade; opencl-headers = callPackage ../development/libraries/opencl-headers { }; @@ -14546,7 +14538,6 @@ with pkgs; freecad = callPackage ../applications/graphics/freecad { boost = boost155; - opencascade = opencascade_oce; }; freemind = callPackage ../applications/misc/freemind { }; From b3433aba3a3399cfe78a5e4fad1e9a1a7bb5a213 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Wed, 27 Sep 2017 14:13:33 -0700 Subject: [PATCH 0276/2806] hugo: 0.27.1 -> 0.29 --- pkgs/applications/misc/hugo/default.nix | 4 +-- pkgs/applications/misc/hugo/deps.nix | 40 ++++++++++++++++++------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index c69bb5bea3b..0dfc725b9ea 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.27.1"; + version = "0.29"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "0vxzjwm9dsan314cz0gnj4spssg4w8y6ywsak8n9c6w0l45xf07p"; + sha256 = "1vklws05534ig9rj55cqnxpqfsvns64kfdg6zjyrcpz7l0z07a33"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 240983b3c71..35faf6b5704 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -26,6 +26,15 @@ sha256 = "13r896yy71i6jj1cwv2pjp53wjfxkg7bh884fggv6y79ly0qr63j"; }; } + { + goPackagePath = "github.com/alecthomas/chroma"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/chroma"; + rev = "b0295f66bdb7c61d54906003d7649185794e21b4"; + sha256 = "1hnvv13nphbzr9xm21fys7lgm0kd6qlbk58vc8fi802lxzsfmdis"; + }; + } { goPackagePath = "github.com/bep/gitmap"; fetch = { @@ -40,8 +49,8 @@ fetch = { type = "git"; url = "https://github.com/chaseadamsio/goorgeous"; - rev = "677defd0e024333503d8c946dd4ba3f32ad3e5d2"; - sha256 = "1mcncs3qdb62m9xwhkxy743ddvgsjfbmbl2djnhqmz1va05njna1"; + rev = "098da33fde5f9220736531b3cb26a2dec86a8367"; + sha256 = "1cwag5vzgrzy22rvcp12whzgqbgrmdmaxar0fl4nwqxdhy90s67k"; }; } { @@ -53,6 +62,15 @@ sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f"; }; } + { + goPackagePath = "github.com/danwakefield/fnmatch"; + fetch = { + type = "git"; + url = "https://github.com/danwakefield/fnmatch"; + rev = "cbb64ac3d964b81592e64f957ad53df015803288"; + sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; + }; + } { goPackagePath = "github.com/dchest/cssmin"; fetch = { @@ -62,6 +80,15 @@ sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; }; } + { + goPackagePath = "github.com/dlclark/regexp2"; + fetch = { + type = "git"; + url = "https://github.com/dlclark/regexp2"; + rev = "487489b64fb796de2e55f4e8a4ad1e145f80e957"; + sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; + }; + } { goPackagePath = "github.com/eknkc/amber"; fetch = { @@ -206,15 +233,6 @@ sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i"; }; } - { - goPackagePath = "github.com/pelletier/go-buffruneio"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-buffruneio"; - rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; - sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; - }; - } { goPackagePath = "github.com/pelletier/go-toml"; fetch = { From 23f398012b420e9e5293a21d62ed838062b8235a Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 27 Sep 2017 22:23:19 +0100 Subject: [PATCH 0277/2806] nixos: skip restarting systemd-logind to not break x11 --- nixos/modules/system/boot/systemd.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index ed1f5d20afb..dd9ba710448 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -875,7 +875,12 @@ in systemd.services.systemd-remount-fs.restartIfChanged = false; systemd.services.systemd-update-utmp.restartIfChanged = false; systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions. - systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ]; + # Restarting systemd-logind breaks X11 + # - upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101 + # - systemd announcement: https://github.com/systemd/systemd/blob/22043e4317ecd2bc7834b48a6d364de76bb26d91/NEWS#L103-L112 + # - this might be addressed in the future by xorg + #systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ]; + systemd.services.systemd-logind.restartIfChanged = false; systemd.services.systemd-logind.stopIfChanged = false; systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; systemd.services.systemd-journald.stopIfChanged = false; From 4a2442032ee5bc06f225bd5666b0f6813026b42f Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 19 Sep 2017 23:01:36 +0200 Subject: [PATCH 0278/2806] Revert "kbd service: use /dev/tty1 for systemd-vconsole-setup" This reverts commit 0c81594a29d99d9ee9c9c88c680340d56823cfb2. It's no longer needed since systemd-vconsole-setup enumerates all ttys until it finds a suitable one since systemd v234. --- nixos/modules/tasks/kbd.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 3975dd5b0ff..a01f35fea03 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -98,22 +98,11 @@ in '') config.i18n.consoleColors} ''; - /* XXX: systemd-vconsole-setup needs a "main" terminal. By default - * /dev/tty0 is used which wouldn't work when the service is restarted - * from X11. We set this to /dev/tty1; not ideal because it may also be - * owned by X11 or something else. - * - * See #22470. - */ systemd.services."systemd-vconsole-setup" = { wantedBy = [ "sysinit.target" ]; before = [ "display-manager.service" ]; after = [ "systemd-udev-settle.service" ]; restartTriggers = [ vconsoleConf kbdEnv ]; - serviceConfig.ExecStart = [ - "" - "${pkgs.systemd}/lib/systemd/systemd-vconsole-setup /dev/tty1" - ]; }; } From 725dee203a88f26e38912e73e832caa3ab73447e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 27 Sep 2017 23:20:08 +0200 Subject: [PATCH 0279/2806] wpa_supplicant service: restart instead of stop & start We now wait for dhcpcd to acquire a lease but dhcpcd is restarted on system activation. As wpa_supplicant is stopped while dhcpcd is restarting a significant delay is introduced on systems with wireless network connections only. This changes the wpa_supplicant service to also be restarted together with dhcpcd in case both services were changed. --- nixos/modules/services/networking/wpa_supplicant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index c91ba91fcb4..908c8730ad2 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -148,6 +148,7 @@ in { wants = [ "network.target" ]; requires = lib.concatMap deviceUnit ifaces; wantedBy = [ "multi-user.target" ]; + stopIfChanged = false; path = [ pkgs.wpa_supplicant ]; From 0ee866ed728ee62e6c598911ff0dcfaa74ea7c55 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 27 Sep 2017 23:34:42 +0200 Subject: [PATCH 0280/2806] kbd service: systemd-vconsole-setup is triggered by udev cc #22470 --- nixos/modules/tasks/kbd.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index a01f35fea03..7fb3cbc5c1b 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -99,8 +99,7 @@ in ''; systemd.services."systemd-vconsole-setup" = - { wantedBy = [ "sysinit.target" ]; - before = [ "display-manager.service" ]; + { before = [ "display-manager.service" ]; after = [ "systemd-udev-settle.service" ]; restartTriggers = [ vconsoleConf kbdEnv ]; }; From a06f839439c1fd3fa123ec654daafaf8405ac6b4 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 14 Sep 2017 00:09:13 +0200 Subject: [PATCH 0281/2806] nixos/release-notes: notable changes to the dnscrypt-proxy service --- nixos/doc/manual/release-notes/rl-1709.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index f91db4a154e..e4fac275d79 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -439,6 +439,16 @@ FLUSH PRIVILEGES; version, kernel version and build date of all bootable generations. + + + The dnscrypt-proxy service now defaults to using a random upstream resolver, + selected from the list of public non-logging resolvers with DNSSEC support. + Existing configurations can be migrated to this mode of operation by + omitting the option + or setting it to "random". + + + From b39c42d5d0d2b71bbc5c073705cfbd0b6b87bc9a Mon Sep 17 00:00:00 2001 From: PanAeon Date: Wed, 27 Sep 2017 22:51:18 +0100 Subject: [PATCH 0282/2806] buildGo19Package: init (#29470) --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3ccba21317..08210f566b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11115,6 +11115,10 @@ with pkgs; go = go_1_8; }; + buildGo19Package = callPackage ../development/go-modules/generic { + go = go_1_9; + }; + buildGoPackage = buildGo18Package; go2nix = callPackage ../development/tools/go2nix { }; From 4f91397c987739cc96e1dd418f79fc0d94326485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rostislav=20Bene=C5=A1?= Date: Sun, 7 May 2017 21:37:56 +0200 Subject: [PATCH 0283/2806] nixos/nvidia: populating /dev with nvidia devices at boot --- nixos/modules/hardware/video/nvidia.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 80abec95c03..2bad50d65e7 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -62,11 +62,16 @@ in boot.extraModulePackages = [ nvidia_x11.bin ]; # nvidia-uvm is required by CUDA applications. - boot.kernelModules = [ "nvidia-uvm" ]; + boot.kernelModules = [ "nvidia-uvm" ] ++ + lib.optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ]; + # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. services.udev.extraRules = '' + KERNEL=="nvidia", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidiactl c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" + KERNEL=="nvidia_modeset", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-modeset c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" + KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia%n c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'" KERNEL=="nvidia_uvm", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" ''; From 4ef82339c9a32548d2432ca71e8aac87abe79777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rostislav=20Bene=C5=A1?= Date: Sun, 7 May 2017 22:27:02 +0200 Subject: [PATCH 0284/2806] nixos/gdm,nvidia: new options to enable GDM on Wayland and disabling it for nvidia drivers. --- nixos/modules/hardware/video/nvidia.nix | 6 ++++++ nixos/modules/services/x11/display-managers/gdm.nix | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 2bad50d65e7..52f1773e9c4 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -40,6 +40,12 @@ in { config = mkIf enabled { + assertions = [ + { + assertion = services.xserver.displayManager.gdm.wayland; + message = "NVidia drivers don't support wayland"; + } + ]; services.xserver.drivers = singleton { name = "nvidia"; modules = [ nvidia_x11.bin ]; libPath = [ nvidia_x11 ]; }; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index b0a3ff1bb75..e68bc816aad 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -64,6 +64,14 @@ in }; }; + wayland = mkOption { + default = true; + description = '' + Allow GDM run on Wayland instead of Xserver + ''; + type = types.bool; + }; + }; }; @@ -139,6 +147,7 @@ in # presented and there's a little delay. environment.etc."gdm/custom.conf".text = '' [daemon] + WaylandEnable=${if cfg.gdm.wayland then "true" else "false"} ${optionalString cfg.gdm.autoLogin.enable ( if cfg.gdm.autoLogin.delay > 0 then '' TimedLoginEnable=true From 0cad98dde1cef69e847cb2b1ccfb9c583016a1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rostislav=20Bene=C5=A1?= Date: Sun, 7 May 2017 23:01:20 +0200 Subject: [PATCH 0285/2806] nixos/xserver,gdm: let GDM handle X server verbosity. --- nixos/modules/services/x11/display-managers/gdm.nix | 1 + nixos/modules/services/x11/xserver.nix | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index e68bc816aad..83c5c95dae7 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -102,6 +102,7 @@ in # GDM needs different xserverArgs, presumable because using wayland by default. services.xserver.tty = null; services.xserver.display = null; + services.xserver.verbose = null; services.xserver.displayManager.job = { diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 3ce124d3da2..d4fe475690c 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -480,6 +480,15 @@ in ''; }; + verbose = mkOption { + type = types.nullOr types.int; + default = 3; + example = 7; + description = '' + Controls verbosity of X logging. + ''; + }; + useGlamor = mkOption { type = types.bool; default = false; @@ -631,10 +640,11 @@ in [ "-config ${configFile}" "-xkbdir" "${cfg.xkbDir}" # Log at the default verbosity level to stderr rather than /var/log/X.*.log. - "-verbose" "3" "-logfile" "/dev/null" + "-logfile" "/dev/null" ] ++ optional (cfg.display != null) ":${toString cfg.display}" ++ optional (cfg.tty != null) "vt${toString cfg.tty}" ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}" + ++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}" ++ optional (!cfg.enableTCP) "-nolisten tcp" ++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}" ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}" From ae259ff83b6f1f10358dee72428712aba17dbb89 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Wed, 27 Sep 2017 14:46:36 -0700 Subject: [PATCH 0286/2806] lftp: 4.8.0 -> 4.8.2 --- pkgs/tools/networking/lftp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index b6d8baeee7e..aa5a7b514cb 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, gettext }: +{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: stdenv.mkDerivation rec { name = "lftp-${version}"; - version = "4.8.0"; + version = "4.8.2"; src = fetchurl { urls = [ @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { "ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.bz2" "http://lftp.yar.ru/ftp/old/${name}.tar.bz2" ]; - sha256 = "0z2432zxzg808swi72yak9kia976qrjj030grk0v4p54mcib3s34"; + sha256 = "0a4sp9khqgny1md0b2c9vvg4c7sz0g31w3sfdslxw7dsvijin3mn"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnutls readline zlib libidn2 gmp libiconv ] + buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring ] ++ stdenv.lib.optional stdenv.isDarwin gettext; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; From d02fac35a553d73e5cac7224946348d74d8dd7f0 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Wed, 27 Sep 2017 12:44:51 -0700 Subject: [PATCH 0287/2806] dgraph: 0.8.1 -> 0.8.2 --- pkgs/servers/dgraph/default.nix | 7 ++++--- pkgs/servers/dgraph/deps.nix | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 1712476b923..06aef0babd3 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "dgraph-${version}"; - version = "0.8.1"; + version = "0.8.2"; goPackagePath = "github.com/dgraph-io/dgraph"; @@ -10,13 +10,13 @@ buildGoPackage rec { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "1gls2pvgcmd364x84gz5fafs7pwkll4k352rg1lmv70wvzyydsdr"; + sha256 = "0zc5bda8m2srjbk0gy1nnm0bya8if0kmk1szqr1qv3xifdzmi4nf"; }; extraOutputsToInstall = [ "dashboard" ]; goDeps = ./deps.nix; - subPackages = [ "cmd/dgraph" "cmd/dgraphloader" ]; + subPackages = [ "cmd/dgraph" "cmd/dgraphloader" "cmd/bulkloader"]; # let's move the dashboard to a different output, to prevent $bin from # depending on $out @@ -36,6 +36,7 @@ buildGoPackage rec { # Removing it fixes cycle between $out and $bin install_name_tool -delete_rpath $out/lib $bin/bin/dgraph install_name_tool -delete_rpath $out/lib $bin/bin/dgraphloader + install_name_tool -delete_rpath $out/lib $bin/bin/bulkloader ''; meta = { diff --git a/pkgs/servers/dgraph/deps.nix b/pkgs/servers/dgraph/deps.nix index 2e03c75489b..89e00e0d8cb 100644 --- a/pkgs/servers/dgraph/deps.nix +++ b/pkgs/servers/dgraph/deps.nix @@ -94,8 +94,8 @@ fetch = { type = "git"; url = "https://github.com/coreos/etcd"; - rev = "1ebeef5cbfe69c0dab2bc701ee5307eed7a7d8d2"; - sha256 = "12lidn1a8nwsk6nlwyfirrxkxhs4lhj53f4cd19xm8w070q0mg19"; + rev = "9d43462d174c664f5edf313dec0de31e1ef4ed47"; + sha256 = "0qxqjxhhciaacag1jz2rlncmlgw861ig2yx993ylvfm30jvyj2cj"; }; } { @@ -112,8 +112,8 @@ fetch = { type = "git"; url = "https://github.com/dgraph-io/badger"; - rev = "ad23a425b3c87b8223780cb882bed568ca14b9f0"; - sha256 = "1xjd05vska1kanmgdhp5cvkn2i6236rqphrc9i4kfjndgwkmas57"; + rev = "64df7f57d9ee20d7b28de4a3eea90bf8d7310a77"; + sha256 = "1ikgzn2l62kb238n0wm6s95py5ypv71p09w7zyvzkjf34x675mzz"; }; } { @@ -139,8 +139,8 @@ fetch = { type = "git"; url = "https://github.com/golang/geo"; - rev = "3a42ea109208469f16baf9e090135dd0e82ece5c"; - sha256 = "1fzlakjj94gv516q7gd9qycn91lij7wmjbdv0vsrh6qnxvgqr8hw"; + rev = "31fb0106dc4a947e5aaee1fe186e56447f839510"; + sha256 = "00w4kwm98hrgr3ggfdk1h7qa5gp00z4s0j0iwgwd9rgadb59kb2c"; }; } { @@ -292,8 +292,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720"; - sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1"; + rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a"; + sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56"; }; } { @@ -301,8 +301,8 @@ fetch = { type = "git"; url = "https://github.com/google/go-genproto"; - rev = "b0a3dcfcd1a9bd48e63634bd8802960804cf8315"; - sha256 = "0lkj73lyr4dzj2pxgmild0i1bl6kdgrxa3c8m44j5ms537pyxcpr"; + rev = "1e559d0a00eef8a9a43151db4665280bd8dd5886"; + sha256 = "1dfm8zd9mif1aswks79wgyi7n818s5brbdnnrrlg79whfhaf20hd"; }; } { @@ -310,8 +310,8 @@ fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "2bb318258959db281674bc6fd67b5167b7ff0d65"; - sha256 = "1g8ir87ksr8549801vdgb0n6rmxws05ky50bkgjv86370h146cqm"; + rev = "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3"; + sha256 = "1li8rn2s4f8qc77npamlm2ijin44scb8vvd8c4cr0l7za2m89jfn"; }; } { From ff15b852c1f5ef5b0436b7611b8fce55491d0234 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Wed, 27 Sep 2017 15:32:47 -0700 Subject: [PATCH 0288/2806] youtube-dl: 2017.09.15 -> 2017.09.24 (#29866) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 3af0c543560..c364935b12c 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.09.15"; + version = "2017.09.24"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1kw8pqzvhbpyxcz2jb692j4cgzd3vmd81mra09xvpzkq974jkx7f"; + sha256 = "0j2m75j0d1n83i7jzpkcj7ir0bkskj024j9b0yi88zipcg740wbx"; }; nativeBuildInputs = [ makeWrapper ]; From f4c53f1940de477a3cd7193306c5512d319b1c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 18 Jul 2017 14:51:35 +0200 Subject: [PATCH 0289/2806] consul service: Restart on failure. Consul is a service you typically want to have running all the time; it's not supposed to quit by itself. --- nixos/modules/services/networking/consul.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 166ee773237..6333970cb33 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -183,6 +183,7 @@ in ExecReload = "${cfg.package.bin}/bin/consul reload"; PermissionsStartOnly = true; User = if cfg.dropPrivileges then "consul" else null; + Restart = "on-failure"; TimeoutStartSec = "0"; } // (optionalAttrs (cfg.leaveOnStop) { ExecStop = "${cfg.package.bin}/bin/consul leave"; From ad38b7c9aebbdf7a9d4fb5cc99faeb6decd679fd Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 27 Sep 2017 13:46:20 +0000 Subject: [PATCH 0290/2806] liboping: 1.9.0 -> 1.10.0 --- pkgs/development/libraries/liboping/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index 435f593b597..c177f7ba58e 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses ? null, perl ? null }: stdenv.mkDerivation rec { - name = "liboping-1.9.0"; + name = "liboping-1.10.0"; src = fetchurl { url = "http://verplant.org/liboping/files/${name}.tar.bz2"; - sha256 = "0c1mdx9ixqypayhm617jjv9kr6y60nh3mnryafjzv23bnn41vfs4"; + sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; buildInputs = [ ncurses perl ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://noping.cc/; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } From 7d883056a074c7e6ec78ba14af3653c23942b193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 27 Sep 2017 15:52:18 -0700 Subject: [PATCH 0291/2806] lxqt.screengrab: 2017-02-18 -> 1.97 (#29835) --- pkgs/desktops/lxqt/optional/screengrab/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix index e8cc7c30fa1..4bd040c00a8 100644 --- a/pkgs/desktops/lxqt/optional/screengrab/default.nix +++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg }: stdenv.mkDerivation rec { - name = "screengrab-unstable-2017-02-18"; + name = "screengrab-${version}"; + version = "1.97"; srcs = fetchFromGitHub { owner = "QtDesktop"; repo = "screengrab"; - rev = "6fc03c70fe132b89f35d4cef2f62c9d804de3b64"; - sha256 = "1h3rlpmaqxzysaibcw7s5msbrwaxkg6sz7a8xv6cqzjvggv09my0"; + rev = version; + sha256 = "0qhdxnv1pz745qgvdv5x7kyfx9dz9rrq0wxyfimppzxcszv4pl2z"; }; nativeBuildInputs = [ cmake pkgconfig ]; From a3e2ecd7f746300703eb95dea91668e91519d003 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Fri, 1 Sep 2017 15:42:52 -0400 Subject: [PATCH 0292/2806] freebayes: 1.1.0 -> 2017-08-23 --- .../applications/science/biology/freebayes/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index ef0da619b25..ec11e4ccb30 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, gcc, zlib}: +{ stdenv, fetchFromGitHub, cmake, gcc, zlib, bzip2, lzma }: stdenv.mkDerivation rec { name = "freebayes-${version}"; - version = "1.1.0"; + version = "2017-08-23"; src = fetchFromGitHub { name = "freebayes-${version}-src"; owner = "ekg"; repo = "freebayes"; - rev = "refs/tags/v${version}"; - sha256 = "0xb8aicb36w9mfs1gq1x7mcp3p82kl7i61d162hfncqzg2npg8rr"; + rev = "8d2b3a060da473e1f4f89be04edfce5cba63f1d3"; + sha256 = "0yyrgk2639lz1yvg4jf0ccahnkic31dy77q05pb3i28rjf37v45z"; fetchSubmodules = true; }; - buildInputs = [ cmake gcc zlib ]; + buildInputs = [ cmake gcc zlib bzip2 lzma ]; builder = ./builder.sh; From 7cbf3a27de3bcb9d090a5ef205f238c2e69e0786 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 00:52:58 +0200 Subject: [PATCH 0293/2806] freebayes: clean up build --- .../applications/science/biology/freebayes/builder.sh | 11 ----------- .../science/biology/freebayes/default.nix | 6 ++++-- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 pkgs/applications/science/biology/freebayes/builder.sh diff --git a/pkgs/applications/science/biology/freebayes/builder.sh b/pkgs/applications/science/biology/freebayes/builder.sh deleted file mode 100644 index a9f56e77d7e..00000000000 --- a/pkgs/applications/science/biology/freebayes/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -unpackPhase - -cd freebayes-* - -make - -mkdir -p $out/bin -cp bin/freebayes bin/bamleftalign $out/bin -cp scripts/* $out/bin diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index ec11e4ccb30..99d2dfa55dd 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ cmake gcc zlib bzip2 lzma ]; + buildInputs = [ zlib bzip2 lzma ]; - builder = ./builder.sh; + installPhase = '' + install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin + ''; meta = with stdenv.lib; { description = "Bayesian haplotype-based polymorphism discovery and genotyping"; From 3c6eb3a247721aafded88c789d247602762b7d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 26 Sep 2017 22:17:01 +0200 Subject: [PATCH 0294/2806] nixos/iso-image.nix: add top-level /version.txt file This makes it easy to identify which NixOS version is written to an USB stick without actually booting it. --- nixos/modules/installer/cd-dvd/iso-image.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 96f7aac1d59..a039f7fdcb6 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -361,6 +361,9 @@ in { source = config.isoImage.splashImage; target = "/isolinux/background.png"; } + { source = pkgs.writeText "version" config.system.nixosVersion; + target = "/version.txt"; + } ] ++ optionals config.isoImage.makeEfiBootable [ { source = efiImg; target = "/boot/efi.img"; From 22b0c966aad75d1988185f10c594d47590821023 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Sep 2017 00:47:37 +0000 Subject: [PATCH 0295/2806] snes9x-gtk: 1.53 -> 1.54.1 --- pkgs/misc/emulators/snes9x-gtk/default.nix | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index c6f4df1e5c0..f2d3abc0de3 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,26 +1,26 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk2, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: +{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig +, SDL, zlib, gtk2, libxml2, libXv }: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; - version = "1.53"; + version = "1.54.1"; - src = fetchurl { - url = "http://files.ipherswipsite.com/snes9x/snes9x-${version}-src.tar.bz2"; - sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; + src = fetchFromGitHub { + owner = "snes9xgit"; + repo = "snes9x"; + rev = version; + sha256 = "10fqm7lk36zj2gnx0ypps0nlws923f60b0zj4pmq9apawgx8k6rw"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk2 pkgconfig libxml2 xlibsWrapper libpulseaudio]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; - sourceRoot = "snes9x-${version}-src/gtk"; + sourceRoot = "snes9x-${version}-src"; + preAutoreconf = "cd gtk; intltoolize"; + + buildInputs = [ SDL zlib gtk2 libxml2 libXv ]; + installPhase = "install -Dt $out/bin snes9x-gtk"; - configureFlags = "--prefix=$out/ --with-opengl"; - - installPhase = '' - mkdir -p $out/bin - cp snes9x-gtk $out/bin - ''; - - meta = { + meta = with stdenv.lib; { description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator"; longDescription = '' Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan. ''; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.qknight ]; + license = licenses.lgpl2; + maintainers = with maintainers; [ qknight ]; homepage = http://www.snes9x.com/; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } From 29b2830d6ed5efb20dfea09661422b8b57a44e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 28 Sep 2017 01:04:18 +0200 Subject: [PATCH 0296/2806] consul: 0.7.5 -> 0.9.3 --- pkgs/servers/consul/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index ebc2685c122..728e7034a19 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-${version}"; - version = "0.7.5"; + version = "0.9.3"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "0zh4j5p0v41v7i6v084dgsdchx1azjs2mjb3dlfdv671rsnwi54z"; + sha256 = "1176frp7kimpycsmz9wrbizf46jgxr8jq7hz5w4q1x90lswvrxv3"; }; # Keep consul.ui for backward compatability From ece9245a4dacf5fa7b853906aa6f0c8e083a338f Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 24 Sep 2017 15:08:23 +0200 Subject: [PATCH 0297/2806] ipxe: 20160831 -> 20170922 --- pkgs/tools/misc/ipxe/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 6cd451264ab..2d36ad17eec 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchgit, perl, cdrkit, syslinux, xz, openssl }: let - date = "20160831"; - rev = "827dd1bfee67daa683935ce65316f7e0f057fe1c"; + date = "20170922"; + rev = "74d90b33f8490adcee2026ece18d8411d93b6a39"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchgit { url = git://git.ipxe.org/ipxe.git; - sha256 = "11w8b0vln3skfn8r1cvzngslz12njdkwmnacyq3qffb96k2dn2ww"; + sha256 = "12ijrq451fj2x3i7c7xjlxig5mwbhmgzqjvmfl2sza953vfbk4vw"; inherit rev; }; @@ -40,6 +40,10 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn bin/undionly.kpxe $out + + # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending + # let's provide it as a symlink to be compatible in this case. + ln -s undionly.kpxe $out/undionly.kpxe.0 ''; meta = with stdenv.lib; From 80021094b74b2c1c4976d4add174967041acb96d Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sun, 17 Sep 2017 23:31:18 -0400 Subject: [PATCH 0298/2806] mesos: 1.1.1 -> 1.4.0 (cherry picked from commit 6acc4084afec6bdfa4ebaf848ee53da68fc22f05) --- .../networking/cluster/mesos/default.nix | 33 +- .../cluster/mesos/fetch-mesos-deps.sh | 10 +- .../networking/cluster/mesos/mesos-deps.nix | 2 +- .../networking/cluster/mesos/nixos.patch | 374 +++++++++--------- 4 files changed, 198 insertions(+), 221 deletions(-) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 0506f7c154d..712b1376845 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf -, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython +{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh +, unzip, gnutar, jdk, python, wrapPython , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent -, ethtool, coreutils, which, iptables -, bash +, ethtool, coreutils, which, iptables, maven +, bash, autoreconfHook }: let @@ -21,7 +21,7 @@ let }); in stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.4.0"; name = "mesos-${version}"; enableParallelBuilding = true; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "0f46ebb130d2d4a9732f95d0a71d80c8c5967f3c172b110f2ece316e05922115"; + sha256 = "0c08kd226nrjwm2z2drpq4vi97h9r8b1xkdvkgh1114fxg7cyvys"; }; patches = [ @@ -40,11 +40,13 @@ in stdenv.mkDerivation rec { # see https://github.com/cstrahan/mesos/tree/nixos-${version} ./nixos.patch ]; - + nativeBuildInputs = [ + autoreconfHook + ]; buildInputs = [ - makeWrapper autoconf automake libtool curl sasl jdk maven + makeWrapper curl sasl jdk python wrapPython boto setuptools leveldb - subversion apr glog openssl libevent + subversion apr glog openssl libevent maven ] ++ lib.optionals stdenv.isLinux [ libnl ]; @@ -52,10 +54,6 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ pythonProtobuf ]; - - # note that we *must* statically link libprotobuf. - # if we dynamically link the lib, we get these errors: - # https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684 preConfigure = '' # https://issues.apache.org/jira/browse/MESOS-6616 configureFlagsArray+=( @@ -66,13 +64,10 @@ in stdenv.mkDerivation rec { # instead of sed 1i'#include ' -i src/linux/fs.cpp sed 1i'#include ' -i src/slave/containerizer/mesos/isolators/gpu/isolator.cpp - substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \ --subst-var-by chown ${coreutils}/bin/chown substituteInPlace 3rdparty/stout/Makefile.am \ - --replace "-lprotobuf" \ - "${pythonProtobuf.protobuf}/lib/libprotobuf.so" substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \ --subst-var-by sh ${bash}/bin/bash @@ -99,8 +94,6 @@ in stdenv.mkDerivation rec { --subst-var-by mesos-resolve $out/bin/mesos-resolve substituteInPlace src/python/native_common/ext_modules.py.in \ - --replace "-lprotobuf" \ - "${pythonProtobuf.protobuf}/lib/libprotobuf.so" substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \ --subst-var-by cp ${coreutils}/bin/cp \ @@ -124,8 +117,6 @@ in stdenv.mkDerivation rec { substituteInPlace src/Makefile.am \ --subst-var-by mavenRepo ${mavenRepo} \ - --replace "-lprotobuf" \ - "${pythonProtobuf.protobuf}/lib/libprotobuf.so" '' + lib.optionalString stdenv.isLinux '' @@ -179,7 +170,7 @@ in stdenv.mkDerivation rec { "--enable-libevent" "--with-libevent=${libevent.dev}" "--with-protobuf=${pythonProtobuf.protobuf}" - "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar" + "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar" ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" "--with-nl=${libnl.dev}" diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh index f4a4588dbe4..cf7318ecb27 100644 --- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh +++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh @@ -1127,10 +1127,12 @@ fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1 fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom -fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar -fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar.sha1 +fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom +fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom.sha1 +fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar +fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar.sha1 +fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom +fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom.sha1 fetchArtifact com/google/google/1/google-1.pom fetchArtifact com/google/google/1/google-1.pom.sha1 fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix index 1edb4a755d8..642c660edb6 100644 --- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix +++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "066ikswavq3l37x1s3pfdncyj77pvpa0kj14ax5dqb9njmsg0s11"; + outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly"; buildInputs = [ curl ]; diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/pkgs/applications/networking/cluster/mesos/nixos.patch index 78e374b8d6b..a6fea024b08 100644 --- a/pkgs/applications/networking/cluster/mesos/nixos.patch +++ b/pkgs/applications/networking/cluster/mesos/nixos.patch @@ -1,20 +1,7 @@ -diff --git a/3rdparty/stout/include/stout/os/posix/chown.hpp b/3rdparty/stout/include/stout/os/posix/chown.hpp -index c82e2e574..15d332107 100644 ---- a/3rdparty/stout/include/stout/os/posix/chown.hpp -+++ b/3rdparty/stout/include/stout/os/posix/chown.hpp -@@ -34,7 +34,7 @@ inline Try chown( - // TODO(bmahler): Consider walking the file tree instead. We would need - // to be careful to not miss dotfiles. - std::string command = -- "chown -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'"; -+ "@chown@ -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'"; - - int status = os::system(command); - if (status != 0) { -diff --git a/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/stout/include/stout/os/posix/fork.hpp -index a29967dcb..290b98b50 100644 ---- a/3rdparty/stout/include/stout/os/posix/fork.hpp -+++ b/3rdparty/stout/include/stout/os/posix/fork.hpp +diff --git i/3rdparty/stout/include/stout/os/posix/fork.hpp w/3rdparty/stout/include/stout/os/posix/fork.hpp +index a29967d..290b98b 100644 +--- i/3rdparty/stout/include/stout/os/posix/fork.hpp ++++ w/3rdparty/stout/include/stout/os/posix/fork.hpp @@ -369,7 +369,7 @@ private: if (exec.isSome()) { // Execute the command (via '/bin/sh -c command'). @@ -24,11 +11,11 @@ index a29967dcb..290b98b50 100644 EXIT(EXIT_FAILURE) << "Failed to execute '" << command << "': " << os::strerror(errno); } else if (wait.isSome()) { -diff --git a/3rdparty/stout/include/stout/posix/os.hpp b/3rdparty/stout/include/stout/posix/os.hpp -index c37e64db6..d3d87b7f0 100644 ---- a/3rdparty/stout/include/stout/posix/os.hpp -+++ b/3rdparty/stout/include/stout/posix/os.hpp -@@ -375,7 +375,7 @@ inline Option getenv(const std::string& key) +diff --git i/3rdparty/stout/include/stout/posix/os.hpp w/3rdparty/stout/include/stout/posix/os.hpp +index 8511dfd..1e7be01 100644 +--- i/3rdparty/stout/include/stout/posix/os.hpp ++++ w/3rdparty/stout/include/stout/posix/os.hpp +@@ -366,7 +366,7 @@ inline Try> pids(Option group, Option session) inline Try tar(const std::string& path, const std::string& archive) { Try tarOut = @@ -37,11 +24,11 @@ index c37e64db6..d3d87b7f0 100644 if (tarOut.isError()) { return Error("Failed to archive " + path + ": " + tarOut.error()); -diff --git a/src/Makefile.am b/src/Makefile.am -index 3bcc0f2df..e5cbc57e8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1545,7 +1545,7 @@ if HAS_JAVA +diff --git i/src/Makefile.am w/src/Makefile.am +index 68fff14..c572f92 100644 +--- i/src/Makefile.am ++++ w/src/Makefile.am +@@ -1775,7 +1775,7 @@ if HAS_JAVA $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom @echo "Building mesos-$(PACKAGE_VERSION).jar ..." @@ -50,10 +37,10 @@ index 3bcc0f2df..e5cbc57e8 100644 # Convenience library for JNI bindings. # TODO(Charles Reiss): We really should be building the Java library -diff --git a/src/cli/mesos-scp b/src/cli/mesos-scp -index a71ab0708..1043d1b3c 100755 ---- a/src/cli/mesos-scp -+++ b/src/cli/mesos-scp +diff --git i/src/cli/mesos-scp w/src/cli/mesos-scp +index a71ab07..1043d1b 100755 +--- i/src/cli/mesos-scp ++++ w/src/cli/mesos-scp @@ -19,7 +19,8 @@ if sys.version_info < (2,6,0): @@ -64,11 +51,11 @@ index a71ab0708..1043d1b3c 100755 try: process = subprocess.Popen( cmd, -diff --git a/src/common/command_utils.cpp b/src/common/command_utils.cpp -index 09e805140..90bf65896 100644 ---- a/src/common/command_utils.cpp -+++ b/src/common/command_utils.cpp -@@ -140,7 +140,7 @@ Future tar( +diff --git i/src/common/command_utils.cpp w/src/common/command_utils.cpp +index c50be76..388cc53 100644 +--- i/src/common/command_utils.cpp ++++ w/src/common/command_utils.cpp +@@ -142,7 +142,7 @@ Future tar( argv.emplace_back(input); @@ -77,7 +64,7 @@ index 09e805140..90bf65896 100644 .then([]() { return Nothing(); }); } -@@ -162,7 +162,7 @@ Future untar( +@@ -164,7 +164,7 @@ Future untar( argv.emplace_back(directory.get()); } @@ -86,7 +73,7 @@ index 09e805140..90bf65896 100644 .then([]() { return Nothing(); }); } -@@ -170,7 +170,7 @@ Future untar( +@@ -172,7 +172,7 @@ Future untar( Future sha512(const Path& input) { #ifdef __linux__ @@ -95,7 +82,7 @@ index 09e805140..90bf65896 100644 vector argv = { cmd, input // Input file to compute shasum. -@@ -206,7 +206,7 @@ Future gzip(const Path& input) +@@ -208,7 +208,7 @@ Future gzip(const Path& input) input }; @@ -104,7 +91,7 @@ index 09e805140..90bf65896 100644 .then([]() { return Nothing(); }); } -@@ -219,7 +219,7 @@ Future decompress(const Path& input) +@@ -221,7 +221,7 @@ Future decompress(const Path& input) input }; @@ -113,41 +100,45 @@ index 09e805140..90bf65896 100644 .then([]() { return Nothing(); }); } -diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp -index 4456c2813..e22c8fc03 100644 ---- a/src/launcher/fetcher.cpp -+++ b/src/launcher/fetcher.cpp -@@ -68,13 +68,13 @@ static Try extract( +diff --git i/src/launcher/fetcher.cpp w/src/launcher/fetcher.cpp +index 42980f5..3aebeed 100644 +--- i/src/launcher/fetcher.cpp ++++ w/src/launcher/fetcher.cpp +@@ -80,17 +80,17 @@ static Try extract( strings::endsWith(sourcePath, ".tar.bz2") || strings::endsWith(sourcePath, ".txz") || strings::endsWith(sourcePath, ".tar.xz")) { -- command = "tar -C '" + destinationDirectory + "' -xf"; -+ command = "@tar@ -C '" + destinationDirectory + "' -xf"; +- command = {"tar", "-C", destinationDirectory, "-xf", sourcePath}; ++ command = {"@tar@", "-C", destinationDirectory, "-xf", sourcePath}; } else if (strings::endsWith(sourcePath, ".gz")) { string pathWithoutExtension = sourcePath.substr(0, sourcePath.length() - 3); string filename = Path(pathWithoutExtension).basename(); -- command = "gzip -dc > '" + destinationDirectory + "/" + filename + "' <"; -+ command = "@gzip@ -dc > '" + destinationDirectory + "/" + filename + "' <"; + string destinationPath = path::join(destinationDirectory, filename); + +- command = {"gunzip", "-d", "-c"}; ++ command = {"@gunzip@", "-d", "-c"}; + in = Subprocess::PATH(sourcePath); + out = Subprocess::PATH(destinationPath); } else if (strings::endsWith(sourcePath, ".zip")) { -- command = "unzip -o -d '" + destinationDirectory + "'"; -+ command = "@unzip@ -o -d '" + destinationDirectory + "'"; +- command = {"unzip", "-o", "-d", destinationDirectory, sourcePath}; ++ command = {"@unzip@", "-o", "-d", destinationDirectory, sourcePath}; } else { return false; } -@@ -162,7 +162,7 @@ static Try copyFile( +@@ -193,7 +193,7 @@ static Try copyFile( const string& sourcePath, const string& destinationPath) { -- const string command = "cp '" + sourcePath + "' '" + destinationPath + "'"; -+ const string command = "@cp@ '" + sourcePath + "' '" + destinationPath + "'"; +- int status = os::spawn("cp", {"cp", sourcePath, destinationPath}); ++ int status = os::spawn("cp", {"@cp@", sourcePath, destinationPath}); - LOG(INFO) << "Copying resource with command:" << command; - -diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp -index aa31982eb..8b5331b17 100644 ---- a/src/linux/perf.cpp -+++ b/src/linux/perf.cpp -@@ -127,7 +127,7 @@ private: + if (status == -1) { + return ErrnoError("Failed to copy '" + sourcePath + "'"); +diff --git i/src/linux/perf.cpp w/src/linux/perf.cpp +index b301e25..356a2cf 100644 +--- i/src/linux/perf.cpp ++++ w/src/linux/perf.cpp +@@ -128,7 +128,7 @@ private: // NOTE: The supervisor childhook places perf in its own process group // and will kill the perf process when the parent dies. Try _perf = subprocess( @@ -156,19 +147,10 @@ index aa31982eb..8b5331b17 100644 argv, Subprocess::PIPE(), Subprocess::PIPE(), -@@ -319,7 +319,7 @@ bool valid(const set& events) - ostringstream command; - - // Log everything to stderr which is then redirected to /dev/null. -- command << "perf stat --log-fd 2"; -+ command << "@perf@ stat --log-fd 2"; - foreach (const string& event, events) { - command << " --event " << event; - } -diff --git a/src/linux/systemd.cpp b/src/linux/systemd.cpp -index 6318f48fc..394d88d47 100644 ---- a/src/linux/systemd.cpp -+++ b/src/linux/systemd.cpp +diff --git i/src/linux/systemd.cpp w/src/linux/systemd.cpp +index 6318f48..394d88d 100644 +--- i/src/linux/systemd.cpp ++++ w/src/linux/systemd.cpp @@ -196,13 +196,21 @@ bool exists() // This is static as the init system should not change while we are running. static const bool exists = []() -> bool { @@ -209,10 +191,10 @@ index 6318f48fc..394d88d47 100644 Try daemonReload = os::shell("systemctl daemon-reload"); if (daemonReload.isError()) { return Error("Failed to reload systemd daemon: " + daemonReload.error()); -diff --git a/src/python/cli/src/mesos/cli.py b/src/python/cli/src/mesos/cli.py -index f342992e0..354abf443 100644 ---- a/src/python/cli/src/mesos/cli.py -+++ b/src/python/cli/src/mesos/cli.py +diff --git i/src/python/cli/src/mesos/cli.py w/src/python/cli/src/mesos/cli.py +index 4a9b558..c08a8b9 100644 +--- i/src/python/cli/src/mesos/cli.py ++++ w/src/python/cli/src/mesos/cli.py @@ -40,7 +40,7 @@ def resolve(master): import subprocess @@ -222,10 +204,10 @@ index f342992e0..354abf443 100644 stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, -diff --git a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp -index af9f3736b..f8554d414 100644 ---- a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp -+++ b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp +diff --git i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp +index 5b630c1..d63ad69 100644 +--- i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp ++++ w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp @@ -499,7 +499,7 @@ Future> DockerVolumeIsolatorProcess::_prepare( // unsafe arbitrary commands). CommandInfo* command = launchInfo.add_pre_exec_commands(); @@ -235,11 +217,11 @@ index af9f3736b..f8554d414 100644 command->add_arguments("mount"); command->add_arguments("-n"); command->add_arguments("--rbind"); -diff --git a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp -index df16b8fee..4a17475bd 100644 ---- a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp -+++ b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp -@@ -159,9 +159,9 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags) +diff --git i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp +index d7fe9a8..1361a4e 100644 +--- i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp ++++ w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp +@@ -154,9 +154,9 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags) // here because 'create' will only be invoked during // initialization. Try mount = os::shell( @@ -252,7 +234,7 @@ index df16b8fee..4a17475bd 100644 workDir->c_str(), workDir->c_str(), workDir->c_str(), -@@ -180,8 +180,8 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags) +@@ -175,8 +175,8 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags) LOG(INFO) << "Making '" << workDir.get() << "' a shared mount"; Try mount = os::shell( @@ -263,7 +245,7 @@ index df16b8fee..4a17475bd 100644 workDir->c_str(), workDir->c_str()); -@@ -404,7 +404,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands( +@@ -422,7 +422,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands( CommandInfo command; command.set_shell(false); @@ -272,7 +254,7 @@ index df16b8fee..4a17475bd 100644 command.add_arguments("mount"); command.add_arguments("-n"); command.add_arguments("--rbind"); -@@ -569,7 +569,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands( +@@ -610,7 +610,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands( // TODO(jieyu): Consider the mode in the volume. CommandInfo command; command.set_shell(false); @@ -281,11 +263,11 @@ index df16b8fee..4a17475bd 100644 command.add_arguments("mount"); command.add_arguments("-n"); command.add_arguments("--rbind"); -diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp -index a1283e5ee..a918427bf 100644 ---- a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp -+++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp -@@ -207,7 +207,7 @@ Future> SharedFilesystemIsolatorProcess::prepare( +diff --git i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp +index 927d95b..576dc63 100644 +--- i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp ++++ w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp +@@ -208,7 +208,7 @@ Future> SharedFilesystemIsolatorProcess::prepare( } launchInfo.add_pre_exec_commands()->set_value( @@ -294,11 +276,11 @@ index a1283e5ee..a918427bf 100644 } return launchInfo; -diff --git a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp -index e3756c920..cfe458b59 100644 ---- a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp -+++ b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp -@@ -355,7 +355,7 @@ Future> NvidiaGpuIsolatorProcess::_prepare( +diff --git i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp +index 25636b5..33ec315 100644 +--- i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp ++++ w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp +@@ -401,7 +401,7 @@ Future> NvidiaGpuIsolatorProcess::_prepare( } launchInfo.add_pre_exec_commands()->set_value( @@ -307,11 +289,11 @@ index e3756c920..cfe458b59 100644 volume.HOST_PATH() + " " + target); } -diff --git a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp -index 478752f37..ab527f0cd 100644 ---- a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp -+++ b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp -@@ -281,7 +281,7 @@ Try NvidiaVolume::create() +diff --git i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp +index 536a3c7..e2819dd 100644 +--- i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp ++++ w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp +@@ -274,7 +274,7 @@ Try NvidiaVolume::create() string path = path::join(hostPath, "bin", binary); if (!os::exists(path)) { @@ -320,7 +302,7 @@ index 478752f37..ab527f0cd 100644 Try which = os::shell(command); if (which.isSome()) { -@@ -295,7 +295,7 @@ Try NvidiaVolume::create() +@@ -288,7 +288,7 @@ Try NvidiaVolume::create() : "No such file or directory")); } @@ -329,7 +311,7 @@ index 478752f37..ab527f0cd 100644 Try cp = os::shell(command); if (cp.isError()) { return Error("Failed to os::shell '" + command + "': " + cp.error()); -@@ -367,7 +367,7 @@ Try NvidiaVolume::create() +@@ -360,7 +360,7 @@ Try NvidiaVolume::create() Path(realpath.get()).basename()); if (!os::exists(libraryPath)) { @@ -338,11 +320,11 @@ index 478752f37..ab527f0cd 100644 Try cp = os::shell(command); if (cp.isError()) { return Error("Failed to os::shell '" + command + "':" -diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp -index 0d9ec57d9..a177e4476 100644 ---- a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp -+++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp -@@ -94,7 +94,7 @@ Future> NamespacesPidIsolatorProcess::prepare( +diff --git i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp +index 42bc2e1..2f9066e 100644 +--- i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp ++++ w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp +@@ -131,7 +131,7 @@ Future> NamespacesPidIsolatorProcess::prepare( // // TOOD(jieyu): Consider unmount the existing /proc. launchInfo.add_pre_exec_commands()->set_value( @@ -351,11 +333,11 @@ index 0d9ec57d9..a177e4476 100644 return launchInfo; } -diff --git a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp -index c87e6715a..6601cd1b3 100644 ---- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp -+++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp -@@ -262,9 +262,9 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags) +diff --git i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp +index fc68f04..267b040 100644 +--- i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp ++++ w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp +@@ -205,9 +205,9 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags) // here because 'create' will only be invoked during // initialization. Try mount = os::shell( @@ -368,7 +350,7 @@ index c87e6715a..6601cd1b3 100644 rootDir->c_str(), rootDir->c_str(), rootDir->c_str(), -@@ -284,8 +284,8 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags) +@@ -227,8 +227,8 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags) LOG(INFO) << "Making '" << rootDir.get() << "' a shared mount"; Try mount = os::shell( @@ -379,11 +361,11 @@ index c87e6715a..6601cd1b3 100644 rootDir->c_str(), rootDir->c_str()); -diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp -index b470f0c82..6110a43ee 100644 ---- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp -+++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp -@@ -303,7 +303,7 @@ Try PortMapper::addPortMapping( +diff --git i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp +index 43cf3e4..94bad8b 100644 +--- i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp ++++ w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp +@@ -301,7 +301,7 @@ Try PortMapper::addPortMapping( # Check if the `chain` exists in the iptable. If it does not # exist go ahead and install the chain in the iptables NAT # table. @@ -392,7 +374,7 @@ index b470f0c82..6110a43ee 100644 if [ $? -ne 0 ]; then # NOTE: When we create the chain, there is a possibility of a # race due to which a container launch can fail. This can -@@ -317,25 +317,25 @@ Try PortMapper::addPortMapping( +@@ -315,25 +315,25 @@ Try PortMapper::addPortMapping( # since it can happen only when the chain is created the first # time and two commands for creation of the chain are executed # simultaneously. @@ -422,7 +404,7 @@ index b470f0c82..6110a43ee 100644 chain, chain, chain, -@@ -362,7 +362,7 @@ Try PortMapper::delPortMapping() +@@ -360,7 +360,7 @@ Try PortMapper::delPortMapping() # The iptables command searches for the DNAT rules with tag # "container_id: ", and if it exists goes ahead # and deletes it. @@ -431,11 +413,11 @@ index b470f0c82..6110a43ee 100644 chain, getIptablesRuleTag()).get(); -diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp -index 20fb6ab35..46c160977 100644 ---- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp -+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp -@@ -1393,19 +1393,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) +diff --git i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp +index 57d4ccd..68c9577 100644 +--- i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp ++++ w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp +@@ -1394,19 +1394,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) // Check the availability of a few Linux commands that we will use. // We use the blocking os::shell here because 'create' will only be // invoked during initialization. @@ -458,7 +440,7 @@ index 20fb6ab35..46c160977 100644 if (checkCommandIp.isError()) { return Error("Check command 'ip' failed: " + checkCommandIp.error()); } -@@ -1925,9 +1925,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) +@@ -1940,9 +1940,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) // visible. It's OK to use the blocking os::shell here because // 'create' will only be invoked during initialization. Try mount = os::shell( @@ -471,7 +453,7 @@ index 20fb6ab35..46c160977 100644 bindMountRoot->c_str(), bindMountRoot->c_str(), bindMountRoot->c_str(), -@@ -1944,8 +1944,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) +@@ -1959,8 +1959,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) // shared mount yet (possibly due to slave crash while preparing // the work directory mount). It's safe to re-do the following. Try mount = os::shell( @@ -482,7 +464,7 @@ index 20fb6ab35..46c160977 100644 bindMountRoot->c_str(), bindMountRoot->c_str()); -@@ -1964,8 +1964,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) +@@ -1979,8 +1979,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags) // so that they are in different peer groups. if (entry.shared() == bindMountEntry->shared()) { Try mount = os::shell( @@ -493,7 +475,7 @@ index 20fb6ab35..46c160977 100644 bindMountRoot->c_str(), bindMountRoot->c_str()); -@@ -3911,6 +3911,8 @@ Try PortMappingIsolatorProcess::removeHostIPFilters( +@@ -3927,6 +3927,8 @@ Try PortMappingIsolatorProcess::removeHostIPFilters( // TODO(jieyu): Use the Subcommand abstraction to remove most of the // logic here. Completely remove this function once we can assume a // newer kernel where 'setns' works for mount namespaces. @@ -502,7 +484,7 @@ index 20fb6ab35..46c160977 100644 string PortMappingIsolatorProcess::scripts(Info* info) { ostringstream script; -@@ -3921,7 +3923,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -3937,7 +3939,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) // Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave // mount so that changes in the container will not be propagated to // the host. @@ -511,7 +493,7 @@ index 20fb6ab35..46c160977 100644 // Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be // forwarded anyway. -@@ -3929,7 +3931,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -3945,7 +3947,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) << " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n"; // Configure lo and eth0. @@ -520,7 +502,7 @@ index 20fb6ab35..46c160977 100644 << " mtu " << hostEth0MTU << " up\n"; // NOTE: This is mostly a kernel issue: in veth_xmit() the kernel -@@ -3938,12 +3940,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -3954,12 +3956,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) // when we receive a packet with a bad checksum. Disabling rx // checksum offloading ensures the TCP layer will checksum and drop // it. @@ -537,7 +519,7 @@ index 20fb6ab35..46c160977 100644 // Restrict the ephemeral ports that can be used by the container. script << "echo " << info->ephemeralPorts.lower() << " " -@@ -3972,19 +3974,19 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -3988,19 +3990,19 @@ string PortMappingIsolatorProcess::scripts(Info* info) } // Set up filters on lo and eth0. @@ -561,7 +543,7 @@ index 20fb6ab35..46c160977 100644 << " protocol ip" << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" << " flowid ffff:0" -@@ -3995,7 +3997,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -4011,7 +4013,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) foreach (const PortRange& range, getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) { // Local traffic inside a container will not be redirected to eth0. @@ -570,7 +552,7 @@ index 20fb6ab35..46c160977 100644 << " protocol ip" << " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32" << " flowid ffff:0" -@@ -4004,7 +4006,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -4020,7 +4022,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) // Traffic going to host loopback IP and ports assigned to this // container will be redirected to lo. @@ -579,7 +561,7 @@ index 20fb6ab35..46c160977 100644 << " protocol ip" << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" << " flowid ffff:0" -@@ -4016,14 +4018,14 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -4032,14 +4034,14 @@ string PortMappingIsolatorProcess::scripts(Info* info) } // Do not forward the ICMP packet if the destination IP is self. @@ -596,8 +578,8 @@ index 20fb6ab35..46c160977 100644 << " protocol ip" << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32" << " flowid ffff:0" -@@ -4032,9 +4034,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) - << net::IPNetwork::LOOPBACK_V4().address() << "\n"; +@@ -4048,9 +4050,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) + << net::IP::Network::LOOPBACK_V4().address() << "\n"; // Display the filters created on eth0 and lo. - script << "tc filter show dev " << eth0 @@ -608,7 +590,7 @@ index 20fb6ab35..46c160977 100644 << " parent " << ingress::HANDLE << "\n"; // If throughput limit for container egress traffic exists, use HTB -@@ -4046,9 +4048,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -4062,9 +4064,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) // throughput. TBF requires other parameters such as 'burst' that // HTB already has default values for. if (egressRateLimitPerContainer.isSome()) { @@ -620,7 +602,7 @@ index 20fb6ab35..46c160977 100644 << CONTAINER_TX_HTB_HANDLE << " classid " << CONTAINER_TX_HTB_CLASS_ID << " htb rate " << egressRateLimitPerContainer.get().bytes() * 8 << "bit\n"; -@@ -4059,12 +4061,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) +@@ -4075,12 +4077,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) // fq_codel, which has a larger buffer and better control on // buffer bloat. // TODO(cwang): Verity that fq_codel qdisc is available. @@ -636,24 +618,24 @@ index 20fb6ab35..46c160977 100644 } return script.str(); -diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.cpp b/src/slave/containerizer/mesos/isolators/posix/disk.cpp -index db0583386..542586370 100644 ---- a/src/slave/containerizer/mesos/isolators/posix/disk.cpp -+++ b/src/slave/containerizer/mesos/isolators/posix/disk.cpp -@@ -540,7 +540,7 @@ private: +diff --git i/src/slave/containerizer/mesos/isolators/posix/disk.cpp w/src/slave/containerizer/mesos/isolators/posix/disk.cpp +index eb23025..db268ea 100644 +--- i/src/slave/containerizer/mesos/isolators/posix/disk.cpp ++++ w/src/slave/containerizer/mesos/isolators/posix/disk.cpp +@@ -572,7 +572,7 @@ private: // NOTE: The supervisor childhook will watch the parent process and kill // the 'du' process in case that the parent die. Try s = subprocess( - "du", + "@du@", command, - Subprocess::PATH("/dev/null"), + Subprocess::PATH(os::DEV_NULL), Subprocess::PIPE(), -diff --git a/src/slave/containerizer/mesos/isolators/volume/image.cpp b/src/slave/containerizer/mesos/isolators/volume/image.cpp -index 210e67ad0..60b3a15e4 100644 ---- a/src/slave/containerizer/mesos/isolators/volume/image.cpp -+++ b/src/slave/containerizer/mesos/isolators/volume/image.cpp -@@ -214,7 +214,7 @@ Future> VolumeImageIsolatorProcess::_prepare( +diff --git i/src/slave/containerizer/mesos/isolators/volume/image.cpp w/src/slave/containerizer/mesos/isolators/volume/image.cpp +index 35966aa..b62fc86 100644 +--- i/src/slave/containerizer/mesos/isolators/volume/image.cpp ++++ w/src/slave/containerizer/mesos/isolators/volume/image.cpp +@@ -231,7 +231,7 @@ Future> VolumeImageIsolatorProcess::_prepare( CommandInfo* command = launchInfo.add_pre_exec_commands(); command->set_shell(false); @@ -662,11 +644,11 @@ index 210e67ad0..60b3a15e4 100644 command->add_arguments("mount"); command->add_arguments("-n"); command->add_arguments("--rbind"); -diff --git a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp -index 7b976d292..474dcd486 100644 ---- a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp -+++ b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp -@@ -240,7 +240,7 @@ Future> VolumeSandboxPathIsolatorProcess::prepare( +diff --git i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp +index b321b86..8ed3e78 100644 +--- i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp ++++ w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp +@@ -265,7 +265,7 @@ Future> VolumeSandboxPathIsolatorProcess::prepare( CommandInfo* command = launchInfo.add_pre_exec_commands(); command->set_shell(false); @@ -675,58 +657,60 @@ index 7b976d292..474dcd486 100644 command->add_arguments("mount"); command->add_arguments("-n"); command->add_arguments("--rbind"); -diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp -index 9c5354e5f..a73a9692e 100644 ---- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp -+++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp -@@ -147,7 +147,7 @@ Future CopyBackendProcess::_provision( +diff --git i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp +index 69faa03..01a3ed6 100644 +--- i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp ++++ w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp +@@ -266,7 +266,7 @@ Future CopyBackendProcess::_provision( #endif // __APPLE__ || __FreeBSD__ Try s = subprocess( - "cp", + "@cp@", args, - Subprocess::PATH("/dev/null"), - Subprocess::PATH("/dev/null"), -@@ -180,7 +180,7 @@ Future CopyBackendProcess::destroy(const string& rootfs) + Subprocess::PATH(os::DEV_NULL), + Subprocess::PATH(os::DEV_NULL), +@@ -313,7 +313,7 @@ Future CopyBackendProcess::destroy(const string& rootfs) vector argv{"rm", "-rf", rootfs}; Try s = subprocess( - "rm", + "@rm@", argv, - Subprocess::PATH("/dev/null"), + Subprocess::PATH(os::DEV_NULL), Subprocess::FD(STDOUT_FILENO), -diff --git a/src/uri/fetchers/copy.cpp b/src/uri/fetchers/copy.cpp -index 2cfef5ab0..8a62f7699 100644 ---- a/src/uri/fetchers/copy.cpp -+++ b/src/uri/fetchers/copy.cpp -@@ -97,7 +97,7 @@ Future CopyFetcherPlugin::fetch( - const vector argv = {"cp", "-a", uri.path(), directory}; +diff --git i/src/uri/fetchers/copy.cpp w/src/uri/fetchers/copy.cpp +index 17f69be..831b08a 100644 +--- i/src/uri/fetchers/copy.cpp ++++ w/src/uri/fetchers/copy.cpp +@@ -97,8 +97,8 @@ Future CopyFetcherPlugin::fetch( + VLOG(1) << "Copying '" << uri.path() << "' to '" << directory << "'"; - Try s = subprocess( -- "cp", -+ "@cp@", - argv, - Subprocess::PATH("/dev/null"), - Subprocess::PIPE(), -diff --git a/src/uri/fetchers/curl.cpp b/src/uri/fetchers/curl.cpp -index 7b746d619..12bbb04df 100644 ---- a/src/uri/fetchers/curl.cpp -+++ b/src/uri/fetchers/curl.cpp -@@ -107,7 +107,7 @@ Future CurlFetcherPlugin::fetch( + #ifndef __WINDOWS__ +- const char* copyCommand = "cp"; +- const vector argv = {"cp", "-a", uri.path(), directory}; ++ const char* copyCommand = "@cp@"; ++ const vector argv = {"@cp@", "-a", uri.path(), directory}; + #else // __WINDOWS__ + const char* copyCommand = os::Shell::name; + const vector argv = +diff --git i/src/uri/fetchers/curl.cpp w/src/uri/fetchers/curl.cpp +index f34daf2..6a50341 100644 +--- i/src/uri/fetchers/curl.cpp ++++ w/src/uri/fetchers/curl.cpp +@@ -109,7 +109,7 @@ Future CurlFetcherPlugin::fetch( }; Try s = subprocess( - "curl", + "@curl@", argv, - Subprocess::PATH("/dev/null"), + Subprocess::PATH(os::DEV_NULL), Subprocess::PIPE(), -diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp -index 3f38dddfb..fd991ee74 100644 ---- a/src/uri/fetchers/docker.cpp -+++ b/src/uri/fetchers/docker.cpp +diff --git i/src/uri/fetchers/docker.cpp w/src/uri/fetchers/docker.cpp +index 91db13b..82a7fc4 100644 +--- i/src/uri/fetchers/docker.cpp ++++ w/src/uri/fetchers/docker.cpp @@ -114,7 +114,7 @@ static Future curl( // TODO(jieyu): Kill the process if discard is called. @@ -734,14 +718,14 @@ index 3f38dddfb..fd991ee74 100644 - "curl", + "@curl@", argv, - Subprocess::PATH("/dev/null"), + Subprocess::PATH(os::DEV_NULL), Subprocess::PIPE(), -@@ -213,7 +213,7 @@ static Future download( +@@ -229,7 +229,7 @@ static Future download( // TODO(jieyu): Kill the process if discard is called. Try s = subprocess( - "curl", + "@curl@", argv, - Subprocess::PATH("/dev/null"), + Subprocess::PATH(os::DEV_NULL), Subprocess::PIPE(), From d05b0b6b70e331145b2ee337a14e3b7672c562bc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 24 Sep 2017 14:52:44 +0200 Subject: [PATCH 0299/2806] mesos test: fix python handling Still does not succeed but advances further (cherry picked from commit 30d09f717aa94a78105bff22da548b904887b394) --- nixos/tests/mesos.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix index 6e9af126f03..34671df047c 100644 --- a/nixos/tests/mesos.nix +++ b/nixos/tests/mesos.nix @@ -56,9 +56,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { src = ./mesos_test.py; phases = [ "installPhase" "fixupPhase" ]; installPhase = '' - mkdir $out - cp $src $out/mesos_test.py - chmod +x $out/mesos_test.py + install -Dvm 0755 $src $out/bin/mesos_test.py echo "done" > test.result tar czf $out/test.tar.gz test.result @@ -74,18 +72,18 @@ import ./make-test.nix ({ pkgs, ...} : rec { $master->waitForOpenPort(5050); $slave->waitForOpenPort(5051); - # is slave registred? + # is slave registered? $master->waitUntilSucceeds("curl -s --fail http://master:5050/master/slaves". " | grep -q \"\\\"hostname\\\":\\\"slave\\\"\""); - # try to run docker image + # try to run docker image $master->succeed("${pkgs.mesos}/bin/mesos-execute --master=master:5050". " --resources=\"cpus:0.1;mem:32\" --name=simple-docker". " --containerizer=mesos --docker_image=echo:latest". " --shell=true --command=\"echo done\" | grep -q TASK_FINISHED"); # simple command with .tar.gz uri - $master->succeed("${testFramework}/mesos_test.py master ". + $master->succeed("${testFramework}/bin/mesos_test.py master ". "${testFramework}/test.tar.gz"); ''; }) From ddd13e13756ac74a592b38569263a675cf72ba39 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 27 Sep 2017 23:16:02 +0000 Subject: [PATCH 0300/2806] nixos/tinc: add "restartTriggers" back Add "restartTriggers" back to restart the Tinc daemon when its peer is removed. Reverted #27660 --- nixos/modules/services/networking/tinc.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 0354e76d74f..adb80ea2984 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -163,6 +163,12 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ data.package ]; + restartTriggers = + let + drvlist = [ config.environment.etc."tinc/${network}/tinc.conf".source ] + ++ mapAttrsToList (host: _: config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts; + in # drvlist might be too long to be used directly + [ (builtins.hashString "sha256" (concatMapStrings (d: d.outPath) drvlist)) ]; serviceConfig = { Type = "simple"; Restart = "always"; From c6f513b56a30fe974ec9166c8e94c51c0ab6e097 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 27 Sep 2017 15:20:14 -0700 Subject: [PATCH 0301/2806] nixos/monit: install monit as system package, use default config file path --- nixos/modules/services/monitoring/monit.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix index e07ffd2e8b5..71f50cc0f19 100644 --- a/nixos/modules/services/monitoring/monit.nix +++ b/nixos/modules/services/monitoring/monit.nix @@ -17,20 +17,22 @@ in }; config = mkOption { default = ""; - description = "monit.conf content"; + description = "monitrc content"; }; }; }; config = mkIf config.services.monit.enable { + environment.systemPackages = [ pkgs.monit ]; + environment.etc = [ { source = pkgs.writeTextFile { - name = "monit.conf"; + name = "monitrc"; text = config.services.monit.config; }; - target = "monit.conf"; + target = "monitrc"; mode = "0400"; } ]; @@ -40,9 +42,9 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf"; - ExecStop = "${pkgs.monit}/bin/monit -c /etc/monit.conf quit"; - ExecReload = "${pkgs.monit}/bin/monit -c /etc/monit.conf reload"; + ExecStart = "${pkgs.monit}/bin/monit -I -c /etc/monitrc"; + ExecStop = "${pkgs.monit}/bin/monit -c /etc/monitrc quit"; + ExecReload = "${pkgs.monit}/bin/monit -c /etc/monitrc reload"; KillMode = "process"; Restart = "always"; }; From 589cff44bcfc7d69733b0b0af2f403b630388604 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 27 Sep 2017 23:13:31 +0100 Subject: [PATCH 0302/2806] bitcoin-abc: build against qt5 --- pkgs/applications/altcoins/bitcoin-abc.nix | 8 +++++--- .../altcoins/fix-bitcoin-qt-build.patch | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/altcoins/fix-bitcoin-qt-build.patch diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index a14cccd2fdc..d3800062b11 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, zlib, miniupnpc, qt5, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { sha256 = "1fygn6cc99iasg5g5jyps5ps873hfnn4ln4hsmcwlwiqd591qxyv"; }; + patches = [ ./fix-bitcoin-qt-build.patch ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qt5.qtbase qt5.qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; + ++ optionals withGui [ "--with-gui=qt5" ]; meta = { description = "Peer-to-peer electronic cash system (Cash client)"; diff --git a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch new file mode 100644 index 00000000000..cbbfd85fe5b --- /dev/null +++ b/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch @@ -0,0 +1,15 @@ +--- bitcoin-abc-v0.15.0-src/build-aux/m4/bitcoin_qt.m4 1970-01-01 01:00:01.000000000 +0100 ++++ bitcoin-abc-v0.15.0-src.org/build-aux/m4/bitcoin_qt.m4 2017-09-27 23:38:44.748384197 +0100 +@@ -35,11 +35,7 @@ + dnl Output: $1 is set to the path of $2 if found. $2 are searched in order. + AC_DEFUN([BITCOIN_QT_PATH_PROGS],[ + BITCOIN_QT_CHECK([ +- if test "x$3" != "x"; then +- AC_PATH_PROGS($1,$2,,$3) +- else +- AC_PATH_PROGS($1,$2) +- fi ++ AC_PATH_PROGS($1,$2) + if test "x$$1" = "x" && test "x$4" != "xyes"; then + BITCOIN_QT_FAIL([$1 not found]) + fi From 18774fb82b5f3a2bce5d0aba9fd565c0b3021c0d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 27 Sep 2017 18:36:37 -0500 Subject: [PATCH 0303/2806] sqldeveloper: 4.1.1 -> 17.2.0 --- pkgs/development/tools/database/sqldeveloper/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 9f321ee3309..929aeb23e6d 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,12 +1,13 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - name = "sqldeveloper-4.1.1.19.59"; + name = "sqldeveloper-17.2.0.188.1159"; src = requireFile { name = "${name}-no-jre.zip"; url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/"; - sha256 = "1dbbqlz11zps9w5qvzlcv5rdv43s25c3mbzf8il1px4m2j33y3rv"; + /* Actual direct link (would it be allowed to give that link?): http://download.oracle.com/otn/java/sqldeveloper/sqldeveloper-17.2.0.188.1159-no-jre.zip */ + sha256 = "03960705fabc7b3fa98d55a31ee6a17f783b8c8b01462613c6b6a699e8cae4d5"; }; buildInputs = [ makeWrapper unzip ]; From d0435ba032473f89fad8b6425bb3feee3d6fd718 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 1 Sep 2017 06:24:37 +0200 Subject: [PATCH 0304/2806] network-interfaces: device routes for default gateway Iff interface is set, it makes sense to add device route by default. --- .../tasks/network-interfaces-scripted.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 3512296dff4..e92c9bc27de 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -122,24 +122,32 @@ let # Set the default gateway. ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") '' - # FIXME: get rid of "|| true" (necessary to make it idempotent). - ip route add default ${optionalString (cfg.defaultGateway.metric != null) + ${optionalString (cfg.defaultGateway.interface != null) '' + ip route replace ${cfg.defaultGateway.address} dev ${cfg.defaultGateway.interface} ${optionalString (cfg.defaultGateway.metric != null) + "metric ${toString cfg.defaultGateway.metric}" + } proto static + ''} + ip route replace default ${optionalString (cfg.defaultGateway.metric != null) "metric ${toString cfg.defaultGateway.metric}" } via "${cfg.defaultGateway.address}" ${ optionalString (cfg.defaultGatewayWindowSize != null) "window ${toString cfg.defaultGatewayWindowSize}"} ${ optionalString (cfg.defaultGateway.interface != null) - "dev ${cfg.defaultGateway.interface}"} proto static || true + "dev ${cfg.defaultGateway.interface}"} proto static ''} ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") '' - # FIXME: get rid of "|| true" (necessary to make it idempotent). - ip -6 route add ::/0 ${optionalString (cfg.defaultGateway6.metric != null) + ${optionalString (cfg.defaultGateway6.interface != null) '' + ip -6 route replace ${cfg.defaultGateway6.address} dev ${cfg.defaultGateway6.interface} ${optionalString (cfg.defaultGateway6.metric != null) + "metric ${toString cfg.defaultGateway6.metric}" + } proto static + ''} + ip -6 route replace default ${optionalString (cfg.defaultGateway6.metric != null) "metric ${toString cfg.defaultGateway6.metric}" } via "${cfg.defaultGateway6.address}" ${ optionalString (cfg.defaultGatewayWindowSize != null) "window ${toString cfg.defaultGatewayWindowSize}"} ${ optionalString (cfg.defaultGateway6.interface != null) - "dev ${cfg.defaultGateway6.interface}"} proto static || true + "dev ${cfg.defaultGateway6.interface}"} proto static ''} ''; }; From b80ed214f54d877e75d0cbb804eb8fe2de51bf09 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Thu, 28 Sep 2017 00:16:59 +0000 Subject: [PATCH 0305/2806] tex-gyre-math fonts: init at 1.005, 1.632, 1.533, 1.543 --- pkgs/data/fonts/tex-gyre-math/default.nix | 66 +++++++++++++++++++ .../fonts/tex-gyre-termes-math/default.nix | 37 ----------- pkgs/top-level/all-packages.nix | 8 ++- 3 files changed, 73 insertions(+), 38 deletions(-) create mode 100644 pkgs/data/fonts/tex-gyre-math/default.nix delete mode 100644 pkgs/data/fonts/tex-gyre-termes-math/default.nix diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix new file mode 100644 index 00000000000..e99e0bfb342 --- /dev/null +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -0,0 +1,66 @@ +{ variant, stdenv, fetchzip }: + +let + variants = { + bonum = { + displayName = "Bonum"; + version = "1.005"; + sha256 = "1b6x7siypyxp1lhq7xxdqafwbn6p2p3xm3jb38q999sv8cgslxz8"; + outputHash = "1zjaxkzidqmxakh9d61n0by9mi8hrmir45jppjj6hzwhm3rvknff"; + }; + pagella = { + displayName = "Pagella"; + version = "1.632"; + sha256 = "0f4cgq9w0lc1fbcbfqiv19mdhivbsscl13jmb0ln685641ci2sjr"; + outputHash = "0wz2n1dpx9b8a0qgqy8vl712fxhi87mhcda281xaad62chndwf6k"; + }; + schola = { + displayName = "Schola"; + version = "1.533"; + sha256 = "0caqgkz7gz700h5a1mai0gq8hv7skrgs5nnrs1f7zw1mb9g53ya9"; + outputHash = "0jk4bpxki95a9lmfj4cgpnv1jwlkh8qixbkf498n1x7hkaz03f5n"; + }; + termes = { + displayName = "Termes"; + version = "1.543"; + sha256 = "10ayqfpryfn1l35hy0vwyjzw3a6mfsnzgf78vsnccgk2gz1g9vhz"; + outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm"; + }; + }; + current = variants."${variant}"; + dotless_version = builtins.replaceStrings ["."] [""] current.version; +in stdenv.mkDerivation rec { + name = "tex-gyre-${variant}-math-${current.version}"; + version = "${current.version}"; + + src = fetchzip { + url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip"; + sha256 = current.sha256; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype/ + mkdir -p $out/share/doc/${name}/ + cp -v opentype/*.otf $out/share/fonts/opentype/ + cp -v doc/*.txt $out/share/doc/${name}/ + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = current.outputHash; + + meta = with stdenv.lib; { + longDescription = '' + TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre + ${current.displayName} family of fonts (see + http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format. + ''; + homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; + # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), + # which is a free license, legally equivalent to the LaTeX Project Public + # License (LPPL), version 1.3c or later." - GUST website + license = licenses.lppl13c; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/tex-gyre-termes-math/default.nix b/pkgs/data/fonts/tex-gyre-termes-math/default.nix deleted file mode 100644 index 83b157b085b..00000000000 --- a/pkgs/data/fonts/tex-gyre-termes-math/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchzip }: - -stdenv.mkDerivation rec { - name = "tex-gyre-termes-math-${version}"; - version = "1.543"; - - src = fetchzip { - url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyretermes-math-1543.zip"; - sha256 = "10ayqfpryfn1l35hy0vwyjzw3a6mfsnzgf78vsnccgk2gz1g9vhz"; - }; - - installPhase = '' - mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/${name}/ - cp -v opentype/*.otf $out/share/fonts/opentype/ - cp -v doc/*.txt $out/share/doc/${name}/ - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm"; - - meta = with stdenv.lib; { - longDescription = '' - TeX Gyre Termes Math is a math companion for the TeX Gyre Termes family - of fonts (see http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in - the OpenType format. - ''; - homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; - # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), - # which is a free license, legally equivalent to the LaTeX Project Public - # License (LPPL), version 1.3c or later." - GUST website - license = licenses.lppl13c; - maintainers = with maintainers; [ siddharthist ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5aad1dcbc5..9ece6cab423 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13386,7 +13386,13 @@ with pkgs; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; - tex-gyre-termes-math = callPackage ../data/fonts/tex-gyre-termes-math { }; + tex-gyre-bonum-math = callPackage ../data/fonts/tex-gyre-math { variant = "bonum"; }; + + tex-gyre-pagella-math = callPackage ../data/fonts/tex-gyre-math { variant = "pagella"; }; + + tex-gyre-schola-math = callPackage ../data/fonts/tex-gyre-math { variant = "schola"; }; + + tex-gyre-termes-math = callPackage ../data/fonts/tex-gyre-math { variant = "termes"; }; tipa = callPackage ../data/fonts/tipa { }; From 6e4c9b62946d8dae0ec012c4fd1b3d7f44b5b995 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Sep 2017 15:20:07 +0000 Subject: [PATCH 0306/2806] mednaffe: 0.8 -> 0.8.6, add autoreconfHook, drop g_strdup from patch --- pkgs/misc/emulators/mednaffe/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 21e75a72d61..a72192b1fcf 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -1,28 +1,29 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk2, mednafen }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, mednafen }: stdenv.mkDerivation rec { - - version = "0.8"; name = "mednaffe-${version}"; + version = "0.8.6"; src = fetchFromGitHub { - repo = "mednaffe"; - owner = "AmatCoder"; - rev = "v${version}"; - sha256 = "1j4py4ih14fa6dv0hka03rs4mq19ir83qkbxsz3695a4phmip0jr"; + owner = "AmatCoder"; + repo = "mednaffe"; + rev = "v${version}"; + sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m"; }; - prePatch = '' - substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = g_strdup( \"${mednafen}/bin/mednafen\" )" + patchPhase = '' + substituteInPlace src/mednaffe.c \ + --replace 'binpath = NULL' 'binpath = "${mednafen}/bin/mednafen"' ''; - buildInputs = [ pkgconfig gtk2 mednafen ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gtk2 mednafen ]; meta = with stdenv.lib; { description = "A GTK based frontend for mednafen"; homepage = https://github.com/AmatCoder/mednaffe; license = licenses.gpl3; - maintainers = [ maintainers.sheenobu ]; + maintainers = with maintainers; [ sheenobu ]; platforms = platforms.linux; }; } From c766092193e44eda1a645080d737fda5c58fdd02 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 28 Sep 2017 00:21:19 +0300 Subject: [PATCH 0307/2806] octoprint-plugins.m33-fio: 1.20 -> 1.21 --- .../misc/octoprint/m33-fio-one-library.patch | 29 ++++++++++++------- pkgs/applications/misc/octoprint/plugins.nix | 4 +-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch index 87b00f3ab70..24c9c4a80f5 100644 --- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch +++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch @@ -1,18 +1,18 @@ -From 0defcf6ec155899c414f66524b7df629f59327f0 Mon Sep 17 00:00:00 2001 +From 314bcebfcd1759981ce12255be29d8ae68cd400b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 00:40:48 +0300 Subject: [PATCH] Build and use one version of preprocessor library --- - octoprint_m33fio/__init__.py | 67 ++---------------------------------------- - shared library source/Makefile | 62 +++----------------------------------- - 2 files changed, 6 insertions(+), 123 deletions(-) + octoprint_m33fio/__init__.py | 73 ++---------------------------------------- + shared library source/Makefile | 62 +++-------------------------------- + 2 files changed, 6 insertions(+), 129 deletions(-) diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py -index 4b43c59..d1259e4 100755 +index 054870a..4d5ecc1 100755 --- a/octoprint_m33fio/__init__.py +++ b/octoprint_m33fio/__init__.py -@@ -1062,71 +1062,8 @@ class M33FioPlugin( +@@ -1189,78 +1189,9 @@ class M33FioPlugin( # Check if using shared library or checking if it is usable if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : @@ -54,7 +54,9 @@ index 4b43c59..d1259e4 100755 - - # Otherwise check if running on Windows and using an i386 or x86-64 device - elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -- ++ # Set shared library ++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") + - # Check if Python is running as 32-bit - if platform.architecture()[0].startswith("32") : - @@ -81,11 +83,16 @@ index 4b43c59..d1259e4 100755 - - # Set shared library - self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib") -+ # Set shared library -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") - +- +- # Otherwise check if running FreeBSD +- elif platform.uname()[0].startswith("FreeBSD") : +- +- # TODO: Compile FreeBSD shared library pre-processors +- pass +- # Check if shared library was set if self.sharedLibrary : + diff --git a/shared library source/Makefile b/shared library source/Makefile index 792b4f4..4c74f5c 100755 --- a/shared library source/Makefile @@ -164,5 +171,5 @@ index 792b4f4..4c74f5c 100755 clean: rm -f ../octoprint_m33fio/static/libraries/$(PROG) -- -2.11.0 +2.14.1 diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index c09e8d2f5e6..0a1d26012a8 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -12,13 +12,13 @@ let m33-fio = buildPlugin rec { name = "M33-Fio-${version}"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M33-Fio"; rev = "V${version}"; - sha256 = "1ng7lzlkqsjcr1w7wgzwsqkkvcvpajcj2cwqlffh95916sw8n767"; + sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; }; patches = [ From 35c15d4a61be8e9fb56410077c16dfb092e4ae1b Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 28 Sep 2017 00:43:12 +0200 Subject: [PATCH 0308/2806] tinycc: 0.9.27pre-20170911 -> 0.9.27pre-20170924 Improves `long` handling --- pkgs/development/compilers/tinycc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 8e56c1ee50b..4d655521334 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,9 +2,9 @@ with stdenv.lib; let - date = "20170911"; - rev = "870271ea071971002fa556e09e1873db316fa1a9"; - sha256 = "1a9djm0p7cd5nzqdhch9y48c4wai76x6d4nwx0bj5jz46ws39bs9"; + date = "20170924"; + rev = "1443039416dd02750765efde1af35e31c8d41be3"; + sha256 = "060l0f77hirq3i5bg294gxcszlvyn89ds2q21jwgy3ryrapfbl8i"; version = "0.9.27pre-${date}"; in From c57e5d1aa9a90e86d02812970670513839b14313 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 04:16:32 +0200 Subject: [PATCH 0309/2806] elasticsearch: use jre_headless --- pkgs/servers/search/elasticsearch/5.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index cfa471f217e..fb988b54630 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elk5Version, makeWrapper, jre, utillinux, getopt }: +{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux, getopt }: with stdenv.lib; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; - buildInputs = [ makeWrapper jre ] ++ + buildInputs = [ makeWrapper jre_headless ] ++ (if (!stdenv.isDarwin) then [utillinux] else [getopt]); installPhase = '' @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { ${if (!stdenv.isDarwin) then ''--prefix PATH : "${utillinux}/bin/"'' else ''--prefix PATH : "${getopt}/bin"''} \ - --set JAVA_HOME "${jre}" \ + --set JAVA_HOME "${jre_headless}" \ --set ES_JVM_OPTIONS "$out/config/jvm.options" - wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}" + wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" ''; meta = { From 01eb7d8644fbb49467c76806d9d124987ddd1308 Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 13:53:08 +1000 Subject: [PATCH 0310/2806] guile-sdl: 0.5.1 -> 0.5.2 --- pkgs/development/guile-modules/guile-sdl/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index a7f703028bb..5f887c3a7be 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -3,12 +3,13 @@ }: stdenv.mkDerivation rec { - name = "guile-sdl-${version}"; - version = "0.5.1"; + name = "${pname}-${version}"; + pname = "guile-sdl"; + version = "0.5.2"; src = fetchurl { - url = "mirror://gnu/guile-sdl/${name}.tar.xz"; - sha256 = "126n4rd0ydh6i2s11ari5k85iivradlf12zq13b34shf9k1wn5am"; + url = "mirror://gnu/${pname}/${name}.tar.xz"; + sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01"; }; nativeBuildInputs = [ pkgconfig guile ]; From 0978d59c763bfbf237e321b7df794e463316b447 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 28 Sep 2017 03:59:18 +0000 Subject: [PATCH 0311/2806] urweb: do not use removed postgres.dev output postgres.dev output was reverted by 6b05651c20fd0d73b11f8ab1f4ca984c1fd9fce8 --- pkgs/development/compilers/urweb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index bb8cb5f1746..74ca5dc4c4b 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-openssl=${openssl.dev}"; preConfigure = '' - export PGHEADER="${postgresql.dev}/include/libpq-fe.h"; + export PGHEADER="${postgresql}/include/libpq-fe.h"; export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h"; export SQHEADER="${sqlite.dev}/include/sqlite3.h"; From c758e553de4e425f754643f1c75f3d4042c255b3 Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 14:40:12 +1000 Subject: [PATCH 0312/2806] guile-sdl2: code formatting nits --- .../guile-modules/guile-sdl2/default.nix | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 52dbd89232b..bbbd8fa8329 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -1,46 +1,43 @@ -{ stdenv, - SDL2, - SDL2_image, - SDL2_ttf, - SDL2_mixer, - autoconf, - automake, - fetchgit, - guile, - libtool, - pkgconfig - }: -stdenv.mkDerivation rec { - name = "guile-sdl2-${version}"; +{ stdenv, fetchgit, autoconf, automake, guile, libtool, pkgconfig +, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer +}: + +let + name = "${pname}-${version}"; + pname = "guile-sdl2"; version = "0.1.0"; - buildInputs = [ autoconf - automake - SDL2 - SDL2_image - SDL2_ttf - SDL2_mixer - libtool - guile - pkgconfig ]; +in stdenv.mkDerivation { + inherit name; + src = fetchgit { url = "git://dthompson.us/guile-sdl2.git"; rev = "048f80ddb5c6b03b87bba199a99a6f22d911bfff"; sha256 = "1v7bc2bsddb46qdzq7cyzlw5i2y175kh66mbzbjky85sjfypb084"; }; + + buildInputs = [ + autoconf automake guile libtool pkgconfig + SDL2 SDL2_image SDL2_ttf SDL2_mixer + ]; + preConfigurePhases = [ "bootstrapPhase" ]; - bootstrapPhase = '' - ./bootstrap - ''; - configureFlags = [ "--with-libsdl2-prefix=${SDL2}" - "--with-libsdl2-image-prefix=${SDL2_image}" - "--with-libsdl2-ttf-prefix=${SDL2_ttf}" - "--with-libsdl2-mixer-prefix=${SDL2_mixer}"]; - makeFlags = ["GUILE_AUTO_COMPILE=0"]; - meta = { + + bootstrapPhase = "./bootstrap"; + + configureFlags = [ + "--with-libsdl2-prefix=${SDL2}" + "--with-libsdl2-image-prefix=${SDL2_image}" + "--with-libsdl2-ttf-prefix=${SDL2_ttf}" + "--with-libsdl2-mixer-prefix=${SDL2_mixer}" + ]; + + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + meta = with stdenv.lib; { description = "Bindings to SDL2 for GNU Guile"; - homepage = https://git.dthompson.us/guile-sdl2.git; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.seppeljordan ]; - platforms = stdenv.lib.platforms.all; + homepage = "https://git.dthompson.us/guile-sdl2.git"; + license = licenses.gpl3; + maintainers = with maintainers; [ seppeljordan ]; + platforms = platforms.all; }; } From 2327fa6996cc1139fc3db0b26edefa652252f213 Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 14:40:32 +1000 Subject: [PATCH 0313/2806] guile-sdl2: add vyp as maintainer --- pkgs/development/guile-modules/guile-sdl2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index bbbd8fa8329..d7d4658f7a7 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { description = "Bindings to SDL2 for GNU Guile"; homepage = "https://git.dthompson.us/guile-sdl2.git"; license = licenses.gpl3; - maintainers = with maintainers; [ seppeljordan ]; + maintainers = with maintainers; [ seppeljordan vyp ]; platforms = platforms.all; }; } From 1c818af667cc67f01acea09cb1b1a7bc1b8a7691 Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 14:41:12 +1000 Subject: [PATCH 0314/2806] guile-sdl2: use the proper homepage URL --- pkgs/development/guile-modules/guile-sdl2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index d7d4658f7a7..412440a4a22 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bindings to SDL2 for GNU Guile"; - homepage = "https://git.dthompson.us/guile-sdl2.git"; + homepage = "https://dthompson.us/projects/guile-sdl2.html"; license = licenses.gpl3; maintainers = with maintainers; [ seppeljordan vyp ]; platforms = platforms.all; From 47710757db8d768d883b09e9e20bccf3bc35857b Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 14:42:55 +1000 Subject: [PATCH 0315/2806] guile-sdl2: set the correct upstream license --- pkgs/development/guile-modules/guile-sdl2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 412440a4a22..5c741d5242d 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bindings to SDL2 for GNU Guile"; homepage = "https://dthompson.us/projects/guile-sdl2.html"; - license = licenses.gpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ seppeljordan vyp ]; platforms = platforms.all; }; From 8543e31f66aff5359b0f5c8cd8807580ee2d177b Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 14:54:04 +1000 Subject: [PATCH 0316/2806] guile-sdl2: 0.1.0 -> 0.2.0 Autoconf, automake, and running `./bootstrap` is no longer required because we are now building from the tarball, which includes the generated ./configure script. --- .../guile-modules/guile-sdl2/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 5c741d5242d..b20fc162ef3 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -1,29 +1,24 @@ -{ stdenv, fetchgit, autoconf, automake, guile, libtool, pkgconfig +{ stdenv, fetchurl, guile, libtool, pkgconfig , SDL2, SDL2_image, SDL2_ttf, SDL2_mixer }: let name = "${pname}-${version}"; pname = "guile-sdl2"; - version = "0.1.0"; + version = "0.2.0"; in stdenv.mkDerivation { inherit name; - src = fetchgit { - url = "git://dthompson.us/guile-sdl2.git"; - rev = "048f80ddb5c6b03b87bba199a99a6f22d911bfff"; - sha256 = "1v7bc2bsddb46qdzq7cyzlw5i2y175kh66mbzbjky85sjfypb084"; + src = fetchurl { + url = "https://files.dthompson.us/${pname}/${name}.tar.gz"; + sha256 = "0yq9lsl17cdvj77padvpk3jcw2g6g0pck9jrchc7n2767rrc012b"; }; buildInputs = [ - autoconf automake guile libtool pkgconfig + guile libtool pkgconfig SDL2 SDL2_image SDL2_ttf SDL2_mixer ]; - preConfigurePhases = [ "bootstrapPhase" ]; - - bootstrapPhase = "./bootstrap"; - configureFlags = [ "--with-libsdl2-prefix=${SDL2}" "--with-libsdl2-image-prefix=${SDL2_image}" From f9d64a068b90f196d43b91c81311547016b75fe9 Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Thu, 28 Sep 2017 08:36:51 +0200 Subject: [PATCH 0317/2806] nullmailer: fix relative -> absolute path in preStart script --- nixos/modules/services/mail/nullmailer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index b2c738ab6eb..2eb2d39fc62 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -192,7 +192,7 @@ with lib; preStart = '' mkdir -p /var/spool/nullmailer/{queue,tmp} - rm -f var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger + rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger chown ${cfg.user} /var/spool/nullmailer/* ''; From 02e89de71c402aa4e4a96737a54e07e86a1ef253 Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Thu, 28 Sep 2017 08:37:48 +0200 Subject: [PATCH 0318/2806] nullmailer: use proper description for `remotes` option --- nixos/modules/services/mail/nullmailer.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index 2eb2d39fc62..68cba4a7436 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -142,7 +142,16 @@ with lib; type = types.nullOr types.str; default = null; description = '' - If set, content will override the envelope sender on all messages. + A list of remote servers to which to send each message. Each line + contains a remote host name or address followed by an optional + protocol string, separated by white space. + + See man 8 nullmailer-send for syntax and available + options. + + WARNING: This is stored world-readable in the nix store. If you need + to specify any secret credentials here, consider using the + remotesFile option instead. ''; }; From e741cc488190ab79e26b96d8e6f1402ab5965b6a Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Thu, 28 Sep 2017 08:38:59 +0200 Subject: [PATCH 0319/2806] nullmailer: add `remotesFile` option The current `remotes` option is a string option containing nullmailer remote definitions. However, those definitions may contain secret credentials and should therefore not be put world-readable in the nix store. I added a `remotesFile` option, which allows to specify a path to the remotes definition file instead. This way, the definitions can be kept outside of the nix store with more secure file permissions. --- nixos/modules/services/mail/nullmailer.nix | 30 ++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index 68cba4a7436..c5af1d4d381 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -35,6 +35,18 @@ with lib; description = "Whether to set the system sendmail to nullmailer's."; }; + remotesFile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to the remotes control file. This file contains a + list of remote servers to which to send each message. + + See man 8 nullmailer-send for syntax and available + options. + ''; + }; + config = { adminaddr = mkOption { type = types.nullOr types.str; @@ -173,13 +185,27 @@ with lib; cfg = config.services.nullmailer; in mkIf cfg.enable { + assertions = [ + { assertion = cfg.config.remotes == null || cfg.remotesFile == null; + message = "Only one of `remotesFile` or `config.remotes` may be used at a time."; + } + ]; + environment = { systemPackages = [ pkgs.nullmailer ]; etc = let getval = attr: builtins.getAttr attr cfg.config; attrs = builtins.attrNames cfg.config; - attrs' = builtins.filter (attr: ! isNull (getval attr)) attrs; - in foldl' (as: attr: as // { "nullmailer/${attr}".text = getval attr; }) {} attrs'; + remotesFilter = if cfg.remotesFile != null + then (attr: attr != "remotes") + else (_: true); + optionalRemotesFileLink = if cfg.remotesFile != null + then { "nullmailer/remotes".source = cfg.remotesFile; } + else {}; + attrs' = builtins.filter (attr: (! isNull (getval attr)) && (remotesFilter attr)) attrs; + in + (foldl' (as: attr: as // { "nullmailer/${attr}".text = getval attr; }) {} attrs') + // optionalRemotesFileLink; }; users = { From 56d1a14419cceca3c448c384ce7a98909987f6db Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 28 Sep 2017 00:01:37 -0700 Subject: [PATCH 0320/2806] nvidia-x11: 384.69 -> 384.90 --- 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 22ceb1b2378..ba9b332e6d7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -6,11 +6,11 @@ in { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "384.69"; - sha256_32bit = "1zgq9vji0ndadvql3bsnd0a6p7pq0vr8d0yb5c8b22i2h9smhw1v"; - sha256_64bit = "0l3np6cx2rnb2q89zbnq4lvfcjl2g7i56hxwcb11ggijqm7ridx7"; - settingsSha256 = "064va75p7dnkhy4hyi9b1gl4wjmrpjksg4cyiwl6n3lkmjnvmnwy"; - persistencedSha256 = "0ijq25gnihw34qhkba62l5fy6lwkma94i0fxp8084byyilm3fwms"; + version = "384.90"; + sha256_32bit = "0mq0h7g56m9zvr42ipy2664ph922754l0pdp8wpsmzfpkzg6g9lp"; + sha256_64bit = "1ggylpzw1j217w64rspw4fhvq25wz0la0hhy0b1kxjpwy8h6ipqd"; + settingsSha256 = "023jfbsxsbkjk78i9i6wd0sybv5hib2d7mfvy635w3anjcrsk5il"; + persistencedSha256 = "166ya8pnv4frvrsp0x5zkg8li85vipags03wy6dlf8s940al92z2"; }; beta = generic { From be1209918bef9aca66e4c87b29f8239e0728f165 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Thu, 28 Sep 2017 09:16:09 +0200 Subject: [PATCH 0321/2806] unicode: init at 2.5 --- pkgs/tools/misc/unicode/default.nix | 30 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/unicode/default.nix diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix new file mode 100644 index 00000000000..2b1f5da6e2f --- /dev/null +++ b/pkgs/tools/misc/unicode/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, fetchurl, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "unicode-${version}"; + version = "2.5"; + + src = fetchFromGitHub { + owner = "garabik"; + repo = "unicode"; + rev = "v${version}"; + sha256 = "0vg1zshlzgdva8gzw6fya28fc4jhypjkj743x3q0yabx6934k0g2"; + }; + + ucdtxt = fetchurl { + url = http://www.unicode.org/Public/11.0.0/ucd/UnicodeData-11.0.0d1.txt; + sha256 = "0y9l0sap7yq7c7c8d0fivzycqaw0zncbxzh1inggg42308z974rn"; + }; + + postFixup = '' + substituteInPlace "$out/bin/.unicode-wrapped" \ + --replace "/usr/share/unicode/UnicodeData.txt" "$ucdtxt" + ''; + + meta = with stdenv.lib; { + description = "Display unicode character properties"; + homepage = https://github.com/garabik/unicode; + license = licenses.gpl3; + maintainers = [ maintainers.woffs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f481512ff6..9eae0c7ecf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19224,6 +19224,8 @@ with pkgs; utf8proc = callPackage ../development/libraries/utf8proc { }; + unicode-paracode = callPackage ../tools/misc/unicode { }; + valauncher = callPackage ../applications/misc/valauncher { }; vault = callPackage ../tools/security/vault { }; From ac7673e2faa70245197ca125a42204e8dc184e25 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 26 Sep 2017 19:31:13 +0200 Subject: [PATCH 0322/2806] python.pkgs.pyblake2: init at 0.9.3 --- .../python-modules/pyblake2/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pyblake2/default.nix diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix new file mode 100644 index 00000000000..4e166dcb183 --- /dev/null +++ b/pkgs/development/python-modules/pyblake2/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyblake2"; + version = "0.9.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "626448e1fe1cc01d2197118954bec9f158378577e12686d5b01979f7f0fa2212"; + }; + + # requires setting up sphinx doctest + doCheck = false; + + meta = { + description = "BLAKE2 hash function extension module"; + license = lib.licenses.publicDomain; + homepage = https://github.com/dchest/pyblake2; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70c334dda0b..b0835ad5c1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7156,6 +7156,8 @@ in { pycassa = callPackage ../development/python-modules/pycassa { }; + pyblake2 = callPackage ../development/python-modules/pyblake2 { }; + pybluez = buildPythonPackage rec { version = "unstable-20160819"; pname = "pybluez"; From 1bf5fcad248607008c7d170ad41964bfe0b8476a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 26 Sep 2017 19:31:57 +0200 Subject: [PATCH 0323/2806] python.pkgs.requests-toolbelt: 0.7.1 -> 0.8.0 --- .../requests-toolbelt/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 ++----------- 2 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/requests-toolbelt/default.nix diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix new file mode 100644 index 00000000000..e7834e62b82 --- /dev/null +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, betamax +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "requests-toolbelt"; + version = "0.8.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"; + }; + + checkInputs = [ betamax mock pytest ]; + propagatedBuildInputs = [ requests ]; + + checkPhase = '' + py.test tests + ''; + + meta = { + description = "A toolbelt of useful classes and functions to be used with python-requests"; + homepage = http://toolbelt.rtfd.org; + maintainers = with lib.maintainers; [ matthiasbeyer jgeerds ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0835ad5c1c..432cf5ea526 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18430,26 +18430,8 @@ in { requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { }; - requests_toolbelt = buildPythonPackage rec { - version = "0.7.1"; - name = "requests-toolbelt-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/sigmavirus24/requests-toolbelt/archive/${version}.tar.gz"; - sha256 = "16grklnbgcfwqj3f39gw7fc9afi7xlp9gm7x8w6mi81dzhdxf50y"; - }; - - propagatedBuildInputs = with self; [ requests ]; - - buildInputs = with self; [ betamax mock pytest ]; - - meta = { - description = "A toolbelt of useful classes and functions to be used with python-requests"; - homepage = http://toolbelt.rtfd.org; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; - }; - - }; + requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; + requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 retry_decorator = buildPythonPackage rec { name = "retry_decorator-1.0.0"; From a6d2058e4897fe5541875f8c8678c9768ead1db2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 26 Sep 2017 19:32:15 +0200 Subject: [PATCH 0324/2806] python.pkgs.twine: 1.8.1 -> 1.9.1 --- .../python-modules/twine/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------ 2 files changed, 33 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/twine/default.nix diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix new file mode 100644 index 00000000000..a3f0df8ca2c --- /dev/null +++ b/pkgs/development/python-modules/twine/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pkginfo +, requests +, requests_toolbelt +, tqdm +, pyblake2 +}: + +buildPythonPackage rec { + pname = "twine"; + version = "1.9.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "caa45b7987fc96321258cd7668e3be2ff34064f5c66d2d975b641adca659c1ab"; + }; + + propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 ]; + + # Requires network + doCheck = false; + + meta = { + description = "Collection of utilities for interacting with PyPI"; + homepage = https://github.com/pypa/twine; + license = lib.licenses.asl20; + maintainer = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 432cf5ea526..27d41c059ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21928,27 +21928,7 @@ in { }; }; - twine = buildPythonPackage rec { - name = "twine-${version}"; - version = "1.8.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/twine/${name}.tar.gz"; - sha256 = "68b663691a947b844f92853c992d42bb68b6333bffc9ab7f661346b001c1da82"; - }; - - propagatedBuildInputs = with self; [ clint pkginfo requests requests_toolbelt ]; - - # Requires network - doCheck = false; - - meta = { - description = "Collection of utilities for interacting with PyPI"; - homepage = https://github.com/pypa/twine; - license = licenses.asl20; - maintainer = with maintainers; [ fridh ]; - }; - }; + twine = callPackage ../development/python-modules/twine { }; twisted = callPackage ../development/python-modules/twisted { }; From 82667fee37e306deb20cf7abdfe9ed0b896a7183 Mon Sep 17 00:00:00 2001 From: Sukant Hajra Date: Thu, 28 Sep 2017 02:09:16 -0500 Subject: [PATCH 0325/2806] hdf5: remove references to stdenv.cc The build provides as text a summary of the build, including the absolute path of the compiler used for compilation. Unfortunately, this pulls in stdenv.cc as a transitive closure. So this change just calls remove-references-to as a postInstall step for the one stdenv.cc dependency. See #29889 for details. --- pkgs/tools/misc/hdf5/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index eb29e7d914c..257ade40727 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchurl +, gcc +, removeReferencesTo , cpp ? false , gfortran ? null , zlib ? null @@ -30,6 +32,8 @@ stdenv.mkDerivation rec { inherit mpi; }; + nativeBuildInputs = [ removeReferencesTo ]; + buildInputs = [] ++ optional (gfortran != null) gfortran ++ optional (szip != null) szip; @@ -47,6 +51,10 @@ stdenv.mkDerivation rec { patches = [./bin-mv.patch]; + postInstall = '' + find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + + ''; + meta = { description = "Data model, library, and file format for storing and managing data"; longDescription = '' From f1ffca9ac606fc84c34e0003ce693009a1255a48 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 28 Sep 2017 05:09:54 +0000 Subject: [PATCH 0326/2806] docker: fix docker_17_06 build Broken by #29843 --- pkgs/applications/virtualization/docker/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f28ec6275b8..270a9be6eec 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -46,11 +46,10 @@ rec { }; # This should go into the containerd derivation once 1.0.0 is out - preBuild = '' + preBuild = (optionalString (version == "17.09.0-ce") '' mkdir $(pwd)/vendor/src mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ - ln -s $(pwd) vendor/src/github.com/containerd/containerd - ''; + '') + oldAttrs.preBuild; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { name = "docker-init"; From f1e6c43d451c126c75476109b11de72f31771282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 28 Sep 2017 11:58:56 +0200 Subject: [PATCH 0327/2806] gnome2.glibgnome: fixup build with updated glib --- pkgs/desktops/gnome-2/platform/libgnome/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 1bffa6211dc..a9957c41ff5 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; - outputs = [ "out" "dev" ]; - patches = [ ./new-glib.patch ]; + /* There's a comment containing an invalid utf-8 sequence, breaking glib-mkenums. */ + postPatch = "sed '/returns the true filename/d' -i libgnome/gnome-config.h"; + + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; From 91eb6cf82cc7fa2eaa2802f64a15ab75be726fae Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 28 Sep 2017 10:47:19 +0100 Subject: [PATCH 0328/2806] nullmailer: simplify config generation --- nixos/modules/services/mail/nullmailer.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index c5af1d4d381..59cb512c115 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -194,18 +194,10 @@ with lib; environment = { systemPackages = [ pkgs.nullmailer ]; etc = let - getval = attr: builtins.getAttr attr cfg.config; - attrs = builtins.attrNames cfg.config; - remotesFilter = if cfg.remotesFile != null - then (attr: attr != "remotes") - else (_: true); - optionalRemotesFileLink = if cfg.remotesFile != null - then { "nullmailer/remotes".source = cfg.remotesFile; } - else {}; - attrs' = builtins.filter (attr: (! isNull (getval attr)) && (remotesFilter attr)) attrs; + validAttrs = filterAttrs (name: value: value != null) cfg.config; in - (foldl' (as: attr: as // { "nullmailer/${attr}".text = getval attr; }) {} attrs') - // optionalRemotesFileLink; + (foldl' (as: name: as // { "nullmailer/${name}".text = validAttrs.${name}; }) {} (attrNames validAttrs)) + // optionalAttrs (cfg.remotesFile != null) { "nullmailer/remotes".source = cfg.remotesFile; }; }; users = { From d9d65fb275a455327a13a9caa1ee79580367ea76 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 Sep 2017 23:02:59 +0200 Subject: [PATCH 0329/2806] libgda: finally fix compatibility with GLib vcunat ported this and changed fetchpatch to fetchurl, as the patch is just an attachement, it's not generated. --- pkgs/desktops/gnome-3/misc/libgda/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index 2e5b0a4af84..0ad6a590eb3 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -3,6 +3,14 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + patches = [ + (fetchurl { + name = "libgda-fix-encoding-of-copyright-headers.patch"; + url = https://bug787685.bugzilla-attachments.gnome.org/attachment.cgi?id=359901; + sha256 = "11qj7f7zsiw8jy18vlwz2prlxpg4iq350sws3qwfwsv0lnmncmfq"; + }) + ]; + configureFlags = [ "--enable-gi-system-install=no" ]; From 13649ee12f5a135fd4c912374b09723938a04908 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 Sep 2017 23:49:08 +0200 Subject: [PATCH 0330/2806] libgnomeui: fix compatibility with GLib Picked from #29392, like the parent commit. --- pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index d30c38a2cfc..24cd851eef6 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango +{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome_keyring, libglade }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + (fetchpatch { + name = "0001-gnome-scores.h-Convert-to-UTF-8.patch"; + url = https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff; + sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; From 49a060ea1f15f91c9334c74cc819550617ba9024 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Sep 2017 07:25:16 +0000 Subject: [PATCH 0331/2806] envoy: mark as broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit building Extracting Bazel installation... Loading: Analyzing: target //source/exe:envoy-static ERROR: java.io.IOException: Could not read the crosstool configuration file 'CROSSTOOL file /tmp/nix-build-envoy-1.3.0.drv-0/envoy-v1.3.0-src/.home/.cache/bazel/_bazel_nixbld1/cbe181aaebf3d7253cbcf6057028e514/external/local_config_cc/CROSSTOOL', because of a parser error (945:1: Expected identifier. Found '%') INFO: Elapsed time: 3.065s FAILED: Build did NOT complete successfully builder for ‘/nix/store/09wh9hd81529pgr3ddwfw68higfzkfgr-envoy-1.3.0.drv’ failed with exit code 2 error: build of ‘/nix/store/09wh9hd81529pgr3ddwfw68higfzkfgr-envoy-1.3.0.drv’ failed --- pkgs/tools/networking/envoy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix index 83af542b8ad..a31e6ad004c 100644 --- a/pkgs/tools/networking/envoy/default.nix +++ b/pkgs/tools/networking/envoy/default.nix @@ -299,5 +299,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; + broken = true; }; } From 589574e5c91c477cc5303d3f86eff9f686dd7a3c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 17 Sep 2017 05:56:11 +0000 Subject: [PATCH 0332/2806] go: fix tests and impurity --- pkgs/development/compilers/go/1.9.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index c5d44af2b5b..11d28681abc 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -118,6 +118,15 @@ stdenv.mkDerivation rec { ./ssl-cert-file-1.9.patch ./creds-test.patch ./remove-test-pie-1.9.patch + + (fetchpatch { + url = "https://github.com/golang/go/commit/29415eb2b92e78481897c4161ba99f5b09fa6102.patch"; + sha256 = "01jkm4b2dazzjnfla7rdd0w2clzplga3zza6ybpmkjkk3i4bp73d"; + }) + (fetchpatch { + url = "https://github.com/golang/go/commit/27e80f7c4d8001598367e15a1617fa524bd0fb11.patch"; + sha256 = "1250nrc79jwcagkjqffn5srn78isykvjhvmqhwipwyqb99q85wcz"; + }) ]; postPatch = optionalString stdenv.isDarwin '' @@ -171,11 +180,11 @@ stdenv.mkDerivation rec { disallowedReferences = [ go_bootstrap ]; meta = with stdenv.lib; { - branch = "1.8"; + branch = "1.9"; homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; + maintainers = with maintainers; [ cstrahan orivej wkennington ]; platforms = platforms.linux ++ platforms.darwin; }; } From 8e4586d077f7c2d202a5b4f809f55022e2c41ae1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 12:26:24 +0200 Subject: [PATCH 0333/2806] openvpn: 2.4.3 -> 2.4.4 for CVE-2017-12166 https://community.openvpn.net/openvpn/wiki/CVE-2017-12166 --- pkgs/tools/networking/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 78f21e78277..ddcdfd31c26 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openvpn-${version}"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz"; - sha256 = "0w85915nvdws1n1zsn8zcy9wg23jsx782nvrx1a3x4mqlmkn3a3s"; + sha256 = "102an395nv8l7qfx3syydzhmd9xfbycd6gvwy0h2kjz8w67ipkcn"; }; nativeBuildInputs = [ pkgconfig ]; From ad3efa3b54d59f0cefbd0345c38af70417ea0b5e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Sep 2017 03:19:06 +0000 Subject: [PATCH 0334/2806] gcsfuse: 0.19.0 -> 0.23.0 --- pkgs/tools/filesystems/gcsfuse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 086f0e0f790..215f02ccdd4 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "gcsfuse-${version}"; - version = "v0.19.0"; - rev = "81281027c0093e3f916a6e611a128ec5c3a12ece"; + version = "0.23.0"; + rev = "v${version}"; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; src = fetchgit { inherit rev; url = "https://github.com/googlecloudplatform/gcsfuse"; - sha256 = "1lj9czippsgkhr8y3r7vwxgc8i952v76v1shdv10p43gsxwyyi9a"; + sha256 = "1qxbpsmz22l5w4b7wbgfdq4v85cfc9ka9i8h4c56nals1x5lcsnx"; }; meta = { From 24f5edaebbcc98644d9bf8699343568ffd60aadc Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Sep 2017 07:03:08 +0000 Subject: [PATCH 0335/2806] syncthing012: update go tags argument --- pkgs/applications/networking/syncthing012/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix index 5735dd68bcd..4b5359555f4 100644 --- a/pkgs/applications/networking/syncthing012/default.nix +++ b/pkgs/applications/networking/syncthing012/default.nix @@ -5,8 +5,6 @@ buildGoPackage rec { version = "0.12.15"; rev = "v${version}"; - buildFlags = "--tags noupgrade,release"; - goPackagePath = "github.com/syncthing/syncthing"; src = fetchFromGitHub { @@ -22,4 +20,8 @@ buildGoPackage rec { # Mostly a cosmetic change sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go ''; + + preBuild = '' + export buildFlagsArray+=("-tags" "noupgrade release") + ''; } From 29d93f97abf9c8e87bafde102a1deee326c0fd6e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Sep 2017 08:22:43 +0000 Subject: [PATCH 0336/2806] cockroachdb: build with go1.8 until the next release --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eae0c7ecf2..56eda39f252 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12008,7 +12008,10 @@ with pkgs; cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { + # Go 1.9 build fails with "go1.8.* required (see CONTRIBUTING.md)". + buildGoPackage = buildGo18Package; + }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_1; # conky can use 5.2, but toluapp can not From 07d2a5b4124d909f128345012aa9ea708a3e2d93 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Sep 2017 08:23:27 +0000 Subject: [PATCH 0337/2806] go: update nonfatal build error list --- pkgs/development/go-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index c2e4b39472c..5a1a0eb52eb 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -123,7 +123,7 @@ go.stdenv.mkDerivation ( [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 local OUT if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then - if ! echo "$OUT" | grep -q 'no buildable Go source files'; then + if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then echo "$OUT" >&2 return 1 fi From 2be4d53faa14d873fa8d8584382c7ef9afbd0248 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Sep 2017 08:24:10 +0000 Subject: [PATCH 0338/2806] go: buildGoPackage: 1.8 -> 1.9 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56eda39f252..123e225dbe8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11121,7 +11121,7 @@ with pkgs; go = go_1_9; }; - buildGoPackage = buildGo18Package; + buildGoPackage = buildGo19Package; go2nix = callPackage ../development/tools/go2nix { }; From b46b0468ca71efb3c2b1a32a63274ac041dea3d6 Mon Sep 17 00:00:00 2001 From: amorsillo Date: Thu, 28 Sep 2017 10:42:00 +0000 Subject: [PATCH 0339/2806] mongodb-tools: 3.0.12 -> 3.5.13 (#29884) * Upgrade mongodb-tools to 3.5.13 with ssl * mongodb-tools: fix go references --- pkgs/tools/misc/mongodb-tools/default.nix | 32 +++-- pkgs/tools/misc/mongodb-tools/deps.nix | 155 ++++++++++++++++++++-- 2 files changed, 166 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index f67fd383f18..7e24c955a80 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, openssl_1_0_2, pkgconfig, libpcap }: let tools = [ @@ -6,9 +6,12 @@ let "mongooplog" "mongorestore" "mongostat" "mongotop" ]; in + +with stdenv.lib; + buildGoPackage rec { name = "mongo-tools-${version}"; - version = "3.0.12"; + version = "3.5.13"; rev = "r${version}"; goPackagePath = "github.com/mongodb/mongo-tools"; @@ -18,20 +21,27 @@ buildGoPackage rec { inherit rev; owner = "mongodb"; repo = "mongo-tools"; - sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm"; + sha256 = "00klm4pyx5k39nn4pmfrpnkqxdhbzm7lprgwxszpirzrarh2g164"; }; goDeps = ./deps.nix; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl_1_0_2 libpcap ]; + # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer - preInstall = '' - mkdir -p $bin/bin - '' + toString (map (t: '' - go install $goPackagePath/${t}/main - mv go/bin/main $bin/bin/${t} - '' - ) tools) + '' - rm -r go/bin + buildPhase = '' + runHook preBuild + ${stdenv.lib.concatMapStrings (t: '' + go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main + '') tools} + runHook postBuild ''; + + meta = { + homepage = https://github.com/mongodb/mongo-tools; + description = "Tools for the MongoDB"; + license = licenses.asl20; + }; } diff --git a/pkgs/tools/misc/mongodb-tools/deps.nix b/pkgs/tools/misc/mongodb-tools/deps.nix index 437dcd64937..30de006db6f 100644 --- a/pkgs/tools/misc/mongodb-tools/deps.nix +++ b/pkgs/tools/misc/mongodb-tools/deps.nix @@ -1,11 +1,20 @@ [ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "314a259e304ff91bd6985da2a7149bbf91237993"; + sha256 = "0vya62c3kmhmqx6awlxx8hc84987xkym9rhs0q28vlhwk9kczdaa"; + }; + } { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + url = "https://github.com/golang/crypto"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; }; } { @@ -13,17 +22,62 @@ fetch = { type = "git"; url = "https://github.com/howeyc/gopass"; - rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; - sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; }; } { goPackagePath = "gopkg.in/mgo.v2"; fetch = { type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; - sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + url = "https://github.com/10gen/mgo"; + rev = "39b4000d99037e917f3a3b9d2dcab667a9ef284a"; + sha256 = "1m0xgd3y32g15fhl204g2caarfi5rn41m8pyym0i2gl3jnv5zw99"; + }; + } + { + goPackagePath = "github.com/google/gopacket"; + fetch = { + type = "git"; + url = "https://github.com/google/gopacket"; + rev = "93b782132903d1846aab74cb1f62e6138564949f"; + sha256 = "0l5m5a8dnqbkhphyfq7anj5zv59s74q2l7i6w9r7xwysfiqyq335"; + }; + } + { + goPackagePath = "github.com/patrickmn/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/patrickmn/go-cache"; + rev = "1881a9bccb818787f68c52bfba648c6cf34c34fa"; + sha256 = "1nd0kqijx6mrxb8wlh20bx73mwj0fqzla2sr68y6j6lz3fsy1fw2"; + }; + } + { + goPackagePath = "github.com/spacemonkeygo/openssl"; + fetch = { + type = "git"; + url = "https://github.com/10gen/openssl"; + rev = "2692b9f6fa95e72c75f8d9ba76e49c5dfd2cf8e4"; + sha256 = "16x2mx51977jrqw8d9hqhqmx892v2qf1k5xb01hhfklh58f527k2"; + }; + } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "8ddce2a84170772b95dd5d576c48d517b22cac63"; + sha256 = "11rp9wbzkd71640rq0nwmgsddskx3qac8wzqz71ksdb7ixjj5fmj"; + }; + } + { + goPackagePath = "github.com/spacemonkeygo/spacelog"; + fetch = { + type = "git"; + url = "https://github.com/spacemonkeygo/spacelog"; + rev = "f936fb050dc6b5fe4a96b485a6f069e8bdc59aeb"; + sha256 = "00an6zlhjk5l0vk1zjzshhswsd0h4syi48n50hv0fcnbmpxc5hv2"; }; } { @@ -35,13 +89,94 @@ sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; }; } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "8ddce2a84170772b95dd5d576c48d517b22cac63"; + sha256 = "11rp9wbzkd71640rq0nwmgsddskx3qac8wzqz71ksdb7ixjj5fmj"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "287b4346dc4e71a038c346375a9d572453bc469b"; + sha256 = "1nw9j9aircra68lbkp5bq4l8ayq4g3fvbb2x8qd2hg0vwgn5yaij"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "bf58a9a1291224109919756b4dcc469c670cc7e4"; + sha256 = "1k8k6vvlpl5a19dbrywxjmcia36macjbajx2hb6ci64rdfyf5kz5"; + }; + } + { + goPackagePath = "github.com/jacobsa/oglematchers"; + fetch = { + type = "git"; + url = "https://github.com/jacobsa/oglematchers"; + rev = "3ecefc49db07722beca986d9bb71ddd026b133f0"; + sha256 = "0vrk5sfs1ymkg0gv5n5dn9x0kqiaw8gaapljj8q75mgrr1p5149y"; + }; + } + { + goPackagePath = "github.com/3rf/mongo-lint"; + fetch = { + type = "git"; + url = "https://github.com/3rf/mongo-lint"; + rev = "3550fdcf1f43b89aaeabaa4559eaae6dc4407e42"; + sha256 = "19b60a3i6kzssd15dg57y4bg49sw41idrsjdi8vr4j5lr5d7gviv"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/10gen/escaper"; + fetch = { + type = "git"; + url = "https://github.com/10gen/escaper"; + rev = "17fe61c658dcbdcbf246c783f4f7dc97efde3a8b"; + sha256 = "1iw86lg8ad5gdm46ryf4v431ix834l52lrjvcahq3c4dw1ylnbvl"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; + sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "0723e7c3d0a317dea811f0fbe4d6edd81908c971"; + sha256 = "1ak35nhlgjpbpnh7v9qvjyfsq52liz3niqfqva76p7a68pblwbr7"; + }; + } { goPackagePath = "github.com/jessevdk/go-flags"; fetch = { type = "git"; url = "https://github.com/jessevdk/go-flags"; - rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; - sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + rev = "97448c91aac742cbca3d020b3e769013a420a06f"; + sha256 = "0fv3yxvq8m3639a279hq4pf0c52ngqfl5n1vklcfympndrb7zjzj"; }; } ] From 262b1cb40147a97e431c84994382a8b03741cece Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 20:51:20 +1000 Subject: [PATCH 0340/2806] guile-lint: set version in mkDerivation --- pkgs/development/tools/guile/guile-lint/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 543e30cca7b..19441c54017 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -1,10 +1,8 @@ { stdenv, fetchurl, guile }: -let +stdenv.mkDerivation rec { name = "guile-lint-${version}"; version = "14"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { url = "https://download.tuxfamily.org/user42/${name}.tar.bz2"; From dabb296c76dea4446665e47990653de909ac054f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 12:56:23 +0200 Subject: [PATCH 0341/2806] Revert "dockerTools.buildImage: Switch to the format image generated by Skopeo" This reverts commit 35f205a4b624bceca7c53b9c19ddac5f37a5ae4c. This does not use a standard format and by that breaks mesos --- pkgs/build-support/docker/default.nix | 111 ++++++++++++++++++-------- 1 file changed, 77 insertions(+), 34 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 843d6d6b5dd..267a2812a2a 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -137,7 +137,7 @@ rec { }; inherit fromImage fromImageName fromImageTag; - buildInputs = [ utillinux e2fsprogs jshon rsync jq ]; + buildInputs = [ utillinux e2fsprogs jshon rsync ]; } '' rm -rf $out @@ -146,29 +146,44 @@ rec { mount /dev/${vmTools.hd} disk cd disk - layers="" if [[ -n "$fromImage" ]]; then echo "Unpacking base image..." mkdir image tar -C image -xpf "$fromImage" - layers=$(jq -r '.[0].Layers | join(" ")' image/manifest.json) + + # If the image name isn't set, read it from the image repository json. + if [[ -z "$fromImageName" ]]; then + fromImageName=$(jshon -k < image/repositories | head -n 1) + echo "From-image name wasn't set. Read $fromImageName." + fi + + # If the tag isn't set, use the name as an index into the json + # and read the first key found. + if [[ -z "$fromImageTag" ]]; then + fromImageTag=$(jshon -e $fromImageName -k < image/repositories \ + | head -n1) + echo "From-image tag wasn't set. Read $fromImageTag." + fi + + # Use the name and tag to get the parent ID field. + parentID=$(jshon -e $fromImageName -e $fromImageTag -u \ + < image/repositories) fi - # Unpack all of the layers into the image. - # Layer list is ordered starting from the base image + # Unpack all of the parent layers into the image. lowerdir="" - for layer in $layers; do - echo "Unpacking layer $layer" - layerDir=image/$(echo $layer | cut -d':' -f2)"_unpacked" - mkdir -p $layerDir - tar -C $layerDir -xpf image/$layer - chmod a+w image/$layer - rm image/$layer + while [[ -n "$parentID" ]]; do + echo "Unpacking layer $parentID" + mkdir -p image/$parentID/layer + tar -C image/$parentID/layer -xpf image/$parentID/layer.tar + rm image/$parentID/layer.tar - find $layerDir -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; + find image/$parentID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; # Get the next lower directory and continue the loop. - lowerdir=$lowerdir''${lowerdir:+:}$layerDir + lowerdir=$lowerdir''${lowerdir:+:}image/$parentID/layer + parentID=$(cat image/$parentID/json \ + | (jshon -e parent -u 2>/dev/null || true)) done mkdir work @@ -446,17 +461,26 @@ rec { mkdir image touch baseFiles - layers="" if [[ -n "$fromImage" ]]; then echo "Unpacking base image..." tar -C image -xpf "$fromImage" - config=$(jq -r '.[0].Config' image/manifest.json) - layers=$(jq -r '.[0].Layers | join(" ")' image/manifest.json) - for l in $layers; do - ls_tar image/$l >> baseFiles + # Do not import the base image configuration and manifest + chmod a+w image image/*.json + rm -f image/*.json + + if [[ -z "$fromImageName" ]]; then + fromImageName=$(jshon -k < image/repositories|head -n1) + fi + if [[ -z "$fromImageTag" ]]; then + fromImageTag=$(jshon -e $fromImageName -k \ + < image/repositories|head -n1) + fi + parentID=$(jshon -e $fromImageName -e $fromImageTag -u \ + < image/repositories) + + for l in image/*/layer.tar; do + ls_tar $l >> baseFiles done - chmod u+w image image/$config - rm image/$config fi chmod -R ug+rw image @@ -483,28 +507,47 @@ rec { tar -rpf temp/layer.tar --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 --no-recursion --files-from newFiles - gzip temp/layer.tar - layerID="sha256:$(sha256sum temp/layer.tar.gz | cut -d ' ' -f 1)" - mv temp/layer.tar.gz image/$layerID + echo "Adding meta..." - echo "Generating image configuration and manifest..." + # If we have a parentID, add it to the json metadata. + if [[ -n "$parentID" ]]; then + cat temp/json | jshon -s "$parentID" -i parent > tmpjson + mv tmpjson temp/json + fi + + # Take the sha256 sum of the generated json and use it as the layer ID. + # Compute the size and add it to the json under the 'Size' field. + layerID=$(sha256sum temp/json|cut -d ' ' -f 1) + size=$(stat --printf="%s" temp/layer.tar) + cat temp/json | jshon -s "$layerID" -i id -n $size -i Size > tmpjson + mv tmpjson temp/json + + # Use the temp folder we've been working on to create a new image. + mv temp image/$layerID + + # Create image json and image manifest imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") - - # The layer list is ordered starting from the base image - layers=$(echo $layers $layerID) - for i in $(echo $layers); do + currentID=$layerID + while [[ -n "$currentID" ]]; do + layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1) imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .") - diffId=$(gzip -dc image/$i | sha256sum | cut -d" " -f1) - imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$diffId\"] + .") - manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$i\"] + .") + imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .") + manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .") + + currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true)) done imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1) - echo "$imageJson" > "image/sha256:$imageJsonChecksum" - manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"sha256:$imageJsonChecksum\"") + echo "$imageJson" > "image/$imageJsonChecksum.json" + manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"") echo "$manifestJson" > image/manifest.json + # Store the json under the name image/repositories. + jshon -n object \ + -n object -s "$layerID" -i "$imageTag" \ + -i "$imageName" > image/repositories + # Make the image read-only. chmod -R a-w image From 49e9a26e77b05f26c8d273a4c9836e919ba5878f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 12:57:54 +0200 Subject: [PATCH 0342/2806] protobuf: build static libraries mesos needs them --- pkgs/development/libraries/protobuf/generic-v3.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 44ecdcb2f65..b3249aae9b1 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { doCheck = true; + dontDisableStatic = true; + NIX_CFLAGS_COMPILE = with stdenv.lib; # gcc before 6 doesn't know this option optionalString (hasPrefix "gcc-6" stdenv.cc.cc.name) "-Wno-error=misleading-indentation"; From c2ce38473b48e3249112698ee89473a662cd50a9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 12:58:25 +0200 Subject: [PATCH 0343/2806] mesos: use static protobuf libraries --- pkgs/applications/networking/cluster/mesos/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 712b1376845..116e7432690 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -68,6 +68,8 @@ in stdenv.mkDerivation rec { --subst-var-by chown ${coreutils}/bin/chown substituteInPlace 3rdparty/stout/Makefile.am \ + --replace "-lprotobuf" \ + "${pythonProtobuf.protobuf}/lib/libprotobuf.a" substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \ --subst-var-by sh ${bash}/bin/bash @@ -94,6 +96,8 @@ in stdenv.mkDerivation rec { --subst-var-by mesos-resolve $out/bin/mesos-resolve substituteInPlace src/python/native_common/ext_modules.py.in \ + --replace "-lprotobuf" \ + "${pythonProtobuf.protobuf}/lib/libprotobuf.a" substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \ --subst-var-by cp ${coreutils}/bin/cp \ @@ -117,6 +121,8 @@ in stdenv.mkDerivation rec { substituteInPlace src/Makefile.am \ --subst-var-by mavenRepo ${mavenRepo} \ + --replace "-lprotobuf" \ + "${pythonProtobuf.protobuf}/lib/libprotobuf.a" '' + lib.optionalString stdenv.isLinux '' From 15189140dd22f7e7f55800fc70451b4e31103e87 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 13:00:59 +0200 Subject: [PATCH 0344/2806] weechat: 1.9 -> 1.9.1 for CVE-2017-14727 https://lists.nongnu.org/archive/html/weechat-security/2017-09/msg00000.html --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index e9484044fcc..49cbe29eaf2 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -21,12 +21,12 @@ let in stdenv.mkDerivation rec { - version = "1.9"; + version = "1.9.1"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0xfnhaxmvxdxs3ic0qs5lwq3yl4pi5ib99p0p5lv3v2vldqlm4lc"; + sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1"; }; outputs = [ "out" "man" ]; From ca5e22957c67d8ca05ba5bde4b751ccb378c38ee Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Tue, 26 Sep 2017 15:34:43 +0300 Subject: [PATCH 0345/2806] pythonPackages.livereload: 2.5.0 -> 2.5.1 Also move to development/python-modules. --- .../python-modules/livereload/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/livereload/default.nix diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix new file mode 100644 index 00000000000..fba324d4393 --- /dev/null +++ b/pkgs/development/python-modules/livereload/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, django +, tornado +, six +}: + +buildPythonPackage rec { + pname = "livereload"; + version = "2.5.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b2yyfnpddmrwjfqsndidzchkf3l9jlgzfkwl8dplim9gq6y2ba2"; + }; + + buildInputs = [ nose django ]; + + propagatedBuildInputs = [ tornado six ]; + + meta = { + description = "Runs a local server that reloads as you develop"; + homepage = "https://github.com/lepture/python-livereload"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e24dd180c8..f1142c6b31f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11174,27 +11174,7 @@ in { linode-api = callPackage ../development/python-modules/linode-api { }; - livereload = buildPythonPackage rec { - name = "livereload-${version}"; - version = "2.5.0"; - - src = pkgs.fetchFromGitHub { - owner = "lepture"; - repo = "python-livereload"; - rev = "v${version}"; - sha256 = "0ixsc7wibmkfk9fnyq0d1b5d9snxfpzzzgsxvq28rn54v6q8b7m2"; - }; - - buildInputs = with self; [ nose django ]; - - propagatedBuildInputs = with self; [ tornado six ]; - - meta = { - description = "Runs a local server that reloads as you develop"; - homepage = "https://github.com/lepture/python-livereload"; - license = licenses.bsd3; - }; - }; + livereload = callPackage ../development/python-modules/livereload { }; llfuse = buildPythonPackage rec { name = "llfuse-1.0"; From d70f426dfc336b90a0435dd0c465dcf8b2609cad Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Tue, 26 Sep 2017 15:35:17 +0300 Subject: [PATCH 0346/2806] mkdocs: Initialise at 0.16.3 --- .../tools/documentation/mkdocs/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/documentation/mkdocs/default.nix diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix new file mode 100644 index 00000000000..1aecb267552 --- /dev/null +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -0,0 +1,29 @@ +{ lib, python }: + +with python.pkgs; + +buildPythonApplication rec { + pname = "mkdocs"; + version = "0.16.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z9n0dnidnvm511pdzf73grmr4xn59znkfalq8x9gw5v7lqwa2mc"; + }; + + propagatedBuildInputs = [ + tornado + livereload + click + pyyaml + markdown + jinja2 + ]; + + meta = { + homepage = http://mkdocs.org/; + description = "Project documentation with Markdown"; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ba0c3add19..a16b2ab3d73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7266,6 +7266,8 @@ with pkgs; mk = callPackage ../development/tools/build-managers/mk { }; + mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + moby = callPackage ../development/tools/misc/moby { }; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; From 6960348f2e14b8f79444af19226c2fe420590e8d Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 28 Sep 2017 14:00:01 +0200 Subject: [PATCH 0347/2806] pythonPackages.redis: 2.10.5 -> 2.10.6 --- .../python-modules/redis/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/redis/default.nix diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix new file mode 100644 index 00000000000..87700d8edc4 --- /dev/null +++ b/pkgs/development/python-modules/redis/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchPypi, buildPythonPackage }: +buildPythonPackage rec { + pname = "redis"; + version = "2.10.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52"; + }; + + # tests require a running redis + doCheck = false; + + meta = { + description = "Python client for Redis key-value store"; + homepage = "https://pypi.python.org/pypi/redis/"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c6ca4bd1fc..82ff3b64cd6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18585,22 +18585,7 @@ in { }; - redis = buildPythonPackage rec { - name = "redis-2.10.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/redis/${name}.tar.gz"; - sha256 = "0csmrkxb29x7xs9b51zplwkkq2hwnbh9jns1g85dykn5rxmaxysx"; - }; - - # tests require a running redis - doCheck = false; - - meta = { - description = "Python client for Redis key-value store"; - homepage = "https://pypi.python.org/pypi/redis/"; - }; - }; + redis = callPackage ../development/python-modules/redis { }; rednose = buildPythonPackage rec { name = "rednose-${version}"; From 92c0f467ba2b67028c4dc3201c1d4aaebcf99a7f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 28 Sep 2017 14:00:49 +0200 Subject: [PATCH 0348/2806] pythonPackages.django_redis: 4.2.0 -> 4.5.0 --- .../python-modules/django_redis/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +---------------- 2 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/django_redis/default.nix diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix new file mode 100644 index 00000000000..42f2cde8113 --- /dev/null +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchPypi, buildPythonPackage, + mock, django, redis, msgpack }: +buildPythonPackage rec { + pname = "django-redis"; + version = "4.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "170dbk1wmdg0mxp5m3376zz54dyxmhmhnswrccf0jnny1wqcgpsp"; + }; + + doCheck = false; + + buildInputs = [ mock ]; + + propagatedBuildInputs = [ + django + redis + msgpack + ]; + + meta = with stdenv.lib; { + description = "Full featured redis cache backend for Django"; + homepage = https://github.com/niwibe/django-redis; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82ff3b64cd6..95749833e85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8398,31 +8398,7 @@ in { django-raster = callPackage ../development/python-modules/django-raster { }; - django_redis = buildPythonPackage rec { - name = "django-redis-${version}"; - version = "4.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-redis/${name}.tar.gz"; - sha256 = "9ad6b299458f7e6bfaefa8905f52560017369d82fb8fb0ed4b41adc048dbf11c"; - }; - - doCheck = false; - - buildInputs = [ self.mock ]; - - propagatedBuildInputs = with self; [ - django - redis - msgpack - ]; - - meta = { - description = "Full featured redis cache backend for Django"; - homepage = https://github.com/niwibe/django-redis; - license = licenses.bsd3; - }; - }; + django_redis = callPackage ../development/python-modules/django_redis { }; django_reversion = buildPythonPackage rec { name = "django-reversion-${version}"; From 8d35fa697b0194aaf9bd18b60c69116ac6fa8fbf Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 28 Sep 2017 14:01:19 +0200 Subject: [PATCH 0349/2806] pythonPackages.asgi_redis: 1.4.2 -> 1.4.3 --- pkgs/development/python-modules/asgi_redis/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix index 440f15cbd3a..77a9af8645e 100644 --- a/pkgs/development/python-modules/asgi_redis/default.nix +++ b/pkgs/development/python-modules/asgi_redis/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildPythonPackage, fetchurl, +{ stdenv, buildPythonPackage, fetchPypi, asgiref, asgi_ipc, msgpack, six, redis, cryptography }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.4.3"; pname = "asgi_redis"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; - sha256 = "aa8e9342a3e66c4e7f9035b074f6f66b92e5f1cf8022f1446106ed6dd004a274"; + src = fetchPypi { + inherit pname version; + sha256 = "10xk7k7mcd28nb3v93mc8xa7sa6p02jnbl8idk6scr6p75jaixzi"; }; # Requires a redis server available From 69344de783ee4fcf0d1c36926249818fb54b52dd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 13:22:54 +0200 Subject: [PATCH 0350/2806] Revert "dockerTools.pullImage: release note regarding sha256 argument value" This reverts commit ea6d37c2bba277295e7a70d0a4f5871a99f7c451. --- nixos/doc/manual/release-notes/rl-1709.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index e4fac275d79..6add37e1aef 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -273,15 +273,7 @@ FLUSH PRIVILEGES; - - - sha256 argument value of - dockerTools.pullImage expression must be - updated since the mechanism to download the image has been - changed. Skopeo is now used to pull the image instead of the - Docker daemon. - - + Templated systemd services e.g container@name are From 5c6dc717a66b6555e5757f92376527da7a553fec Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 13:24:56 +0200 Subject: [PATCH 0351/2806] Revert "dockerTools.pullImage: use skopeo to pull the image" This reverts commit 01174c5f4d7df0fd0928fbf8a2a8e633a9cf54aa. See https://github.com/NixOS/nixpkgs/pull/29302#issuecomment-332809092 for more information. This broke image format compatibility and therefore amongst others mesos. --- pkgs/build-support/docker/default.nix | 15 +----------- pkgs/build-support/docker/examples.nix | 2 +- pkgs/build-support/docker/pull.nix | 32 ++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 pkgs/build-support/docker/pull.nix diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 267a2812a2a..68b803f6e3c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -32,20 +32,7 @@ rec { inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb; }; - pullImage = - let - nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; - in - # For simplicity we only support sha256. - { imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}" - , sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }: - runCommand name { - impureEnvVars=pkgs.stdenv.lib.fetchers.proxyImpureEnvVars; - outputHashMode="flat"; - outputHashAlgo="sha256"; - outputHash=sha256; - } - "${pkgs.skopeo}/bin/skopeo copy docker://${imageId} docker-archive://$out:${imageId}"; + pullImage = callPackage ./pull.nix {}; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 498028fb088..02fa9792a06 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -87,7 +87,7 @@ rec { imageName = "nixos/nix"; imageTag = "1.11"; # this hash will need change if the tag is updated at docker hub - sha256 = "18xvcnl0yvj9kfi5bkimrhhjaa8xhm3jhshh2xd7c0sbfrmfqzvi"; + sha256 = "1gk4bq05vl3rj3mh4mlbl4iicgndmimlv8jvkhdk4hrv0r44bwr3"; }; # 5. example of multiple contents, emacs and vi happily coexisting diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix new file mode 100644 index 00000000000..5ccd0a41c5e --- /dev/null +++ b/pkgs/build-support/docker/pull.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, docker, vmTools, utillinux, curl, kmod, dhcp, cacert, e2fsprogs }: +let + nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; +in +# For simplicity we only support sha256. +{ imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}" +, sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }: +let + pullImage = vmTools.runInLinuxVM ( + stdenv.mkDerivation { + inherit name imageId; + + certs = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + builder = ./pull.sh; + + buildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ]; + + outputHashAlgo = "sha256"; + outputHash = sha256; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + + preVM = vmTools.createEmptyImage { + size = 2048; + fullName = "${name}-disk"; + }; + + QEMU_OPTS = "-netdev user,id=net0 -device virtio-net-pci,netdev=net0"; + }); +in + pullImage From 20677fca5975cdbda4410d418fb28a1ec9709fbf Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 13:38:04 +0200 Subject: [PATCH 0352/2806] dockerTools: fix hash to accomodate the pullImage revert --- pkgs/build-support/docker/examples.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 02fa9792a06..b9a33497174 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -87,7 +87,7 @@ rec { imageName = "nixos/nix"; imageTag = "1.11"; # this hash will need change if the tag is updated at docker hub - sha256 = "1gk4bq05vl3rj3mh4mlbl4iicgndmimlv8jvkhdk4hrv0r44bwr3"; + sha256 = "0nncn9pn5miygan51w34c2p9qssi96jgsaqv44dxxdprc8pg0g83"; }; # 5. example of multiple contents, emacs and vi happily coexisting From 4aeb38e5b9610c5e1fccc0d2b0e1382a7a62ce19 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 14:01:05 +0200 Subject: [PATCH 0353/2806] Revert "kubernetes: fix hashes after dockerTools change" This reverts commit 9ba024f6d85cc9adfac9ceb58f3eed231feb2d62. --- nixos/modules/services/cluster/kubernetes/dashboard.nix | 2 +- nixos/modules/services/cluster/kubernetes/dns.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix index 482cbd939cb..75d71fccfda 100644 --- a/nixos/modules/services/cluster/kubernetes/dashboard.nix +++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix @@ -11,7 +11,7 @@ let image = pkgs.dockerTools.pullImage { imageName = name; imageTag = version; - sha256 = "0b5v7xa3s91yi9yfsw2b8wijiprnicbb02f5kqa579h4yndb3gfz"; + sha256 = "1sf54d96nkgic9hir9c6p14gw24ns1k5d5a0r1sg414kjrvic0b4"; }; in { options.services.kubernetes.addons.dashboard = { diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix index d70663fa5d7..226fdadffd1 100644 --- a/nixos/modules/services/cluster/kubernetes/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/dns.nix @@ -8,19 +8,19 @@ let k8s-dns-kube-dns = pkgs.dockerTools.pullImage { imageName = "gcr.io/google_containers/k8s-dns-kube-dns-amd64"; imageTag = version; - sha256 = "0g64jc2076ng28xl4w3w9svf7hc6s9h8rq9mhvvwpfy2p6lgj6gy"; + sha256 = "0q97xfqrigrfjl2a9cxl5in619py0zv44gch09jm8gqjkxl80imp"; }; k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage { imageName = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64"; imageTag = version; - sha256 = "0sdpsbj1vismihy7ass1cn96nwmav6sf3r5h6i4k2dxha0y0jsh5"; + sha256 = "051w5ca4qb88mwva4hbnh9xzlsvv7k1mbk3wz50lmig2mqrqqx6c"; }; k8s-dns-sidecar = pkgs.dockerTools.pullImage { imageName = "gcr.io/google_containers/k8s-dns-sidecar-amd64"; imageTag = version; - sha256 = "01zpi189hpy2z62awl38fap908s8rrhc3v5gb6m90y2pycl4ad6q"; + sha256 = "1z0d129bcm8i2cqq36x5jhnrv9hirj8c6kjrmdav8vgf7py78vsm"; }; cfg = config.services.kubernetes.addons.dns; From 990b5a5388b5ef416a06520f5a1ed66d40ad908d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 14:25:17 +0200 Subject: [PATCH 0354/2806] release.nix: add mesos test back This is working now again --- nixos/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release.nix b/nixos/release.nix index 06f1c73410c..7dc973a627c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -278,6 +278,7 @@ in rec { tests.login = callTest tests/login.nix {}; #tests.logstash = callTest tests/logstash.nix {}; tests.mathics = callTest tests/mathics.nix {}; + tests.mesos = callTest tests/mesos.nix {}; tests.misc = callTest tests/misc.nix {}; tests.mongodb = callTest tests/mongodb.nix {}; tests.mumble = callTest tests/mumble.nix {}; From 2a33aab60de16ac9ff86e89bac6e202c29ad7003 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 28 Sep 2017 16:25:36 +0900 Subject: [PATCH 0355/2806] rpl: init at 1.5.6 A python program that helps replacing string in files. --- pkgs/tools/text/rpl/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/text/rpl/default.nix diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix new file mode 100644 index 00000000000..bdbc9712443 --- /dev/null +++ b/pkgs/tools/text/rpl/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "rpl"; + version = "1.5.7"; + + # Tests not included in pip package. + doCheck = false; + + src = fetchFromGitHub { + owner = "kcoyner"; + repo = "rpl"; + rev = "v${version}"; + sha256 = "1xhpgcmq91ivy9ijfyz5ilg51m7fz8ar2077r7gq246j8gbf8ggr"; + }; + + meta = with stdenv.lib; { + description = "Replace strings in files"; + homepage = "https://github.com/kcoyner/rpl"; + license = licenses.gpl2; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 751aaf73216..ad34fdeffe1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19064,6 +19064,10 @@ with pkgs; retrofe = callPackage ../misc/emulators/retrofe { }; + rpl = callPackage ../tools/text/rpl { + pythonPackages = python3Packages; + }; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; runit = callPackage ../tools/system/runit { }; From 16012ff98a87a3658c3a673914dc295f035a86e0 Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 25 Sep 2017 10:24:03 +1000 Subject: [PATCH 0356/2806] guile-gnome: remove taktoa and amiloradovsky from maintainers and add vyp See discussion in [1]. [1]: https://github.com/NixOS/nixpkgs/pull/29732 --- pkgs/development/guile-modules/guile-gnome/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index aae44e2f6d8..45fdafa9852 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; - maintainers = with maintainers; [ taktoa amiloradovsky ]; + maintainers = with maintainers; [ vyp ]; platforms = with platforms; linux; }; } From 88ef99e2c3f0eece4fa441ff3477af3d19d3d67a Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 25 Sep 2017 10:30:09 +1000 Subject: [PATCH 0357/2806] guile-gnome: code style formatting nitpicks --- .../guile-modules/guile-gnome/default.nix | 53 +++++++------------ 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 45fdafa9852..4711eaeaad9 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,58 +1,41 @@ { fetchurl, stdenv, guile, guile-lib, gwrap , pkgconfig, gconf, glib, gnome_vfs, gtk2 , libglade, libgnome, libgnomecanvas, libgnomeui -, pango, guile-cairo, autoconf, automake, texinfo }: +, pango, guile-cairo, autoconf, automake, texinfo +}: stdenv.mkDerivation rec { - name = "guile-gnome-platform-2.16.4"; + name = "${pname}-${version}"; + pname = "guile-gnome-platform"; + version = "2.16.4"; src = fetchurl { - url = "http://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/${name}.tar.gz"; + url = "http://ftp.gnu.org/pub/gnu/guile-gnome/${pname}/${name}.tar.gz"; sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3"; }; buildInputs = [ - autoconf - automake - texinfo - guile - gwrap - pkgconfig - gconf - glib - gnome_vfs - gtk2 - libglade - libgnome - libgnomecanvas - libgnomeui - pango - guile-cairo + autoconf automake texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2 + libglade libgnome libgnomecanvas libgnomeui pango guile-cairo ] ++ stdenv.lib.optional doCheck guile-lib; - preConfigure = '' - ./autogen.sh - ''; + preConfigure = "./autogen.sh"; # The test suite tries to open an X display, which fails. doCheck = false; meta = with stdenv.lib; { description = "GNOME bindings for GNU Guile"; - - longDescription = - '' GNU guile-gnome brings the power of Scheme to your graphical - application. guile-gnome modules support the entire Gnome library - stack: from Pango to GnomeCanvas, Gtk+ to GStreamer, Glade to - GtkSourceView, you will find in guile-gnome a comprehensive - environment for developing modern applications. - ''; - - homepage = http://www.gnu.org/software/guile-gnome/; - + longDescription = '' + GNU guile-gnome brings the power of Scheme to your graphical application. + guile-gnome modules support the entire Gnome library stack: from Pango to + GnomeCanvas, Gtk+ to GStreamer, Glade to GtkSourceView, you will find in + guile-gnome a comprehensive environment for developing modern + applications. + ''; + homepage = "http://www.gnu.org/software/guile-gnome/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ vyp ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } From f1b7d0a54fd65308ce3daa523c72726aa61d8afe Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 00:46:25 +1000 Subject: [PATCH 0358/2806] guile-gnome: fix build by building gwrap with guile-2.0 Apparently gwrap will not compile with guile-2.2 [1], even though the news for version 1.9.15 says it "allows" Guile 2.2 [2]: > it will _not_ compile using 2.2 Furthermore, it seems like it isn't being developed anymore either [1]: > Also note that g-wrap itself is not being further developed anymore, > it is recommended for new projects to use Guile's dynamic FFI. Also, guile-gnome-2.16.5 is apparently compatible with guile-2.2 [3], but I'm not sure how they built it with guile-2.2 because gwrap 1.9.15 (latest release) apparently doesn't build with guile-2.2. (And certainly when I try to build gwrap 1.9.15 with guile-2.2 it doesn't work. Maybe it can be made to work with certain compile flags, but I haven't pursued that further due to [1] anyway.) This is why guile-gnome is still on 2.16.4 here. Because, although 2.16.5 can still (apparently) build with guile-2.0.14, guile_2_0 is only at guile-2.0.13. So to update guile-gnome to 2.16.5, guile_2_0 would first have to be updated to 2.0.14. [1]: http://lists.nongnu.org/archive/html/g-wrap-dev/2016-08/msg00001.html [2]: http://www.nongnu.org/g-wrap/news.html [3]: https://www.gnu.org/software/guile-gnome/news.html --- pkgs/top-level/all-packages.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ccda31fb5a..b3cffbb4c45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6734,16 +6734,21 @@ with pkgs; jython = callPackage ../development/interpreters/jython {}; - guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; + guile-cairo = callPackage ../development/guile-modules/guile-cairo { + guile = guile_2_0; + }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; guile-gnome = callPackage ../development/guile-modules/guile-gnome { gconf = gnome2.GConf; + guile = guile_2_0; inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; }; - guile-lib = callPackage ../development/guile-modules/guile-lib { }; + guile-lib = callPackage ../development/guile-modules/guile-lib { + guile = guile_2_0; + }; guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { }; @@ -7193,7 +7198,9 @@ with pkgs; guile = guile_1_8; }; - gwrap = callPackage ../development/tools/guile/g-wrap { }; + gwrap = callPackage ../development/tools/guile/g-wrap { + guile = guile_2_0; + }; help2man = callPackage ../development/tools/misc/help2man { inherit (perlPackages) LocaleGettext; From 468626ce866c487d6d7fee35f7355626a14e5a0a Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 00:54:22 +1000 Subject: [PATCH 0359/2806] gwrap: code style nits --- .../tools/guile/g-wrap/default.nix | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index da664093d8a..313e089bf10 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,30 +1,35 @@ -{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile-lib }: +{ fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }: + +let + name = "${pname}-${version}"; + pname = "g-wrap"; + version = "1.9.15"; +in stdenv.mkDerivation { + inherit name; -stdenv.mkDerivation rec { - name = "g-wrap-1.9.15"; src = fetchurl { - url = "mirror://savannah/g-wrap/${name}.tar.gz"; + url = "mirror://savannah/${pname}/${name}.tar.gz"; sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; - # Note: Glib support is optional, but it's quite useful (e.g., it's - # used by Guile-GNOME). + # Note: Glib support is optional, but it's quite useful (e.g., it's used by + # Guile-GNOME). buildInputs = [ guile pkgconfig glib guile-lib ]; propagatedBuildInputs = [ libffi ]; doCheck = true; - meta = { - description = "G-Wrap, a wrapper generator for Guile"; + meta = with stdenv.lib; { + description = "A wrapper generator for Guile"; longDescription = '' - G-Wrap is a tool (and Guile library) for generating function - wrappers for inter-language calls. It currently only supports - generating Guile wrappers for C functions. + G-Wrap is a tool (and Guile library) for generating function wrappers for + inter-language calls. It currently only supports generating Guile + wrappers for C functions. ''; - homepage = http://www.nongnu.org/g-wrap/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.taktoa ]; - platforms = stdenv.lib.platforms.linux; + homepage = "http://www.nongnu.org/g-wrap/"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ taktoa ]; + platforms = platforms.linux; }; } From de9c86f81a6fe121d828b519ab94a2c91c33f564 Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 00:55:23 +1000 Subject: [PATCH 0360/2806] gwrap: switch maintainer from taktoa to vyp --- pkgs/development/tools/guile/g-wrap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 313e089bf10..7839f9e48a2 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { ''; homepage = "http://www.nongnu.org/g-wrap/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ taktoa ]; + maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; }; } From d0638809868c08847d1aae631f486a051ece6158 Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 20:54:42 +1000 Subject: [PATCH 0361/2806] gwrap: set version in mkDerivation --- pkgs/development/tools/guile/g-wrap/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 7839f9e48a2..7c8653a82be 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,11 +1,9 @@ { fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }: -let +stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "g-wrap"; version = "1.9.15"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { url = "mirror://savannah/${pname}/${name}.tar.gz"; From b3dab5b088a75f095198d73a1cd2b3acf2a94a36 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 14:48:19 +0200 Subject: [PATCH 0362/2806] guile-gnome: nitpicks fixed --- pkgs/development/guile-modules/guile-gnome/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 4711eaeaad9..12648cab7dc 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, guile, guile-lib, gwrap , pkgconfig, gconf, glib, gnome_vfs, gtk2 , libglade, libgnome, libgnomecanvas, libgnomeui -, pango, guile-cairo, autoconf, automake, texinfo +, pango, guile-cairo, texinfo }: stdenv.mkDerivation rec { @@ -10,20 +10,20 @@ stdenv.mkDerivation rec { version = "2.16.4"; src = fetchurl { - url = "http://ftp.gnu.org/pub/gnu/guile-gnome/${pname}/${name}.tar.gz"; + url = "mirror://gnu/guile-gnome/${pname}/${name}.tar.gz"; sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3"; }; buildInputs = [ - autoconf automake texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2 + texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2 libglade libgnome libgnomecanvas libgnomeui pango guile-cairo ] ++ stdenv.lib.optional doCheck guile-lib; - preConfigure = "./autogen.sh"; - # The test suite tries to open an X display, which fails. doCheck = false; + GUILE_AUTO_COMPILE = 0; + meta = with stdenv.lib; { description = "GNOME bindings for GNU Guile"; longDescription = '' From 6dd6f10615a6a104b019faeb2e7ad9a21f3ce8ab Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 13:20:41 +0200 Subject: [PATCH 0363/2806] libbson: 1.6.1 -> 1.8.0 for CVE-2017-14227 --- pkgs/development/libraries/libbson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 31a1b8b4bf5..28a6aee67c1 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libbson-${version}"; - version = "1.6.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "libbson"; rev = version; - sha256 = "1ilxbv4yjgf0vfzaa8lzn40hv5x1737ny2g2q1wmm8bl39m0viiw"; + sha256 = "1bd9z07q3faq5k4521d9inv0j836w6hrsd0vj2sapjlq8jmqgslg"; }; nativeBuildInputs = [ cmake ]; From cc258a671a4b3f4b15d90acef5cf2e3934c739c1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 13:20:56 +0200 Subject: [PATCH 0364/2806] mongoc: 1.7.0 -> 1.8.0 --- pkgs/development/libraries/mongoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 67d2bdf1559..0f481e4150c 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mongoc-${version}"; - version = "1.7.0"; + version = "1.8.0"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; - sha256 = "1s0j7wmgdkgawzd75psh5ml35lkx68h6pimqrnfp2z1ggzcwajgn"; + sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; }; propagatedBuildInputs = [ libbson ]; From 8a5b8aeaf5411a007d6dba9e335c6da74d9685e1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 13:28:50 +0200 Subject: [PATCH 0365/2806] libtiff: use patches from newer debian revision --- pkgs/development/libraries/libtiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index b64a578f0cc..f43db801f24 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { prePatch =let debian = fetchurl { - url = http://snapshot.debian.org/archive/debian-debug/20170602T031313Z/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz; - sha256 = "1ssjh6vn9rvl2jwm34i3p89g8lj0c7fj3cziva9rj4vasfps58ng"; + url = http://snapshot.debian.org/archive/debian-debug/20170928T093547Z/pool/main/t/tiff/tiff_4.0.8-5.debian.tar.xz; + sha256 = "11qkiliw04dmdvdd5z2lv5hh2fiwa29qbhkxvlvmb4yslnmyywha"; }; in '' tar xf '${debian}' From 15a6c2c4fcd7b7dd56e877bbd5b4e49b8243da95 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 13:37:14 +0200 Subject: [PATCH 0366/2806] samba: 4.6.7 -> 4.6.8 for multiple CVEs Fixes CVE-2017-12150, CVE-2017-12151, CVE-2017-12163. --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 1e1cc369136..8adb90496c3 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -19,11 +19,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.6.7"; + version = "4.6.8"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "1ynxndfk45zkkylz3jsrx42a7kmm42jddk5bdhihyf88vs9l7wly"; + sha256 = "0pap686cl0j5c9v1v09krpqdk416x3851fbcap5ysp1zajrfw7aq"; }; outputs = [ "out" "dev" "man" ]; From c02c47d1ebb772e31528bab14fb034c866b71001 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 13:40:23 +0200 Subject: [PATCH 0367/2806] samba3: mark as vulnerable --- pkgs/servers/samba/3.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix index 858f60b3885..91b1c8f95c1 100644 --- a/pkgs/servers/samba/3.x.nix +++ b/pkgs/servers/samba/3.x.nix @@ -91,5 +91,8 @@ stdenv.mkDerivation rec { homepage = http://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; platforms = stdenv.lib.platforms.linux; + knownVulnerabilities = [ + "Numerous CVEs and no patches from upstream for 3.x since 2014." + ]; }; } From 41b43b201e23f5f1f2ac943d04b896de7ab860a9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 13:53:18 +0200 Subject: [PATCH 0368/2806] oniguruma: 5.9.5 -> 6.6.1 for multiple CVEs Fixes CVE-2017-9224, CVE-2017-9225, CVE-2017-9226, CVE-2017-9227, CVE-2017-9228, CVE-2017-9229. --- .../development/libraries/oniguruma/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 62b0080fce0..eccfccbaf04 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "onig-5.9.5"; + name = "onig-${version}"; + version = "6.6.1"; - src = fetchurl { - url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.5.tar.gz; - sha256 = "12j3fsdb8hbhnj29hysal9l7i7s71l0ln3lx8hjpxx5535wawjcz"; + src = fetchFromGitHub { + owner = "kkos"; + repo = "oniguruma"; + rev = "v${version}"; + sha256 = "062g5443dyxsraq346panfqvbd6wal6nmb336n4dw1rszx576sxz"; }; + nativeBuildInputs = [ cmake ]; + meta = { - homepage = http://www.geocities.jp/kosako3/oniguruma/; + homepage = https://github.com/kkos/oniguruma; description = "Regular expressions library"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; From c7e16f5ce58ae660c966810b9f54a677a1dc885c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 13:57:21 +0200 Subject: [PATCH 0369/2806] libraw: 0.18.2 -> 0.18.5 for multiple CVEs Fixes at least CVE-2017-13735, CVE-2017-14265, CVE-2017-14348. --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 351f839553b..0b88cd02df7 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.18.2"; + version = "0.18.5"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "1imby9x88pjx4ad1frdi3bfb8dw90ccyj5pb6w3i6i0iijrnndnf"; + sha256 = "0y519nlvl4bfnnxbwry35f6gbcv6jbbpd2lmiwv6pbyzv4a7saps"; }; outputs = [ "out" "lib" "dev" "doc" ]; From 58f15c1f957cec199f3ad4e1152d7f28d66a445c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 14:00:55 +0200 Subject: [PATCH 0370/2806] unrar: 5.5.5 -> 5.5.7 for multiple CVEs Fixes CVE-2012-6706, CVE-2017-12940, CVE-2017-12941, CVE-2017-12942. --- pkgs/tools/archivers/unrar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index a1454229a1c..563b21c76d8 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unrar-${version}"; - version = "5.5.5"; + version = "5.5.7"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "1vv1s1pa0pf1r0h7dw89ha9y68x7hdm82csnkh6ms0igrcwkhmd4"; + sha256 = "13rd69ss6jqsa6yxr8kmgs84kb67k822d2mbiz29m75zj46hmvwa"; }; postPatch = '' From d27ebcbae36da69d86e1d120dac02bb074f5f531 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 14:07:16 +0200 Subject: [PATCH 0371/2806] php70: 7.0.22 -> 7.0.24 --- 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 ed018a94227..d6cbceca854 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -330,8 +330,8 @@ in { }; php70 = generic { - version = "7.0.22"; - sha256 = "1ppxdlyb9vapcmzylml447vrlizam72h1w41vvn15pdbd5zv5q48"; + version = "7.0.24"; + sha256 = "06fgpljz6xpxxkpf4cv9rqz8g504l9ikbw5aq0hqh5sgd611kycv"; }; php71 = generic { From 09b6f1e60555ce44b72ab74fc13d77bdb8a9deb8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 14:07:31 +0200 Subject: [PATCH 0372/2806] php71: 7.1.8 -> 7.1.9 --- 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 d6cbceca854..e1704a2ec48 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -335,7 +335,7 @@ in { }; php71 = generic { - version = "7.1.8"; - sha256 = "1y527hs9yh9lmr38q3rf7gkhnvk49vh4nyhci6852mjhjh5a0r3h"; + version = "7.1.9"; + sha256 = "1blvzm2js8mrdbmwks0v6nlb5wj4789ixzmlxm1l8z6xvw8cqk9i"; }; } From 8678f14ac97fa7488b866f0b4de6202b3ed86b02 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 14:16:21 +0200 Subject: [PATCH 0373/2806] kerberos: 1.15 -> 1.15.2 for CVE-2017-11462 --- pkgs/development/libraries/kerberos/krb5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 6f96ce67e27..1e64a4d6600 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; majorVersion = "1.15"; - version = "${majorVersion}"; + version = "${majorVersion}.2"; src = fetchurl { url = "${meta.homepage}dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; - sha256 = "0z0jxm6ppbxi9anv2h12nrb5lpwl95f96kw6dx7sn268fhkpad7x"; + sha256 = "0zn8s7anb10hw3nzwjz7vg10fgmmgvwnibn2zrn3nppjxn9f6f8n"; }; configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] From 232340f35bca6e4a9a125048717a022415218f55 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 14:49:57 +0200 Subject: [PATCH 0374/2806] pyjwt: 1.4.2 -> 1.5.3 for CVE-2017-11424 --- pkgs/top-level/python-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27d41c059ad..9f817f22637 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17113,12 +17113,14 @@ in { }; pyjwt = buildPythonPackage rec { - version = "1.4.2"; + version = "1.5.3"; name = "pyjwt-${version}"; - src = pkgs.fetchurl { - url = "http://github.com/progrium/pyjwt/archive/${version}.tar.gz"; - sha256 = "06vg84aicwkv0kli8i4jhg0kc6298cmh38ib058q01yxzk6q17gn"; + src = pkgs.fetchFromGitHub { + owner = "progrium"; + repo = "pyjwt"; + rev = version; + sha256 = "109zb3ka2lvp00r9nawa0lmljfikvhcj5yny19kcipz8mqia1gs8"; }; buildInputs = with self; [ pytestrunner pytestcov pytest coverage ]; From bc5ec7b1d4e224c00d2987b6fab4dd667e1109ac Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 15:11:24 +0200 Subject: [PATCH 0375/2806] mongoc: don't use bundled zlib & snappy --- pkgs/development/libraries/mongoc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 0f481e4150c..4cba89d9206 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, perl, pkgconfig, libbson -, openssl, which +, openssl, which, zlib, snappy }: stdenv.mkDerivation rec { @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; }; + nativeBuildInputs = [ pkgconfig which perl ]; + buildInputs = [ openssl zlib snappy ]; propagatedBuildInputs = [ libbson ]; - buildInputs = [ openssl perl pkgconfig which ]; meta = with stdenv.lib; { description = "The official C client library for MongoDB"; From 09fa3859954bb1861f4d32dc06c51aa9af4099b6 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sat, 23 Sep 2017 16:39:04 +0100 Subject: [PATCH 0376/2806] flake8-future-import: Add patch to fix tests. --- .../flake8-future-import/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index f00c1fe2166..2ece8ba85ab 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six }: +{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six, + fetchurl }: buildPythonPackage rec { pname = "flake8-future-import"; @@ -11,6 +12,17 @@ buildPythonPackage rec { rev = version; sha256 = "0622bdcfa588m7g8igag6hf4rhjdwh74yfnrjwlxw4vlqhg344k4"; }; + + patches = [ + # Tests in 0.4.3 are broken. We can remove this patch after + # the next release. + (fetchurl { + url = "https://github.com/xZise/flake8-future-import/commit/b4f5a06b22c574fb5270574d1420715667768d5c.patch"; + sha256 = "06n9ggz9p9kiwjb3vmaj44pm5vi4nhgzjfn7i730m85xn67xzmyn"; + }) + ]; + + propagatedBuildInputs = [ flake8 six ]; meta = { homepage = https://github.com/xZise/flake8-future-import; From b831b243ff8a915834e255dc70f1a83d3acada28 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 26 Aug 2017 07:01:30 +0000 Subject: [PATCH 0377/2806] clp: init at 1.16.11 --- .../applications/science/math/clp/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/science/math/clp/default.nix diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix new file mode 100644 index 00000000000..daa9a53c59a --- /dev/null +++ b/pkgs/applications/science/math/clp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + version = "1.16.11"; + name = "clp-${version}"; + src = fetchurl { + url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; + sha256 = "0fazlqpp845186nmixa9f1xfxqqkdr1xj4va7q29m8594ca4a9dm"; + }; + + propagatedBuildInputs = [ zlib ]; + + doCheck = true; + + checkTarget = "test"; + + meta = { + license = stdenv.lib.licenses.epl10; + homepage = https://projects.coin-or.org/Clp; + description = "An open-source linear programming solver written in C++"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b649d924f1..24ee69745e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13830,6 +13830,8 @@ with pkgs; cloud-print-connector = callPackage ../servers/cloud-print-connector { }; + clp = callPackage ../applications/science/math/clp { }; + cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { From 3ec05d6237a9c6303bc83ba7712eaeebb2c21766 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 28 Sep 2017 02:43:40 +0200 Subject: [PATCH 0378/2806] tor-browser-bundle: feature parity with the binary bundle This will be factored later (eventually both will be subsumed by a more generic construct). Don't bother with pulseaudio support, however. --- .../browsers/tor-browser-bundle/default.nix | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 16182c8e4e7..6b582c756a3 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -14,6 +14,19 @@ , noto-fonts , noto-fonts-emoji +# Audio support +, audioSupport ? mediaSupport +, apulse + +# Media support (implies audio support) +, mediaSupport ? false +, gstreamer +, gst-plugins-base +, gst-plugins-good +, gst-ffmpeg +, gmp +, ffmpeg + # Extensions, common , zip @@ -57,6 +70,21 @@ let }; fontsDir = "${fontsEnv}/share/fonts"; + + gstPluginsPath = lib.concatMapStringsSep ":" (x: + "${x}/lib/gstreamer-0.10") [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-ffmpeg + ]; + + gstLibPath = lib.makeLibraryPath [ + gstreamer + gst-plugins-base + gmp + ffmpeg + ]; in stdenv.mkDerivation rec { name = "tor-browser-bundle-${version}"; @@ -109,6 +137,13 @@ stdenv.mkDerivation rec { lockPref("extensions.torlauncher.control_port_use_ipc", true); lockPref("extensions.torlauncher.socks_port_use_ipc", true); + // Allow sandbox access to sound devices if using ALSA directly + ${if audioSupport then '' + pref("security.sandbox.content.write_path_whitelist", "/dev/snd/"); + '' else '' + clearPref("security.sandbox.content.write_path_whitelist"); + ''} + // User customization ${extraPrefs} EOF @@ -141,6 +176,15 @@ stdenv.mkDerivation rec { shared_mime_info ]} + ${lib.optionalString audioSupport '' + # apulse uses a non-standard library path ... + wrapper_LD_LIBRARY_PATH=${apulse}/lib/apulse''${wrapper_LD_LIBRARY_PATH:+:$wrapper_LD_LIBRARY_PATH} + ''} + + ${lib.optionalString mediaSupport '' + wrapper_LD_LIBRARY_PATH=${gstLibPath}''${wrapper_LD_LIBRARY_PATH:+:$wrapper_LD_LIBRARY_PATH} + ''} + mkdir -p $out/bin cat >$out/bin/tor-browser < Date: Thu, 28 Sep 2017 02:37:13 +0200 Subject: [PATCH 0379/2806] tor-browser-bundle: minor refactorings --- .../browsers/tor-browser-bundle/default.nix | 49 ++++++++++--------- .../tor-browser-bundle/extensions.nix | 13 +---- 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 6b582c756a3..0e9610247c8 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -1,7 +1,6 @@ { stdenv -, lib -, fetchurl , fetchgit +, fetchurl , symlinkJoin , tor @@ -42,6 +41,8 @@ , extraExtensions ? [ ] }: +with stdenv.lib; + let tor-browser-build_src = fetchgit { url = "https://git.torproject.org/builders/tor-browser-build.git"; @@ -54,15 +55,12 @@ let git libxml2 python27 python27Packages rsync; }; - extensionsEnv = symlinkJoin { - name = "tor-browser-extensions"; - paths = with firefoxExtensions; [ - https-everywhere - noscript - torbutton - tor-launcher - ] ++ extraExtensions; - }; + bundledExtensions = with firefoxExtensions; [ + https-everywhere + noscript + torbutton + tor-launcher + ] ++ extraExtensions; fontsEnv = symlinkJoin { name = "tor-browser-fonts"; @@ -71,7 +69,7 @@ let fontsDir = "${fontsEnv}/share/fonts"; - gstPluginsPath = lib.concatMapStringsSep ":" (x: + gstPluginsPath = concatMapStringsSep ":" (x: "${x}/lib/gstreamer-0.10") [ gstreamer gst-plugins-base @@ -79,7 +77,7 @@ let gst-ffmpeg ]; - gstLibPath = lib.makeLibraryPath [ + gstLibPath = makeLibraryPath [ gstreamer gst-plugins-base gmp @@ -96,6 +94,11 @@ stdenv.mkDerivation rec { buildPhase = ":"; + # The following creates a customized firefox distribution. For + # simplicity, we copy the entire base firefox runtime, to work around + # firefox's annoying insistence on resolving the installation directory + # relative to the real firefox executable. A little tacky and + # inefficient but it works. installPhase = '' TBBUILD=${tor-browser-build_src}/projects/tor-browser TBDATA_PATH=TorBrowser-Data @@ -123,6 +126,7 @@ stdenv.mkDerivation rec { lockPref("app.update.enabled", false); lockPref("extensions.update.autoUpdateDefault", false); lockPref("extensions.update.enabled", false); + lockPref("extensions.torbutton.updateNeeded", false); lockPref("extensions.torbutton.versioncheck_enabled", false); // Where to find the Nixpkgs tor executable & config @@ -149,8 +153,7 @@ stdenv.mkDerivation rec { EOF # Preload extensions - # XXX: the fact that ln -s env browser/extensions fails, symlinkJoin seems a little redundant ... - ln -s -t browser/extensions ${extensionsEnv}"/"* + find ${toString bundledExtensions} -name '*.xpi' -exec ln -s -t browser/extensions '{}' '+' # Copy bundle data bundlePlatform=linux @@ -170,18 +173,18 @@ stdenv.mkDerivation rec { > $TBDATA_PATH/fonts.conf # Generate a suitable wrapper - wrapper_PATH=${lib.makeBinPath [ coreutils ]} - wrapper_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ + wrapper_PATH=${makeBinPath [ coreutils ]} + wrapper_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ hicolor_icon_theme shared_mime_info ]} - ${lib.optionalString audioSupport '' + ${optionalString audioSupport '' # apulse uses a non-standard library path ... wrapper_LD_LIBRARY_PATH=${apulse}/lib/apulse''${wrapper_LD_LIBRARY_PATH:+:$wrapper_LD_LIBRARY_PATH} ''} - ${lib.optionalString mediaSupport '' + ${optionalString mediaSupport '' wrapper_LD_LIBRARY_PATH=${gstLibPath}''${wrapper_LD_LIBRARY_PATH:+:$wrapper_LD_LIBRARY_PATH} ''} @@ -189,10 +192,12 @@ stdenv.mkDerivation rec { cat >$out/bin/tor-browser </dev/null ''; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index 4adf99365ba..88ec2ad9509 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -24,6 +24,7 @@ url = "https://git.torproject.org/https-everywhere.git"; rev = "refs/tags/${version}"; sha256 = "0z9madihh4b4z4blvfmh6w1hsv8afyi0x7b243nciq9r4w55xgfa"; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -35,10 +36,6 @@ zip ]; - unpackPhase = '' - cp -dR --no-preserve=mode "$src" src && cd src - ''; - buildPhase = '' $shell ./makexpi.sh ${version} --no-recurse ''; @@ -80,10 +77,6 @@ nativeBuildInputs = [ zip ]; - unpackPhase = '' - cp -dR --no-preserve=mode "$src" src && cd src - ''; - buildPhase = '' $shell ./makexpi.sh ''; @@ -107,10 +100,6 @@ nativeBuildInputs = [ zip ]; - unpackPhase = '' - cp -dR --no-preserve=mode "$src" src && cd src - ''; - buildPhase = '' make package ''; From c6761f857863b6c42c48eb535099e169d8f71a31 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 24 Sep 2017 20:42:44 +0200 Subject: [PATCH 0380/2806] security.pam.usb: link to wiki on github.com pamusb.org no longer serves the intended content. --- nixos/modules/security/pam_usb.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix index 6f811dab8d7..9bc73bf0b85 100644 --- a/nixos/modules/security/pam_usb.nix +++ b/nixos/modules/security/pam_usb.nix @@ -22,7 +22,7 @@ in description = '' Enable USB login for all login systems that support it. For more information, visit . + xlink:href="https://github.com/aluzzardi/pam_usb/wiki/Getting-Started#setting-up-devices-and-users" />. ''; }; From a19c52a101f661b85076d646b0ebd8322e15382f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 16:30:08 +0200 Subject: [PATCH 0381/2806] 17.09 release notes: reformat and generate added services --- nixos/doc/manual/release-notes/rl-1709.xml | 110 ++++++++++++++++++++- 1 file changed, 106 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 6add37e1aef..cdfecc2bb75 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -6,6 +6,14 @@ Release 17.09 (“Hummingbird”, 2017/09/??) +
+ +Highlights + In addition to numerous new and upgraded packages, this release has the following highlights: @@ -74,14 +82,100 @@ has the following highlights: +
+
+ +New Services + The following new services were added since the last release: - - - + config/fonts/fontconfig-penultimate.nix + config/fonts/fontconfig-ultimate.nix + config/terminfo.nix + hardware/sensor/iio.nix + hardware/nitrokey.nix + hardware/raid/hpsa.nix + programs/browserpass.nix + programs/gnupg.nix + programs/qt5ct.nix + programs/slock.nix + programs/thefuck.nix + security/auditd.nix + security/lock-kernel-modules.nix + service-managers/docker.nix + service-managers/trivial.nix + services/admin/salt/master.nix + services/admin/salt/minion.nix + services/audio/slimserver.nix + services/cluster/kubernetes/default.nix + services/cluster/kubernetes/dns.nix + services/cluster/kubernetes/dashboard.nix + services/continuous-integration/hail.nix + services/databases/clickhouse.nix + services/databases/postage.nix + services/desktops/gnome3/gnome-disks.nix + services/desktops/gnome3/gpaste.nix + services/logging/SystemdJournal2Gelf.nix + services/logging/heartbeat.nix + services/logging/journalwatch.nix + services/logging/syslogd.nix + services/mail/mailhog.nix + services/mail/nullmailer.nix + services/misc/airsonic.nix + services/misc/autorandr.nix + services/misc/exhibitor.nix + services/misc/fstrim.nix + services/misc/gollum.nix + services/misc/irkerd.nix + services/misc/jackett.nix + services/misc/radarr.nix + services/misc/snapper.nix + services/monitoring/osquery.nix + services/monitoring/prometheus/collectd-exporter.nix + services/monitoring/prometheus/fritzbox-exporter.nix + services/network-filesystems/kbfs.nix + services/networking/dnscache.nix + services/networking/fireqos.nix + services/networking/iwd.nix + services/networking/keepalived/default.nix + services/networking/keybase.nix + services/networking/lldpd.nix + services/networking/matterbridge.nix + services/networking/squid.nix + services/networking/tinydns.nix + services/networking/xrdp.nix + services/security/shibboleth-sp.nix + services/security/sks.nix + services/security/sshguard.nix + services/security/torify.nix + services/security/usbguard.nix + services/security/vault.nix + services/system/earlyoom.nix + services/system/saslauthd.nix + services/web-apps/nexus.nix + services/web-apps/pgpkeyserver-lite.nix + services/web-apps/piwik.nix + services/web-servers/lighttpd/collectd.nix + services/web-servers/minio.nix + services/x11/display-managers/xpra.nix + services/x11/xautolock.nix + tasks/filesystems/bcachefs.nix + tasks/powertop.nix +
+
+ +Backward Incompatibilities When upgrading from a previous release, please be aware of the following incompatible changes: @@ -336,7 +430,14 @@ FLUSH PRIVILEGES; -Other notable improvements: +
+
+ +Other Notable Changes @@ -444,3 +545,4 @@ FLUSH PRIVILEGES;
+ From 4ca4d6afca23ef46ae4060c4602485f2a16b10dd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 16:35:55 +0200 Subject: [PATCH 0382/2806] 18.03 release notes: reformat --- nixos/doc/manual/release-notes/rl-1803.xml | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 7acc689ed11..830e7cdd269 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -6,6 +6,14 @@ Release 18.03 (“Impala”, 2018/03/??) +
+ +Highlights + In addition to numerous new and upgraded packages, this release has the following highlights: @@ -16,6 +24,15 @@ has the following highlights: +
+
+ +New Services + The following new services were added since the last release: @@ -24,6 +41,15 @@ has the following highlights: +
+
+ +Backward Incompatibilities + When upgrading from a previous release, please be aware of the following incompatible changes: @@ -33,7 +59,14 @@ following incompatible changes: -Other notable improvements: +
+
+ +Other Notable Changes @@ -43,3 +76,4 @@ following incompatible changes:
+ From 6c283ae8f3847a86d8aecbd85e325237c7029970 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 15:34:30 +0200 Subject: [PATCH 0383/2806] mpg123: 1.25.4 -> 1.25.7 for multiple CVEs Fixes at least CVE-2017-10683, CVE-2017-11126, CVE-2017-9545, CVE-2017-12797. --- pkgs/applications/audio/mpg123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 37717babce4..1e0b46826cf 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.25.4"; + name = "mpg123-1.25.7"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd"; + sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; From 14e53aa0b18ca8e875defe3b34fadba772b2d7d7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 15:53:21 +0200 Subject: [PATCH 0384/2806] postfix: 3.1.3 -> 3.2.3 Possibly fixes security issues. No CVE yet. --- 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 f3266046cb9..1bb9d83375a 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.1.3"; + version = "3.2.3"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "0ya9h7ynhq8h7zgq0qkvfwx5rsam7i3vkbyh6rx63qlpcxz15y2j"; + sha256 = "1gs025smgynrlsg44cypjam99ds92mc9q46l5085d9sy0xfrf2sv"; }; buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ] From d2b6e9cdb05a68d5e7ebf04abe7748e2e0252a7f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 15:54:55 +0200 Subject: [PATCH 0385/2806] augeas: 1.8.0 -> 1.8.1 for CVE-2017-7555 --- pkgs/tools/system/augeas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index e3f74376614..fb1806b850e 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "augeas-${version}"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "http://download.augeas.net/${name}.tar.gz"; - sha256 = "1iac5lwi1q10r343ii9v5p2fdplvh06yv9svsi8zz6cd2c2fjp2i"; + sha256 = "1yf93fqwav1zsl8dpyfkf0g11w05mmfckqy6qsjy5zkklnspbkv5"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libxml2 ]; From faed026cd4e0532cb19b1d9d83e84fc9052b396e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 15:59:40 +0200 Subject: [PATCH 0386/2806] fossil: 2.2 -> 2.3 Fixes XSS vulnerability on the /help webpage. No CVE known. --- pkgs/applications/version-management/fossil/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index cefdc1108bf..80c4401f170 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -2,15 +2,16 @@ , tcllib, withJson ? true}: stdenv.mkDerivation rec { - name = "fossil-2.2"; + name = "fossil-${version}"; + version = "2.3"; src = fetchurl { - urls = + urls = [ - https://www.fossil-scm.org/index.html/uv/fossil-src-2.2.tar.gz + "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${name}.tar.gz"; - sha256 = "0wfgacfg29dkl0c3l1rp5ji0kraa64gcbg5lh8p4m7mqdqcq53wv"; + sha256 = "0paalvb4rdyr79v6rwspaha5n4dqb92df9irijha13m3apsanwzh"; }; buildInputs = [ zlib openssl readline sqlite which ed ] From b29051b2f5c5493f56c4cae9f21b2014328c5a56 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 16:17:13 +0200 Subject: [PATCH 0387/2806] ettercap: fix CVE-2017-8366 & CVE-2017-6430 --- .../networking/sniffers/ettercap/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index cc8e5dc4de0..13d536ccf1b 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre, - openssl, ncurses, glib, gtk2, atk, pango, flex, bison }: +{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre +, openssl, ncurses, glib, gtk2, atk, pango, flex, bison +, fetchpatch }: stdenv.mkDerivation rec { name = "ettercap-${version}"; @@ -12,6 +13,19 @@ stdenv.mkDerivation rec { sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-8366.patch"; + url = "https://github.com/Ettercap/ettercap/commit/1083d604930ebb9f350126b83802ecd2cbc17f90.patch"; + sha256 = "1ff6fp8fxisvd3fkkd01y4fjykgcj414kczzpfscdmi52ridwg8m"; + }) + (fetchpatch { + name = "CVE-2017-6430.patch"; + url = "https://github.com/Ettercap/ettercap/commit/7f50c57b2101fe75592c8dc9960883bbd1878bce.patch"; + sha256 = "0s13nc9yzxzp611rixsd1c8aw1b57q2lnvfq8wawxyrw07h7b2j4"; + }) + ]; + buildInputs = [ cmake libpcap libnet zlib curl pcre openssl ncurses glib gtk2 atk pango flex bison From 536ab403d49f467b2290ede4bda40f5687afb20c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 16:17:58 +0200 Subject: [PATCH 0388/2806] qemu: 2.9.0 -> 2.9.1 Security and bugfix release. --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 5da9db91855..7b78db64fe6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -18,7 +18,7 @@ with stdenv.lib; let - version = "2.9.0"; + version = "2.9.1"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "053c7ivp3li7cdagzkp2wdc5myybzjf826r6qfkcf0xvn4bv5gq0"; + sha256 = "1340hh4jvhvi97yqck408wi8aagnhzq1311ih0fq9bp4ddlk03sd"; }; buildInputs = From ee6b48cc1ff06eedf9a16b87ca592581f8735b60 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 28 Sep 2017 17:07:43 +0200 Subject: [PATCH 0389/2806] spotify: 1.0.49.125.g72ee7853-111 -> 1.0.64.401.g9d720389-21 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index ad0f7ee14c5..10637fde8c7 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.49.125.g72ee7853-111"; + version = "1.0.64.401.g9d720389-21"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x"; + sha256 = "026khnz7n66mj94yr33690pmjm3pz1nsy38xggsyr5gldf1chsfc"; }; buildInputs = [ dpkg makeWrapper ]; From dfdfb97f0fc1e4fe1dfd7c944597e93483f4cda9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 28 Sep 2017 16:58:45 +0200 Subject: [PATCH 0390/2806] nixos/tests/gnome3-gdm: Increase memory limit The test was failing on x86_64 prematurely due to memory being exhausted. See also 3b9f0c6a469a574c1c030e4c23f6c766819cbd2d --- nixos/tests/gnome3-gdm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix index 2c9c745021a..4b459e93e1b 100644 --- a/nixos/tests/gnome3-gdm.nix +++ b/nixos/tests/gnome3-gdm.nix @@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; services.xserver.desktopManager.gnome3.enable = true; - virtualisation.memorySize = 512; + virtualisation.memorySize = 1024; }; testScript = From 9aae605fe78cd6cf7d5e33e4adfa11509508ab19 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 28 Sep 2017 15:11:42 +0000 Subject: [PATCH 0391/2806] fakenes: mark as broken --- pkgs/misc/emulators/fakenes/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index 6e9253b299e..4d698563469 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, allegro, openal, mesa, zlib, hawknl, freeglut, libX11, libXxf86vm, libXcursor, libXpm }: -stdenv.mkDerivation { +stdenv.mkDerivation { name = "fakenes-0.5.9b3"; src = fetchurl { url = mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp fakenes $out/bin ''; - NIX_LDFLAGS = "-lX11 -lXxf86vm -lXcursor -lXpm"; + NIX_LDFLAGS = "-lX11 -lXxf86vm -lXcursor -lXpm"; patches = [ ./build.patch ]; @@ -27,5 +27,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; platforms = stdenv.lib.platforms.linux; + broken = true; }; } From 8fb9d37f27c26116d6fb61dda14b2c43db8c3f4e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 17:20:48 +0200 Subject: [PATCH 0392/2806] amtterm: fix build --- pkgs/tools/system/amtterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix index a4c29cd6a29..a31fdd08c60 100644 --- a/pkgs/tools/system/amtterm/default.nix +++ b/pkgs/tools/system/amtterm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "amtterm-${version}"; version = "1.6-1"; - + buildInputs = with perlPackages; [ perl SOAPLite ]; nativeBuildInputs = [ makeWrapper ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1jxcsqkag2bxmrnr4m6g88sln1j2d9liqlna57fj8kkc85316vlc"; }; - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ "prefix=$(out)" "STRIP=" ]; postInstall = "wrapProgram $out/bin/amttool --prefix PERL5LIB : $PERL5LIB"; From 6c72efe0bae7b183d0b73edf4bb7f00c94fc8837 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 28 Sep 2017 17:32:31 +0200 Subject: [PATCH 0393/2806] Don't generate instance-store AMIs These are obsolete, use EBS AMIs instead. --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 24ced8da531..dfc0f8d1146 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -17,7 +17,7 @@ mkdir -p $stateDir rm -f ec2-amis.nix types="hvm" -stores="ebs s3" +stores="ebs" regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" for type in $types; do From f8ffbcb520de8690e7b165d6b768c4d805b8d71d Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Thu, 28 Sep 2017 13:22:46 +0200 Subject: [PATCH 0394/2806] nodejs: 8.5.0 -> 8.6.0 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 244c236cd18..013cab8f57b 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.5.0"; + version = "8.6.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "0g2wyy9zdjzm9c0vbjn8bn49s1b2c7r2iwdfc4dpx7h4wpcfbkg1"; + sha256 = "14vy9xnyfz44j460hkrx423g7acpzzyqlxiv6sgmna9qj8872w5i"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; From 8e38de4e0c7061786da9b9564aa4cca6022ecc97 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 18:06:57 +0200 Subject: [PATCH 0395/2806] firebirdSuper: pin to gcc5 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b649d924f1..4324cc0092f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11390,7 +11390,7 @@ with pkgs; fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; - firebirdSuper = callPackage ../servers/firebird { superServer = true; }; + firebirdSuper = callPackage ../servers/firebird { superServer = true; stdenv = overrideCC stdenv gcc5; }; fleet = callPackage ../servers/fleet { }; From f1562a4c04feb7c5afe660faafe7b657fc97e5ff Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 Sep 2017 20:09:56 -0400 Subject: [PATCH 0396/2806] libnotify: gobject-introspection should be a buid-time dep --- pkgs/development/libraries/libnotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 41a9cf518e4..fbde49a54d0 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { # disable tests as we don't need to depend on gtk+(2/3) configureFlags = [ "--disable-tests" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ glib gdk_pixbuf gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig autoreconfHook gobjectIntrospection ]; + buildInputs = [ glib gdk_pixbuf ]; meta = { homepage = https://developer.gnome.org/notification-spec/; From 20ba83a19625a2d1e899bc20b24308a1110b63b3 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Thu, 21 Sep 2017 23:23:17 -0400 Subject: [PATCH 0397/2806] audiofile: move alsaLib from nativeBuildInputs to buildInputs --- pkgs/development/libraries/audiofile/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 78867881dc3..a7576e07f2d 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -3,10 +3,12 @@ stdenv.mkDerivation rec { name = "audiofile-0.3.6"; - nativeBuildInputs = stdenv.lib.optional stdenv.isLinux alsaLib; - - buildInputs = (stdenv.lib.optional stdenv.isDarwin CoreServices) ++ - (stdenv.lib.optional stdenv.isDarwin AudioUnit); + buildInputs = + stdenv.lib.optionals stdenv.isLinux [ + alsaLib + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + CoreServices AudioUnit + ]; src = fetchurl { url = "http://audiofile.68k.org/${name}.tar.gz"; From c955c86fd934862c82d44dc06af91def87d6566e Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Thu, 21 Sep 2017 23:23:52 -0400 Subject: [PATCH 0398/2806] geoclue-2.0: move pkgconfig from buildInputs to nativeBuildInputs --- pkgs/development/libraries/geoclue/2.0.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 8cc06f9269e..34da3c1f372 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -12,8 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd"; }; + nativeBuildInputs = [ + pkgconfig + ]; + buildInputs = libintlOrEmpty ++ - [ intltool pkgconfig glib json_glib libsoup geoip + [ intltool glib json_glib libsoup geoip dbus dbus_glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; From f08d6f0e2daf9f3d9daa070eee223855b33c430d Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Thu, 21 Sep 2017 23:26:33 -0400 Subject: [PATCH 0399/2806] webkitgtk-2.16: move sqlite from nativeBuildInputs to buildInputs --- pkgs/development/libraries/webkitgtk/2.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix index 7d7424d914d..47b29eb001f 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -83,14 +83,14 @@ stdenv.mkDerivation rec { + (optionalString stdenv.isDarwin " -lintl"); nativeBuildInputs = [ - cmake perl python2 ruby bison gperf sqlite + cmake perl python2 ruby bison gperf pkgconfig gettext gobjectIntrospection ]; buildInputs = libintlOrEmpty ++ [ gtk2 libwebp enchant libnotify gnutls pcre nettle libidn libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - gst-plugins-base libxkbcommon epoxy at_spi2_core + sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core ] ++ optional enableGeoLocation geoclue2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) ++ optionals stdenv.isDarwin [ libedit readline mesa ] From f79fde1ca4da148fd7a440d376e85b6670d4560d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Sep 2017 21:04:04 +0200 Subject: [PATCH 0400/2806] routino: init at 3.2 --- pkgs/tools/misc/routino/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/routino/default.nix diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix new file mode 100644 index 00000000000..2629b8fd5d8 --- /dev/null +++ b/pkgs/tools/misc/routino/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, perl, zlib, bzip2 }: + +stdenv.mkDerivation rec { + name = "Routino-${version}"; + version = "3.2"; + + src = fetchurl { + url = "http://routino.org/download/routino-${version}.tgz"; + sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ zlib bzip2 ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = http://www.routino.org/; + description = "OpenStreetMap Routing Software"; + license = licenses.agpl3; + maintainter = with maintainers; [ dotlambda ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4324cc0092f..10455175412 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4179,6 +4179,8 @@ with pkgs; rnv = callPackage ../tools/text/xml/rnv { }; + routino = callPackage ../tools/misc/routino { }; + rq = callPackage ../development/tools/rq { v8 = v8_static; }; From 595c8fad83c2f4a9217fb1e0b30492f7476a960a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 18:47:39 +0200 Subject: [PATCH 0401/2806] openrw: 2016-06-29 -> 2017-09-17 fixes build --- pkgs/games/openrw/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 0c235383acf..6dd098ee7b8 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchgit, cmake, sfml, mesa, bullet, glm, libmad, x11 }: +{ stdenv, fetchgit, cmake, sfml, mesa, bullet, glm, libmad, x11, openal +, SDL2, boost, ffmpeg }: stdenv.mkDerivation rec { - version = "2016-06-29"; + version = "2017-09-17"; name = "openrw-${version}"; + src = fetchgit { url = "https://github.com/rwengine/openrw"; - rev = "46a7254a41d9f6e1eda8d31e742de492abb2540e"; - sha256 = "16ip9779dy59xcj9src2i4zp8jq2h0h5mb4a7d5cpkhd3xlcpabm"; + rev = "11e90c61e56b60240251cd080f175ddff7d7a101"; + sha256 = "16qklk9yc4ssxxkicxvww4gmg1c7cm6vhyilyv287vhz1fq9sz49"; fetchSubmodules = true; }; - buildInputs = [ cmake sfml mesa bullet glm libmad x11 ]; + buildInputs = [ + cmake sfml mesa bullet glm libmad x11 openal SDL2 boost ffmpeg + ]; meta = with stdenv.lib; { description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; From dffd77b037c48a845cac73aa2edf6234d2210987 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 19:09:17 +0200 Subject: [PATCH 0402/2806] flightgear: 2016.4.4 -> 2017.3.1 for CVE-2017-13709 --- pkgs/development/libraries/simgear/default.nix | 8 +++++--- pkgs/games/flightgear/default.nix | 15 ++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index b5c94678146..d724ebbf373 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -6,18 +6,20 @@ stdenv.mkDerivation rec { name = "simgear-${version}"; - version = "2016.4.4"; - shortVersion = "2016.4"; + version = "2017.3.1"; + shortVersion = "2017.3"; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "1p615wmh744m01mcqik27ah1wjdf3sj7vard1vfdpz5v0q0gs52m"; + sha256 = "1x71wvycs2bjgmmacswgk6091p65p46fr40mr7f4kcipnx88bq0f"; }; buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto libICE libSM libXt libXmu mesa boost zlib libjpeg freealut openscenegraph openal expat cmake apr curl ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Simulation construction toolkit"; homepage = https://gitorious.org/fg/simgear; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 2d7f5566c5d..74319426991 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -2,18 +2,18 @@ , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr -, makeDesktopItem, qtbase +, makeDesktopItem, qtbase, qtdeclarative, glew }: let - version = "2016.4.4"; - shortVersion = "2016.4"; + version = "2017.3.1"; + shortVersion = "2017.3"; data = stdenv.mkDerivation rec { name = "flightgear-base-${version}"; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "0s4nlkwi9jfc408agsl0w5xl3vajrvplc66k3nwg92wsr614pz9x"; + sha256 = "166q0fsbp17lx1l1n6i8cfk3d1i79pasz1liya09z6m2i1pb026z"; }; phases = [ "installPhase" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "1z7s9m2g85g8q9zxawhpal84rq2jin1ppchshbwi460gwk5r46fm"; + sha256 = "1kccf91vmxnzyki6grx09s10dvr4j6qrz34ikj7jn81g5scisbkg"; }; # Of all the files in the source and data archives, there doesn't seem to be @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { freeglut freealut mesa libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xproto libXext xextproto libXi inputproto libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase + glew qtdeclarative ]; postInstall = '' @@ -66,10 +67,10 @@ stdenv.mkDerivation rec { do wrapProgram $f --set FG_ROOT "${data}/share/FlightGear" done - - ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Flight simulator"; maintainers = with maintainers; [ raskin the-kenny ]; From 0395a0d10bd1a47db0592047a668b9334af60a4f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 28 Sep 2017 17:29:49 +0000 Subject: [PATCH 0403/2806] routino: fix data path --- pkgs/tools/misc/routino/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index 2629b8fd5d8..e3e174e0204 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchurl, perl, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "Routino-${version}"; + name = "routino-${version}"; version = "3.2"; src = fetchurl { - url = "http://routino.org/download/routino-${version}.tgz"; + url = "http://routino.org/download/${name}.tgz"; sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; }; nativeBuildInputs = [ perl ]; + buildInputs = [ zlib bzip2 ]; - installFlags = [ "prefix=$(out)" ]; + outputs = [ "out" "doc" ]; + + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { homepage = http://www.routino.org/; From 93aaeaccc2c048519c82607c0302e4a016e58a03 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 21 Sep 2017 02:32:40 +0200 Subject: [PATCH 0404/2806] chromium: separate patches for beta and dev builds fixes beta and dev builds --- .../networking/browsers/chromium/common.nix | 35 ++- .../chromium/patches/chromium-gcc5-r2.patch | 36 +++ .../patches/chromium-glibc2.26-r1.patch | 220 ++++++++++++++++++ .../patches/chromium-gn-bootstrap-r17.patch | 68 ++++++ .../patches/chromium-gn-bootstrap-r19.patch | 10 + .../patches/chromium-sysroot-r1.patch | 14 ++ 6 files changed, 378 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c4fd85ab93e..f6f9a829c2d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -90,6 +90,15 @@ let sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77"; }; + versionRange = min-version: upto-version: + let inherit (upstream-info) version; + result = versionAtLeast version min-version && versionOlder version upto-version; + stable-version = (import ./upstream-info.nix).stable.version; + in if versionAtLeast stable-version upto-version + then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." + result + else result; + base = rec { name = "${packageName}-${version}"; inherit (upstream-info) version; @@ -117,15 +126,31 @@ let patches = [ ./patches/nix_plugin_paths_52.patch + # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled + # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 + ./patches/fix_network_api_crash.patch + ] # As major versions are added, you can trawl the gentoo and arch repos at + # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ + # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium + # for updated patches and hints about build flags + ++ optionals (versionRange "61" "62") [ ./patches/chromium-gn-bootstrap-r14.patch ./patches/chromium-gcc-r1.patch ./patches/chromium-atk-r1.patch ./patches/chromium-gcc5-r1.patch - # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled - # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 - ./patches/fix_network_api_crash.patch - - ] ++ optional enableWideVine ./patches/widevine.patch; + ] + ++ optionals (versionRange "62" "63") [ + ./patches/chromium-gn-bootstrap-r17.patch + ./patches/chromium-gcc5-r2.patch + ./patches/chromium-glibc2.26-r1.patch + ] + ++ optionals (versionAtLeast version "63") [ + ./patches/chromium-gn-bootstrap-r19.patch + ./patches/chromium-gcc5-r2.patch + ./patches/chromium-glibc2.26-r1.patch + ./patches/chromium-sysroot-r1.patch + ] + ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch new file mode 100644 index 00000000000..f2be2d5b8ae --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch @@ -0,0 +1,36 @@ +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 ++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include ++#include + #include + #include + diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch new file mode 100644 index 00000000000..ec37a2816d5 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch @@ -0,0 +1,220 @@ +diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +index c80724d..052ce37 100644 +--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +@@ -36,19 +36,19 @@ namespace google_breakpad { + + // Minidump defines register structures which are different from the raw + // structures which we get from the kernel. These are platform specific +-// functions to juggle the ucontext and user structures into minidump format. ++// functions to juggle the ucontext_t and user structures into minidump format. + + #if defined(__i386__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_ESP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_EIP]; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fp) { + const greg_t* regs = uc->uc_mcontext.gregs; + +@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, + + #elif defined(__x86_64) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_RSP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_RIP]; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fpregs) { + const greg_t* regs = uc->uc_mcontext.gregs; + +@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, + + #elif defined(__ARM_EABI__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.arm_sp; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.arm_pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { + out->context_flags = MD_CONTEXT_ARM_FULL; + + out->iregs[0] = uc->uc_mcontext.arm_r0; +@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { + + #elif defined(__aarch64__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.sp; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct fpsimd_context* fpregs) { + out->context_flags = MD_CONTEXT_ARM64_FULL; + +@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, + + #elif defined(__mips__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { + #if _MIPS_SIM == _ABI64 + out->context_flags = MD_CONTEXT_MIPS64_FULL; + #elif _MIPS_SIM == _ABIO32 +diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +index b6e77b4..2de80b7 100644 +--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h ++++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +@@ -39,23 +39,23 @@ + + namespace google_breakpad { + +-// Wraps platform-dependent implementations of accessors to ucontext structs. ++// Wraps platform-dependent implementations of accessors to ucontext_t structs. + struct UContextReader { +- static uintptr_t GetStackPointer(const struct ucontext* uc); ++ static uintptr_t GetStackPointer(const ucontext_t* uc); + +- static uintptr_t GetInstructionPointer(const struct ucontext* uc); ++ static uintptr_t GetInstructionPointer(const ucontext_t* uc); + +- // Juggle a arch-specific ucontext into a minidump format ++ // Juggle a arch-specific ucontext_t into a minidump format + // out: the minidump structure + // info: the collection of register structures. + #if defined(__i386__) || defined(__x86_64) +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fp); + #elif defined(__aarch64__) +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct fpsimd_context* fpregs); + #else +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); + #endif + }; + +diff --git a/breakpad/src/client/linux/handler/exception_handler.cc b/breakpad/src/client/linux/handler/exception_handler.cc +index 586d84e..05936d2 100644 +--- a/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/breakpad/src/client/linux/handler/exception_handler.cc +@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { + // Fill in all the holes in the struct to make Valgrind happy. + memset(&g_crash_context_, 0, sizeof(g_crash_context_)); + memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); +- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); ++ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); + #if defined(__aarch64__) +- struct ucontext* uc_ptr = (struct ucontext*)uc; ++ ucontext_t* uc_ptr = (ucontext_t*)uc; + struct fpsimd_context* fp_ptr = + (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; + if (fp_ptr->head.magic == FPSIMD_MAGIC) { +@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { + } + #elif !defined(__ARM_EABI__) && !defined(__mips__) + // FP state is not part of user ABI on ARM Linux. +- // In case of MIPS Linux FP state is already part of struct ucontext ++ // In case of MIPS Linux FP state is already part of ucontext_t + // and 'float_state' is not a member of CrashContext. +- struct ucontext* uc_ptr = (struct ucontext*)uc; ++ ucontext_t* uc_ptr = (ucontext_t*)uc; + if (uc_ptr->uc_mcontext.fpregs) { + memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, + sizeof(g_crash_context_.float_state)); +@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { + // ExceptionHandler::HandleSignal(). + siginfo.si_code = SI_USER; + siginfo.si_pid = getpid(); +- struct ucontext context; ++ ucontext_t context; + getcontext(&context); + return HandleSignal(sig, &siginfo, &context); + } +diff --git a/breakpad/src/client/linux/handler/exception_handler.h b/breakpad/src/client/linux/handler/exception_handler.h +index daba57e..25598a2 100644 +--- a/breakpad/src/client/linux/handler/exception_handler.h ++++ b/breakpad/src/client/linux/handler/exception_handler.h +@@ -191,11 +191,11 @@ class ExceptionHandler { + struct CrashContext { + siginfo_t siginfo; + pid_t tid; // the crashing thread. +- struct ucontext context; ++ ucontext_t context; + #if !defined(__ARM_EABI__) && !defined(__mips__) + // #ifdef this out because FP state is not part of user ABI for Linux ARM. + // In case of MIPS Linux FP state is already part of struct +- // ucontext so 'float_state' is not required. ++ // ucontext_t so 'float_state' is not required. + fpstate_t float_state; + #endif + }; +diff --git a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +index 3764eec..80ad5c4 100644 +--- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc ++++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +@@ -593,7 +593,7 @@ class MicrodumpWriter { + + void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } + +- const struct ucontext* const ucontext_; ++ const ucontext_t* const ucontext_; + #if !defined(__ARM_EABI__) && !defined(__mips__) + const google_breakpad::fpstate_t* const float_state_; + #endif +diff --git a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +index d11ba6e..c716143 100644 +--- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc ++++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +@@ -1323,7 +1323,7 @@ class MinidumpWriter { + const int fd_; // File descriptor where the minidum should be written. + const char* path_; // Path to the file where the minidum should be written. + +- const struct ucontext* const ucontext_; // also from the signal handler ++ const ucontext_t* const ucontext_; // also from the signal handler + #if !defined(__ARM_EABI__) && !defined(__mips__) + const google_breakpad::fpstate_t* const float_state_; // ditto + #endif diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch new file mode 100644 index 00000000000..6cfd08d58c2 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch @@ -0,0 +1,68 @@ +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options): + + write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h', + { ++ 'ENABLE_LOCATION_SOURCE': 'false', + 'ENABLE_PROFILING': 'false', + 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false' + }) +@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options): + + write_gn_ninja(os.path.join(tempdir, 'build.ninja'), + root_gen_dir, options) +- cmd = ['ninja', '-C', tempdir] ++ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err'] + if options.verbose: + cmd.append('-v') + +@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/metrics/bucket_ranges.cc', + 'base/metrics/field_trial.cc', + 'base/metrics/field_trial_param_associator.cc', ++ 'base/metrics/field_trial_params.cc', + 'base/metrics/histogram.cc', + 'base/metrics/histogram_base.cc', + 'base/metrics/histogram_functions.cc', +@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/task_scheduler/scheduler_lock_impl.cc', + 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc', + 'base/task_scheduler/scheduler_worker.cc', ++ 'base/task_scheduler/scheduler_worker_pool.cc', + 'base/task_scheduler/scheduler_worker_pool_impl.cc', + 'base/task_scheduler/scheduler_worker_pool_params.cc', + 'base/task_scheduler/scheduler_worker_stack.cc', +@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/third_party/icu/icu_utf.cc', + 'base/third_party/nspr/prtime.cc', + 'base/threading/post_task_and_reply_impl.cc', ++ 'base/threading/scoped_blocking_call.cc', + 'base/threading/sequence_local_storage_map.cc', + 'base/threading/sequenced_task_runner_handle.cc', + 'base/threading/sequenced_worker_pool.cc', +@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/unguessable_token.cc', + 'base/value_iterators.cc', + 'base/values.cc', +- 'base/value_iterators.cc', + 'base/vlog.cc', + ]) + +@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options): + static_libraries['base']['sources'].extend([ + 'base/memory/shared_memory_handle_posix.cc', + 'base/memory/shared_memory_posix.cc', +- 'base/memory/shared_memory_tracker.cc', + 'base/nix/xdg_util.cc', + 'base/process/internal_linux.cc', + 'base/process/memory_linux.cc', +@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options): + cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args] + check_call(cmd) + +- cmd = ['ninja', '-C', build_dir] ++ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err'] + if options.verbose: + cmd.append('-v') + cmd.append('gn') diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch new file mode 100644 index 00000000000..999fdb7eda7 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch @@ -0,0 +1,10 @@ +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -576,7 +576,6 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/trace_event/trace_log.cc', + 'base/trace_event/trace_log_constants.cc', + 'base/trace_event/tracing_agent.cc', +- 'base/tracked_objects.cc', + 'base/unguessable_token.cc', + 'base/value_iterators.cc', + 'base/values.cc', diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch new file mode 100644 index 00000000000..b5ff0d8cba1 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch @@ -0,0 +1,14 @@ +--- a/chrome/installer/BUILD.gn ++++ b/chrome/installer/BUILD.gn +@@ -3,9 +3,10 @@ + # found in the LICENSE file. + + import("//build/config/chrome_build.gni") ++import("//build/config/sysroot.gni") + + declare_args() { +- enable_linux_installer = is_linux && !is_component_build ++ enable_linux_installer = is_linux && !is_component_build && use_sysroot + } + + # Meta-target that forwards to the installer of the correct type (if any). From e78bf2d1e9d7ce57ea43b10779667451525ef11f Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 19 Sep 2017 23:51:04 +0200 Subject: [PATCH 0405/2806] chromium: 61.0.3163.79 -> 61.0.3163.100 --- .../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 ff349c8a576..af4c30b431f 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 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x"; - sha256bin64 = "12z6z8gjxl4mx8j6db8nnlzrj03rh4qwyrvcf4hqcsv7b1armg6j"; - version = "61.0.3163.79"; + sha256 = "0c8qn2i7iygl3kgrdwwd8h3l5j8hg66dw99qgr618cgca1b4im68"; + sha256bin64 = "04mfg18zpx19ha0mrlwx2aabn0vhl08n9c60hazivmw99pzlg8dn"; + version = "62.0.3202.29"; }; dev = { - sha256 = "168i6dcdl13an3vlr2m83q8fcprgckmclkmzwj70jdkp84qx80fq"; - sha256bin64 = "116vddp01m2ls337zj6r4h1nvybphvldlk9bs8czypx5skn29vbz"; - version = "62.0.3202.9"; + sha256 = "1zd7rid626fglbyrp7c6517jldhgfk3vjn357vhlhy6pgj1ydrrn"; + sha256bin64 = "0hqb5prf0ags4bnla6skyi5vmkrazhd8n3ri4ijhbqjbb536bfpb"; + version = "63.0.3218.0"; }; stable = { - sha256 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x"; - sha256bin64 = "0a0wd06c0v061lnmb8x20gqgsg9zqafp2kq1fl3cjm0ldg9rwayw"; - version = "61.0.3163.79"; + sha256 = "06r89jim9cq87668ya8wwk69hh17rl04cj94nb9c28v6mj69cda1"; + sha256bin64 = "1cm9snw29nkzq4bafqgi6fd0gqcc3jp60y6vfsrf9k4dvdard2sv"; + version = "61.0.3163.100"; }; } From d84d8af862c492e7e9bf0c76d407e5c9fd58cc95 Mon Sep 17 00:00:00 2001 From: berdario Date: Thu, 28 Sep 2017 19:49:34 +0100 Subject: [PATCH 0406/2806] Rhino: enable on Darwin (#29824) rhino: enable on darwin --- pkgs/development/libraries/java/rhino/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index c3e80fe87f4..544f0f4c4e9 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation { homepage = http://www.mozilla.org/rhino/; license = with licenses; [ mpl11 /* or */ gpl2Plus ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 144914121c158d2b3c738b74cd4b2e127c1d04f5 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 28 Sep 2017 19:15:42 +0000 Subject: [PATCH 0407/2806] mosquitto: fix darwin build (#29851) --- pkgs/servers/mqtt/mosquitto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index b0e05aa8bc0..c157064fcb2 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libuuid libwebsockets c-ares libuv ] ++ stdenv.lib.optional stdenv.isDarwin cmake; - makeFlags = [ + makeFlags = stdenv.lib.optionals stdenv.isLinux [ "DESTDIR=$(out)" "PREFIX=" ]; - preBuild = '' + postPatch = '' substituteInPlace config.mk \ --replace "/usr/local" "" substituteInPlace config.mk \ From 1ae19b6c4e9790495dc108e58726b34274562f41 Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Thu, 28 Sep 2017 07:27:11 +0700 Subject: [PATCH 0408/2806] gucharmap: 3.18.2 -> 10.0.1 - Gucharmap no longer follow the GNOME major versioning. - Gucharmap no longer includes Unicode data. Instead the data should be downloaded from unicode.org. --- maintainers/scripts/gnome.sh | 2 +- .../gnome-3/core/gucharmap/default.nix | 20 +++++---- pkgs/desktops/gnome-3/core/gucharmap/src.nix | 6 +-- .../gnome-3/core/gucharmap/unicode-data.nix | 44 +++++++++++++++++++ 4 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh index f77dc5a9e64..d44bda53f8d 100755 --- a/maintainers/scripts/gnome.sh +++ b/maintainers/scripts/gnome.sh @@ -6,7 +6,7 @@ GNOME_FTP=ftp.gnome.org/pub/GNOME/sources # projects that don't follow the GNOME major versioning, or that we don't want to # programmatically update -NO_GNOME_MAJOR="ghex gtkhtml gdm" +NO_GNOME_MAJOR="ghex gtkhtml gdm gucharmap" usage() { echo "Usage: $0 || [major.minor]" >&2 diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 05aff866606..58d9901ad01 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,6 +1,7 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3 , glib, desktop_file_utils, bash, appdata-tools -, makeWrapper, gnome3, file, itstool, libxml2 }: +, wrapGAppsHook, gnome3, itstool, libxml2 +, callPackage, unzip }: # TODO: icons and theme still does not work # use packaged gnome3.adwaita-icon-theme @@ -12,16 +13,17 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; - buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools - gnome3.yelp_tools libxml2 file desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip ]; - preFixup = '' - wrapProgram "$out/bin/gucharmap" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; + buildInputs = [ gtk3 intltool itstool glib appdata-tools + gnome3.yelp_tools libxml2 desktop_file_utils + gnome3.gsettings_desktop_schemas ]; + + unicode-data = callPackage ./unicode-data.nix {}; + + configureFlags = "--with-unicode-data=${unicode-data}"; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Gucharmap; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix index 69c0dd60025..67d00c269f5 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/src.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gucharmap-3.18.2"; + name = "gucharmap-10.0.1"; src = fetchurl { - url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.2.tar.xz; - sha256 = "80141d3e892c3c4812c1a8fad8f89978559ef19e933843267e6e9a5524c09ec9"; + url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.1.tar.xz; + sha256 = "51a2bf91c4590ea2159f828156864f088a0bd4c12e7a1c396002a23d48b2d5e2"; }; } diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix new file mode 100644 index 00000000000..84770a17162 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -0,0 +1,44 @@ +{fetchurl, stdenv}: +stdenv.mkDerivation { + name = "unicode-data-10.0.0"; + srcs = [ + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/Blocks.txt"; + sha256 = "19zf2kd198mcv1paa194c1zf36hay1irbxssi35yi2pd8ad69qas"; + }) + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/DerivedAge.txt"; + sha256 = "1h9p1g0wnh686l6cqar7cmky465vwc6vjzzn1s7v0i9zcjaqkr4h"; + }) + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/NamesList.txt"; + sha256 = "0gvpcyq852rnlqmx4y5i1by7bavvcw6rj40i54w48yc7xr3zmgd1"; + }) + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/Scripts.txt"; + sha256 = "0b9prz2hs6w61afqaplcxnv115f8yk4d5hn9dc5hks8nqpj28bnh"; + }) + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt"; + sha256 = "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj"; + }) + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/Unihan.zip"; + sha256 = "199kz6laypkvc0ykms6d7bkb571jmpds39sv2p7kd5jjm1ij08q1"; + }) + ]; + phases = "installPhase"; + installPhase = with stdenv.lib; '' + mkdir $out + for f in $srcs;do + cp $f $out/$(stripHash $f) + done + ''; + meta = with stdenv.lib; { + homepage = http://www.unicode.org/ucd/; + description = "Unicode Character Database"; + maintainers = gnome3.maintainers; + license = licenses.mit; + platforms = platforms.all; + }; +} From 80c57fd96a8f4aa9b7ef69a01f50f4c264c49f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 28 Sep 2017 21:51:00 +0200 Subject: [PATCH 0409/2806] gcj, gccgo: port fixes for 4.9 to 6 Tested that pdftk builds on linux again, and gccgo6 builds hello-world. The default gcc doesn't rebuild. --- pkgs/development/compilers/gcc/6/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 2c8a9696e69..47cb93c1995 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -217,7 +217,8 @@ stdenv.mkDerivation ({ inherit patches; - outputs = [ "out" "lib" "man" "info" ]; + outputs = if langJava || langGo then ["out" "man" "info"] + else [ "out" "lib" "man" "info" ]; setOutputFlags = false; NIX_NO_SELF_RPATH = true; @@ -323,7 +324,11 @@ stdenv.mkDerivation ({ export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" - ''; + '' + + stdenv.lib.optionalString (langJava || langGo) '' + export lib=$out; + '' + ; dontDisableStatic = true; @@ -565,4 +570,10 @@ stdenv.mkDerivation ({ // optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } + +// optionalAttrs (langJava) { + postFixup = '' + target="$(echo "$out/libexec/gcc"/*/*/ecj*)" + patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" + '';} ) From f68b1c1a1c0b7d1b99d7cec916f929d0f579c848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Thu, 28 Sep 2017 12:24:12 -0400 Subject: [PATCH 0410/2806] perl-Mail-SPF: fix lib path --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d8c69ae44e9..eae18c1b5ed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8329,7 +8329,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild NetDNSResolverProgrammable ]; propagatedBuildInputs = [ Error NetAddrIP NetDNS URI ]; - buildPhase = "perl Build.PL --install_base=$out --install_path=\"sbin=$out/bin\"; ./Build build "; + buildPhase = "perl Build.PL --install_base=$out --install_path=\"sbin=$out/bin\" --install_path=\"lib=$out/lib/perl5/site_perl\"; ./Build build "; doCheck = false; # The main test performs network access meta = { From 3ef954bdd77613a3c72afb7abd0254701b9de275 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 28 Sep 2017 20:35:12 +0100 Subject: [PATCH 0411/2806] uchiwa: fix bower hashes Previous bower2nix had a bug resulting in incorrect hashes. This uses bower2nix 3.2.0 to regenerate the bower packages file. --- .../monitoring/uchiwa/bower-packages.nix | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 95218c76ea7..06144eedbf4 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,25 +1,25 @@ -# Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix) +# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "0.26.0" "0.26.0" "1p091rsb78wixpj5h5n4sm0a5ad60w6wi1lq7ljy31x5c5srd3l8") - (fetchbower "angular" "1.6.6" "~1.6.3" "1h0irwglk6qybnn5j7g25m01fx61bzjb2ina4l50a73x617s8a7v") - (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7") - (fetchbower "angular-cookies" "1.6.6" "~1.6.3" "0fkhm885mcqvy9c8hb072gby3yay1hcs5d391pshikwam98d093c") - (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "19q40hsjhwz8y3phmyrrg27f20qpaknvw44cfx4gliin2zqwwsfk") - (fetchbower "angular-moment" "1.0.1" "~1.0.1" "1ydnilyf6nysxxjir51lhn92k7mjqii5277xxdqnpcvc376la244") - (fetchbower "angular-resource" "1.6.6" "~1.6.3" "119ly273fa0ygb416d03av6z9zb78m618nbdqim7p6vhn07h3sww") - (fetchbower "angular-route" "1.6.6" "~1.6.3" "1gzndkaqjgg2cjmch71nlcf1l0lwkjjjh2xaq1yhgcbj47k0j878") - (fetchbower "angular-sanitize" "1.6.6" "~1.6.3" "1pyw0prnm6pca563kn0cg1sx0mxs7hyhmg06161mjr3n8c978x3y") - (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1") - (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1rr7xf3a2l15g2nmd9svq8ijy1v0igc5jdpwp21kna1kzc65jg3m") - (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z") - (fetchbower "bootstrap" "3.1.1" "3.1.1" "036xbjpv4621p5r2l9vfm9zys6h1mhkvb0zhvk3irrmkzsl77hwh") - (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "0rfmja15p8kxz6i3liwyqrmbm82azq61d3882w2vmp08vvv2c371") - (fetchbower "fontawesome" "4.4.0" "~4.4.0" "1mbs0vhixvg11vj3n0l3jn3pb6s839rcs416zq2wzfqkbvsc3sf5") - (fetchbower "highlightjs" "9.1.0" "~9.1.0" "1gz4q922sylbbqw1sawmjjq8nw0mk90wq0qq95ap0f31px7bfm3f") - (fetchbower "moment" "2.16.0" "~2.16.0" "0g6zd465rnm3dhsank1iq9b5s4clc58lh3wrpg5sf8dd5zjlr2k2") - (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0lw31180v0yjlcah17kpgklcllz78bnrdiyvwhw14151xcyds4jm") - (fetchbower "ua-parser-js" "0.7.14" "~0.7.12" "0z27b811xj09fh0gm72ah8425609gbj87jda3xap5l91alrwixz1") - (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "05rcd98z6wc2x5kiaq9dfbvynbkwbrbrcgivcs8bv66d1k747ph8") - (fetchbower "jquery" "3.2.1" ">= 1.9.0" "1h14hjhi3ydnl66wmr8w72syyfcvbz47g7bprz7cqw5qxf2n7sah") + (fetchbower "uchiwa-web" "0.26.0" "0.26.0" "1ywbmay0pwm7rj4y0yqk6a3a62lv32ncshwy5j02rq5b2nf7lbc3") + (fetchbower "angular" "1.6.6" "~1.6.3" "1hc71mpipbdz6ban4zkagdhmn3rw28ksjkr6nwmbzfcpk59gnzkb") + (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") + (fetchbower "angular-cookies" "1.6.6" "~1.6.3" "0qfk0az32fmrn71ywjl63k7hgan0f0bb4d7fx7q5ch2kd75rzkfm") + (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "14jrzvjwx64awh9z95054manp8qd57fvinqhmakipz5x12i7qrwi") + (fetchbower "angular-moment" "1.0.1" "~1.0.1" "0zkn52s9l15d6b5zfx52g5jpib23rpb637m0p1hzc429w5bbl0rj") + (fetchbower "angular-resource" "1.6.6" "~1.6.3" "1fxd188qa16zbidr4kbwnw7gqcc0bjpvpa7xcmv22nbfk5akjz5b") + (fetchbower "angular-route" "1.6.6" "~1.6.3" "05saq9lb7xqhr1f4k2hdc2qlq0nacbgr36qsv7izvvmgh6irn1iq") + (fetchbower "angular-sanitize" "1.6.6" "~1.6.3" "1cikmvq456pvxdmrqw0dp04y3ar9n0nxrgv583m7cy6z228sx1hl") + (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1szigf1m28bgpfyg8hbm5rffr5zi7wr9n73nc1fqhk0yqh7gzysh") + (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1j3vysr01niabc9fxcpixhcq1lyx2fr4q4wpmxhmiqki431h9hq8") + (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0gb0vmwksnydlm6hklfq1n4ak2967wcmnx3cx9cgiv7v7vk3w2m9") + (fetchbower "bootstrap" "3.1.1" "3.1.1" "1a06mx1rw5h4wq89kqpa8g2pbiddm3p21dxq50jyi29sywd01ny4") + (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "1k6hhvsd75hdfrz8qcjzmb12c17fdn0h3l3l5k9wgd0rfhhfkyvd") + (fetchbower "fontawesome" "4.4.0" "~4.4.0" "09mrbik8i3skjwchn7ns2020bqmb51kbd3mqi59vh444s4az2sc7") + (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3") + (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71") + (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb") + (fetchbower "ua-parser-js" "0.7.14" "~0.7.12" "0bpyfbaixz2dhkc19r7zgm61n4rncrvfyvj61c5kn6fmj68fdbz3") + (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x") + (fetchbower "jquery" "3.2.1" ">= 1.9.0" "03vn0kq07yxl3i5shc6b0mjck1vdbz1x0jspd3wwb169mvlsxxn3") ]; } From d5bf6a0d2c2dd57ce2c906ab7359d2b572b0aac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 28 Sep 2017 22:02:57 +0200 Subject: [PATCH 0412/2806] gccgo: 4.9 -> 6 I assume we don't need to have multiple versions of gccgo, so let me keep it aligned with our default gcc version. --- pkgs/top-level/all-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fced3a1bb8..45fa62cff87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5646,10 +5646,9 @@ with pkgs; emacsSupport = config.emacsSupport or false; }; - gccgo = gccgo49; - - gccgo49 = wrapCC (gcc49.cc.override { - name = "gccgo49"; + gccgo = gccgo6; + gccgo6 = wrapCC (gcc6.cc.override { + name = "gccgo6"; langCC = true; #required for go. langC = true; langGo = true; From e71334992211c992efc46fa95f932a94fcdac7e4 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 28 Sep 2017 20:05:07 +0000 Subject: [PATCH 0413/2806] collectd: fix darwin build (#29841) - liboping supported on darwin since #29849 - libmicrohttpd supported on darwin since #29848 --- pkgs/tools/system/collectd/default.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 824eb74b72e..2e12345783d 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, darwin # optional: , pkgconfig ? null # most of the extra deps need pkgconfig to be found , curl ? null @@ -44,16 +44,22 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached - cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt - lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool - varnish yajl jdk libtool python udev net_snmp hiredis libmnl libmicrohttpd + pkgconfig curl libdbi libgcrypt libmemcached + cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt + libxml2 libmysql postgresql protobufc rrdtool + varnish yajl jdk libtool python hiredis libmicrohttpd + ] ++ stdenv.lib.optionals stdenv.isLinux [ + iptables libatasmart libcredis libmodbus libsigrok + lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.ApplicationServices ]; # for some reason libsigrok isn't auto-detected configureFlags = [ "--localstatedir=/var" ] ++ - stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++ + stdenv.lib.optional (stdenv.isLinux && libsigrok != null) "--with-libsigrok" ++ stdenv.lib.optional (python != null) "--with-python=${python}/bin/python"; # do not create directories in /var during installPhase @@ -71,7 +77,7 @@ stdenv.mkDerivation rec { description = "Daemon which collects system performance statistics periodically"; homepage = https://collectd.org; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor fpletz ]; }; } From d4bdf302a3c6b9c7e00b14e3ae21597fad6d17d8 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 28 Sep 2017 13:11:16 -0700 Subject: [PATCH 0414/2806] nvidia-x11: fix eval error from 4ef82339c9 --- nixos/modules/hardware/video/nvidia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 52f1773e9c4..50c085dd7ee 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -42,7 +42,7 @@ in config = mkIf enabled { assertions = [ { - assertion = services.xserver.displayManager.gdm.wayland; + assertion = config.services.xserver.displayManager.gdm.wayland; message = "NVidia drivers don't support wayland"; } ]; From b93ba5dcd7b66ac5efdb8d6b9c255c5e85e58bc7 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 28 Sep 2017 16:49:01 -0400 Subject: [PATCH 0415/2806] envoy: fix by reviving bazel 0.4 /cc #28643 --- .../tools/build-managers/bazel/0.4.nix | 91 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +- 2 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bazel/0.4.nix diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix new file mode 100644 index 00000000000..2137c5c1497 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper, which }: + +stdenv.mkDerivation rec { + + version = "0.4.5"; + + meta = with stdenv.lib; { + homepage = https://github.com/bazelbuild/bazel/; + description = "Build tool that builds code quickly and reliably"; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan philandstuff ]; + platforms = platforms.linux; + }; + + name = "bazel-${version}"; + + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + sha256 = "0asmq3kxnl4326zhgh13mvcrc8jvmiswjj4ymrq0943q4vj7nwrb"; + }; + + sourceRoot = "."; + + postPatch = '' + for f in $(grep -l -r '#!/bin/bash'); do + substituteInPlace "$f" --replace '#!/bin/bash' '#!${bash}/bin/bash' + done + for f in \ + src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java \ + src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java \ + src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java \ + src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java \ + ; do + substituteInPlace "$f" --replace /bin/bash ${bash}/bin/bash + done + ''; + + buildInputs = [ + stdenv.cc + stdenv.cc.cc.lib + jdk + zip + unzip + makeWrapper + which + ]; + + # These must be propagated since the dependency is hidden in a compressed + # archive. + + propagatedBuildInputs = [ + bash + ]; + + # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink + # detector (see com.google.devtools.build.lib.skyframe.FileFunction). + # Change this to $(mktemp -d) as soon as we figure out why. + + buildPhase = '' + export TMPDIR=/tmp + ./compile.sh + ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ + --spawn_strategy=standalone \ + --genrule_strategy=standalone + cp bazel-bin/scripts/bazel-complete.bash output/ + ''; + + # Build the CPP and Java examples to verify that Bazel works. + + doCheck = true; + checkPhase = '' + export TEST_TMPDIR=$(pwd) + ./output/bazel test --test_output=errors \ + examples/cpp:hello-success_test \ + examples/java-native/src/test/java/com/example/myproject:hello + ''; + + # Bazel expects gcc and java to be in the path. + + installPhase = '' + mkdir -p $out/bin + mv output/bazel $out/bin + wrapProgram "$out/bin/bazel" --prefix PATH : "${stdenv.cc}/bin:${jdk}/bin" + mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions + mv output/bazel-complete.bash $out/share/bash-completion/completions/ + cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ + ''; + + dontStrip = true; + dontPatchELF = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45fa62cff87..d56971c5263 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1875,7 +1875,9 @@ with pkgs; entr = callPackage ../tools/misc/entr { }; - envoy = callPackage ../tools/networking/envoy { }; + envoy = callPackage ../tools/networking/envoy { + bazel = bazel_0_4; + }; eot_utilities = callPackage ../tools/misc/eot-utilities { }; @@ -6850,7 +6852,9 @@ with pkgs; bam = callPackage ../development/tools/build-managers/bam {}; - bazel = callPackage ../development/tools/build-managers/bazel { }; + bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; + bazel_0_5 = callPackage ../development/tools/build-managers/bazel { }; + bazel = bazel_0_5; bear = callPackage ../development/tools/build-managers/bear { }; From bb005d138e5730f95873adf2dc3877fbdc59f46e Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 28 Sep 2017 16:55:26 -0400 Subject: [PATCH 0416/2806] envoy: unmark as broken --- pkgs/tools/networking/envoy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix index a31e6ad004c..83af542b8ad 100644 --- a/pkgs/tools/networking/envoy/default.nix +++ b/pkgs/tools/networking/envoy/default.nix @@ -299,6 +299,5 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; - broken = true; }; } From 57ed9e7e1df221ed3e34504927e5f1efd3238cdd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 20:09:31 +0200 Subject: [PATCH 0417/2806] gitlab: 9.5.5 -> 10.0.2 --- nixos/modules/services/misc/gitlab.nix | 7 + .../version-management/gitaly/Gemfile | 2 +- .../version-management/gitaly/Gemfile.lock | 10 +- .../version-management/gitaly/default.nix | 4 +- .../version-management/gitaly/gemset.nix | 12 +- .../gitlab-shell/default.nix | 4 +- .../version-management/gitlab/Gemfile | 31 ++--- .../version-management/gitlab/Gemfile.lock | 84 +++++------ .../version-management/gitlab/default.nix | 6 +- .../version-management/gitlab/gemset.nix | 131 ++++++++++-------- .../gitlab/remove-hardcoded-locations.patch | 25 ++-- 11 files changed, 173 insertions(+), 143 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index d6c8ac54724..280c66d0aaf 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -635,6 +635,13 @@ in { chown -R ${cfg.user}:${cfg.group} ${cfg.statePath} chmod -R ug+rwX,o-rwx+X ${cfg.statePath} chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME} + chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories + chmod -R ug-s ${cfg.statePath}/repositories + find ${cfg.statePath}/repositories -type d -print0 | xargs -0 chmod g+s + chmod 700 ${cfg.statePath}/uploads + chown -R git ${cfg.statePath}/uploads + find ${cfg.statePath}/uploads -type f -exec chmod 0644 {} \; + find ${cfg.statePath}/uploads -type d -not -path ${cfg.statePath}/uploads -exec chmod 0700 {} \; ''; serviceConfig = { diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile index a12e23a57b5..88b7120d6f9 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitaly/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' gem 'github-linguist', '~> 4.7.0', require: 'linguist' -gem 'gitaly-proto', '~> 0.31.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly' gem 'activesupport' diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock index 9d2f03b531e..68433fc6878 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitaly/Gemfile.lock @@ -13,7 +13,7 @@ GEM escape_utils (1.1.1) faraday (0.12.2) multipart-post (>= 1.2, < 3) - gitaly-proto (0.31.0) + gitaly-proto (0.37.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -21,7 +21,7 @@ GEM escape_utils (~> 1.1.0) mime-types (>= 1.19) rugged (>= 0.23.0b) - google-protobuf (3.3.0) + google-protobuf (3.4.0.2) googleauth (0.5.3) faraday (~> 0.12) jwt (~> 1.4) @@ -30,7 +30,7 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.4.5) + grpc (1.6.0) google-protobuf (~> 3.1) googleauth (~> 0.5.1) i18n (0.8.1) @@ -63,8 +63,8 @@ PLATFORMS DEPENDENCIES activesupport - gitaly-proto (~> 0.31.0) + gitaly-proto (~> 0.37.0) github-linguist (~> 4.7.0) BUNDLED WITH - 1.15.3 + 1.15.4 diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index ff6555ad8f0..ba8831d370c 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.35.0"; + version = "0.38.0"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "0h3gh4y571wrnnsg5wpi67psih8yssaw24v3vrcpqpkz5linj7pl"; + sha256 = "02s5gjxbjvm990n4h5zkyqj71a9mp4yj83hfl8mma0g7gx00icsf"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix index 06ba56e6b9a..6dc3eb59666 100644 --- a/pkgs/applications/version-management/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitaly/gemset.nix @@ -54,10 +54,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n5bpclizxc42m5kbrhdgsb0ddkl47d0rgmcya5b6sv8qbclkkds"; + sha256 = "1nqp9ib00q55ig8zf1r6ldf3xkqw0874ra1mbcsm8sl46l84lx11"; type = "gem"; }; - version = "0.31.0"; + version = "0.37.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -71,10 +71,10 @@ google-protobuf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1q0ka7x53b9vx4wdb2jdvwxxpb5i5ns7fhqb9zgbrp8yy1bg9m9p"; + sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.0.2"; }; googleauth = { dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; @@ -89,10 +89,10 @@ dependencies = ["google-protobuf" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38"; + sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52"; type = "gem"; }; - version = "1.4.5"; + version = "1.6.0"; }; i18n = { source = { diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 590070f04a2..1fdb529d9ac 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "5.8.0"; + version = "5.9.0"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1zqd7lys309ylbg45vm1apyx9r82kq1drwinr3di2ybb64v3z2q8"; + sha256 = "1zjlwivksaqlfxxhxjgpqa3293nhijw76fj7nv0l11820wplc7yf"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 5a38c956be1..97af3413b15 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -16,7 +16,7 @@ gem 'mysql2', '~> 0.4.5', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres gem 'rugged', '~> 0.26.0' -gem 'grape-route-helpers', '~> 2.0.0' +gem 'grape-route-helpers', '~> 2.1.0' gem 'faraday', '~> 0.12' @@ -31,7 +31,7 @@ gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.4.1' +gem 'omniauth-google-oauth2', '~> 0.5.2' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.7.0' @@ -64,7 +64,7 @@ gem 'gpgme' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.0.3', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki @@ -76,7 +76,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.4', require: false gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API -gem 'grape', '~> 0.19.2' +gem 'grape', '~> 1.0' gem 'grape-entity', '~> 0.6.0' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' @@ -128,7 +128,7 @@ gem 'asciidoctor-plantuml', '0.0.7' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.0' +gem 'nokogiri', '~> 1.8.1' # Diffs gem 'diffy', '~> 3.1.0' @@ -141,8 +141,6 @@ end # State machine gem 'state_machines-activerecord', '~> 0.4.0' -# Run events after state machine commits -gem 'after_commit_queue', '~> 1.3.0' # Issue tags gem 'acts-as-taggable-on', '~> 4.0' @@ -183,7 +181,7 @@ gem 'connection_pool', '~> 2.0' gem 'hipchat', '~> 1.5.0' # JIRA integration -gem 'jira-ruby', '~> 1.1.2' +gem 'jira-ruby', '~> 1.4' # Flowdock integration gem 'gitlab-flowdock-git-hook', '~> 1.0.1' @@ -206,9 +204,6 @@ gem 'kubeclient', '~> 2.2.0' # d3 gem 'd3_rails', '~> 3.5.0' -# underscore-rails -gem 'underscore-rails', '~> 1.8.0' - # Sanitize user input gem 'sanitize', '~> 2.0' gem 'babosa', '~> 1.0.2' @@ -229,7 +224,7 @@ gem 'ace-rails-ap', '~> 4.1.0' gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding -gem 'charlock_holmes', '~> 0.7.3' +gem 'charlock_holmes', '~> 0.7.5' # Faster JSON gem 'oj', '~> 2.17.4' @@ -329,7 +324,7 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.4' - gem 'capybara', '~> 2.6.2' + gem 'capybara', '~> 2.15.0' gem 'capybara-screenshot', '~> 1.0.0' gem 'poltergeist', '~> 1.9.0' @@ -339,6 +334,7 @@ group :development, :test do gem 'rubocop', '~> 0.49.1', require: false gem 'rubocop-rspec', '~> 1.15.1', require: false + gem 'rubocop-gitlab-security', '~> 0.1.0', require: false gem 'scss_lint', '~> 0.54.0', require: false gem 'haml_lint', '~> 0.26.0', require: false gem 'simplecov', '~> 0.14.0', require: false @@ -352,7 +348,9 @@ group :development, :test do gem 'activerecord_sane_schema_dumper', '0.2' - gem 'stackprof', '~> 0.2.10' + gem 'stackprof', '~> 0.2.10', require: false + + gem 'simple_po_parser', '~> 1.1.2', require: false end group :test do @@ -394,12 +392,12 @@ gem 'net-ssh', '~> 4.1.0' # Required for ED25519 SSH host key support group :ed25519 do gem 'rbnacl-libsodium' - gem 'rbnacl', '~> 3.2' + gem 'rbnacl', '~> 4.0' gem 'bcrypt_pbkdf', '~> 1.0' end # Gitaly GRPC client -gem 'gitaly', '~> 0.26.0' +gem 'gitaly-proto', '~> 0.33.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false @@ -409,5 +407,6 @@ gem 'flipper-active_record', '~> 0.10.2' # Structured logging gem 'lograge', '~> 0.5' +gem 'grape_logging', '~> 1.7' gem 'activerecord-nulldb-adapter' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index d729b62d8f9..61c5335962b 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -48,8 +48,6 @@ GEM ice_nine (~> 0.11.0) memoizable (~> 0.4.0) addressable (2.3.8) - after_commit_queue (1.3.0) - activerecord (>= 3.0) akismet (2.0.0) allocations (1.0.5) arel (6.0.4) @@ -104,9 +102,9 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (9.0.6) - capybara (2.6.2) + capybara (2.15.1) addressable - mime-types (>= 1.16) + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) @@ -119,7 +117,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) - charlock_holmes (0.7.3) + charlock_holmes (0.7.5) chronic (0.10.2) chronic_duration (0.10.6) numerizer (~> 0.1.1) @@ -207,7 +205,7 @@ GEM multi_json fast_gettext (1.4.0) ffaker (2.4.0) - ffi (1.9.10) + ffi (1.9.18) flay (2.8.1) erubis (~> 2.7.0) path_expander (~> 1.0) @@ -279,7 +277,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly (0.26.0) + gitaly-proto (0.33.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -298,7 +296,7 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab-markup (1.5.1) - gitlab_omniauth-ldap (2.0.3) + gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) @@ -334,7 +332,7 @@ GEM multi_json (~> 1.10) retriable (~> 1.4) signet (~> 0.6) - google-protobuf (3.3.0) + google-protobuf (3.4.0.2) googleauth (0.5.1) faraday (~> 0.9) jwt (~> 1.4) @@ -345,12 +343,9 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (0.19.2) + grape (1.0.0) activesupport builder - hashie (>= 2.1.0) - multi_json (>= 1.3.2) - multi_xml (>= 0.5.2) mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept @@ -358,11 +353,13 @@ GEM grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) - grape-route-helpers (2.0.0) + grape-route-helpers (2.1.0) activesupport - grape (~> 0.16, >= 0.16.0) + grape (>= 0.16.0) rake - grpc (1.4.0) + grape_logging (1.7.0) + grape + grpc (1.4.5) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) @@ -378,7 +375,7 @@ GEM thor tilt hashdiff (0.3.4) - hashie (3.5.5) + hashie (3.5.6) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) @@ -411,8 +408,9 @@ GEM cause json ipaddress (0.8.3) - jira-ruby (1.1.2) + jira-ruby (1.4.1) activesupport + multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) jquery-rails (4.1.1) @@ -485,7 +483,8 @@ GEM method_source (0.8.2) mime-types (2.99.3) mimemagic (0.3.0) - mini_portile2 (2.2.0) + mini_mime (0.1.4) + mini_portile2 (2.3.0) minitest (5.7.0) mmap2 (2.2.7) mousetrap-rails (1.4.6) @@ -499,8 +498,8 @@ GEM net-ldap (0.16.0) net-ssh (4.1.0) netrc (0.11.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) numerizer (0.1.1) oauth (0.5.1) oauth2 (1.4.0) @@ -535,8 +534,8 @@ GEM omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.4.1) - jwt (~> 1.5.2) + omniauth-google-oauth2 (0.5.2) + jwt (~> 1.5) multi_json (~> 1.3) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.3.1) @@ -569,7 +568,7 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (0.9.6) - parallel (1.11.2) + parallel (1.12.0) paranoia (2.3.1) activerecord (>= 4.0, < 5.2) parser (2.4.0.0) @@ -690,7 +689,7 @@ GEM rake (12.0.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rbnacl (3.4.0) + rbnacl (4.0.2) ffi rbnacl-libsodium (1.0.11) rbnacl (>= 3.0.1) @@ -730,7 +729,7 @@ GEM retriable (1.4.1) rinku (2.0.0) rotp (2.1.2) - rouge (2.1.0) + rouge (2.2.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -777,6 +776,8 @@ GEM rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-gitlab-security (0.1.0) + rubocop (>= 0.47.1) rubocop-rspec (1.15.1) rubocop (>= 0.42.0) ruby-fogbugz (0.2.1) @@ -838,6 +839,7 @@ GEM faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) + simple_po_parser (1.1.2) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) @@ -905,7 +907,6 @@ GEM uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - underscore-rails (1.8.3) unf (0.1.4) unf_ext unf_ext (0.0.7.2) @@ -952,7 +953,7 @@ GEM expression_parser rinku xml-simple (1.1.5) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) PLATFORMS @@ -965,7 +966,6 @@ DEPENDENCIES activerecord_sane_schema_dumper (= 0.2) acts-as-taggable-on (~> 4.0) addressable (~> 2.3.8) - after_commit_queue (~> 1.3.0) akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.6.0) @@ -985,10 +985,10 @@ DEPENDENCIES browser (~> 2.2) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.6.2) + capybara (~> 2.15.0) capybara-screenshot (~> 1.0.0) carrierwave (~> 1.1) - charlock_holmes (~> 0.7.3) + charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) concurrent-ruby (~> 1.0.5) @@ -1027,19 +1027,20 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.26.0) + gitaly-proto (~> 0.33.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) - gitlab_omniauth-ldap (~> 2.0.3) + gitlab_omniauth-ldap (~> 2.0.4) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) google-api-client (~> 0.8.6) gpgme - grape (~> 0.19.2) + grape (~> 1.0) grape-entity (~> 0.6.0) - grape-route-helpers (~> 2.0.0) + grape-route-helpers (~> 2.1.0) + grape_logging (~> 1.7) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes @@ -1049,7 +1050,7 @@ DEPENDENCIES html2text httparty (~> 0.13.3) influxdb (~> 0.2) - jira-ruby (~> 1.1.2) + jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) jquery-rails (~> 4.1.0) json-schema (~> 2.6.2) @@ -1069,7 +1070,7 @@ DEPENDENCIES mysql2 (~> 0.4.5) net-ldap net-ssh (~> 4.1.0) - nokogiri (~> 1.8.0) + nokogiri (~> 1.8.1) oauth2 (~> 1.4) octokit (~> 4.6.2) oj (~> 2.17.4) @@ -1081,7 +1082,7 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.4.1) + omniauth-google-oauth2 (~> 0.5.2) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-saml (~> 1.7.0) @@ -1115,7 +1116,7 @@ DEPENDENCIES rainbow (~> 2.2) raindrops (~> 0.18) rblineprof (~> 0.3.6) - rbnacl (~> 3.2) + rbnacl (~> 4.0) rbnacl-libsodium rdoc (~> 4.2) re2 (~> 1.1.1) @@ -1134,6 +1135,7 @@ DEPENDENCIES rspec-set (~> 0.1.3) rspec_profiling (~> 0.0.5) rubocop (~> 0.49.1) + rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.15.1) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.16.2) @@ -1152,6 +1154,7 @@ DEPENDENCIES sidekiq (~> 5.0) sidekiq-cron (~> 0.6.0) sidekiq-limit_fetch (~> 3.4) + simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) spinach-rails (~> 0.2.1) @@ -1170,7 +1173,6 @@ DEPENDENCIES truncato (~> 0.7.9) u2f (~> 0.2.1) uglifier (~> 2.7.2) - underscore-rails (~> 1.8.0) unf (~> 0.1.4) unicorn (~> 5.1.0) unicorn-worker-killer (~> 0.4.4) @@ -1183,4 +1185,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.15.3 + 1.15.4 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 9087ff6fdc0..93829b05dae 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -18,11 +18,11 @@ let }; }; - version = "9.5.5"; + version = "10.0.2"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "1wrwxksfqkha7qm2hbgs0z7lmgisdvdqa4wcll0qfzq1c3d286zz"; + sha256 = "0jsqjarvjzbxv1yiddzp5xwsqqrq5cvam0xn749p1vzqhcp8pahc"; }; in @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "0qi21lkq69ah977vssbkllb7q5jwb0vf2ws5s3bzpvp2mj3iab5m"; + sha256 = "1602d6nkb41gg80n6p0wqxrjsn79s0z3817461d8dw2ha2dmbl34"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index fd27c643597..34567ddb3ea 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -122,15 +122,6 @@ }; version = "2.3.8"; }; - after_commit_queue = { - dependencies = ["activerecord"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jrhvj4335dsrj0xndbf7a7m2inbwbx1knc0bwgvmkk1w47l43s0"; - type = "gem"; - }; - version = "1.3.0"; - }; akismet = { source = { remotes = ["https://rubygems.org"]; @@ -383,13 +374,13 @@ version = "9.0.6"; }; capybara = { - dependencies = ["addressable" "mime-types" "nokogiri" "rack" "rack-test" "xpath"]; + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ln77a5wwhd5sbxsh3v26xrwjnza0rgx2hn23yjggdlha03b00yw"; + sha256 = "0bahhwrd1rpfhci1x57yz0df9plziipljbw3p4k6mlash4wq6w92"; type = "gem"; }; - version = "2.6.2"; + version = "2.15.1"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -420,10 +411,10 @@ charlock_holmes = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7"; + sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.5"; }; chronic = { source = { @@ -859,10 +850,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; }; - version = "1.9.10"; + version = "1.9.18"; }; flay = { dependencies = ["erubis" "path_expander" "ruby_parser" "sexp_processor"]; @@ -1076,14 +1067,14 @@ }; version = "0.3.2"; }; - gitaly = { + gitaly-proto = { dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vm3kp2qrlkrdd1r386fg97av73y2k3xxw4xl9wfjdqqhisyi6hw"; + sha256 = "0f15idw1850kwi0na6x3xlk13ljwx3mpfnxfv58631cmb3ac7wf8"; type = "gem"; }; - version = "0.26.0"; + version = "0.33.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1132,10 +1123,10 @@ dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lx5ayb8m2avw6iy9fq0d847z78npg2aax4pbcbprwwmpbnvzz4b"; + sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.4"; }; globalid = { dependencies = ["activesupport"]; @@ -1194,10 +1185,10 @@ google-protobuf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1q0ka7x53b9vx4wdb2jdvwxxpb5i5ns7fhqb9zgbrp8yy1bg9m9p"; + sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.0.2"; }; googleauth = { dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; @@ -1218,13 +1209,13 @@ version = "2.0.13"; }; grape = { - dependencies = ["activesupport" "builder" "hashie" "multi_json" "multi_xml" "mustermann-grape" "rack" "rack-accept" "virtus"]; + dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ida2agz4f6hfxc4nvmls15f9cl1xg2pra04d388x40r5dmjp04x"; + sha256 = "1vz5lx56z9hwx6ifyc7qpdwd020xb3ynv3vahvlcgm01qi7ykdhv"; type = "gem"; }; - version = "0.19.2"; + version = "1.0.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1239,19 +1230,28 @@ dependencies = ["activesupport" "grape" "rake"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qkaf2l56rxhacviqpzgqiwiv1fpbpxg5xgyp18x66mgxp9bpram"; + sha256 = "0ja4dlakk6r8p2cx113kymz9sbhdybjsiynnqpfs71lv0r6mmghj"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; + }; + grape_logging = { + dependencies = ["grape"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza"; + type = "gem"; + }; + version = "1.7.0"; }; grpc = { dependencies = ["google-protobuf" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1siq5v4bmqlsb6122394dpk35fd2lxvjp4xnrabsb3vd90xqszcj"; + sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.5"; }; haml = { dependencies = ["tilt"]; @@ -1291,10 +1291,10 @@ hashie = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0lfmbh98ng141m7yc8s4v56v49ppam416pzvd2d7pg85wmm44ljw"; + sha256 = "120mkd2hkwhcfj7avi1dphb0lm7wx364d1cjm9yr4fibqpvsgqi7"; type = "gem"; }; - version = "3.5.5"; + version = "3.5.6"; }; hashie-forbidden_attributes = { dependencies = ["hashie"]; @@ -1434,13 +1434,13 @@ version = "0.8.3"; }; jira-ruby = { - dependencies = ["activesupport" "oauth"]; + dependencies = ["activesupport" "multipart-post" "oauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "03n76a8m2d352q29j3yna1f9g3xg9dc9p3fvvx77w67h19ks7zrf"; + sha256 = "14019mliqwcppj6qp2wdhh5gbvs2yh2idibag13m9a18ag965bhw"; type = "gem"; }; - version = "1.1.2"; + version = "1.4.1"; }; jquery-atwho-rails = { source = { @@ -1700,13 +1700,21 @@ }; version = "0.3.0"; }; + mini_mime = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kzf2zx1arhjhw9c6mns0jqbmzdkd1vw25v940lvw63fzkbfv6dg"; + type = "gem"; + }; + version = "0.1.4"; + }; mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm"; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; minitest = { source = { @@ -1809,10 +1817,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn"; + sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; numerizer = { source = { @@ -1932,10 +1940,10 @@ dependencies = ["jwt" "multi_json" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m6v2vm3h21ychd10wzkdhyhnrk9zhc1bgi4ahp5gwy00pggrppw"; + sha256 = "1sri7pn9pm7nr93zj7j1g4gqd3rpibqw7v09s1c6fihh5cmjz3fz"; type = "gem"; }; - version = "0.4.1"; + version = "0.5.2"; }; omniauth-kerberos = { dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; @@ -2046,10 +2054,10 @@ parallel = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1yxhk64sfkm84v509m3mzmp0b7ra9lc7s8k6113yk9faih3g7w7v"; + sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd"; type = "gem"; }; - version = "1.11.2"; + version = "1.12.0"; }; paranoia = { dependencies = ["activerecord"]; @@ -2441,10 +2449,10 @@ dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xb4khgjblrmp1xgkjbmca0wl97i0nazf9pgx69vwr1ac03j920"; + sha256 = "08dkigw8wdx53hviw1zqrs7rcrzqcwh9jd3dvwr72013z9fmyp48"; type = "gem"; }; - version = "3.4.0"; + version = "4.0.2"; }; rbnacl-libsodium = { dependencies = ["rbnacl"]; @@ -2620,10 +2628,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1932gvvzfdky2z01sjri354ak7wq3nk9jmh7fiydfgjchfwk7sr4"; + sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -2740,6 +2748,15 @@ }; version = "0.49.1"; }; + rubocop-gitlab-security = { + dependencies = ["rubocop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy"; + type = "gem"; + }; + version = "0.1.0"; + }; rubocop-rspec = { dependencies = ["rubocop"]; source = { @@ -2990,6 +3007,14 @@ }; version = "0.7.3"; }; + simple_po_parser = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3"; + type = "gem"; + }; + version = "1.1.2"; + }; simplecov = { dependencies = ["docile" "json" "simplecov-html"]; source = { @@ -3280,14 +3305,6 @@ }; version = "2.7.2"; }; - underscore-rails = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0iyspb7s49wpi9cc314gvlkyn45iyfivzxhdw0kql1zrgllhlzfk"; - type = "gem"; - }; - version = "1.8.3"; - }; unf = { dependencies = ["unf_ext"]; source = { @@ -3455,9 +3472,9 @@ dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w"; + sha256 = "1ha626m6fh50fpilb9pdnmq9xl586w7c0zyidg895c3iq13rqgyw"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 0c56140b9f0..c88f525715e 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -62,22 +62,16 @@ diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb index 59b21149a9..4f4a39a06c 100644 --- a/lib/gitlab/logger.rb +++ b/lib/gitlab/logger.rb -@@ -13,20 +13,20 @@ module Gitlab +@@ -13,7 +13,7 @@ end def self.read_latest - path = Rails.root.join("log", file_name) + path = File.join(ENV["GITLAB_LOG_PATH"], file_name) - self.build unless File.exist?(path) - tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path})) - tail_output.split("\n") - end - def self.read_latest_for(filename) -- path = Rails.root.join("log", filename) -+ path = File.join(ENV["GITLAB_LOG_PATH"], filename) - tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path})) - tail_output.split("\n") + return [] unless File.readable?(path) + +@@ -22,7 +22,7 @@ end def self.build @@ -158,3 +152,14 @@ index b276a81eac..070e3ebd81 100644 end end end +--- a/lib/api/api.rb 1970-01-01 01:00:01.000000000 +0100 ++++ b/lib/api/api.rb 2017-09-28 19:37:24.953605705 +0200 +@@ -2,7 +2,7 @@ + class API < Grape::API + include APIGuard + +- LOG_FILENAME = Rails.root.join("log", "api_json.log") ++ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log") + + use GrapeLogging::Middleware::RequestLogger, + logger: Logger.new(LOG_FILENAME), From 83405798e693373a509d1a8e7010f55233d0912b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 23:13:49 +0200 Subject: [PATCH 0418/2806] 17.09 release notes: update information on gitlab --- nixos/doc/manual/release-notes/rl-1709.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index cdfecc2bb75..6fa58508335 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -525,7 +525,8 @@ FLUSH PRIVILEGES; have been added to the postfix module and has been improved further. - The GitLab package and module have been updated to the latest 9.5 release. + The GitLab package and module have been updated to the latest 10.0 + release. The systemd-boot boot loader now lists the NixOS From f0fa565dfb85c267e06048c8971cb3ee79ef8e3a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 23:14:11 +0200 Subject: [PATCH 0419/2806] qpid-cpp: fix build --- pkgs/servers/amqp/qpid-cpp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index adbf156730e..6c256d14fe7 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { sed -i '/ENV/d' src/CMakeLists.txt ''; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=unused-function"; + meta = { homepage = http://qpid.apache.org; repositories.git = git://git.apache.org/qpid.git; From 169a344ab80d58686dda6e99e23597035d48d30d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 23:42:05 +0200 Subject: [PATCH 0420/2806] python.pkgs.futurist: dontCheck --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f817f22637..e4f8d6abfc1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14033,6 +14033,8 @@ in { testtools testscenarios testrepository oslotest subunit ]; + # breaks in sandboxing + doCheck = false; }; oslo-messaging = buildPythonPackage rec { From df86f1996896dd1fb57b8fddef888350160d3583 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Sep 2017 21:13:19 +0200 Subject: [PATCH 0421/2806] virt-what: init at 1.18 --- .../virtualization/virt-what/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/virtualization/virt-what/default.nix diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix new file mode 100644 index 00000000000..0236a34bb12 --- /dev/null +++ b/pkgs/applications/virtualization/virt-what/default.nix @@ -0,0 +1,19 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + name = "virt-what-${version}"; + version = "1.18"; + + src = fetchurl { + url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz"; + sha256 = "1x32h7i6lh823wj97r5rr2hg1v215kqzly14dwg0mwx62j1dshmw"; + }; + + meta = with lib; { + description = "Detect if running in a virtual machine and prints its type"; + homepage = "https://people.redhat.com/~rjones/virt-what/"; + maintainers = with maintainers; [ fpletz ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d56971c5263..083e76ee0ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16751,6 +16751,8 @@ with pkgs; ocamlPackages = ocamlPackages_4_01_0; }; + virt-what = callPackage ../applications/virtualization/virt-what { }; + virtmanager = callPackage ../applications/virtualization/virt-manager { vte = gnome3.vte; dconf = gnome3.dconf; From 49f175cd0c80a39e1d05fc687c4a2a40e0aba58c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 29 Sep 2017 00:06:38 +0200 Subject: [PATCH 0422/2806] 17.09 release notes: add network interface rename note Fixes #29197. --- nixos/doc/manual/release-notes/rl-1709.xml | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 6fa58508335..8b0d2549439 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -181,6 +181,53 @@ has the following highlights: following incompatible changes: + + + + In an Qemu-based virtualization environment, the network interface + names changed from i.e. enp0s3 to + ens3. + + + + This is due to a kernel configuration change. The new naming + is consistent with those of other Linux distributions with + systemd. See + + for more information. + + + A machine is affected if the virt-what tool + either returns qemu or + kvm and has + interface names used in any part of its NixOS configuration, + in particular if a static network configuration with + networking.interfaces is used. + + + Before rebooting affected machines, please ensure: + + + + Change the interface names in your NixOS configuration. + The first interface will be called ens3, + the second one ens8 and starting from there + incremented by 1. + + + + + After changing the interface names, rebuild your system with + nixos-rebuild boot to activate the new + configuration after a reboot. If you switch to the new + configuration right away you might lose network connectivity! + If using nixops, deploy with + nixops deploy --force-reboot. + + + + + The aiccu package was removed. This is due to SixXS From 7ea5672e85ff4a1535857cfaf27d8ed08c0b7dd2 Mon Sep 17 00:00:00 2001 From: edef Date: Fri, 29 Sep 2017 00:05:44 +0200 Subject: [PATCH 0423/2806] wmsm.app: compile in gnu89 mode it expects `inline` to expose a symbol, which hasn't been the case since C99, breaking linking. --- .../window-managers/windowmaker/dockapps/wmsm.app.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix index e211abe0ea5..cf9a19c12d2 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation { postUnpack = "sourceRoot=\${sourceRoot}/wmsm"; + NIX_CFLAGS_COMPILE = "-std=gnu89"; + installPhase = '' substituteInPlace Makefile --replace "PREFIX = /usr/X11R6/bin" "" --replace "/usr/bin/install" "install" mkdir -pv $out/bin; From 751d397ad486a84b93907345124f550e3b32427c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 28 Sep 2017 18:40:11 -0400 Subject: [PATCH 0424/2806] Fix evaluation --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index 3e30ec515fc..ae8a1899b19 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -60,7 +60,7 @@ let nixpkgsVersion mod; inherit (fixedPoints) fix fix' extends composeExtensions - makeExtensible makeExtensibleWithCustomName; + makeExtensible makeExtensibleWithCustomName makeExtensibleWithInterface; inherit (attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues catAttrs filterAttrs filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs From 9ce7175cfe9edf5f7eb9a9f299807047a4feeaf1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 28 Sep 2017 18:44:10 -0400 Subject: [PATCH 0425/2806] Fix tarball --- lib/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index ae8a1899b19..9da78ff0da7 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -88,7 +88,8 @@ let inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith addPassthru hydraJob makeScope; + callPackageWith callPackagesWith addPassthru hydraJob makeScope + callPackageWithOutputWith; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio hiPrioSet; From 01a3f0b8aabdb321b15dc7cc0e2287ce8232f797 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 28 Sep 2017 18:51:20 -0400 Subject: [PATCH 0426/2806] Avoid polluting lib namespace unncessarily --- lib/customisation.nix | 2 +- lib/default.nix | 5 ++--- pkgs/top-level/haskell-packages.nix | 2 +- pkgs/top-level/splice.nix | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 217daada781..304bb228449 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -81,7 +81,7 @@ rec { }); }; - in lib.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: { + in lib.fixedPoints.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: { args = origArgs; val = f output self.args self.val; }); diff --git a/lib/default.nix b/lib/default.nix index 9da78ff0da7..3e30ec515fc 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -60,7 +60,7 @@ let nixpkgsVersion mod; inherit (fixedPoints) fix fix' extends composeExtensions - makeExtensible makeExtensibleWithCustomName makeExtensibleWithInterface; + makeExtensible makeExtensibleWithCustomName; inherit (attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues catAttrs filterAttrs filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs @@ -88,8 +88,7 @@ let inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith addPassthru hydraJob makeScope - callPackageWithOutputWith; + callPackageWith callPackagesWith addPassthru hydraJob makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio hiPrioSet; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a1f9b2e81c3..dce783b3f98 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -24,7 +24,7 @@ let }; callPackage = lib.callPackageWith (pkgs // { inherit haskellLib; }); - callPackageWithOutput = lib.callPackageWithOutputWith (pkgs // { inherit haskellLib; }); + callPackageWithOutput = lib.customisation.callPackageWithOutputWith (pkgs // { inherit haskellLib; }); in rec { lib = haskellLib; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index d6498be949b..599c108062c 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -86,5 +86,5 @@ in newScope = extra: lib.callPackageWith (splicedPackages // extra); - newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra); + newScopeWithOutput = extra: lib.customisation.callPackageWithOutputWith (splicedPackages // extra); } From 96939d5a0d5a3907787c3f78eefc64bc026a65e3 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 29 Sep 2017 08:45:18 +0930 Subject: [PATCH 0427/2806] flow: 0.55.0 -> 0.56.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index cbf890ab1ec..fc93d8dc6f8 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.55.0"; + version = "0.56.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "042q2197m9l7r6j053dd4hqaqv7dsc5wh8h6aifkcmqa4ypp4w5r"; + sha256 = "0979hcz5qqblcnkc4whkklzdhm4f45gzfl6y4zp0wbq0qi1gv7x4"; }; installPhase = '' From 0dc882e3d48b4e67e668350af6457e97a9857287 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 29 Sep 2017 01:41:09 +0200 Subject: [PATCH 0428/2806] kicad: don't try to build on hydra --- pkgs/applications/science/electronics/kicad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 4ebc25fa4e8..65b1537d59b 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + hydraPlatforms = []; # 'output limit exceeded' error on hydra }; } From 5b714114136a5497f039af628504b7381a2efc38 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 29 Sep 2017 01:41:37 +0200 Subject: [PATCH 0429/2806] firefox-bin: 55.0.3 -> 56.0 --- .../browsers/firefox-bin/release_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 8a8298ef818..20033e18240 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,955 +1,955 @@ { - version = "55.0.3"; + version = "56.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ach/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ach/firefox-56.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "fdbe702f129c2e8c749fed009609c475282638b5e920defeb65b94cce807f96f8f07d02d916c91b3d50cb9f909b419d2c635b3914f8f059251f33f93b887c797"; + sha512 = "5e91b737751e62f34d2d138956c115120993cd6e8f4f86b7e59dbbcd38f6dc30f7550cac45d3a8ed866cf24c566d042c4ca43bf1e14c8f8452db428a78d167a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/af/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/af/firefox-56.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b5ace58a9cffa219e3a56eb5e427a482dcce4f2e4ac2a6955c3bea6c40b48940763129499803e86742ca3407d4a80973094d9bfce869bc2a321b443258fa5806"; + sha512 = "7e523a24713b84e182ac060562827778d99d9c6125410ba9dffc151e53fa87774943a4dd3ce2c4afc9d17340ab08fd951832af35d5715d143303dbc94bf95d87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/an/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/an/firefox-56.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "d737a3425592ecc474399feb2d1f82fd7cdab362ed406f26671ddb3ce88c8736b17627ac279c12551c2b27432f9ba8bb3dc93b6ca30124cd155848a63bccff06"; + sha512 = "410b11e1bf797a5bbde80fdca6ec0b223e5fb4404441636b633379d42c1bf337faf00f70ac71da2b44c71ef9a1e7fe9aaea0e71184640d5e5f20335d46b9ae03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ar/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ar/firefox-56.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "31e834d78399549ef670e78d2ff9befad6d300dc327853d1435d02533379e23ae38cf3dfff1222e314165c8f80e2e4fb9f364a9a3b33fb3d0aaed3259414d321"; + sha512 = "82b390cb188629f0942c8c23db1c84a377ee6e6046add935faa036c93d7d0e9da50ffdb6f7bd0cee540781fd05fd28e9f5799c6970607e412659a625f850d262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/as/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/as/firefox-56.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "8393861ad7e2ab0a070ba32f38afb59bfabba4510f0f9a85273b4300fd7b2f45461d8e2c0a485e1d5776533d4b0bb8d06c78efc2a2a0c87af55fe5eede33e6f2"; + sha512 = "d321a7b25d3b06ae356ce875b10d42082ada5673ed73edea419a1b021853fc7079c356d8e7a352b248d470bff90adc0ccfdbcfbd886945c219106bfb00b47931"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ast/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ast/firefox-56.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "e091884962a239f65f7bee05e1bdc516091b89ae7be1dd6517c4ae3b8ad34af0c49c04d365114cceca40a6a8af229256f100e4a1aec09e7e284fd6cbee497e54"; + sha512 = "9ea303a429ce7e3c33e306c5c3cf9e8ba30e9c1441b8beddf3480a488fc99fc95f996f3b38763c04539f9438bdecafb77fa019d4b3a81edbcafd024d4afbe32c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/az/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/az/firefox-56.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3324d8041257adf120d08537ffb94e90ff1d701bd60b9bc3016570887c0a2ff2d10a406de599be8bf5146b62647f4b95b87e9fb48736c4d0e747be03a35b6d09"; + sha512 = "6fd4196be196b6770635499c1f4eac4b3b1f67073c8a4c2d78fa89bb50ddf64248e8722bcf2367987bd8eddac93663f7f75790985afd39e1399b71121e73f26f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/be/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/be/firefox-56.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "65861965c8f3c5e37d9b6e919f0ec506340b38a2cfe71905b43802ff3cceaa062ffb49516541253a8c944ea2a6b0c09d6523da6f5b8419857921c08a53b70062"; + sha512 = "3be882b52db840e9d16976a8596877b1266e83bf1523e32467ba914a1295dccd5b578368bd19eb6a2c864a34e0deb06d75ac798b65e8d4216923c9e60826f0ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bg/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bg/firefox-56.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "948b2469ade253a0c174d996053e4855e477f93f6a35351c3c6db10aba6e9894fa850289aa90bc7d830edc8ddad6ddce78f6bf5047f91701152c4b7dea10accc"; + sha512 = "f5e04004f3ae5944e3b2cfd8922a670bf41c962135a6e65fcee7feef70b4e8de9c159bdb823f9819065b4225de621347066a9dc863aab6bec2bebd05b8fc74eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bn-BD/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bn-BD/firefox-56.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "3cba3214ff62b5fbed875e7af40c04382564caa3ab613f44d25aba56eefca893dace583afbae172153fcbf1adc13cd0545e3c80ee72631862f46e4211589e103"; + sha512 = "6383795dbc65a2d63485bb9014b6119259bf07cdd9e0240fbbf3101b9c955d2008739dc8a7cea4e98ae17212ffb867cfc88ec781935a27d2a8e009e3f2bdb66b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bn-IN/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bn-IN/firefox-56.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "8a9335fce85a4787c091053842a45e2234ba13ac75568209d965f28a8d40ec42f8eef8da62878c0f8f17b6db052f72a00798bf2bbc37c7de9c861efcebd9e41a"; + sha512 = "0233366e72f24498be112a584180181401b3bd5dd9dbfdd5b5a320ae2fb7e96c283e0b142c8e3a46e8f3a1ad9958833f7ce3f4a85add5f5b70a3b0e7ca29d996"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/br/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/br/firefox-56.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1b08b96c1030302ac47baafbaec63ce87a5744a284c20a6432208d0e3c7750f15941f89c69fe3f8a7875a7eaf7a9872855c72c4157447799edc2ba6bcf3768e0"; + sha512 = "667ade9dae138550defba527024f0900ae78a84d98f427ab5d767140d3bb0636677390ca0365dde4b526e2b0b318ab87aaf6c39f85818fc9f2dc671fb7a4a39b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bs/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bs/firefox-56.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "35e3a1c0b098c5ccf68e2b4547cedc513d31ca62897e0a6ceb6283e0af565ee7a1da847459217dca94c3e192e5b643dd0fb1e302ca54d866f7023841722f8aef"; + sha512 = "0addc663903145e6a95350ee23c734e7fc42156c07d27e60efc0228da0e4b20f230f76e7802edc795b95c8ba7c1db3133896f4bc3e56221a782eeb78ca57409f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ca/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ca/firefox-56.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "372881da1ab01c36e06c9bbc7a67c12adf2af454afb8baee79b506d65e99754340e0650a7c16f01ee6735d2c2bad6ba82ea437f3d6265f17efe2ba26d4b55471"; + sha512 = "3a9b9622324528b7c7196269cd76ef6e15063ffd1944277ff4ec7cec8f972001718368154a5edbe7af8247262218aed697db46296a13e5861432848d3a29475a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cak/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/cak/firefox-56.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "447414a13729e3eef3311802c4714a00c707f3567d4d90687420972f57f4ab7079afcc741f7ea0e992f916786919c27a6670424036b50fac3be52bfe8eefbc8a"; + sha512 = "b691c0828637e13cb73ff281a939030effd78c7760cdd5826f723ea7b13f4c7b63bfddcfb27b61aab414f1621291756f5b98ca966efeac368e21e780147affeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cs/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/cs/firefox-56.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2eb5388d2dfccc213c730cf605b134e51c68496c93dec255c9ede8820de2d40968371e989f125c4ee938622312e782d6d68b28c836e7c8cfbfbfb100ddf59441"; + sha512 = "d99ac651fb417674cbc0750e5e1250d2e622275eead4d9709107f05359d1f62b248295e9120cc0ef1d5de61d22c0f3a889470b1b7fd4c04440d0f1a4730071d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cy/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/cy/firefox-56.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f27a12d1e9c9c5712f2da5236a2d81b8958eb8a208cabb8b6e1e75e40579bcefd9ea17a64d5f530248ae8f288ac1628ee350b1b280aedf3dfb8948d5cb800983"; + sha512 = "68bab0e265332111a09f04d651bbfca5b462cfd0c4ecc81f7f09f5722f52bd9a089ac28303879681d9ddc7c0da7456f71cc1a67094d2165d3f722c25ccd8115f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/da/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/da/firefox-56.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f8957fea57b1f48ea18eb65bcf5caf3d5f71aa3ad44c697861d9b7c7655cfa99c66a49b034eacb8530d42a66b2a458ce4a4c97890bf8f28cb06d24d000517c57"; + sha512 = "694e988e88b8b111f4c47e75dd439b03edf5e6d3476a0aaf6ff6a64f3732f2b47bb5639a017e026b49d5cad28ff2d9beaa1fdf39571400cf64753a2830a162a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/de/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/de/firefox-56.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "11a2076a5502d2edcf91a0b1e8776f71be3e5970885843096ab2e576dc5910da6b758b9372caba83fb5a6c20fafbc1dfa8d0a238020b32f93a7ffe50ba1ec430"; + sha512 = "9647ad2fb13dbbd3bf83c43acfd835fcabcfc27480f31798939065ddd6fa4559fd22d11b656a735f88f30895842059c34f6860b61945e96608756306c3447957"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/dsb/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/dsb/firefox-56.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e788a73b2b77d2cf6aac1557814df1d88ad9e036b1d58218781dc284433f3b8b9e1a34be4c0bceabb99b6238dca2f9dee8f5e97a994e09f5fae175eec7e34b9a"; + sha512 = "0faa30e572a216576ea8ef60d0d23847fe731634cbe87873a4e7fbd74dbfef85f7ea1c46175d5519ee0265a36603a97c0641c564f72a89de623320137dffbdd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/el/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/el/firefox-56.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "03099311390384c652e7dbbcb41d60eae522a1ecaa69b6e17e214fc0e06f81739456a2543adf9808b2b08d6b0c0b84dbea6168c70be4cc1ef71a04e81164792b"; + sha512 = "754f1dd8cc5e229af2f66205054c60d6c5c78f92e8434a2c079a2e4f0ef28a4b29e1b5ffa0e1828c613b749fa0105874dea03bceb6b2e3a01fb910f1a91005f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-GB/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/en-GB/firefox-56.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "e971fdbb2cbe2e080f75900df9a32506e26eb07859f635c9f9b4738ad20cf7bc939bfe6b8a91455178d124a29d869f5f960ad9bac64ac863d31dae3a2f4ab2b8"; + sha512 = "c16a44f0b057075193bcdad11220ab8e2a4f342980b5b04912bf00a4dd7c6f92d8367319422e27f96413f2aefbbd60b012d62909658a42cf62b5d12abc09ea19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-US/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/en-US/firefox-56.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "99f270542b0d77a0bf2ce7926dcff04a356785af9269854eb12bd50c179e1d5b6db66885900a0f1dbfd1ae50a40298a2be7610b55380886719fbb3890f9e66fa"; + sha512 = "8b92bd537c2f962855e7ee4b259c99f3ecdb9939c56da118f38063588de222fddd66ea72fe95ceca5895229804fcb946ece9fd5beb476be771be430804d06be1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-ZA/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/en-ZA/firefox-56.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "837b11040ac50920f41400bb7764864a42fa84da9da6c606c9475f862cec3bcae8ea1bba3b72424c668d9bc036a00c7c360ad248285ca8d6f6d94aa46c80b868"; + sha512 = "bbe364ece5f1da652530684fa36d2e13051fc85f90c147046110acaf4266ae187067a7b1c59dd48cdbfc5e10ca8df478579e20d19ed1e00b839f4fa1e99c2608"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/eo/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/eo/firefox-56.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "0d7c650fa35e75a6af940bdb4662e03fe4a76f5fc3750ec4f813bc6570fce252256f6fd1e6b26a15c6f19c819a0e0bb2a26325015feb37b4f5318a018a8c09ef"; + sha512 = "2098fcc0e8405a3ac148ab4aa6ea3fd686b4ca839a3102886de515234b06a246bf4c588e6e0b3ecb0ce5c053b4f42e1d01cce79249ca22e041ec35e151b58ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-AR/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-AR/firefox-56.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "442370c45f57cf0a63da9d7b33e377b766d71c80606144d4cdfa956c6d4d5c91314cd3f9b7db007cefc762dd2cf79bbe1999842f1ff74bcd85affb7ed1305158"; + sha512 = "868e89a57c7ec69ff936dfc3dc3042ababa7c703bbabf5c12044668de922f22f0fe395f792891c839739e859a570676605d17c3c86c362b78155089e9ebc2437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-CL/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-CL/firefox-56.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ce5cc274961638c396ea3350857c79fcf39bfd116a9f3ceda74bef9d5eee2dfab54b12d77cd9e0a01bf98856f0b7eb8ca155fab50f444a4eab785086e8045734"; + sha512 = "cab2543a4d0d2201f4d956a5a35593c0f52df8ebf03ab4872450c409b11ea9c13b794897d8f4bfab6d362d50e72823c57405f8d78d3204d5f621592e188e69dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-ES/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-ES/firefox-56.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "45aa1e6e9df4bde4fe67296ce735eac1356e20bdfde638944f809338869ce243c16a23bd6c066cc3df54cd1a8b7ed1937eeb56f556803dceb3b1fcdc2ecc273d"; + sha512 = "4f48a78207b5bfafccd8c76f5d5e06a38e79fda36739ef3f2f6359cd392c02a79367eaf8c136ed56c8ead59dd176388de3bbab6146898939fa93db01cfbf53a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-MX/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-MX/firefox-56.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "17c4ccef75bbe794d398121beaccdc3110d58991d5a0bfca857914c8fca5c866b45d1e4cd07e2be8f4f029a058179d61c774b74f1e9c6fb513e547a79ea901cb"; + sha512 = "deaf33a4da6e9caf88668d6ca1f634f581c258f8d2ae47d1631735e5311a2818ff951c5a95c6c555dcdc3a182872bd64efceaeea3350ec6229c5207366f8a928"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/et/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/et/firefox-56.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "072b65588b1829309af5b84fe46e15974f8689e07be1bd24fd09cf5ae403d66ff196b1deac32de70d97fd5984d5579aa991a9fcde4df8fdd1884050507dab13f"; + sha512 = "9ccdebf0492d629be1e6514cbb9422bbb224bd7894e05d6343fcec32dad2e6817727c9becc1df487b402a5e61880d073f3315f4fbe221905c60d5c8324bbd57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/eu/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/eu/firefox-56.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "dfde116081eb810215d29a142f6f3c16c0664c01415c6d2f3cd6385097b55a49b112090934700e9c217a286e345be13236df1768f602232db2da0a47edeecf03"; + sha512 = "2acea950147b6ccc824a42a0256730a6fa1e7226a4bb3ad093a555af5d8323c1a4cbf8affa20ffdedbb3a0c1e2629082dcd01a8c4a18490c1cec579f6546e371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fa/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fa/firefox-56.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7b934fcef4d9eda9895f4ea1a0e52e8ff40186bfec73e8c1171d0d96ee6a2b19d7a077e4208c0d6c768f6078a90525772086ca08a179036a2723443761e69259"; + sha512 = "e4694064bfc8e00b3afb3c83c5286e93010c2d9a90daf781bf141787190aa6314bcfec9ba542fa136efa653b7527ba7c264ff4cd8cf1e529f1402ec2abe90f3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ff/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ff/firefox-56.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "1e6667da86ad91d5bdbd27bdd615f8152a84e01d6304de4da90d48baefd758fc6e124c4253a00a89431b6c860ea574687237fb20b8ff95f52ee55b661447e723"; + sha512 = "93d864d355ebea2d8add77031f490edb13f1e1faaa65e4207a4013c5bab1b473f6fd8d7f5867cd5a3bc30aa23263911f4dab2552adf570675427bbd3e3e93268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fi/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fi/firefox-56.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "24d8f011fff7425163a3a1ebc497eef9fbecdba8deec7ced18d1af0dfbc2e0dc31dffe29a7d6179972026aa04f5111ecfb5d1bdb29f466d041e5ba8058ae7f31"; + sha512 = "2bbdbe8798e2050432bc53f655d533fde999c8081a8a7d494e48d482afb572a08b3c63840124dd50374cca813aae7e87629cfcd68ef9596eb749b5bcef0270d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fr/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fr/firefox-56.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "651bbba82549e5309373cc8ba3bf00c0cb87f0a8e1f943ef4c55b1d9157879a6c0132a8a296a9df3d10a501a1a13dbbfc18ce97febeab9b2e19fd87c00ce860a"; + sha512 = "c3903b640f674f5da1a7097543e917ea7c56c2c8749a30776fdaeb518d7b0ac874533cca0aae643d24175fa6307ec5cf00ab457ce3dbcad52a02e4269c12550f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fy-NL/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fy-NL/firefox-56.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0adfc657c5e29e0af9c33972a93973ade9a4441e32998a1e8ac45ef814791637e26fad074ea2d3669f5d3261bd48afcf1abb30170844db12ad49a1a1b0a28bc6"; + sha512 = "246cc7102dd43351a6751f71b30e347a67db6997744fd6b94d2179706304a370a36bf31b00aec32a41cda37ec0b734cb93b759bc30369ebfecd20ab3680b0c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ga-IE/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ga-IE/firefox-56.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "dca148b6cad926c1b57a2fa1d8e2175cca84f9ad7041a517fcd7436ae557219a19efffd6986ba7e7d1b0ff51f895d6894bc6c4316ec92b2ad79cdf747243bfc7"; + sha512 = "cf825c5e47045afdad04cce7622ff91e82c2ab10c14d6c7f0338f37221fffd1df86b79a6dd606a333c83e029a21421220616af6bf417c1a12dab8504ede297ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gd/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gd/firefox-56.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f4f01d4253b0e2ce56aa15839ca619df93fff7b60a771440a7102df1d84d45e37a7981044ad40d03e8dc70317836968bd84cf3ab3985736593880f26d95d7e60"; + sha512 = "82f09b004babae82f2e84ebc3d7aff0f556eddfc3be0ecc1abe90a18ac67e846304ce478fdb6c3a757ffefbef50fe733666796c4820c701f249c09cc246eb396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gl/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gl/firefox-56.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "2fb7a2ced35eb942cca10b4ca4b89fe4c0eb1a8f5aeeb9d62989717b704a922bf2678251e4c5fdb4a3507255f1548c183081d88e1586a727c17ec821240443e9"; + sha512 = "f5b6513b4dac92b02a4961febf7c734b5b9e1f9e235bda4749fb139c9c050116d1f1f222daa50c0bd6209b7958f8610800d4504d9a9d7ea255bc70ae7149f211"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gn/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gn/firefox-56.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "28a720b0e8c3b452ca6824db44f274728d61471a815f858d95498ec8a8662973b0800e34cd8cceb5a0abdad405ee5eebb87f5f8efb5e07ebb8021bee41e73827"; + sha512 = "de42e872ce6ce31c020a539c3c85c0ad568c720a2667964fcfc6adbc5725fb84c4d559902cd36f7daa42864c8c276d18bce57c994bb0a996727291ab29f43362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gu-IN/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gu-IN/firefox-56.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "5b1fbbba89814b15c6d8db09a1f335bdf37a300035ecd637909aba756a6986b3ed2107e5f015df2122e594e3a4a84775110f2e1faa9412302758f20915da5b03"; + sha512 = "a894ee96d15bbfcd81a596d0e1c3fe72b01c02250c54e85e7f66321db735c157a8cc971c0aa04fbfaba367817b360ee5b9acdd000d46f85ff035c5ab3762aed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/he/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/he/firefox-56.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "96dc38740133f31d385f5a2bfdac4af4eb9ec13c9a5fb29b989de34349eea3a682dc50a57b52037228dcea56b19535a31c37b47873b34a6383dc687eb3d61680"; + sha512 = "fa3eeb6926593e77505583f5321d7fa21928642c900c9ea3147cd8967b36478e30a15069ebcf23212f82a32030713144fac0cb836808e7e3ddad4184f03629a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hi-IN/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hi-IN/firefox-56.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "62ebb2492546d9d6923a93b506c573e1bbb1cdd563700db4980b0d9afcfe19ec3b31b34b5f0d141e1a5827bf922978860ab13e36338a611a6c1143b225d6c546"; + sha512 = "1749903bceca3b06fede93fe4a3cc531cdfc65d9bd1ceec7cfba0fb0c1c6cf74118de4e5f8b59125f429ab0797fd308b511bb50087237a2b470ed164281fa143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hr/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hr/firefox-56.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "1de18ef034b46d2d610268bcc5735e10671a6e7e70c2239d869606cebc0421c0c99032c2deaba2b0ced97c937441731a8097598185a81ebfb609662471081533"; + sha512 = "244a2895a30d6f6cadb7de82c5b1fa193a41d7c255d27ad525f30e057a2571531999992f3b8735b5cc549ec4e0340d0027b59c4518992cedc4fc2ed89be4c73e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hsb/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hsb/firefox-56.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "2a500029892890bbcc44937e02c2f8dfee42fcc0cf0397e635b2e564aff66806424f0c0105440e3fef973289ec655a109b480c9c52f9cf820ffdedc7a5314377"; + sha512 = "274ebe64c5e0395d26443ababf3c998f583024d979d498bdb6de65defe330bb862abb8b29202bf17c8c6f5d938623936dc9336d13e99c214027d9cfc261f2b74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hu/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hu/firefox-56.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3227cf91840b19e45e4d1eb1454d0d1ebfaae1f91a632c93e994cd576f3d6dbe1acee273e266b12a8d8d18409e8c7da8abb2284a2d85e0f48a3e2619d6ffbeaf"; + sha512 = "4aeb33a804b88312fb68e1429627328accb82db368b017214c9dc9a8023dd2a702e787c03020a5047bccad9fbfa82b5f44a9079ba9235dc03393e1b766b88f7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hy-AM/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hy-AM/firefox-56.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "47d744ae1aa81e5caf0ec14bbb19289bac77c969c773a3a98ef6b22577a1b345127333281d9d041c9a835aa2a6313fee26dd5e8d20e452a9ebad049eff96c560"; + sha512 = "92202f50142c2e0dd0384d5d65ed1d059f55ecdf583e37777017ca3fa428225e1ced4206140f268fa5eaca301414b217f5e46f435ada4ce1a70be87d5dc30cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/id/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/id/firefox-56.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3745ceb9ac5cb1a11d4fde46787a435a44c6197d7cc557fcffd6c68a332105eee9e0aa4042dc010b11e0a4846caa066f96c786a744b45a2b13b832b29deacce7"; + sha512 = "b2b109fda6ac076c933765698026d278da662bf026a4e38b351676d2c73fee10969f39650217ad225bab1ad387fce1f42b7c5152385f1779d98264e0403ed04d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/is/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/is/firefox-56.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "cdcc14717bf8460b2ae2a21dc5ae4d9e3f9486ca29d744149f90e26f09f6fed54b40739f75ad644c57b8a1e4b16dac49f43167ab74e8e29b850d6dd8b22a68fd"; + sha512 = "b5d753de5f044b693345c0dbb112555baa0f84a385338780c99bf465fdc09410b920083ad160f4eb56db5e2b73e3571aed8f8ae3b3d57142b9e5e452c39836a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/it/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/it/firefox-56.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "d93cfd5b5bdf0dcef5a82a39e592cfb3aa6e4b128ad22c38fc5ba3dff8177947c877b55da6d45fdb0e8fedf73aed024630eebc45910dea6760e4cbc0cb47f971"; + sha512 = "3c6017bcbaa10da0d8fae0c37713cd06c010b9940791f6f9f9aac3f8393d18406759c6ea0c12fec02c50d52e436d401d67839859d96322d7ef3c664063d380cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ja/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ja/firefox-56.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d9508e377e104c869c38d62edd255b2837092571c0748112554efa8fd9eb2f17319e3e7d36fad2538b49eb06a82151e364614416b3bd17c181923f5506cfb445"; + sha512 = "ba0f3bc654e0a6cf96ac555733cba556c3725474df71be52af06741a6690c8213c604f1f04b2df048b756addb86b85593e8b91b0bac714925e53469c7701c067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ka/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ka/firefox-56.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "6dd2fffd82ccf111b133431edde1c8bdd34769803cce8626987b7665203d64925aef1c2bcbdb2be70897e3f66fd40bdfedf4b6ffc9dfcb2e8f0ee585a1b75cea"; + sha512 = "2bce012298b2b80e4567923b99c96dc49a6d2282cdd24b464c98dd36c2a66915f8486aca673abf34df63cfdba2bd2bf6999397610ef64a55804fd589cb581517"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kab/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/kab/firefox-56.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "389d33267f621a82d08e179005dafe88284a2580cd2803a3c223e9d132b471a69ea97647883ca05fed98d96048b0f448f376dcb3994c64c3f25598b601f2226f"; + sha512 = "b2e2c667d4551724cf9fddbcd8ed4029c4d91a6f7363804b9f1382d6f4463ba65887174cb44cd4f7a5be525db8699ef4f517dcc3f87018d65e9fa136219278ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kk/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/kk/firefox-56.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "48b5cc20a559aceff6f58fbc5bc18ef72e60ed5ae4ed86e7d30ba75169a1bb62bee19deed7dcf071ed470719c8f97117fbd2dd0f973edd3cd641500747fc1dae"; + sha512 = "3e3dda19c1f03c144cdabbb4f968eec57df764053655d0a5cb69476d6bbb312cac0f06555422c1d95985871f37525f1675bdd4575008fbed99cdba2f0e80a3e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/km/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/km/firefox-56.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "783a67160300aa95ff851e913b5af9208db4d1c96696db9aeb153a6ca0d061b68d2d83fd231b1ff73d11fb6c9689ede2c1632d43e23fb2c923e761cbffd73b64"; + sha512 = "ed50a3fe8f72d0391a3facaf08bfa34bf8227689fd74e2372bb78a2cd76a99f150669a0a30c01879096a6fb4e6b1bdbd15b41756cf41000a1f10f3e5b7038cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kn/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/kn/firefox-56.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "a4ae433d78844021f0fbe9a36b2baedda3c80cc10fea1bdf865d110c52c23936c51f5670917947aca9c313d7de936012661a96b498f3a88dd73ef6862a1035b3"; + sha512 = "fc3d3adb8a3e92e2da7e3970ab3f45a1c8750acdc11d5f7c062249a6f025070ee631dec1f8ccc9237f00442b4c9c782f51d8f2ba420ef5a8c3c4e3601e292d27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ko/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ko/firefox-56.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "a1075cb1d622af46b47110da0e0c846a3a245fd94a89427d1598cec1e30f2b43a5697075358bddece7b44fa4bb5dacb63751a6cb16f00a447b9c3f815a96838f"; + sha512 = "05e6a136e711d1b13adf78037dcbcc21a6af7aa8eebcfca0c839810d8df4e87fd951a12c705504a585e729af72b6f6bed8189d3c5f8919f68f2aea72cca2f1b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lij/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/lij/firefox-56.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "ef16c60f7a479876655338a822d0a366340581f90ba6a5927336aa24c7241ae1de7295dac0aa9d94758fcf2f9de696ec5996066db51ab961e108b73717f93019"; + sha512 = "d0ad5add37962d986b6faf324a4e9faab8c0366c6c04b34bbc5829159ed7364d108c5b324cd6ee42de279bc58c414d347054218dad268132a2543913841b2846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lt/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/lt/firefox-56.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4eb707f286d699948bcc7df14096f32581a0ba2edbde59b89f1568f6d5a96e412d2aac210d765707b4bd797845cfb70569e57b6587a8fa67b81ce56d23648666"; + sha512 = "efb74c5479867061c9a8ae525893114d85d253322a4411a7d67f5d1bfd17843b371ff58167d8c9f199cdfe7f3b13592072ccfb5eb88ad62a511272ff6419b620"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lv/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/lv/firefox-56.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "45fed96d0e82dceb48853aaa08ac9f6b26ef16ee8fad04ef15cb76cc2f1969a3733fd74468088803a735feca5e5416b853f41956d240d4150254a61ac86f83cf"; + sha512 = "030e445cbb156c12d77c1858262b6261e73fecf3091478cc9de47c4867c53b7ef807ed8a15caf2d217ca00e2d90a05f8a86e4a1f836abc99731c9384d74a1c98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mai/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/mai/firefox-56.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "14739a5b2249386786c14816115a9b1a21bded28083bba11aba28012a9c7f5240d7b4dc3342192689d4d3a096d6a6f516d22f4370e49d465ee07721e937c1380"; + sha512 = "abe8c9eb6fc36fa2eeaac29f7d53c9ced228383d24cff0c43520aba9975c6b400aa6ba44584c05395c9a4fe156ad1ec2e348cb8ab813933f514729bc4eb3569b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mk/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/mk/firefox-56.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "fa44baf0e211a6efc3498c077911879593bb3dd715dfe3127f3177801f86fc7561f1ceefd5743cf4367bb01082a19df1f003ec879d314d252877bb69e2a12213"; + sha512 = "a8c268b53e392f147aa371a7c5e623352fe80689e5d65b325540a478e9b2015ed91bbb7cae309117b16677dff1cab99e64de171dba3936a01101579b49efcd3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ml/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ml/firefox-56.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "91b233c59500256bda1e9236df9e282af2a161b4085e4d3af4807e4d9bbb568bf1c83b1d7314c01e10dd5757fbb9d291ac3df334e40e3f155f996db506996bd0"; + sha512 = "655369ea9047c3715e7e46065fadc255516e170f1892f0e0a02aa6c77ab94927b43f0d125be3b886dc7295a43cec304baf3268d701bb9aa6cf263eeed2f95974"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mr/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/mr/firefox-56.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "eaf62cb8a34af24dffd29daa1a5e2b9bab7f58a4016a6624335f621cb75f187d09c3fba71abe780b58c3e4861b640a1e8273a682d02c2179909249725a44da30"; + sha512 = "f944bc416068446084e9fddcbcfc44ff096e29c2feeb2b1a40530317f7fbabc1c3f31419d749fc859789be9188c875e7d769d3aa09e286eaef305623f5a49d70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ms/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ms/firefox-56.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "f089fa240f58ebc248fed6922eb1c429043504df079027f0f8122288ca7277bfb24644852c73ba1cb8032e5951f6066b4175b59bcd894485e7adcaf7823776bc"; + sha512 = "25d47aa89a88da6932cced36e2d5ea5de7fa9e1d7dbfece462842daa65ff018d7af81c26659267f5a40bf621e79ca0df30f1ecc5abc5d5b159673c73d10b0e69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/my/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/my/firefox-56.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "747ae8c0826f463a9b5f6e68283069ac35501245a3ec4e3df356e4244bf649bc83f3564bf7f7dfd572f7c09fc2b4cd533b7d60a1c2839de9ff9e049945d3238a"; + sha512 = "3611e75b8d4c838ce81320e4f72d8b3425959e1962bf1b147da081f23a6536ff4e28204d01154f7e2f4eef3dd48796180d42ad7a4467d66cfbb56089784b3fe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nb-NO/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/nb-NO/firefox-56.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "063eb5efc2a47e6ac39d71900844df00bd1508873ffda1a1a7910bceb83fcb33f33b6de00470e1ef23ffdcd46dbb7ee2e60d9272e43f74275ac1c3b34c330f68"; + sha512 = "1a1ebe6b9b118c89a3642504c5d1175e64aa37d652741255ab93e7ed8770a21e2208434d19f95bc01deaffab7e33a011352bac5783401add797ee4c9535055e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nl/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/nl/firefox-56.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "77441aa1589345be58882ecf3890e2f029b80ba62946109d48a105d421db7259532ac153fc1b5dfb4ff54c788def590dfa98ebb6f5c95383374843e9f8dba1e7"; + sha512 = "e5348a13c66e3b6f5dcd1765bdaee0adffd0dad195be0c52dadd99fe1dbe5e381e5aea7b9e48d4c77059d1fbb0b214c25d3b51f83de79c5dc33089e2629f7298"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nn-NO/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/nn-NO/firefox-56.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "0369a0732cd13ed14059041187de9bf10ad018b68449513da224ade76827a21df8b87743137028c788dcbc76c216345a50bc82f097aaa991d068cb37473ab5ee"; + sha512 = "fc7ebfebccd5c3be0a06a02b98da1d18eb6402e2b97a44a8a483845df0365a073260930eb7651ee481c5f788bd0b158e5b97017818427b9143772601ed7b1af0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/or/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/or/firefox-56.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "dd3a1a56f506cd20163d28c8aab98958dedc811f921f4a0c277be59d93379856b04fa7362d3528c5840cb024280919eabf7acec031bcd1a198012457a4061a88"; + sha512 = "2e450311632a130b4fdeb1aca3be2073e22acc1016315663037b0ce5daece961a2ea276b96da06219f6a6259ced97d819e2feed745c38148e766d2a08896835a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pa-IN/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pa-IN/firefox-56.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "04ac45c34a0373e40574662f841879172d6d49fb79c0b39d0394397f26e3291a5ef053b78dac8d1bcac9d55fdb9e3e60dbe315f2416d4b93ecf6a258bbad31d8"; + sha512 = "ab2ce9dca08d20bd9f389f04ef1b2049ef60cf98c0423a59202b623419714fc1a1a40210e11a73a804adbfec1d6bf142747b7a80e7c83e35d905b9c48d7bcf12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pl/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pl/firefox-56.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "1037efb25bc120e8aa8829362991461f22c0a7422afd45a3bcd29e81c81d009efdb9b8011e09fdf95e2d59a37199a75fa5ac46f042552140bd9ab571c63ac702"; + sha512 = "d9b75c4777f029eb9645a076de83b634f8ce003dc3bc2276c94f7e6434fb5d4b06eac0a2998b2e4abedeabfadbcd9410c9c6bbe58cdf5bb257601f3dc0dbf0db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pt-BR/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pt-BR/firefox-56.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "66372b345b017a46b0bc6a5eb2cd54854e15fb6229b72b418dabc605003542b97170c72ef4d22d05a41e8622c8f43767e32971e09d1d0c3c4f58c008a0028532"; + sha512 = "bfbbbf7c2f94fdb5a15b3170f7ee6489a4cedaca07385643f659e553923c0ac06b7e7d38f80ffff082a56c1f2f08fa883067d1a3fce1531f1e4160d9c8f7dd70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pt-PT/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pt-PT/firefox-56.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "99b5a21180578bcc24e2813e2304a3b70f6d19c199925b0771938366e40710329ac408b59635f741e3082048972a740e84166fad9d567d155bb714aeac35037d"; + sha512 = "5033151554eff19cbd1b9c66cf5338a20a8855e677761f89cbee022b8a2cef962161a91a7e67b85c34ab3b44ec4f4a1a638e5f7955e998bc29dc55ba072b905f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/rm/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/rm/firefox-56.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d67cde6cce18638e061256a562774a332192242a506b817b033ba41fe2f0f854bc0c80ce9b956f5ed7f25e51fd257cdb17673b05cb139a7e619cf5f01d90fd96"; + sha512 = "12426599187b70240624401aed139c9c61ca58d3bc721bcad01d253942b30ef3beee77cd8d76c17c9204ed8a6b919cfa9709e775c520654c7570f26a1e5234f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ro/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ro/firefox-56.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "dc33064cebff3ba13f169fc1f52f4134c672214431db0d6309b111df8c53d59db5ac32ec54e5001d14b837cb8bcea02ed3b48763bde75c29fa8e4ba3a406fe08"; + sha512 = "3eb917db04503d692883d621d783d6df623ece55da12769fed51634457ab9dcc4c879b79c232054e504d266cfd167a208e728c0b9bdfb2b9a80e0edc60ed0524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ru/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ru/firefox-56.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "24b5259c9a146176075e26b37744759ce3f9b24c7e7973b9394fe2a70ad10410e2c4453ee55a1bb2bef9b766fe829b3a7dc99cddc4686081f413f4cd2537be35"; + sha512 = "a839398c7afcbcc7e4902106a980675ef46123c7c8466da61586db623bf559e4238448003c722594d8b0a39b1da1efceb93d923d5160ae20e5d3bb6230005d4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/si/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/si/firefox-56.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0d8590d03413e817baba1d5f32ccaa7516d258f7eb742ed619a8615f7b2191e5229674730e90accfaa1711d6730c458e60c2b142840a62e526127257632233ea"; + sha512 = "c37aabe213ba6eb7bf12d56cdb65ce8b95fe95c40fdb0edb58e9abac064e4ef232fc75787d2b44647cd1887f117d6144d00d495dc196fade8bcc96ef06c6af82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sk/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sk/firefox-56.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c2afd8ec0f78f6d8db747500c8dafa3a188a10ba6c1cf713d3997bfc349a02f8dff58663b51ab24d545f74308d4b7db29c2d6a5a92f9efa3520b42e84795696a"; + sha512 = "b79303551562b52e1fcec89819ea2ab04e1c5dcf41b9dde067da2d2e0a51307ceb45e0417c94c1f446bb80ee2c7f0e1f61479d33088c843423d5b195a6df4ebd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sl/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sl/firefox-56.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "75d545f89dc2da70737910f0288a91a6a745675419aa2ed41e0652072dfce0696b0b01197f0cb7dbffbbcfc4e8350394e94c621d2f8e36c65fa95163e70db50d"; + sha512 = "c51c1a2a81e6644c144840ae3a671e74165add9244975f2671a17ba6beba9096219e630b4475b9a576cf0d0c2fe8001692903a984bfa1adf92b7c34bed46cd9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/son/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/son/firefox-56.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "0baf5dc181eca057107b2d2ea89fdbd5662a0e443f7ad7adc286773da3b0ba922a90583b4961908607f6b6f1f1849c56ca219e661b8ec3ecde2ae4e1dbec0f63"; + sha512 = "f40f28d3774c528e0b8043e30e9b4f88b46b1e3a296934d155c9b340e099937804f7d5b80c845df251f70401099dd089a09169c55b9f39f7b22a02261381ab73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sq/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sq/firefox-56.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9d220d7177945732d27c77fede9528043f1ced0e26968c9589aab75c727d808440897b8246b0ecc72c91a375f532c2add002d2bd8d59e3fb0f5f9474f42e144b"; + sha512 = "728941b8eafc179e5100add0d2489a418b28973e2427586cb662c34e7ff080bf528ae7037835b7c8965b68c6cab3fa5883cd6bc8f1b849937a5d37cf069765c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sr/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sr/firefox-56.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8e9ac8e24c3af617ec99e77ac849267712ef095d01b177c78e8e8a0c35ca28b4567b93fc9ce1eb5c5e7cc16f9e1e9ad19df30f483db86d25e01e665c73380838"; + sha512 = "3108a89eedd792e44334b232a127c7c8896d1a9fe389acb206118f341a747f65924798e99c36bc1be19c215988785fbd1cecd20f2707afe63a9b0664e23051a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sv-SE/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sv-SE/firefox-56.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "4a5895a1304c24c19ab270496f6de03a46059ac7d47edb834f36ec2ab39ab363af59eb742f2b11c325b69616cf4bfe93abe2a6720ebb5654cbf56e6868d07508"; + sha512 = "a59983dae6d6814e45564dfd7b199412b7d7ea76afa0b0fcdad9019ea047b3c45d49317af4624d99a2375a525dcf72b92af0f34a51d955543fcaff8f407c6f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ta/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ta/firefox-56.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "00d6ef2853eff0f6e867087e0fbdc16f6243d349b14ada2c540c8d3bebb520b682248165725ca842c77925d71b07e27ec15426cc215fc256caf34f56055351af"; + sha512 = "458033fe202c3191cf6c8930ea8697aca2c534bb4c86c7f0a85925ca830086120d4bc3a8148530b8f04c621c5da6d2674321ad6b4f9af7fff0b7c02770550ed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/te/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/te/firefox-56.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ca9b12ba9c26bf12c709b8204206cf5766a819cbafee1d71fe4e12897fe76fc9144cb281e11b94f35243af6cb7d8deff2dd3d05444fc92a18a8babc8de9bb72a"; + sha512 = "ce7dd880adf34db123f85dd1e8d28dd3219e9db59177ae8f4e978efddec67b82025d4a2a2d90b7e8acd4f093b3d019e4b4e8203c70e1e8a41756bbd1c8eb95ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/th/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/th/firefox-56.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "d58decde55543eb8ae134335d3dc10f478b8354a723c0f0de2cef89d76c885ad442f989590bf5746a60e9bd46627ea520cc296f6811452d6ac4188da261ac941"; + sha512 = "7c23001e41e8e09f7468c74c79dcfbdaf655894f1c9a20bd87357e39f970faefdc1601b4d0ac2e442d4ee490362f17a4817269509280e180a2cfc31f8ebb1e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/tr/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/tr/firefox-56.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1852fe5c47454a7b5bffc236f12843f0fc7491311979bb0793cc8150943f6bbc39852b30c597a6167d23b8b3199da77347bcaaf8a7d58f50f65019dc6db5a8b2"; + sha512 = "27bfd7c5d3cc45be0d29d4ffd4d449a0c564bf5eb7d7f86b808429bfc4cd54cffa9b7dab213122930b2b666ccdc99d09f8641670f79a1d1250988a1db4079a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/uk/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/uk/firefox-56.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "c908a9385c9bb07bbe55e62962f19af59da63753284dbc90fa4418fbb601a787f9ac6448906a45da73929e7fd66ffaa1d1c643e240ff288b21e66494e73b9e9c"; + sha512 = "4073153ae727ba314dcb77ef8d8fadebb5e397a4c379d028ab381194a0c9a325ee2573ee22ce407c7d774758d74644f033f5e17f1ec402026bbb1b1c4b806520"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ur/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ur/firefox-56.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e23aed0297c0605881baaed3df11f327db42467d8f0c764763ab0ac08697f1a7d3183ca0dbe8abe97d46503d6f71b9efaf046e5be68ac8e34027e8cc70c1c622"; + sha512 = "e0ab4125e4d46529eb27a5d1e2039f36463b88b87370151955fe33d602bd1c72ee4fbe79cf669beea81444f340df3da1a3ac4acc73ef47162acc7240fe230841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/uz/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/uz/firefox-56.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "894e4bfa2919983c8879bdbed542b39da58ccc237e93a981a7dfcdbd0fb91fb338770f89c46cb97d4af3f3b8b9472983ce72c4fccb458d50f70d79b3da6591ab"; + sha512 = "628af5328deb486ebac3c3e631a3314c39e3a3cd4d76610c640ae60b5a827b62a4364898c895aa2f7bb300146451b3d21a1eadd484ec77665828591b111b40f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/vi/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/vi/firefox-56.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "5011071e8f1be873e69d7914c99b5fff3a510f74a064525f71c45373ea1444db4a2da46e806f0cc6f20032f96ef63a6147961acc4f6a7d9af161f08732b6b4bd"; + sha512 = "2e4117e805227dbbd96f2b5af658971018000e7dd89859f5f68369e45885125b60810a19f5d62affb98290b0846fe18ac7e96552fc8500369ae10ad1a2ee245c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/xh/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/xh/firefox-56.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "9bb89e5614745a1fee19241d96abb15d7ba51a19b312c3d47d0a931d4e111b1e5796a47b97175af44331f4d7d86158d4c07d825b4f019383e5d93b2460a17ccf"; + sha512 = "b915c86aa00d09bb02424f93b6135e3f407daf73d8cead602682e13e78d6eefbdafa5116f8ed8683f3d42a2eaeaf3bc63660acbf9c4104fe99a8d80ca1ebe695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/zh-CN/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/zh-CN/firefox-56.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2d9a2a0c2d0b21f5c3d58fd14cd7b9fdf3a7b45cb31b124ad17eff538e4dc64e55c035834373d0093615e93fcf61033fd16151b74b411d774541872ee4e1e914"; + sha512 = "27491f5c075c2a9ab48cadbea211be12d4cd1a4b110d7e0f211a7255cc5109f9b1bdeadca1606afb0fccbf70351aef6ad7fcb251a49280e46fca546e28df9e04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/zh-TW/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/zh-TW/firefox-56.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2d55a1458104fcbd6b6f24d5ab6df1103ce1390d4bae44fa4552b6172a25a36d2456c5f5466abdf8a1eebbda926f1c354b12183b12bba497ea1b7739f804a167"; + sha512 = "46c370fb51c1691b06ff026b9ae5a9682713c3c564b077bee4e3fed9ea80c796787a37dfb79babb095c05ae49db364ab552913a43e48ce43a628b3747a15f68a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ach/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ach/firefox-56.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f66fb15ed6671b27f03eeed20c42a93a31ec2589196160ab80d27b2db57f580ad52d3f23b03a3426e90753b8530ec766e35d3428561b837fac2444d0b9972e17"; + sha512 = "d8524970684dde392a393ecdff1897af03835ac07a529a643050e49a53e12dee472f33697bd66cccfb1f2ed78a261dd479d4aa25f3a56ac953579f6c6d5621d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/af/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/af/firefox-56.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "41fa15ec74a0b53fccd6f572e4d350ede8eb637d1cdcfd38db1ef56e29672761abfaac76b2eed74b59c3a907238df02e5a193410829ba5b738a4a7d2ed74a0c0"; + sha512 = "3624bad2947f43d9aa89a4a5867d7a406fb34dba9aa06bfbfbb44405fef3b3f78e4ba64789cb02cae561c8112b65d81ec291460522602798ede3408b7127e1d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/an/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/an/firefox-56.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "900409612c2ef05008c8c3b27852ab94038677df5fabb2ddf460ab731d57f5a39b9928b5cadb0996ffcce893983128bc04593ca6dbedb528ddd634199d92d311"; + sha512 = "ad7ee2ba36ac9a84ee44a16ffaf39cffaa10325c54fb573565780ebf3d176b7f7652349bcd02f0d7d1d4f51b8fd6e010f081f770bd0393e10225ac8ef4262f5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ar/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ar/firefox-56.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "445af6192be988f8af74f2ef618c09c3ebb8f3bacedb0d622740b9068665b104146a7bb06306219193455cfdb1f508a924711a2480a31b5d1d554361a9ebf576"; + sha512 = "4796be96acf7b5a52844e52cf86f0bd90c8b6f3b4c8cc116578529371a77a44fe4a1176a1b4832aa4046a3e9a6291b13bd57c63b0df31cc6b2ba7f4fc58905e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/as/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/as/firefox-56.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "9230c78a28845292164c311fdd882a2e0be590f09ed680c5fa91cb400570b1da8efce86efb96c1f006d166f61fa463871c9c8d7276a4f49a07bdd89c9a67442f"; + sha512 = "26c69f994389ebc7a0ed737c5f925f812e0ce0a1d2222406a17801891cc6ba8150c99aed0636f6585415d8ec6e7b4e51d39b39dbdfce1e0326af89faa8ab6179"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ast/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ast/firefox-56.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "8b313ba678e7beb14788fccda7ab1ff4dcf8c2adee8eee7a8a1224184219b167f8b84d81ae1c73400781bdd0b6c8a5e3e0e6bbb3e34b26587d5eda71130f2215"; + sha512 = "511f7e3cb28b888c45fbe31e398d3b66192f8e6498021e34c10298096bdd16c839a0aac8db6a103efab12978f099ee3c414028ac4966bd7626556c8eb6f2ac99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/az/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/az/firefox-56.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "8092452d5e2197932a4fe126e891b8985c008fc28d24ae2ebcbc8554a55f1592de2eb0e0ec6b8d33d483aaca29c644b4b5956ea49719e6bd06b88d07ce200169"; + sha512 = "2694b535a2bce0c5049a143b2a8c9d62bf1dd29e4ce18d7e686df43e87aa745b284c6272a6b1fc5bab58b023427120bd694f7e8e681320aaf0f9bb41bde0e7ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/be/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/be/firefox-56.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "6020147ec72cad49e2d1ca93f3eb4e7f5c3c435f6f0a85bbe0a39335c3791d52c628ad5b9b97dfaf52ecb61e7ba354e0bb5d00770cb88c79a58db0c002f2aac1"; + sha512 = "77d586ba3244e6fbedf354ad3b71edfdc20b7ec35ae520769aec4037bc45dd9d1a4ae858121c869a9e0f888f0d94d43ed0e0b4a25703d8cd0f0d8537b9631bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bg/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bg/firefox-56.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c34a98c08553a7961f3dd2af92e14f72c6bc9eb6fe0c613339570d9ecef1f015d0860ba5866107115cd1ea71a86b4c8177509c173f108db316b0d1a4feccf0b7"; + sha512 = "eddb4223b62e2bc1e54f27ffd1df85696b9bd169f65b75dbc8f96cccbfd59d110b262f0a149a88b584d4a02c9cda81ced7ea4884be8edd4888d50fb26a850eb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bn-BD/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bn-BD/firefox-56.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "d1157740fc765119441aab489252db93698e82e43a8bf2577a1c36be535adc782fb418a439c56c1954d58091514db4c9e33b7a8f281930387a9bbe6066062b52"; + sha512 = "d5ac79231ef0f559059b62cc2b7b438fad544ebc4f44f8a88a1e2503c36547de70a485c4aa0ec575835be54657ff102d2f8d5ea5b009a5f4ee3ab9bc1c8553cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bn-IN/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bn-IN/firefox-56.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "ada0aec0383e3f43bc46d72e0e79e3adc64cdba5d5d6fb76315077403e233e5ebb8622795b4e3d78bd16ca3b5978259218c0873f547828f420aacdfb53753e7d"; + sha512 = "ff104d3271479d8df7c5d63ecaa03ce67bcfce839e155bb8b7f12b0f4ce7eb950f0b36f542e6c87402b070ba23d7154124bfe51a10c560bb7d756cef9ba0db85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/br/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/br/firefox-56.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "714d2433d3716d1d9f08025115a7c4a20be975a7d66684ffd25439f68cea2b5dab2c37689c688b7d6eedddaf756e810556bd53366a28ee11437e1180a563388b"; + sha512 = "5c25ffd7d5a7cc974c924e04103fa81f3d4bae58b2d00a9fe57b6c849de91e29be73533e2dfa49b07ccd45f1bfa7f80861fb6736beb5deeaa55460192ca3c231"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bs/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bs/firefox-56.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "836310bd3eafd70edc760390fe0fa33659ce2c1f0243ffa21d5da95d59462cf9301f50e89f8e413a91c02f5f362ddc34e18498f635ba19667ae8bb5d69bfcd57"; + sha512 = "63ad8bf0161537029da342ed24784c08daa7934c40231402ba867d9812ec0d01d93db251f5c253592de53b69300f669754fbe530ae4cc5f4a7043031a7dcaa32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ca/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ca/firefox-56.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "51f2ce893ae1513c067dcdd0525b254a7c1049e952e56b31f86eb3249d741d131f7df529400039bc63b61a673cf1fc55e7dc12043679def7fcb583d748afe4e9"; + sha512 = "09ba0756946a02bbaf697f452275d3ae908e7fdb5af166e7586b84d1ae0983db0ca9008c48be93f409a56485a189da957f5ea9c18f9fb68c2c09621e16a1faff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cak/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/cak/firefox-56.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ed948b4f57118d0e0fe7deb5d8e117c1cf8d7df0c6d5c1f1721490586720bea76e81f05ee07553f2ffb42675b2ce5fd8e3dae342fbe9ec7836d489472d1ca673"; + sha512 = "eeab51af57e52689003339d3f02e60da8bbc13ead89343330328eeab34cbd55c4cdab4706075aced5b440378b83e84be7d9a62182fc76f47d7945a1b1f0fa337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cs/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/cs/firefox-56.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "2b16f351f4984310355f9f9b27d656bdaf15b2641ab5c83c08d6e590562284b9d4a89d7f26be605957ad3f4fc81775155255d1f0080ee0558dad96c05e6a5591"; + sha512 = "938cef9e5f0e7bbb6b3fc87bc71ddf5b71e97c89a53aa959b940f48345876ca0c8d368f4b630776fef51a1cd64496c96c1f75f32cb7d6ad0d92bb0a3c01cffe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cy/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/cy/firefox-56.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "ad4719304c7ee807294853aacf1516e29339be23e5906bfb5725266ebc3105dc1bde876b29573609de0f38b180f75017fdcc40e8602f92d779578a450146f6c4"; + sha512 = "f70dc0dd9c92b9789d8de307a7151836729fb98c55666d13beb66958f3824493adec8a409109be6ee076a26a723e5b9da1c4e6363a881f1546a739978e78e7be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/da/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/da/firefox-56.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "158c318c5b83dacc3ca737e387d47845a43cfdae5add8230b9b4055f936f212fd9f25d2837ad9b4e177e18beb949ae2afe5853b24331facea3fe410216b8cf78"; + sha512 = "4b9d83ec54935a6249111ef8605c184e3226223038b65cd709b7207d46d5342665fac40bd2672c40f8207a0436fe38be96bc762573d0a6453cd6dec15683df3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/de/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/de/firefox-56.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "f9ff911f2cadc837685b814e906d6e03f019a004f0daff5b5af902467e905269b873f101b63b9e6cc33e357b5be06834878b072b2f8b7e08cf9f16d46122f987"; + sha512 = "ba2d976917ab0559f4c70140231c2df3c372d7363f897ba92bfecb67f7c58ac6ae4dfbd43724b3404dc8aaf8c72828ea89108c8fd11792a30e34ce9969a3b3af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/dsb/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/dsb/firefox-56.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "d4d92ccb3073d038836c92ece1e7cb94e8c2ad1210c1f70608f99381fb02fc88aa61db5845cb123af11794cb39d14562e9e034be4f1519234bb9f8b2f685eb61"; + sha512 = "706d77a27896c711fb5660203fee10f22fc902ee5b0dc8d26c95e61c49b8fcd39049fde234143af86b0be562ae162894a9a97613b326ae7011cae9f583a8b08f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/el/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/el/firefox-56.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "6eff466dd1b04611fa8af686dc70bb2530e4392d2eabdfbf51f4b679060c7d5f96fd95120e60cc629eea8b23f2452f5342fa5e5dff6067b820d152906ac19882"; + sha512 = "da683e296a10a6e548a6838c62d3ffeb26e1ae3e89c5aaad76b10cecdf5712421f2a2cda90105ea1da815c883d5c52da805eb31dc241bd93aa9199201efc9b8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-GB/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/en-GB/firefox-56.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e8193bc433fccb5d02254892f2e4869cbad215ab9022dade1167082d3559545c7d9a8c28b6b6454183e1a0ab707f0535709cf551977c97398459f816ecfb1b05"; + sha512 = "61f6f0646daa9c530d098b3dd5679fda75161cb26e3b39b69616629ff1674b0cceaa4aa2d6b56826e54f6f4dfe2038b9186637980facfc63abf247765cdf1bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-US/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/en-US/firefox-56.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "880084f39653f405a3a142267e0c6023779cac219932d89705750f1384e08e21d70025152dc010ed19a5a3c6c4059948892d6121135a44de96ba9c6dd185b5a6"; + sha512 = "c6c0573e967681e19667060f239aba9910648213f77d9c7b38b0d9318944ce89062235cbda54e55e0901a23f2a9aa7fdf1a7f02ae94217f6ad554f3ee9010f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-ZA/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/en-ZA/firefox-56.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d42d7a3e9bc2c3d06b7579077a99db5bd609b62e807862e5e03717cc84c2b26e9202f8e785ea16bc16182aaa8ebd8b83ba2b0b73dae133dd6466ed46a75351fd"; + sha512 = "7e288b18a6c85549c4239972a2d162ea1288fc5939494f612a9fe2a4ee7f39954506618e354dd3965cbbe221467cf1f74227a42c43f8cef96045defe958fd6d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/eo/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/eo/firefox-56.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "2f1aae311a095e8d48df3106513b94e9b1fb2cb426c0b35782a61bd7cb02215f26039e3090b78401120fbe81a548b5de819c3e49cdc46a41431534735527cf40"; + sha512 = "9f3074cbcc973fd5bed0ce0b6f6090da9a7ebd05c543a065466a3b0968e58afff473d1637242fadee31840d5cc0504f6001e7cd2849dace0eff4edfd4411349e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-AR/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-AR/firefox-56.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "71b1c0ca8dd8483f6c40f62215b86b7633c76097aa9c2d94bb901eea5f6e8a9a5bd99255064c700308569d294caeafee7fd711191b9f393f0b607768edbe2488"; + sha512 = "ef56e3dbd4f13b49b05db59e5f89ba3e3188dc7df4d2f340401510cd59620363a3294ef2b95c01e7c3cbb511f2ece013130a09445c314390679401d369067d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-CL/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-CL/firefox-56.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "065fe812e9a4001b0cb282efa5c667a999429456de1be2679fb656b88be7119d252164036a9c23829722e5f52b29512809ed4ebdd0824f6904c81865a1a96a1b"; + sha512 = "85b0284aa6ce08609ae6e7c874c02a8332ab723debff8bb6d1b500b8da791090b44742908683ca64405dcd85dbfc474b4157f873daedfdb9e678e0bc908e2a63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-ES/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-ES/firefox-56.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c2c22c22624e55d2463644fd0e3812556b22b7c664ef412613485278b5bb9e0cda8f17e9e57798cbe6b93a3a8acfad9c287abef425e1c064374757abc7465edf"; + sha512 = "36519bebb0e79a405610bac938c8a0183ba857fd733b71bb50f82f9fb16883a52818596f9bd776a56798829cf9d4761658d498069bae228ccb123da266459642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-MX/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-MX/firefox-56.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "e0c84c217ff11d3ed882d49edd68b8b72589b5a1689dc75d54a895dbe261166bcbc2a14f89f633749b5c9ebc865e39a01bb992904e897d518a45840846710e79"; + sha512 = "93d40e3df17392b4268e4efa1cd9c23d3da1f702b0e0a2305a05a31f80af0ed26738dc4eb6a4db60a7f43e7de13662ddbcae8ceaad972aaeae40a21856d9fb42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/et/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/et/firefox-56.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "7639e65067d23d20f4ac96e1ec87efcf3fd6ba912dae1fb68e46c4eb23fa31352589bcd6841df66e292c08a332243dc305c1800ee26b4d91d6401b873d517607"; + sha512 = "bbbc7dac5d3a122a9a77790d570a8943bacf4bdf1595e1297d26a23cc99efc88de088aae9533b86d573bd10f81fa741ab765177bbf86f2920232ea3a832509a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/eu/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/eu/firefox-56.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "8251eab30eb48b0012d3df66ebfbe75d75d36fc4d2ef71947113f747741f42ae8942db7a40df777973245be3c72949a303fe013341bfa64753d30ff05407d592"; + sha512 = "a36172e47a17109d2790961f3317dc0a23404856224411393d4bc0a238ff3ea8ef9af46098f215beef85c35a20bc7d515e764ed3a5c4a1cf0da31c019788933f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fa/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fa/firefox-56.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "418c2ccaedc94c695dd77bacc399d7dda65cba53251eeea8e203c68a80fcc2fc83f7f6a75bd2d919a5e8f61a148b25da7ef4e4026bf2ab35eec99f39bbc4daf7"; + sha512 = "c735cf60f7726485fd10d7da09bbd75f0ecb47c84f03fd4b2ed75efa32e906867cd5c99945cb4354792bd7a978c48f61fccb7634e931c370db8c28479023354d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ff/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ff/firefox-56.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "eeb0f38f0aa9cca8c7d9530a60416685054394a016778006eee3fad363f05ef8a362425e1a318d18b9f88c409b60fe380dfd86080825929aa9cd2553392a8b79"; + sha512 = "bf54987c9cc48218793e68580fba1f906d9168afa4adaf340c50c21d36859ed01cfc0b0485ba7aa835b1de78afaadee8c137e767589186090308316a4c0aefd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fi/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fi/firefox-56.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "678e4396e41c5674b8bb5a536c498b48312b2fc029ac8a34fe152b93392e6337f41f29c755157a0cbb3af39098eb9a821ca288b1b09d28da417164a46195f5f0"; + sha512 = "597cd931f7a639e4e1c0cee220968269a03cb54bf72da2c658803c5ff2707523c6d1cfd9cd301b2b5df7db63f1d6d78b873b709003b67add35108d02a7011596"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fr/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fr/firefox-56.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "2f94ad8820602f0687da70da22dd1d09ab7901e3697f55fb094f7e9ef2aee87b02aef529b58b528cbc7a3d3f7245f5fe2886949201fe902463febb1900c9e38d"; + sha512 = "54dd3162f6783703b7ebbff0a15d4d733cee206feb59e131cc974cd431f9a83e8fd703c2ea03149dfd2d06289ca0db18e91a95c53a757b6b04abca506240c1f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fy-NL/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fy-NL/firefox-56.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7641e748104314754fab92b8d08a3f1d45871b10997a7c42b1862bd69db8cb8df41251a8030488d673127b24da40159996f1f9d88869ddf90cd60f9017cdf1c8"; + sha512 = "cb9dd1f14d61068f74d7cb1d5368bdffadedc7f53059a66ea845cc7a0118ad01041b4d1b23f038b388fce9df91f962e2db8dc7ae13d35c472d9a2f19ef7f39b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ga-IE/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ga-IE/firefox-56.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "8eaba21bf5b37552186db581f5f0da833170ccc1eb5c490911b51771a72d1c48678aa680f29ef5f1a3a3cc019ba5e9a58fddfdb9acd08b2356886a84eb5801b6"; + sha512 = "d54a01a07aa3d4c5b66f8fa2653ad06715ebe473756d56e685ccf23596854c1190b871cab8827507b2da0f42b0843d2d696633cdd173a155596ffacf2b8e9a08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gd/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gd/firefox-56.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "71508a24090f347738fc0511432d4331007e4982a69d2b07e8ef39a6c0917db55b6a0a1c4b5397f7bc96213c6ab67747a4252bba3625b1ec7ad3dbce4b6976a6"; + sha512 = "bf8e248055b68eb8b04a37aca7711aaeb30401c126e911fd36658ae4fb140bf006f818291fad4dd1d82951ffed74f94d1174420254ef6ea19925276dbe660062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gl/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gl/firefox-56.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "01f4fe34072d62b95e0197ce2622334dd851c14066bb988b2744a983bb766d60852f8a1144b2d2972ea0a7edc8bd974934e4e120b9e218ea8307744ec42ad268"; + sha512 = "527d0febe7c58b7205cfbb21cf2e054bc8f390c28fb6a8e2f317c6bc8d58092b92f9f285dad6da1e01722da5cb198d9cb2f60ec36aef9f03cb87b48674f67b27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gn/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gn/firefox-56.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "2857bad04c580841f58aa29d02d30c87fa72d5ca2695c124ee73f5cdcef93e5b7cd02daa42f2b93a569be6773b0edb9c9da55289bf49f2e442fc91c1cf97ac47"; + sha512 = "1599e5a6a242884d9fc13568d4ee48ba925c0d3f9ea6ca4ca1254ed39cd8187813efa86d1f65b8d7aa570f4d35420edf9a6412fe66bac34b748bde4ca9973022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gu-IN/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gu-IN/firefox-56.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "8ec3538b7d0278caeaae64b19300132c76cefc3345e66a76bf686391ce35cb578be9674d14b6cc54fee2017792e319496777af337401f3b3419af99e86710462"; + sha512 = "f6f1cc145a65c1ecce6e5e5b3293af37e731a24d1d15fb1c8e8c87d37745f823f8156f934931db0542106365a960cc81000cce8df37c863f6db47a48ce2dc382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/he/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/he/firefox-56.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "82324d45dda57df70520e878938a646e6692817f4f35d6d0f0518d8f8c7ce6183f968f9863e83304f5f41a5a6e135d77f613dbd6d277a66f6d5db9996381d949"; + sha512 = "fa56346e138b1981a125a5815b880ebdc192e9eba2af5348dbbab3cd601c35e61bb22bfaede27647705c7bfbf11fcec5e0773838dfe50e14cefa716d7f843304"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hi-IN/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hi-IN/firefox-56.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0359d570441db163c8d8346a0cf1e50704125e6f165a6e1d7bbfbcd0ffd89fede9487195de927d9eec5d4f23889dbf4ed69d8a7807ddf93291da79bae14267c0"; + sha512 = "9176dfa4d5207108217fc9df663797bfb97ddccdb43762db85247f42f3d2c6f2ef309f68cd157f9f4972c80546d131d81c5780dd6ed92d267d8567a7d9420aee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hr/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hr/firefox-56.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "fd3e94d57decd57ac00450b9b76cdda282bc2b528cea4630d6e835c5a1ff9d56c7be6c67e18e977ff4b3d00cc4e1db3d21b73debb7194bc094e29a49de405010"; + sha512 = "0c1b1845e6aff8cd81dac114b2654ecfdf3176b7b9995c839fabb07fa52cf1ab5ed0cd93cafa969e98ce7fdc7883b7d40fa19e688c7b2e0850db69f71e13e146"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hsb/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hsb/firefox-56.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0a6896110e471501194086932f155d0a5302fbae75fc0403cf437d13d5e5e3ecdc382ac748688f7918307e45d294e0b29100831fbab5684afb8d78f9031512bc"; + sha512 = "88a6e49f8346f566db7a6807a5999a01ae3b843a2cb16051a7d82b250e8bb7169818ca4fd34893cc8c111ab00d62d7fedba651ba813b3bcdf639e1dc196cac3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hu/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hu/firefox-56.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "ed27b99b71dbe5f51db4a981e4c93b59c35d7ebb2965b7d12719c70de41512201f37f4540aee2bb723ebdb7b2737df668babef889847d3c136d6083433e75c20"; + sha512 = "0fc08455d35212d8beb1097f7ce7c1ddc5519cc6faa62c9fc6294abe4cc3a020d13d514fb2b4e1b27eebbd351aabda70a1de68bcc3865f85c782bae7a19b0fb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hy-AM/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hy-AM/firefox-56.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "568c1e4bc95c26b5b0113c0784a305dd5ecfba56f5cb8318f71e135a676f9b86e38fe31675684785d2cbff7a1db46910c0ef7c60470791f9b6c0334422df83ec"; + sha512 = "89c3f56d2f6b4efbdc44e3fcadebbff7ac77b845eaa2f6220e1855f547c6aa14a727a493736f7e913602c6c354f259085bdc66eaa0ba3bdae9ce53a37de991ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/id/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/id/firefox-56.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "91e66bda4ef701bfd10e5170ba463fcd1849083651add4cd09103c5eb6532ce5f72bd30a15e0caa811e2e78326fa53429f7d232a27100ed03207f2a2110730bb"; + sha512 = "6ac431518cdaf8e2bbad23f44793b46c87e205513a3df8c092bdc4b25729ed7355779edd2bf154f9d49fae48747518aa12acb6ef55a3206e0f52ffa53dd2aa5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/is/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/is/firefox-56.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "a9fe82f9045ca421c45bb9f2de9fd28b57b22329dc767b402a7393d0275acda591cd193d0285395a36907a9b497427a88d2d4da2c224bcd123dfbd53888b2e3b"; + sha512 = "b4fde08b7dfb09bedb2fd9fb7e3a1876dbe07ad2eaf7a706bbcda18728d997dac192f736ebcec4c0f3cf0ca2b49804f49030222ce25612987b73539acd98bbf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/it/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/it/firefox-56.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "2ea32878113a4256eb9e264bfbf67a81803f8c89a63d74e3ba66a143ede3af2082e5fd13f1e761147f5545c29c70f578210b2a4e5dbf2985ce957ce79db2d568"; + sha512 = "ab91f86b0f8458e00fad441799056c396600d714316c0a1bf332253ad476c8a00a8b3c5634396fd70d60ff0ba32d6adb1a8ae3b2a01f42d1458b7796b0f09d84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ja/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ja/firefox-56.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "760b3c4ad18d6af0b1bc993dd9d12d76e30f6c197b1e58d9b4606d271ce502fb609b1208c0ccdea222bc7076f03dc8923e61cad092d23c0289ffb5bdd3d8442d"; + sha512 = "0b7e8d83b677ff51e8ab1c335d9befe05f3cee0444b0dce063b99516381697a985e5ce3d3b80b45ef563766166c65e7ff7d503c04240c44798a8a847ff66e05a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ka/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ka/firefox-56.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "5a2c4a3249be869c5e70369c38a3795de3cfc2ad9bf30f933f82b4a286d72fb9c936d4df8e1320105a4ba20ebadaaef1659ecbec80eb9e8e21aa8f403d912c41"; + sha512 = "c09b1b11629f242918d231a27a3dba59fc8198c0c0a4c5ac2e648be6caf08c0644e89c9452c47b5ab4690f967a67054c4637cc83db6bf64eb6d9d796d5927cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kab/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/kab/firefox-56.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7ef692ed2101c094a08b3593ba2d1738a616803b3649f83f650c0038316fd52b51e8cde53116015a54dcdfbfeb9d1209dea2273705142bf431b29c2f6b7611dd"; + sha512 = "b78db07da52542eb646c484c567f36c3d56b8613c6ee183ab02735a45397e28dc8cf1da3d42bd5ed0326554c93a4e53f85993f27193df05ea383873ca9767252"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kk/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/kk/firefox-56.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "bd88bc609a6638f9cf825e2ce9b7a615c555532275dea9dc3c6e79376cd2d814b886f5266631166a53ea38542e66011608f52797febd2867d15c18223d5f7788"; + sha512 = "dcb8a95db799748531fec235d1c348a5feb04b5a6ae86b93e3adb23b7f1142c4ce12f19c0007b34a9c0a7ecbf8760c476cf99398fb001810fb852c67883cec75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/km/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/km/firefox-56.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "b38ca1ff78eff732ef54d71cc956a31fe87922e76df5cef63ffc13016b01394aae904a17b7c8905d62120420bf715b8c37f73cd5fbe2468003d55b8c28db47c8"; + sha512 = "23565ee1f7f0ba89821efdffae8bf2a615e11d8ff74b56425097ee4cdc6abe2795d81513cb7066165c445cbb44f4f8b0bbc1add77f23b797a372cd9068f8794a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kn/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/kn/firefox-56.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "ae05bfa4914d479de80f0cb6842a570737b21097a60386b700cdd831374e6197cbc5d0b171b2091ce962e082bb7809fa46fcffb4a1281d7c38d5f57675b8e925"; + sha512 = "4646c1431dbcd96f943268a1a80e87ecb94db9c9d71eca80383c26f02ff8e117b22aba03f4d829b0a381ec04e249b2533fb104a2609437bca7f6b78e143a5d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ko/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ko/firefox-56.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "20993f13768ea3b035b0b9d80db2baaae2d07757761a9d0a8e2a992df2e7ba3b891222c93dc3778f1b51b381ab99adf2671161560904f99a4756d5e4999cfc82"; + sha512 = "efd5b303fec5ab0be91dc457f383fd9cd14ba7f877d2be5b0133d9a8e7fc03b67cc0ebe9414c4ffa3859fa022656185cb78be955483bd749ffce258197b2ba64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lij/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/lij/firefox-56.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "0bf873490e9a6dc237d5bf2b8f32676b78eb1d6d9a8cf5f5ca9d1913b4b235e9694010463ba13bd082a90cae23d65f6eb33a15a8dd8e21092a5c966c2805ef54"; + sha512 = "611d457dee0be03eace5e51160466748770e82b4d71617f7cd4aa0e48935c73fbe4334a786d1055be869b32c61cc1c189138650062408e66a382dab12bf9afa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lt/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/lt/firefox-56.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0660a016305c84dc4601bc1e324864702233cd08a356673f515d8b9a9b7be443c6e265cc6072f144c49a097ab3d512b033ef0ca657be92117f6b646b6e2102f6"; + sha512 = "c8760630354790f3c4d9964b594f4813d690ff30d62234c748c7c38758e4428873d55f7b54e5ba7f3c6008b0d5d14ff0b3e4de51d564d9c52b056eaf31753bc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lv/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/lv/firefox-56.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6fa4d166fd871e1d76d8324cfe50217a468c6da073905504919ab69c6dd14521f585e0e347fc076c985afb5d41f86b3ae691f09492c97400ad5245ddbaaadcf1"; + sha512 = "6b074f3f4ef5e1c349db0ddb5e9bdb275af226d10768eb40322c14ec8b4c8d0c6f300d89b20911350ed1bbf84d9e7c28d3d4ed74f7f5944a2a60e13460c1eb3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mai/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/mai/firefox-56.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "a18f5580bcf74d2dde0d2c1bed4413add943d0e7ce8529d3fb5ab55b91397352eb70ec8c393cf8f9dd89e3a32f4187b4cc93954800b63d1a10853bcf13202b10"; + sha512 = "4e9e84e48187535075a0a424c99c5a7d2b5ef1a30e5b86662e295b8116d64a5448588bb9e262edeaa03138ecad46ccaf388ef9d3b053315b3dc77efd08ab2c9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mk/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/mk/firefox-56.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "72248c99fd9bc40ce579992438cd94b050c18100b26cbfe575c6199ae3b986d1d8aeb8fcfb63c8b8464b7d4ec35f6b332fc32595e72603eb7d41f0b0dbf3c2b1"; + sha512 = "adf41bac2ede4a91ffb3f107ecbfd40e945ad1fe23b44cfd0907400c12e526b8181ade5155ffb669a5f9a3c2ce08d06a5feb49d7faddb51494b6c404372ed083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ml/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ml/firefox-56.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "f9ae435602cfc796d93a2e5aa9ffe1216c1465de3beed4ecc6b04141c392df9d1b6280deb1d69c30330db4c9ac6568b3cc4849e57c8e84f8d3e69c47a473018f"; + sha512 = "b7d2c89c066cb142ad45098c7580268c4ef6e53588a1cdda100d195047efb33b62ad0ae0c6092810b69799647201526bca3654f3256f82692a678ad357dbd950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mr/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/mr/firefox-56.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "0cff95fc291a1874926ec895150cbc99b8219b29f4e66782ab182c29670b2356a5ccb1a765e0eb734666f7ff4a7be7806c62012b38118ce8d2a8f7c47a1e936c"; + sha512 = "932431c5cccbccf0bea43ba18e4463721c78a2d0b87bb53f89b2e3ce7d1d98ff0c22af78e1643010f7ad3a1c74c1ecfc302841b522d24000960711aa469835e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ms/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ms/firefox-56.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "1add2335e98ad3ea9a2b57ca733087830c50e50872f8add7d8d5f2571f2d858b4f4a866298a8509398237ba62c363eccce9bb358c978cbd7b1ac6cf1dcaffce5"; + sha512 = "594ea2dcf622aff32d66a8d7336ccfc96abf50429214ae0503c05377c9fc79ba35bad70e05f713b44127e6aba2ef09ae29c7187ec17470645d413b1d1a30924f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/my/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/my/firefox-56.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "901404d74cdd090c0a63b2c0e60d0fb7afcdf3fbabda7dff07205613680ea315c2c33ee33001c8e10174f91698cc1cb4f03dfcf96e1104a5bd2d4750666627b3"; + sha512 = "f7135ab56d292beeec62f075eb8e2a958adc95af848408b6d051992ca4def002ed6bbebd6f3733577ee9853bee99d346e6e749ef455aac4646bac3de9812c33d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nb-NO/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/nb-NO/firefox-56.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "50821c1cf2ff9b49c34f9e05007678068d73d9558e43083bb305049c47d62abeeb3c0a994d872de6c9dbe86971e4a5d70de716a9051180a0b2bd73df213416b6"; + sha512 = "82d1317e251b5c93b8c913a7a0a54b8582ad8a80fa242cf0d4e997f5d09615779a5b1a544a55a68feec2a49144f3a8e13be37a3f32caacfd7ffaae150ab8a4a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nl/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/nl/firefox-56.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a81331ef521173951d7b45e726dcc0d57fa4d1ae1d9c05a835163bd71bd6ec6ee410a355bd2d697b6c59f3a8d9d2a5122182e82ed800b0d8c1830ff759fff71c"; + sha512 = "d3ee1e58a46266688aab03a55846bd5cbc9ef96188cbc0c6a723088a71637390d14feb62dc5b1af48659b4bf41466ead9504d8c086eaf1a775d50f30d23982f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nn-NO/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/nn-NO/firefox-56.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "9e8e1337557ab07c07ceb5395d6cdaca647a606650ff00d76244df125e6e041b3580828cc25dc1e300559b05a83121454e77c88e47c0708c30a561b00f18a86c"; + sha512 = "0a07cec43e602baa4fba8ba23c76d820c3fb0a7698968d6324d49b3a2cd88541f9c54998a090be173bcb5b31f0de85c0e5700e83cfc91ca9e448a4886503a346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/or/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/or/firefox-56.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "4dddf3bcc8b46c326a632f96844ec369c5593bbd70a846a4d041a5f14da29b953c3318aef820b46d4e77d25e79290fa77230ef17c0d57bd00802f830ae4a76a1"; + sha512 = "5fbc52e53d63561249da9c3c33b28504fe7278bf91b218bb683d9d35fbd20ec94ffbb359e9d8ee2c3afa00f1f9bda0f13b07bcf266ccf1f19f647747b5b40b1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pa-IN/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pa-IN/firefox-56.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "b22a57fb65257b25f2a7c083fbdfeb9ca0ff83919d5201fb6996a5af33a68a2722ed8174853d81a90d61beb79d811c6b756d1fca6dea6c70175165255dc92bda"; + sha512 = "a91a0569b9dd8f5cbbfa66b67f7d737a4cc5cd2178eaee9d5b243230672813caaa17483f10d831c0aba89a2dc97945588a7b06d016aed7c4f6ca5e4ba80cd0c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pl/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pl/firefox-56.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "76d98c31d80b581a910a703098a0f80d9b9dceebb8b8f5f69eb428a59d7b592ff3aea40f152b1c74a9a849c45cfe1334951261b84e84ed454afa3bf9d14afdd2"; + sha512 = "fd2dd21020116fc81e91c2ad92827e58803d06ecb63069953f7a6d49321152dbbee83d84aee280f9a2306220986a4e56dca36f0df771e61e950389b0981b6058"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pt-BR/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pt-BR/firefox-56.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b22cce3b391df6c945a7d84294b3ca36c90438d1eeeda002f1af4230bb8638733db1313b36f3d907b8ad4b7b117eec58c601abb21400ca2cd228a44fc49a499d"; + sha512 = "e1eacb5b8da228b881503b0e1e43de40b7dd6808690011fbef6c5b367ec7d9edf1ae7df8d2e65ce6239a00a5b20296739dccc8086fbbd3634ae7153f2704a847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pt-PT/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pt-PT/firefox-56.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "7f0f627c170f8db91525a3aebbe1afe47a84745eba53da6fec79c14a95d857f8ca65ed7b52d67d966f371d3c4cf1bc4d734e1c8f427775e234aa80c318aeac52"; + sha512 = "240094ce50b49a3537cb5b6e80dd2381309ea7684eacd5b7fa207f097b75728d48041ed0ce7eced5ae6da20ab769d4d8730eef0dacf534d5b1dc701730937503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/rm/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/rm/firefox-56.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3e7941441c09a0dbac44ae352b3817713b34c0a7cf694e465b75cdc53d977b97ae3e388ae580880bc33df134d11fbe941b4d1c63567ee6183f43bde31a2d9793"; + sha512 = "78191dbb18f1cd6ab2425ad6ba38402fe98e20888fea662b3b6c347751de512439bb3cf349ffb2daaba93011cd33a2cecd6e383a45800224ccf9443ca4c2075b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ro/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ro/firefox-56.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "67d270f1eed7b761499967d1d3ae6c1c7e067f124689f6214be6ba5687f3eb212e70a6089573ab2a90315593d8749496e48d047cb8642b19c01877ee394ef86d"; + sha512 = "b62b8c628864e176eddf410a402dcb5e39bec295ce97891b054b13727591cdf4ccd2973825e513929808c67a7519cd3aa550040eb359dea18b97bb4f01ea3dd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ru/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ru/firefox-56.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "287e6a3fb2de71b31a0cfd74d3eca00ad8ae1cc68760fa5731c1cc9f58c4bcccecbfefab892b93864ffffca6433498d6daafd7928b9633f8a587de3c0787600e"; + sha512 = "51e61b637de95df9a400416546003fa5105390acd48aa1f8a3511b39fab76c83a6ba3d41cd5b15148837ea2df295dff06ef7baabaf44994130f0be73af4e13d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/si/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/si/firefox-56.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "63260a1c9e333d05654ac7d912011228d0f787d2d2a5b084410ee6cef75b41ef3ee08dc305f95baf459d16fa4f206792e3811426500ded4d02eea0d6fbc0d5ce"; + sha512 = "3ff9503a991fc935cc7f0afbf69f76b1cb0ad68c21348bb9034c6af6e262fc87f49ffc0025702846b0c85d72b371cd573ad3147fa9dadf04ba846b22033aac62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sk/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sk/firefox-56.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "339c3df4c1a12e14f6e2156ec0fc64aa62fb5d5e93897fcd412980ffa37edd2f6a55f3da991e0ee4c00aaa30e469f862e288cd8c950ac03bcebbe8b84d12f374"; + sha512 = "4d574e1381c689f847b1d2be8f8f8e5d31d9e3e7765da00ae44d801716bfad56c1cdf18824bc203b6ca8124e9ab598b938c9082b57482146cbb7dfd6607bdb3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sl/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sl/firefox-56.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "793c89b07c0fb8e7929aecb67bd37a1a97156d48f50972ec13583728614703b3d69e50249efb12b592aa6e5643d3f2af2aa57854ea1bb88d080983ded11ef676"; + sha512 = "a960a47cd5349e6c7073052672273c8a889e3d8650453f99ff118313ad692e9a0ae5ff8777ac52fc69a40e24665064d03e4cff4942796d554b75a1e4168f5790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/son/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/son/firefox-56.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "51d941ebf974bc04f9aa7a02c14c14b4aa5190d3621604964262a92d298d68d36f3aaf84ed235760d1d9d766d29a97490ddd6df8cfc53ab215526741c8de0d31"; + sha512 = "c2a18b625ca95c4e4070409bf7a4bf42d0338c6b4c8065938297b4c0834c7018271e8d6001b8fde382719ca313d5ebae9dd811499e84e1ee917c8b3a512f8534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sq/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sq/firefox-56.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "44ee948b537e8774fbc37361639a83508fa3e7bb0978e12bce9ecd8c9a02d9bcf6ba28922093e8701deac71fd577eb4d85cd349c85e93fb04f5e5e6a02d6fa48"; + sha512 = "588076f33cab37b746ef25362a55c1cd8455a1c4ebf55dcf079b16b19cd7dd77a9c1cd57496117b5c3fb3907b1b047649f4e6f6eb0ed2e0e034ffa291e6f9b91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sr/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sr/firefox-56.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "77e9dd47c3967435a83e191c335791d03e6e63206f1e303eece5e1a813bf5e0b88aede11eea033972e578974beb4ec6bde260194a01e15f7b9ed7fd915ace77d"; + sha512 = "995b5a57fdb617f1b8ceecbdd22ee408e4d83b73ed5b2cc49abda0a4de5d6ca0d5bd54346efcbb2d181b5a77d978e4611e7235bf66b3c501dc25785a4afb737b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sv-SE/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sv-SE/firefox-56.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "945a718d39d665e4b51a57ee4bb819eca8d4572c2e9098c448bece63b76bfbb652764667908c66ab4f9ace0c82b2d476f51a6fae5ba0f24aab8f94e47f506085"; + sha512 = "050c87742013c5de08d072171a10ff365ac50f2900c65039f3ed699b206a684323bd08c7941027eb6f6f7862ba8bd7011054e83f92fb0a9e9a3f208bd1e4617a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ta/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ta/firefox-56.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "17c5f121cee7d8b81fae8f1b2dec696e4fe02abeb0fb50124906dbb9d00c4a74a917d812760e671215f7391c408a391ecad2c590103956460dbbe5484595f457"; + sha512 = "8ba9e5eceb691c34c067a620167de35a130c3cbf67f0dd5417c27915b507891939d9080c9b7b3616ce939a17c153c8204639b7e3b431d564d43f79783a61b857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/te/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/te/firefox-56.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0f14c88d99afa7f299bff4d456d10a08bd4d359bd5ffae74b51eb907274e0ac5da1b762f357b845f7039e2b43fffa1b20c1a7fbd895ac57eb42615516ef0329e"; + sha512 = "c57380183538fd0a54a98f6fc9a9ad2a37c8a26f7beea65967b18ace44b88d2231a3509e643204322bd2c8111b8e9edd176a0712a32b34e4078c686a3b138bb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/th/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/th/firefox-56.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "2727f304314911aabbd34f46afda1c035fe018cd2efcfd2ab89cd71a265de176b5fef36f176086f93c28e0d456464634dd36f6e048761b24d276aecd0dc7fb97"; + sha512 = "bb9c8c108ba03016bffbcdc66dd5972df779c55349db431acc289ce2e8d299b930e9f17c8e3eac04b17a50e3e226eb73df91b8de0ee690915de8b3dccd7ddb2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/tr/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/tr/firefox-56.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "74b31af4b6622d286aa145e41567b09e9d1f0d922dd256647f09c959f09c2637889d11a346ec303c0fc871c8b1a382707756b8d0fc38d7093387b0247d143ff5"; + sha512 = "2bb15f16c35021a319ea79b653185fc87e81fb55764eda65f78d049dfc876c3b95828fab69bbf7521738cb2107e8cf16c2bae40332d2ce891aefc086ec582b30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/uk/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/uk/firefox-56.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a9373c5d8379a7ab483d4587fdc3df8adee0371d2a40b7886033d0505022b8adb516f7164d67da7b504e170aa5ed105218124274173d29c232e2dab7f7279921"; + sha512 = "bcb377c223a8f969b78832ce581dd4f21c4ef08409445faf3409651ec28f66361d8fda763104a6e39590e2e02ced75d7d0554d643e96a33784d471e9f1aba06a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ur/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ur/firefox-56.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "78578c99aefea3eb46d70d563868d2eb0bf43cc6a905b908305cf61ffe5b49064bf2845661af48c861e93cf50aa5e9d8dfaa755f11732760c1574cc0c88e5718"; + sha512 = "dfe75ccf52fa8a9d96309162e6499074446c609664a2d0971b9a7a0d64ccd4923494975af8d9b1710d7d5093b259d4ec56f43faeca331fbaf2c435f3cd5ed406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/uz/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/uz/firefox-56.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "0739b4d60e55b1d4e0ef5984050dca5ef484edb73ed590f948d8e4c4c2303cc0fcd177dbcca4ef66bf61821172675a4805aeaaf3349df1dad5a3080544316aa4"; + sha512 = "81618bda3809d1c489fdd03be8aeb440a7963464efc381664d6ebeae5d106cc36008977592a16ad629711a00a731f25cd651f789f84260add8f272cb7f6d39e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/vi/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/vi/firefox-56.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "9e0185b988338a333e7d89a384bd42dcf6f6ca8db4eedd56236357909f9d43ec09685e8099fe25833dcd60c301297760972770bbca7b61aba87622abc2623428"; + sha512 = "08d962b2ba18586e8bfc32d55ff800ce86125d59a7bdf6e6cb554b76d069aca86835cbe3985ff23c0462ab9f65758a12a0bcece39ce192d37d2eb2b66db8eaa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/xh/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/xh/firefox-56.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "63c1cd434edcb6069959085526cc14845de1fbf4da135a1e705433fae305dacaccfc958b98e0905b5cb2627f50b768db0940aeb728a4ab84e4592b596e50a895"; + sha512 = "fdf12790a573445cd48c5313579cb3d4016cde9ff8283c5adb63c7e51b6e2b42aa855f331842ecaf62c99c30641ed7b8531e9b2fefa3de1ee03530bafb12ee30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/zh-CN/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/zh-CN/firefox-56.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "a8c2473a2e172eb7bb34a66a4ce145218ba1cdbf951d3865561512cecd6cdda2a9741c6b383706f37537eea646fa1b282174ce9634bc69105c7611879c851a69"; + sha512 = "e828b745ee8526a2acea5a701982240172050342e0df0efc15dd87dfaea0271d42f7bc06435d4bc4af657f725462de49df8232d985debe15514d19d50b184663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/zh-TW/firefox-55.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/zh-TW/firefox-56.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f40193e6390f143cac3cdc0c230fedf2e791792d16e8446becf2038b4916274b47522bf5f239454696a8cbfffbb001556ade3b1bee2bdd239843f3bc3448b03f"; + sha512 = "c1b058d91c7b8d242238bd8411bfb339e2712b6c550329bd06fac837faf453320310cf0d11597e9ca6d5d9abf084ad761a6701deeb6673547fcd60a094c6452f"; } ]; } From c22d717c75ab4db9a7f8816a7b0ee951a187dac2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 29 Sep 2017 01:39:29 +0200 Subject: [PATCH 0430/2806] 17.09 release notes: fix typos & ordering --- nixos/doc/manual/release-notes/rl-1709.xml | 120 ++++++++++++--------- 1 file changed, 67 insertions(+), 53 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 8b0d2549439..f8b24f552d2 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -55,22 +55,23 @@ has the following highlights: - The handling of SSL in the nginx module has been cleaned up, renaming - the misnomed enableSSL to onlySSL - which reflects its original intention. This is not to be used with the - already existing forceSSL which creates a second - non-SSL virtual host redirecting to the SSL virtual host. This by - chance had worked earlier due to specific implementation details. In - case you had specified both please remove the enableSSL - option to keep the previous behaviour. + The handling of SSL in the services.nginx module has + been cleaned up, renaming the misnamed enableSSL to + onlySSL which reflects its original intention. This + is not to be used with the already existing forceSSL + which creates a second non-SSL virtual host redirecting to the SSL + virtual host. This by chance had worked earlier due to specific + implementation details. In case you had specified both please remove + the enableSSL option to keep the previous behaviour. Another addSSL option has been introduced to configure - both a non-SSL virtual host and an SSL virtual host. + both a non-SSL virtual host and an SSL virtual host with the same + configuration. - Options to configure resolvers and - upstreams have been introduced. See their information + Options to configure resolver options and + upstream blocks have been introduced. See their information for further details. @@ -193,7 +194,7 @@ following incompatible changes: This is due to a kernel configuration change. The new naming is consistent with those of other Linux distributions with systemd. See - + #29197 for more information. @@ -228,6 +229,39 @@ following incompatible changes: + + + The following changes apply if the stateVersion is changed to 17.09 or higher. + For stateVersion = "17.03" or lower the old behavior is preserved. + + + + + The postgres default version was changed from 9.5 to 9.6. + + + + + The postgres superuser name has changed from root to postgres to more closely follow what other Linux distributions are doing. + + + + + The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example. + + + + + The mysql default dataDir has changed from /var/mysql to /var/lib/mysql. + + + + + Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found here . It is also possible to use the newer version by setting the package to radicale2, which is done automatically when stateVersion is 17.09 or higher. The extraArgs option has been added to allow passing the data migration arguments specified in the instructions; see the radicale.nix NixOS test for an example migration. + + + + The aiccu package was removed. This is due to SixXS @@ -256,7 +290,7 @@ following incompatible changes: - The ipfs package now doesn't ignore the dataDir option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with + The ipfs service now doesn't ignore the dataDir option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with dataDir=<valueOfDataDir> mv /var/lib/ipfs/.ipfs/* $dataDir @@ -264,32 +298,11 @@ rmdir /var/lib/ipfs/.ipfs - - - The following changes apply if the stateVersion is changed to 17.09 or higher. - For stateVersion = "17.03 or lower the old behavior is preserved. - - - The postgres default version was changed from 9.5 to 9.6. - - - The postgres superuser name has changed from root to postgres to more closely follow what other Linux distributions are doing. - - - The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example. - - - The mysql default dataDir has changed from /var/mysql to /var/lib/mysql. - - - Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found here . It is also possible to use the newer version by setting the package to radicale2, which is done automatically when stateVersion is 17.09 or higher. The extraArgs option has been added to allow passing the data migration arguments specified in the instructions; see the radicale.nix NixOS test for an example migration. - - The caddy service was previously using an extra - .caddy in the data directory specified with the - dataDir option. The contents of the + .caddy directory in the data directory specified + with the dataDir option. The contents of the .caddy directory are now expected to be in the dataDir. @@ -367,15 +380,6 @@ rmdir /var/lib/ipfs/.ipfs upstream's announcement for more information. No complete replacement for grsecurity/PaX is available presently. - - - - The gnupg package used to suffix its programs - with 2, like gpg2 and - gpgv2. This suffix has since been dropped, - and the programs are now simply gpg, - gpgv, etc. - @@ -415,14 +419,6 @@ FLUSH PRIVILEGES; - - - Templated systemd services e.g container@name are - now handled currectly when switching to a new configuration, resulting - in them being reloaded. - - - services.mysqlBackup now works by default @@ -463,6 +459,14 @@ FLUSH PRIVILEGES; + + + Templated systemd services e.g container@name are + now handled currectly when switching to a new configuration, resulting + in them being reloaded. + + + Steam: the newStdcpp parameter was removed and should not be needed anymore. @@ -558,23 +562,33 @@ FLUSH PRIVILEGES; which makes it possible to remove the install medium after booting. This allows tethering from your phone after booting from it. + + services.gitlab-runner.configOptions has been added to specify the configuration of gitlab-runners declaratively. + + services.jenkins.plugins has been added to install plugins easily, this can be generated with jenkinsPlugins2nix. + + services.postfix.config has been added to specify the main.cf with NixOS options. Additionally other options have been added to the postfix module and has been improved further. + + The GitLab package and module have been updated to the latest 10.0 release. + + The systemd-boot boot loader now lists the NixOS version, kernel version and build date of all bootable generations. From 5b8a798137f9d8e846b728a395e68e8d22687dd2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 29 Sep 2017 01:47:05 +0200 Subject: [PATCH 0431/2806] 17.09 release notes: mention KDE upgrades --- nixos/doc/manual/release-notes/rl-1709.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index f8b24f552d2..4e4b0178a08 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -20,7 +20,8 @@ has the following highlights: - The GNOME version is now 3.24. + The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, + KDE Applications to 17.08.1 and KDE Frameworks to 5.37. From fdbda216b1864a23cb2582fa93793baa32821f46 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 30 Aug 2017 14:57:20 -0400 Subject: [PATCH 0432/2806] cc-wrapper: Clean up dynamic linking with x86 multilib It's better layering to do everything in ld-wrapper. Also, use numeric comparisons for `relocatable`. --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 4 --- pkgs/build-support/cc-wrapper/ld-wrapper.sh | 33 ++++++++++++++++++--- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index e6f5a5a9f7d..f1f56cf5cec 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -61,10 +61,6 @@ while (( "$n" < "$nParams" )); do cppInclude=0 elif [ "${p:0:1}" != - ]; then nonFlagArgs=1 - elif [ "$p" = -m32 ]; then - if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)" - fi fi n+=1 done diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 355ea881898..bbab3c43d6f 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -67,12 +67,22 @@ fi extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER) +# Three tasks: +# +# 1. Find all -L... switches for rpath +# +# 2. Find relocatable flag for build id. +# +# 3. Choose 32-bit dynamic linker if needed declare -a libDirs declare -A libs -relocatable= +declare -i relocatable=0 link32=0 -# Find all -L... switches for rpath, and relocatable flags for build id. -if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ]; then +if + [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] \ + || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] \ + || [ -e @out@/nix-support/dynamic-linker-m32 ] +then prev= # Old bash thinks empty arrays are undefined, ugh. for p in \ @@ -87,6 +97,13 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_I -l) libs["lib${p}.so"]=1 ;; + -m) + # Presumably only the last `-m` flag has any effect. + case "$p" in + elf_i386) link32=1;; + *) link32=0;; + esac + ;; -dynamic-linker | -plugin) # Ignore this argument, or it will match *.so and be added to rpath. ;; @@ -112,6 +129,14 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_I done fi +if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then + # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's + # use it. + extraAfter+=( + '-dynamic-linker' + "$(< @out@/nix-support/dynamic-linker-m32)" + ) +fi # Add all used dynamic libraries to the rpath. if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then @@ -154,7 +179,7 @@ fi # Only add --build-id if this is a final link. FIXME: should build gcc # with --enable-linker-build-id instead? -if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then +if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && ! (( "$relocatable" )); then extraAfter+=(--build-id) fi From 538b016ae05c784c4a7d6acdeceb778442e0a64b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 29 Sep 2017 02:05:28 +0200 Subject: [PATCH 0433/2806] pythonPackages.pyalgotrade: incompatible with python3 --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4f8d6abfc1..e6b70cf164b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16108,6 +16108,7 @@ in { pyalgotrade = buildPythonPackage { name = "pyalogotrade-0.16"; + disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/P/PyAlgoTrade/PyAlgoTrade-0.16.tar.gz"; From e68e14944786367dd2c18879f3990a531e1daf7d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 29 Sep 2017 02:10:56 +0200 Subject: [PATCH 0434/2806] pythonPackages.pyalgotrade: fix typo --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6b70cf164b..e7fd6c70fdd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16107,7 +16107,7 @@ in { pyalgotrade = buildPythonPackage { - name = "pyalogotrade-0.16"; + name = "pyalgotrade-0.16"; disabled = isPy3k; src = pkgs.fetchurl { From df6b0fbd677a620b275c69df8af0312ad7e93dae Mon Sep 17 00:00:00 2001 From: Andrew Morsillo Date: Thu, 28 Sep 2017 11:58:42 -0400 Subject: [PATCH 0435/2806] robo3t: added 1.1.1 --- pkgs/applications/misc/robo3t/default.nix | 77 +++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/robo3t/default.nix diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix new file mode 100644 index 00000000000..5ebb2b1189a --- /dev/null +++ b/pkgs/applications/misc/robo3t/default.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, + freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: + +stdenv.mkDerivation rec { + name = "robo3t-${version}"; + version = "1.1.1"; + + src = fetchurl { + url = "https://download.robomongo.org/1.1.1/linux/robo3t-${version}-linux-x86_64-c93c6b0.tar.gz"; + sha256 = "140cn80vg7c8vpdjasqi4b3kyqj4n033lcm3ikz5674x3jr7r5zs"; + }; + + icon = fetchurl { + url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png"; + sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2"; + }; + + desktopItem = makeDesktopItem { + name = "Robo3T"; + exec = "robo3t"; + icon = icon; + comment = "Query GUI for mongodb"; + desktopName = "Robo3T"; + genericName = "MongoDB management tool"; + categories = "Development;IDE;mongodb;"; + }; + + nativeBuildInputs = [makeWrapper]; + + ldLibraryPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc + zlib + glib + xorg.libXi + xorg.libxcb + xorg.libXrender + xorg.libX11 + xorg.libSM + xorg.libICE + xorg.libXext + dbus + fontconfig + freetype + ]; + + installPhase = '' + BASEDIR=$out/lib/robo3t + + mkdir -p $BASEDIR/bin + cp bin/* $BASEDIR/bin + + mkdir -p $BASEDIR/lib + cp -r lib/* $BASEDIR/lib + + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications + + mkdir -p $out/share/icons + cp ${icon} $out/share/icons/robomongo.png + + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robo3t + + mkdir $out/bin + + makeWrapper $BASEDIR/bin/robo3t $out/bin/robo3t \ + --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ + --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb + ''; + + meta = { + homepage = https://robomongo.org/; + description = "Query GUI for mongodb"; + platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.eperuffo ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 343e10f55be..3abaa7402fb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -126,6 +126,7 @@ mapAliases (rec { qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 + robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rustUnstable = rustNightly; # added 2016-11-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b649d924f1..b7407658878 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19040,7 +19040,7 @@ with pkgs; redis-desktop-manager = libsForQt56.callPackage ../applications/misc/redis-desktop-manager { }; - robomongo = callPackage ../applications/misc/robomongo { }; + robo3t = callPackage ../applications/misc/robo3t { }; rucksack = callPackage ../development/tools/rucksack { }; From 3e91da5ecec16d46915abdb1844eb26f0202f0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 28 Sep 2017 23:04:52 -0300 Subject: [PATCH 0436/2806] efl: 1.20.3 -> 1.20.4 --- pkgs/desktops/enlightenment/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 67840a4c9e6..d011012e010 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.20.3"; + version = "1.20.4"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "148i8awjdrqzd0xqfc6q4qvhhs46jl15nx7n2nii7lrwzx502wqj"; + sha256 = "1jxha61gsil6hs9zb72zsyh3gmdipvfnlc9v3palb2bm0b23aq9i"; }; nativeBuildInputs = [ pkgconfig ]; From 54dc7807c704c96452e5f36ab5a839e9ce2f9d8d Mon Sep 17 00:00:00 2001 From: xd1le Date: Fri, 29 Sep 2017 15:13:28 +1000 Subject: [PATCH 0437/2806] guile-xcb: fix build by building with guile-2.0 --- 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 bbd6a59088d..0bf4e50a9ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6751,7 +6751,9 @@ with pkgs; guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; - guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; + guile-xcb = callPackage ../development/guile-modules/guile-xcb { + guile = guile_2_0; + }; pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; From 40312b6a9b8b4d20b825520e17efaa543300e772 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 29 Sep 2017 08:29:15 +0200 Subject: [PATCH 0438/2806] modemmanager: 1.6.2 -> 1.6.8 --- pkgs/tools/networking/modemmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index dc4e246c02f..36c56ac9847 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "ModemManager-${version}"; - version = "1.6.2"; + version = "1.6.8"; src = fetchurl { url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz"; - sha256 = "14v31j916h63z7af107rias1zbb2y94p3jg77zhzhrn1v6c46m74"; + sha256 = "0xj3ng7qcqxkib5qkprwghcivaz0mn449fw08l67h1zbpz23bh7z"; }; nativeBuildInputs = [ intltool pkgconfig ]; From eee86b1ba5186d065c122fb7b9fd473c78e6aece Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 29 Sep 2017 08:34:55 +0200 Subject: [PATCH 0439/2806] libmbim: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/libmbim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index f1625e6a33f..92902cd27d7 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.14.0"; + name = "libmbim-1.14.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "0nxb4x8l092xckk4dy84cn5qhviif8akzy0miypapjqqbalm53fa"; + sha256 = "1krirl9881dnx7l29zhvagk2qlhi26vpvkzdifjklhrjhimzxji2"; }; outputs = [ "out" "dev" "man" ]; From 7f831ef05ee61cbd070ed27348005aad3963ad69 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 28 Sep 2017 10:50:50 +0200 Subject: [PATCH 0440/2806] python.pkgs.numpy: 1.13.1 -> 1.13.2 --- pkgs/development/python-modules/numpy/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 19d135fc0e1..ffb74021d8d 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,13 +1,14 @@ -{lib, fetchurl, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}: +{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}: buildPythonPackage rec { pname = "numpy"; - version = "1.13.1"; + version = "1.13.2"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/n/numpy/numpy-${version}.zip"; - sha256 = "c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb"; + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1fmq8923q91xyjf6fngl0n6jlysryyzx06288b5qdvv97mlfpklh"; }; disabled = isPyPy; From 8ebe47a45a04d20374ebec1b120715ab9d49dd45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 29 Sep 2017 07:00:37 -0300 Subject: [PATCH 0441/2806] gparted: 0.28.1 -> 0.29.0 --- pkgs/tools/misc/gparted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 67e5a7848b2..76bfb8c661e 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -4,10 +4,10 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.28.1"; + name = "gparted-0.29.0"; src = fetchurl { - sha256 = "0cyk8lpimm6wani8khw0szwqkgw5wpq2mfnfxkbgfm2774a1z2bn"; + sha256 = "1kf3ly7m3bikyzapjw8q1rlia0kg5zzgp59akhabx1rnnimvyl12"; url = "mirror://sourceforge/gparted/${name}.tar.gz"; }; From 864f9a8df5c52120b40ca9d3a797985ec75b849a Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 25 Sep 2017 20:59:17 +1000 Subject: [PATCH 0442/2806] libwhereami: init at 0.1.1 --- .../libraries/libwhereami/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/libwhereami/default.nix diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix new file mode 100644 index 00000000000..35e904989c4 --- /dev/null +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: + +stdenv.mkDerivation rec { + name = "libwhereami-${version}"; + version = "0.1.1"; + + src = fetchFromGitHub { + sha256 = "0nhbmxm626cgawprszw6c03a3hasxjn1i9ldhhj5xyvxp8r5l9q4"; + rev = version; + repo = "libwhereami"; + owner = "puppetlabs"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost curl leatherman ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Library to report hypervisor information from inside a VM"; + license = licenses.asl20; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aadb559110..be2500331d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9520,6 +9520,8 @@ with pkgs; libupnp = callPackage ../development/libraries/pupnp { }; + libwhereami = callPackage ../development/libraries/libwhereami { }; + giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; From c9be5ced8f92874eca7fce3a032c4b7d81142e36 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 25 Sep 2017 20:59:41 +1000 Subject: [PATCH 0443/2806] cpp-hocon: 0.1.5 -> 0.1.6 --- pkgs/development/libraries/cpp-hocon/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 6014c9f4eaf..236d634a514 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { - sha256 = "0fc5468458mz572nbp45x5sblp6dsb4d1b6jqv77zf3mx5xyziz7"; + sha256 = "0qf2nqp28ahypnzjrr37f54i06ylni40y18q9kwp5s7i5cwbjqgc"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl leatherman ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = " A C++ port of the Typesafe Config library"; From 09c2e243b492c1a8e8592941bdb12edd9b5d8611 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 25 Sep 2017 21:01:43 +1000 Subject: [PATCH 0444/2806] leatherman: 1.0.0 -> 1.3.0 --- pkgs/development/libraries/leatherman/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index a9c7a9b70bb..be033c3860c 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.0.0"; + version = "1.3.0"; src = fetchFromGitHub { - sha256 = "15kg6vdr1iav5x3pzwvrdsi54lbl8zh2xwqlp03gaq4n3kg5wj3y"; + sha256 = "1pcbfgq9khlcvxjsqpdshjskwljzawryzps0ickazwm7l3m7hrln"; rev = version; repo = "leatherman"; owner = "puppetlabs"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost cmake curl ruby ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://github.com/puppetlabs/leatherman/; description = "A collection of C++ and CMake utility libraries"; From 4f598b1b9ad43c665fa83823eb68fec60f5d4d58 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 25 Sep 2017 21:02:00 +1000 Subject: [PATCH 0445/2806] facter: 3.7.1 -> 3.9.0 --- pkgs/tools/system/facter/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 56ac33ba23c..b74f9948418 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }: +{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }: stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.7.1"; + version = "3.9.0"; src = fetchFromGitHub { - sha256 = "0v5g7qlqqixgvc2hf9440a8sfh8jvgzynwk5ipcb505hi00ddq7a"; + sha256 = "1picxrmvka57ph4zqgwqdsqvz3mqppg41wkj8dx37hscwwlbdw0s"; rev = version; repo = "facter"; owner = "puppetlabs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # since we cant expand $out in cmakeFlags preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\""; - buildInputs = [ boost cmake cpp-hocon curl leatherman libyamlcpp openssl ruby utillinux ]; + buildInputs = [ boost cmake cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; enableParallelBuilding = true; From 24890984e758a3f9de645181bd758ec8e6af34c0 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 29 Sep 2017 13:16:17 +0300 Subject: [PATCH 0446/2806] timescaledb: cosmetics --- pkgs/servers/sql/postgresql/timescaledb/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index 5810ae86891..fbf0bfa1926 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -1,5 +1,11 @@ { stdenv, fetchFromGitHub, postgresql }: +# # To enable on NixOS: +# config.services.postgresql = { +# extraPlugins = [ pkgs.timescaledb ]; +# extraConfig = "shared_preload_libraries = 'timescaledb'"; +# } + stdenv.mkDerivation rec { name = "timescaledb-${version}"; version = "0.5.0"; @@ -21,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "TimescaleDB scales PostgreSQL for time-series data via automatic partitioning across time and space"; + description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = https://www.timescale.com/; maintainers = with maintainers; [ volth ]; platforms = platforms.linux; From d96da5af876db7d5839a048980853a0b294b59e7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 29 Sep 2017 09:09:53 -0400 Subject: [PATCH 0447/2806] Revert "Avoid polluting lib namespace unncessarily" Reverting #27319 This reverts commit 01a3f0b8aabdb321b15dc7cc0e2287ce8232f797. --- lib/customisation.nix | 2 +- lib/default.nix | 5 +++-- pkgs/top-level/haskell-packages.nix | 2 +- pkgs/top-level/splice.nix | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 304bb228449..217daada781 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -81,7 +81,7 @@ rec { }); }; - in lib.fixedPoints.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: { + in lib.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: { args = origArgs; val = f output self.args self.val; }); diff --git a/lib/default.nix b/lib/default.nix index 3e30ec515fc..9da78ff0da7 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -60,7 +60,7 @@ let nixpkgsVersion mod; inherit (fixedPoints) fix fix' extends composeExtensions - makeExtensible makeExtensibleWithCustomName; + makeExtensible makeExtensibleWithCustomName makeExtensibleWithInterface; inherit (attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues catAttrs filterAttrs filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs @@ -88,7 +88,8 @@ let inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith addPassthru hydraJob makeScope; + callPackageWith callPackagesWith addPassthru hydraJob makeScope + callPackageWithOutputWith; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio hiPrioSet; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dce783b3f98..a1f9b2e81c3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -24,7 +24,7 @@ let }; callPackage = lib.callPackageWith (pkgs // { inherit haskellLib; }); - callPackageWithOutput = lib.customisation.callPackageWithOutputWith (pkgs // { inherit haskellLib; }); + callPackageWithOutput = lib.callPackageWithOutputWith (pkgs // { inherit haskellLib; }); in rec { lib = haskellLib; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 599c108062c..d6498be949b 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -86,5 +86,5 @@ in newScope = extra: lib.callPackageWith (splicedPackages // extra); - newScopeWithOutput = extra: lib.customisation.callPackageWithOutputWith (splicedPackages // extra); + newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra); } From ca535da1fbee8d61abb985aca97617e3c78b7352 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 29 Sep 2017 09:10:30 -0400 Subject: [PATCH 0448/2806] Revert "Fix tarball" Reverting #27319 This reverts commit 9ce7175cfe9edf5f7eb9a9f299807047a4feeaf1. --- lib/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 9da78ff0da7..ae8a1899b19 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -88,8 +88,7 @@ let inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith addPassthru hydraJob makeScope - callPackageWithOutputWith; + callPackageWith callPackagesWith addPassthru hydraJob makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio hiPrioSet; From 8f33315f8f50fa5a01d082fb1cce57f1ac2c20d1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 29 Sep 2017 09:10:48 -0400 Subject: [PATCH 0449/2806] Revert "Fix evaluation" Reverting #27319 This reverts commit 751d397ad486a84b93907345124f550e3b32427c. --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index ae8a1899b19..3e30ec515fc 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -60,7 +60,7 @@ let nixpkgsVersion mod; inherit (fixedPoints) fix fix' extends composeExtensions - makeExtensible makeExtensibleWithCustomName makeExtensibleWithInterface; + makeExtensible makeExtensibleWithCustomName; inherit (attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues catAttrs filterAttrs filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs From 1a1ad1a17dfbe1b4da3a0bb174c6830ac318a3a7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 29 Sep 2017 09:11:26 -0400 Subject: [PATCH 0450/2806] Revert "Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs" This reverts commit c3af1210b4c5d7ef380e75add463b37574fdcc8b, reversing changes made to 49f175cd0c80a39e1d05fc687c4a2a40e0aba58c. --- lib/customisation.nix | 164 +++--------------- lib/fixed-points.nix | 34 +--- pkgs/development/beam-modules/default.nix | 7 +- pkgs/development/haskell-modules/default.nix | 20 ++- .../haskell-modules/make-package-set.nix | 34 +++- pkgs/development/idris-modules/default.nix | 11 +- pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/haskell-packages.nix | 41 +++-- pkgs/top-level/splice.nix | 4 - 9 files changed, 113 insertions(+), 206 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 217daada781..483ef6fd486 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -50,50 +50,10 @@ rec { } else { })); - # A more powerful version of `makeOverridable` with features similar - # to `makeExtensibleWithInterface`. - makeOverridableWithInterface = interface: f: origArgs: let - addOverrideFuncs = {val, args, ...}: overridePackage: - (lib.optionalAttrs (builtins.isAttrs val) (val // { - extend = f: overridePackage (_: self: super: { - val = super.val // f self.val super.val; - }); - - overrideDerivation = newArgs: overridePackage (_: self: super: { - val = lib.overrideDerivation super.val newArgs; - }); - - ${if val ? overrideAttrs then "overrideAttrs" else null} = fdrv: - overridePackage (_: self: super: { - val = super.val.overrideAttrs fdrv; - }); - })) // (lib.optionalAttrs (builtins.isFunction val) { - __functor = _: val; - extend = throw "extend not yet supported for functors"; - overrideDerivation = throw "overrideDerivation not yet supported for functors"; - }) // { - inherit overridePackage; - - override = newArgs: overridePackage (_: self: super: { - args = super.args // - (if builtins.isFunction newArgs then newArgs super.args else newArgs); - }); - }; - - in lib.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: { - args = origArgs; - val = f output self.args self.val; - }); - - - /* `makeOverridable` takes a function from attribute set to - attribute set and injects 4 attributes which can be used to - override arguments and return values of the function. - - - 1. `override` allows you to change what arguments were passed to - the function and acquire the new result. + /* `makeOverridable` takes a function from attribute set to attribute set and + injects `override` attibute which can be used to override arguments of + the function. nix-repl> x = {a, b}: { result = a + b; } @@ -105,75 +65,28 @@ rec { nix-repl> y.override { a = 10; } { override = «lambda»; overrideDerivation = «lambda»; result = 12; } - - 2. `extend` changes the results of the function, giving you a - view of the original result and a view of the eventual final - result. It is meant to do the same thing as - `makeExtensible`. That is, it lets you add to or change the - return value, such that previous extensions are consistent with - the final view, rather than being based on outdated - values. "Outdated" values come from the `super` argument, which - must be used when you are attempting to modify and old value. And - the final values come from the `self` argument, which recursively - refers to what all extensions combined return. - - nix-repl> obj = makeOverridable (args: { }) { } - - nix-repl> obj = obj.extend (self: super: { foo = "foo"; }) - - nix-repl> obj.foo - "foo" - - nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; }) - - nix-repl> obj - { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; ... } # Excess omitted - - - 3. `overrideDerivation`: Please refer to "Nixpkgs Contributors - Guide" section ".overrideDerivation" to learn about - `overrideDerivation` and caveats related to its use. - - - 4. `overridePackage` is by far the most powerful of the four, as - it exposes a deeper structure. It provides `self` and `super` - views of both the arguments and return value of the function, - allowing you to change both in one override; you can even have - overrides for one based on overrides for the other. It also - provides the `output` view, which is the view of `self` after - passing it through the `makeOverridable` interface and adding all - the `overrideX` functions. `output` is necessary when your - overrides depend on the overridable structure of `output`. - - nix-repl> obj = makeOverridable ({a, b}: {inherit a b;}) {a = 1; b = 3;} - - nix-repl> obj = obj.overridePackage (output: self: super: { args = super.args // {b = self.val.a;}; }) - - nix-repl> obj.b - 1 - - nix-repl> obj = obj.overridePackage (output: self: super: { val = super.val // {a = self.args.a + 10;}; }) - - nix-repl> obj.b - 11 - + Please refer to "Nixpkgs Contributors Guide" section + ".overrideDerivation" to learn about `overrideDerivation` and caveats + related to its use. */ - makeOverridable = fn: makeOverridableWithInterface (x: _: x) (_: args: _: fn args); - - callPackageCommon = functionArgs: scope: f: args: + makeOverridable = f: origArgs: let - intersect = builtins.intersectAttrs functionArgs; - interface = val: overridePackage: val // { - overrideScope = newScope: overridePackage (_: self: super: { - scope = super.scope.extend newScope; - }); - }; - in (makeOverridableWithInterface interface f (intersect scope // args)) - .overridePackage (output: self: super: { - inherit scope; - # Don't use super.args because that contains the original scope. - args = intersect self.scope // args; - }); + ff = f origArgs; + overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); + in + if builtins.isAttrs ff then (ff // { + override = newArgs: makeOverridable f (overrideWith newArgs); + overrideDerivation = fdrv: + makeOverridable (args: overrideDerivation (f args) fdrv) origArgs; + ${if ff ? overrideAttrs then "overrideAttrs" else null} = fdrv: + makeOverridable (args: (f args).overrideAttrs fdrv) origArgs; + }) + else if builtins.isFunction ff then { + override = newArgs: makeOverridable f (overrideWith newArgs); + __functor = self: ff; + overrideDerivation = throw "overrideDerivation not yet supported for functors"; + } + else ff; /* Call the package function in the file `fn' with the required @@ -196,35 +109,12 @@ rec { libfoo = null; enableX11 = true; }; - - On top of the additions from `makeOverridable`, an `overrideScope` - function is also added to the result. It is similar to `override`, - except that it provides `self` and `super` views to the - scope. This can't be done in `makeOverridable` because the scope - is filtered to just the arguments needed by the function before - entering `makeOverridable`. It is useful to have a view of the - scope before restriction; for example, to change versions for a - particular dependency. - - foo.overrideScope (self: super: { - llvm = self.llvm_37; - }) - - `llvm_37` would not exist in the scope after restriction. - */ callPackageWith = autoArgs: fn: args: - let f = if builtins.isFunction fn then fn else import fn; - in callPackageCommon (builtins.functionArgs f) autoArgs (output: x: _: f x) args; - - - # Like `callPackageWith`, but provides the function with a `self` - # view of the output, which has the override functions - # injected. `fn` is called with the new output whenever an override - # or extension is added. - callPackageWithOutputWith = autoArgs: fn: args: - let f = if builtins.isFunction fn then fn else import fn; - in callPackageCommon (builtins.functionArgs f) autoArgs (output: args: _: f args output ) args; + let + f = if builtins.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + in makeOverridable f (auto // args); /* Like callPackage, but for a function that returns an attribute diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 2526360c111..13e053b5aa7 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -72,34 +72,8 @@ rec { # Same as `makeExtensible` but the name of the extending attribute is # customized. - makeExtensibleWithCustomName = extenderName: f: makeExtensibleWithInterface - (fixedPoint: extend: fixedPoint // { ${extenderName} = ext: extend (_: ext); }) - (_: f); - - # A version of `makeExtensible` that allows the function being fixed - # to return a different interface than the interface returned to the - # user. Along with `self` and `super` views of the internal - # interface, a `self` view of the output interface is also - # provided. `extend` is not added to the output by default. This is - # the job of the interface. - # - # nix-repl> foo = {a, b}: {c = a + b;} - # - # nix-repl> interface = {args, val, ...}: extend: val // {inherit extend;} - # - # nix-repl> obj = makeExtensibleWithInterface interface (output: self: { args = {a = 1; b = 2;}; val = foo self.args; }) - # - # nix-repl> obj.c - # 3 - # - # nix-repl> obj = obj.extend (output: self: super: { args = super.args // { b = output.d; }; }) - # - # nix-repl> obj = obj.extend (output: self: super: { val = super.val // { d = 10; }; }) - # - # nix-repl> { inherit (obj) c d; } - # { c = 11; d = 10; } - makeExtensibleWithInterface = interface: f: let i = interface - (fix' (f i)) - (fext: makeExtensibleWithInterface interface (i': (extends (fext i') (f i')))); - in i; + makeExtensibleWithCustomName = extenderName: rattrs: + fix' rattrs // { + ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs); + }; } diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 95fe683cd1e..1d4cef68514 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -5,9 +5,14 @@ let lib = pkgs.callPackage ./lib.nix {}; + # FIXME: add support for overrideScope + callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args; + mkScope = scope: pkgs // scope; + packages = self: let - callPackage = stdenv.lib.callPackageWith (pkgs // self); + defaultScope = mkScope self; + callPackage = drv: args: callPackageWithScope defaultScope drv args; in import ./hex-packages.nix { inherit pkgs stdenv callPackage; diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 9eeae0eddc7..1658ce79393 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -7,8 +7,6 @@ , configurationNix ? import ./configuration-nix.nix }: -self: # Provided by `callPackageWithOutput` - let inherit (lib) extends makeExtensible; @@ -16,15 +14,19 @@ let haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; - extensible-self = self; - inherit stdenv haskellLib ghc; + inherit stdenv haskellLib ghc extensible-self; }; commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; nixConfiguration = configurationNix { inherit pkgs haskellLib; }; -in (extends overrides - (extends packageSetConfig - (extends compilerConfig - (extends commonConfiguration - (extends nixConfiguration haskellPackages))))) self + extensible-self = makeExtensible + (extends overrides + (extends packageSetConfig + (extends compilerConfig + (extends commonConfiguration + (extends nixConfiguration haskellPackages))))); + +in + + extensible-self diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index b6bd3fdd30b..ff5be894b92 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -29,7 +29,7 @@ self: let - inherit (stdenv.lib) fix' extends makeOverridable callPackageWith; + inherit (stdenv.lib) fix' extends makeOverridable; inherit (haskellLib) overrideCabal; mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { @@ -61,9 +61,39 @@ let mkDerivation = makeOverridable mkDerivationImpl; + # manualArgs are the arguments that were explictly passed to `callPackage`, like: + # + # callPackage foo { bar = null; }; + # + # here `bar` is a manual argument. + callPackageWithScope = scope: fn: manualArgs: + let + # this code is copied from callPackage in lib/customisation.nix + # + # we cannot use `callPackage` here because we want to call `makeOverridable` + # on `drvScope` (we cannot add `overrideScope` after calling `callPackage` because then it is + # 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; + + # this wraps the `drv` function to add a `overrideScope` function to the result. + drvScope = allArgs: drv allArgs // { + overrideScope = f: + let newScope = mkScope (fix' (extends f scope.__unfix__)); + # note that we have to be careful here: `allArgs` includes the auto-arguments that + # weren't manually specified. If we would just pass `allArgs` to the recursive call here, + # then we wouldn't look up any packages in the scope in the next interation, because it + # appears as if all arguments were already manually passed, so the scope change would do + # nothing. + in callPackageWithScope newScope drv manualArgs; + }; + in stdenv.lib.makeOverridable drvScope (auto // manualArgs); + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // { inherit stdenv; } // scope; defaultScope = mkScope self; - callPackage = drv: args: callPackageWith defaultScope drv args; + callPackage = drv: args: callPackageWithScope defaultScope drv args; withPackages = packages: callPackage ./with-packages-wrapper.nix { inherit (self) llvmPackages; diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index cb8f46d0c2e..4d7c4928283 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -1,8 +1,17 @@ { pkgs, idris, overrides ? (self: super: {}) }: let inherit (pkgs.lib) callPackageWith fix' extends; + /* Taken from haskell-modules/default.nix, should probably abstract this away */ + callPackageWithScope = scope: drv: args: (callPackageWith scope drv args) // { + overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; + }; + + mkScope = scope : pkgs // pkgs.xorg // pkgs.gnome2 // scope; + idrisPackages = self: let - callPackage = callPackageWith (pkgs // pkgs.xorg // pkgs.gnome2 // self); + defaultScope = mkScope self; + + callPackage = callPackageWithScope defaultScope; builtins_ = pkgs.lib.mapAttrs self.build-builtin-package { prelude = []; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19452e0d6c0..7e94b3f0c0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5710,7 +5710,9 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc802.extend (config.haskellPackageOverrides or (self: super: {})); + haskellPackages = haskell.packages.ghc802.override { + overrides = config.haskellPackageOverrides or (self: super: {}); + }; inherit (haskellPackages) ghc; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a1f9b2e81c3..b3bbb0d5b64 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, buildPlatform, targetPlatform }: +{ pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform }: let # These are attributes in compiler and packages that don't support integer-simple. @@ -23,8 +23,7 @@ let inherit pkgs; }; - callPackage = lib.callPackageWith (pkgs // { inherit haskellLib; }); - callPackageWithOutput = lib.callPackageWithOutputWith (pkgs // { inherit haskellLib; }); + callPackage = newScope { inherit haskellLib; }; in rec { lib = haskellLib; @@ -122,75 +121,75 @@ in rec { packages = { # Support for this compiler is broken, because it can't deal with directory-based package databases. - # ghc6104 = callPackageWithOutput ../development/haskell-modules { ghc = compiler.ghc6104; }; - ghc6123 = callPackageWithOutput ../development/haskell-modules { + # ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; }; + ghc6123 = callPackage ../development/haskell-modules { ghc = compiler.ghc6123; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { }; }; - ghc704 = callPackageWithOutput ../development/haskell-modules { + ghc704 = callPackage ../development/haskell-modules { ghc = compiler.ghc704; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { }; }; - ghc722 = callPackageWithOutput ../development/haskell-modules { + ghc722 = callPackage ../development/haskell-modules { ghc = compiler.ghc722; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { }; }; - ghc742 = callPackageWithOutput ../development/haskell-modules { + ghc742 = callPackage ../development/haskell-modules { ghc = compiler.ghc742; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { }; }; - ghc763 = callPackageWithOutput ../development/haskell-modules { + ghc763 = callPackage ../development/haskell-modules { ghc = compiler.ghc763; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { }; }; - ghc783 = callPackageWithOutput ../development/haskell-modules { + ghc783 = callPackage ../development/haskell-modules { ghc = compiler.ghc783; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; - ghc784 = callPackageWithOutput ../development/haskell-modules { + ghc784 = callPackage ../development/haskell-modules { ghc = compiler.ghc784; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; - ghc7102 = callPackageWithOutput ../development/haskell-modules { + ghc7102 = callPackage ../development/haskell-modules { ghc = compiler.ghc7102; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; - ghc7103 = callPackageWithOutput ../development/haskell-modules { + ghc7103 = callPackage ../development/haskell-modules { ghc = compiler.ghc7103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; - ghc802 = callPackageWithOutput ../development/haskell-modules { + ghc802 = callPackage ../development/haskell-modules { ghc = compiler.ghc802; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; - ghc821 = callPackageWithOutput ../development/haskell-modules { + ghc821 = callPackage ../development/haskell-modules { ghc = compiler.ghc821; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghcHEAD = callPackageWithOutput ../development/haskell-modules { + ghcHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; # TODO Support for multiple variants here - ghcCross = callPackageWithOutput ../development/haskell-modules { + ghcCross = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD.crossCompiler; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcCross821 = callPackageWithOutput ../development/haskell-modules { + ghcCross821 = callPackage ../development/haskell-modules { ghc = compiler.ghc821.crossCompiler; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghcjs = callPackageWithOutput ../development/haskell-modules { + ghcjs = callPackage ../development/haskell-modules { ghc = compiler.ghcjs; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcjsHEAD = callPackageWithOutput ../development/haskell-modules { + ghcjsHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcjsHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcHaLVM240 = callPackageWithOutput ../development/haskell-modules { + ghcHaLVM240 = callPackage ../development/haskell-modules { ghc = compiler.ghcHaLVM240; compilerConfig = callPackage ../development/haskell-modules/configuration-halvm-2.4.0.nix { }; }; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index d6498be949b..44a46b7b692 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -80,11 +80,7 @@ in # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). callPackage = pkgs.newScope {}; - callPackageWithOutput = pkgs.newScopeWithOutput {}; - callPackages = lib.callPackagesWith splicedPackages; newScope = extra: lib.callPackageWith (splicedPackages // extra); - - newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra); } From 4239d3bcba41e0843863f0109b9f3bc3778ee4af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Sep 2017 11:30:18 +0200 Subject: [PATCH 0451/2806] R: update to version 3.4.2 --- pkgs/applications/science/math/R/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 5adece31370..fd0ff24d58b 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.4.1"; + name = "R-3.4.2"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0y7wlfk3cn1dxn2mpnxwvsk31s0599crbsyah8srm5pa2mfi7c82"; + sha256 = "0r0cv2kc3x5z9xycpnxx6fbvv22psw2m342jhpslbxkc8g1307lp"; }; buildInputs = [ From 11131d5fc102b249b5d271cee29bcae78ada4b0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Sep 2017 12:46:11 +0200 Subject: [PATCH 0452/2806] R: update package set --- pkgs/development/r-modules/cran-packages.nix | 1548 ++++++++++-------- 1 file changed, 887 insertions(+), 661 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index fa2659aa347..b3feb98ebc3 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2017-08-24"; }; +let derive2 = derive { snapshot = "2017-09-27"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; }; @@ -27,6 +27,7 @@ in with self; { ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; ADM3 = derive2 { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; }; ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; }; + ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; }; ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; }; AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; }; AER = derive2 { name="AER"; version="1.2-5"; sha256="0qksj91h1c5kaci0w7q1n6780669di146ll5wnbjppnkz57z237g"; depends=[car Formula lmtest sandwich survival zoo]; }; @@ -57,8 +58,8 @@ in with self; { AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; }; ANLP = derive2 { name="ANLP"; version="1.3"; sha256="1m1jnfaqny6qprgyk4f3naan5i5cildawv322h6mc25nypwl12m4"; depends=[dplyr qdap RWeka tm]; }; ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; - ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.0.0"; sha256="0wqzsyp8bs8ib1l98pqm4hl6xqziqras4k7xykvgmfcgbwfmsbhd"; depends=[quadprog shiny]; }; - APML0 = derive2 { name="APML0"; version="0.2"; sha256="1v407c025528ia21h0zj6qylp3b1p3j3mqrlycc892zli69fxp6g"; depends=[Matrix Rcpp RcppEigen]; }; + ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.1"; sha256="1gx61xzcjqsrqhcxjza5j8wq20rddf7r6z3xvrwjz24svyggr6xg"; depends=[quadprog shiny]; }; + APML0 = derive2 { name="APML0"; version="0.4"; sha256="0cl2ylfwmkzjv0jjr77am5747y6vh1vv457zlp89h9miz4pcjcfl"; depends=[Matrix Rcpp RcppEigen]; }; APSIM = derive2 { name="APSIM"; version="0.9.2"; sha256="0yyjz1kyvqpw9dh71ls2lf44gbb6r7bp9a22mr3z68k89azps5rc"; depends=[data_table lubridate plyr RSQLite sirad stringr]; }; APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; APfun = derive2 { name="APfun"; version="0.1.1"; sha256="0vb5lmyq8wnwnxikhslaqxd65rs2pv0k3l5bghdzj6s0hp1j6kxp"; depends=[raster rgdal]; }; @@ -72,8 +73,8 @@ in with self; { ARTP = derive2 { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; }; ARTP2 = derive2 { name="ARTP2"; version="0.9.32"; sha256="12mrxssjcj08svdsrxv2nm53mzsgy1k0whd5zzy6fz327bjyqsrz"; depends=[data_table Formula]; }; ARTool = derive2 { name="ARTool"; version="0.10.4"; sha256="1malrjv4myk9nj3dndgpzscfhky4y6lj8xbfg8h2b29g7s2k846q"; depends=[car dplyr lme4 magrittr plyr]; }; - ASIP = derive2 { name="ASIP"; version="0.3.1"; sha256="10r7566c5w6s898mlnzj25f0xgd0r6qi9yvzwp4vi026b0bdrcl2"; depends=[gdalUtils raster rgdal]; }; - ASMap = derive2 { name="ASMap"; version="1.0-1"; sha256="0qkw8wxlad327yydgisc7905qbszqr7x64bpkmjrbzain0ina4xv"; depends=[fields gtools lattice qtl RColorBrewer]; }; + ASIP = derive2 { name="ASIP"; version="0.3.2"; sha256="0zrn3hnn46zxmvchicyzy7zz2jnv8y1249a6sdi3w9rw2d8q025g"; depends=[gdalUtils raster rgdal]; }; + ASMap = derive2 { name="ASMap"; version="1.0-2"; sha256="0fhivq5i2py79jkwfms0my77p9x8lrkn5vn1lwbsawfkyar4dvkq"; depends=[fields gtools lattice qtl RColorBrewer]; }; ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; }; ASSISTant = derive2 { name="ASSISTant"; version="1.2-3"; sha256="072lmvmdi5yfyfda42vs556ciwj2rnka02isnknk6czir3947nck"; depends=[mvtnorm R6]; }; ATE = derive2 { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; }; @@ -81,12 +82,12 @@ in with self; { AUC = derive2 { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; }; AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; }; - AWR = derive2 { name="AWR"; version="1.11.89"; sha256="0mg48720ny2a28yfwqx5p4r7g7rbjbzzgbkd2m31hfyz4vnrsr4v"; depends=[rJava]; }; + AWR = derive2 { name="AWR"; version="1.11.189"; sha256="0q9ss6cyx8vv85zif5v4s2bkv0amhyvzbs41mjjgmwb1csg53jgd"; depends=[rJava]; }; AWR_Athena = derive2 { name="AWR.Athena"; version="1.1.0"; sha256="0vix7lx3kl0gm5jy1w4dp60qff485j5mvfvd972qs4zhcn4yv02b"; depends=[rJava RJDBC]; }; AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; }; AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; }; AbSim = derive2 { name="AbSim"; version="0.2.2"; sha256="0z2d3rjpr4fw0m3b1hdb5dz7mciw61jadbapgs0258j3j3r4knyp"; depends=[ape poweRlaw]; }; - AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.5"; sha256="0071llj6xqsj495nlnvhzsqbrvls7fs3xscng537332xinmfhwdr"; depends=[DESeq limma Rcpp RcppArmadillo]; }; + AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.5.1"; sha256="15srxkxsvn38kd5frdrwfdf0ad8gskrd0h01wmdf9hglq8fjrp7w"; depends=[Biobase DESeq limma Rcpp RcppArmadillo]; }; AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-5"; sha256="18krmmyn8pn11aqd81kbvka68lnd36mnpdh7p3pz9r4m4vjj007x"; depends=[]; }; AcousticNDLCodeR = derive2 { name="AcousticNDLCodeR"; version="1.0.1"; sha256="16rmwz51fy84w83vwnq2nv9mcrp4gi9ciirj5555gl1224b9i2am"; depends=[seewave tuneR zoo]; }; AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; }; @@ -95,8 +96,9 @@ in with self; { AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; }; AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; }; AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; }; + AdapSamp = derive2 { name="AdapSamp"; version="1.0"; sha256="1nww2c3kz1a62ivkvlcvhgx68wdk9ka8jhw1k8pilbgairxsbxgn"; depends=[pracma]; }; AdaptFit = derive2 { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; }; - AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.62"; sha256="0cxl58by9mfd6hf4hb2d5qnm0pgb0gplgg7mm0qhvckvghjpb00q"; depends=[MASS mgcv nlme SemiPar]; }; + AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.65"; sha256="0f92dgfiglbklr4lv5kqxks8d04f675jlj2xjy9aqk4cgdj264xk"; depends=[MASS mgcv nlme SemiPar]; }; AdaptGauss = derive2 { name="AdaptGauss"; version="1.3.3"; sha256="0f6wk9ds8ayzi0fj1dz1m3755d1sjv4v5vc1hjhfxaim127kmbqh"; depends=[caTools ggplot2 shiny]; }; AdaptiveSparsity = derive2 { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp RcppArmadillo]; }; AdequacyModel = derive2 { name="AdequacyModel"; version="2.0.0"; sha256="0amp6ic1wylk24sp9wpx3ci38njj7b9qjqfp89j39hkl6kc1q7sq"; depends=[]; }; @@ -112,8 +114,10 @@ in with self; { AlignStat = derive2 { name="AlignStat"; version="1.3.1"; sha256="1x9nlf3z6rpfca3k3cqm673sid418mnl44df9v93nyj5dpd70ylc"; depends=[ggplot2 Rcpp reshape2 seqinr]; }; AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; }; AlleleRetain = derive2 { name="AlleleRetain"; version="1.3.4"; sha256="1jpn497plvgv1f9nwfpp5n765n7jr43cs5kz807a3fld8sjy0x2i"; depends=[]; }; + AlphaVantageClient = derive2 { name="AlphaVantageClient"; version="0.0.1"; sha256="095m850v945lw7i3qd812p28srdb5hdk9h52zf6bkr166zai1ni0"; depends=[httr xts]; }; Amelia = derive2 { name="Amelia"; version="1.7.4"; sha256="0w6532s5xr7pw47zqhhymql7i68c4lralvw1gc26l9d4c7ib00fd"; depends=[foreign Rcpp RcppArmadillo]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; + AmesHousing = derive2 { name="AmesHousing"; version="0.0.2"; sha256="0grms331mndk86nsyjp9why1ikjx7ycnf9hccvwkxkf86n0519w9"; depends=[dplyr magrittr]; }; AmmoniaConcentration = derive2 { name="AmmoniaConcentration"; version="0.1"; sha256="05pnwfji9l9az4jvni6jy7cayzg5pbspz82a63kmj6rgibn4ywvn"; depends=[]; }; AmostraBrasil = derive2 { name="AmostraBrasil"; version="1.2"; sha256="06y555gl9g89gygrv1rhg8j1bhb38m09mvvw67wvwhdl56j0fqbd"; depends=[foreign RCurl rgdal RJSONIO sp stringr]; }; AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1"; sha256="1vqpahavsksphxjyhd94dghg9ddskbfbs5vl5qcwl3jkjfvl7lwy"; depends=[ggplot2 xtable]; }; @@ -124,11 +128,11 @@ in with self; { AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; }; AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="0.2.1"; sha256="100mbmdllk6c32j75jviz2k9kmwca3jvrqb95a555alfcpkfim8c"; depends=[]; }; AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; }; - AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.0"; sha256="14cdkbwv6bf0h6na200gwq6gdldzawsvzk9pnpixj1kq2n8amm6b"; depends=[ape seqinr]; }; + AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.1"; sha256="1pdwb4zmvirbn3aikd66djhzwga18w50krgn43mlw5dpa9c7fvhv"; depends=[ape seqinr]; }; AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; }; AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; }; - AnthropMMD = derive2 { name="AnthropMMD"; version="2.2.0"; sha256="037d3543ga2dzp2bch0270vy8mchnfsfcabjh5kbgx8bbr9cmgkk"; depends=[shiny]; }; - Anthropometry = derive2 { name="Anthropometry"; version="1.8"; sha256="0drbpffi9qx04vrf60fim30l4xkyvn13mvpr3csyqdfhi0wwn990"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; + AnthropMMD = derive2 { name="AnthropMMD"; version="2.2.1"; sha256="0rh5s616q56kxmlbw4nazff0qvpmbdzyvygf9q4iqfzs9a9ln2wy"; depends=[shiny]; }; + Anthropometry = derive2 { name="Anthropometry"; version="1.9"; sha256="1d1grh952kfpanz4vpvdbnx4yn42kkc6z78cc601l70azar2p7zg"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.2"; sha256="01h8hi76nlwn9hnfyvzyg2d25s2r0vgpl5rz37yqkhjs5xr3rpyi"; depends=[doParallel foreach stringr]; }; AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; }; AquaEnv = derive2 { name="AquaEnv"; version="1.0-4"; sha256="07yx7mbslqgqg7ky67n3xfhskaj7s3w5mvl7xkih48xbsdlmxi4l"; depends=[minpack_lm]; }; @@ -147,6 +151,7 @@ in with self; { AsynchLong = derive2 { name="AsynchLong"; version="2.0"; sha256="1wjby75rpypzyrxnv2lgl7h2fsvyni3bpiwclp0x7cl4sxic1x5c"; depends=[]; }; AtelieR = derive2 { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[cairoDevice gWidgetsRGtk2 partitions proto]; }; AtmRay = derive2 { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; }; + AurieLSHGaussian = derive2 { name="AurieLSHGaussian"; version="0.2.0"; sha256="0dzwqv396inbx4r6758vr4gip1y42ahavspadgm4xhafvipg73rb"; depends=[flexclust igraph lsa reshape2 stringdist]; }; AutoDeskR = derive2 { name="AutoDeskR"; version="0.1.3"; sha256="1n7c8ris8b517bs1wahpvrhwfbvn2q4jbq01kgiv9lfmkjckzfkc"; depends=[httr jsonlite shiny]; }; AutoModel = derive2 { name="AutoModel"; version="0.4.9"; sha256="07wpdf5b1z6lk69nqybzx333zc57wbnga6dp0vkf1d50hxmpd9yc"; depends=[aod BaylorEdPsych broom car dplyr gtools lmtest MASS ROCR rowr]; }; AutoSEARCH = derive2 { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[lgarch zoo]; }; @@ -160,11 +165,11 @@ in with self; { BACprior = derive2 { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[boot leaps mvtnorm]; }; BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; BALCONY = derive2 { name="BALCONY"; version="0.1.6"; sha256="13hy0ysg3vsm6v1acqwdifl4g3z6gxv97by49pq5adkjizhvsyvz"; depends=[Rpdb scales seqinr]; }; - BAMBI = derive2 { name="BAMBI"; version="1.1.0"; sha256="1578iifmjzlhxvgih8l5va07w6zk8d6li7j1w91033lfpzivahr0"; depends=[label_switching Rcpp RcppArmadillo]; }; + BAMBI = derive2 { name="BAMBI"; version="1.1.1"; sha256="1jzvsaf9cn28ny40vg0wlvdqz6f4i7n6iyym8s0aj58aiazwsmh5"; depends=[label_switching Rcpp RcppArmadillo]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; }; BANFF = derive2 { name="BANFF"; version="2.0"; sha256="1c5wdwqqvkcm9910lhd387snd7myv9qzs9vfk87vzp3di7hdi4l6"; depends=[coda doParallel DPpackage flexmix foreach GGally igraph mclust network pscl truncnorm]; }; - BANOVA = derive2 { name="BANOVA"; version="0.9"; sha256="1d2azyvz49lzsic133pgii6cfqkbyc9k4kpzs4diqy6s1bl62769"; depends=[coda rjags rstan runjags]; }; - BART = derive2 { name="BART"; version="1.2"; sha256="0clg63avxldr4h6dzv3pl087ms2a2zhg570xy7l9zjgh00v2zb2p"; depends=[Rcpp survival]; }; + BANOVA = derive2 { name="BANOVA"; version="0.9.1"; sha256="0vjpvxjkxwnwd85g4igpwf2g82i4hlvwq8x02ap7srjd2b2h6av1"; depends=[coda rjags rstan runjags]; }; + BART = derive2 { name="BART"; version="1.3"; sha256="1jlch8r9jklfjjlmjmdxsjw8lsqzc1wmgr4b94phlj4cgxxbc8ri"; depends=[Rcpp survival]; }; BAS = derive2 { name="BAS"; version="1.4.6"; sha256="0fhldihrl94aj4kx5wlqyy7i8d9cm92zhk33ilarrymmksccinmp"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; }; @@ -196,19 +201,19 @@ in with self; { BEDMatrix = derive2 { name="BEDMatrix"; version="1.4.0"; sha256="0aha33skksh45fx248lx6v8cxwgkiripw3avspb8arbld9rmqwxn"; depends=[BH crochet Rcpp]; }; BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; }; BEST = derive2 { name="BEST"; version="0.5.0"; sha256="178vn0ps6nr7qjayavnvmbyx6gq57dni5llsncl89kkz633mb2hg"; depends=[coda HDInterval rjags]; }; - BETS = derive2 { name="BETS"; version="0.3.1"; sha256="0w95nb4l63872rc5m24mz2n5gvr8wfs9kfy8f8dcabyl1nhlml0y"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn htmltools lubridate miniUI plotly RCurl rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; }; + BETS = derive2 { name="BETS"; version="0.3.2"; sha256="11fzwh7r371y6aqjn568jfv3qjaxyj4ij4rg56nj3ahzrimfgdg2"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly RCurl rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; }; BGData = derive2 { name="BGData"; version="1.0.0"; sha256="0xd7xpnvhpyvv6caxyif7wa25llvrnyzmmk4z6rp7absjqbz2alc"; depends=[BEDMatrix bigmemory bit ff LinkedMatrix symDMatrix]; }; BGLR = derive2 { name="BGLR"; version="1.0.5"; sha256="14a979rnasaklkfafzpkhr6mqv0ga7fsfxq63scpnlwa2aasgn83"; depends=[]; }; BGPhazard = derive2 { name="BGPhazard"; version="1.2.3"; sha256="1yp92y5y3xh0hb1ring6jrma8g4q6210hm9572j8ji1jkafzxjw1"; depends=[survival]; }; BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; }; - BH = derive2 { name="BH"; version="1.62.0-1"; sha256="01vfdpfznd4ynqql33z238xr262mvy3i80lyi8l3a3p3hi0a262p"; depends=[]; }; + BH = derive2 { name="BH"; version="1.65.0-1"; sha256="0n6byzrvl1w4hjdxz479q4a7w1118f9ckqc4gqydq7lgzs5agfl2"; depends=[]; }; BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; }; BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.1"; sha256="1qygizn2np9amkm1f1332zp9ab9ky423plr9lahgwzdxn1c2c5c2"; depends=[AnalyzeFMRI fmri wavethresh]; }; BHPMF = derive2 { name="BHPMF"; version="1.0"; sha256="0b7dl4wxhkk47cnj1dxdjnf094cabqb8ncyl7pdi0zx6h4py9h8w"; depends=[Matrix]; }; BIEN = derive2 { name="BIEN"; version="1.2.2"; sha256="11bqbkw6v4yvlvpv0bhmn5q7ady12hmp9ziak5jzsc7p4d8azd5r"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; }; BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.2-22"; sha256="1m5kybi4mp7ghhv0cwdgfpqbclrp317wncns0hpbqywcqngxy3j4"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; }; - BIGDAWG = derive2 { name="BIGDAWG"; version="1.14.2"; sha256="11y6fjq36szb7mdc6s22s4ji2hd3n7pqsyp9qr3665wp8lvw011c"; depends=[haplo_stats knitr rmarkdown XML]; }; - BIGL = derive2 { name="BIGL"; version="1.0.1"; sha256="0qv57xknvivy3y1zppp0qnjy38124sgay9apj76s4bgf82kfyaiv"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; }; + BIGDAWG = derive2 { name="BIGDAWG"; version="1.16"; sha256="04l0x8g81ij7varj0s40fsmajfkr630s70f0brv41s4zcznv25sz"; depends=[haplo_stats knitr rmarkdown XML]; }; + BIGL = derive2 { name="BIGL"; version="1.1.0"; sha256="18qsdw3nb3wjrzdr3yg8kfqxbv761c5gc6qg937k8g87wiagrplp"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; }; BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; }; BIOMASS = derive2 { name="BIOMASS"; version="1.1"; sha256="1qawp10hw7xhqyg9bdwvgxbksiwhga7h6vwp8m7q30ibwfv5kamg"; depends=[httr jsonlite minpack_lm msm raster]; }; BIOdry = derive2 { name="BIOdry"; version="0.5"; sha256="0isvqs2bgirxwb7b1dbn70zfx9b4mw7fp33fwmxq0dx6k1r4f87g"; depends=[ecodist nlme]; }; @@ -223,15 +228,17 @@ in with self; { BMN = derive2 { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; }; BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; }; BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; }; + BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; }; + BMhyb = derive2 { name="BMhyb"; version="1.5.1"; sha256="1xrf9l4bgksa0v40ywsbbbj7l2ixn6lndx3xx020c8xf7jgfpv7x"; depends=[ape corpcor DEoptim geiger lhs Matrix mvtnorm numDeriv phylobase phytools TreeSim viridis]; }; BMhyd = derive2 { name="BMhyd"; version="1.2-8"; sha256="14pv5f621zq5x9i408zjm8k80hcsabkjpdf86gk3ylgw5yqcivrx"; depends=[ape corpcor geiger mvtnorm numDeriv phylobase phytools TreeSim]; }; BMisc = derive2 { name="BMisc"; version="1.0.1"; sha256="0r16aacsdag3b6vz0jbfvchdy10giwchdcnhri20l6bg7kwjvjwb"; depends=[formula_tools]; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; - BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="0.2.0"; sha256="1w8p8fkiai2xqgf0w8imv55p8s1nvsfdfmyrq2cnc5b8m1gw457k"; depends=[MASS matrixcalc mvtnorm plyr truncnorm]; }; + BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; }; BNPMediation = derive2 { name="BNPMediation"; version="0.1.0"; sha256="0bfsayhhhf60qr8nvs4yhshnb7ank70529abpqdxb506ni67pny1"; depends=[condMVNorm DPpackage mnormt]; }; BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; }; BNPdensity = derive2 { name="BNPdensity"; version="2017.03"; sha256="0anpi75wwx91dbm937ydgcpd8wchm0nyciy4xdhppsvzq9v3d2hp"; depends=[]; }; - BNSL = derive2 { name="BNSL"; version="0.1.2"; sha256="0phvbxijrb29hs20g1f1nz5s449zv7mgrymlczc5vpsq8nq2y4vm"; depends=[bnlearn igraph Rcpp]; }; - BNSP = derive2 { name="BNSP"; version="2.0.1"; sha256="08flz440ki467xsr8pg8y02n74p9wncawqpghchzm5zwb82wjdmw"; depends=[coda ggplot2 gridExtra plot3D threejs]; }; + BNSL = derive2 { name="BNSL"; version="0.1.3"; sha256="1918dc73gasac45kzcf4pxvl8iaawzkqdi03ny0napbjr3z8rss2"; depends=[bnlearn igraph Rcpp]; }; + BNSP = derive2 { name="BNSP"; version="2.0.2"; sha256="0vapcf8qxcdmragbmwai4yddpmwwm79mksf4zcych0d4a0ij39h6"; depends=[coda ggplot2 gridExtra plot3D threejs]; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; }; BOIN = derive2 { name="BOIN"; version="2.4"; sha256="0vb3bkaq9vl1yqm3dhdpd27nhv2095n3lp90fr961jpwj1xhjh5l"; depends=[Iso]; }; BPEC = derive2 { name="BPEC"; version="1.1"; sha256="14bkpmi1rmpl728nb7kmbmd687s5cvlzj181cxzwcaz3yb8x58nw"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools R2G2 sp]; }; @@ -239,7 +246,7 @@ in with self; { BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; depends=[e1071 lattice]; }; BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; }; BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; }; - BSSasymp = derive2 { name="BSSasymp"; version="1.2-0"; sha256="1xs6gfvsla7h1sldckjfpw3qx7fhxiqzv849g3k6w1309r7pv75r"; depends=[fICA JADE]; }; + BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; }; BSagri = derive2 { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; BSquare = derive2 { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; }; BTLLasso = derive2 { name="BTLLasso"; version="0.1-6"; sha256="03yfkwgjscki9xbv6myyhdhbz6xrd81zny576vvwqyz14l1sygs0"; depends=[Matrix Rcpp RcppArmadillo stringr TeachingDemos]; }; @@ -262,7 +269,7 @@ in with self; { BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; }; BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; }; Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; }; - Barycenter = derive2 { name="Barycenter"; version="1.0"; sha256="0dqa3fzrwcaqgkj883v9cn5v0zl3rl32zlqzx9lbqzbrlchxgc3k"; depends=[Rcpp RcppArmadillo]; }; + Barycenter = derive2 { name="Barycenter"; version="1.2"; sha256="077b66pj60sryjnd6zkwqdd5hvbqh4pj8r65k4jb2rjvlbqyxln8"; depends=[Rcpp RcppArmadillo]; }; BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.1"; sha256="0fg7p0q6avc0kcwcd3z4q3akrr2mkrx2yf9zcd6hhz22l3x4aphz"; depends=[BatchJobs BBmisc checkmate DBI plyr RSQLite]; }; BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="1.2"; sha256="06ndhdsnpc7i367xksghgkwx1m6h6finwj0sab9ivcwpqb4n5h6f"; depends=[curl quantmod rvest stringr]; }; BatchJobs = derive2 { name="BatchJobs"; version="1.6"; sha256="1kb99024jih5bycc226bl4jyvbbl1sg72q3m2wnlshl7s8p6vva0"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; }; @@ -270,11 +277,12 @@ in with self; { BayClone2 = derive2 { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv4m2n2y7sqwh2f6m9b0cq0rp4ll774yz30i"; depends=[combinat]; }; BayHap = derive2 { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; }; BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; + BayLum = derive2 { name="BayLum"; version="0.1.1"; sha256="1qgpn7blazgb1mkjcnn8x0j7z3k6vgcqpg0vm4gg4r4pxyw61b9n"; depends=[ArchaeoPhases coda hexbin Luminescence rjags]; }; BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; }; BayesBD = derive2 { name="BayesBD"; version="1.2"; sha256="10ik2lndqgmy6pvdm6cx4fsxgjb2fgi6hlz5ic35ab7fkpi90ka5"; depends=[jpeg mritc png Rcpp RcppArmadillo shiny]; }; BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; }; BayesBridge = derive2 { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lhbrfvddjglrzs6px7bc89yvfzj776amm7myqd0l"; depends=[]; }; - BayesCR = derive2 { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mnormt mvtnorm Rlab rootSolve truncdist]; }; + BayesCR = derive2 { name="BayesCR"; version="2.1"; sha256="1qav7l64iqqdvr1v6c7hlzvbx7zbvsa55pyisvkq5rsayy1rdsl1"; depends=[mnormt mvtnorm rootSolve truncdist]; }; BayesCombo = derive2 { name="BayesCombo"; version="1.0"; sha256="01rzjja0xzvqyjivl8a9da13v13ylm4dwv4f27cmgz2znakfg5y8"; depends=[]; }; BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; }; BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; }; @@ -300,7 +308,7 @@ in with self; { BayesTreePrior = derive2 { name="BayesTreePrior"; version="1.0.1"; sha256="13igmvw1wj8kzfijzsrhdqr52kv4vqrm91i71ay6f7jnkry3spaw"; depends=[]; }; BayesTwin = derive2 { name="BayesTwin"; version="1.0"; sha256="026blnhihbx9bpd63mxhbp0kpvj0lwbj7mg72alyfr2jnrh1n3lp"; depends=[coda foreign matrixStats rjags]; }; BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; - BayesVarSel = derive2 { name="BayesVarSel"; version="1.7.0"; sha256="10w9l8jz7j72npl0z2smngrsmb4ga88gn37ps1xn3fyql999iz7d"; depends=[MASS mvtnorm]; }; + BayesVarSel = derive2 { name="BayesVarSel"; version="1.7.1"; sha256="08zhy1brhb4zyishwgsc0hnmplw776d6qvakx39jiwbi02nvwvx9"; depends=[MASS mvtnorm]; }; BayesX = derive2 { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[coda colorspace maptools shapefiles sp]; }; BayesXsrc = derive2 { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; }; @@ -322,12 +330,12 @@ in with self; { BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; }; Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; }; - BiDAG = derive2 { name="BiDAG"; version="1.0.1"; sha256="089nixy13mi9z4vqb5dsrxf0g472d7ax5rrlrqmhr19pjfh800cq"; depends=[pcalg Rcpp]; }; + BiDAG = derive2 { name="BiDAG"; version="1.0.2"; sha256="1y91vb9g6642c0j7cr3g9fg999fxb7bhbfvm0bdlnaixpbnky6qa"; depends=[pcalg Rcpp]; }; BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; }; BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; }; BiTrinA = derive2 { name="BiTrinA"; version="1.2"; sha256="0q2wqxj2ipmppilhvq80cnvhnhcp26h422i8ghx26nrkswhx378s"; depends=[diptest]; }; BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; }; - BibPlots = derive2 { name="BibPlots"; version="0.0.1"; sha256="0bmgyla44aw7mski7yw91mqzabhsf65j8bd6dvgaa8shvwhz6dqq"; depends=[]; }; + BibPlots = derive2 { name="BibPlots"; version="0.0.2"; sha256="04j5wmdy464sgv1yz4km9i14i3j95qr3m2vi96nmsy5158ga9ilz"; depends=[]; }; BigQuic = derive2 { name="BigQuic"; version="1.1-7"; sha256="1bhi9dilrprgjvqyc2hb4a0y8rm9la0m5lgry9mf184p56z1syzb"; depends=[Matrix Rcpp scalreg]; }; BigSEM = derive2 { name="BigSEM"; version="0.2"; sha256="091fdibcxd8a8kf9k4pvc1sah830wh179f28gag9g816h4qclnx9"; depends=[MASS parcor]; }; BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; }; @@ -339,25 +347,27 @@ in with self; { Binarize = derive2 { name="Binarize"; version="1.2"; sha256="014iagr76y3v7ljn6zlbg1hxwbwdi889bqxa7hwmqrcybnla22ja"; depends=[diptest]; }; BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; }; BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.0"; sha256="08w5zcyrfz55x86nwpb4k0w0lpk1ncirjp30p46421w0xz8swk10"; depends=[expm Formula lmtest numDeriv]; }; + BinarybalancedCut = derive2 { name="BinarybalancedCut"; version="0.2"; sha256="1rs7x7ggqzaz9r2912g0fi9x7przd8gjy6pianx457w5f39fqx4v"; depends=[ggplot2 reshape2]; }; BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; }; BioGeoBEARS = derive2 { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[ape cladoRcpp FD gdata optimx phylobase plotrix rexpokit xtable]; }; - BioInstaller = derive2 { name="BioInstaller"; version="0.2.0"; sha256="1pfgmpn6bwzxqac6jywkfkdi1jh99z93zlpcf8dpc9926zpjik7b"; depends=[configr devtools futile_logger git2r R_utils RCurl rvest stringi stringr]; }; + BioInstaller = derive2 { name="BioInstaller"; version="0.2.1"; sha256="0479cv5hq73s8vm8y8wdxkvv7dqnnjx1gk6zzlbssy084czlf71s"; depends=[configr devtools futile_logger git2r R_utils RCurl rvest stringi stringr]; }; BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; }; BioPET = derive2 { name="BioPET"; version="0.2.1"; sha256="0pwkgffm8hlgvpk3dfzskl50kp9b4rnxc8aj119kwrmlfazhhl50"; depends=[ggplot2 gridExtra pROC VGAM]; }; BioPhysConnectoR = derive2 { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; }; BioStatR = derive2 { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; }; Biocomb = derive2 { name="Biocomb"; version="0.3"; sha256="0shhsljg0knfp83b3hrs2c674sqx2348h5m99jhf19jf1i98pf1k"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; }; Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; }; - BiodiversityR = derive2 { name="BiodiversityR"; version="2.8-3"; sha256="11574bspbp7kfm0g9mmpi0vh0lyfrjqkccpdsrashsbcij96rcv6"; depends=[Rcmdr vegan]; }; + BiodiversityR = derive2 { name="BiodiversityR"; version="2.8-4"; sha256="18g283cs9fz5nscni4kaai6z7w0p2g619n3wzdz6kqmjdafy6bhv"; depends=[Rcmdr vegan]; }; Biograph = derive2 { name="Biograph"; version="2.0.6"; sha256="0vklqwbifbac3v9ws9fs22yxpqqk5b3m96qzr8j0irnimb5kgh5p"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; }; Biolinv = derive2 { name="Biolinv"; version="0.1-1"; sha256="1fnx9fcybw8agc2zba61lk4ygq8qi3b747i5cnh1b3vh6dw5fapq"; depends=[classInt fields raster sp spatstat]; }; + Bios2cor = derive2 { name="Bios2cor"; version="1.2"; sha256="00fzvj20x85gcpb9l6rfnm3qml8nnl365z1a68j90qi14wy6dfh6"; depends=[bigmemory bio3d circular igraph]; }; BisRNA = derive2 { name="BisRNA"; version="0.2.1"; sha256="1sjx53lkdhiygr2w7drs9c47hnmv2s232bsd96d6k2xn6yai593i"; depends=[knitr MASS]; }; BivRegBLS = derive2 { name="BivRegBLS"; version="1.0.0"; sha256="1fi399vv54dnfywxbc8yb1r58lrl7zpqkahvcx3f5svjy20dvvbw"; depends=[ellipse]; }; BivUnifBin = derive2 { name="BivUnifBin"; version="1.1"; sha256="0dxkk3pjnbjx04r9870lcr3hl4r5j7cd3y1fn800fz0qjnv5dahd"; depends=[BinOrdNonNor rootSolve]; }; BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; }; BlakerCI = derive2 { name="BlakerCI"; version="1.0-5"; sha256="16zj678qzwqih92q19dma7a602d0hif2dhii5hvxdgjymg7hg2bj"; depends=[]; }; BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; }; - Blaunet = derive2 { name="Blaunet"; version="2.0.4"; sha256="195ijmn3y9rzcincvjwivaclbs0d9bglb83ss62yfjzw2jpfvc54"; depends=[network]; }; + Blaunet = derive2 { name="Blaunet"; version="2.0.6"; sha256="0zbc7nc962hr4j604zx1xn15xwnfwws55xiwgp61r7a3vfsysg7g"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; }; BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; }; Blossom = derive2 { name="Blossom"; version="1.4"; sha256="0002rvz0mlwl2clglzqldg0x5l8lj07qh74ifpdaf1lrdailh328"; depends=[]; }; Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; }; @@ -374,13 +384,15 @@ in with self; { BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; }; Boruta = derive2 { name="Boruta"; version="5.2.0"; sha256="111rp7lbq79p7c1w4dkzhb9wh32mns5p17xxq0qbjzaiv41377dy"; depends=[ranger]; }; - BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[brglm gtools lme4]; }; + BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; }; + BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.0-8"; sha256="09c6zdzf5k5x7zv5m6ygl4k5xbprlpb6s3lrq432mmv8rn2yi58z"; depends=[brglm gtools lme4 qvcalc]; }; BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; }; BrailleR = derive2 { name="BrailleR"; version="0.26.0"; sha256="1grqs3sb1xk28vmpcbidb6s805wqzkrrx41qqz7jc5y8vpspba51"; depends=[devtools extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest pander rmarkdown XML xtable]; }; Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; }; Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; }; BrownDog = derive2 { name="BrownDog"; version="0.2.0"; sha256="0i1rvrxb67kx3m3p84b7rrajjz5k3xj18qy631iqkg596p007940"; depends=[httpuv jsonlite RCurl]; }; Brq = derive2 { name="Brq"; version="2.0"; sha256="0j6d1m2drzy1wyr5y25qb8gs6555vh0lkyh415kw17x9dj4ks0zx"; depends=[]; }; + Brundle = derive2 { name="Brundle"; version="1.0.5"; sha256="18r54afnh8lylly89qpsgy39r81qkpijx482p62m2dsswhfhj022"; depends=[DESeq2 DiffBind lattice Rsamtools]; }; BsMD = derive2 { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; }; BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; }; BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; }; @@ -398,9 +410,10 @@ in with self; { CARBayesdata = derive2 { name="CARBayesdata"; version="2.0"; sha256="0mlqlqm50k4lqyvbjva7vji9jqa3rwi5ky5521rp5l4nqlj53sfb"; depends=[shapefiles sp]; }; CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; }; - CARS = derive2 { name="CARS"; version="0.1"; sha256="1l996731f29z54cyjp6x303xj8i6rrjkkwfsx79d0569b8dqv3rd"; depends=[np]; }; + CARS = derive2 { name="CARS"; version="0.2"; sha256="1n8p4n9fbl20jps9g9pbspw54hq9y6kqbggc8h0i9pbm1b25ngrg"; depends=[np]; }; CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; }; CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; }; + CATTexact = derive2 { name="CATTexact"; version="0.1.0"; sha256="0mklkmay9ph4d0z2l1gcg0lj429xkyhmz7srdil5rgwqxx9dnqs8"; depends=[]; }; CATkit = derive2 { name="CATkit"; version="3.0.0.2"; sha256="1afaa1s8clynpna9hwgbgfdp5jciv0n5q9vb27cgyl9n69nla991"; depends=[magic MASS png rtf season signal]; }; CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; }; CBCgrps = derive2 { name="CBCgrps"; version="2.1"; sha256="0cvgcpvdvpvjkzkwapx0y4a666xq54dwm00w4w9n8fhgp05mnkn8"; depends=[nortest]; }; @@ -444,6 +457,7 @@ in with self; { CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; CMF = derive2 { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; }; CMPControl = derive2 { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; }; + CMatching = derive2 { name="CMatching"; version="1.0"; sha256="1qvixshdkv1sgy4ianfcvb4mfnc05rwm7hxs3rssnma7m9j3g2np"; depends=[lme4 lmtest Matching multiwayvcov]; }; CMplot = derive2 { name="CMplot"; version="3.2.1"; sha256="0gnqqw59xsjq671kiykj8k1qx1m2j7hj8dsnh7ccirpq55hqajff"; depends=[]; }; CNLTreg = derive2 { name="CNLTreg"; version="0.1"; sha256="1fjc45kv2nm902vpfynfxj0n7nm2prazm44nhg2m30vd6l1ijisv"; depends=[adlift miscTools nlt]; }; CNLTtsa = derive2 { name="CNLTtsa"; version="0.1"; sha256="0s98ckg6ms3kh49b8la2d8rsdb0m4m0v8gdbj48nqxncdvg25qk4"; depends=[adlift CNLTreg fields nlt]; }; @@ -453,7 +467,7 @@ in with self; { CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; }; CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; }; COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; - COCONUT = derive2 { name="COCONUT"; version="1.0.1"; sha256="1bpn1zhlbm99w8d80lp7iasi1ivvh0ndhpzh8glmnlnanm2b06ni"; depends=[]; }; + COCONUT = derive2 { name="COCONUT"; version="1.0.2"; sha256="1qjrhxn6dkxyimdca3nslaiw3hncfpk1pk4v01mcrnz550z001nz"; depends=[]; }; COMBAT = derive2 { name="COMBAT"; version="0.0.2"; sha256="1sda41db8h5gi7gqq0hj433dd6lh4xj75skjgmgqa3p80rndw461"; depends=[corpcor mvtnorm]; }; COMBIA = derive2 { name="COMBIA"; version="1.0-4"; sha256="02yadw3zjkj0ljq2c5k5zfsn8qnlvr6gxgafzrqw9g95cawv8q4x"; depends=[gdata hash lattice latticeExtra oro_nifti]; }; COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.4.1"; sha256="14gjrf2hj7dy4hd0qnh6vqjzh7gc6g7gm7rh1d8dingkjwmjzrqb"; depends=[]; }; @@ -504,7 +518,7 @@ in with self; { CateSelection = derive2 { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; }; CausalFX = derive2 { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; }; CausalGAM = derive2 { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; }; - CausalImpact = derive2 { name="CausalImpact"; version="1.2.1"; sha256="1y17icqia2iwd0q7nm1ngb3r51xq9r2qqm6k271znfpmv6pkp890"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; + CausalImpact = derive2 { name="CausalImpact"; version="1.2.3"; sha256="16qwf1kcs7x6qw18zpabs4zsv3m7xwxixf89krnipydiwlpxjjn6"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; }; CePa = derive2 { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; }; CellularAutomaton = derive2 { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; }; @@ -526,8 +540,7 @@ in with self; { ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; ChemoSpec = derive2 { name="ChemoSpec"; version="4.4.85"; sha256="1wb9jvrsydia9lnc0pw55lngiqwa62ff02bfqj1slmr53nw864mp"; depends=[plyr]; }; - ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.10"; sha256="0pdi7lbn97bs11x9dy4aa7zi2warqswk0gak4gr5ap4l69vh0baj"; depends=[devtools kohonen MASS pls]; }; - ChemometricsWithRData = derive2 { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; }; + ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.11"; sha256="00z09bplm5qvd31y7m4b4knsrl0n27j9635m1gdak6lg4db4nxrd"; depends=[devtools kohonen MASS pls]; }; ChoR = derive2 { name="ChoR"; version="0.0-1"; sha256="1zxzgmww368zfdd3fq4wmj4v9prh8fqdb2d3wplqszxjf1irmb45"; depends=[rJava]; }; ChocoLattes = derive2 { name="ChocoLattes"; version="0.1.0"; sha256="0ircdar4fswaf34969gzgn83ia891jvwl29jn4s9a87cc4qagzgr"; depends=[ggplot2 knitr plotly R_utils rmarkdown WriteXLS XML]; }; ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; @@ -547,7 +560,7 @@ in with self; { ClickClust = derive2 { name="ClickClust"; version="1.1.5"; sha256="0b46f453mffg4ym6yvmh7g3v05mc9gphwfra75j28y1425s87yvw"; depends=[]; }; ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; }; ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; }; - CluMix = derive2 { name="CluMix"; version="2.0"; sha256="0bp85yhz7mj0ljmqrlj72q817vwcdibsxhadv0jjfxw1bwjhh1mh"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; }; + CluMix = derive2 { name="CluMix"; version="2.1"; sha256="080gd6v8yj83djmf4wg7cwk6q6w6gsg4xfsgw5qd6z8h3kpyn45m"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; }; ClueR = derive2 { name="ClueR"; version="1.2"; sha256="17phjzpdx11sw259xk16h2w28xdaxxpzbh0sxli61icnssw35n7z"; depends=[e1071]; }; ClusVis = derive2 { name="ClusVis"; version="1.0.0"; sha256="0d8s4gd5dl4mc1538rhy2pwk1xfgbq2ca76qaqrl2q3mswb1p6wp"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod]; }; ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; }; @@ -634,11 +647,12 @@ in with self; { Coxnet = derive2 { name="Coxnet"; version="0.2"; sha256="023l1fcs0g5qqlslqfwb51nkmcqa0d5qp9bibhndd8gq7raz6ws6"; depends=[Matrix Rcpp RcppEigen]; }; CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; }; CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; }; - Cprob = derive2 { name="Cprob"; version="1.3"; sha256="1hahvkmniahhar47nha96vcj810895wgvvg9si112hnv3sjaql3r"; depends=[geepack lattice lgtdl prodlim tpr]; }; + Cprob = derive2 { name="Cprob"; version="1.4"; sha256="1kjw5hhb3fy12xlyg01i8ynl78gx0r57kvmgafbqix1s3pg2hyw6"; depends=[geepack lattice lgtdl prodlim tpr]; }; CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; }; + CreditRisk = derive2 { name="CreditRisk"; version="0.1.0"; sha256="1nrzpafgd0liqa8b7mhg8xgkqp4kqgz1a60xzi5bh5wmxp9bqf99"; depends=[fOptions]; }; CrossClustering = derive2 { name="CrossClustering"; version="3.0"; sha256="0l9cdniqf63x4pfkf6y7c2qh056jwadqw45nz9jk78wamqq8hyqv"; depends=[cluster]; }; CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; }; - CrossVA = derive2 { name="CrossVA"; version="0.9.0"; sha256="0q5fc2maxq70s6h6dmj6amn6xzrjn6rzcsnq0cqrah2c8b6y351y"; depends=[lubridate]; }; + CrossVA = derive2 { name="CrossVA"; version="0.9.1"; sha256="13skbazs1mh5am70qlwxhvxgfx4gwlzzq6zy3vdzaa3zbykkxlvw"; depends=[lubridate]; }; CrossValidate = derive2 { name="CrossValidate"; version="2.3.1"; sha256="1v9fwhhy2xxrrn0xd2yg7ngy7adm85fmyvqhcvnpa91ifr4ijrly"; depends=[Modeler oompaBase]; }; Crossover = derive2 { name="Crossover"; version="0.1-16"; sha256="19697wy066apkxrm99s7vflc0ih6zxxmyvj7x3dzh2icnv1gg1bb"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; }; CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; }; @@ -647,6 +661,7 @@ in with self; { Cubist = derive2 { name="Cubist"; version="0.0.19"; sha256="1bjajcr2qnmqy8cakgiy4q07nj9dygz15a9jry5sa4nbkabpj4qh"; depends=[lattice reshape2]; }; Cyclops = derive2 { name="Cyclops"; version="1.3.0"; sha256="0sznzzz21qn1cxxfa3wiwvfza7lykzzf0xyqvawha9vzm8qzgqnq"; depends=[BH bit ff ffbase Matrix Rcpp RcppEigen RcppParallel survival]; }; CytobankAPI = derive2 { name="CytobankAPI"; version="1.1.0"; sha256="1014r17krw74drykdlw24pgqylidp8yxa00zhf340ilcxfpacxyi"; depends=[curl httr jsonlite]; }; + CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="1.0"; sha256="0hr74igy43d5ybzlgqpvx9ingw6h83w502b6k55cp6zqcv5rl8d5"; depends=[CytobankAPI]; }; D2C = derive2 { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; }; D3GB = derive2 { name="D3GB"; version="1.1"; sha256="1r4hxx2qdws7c7hsnswzfh6az8mn720sk8nygilljl2ghnwpq7pa"; depends=[DBI RSQLite]; }; D3M = derive2 { name="D3M"; version="0.41.1"; sha256="1qr50xq5zccb16a1rgzfbb9bz8bbnxxb522nb8ga159nmb4cwjmp"; depends=[beanplot Rcpp]; }; @@ -654,6 +669,7 @@ in with self; { DAAG = derive2 { name="DAAG"; version="1.22"; sha256="16xp4qk09v9jwm4cs7b4mpn0kgl1va9rw86viwcjc54vjc32953f"; depends=[lattice latticeExtra]; }; DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; }; DAAGxtras = derive2 { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; }; + DAC = derive2 { name="DAC"; version="0.1.0"; sha256="0x27asjn1y8bxgc35ic4jpara4f7vn8w61fpg4glkjy5nbh5ss0p"; depends=[fGarch flexmix]; }; DAGGER = derive2 { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Matrix quadprog Rglpk]; }; DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; }; DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; }; @@ -667,6 +683,7 @@ in with self; { DBItest = derive2 { name="DBItest"; version="1.5"; sha256="1mhygy6wdw22r43jcisyxc852q1lbzx4xi387csf2zqgl86xldw4"; depends=[blob DBI desc hms R6 testthat withr]; }; DBKGrad = derive2 { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; }; DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; }; + DCD = derive2 { name="DCD"; version="0.1.0"; sha256="0p6vk8fdvpcvb1bb5fwy3h1v8y3djlvcm5jl5lnx30ngqj6d7rcj"; depends=[data_table doParallel foreach ggplot2 igraph lattice lsa Matrix plyr qlcMatrix Rdpack ROCR WGCNA]; }; DCG = derive2 { name="DCG"; version="0.9.2"; sha256="1s2dz0vnhdhq23fqds1m2jspaz8k5zvd76z1zlbi6nb5ja5n3j3w"; depends=[]; }; DCGL = derive2 { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph limma]; }; DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; @@ -684,11 +701,12 @@ in with self; { DEEPR = derive2 { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; }; DEMEtics = derive2 { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; }; DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; }; + DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; }; DESP = derive2 { name="DESP"; version="0.2-2"; sha256="1s5x6x36ra83izcyrgdzc26a02cbbgy3xxn32sl30z6srys1j3j3"; depends=[graph MASS Matrix RBGL SparseM]; }; DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; }; DEoptim = derive2 { name="DEoptim"; version="2.2-4"; sha256="10nlsvms5pf0wmn4z1lj6vnmpwr10q8nhdy5xy9rn7hd1627fm0a"; depends=[]; }; DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; }; - DEploid = derive2 { name="DEploid"; version="0.4.3"; sha256="1hcdf4iap81d332daqlzva6vs5glxj5523znl2rifx6r0m8kzagl"; depends=[magrittr plotly Rcpp scales]; }; + DEploid = derive2 { name="DEploid"; version="0.4.4"; sha256="1hcn54mn1kil6kg77j4aij15h69fnmp40d6xxfgijjcgydp211bf"; depends=[magrittr plotly Rcpp scales]; }; DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; }; DGCA = derive2 { name="DGCA"; version="1.0.1"; sha256="1lqqzrsidkli4bk4jikq5f75jzqyzhv94n882yic5ndxgv26p9ic"; depends=[matrixStats WGCNA]; }; DHARMa = derive2 { name="DHARMa"; version="0.1.5"; sha256="1mgvpyhllp7pqnas5sbn6393jkin205109g2b4pn3diyb20avqwp"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; }; @@ -704,6 +722,7 @@ in with self; { DMMF = derive2 { name="DMMF"; version="0.3.2.0"; sha256="17v7ksmknbgh7h9k2l6mgkykg0rq352nlw585yhfck0bvvb5vdb3"; depends=[raster rgdal sp]; }; DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; }; DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; }; + DMRnet = derive2 { name="DMRnet"; version="0.1.0"; sha256="0p5iyj6zqrv1hsfdq7bp96ly8dkf2ky6gzilrha336lhm35ym7sr"; depends=[glmnet grpreg]; }; DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; }; DMwR2 = derive2 { name="DMwR2"; version="0.0.2"; sha256="1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9"; depends=[class DBI dplyr quantmod readr rpart xts zoo]; }; DNAseqtest = derive2 { name="DNAseqtest"; version="1.0"; sha256="1mpmf40vrpw8m75rlqchsnyrz12pgg5bkz7wfca5yy5sbbiwk5pf"; depends=[]; }; @@ -715,8 +734,8 @@ in with self; { DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; }; DOvalidation = derive2 { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; }; DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; }; - DPWeibull = derive2 { name="DPWeibull"; version="1.0"; sha256="01ssi5g9g1nx8ljfng6rbjbn3j229ajm16xfx39g5a2i9hndi45h"; depends=[DPpackage matrixStats Rcpp truncdist]; }; - DPpackage = derive2 { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; }; + DPWeibull = derive2 { name="DPWeibull"; version="1.1"; sha256="1q47bq5qanrqnx0j5zrij4lm5mkpiar58wxabwxfqdcr7yncm5pq"; depends=[matrixStats Rcpp truncdist]; }; + DPpackage = derive2 { name="DPpackage"; version="1.1-7"; sha256="027zwznkqn2ny21dqvmk1fclzxnvsf8lpn1ks0rbigc58df4cvx2"; depends=[MASS nlme survival]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRIP = derive2 { name="DRIP"; version="1.1"; sha256="050xfq30fp9m03ig938bci2haiglj6jj4k327fpz7r2y78cgcnn4"; depends=[caTools readbitmap]; }; DRR = derive2 { name="DRR"; version="0.0.2"; sha256="1scfwp6ry6apxzqjclsmn2frxp9qfw6zxsxn5w0j0q3sz42hz1h2"; depends=[CVST kernlab Matrix]; }; @@ -735,8 +754,9 @@ in with self; { DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; DTRlearn = derive2 { name="DTRlearn"; version="1.2"; sha256="1dakwlafs27nkjsiknnwxnb2hgc2xdpi5mb6dmzpjig7hg2f8d3f"; depends=[ggplot2 glmnet kernlab MASS]; }; - DTRreg = derive2 { name="DTRreg"; version="1.2"; sha256="055m587pvvcysfarxhkvgl30qisgf3v1yry8qrk54vps70scm03v"; depends=[]; }; + DTRreg = derive2 { name="DTRreg"; version="1.3"; sha256="1144kcqblyrpdqyj9as6y47iq3x99bf76hdw6j43cmgcs11gapc3"; depends=[]; }; DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.6"; sha256="0r3wjkr6grrh4nybrg0rs9ialrppjsdjshb47m0knn48vi0iwm77"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; }; + DWLasso = derive2 { name="DWLasso"; version="0.1.0"; sha256="11w6cds1cp90bcf7pj5klvby802vdn9a23pwdpjajw8bh17302qf"; depends=[glmnet hglasso Matrix]; }; DWreg = derive2 { name="DWreg"; version="2.0"; sha256="0bgahzgcxz86n0ady97l48zyahv3p2iyc2ivbij1xrfx3wcx3b5n"; depends=[DiscreteWeibull Ecdat maxLik survival]; }; DYM = derive2 { name="DYM"; version="0.2"; sha256="1rk0xs224xi68f0mrygny2rklggl4grk866q7y9xck38bwy7aw94"; depends=[]; }; DZEXPM = derive2 { name="DZEXPM"; version="1.0"; sha256="0qk93jsfrlbq4b9mgwq0fpyad7w81b0hcfa4xgaahd05p2jbcqrj"; depends=[]; }; @@ -764,6 +784,7 @@ in with self; { DeducerSurvival = derive2 { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; }; DeducerText = derive2 { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; }; Delaporte = derive2 { name="Delaporte"; version="6.1.0"; sha256="1gpckw6vd00cjpf164rmxxdvg08ky1as9rj7ls3l52ghyn0s3pxs"; depends=[]; }; + DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="0.0.4"; sha256="0n1dw9bqisfarg7him49mzqn60gcfr660d5x9k6b37r12dnmy48v"; depends=[msm survival]; }; Delta = derive2 { name="Delta"; version="0.1.1.11"; sha256="1fi5sgyrf86xmfxhglqxcc0hq5mpc8ar3nk2s4wx3rw4if3sdxdz"; depends=[]; }; Demerelate = derive2 { name="Demerelate"; version="0.9-3"; sha256="1bsf09di6nh0hznqx829jnbn3092rya03hnc82cns6rm8d3bn0a9"; depends=[fts mlogit sfsmisc vegan]; }; DendSer = derive2 { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; }; @@ -773,15 +794,16 @@ in with self; { Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; DepthProc = derive2 { name="DepthProc"; version="2.0.2"; sha256="0n9hs6fp047gnd8y87rzx5qcr3hqg3pdck97hcbzkd8jsi1b1daw"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; Deriv = derive2 { name="Deriv"; version="3.8.1"; sha256="13q3y5981cglykga4qfxpad5sik66m1w273f2j1n0zh58s4da5rz"; depends=[]; }; - DescTools = derive2 { name="DescTools"; version="0.99.21"; sha256="1d4qrhp1xgdky24djixi7d1wv8hpyyn6w02zqxfr10q33lbw0y7w"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; + DescTools = derive2 { name="DescTools"; version="0.99.22"; sha256="0nl2zk0sp4fdilg6a5rgkidjg7xncy252ihbqpjia4bda8y23mkn"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="0.9.1"; sha256="10q51qakascv14f8yzp2izvd404230wzvygql23ja37xgkyhz3v1"; depends=[DescTools rstudioapi]; }; DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; }; + DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.2.1"; sha256="0mb33ihqr8jj1ispykvyc7jn1wyaagb535ya5jgwlqrians41ihc"; depends=[jsonlite RCurl reshape]; }; DetMCD = derive2 { name="DetMCD"; version="0.0.4"; sha256="0jdwwx15k8g3f5izcswsj28nfdw3n50x710mc938031yn7hjmkhg"; depends=[pcaPP Rcpp RcppEigen robustbase]; }; DetR = derive2 { name="DetR"; version="0.0.4"; sha256="0kvmbh7cdy3hmds1znahy1lqhd68y21kmmcki9xbq1b76n4h812n"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; }; DetSel = derive2 { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; }; Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; }; Dforest = derive2 { name="Dforest"; version="0.4.0"; sha256="05a3hhddkyk1jlmgvlswa5bsaqlfpgvprzpays18rd7af60542n8"; depends=[ggplot2 rpart]; }; - DiagrammeR = derive2 { name="DiagrammeR"; version="0.9.1"; sha256="0aj45iyvrf1whm7k9gdd9hbwq8j7ffd7v6286wxqlknbrfjacp3p"; depends=[downloader dplyr htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; }; + DiagrammeR = derive2 { name="DiagrammeR"; version="0.9.2"; sha256="0fz6d1j4jkymdz94rad96wsjzw653zz3hi6p3n6nhacv2b2j97fw"; depends=[downloader dplyr htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; }; DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; }; DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.1.1"; sha256="1diwzckn0f2dv0vj2mdzy7k3md6j472xzj82ip23adwr27vlfsi3"; depends=[ggplot2]; }; DiceDesign = derive2 { name="DiceDesign"; version="1.7"; sha256="05bmscy275077kmbmg75npnmw30kd5x5wmlizcfq771zixby3f7h"; depends=[]; }; @@ -790,6 +812,7 @@ in with self; { DiceOptim = derive2 { name="DiceOptim"; version="2.0"; sha256="1hx4379yb6d36c494qc237vld4jnfxq18m994p5ii9ks6s7amifn"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; }; DiceView = derive2 { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceEval DiceKriging rgl]; }; DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; }; + Diderot = derive2 { name="Diderot"; version="0.11"; sha256="1lqrmgb3lxmkqyv0ys7w8fvr3n8vmgdnvhlqjqvkqys50x9a5pzl"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; DiffCorr = derive2 { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; }; DiffNet = derive2 { name="DiffNet"; version="1.0-0"; sha256="04dvf0qxnc6jizwfjxw731j7d2fxyapk06rmqvga6h3p075q0mqk"; depends=[data_table doParallel foreach gplots Hmisc igraph lsa Matrix qlcMatrix Rcpp RcppEigen]; }; DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.3"; sha256="1gf5jpvimfrc9ccva0jk85rl4zfkbijm2305ky1rxcgm4kgw4lax"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; @@ -816,7 +839,7 @@ in with self; { DiversitySampler = derive2 { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; }; DoE_base = derive2 { name="DoE.base"; version="0.31"; sha256="0kr9d8ga6dif02gzn6z72n46a85n2kx933m16ja6gpa3wmp3x2wh"; depends=[combinat conf_design lattice MASS numbers vcd]; }; - DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.8-10"; sha256="12q3arfm76x9j8qnrmw07jh904qdqz59ga1zk8m3n17prr11vrgb"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; + DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.9"; sha256="0l4dxb0f4ql5k3x1avfzs1w54qwjxfp8rl9h9vg6p1zhbkz4qz06"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; }; Dodge = derive2 { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; }; @@ -837,6 +860,7 @@ in with self; { DynNom = derive2 { name="DynNom"; version="4.1.1"; sha256="1c4hykp8fwr6h5y09m4qs23bmbaj6im2c833mv2ymlhy5bwhmnfi"; depends=[BBmisc compare ggplot2 plotly rms shiny stargazer survival]; }; DynTxRegime = derive2 { name="DynTxRegime"; version="3.01"; sha256="0kcg4yqh1srhcn4wp0k97ppwn6w8vh05y9ssn82sjhlgxfbhzzjx"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; + EAinference = derive2 { name="EAinference"; version="0.2.0"; sha256="1655m1li2xa4slcaj8sg5w5svm44gdcxmyy13w61i1g5zksd4fl3"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; }; EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; }; EBMAforecast = derive2 { name="EBMAforecast"; version="0.52"; sha256="1809ia0dpkilprv7x19drp1v2qckk0wm596f1i1vl0k37wbhcziv"; depends=[abind Hmisc plyr Rcpp separationplot]; }; @@ -844,7 +868,7 @@ in with self; { EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; }; EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; }; ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; }; - ECOSolveR = derive2 { name="ECOSolveR"; version="0.3"; sha256="16cw13cxa24c1dkcn8qwkpim4lrjr7cgr8z59px7wi6fyh6v189g"; depends=[Matrix]; }; + ECOSolveR = derive2 { name="ECOSolveR"; version="0.3-2"; sha256="1awkylhsd0l5k2iflcx5y2779zhxjzr8l0xrk7v24m4nak6xj1jg"; depends=[Matrix]; }; ECctmc = derive2 { name="ECctmc"; version="0.2.4"; sha256="1aw0cbfgzlrkyc3m1rfhbdcdyb8wjcfx6p2mz1hvds86mf1pzv1i"; depends=[Rcpp RcppArmadillo]; }; ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.12"; sha256="0g0591dddkdvpq1wgw5wjz0b0qlwkjxi0zz9g33qs442ijq8v1wc"; depends=[jsonlite shiny]; }; EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; }; @@ -861,13 +885,14 @@ in with self; { EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; EL2Surv = derive2 { name="EL2Surv"; version="1.0"; sha256="1vrm0w9rmy4vfkpzq804p216cxw4vvp91g77k4vvzv4z87gkqfhq"; depends=[survival]; }; ELMR = derive2 { name="ELMR"; version="1.0"; sha256="0pd3drv485xbdyfwm28kjpd0nd0zv1khfwzki1gh5p1gz9ndwr2x"; depends=[]; }; + ELMSurv = derive2 { name="ELMSurv"; version="0.4"; sha256="0vziygjvs50wih318jvksj4z4mn1r35xx200p7ywf2a39xmr4490"; depends=[Rcpp RcppArmadillo survival]; }; ELT = derive2 { name="ELT"; version="1.6"; sha256="0vbrf912m6f80sqyyrp0z4jhq38fnmcy6hgwy0qh8wgk3p1aqm7c"; depends=[lattice latticeExtra locfit xlsx]; }; ELYP = derive2 { name="ELYP"; version="0.7-3"; sha256="1d91r59m85k91kcjjlvhvbsa9855fyd702bwj7drvk36ssfr8qb9"; depends=[survival]; }; EMA = derive2 { name="EMA"; version="1.4.5"; sha256="16iq5a3yrilchqmkyb4g5bmmgpw6psm88n52gmlax75xbiwk8261"; depends=[affy AnnotationDbi Biobase biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; }; EMAtools = derive2 { name="EMAtools"; version="0.1.3"; sha256="1kzna29kd6s2hgli5azrfz85mbyl1x6knvhhhny2scf7a1fcijsy"; depends=[DataCombine ggplot2 lmerTest sjstats]; }; EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; }; EMCC = derive2 { name="EMCC"; version="1.3"; sha256="166yqr17a72lhimpgbgzpf9frribj47n4rddzqd9m4xmh4f6x7x5"; depends=[EMC MASS mclust]; }; - EMCluster = derive2 { name="EMCluster"; version="0.2-7"; sha256="1ybffri9khfmliwp0xln3yzal7wx1h0qw3s7ixrx7zzvg58blryp"; depends=[MASS Matrix]; }; + EMCluster = derive2 { name="EMCluster"; version="0.2-8"; sha256="15ngm8k0iscasi1jcn4ffya0y4rq5llj5m7gjv8f61rw31yfyjm0"; depends=[MASS Matrix]; }; EMD = derive2 { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; }; EML = derive2 { name="EML"; version="1.0.3"; sha256="04qz4rwq0amy9lp6358qjjql46ky2slqrvipngym5klqvm9vi0zi"; depends=[uuid xml2]; }; EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.4"; sha256="1i36s8mzp04alff6lqkc798xjzgn61wdpl5i0awjdvg26ka8v7lj"; depends=[GPArotation limSolve shape shiny]; }; @@ -888,6 +913,7 @@ in with self; { ENmisc = derive2 { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; }; EPGLM = derive2 { name="EPGLM"; version="1.1.2"; sha256="1x7n16pjr38gh5llraszjwgm650zmcm14j6v1kc5k81g4ghgdsq6"; depends=[BH MASS Rcpp RcppArmadillo]; }; EQL = derive2 { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; }; + EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; }; ERP = derive2 { name="ERP"; version="1.1"; sha256="00w9zz5rp1asvk13sj9gkd14n2akbclsyz26jp5a3r85fh6chdm0"; depends=[fdrtool mnormt]; }; ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; }; ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; }; @@ -898,8 +924,9 @@ in with self; { ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; ETLUtils = derive2 { name="ETLUtils"; version="1.3"; sha256="13xq9i9fr34kx1nym7nr02gynshzm4jjn4qzx6ydg044b7xl57jp"; depends=[bit ff]; }; EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; - EWGoF = derive2 { name="EWGoF"; version="2.1"; sha256="10p392n003sxn8l9sfnksi789k1w191rmkah6gxhji5f41gib5rh"; depends=[Rcpp]; }; + EWGoF = derive2 { name="EWGoF"; version="2.2"; sha256="0limqk1hcpla9mz41ylm8qcvg8q4491d4dhhb1pbvdnskb70g5i4"; depends=[Rcpp]; }; EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; }; + Eagle = derive2 { name="Eagle"; version="1.0.2"; sha256="0n36h23jkac93d9f13bdwvac0fv198fjmh3981z32cn9glz0xbl8"; depends=[data_table matrixcalc Rcpp RcppEigen shiny shinyBS shinyjs shinythemes]; }; EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; }; EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; }; EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; }; @@ -910,10 +937,11 @@ in with self; { Ecfun = derive2 { name="Ecfun"; version="0.1-7"; sha256="0s4hhvwyi411xr7c1fv098nmwqjcyvh8vy65j5w9hd80l864lvkl"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; }; EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1"; sha256="0ww0p4allaaz2zmj88105xr75gffcsycjjyy1ph4m9q7w5sw3c5y"; depends=[d3heatmap edgebundleR ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; }; EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; }; - EcoIndR = derive2 { name="EcoIndR"; version="1.1"; sha256="12m0cwv3q0bsxqz0vrfnqb18vb61pqpsd0j7fn1bs2xmkwvwkbni"; depends=[]; }; + EcoIndR = derive2 { name="EcoIndR"; version="1.2"; sha256="1p2m4kramcf71xlm9hbk5l5mb8nmjfac1p3csai7m2gmikf559yj"; depends=[]; }; EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; }; EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; EcoVirtual = derive2 { name="EcoVirtual"; version="1.0"; sha256="1adhxwi22psr81xh1szjvn6ycv4zw31xjnswk65iazk3sc4vz7wc"; depends=[]; }; + Ecohydmod = derive2 { name="Ecohydmod"; version="1.0.0"; sha256="0imkzjqp3g28l42jz5m4p85wg5rawmn9hy1wys9xndnaliv6d7r2"; depends=[]; }; EconDemand = derive2 { name="EconDemand"; version="1.0"; sha256="1slpwiaxj7w21zdri9myrzwbwzl62m3cnp0g4fr2rkdlzgb6j5yj"; depends=[]; }; EdSurvey = derive2 { name="EdSurvey"; version="1.0.6"; sha256="1p8cxr69ckz6py0hmagm9aq7kp1q48ymffmnpwsvwh2yfkzl90yq"; depends=[data_table LaF lfactors Matrix NAEPprimer wCorr]; }; EditImputeCont = derive2 { name="EditImputeCont"; version="1.0.2"; sha256="1l847892grqp1zf8lbvhxcimw06xcmikyry0wn1wf3l4hw4hiamv"; depends=[editrules Rcpp]; }; @@ -948,7 +976,7 @@ in with self; { Epi = derive2 { name="Epi"; version="2.19"; sha256="1zd5q5w8l9gvq0x5j00vwfb61kfadbziqmff5fm0cmwnvpizl55k"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival zoo]; }; EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; }; EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.11.0"; sha256="1ry7s4snq6hgbw55b6w615f2y2iskpdcy9kpjg1zv6hp06b6hyqr"; depends=[]; }; - EpiCurve = derive2 { name="EpiCurve"; version="1.1-0"; sha256="1s6lhhc6n0dfbwaklc8fx9f0yi9r0yf5pf0fs955hiv5al98vaai"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; }; + EpiCurve = derive2 { name="EpiCurve"; version="2.0-1"; sha256="15y6nlinw3ppi4bn8xpsrch1avn7642f06lcsv2bjyi1carhfqkw"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; }; EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; }; EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; }; EpiILM = derive2 { name="EpiILM"; version="1.2"; sha256="1mp6j1yk9vzs88clkpwgk0qlbc5b4m94j3isgirsq346006q5jil"; depends=[]; }; @@ -960,13 +988,13 @@ in with self; { EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; }; EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; }; EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.1.2"; sha256="148srhlpzh0scvnkjbkyia1pr8a2ridabm3dahw4zn7p3cryiyb1"; depends=[igraph qgraph]; }; - EthSEQ = derive2 { name="EthSEQ"; version="2.1.0"; sha256="0hby3sc7zflqnk8x7cbpy04mk3xf138xm5zrxlfckpimj40nzkkk"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; }; + EthSEQ = derive2 { name="EthSEQ"; version="2.1.1"; sha256="10i2cwrsgi6q5fq9ksjrhrdwg6hjjd284xsjdiwlfcbfa59390dc"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; }; EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.0"; sha256="08m7igh6n8haf8yi8ikrz6ih4agvsnx415kdx4cgjw4xilvgpgqm"; depends=[clinfun data_table plyr shiny VGAM]; }; EvCombR = derive2 { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; }; EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; }; EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; }; Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.11"; sha256="1zir62009fw4w4ixkyc5s9428krlh6bz8ir2vl11206xxf8rbkd4"; depends=[zoo]; }; - EventStudy = derive2 { name="EventStudy"; version="0.32"; sha256="1g142289my77zhqsgjb7q38izs1ipkisxw656n2xna6c64zv349a"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI purrr RColorBrewer readr rstudioapi scales shiny stringr testthat tidyquant]; }; + EventStudy = derive2 { name="EventStudy"; version="0.33"; sha256="1jyy0mhmykysv7qmmcr3anl2gm01swh19csxjkm1aanwdxc11835"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI openxlsx purrr RColorBrewer readr rstudioapi scales shiny stringr testthat tidyquant]; }; EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; }; Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; }; ExPosition = derive2 { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; }; @@ -1000,12 +1028,13 @@ in with self; { FCNN4R = derive2 { name="FCNN4R"; version="0.6.2"; sha256="089vq8kaag4j6xl3h9pb3ch8lfg0mmi96jgm4xhgr40rr0m3ijma"; depends=[Rcpp]; }; FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; }; FDGcopulas = derive2 { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; }; + FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; }; FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; }; FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; }; FDboost = derive2 { name="FDboost"; version="0.3-0"; sha256="06cwd8534k3h7mk6w9z7fyq0gvb74w12gxh3njmy4m7hw8yzicc8"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; }; FENmlm = derive2 { name="FENmlm"; version="1.0"; sha256="0mq1qa72hsz3pyqjnbyzcc7shr08cq3hng1fz53mn9mvp11vb135"; depends=[MASS Matrix numDeriv]; }; FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; }; - FFTrees = derive2 { name="FFTrees"; version="1.3.3"; sha256="0vvrihgq2m08jpm4sbq9fpbwppvmcc2v9za7kl2l41n8as1n14gc"; depends=[circlize e1071 igraph progress randomForest rpart stringr yarrr]; }; + FFTrees = derive2 { name="FFTrees"; version="1.3.4"; sha256="06f1vjmypcdai8smac7acixc2zdah3la4lbwr8s3a0ksrj2590sk"; depends=[circlize e1071 igraph progress randomForest rpart stringr yarrr]; }; FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; FGN = derive2 { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; }; FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; @@ -1014,7 +1043,6 @@ in with self; { FHtest = derive2 { name="FHtest"; version="1.3"; sha256="1cay1cl1x4lias55vxc14caznggdw6j8vgqgkxfmvldnvjfljsq1"; depends=[interval KMsurv MASS perm survival]; }; FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; }; - FIT = derive2 { name="FIT"; version="0.0.4"; sha256="150lwqxzznmga5dbrxi12pjva7pvc7nsahs8w5wvibkasndxwxj9"; depends=[gglasso MASS Rcpp RcppEigen XML]; }; FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; }; FKF = derive2 { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; }; FLIM = derive2 { name="FLIM"; version="1.2"; sha256="180az4zwmfcglmvismyacmh7ri4qg8jvhlisqpway0z5z6fsda6r"; depends=[MASS zoo]; }; @@ -1030,6 +1058,7 @@ in with self; { FNN = derive2 { name="FNN"; version="1.1"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; }; FPCA2D = derive2 { name="FPCA2D"; version="1.0"; sha256="18bb90ppd9gd8pg9jxfyfkmlsaqk8w25fgaj9fk18ybm2nhsxqm6"; depends=[corpcor]; }; FPDclustering = derive2 { name="FPDclustering"; version="1.2"; sha256="1qj1dddzcy2jx4903kmzzhcwfi13c2x9kva2n4rzqh5n560nvg57"; depends=[ThreeWay]; }; + FPV = derive2 { name="FPV"; version="0.5"; sha256="0pxa8lbcxw2hx2n0frkx0pdndlcfm7gnh9qay9q53cf5gqzzwvvc"; depends=[FuzzyNumbers FuzzyNumbers_Ext_2]; }; FRACTION = derive2 { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; }; FRAPO = derive2 { name="FRAPO"; version="0.4-1"; sha256="0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq"; depends=[cccp Rglpk timeSeries]; }; FRB = derive2 { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; }; @@ -1039,11 +1068,13 @@ in with self; { FRESA_CAD = derive2 { name="FRESA.CAD"; version="2.2.1"; sha256="065iywjay4a06w97lg2z98qq0j60flq4srchyg7c2a3pjrwppqc2"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; FREddyPro = derive2 { name="FREddyPro"; version="1.0"; sha256="0h2rdydcx9pwjl1zxghzb5vqynrwdkscyq6c9adjgz4dngfwyzsw"; depends=[dismo ggplot2 lubridate raster RColorBrewer sp]; }; FRK = derive2 { name="FRK"; version="0.1.5"; sha256="01r7w2m9f6lr63hiv8sfg49jccyf5xk0fw7xipvwmq0daxl250y1"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime]; }; - FSA = derive2 { name="FSA"; version="0.8.14"; sha256="085xzghpk0j4d5678ka1bqxlgkp0hz62vi9gld4qap89fy954hrm"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; }; + FRegSigCom = derive2 { name="FRegSigCom"; version="0.1.0"; sha256="02lvgxxr12rfs4k7dg3rl249nbvfkqaywas3k6jhm378j3j8yaaf"; depends=[fda]; }; + FSA = derive2 { name="FSA"; version="0.8.16"; sha256="0vsaldpnz648mrhbix6688pqf4ayxkn3375cqjy8spk4kpwrpwpl"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; }; FSAdata = derive2 { name="FSAdata"; version="0.3.6"; sha256="0r4g3s4a7hizxj7zlp8wb5sldnx6kc99vak8ww715bhzpzq40qf8"; depends=[]; }; FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; }; FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; }; FSelector = derive2 { name="FSelector"; version="0.21"; sha256="0qk54b4svihwcmfdp5k8pcvy60568zlg4z2qqiawr7h4inzmvrlk"; depends=[digest entropy randomForest RWeka]; }; + FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.1.8"; sha256="0qn916i0gcq7l4ym8yyl9dk0iwh6m4fkwcvvm60yvzbglv8dpqjc"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; }; FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; }; FTRLProximal = derive2 { name="FTRLProximal"; version="0.3.0"; sha256="0wnlswvxiw7gvmn9yq1v8jixwspfbvcg3rklqcd0ib38d72ww7w0"; depends=[Matrix]; }; FUNLDA = derive2 { name="FUNLDA"; version="1.1"; sha256="1qqwpics63qab43mvpm275rk9iywawr4gap0qa832i6iy3jp1h3c"; depends=[Rcpp RcppArmadillo]; }; @@ -1051,11 +1082,11 @@ in with self; { FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; }; FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; }; FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; - FactoClass = derive2 { name="FactoClass"; version="1.1.4"; sha256="1svql9llnwwdpb2c9g3fx65wgmkvv0ksdrk1vrhw9pvwyk3yzbrn"; depends=[ade4 KernSmooth scatterplot3d xtable]; }; + FactoClass = derive2 { name="FactoClass"; version="1.1.6"; sha256="0wkz1kvpsl4z688y9qwp3hlycn66vbsl85s70wwv8ww12z3dwpcd"; depends=[ade4 KernSmooth scatterplot3d xtable]; }; FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.0"; sha256="10yim7xvzizr383hygs4s2f59ipbl4sj2i85g55zw7j5crangql3"; depends=[FactoMineR rmarkdown rrcov]; }; FactoMineR = derive2 { name="FactoMineR"; version="1.36"; sha256="1pin3frnls7bbng3fvl92248mf9nnv6d8wwkdzgj66m4rbxc7611"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; }; FactoRizationMachines = derive2 { name="FactoRizationMachines"; version="0.21"; sha256="0kd9q4nh01hh9ky9f2gx880cbhsipk5cl0173z8kn5vqag9ms4wj"; depends=[Matrix Rcpp]; }; - FactorsR = derive2 { name="FactorsR"; version="1.1"; sha256="06193gw4q9yvhmgzlv8w2xi9f418cjkn9jx72l41426wapjhygdy"; depends=[]; }; + FactorsR = derive2 { name="FactorsR"; version="1.2"; sha256="0y6r5ch0h0sag1xinvnjr7q4495naygvi5iiqq9bc51ijv228c0m"; depends=[]; }; Factoshiny = derive2 { name="Factoshiny"; version="1.0.5"; sha256="1jqk80raqf3kxympkqfayzwwc61yipzh4cbklrb9kmay5ryg4gj9"; depends=[colourpicker FactoMineR shiny]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; FamEvent = derive2 { name="FamEvent"; version="1.3"; sha256="0jf4ph9mskycyckyg9biy0h1zk5q6nvj8669zfh8nfnnn2yh3s48"; depends=[kinship2 MASS survival truncnorm]; }; @@ -1084,7 +1115,7 @@ in with self; { FinancialInstrument = derive2 { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod TTR xts zoo]; }; FinancialMath = derive2 { name="FinancialMath"; version="0.1.1"; sha256="11nhphvd7bvbc7xfs85rib763r1mpvxmsj6hgzfib5aifib5k5js"; depends=[]; }; FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; - FindIt = derive2 { name="FindIt"; version="1.1"; sha256="16ply5a3zh9qzff6iv9kgbvz7y33j5fmpkf6ydfjfb4bw57v1xix"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; }; + FindIt = derive2 { name="FindIt"; version="1.1.1"; sha256="069n260dqzxw3d5xqlrzw4h6m3w8zkcd4zra9xzv0h561xr3b237"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; }; FindMinIC = derive2 { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; }; FinePop = derive2 { name="FinePop"; version="1.4.0"; sha256="0bq6p95mpwbx38gly61n58jrqz6rymwdq6dwxghpx98f6isa83xh"; depends=[]; }; FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; }; @@ -1102,14 +1133,14 @@ in with self; { ForeCA = derive2 { name="ForeCA"; version="0.2.4"; sha256="1i19lmhl1kgfnd7zipjr6xp5ir9rvjy13sbq321jaf8ya60bjdd9"; depends=[ifultools MASS reshape2 sapa]; }; ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; }; ForecastFramework = derive2 { name="ForecastFramework"; version="0.9.0"; sha256="131h9f148wn89znzsnym43amlvf4s7jzg4f2p7ld9ns7727sf56q"; depends=[abind dplyr lubridate magrittr R6 reshape2]; }; - ForestTools = derive2 { name="ForestTools"; version="0.1.4"; sha256="0czvslmhz5syvd8h5zz6wl3nfp2dpyx3wf9x1d1hkgfgxkkl6f1y"; depends=[APfun imager raster rgdal rgeos sp TileManager]; }; + ForestTools = derive2 { name="ForestTools"; version="0.1.5"; sha256="0yjyc5i2jhagvwpzg420zhhygs966ncjn9aggh4gd4zdsi0nzqcx"; depends=[APfun imager raster rgeos sp TileManager]; }; FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; Formula = derive2 { name="Formula"; version="1.2-2"; sha256="0ad49bzip1zqmpj1d8jajwl4bd81fm3k6dq8p26x6mvlzc04dvwd"; depends=[]; }; ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; }; FourScores = derive2 { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; }; FrF2 = derive2 { name="FrF2"; version="1.7-2"; sha256="1qjgx7zbnabbs4zq7hn3j1i1xyy4yjwnz7pn25kz9s3szqr1fk66"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; }; FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; - FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1"; sha256="1ni10fdxinmclng0ck8287i6shis886y318a7b42pcfp00aiz8hh"; depends=[]; }; + FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.1"; sha256="0l015v99hzmiyic0klvq71ljk9f8ipr57ki7x4cjyz1gam9f84p5"; depends=[]; }; Fragman = derive2 { name="Fragman"; version="1.0.7"; sha256="0dh1gk2arj7r6zd5dhkmxpr7a1hd3pl8x5klmlsg4n6rwsx2p4v8"; depends=[]; }; Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; }; FreeSortR = derive2 { name="FreeSortR"; version="1.2"; sha256="01h29p9qhlkd2qmmmw23wh9lrsggvp1h3r2laqi2lln7d7srcwbj"; depends=[ellipse smacof vegan]; }; @@ -1120,12 +1151,12 @@ in with self; { Funclustering = derive2 { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; }; FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; }; FusedPCA = derive2 { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; }; - Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.0"; sha256="1n2m6p03bfip2fxfg8v4k43zgv7lcwwgv4myw2rj46djfwl2l9i7"; depends=[FuzzyNumbers MASS]; }; + Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; }; FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.0"; sha256="02c08rzmmdd2l84jlzb0vck9m08afm7j599n0g09hffflcrb3fz7"; depends=[MASS]; }; FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-5"; sha256="1achmsc107b26d266q0vmip8vi3qaa5z0p183z2fjdm7zh9ch6ag"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; }; FuzzyMCDM = derive2 { name="FuzzyMCDM"; version="1.1"; sha256="0ss0s65mm6j0nax4mb9g668d9n9cgl0l016mc3h9hbjxfpqrbkks"; depends=[RankAggreg]; }; FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; }; - FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="3.1"; sha256="1wqp2ffqy5pl4m06ibj42x9hbcixsvdpx3703kn6jhqyif4i1r43"; depends=[FuzzyNumbers]; }; + FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="3.2"; sha256="0gldq0bg1p1vmrn35prha44d7lyymz0jzshdyp2c5rx433mny7h5"; depends=[FuzzyNumbers]; }; FuzzyR = derive2 { name="FuzzyR"; version="2.1"; sha256="08mhwzyksw0snxxcwn2kg62ya8smfvrls30znqhmnbkn5ijz0642"; depends=[plyr shiny]; }; FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.3"; sha256="0ry2cr5ds7kd7vk6ihdg68gqs2rv6qfmzlszr33a9ia5gsbi8b7b"; depends=[DEoptim FuzzyNumbers MultinomialCI]; }; FuzzyStatTra = derive2 { name="FuzzyStatTra"; version="1.0"; sha256="1ijrlnlmq9d5ahgrpzba6kzkaq1zq59zqdgcizybsf9alsswcm00"; depends=[]; }; @@ -1148,16 +1179,18 @@ in with self; { GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; }; GAparsimony = derive2 { name="GAparsimony"; version="0.9-1"; sha256="1j8r56pri7h0xr0fiihkwgccjb33n89lz8ah5p42bak7ay9fglkm"; depends=[foreach iterators]; }; GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; }; + GBJ = derive2 { name="GBJ"; version="0.4.0"; sha256="0b1612ijmbif7qbsnfnnkq1fsz0qmz4hbq14clpv59d3bsccs6jc"; depends=[BH mvtnorm Rcpp SKAT]; }; GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; GCD = derive2 { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; }; GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; }; - GCalignR = derive2 { name="GCalignR"; version="0.1.0"; sha256="0prky8n2j6xvq4srxcp08k4wlikg7hhj78mw7fjqbf01sl0zhwz5"; depends=[ggplot2 readr reshape2 stringr]; }; + GCalignR = derive2 { name="GCalignR"; version="1.0.0"; sha256="09qwxl39csrljkbfn3n0fxzypslhjzf10p61p0qmqkc9shh4yk6c"; depends=[ggplot2 pbapply readr reshape2 stringr]; }; GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; }; GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; }; GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; GDINA = derive2 { name="GDINA"; version="1.4.2"; sha256="14686mkyxk7gjp0ivz1wkmry15qrf50fcwwza1j98791yjkqsbyf"; depends=[alabama data_table ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; GEEmediate = derive2 { name="GEEmediate"; version="1.1.1"; sha256="1akgl4j38x4qf3z9d6z7cgjd7x9f0k3lrzyrzgykqhrzmbh68z2m"; depends=[gee]; }; + GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.5"; sha256="1hrsdpfk0iz0agi3rms43fk0yjv5ys10awqfxgwz9r9qfgczkh7j"; depends=[changepoint GENEAread MASS rpart signal]; }; GENEAread = derive2 { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; }; GENLIB = derive2 { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; GEOmap = derive2 { name="GEOmap"; version="2.4-0"; sha256="0jhzsp5f427r652mnaw3zg0vv13jaz11bfbbxppmxvya6k2jimyg"; depends=[fields MBA RPMG splancs]; }; @@ -1180,7 +1213,7 @@ in with self; { GHap = derive2 { name="GHap"; version="1.2.2"; sha256="1qwv4llcixklr9d6lq4ljzbs8al80xnvqkcajnh8dbf3axmlmr5b"; depends=[bigmemory lme4 Matrix]; }; GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; }; GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; }; - GJRM = derive2 { name="GJRM"; version="0.1-1"; sha256="04vk9442zdjy00pzjkzgvxnszbvk021klayjzlimi5pbrm7mlgc2"; depends=[copula gamlss_dist ggplot2 magic matrixStats mgcv mnormt psych Rmpfr scam survey survival trust VGAM VineCopula]; }; + GJRM = derive2 { name="GJRM"; version="0.1-2"; sha256="02s0s4kh9vxap5qyr2imr8zbfixkhiyrk7fg5fk7hjbs3ziy6q0s"; depends=[copula gamlss_dist ggplot2 magic matrixStats mgcv mnormt psych Rmpfr scam survey survival trust VGAM VineCopula]; }; GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; }; GLDEX = derive2 { name="GLDEX"; version="2.0.0.5"; sha256="0mr8qhccp8dndp43v8ym22f4djrjr8qcxbv61lwabk2462llwln6"; depends=[cluster]; }; GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; }; @@ -1205,6 +1238,7 @@ in with self; { GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; }; GPGame = derive2 { name="GPGame"; version="1.0.0"; sha256="1ln3smlhr0hz5nkbdfhrpvz6cn0jz21w8p0d3xlcv4szlmkx8lx6"; depends=[DiceDesign DiceKriging emoa GPareto KrigInv MASS mnormt mvtnorm Rcpp]; }; GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; }; + GPPFourier = derive2 { name="GPPFourier"; version="2.1"; sha256="1wlzpiqlg5zx3rv29l1ql3apcaykvk72zc0anwxr152qlk910l2q"; depends=[mFilter Tides]; }; GPareto = derive2 { name="GPareto"; version="1.1.0"; sha256="0y4jskrbsv7apc5blchnzgd2mfphvrpc03qgbgyvnzpc0yq18vmh"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud]; }; GPfit = derive2 { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; }; GPoM = derive2 { name="GPoM"; version="1.0"; sha256="14h9g2rg5yzw68hg2a3s2lp19ilq7dl1k3cjnd9k516b5gdm2izl"; depends=[deSolve rgl]; }; @@ -1225,8 +1259,8 @@ in with self; { GSED = derive2 { name="GSED"; version="1.5"; sha256="0r1fgwk1v11bwq83a64cgmxh5snw3mnaq4mlgi0h4n5f1yjgg5wj"; depends=[memoise rootSolve survival]; }; GSIF = derive2 { name="GSIF"; version="0.5-4"; sha256="1vh3dffi5hakk32rwaabw9k34wigd0n5bhzcyqhadl6fxjsaz6b6"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; - GSMX = derive2 { name="GSMX"; version="1.1"; sha256="06l6abhf4b6h8wkmwdylw4f4inflr8qxfd65pnnsjmk6lv6zpdgm"; depends=[MASS]; }; - GSODR = derive2 { name="GSODR"; version="1.0.5"; sha256="09q7d26y12d1mkxjf2zcbzjm3ddkj1spls53g01m842y1kwxnn2h"; depends=[curl data_table dplyr fields magrittr purrr R_utils readr rgdal sp]; }; + GSMX = derive2 { name="GSMX"; version="1.2"; sha256="0prnvhz5j0y77xywgc057vrnawzdjz9s4l08j60sg12p6gm1q2fj"; depends=[MASS]; }; + GSODR = derive2 { name="GSODR"; version="1.0.6"; sha256="0v2g5sssrf23v7369jh0ddja0yf0j6f4gblhf3iasnq2i8fnbxhl"; depends=[curl data_table dplyr fields magrittr purrr R_utils readr rgdal sp]; }; GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; }; GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; }; GUIDE = derive2 { name="GUIDE"; version="1.2.3.1"; sha256="02chn2mzh6smmiv8rp00cq5rff18bqszazbk8svmvvlgn0a25pj4"; depends=[rpanel tkrplot]; }; @@ -1246,7 +1280,7 @@ in with self; { GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; }; GameTheoryAllocation = derive2 { name="GameTheoryAllocation"; version="1.0"; sha256="0733vmyr0d9scjd5ixpnggr548snd7nj70knf5hbzc59nmbc5y11"; depends=[e1071 lpSolveAPI]; }; Gammareg = derive2 { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; }; - GauPro = derive2 { name="GauPro"; version="0.2.0"; sha256="0fkkn03bs90sjynv5h9bby3n2v49vb5x25j9nxhi0gm0wxsqydb7"; depends=[lbfgs R6 Rcpp RcppArmadillo]; }; + GauPro = derive2 { name="GauPro"; version="0.2.2"; sha256="127agnhqbbavcf7sx0zq1c8ldh3w1d1iz5bpd1ixxkyaapmiq4qy"; depends=[lbfgs R6 Rcpp RcppArmadillo]; }; GeNetIt = derive2 { name="GeNetIt"; version="0.1-1"; sha256="1xjz22m4yn642m0bqa33w4m2rygpxjwg43c54lw168jck9zzgv1f"; depends=[nlme raster rgeos sp spatialEco spdep]; }; GenABEL = derive2 { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[GenABEL_data MASS]; }; GenABEL_data = derive2 { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; }; @@ -1274,14 +1308,15 @@ in with self; { GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; }; GeoGenetix = derive2 { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; }; GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; }; - GeoMongo = derive2 { name="GeoMongo"; version="1.0.0"; sha256="1kpc1nh7gnbfms6wsvrj278bqb3grgxsrpqzq9jyk3l36ybahn5r"; depends=[data_table geojsonR R6 reticulate]; }; + GeoMongo = derive2 { name="GeoMongo"; version="1.0.1"; sha256="19wim724sgmxx9rd5yvmqdml0hppb92b8qvpl5zqrlnzxzm0ih5x"; depends=[data_table geojsonR R6 reticulate]; }; GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; }; GeoXp = derive2 { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[KernSmooth quantreg rgeos rgl robustbase spdep splancs]; }; GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; }; GerminaR = derive2 { name="GerminaR"; version="1.1"; sha256="1ijx2bd0fpki3pqm9grksc60f43qg9y5412mwd847xqqjpc1mxm4"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tidyr]; }; - GetHFData = derive2 { name="GetHFData"; version="1.3"; sha256="036lv3gvrcj6b47dc1shhihgcjc3nnl4fnqjk3qphp7q02lfh0g7"; depends=[curl dplyr lubridate RCurl readr stringr]; }; + GetHFData = derive2 { name="GetHFData"; version="1.4"; sha256="0m9s65wyd0r37fn83dh5d2w4dr7x5z4sk9pgxbq9mcgz276i7anx"; depends=[curl dplyr lubridate RCurl readr stringr]; }; + GetLattesData = derive2 { name="GetLattesData"; version="0.5"; sha256="18kaqmgx019jfwp6mhdy29kiz4w54xnnywbsipbp621f7k2is6zd"; depends=[curl dplyr readr stringdist stringr XML]; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; - GetTDData = derive2 { name="GetTDData"; version="1.2.5"; sha256="0ghi9iram9d67vs12hkw362qnvmk1lk72pjgmx118i4yxh5gvvw3"; depends=[curl RCurl readxl stringi stringr]; }; + GetTDData = derive2 { name="GetTDData"; version="1.3"; sha256="0x8hgpjk3ah5izr4da7xkazha5j737cq5y84qmjbsgaxn9jdmvj5"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; }; GetoptLong = derive2 { name="GetoptLong"; version="0.1.6"; sha256="1d98gcvlvp9nz5lbnzr0kkpc2hbkx74hlhrnybqhg1gdwc3g09pm"; depends=[GlobalOptions rjson]; }; GiANT = derive2 { name="GiANT"; version="1.2"; sha256="0h9jx2vpgpzlinf6v9mxj260r22nlqml8xnd2jknw36j5imim57w"; depends=[]; }; GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; }; @@ -1293,7 +1328,7 @@ in with self; { GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; }; GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.12"; sha256="1abpc03cfvazbwj2sx6qgngs5pgpzysvxkana20hyvb4n7ws77f0"; depends=[]; }; - Gmedian = derive2 { name="Gmedian"; version="1.2.3"; sha256="0b2ijr9zlsp1287da3h9qm5cm17xk8zm8cdcj6d4kz0ivgg444py"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; + Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; Gmisc = derive2 { name="Gmisc"; version="1.4.1"; sha256="1xdgmvzixc03qz34l57gy85w711iimmfqn6w20rr5b67m5m63drz"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; }; GoFKernel = derive2 { name="GoFKernel"; version="2.1-0"; sha256="17jd1dqwpki4mmzk695g25vvfwvkp4k7jhvw06dmdmn5j09hw373"; depends=[KernSmooth]; }; GofKmt = derive2 { name="GofKmt"; version="2.0"; sha256="0018ljzlj7nkf12g0sqa8iyq3j2bnj9la3fwblx9lbdn8nxgllhn"; depends=[Rsolnp]; }; @@ -1335,7 +1370,7 @@ in with self; { HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; }; HEAT = derive2 { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; }; HEMDAG = derive2 { name="HEMDAG"; version="1.0.0"; sha256="0hgxhd8c87ngyh87vdzlmmbfllxjrmqr6ndh561hkxzmbiw1q655"; depends=[graph PerfMeas precrec preprocessCore RBGL]; }; - HGNChelper = derive2 { name="HGNChelper"; version="0.3.5"; sha256="0b2q99z22gafkicfkaxpzl79j2axrz60r9ch1smjivpk8sa22hyq"; depends=[]; }; + HGNChelper = derive2 { name="HGNChelper"; version="0.3.6"; sha256="1bm6zxwafbp65p6w4rk2y1bw7ig60br2mk75c4frdzqw3yw0zwxd"; depends=[]; }; HH = derive2 { name="HH"; version="3.1-34"; sha256="1srr195ha8n4va30impm12p2kamkl36whl8g10pl80hwgg20pbqk"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; HHG = derive2 { name="HHG"; version="2.1"; sha256="0930pgq0xzixj0rl6rkd1cd007zpa9krfdyaav8cbx8sgg5bfknp"; depends=[]; }; HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; @@ -1382,7 +1417,7 @@ in with self; { HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.8"; sha256="0xbcchmzii0jv0ygr91n72r39j1axraxd2i607b56v4yd5d8sy4k"; depends=[mice Rcpp]; }; HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; }; Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; }; - HelpersMG = derive2 { name="HelpersMG"; version="1.9"; sha256="10icxks0b2sq7s2g7m4vs8857mlw5hkpnmphy7dfd1r8cbf7y7sh"; depends=[coda]; }; + HelpersMG = derive2 { name="HelpersMG"; version="2.0"; sha256="0gp5mmb7w4s6mr0cnjlx0qrdplgq6sc7cvh912kdqfjz5ayr297i"; depends=[coda]; }; HeritSeq = derive2 { name="HeritSeq"; version="1.0.0"; sha256="0ibb2nkjk1d59gc1ljihihsjai3jp4jsbbariv05h1z26pgpc9p3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; }; HiCblock = derive2 { name="HiCblock"; version="1.0"; sha256="09k0iiqg8acw2v36j89cjca5jdsfdnbj3z00ynfgaxlgphbigrl1"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; }; HiCfeat = derive2 { name="HiCfeat"; version="1.2"; sha256="01b8isvn4my41n3608k80d38vgd3waq7rxsx1v4p0rl1f3pxn7dn"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; }; @@ -1395,7 +1430,7 @@ in with self; { HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-8"; sha256="13db9qxcky91nck49w6iz98yx3c5rb70dc993gdmnwhzzrl92lfp"; depends=[]; }; HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; }; HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; }; - HistDAWass = derive2 { name="HistDAWass"; version="0.1.6"; sha256="0i43zki95m47nm3yy7m7s66nvpmx6vl3df2bxkpyihc2xsqrsf3l"; depends=[class colorspace FactoMineR ggplot2 histogram]; }; + HistDAWass = derive2 { name="HistDAWass"; version="0.1.7"; sha256="16mn6z8gvg9x5flia7kl5qi5nbnd9fr7bfggz58vpfqwd8xl9g4n"; depends=[class colorspace FactoMineR ggplot2 histogram]; }; HistData = derive2 { name="HistData"; version="0.8-2"; sha256="0qd3a1v3xg39nwqfw63k6210vqkpknq0j3r36sy1910hn0nr83fa"; depends=[]; }; HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; }; HiveR = derive2 { name="HiveR"; version="0.3.42"; sha256="09h061511pk7iy1k9gb3ifa5q6gd17ix9sn2fshl6gp5sxnysn4f"; depends=[jpeg plyr png RColorBrewer rgl tkrgl]; }; @@ -1407,6 +1442,7 @@ in with self; { HotDeckImputation = derive2 { name="HotDeckImputation"; version="1.1.0"; sha256="1mqfn6yw5846ynrcgzka0m6ikfppa5civjkhj42rhp2v2xk25li7"; depends=[Rglpk]; }; Hotelling = derive2 { name="Hotelling"; version="1.0-4"; sha256="1ncq74ifdn1ha6wbkvygbwi2n0nwaj1lifyqp36sy0hql3ahrac9"; depends=[corpcor]; }; HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; + HybridFS = derive2 { name="HybridFS"; version="0.1.1"; sha256="09kb9zy70i2z7qd9ilkv3g4sb8giyh5mqsz3cgyd3dph7d9y0979"; depends=[caTools FSelector InformationValue ROCR woeBinning]; }; HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; }; HydeNet = derive2 { name="HydeNet"; version="0.10.5"; sha256="00h7lj347nag5m5nfyv1hgaml77kqlcxrl704mq6791fcjdchgp1"; depends=[checkmate DiagrammeR dplyr graph gRbase magrittr nnet pixiedust plyr rjags stringr]; }; HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; }; @@ -1425,10 +1461,10 @@ in with self; { IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; }; ICAOD = derive2 { name="ICAOD"; version="0.9.2"; sha256="12fkcc2ii3652n8ihzm29f9gip790wdmil7c1bzd5ma4l959w7hy"; depends=[nloptr Rcpp RcppEigen Rsolnp]; }; - ICBayes = derive2 { name="ICBayes"; version="1.0"; sha256="0z0z74yslhfjbh7188hzyxhwb7kn9raa0xsrr6n592ridpkhaih4"; depends=[HI survival]; }; + ICBayes = derive2 { name="ICBayes"; version="1.1"; sha256="1bmxba3bv9szzxvjf1blwxwdhw87h7s04cfn63c1gqpnpwsmr03y"; depends=[coda HI survival]; }; ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; }; ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; }; - ICCbin = derive2 { name="ICCbin"; version="1.0"; sha256="1ybhxk5bvgfsz45r1kbb8b82qwjb8a88q11x5c4dbdk85fkxg3w9"; depends=[]; }; + ICCbin = derive2 { name="ICCbin"; version="1.1"; sha256="0jlq1rlpgw52kxaj02mh0jlvvxw4f1bj8094p7f5hqdjhjc53ynf"; depends=[]; }; ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; }; ICEinfer = derive2 { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; }; @@ -1441,6 +1477,7 @@ in with self; { ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; }; ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; ICtest = derive2 { name="ICtest"; version="0.3"; sha256="0g4h6gkz6zp28a1hvrvm89wckx6sg5fqzy0flb97a6lh9xpmb83g"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; }; + IDCard = derive2 { name="IDCard"; version="0.1.0"; sha256="1hc319avacxprg8vdp218dbkhzi6fn5ahd2rr1m7qwz4gnhwl95q"; depends=[]; }; IDPSurvival = derive2 { name="IDPSurvival"; version="1.2"; sha256="0hifs8vw3rxlb5vlxs1433pcv2dh7p0mxpgb2n03d98f20vkdwfw"; depends=[gtools Rsolnp survival]; }; IDPmisc = derive2 { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; }; IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.2.2"; sha256="0pfvdy82i5w6zrda2022m1v22dv2qsgcj1y7f8hqmaqvqgczizfk"; depends=[]; }; @@ -1448,6 +1485,7 @@ in with self; { IDmining = derive2 { name="IDmining"; version="1.0.2"; sha256="1ffjwcf3j2v950ksshajwld0h2ld71ij2i76vncl2qmwdlmx0ip3"; depends=[data_table doParallel foreach]; }; IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; }; IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.5"; sha256="09k5di7bqlqi2m3jn39ahnf7x96wx1h06bw0ah6pdszwd97yy33i"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; }; + IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; }; IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; }; ILS = derive2 { name="ILS"; version="0.1.0"; sha256="18phs1q28mpwvwnzn0hgjxy978f7n4c3p94jxjp0sy3as67hqphp"; depends=[depthTools fda_usc MASS multcomp]; }; IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; }; @@ -1477,7 +1515,7 @@ in with self; { ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; }; ISDA_R = derive2 { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; }; ISLR = derive2 { name="ISLR"; version="1.1"; sha256="1w6k90mbzrx1756rvx7b3y22ypgkzl9p7mjjdlzs8i5g1yz8gzqv"; depends=[]; }; - ISOcodes = derive2 { name="ISOcodes"; version="2016.12.09"; sha256="1xsazjipx468hyqivdkskcqiipmysdzzrswh4yh6p41qbf1ahp6a"; depends=[]; }; + ISOcodes = derive2 { name="ISOcodes"; version="2017.09.20"; sha256="0yzn0qh5qh863zqr3vdsspr9diy2whx92gqm84d2brxm195sd1x8"; depends=[]; }; ISOpureR = derive2 { name="ISOpureR"; version="1.0.21"; sha256="093wvnh7fv9shvssgl8slfg394f0v0jazj4jpihhaqkfchq1vryy"; depends=[futile_logger Rcpp RcppEigen]; }; ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; }; @@ -1503,6 +1541,7 @@ in with self; { InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; }; InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; }; InfiniumPurify = derive2 { name="InfiniumPurify"; version="1.3.1"; sha256="0yqah4rwpishas0xyv5a7cn4v18brj33cd7f494g21b9brggafq1"; depends=[matrixStats]; }; + Inflation = derive2 { name="Inflation"; version="0.1.0"; sha256="0ikhsslbg32kr9vcaxq8qwaa7ahiwvq91xwv53550wci2vyzmybp"; depends=[seasonal]; }; InfoTrad = derive2 { name="InfoTrad"; version="1.2"; sha256="0blfn59w73hjga15sw8plwvn6yq9fj95nxwp018mp1harl8wa5db"; depends=[nloptr]; }; Information = derive2 { name="Information"; version="0.0.9"; sha256="0pszwzj3r7vdvdsy9w1qz95zxp7y2bsyg36b58mm4qcvcvymd4kn"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; }; InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; }; @@ -1523,11 +1562,10 @@ in with self; { InterfaceqPCR = derive2 { name="InterfaceqPCR"; version="1.0"; sha256="12nmkv6qnzh2dnbhk1656dla6mrznh24gqblmn4xai7wg4p92fbx"; depends=[plyr reshape2 tkrplot xlsx]; }; Interpol = derive2 { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; }; Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; }; - InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.0"; sha256="0b73xxkpz2rj0i2g5bqj8zsybcz0850f4vhdiryqn9933zi347ap"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; }; + InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.1"; sha256="00nhfz1hs2j1pqhwgw5c337kl1azr3vmlcd1krnl4fgs5yz6ksyq"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; }; InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.6-1"; sha256="16qlskxszpi24qsdl821n72pzdvmf1gg7lnlwyhyzhzzkh9az1pd"; depends=[glmnet mboost]; }; InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; }; - Inventorymodel = derive2 { name="Inventorymodel"; version="1.0.4"; sha256="1mlvdfhyr27sgap7jgccy79gg7dksplp2jirijn9i289mqvy12c9"; depends=[e1071 GameTheoryAllocation]; }; - InventorymodelPackage = derive2 { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; }; + Inventorymodel = derive2 { name="Inventorymodel"; version="1.0.5"; sha256="16aqc8202k84pwbss6g2cw7lvykjjjfdg62jg9r82skjf7zzprpg"; depends=[e1071 GameTheoryAllocation]; }; IrishDirectorates = derive2 { name="IrishDirectorates"; version="0.2.0"; sha256="1m3c3dj4729chk1n3k7awvi1jdfnds2w36vm268azg53j6c7l4b6"; depends=[]; }; IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; }; IsingSampler = derive2 { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[magrittr nnet plyr Rcpp]; }; @@ -1535,7 +1573,7 @@ in with self; { IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; }; IsoSpecR = derive2 { name="IsoSpecR"; version="1.0.3"; sha256="1cnkzc29k0inz6kdn77l0ymzjgf1hid8jza7nla4ym2s0gidgdyf"; depends=[Rcpp]; }; - IsoplotR = derive2 { name="IsoplotR"; version="0.16"; sha256="1g4slgafi1wbiayhy0b51kixbwrdfw14pcvwvh9xbbn6rqnk1wci"; depends=[MASS]; }; + IsoplotR = derive2 { name="IsoplotR"; version="0.17"; sha256="02sd9qvab4lbb5dw9lvcv0l45rfv4z12irlsy83kr2wj0vkfxam7"; depends=[MASS]; }; IsoriX = derive2 { name="IsoriX"; version="0.7"; sha256="0b94s94axrqgv3dm9dbkdnh6imlzn245f2pi7wbj99nqhwa47ynb"; depends=[latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; }; IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; }; JADE = derive2 { name="JADE"; version="2.0-0"; sha256="15bcq6r2iargxkb0pdbqkwrrn2rs7hc3y5fxjm5mb377513sdz5j"; depends=[clue]; }; @@ -1544,16 +1582,16 @@ in with self; { JBTools = derive2 { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; }; JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; }; JGL = derive2 { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; }; - JGR = derive2 { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[iplots JavaGD rJava]; }; + JGR = derive2 { name="JGR"; version="1.8-4"; sha256="0zfjfqlfrsz4wjdq78zasvgd3ldgcx20h16bbar1l7wv843j71ym"; depends=[JavaGD rJava]; }; JM = derive2 { name="JM"; version="1.4-7"; sha256="1ajdmabifzg4jp74ghas5wf3vp4x2vnc6sh811n44a1ni727sb2n"; depends=[MASS nlme survival]; }; - JMbayes = derive2 { name="JMbayes"; version="0.8-0"; sha256="1kay6na8mb7k2r4alpzm2lb8phjqr3a05qfpv4ydd16rbjrlfbph"; depends=[MASS nlme survival]; }; + JMbayes = derive2 { name="JMbayes"; version="0.8-67"; sha256="02gcpbn3nw1bfrsdybb17wrs4bwp2kzg22m2k6080b4gbrhqspi4"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; }; JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; }; JOUSBoost = derive2 { name="JOUSBoost"; version="2.1.0"; sha256="0f3rr7aw20nvmlpqrq3wzgmr55lqdqhk3wphpqq7msgvaf1zrcl7"; depends=[doParallel foreach Rcpp rpart]; }; JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; }; JPSurv = derive2 { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; }; JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; }; - JSM = derive2 { name="JSM"; version="0.1.1"; sha256="0ggqf55fn1zjn3d5nmizi4ywj5h6qfisp76ld95527xw2lkrv011"; depends=[nlme Rcpp RcppEigen statmod survival]; }; + JSM = derive2 { name="JSM"; version="0.1.2"; sha256="18h3jhfg5ch9312aidpbs0fz5rd54alv4kjhvkchddhp3alyhp82"; depends=[nlme Rcpp RcppEigen statmod survival]; }; JWileymisc = derive2 { name="JWileymisc"; version="0.2.1"; sha256="0cli204f1b5hj3qz62fycww12a6dv7xxxszkxgrxirw6mpdf858c"; depends=[cowplot data_table devtools foreach ggplot2 Hmisc lavaan MASS mgcv mice multcompView plyr]; }; JacobiEigen = derive2 { name="JacobiEigen"; version="0.2-2"; sha256="1q6wqxlhslip14544px1aq446m77a8s0chvhpc19im014w4g930v"; depends=[Rcpp]; }; JavaGD = derive2 { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; }; @@ -1564,6 +1602,7 @@ in with self; { JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; }; JointRegBC = derive2 { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[MASS nlme survival]; }; Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; + JuliaCall = derive2 { name="JuliaCall"; version="0.7.3"; sha256="00kj1mwsgs5fj9s5qipbh81dmb908610ajng1k1yxkkrnc4nxqpk"; depends=[inline]; }; JumpTest = derive2 { name="JumpTest"; version="0.0.1"; sha256="1d5zmjwmajzdg5d1ws40zchx9wiaav01fby1v3irym2mx30jgbqn"; depends=[MASS Rcpp RcppEigen]; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit matlab R_matlab]; }; @@ -1572,6 +1611,7 @@ in with self; { KFAS = derive2 { name="KFAS"; version="1.2.9"; sha256="04iq4zyy98rqvv7q4f3ypg0bmdawmwa3lwm9agbrsaiz8v89cqhk"; depends=[]; }; KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; }; KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; }; + KMgene = derive2 { name="KMgene"; version="1.0"; sha256="0fyi594djnz6phhw507bvscyi7qwskch5ykwrc7w0npxxjyryp2h"; depends=[CompQuadForm coxme kinship2 MASS mgcv nlme]; }; KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; KODAMA = derive2 { name="KODAMA"; version="1.4"; sha256="0qzpgj6ljzd8n8vgmf53pmblsmypl86j7njd3pz0d370bxfchsqj"; depends=[Rcpp RcppArmadillo]; }; KOGMWU = derive2 { name="KOGMWU"; version="1.1"; sha256="0n07wrpmmvxflxpmhkp3gm40xz2w4j0l8dsljhmfiyxcf5y7kq2g"; depends=[pheatmap]; }; @@ -1592,7 +1632,7 @@ in with self; { Kmisc = derive2 { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[data_table knitr lattice markdown Rcpp]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; Knoema = derive2 { name="Knoema"; version="0.1.7"; sha256="1f9sndva2pfv4r8g8dspywg8rs1vzlb8adf5zdc5gz8hl03b3dgr"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; - KnowBR = derive2 { name="KnowBR"; version="1.2"; sha256="1d2rzggj3jp8r748mrvk4c692xkmbim5avxjy30qzn3wmy15r479"; depends=[]; }; + KnowBR = derive2 { name="KnowBR"; version="1.3"; sha256="1083kficxc716sxzxj93arzx97bzcfm9fim3vkyvx9m9q26m3axl"; depends=[fossil plotrix sp splancs vegan]; }; KoNLP = derive2 { name="KoNLP"; version="0.80.1"; sha256="1chj8kv1l405dm0jcsxjjjxx395z05sfxbcc5vxnpbydx7lxa6zy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; }; KoulMde = derive2 { name="KoulMde"; version="3.0.0"; sha256="01mczlrdrfwdp2cj10kdqay3qpg8xf2v7vym62pll9l8n595snrl"; depends=[Rcpp]; }; Kpart = derive2 { name="Kpart"; version="1.2.0"; sha256="14c6ngc37xpxy5pd5jishaqz6aahky32p0x5bfsn5zirdahlphsa"; depends=[leaps]; }; @@ -1621,7 +1661,7 @@ in with self; { LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; }; LEGIT = derive2 { name="LEGIT"; version="1.1.1"; sha256="108bxw98z0hgm4nnxvn54c5npm48qsif7y91dqsjx69p6azckqmh"; depends=[doSNOW foreach formula_tools iterators pROC snow]; }; LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0"; sha256="11vy6gg2x98s1y8a5ns9vcd61gw8ax1lhn4lvicdjbd1lg18nm83"; depends=[]; }; - LGEWIS = derive2 { name="LGEWIS"; version="0.2"; sha256="0aqvj6vphg33jfyfkj0zkdbp60a94jlc1vcsba2nyywc54qm9wjh"; depends=[CompQuadForm geeM pls SKAT]; }; + LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; }; LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; }; LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; }; LICurvature = derive2 { name="LICurvature"; version="0.1.1"; sha256="09hqar4kvksd816ya6jg349r0v6z2m2109hq6j4k1d2vchab4lni"; depends=[MASS]; }; @@ -1632,6 +1672,7 @@ in with self; { LLSR = derive2 { name="LLSR"; version="0.0.2.0"; sha256="0nxp1sfnhgf0iqfhwqvr7a0mvs3swsj2l0shcyrb3zliyd23g5ax"; depends=[digest ggtern rootSolve svDialogs XLConnect]; }; LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; }; LMest = derive2 { name="LMest"; version="2.4"; sha256="1ag3w0789qfr0ypbkcwy81j61mmf0nwriiw22w7gqjn1ripx94kv"; depends=[MASS MultiLCIRT]; }; + LMfilteR = derive2 { name="LMfilteR"; version="0.1.0"; sha256="1sn5ag59zfbq8birvb84zwksy0z0qiqc4sm66ixvmfrxhfikan9l"; depends=[MASS]; }; LNIRT = derive2 { name="LNIRT"; version="0.2.0"; sha256="02gaqn2pixry6qgybwszsv60pk6hzdd51axchkq3ma3gb6biw4fv"; depends=[MASS]; }; LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; LOGIT = derive2 { name="LOGIT"; version="1.3"; sha256="1nx9ycrys0p08xr1n7bqgn47k5wz1zbp6w5pwsqk5c6f6did2rs1"; depends=[caret e1071 ggplot2 MASS pROC reshape]; }; @@ -1662,7 +1703,7 @@ in with self; { LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; }; LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.1"; sha256="1inq88yqm1155shx81lsmjvc0snnid0ibim991g46yibf3jpcyzf"; depends=[]; }; LaF = derive2 { name="LaF"; version="0.6.3"; sha256="0mp1g8pikmkahxgshgs4a7iryxzzcxhxdzvdn60s6m9h1addvhww"; depends=[Rcpp]; }; - LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.0"; sha256="0qf818dgyp1sgs6j5zqsj1wld5hychv1qxr6gdk3s0nbv72y7wsw"; depends=[data_table maptools rgdal rgeos sp spdep]; }; + LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.1"; sha256="0ic6rm47iqkrlds7cshfcd0vjpgd7hldlicjq1wzxx0p3fbbnqjm"; depends=[data_table maptools rgdal rgeos sp spdep]; }; Lahman = derive2 { name="Lahman"; version="6.0-0"; sha256="1616iaa28z6wrxcvvmnic5awj33b7km9yxnn8bnll9yw99ks6qk6"; depends=[dplyr]; }; LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.0"; sha256="06mvdrdyl0rh9rwd0jxww0sycadcp7cj08hq35q6vyzq0jkxn2xf"; depends=[plyr rLakeAnalyzer]; }; Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; }; @@ -1714,19 +1755,19 @@ in with self; { LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-4"; sha256="02p46agsdbvw6dpgzahq9hfmy184jrkwa1hhnrcbrsmm54n3m2bx"; depends=[nlme]; }; LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; }; LowRankQP = derive2 { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; }; - LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.0"; sha256="0dqh1cg49w75fc6qmv2sdym5jsdnsgkwv621g3wmr8m3i81m49v6"; depends=[Rcpp RSQLite]; }; - LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.0"; sha256="1a74hjamh6sldzp65s0fm7d2wq1f37j822a7whikcpwsdj3za8vm"; depends=[Rcpp RSQLite]; }; + LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; }; + LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; }; LumReader = derive2 { name="LumReader"; version="0.1.0"; sha256="1h2r3c9xkwlnaicn65085bdx7y86ha2fpd5mxirqax5lm6d8lirc"; depends=[gridExtra lattice plotly shiny]; }; Luminescence = derive2 { name="Luminescence"; version="0.7.5"; sha256="07v78diyjvbymwidpa9f5bykaafczv0f88f6r926mk949sj1ici4"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm raster Rcpp RcppArmadillo readxl shape XML zoo]; }; M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; }; M4comp = derive2 { name="M4comp"; version="0.0.1"; sha256="1lxm6qcbdp7i00vxbikhyl7pdxnz4czar10kh9xm0qwy8sl8lxg2"; depends=[]; }; MADPop = derive2 { name="MADPop"; version="1.1"; sha256="1w2jbiki6d14y32p8a50b8g53m1iva2kgik14yg27z5hx1rwwq97"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; }; - MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="1.0.0"; sha256="1933dxjz0scw4arjlx606kr4b3czvl4i0blg4b212pycf8p7jyfb"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; }; + MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.0"; sha256="0vvzjqjhxnjxj3askm708bl07ph4zs9jykpw4yg5dsysy58cjl0z"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; }; MAINT_Data = derive2 { name="MAINT.Data"; version="1.1.2"; sha256="1d552k2n110a6rvvf2ld8anravp3xgh17irj6kb0nxzcjy30vprg"; depends=[MASS miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; }; - MALDIquant = derive2 { name="MALDIquant"; version="1.16.2"; sha256="0z5srzsfgsgi4bssr4chls4ry6d18y2g9143znqmraylppwrrqzr"; depends=[]; }; - MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.10"; sha256="1h1lvmw3233wgy1wvpa6n5q5j6z27hg3k31rq4a7c53w8g1bsmi3"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; - MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.0"; sha256="1di9l80pk0pp9r2437rq79ad05kaxrd2pvl0bliw63vr4g7vcnha"; depends=[lattice MALDIquant robustbase signal wmtsa]; }; - MAMS = derive2 { name="MAMS"; version="1.01"; sha256="0vm1pnh5bcggsip4cpbfif2j2glvbsscpnpjsycbd2y0m05asccz"; depends=[mvtnorm]; }; + MALDIquant = derive2 { name="MALDIquant"; version="1.16.4"; sha256="1pmhsfvd45a44xdiml4zx3zd5fhygqyziqvygahkk9yibnyhv4cv"; depends=[]; }; + MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.11"; sha256="11akflnz4d3vbal1zqyv58n8dwggnix2lzd1r1kkvwja6izb5z08"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; + MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.1"; sha256="1y2nr65cvqkvzzjsr3lmpk58lqd5rqvmzjdakhwhw4s6ymggd9hf"; depends=[lattice MALDIquant robustbase signal wmtsa]; }; + MAMS = derive2 { name="MAMS"; version="1.2"; sha256="19w6ydsbr60p1cmizhhmsajzasg76r23x29qcaa7mibcb5gh1yzs"; depends=[mvtnorm]; }; MAMSE = derive2 { name="MAMSE"; version="0.2-1"; sha256="0spi7fqkxjiw5j0nf7ambcr8kpzdhjzh9y3dk23y1mrk2dgc5dkw"; depends=[]; }; MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; }; MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.1.2"; sha256="14vs6a4kh6w3qjsphid4czkzg1456igv4q0laxi4wfm8pb1j3aym"; depends=[ellipse magic MASS Matrix plotrix plyr]; }; @@ -1749,17 +1790,17 @@ in with self; { MBA = derive2 { name="MBA"; version="0.0-9"; sha256="06kmrdkhwwvr3kd5w8ws6r528hhpvbhixyj98lv36kkwlx14x06g"; depends=[BH]; }; MBC = derive2 { name="MBC"; version="0.10-2"; sha256="0c40k3m9z9cqk3778hwyy0i56qnsvw1dwpa6p9v097fbpacfsrg2"; depends=[energy Matrix]; }; MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; }; - MBESS = derive2 { name="MBESS"; version="4.3.0"; sha256="055h4wppp4dyxa152hdg6as5ckxzvjjfb3k8n72w9jmmrk49vbbg"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; - MBHdesign = derive2 { name="MBHdesign"; version="1.0.70"; sha256="1diprak06v4jkivnf2bb74v9flm439034n62pfqg446vymxjkzh9"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; + MBESS = derive2 { name="MBESS"; version="4.4.0"; sha256="0qr5p5znwfq8j7ixdqyd45hdvjkk6nnd1s52ixzzmzv888bafflg"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; + MBHdesign = derive2 { name="MBHdesign"; version="1.0.76"; sha256="04nrfgi8l4hn1shzvzf389hgdd7d5psxhvplk0qn5x99ya8ldr7l"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; }; MBTAr = derive2 { name="MBTAr"; version="1.0.1"; sha256="0zak19pdk0wwkhl4kj1jbwx0qmqcgpmmqv3vk0wg8nwgf1l65idy"; depends=[jsonlite]; }; MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; }; MC2toPath = derive2 { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; }; MCAvariants = derive2 { name="MCAvariants"; version="2.0"; sha256="0akff64v49d5r0wvspal0pz17jhz1ry4vdmj47m28gzjj69zcab0"; depends=[]; }; - MCDA = derive2 { name="MCDA"; version="0.0.16"; sha256="1yxcpvapn9dv802z3fm0sfgf8lkpsniwb41qnb8lbvmqnyzmkqhw"; depends=[glpkAPI RColorBrewer Rglpk]; }; + MCDA = derive2 { name="MCDA"; version="0.0.17"; sha256="1j9lahacdhvcvj7h32yb9fimlwfcl2q8jc7dlvnsc95wai43khfr"; depends=[combinat glpkAPI RColorBrewer Rglpk]; }; MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; }; - MCI = derive2 { name="MCI"; version="1.3.1"; sha256="1dy7awqwxzpijx0x49ma28iialrdcwdcvc1qznlr9znml9xmz2br"; depends=[]; }; + MCI = derive2 { name="MCI"; version="1.3.2"; sha256="1qmvxpxhdzzlsdgi8gv5m3vknshvalsac38mh00v4v5sqpw4zc7l"; depends=[]; }; MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; }; MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; }; @@ -1792,6 +1833,7 @@ in with self; { MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; }; MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9"; sha256="16f1kdaqczjlv5cx0nv9fybvjwf22yaj3f4blkgm7mf9h78cyz05"; depends=[corpcor Matrix matrixcalc scs]; }; MFPCA = derive2 { name="MFPCA"; version="1.1"; sha256="1nbm8j9g36jqbalja5zcgkiy03i0pmr75hiqnhigxyy4dnp0wj4a"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; + MFT = derive2 { name="MFT"; version="1.3"; sha256="029apjg1fqrqfg98jczbxfy267m3f68qxvxqjzbsw1xisq4j7wc0"; depends=[]; }; MGGM = derive2 { name="MGGM"; version="1.0"; sha256="0j9wyshwxd7zqb60avb7dmfgnrzv2nyn983bw0g5997zixz0w6mp"; depends=[]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; MGLM = derive2 { name="MGLM"; version="0.0.8"; sha256="1yzi679jm7x9qkz0d3az84clkjfc7wjnxkk6n6s6ia4bnw05d5v7"; depends=[]; }; @@ -1843,12 +1885,12 @@ in with self; { MPDiR = derive2 { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; }; MPINet = derive2 { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; }; MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.1"; sha256="0xgj349jkv29ldia4lmsiwnkhrk99aqcrvyiy3si5knmi1jvx9q0"; depends=[MASS survival]; }; - MPSEM = derive2 { name="MPSEM"; version="0.3-2"; sha256="10kh0ss2m8j09risnwk550p0bdd73asgdm8qjjwb2ii6bi31lw5g"; depends=[ape MASS]; }; + MPSEM = derive2 { name="MPSEM"; version="0.3-3"; sha256="0ir1zlg0vz0nfdair3apa737dw4078lbxyk932755d3rj0cm20c3"; depends=[ape MASS]; }; MPTinR = derive2 { name="MPTinR"; version="1.10.3"; sha256="0281w5dhg8wmi1rz80xribq437shp4m890c504kggsacr28mbhkw"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; }; MPV = derive2 { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; }; MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; }; MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; }; - MRFA = derive2 { name="MRFA"; version="0.1"; sha256="1z6bnss9p8p8a2wxy40yp62ypxpis6k2j7naspdjcv09b1882jdg"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; }; + MRFA = derive2 { name="MRFA"; version="0.2"; sha256="1ld9bchldx4y8g0zp2nr6r439f9vqy5xcr9bkv4g4vphm2c5zq72"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; }; MRH = derive2 { name="MRH"; version="2.2"; sha256="1icwlq8js58g9fkiq7fwjg8r97ca47xl3dscnhnga99gkgsfgjwl"; depends=[coda KMsurv survival]; }; MRMR = derive2 { name="MRMR"; version="0.1.4"; sha256="0dgbhlynaaka7mdzl6igwgcdzvy6cm2y8mbxaf9pfla8w3z8y0lq"; depends=[ggplot2 lmtest lubridate plyr reshape2]; }; MRQoL = derive2 { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; }; @@ -1860,19 +1902,21 @@ in with self; { MSBVAR = derive2 { name="MSBVAR"; version="0.9-3"; sha256="0ybkkl3hfff2jgz4a0z105bb0v6jl4dkkqmdg382and8w0mc496c"; depends=[bit coda KernSmooth lattice mvtnorm xtable]; }; MSCMT = derive2 { name="MSCMT"; version="1.3.0"; sha256="0rwhfk6dh10zn1zgjamwx23j8i9kw1p6yzfgxj5ch7w3d3yzhrbf"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; }; MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; }; - MSGARCH = derive2 { name="MSGARCH"; version="0.17.7"; sha256="01n8ngk0r2hfa5vrj0mbc09kq9dj0d4fjzhszcj80mzfr47jf5vf"; depends=[adaptMCMC DEoptim dfoptim expm fanplot ggplot2 nloptr Rcpp RcppArmadillo reshape2 stringr zoo]; }; + MSGARCH = derive2 { name="MSGARCH"; version="1.1"; sha256="1pclfp7x629axby4kpfnrvnr6lpm8f4pimwsvwnpda3sx0pfvkkx"; depends=[adaptMCMC coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; }; MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; }; MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; }; MST = derive2 { name="MST"; version="2.0"; sha256="131c98lzy1cs1gbv20nv9r6yhlyyhk43hh1mrx12k1cgw299265k"; depends=[Formula MASS partykit survival]; }; + MSbox = derive2 { name="MSbox"; version="0.1.0"; sha256="0r6dprmvlga58drdk3x7z1rzy12lmmxcqng8534la8d3g6hhdwmz"; depends=[]; }; MScombine = derive2 { name="MScombine"; version="1.1"; sha256="0kgz1l4jlhcada3fp02dscf4zx6a22cjxj251838lfz65f512hrn"; depends=[plyr]; }; MSeasy = derive2 { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap cluster clValid fpc mzR xcms]; }; MSeasyTkGUI = derive2 { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; }; MSwM = derive2 { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; }; - MTA = derive2 { name="MTA"; version="0.1.0"; sha256="0h1nnvylp5yvzx6mljayjjz73l0bjyz5zahymxa9z3z7jlahvkwh"; depends=[igraph rgeos sp]; }; + MTA = derive2 { name="MTA"; version="0.1.1"; sha256="07bkisjvdxzf79ngwc8c5ikmnfas82m894hdc87q2yh0lzf12987"; depends=[igraph rgeos sp]; }; MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; }; + MTE = derive2 { name="MTE"; version="1.0.0"; sha256="009mrl9dgxafl4hrgfzvsfvgx3dljb0rbbs74j2cxc5ray87kp55"; depends=[parcor quantreg]; }; MTS = derive2 { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; }; - MTSYS = derive2 { name="MTSYS"; version="1.0.0"; sha256="0gap1ghwkfa8ni11wgrck4zsngf9j470vwv1jdzmsmr963q1yw1w"; depends=[]; }; + MTSYS = derive2 { name="MTSYS"; version="1.2.0"; sha256="04dkan3hxl3difflskp7d1lw1bvxhg4s28ssy2v4m7z7wbpj3v1m"; depends=[]; }; MTurkR = derive2 { name="MTurkR"; version="0.8.0"; sha256="0q498chr2s67ai7lfxi6kdficqbs5sxj9asyv69z2a37fmsr4va7"; depends=[base64enc curl digest XML]; }; MTurkRGUI = derive2 { name="MTurkRGUI"; version="0.1.5"; sha256="1rlgz80na0v1nx70cda1fzyswlb1lg5kcx64zl9dcqy6accsrpmp"; depends=[curl MTurkR XML]; }; MUCflights = derive2 { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; }; @@ -1884,17 +1928,17 @@ in with self; { MVR = derive2 { name="MVR"; version="1.32.0"; sha256="18arp9xh9dflbmc5zxafy132mnz5xwc6kb9hv51njz602kms70qg"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; MVar_pt = derive2 { name="MVar.pt"; version="1.9.8"; sha256="0ysdrdjlljbscw92ylyq4m22zvj3b9yp9mpw4pdlnzwix9z0k2yx"; depends=[]; }; - MVisAGe = derive2 { name="MVisAGe"; version="0.1.0"; sha256="04p5kvi1nkwwi1apwd0ycnp139yl024qq419d887n3hc0rlrd4kb"; depends=[]; }; + MVisAGe = derive2 { name="MVisAGe"; version="0.2.0"; sha256="18w3qf85l81sbxhzxs61jbsng14lbd8vzvbprq0ywkxb2lsq16n2"; depends=[]; }; MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; }; MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; }; - MXM = derive2 { name="MXM"; version="0.9.9"; sha256="1d6k941psi7d4ycsalvbi8n6xhahj235fgq75izjvnwxbs0j704b"; depends=[doParallel e1071 energy foreach lme4 MASS nnet ordinal quantreg relations Rfast speedglm survival visNetwork]; }; + MXM = derive2 { name="MXM"; version="1.0.0"; sha256="1f2ml4q33ml28y0h68bll2lmb1xxnjxgdxi5mf8arzl42b3d72b6"; depends=[doParallel energy foreach lme4 MASS nnet ordinal quantreg relations Rfast speedglm survival visNetwork]; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; }; MagneticMap = derive2 { name="MagneticMap"; version="1.0"; sha256="1634bk6x92z01gyiy89c1g6z5cjsj8pf4f358y7rk2kppmfz4cf7"; depends=[scatterplot3d]; }; MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; }; ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.3"; sha256="1ppc0ik7vx14n6alq9wpykgfacg78ph9fc5r9k9jqm55nwz4d3xh"; depends=[Rcpp RcppArmadillo]; }; - ManlyMix = derive2 { name="ManlyMix"; version="0.1.7"; sha256="10m5kfs8n34frygn36ryn4h8128p4smmr5s2ngbbj05dchni09ai"; depends=[]; }; + ManlyMix = derive2 { name="ManlyMix"; version="0.1.9"; sha256="0zf3j0vs3gg697dlma9j92davf6x7isykgx01018zzivlabrrc6b"; depends=[]; }; ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; }; Map2NCBI = derive2 { name="Map2NCBI"; version="1.1"; sha256="19gafyql767f1p4fxdw7d5a8z1b4vg7jfrvzaml5x16fj6c78fjm"; depends=[]; }; MapGAM = derive2 { name="MapGAM"; version="1.0"; sha256="1hzv3sy2szxl4fhnnzlwagh3qm4z22cbhiwi8whgn5ymwlnw0pca"; depends=[gam maptools sp survival]; }; @@ -1908,8 +1952,8 @@ in with self; { Matching = derive2 { name="Matching"; version="4.9-2"; sha256="0lv5b41l797c4bl2rzmdqzjnn47zpvvcv3md3xwxvvz5knxky5x4"; depends=[MASS]; }; MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; }; Matrix = derive2 { name="Matrix"; version="1.2-11"; sha256="1yvd6fx3n99j4gvzrng43ji38pr5h8y03kijccgjdalym2hcp36g"; depends=[lattice]; }; - Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.5"; sha256="057lms2xdp13wcglg8hg95blj60f5zhva26jlkm2z1vi11jiy728"; depends=[grr Matrix]; }; - MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.1"; sha256="1m14fh52l7zb9pyj2swisrz8dfw68k1p90rgg0g9zqkmx6fp5qls"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; + Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.6"; sha256="0aa225y6vqm0dqjfppfrc43wbq3ks9aszhmy73xbai2v12sh439g"; depends=[grr Matrix]; }; + MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.2"; sha256="0s4gxgl6fsy0fnjmsdz4k7p96vl6p00xl9w2fg7v0gikjpz6h5bg"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; }; MatrixLDA = derive2 { name="MatrixLDA"; version="0.1"; sha256="19q6wl8fc6jzn7544qnlpzfh9v0xlg9cr78l6k8kx6kzjnbnyh9z"; depends=[glasso plyr Rcpp RcppArmadillo]; }; MatrixModels = derive2 { name="MatrixModels"; version="0.4-1"; sha256="0cyfvhci2p1vr2x52ymkyqqs63x1qchn856dh2j94yb93r08x1zy"; depends=[Matrix]; }; @@ -1928,7 +1972,7 @@ in with self; { MenuCollection = derive2 { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; }; MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; }; MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; }; - MetFns = derive2 { name="MetFns"; version="3.0.0"; sha256="0h2zic2abkifwz8ysy46980frc15rlpzirgk045m4qms91zk08fl"; depends=[astroFns lubridate plotrix pracma]; }; + MetFns = derive2 { name="MetFns"; version="3.0.1"; sha256="1irrwg3a1m6a820zg7f13x84rfgd3z2xl4qc4y096y4agn6h7v97"; depends=[astroFns lubridate plotrix pracma]; }; MetNorm = derive2 { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; }; MetProc = derive2 { name="MetProc"; version="1.0.1"; sha256="1z6538pij1rq5wv9s8rjcn0sck15y26asv4vamav8a6s4135ia3q"; depends=[fastcluster gplots]; }; MetSizeR = derive2 { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; }; @@ -1944,7 +1988,7 @@ in with self; { MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; }; MetaQC = derive2 { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; }; MetaSKAT = derive2 { name="MetaSKAT"; version="0.60"; sha256="13qffirv0lnj0bflzjpr2hd0d8j4bkakyfjvicp40f0v4v3cack2"; depends=[SKAT]; }; - MetaSubtract = derive2 { name="MetaSubtract"; version="1.0"; sha256="0yn5ymx22wxn0j6j0w6nxj2mr9nb4qf7ypflikpj9h5qqiln2nn7"; depends=[]; }; + MetaSubtract = derive2 { name="MetaSubtract"; version="1.1"; sha256="0p1fqglrhf3yvdmg6cr3clipf4jhhv3fmb7visrjc27sgcvlwws8"; depends=[]; }; MetaboList = derive2 { name="MetaboList"; version="1.2"; sha256="15wkj29s1mxi1wzqzlh8lkr5jkw15dbc37h3hzsc0r72a3ddzf38"; depends=[enviPick]; }; MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; }; MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; }; @@ -2007,6 +2051,7 @@ in with self; { MotilityLab = derive2 { name="MotilityLab"; version="0.2-5"; sha256="080j548sp1c4yqqd7p7zgr70j1xyrw3fgjj1f521sgh84x5h2hbc"; depends=[ellipse]; }; MplusAutomation = derive2 { name="MplusAutomation"; version="0.7"; sha256="0xnipvfib16ycxglqnr5x0h19km0sw966w1xhaxw2ii6cm82ks0l"; depends=[boot coda digest gsubfn lattice pander plyr texreg xtable]; }; Mposterior = derive2 { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; }; + MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; }; MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; MuMIn = derive2 { name="MuMIn"; version="1.15.6"; sha256="08qac7d1w367wjsz7n9ydziacbf8np8w8mm9izbxd4pk3ibxwi5a"; depends=[Matrix]; }; MuViCP = derive2 { name="MuViCP"; version="1.3.2"; sha256="1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4"; depends=[gtools MASS sm]; }; @@ -2052,7 +2097,7 @@ in with self; { NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; }; NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; }; NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; }; - NHMSAR = derive2 { name="NHMSAR"; version="1.5"; sha256="1s94icc99b9vaaypxy5q4pnid1kqmh4xx4p7yb52i9zizpw9sr90"; depends=[caTools glasso lars ncvreg SIS ucminf]; }; + NHMSAR = derive2 { name="NHMSAR"; version="1.6"; sha256="02g3yhd5xmrk15ydj110yd80aff2vxk852b4kbhnl3flnf3j2mzk"; depends=[caTools glasso lars ncvreg ucminf]; }; NHPoisson = derive2 { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; }; NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; }; NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; @@ -2084,10 +2129,10 @@ in with self; { NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; NSA = derive2 { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[aroma_affymetrix aroma_core DNAcopy MASS matrixStats R_methodsS3 R_oo R_utils]; }; - NSM3 = derive2 { name="NSM3"; version="1.9"; sha256="0ianzczznigkbialzdm43w9wkgnsx24393v7hnxcvxqczzhl795h"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; + NSM3 = derive2 { name="NSM3"; version="1.10"; sha256="118pp3a11w4wyjq18jm3f7xy79l5jyjsyxgkyxbwsrr7lvplqzb2"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; NScluster = derive2 { name="NScluster"; version="1.1.1"; sha256="1w63abh4q0wgv3x7inl2xyp9qgr9m223r2p7nfiqnxk9y259kh04"; depends=[]; }; - NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4"; sha256="00zdwm722v625dyya323jlipicpmfxvzxxf072x3fn4b97xc8h8n"; depends=[snowfall]; }; + NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.1"; sha256="1grz2yxrklqglw9027c8k01jnb42p453fcd38arw4wd85y5hbam4"; depends=[snowfall]; }; NameNeedle = derive2 { name="NameNeedle"; version="1.2.4"; sha256="1f8hmabwafjmgx2z381a3m84zfrd0s9x51haa4c1phq41yfq2lm5"; depends=[]; }; NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.1.21"; sha256="1rbmhk5kags3mm4znakfp1c7axdpv4gmh2h0sydvyc2dm1vds5k4"; depends=[gdata vsn]; }; NbClust = derive2 { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; }; @@ -2125,6 +2170,7 @@ in with self; { NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; }; Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; }; + OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; }; OBRE = derive2 { name="OBRE"; version="0.1-0"; sha256="1sxfb8mn0ky8x177l3v6wwcr96h5hfwd718h1akwrpir7acldchl"; depends=[pracma]; }; OBsMD = derive2 { name="OBsMD"; version="0.2-0.00"; sha256="16km0v6678lbgh9n2d9nvmpq6k7d2gicc68wnfy4kvn9vmpr79cz"; depends=[Rcpp]; }; OCA = derive2 { name="OCA"; version="0.1"; sha256="0kaf46gic8gp8f98y68kqvgm1baicwgvarfiwry1j0bd2rjad64d"; depends=[]; }; @@ -2154,8 +2200,9 @@ in with self; { OTUtable = derive2 { name="OTUtable"; version="1.1.1"; sha256="0mjjfndc67gzkqskcq4sxpr8fwx3lm3wjgapgg64rbj5x4i1w4rp"; depends=[]; }; OUwie = derive2 { name="OUwie"; version="1.50"; sha256="1gzgwax9kmcr6rl6nv10xn536nbkjhmg6sqax58xxinc00ykdx75"; depends=[ape corHMM corpcor expm lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; }; Oarray = derive2 { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; }; - OasisR = derive2 { name="OasisR"; version="2.0.1"; sha256="0knkq33yf0b5flbkmc5ng4ys4x840rzkfrr26jcp7ri3bqg87lqv"; depends=[birk rgdal rgeos spdep]; }; + OasisR = derive2 { name="OasisR"; version="3.0.0"; sha256="0dk8asv5v0qiqqf45r3hhh67sa03qdkpgsss649mp2pxzm8chv1y"; depends=[measurements outliers rgdal rgeos seg spdep]; }; OceanView = derive2 { name="OceanView"; version="1.0.4"; sha256="072gjbka7ncp5sa463kbi06fjx7nm1ljgzpx4b7ybq9pcwvnyzz6"; depends=[plot3D plot3Drgl rgl shape]; }; + Ohit = derive2 { name="Ohit"; version="1.0.0"; sha256="132d4drc2phw9ppxnczb1ycdg3dv085k8p6bcaj3v866j0hfxjgb"; depends=[]; }; Ohmage = derive2 { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; }; OjaNP = derive2 { name="OjaNP"; version="0.9-9"; sha256="12a7zfrk3rdvfby5qa511w3nk5jpnsd5gg2z46b5s97rxb3qq7za"; depends=[ICS ICSNP Rcpp]; }; OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; }; @@ -2170,7 +2217,7 @@ in with self; { OpenImageR = derive2 { name="OpenImageR"; version="1.0.6"; sha256="0mp79l2yaix4pagvjv41z01arpw2qpx1mzib82vklsbb7g85k1z2"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; }; OpenML = derive2 { name="OpenML"; version="1.6"; sha256="0khcach9myls6nfqm308nvhv8ylzysg2v3aw8l79ajfmdp83s1am"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; }; OpenMPController = derive2 { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; }; - OpenMx = derive2 { name="OpenMx"; version="2.7.16"; sha256="1jpx8z1ql8phh59kvb4jc7pd65b6mxrg61sdk8kx8pkw22qh8fip"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; + OpenMx = derive2 { name="OpenMx"; version="2.7.17"; sha256="0f7x2d9rgb93rlwhjcr0fhgi7bi8f0hjfp4gg8kq8z64cw668qij"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.10"; sha256="0ikw8l9hffcaa094y6pnvyc3ly5jb02djaakz668ba15a0yw0wmb"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; }; OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.3"; sha256="099vdyq0vw9xl5v7zggdb8yd4zl7x8imvvbj5j2f5hrspgg131pz"; depends=[ggplot2 raster rgdal rJava sp]; }; Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; }; @@ -2192,6 +2239,7 @@ in with self; { OutbreakTools = derive2 { name="OutbreakTools"; version="0.1-14"; sha256="03bdb7w5nsrjxz5kd5zvgwybgmv2mzsxyzdc7v3kpwi20yfb9ax8"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; }; OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; }; OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; }; + OutliersO3 = derive2 { name="OutliersO3"; version="0.2.1"; sha256="09kq3jhsqxwqsnn8av12jd0qxw0ai1h0f46mib1z0bwwbxg6bf9h"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers rlist robustbase robustX tidyr]; }; OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; }; P2C2M = derive2 { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; }; @@ -2244,11 +2292,11 @@ in with self; { PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; }; PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; }; PHeval = derive2 { name="PHeval"; version="0.5.3"; sha256="1zq4ks6w5vrhy1f170fv16zgrgi1lfxmkpfkg75sjin7asw4i7a9"; depends=[survival]; }; - PIGE = derive2 { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[ARTP snowfall survival xtable]; }; + PIGE = derive2 { name="PIGE"; version="1.1"; sha256="0pc24rvvxzpgrsx7xsj98n5vd462hjggakzwp36qdkib69yyr4bn"; depends=[ARTP snowfall survival xtable]; }; PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; }; PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; PK = derive2 { name="PK"; version="1.3-3"; sha256="07qxyszj0f7qwrg5ixvciy33mjsfxxi9rk32a1fz46z8wiwfil9i"; depends=[]; }; - PKI = derive2 { name="PKI"; version="0.1-3"; sha256="1xhc84k4iszvfawwwzrwclfs41nvb8bmyygapxmsxjky725s7k1g"; depends=[base64enc]; }; + PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; }; PKNCA = derive2 { name="PKNCA"; version="0.8.1"; sha256="1by2yp1ngqv06w7dfl7lbb80gnmpid4xg1yhk4zvx8bwss0ggzph"; depends=[digest dplyr lattice nlme plyr tidyr]; }; PKPDmisc = derive2 { name="PKPDmisc"; version="2.0.0"; sha256="0rn5m5wak6lis5wck2ws934bzy8w65wj1d0l3rz8svfd8agf2ys8"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; }; PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; @@ -2258,7 +2306,7 @@ in with self; { PLMIX = derive2 { name="PLMIX"; version="1.0"; sha256="1z59z7ynlfh7cskanj7drvry0fpzl5mq52as8adi2zxp2q8q032p"; depends=[abind combinat foreach FSA rcdd Rcpp]; }; PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; }; PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; }; - PLmixed = derive2 { name="PLmixed"; version="0.1.0"; sha256="1xg5zg646ihm7cnpi77hkcvymvix4jagl77ysqi8j27z4jiak9gq"; depends=[lme4 Matrix numDeriv]; }; + PLmixed = derive2 { name="PLmixed"; version="0.1.1"; sha256="1ihhrmhzvbd4mswi227s81wkk42vdps42pnvkaz71p4y9a7d7szf"; depends=[lme4 Matrix numDeriv]; }; PLordprob = derive2 { name="PLordprob"; version="1.0"; sha256="156lvz6vfm68hm32l5nlhq15hfacdla627d6lf8l4g34lwzdh8k8"; depends=[mnormt]; }; PMA = derive2 { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; }; PMCMR = derive2 { name="PMCMR"; version="4.1"; sha256="0mfms8wvdwcakkgsnrb2wawp07hvlr7s6cvl54kxv7f5fqllw5kc"; depends=[]; }; @@ -2270,7 +2318,7 @@ in with self; { PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.1"; sha256="02073yxdwns9mnnjvw13ydw1s3vrxl53szcd9jy8ibj78vnm57r3"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; PRIMME = derive2 { name="PRIMME"; version="2.1-0"; sha256="1sjgy923ppp28qhkvhgv2xmx7b7aqd17g60af1my44ygdsd8c1kw"; depends=[Matrix Rcpp]; }; - PRIMsrc = derive2 { name="PRIMsrc"; version="0.7.3"; sha256="0mppmgg435fjg33pxql67rygyr5nibvcac9q2nxgq9fqyya70gys"; depends=[glmnet Hmisc quantreg superpc survival]; }; + PRIMsrc = derive2 { name="PRIMsrc"; version="0.7.4"; sha256="1g373v404zlwpzjamrwjbl472vyczhdz4fx4m6dczinbajysfcl1"; depends=[glmnet Hmisc quantreg superpc survival]; }; PRISMA = derive2 { name="PRISMA"; version="0.2-6"; sha256="1yzcx4js0xaxp1mp7ginhfz8jji49rkw3x15a9mlmpz260gkfs98"; depends=[ggplot2 gplots Matrix]; }; PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.0.1"; sha256="1qk9cljk52m8rcasck8cl7gwzhcsx0p58jn31izy2j027w0rns7j"; depends=[DiagrammeR]; }; PROFANCY = derive2 { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; }; @@ -2285,8 +2333,10 @@ in with self; { PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; }; PSCBS = derive2 { name="PSCBS"; version="0.63.0"; sha256="0pgha1rvb9nfxkr8fxc17zgws781qwmrl01rss7bd0sf2n2lw2k2"; depends=[aroma_light DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; }; PSF = derive2 { name="PSF"; version="0.4"; sha256="1hjry8vjqr6zk2i2ppf3fcpsr4v4jm1705qv6i1iz2agl6g2rcnp"; depends=[cluster data_table forecast knitr]; }; - PSIMEX = derive2 { name="PSIMEX"; version="1.0"; sha256="0py58x1sqxdas8ny6dqj0x9wcpglyxl6v70wwd68z30w1ppyiq13"; depends=[knitr MCMCglmm pedigree plotrix]; }; + PSIMEX = derive2 { name="PSIMEX"; version="1.1"; sha256="0cndzasvg4y49incyd9nfz8y3z88ywbc7xk0zzjir665pv2xn23b"; depends=[knitr MCMCglmm pedigree plotrix]; }; PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; }; + PSTR = derive2 { name="PSTR"; version="1.1.0"; sha256="1wzbwll5c2qsvngzqycg2zk6dghbr45mk8chj6kzzppmkk7vzj47"; depends=[ggplot2 snowfall tibble]; }; + PSW = derive2 { name="PSW"; version="1.1-1"; sha256="0zrf8daxwxypw2ckr9h9b0xl7m2zbhbssg7bv584m3k3mk6aqwl1"; depends=[gtools Hmisc]; }; PTAk = derive2 { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; }; PTE = derive2 { name="PTE"; version="1.5"; sha256="1wx90b34yrc2rwg6yh2hiivirp1c1357h276jzjc0kzchkkxv4g2"; depends=[doParallel foreach survival]; }; PTXQC = derive2 { name="PTXQC"; version="0.90.0"; sha256="1jcx864skn1p9y7v951grm7n8waby8wkqahhnyb2r51qj3zdlilf"; depends=[data_table ggdendro ggplot2 gridExtra gtable kableExtra knitr plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; }; @@ -2299,6 +2349,11 @@ in with self; { PairViz = derive2 { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; }; PairedData = derive2 { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[ggplot2 gld lattice MASS mvtnorm]; }; PairwiseD = derive2 { name="PairwiseD"; version="0.9.62"; sha256="19qjms99gf7s39nwwgj56n8426d0gw80dipz165sk3km4zb2mcwv"; depends=[openxlsx xlsx]; }; + PakPC2017 = derive2 { name="PakPC2017"; version="0.3.0"; sha256="0cm6yjplc49qkvash9lswf0k6j92m0arwgk51y5xczixhz4xlg2n"; depends=[curl data_table]; }; + PakPMICS2014Ch = derive2 { name="PakPMICS2014Ch"; version="0.1.0"; sha256="0gjrx34613d9wzal292zfzh8hmkav271fqb0skdxd1f8rs2c79dg"; depends=[data_table]; }; + PakPMICS2014HH = derive2 { name="PakPMICS2014HH"; version="0.1.0"; sha256="1n6cyanqafscizgi1xqmc19w59yigxk5mvqinbivpdr7rydhrac6"; depends=[data_table]; }; + PakPMICS2014HL = derive2 { name="PakPMICS2014HL"; version="0.1.0"; sha256="18i5p54zmqxph0lkbgz4ahrbmi2jwhjwdca7aqvx9az18ki5c9sx"; depends=[data_table]; }; + PakPMICS2014Wm = derive2 { name="PakPMICS2014Wm"; version="0.1.0"; sha256="1sczczk07n91c21iqkxz1j1hixrk6p0c30ggahxbmk1cawqfn4cb"; depends=[data_table]; }; PanJen = derive2 { name="PanJen"; version="1.4"; sha256="1b5nsacy4bfda4kbvabddkj2mkl709kbbgwgws2p2sj3zxjv554i"; depends=[mgcv]; }; PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; }; Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; @@ -2332,7 +2387,7 @@ in with self; { Perc = derive2 { name="Perc"; version="0.1.2"; sha256="0p6l4b536jjz4lmgsdrxqsh77lx4vkb6hbyd6vhbc102m5x3b1yc"; depends=[]; }; PerfMeas = derive2 { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; }; PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; }; - PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.1"; sha256="0r14byi2pmgvmpl07dhqq4m00ddfaixnzqd5kgav1gxmsw6bk35l"; depends=[]; }; + PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.2"; sha256="133rwbvapk99dmh3vi8p7sa81d7hjmy0g4a5hcmwr3mdq8jzgwrj"; depends=[]; }; PermAlgo = derive2 { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; }; PersomicsArray = derive2 { name="PersomicsArray"; version="1.0"; sha256="1d5gxd65b01m13rgbdhk6w3l43vqcbdk0s1pbgc8h6cnipj55z0i"; depends=[jpeg raster stringr tiff]; }; PhViD = derive2 { name="PhViD"; version="1.0.8"; sha256="038pw24sb8ja8pbbmj05rww6413i2ljybb2dxwgrpffv22aqawmc"; depends=[LBE MCMCpack]; }; @@ -2343,7 +2398,7 @@ in with self; { PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; }; PhySortR = derive2 { name="PhySortR"; version="1.0.7"; sha256="1xpxkd2bf3xdsfwa0bzkppr6y7p6v7s4iy0x0m8fiwj93n9jh0pz"; depends=[ape phytools]; }; PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; }; - PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.0.1"; sha256="197js49vybrdby0wrpncfis2zi2hfhc24dmk14563gl7gg7v8iwx"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; + PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.1.0"; sha256="0ji78zx0gp1nd5assrmwxdkxryfjijnn9g34w2g2qv32s1fdj6ak"; depends=[ape capushe foreach glmnet grplasso LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; }; PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; }; Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; }; @@ -2389,7 +2444,7 @@ in with self; { PracTools = derive2 { name="PracTools"; version="0.6"; sha256="0y6gqqk2inq96afr50qwv19bwjc0kyvd1jnmacsda2fxgplflzgx"; depends=[]; }; PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; }; PreProcess = derive2 { name="PreProcess"; version="3.1.4"; sha256="0zvy7wx9wfsdcvnjdr1angh0shqwhlm48byc0ymciqlx6xagaw0b"; depends=[oompaBase]; }; - PredPsych = derive2 { name="PredPsych"; version="0.2"; sha256="1fppjwh1g2irxafaaid2y7ln1psii7kx369jbnl63kadmpd36q7p"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; }; + PredPsych = derive2 { name="PredPsych"; version="0.3"; sha256="0bqc2vl32z9wzby7ncrab742cajy4w5kq7wv2gh2jjqdnv9nkia7"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; }; PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; }; PredictTestbench = derive2 { name="PredictTestbench"; version="1.1.3"; sha256="14np4zvr0labhqxzsv07iqzldfxmnsfk91qpfqz7vyiq0vwcymp4"; depends=[forecast ggplot2 imputeTestbench PSF reshape2]; }; PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; @@ -2437,7 +2492,8 @@ in with self; { QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; }; QGglmm = derive2 { name="QGglmm"; version="0.5.1"; sha256="1112w9dwbr9smxa869w4833iw1vclscr1zbjn2f0xklnpn3nb40d"; depends=[mvtnorm R2Cuba]; }; QICD = derive2 { name="QICD"; version="1.2.0"; sha256="0ppyl978y7md2n9m4kwhbrgdr5i3df0yw124x84f53w4acipgz5q"; depends=[]; }; - QNB = derive2 { name="QNB"; version="1.1.9"; sha256="1358h00qnxd0c6yg9dwi1qp7svd9avyvfww1xji95xazfx4ksl59"; depends=[exomePeak GenomicFeatures locfit Rsamtools]; }; + QLearning = derive2 { name="QLearning"; version="0.1.1"; sha256="1bx77yxsnzh0ny3ghala5fw54lxzrxqk9s32qk3dzvfbyp4paggn"; depends=[]; }; + QNB = derive2 { name="QNB"; version="1.1.10"; sha256="12lb0kayndq8gipf457qvk0g9ar0ywaspbffi7s3hvh98gmlzws6"; depends=[exomePeak GenomicFeatures locfit Rsamtools]; }; QPBoot = derive2 { name="QPBoot"; version="0.2"; sha256="1nxmxayfq2xcjzix080mkc8y52wl3vs0rcwdl8lmhwfawjb4pap5"; depends=[abind quantspec rugarch]; }; QPot = derive2 { name="QPot"; version="1.1"; sha256="1ivkk5wdd1lp6v4hwmpr9g230kd7zgmj0vnv5fw0svwpb8zzz14x"; depends=[MASS]; }; QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; }; @@ -2456,7 +2512,7 @@ in with self; { QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; }; Quandl = derive2 { name="Quandl"; version="2.8.0"; sha256="0n1c4343ki8nia7qrq2m9zb7b05qr3yjwvk1ji7m44sa613w6y5l"; depends=[httr jsonlite xts zoo]; }; QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; - QuantTools = derive2 { name="QuantTools"; version="0.5.5"; sha256="1jkfnjndbr0hhrsl9cg7llc4y9v3g6s01i034wz22lkhvg3jszy4"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; }; + QuantTools = derive2 { name="QuantTools"; version="0.5.6"; sha256="0ykfxrg4chq4n24spfj2v6cqiw5y7wps2rmnd0150fa6fqk7nd2k"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; }; QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; }; QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; }; QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.4"; sha256="1dqibl4rnf1qbk44srh8ndka0ni7a463hlpf7sdpgx2b57414jkd"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; }; @@ -2478,10 +2534,10 @@ in with self; { R2G2 = derive2 { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; }; R2GUESS = derive2 { name="R2GUESS"; version="1.7"; sha256="07w54r5r9v7pa8aklmwbwdcc57j3a3b46b1a7mwmzcl11mcfwdph"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; }; - R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-4"; sha256="0ycjqkxjgqlhyn82zadlsqwcc5r2sm5wh3y4pl3xkppmwm131f0s"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc rbugs texreg]; }; + R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-5"; sha256="09p8xrxhcf6biy1mffv31p2hlr19s51f3n67az52f3xv5lyp9wm8"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc rbugs texreg]; }; R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2"; sha256="1cxr93g0fkdv3lqdh63l2gcp7qn3q42pm1r6nzf35550k9ahkhnv"; depends=[boot coda]; }; R2STATS = derive2 { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[cairoDevice gWidgets gWidgetsRGtk2 lattice latticeExtra lme4 MASS Matrix proto RGtk2Extras statmod]; }; - R2SWF = derive2 { name="R2SWF"; version="0.9-1"; sha256="0xhq4dyi1mj4n38zylgi6d17d5wp402wm3kic05vgssg4pyfda2d"; depends=[sysfonts]; }; + R2SWF = derive2 { name="R2SWF"; version="0.9-2"; sha256="1f7bj2jqm7ys3rimgpsn252j39mw0xd008p3zqi77x1flisla0z3"; depends=[sysfonts]; }; R2WinBUGS = derive2 { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; }; R2admb = derive2 { name="R2admb"; version="0.7.15"; sha256="1v01fbcc7hx6mswn4gkwpm6k171956wk51ls6sgca1i6ia6ckmli"; depends=[coda lattice]; }; R2jags = derive2 { name="R2jags"; version="0.5-7"; sha256="0h1d27cddyacx5m5f23rlki97iwni7clffmb2k7a4bznlnjhn50a"; depends=[abind coda R2WinBUGS rjags]; }; @@ -2505,13 +2561,13 @@ in with self; { RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; }; RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; }; RATest = derive2 { name="RATest"; version="0.1.0"; sha256="1pi082iydl6k6l78gpvff5hfk4y7fr82vnhnp28dw215hi0x3891"; depends=[ggplot2 gridExtra quantreg]; }; - RAdwords = derive2 { name="RAdwords"; version="0.1.12"; sha256="0g2lbrqqh3azyc2xlafgqnd1langjg8xhma1njjcd3jn7q21mhnk"; depends=[RCurl rjson]; }; + RAdwords = derive2 { name="RAdwords"; version="0.1.13"; sha256="0zpryvrrbmwd5mnn2wifbfmy26kmf6rpjsqvif8s17sjqqyh7ynj"; depends=[RCurl rjson]; }; RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.3"; sha256="0g5sdq6sl7cvsj9fgqhcdxjkrfi53078r0mbzvf69cvz38y5x3sm"; depends=[]; }; RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; RAppArmor = derive2 { name="RAppArmor"; version="2.0.2"; sha256="18zmqqh4rnbnaiwi60jfp4xi8fp63ydr3jk9w4ijmy6s4hkpp75g"; depends=[]; }; RArcInfo = derive2 { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; }; RAtmosphere = derive2 { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; }; - RBMRB = derive2 { name="RBMRB"; version="2.0.4"; sha256="0l6w3j4dykxd5r3h3qj7hsz77657bhif7qk020hvmcg17jszr9a2"; depends=[data_table ggplot2 httr plotly rjson]; }; + RBMRB = derive2 { name="RBMRB"; version="2.1.0"; sha256="09zhx06m7513w4srxkv0bmskm21m33zd28mscgzgma4ifbyxr55h"; depends=[data_table ggplot2 httr plotly rjson]; }; RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; RBesT = derive2 { name="RBesT"; version="1.2-3"; sha256="1d6m3r8amcw9rvivzgxgvsqjxq3xq78z2s29f20r6dxfl7wl7d99"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 lme4 mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; }; @@ -2529,8 +2585,8 @@ in with self; { RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; RCurl = derive2 { name="RCurl"; version="1.95-4.8"; sha256="1yrbm8sypizy18qxkl6534fk2gf2ijxhahw6qldk9v5v3cjl68p7"; depends=[bitops]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; - RDML = derive2 { name="RDML"; version="0.9-7"; sha256="03rh1ji473jj7sg53vr73lr9557wd9s3y7cn6450mjgalf9zfh7k"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; - RDS = derive2 { name="RDS"; version="0.7-8"; sha256="0lxnb6zd5lphs9d42pfdzx607w7iz1mpj3z8pb2ri3s4h011g1vn"; depends=[ggplot2 gridExtra igraph reshape2 scales]; }; + RDML = derive2 { name="RDML"; version="0.9-9"; sha256="0amlr7mxp7175a7rd3jw7lhyvp3lnr01y81l27sl148sfb85zar6"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; + RDS = derive2 { name="RDS"; version="0.8-0"; sha256="1waqrnr3hlr1zyvs8qh14dmq8ax2nghnkvz6gs32dbvlirl7zmxk"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales]; }; RDSTK = derive2 { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; }; RDStreeboot = derive2 { name="RDStreeboot"; version="1.0"; sha256="10ry8rna450j389cplvyvgwljxa8lli7licwdin64b1kyzy2cdn7"; depends=[]; }; RDataCanvas = derive2 { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; }; @@ -2568,10 +2624,11 @@ in with self; { RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2"; sha256="1w28yfzk3ilbz1r9fsc76cigyrnzzhsfm3a81ff8g26za7cb8vjp"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; + RGeode = derive2 { name="RGeode"; version="0.1.0"; sha256="1g8ha6zg4pvi8qimiihsa6rjfdcyj0q526l44jajjbqczmwg59lv"; depends=[MASS Rcpp]; }; RGoogleAnalytics = derive2 { name="RGoogleAnalytics"; version="0.1.1"; sha256="1049fyxl00izw92rm508p90asjp0agmv38b00yfbmasfzsp1r00s"; depends=[httr lubridate]; }; RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; }; RGoogleFit = derive2 { name="RGoogleFit"; version="0.3.1"; sha256="0g4r5vb9zv6mqym1mh028ic9hkmlpklrhq4ks5sys7y60ps893k1"; depends=[bit64 httr jsonlite RCurl]; }; - RGraphM = derive2 { name="RGraphM"; version="0.1.9"; sha256="1rba0vymw0vgkd9wv4dfx1l8lja73sfjpdvqk2ggiaqcii12z2xh"; depends=[Rcpp RcppGSL]; }; + RGraphM = derive2 { name="RGraphM"; version="0.1.11"; sha256="0fj1ww4q3gl707id2qv4c2aw9cdbnhxxi6x6a72r3d0bbb0yl8l9"; depends=[Rcpp RcppGSL]; }; RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; }; RGtk2 = derive2 { name="RGtk2"; version="2.20.33"; sha256="0d5r0lrkk1ixhln94pm6d5d88bqs0h8p2sdczb7r7ah007ffmhic"; depends=[]; }; RGtk2Extras = derive2 { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; }; @@ -2638,7 +2695,7 @@ in with self; { RNetCDF = derive2 { name="RNetCDF"; version="1.8-2"; sha256="0pn45z1bj777nkfglvwwhpji8vz39sd51yszfa5g6rqxiw1a7y5d"; depends=[]; }; RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; }; RNewsflow = derive2 { name="RNewsflow"; version="1.0.1"; sha256="1vxzcsiapnq8101iq4w73m9k8cq2khgcsxak71x72n295r7qpsd6"; depends=[data_table igraph Matrix plyr scales slam tm wordcloud]; }; - RNifti = derive2 { name="RNifti"; version="0.7.0"; sha256="1c2diwcd6rsscw3nhvkv745rcrj5xpwf3rcsxy99nsmdgwl3zbk5"; depends=[Rcpp]; }; + RNifti = derive2 { name="RNifti"; version="0.7.1"; sha256="0ysr967qqid84vh6q13z045lqpi15d4pmicx59qmvfpsdpy0dz6w"; depends=[Rcpp]; }; RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.0"; sha256="0a820m1f4j8d6xwpkmk1n6g73zycrygrxzs3c4fx09kfsbc0v0rk"; depends=[ore Rcpp RcppEigen RNifti]; }; ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; }; ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; }; @@ -2654,7 +2711,7 @@ in with self; { ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="0.0-1"; sha256="1viqr0dqza9386m9xmfdm5riaczp4izf3bd2jk70cmdgypjj6mzg"; depends=[R_utils Rglpk ROI]; }; ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.0"; sha256="13ai7zkd00a03vyzfy1sm64cx8328xzwz5v8yw0shkdz5rchaq2d"; depends=[ROI]; }; ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="0.2-5"; sha256="0hd5v0n9pa3a02hhlknj4xa2h1y4p8132i6wky7v5h2gls6prqwl"; depends=[alabama ROI]; }; - ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.3"; sha256="1wkik3142w9abphgyl3zp40by26wzw75lx7s9ad9ppkhyzwmmsn8"; depends=[clpAPI Matrix ROI slam]; }; + ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.4"; sha256="0fzrb4q2mcf3j4d4j8r354n6fyv2rik0ypp01l54zbm8s2r29bwb"; depends=[clpAPI Matrix ROI slam]; }; ROI_plugin_cplex = derive2 { name="ROI.plugin.cplex"; version="0.2-5"; sha256="028w9hzj1ynrsqslb89dxkkivdsi1c4cvvhgvmjz0rnxy9qxz57j"; depends=[Rcplex ROI slam]; }; ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="0.2-5"; sha256="1h2pcxjhwfvrrjrmjf4wl87pfhdbwirjwblpcyvj1hrhcks56y4y"; depends=[ECOSolveR Matrix ROI slam]; }; ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="0.2-5"; sha256="1n9n5rzbhcwc0gzbdqadk41d6j8ysyzsjld87y9l06c3dchiwkz8"; depends=[Rglpk ROI]; }; @@ -2675,6 +2732,7 @@ in with self; { ROptEst = derive2 { name="ROptEst"; version="1.0.1"; sha256="0160xs3bmk1bdan7gkibc50qfzxlmi413grvs0bib74xlr0x2kgj"; depends=[distr distrEx distrMod RandVar RobAStBase startupmsg]; }; ROptEstOld = derive2 { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx evd RandVar]; }; ROptRegTS = derive2 { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[distr distrEx RandVar ROptEstOld]; }; + ROptSpace = derive2 { name="ROptSpace"; version="0.1.1"; sha256="01n99hsph4p4hvh9wimh7p3g38ww1bcdh6v4rd1hj18964v166a2"; depends=[]; }; ROptimizely = derive2 { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; }; ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; }; RPANDA = derive2 { name="RPANDA"; version="1.3"; sha256="0rah5l5nfjs65zxgsgsy3q3vaph6qkr7p41x3arfhjsyma96p0zn"; depends=[ape BioGeoBEARS cluster corpcor deSolve fpc igraph mvMORPH mvtnorm phytools picante pspline pvclust TESS]; }; @@ -2700,7 +2758,7 @@ in with self; { RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; }; RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; }; RRreg = derive2 { name="RRreg"; version="0.6.2"; sha256="0cm1r34hqdil3d27670q6a5iixh3lg8r4rzam6mq4zf2fqiwdpb9"; depends=[doParallel foreach lme4]; }; - RSA = derive2 { name="RSA"; version="0.9.10"; sha256="0m9gd1h9ghj6gfwixwy8hhc2625f9mi473zp55zdl5w2q10qk3ij"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; }; + RSA = derive2 { name="RSA"; version="0.9.11"; sha256="1hsjy755r78my6ib9s9da7mibcjxd5svh2kq0v7a466m60cyfrss"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; }; RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; RSAGA = derive2 { name="RSAGA"; version="0.94-5"; sha256="0lbvy1p6wcxnn70149wcpmfy2ijk6g37ka452dxm0w0zpg0zga1w"; depends=[gstat plyr shapefiles]; }; RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; }; @@ -2726,14 +2784,14 @@ in with self; { RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; }; RSelenium = derive2 { name="RSelenium"; version="1.7.1"; sha256="04ghck76jh7w6kgzdszkzjwj9fhyngq13mf9iybavxph5wcy7xgq"; depends=[binman caTools httr openssl wdman XML]; }; RSentiment = derive2 { name="RSentiment"; version="2.2"; sha256="0a4i9mpffmblgzj6qh4kg2x2cv9s93b1pgpfd0z6dh8czdzkdd8j"; depends=[NLP openNLP plyr stringr]; }; - RSiena = derive2 { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; }; + RSiena = derive2 { name="RSiena"; version="1.2-3"; sha256="125qkh8j42zm8r4acxw20m6ylq6vksja3qz6zxyyvfd3l2vqb2gy"; depends=[lattice MASS Matrix]; }; RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.13"; sha256="03993xck4274r6sxkzxlzcvwviafdb3d7icfn6f0xin4cnj6ry4m"; depends=[base64enc digest httr jsonlite plyr stringr]; }; RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.2"; sha256="0phkk79ng4r54w3d4ajl505gs8svlzdf1g6q50lhraq2cbllbvgx"; depends=[RCurl]; }; RSocrata = derive2 { name="RSocrata"; version="1.7.3-2"; sha256="17c5g8k5r60h6cgs2383fhi09lnm3kjm3pll4ma66ypjfbffzdpn"; depends=[httr jsonlite mime plyr]; }; RSpectra = derive2 { name="RSpectra"; version="0.12-0"; sha256="0aa33mhzj03gznpza5l5qj94s45imfhrgx52bsa8rq00f93fgaf0"; depends=[Matrix Rcpp RcppEigen]; }; RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; }; RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; }; - RStoolbox = derive2 { name="RStoolbox"; version="0.1.8"; sha256="1q2gahx8a9dgj8bxhrgl1k2ky5qba1rrrfyszx826mpnlzv72psd"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgeos sp XML]; }; + RStoolbox = derive2 { name="RStoolbox"; version="0.1.9"; sha256="0gra980cmv9xw2dzpqk9vfr78n03i8zcv9pbzmvkjb3x8ln8288h"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; }; RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; }; RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; }; RSurveillance = derive2 { name="RSurveillance"; version="0.2.0"; sha256="1lvl9msnd8l9svd9nyivx1cqfmcxirxvfjfj0xv7yjklza8af7w3"; depends=[epiR epitools mc2d]; }; @@ -2742,7 +2800,7 @@ in with self; { RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; RTDE = derive2 { name="RTDE"; version="0.2-0"; sha256="1dj7dsj4256z9m70y2fpcgprxpqbgqxz0dqwn0jl80sj2325f66s"; depends=[]; }; RTOMO = derive2 { name="RTOMO"; version="1.1-5"; sha256="0wnxmzad2q5cpnqmglqh92clsk2c8fngd3gzh8f91alpj6nz69jp"; depends=[GEOmap RPMG RSEIS splancs]; }; - RTaxometrics = derive2 { name="RTaxometrics"; version="2.2"; sha256="0zjpgnxh5mqr4h6v2dw9g6zbrsrdlxzcpc7fx7yakqncwf6gd8b7"; depends=[]; }; + RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; depends=[]; }; RTextTools = derive2 { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[caTools e1071 glmnet ipred maxent nnet randomForest SparseM tau tm tree]; }; RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; RTransProb = derive2 { name="RTransProb"; version="0.1.0"; sha256="0q5fyf176pzjjdpyc5wpakpfnp48ckcpcparf6n99js2xgxc725g"; depends=[chron e1071 expm matrixStats nnet pracma zoo]; }; @@ -2796,19 +2854,19 @@ in with self; { Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; }; RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; }; Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; }; - RcextTools = derive2 { name="RcextTools"; version="0.1.0"; sha256="1pr22bb6vy6fzlmn27nm9m491v32s9dc3pvghdzy4xccq4hqa58q"; depends=[data_table igraph sqldf]; }; + RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; }; Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; RchivalTag = derive2 { name="RchivalTag"; version="0.0.5"; sha256="03zjw60kjgqfyaaic097fzi72l7sw6cg1236lj3awfqw9z6dfb56"; depends=[akima mapdata maps maptools ncdf4 oceanmap PBSmapping plyr raster rgeos sp]; }; Rchoice = derive2 { name="Rchoice"; version="0.3-1"; sha256="1mx50270vbhvng4vdcc6w94f3l890vjl41y07bqkv40n93fxvffw"; depends=[Formula maxLik msm plm plotrix]; }; Rclusterpp = derive2 { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; }; - Rcmdr = derive2 { name="Rcmdr"; version="2.3-2"; sha256="07p22b6kbx2md6h911jzgiin2rds76aizn9d7nd6l4lxp8a76c09"; depends=[abind car RcmdrMisc relimp tcltk2]; }; - RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-5"; sha256="11y53wzxflpyq6p187yihs0xpa9nv2rkqhzl70k0mrchvv625bcr"; depends=[abind car colorspace e1071 Hmisc MASS readxl sandwich]; }; + Rcmdr = derive2 { name="Rcmdr"; version="2.4-0"; sha256="0wb2ai48xy67c7pw7k8wx2bn9zxkk8asdsg2rjgw2sh9nrc6kia7"; depends=[abind car effects RcmdrMisc relimp tcltk2]; }; + RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-6"; sha256="1afz5j96m1cyiwnbwsndkqhbn986bdbznzd2z64cygnqhb04gs70"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; }; RcmdrPlugin_BCA = derive2 { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; }; RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; }; RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; }; RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; }; RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; }; - RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.35"; sha256="1lppf84s9ymdmbyx6p7f2vvkrg7gbap5rf2yf759l0bqjcx954a7"; depends=[Rcmdr]; }; + RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.36"; sha256="0yj9z9x185p4kqn10hm6mrl6i64dwyaaywzlmbgzd51m1112fp6r"; depends=[Rcmdr]; }; RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="1.0"; sha256="0q879wnrmgbaddv883q9zdnp0i7kjcgn8cffv7lp8nrsqil6l7mc"; depends=[EcoVirtual Rcmdr]; }; RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; }; RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.6-0"; sha256="07k9x3mdaqzk1503wjsha9f8bxzw1074i9g7sa16yqz5lwky4lr7"; depends=[FactoMineR Rcmdr]; }; @@ -2844,39 +2902,40 @@ in with self; { RcmdrPlugin_sos = derive2 { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; }; RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; }; RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.1-1"; sha256="0hgf52pk81wii2jfw69csapm4gw7xrp1cm08b9n2d29chgw0gww6"; depends=[date Rcmdr survival]; }; + RcmdrPlugin_sutteForecastR = derive2 { name="RcmdrPlugin.sutteForecastR"; version="1.0.0"; sha256="1np42kizkk572vharki84ka34lr7bdlckn4227bnq2l37c0zsq5y"; depends=[Rcmdr sutteForecastR]; }; RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.9"; sha256="0nacpipaimb1348rhv1rma85gnd38wsg741pz7xpvn347wnnc0wz"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; }; Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; }; Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; }; Rcpp = derive2 { name="Rcpp"; version="0.12.12"; sha256="1byyqvlgb2p46p1gv243k73rk69fa8pa4l5m5asmckag2pkb2glz"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.4"; sha256="0xbaamv3bg08ymbmiq6kwh86p17y6qzgydq02syig2a3ykp0042c"; depends=[Rcpp]; }; - RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.8"; sha256="14hw9nrqwcqx2xwam03wfxk07qg648gp0cnk76c4knpr6pmad9sx"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.7.960.1.1"; sha256="0m2c5lb4k3y1xp4bgvy1y5llci0nryyxnlv1nwl9pb1knl9p141a"; depends=[Rcpp]; }; + RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.10"; sha256="08s86ak26zybawry6l6l30k1lakc71k2j58539h70dnrmsd15jna"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.7.960.1.2"; sha256="0kg8vbamaz3413h283f23hzgqkmfpf6fs0vbklmpj0l3ricvp9cc"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; RcppBlaze = derive2 { name="RcppBlaze"; version="0.1.1"; sha256="0r6mzsm2gq77i8cylcvgg7hn0399d3v11wlf89v559vslkv2b2m0"; depends=[BH Matrix Rcpp]; }; RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.3"; sha256="0cb04filbr0mymcg891lc0dw2b3fnjmhn8z50xcilb3v72ccrvqg"; depends=[Rcpp]; }; - RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.6"; sha256="0j2sj1yzpqmw6krjfyjklw4pmkdqdsnyvlfqbic0w1h8gs1mq6yb"; depends=[Rcpp]; }; - RcppClassic = derive2 { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp]; }; + RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.7"; sha256="10i9gjkq7grr7s24x62nji87zikabjx0pfrrp6jvm6nbmaxcb8yj"; depends=[Rcpp]; }; + RcppClassic = derive2 { name="RcppClassic"; version="0.9.8"; sha256="1yijzkznn5w883idx8fq5ibw1ag12sswhj98ywflc9nb8q44f9d9"; depends=[Rcpp]; }; RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; }; RcppDE = derive2 { name="RcppDE"; version="0.1.5"; sha256="1zgz8h7d7jjml9hm164y9wrsgcb1fymp3ipxp235fmk44lbrwpcw"; depends=[Rcpp RcppArmadillo]; }; RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; }; RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.3.0"; sha256="0zz9v0f8nnlvhhqv91lkyfblvjnmav84l89mr6vmbqjc2hzqd3n8"; depends=[Matrix Rcpp]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.8"; sha256="15iw2vx6ygb03siq743418whhqvfrxk2i4nqn7p9yg1m3jwafxna"; depends=[Rcpp]; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; }; - RcppGSL = derive2 { name="RcppGSL"; version="0.3.2"; sha256="0fg13va124shkyy6g1fwblld1r4vdgxscab64kszyjivkjsb2lw1"; depends=[Rcpp]; }; + RcppGSL = derive2 { name="RcppGSL"; version="0.3.3"; sha256="0ih6lcby6rx0pkzwnd4bxq40cxa3cw9nfrphhhm9q71ng5vj1vrr"; depends=[Rcpp]; }; RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.2"; sha256="0z5sg2jlr465196ws2pqi7j7hfmd7j8xlqqj6841m635cg4q48ba"; depends=[Rcpp]; }; - RcppHMM = derive2 { name="RcppHMM"; version="1.0.1"; sha256="10ssg2558s6cw6f6adzpw76qcsizbllc70y1s8vbhb2xkc26d1cn"; depends=[Rcpp]; }; + RcppHMM = derive2 { name="RcppHMM"; version="1.2"; sha256="0i3n4lca6rbi4lfyv65y6i6xaxb0mzcv999vccl38zhdg42sf1vk"; depends=[Rcpp RcppArmadillo]; }; RcppHoney = derive2 { name="RcppHoney"; version="0.1.6"; sha256="1llbs6x4qcvgnlmnd391s1j9lqvybnnq3d4gjwyyc8vy2i5jr28c"; depends=[Rcpp]; }; RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; }; - RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.1.1"; sha256="05kk3yd52zk9hn1jzii4hbrxcy3ak0rr189pqjcyrsfqrxxq87nw"; depends=[Rcpp]; }; + RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.0"; sha256="1q5r4sj3rqs5xdxsmpzcxzs3jyx36siawz6j4ghc37mjb04rrdrl"; depends=[BH Rcpp]; }; RcppNumerical = derive2 { name="RcppNumerical"; version="0.3-1"; sha256="1b88iz0f13w148jrmd3qdkagycs7w3yr82y4zgn123kp17y7vvny"; depends=[Rcpp RcppEigen]; }; RcppOctave = derive2 { name="RcppOctave"; version="0.18.1"; sha256="1b2mwnsx799a86hdpkqy6l1m048g8hqz57l70siybkxnlaib3z0f"; depends=[digest pkgmaker Rcpp stringr]; }; RcppParallel = derive2 { name="RcppParallel"; version="4.3.20"; sha256="1hc325hj214s61694iy4j3ly5zkya25h92hki29n3562qiirpb0g"; depends=[BH]; }; RcppProgress = derive2 { name="RcppProgress"; version="0.3"; sha256="0796g11w7iv3ix1wfm3fh09qq7jki4r4cp1mjagq77igri3xrr9x"; depends=[Rcpp]; }; RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.1"; sha256="0c4kb6jnhsnha6139nj9kifg4yb5glj7azs0xwch5052bnl7xhyp"; depends=[BH Rcpp]; }; - RcppRedis = derive2 { name="RcppRedis"; version="0.1.7"; sha256="0x456zrd7qv8iclhdbgl4bwa1bvpirlqx6ywsincj6y0446f13rz"; depends=[BH RApiSerialize Rcpp]; }; + RcppRedis = derive2 { name="RcppRedis"; version="0.1.8"; sha256="05c4c65ayiqyzmkj2mrgwwflgjk54rf9nmb3rhickj16yy9b071q"; depends=[BH RApiSerialize Rcpp]; }; RcppRoll = derive2 { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; }; - RcppSMC = derive2 { name="RcppSMC"; version="0.1.5"; sha256="0vzibl1ck0cxl9nzx2829ikxvp2bcndq7h0agzr53i089168rr8s"; depends=[Rcpp]; }; + RcppSMC = derive2 { name="RcppSMC"; version="0.2.0"; sha256="063ds546hd5dfsickiawm5c92sw2kb6n79fqz4gy4hvnbkf00q84"; depends=[Rcpp RcppArmadillo]; }; RcppShark = derive2 { name="RcppShark"; version="3.1.1"; sha256="0dy6zksxcsbzjyz0f147rk2amwjsrjdcyl6jn767pw9ij9vdzh6r"; depends=[BH checkmate Rcpp]; }; RcppStreams = derive2 { name="RcppStreams"; version="0.1.1"; sha256="0sa0ndnfm89f8lh3ba6jf3gxaan1g97dhlzbmpkwqj22frgggqjw"; depends=[BH Rcpp]; }; RcppTN = derive2 { name="RcppTN"; version="0.2-1"; sha256="09ssggx66b3cyjh7mlc73lax2nfw7agfiph090w1qblaam9jz8sy"; depends=[Rcpp]; }; @@ -2891,6 +2950,7 @@ in with self; { Rd2md = derive2 { name="Rd2md"; version="0.0.2"; sha256="07j1nnsk5nyl8kvgvh9f684g6bhc01jiq1fcmq2pnpx57jdzfbpi"; depends=[knitr]; }; Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.6.2"; sha256="1hkqy97mh68yzkh4bawjrgf1rlhkh3jz2ky84rg3wgz1mkvrrsx2"; depends=[formatR roxygen2]; }; Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; }; + Rdimtools = derive2 { name="Rdimtools"; version="0.1.1"; sha256="0ivap8c71c0gja11k72sl4ma4ka73l8dbm3i802b78rikjn9r8m2"; depends=[Rcpp RcppArmadillo Rcsdp Rtsne]; }; Rdistance = derive2 { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; }; Rdpack = derive2 { name="Rdpack"; version="0.4-21"; sha256="15i2xby0jys9pxyy8c19najxyh98mbsw7pll14p69rfsx8s07kbn"; depends=[bibtex gbRd]; }; Rdrools = derive2 { name="Rdrools"; version="1.0.2"; sha256="1xn46lp6kgj6bns5nwjx4s8a3iif1g38iwf58hsrbqjhyygqvdzv"; depends=[Rdroolsjars rJava]; }; @@ -2899,7 +2959,7 @@ in with self; { Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; }; Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; }; ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; - ReIns = derive2 { name="ReIns"; version="1.0.4"; sha256="1dyj95grwwb2nd0xa3631h3ahqi9zw08jr406aq8hq51wd4aq054"; depends=[doParallel foreach Rcpp survival]; }; + ReIns = derive2 { name="ReIns"; version="1.0.5"; sha256="1p6m3xkkhh2jj8h2lphwirk9zzbjv4gvag2bpypan8c6cic8rd9a"; depends=[doParallel foreach Rcpp survival]; }; ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; }; RealVAMS = derive2 { name="RealVAMS"; version="0.4-0"; sha256="1byh7in3bpfgdwfxp15334h167bvrcfj0cdswqy3yd81l9g2ickn"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; @@ -2930,7 +2990,7 @@ in with self; { RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; - Rfast = derive2 { name="Rfast"; version="1.8.2"; sha256="1nfdcph66d3kb8gjq5ik5lf1g0m5j87zjhwq8f3ma16w1h3cm487"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; + Rfast = derive2 { name="Rfast"; version="1.8.4"; sha256="1x63bndlcvjyndqmd2n7jf2bmp317rpnxldd4y3dw5xdqvgj8pgb"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; }; Rfmtool = derive2 { name="Rfmtool"; version="1.2"; sha256="1q359574fspwxy1lmlzfqk0cg3qih8jzh3rk74qr22jw0sp7bcyw"; depends=[]; }; Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; }; @@ -2943,6 +3003,7 @@ in with self; { RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.15-148"; sha256="1carylfz9gafradbdyg7fz2bypr7n72fbm8vhyiinmp0k4s5ipvc"; depends=[]; }; RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; }; Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; + Rilostat = derive2 { name="Rilostat"; version="0.2"; sha256="1ziy0g2piz4z37gnl0xdi486ig6p9b39v0qyiwcbdn03srizbj3a"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; }; Rip46 = derive2 { name="Rip46"; version="1.0.2"; sha256="0wfp6fm5mgmjqjkn0c5hvjd95yn4zcv0s8xc5294qf5jqxp8b1w7"; depends=[Rcpp]; }; Risk = derive2 { name="Risk"; version="1.0"; sha256="1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg"; depends=[]; }; RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.1"; sha256="1kn0vb4nhm3bxlmk5y2nl5m7a7hdvz3nz0yp8rdigpl6b2dp79w1"; depends=[MASS nloptr quadprog]; }; @@ -2968,7 +3029,7 @@ in with self; { RnavGraph = derive2 { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[graph rgl scagnostics]; }; RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; }; RndTexExams = derive2 { name="RndTexExams"; version="1.4"; sha256="18zmdfq234k4bjj5rz6zjlkiyndbj5v2irjfl3w66vz38lk8sf6v"; depends=[CopyDetect data_table stringi stringr]; }; - Rnightlights = derive2 { name="Rnightlights"; version="0.1.1"; sha256="0k5pc6jd249n333w0nwlp64ah0823is9ryw1yfdibvhh2a8fxfgk"; depends=[cleangeo data_table doParallel dplyr foreach gdalUtils lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings sp stringr xml2]; }; + Rnightlights = derive2 { name="Rnightlights"; version="0.1.2"; sha256="15jpb4rpnw4pm58101hvb7i981cwgzagp89qpvgfys9fcjlj7zxy"; depends=[cleangeo data_table doParallel dplyr foreach gdalUtils lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings sp stringr xml2]; }; RobAStBase = derive2 { name="RobAStBase"; version="1.0.1"; sha256="17vfi0ia3z3s6x7frjk1alcgb0h73gwxy2n11kfl0k8w2fxgk49l"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; RobAStRDA = derive2 { name="RobAStRDA"; version="1.0.2"; sha256="1lyp2y38jnwv8ggrv9pdzprpf2gs62w1mpzwcqcbrmy7fzjsym0b"; depends=[]; }; RobLox = derive2 { name="RobLox"; version="1.0"; sha256="0y193xai0mfwpm6zhxgy21h4yrlqrpvwx84bj4xnr8ql87wznh7q"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; }; @@ -2987,7 +3048,7 @@ in with self; { Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; }; RoughSetKnowledgeReduction = derive2 { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; }; RoughSets = derive2 { name="RoughSets"; version="1.3-0"; sha256="08yz19ngipqpzfam6ivwsfnbg8ps2wwyi6djprmd7kfj0n43ab62"; depends=[Rcpp]; }; - Rpdb = derive2 { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; }; + Rpdb = derive2 { name="Rpdb"; version="2.3"; sha256="0zy5f7bli6ppc9giwf8845mzjcv54r2sqb8hxwgbn9k6rjlszgi8"; depends=[rgl]; }; RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; }; Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; Rphylopars = derive2 { name="Rphylopars"; version="0.2.9"; sha256="19y0j5vh82sa9jigylxhv0s0hgjyhx3xq4blvk55jhpj8v7iyiky"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; }; @@ -2995,7 +3056,7 @@ in with self; { Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; }; Rramas = derive2 { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; }; Rrdrand = derive2 { name="Rrdrand"; version="0.1-14"; sha256="18ry07pi9iwskbxcimvp91fgpvrlaf44z0hp7k90dnyaa8qpbwjx"; depends=[]; }; - Rsampletrees = derive2 { name="Rsampletrees"; version="1.0"; sha256="1qq7z7wxb933wvy62zz2vxmpiz0441v01ravhkrmz70ppq5jnlpn"; depends=[ape haplo_stats Rcpp]; }; + Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.1"; sha256="1npv854iasvnrx51vgpda356dqwg7lgnx0d1lm174a0423cj3kmh"; depends=[ape haplo_stats Rcpp]; }; Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; }; Rserve = derive2 { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; }; RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.3"; sha256="0jlzrs9xxlpazvq3iw8znk0bd00bzlry7bgxsxq7xl23akizj0ji"; depends=[fields jpeg RANN]; }; @@ -3016,7 +3077,7 @@ in with self; { Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; }; Runuran = derive2 { name="Runuran"; version="0.23.0"; sha256="1qkml3n0h1z59085spla0ry1wl42c1ljg9nh2sxv6mnhxygm6aq1"; depends=[]; }; RunuranGUI = derive2 { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[cairoDevice gWidgets gWidgetsRGtk2 Runuran rvgtest]; }; - Rvcg = derive2 { name="Rvcg"; version="0.16"; sha256="0629fl4bq15mcb9kxiqsgllqgygxx0xn50849akx0rn72y7jp5v0"; depends=[Rcpp RcppArmadillo RcppEigen]; }; + Rvcg = derive2 { name="Rvcg"; version="0.17"; sha256="0ssmi8mqmq82qrw0hzrmfqpwnkxwdlfa6j049r4l3gn28cfqhg1j"; depends=[Rcpp RcppArmadillo RcppEigen]; }; Rvmmin = derive2 { name="Rvmmin"; version="2017-7.18"; sha256="14jzwqwi1zd8sg1vb18hgvbvsax38hdqjy540qqhn2xb4z8qx3hy"; depends=[optextras]; }; Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; Rwave = derive2 { name="Rwave"; version="2.4-5"; sha256="1q80759382yig5gmjd83qafavhbbh7bbbgil8qha91xfs27m45br"; depends=[]; }; @@ -3058,6 +3119,7 @@ in with self; { SCI = derive2 { name="SCI"; version="1.0-2"; sha256="1jvzkdv15ifgf6a3zjfzzcgw2y2vg0wp7yhiamiaqp8xkm142w49"; depends=[fitdistrplus lmomco]; }; SCMA = derive2 { name="SCMA"; version="1.2"; sha256="0z4f8p1d0ry35g5a13blc8w73vid7nwdn2w9d3i0nfb05fj7i5qf"; depends=[]; }; SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; + SCORPIUS = derive2 { name="SCORPIUS"; version="1.0"; sha256="1ipqscj20qkqik5gsiramsv18ld4k5g9w0gllf1izjimrlrnqc6n"; depends=[dplyr fitdistrplus ggplot2 magrittr MASS mclust pbapply pheatmap princurve purrr ranger RColorBrewer Rcpp reshape2 testthat tidyr TSP]; }; SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; }; SCRT = derive2 { name="SCRT"; version="1.2.1"; sha256="09d9ghviskg1ifjgqcgdlcp1p3w09bpkixvbxqr4354rq31kwf21"; depends=[]; }; SCVA = derive2 { name="SCVA"; version="1.2.1"; sha256="1ixy4ybw3c9w6q8csjv27r5f9x6988zrbr2a3yybhyw8xmkszc4v"; depends=[]; }; @@ -3092,7 +3154,7 @@ in with self; { SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; }; SIDES = derive2 { name="SIDES"; version="1.11"; sha256="1gmhfj44qdklsdklmg8p35lmvlgla8i881i3iaziblslyscbyw9f"; depends=[doParallel foreach MASS memoise multicool nnet survival]; }; SII = derive2 { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; }; - SIMMS = derive2 { name="SIMMS"; version="1.0.2"; sha256="1phvphk7ir9zw77ycm27y4fin6wyxppsmb1cnm4xc83v1yq7lql4"; depends=[glmnet MASS survival xtable]; }; + SIMMS = derive2 { name="SIMMS"; version="1.1.0"; sha256="05qwcc3l4b54wn51y10x03yk7sp1habnpmqzn304kz3lv3s5whdf"; depends=[glmnet MASS survival xtable]; }; SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; SIS = derive2 { name="SIS"; version="0.8-4"; sha256="1bhpj0l28804f48nc68xg0cfbpzplr2n32ccfs4w9g2m7lgarg07"; depends=[glmnet ncvreg survival]; }; SISIR = derive2 { name="SISIR"; version="0.1"; sha256="08lw9y38j5qq00m2vcxsac97lg14j4w1y6607vw8isrb3qb5db9z"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; }; @@ -3108,7 +3170,7 @@ in with self; { SMFI5 = derive2 { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; }; SMIR = derive2 { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; }; SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; }; - SMM = derive2 { name="SMM"; version="1.0"; sha256="0qg6c553z1f3w6s84mnql9w4p7ss8xy7fijnrhn2wdh0j4yp18bf"; depends=[DiscreteWeibull seqinr]; }; + SMM = derive2 { name="SMM"; version="1.0.1"; sha256="0g2blwcir0sxvqrivcyn9a8ssx34834lgcwrjwb6kcrq224dchws"; depends=[DiscreteWeibull seqinr]; }; SMMA = derive2 { name="SMMA"; version="1.0.1"; sha256="0ld8jjh67iw5w5cmb2gb899269apjydgqjsnn5hq5lzqjilpzzl8"; depends=[Rcpp RcppArmadillo]; }; SMNCensReg = derive2 { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; }; SMPracticals = derive2 { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; }; @@ -3119,15 +3181,15 @@ in with self; { SNPassoc = derive2 { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; }; SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; }; SNPtools = derive2 { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[Biostrings GenomicRanges IRanges Rsamtools]; }; - SNSequate = derive2 { name="SNSequate"; version="1.3.0"; sha256="0j0cj6c3j1pqh67nxz3wrwr0cf4hj44zqh2k7c1jc5cbldixkhpn"; depends=[DPpackage emdbook knitr magic plyr progress statmod]; }; + SNSequate = derive2 { name="SNSequate"; version="1.3.1"; sha256="1w6yai79996pgg98skfb63kha8rqjzn751nmxg961rc4id1g8ysn"; depends=[emdbook knitr magic plyr progress statmod]; }; SNscan = derive2 { name="SNscan"; version="1.0"; sha256="1s7dxi7faih0phx5wk2xrrzhvfwicq3h2cg8x2klwbrslin973lz"; depends=[igraph poweRlaw Rmpfr]; }; SOAR = derive2 { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; }; SOD = derive2 { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp]; }; SODC = derive2 { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic MASS ppls psych]; }; SOFIA = derive2 { name="SOFIA"; version="1.0"; sha256="1jlaggxa2nz2r5yb2xmf0dh5wmxfdk6xwn0l3nwsqh82vyxhp7l9"; depends=[png]; }; - SOIL = derive2 { name="SOIL"; version="1.0"; sha256="1bx399530cfh7k6p8jw4irar3q1zazvpiqcb0k4q02s2ygx3z5p6"; depends=[brglm glmnet MASS ncvreg]; }; + SOIL = derive2 { name="SOIL"; version="1.1"; sha256="0dvfh84xjzald51kmdb546par2rbjdn3nys9y9w7cvafv2lc5yj9"; depends=[brglm2 glmnet MASS ncvreg]; }; SOLOMON = derive2 { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; }; - SOMbrero = derive2 { name="SOMbrero"; version="1.2"; sha256="1pvgxy22rha4nw0kcp8635hw5gl8l6j2c1ylbf5mvqb4c4pzpg09"; depends=[igraph knitr RColorBrewer scatterplot3d shiny wordcloud]; }; + SOMbrero = derive2 { name="SOMbrero"; version="1.2-2"; sha256="1y1shgzsl922id3r7yrc5715zg5l6pxmim969h3ba32ry6mr0sr8"; depends=[igraph knitr RColorBrewer scatterplot3d shiny wordcloud]; }; SOPIE = derive2 { name="SOPIE"; version="1.5"; sha256="0isvb2vzzpn57bq0ix2pfaqdnl5z8qk6v6fvf15vnxcqg2sm63q5"; depends=[ADGofTest circular]; }; SOR = derive2 { name="SOR"; version="0.23.0"; sha256="0djmz57g23xpzv6p8i71f3zrsc6xdgqkbcvn5cbx9m78n31ipkm5"; depends=[Matrix]; }; SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; }; @@ -3136,10 +3198,10 @@ in with self; { SPADAR = derive2 { name="SPADAR"; version="1.0"; sha256="0xzhcy5nglwx9j2jkm3i9xj1iw1y9wbf6rwfjyhpiwwq6qn8mn5r"; depends=[mapproj RCEIM]; }; SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; }; SPAr = derive2 { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; }; - SPAtest = derive2 { name="SPAtest"; version="1.1.1"; sha256="0mi4q76r2ddvh391689gvk18zc528kd7vg5f3b16q40ic5wyjpbj"; depends=[]; }; + SPAtest = derive2 { name="SPAtest"; version="2.0.0"; sha256="1285ayvx1rfjd7gn3gxqbc6rjclp41rdsy47r0zijipj0y0b99wp"; depends=[]; }; SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; }; SPECIES = derive2 { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; }; - SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.4"; sha256="19xcmbqkd94z4zvqdz64l9g6lkld3wd8ap0bh57wk2s304px09sv"; depends=[]; }; + SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.5"; sha256="1m8als33k8db82pr9k8n4jk6i1dqimd9klw8xawwz7gzk1h31fsr"; depends=[]; }; SPEI = derive2 { name="SPEI"; version="1.7"; sha256="0lj7d3bbik7q4di5nqc3a1rn94z2y2v9x45r1jjkvgf03frj96qd"; depends=[ggplot2 lmomco]; }; SPIAssay = derive2 { name="SPIAssay"; version="1.1.0"; sha256="0y02122lj4v95g62w84jmdjdazfz3rch133aid5sgakj2kv68cvh"; depends=[]; }; SPIGA = derive2 { name="SPIGA"; version="1.0.0"; sha256="0yd06x5rh1h1s4v9apj43c90rkz8m5kssbny7y5mnw5mr2acds9b"; depends=[GA]; }; @@ -3161,6 +3223,7 @@ in with self; { SSDM = derive2 { name="SSDM"; version="0.2.3"; sha256="177lh4qf9b7gwi911mhy8ypfqlpl7yhl60pznhwcpynk9iqp2hzx"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; }; SSDforR = derive2 { name="SSDforR"; version="1.4.15"; sha256="0vjfzjs2bhxzavcnlz5lq5f96pp2sw5zdzlz3vivxbmvzp50kbr7"; depends=[MASS psych TSA TTR]; }; SSL = derive2 { name="SSL"; version="0.1"; sha256="0fy6svf8xfni72bpsg8a5wr8ly46srhfixk8866lrcsp8pb6mqcd"; depends=[caret e1071 klaR NetPreProc proxy Rcpp xgboost]; }; + SSLASSO = derive2 { name="SSLASSO"; version="0.0-1"; sha256="045w4j9rqqmkp1am838isa9an30hlvc46w9fkpl0q6npk6fl9rws"; depends=[]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; SSN = derive2 { name="SSN"; version="1.1.10"; sha256="0fhwshl6vwf9cvbg8j284i27vayjrslk5hpyvrby390jma9klk4i"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; }; @@ -3169,7 +3232,7 @@ in with self; { SSsimple = derive2 { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; }; STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; }; STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; }; - STARTS = derive2 { name="STARTS"; version="0.0-9"; sha256="1r93gy1044sn4cdjqfbqc9pcrq63135rm8fvvy0jjmqqmx5xigi2"; depends=[]; }; + STARTS = derive2 { name="STARTS"; version="0.1-51"; sha256="1gpnhwmlwc742pg8c7ya9yn591xryi6cq631q5c4180d8s424gsr"; depends=[CDM LAM sirt]; }; STARTdesign = derive2 { name="STARTdesign"; version="1.0"; sha256="1q61l3v8ishzax3ppy0pz4ky4l46472l6j36hjlsa8cl01ik1zjf"; depends=[Rcpp]; }; STB = derive2 { name="STB"; version="0.6.3.1"; sha256="0fj1cfxqhijpxl41z799zd7id95jsb84ylrbqzrd1jlp80plyw83"; depends=[Matrix VCA]; }; STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; }; @@ -3185,6 +3248,7 @@ in with self; { SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; }; SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; }; Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; + SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.1.0"; sha256="0wx1rfyf753wppjwwb3l1zpmg4b2mwnwjcw45yzav54yxaszy2v3"; depends=[]; }; SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; SamplerCompare = derive2 { name="SamplerCompare"; version="1.2.7"; sha256="149ipraps9dngmvpy5w5q9a1zgnwqblhawrk6184g52ij33jv4ji"; depends=[mvtnorm]; }; @@ -3219,6 +3283,7 @@ in with self; { SemiPar = derive2 { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; }; SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.5"; sha256="0apbg8sddz2ab9170wvf7p6cgawvp4w13r97r5q7p3hx2hylb8sw"; depends=[CDVine copula gamlss_dist magic Matrix matrixStats mgcv mvtnorm trust VGAM]; }; SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; }; + SensMap = derive2 { name="SensMap"; version="0.3"; sha256="1x15gch688249ly6qw9wwl9dg72j815f03v964pffajki0m67ban"; depends=[doBy factoextra FactoMineR fields ggdendro ggfortify ggplot2 glmulti lattice MCMCpack mgcv plotly shiny]; }; SensMixed = derive2 { name="SensMixed"; version="2.0-10"; sha256="0r2lga40xr782n1viyxc4wn9gzgm7g2ick45pfnkgq6m60wx9rfh"; depends=[doBy ggplot2 Hmisc lme4 lmerTest plyr reshape2 shiny shinyBS xtable]; }; SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; SensoMineR = derive2 { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[cluster FactoMineR KernSmooth]; }; @@ -3239,16 +3304,18 @@ in with self; { ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; }; ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; }; SharpeR = derive2 { name="SharpeR"; version="1.1.0"; sha256="0qhvpwv81jznqfzm7xysm051ckv8ilq7zhsysxc7wripnlj01c4m"; depends=[matrixcalc sadists]; }; + ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; }; ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.3"; sha256="1l7x1aw1nfjcwv3b47x3hr5yvdhbxyn8gxipwx5asr6gc62jxlqf"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap xtable]; }; ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; }; ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.2.0"; sha256="1ybd8vm69y50lj2mkmcdyplxb689xfg4spbl129v8hlvhw69mzmy"; depends=[]; }; + SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; }; SiMRiv = derive2 { name="SiMRiv"; version="1.0.1"; sha256="17aja5blbslj6pzypxk2nx91lnqdq2z5kn0ss9xfd3x4h9hvw81y"; depends=[mco raster rgdal sp]; }; SiZer = derive2 { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; }; SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; }; SigTree = derive2 { name="SigTree"; version="1.10.5"; sha256="1i0zhawv0dl764ciyyr3r4sbql2xhhks2r8vbya10wnzyqipxmmb"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; }; SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; }; SignifReg = derive2 { name="SignifReg"; version="1.0"; sha256="1360892wy0qc6dch3753s4a17l3pcijjmxd34zqvzl9534arlsxd"; depends=[]; }; - Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.7"; sha256="0g45mi7hd64h2ja215g61qa5v47vqlbfbbs15dsmlv4yygy1n2fx"; depends=[ks MASS misc3d rgl scatterplot3d]; }; + Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.8"; sha256="07zg8azj9giay460x0y4cmmipl22cbfc2ba3hi3szmmnfn6z21i7"; depends=[Deriv MASS rgl scatterplot3d]; }; SimComp = derive2 { name="SimComp"; version="3.2"; sha256="04rmpxasaa888p6f0rhhpvpqc39fppdkcwbq5sxcslx7bwc9w9z8"; depends=[mratios multcomp mvtnorm]; }; SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.5.0"; sha256="10afb3k4rvsmgfx6m1csb0pvnjba1d896llfh3ksmjzxglmvslgw"; depends=[evd]; }; SimDesign = derive2 { name="SimDesign"; version="1.7"; sha256="0n71irxa2yjy3hx3138r2fjnwn46ihbbq235vk7h9sxdy37ksp1f"; depends=[foreach pbapply plyr]; }; @@ -3282,6 +3349,7 @@ in with self; { Smisc = derive2 { name="Smisc"; version="0.3.6"; sha256="0knrgq6831rwr48880kvsmrl6c943nw3nkzds0sh63ljw0dp5ja7"; depends=[doParallel plyr]; }; SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; }; SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; }; + SmoothWin = derive2 { name="SmoothWin"; version="1.0.0"; sha256="19yd3gnanv8q8ab0x8ds61rznm5w71dri0liknylikiqgbqwxrcn"; depends=[msgps]; }; SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.6"; sha256="1p15k57hi31i3p6v63v9s7hi1w9kb4aqjcgz405jk4klsifzw8va"; depends=[jsonlite Rcpp stringr]; }; SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; }; SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; }; @@ -3299,11 +3367,13 @@ in with self; { SoyNAM = derive2 { name="SoyNAM"; version="1.3"; sha256="128iq8rrj6nm8zdqrv17gsjxzdsfashgzk1k7lnw38w04a2g05zs"; depends=[lme4 NAM reshape2]; }; SpATS = derive2 { name="SpATS"; version="1.0-5"; sha256="0nxv6mnbwd1a9yh883dqhcz6qnjznqc7q6c43s23lggj9wmjlzwj"; depends=[data_table fields plot3Drgl spam]; }; SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; }; - SpaDES = derive2 { name="SpaDES"; version="1.3.1"; sha256="0a2s0smd0m3dmrjl88hm7dnkv6src96v00bhllc42sq6vq81iwsf"; depends=[archivist chron CircStats data_table DEoptim DiagrammeR digest dplyr DT ff ffbase fpCompare ggplot2 gridBase httr igraph lazyeval lubridate miniUI R_utils RandomFields raster RColorBrewer rstudioapi shiny sp stringi stringr]; }; + SpaDES = derive2 { name="SpaDES"; version="2.0.0"; sha256="1fbf40qyb0nhvk1sdzxwn7g3p73v325z9mkij1mzgjyprb91i9k9"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; }; + SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.0"; sha256="0jggwywzs5i9v3xvyqk6j39mwp45zjhh145pb972yrdivxlw6vhc"; depends=[devtools magrittr miniUI rstudioapi shiny SpaDES_core stringi]; }; + SpaDES_core = derive2 { name="SpaDES.core"; version="0.1.0"; sha256="17gr386xxp22i5ln7grd1dbfxmkwfs0fnhyd7v40lmwdknj7myl7"; depends=[chron CircStats data_table DEoptim DiagrammeR digest dplyr fastdigest fpCompare httr igraph lazyeval lubridate quickPlot R_utils RandomFields raster reproducible sp stringi]; }; SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.1.0"; sha256="178xcvh5m5hkyjiqq6bgk6a7r7nrfd4fv5r6g27b26inxlpxc2bg"; depends=[bit checkmate CircStats data_table fastdigest fastmatch ff ffbase fpCompare magrittr quickPlot RandomFields raster Rcpp reproducible sp]; }; SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; }; SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; }; - SparseDC = derive2 { name="SparseDC"; version="0.1.5"; sha256="15hgcpqr3hmbpm65d15d1lcrwi2vq38pz07rrr4rgr3z2rd7f36g"; depends=[]; }; + SparseDC = derive2 { name="SparseDC"; version="0.1.12"; sha256="158c2y3qc0b9nnk437hqx18wcx9k4na62hkplyy809j4c6fkk4n0"; depends=[]; }; SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; }; SparseGrid = derive2 { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; }; SparseLearner = derive2 { name="SparseLearner"; version="1.0-2"; sha256="1qxycxpch2m2yyk97210gdzsizhlinc0hkhk5ak00rdgkrsxxc0k"; depends=[glmnet lqa mlbench qgraph RankAggreg SIS SiZer]; }; @@ -3313,11 +3383,12 @@ in with self; { SpatPCA = derive2 { name="SpatPCA"; version="1.1.1.2"; sha256="0v694bmfgwhpz2072f7gshqasd2vywvrbk5ncwq74xk5qrcpx9i7"; depends=[Rcpp RcppArmadillo RcppParallel]; }; SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-2"; sha256="1nyxxwvlnhz78pw31dqijp1crlar5nak5934s4h0a4sajv9syif2"; depends=[]; }; SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.2"; sha256="172i4khjb2fh818bq7wdfdm79fwxjwi60nqfj69dgbgcaww55ffr"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; }; - SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.2"; sha256="1f59da2r36vpz8caq7jncmlq8j4l9g5g5v5a5x4abdm750g6n7mz"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; }; - SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-3"; sha256="0rsfrsa4wqmrxc7vybijvzadhshpx3kmivfmq656acqj94g0qnpg"; depends=[fields maps]; }; - SpatialNP = derive2 { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; }; + SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; }; + SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-5"; sha256="0p56h2dbdgbxzvfrdjnbr1yxr3wrlsrfgfgk4j8gf4nb4j6mrbiz"; depends=[fields maps]; }; + SpatialFloor = derive2 { name="SpatialFloor"; version="1.0.1"; sha256="0bb7crfqnfswr01dhv374iwxs36sxajs4y5qi1y6x3jjwach6nbg"; depends=[fields reshape2]; }; + SpatialNP = derive2 { name="SpatialNP"; version="1.1-2"; sha256="048zzyy3hav8qg0zad2fsv5z1avdppwwdcv0rc6j635wzhdmsl1j"; depends=[]; }; SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; }; - SpatialPosition = derive2 { name="SpatialPosition"; version="1.1.1"; sha256="1fbch16qmp8xnlkl7crydn1rh5gj49zlii6c9va5l7zp5wf8cl87"; depends=[raster rgdal rgeos sp]; }; + SpatialPosition = derive2 { name="SpatialPosition"; version="1.2.0"; sha256="140fg3bjj7383nrdbgnk9lccj4yjq65rkprqpmf4q0mwbc89mmqc"; depends=[raster rgdal rgeos sp]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; }; SpatialVx = derive2 { name="SpatialVx"; version="0.6-1"; sha256="1yscz5w6ydh87qh4ncgn6br49pzg08nqgx95m5bmydqx2r74h9jg"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; }; @@ -3325,10 +3396,10 @@ in with self; { SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; }; SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-2"; sha256="0dnya9mzkf48clp51jrnkz6lc4fps38nn3lap7n2wcp3dvbvdycg"; depends=[Rcpp RcppArmadillo]; }; SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; }; - SphericalCubature = derive2 { name="SphericalCubature"; version="1.3"; sha256="195is72nj1vbhdx3yqmklmc9hqaaxvipgmcxszgvnqdv5bsiypgw"; depends=[abind cubature mvmesh SimplicialCubature]; }; + SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; }; SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; }; SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; - SqlRender = derive2 { name="SqlRender"; version="1.3.7"; sha256="15jp608bnnqrv7x4dnwi7hvnhxxpykfpavb8ynrlp9r6n6d3qp71"; depends=[rJava]; }; + SqlRender = derive2 { name="SqlRender"; version="1.4.3"; sha256="1xv71qx1wxfbczrqxh1zrywzwwvjjd2yrwl62cg5hclnbivn4435"; depends=[rJava]; }; StAMPP = derive2 { name="StAMPP"; version="1.4"; sha256="0rmp5l50dkkldq9xc1abhdxjhbwlqk3i3g0d8w3xissidnz5n31b"; depends=[adegenet doParallel foreach pegas]; }; StMoMo = derive2 { name="StMoMo"; version="0.4.0"; sha256="0zkcp19a76dm29fba5r96dxly709sic2k5p9hzc70cvwjhwhfr7v"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; }; StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; }; @@ -3336,6 +3407,7 @@ in with self; { StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; }; Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; }; StagedChoiceSplineMix = derive2 { name="StagedChoiceSplineMix"; version="1.0.0"; sha256="1008gm6zv5k8lpv0qg42qjriajmx0n4kshjh76mvx91dpi788ivh"; depends=[plyr]; }; + StakeholderAnalysis = derive2 { name="StakeholderAnalysis"; version="1.0"; sha256="0gjjyxw9413xi8vx9fvw2mlz90br6viws1qzyvy4gxc5mp2bsmaw"; depends=[]; }; StanHeaders = derive2 { name="StanHeaders"; version="2.16.0-1"; sha256="0i1gq32ys7iwgbdrwc86ww8kj5aqc7jbl663dynackb7wmqwlb7r"; depends=[]; }; StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; }; Stat2Data = derive2 { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; }; @@ -3356,7 +3428,7 @@ in with self; { Storm = derive2 { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; }; StrainRanking = derive2 { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; }; StratSel = derive2 { name="StratSel"; version="1.2"; sha256="11dkhyh0xgl23f9ksxcjl6bqfhwm6k6i1chgx23dvjifbm6s5s5p"; depends=[Formula MASS memisc mnormt pbivnorm]; }; - Strategy = derive2 { name="Strategy"; version="1.0.0"; sha256="1s89rl6h68sn8px3g7bhhrwmn6k4kmdqhiz0d39xr3kgpfpvi5i2"; depends=[xts zoo]; }; + Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; }; StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.2.0"; sha256="0iwzvschncb2vrmsawb6i94shn2cjbkph854x1z4ykr6ddw411g2"; depends=[plyr]; }; StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; }; StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; }; @@ -3365,7 +3437,7 @@ in with self; { StructFDR = derive2 { name="StructFDR"; version="1.2"; sha256="00h3mx7kf01snngkcarhyidqiycvnjhcs81x3kprgp6597md7ph1"; depends=[ape cluster dirmult matrixStats nlme]; }; SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; }; - SubTite = derive2 { name="SubTite"; version="1.0.1"; sha256="0zf65ds771831xlrnyvknpis81ns0p29yr7w1a7ifczn17wmx796"; depends=[Rcpp RcppArmadillo]; }; + SubTite = derive2 { name="SubTite"; version="1.1.1"; sha256="07d5v6gzbgkp0svlr7ff73q1w07znkyawyhb0j1igkjy0jq1h648"; depends=[Rcpp RcppArmadillo]; }; SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; }; SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; }; SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; }; @@ -3405,7 +3477,7 @@ in with self; { TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; }; TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; }; TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; }; - TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.0"; sha256="1jh4gw9z6kq3lzg2xdr5yw0y9c21zcairwi88lm45px0vd5c4nqh"; depends=[httr jsonlite testthat]; }; + TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.1"; sha256="0jxpv0a7lyd0lb5mijpfw0pcp80h9s7bhxn9j4w7bkwsg1n59c83"; depends=[httr jsonlite testthat]; }; TDA = derive2 { name="TDA"; version="1.5.1"; sha256="1ab60b1wk2j4271vikbglkk12nwl77d5b9w3xqvzpcbrbjfqsmjh"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; }; TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; }; @@ -3432,12 +3504,13 @@ in with self; { TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; }; TMB = derive2 { name="TMB"; version="1.7.11"; sha256="1v74iw4pmklhnq5rc0xaahrfd78bgz1fylnwp8gahha72lbcdzrq"; depends=[Matrix RcppEigen]; }; TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; }; + TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; }; TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; }; - TOSTER = derive2 { name="TOSTER"; version="0.2.3"; sha256="1wyzlil7sznf0gldnmga9qkbj4qcfrbpm8imns18dpfrz3kxaw4i"; depends=[ggplot2 jmvcore R6]; }; + TOSTER = derive2 { name="TOSTER"; version="0.2.4"; sha256="0x01a9z3620akp22h85ssqc5n5iiw17x52gb2kpb63dbk24x3pkn"; depends=[ggplot2 jmvcore R6]; }; TP_idm = derive2 { name="TP.idm"; version="1.2"; sha256="08n5bgc7gw1cbn9q7kd6jfxcwmb5mfjmdmhkhr35fi5ah21a57mh"; depends=[]; }; TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; }; TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; }; - TR8 = derive2 { name="TR8"; version="0.9.16"; sha256="04zn01hqvza7pkc3pmiwiygdkawa39wc3g875mdvd5hjhi4ffkaf"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; }; + TR8 = derive2 { name="TR8"; version="0.9.18"; sha256="14nfyqwqv1l5lr5zvywd5pxrv4qz0g5v5x8sdxkjbkxi9s7xrlaw"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; }; TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; }; TRAMPR = derive2 { name="TRAMPR"; version="1.0-8"; sha256="0nxp8wdr7yx94fk14m0r4dh2jxcvjqp6lg02092zww5y7jlbf4ds"; depends=[]; }; TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; }; @@ -3498,6 +3571,7 @@ in with self; { TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestSurvRec = derive2 { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[boot survrec]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.0"; sha256="1fagy9168cz09p460pa0qyn8m79zg4i2b9j5vg8gm1ssqi2znsl9"; depends=[alabama DoseFinding lattice]; }; + ThankYouStars = derive2 { name="ThankYouStars"; version="0.1.0"; sha256="1wzpd9riaphdaw8nfvq25hywpi4qik0cb13qp26q8704acdm55wm"; depends=[httr jsonlite]; }; ThermIndex = derive2 { name="ThermIndex"; version="0.2.0"; sha256="0s9d55577dq61qixwwfwmqc2k2c8my00j2ng97ng42cw0jc7aylm"; depends=[]; }; Thermimage = derive2 { name="Thermimage"; version="3.0.0"; sha256="0l098praarg5kg0m5hxs9zbwhl8w7g48ngyiry1rlwkp2rsl3cza"; depends=[png tiff]; }; Thinknum = derive2 { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; }; @@ -3507,11 +3581,11 @@ in with self; { ThresholdROC = derive2 { name="ThresholdROC"; version="2.5"; sha256="1c727qbplwrclhg41jjygm6a5k45whzar9pjm2nlp9ccr9fv710a"; depends=[MASS numDeriv pROC]; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; - TideCurves = derive2 { name="TideCurves"; version="0.0.2"; sha256="1xm8df18i3pzb2v5g2li9axdx1hhg63q3j73381s88iadvqgf3aq"; depends=[chron data_table fields]; }; + TideCurves = derive2 { name="TideCurves"; version="0.0.3"; sha256="0wll0zbkfas6hs4h8ma5km68nv2brw1k75ngw5lrnxilya22lrgp"; depends=[chron data_table fields]; }; TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-1"; sha256="1g1v99gh6mns4l8ipmw7kpalbk07m92ybcqjq7b0wsjmdvs1y67s"; depends=[]; }; - TideTables = derive2 { name="TideTables"; version="0.0.1"; sha256="08c1fbwxc2kc3vicjdw8qg452y8jrsgyi6b4qbnpb8j6nj91qcx3"; depends=[chron data_table]; }; - Tides = derive2 { name="Tides"; version="1.2"; sha256="1bd5x5wx6dd7498dc8jl0hsflxvlya2b6rkwg39dpsxsigb4qc5n"; depends=[]; }; - TileManager = derive2 { name="TileManager"; version="0.1.11"; sha256="11jlg99zfi00ss2a9qzmzxxdphdl3zy3pac0c7b0j2v2f529xwsw"; depends=[APfun raster rgeos sp]; }; + TideTables = derive2 { name="TideTables"; version="0.0.2"; sha256="1grm9s9np7xs2d8gql4sgg72rxpxiidw6g1ni8q97qgqr7r3105l"; depends=[chron data_table]; }; + Tides = derive2 { name="Tides"; version="2.0"; sha256="0s7ja0vs8ag7myjq4kmza4ja9p76sdbbkaaamxbsgp9yaf02c6nf"; depends=[]; }; + TileManager = derive2 { name="TileManager"; version="0.2.0"; sha256="1zk5q1m3imlr9ms81jyb9kibm0m5zmiidsv86qgnqj8r4b8hpqyh"; depends=[APfun raster rgeos sp]; }; TilePlot = derive2 { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; }; TimeMachine = derive2 { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; }; TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; }; @@ -3536,7 +3610,7 @@ in with self; { TreeBUGS = derive2 { name="TreeBUGS"; version="1.1.1"; sha256="1zhxmmks263khrdckp570j6lykfhhlpc6rnhw3rk35a9k89yp90v"; depends=[coda hypergeo MASS Rcpp RcppArmadillo rjags runjags]; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; }; TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; }; - TreeSimGM = derive2 { name="TreeSimGM"; version="2.2"; sha256="14m7m3krhbwnm5l254cy12i201kjfbbvnsajkgljkmpqxn0cg5vb"; depends=[ape TreeSim]; }; + TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; }; TrendInTrend = derive2 { name="TrendInTrend"; version="1.0.2"; sha256="0ymlgalddnfnb55s31bysm68yh823ys0rr5fgiic4a2ipnbfd8qf"; depends=[pROC rms]; }; TriMatch = derive2 { name="TriMatch"; version="0.9.7"; sha256="06idgh9bwwbwa16hlc2kgm06n9shzm0825f7k65zpz3isq23dp7q"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; }; TriadSim = derive2 { name="TriadSim"; version="0.1.1"; sha256="0m14k512b7q09zx51v2kxa8q9pk2i179w6ckl6jxj2acc860xw3k"; depends=[doParallel foreach snpStats]; }; @@ -3558,6 +3632,7 @@ in with self; { UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; }; UPMASK = derive2 { name="UPMASK"; version="1.1"; sha256="1qxajvld8g2mii12agypcm50fps9bai6d2wx6l0bv3srk80in7ai"; depends=[DBI MASS RSQLite]; }; USAboundaries = derive2 { name="USAboundaries"; version="0.3.0"; sha256="0rza1np6320xm9ppn458cwgz4zaq173m3g0ylvxbx1fxq716lqj6"; depends=[]; }; + USCF = derive2 { name="USCF"; version="0.1.3"; sha256="00ynxfd4lg8g4mspz5izxvgkj27l2i1cnp0z0dnkhsbxsg0161mj"; depends=[]; }; USGSstates2k = derive2 { name="USGSstates2k"; version="1.0.1"; sha256="11yk0pkss23j6fmmxnjkjm9p24ln343y4hijigbrbvcnb21wj2py"; depends=[sp]; }; UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; }; UScensus2000cdp = derive2 { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[foreign maptools sp]; }; @@ -3565,17 +3640,18 @@ in with self; { UScensus2010 = derive2 { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[foreign maptools sp]; }; UStatBookABSC = derive2 { name="UStatBookABSC"; version="1.0.0"; sha256="16r6clhfaalfsg5hmvzm8a128zygxax5hyc0vr1q9bsw9hj7cs0c"; depends=[]; }; UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; + UdderQuarterInfectionData = derive2 { name="UdderQuarterInfectionData"; version="1.0.0"; sha256="084bq5ai1ccp4www64z0ipic74zkd8j1ygv0py900164a25wdr9b"; depends=[]; }; Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; }; Umpire = derive2 { name="Umpire"; version="1.3.4"; sha256="0kxndg96ah6sk1m216f2dmkg73w10lyg3rv7qsrnn145mznsdlw1"; depends=[]; }; UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; }; UncertainInterval = derive2 { name="UncertainInterval"; version="0.3.0"; sha256="09x52g691qqsphy2sppm3852gak0ammsan4x306vd16yz9z0zlb2"; depends=[nloptr reshape2 rootSolve]; }; - Unicode = derive2 { name="Unicode"; version="9.0.0-1"; sha256="1daf4wlglqzha0p6cbmrkwn4ppkzfvpvg1aa64gphr4dg2g5jsdf"; depends=[]; }; + Unicode = derive2 { name="Unicode"; version="10.0.0-1"; sha256="1kj4b29gj3p0wzlzxqn7lwzabair6np705va0nxissfybpmwalgk"; depends=[]; }; UnivRNG = derive2 { name="UnivRNG"; version="1.0"; sha256="1d55a103q30vhyjq659a6bbnqbm4g4calr5j4xw8p0h0x5i4p5xh"; depends=[]; }; UpSetR = derive2 { name="UpSetR"; version="1.3.3"; sha256="08vj7l92b8fpqyqwxshll2mhk3yhgyr74axvr2lf29z78bapymhz"; depends=[ggplot2 gridExtra plyr scales]; }; UsingR = derive2 { name="UsingR"; version="2.0-5"; sha256="1w1swcb5srb2b76agbh3mipz8b3vbhpnhxfhg7k546y38j3crafq"; depends=[HistData Hmisc MASS]; }; V8 = derive2 { name="V8"; version="1.5"; sha256="155389k8laa48akg0bfsz65s4ddmpk0xpi1ha56z1sayv01vrrgc"; depends=[curl jsonlite Rcpp]; }; VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; - VARSEDIG = derive2 { name="VARSEDIG"; version="1.3"; sha256="1qvc9lyfdc0irivi4y27hc5yn5lk05nbgqx7zcj602s0r7i7nvln"; depends=[]; }; + VARSEDIG = derive2 { name="VARSEDIG"; version="1.4"; sha256="1g0qpa21gkp2s0sr336bkdqfrcxygrdl77i3lv09vqimyinbi0p2"; depends=[]; }; VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; }; VARtests = derive2 { name="VARtests"; version="1.0.1"; sha256="19xmf4mg4v1fwd002ccinfbsbpcq9qfmzc2sf710mqv6i8ghv6jm"; depends=[Rcpp RcppArmadillo sn]; }; VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; }; @@ -3583,6 +3659,7 @@ in with self; { VCA = derive2 { name="VCA"; version="1.3.3"; sha256="03ibvn3a6bbgq36a1ibhi4givdnba6d0qcfbpbdxkz5masn1r23q"; depends=[lme4 Matrix numDeriv]; }; VDA = derive2 { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; }; VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; }; + VDSPCalibration = derive2 { name="VDSPCalibration"; version="1.0"; sha256="1hrmmhvk3mhd3bdl0msnm5shcj4cjgd3pn1rkfkv8fh4llqvz7w8"; depends=[]; }; VGAM = derive2 { name="VGAM"; version="1.0-4"; sha256="0r59hyp3afmvms890b3v2yyckf8v0qkjf2w11rnqd2zgg1gri0g5"; depends=[]; }; VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; }; VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; @@ -3602,7 +3679,7 @@ in with self; { VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; }; VarReg = derive2 { name="VarReg"; version="1.0.1"; sha256="00ygs9gk2719fnhb47z1pj7qacapzg9qs1li2206vsfrmqxjvj1a"; depends=[sn survival]; }; - VarSelLCM = derive2 { name="VarSelLCM"; version="1.2"; sha256="1pzcadzg1snv2nkdrbhgi6scrd70cawprncm8hs82gcl3r9dscic"; depends=[Rcpp RcppArmadillo]; }; + VarSelLCM = derive2 { name="VarSelLCM"; version="2.0"; sha256="0m0va9qdjwzaaf0ch5b8z5r038lcw9mfpa0sbwd0489igszc3ng7"; depends=[mgcv Rcpp RcppArmadillo]; }; VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.7"; sha256="1sb31338r2p0jsa3k72q9lc5f57cybywmda7q2j8byngh1fjvgyz"; depends=[curl RISmed stringi stringr XML XML2R]; }; VariABEL = derive2 { name="VariABEL"; version="0.9-2.1"; sha256="00k08mvd09rpplakvid6qal1zdxaj1bxn4d2ivpnqihisf7nxqbs"; depends=[]; }; @@ -3615,6 +3692,7 @@ in with self; { VennDiagram = derive2 { name="VennDiagram"; version="1.6.17"; sha256="14cahgxm5kq133j5wv6p7ivlmcmym5r39v4dpj69wnq6w9rjqki8"; depends=[futile_logger]; }; VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; }; VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; }; + VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.0"; sha256="1lb1bsapczryw5sabfcvvj0g7p3ar997awphda5fxi4q3s118dxy"; depends=[Rcpp]; }; VetResearchLMM = derive2 { name="VetResearchLMM"; version="0.2.0"; sha256="1vx72pn3fl27mjsa48kz5j1sj1bkjq8q0ifs5dxdfrcdswfqhjcw"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; }; ViSiElse = derive2 { name="ViSiElse"; version="1.2.0"; sha256="0k5hhzyjws0haawx2r2c0rxjbjdfx821x0jmj88786q6x67x86n0"; depends=[chron colorspace Matrix stringr]; }; VideoComparison = derive2 { name="VideoComparison"; version="0.15"; sha256="0592fz0v4xvq1qy2hj4ph90v7zn1cnzr6a094mp9p1k61ki3fbg2"; depends=[pracma Rcpp RCurl RJSONIO zoo]; }; @@ -3640,7 +3718,7 @@ in with self; { WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; }; WRS2 = derive2 { name="WRS2"; version="0.9-2"; sha256="0szjq9ffckjqa128avs4cymqvxk7dhldzj620kcq7q59aagrnj04"; depends=[MASS mc2d plyr reshape]; }; WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.0"; sha256="0yyhls0qzwwj4sz5d1nvzfiacx28dmf2hgjc7xgfi2qjkckg40hs"; depends=[caret dplyr EnvStats fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; }; - WVPlots = derive2 { name="WVPlots"; version="0.2.5"; sha256="0d1za8mp1ikaav756kqlnl0c0k08cg9dqfnn58izw3k5g6g4l4bn"; depends=[ggplot2 gridExtra mgcv plotly replyr reshape2 sigr wrapr]; }; + WVPlots = derive2 { name="WVPlots"; version="0.2.6"; sha256="0j399zjm2izg52fa1x06aqi56kmpcj8ciabvkyrcfpmf0bk8bxls"; depends=[ggplot2 gridExtra mgcv plotly replyr reshape2 sigr wrapr]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; WWR = derive2 { name="WWR"; version="1.2.0"; sha256="1m60zchm1f85m2b5h1yqcyhnm4593d0r7wakhmx5zpkhbx1rhgmg"; depends=[inline]; }; WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; }; @@ -3660,12 +3738,13 @@ in with self; { WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; }; WikiSocio = derive2 { name="WikiSocio"; version="0.7.0"; sha256="1rc90cidc8mj8x7vw82vx41ivwnmil3cmc1whc8ghxrwli256w32"; depends=[httr igraph pbapply plyr RCurl stringr XML]; }; WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="0.1.1"; sha256="1bqgp3wldfmnwwh9llig8xpa4x0rcp1hcwyw7d7pw4ym61b2v65x"; depends=[dplyr httr jsonlite]; }; - WikidataR = derive2 { name="WikidataR"; version="1.3.0"; sha256="0ymbvnalayx082hbjdyxazx25k1qclf16qch5ikzxn3vc8qwffaa"; depends=[httr jsonlite WikipediR]; }; + WikidataR = derive2 { name="WikidataR"; version="1.4.0"; sha256="0ajbizsyk5a7fgbfn26qydxpp5d8qfnlcwbslxrrn913f0yxbcb4"; depends=[httr jsonlite WikipediR]; }; WikipediR = derive2 { name="WikipediR"; version="1.5.0"; sha256="1w4ggq42vlq7zbrz3v9ripz9yscbd8m8as60q7cplpxn9zqfdl7q"; depends=[httr jsonlite]; }; WikipediaR = derive2 { name="WikipediaR"; version="1.1"; sha256="0fxk247jb82g0f3nmwraa4kvdpjxy5s4dcyzj9vkjw2lq8by3l0h"; depends=[httr XML]; }; WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; Wmisc = derive2 { name="Wmisc"; version="0.3.2"; sha256="1dyfpmsl1fdznnz79l8zkp6v4kxc9a260qp7g52mwxj9xw0jb0z7"; depends=[hash R6 Rcpp]; }; WordPools = derive2 { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; }; + WordR = derive2 { name="WordR"; version="0.2.2"; sha256="1q8im3v30xil5qg4m1hypmj439rsx5g2x4mfxsgkz4xz2hwlfh4f"; depends=[dplyr officer ReporteRs]; }; Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; }; WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; }; WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; }; @@ -3695,7 +3774,7 @@ in with self; { ZIM = derive2 { name="ZIM"; version="1.0.3"; sha256="1497ki0pr0x21fz5wa2z6zgb2br99z56gvfxyn9cglqq45if6cjh"; depends=[MASS]; }; ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; }; ZeBook = derive2 { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; }; - Zelig = derive2 { name="Zelig"; version="5.1-3"; sha256="0qk2i8z07b69vnnmxl33cqxxccjybzqy6rm0vgbjlk7xcl4c1bpd"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; }; + Zelig = derive2 { name="Zelig"; version="5.1-4"; sha256="0bivbgi70livmddndf7jxgjfy99clsj7psd08jjz4bj47vv32a7x"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; }; ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-6"; sha256="1whfwc42lsi54xfr423h6jwbvpj6yjyyf0854k1f1ms13liahm8w"; depends=[dplyr Formula jsonlite MASS VGAM Zelig]; }; ZeligEI = derive2 { name="ZeligEI"; version="0.1-2"; sha256="0kilzfqmm6a41mmjvlynh3rnj30fqiq8gsja28fzwpf0lbl89slg"; depends=[dplyr ei eiPack Formula jsonlite MASS MCMCpack Zelig]; }; ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; }; @@ -3711,7 +3790,7 @@ in with self; { abc = derive2 { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; }; abc_data = derive2 { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; }; abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; }; - abcrf = derive2 { name="abcrf"; version="1.6"; sha256="0qphqw4wg6dl0chfwvf4bxm0kdgsbcvlpshjhimkklmvpxbh1957"; depends=[MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; }; + abcrf = derive2 { name="abcrf"; version="1.7"; sha256="1gz1jhbc2qj2dvsdn22hb03lm99v8hfr5qjrjql14jvhw8y2smz8"; depends=[MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; }; abctools = derive2 { name="abctools"; version="1.1.1"; sha256="0x6pjdvn5z510j42byddzdvg2mgv81yy72snia5k8h7bs9k5glfg"; depends=[abc abind Hmisc plyr]; }; abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; }; abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; }; @@ -3721,6 +3800,7 @@ in with self; { abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; abundant = derive2 { name="abundant"; version="1.1"; sha256="1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"; depends=[QUIC]; }; acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; }; + accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; }; accelerometry = derive2 { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; }; accelmissing = derive2 { name="accelmissing"; version="1.1"; sha256="0s2vy16zcpvbqyqz4ifdqccs6bfp8sf7azvfy8jjcm73xncv6ij3"; depends=[mice pscl]; }; accrual = derive2 { name="accrual"; version="1.2"; sha256="1d9jis7d2fihkmwlqqvjl2kh6dcinzbffc9c0m4aqwzaq7c6ngjx"; depends=[fgui SMPracticals tcltk2]; }; @@ -3768,24 +3848,25 @@ in with self; { adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.11"; sha256="1911zdpwyr1gqyjvnn5w3blhk0mjafy0xmr3l6l749lx4cwa08d9"; depends=[filehash sp]; }; adephylo = derive2 { name="adephylo"; version="1.1-10"; sha256="1hj9nkl2z2xdb5yv9a7fb7zn9sd41lrhk2ff5z8s88xab3b2vhnc"; depends=[ade4 adegenet ape phylobase]; }; adepro = derive2 { name="adepro"; version="0.1.0"; sha256="0gvqfrdmd755nz72022wq5vmdh2z83lr7bg44b07bxyd6id2pak0"; depends=[audio Cairo MASS shape shiny shinyBS]; }; - adespatial = derive2 { name="adespatial"; version="0.0-8"; sha256="0h2waffkgdns5pz47zhy0wi388hrya6s01gwgwbyp7fgxj65i9ba"; depends=[ade4 adegraphics lattice MASS shiny sp spdep]; }; + adespatial = derive2 { name="adespatial"; version="0.0-9"; sha256="0cmpsf4vhllykmvkxd71qw8axw270zhj9g7n1nr1myvy46p8iqy2"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep]; }; adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; }; adimpro = derive2 { name="adimpro"; version="0.8.2"; sha256="0nfzk9pp4p16c1nvpidngag96r845376h8ljh7m6p6rhk9fs4jdw"; depends=[awsMethods]; }; - adiv = derive2 { name="adiv"; version="1.0"; sha256="1q6miic5y0zdj1wsnih4jdwg9shmdgv8bxrgfq92dyb5v5zwax5c"; depends=[ade4 adephylo ape cluster phylobase]; }; - adlift = derive2 { name="adlift"; version="1.3-2"; sha256="0nzg16vhm5qg3xzczi3f6cynvp9ym2jsfrc4fdyxq7bwp9kry2i4"; depends=[EbayesThresh]; }; + adiv = derive2 { name="adiv"; version="1.1"; sha256="12m8p1agahzck1nm8j765wacc6vrl0pa31wld4rqxl7c2pvhs7f4"; depends=[ade4 adegraphics adephylo ape cluster phylobase]; }; + adlift = derive2 { name="adlift"; version="1.3-3"; sha256="0q4ipk9yax4wqp3jckpx6ihriqaaaz0knxd19cm20qzdx37vz4id"; depends=[EbayesThresh]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; ads = derive2 { name="ads"; version="1.5-2.2"; sha256="17k24dihl41jgkkglhnkj7lvvl53dgahjkb5jhfmfgk6i16c7s23"; depends=[ade4 spatstat]; }; advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; }; - adwave = derive2 { name="adwave"; version="1.1"; sha256="0kkwgcyxddzmrb8h1w1f4xy2cq40b86q0lxwfdhx25z3zjc4m1ni"; depends=[waveslim]; }; + adwave = derive2 { name="adwave"; version="1.2"; sha256="1fnaq9v84y52kb66aq4g0xiqgllk7mi0is5qiafqf546hck3kzz6"; depends=[waveslim]; }; aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; }; afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; }; afex = derive2 { name="afex"; version="0.18-0"; sha256="0ls4mc75f2swhxrabvyilggdhf4ps893d4krpp07magz3iyi7gv5"; depends=[car coin lme4 lmerTest lsmeans pbkrtest reshape2 stringr]; }; affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; }; afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; }; + afpt = derive2 { name="afpt"; version="1.0.0"; sha256="0kshyzvw8sp7p686xi98g758zld3n7kq44lnvly8d0y8fg6ahcl2"; depends=[]; }; aftgee = derive2 { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; }; agRee = derive2 { name="agRee"; version="0.5-0"; sha256="16ijw02x5qvc8rppf0yn35aljd35alnvjkjyi6725nywjib2xy5x"; depends=[coda lme4 miscF R2jags]; }; agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; }; - agricolae = derive2 { name="agricolae"; version="1.2-6"; sha256="04dk0fwszdrmqsrnaxf6h5bi3mmv5pvbi26f4kpzm82pc5x0kh4j"; depends=[AlgDesign cluster klaR MASS nlme spdep]; }; + agricolae = derive2 { name="agricolae"; version="1.2-8"; sha256="1c6n52jralp33hl3nmpv9fc9vsvs6lcz9j75f2zbz0r4sqd2mw89"; depends=[AlgDesign cluster klaR MASS nlme spdep]; }; agridat = derive2 { name="agridat"; version="1.12"; sha256="1b3dgrp6mkfpfaywqdm22sakadhnl1vlyj1n3rq6bc2f0gf8kcrw"; depends=[lattice reshape2]; }; agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; }; agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; }; @@ -3799,13 +3880,14 @@ in with self; { ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; }; akima = derive2 { name="akima"; version="0.6-2"; sha256="1klprj4a2pgy5pwdwnrn3siisi2lh8hr4z6vz38sdvjkcmakxnk1"; depends=[sp]; }; akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; + alR = derive2 { name="alR"; version="2.2.0"; sha256="1hri2vifgwrklmx5087vlxkd1nv1y42rrhpzm4nk1sbn2b3lcway"; depends=[alabama DEoptimR pbdMPI Rcpp RcppArmadillo]; }; alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; - alakazam = derive2 { name="alakazam"; version="0.2.7"; sha256="11gv8y7a29vy9q3sfm6nsvlgacsa502j5fpisdqhw4b3f60q3mw3"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi]; }; + alakazam = derive2 { name="alakazam"; version="0.2.8"; sha256="0lilldxynwhp1i538k3xb9c73956agxj6v8zickxkba1sx4k5zrc"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi]; }; ald = derive2 { name="ald"; version="1.1"; sha256="1ar9mrvfw2jz4js9prbp9icsync7fw6wpirpximsr4cy1klqjfpn"; depends=[]; }; - alfred = derive2 { name="alfred"; version="0.1.1"; sha256="04g9956r4359l5k6fjiqddn2qfay3nicrhhbk58sdgl79lay44gz"; depends=[dplyr lubridate magrittr tibble tidyr xml2]; }; + alfred = derive2 { name="alfred"; version="0.1.3"; sha256="0vradid3i83x1n5ss4v85w4vva8psf4byysjv4wrz11mxhy8c68i"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; }; algorithmia = derive2 { name="algorithmia"; version="0.0.2"; sha256="0kly70l9si8ni8n5xm30vai70pvfvip6354scvjqj34362s0lm0a"; depends=[base64enc httr rjson xml2]; }; algstat = derive2 { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; }; - alineR = derive2 { name="alineR"; version="1.1.3"; sha256="000rywvianwi0xm0ccsmc7g2hl9d0zjl3qplidrr7rz872f6snwm"; depends=[]; }; + alineR = derive2 { name="alineR"; version="1.1.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; }; allan = derive2 { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; }; allanvar = derive2 { name="allanvar"; version="1.1"; sha256="142wy1mf4jbp4hy756rz95w24f4j1dgf14f1n5sd09dg4w98j7xg"; depends=[gplots]; }; alleHap = derive2 { name="alleHap"; version="0.9.9"; sha256="1fqrw645s3f5363p7jl3dzy8xphxdr1v6wdsjmqcqwpgvjqfr2zz"; depends=[abind]; }; @@ -3816,6 +3898,7 @@ in with self; { alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; }; alphahull = derive2 { name="alphahull"; version="2.1"; sha256="129b2j9j60p2wvbb8703x18pydv1g715vmjcb1a80v70i93w4f49"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; }; alphashape3d = derive2 { name="alphashape3d"; version="1.2"; sha256="1apbirffqipdj618qgqh7vjlhg9fp6ncxb0yk4dclpn7g645863x"; depends=[geometry rgl]; }; + alphavantager = derive2 { name="alphavantager"; version="0.1.0"; sha256="02vv0mks73rih4xwabsnk8rkl3cipd27k5lak9lp1rl0agp8g68v"; depends=[devtools dplyr glue httr jsonlite lubridate purrr readr stringr tibble tidyr]; }; alr3 = derive2 { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; }; alr4 = derive2 { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; }; alterryx = derive2 { name="alterryx"; version="0.2.0"; sha256="042cbxw0s43ffmicf25mvg0na1l0x8qbf6rl63ia44r9l3v8jcyd"; depends=[base64enc digest httr jsonlite]; }; @@ -3847,8 +3930,7 @@ in with self; { animation = derive2 { name="animation"; version="2.5"; sha256="0pxmihfr3q1hh4cdnzf7wbzqak5spa3kv4p1wl89giqqngqzwcmj"; depends=[]; }; anocva = derive2 { name="anocva"; version="0.1.0"; sha256="1kira0bs3yjmsq7zrd4y5zzl948pz3rgbfsvkzidi2n6vvcl5344"; depends=[cluster]; }; anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; }; - anomalyDetection = derive2 { name="anomalyDetection"; version="0.1.2"; sha256="0nn5a7hl5r4g1akpxggqqfgbc56pnm3a08q0i1pd8hmz0rh6apbh"; depends=[caret dplyr gmp gplots magrittr MASS matrixStats plyr purrr qdapTools RColorBrewer tibble tidyverse]; }; - anominate = derive2 { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6bafg3c36a7whnznnww0101da2y0i6dw79lg5"; depends=[coda MCMCpack oc pscl wnominate]; }; + anomalyDetection = derive2 { name="anomalyDetection"; version="0.2.4"; sha256="0a9m9bxz9v9xx19lq8yih727p7zy25ndfamwajzgh0zvx394h0jz"; depends=[caret dplyr ggplot2 gmp magrittr MASS plyr purrr Rcpp RcppArmadillo tibble tidyr]; }; anonymizer = derive2 { name="anonymizer"; version="0.2.0"; sha256="0zlzxcqy8fjhh6ab58a1pi0k686dzgap58d160ms6bsr5mgn3fbf"; depends=[]; }; antaresProcessing = derive2 { name="antaresProcessing"; version="0.11"; sha256="165rqsqq3cp5kak4513rv5ibbq61nipvybvmm4m8ynwbd4q5p7p9"; depends=[antaresRead data_table]; }; antaresRead = derive2 { name="antaresRead"; version="1.1.4"; sha256="1n59rspxswxsljhwhbqdcq8grd5899403581rc46bd8l81hldapp"; depends=[data_table lubridate plyr]; }; @@ -3870,7 +3952,7 @@ in with self; { apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; ape = derive2 { name="ape"; version="4.1"; sha256="0959fiiy11rzfzrzaknmgrx64bhszj02l0ycz79k5a6bmpfzanlk"; depends=[lattice nlme]; }; apercu = derive2 { name="apercu"; version="0.2.1"; sha256="11ykbl3g752imj8zr03p5sv6pwl12apdrq4wg66yj1fdqflhd9sp"; depends=[pls]; }; - apex = derive2 { name="apex"; version="1.0.2"; sha256="0p2sjpjg3b6i0ya99hkx2vl40w97k34z0z6ccnz08sfg3fyjiv24"; depends=[adegenet ape phangorn]; }; + apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; }; aphid = derive2 { name="aphid"; version="1.0.1"; sha256="1s41ph6i28l14h8s5vvgmx6kby378x27y3vwbz25f2jmq8i7fqi2"; depends=[openssl phylogram Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; aplpack = derive2 { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; }; @@ -3891,7 +3973,7 @@ in with self; { aqp = derive2 { name="aqp"; version="1.10"; sha256="1c8vj10mygsrlixx4pwfs1xk69bvhdi37hl4p1v6g3nwvsr8f7ac"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; }; aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; }; arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; }; - arc = derive2 { name="arc"; version="1.1"; sha256="1ms0ibvsdjqgdramd4nxy5dcnw019yfpd5xryjficmkfxs6jl9pf"; depends=[arules discretization Matrix R_utils]; }; + arc = derive2 { name="arc"; version="1.1.2"; sha256="145sapcawsp7aan1g2c70a6ck3krxapj9k1w8vkv69irvggbbkql"; depends=[arules discretization Matrix R_utils]; }; archdata = derive2 { name="archdata"; version="1.1"; sha256="07ca51kl5imy6d9s0qi501xxl3zn4q3gbm0w8kvznfw8imclq17z"; depends=[]; }; archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; archiDART = derive2 { name="archiDART"; version="2.0"; sha256="1ypbkj0wzpj8rhpjp3vc9yk7icjg40xn0ms11mcmhphkjpczmay5"; depends=[rgl XML]; }; @@ -3903,29 +3985,31 @@ in with self; { argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; argparse = derive2 { name="argparse"; version="1.0.7"; sha256="1ph13n8zv591vc427sihj765h27mkdrjyf1whg3as3i644bjsaqs"; depends=[findpython getopt proto rjson]; }; argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; }; + ari = derive2 { name="ari"; version="0.1.0"; sha256="05pva8jp7dhl46dm1fha6f8mavrs76a6c491fq3mavly8qcbgx44"; depends=[aws_polly progress purrr rmarkdown rvest tuneR webshot xml2]; }; arm = derive2 { name="arm"; version="1.9-3"; sha256="00773z8ai07s9wa2annzjqrxml3z13fh9zqls0z1n7s3h8fwrvqw"; depends=[abind coda lme4 MASS Matrix nlme]; }; arnie = derive2 { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; }; aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.1.0"; sha256="1slbmqr0qd8r9lrms7b86fhvn612g4yjbm604zahjr335q6d7h03"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; }; aroma_apd = derive2 { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; }; aroma_cn = derive2 { name="aroma.cn"; version="1.6.1"; sha256="1d9g81b12a3m03wrvb3cvg33fjybgiabpxhci2y2rr6diay42pmr"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; }; - aroma_core = derive2 { name="aroma.core"; version="3.1.0"; sha256="1hynag8jgjbxhnihpvv3zy3z5wdfg52ca9mly9bc649yh3gpmmxk"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; + aroma_core = derive2 { name="aroma.core"; version="3.1.1"; sha256="0mbhk818m8if6cr7g42yy7ba13jh2xs66xkx4zh7dqlwrrmgjnk1"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; arrApply = derive2 { name="arrApply"; version="2.0.1"; sha256="007fsqgb9bsr4mscljhp37dvrk7cv6nrb7y28w8kc7mxvgdq29wg"; depends=[Rcpp RcppArmadillo]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; }; ars = derive2 { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; }; - arsenal = derive2 { name="arsenal"; version="0.5.0"; sha256="0acqzq2g7bgyj9k3kn967akyjjk5rpnd598q2dw27zq0vyysaxr9"; depends=[testthat]; }; + arsenal = derive2 { name="arsenal"; version="0.6.0"; sha256="1p3yfqjbxg1j1k65n1lfnkgncsw1wbrbvswn5psvn9cdfnjnf939"; depends=[testthat]; }; artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; }; - arules = derive2 { name="arules"; version="1.5-2"; sha256="0i5cj2v86nmrqf4lr0jisfpvscjz6pp6d8kzaj1ry09d4j3z2siz"; depends=[Matrix]; }; + arules = derive2 { name="arules"; version="1.5-3"; sha256="04x29jdj0b7pz6rfxs1l4lvsf0xrpjaxw94p69cg3b3ymv822c79"; depends=[Matrix]; }; arulesCBA = derive2 { name="arulesCBA"; version="1.1.2"; sha256="0c37cffb89gsyv5shpgiksrh5hi2lzdqsk7xl8lxzz6mnv4v1xrj"; depends=[arules caret Matrix testthat]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; }; arulesSequences = derive2 { name="arulesSequences"; version="0.2-19"; sha256="1cncvrf7za38b3vdwbzy4yrbakj7jbpxrl1jg6bvjnlkymiajavx"; depends=[arules]; }; - arulesViz = derive2 { name="arulesViz"; version="1.2-1"; sha256="0x4hg5nhkga6zikl5ah5g0vvqfn0xw9277c9q4hfxp4x2hzdbsyy"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd]; }; + arulesViz = derive2 { name="arulesViz"; version="1.3-0"; sha256="0k9lq1w0cdk9mlbr5mwh87qrzank1nd8bwlymv4xyi7xm5y6wq4l"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; }; as_color = derive2 { name="as.color"; version="0.1"; sha256="1y5qpm0pabfk5qvgx6s2vqqxfhp1x99g7dva24zay34nvf4bxrzn"; depends=[]; }; asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; }; asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; }; asbio = derive2 { name="asbio"; version="1.4-2"; sha256="0f7zw4vmlklf8sc0sdhn67z15xawl0qaxsk7i29m98a2q8gfnjl4"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; ascii = derive2 { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; }; + asciiSetupReader = derive2 { name="asciiSetupReader"; version="1.0"; sha256="0xslny66fpfmgj6wxznnswzbd9riddh09g0v356m1aqb10z1by4a"; depends=[data_table readr stringr]; }; asd = derive2 { name="asd"; version="2.2"; sha256="0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"; depends=[mvtnorm]; }; - asdreader = derive2 { name="asdreader"; version="0.1-2"; sha256="0lfm0c5nzm276zaaxxwkpkqca5xg9r6ysfpgl6wvdbbvs9s83x4a"; depends=[]; }; + asdreader = derive2 { name="asdreader"; version="0.1-3"; sha256="15a922aw0v5w4hrha03xifx8cpifcc773gambgwqq6i5nz08ya26"; depends=[]; }; ash = derive2 { name="ash"; version="1.0-15"; sha256="1ay2a2agdmiz7zzvn26mli0x0iwk09g5pp4yy1r23knhkp1pn2lb"; depends=[]; }; ashr = derive2 { name="ashr"; version="2.0.5"; sha256="0blr19ipcanwjxizilkd8hb37dlhb6idjcw2lf0ll8pkd2l68f5z"; depends=[assertthat doParallel etrunct foreach pscl Rcpp SQUAREM truncnorm]; }; asht = derive2 { name="asht"; version="0.9.1"; sha256="1la0dnyxrl35pb531awfkajinx7bwf78gzm8f1pryh5x5g8lpli6"; depends=[bpcp coin exact2x2 exactci ssanv]; }; @@ -3967,7 +4051,7 @@ in with self; { astrolibR = derive2 { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; }; astsa = derive2 { name="astsa"; version="1.7"; sha256="1rzl1ayzv8lnn2009j4v667pp8sxdbn7qbqqyjpq00c75f4wss6x"; depends=[MASS]; }; asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; }; - asymmetry = derive2 { name="asymmetry"; version="1.2.2"; sha256="1l3i5ja0b3q83b7cnvzbdc4k2hy6166xfkgfhl1bggyf0cbf55v9"; depends=[gplots rJava smacof]; }; + asymmetry = derive2 { name="asymmetry"; version="1.2.3"; sha256="1h5jnpqbjdnr7x6imxm7rvhlhv1p4j8wc2k2zs521rdq2qj5ir5w"; depends=[gplots rJava smacof]; }; asympTest = derive2 { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; }; asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; }; atlantistools = derive2 { name="atlantistools"; version="0.4.3"; sha256="06rb0c4ralx55mdlqwpjzim0inxif4cdi9732v4h1ll8jhlm5v7d"; depends=[circlize dplyr ggplot2 gridExtra lazyeval magrittr proj4 purrr RColorBrewer RNetCDF rvest scales stringr tibble tidyr xml2]; }; @@ -3981,8 +4065,10 @@ in with self; { audio = derive2 { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; }; audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; }; audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; + augSIMEX = derive2 { name="augSIMEX"; version="1.0"; sha256="1d13kh9xfkpwy2285awhvgfkwyqlsdk2bypm0i1jjf10avrynxvf"; depends=[MASS Rcpp rootSolve]; }; auk = derive2 { name="auk"; version="0.0.2"; sha256="0vi1fs2nda77sfhq3xzqs04kd7fq14bknv7jqffa30g84bm8qkb1"; depends=[assertthat countrycode magrittr stringi stringr tidyr]; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; }; + auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; }; autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; }; autoSEM = derive2 { name="autoSEM"; version="0.1.0"; sha256="0s58dnpr7zyclk5vwaf7a2id6paqsnb224f0gpmj2nms4klsw323"; depends=[GA lavaan snowfall]; }; autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; }; @@ -4017,16 +4103,17 @@ in with self; { babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; }; babynames = derive2 { name="babynames"; version="0.3.0"; sha256="018wyajdkpvcywcvkna57m5sqnsh7i9zq2hqlyb8q93mgyb3ddzm"; depends=[tibble]; }; - backShift = derive2 { name="backShift"; version="0.1.4.1"; sha256="1vixr9l9zqaqy0knahijp6y9vzix4m8bz3abiprk3v2pjzg5nrvm"; depends=[clue ggplot2 igraph jointDiag MASS matrixcalc mvnmle reshape2]; }; + backShift = derive2 { name="backShift"; version="0.1.4.2"; sha256="1nj7mcdpzfzq68qg86rrys752gzw69n99yyb0jzg6r8qrgpcxj49"; depends=[clue ggplot2 igraph MASS matrixcalc mvnmle reshape2]; }; backblazer = derive2 { name="backblazer"; version="0.1.0"; sha256="020kdydksm0brnxsa00blf5sylxd4hz49wmngk1x1fx43kdlyc41"; depends=[httr jsonlite openssl]; }; backpipe = derive2 { name="backpipe"; version="0.1.8.1"; sha256="1nid5rbgwiq8axkrl2gwl4vr5bjq5k5nrhq7macddvijcn3r2dz8"; depends=[]; }; - backports = derive2 { name="backports"; version="1.1.0"; sha256="1kcz6j82by28cjk5wi2j6dfqdin1kib4y7d2r4h3zabcxmk6jly5"; depends=[]; }; + backports = derive2 { name="backports"; version="1.1.1"; sha256="15w8psmv203wzijrk4hvwaw3i4byh2m5s09yrkqwhfckhaj82kj9"; depends=[]; }; backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; }; backtestGraphics = derive2 { name="backtestGraphics"; version="0.1.6"; sha256="14l9dbkbcx4kl45kpjbq4ihzf47j859khhd1db40vnp8x57g9xcx"; depends=[dplyr dygraphs scales shiny xts]; }; bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; }; badgecreatr = derive2 { name="badgecreatr"; version="0.1.0"; sha256="070zb5jw817s9ykqc3dvzjqk48612gydkdc31svc0ji01s1y1545"; depends=[stringr]; }; badger = derive2 { name="badger"; version="0.0.2"; sha256="15qnb0a6rqsf1dbb1cf9ag2z5f4zhf8b8psxbsdhh42qrg8g3mma"; depends=[dlstats rvcheck]; }; bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; + bairt = derive2 { name="bairt"; version="0.1.1"; sha256="1i0y7bkhx0rsv93j32i2v3g2h3csxvnkkkx9kvkdnkcwzffps5x2"; depends=[coda mvtnorm shiny shinyjs]; }; baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; }; bamboo = derive2 { name="bamboo"; version="0.9.18"; sha256="1y95apf43bpgw15jh4bzqfyiqs2imdrmn4wmbplxgjn4369mbqq9"; depends=[rscala]; }; bamdit = derive2 { name="bamdit"; version="3.1.0"; sha256="148ikj7mly8m6kxs2n4gidi7kb70i3x2vbf9xsllrf0cgvrjccps"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; @@ -4049,10 +4136,10 @@ in with self; { batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; batch = derive2 { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; }; batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; }; - batchtools = derive2 { name="batchtools"; version="0.9.5"; sha256="0g49bgh9mvxwfw5pq0hza9svvr7rdwpd9pk72s37icsnj948bj5n"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi withr]; }; + batchtools = derive2 { name="batchtools"; version="0.9.6"; sha256="1yr5ar2c7jwm5c6q8gky6xi8fyp92y4nm0jvg0wcxb3lhwvmr42k"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi withr]; }; batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; }; batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; }; - bayesAB = derive2 { name="bayesAB"; version="1.0.0"; sha256="0m7nhzyq727gzs191ra39kdds634i39hxvflcfxfgl6l6px4zdcz"; depends=[ggplot2 Rcpp reshape2]; }; + bayesAB = derive2 { name="bayesAB"; version="1.1.0"; sha256="0g74n6jvpmb2sbmywcagb10rk8sd3pxzkw9s8s6qpg34q58v01a6"; depends=[ggplot2 Rcpp]; }; bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; }; bayesDP = derive2 { name="bayesDP"; version="1.2.2"; sha256="0lfw3mnk6kgpzg0h0r54k5dndgpbsb2i2q59qwsm6k14nz1b5n5j"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; }; @@ -4064,19 +4151,19 @@ in with self; { bayesMCClust = derive2 { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[bayesm boa e1071 gplots gtools MASS mnormt xtable]; }; bayesPop = derive2 { name="bayesPop"; version="6.1-1"; sha256="0vf82bf400wsm8pkp1pzsxylijajp01z6q260cdri12c0qjdzcy5"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2015]; }; bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; }; - bayesSurv = derive2 { name="bayesSurv"; version="3.0"; sha256="0p1kn7hc02v9vrnzicwh2vy5h7aw0mdhh2cssm09dp9wz4sajwgk"; depends=[coda smoothSurv survival]; }; + bayesSurv = derive2 { name="bayesSurv"; version="3.1"; sha256="1dbk9bi4l5m5hmn10i7qm3ypb5y91dxr7b01xvrb2wpn6i1s9h7n"; depends=[coda smoothSurv survival]; }; bayesTFR = derive2 { name="bayesTFR"; version="6.1-1"; sha256="12f3s1k7jalaqd3hxhlrn2i6nvzsmcgv5k1jfhbmk7py5b7ybj2p"; depends=[coda MASS mvtnorm wpp2017]; }; bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; }; bayesboot = derive2 { name="bayesboot"; version="0.2.1"; sha256="0gd3in9z8kx3d29dvyd8blmhlc7wxxl5b2hxnrrq0w13jcnsn57w"; depends=[HDInterval plyr]; }; bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; }; bayesianETAS = derive2 { name="bayesianETAS"; version="1.0.3"; sha256="0nbif0b6lcik2kh948zg5ska5mvkdsfr0dg8ndnfpscm2mp7y1dg"; depends=[]; }; - bayeslm = derive2 { name="bayeslm"; version="0.1.0"; sha256="1fbpw2dxhcq7zd7652gskq2x3sz0ad475ds3c2cq94d3aasvzjix"; depends=[Rcpp RcppArmadillo]; }; + bayeslm = derive2 { name="bayeslm"; version="0.2.0"; sha256="04p01rkgn2mbr0ihyclf1hsmr5410cihk4xwwcay7saxdbpsxn3d"; depends=[Rcpp RcppArmadillo]; }; bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; }; bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; }; bayesm = derive2 { name="bayesm"; version="3.1-0.1"; sha256="04b4s8clxrmdyhnhd2arnsdi992422yam3z91w6dzrmngwxq4yaq"; depends=[Rcpp RcppArmadillo]; }; - bayesmeta = derive2 { name="bayesmeta"; version="1.5"; sha256="0cdld4gvaaj1aqj2fjpg19a1ipym1ci099r4q5mjfnwb9n5ji2dx"; depends=[forestplot]; }; + bayesmeta = derive2 { name="bayesmeta"; version="1.6"; sha256="0drg3dwqq5zc70iq8a4znhk99k73vnczg45vna0d55p4ldr0nirf"; depends=[forestplot]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; }; - bayesplot = derive2 { name="bayesplot"; version="1.3.0"; sha256="0n07ii605dskf0x9bms7krx1akjghb4bmq76zm39sc1lshyxinrr"; depends=[dplyr ggplot2 reshape2]; }; + bayesplot = derive2 { name="bayesplot"; version="1.4.0"; sha256="0izp2v734n4pcdlfjrhasl2srlnhccsf93ni6hfhl5l5xyf02043"; depends=[dplyr ggplot2 reshape2 rlang]; }; bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; bayesreg = derive2 { name="bayesreg"; version="1.0"; sha256="0crld04cxxqw0xq2d4rdv040iq7vchwjbzacj0z8jv245hwgr9qy"; depends=[BayesLogit]; }; bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; }; @@ -4120,8 +4207,8 @@ in with self; { belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; }; benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; }; - benchmarkme = derive2 { name="benchmarkme"; version="0.4.0"; sha256="1x17nhpxvz51mllml8mhn9lzx5in1mmfi1f6arqw2xhxd6rkbjdz"; depends=[benchmarkmeData httr Matrix]; }; - benchmarkmeData = derive2 { name="benchmarkmeData"; version="0.4.0"; sha256="06nphyma03pmjynmck9mcnws6sjp32894wv8pvh9xa14ifxqf48f"; depends=[]; }; + benchmarkme = derive2 { name="benchmarkme"; version="0.6.0"; sha256="0w98q4b814bz3q0vqdfnwqrgfrky3ggsyyzmdiz17kv6xk17qds8"; depends=[benchmarkmeData doParallel foreach httr Matrix]; }; + benchmarkmeData = derive2 { name="benchmarkmeData"; version="0.5.1"; sha256="0vv5d90qv81lwrgi5d3zbwlwxwjqlx70xi4ljhcc0ljv50x2rvv4"; depends=[]; }; benchr = derive2 { name="benchr"; version="0.2.0"; sha256="042ijh6726s116z7w2cky5l105p3dj7xsfmlwkigsbrmya8x5d37"; depends=[Rcpp RcppProgress]; }; benford_analysis = derive2 { name="benford.analysis"; version="0.1.4.1"; sha256="0acbjjavbvsaigy78b5k9qhj8011751116lqln8j0v8w1k3vqwqm"; depends=[data_table]; }; bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; }; @@ -4150,8 +4237,8 @@ in with self; { bgsmtr = derive2 { name="bgsmtr"; version="0.1"; sha256="09h118msqf9yl2z7d6dsvgn4vrvy43ynznajj58k7gkxdlm1nimg"; depends=[coda EDISON Matrix mnormt mvtnorm sparseMVN statmod]; }; bhm = derive2 { name="bhm"; version="1.11"; sha256="1d35fvwk8v8b2x1knhsk5rz48hc5k9lkrxqd6y8p0gn63k5iy5ag"; depends=[coda survival]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; - bib2df = derive2 { name="bib2df"; version="0.2"; sha256="06gzkvf5fngijkicsi97a9vzabkc3af32mr52wl178y2pzigf4hc"; depends=[dplyr humaniformat plyr stringr]; }; - bibliometrix = derive2 { name="bibliometrix"; version="1.7"; sha256="11fnymbfrpw3r63lw1z4k4a8nni4lhzb4ddxv18azhaqawkf7hwh"; depends=[factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer rscopus SnowballC stringdist stringr]; }; + bib2df = derive2 { name="bib2df"; version="1.0.0"; sha256="0qhhv23lr5ya3jhqrx4x5zx3bl0mrjlwd8i30lbinl7hlz50ahgr"; depends=[dplyr httr humaniformat stringr]; }; + bibliometrix = derive2 { name="bibliometrix"; version="1.8"; sha256="1wzdyymmzikbkr41mw5s3srsvzh4zww8657r8i60dnf8dajgcryj"; depends=[factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer rscopus SnowballC stringdist stringr]; }; bibliospec = derive2 { name="bibliospec"; version="0.0.4"; sha256="0abrbaw2knnlh8g5r4c2i6cc7a6ilfxry8zhscrx0x58irmp790b"; depends=[DBI RSQLite]; }; bibtex = derive2 { name="bibtex"; version="0.4.2"; sha256="0wl3925ryd54g1nv3ncwllc493d39dpgy5md61940h69c0van1hz"; depends=[stringr]; }; biclique = derive2 { name="biclique"; version="1.0.1"; sha256="0wxvqjxc11ccvfnlnnb6gv6r74a48pg3yabsjynrg1m2kbynnqjf"; depends=[]; }; @@ -4160,7 +4247,7 @@ in with self; { bife = derive2 { name="bife"; version="0.4"; sha256="1h3r5vigs2ghga84smx492m0v9aq6gynnw5r23n20kkbiscv1fxk"; depends=[Formula Rcpp RcppArmadillo]; }; bigFastlm = derive2 { name="bigFastlm"; version="0.0.2"; sha256="012vxy5mpknc3998h382qdzgrxnyfpyddy003zjp3v42clim5y64"; depends=[BH bigmemory Rcpp RcppEigen]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; - bigKRLS = derive2 { name="bigKRLS"; version="1.5.3"; sha256="1dapdxk6bmbpixgxs04hb64wjx9nlr55gg76zpbnwbddwwmp2b28"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; + bigKRLS = derive2 { name="bigKRLS"; version="2.0.2"; sha256="0m58mjk3s4slpblxiby6j7fd2pha19nl7gl71f49k5gkz87skd2m"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; bigQueryR = derive2 { name="bigQueryR"; version="0.3.1"; sha256="1lhkd4yz7gybcsx0wsg2ikilns5xxmij5vpc1rsskwpsmgv7xwsh"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; }; bigRR = derive2 { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[DatABEL hglm]; }; bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; }; @@ -4175,16 +4262,20 @@ in with self; { bigpca = derive2 { name="bigpca"; version="1.0.3"; sha256="0hqkaamj5fyp2jw5727pkvmnqr194ngh4hlja14qmj81nr26a88p"; depends=[biganalytics bigmemory bigmemory_sri irlba NCmisc reader]; }; bigrquery = derive2 { name="bigrquery"; version="0.4.1"; sha256="07hi5z8l2qm9cjfc9y1y5vjijkkwmxq1dgz3bvv578kasz6yjs11"; depends=[assertthat DBI httr jsonlite progress readr]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-0"; sha256="0jjlv9qidn8xrz630wbyq7kz7vlxgaphv2y2siv90j01j5nj4s89"; depends=[quadprog]; }; + bigstatsr = derive2 { name="bigstatsr"; version="0.2.2"; sha256="0x46csllfdiyr0krsiicvlcdkafh114r6iv71barah3sfib6rash"; depends=[BH cowplot doParallel foreach ggplot2 glue magrittr Matrix Rcpp RcppArmadillo RSpectra]; }; bigstep = derive2 { name="bigstep"; version="0.7.4"; sha256="0g45fgnamdv1v3b8xvpsj4rzhisyvbbddwyzvzvmmi4a8w20pzn5"; depends=[bigmemory matrixStats R_utils RcppEigen speedglm]; }; bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; }; bigtcr = derive2 { name="bigtcr"; version="1.0"; sha256="1wh85r6f4jd8xzinczr5g1p1acbcyn4am3v1n4blfbn447l9nx4z"; depends=[]; }; bikedata = derive2 { name="bikedata"; version="0.0.4"; sha256="0j4zyphnmmgdckvlhf0sbmnjkz1xpbikfsgk111lpcn5dg1h526g"; depends=[BH DBI httr lubridate magrittr Rcpp reshape2 RSQLite tibble xml2]; }; bikeshare14 = derive2 { name="bikeshare14"; version="0.1.0"; sha256="12399c01s8p9rmpi3fpy4rm7xxnsf627slz3h234frbahhs882c4"; depends=[]; }; bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; }; + billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; }; + billboarder = derive2 { name="billboarder"; version="0.0.3"; sha256="1zw18cxsk4q6lbasig6bw2zjxws76rmpcp4qna4jdq6ars1p8sl1"; depends=[htmlwidgets jsonlite magrittr]; }; bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; }; binGroup = derive2 { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; }; binMto = derive2 { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; }; + binaryGP = derive2 { name="binaryGP"; version="0.2"; sha256="0i4xi0gxk0lamjdygyx0azdp3kfqmva1g20nl3p65w4yx77m88d6"; depends=[GPfit lhs logitnorm nloptr Rcpp RcppArmadillo]; }; binaryLogic = derive2 { name="binaryLogic"; version="0.3.5"; sha256="1zaqwkrr1dyxsbfa3zvz1ciipmqddl932jkw9r00qmnhdh3ybpa6"; depends=[]; }; binda = derive2 { name="binda"; version="1.0.3"; sha256="15rhxnlif7agblzd09gyllkqkf5d8cc75b4vmp7grx8a6y7w47g0"; depends=[entropy]; }; bindata = derive2 { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; }; @@ -4215,7 +4306,7 @@ in with self; { bioimagetools = derive2 { name="bioimagetools"; version="1.1.0"; sha256="0ws99rx7bhqi448qqy08jsl3c4vbq96gigqb85yv1mzrc82sg62p"; depends=[EBImage httr tiff]; }; bioinactivation = derive2 { name="bioinactivation"; version="1.1.5"; sha256="0m20947n2kzrfy8a592k1d9fg1xlv83vjf11pp4h5hhxd8fbm0w5"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS]; }; biolink = derive2 { name="biolink"; version="0.1.2"; sha256="12hpd50swnij9jzc8m6bz7iwmndgwmlyj7vnd8hvnz1gc68bjs2p"; depends=[memoise rentrez xml2]; }; - biomartr = derive2 { name="biomartr"; version="0.5.1"; sha256="05wmpq1g9zk4a5rc9zr5876ls8i1xjnw2sq777m17686fjws61q1"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite RCurl readr stringr tibble XML]; }; + biomartr = derive2 { name="biomartr"; version="0.5.2"; sha256="1q1zizfixi7rcbigxmi1vk271b704z5lxnzph9cqa3zwsv1clfxb"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite RCurl readr stringr tibble XML]; }; biomod2 = derive2 { name="biomod2"; version="3.3-7"; sha256="0mbf6j4m7vvq82l1grmznfqirj1ynr6jzzlpx0s2wjd3hdbvgzia"; depends=[abind dismo earth gbm ggplot2 MASS maxent mda nnet PresenceAbsence pROC randomForest raster rasterVis reshape rpart sp]; }; bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; }; @@ -4240,9 +4331,9 @@ in with self; { bivrp = derive2 { name="bivrp"; version="1.0"; sha256="0q00k24fssvjkgpndg84vdm7w9hswq593k6yjha4pl0a8bmnv6f8"; depends=[MASS]; }; biwavelet = derive2 { name="biwavelet"; version="0.20.11"; sha256="0fmk4b8gzbq0l4n08zq4pl1csaxxxi3hpqd886ccbhmg6zn8dz01"; depends=[fields foreach Rcpp]; }; biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; }; - bizdays = derive2 { name="bizdays"; version="1.0.3"; sha256="16187266vz5kzqlywiai6z0qkvcwmm67vl83pdkbjpqnswxwz57l"; depends=[]; }; + bizdays = derive2 { name="bizdays"; version="1.0.4"; sha256="0vl9anlwvnnaiz67h256r386gy57fbbygjahsjaiaw8zrp84fj3p"; depends=[]; }; bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; }; - blackbox = derive2 { name="blackbox"; version="1.1.0"; sha256="0iqicqfg1phcnb0a9r7fghhvvdk2826r48amp5l50bf4w1lpddv2"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; }; + blackbox = derive2 { name="blackbox"; version="1.1.2"; sha256="1r6pdd82gz7fy866abhgx7xm6c31x24yzk5gjpc6ws2m29lik3ba"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; }; blandr = derive2 { name="blandr"; version="0.4.3"; sha256="03w1k646izbrygcsynrzrph7crpqdqn58544mmm9zxfvkmsilpmi"; depends=[ggplot2 knitr]; }; blastula = derive2 { name="blastula"; version="0.1"; sha256="0i306x0xm34r9fz7iq8frjbcvfbgg64fm5nn7mbk29a58kn91axp"; depends=[commonmark ggplot2 glue htmltools httr knitr magrittr mailR rJava stringr]; }; blavaan = derive2 { name="blavaan"; version="0.2-4"; sha256="1bjczm5i9q1h3i1sl5p31jv87hi9bj4b546fi4g338ljqqrzx6a5"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; }; @@ -4262,7 +4353,7 @@ in with self; { blockmodeling = derive2 { name="blockmodeling"; version="0.1.9"; sha256="1rd8ifwv5q9yl0ayzkgi0h4k79w3r46dr164l73iz1ny77a78fn9"; depends=[]; }; blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; }; blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; - blocksdesign = derive2 { name="blocksdesign"; version="2.6"; sha256="0lxf7wkyfhcr52b2pn3ifmr0k48lr85nimr9yybdamp47rvd4yxw"; depends=[crossdes]; }; + blocksdesign = derive2 { name="blocksdesign"; version="2.7"; sha256="0pkkp1i6dsj4q4p6529qkbyy8mqmw9zhs1ww1y55yn1adkkwfd4z"; depends=[crossdes]; }; blockseg = derive2 { name="blockseg"; version="0.2"; sha256="183hjb66589qqjwf14rzdmy770biad73r0l5pkh6f4xk9xac1r62"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; }; blogdown = derive2 { name="blogdown"; version="0.1"; sha256="05cicpk8yv7v2fbq0yg8rqga88by0zr1ygr7phmsb4fzgzmv709n"; depends=[bookdown htmltools httpuv knitr rmarkdown servr yaml]; }; blsAPI = derive2 { name="blsAPI"; version="0.1.9"; sha256="1p7s799kix396fbx8ap9vy9akwpaps37awr18qbj53n9qcm74wkp"; depends=[RCurl rjson]; }; @@ -4272,10 +4363,11 @@ in with self; { bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; }; bmixture = derive2 { name="bmixture"; version="0.5"; sha256="144nd1s18nyii135jfr2f65szyzw8hi4zg57z85dnmr2xwas22qb"; depends=[BDgraph]; }; bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; }; - bmlm = derive2 { name="bmlm"; version="1.3.0"; sha256="0ahkfg6d10729p4vq77ly2sf667jnyf7ysp3rap87l8vgy24aris"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; }; + bmlm = derive2 { name="bmlm"; version="1.3.3"; sha256="0r9x4yfi583733r1qmrbcw8smw7w9crf48kwi2fwbyi5ysvpi7ms"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; }; bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; - bmp = derive2 { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; }; + bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; }; bmrm = derive2 { name="bmrm"; version="3.4"; sha256="1588nz3h05sss94sa1d87v5si7p3316canxc2dbbdqgv51ds377w"; depends=[LowRankQP lpSolve matrixStats]; }; + bnclassify = derive2 { name="bnclassify"; version="0.3.3"; sha256="11c1sraxlz9sgyg6i257asmxx9pnf0qcblnjp0pwlh1r50h0z5wa"; depends=[assertthat entropy graph matrixStats RBGL rpart]; }; bnlearn = derive2 { name="bnlearn"; version="4.2"; sha256="1k9zfz8sc3ikrxp513cjgxw6fgxx9knz3wv5nikpcjmmrvlvwqya"; depends=[]; }; bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; @@ -4286,11 +4378,12 @@ in with self; { bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; }; boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; }; bold = derive2 { name="bold"; version="0.5.0"; sha256="0gdmb3zsspcp594d32yzqhdpw4dwg7a3pfm7kgbghz368yw662gl"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; }; + bomrang = derive2 { name="bomrang"; version="0.0.7"; sha256="0az3vl2qmbb1v0wjr75lg5qypzfi3vgcn48k4ma3q8ack0nwpm1c"; depends=[curl data_table dplyr foreign httr janitor jsonlite magrittr rappdirs raster readr rgdal rlang rvest tidyr xml2]; }; bookdown = derive2 { name="bookdown"; version="0.5"; sha256="0zm63kr4f4kja4qpwkzl119zzyciqj7ihajfqgfjpgb4dzaiycxp"; depends=[htmltools knitr rmarkdown yaml]; }; bookdownplus = derive2 { name="bookdownplus"; version="1.3.0"; sha256="1297hwxkc1i3h706p135704rxc2hhkppmwkq5b04d7d03a1kv9pn"; depends=[bookdown knitr yaml]; }; boolean3 = derive2 { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; }; boostSeq = derive2 { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; }; - boostmtree = derive2 { name="boostmtree"; version="1.1.0"; sha256="1k6cwiz6354xgmqyadm4vfrl4szcr2c9mgxgmmngdc28p7sm50i7"; depends=[nlme randomForestSRC]; }; + boostmtree = derive2 { name="boostmtree"; version="1.2.0"; sha256="0sn22imcq8w9c1347d1pd680xlkh47s687100y6mh3xrwa1x5nsj"; depends=[nlme randomForestSRC]; }; boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; boot = derive2 { name="boot"; version="1.3-20"; sha256="0ai1qpm0p4z07xr0dvag8sdn9jrxcwanrsk9khzmww094jvr1jxd"; depends=[]; }; bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; }; @@ -4298,13 +4391,13 @@ in with self; { bootRes = derive2 { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; }; bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; }; bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; - bootnet = derive2 { name="bootnet"; version="1.0.0"; sha256="101a1d7x4f09j175n7n3czzihqnpl1pia0rk2q08a6s2zbl1z44m"; depends=[abind corpcor dplyr ggplot2 gtools huge igraph IsingFit IsingSampler Matrix mgm mvtnorm parcor qgraph relaimpo tidyr]; }; + bootnet = derive2 { name="bootnet"; version="1.0.1"; sha256="1r5kbcycdlb8g4zs5vsrmcxl20a6x2kj47ybz6h1s83rqiylxg1b"; depends=[abind corpcor dplyr ggplot2 gtools huge igraph IsingFit IsingSampler Matrix mgm mvtnorm parcor qgraph relaimpo tidyr]; }; bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; }; bootsPLS = derive2 { name="bootsPLS"; version="1.0.3"; sha256="0jkpci97chbvlfkcbbj3gm2dnj5aiwfrh739kd4fa0zra4ac1adh"; depends=[mixOmics]; }; bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; }; bootstrap = derive2 { name="bootstrap"; version="2017.2"; sha256="08lmsy7k8wsgv89yc904c6fidcymr1ma2ry4fl0p69p21v4iiwa4"; depends=[]; }; boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; }; - boral = derive2 { name="boral"; version="1.3.1"; sha256="0kwgjfp4r8a2mph83n3ljlqr7077i4f8dvbk2kz80n5jq48v84j0"; depends=[abind coda fishMod MASS mvtnorm R2jags]; }; + boral = derive2 { name="boral"; version="1.4"; sha256="1risn5f48l5rmrx5pyifbrcbh92v94siqlwwiz2jljnhgsqgc1d4"; depends=[abind coda fishMod MASS mvtnorm R2jags]; }; bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; }; boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; boxcoxmix = derive2 { name="boxcoxmix"; version="0.13"; sha256="16hqhdlh04v7dfk44anvsa9vp2yziwwf7xccm9wknqpbbwif39p2"; depends=[qicharts statmod]; }; @@ -4324,6 +4417,7 @@ in with self; { brainR = derive2 { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[misc3d oro_nifti rgl]; }; brainwaver = derive2 { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; }; brant = derive2 { name="brant"; version="0.1-3"; sha256="1h6aygqcdn2wmxl8mgpq6w2rpr0asqw521i0bkgl37cwzc8sk3c0"; depends=[MASS]; }; + brazilmaps = derive2 { name="brazilmaps"; version="0.1.0"; sha256="1nvd8x4m4m3966qph6390kqwpsrv7vy4yf6pam98xxkjbl9a41nf"; depends=[dplyr ggplot2 magrittr sf sp]; }; brea = derive2 { name="brea"; version="0.1.0"; sha256="0jawpl4d7himydb9z4kqpa7s6b7ghw9yp5j6xvzilbka0agpazck"; depends=[]; }; breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; }; breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; }; @@ -4339,10 +4433,10 @@ in with self; { bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; }; bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; }; bridgesampling = derive2 { name="bridgesampling"; version="0.2-2"; sha256="0sz3svkfwn0xf8z2h3mhz5lnybfph6jky0p1rzpa2adxwg0fsvjg"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; - briskaR = derive2 { name="briskaR"; version="0.1.0"; sha256="0fx254pc250jv53kmd6miw8blcp43c72myah9g5ns2s84pcdmx6h"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; + briskaR = derive2 { name="briskaR"; version="0.1.1"; sha256="0w614lb94vim6wlzj13gnfgkq0vg9fjlvwvvs11pnqq501qn2hzl"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; brlrmr = derive2 { name="brlrmr"; version="0.1.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; }; brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; }; - brms = derive2 { name="brms"; version="1.9.0"; sha256="0lkkgabcy7jink5xr85q1r6m8gpmvzclpd7m63g4kaqblzi4xwx5"; depends=[abind bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools shinystan]; }; + brms = derive2 { name="brms"; version="1.10.0"; sha256="19wv02kgrfxnbxmhf4gxwls9dkba6qnnhsf6vcgmgw7q80dh533c"; depends=[abind bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools shinystan]; }; brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; }; broman = derive2 { name="broman"; version="0.65-4"; sha256="0cmcyifp49c1m3sawcs5ijjl218wk4sffvr68dfi3y9vh58f5iss"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; broom = derive2 { name="broom"; version="0.4.2"; sha256="0i2s3jbi0v5xhbqkmms4f17i3x9s6lan4bj521qmxwiwc89r8h4z"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; }; @@ -4369,8 +4463,8 @@ in with self; { bulletr = derive2 { name="bulletr"; version="0.1"; sha256="181rnrp62almf08gr41qnrnq8qnbqraqdvj4zixdh8fachsq2imp"; depends=[dplyr ggplot2 plotly plyr reshape2 robustbase smoother xml2 zoo]; }; bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; }; bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; }; - bupaR = derive2 { name="bupaR"; version="0.2.0"; sha256="0kwhb4izhlay0lc768xsqc85mz94lphn6lasr208pl0v0ryddda5"; depends=[data_table dplyr magrittr miniUI shiny]; }; - burnr = derive2 { name="burnr"; version="0.2.0"; sha256="032ymd3c4bpljfj3g52fzmw0dpy3idpmlmz1780743mm3fjl04bx"; depends=[ggplot2 MASS plyr reshape2]; }; + bupaR = derive2 { name="bupaR"; version="0.3.0"; sha256="0732h95pv8a235qvaydfaziwbq0q2gxmn4ffh7n1ar4azkgc94l3"; depends=[data_table dplyr magrittr miniUI purrr shiny]; }; + burnr = derive2 { name="burnr"; version="0.2.1"; sha256="138n52rwlkkxpbrz65cfcv9rp4vp4c17w9ydpqfk9fa8b3sqhhsn"; depends=[ggplot2 MASS plyr reshape2]; }; bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; }; bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; }; bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; }; @@ -4383,7 +4477,7 @@ in with self; { c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive2 { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; }; cIRT = derive2 { name="cIRT"; version="1.2.1"; sha256="1i43pqlyzykyd1a6abg1yi7ai9ay7d2jkvnw1sa4c6q07jk56d89"; depends=[Rcpp RcppArmadillo]; }; - cOde = derive2 { name="cOde"; version="0.2.2"; sha256="0v26ilbkg2af4mgn639mnslvvwlsq6il3pxx5brwdsd4816saav4"; depends=[]; }; + cOde = derive2 { name="cOde"; version="0.3"; sha256="1r49q7qansn86wrxbhxqnn1dccd9av4lh4h5pn9kk42pls9q60nf"; depends=[Rcpp RcppArmadillo]; }; cSFM = derive2 { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[MASS mgcv mnormt moments sn]; }; ca = derive2 { name="ca"; version="0.70"; sha256="0730c7nk49hz0k1i5nnhq2j3wbhrlhr1qvb50mk8vmqkbhb1pz1l"; depends=[]; }; caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; }; @@ -4392,7 +4486,7 @@ in with self; { cabootcrs = derive2 { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; }; cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; }; caesar = derive2 { name="caesar"; version="0.1.0"; sha256="1l0z64fsifx37j2h61kzygbwr3z3cncn48znrpb5cq10ma42igqf"; depends=[binhf]; }; - caffsim = derive2 { name="caffsim"; version="0.2.0"; sha256="0ai6glh21b0mrprz3haib44czkby8c50qp6sma47lb09s578333c"; depends=[dplyr ggplot2 mgcv]; }; + caffsim = derive2 { name="caffsim"; version="0.2.2"; sha256="00bkgmmqrydpji2pvhcchgl2p8w5ksby4g80i3h76q0bm2325w9h"; depends=[dplyr ggplot2 markdown mgcv shiny tibble tidyr]; }; cairoDevice = derive2 { name="cairoDevice"; version="2.24"; sha256="1xbjxz1cxnwzvb6hjns2kk97krmx24chpyvjaa25xwmvy4x6qcps"; depends=[]; }; calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; }; calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; }; @@ -4405,9 +4499,9 @@ in with self; { camtrapR = derive2 { name="camtrapR"; version="0.99.8"; sha256="06sl3rlzgjf3yq9y0sg664xc0xfxwlvvd5w4wr5946h6kwvnhih4"; depends=[overlap rgdal ritis secr sp taxize]; }; cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; }; cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; }; - candisc = derive2 { name="candisc"; version="0.7-2"; sha256="0sbvngpyni4pagqb5xqjnk5yjd391rdjqq7aypnm2wd3i1am90hm"; depends=[car heplots]; }; + candisc = derive2 { name="candisc"; version="0.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; }; canprot = derive2 { name="canprot"; version="0.1.0"; sha256="0g3sqc81qw8jx6v2p6makclccnvhshimwlhk2cabq20rfs8npgbm"; depends=[CHNOSZ colorspace xtable]; }; - canvasXpress = derive2 { name="canvasXpress"; version="0.16.7"; sha256="129ks8iaakcci0s61xnajyhgzrmkm2dznnrg4gdr0gvbj8wqamkx"; depends=[htmlwidgets]; }; + canvasXpress = derive2 { name="canvasXpress"; version="0.17.2"; sha256="138385yc84py49fgq5b074c3f52s9hvcqsvlmfr9zlcj8wcs17mi"; depends=[htmlwidgets]; }; cape = derive2 { name="cape"; version="2.0.2"; sha256="0ngm9scd3f2zcy7gy0lqk05cgbfrhhcss3mj5g6bj0byhgwd7msn"; depends=[corpcor doParallel evd fdrtool foreach HardyWeinberg igraph Matrix qpcR RColorBrewer regress shape]; }; caper = derive2 { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; }; capm = derive2 { name="capm"; version="0.11.0"; sha256="1yw7h1r5m4md8yv0fn1j4wxvhwybifqyvrn8ip3fl32kxbwsmnvz"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; }; @@ -4417,25 +4511,26 @@ in with self; { capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; }; capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; car = derive2 { name="car"; version="2.1-5"; sha256="1bm0ks9ga60z3izgq0d4kvirr9v4yf1820d1wznkihnbb55bc3m6"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; + carData = derive2 { name="carData"; version="3.0-0"; sha256="1ggz4py77bgwlpl6rsv7vlxj1kjs6c10dskizwwjps910r76pd79"; depends=[]; }; carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; cardidates = derive2 { name="cardidates"; version="0.4.7"; sha256="0dxb2941w56s479laf315hqh9iv3k2l1ds7k8hdl9akcacagjgs2"; depends=[boot lattice pastecs]; }; cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; }; care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; }; - caret = derive2 { name="caret"; version="6.0-76"; sha256="1w31xzpmj8p6r6s7s1vwnjxainq54bbh4cqm177ba0myv69hh8cc"; depends=[car foreach ggplot2 lattice ModelMetrics nlme plyr reshape2]; }; + caret = derive2 { name="caret"; version="6.0-77"; sha256="05c504567s2nppzfgi36mhszbym2pr80nf50dgxcxfx030721v5y"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; }; caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; caroline = derive2 { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; }; carpenter = derive2 { name="carpenter"; version="0.2.1"; sha256="1f6g85qgd53wzha8kfq8x29lb5wilgxm6bj49znzd1qj03nlnpna"; depends=[dplyr lazyeval magrittr pander tidyr]; }; cartogram = derive2 { name="cartogram"; version="0.0.2"; sha256="055aq2fmbx6ypyqsj427l37px8fld4b9bmc2kcmsi6fmnncb5pxa"; depends=[rgeos sp]; }; - cartography = derive2 { name="cartography"; version="1.4.2"; sha256="1bqadjn1h9xlmswjsylipgni2f78lld4v0y0vybi0cd68m22wxp2"; depends=[classInt raster rgeos rosm sp]; }; + cartography = derive2 { name="cartography"; version="2.0.1"; sha256="0ji5igf6vs07aagmj7lwarlmb32jjk5fja9a975cpd38fsj9a5v2"; depends=[classInt raster Rcpp rgeos rosm sf sp]; }; carx = derive2 { name="carx"; version="0.6.2"; sha256="1wijkpbv2x75ay9pba4sjazjpalrd31zclnnansmhghf1wiizciq"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; }; caschrono = derive2 { name="caschrono"; version="2.0"; sha256="091zqin2cr9p50zmifrb52dxy10zflm7f0lr9nissy589qjdd0gk"; depends=[Hmisc zoo]; }; caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; }; casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; }; - castor = derive2 { name="castor"; version="1.1"; sha256="15ma7zhd53x2ncmnaqn6g1phsr4zbhx62g0c7lm6yw9amdcfyxfn"; depends=[naturalsort Rcpp]; }; + castor = derive2 { name="castor"; version="1.2.1"; sha256="1pgpcsw272spf0bvrq1nmyxh8ih0hccj82k91z09nzd1i74yz46g"; depends=[naturalsort Rcpp]; }; cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; }; - catR = derive2 { name="catR"; version="3.12"; sha256="15db9mfpnrrghiksfrfqqwfhw6fwlqlabc12xq1szg010k343dvb"; depends=[]; }; + catR = derive2 { name="catR"; version="3.13"; sha256="1xzxgf9d33h46qxz6a8d71mi673yzdnvxcxj073z7y19hjss3pkw"; depends=[]; }; catSurv = derive2 { name="catSurv"; version="1.0.3"; sha256="1qjmjdmc81inim5kpwh4k2r3cffmkyp2wpcqqzv731hciqrad8a8"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; }; catdap = derive2 { name="catdap"; version="1.2.4"; sha256="0vvrlbdjml1cxf6jafjycv0k3kzd2xy1zcwjv0rh3cswxmvpnh3a"; depends=[]; }; catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; @@ -4446,11 +4541,12 @@ in with self; { catmap = derive2 { name="catmap"; version="1.6.4"; sha256="18449qh10jxfi8p49gmbnib5y013nfdgdblbs4n0mfs0nnzb10sx"; depends=[forestplot metafor]; }; catnet = derive2 { name="catnet"; version="1.15.0"; sha256="0z2ps2wb33hc0dg08v70gvpy2zibr6kqjjv90g07hkmrhp6zjk5n"; depends=[]; }; catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; + causalMGM = derive2 { name="causalMGM"; version="0.1.1"; sha256="13qx71rfc6m7mvlpwma7ks09f3mlxknxw3jlv3b4iq5pjs8f1v5r"; depends=[rJava]; }; causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; }; - causaleffect = derive2 { name="causaleffect"; version="1.3.4"; sha256="186ndqlz501zzmls0vbfprqbfgz0faqr2l64zr8i7j5asxmwzija"; depends=[ggm igraph XML]; }; + causaleffect = derive2 { name="causaleffect"; version="1.3.5"; sha256="12acm5k1nx6axhxfsiqwyaplfl5z8zzjr3kwk1hdzdrmxni6vhxs"; depends=[ggm igraph XML]; }; causalsens = derive2 { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; }; cba = derive2 { name="cba"; version="0.2-19"; sha256="0nyssc7j5rkv1gcgx4cg31hwc37wd5k3yn9s2k22ffxlnrknss2l"; depends=[proxy]; }; - cbanalysis = derive2 { name="cbanalysis"; version="0.1.0"; sha256="170rhycd78k8ivibvaa7r5hx64wpqwb067s182iwx51fb2yf01a7"; depends=[]; }; + cbanalysis = derive2 { name="cbanalysis"; version="0.2.0"; sha256="0h0h8krlb6rckjpcw0jbbr8pcy3jm0cszimbm56l0ca668kiix06"; depends=[]; }; cbar = derive2 { name="cbar"; version="0.1.2"; sha256="1y7p0ygxy5c53ms5ylrvw4zlj66z8sj4py21q018g2i6cmwb5vc5"; depends=[Boom bsts dplyr ggplot2 magrittr]; }; cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; }; cbsodataR = derive2 { name="cbsodataR"; version="0.2.1"; sha256="0nsg0fzaqhzv8r2lwz5xlybwgv25c0a2hid91ky95yaqvnjrp6mq"; depends=[jsonlite whisker yaml]; }; @@ -4462,28 +4558,31 @@ in with self; { cccp = derive2 { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; }; cccrm = derive2 { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; }; ccda = derive2 { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; }; - ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.3"; sha256="0b5rm17zqf4w22vfjhp13wjqrds7f6mbvmd0kazxrnrnb10799a3"; depends=[Rcpp sparsebnUtils]; }; + ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.4"; sha256="192pfsk6yw26b6f23qgkxslsfwpav8zv6js46i61vj2wa10f4mf2"; depends=[Rcpp sparsebnUtils]; }; ccgarch = derive2 { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; }; - cchs = derive2 { name="cchs"; version="0.3.0"; sha256="0163qvy1k39bwbbidr7wj6cs0nv8m8nh0as9532j8mshq14d0i8c"; depends=[survival]; }; + cchs = derive2 { name="cchs"; version="0.4.0"; sha256="1dahiyn3rj65w56hmhqdxvxh7vkjy5rxlkp1l59aq5iba21ldsyj"; depends=[survival]; }; cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; }; + ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; }; cctools = derive2 { name="cctools"; version="0.1.0"; sha256="1x35dxmyyjbf3v2hsbbnq2f88zy5sk6qz3xzx9p2kg5wi5187xl5"; depends=[qrng Rcpp RcppArmadillo]; }; cda = derive2 { name="cda"; version="2.0.0"; sha256="1vq90z6kafiz5b884hxsz3lg8a0zis1n475lmvwlymcam5rpgjrc"; depends=[randtoolbox Rcpp RcppArmadillo reshape2 statmod]; }; cdata = derive2 { name="cdata"; version="0.1.5"; sha256="1pqy186x7s3kdiz07b963n57jh83acs9ri0k1h44gfjrywj8jdyx"; depends=[dplyr tibble tidyr wrapr]; }; cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; cdcfluview = derive2 { name="cdcfluview"; version="0.5.1"; sha256="0k63hrx3cc04xpi2sxl5g8mn7lc7rh4q33mj3filyiyppj16jixf"; depends=[dplyr httr jsonlite purrr readr V8 xml2]; }; cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; }; - cdfquantreg = derive2 { name="cdfquantreg"; version="1.1.1"; sha256="17ghqcxnaz25n0qrar1bs2i4hcpn1gdzdv53r4krivdzkbi9p90a"; depends=[Formula MASS pracma]; }; + cdfquantreg = derive2 { name="cdfquantreg"; version="1.1.3"; sha256="08l9kg4rclgh29r8cyk3d0619k4mkw2vj1phiyww4qr1dn5ssnda"; depends=[Formula MASS pracma]; }; cdlTools = derive2 { name="cdlTools"; version="0.11"; sha256="0jqr0j6hwqwx574659i3mfzf4hcmmxfd3x28d52dwgpwsv0r10gn"; depends=[raster RCurl rgdal XML]; }; cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; }; + cdparcoord = derive2 { name="cdparcoord"; version="1.0.0"; sha256="0a08rpc7chqbix10jimjh46dy6val97mrzqk972pq446b6ci95sn"; depends=[data_table freqparcoord magrittr partools plotly]; }; cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; }; cec2005benchmark = derive2 { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; }; cec2013 = derive2 { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; }; - celestial = derive2 { name="celestial"; version="1.3"; sha256="0icsrpw8y7r0ls8ch5b25fl4rnvs6x5y2wscmcmpp4fa4x64qqg6"; depends=[RANN]; }; + celestial = derive2 { name="celestial"; version="1.4.1"; sha256="0cvfka5lj0sj9cd7xs68szhckzfm6cgxwxim1nd530s6gxh0l7kz"; depends=[NISTunits pracma RANN]; }; cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; }; cellWise = derive2 { name="cellWise"; version="1.0.0"; sha256="1cpkz256z6ngqdd1wa0ajyjcl0j1xln2f0hwsw24wfzgb8sdj6ac"; depends=[ggplot2 gridExtra matrixStats reshape2 scales]; }; cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; }; cem = derive2 { name="cem"; version="1.1.17"; sha256="1jnhsrc1jhax3zlw9ynla7g9z5i4w01iar7f7hmv92kp1cwh8rbd"; depends=[combinat lattice MatchIt nlme randomForest]; }; cems = derive2 { name="cems"; version="0.4"; sha256="0mk02m702xfr1gh0l3973z1hdpncgjl2vfd1k1iss5s64k56gs4q"; depends=[plotrix rgl vegan]; }; + cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; }; censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; }; censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; censReg = derive2 { name="censReg"; version="0.5-26"; sha256="1g69261ajha9p762xg2a5pj127b9pfws6ylpiqhjv7h96n12f2pi"; depends=[glmmML maxLik miscTools plm sandwich]; }; @@ -4516,7 +4615,7 @@ in with self; { cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; }; chebpol = derive2 { name="chebpol"; version="1.3-1789"; sha256="1505zdzvc9drw7n8qw5jmqligjgp5gwwki4wlk8dsm0p3p06dvd2"; depends=[]; }; checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; }; - checkmate = derive2 { name="checkmate"; version="1.8.3"; sha256="04rxabzamhv6ybynx627sxk02qvq8znkv0y10vmq67xx6pxhqvla"; depends=[backports]; }; + checkmate = derive2 { name="checkmate"; version="1.8.4"; sha256="1xpq73myr39i33mwihvy494sam77hb3z15yr172a31d8wn1qi53g"; depends=[backports]; }; checkpoint = derive2 { name="checkpoint"; version="0.4.1"; sha256="0hp37scj0iaivwk5w2vprq2yzqfpg6zi19nzaxzaz8w2sk8dql7v"; depends=[]; }; cheddar = derive2 { name="cheddar"; version="0.1-631"; sha256="0s6v3xcpv8ppgx6q6h2hgrjcf3f3i87kmylnr9q9zhry7729aiyn"; depends=[]; }; chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; depends=[]; }; @@ -4525,11 +4624,11 @@ in with self; { cherry = derive2 { name="cherry"; version="0.6-11"; sha256="0ixrzbzg559h0qb33b9158rk6w6as2b34b7iq5vzm429cpyzl7l8"; depends=[bitops lpSolve Matrix slam]; }; chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; }; chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; }; - childsds = derive2 { name="childsds"; version="0.6.5"; sha256="17i64vcwlhcsmwbsqcrjz9j8m6bacd8ms2ijqf8xc1q6k3nk7pcj"; depends=[boot class dplyr gamlss gamlss_dist magrittr tidyr]; }; + childsds = derive2 { name="childsds"; version="0.6.6"; sha256="0k2xiq4jgs206fxpj6hvfyc79cnsl3qfghjqhkra72hpj74ii4y9"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr reshape2 tibble tidyr]; }; chillR = derive2 { name="chillR"; version="0.66"; sha256="1qw9l3drw3r4an1jy2bckaslwla3s5fvpqr7ahvd2m6alx05b0k6"; depends=[fields httr Kendall pls raster readxl RMAWGEN sp XML]; }; - chinese_misc = derive2 { name="chinese.misc"; version="0.1.6"; sha256="0mm21mla6wxa62k2hq5cp6489n41a8n11l3vzrjj5a6wma9ddc2q"; depends=[jiebaR Matrix NLP Ruchardet slam stringi tm]; }; + chinese_misc = derive2 { name="chinese.misc"; version="0.1.7"; sha256="1asv4538p42r8mhvkcp0f2h75nq3bwm0v5arwc7masdmpp4fqayn"; depends=[jiebaR Matrix NLP Ruchardet slam stringi tm]; }; chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; - chngpt = derive2 { name="chngpt"; version="2016.7-31"; sha256="1hjqdkqai6aij3giarbxasijipb376qm081ri9w6snd5gy6izzsi"; depends=[boot kyotil MASS survival]; }; + chngpt = derive2 { name="chngpt"; version="2017.08-28"; sha256="0dpfkpp79wrxlfa1x6jhz3lfrbdm1m4h04fiwn8fys75yn1inkcy"; depends=[boot kyotil MASS survival]; }; choiceDes = derive2 { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; }; cholera = derive2 { name="cholera"; version="0.2.1"; sha256="0w213qlnkwbs7y1z5kmxicrbimkqlws46w12vadghf96rn1pb4fv"; depends=[deldir HistData igraph pracma RColorBrewer scales sp]; }; choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; @@ -4552,6 +4651,7 @@ in with self; { citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; citr = derive2 { name="citr"; version="0.2.0"; sha256="1nzn0yw74k6zkwzb6spfzqkj3cbx6ry6ypbsnhy6w2flabnnvy4v"; depends=[assertthat curl miniUI RefManageR rstudioapi shiny yaml]; }; + civis = derive2 { name="civis"; version="1.0.2"; sha256="1y4f7sqr2wxibr9kfvpq1b743c9b1zi5w8ir67l9r2dx65fchypq"; depends=[DBI dbplyr devtools dplyr ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; }; cjoint = derive2 { name="cjoint"; version="2.0.5"; sha256="0q2mp790maphiz77lw1lashgfcl2a174mmxw65hfvvv7m49plcy3"; depends=[ggplot2 lmtest Matrix sandwich survey]; }; ck37r = derive2 { name="ck37r"; version="1.0.0"; sha256="0nn2sfsfs8mhgjrz0ghn041ybhj2qim4rs3lkci7s4n95c8hbgdi"; depends=[caret cvAUC doParallel doSNOW foreach ggplot2 pryr randomForest RANN reader RhpcBLASctl ROCR snow stringr SuperLearner tmle]; }; ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; }; @@ -4574,8 +4674,8 @@ in with self; { cleangeo = derive2 { name="cleangeo"; version="0.2-2"; sha256="1bhpn53v36652mwg2ba2a6cs34slb7i0df2ibssyr2lnx5gciq4i"; depends=[maptools rgeos sp]; }; cleanr = derive2 { name="cleanr"; version="1.1.3"; sha256="0vf2c2inb729kzmpxaznqa2zwj80j1ix9198gc36zq41ag5pd7jk"; depends=[checkmate]; }; clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; }; - clhs = derive2 { name="clhs"; version="0.5-6"; sha256="0m7pw655d6jidrppk1z84z35n93k1alwq43jh28lf81ydw8finma"; depends=[ggplot2 plyr raster reshape2 scales sp]; }; - clickR = derive2 { name="clickR"; version="0.2.9"; sha256="1wzqfxwi0jala9n5ai1f0mi8gvmfa2f6n0yn766ajzn6y6vd8m8v"; depends=[beeswarm ClustOfVar lme4 lmerTest lqmm ordinal ReporteRs xtable]; }; + clhs = derive2 { name="clhs"; version="0.5-7"; sha256="0n7zy8wf78lka1l0zm42zxwi24bvavfy3irfqcnz5nslqkg61il2"; depends=[ggplot2 plyr raster reshape2 scales sp]; }; + clickR = derive2 { name="clickR"; version="0.3.29"; sha256="15z6gv3gfimhzhn0zm1n8s931mnx05f5hd04wh32xc9n432pb0ik"; depends=[beeswarm boot lme4 lmerTest ReporteRs xtable]; }; clickstream = derive2 { name="clickstream"; version="1.2.1"; sha256="1wan098mp2ml194al616h9qvv69q5l19218ja2x9j1qdq9dgp978"; depends=[arules ClickClust data_table ggplot2 igraph linprog plyr reshape2 Rsolnp]; }; clifro = derive2 { name="clifro"; version="3.1-4"; sha256="1llzdcm4h060pajbh3avn209b717gipxw67rslpbxl1xa4vg1rdn"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; }; clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; }; @@ -4603,21 +4703,23 @@ in with self; { clues = derive2 { name="clues"; version="0.5.9"; sha256="0znlsbfmnz5wkp2cswrkjbgchdmmf7h78mv2zwx382m9n9n9hshy"; depends=[]; }; clusrank = derive2 { name="clusrank"; version="0.5-2"; sha256="168xad5dyz46yxm139q09n9vp1304yrhikxz5bcfzhm3psyv5fbf"; depends=[MASS Rcpp]; }; clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.0.6"; sha256="0hmj85byw1j1b1crb7nj12wz0rddp5cg21jg1dwg7b0mn5xvy981"; depends=[]; }; + clustEff = derive2 { name="clustEff"; version="0.1.1"; sha256="149x9m9x1yxh48ky54gyzps4pdh4jq36bz59ri3xd6v19i8r1ws3"; depends=[cluster fda qrcm]; }; clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; }; - clustMixType = derive2 { name="clustMixType"; version="0.1-25"; sha256="0pxdyay65fgarj166vvmzzjh5b6k05hdx1mv8237w16gvqa2i1y8"; depends=[]; }; + clustMixType = derive2 { name="clustMixType"; version="0.1-28"; sha256="0g7cw89pk5vmws4mwsd73z288g9dxvl1q81kp00x5h2vk2nzdzcn"; depends=[RColorBrewer]; }; clustRcompaR = derive2 { name="clustRcompaR"; version="0.1.0"; sha256="1md1ra18q1iga01q12jyy9va4qyvzlybvbdrdfy2kxhh82w057ww"; depends=[dplyr ggplot2 ppls quanteda tidyr]; }; cluster = derive2 { name="cluster"; version="2.0.6"; sha256="1z4gbz7chxxi4ly6c0yjlikwgf8aa8dlg05cn5cd6pjr21zvh97l"; depends=[]; }; cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; clusterCrit = derive2 { name="clusterCrit"; version="1.2.7"; sha256="13smdm8dmp4795qqn8an3k22l7xs4i4kgazyjzxdbzkg742akk7q"; depends=[]; }; clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; }; clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; }; - clusterPower = derive2 { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; }; + clusterPower = derive2 { name="clusterPower"; version="0.6.111"; sha256="1mwq188x9d495my75cdcahfjm3w46cas9jqxks5c0j63395cw9g3"; depends=[lme4]; }; clusterRepro = derive2 { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; }; clusterSEs = derive2 { name="clusterSEs"; version="2.4"; sha256="10xlcmmsrca8zwis94cv3pafp9k5ykbq9fnmadbhk0ppibndyjak"; depends=[AER Formula lmtest mlogit plm sandwich]; }; - clusterSim = derive2 { name="clusterSim"; version="0.45-2"; sha256="0mf0qy902v4aqszcapk3c0j2b6kj66krxz7s6adpqzwhwx975zfi"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; }; + clusterSim = derive2 { name="clusterSim"; version="0.46-2"; sha256="1l8hcqkz2p8gbnfz8fdb64fk0mbfxx8b725f3pz77c7bjrx4s4l1"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; }; clusterfly = derive2 { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; }; clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; }; clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; }; + clustermq = derive2 { name="clustermq"; version="0.7.0"; sha256="16z90z8i7vbcqw09ka8ivs9b6qg8g91ybaqvzl3yfbqfyvn080gg"; depends=[infuser narray pryr purrr R6 rzmq tibble]; }; clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; }; clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; }; clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; }; @@ -4643,14 +4745,14 @@ in with self; { coala = derive2 { name="coala"; version="0.5.0"; sha256="1yk2cfv73wng1bm00v1xfd208lvc9r7nx1w2rgdgw9m9yv0mw89f"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-3"; sha256="0f1fkpmqq142yrqzbqv11s5q4jkq7dilmrllcns871hc6vah6ikd"; depends=[MCMCpack]; }; - cobalt = derive2 { name="cobalt"; version="2.1.0"; sha256="1a0ynwbnfndgyhihgd73l4cdhivsva8nzimqb2bda425n0vligpn"; depends=[ggplot2 ggstance]; }; + cobalt = derive2 { name="cobalt"; version="2.2.0"; sha256="1rq4mdyq10slmpqxy0h9dpdn0xa9sqppz902rad7h6mrh56bd989"; depends=[ggplot2 ggstance]; }; cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; }; cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; }; cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; }; cocorresp = derive2 { name="cocorresp"; version="0.3-0"; sha256="1r1ssz0cip1gk52nkbr1kpz8gwrg6lwri8ymk41xj2adlsp576v2"; depends=[vegan]; }; cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; }; coda = derive2 { name="coda"; version="0.19-1"; sha256="14a4a8df4ygj05h37chmdn8kzcqs07fpbflxfrq530563mrza7yl"; depends=[lattice]; }; - coda_base = derive2 { name="coda.base"; version="0.1.6"; sha256="07y92k12bfxwmcjrp4g6xmjjf99jpxsnk1isficpyr5zz4hpl37q"; depends=[MASS Rcpp RcppArmadillo]; }; + coda_base = derive2 { name="coda.base"; version="0.1.7"; sha256="1rjw5d76vxl0fx0675q994l8wwbfv8az5kzqj4g9xmgbj8iwdhan"; depends=[MASS Rcpp RcppArmadillo]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codep = derive2 { name="codep"; version="0.6-5"; sha256="18da81wja7z9gnn11xiwi7cg43mrj4w2kjkk8s780krbycnfsn5p"; depends=[]; }; codetools = derive2 { name="codetools"; version="0.2-15"; sha256="0h7sjmvvsi35041jp47cxhsqzgf1y8jrw6fxii7n26i8g7nrh1sf"; depends=[]; }; @@ -4664,11 +4766,12 @@ in with self; { cofeatureR = derive2 { name="cofeatureR"; version="1.0.1"; sha256="1nxdi97b37pw5xr6cib8hjgziazmy9lfbjgixn9ayacvdhkjs7ib"; depends=[dplyr ggplot2 lazyeval]; }; coga = derive2 { name="coga"; version="0.2.1"; sha256="0cb9hvrlhm8c9fjmg4s577r46lp6xj9g0amwd5n9j2vs4m2h8dnf"; depends=[Rcpp RcppGSL]; }; coin = derive2 { name="coin"; version="1.2-1"; sha256="1lnxzafsnk2w856hcbx3664drlmyk125v4h3q3gxlv00k8a068b1"; depends=[modeltools multcomp mvtnorm survival]; }; + coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.1"; sha256="006ndsj37rx7fg3laama9y3xc6ivhp6b67w4wf3g161ypphlhkxv"; depends=[ggplot2 jsonlite RCurl]; }; cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; }; cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; }; colf = derive2 { name="colf"; version="0.1.2"; sha256="1xbmc32rp0xlj73krwhqn2ji5xa9kd2anaw88mvi5psdi3d2y1np"; depends=[nlmrt]; }; collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; }; - collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.5"; sha256="0p0570xslfzn1fv9nl389m6z23bihinn0myi8fd6gss6z5w6vkmm"; depends=[data_tree htmlwidgets]; }; + collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.6"; sha256="1l02rk1lmm2ac9rr5p1633y1chc203cr9mhlc9s95bv12791i5zb"; depends=[data_tree htmlwidgets]; }; collpcm = derive2 { name="collpcm"; version="1.0"; sha256="15k6khsgikjpsasyz02bhgd43nij2n7nl0m0sgxvjlcn0nv95y2n"; depends=[latentnet network vegan]; }; coloc = derive2 { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[BMA colorspace MASS]; }; colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; @@ -4696,14 +4799,14 @@ in with self; { comf = derive2 { name="comf"; version="0.1.7"; sha256="1waxapw870fssmy9mzzpslypbal7vanlajzv9ffnsh5w2yzjdpfi"; depends=[plyr]; }; commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; }; commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; - commonmark = derive2 { name="commonmark"; version="1.2"; sha256="12q5mncxvkwdxc35is6y5idx8a1h99hyz5x6ri0arni6k25krchk"; depends=[]; }; + commonmark = derive2 { name="commonmark"; version="1.4"; sha256="1vb8r9khpvcf0q7acv8rsplfjjwcll302bg5kp596cvn6aacypl6"; depends=[]; }; commonsMath = derive2 { name="commonsMath"; version="1.0.0"; sha256="0yx5yglsdplm3vz268016b1mbwk92hyqwnjircifm81ihivqb3r1"; depends=[]; }; compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; }; compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; }; - compareDF = derive2 { name="compareDF"; version="1.1.0"; sha256="1597xmq857jf4b67k7y869gbflad89rxfvrq8m0gp1wd21wv8z1h"; depends=[dplyr htmlTable tidyr]; }; - compareGroups = derive2 { name="compareGroups"; version="3.3"; sha256="1gh4jvckbqa9wxc6z191m4hq98blbgi276ckm62m0v51vgpb2c38"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; }; + compareDF = derive2 { name="compareDF"; version="1.2.0"; sha256="09y8bh9d9m2pf9j7qqyk1s07pp7rgbhzbkswl12vnx2cm24lp525"; depends=[dplyr htmlTable tidyr]; }; + compareGroups = derive2 { name="compareGroups"; version="3.3.1"; sha256="1sb7acmsdw6zzczksiwh95q6hjf37hqi22njlfdxi233k3ad554y"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; }; compeir = derive2 { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; }; @@ -4732,7 +4835,7 @@ in with self; { conditions = derive2 { name="conditions"; version="0.1"; sha256="0vhqkbsil3qfvrz7924i3wvjknw69cp27g7ayapf6w94bbggx4x8"; depends=[]; }; condmixt = derive2 { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; }; condvis = derive2 { name="condvis"; version="0.4-1"; sha256="1fqwybfw5sv4g8kg1yk41ixm5bmzcx7dry1a7ijca5wakchghvya"; depends=[MASS]; }; - coneproj = derive2 { name="coneproj"; version="1.11"; sha256="11hz6xk7b53c1j2c1l0j8c3gh310b59nhr6ln0vibfp30dzxq7xq"; depends=[Rcpp RcppArmadillo]; }; + coneproj = derive2 { name="coneproj"; version="1.12"; sha256="1937sf7b9s2y421gf2srjjdpv2knxrr03xyq5vg5j77z73kh9s6d"; depends=[Rcpp RcppArmadillo]; }; conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; confSAM = derive2 { name="confSAM"; version="0.1"; sha256="00l4hk0n63p3gdv6hpxqkkn3nw4rgw77rpwzn2k8fgq53ja44yfg"; depends=[]; }; confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; }; @@ -4769,7 +4872,7 @@ in with self; { cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; }; coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.2"; sha256="0cvc4nz329pkjkpir3as8vvqyjmcrg9bxp6mqv12vhxyxqsp6hbg"; depends=[]; }; coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; }; - copula = derive2 { name="copula"; version="0.999-17"; sha256="19i4x4adynn63f0z85hk5npr40lcn36d7cb2z46qnqmpplz9rqh3"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; + copula = derive2 { name="copula"; version="0.999-18"; sha256="1xdjnp8zgla2hixyp524nvgbji0jcrmqc4j99hr8xp9365xb6z86"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; copulaedas = derive2 { name="copulaedas"; version="1.4.2"; sha256="09w6b1m1lnlnsx0qp2mzlp0z9rxzz90qs9jqzwwjl56lzdad3vpr"; depends=[copula mvtnorm truncnorm vines]; }; corHMM = derive2 { name="corHMM"; version="1.22"; sha256="03di9250hjn5fiwn47f0pr4zprmsza4if3xpmy3j1czahc8zlqnj"; depends=[ape corpcor expm GenSA nloptr nnet numDeriv phangorn Rmpfr]; }; corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; @@ -4777,16 +4880,16 @@ in with self; { corcounts = derive2 { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; }; cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; }; cordillera = derive2 { name="cordillera"; version="0.7-0"; sha256="0lapg9h2lw233h8plavs92c1l51m0sicslsr7gjyr0w3vkg13mxq"; depends=[dbscan yesno]; }; - coreCT = derive2 { name="coreCT"; version="1.1.2"; sha256="1yn57glrbk4wqhb8icjv9hxm5lr3ys85849ddwlb6hnjlfc1cn56"; depends=[igraph oro_dicom plyr raster]; }; + coreCT = derive2 { name="coreCT"; version="1.2.1"; sha256="19aq5snv5kin913rf0a1n9z0cg2l1jn2hnxbd0h05p1qrsysx52b"; depends=[igraph oro_dicom plyr raster]; }; coreNLP = derive2 { name="coreNLP"; version="0.4-2"; sha256="0rvyqj7s3lijq4rzil65060b29m393m7zmg99mykp1g1kby5bjd8"; depends=[rJava XML]; }; coreSim = derive2 { name="coreSim"; version="0.2.4"; sha256="1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm"; depends=[dplyr MASS]; }; coreTDT = derive2 { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; }; - corehunter = derive2 { name="corehunter"; version="3.1.0"; sha256="1q5bmzkmm8fzdnbj8s8mi0jxmrqp6ps14m1fm0c3frlqj3fy1ngm"; depends=[naturalsort rJava]; }; + corehunter = derive2 { name="corehunter"; version="3.2.0"; sha256="12bwmhl6mmjz7xggh03933k1ax5k5dri3bp4p73y6bh1rk22p5l2"; depends=[naturalsort rJava]; }; corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; }; corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; }; corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; }; corpora = derive2 { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; }; - corpus = derive2 { name="corpus"; version="0.9.1"; sha256="1bagwiysxk9vsqd3gl4752cid6pnv3nlifry3gb25bqwgxjyhy63"; depends=[Matrix]; }; + corpus = derive2 { name="corpus"; version="0.9.2"; sha256="1kz6k6v2820lxxk6mbpkxzl2n63q1z5xir43srzw5pir93ssqrbv"; depends=[]; }; corr2D = derive2 { name="corr2D"; version="0.2.0"; sha256="02z9k0j6j8jyjfgff55amkzsa5w0xbr9nqm1247qylsh8sl2rqcz"; depends=[colorspace doParallel fields foreach mmand rgl]; }; correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; }; corregp = derive2 { name="corregp"; version="1.0.3"; sha256="07zsbxhvh7n4ma6lgsmg0kkmgcs5afa02k6cq57afaqvxisw18l3"; depends=[diagram ellipse gplots rgl]; }; @@ -4838,9 +4941,12 @@ in with self; { cplm = derive2 { name="cplm"; version="0.7-5"; sha256="16li79x2zyydi7gi4n8k09g9x2n1dgd9av3nqjnb0by3v31c44n0"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; }; cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; }; cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; }; + cprr = derive2 { name="cprr"; version="0.1.1"; sha256="0bnq3961bqf1y1f37x60qkwmq50vnvcpv4axq0yw5n1mrs20mllj"; depends=[]; }; cpt = derive2 { name="cpt"; version="0.9"; sha256="03nvxkwwvqmzpphax4zfij6jvh26x4bsl3mn2xr4mbr7cjb2x12w"; depends=[MASS nnet randomForest]; }; + cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; }; cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; }; cquad = derive2 { name="cquad"; version="1.4"; sha256="1sxf30rikzr4mj1nyr12ys7gcnx5vq0rpd9djc2lkfbqlvi4mmai"; depends=[MASS plm]; }; + cr17 = derive2 { name="cr17"; version="0.1.0"; sha256="1zyq77gxycbwyqhv5w0zw4n7v3ipjs6rcbja43g0k5q8h0gjnnn1"; depends=[cmprsk dplyr ggplot2 gridExtra gtable scales survival]; }; crackR = derive2 { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[evd Hmisc]; }; cramer = derive2 { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; }; crandatapkgs = derive2 { name="crandatapkgs"; version="0.1.8"; sha256="12sz54csqnwk49iwg5zcigyczxhgskxsak6ws2ih7nqpv19v8a0m"; depends=[]; }; @@ -4849,7 +4955,7 @@ in with self; { cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; }; crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; crawl = derive2 { name="crawl"; version="2.1.1"; sha256="0dr9z8y8rvc3wn1gjb6mh5wmszng9j1r2a9ks6p5am8ghf754sps"; depends=[dplyr gdistance mvtnorm raster Rcpp RcppArmadillo shiny sp]; }; - crayon = derive2 { name="crayon"; version="1.3.2"; sha256="0s2yam18slph7xsw4pyc9f92gdyf609r5w92yax69zh57kb7asws"; depends=[]; }; + crayon = derive2 { name="crayon"; version="1.3.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; depends=[]; }; crblocks = derive2 { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; }; crch = derive2 { name="crch"; version="1.0-0"; sha256="1wd9hwr68qlinaw23lckjizq5g67v74wc3v6ig1rxrxyssyzag68"; depends=[Formula ordinal]; }; creditr = derive2 { name="creditr"; version="0.6.1"; sha256="1dhjl99gjc97bdsdg29mq6xifivjn9kr0y7m2jzvrzb26x856z97"; depends=[devtools quantmod Rcpp RCurl XML xts zoo]; }; @@ -4888,6 +4994,7 @@ in with self; { cruts = derive2 { name="cruts"; version="0.3"; sha256="0yn6xc2wg23nkjnsb7kii7dn897wf4ymnpmgppacrsznl8mmlmgd"; depends=[lubridate ncdf4 raster sp stringr]; }; cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; }; csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; + csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; }; csampling = derive2 { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; }; cshapes = derive2 { name="cshapes"; version="0.6"; sha256="0mp6grkibmqk4k1yi4w2sglpp9ari5cfw4iip49a0z58qa98npw7"; depends=[maptools plyr sp]; }; csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; }; @@ -4903,7 +5010,7 @@ in with self; { ctl = derive2 { name="ctl"; version="1.0.0-0"; sha256="12hrrql9wz43s1d3sfyzlqzx7ajrl3hvf96776ik6icbm8by8h6j"; depends=[MASS qtl]; }; ctmcd = derive2 { name="ctmcd"; version="1.1"; sha256="05r04bxd1n866rcizjgw1267ms8zdcpny3i1vycrk31ja953fs0a"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; }; ctmcmove = derive2 { name="ctmcmove"; version="1.2.8"; sha256="16qi4y3ivcys2dfixm4vzyqbqbm2j1gc1l4bjrrp46c268qja2z3"; depends=[fda gdistance Matrix raster sp]; }; - ctmm = derive2 { name="ctmm"; version="0.3.6"; sha256="0yi277hfnb5wygs4brxsha84j5jj7khplh5164xkpla1wy5f89q2"; depends=[bit64 data_table expm fasttime manipulate MASS Matrix numDeriv pbivnorm raster rgdal scales]; }; + ctmm = derive2 { name="ctmm"; version="0.4.1"; sha256="1ggq86j643k2xrl1lbkp9is5759fw63vq544z69bfxm889925bm0"; depends=[data_table expm fasttime manipulate MASS Matrix numDeriv pbivnorm raster rgdal scales]; }; ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; }; cts = derive2 { name="cts"; version="1.0-21"; sha256="0wagxqb8msjc8z33qp7sc92l53f56d9bzz9160bmgpjxlj6cnqcj"; depends=[]; }; ctsem = derive2 { name="ctsem"; version="2.4.0"; sha256="1rlbk7qwn3lbzzlfwdznfywp5nhwswgl6yj220sfxzjqwlcip9qw"; depends=[Matrix OpenMx plyr Rcpp rstan]; }; @@ -4921,6 +5028,7 @@ in with self; { curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; }; curstatCI = derive2 { name="curstatCI"; version="0.1.0"; sha256="00prppvrfk8d234rrazhbjq1ms1ww53pc8zvgywpjf7jiknas2ym"; depends=[Rcpp]; }; curvHDR = derive2 { name="curvHDR"; version="1.2-0"; sha256="185097ikqhmqqc4ha7l74inx5cmg1bhgw3cw40wk0ngc4wv4sfqi"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; }; + curvecomp = derive2 { name="curvecomp"; version="0.1.0"; sha256="0ykgbwnh32w61cjcg1nyqak42hx0jrsrpbra2wh3pgj9clg1qad2"; depends=[multcomp]; }; curvetest = derive2 { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_methodsS3 R_oo]; }; cusp = derive2 { name="cusp"; version="2.3.3"; sha256="130m0is48bp11p5fpg17lwqwlavsa8fzfxjs0z62vl6lm006aahw"; depends=[]; }; customizedTraining = derive2 { name="customizedTraining"; version="1.1"; sha256="0rlfsnhmmcwx7iyjavj03v4kdfzxcqjggi8qpgmi6lkli3n0s6pg"; depends=[FNN glmnet]; }; @@ -4933,7 +5041,7 @@ in with self; { cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; }; cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; }; - cwhmisc = derive2 { name="cwhmisc"; version="6.0"; sha256="13lgpxl957lbf333m1a17ad8iy3kjfrzav0sxx7w3vnsj98aqa43"; depends=[lattice]; }; + cwhmisc = derive2 { name="cwhmisc"; version="6.5"; sha256="1nakiyamg05r7xysac5b1y0ddq6s25v6ygsrb487b5jcv0d95g2n"; depends=[lattice]; }; cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; }; cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; }; cycleRtools = derive2 { name="cycleRtools"; version="1.1.1"; sha256="1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0"; depends=[Rcpp xml2]; }; @@ -4944,18 +5052,20 @@ in with self; { cystiSim = derive2 { name="cystiSim"; version="0.1.0"; sha256="0pz8jxi4lgcwzrb4dh8xn63xhpaga5rzg5hwqicwv8isc16iqizd"; depends=[ggplot2 knitr magrittr]; }; cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; }; cytometree = derive2 { name="cytometree"; version="1.0.1"; sha256="14i6x13kh8kx9vavs4vhv5zxbqwg4r5cxkd1jd801v640p7z9qmm"; depends=[ggplot2 igraph mclust Rcpp RcppArmadillo]; }; + cytominer = derive2 { name="cytominer"; version="0.1.0"; sha256="1p988aw689kgpbglmzrnl30krnbynwk3dgjv7w3x2719hi481z2j"; depends=[caret doParallel dplyr foreach futile_logger magrittr purrr rlang tibble tidyr]; }; d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.1"; sha256="0xx1lpp9qpkqh991ib0l9z1wn6j67jnggrhq5gr5sm63m7sjijwn"; depends=[base64enc dendextend htmlwidgets png scales]; }; + d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; }; d3r = derive2 { name="d3r"; version="0.6.9"; sha256="1gh4s0rrzwzzaqjd3gr0dgw6dz9dwijp9lb2hfjbmk5jlj55akhj"; depends=[dplyr htmltools tidyr]; }; dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; }; dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; }; dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; }; dHSIC = derive2 { name="dHSIC"; version="2.0"; sha256="1acbzln2rlyranccsjndpw6pj4a2lyb24jb52r2wms8lsg4fn2m9"; depends=[Rcpp]; }; - dLagM = derive2 { name="dLagM"; version="0.0.7"; sha256="0p0hdrg4p7aril9hyv184d7v42mqz4pyqvwxcgwpjzpd2cbc9f8k"; depends=[AER dynlm Hmisc wavethresh]; }; - dMod = derive2 { name="dMod"; version="0.3.2"; sha256="1m0rpq78h2vhgl07jsk94hf03zj42wjc08hi6q5lqj77czwpaxfg"; depends=[cOde ggplot2 stringr trust]; }; + dLagM = derive2 { name="dLagM"; version="0.1.0"; sha256="02923n5m5fpjr0vcbszbhxpr1xrywbb6bvqlih9yg5vngkryram5"; depends=[AER dynlm Hmisc wavethresh]; }; + dMod = derive2 { name="dMod"; version="0.4"; sha256="12q80pk0j5081qz4rb19iib0n4h1yf1c42iq1z14yyrmki3266pm"; depends=[cOde deSolve ggplot2 plyr rootSolve stringr]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; - dad = derive2 { name="dad"; version="3.0.0"; sha256="17ric9kj8zni4yv77k118jaczik85liksa6dfvkvpnc8ig60cajp"; depends=[e1071 lattice]; }; + dad = derive2 { name="dad"; version="3.0.1"; sha256="0h8nj8nsmhyv1xww3x0z2fgnh1cd1jyszd91i79wba465vbsi4mh"; depends=[e1071 lattice]; }; dae = derive2 { name="dae"; version="3.0-04"; sha256="1fykmdgg29smdm8qn2cfspjh8lspa57h4s0jsdfz8gh5zfmvsn1h"; depends=[ggplot2]; }; daewr = derive2 { name="daewr"; version="1.1-7"; sha256="01n9g3adjk66wx9lm9gl6wa3y9ba5w0w0p5ayj8rx5ywxnm8fnvi"; depends=[BsMD FrF2 lattice]; }; daff = derive2 { name="daff"; version="0.3.0"; sha256="1kl5pjwxds6bz58zd5xaa1hknd6f9i0512895fhljqi7kvsrldra"; depends=[jsonlite V8]; }; @@ -4966,13 +5076,13 @@ in with self; { dam = derive2 { name="dam"; version="0.0.1"; sha256="1b0fi3l8jxgpr9fwvi03giq7wm39msbh0c82ffgkh54a3bbf5blc"; depends=[]; }; dams = derive2 { name="dams"; version="0.2"; sha256="0hf5s8i61r5q4h3s8dfmdl3vkj7v15ha59pjvpjqx3yihsgziqz9"; depends=[RCurl]; }; darch = derive2 { name="darch"; version="0.12.0"; sha256="17nvxqxbbdv4qdallld5f2c6nhhszsz7ja04rhz5g3844s87bv2f"; depends=[caret futile_logger ggplot2 Rcpp reshape2]; }; - darksky = derive2 { name="darksky"; version="1.0.0"; sha256="03vdzxz5wxwsjz08rg18zsmrg4n7dpgrrm70zrqa5pmyq1swhh2n"; depends=[dplyr ggplot2 gridExtra gtable httr]; }; + darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; }; dartR = derive2 { name="dartR"; version="0.93"; sha256="1mkap7dvbd6j4d2zqp9kdld06ds78fi4w01w7zqmnvz3xzigp3li"; depends=[adegenet ape data_table DBI Demerelate directlabels dismo doParallel foreach ggplot2 MASS misc3d pca3d pegas plotly plyr quadprog qvalue reshape2 rgl seqinr SNPassoc SNPRelate StAMPP stringr tidyr vegan]; }; darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; }; dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; }; dat = derive2 { name="dat"; version="0.3.0"; sha256="1mzkxjyph4xka32c6bl0krr7723sch15x9wh8v9rcawn0gwnknmj"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; }; data_table = derive2 { name="data.table"; version="1.10.4"; sha256="0ykbjr1x50ajxbri385vi3mnxj7zg1dcgh9y0snp341qmmmdypw6"; depends=[]; }; - data_tree = derive2 { name="data.tree"; version="0.7.0"; sha256="0rgpapxsqnbzjcifnz3p41b6j8h9x2yfixr5ryd03v8vzgikyf9b"; depends=[DiagrammeR R6 stringr]; }; + data_tree = derive2 { name="data.tree"; version="0.7.3"; sha256="1r442a1mbmrv7x88769kbz4p32cy8hacliahbls2qsr2ikbk1w2p"; depends=[DiagrammeR R6 stringr]; }; data_world = derive2 { name="data.world"; version="1.1.1"; sha256="0kmlls8wicyfjxl27pajkagi4ps1s85rd7ywwfjfrkzkangy05xz"; depends=[dwapi httr ini]; }; dataCompareR = derive2 { name="dataCompareR"; version="0.1.0"; sha256="06chgmgrb5n2iiynwxxgf6aq0y5ldsy43s7pwnl64w0vsa7nj8wc"; depends=[dplyr knitr markdown stringi]; }; dataMaid = derive2 { name="dataMaid"; version="0.9.2"; sha256="13wim5375vlhaba2gawjb7lykzfj4py89cdhip44xaq19agg5675"; depends=[ggplot2 gridExtra haven pander rmarkdown robustbase]; }; @@ -4990,9 +5100,9 @@ in with self; { datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; }; dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.0"; sha256="17588r2b528ylchdh8aa1k7q7w7wc3f2mxixif8j6snzpwsvwpzc"; depends=[assertthat httr lubridate readr tibble]; }; dataone = derive2 { name="dataone"; version="2.1.0"; sha256="0vpa4gb30dvxax4sxbnbn8gblnzdfcf2k0v5js3gqwjb95ah4w4y"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; }; - datapack = derive2 { name="datapack"; version="1.3.0"; sha256="0ax7mxqv1p9snfjzli5zw5pjzsl3nlss14kiih1hljvyzdya0s1f"; depends=[digest hash redland uuid XML]; }; + datapack = derive2 { name="datapack"; version="1.3.1"; sha256="0hzc68vgjvpm235zg8k2642c3jzh3ls9kp6lpz720y1b56q8k3n7"; depends=[digest hash redland uuid XML]; }; datapasta = derive2 { name="datapasta"; version="2.0.0"; sha256="100nqw315xdzxpzn1gmx4881zli4lwzwckdvqjciysv4l5gvzzfm"; depends=[clipr readr rstudioapi]; }; - datarobot = derive2 { name="datarobot"; version="2.6.0"; sha256="1dnps3hdyz468i7jx2idary2dbphyy6j178n8ba37dvjf5pnhnbw"; depends=[httr jsonlite yaml]; }; + datarobot = derive2 { name="datarobot"; version="2.7.1"; sha256="13aabv0h1ssfd3llbqgapcfgd0x87h99bdzhhfhmkr84mzd6pzpv"; depends=[curl httr jsonlite yaml]; }; datasauRus = derive2 { name="datasauRus"; version="0.1.2"; sha256="1ixfc1v0iv5jb4920957xhpq9kchdy482vdsm51wj1961ldrkhvh"; depends=[]; }; dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; datasets_load = derive2 { name="datasets.load"; version="0.1.0"; sha256="029rxg0h17nszkxgq5kjd0njymb8pgdsabmz5slshzd2ijjh82jz"; depends=[DT miniUI shiny]; }; @@ -5004,6 +5114,7 @@ in with self; { dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; }; date = derive2 { name="date"; version="1.2-37"; sha256="0321kqvpy5cvl8hmm6pd0pyjpi30glm8hvw60mrql6y28sn6pqhl"; depends=[]; }; datetime = derive2 { name="datetime"; version="0.1.2"; sha256="0qbd1makidkbpr26wkxchnb8rpwzm4l42j4vipwwmfwv3gpslmjx"; depends=[]; }; + datetimeutils = derive2 { name="datetimeutils"; version="0.2-7"; sha256="1ql44k6s0pskc7kg28aly9k7ncl58gzs80d9gpwyjdhrgimimcxk"; depends=[]; }; dave = derive2 { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; }; dawai = derive2 { name="dawai"; version="1.2.1"; sha256="0i0vgd4kia2hgx88rjdyi0y8hikzii4mwgal46c9iiqb6gmf8vrj"; depends=[boot ibdreg mvtnorm]; }; dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; }; @@ -5059,6 +5170,7 @@ in with self; { deldir = derive2 { name="deldir"; version="0.1-14"; sha256="12cjr4r50rdrh2l0105cvd42rqwzsmmiqcax3sbqk1ggh2lnblw9"; depends=[]; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; deltaPlotR = derive2 { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; }; + deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; }; demi = derive2 { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[affxparser affy devtools oligo plyr R_utils]; }; deming = derive2 { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; }; demoKde = derive2 { name="demoKde"; version="0.9-4"; sha256="0p4v808m42wbv8ibdfqzm43cbbg0yl452wnm1mzqq2n37z6yljkr"; depends=[]; }; @@ -5089,7 +5201,7 @@ in with self; { descomponer = derive2 { name="descomponer"; version="1.4"; sha256="12zpkixclm6jmrgzvcy48c1mdqh9dgadzf9026wjyamphxkkjbip"; depends=[taRifx]; }; descr = derive2 { name="descr"; version="1.1.3"; sha256="0fp91gbxxxvn2hqdyddhb3x85031wgq7gnqrhzjr956prlv086r6"; depends=[xtable]; }; describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; - descriptr = derive2 { name="descriptr"; version="0.1.1"; sha256="19ppyd9hhhg8s90vd2ldcf2wrr5haanqiycwfcmyrvaddc72i3mv"; depends=[dplyr magrittr]; }; + descriptr = derive2 { name="descriptr"; version="0.2.0"; sha256="1295pgw69v2r60pqff01mcrj619lg769y6x8dilwffl767w0d95n"; depends=[dplyr forcats magrittr tibble]; }; desctable = derive2 { name="desctable"; version="0.1.0"; sha256="002x4zjrcjz0xxh924z00rka1c61ldrj6lypakkf3p4hbwid6j30"; depends=[dplyr DT htmltools pander purrr]; }; deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; }; desiR = derive2 { name="desiR"; version="1.2.1"; sha256="0ghcv96bbwn74mka4dpf2lkpnlikjn3q6lx2sl8bbw77nriap0n6"; depends=[]; }; @@ -5127,7 +5239,7 @@ in with self; { dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; }; dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; }; dhglm = derive2 { name="dhglm"; version="1.7"; sha256="09wasgvjw0xc9k68m6a8lx372p2hywk4j6ikr9wjjjfl6f17j1cw"; depends=[boot MASS Matrix numDeriv]; }; - di = derive2 { name="di"; version="1.0.0"; sha256="0lccp4xzmnj24zvwya6vw2d429b9q5rp6vfby0k3rqljgzyy6rgk"; depends=[scales]; }; + di = derive2 { name="di"; version="1.1.1"; sha256="1rq0cq59p5fgf0sb1n8dm5z5a8b0qnwp5qa6jmgsa8kjwn04hw8z"; depends=[scales]; }; diagis = derive2 { name="diagis"; version="0.1.3"; sha256="0ni7xqpnzr5drdw12sslm7d7amwzaifhlr2pw6b4f264wcab72i8"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; }; diagonals = derive2 { name="diagonals"; version="0.4.0"; sha256="03n6lm0hkgylswgj1qlgrjigm7basl5frip99mxx19mvaqa3bhqy"; depends=[]; }; diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; }; @@ -5140,7 +5252,7 @@ in with self; { didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; }; dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; }; diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; }; - difNLR = derive2 { name="difNLR"; version="1.1.0"; sha256="00cnd155qdv60kvlw9y32316p3gk52xaqxjw4815af2glgdl9lr6"; depends=[CTT ggplot2 msm nnet reshape2]; }; + difNLR = derive2 { name="difNLR"; version="1.1.1"; sha256="14sgya6s8i6r6861dcwwiv8scwvxgk780yka1vlzsqg9bsklcyi9"; depends=[CTT ggplot2 msm nnet reshape2]; }; difR = derive2 { name="difR"; version="4.7"; sha256="17i8l4z7dw8nfr4b5pc72l1qm7byjcflh58kasafx9kxyvfgz258"; depends=[lme4 ltm]; }; difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; }; diffEq = derive2 { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[bvpSolve deSolve deTestSet ReacTran rootSolve shape]; }; @@ -5176,7 +5288,7 @@ in with self; { discord = derive2 { name="discord"; version="0.1"; sha256="0nrjpl7l9lzkn92fwzaj3vh8zv2b6706gnh5c4zalkld0xac3c23"; depends=[dplyr]; }; discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; }; - discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.4"; sha256="0y85fpqb2jdwv28dpxp39q7w4kfw8x48dk1a426a9z14kj807zbi"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; + discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.5"; sha256="1q4g455jjg293yxdwdppw04ah15idk5j233x2kbqv0jni4v0l2bf"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; discrimARTs = derive2 { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; }; diseasemapping = derive2 { name="diseasemapping"; version="1.4.2"; sha256="065ndvpx3q9ycxfjl1f2iy3s23d7qf27s1qz31ppx0n929jynn6n"; depends=[sp]; }; @@ -5205,6 +5317,7 @@ in with self; { distrTEst = derive2 { name="distrTEst"; version="2.6"; sha256="1c0xwpyr5gs89psiflcz5dplsb1g9r651jiqg8nxcqa05r9kyhkr"; depends=[distrSim setRNG startupmsg]; }; distrTeach = derive2 { name="distrTeach"; version="2.6.1"; sha256="0x60xlij1m9q7xhi9vnf61vb2px9aah8iqaki6d87c1pxylmqnvr"; depends=[distr distrEx startupmsg]; }; distrom = derive2 { name="distrom"; version="0.3-3"; sha256="1kpbrsa7ml72zvmdcpbbz2rsv4lpqd5i2w3v488ji6nbi44v1gp6"; depends=[gamlr Matrix]; }; + distrr = derive2 { name="distrr"; version="0.0.4"; sha256="0nywvgcbk2i2n2qa80yk68zikl2fs7nybhq540808rjksldh9pvy"; depends=[dplyr lazyeval magrittr tidyr]; }; divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; }; diveMove = derive2 { name="diveMove"; version="1.4.3"; sha256="18420gm1cb0pinp05n08cj5qgf9rmn5ksr7bfq464s61isrhmzhy"; depends=[caTools geosphere KernSmooth quantreg uniReg]; }; diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; }; @@ -5225,12 +5338,13 @@ in with self; { dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; }; dmm = derive2 { name="dmm"; version="1.7-1"; sha256="0ihzbv2vlymyr1l0xi0jmx0xgpbj46azd7gwr3m9qsgnjp7wc1p8"; depends=[MASS Matrix nadiv pls robustbase]; }; dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; }; - dmutate = derive2 { name="dmutate"; version="0.1.1"; sha256="14lv16lqvlccf84s1g1qrz88y732qzb9545skg6fjrldcr8b0hl4"; depends=[dplyr]; }; + dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; }; dna = derive2 { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; }; dnc = derive2 { name="dnc"; version="1.2"; sha256="0a0nc1yx6vhbjsik9pidda97i7s6ndlsm8pzx29ccmxlmqncc18b"; depends=[BayesLogit igraph MCMCpack movMF plot3D plot3Drgl Rcpp RcppArmadillo skmeans vegan]; }; dnet = derive2 { name="dnet"; version="1.1.1"; sha256="1pj31586li19dybfvwljmpv18k6k2mvrx6g0a8rjjdcqczasf8yr"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; + dng = derive2 { name="dng"; version="0.1.0"; sha256="03c47kviy1bw8sfb9705cr8bqi4d47mfnrkql1c079gqyhxbkv2z"; depends=[Rcpp]; }; doBy = derive2 { name="doBy"; version="4.5-15"; sha256="0n1ml47f78nqhy92a0fgsb4brz0qyfr4q3c7im8pnb0ngia4ssdx"; depends=[MASS Matrix]; }; - doFuture = derive2 { name="doFuture"; version="0.5.0"; sha256="1yb483x99z7xjrxb2r4v2l0d66y15pc799dxqn62kppmr0j452bz"; depends=[foreach future iterators]; }; + doFuture = derive2 { name="doFuture"; version="0.5.1"; sha256="0jhsvs6k7m5n5v37ybwnank38lvdiiwazzsy9hp04y9mgh2p3ysz"; depends=[foreach future iterators]; }; doMC = derive2 { name="doMC"; version="1.3.4"; sha256="0y47jl6g4f83r14pj8bafdzq1phj7bxy5dwyz3k43d2rr8phk8bn"; depends=[foreach iterators]; }; doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; doParallel = derive2 { name="doParallel"; version="1.0.10"; sha256="1mddx25l25pw9d0csnx2q203dbg5hbrhkr1f08kw0p02a1lln0kh"; depends=[foreach iterators]; }; @@ -5247,28 +5361,30 @@ in with self; { docxtools = derive2 { name="docxtools"; version="0.1.1"; sha256="1mlgl9105mifzdgf57spgr2rr5740ghr5afmlskxn6ind7jfka70"; depends=[dplyr ggplot2 pander stringr tidyr]; }; docxtractr = derive2 { name="docxtractr"; version="0.2.0"; sha256="197j57ab8x960b1yfq6xp8fwmq51xs04nf0cb16r161h4bcmgs2j"; depends=[dplyr purrr tibble xml2]; }; domino = derive2 { name="domino"; version="0.3.0"; sha256="0lhrnrpyz98cl16a1xk7x0299kxkz303myyz61nw3x6f7kh1gvd6"; depends=[]; }; - dosresmeta = derive2 { name="dosresmeta"; version="2.0.0"; sha256="1k6m9zl0xzwg7x7s63c4agi7qfdk67f3hjbsikfhsgrb0rbbkpf7"; depends=[mvmeta]; }; + dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; }; dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; }; dotCall64 = derive2 { name="dotCall64"; version="0.9-04"; sha256="0qp6magpp0jaa0b9sfkbxd91afayl24kj0yrh0ix1v3ahdnaar8f"; depends=[]; }; dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; }; dotwhisker = derive2 { name="dotwhisker"; version="0.3.0"; sha256="1sbj8blnqnsyvf7pq2cc9q7nqb66n0v2gi2rr09yjlppf7v1pcjf"; depends=[broom dplyr ggplot2 ggstance gridExtra gtable plyr stringr]; }; + doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; }; downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; - downscale = derive2 { name="downscale"; version="2.0-2"; sha256="0ladwn27x019rhz5dil06d17gj15fhcwlmrrci150z9wzbq6ip4q"; depends=[cubature minpack_lm raster Rmpfr sp]; }; + downscale = derive2 { name="downscale"; version="2.0-3"; sha256="0jvzvmwhpdr7ygcxky4yl1ldb843hrmnzhmnvl0694mmswwqsf8l"; depends=[cubature minpack_lm raster Rmpfr sp]; }; downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; }; dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; }; - dparser = derive2 { name="dparser"; version="0.1.3"; sha256="0cy8k7rqz06s01hr80vppb7mkf5bmh2lpdrzn4fzzmbzciflbh32"; depends=[digest]; }; + dparser = derive2 { name="dparser"; version="0.1.5"; sha256="0h2q7bdx51bzd2zs72gsi4957zlshvb6kf848nl70665pvz04m2v"; depends=[digest]; }; dpcR = derive2 { name="dpcR"; version="0.4"; sha256="02j7fhhfq7p2wfcnr7rdy65v6dcvdym3nfyps7717p7b429chchc"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; }; dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; }; dplR = derive2 { name="dplR"; version="1.6.6"; sha256="04b0j9l2gkkycjjn16zbhv0kczhrij0bsnrdyh9qd6z53pvd3ryc"; depends=[digest lattice Matrix matrixStats plyr png R_utils stringi stringr XML]; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; - dplyr = derive2 { name="dplyr"; version="0.7.2"; sha256="0jpb32ca1c0mr660igna4yw4fmzydzfhxshd0g8wgmggkynx2qi2"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble]; }; + dplyr = derive2 { name="dplyr"; version="0.7.3"; sha256="0wz5vrcsxzmxpxvs1raz9kyfc7mq3591nadq4rb4hx4sc97ysrxf"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble]; }; + dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; }; dpmixsim = derive2 { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; }; dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; }; dprep = derive2 { name="dprep"; version="3.0.2"; sha256="0iw1pqpqlv436wpwh1w832aqvy91zvxmbk2jdw7aczrb29wys2bj"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; }; dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; }; drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; }; - drake = derive2 { name="drake"; version="4.0.0"; sha256="1f03n13cfp5hi7rl1ika4fhrw98fh218kzxgyn3v0d1kjdkap7z5"; depends=[base64url codetools crayon digest eply igraph magrittr plyr R_utils storr stringi stringr testthat visNetwork]; }; - drat = derive2 { name="drat"; version="0.1.2"; sha256="14nmbxy2y51bi258fmx24pkwmga791hnwzbx6jy2sl55g3vrxjpz"; depends=[]; }; + drake = derive2 { name="drake"; version="4.1.0"; sha256="0jzr35d49fm9cd0d07sk98y5kfybypynzyywanpl6jad0y5plh2h"; depends=[base64url codetools crayon digest eply igraph lubridate magrittr plyr R_utils storr stringi stringr testthat visNetwork withr]; }; + drat = derive2 { name="drat"; version="0.1.3"; sha256="14q2ahy51b8mlp7fb0nbwzy5hcnlg1z73wgi85sxx4pyq1ycp4zn"; depends=[]; }; drawExpression = derive2 { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; }; drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; }; drfit = derive2 { name="drfit"; version="0.7.1"; sha256="1k2chmhdwd78a5d1pxi3iskzfb4h1fxp51ji72qs73m3i6s2mqpz"; depends=[drc MASS qcc reshape2 RODBC]; }; @@ -5281,7 +5397,7 @@ in with self; { ds = derive2 { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; }; dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; }; dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; }; - dslabs = derive2 { name="dslabs"; version="0.1.0"; sha256="1ggskr5kqmjl5fa5skzjnc8zwcji79yzixlg05c1rvsiap6b0lwl"; depends=[ggplot2]; }; + dslabs = derive2 { name="dslabs"; version="0.2.0"; sha256="13aw1v1znkvnajgrll120x9vam4vsxy4ihg1066f5f2kiyx8ycgs"; depends=[ggplot2]; }; dslice = derive2 { name="dslice"; version="1.1.5"; sha256="0qwz9rlgpgx0k28hca2m40ab0qad9rfp1gxswygchv7rcnl4f6ml"; depends=[ggplot2 Rcpp scales]; }; dsm = derive2 { name="dsm"; version="2.2.15"; sha256="1b7ixbfq2xpgbc5hyhyzcr6nx4larl3qg1idccraiwrj3m2dr59h"; depends=[ggplot2 mgcv mrds nlme numDeriv statmod]; }; dsmodels = derive2 { name="dsmodels"; version="1.1.0"; sha256="0gidxi4ph49mjm2hdf9flphfb9916al4cpdkiig504n7ms2sbpbg"; depends=[latex2exp pryr shape]; }; @@ -5295,7 +5411,7 @@ in with self; { dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; dtw = derive2 { name="dtw"; version="1.18-1"; sha256="1b91vahba09cqlb8b1ry4dlv4rbldb4s2p6w52gmyw31vxdv5nnr"; depends=[proxy]; }; dtwSat = derive2 { name="dtwSat"; version="0.2.3"; sha256="10b0hs9kn5ljfv28iz62h966zb1pxsfrr6fx45d4427gr6fg8ncz"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp xtable zoo]; }; - dtwclust = derive2 { name="dtwclust"; version="4.0.3"; sha256="1pg9yl1z7a3b17cpaxigry90jnf01jckarnd6gimjf02zyrjqblw"; depends=[BH bigmemory clue dtw flexclust foreach ggplot2 Matrix plyr proxy Rcpp RcppArmadillo reshape2 rngtools RSpectra]; }; + dtwclust = derive2 { name="dtwclust"; version="4.1.1"; sha256="1awpqch4jdm70x6hjhzp3g98yikg12sv82zfyd2jwjh4nssiawh1"; depends=[BH bigmemory clue dtw flexclust foreach ggplot2 Matrix plyr proxy Rcpp RcppArmadillo reshape2 rngtools RSpectra]; }; dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; }; duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; }; dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; @@ -5314,7 +5430,7 @@ in with self; { dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; }; dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; }; - dynamichazard = derive2 { name="dynamichazard"; version="0.3.5"; sha256="1p11krli4chramgcglf1rw30kk7gqjgp34vlqvfl1ppp3m80rriy"; depends=[boot data_table Rcpp RcppArmadillo stringr survival]; }; + dynamichazard = derive2 { name="dynamichazard"; version="0.4.0"; sha256="0cq79kn45rpfzvnsdxa4sglv1qdr5imy5pkjqgznc99n8sfa8alj"; depends=[boot data_table Rcpp RcppArmadillo stringr survival]; }; dynatopmodel = derive2 { name="dynatopmodel"; version="1.1"; sha256="100g131jmgb3by9j3v2n7f7jh9623vd7xf5frjkwrxvwzf0q1i3k"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; }; dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; }; dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; }; @@ -5332,7 +5448,7 @@ in with self; { eLNNpaired = derive2 { name="eLNNpaired"; version="0.2.3"; sha256="08nck2p5npyw264kgcqmgx5rx7c3h9v892f90xlcd1dnb7dqlan3"; depends=[Biobase globaltest GSEAlm iCheck samr]; }; eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; }; eRm = derive2 { name="eRm"; version="0.15-7"; sha256="0x8cqcwgn8znd9w9vkxcacf097rziyb511wzcfmhhadidiilk0x3"; depends=[lattice MASS Matrix]; }; - eVenn = derive2 { name="eVenn"; version="2.3.6"; sha256="0g4ji7dli5d21xnyfzw3qda9mgm25ax2jlvfzfbn4h1ra83mcw0m"; depends=[]; }; + eVenn = derive2 { name="eVenn"; version="2.4"; sha256="1qs5qsrc89kb6w6xqc8jdxkih6h48zprvavffdqhxq4ab4i1nvbf"; depends=[]; }; eaf = derive2 { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; }; earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; }; earth = derive2 { name="earth"; version="4.5.1"; sha256="1fkjrdlq0a8w9dvvp0akxpyg0sxrcd08qzflpxjbwd73pm1l31m5"; depends=[plotmo TeachingDemos]; }; @@ -5356,7 +5472,8 @@ in with self; { eba = derive2 { name="eba"; version="1.7-2"; sha256="00hlmnknif9yr4wzw0n1fzkrgbciv7ljc0gkfq34v3vvy3dmdsvq"; depends=[nlme]; }; ebal = derive2 { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; }; ebdbNet = derive2 { name="ebdbNet"; version="1.2.5"; sha256="0kal4sqx12y04696ilwnwkmss4rn16dkbnalgqimz6i4jhz8n23h"; depends=[igraph]; }; - ebimetagenomics = derive2 { name="ebimetagenomics"; version="0.2"; sha256="1jbb1h2wp3fpmjivy09165qn72ign2pbss4bw9xcn2dlxaddgh1c"; depends=[sads]; }; + ebimetagenomics = derive2 { name="ebimetagenomics"; version="0.3"; sha256="1nvdpgq88yf7a89qy896wc1h7afjwj90jdbpm144fn12b2pba0a7"; depends=[breakaway sads vegan]; }; + ebmc = derive2 { name="ebmc"; version="1.0.0"; sha256="0v9hkzy8ljddmi6wdjd1jga4ib566ikr1vgrvxba67ka524r6bbp"; depends=[C50 DMwR e1071 pROC randomForest rpart]; }; ecb = derive2 { name="ecb"; version="0.2"; sha256="17hj4d48j6rran64ajzlgkgz17mab51fa3lz8rm3mw0qhahkjlmc"; depends=[curl httr rsdmx xml2]; }; ecd = derive2 { name="ecd"; version="0.8.3"; sha256="0ksr5yixg4psgx4nf3y061k2fj5843f6f3xwbfl0nyfly8595s1x"; depends=[digest gsl moments optimx polynom Rmpfr RSQLite xts yaml zoo]; }; ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; }; @@ -5370,7 +5487,8 @@ in with self; { ecoengine = derive2 { name="ecoengine"; version="1.11.0"; sha256="1d5x6hvqrqjj0wg07m4dbgb9ljdq73ibavzy2q5magnfn50a7rzm"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; }; ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; }; ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; }; - ecoreg = derive2 { name="ecoreg"; version="0.2.1"; sha256="1v3n5nbabw6qmwcq3sx759k6c8q4pxbffl227rv0lnnfbq77zlmc"; depends=[]; }; + econullnetr = derive2 { name="econullnetr"; version="0.1.0"; sha256="0l4qy7x8f8sjc3s1bhz3kadfqifw0x9jl7dvcjwkh9q14h093cz5"; depends=[bipartite gtools reshape2]; }; + ecoreg = derive2 { name="ecoreg"; version="0.2.2"; sha256="1yzyqvhshgc7ip251y7hsvip4xwf8i92bvvz84mn0mzv5b4mq3im"; depends=[]; }; ecoseries = derive2 { name="ecoseries"; version="0.1.4"; sha256="0bvh2p3fv0lr55w2b86qzg1plw99q50nk0myxyxg6jv2q5aw3pp0"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; }; ecosim = derive2 { name="ecosim"; version="1.3"; sha256="00arz8j2az1nn4p96pshw0p9xxq2qfgkyrf4ahvl1hp1h3k68jfn"; depends=[deSolve stoichcalc]; }; ecospace = derive2 { name="ecospace"; version="1.1.3"; sha256="01nxjbx638s8pk1ybsz9zbk35cg27x35fam419b9rjj9kspxz49s"; depends=[FD]; }; @@ -5383,7 +5501,7 @@ in with self; { edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; edci = derive2 { name="edci"; version="1.1-2"; sha256="10rqkimvmyb7hxp4wkpj8bq07q3yaimm058d4mmr09fw25lqyz1q"; depends=[]; }; edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; }; - edeaR = derive2 { name="edeaR"; version="0.6.0"; sha256="1042yy8hfh78ybwg1h35dx65hsawlrbcnnqq6ccvdww78amlrhkz"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI shiny shinyTime tibble tidyr XML xml2]; }; + edeaR = derive2 { name="edeaR"; version="0.7.1"; sha256="1551hwl0gb55kkfpl990yhwa6l9hbx7a6bcggv5nkfqc66cs9rcm"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI purrr shiny shinyTime tibble tidyr XML xml2]; }; edesign = derive2 { name="edesign"; version="1.0-13"; sha256="0fc3arr8x9x9kshp6jq4m4izzc5hqyn5vl0ys6x0ph92fc6mybp3"; depends=[]; }; edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; }; edfReader = derive2 { name="edfReader"; version="1.1.2"; sha256="02cclg549z6samhkraaknsmqvk0yxxcf4s9qpbcxb2cl9fcj1cjr"; depends=[]; }; @@ -5393,9 +5511,11 @@ in with self; { edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; }; edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; }; edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; }; + editData = derive2 { name="editData"; version="0.1.0"; sha256="1r4qji1dai6a0h3s4mmds4an09zdfzn0pzh8myxcc7h1q4psl0fl"; depends=[DT miniUI rstudioapi shiny tibble]; }; editrules = derive2 { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; }; - edpclient = derive2 { name="edpclient"; version="0.1.0"; sha256="05wv6sf3kbzjs4ka6qi8acjm15l54kw0wgahh82w8nibw1fzv03n"; depends=[httr ini jsonlite plyr]; }; - edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[lasso2 MASS mvtnorm rgl]; }; + edmcr = derive2 { name="edmcr"; version="0.1"; sha256="1x0l963ccamfw6m9nsbqcfm45wxmq3jpfxzxmc4gxvpz8c7yf4jh"; depends=[igraph lbfgs MASS Matrix nloptr sdpt3r truncnorm vegan]; }; + edpclient = derive2 { name="edpclient"; version="0.2.0"; sha256="090yp94j3mm7g6lyc9vs8l1zhimnh9cizf55gw3g7ffqma2pl1rs"; depends=[httr ini jsonlite plyr]; }; + edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.2"; sha256="105jv2sz10xbl881lkhgmxzgmb8629mqsminhd197khrkf9nv40i"; depends=[lasso2 MASS mvtnorm rgl]; }; edstan = derive2 { name="edstan"; version="1.0.6"; sha256="1gm1rxwywigyfdlcm2yj1m9qjb4s6w7chr1ck7b32x1pdxdl3ns5"; depends=[ggplot2 rstan]; }; educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; }; eechidna = derive2 { name="eechidna"; version="1.1"; sha256="01c1b41fzkq1hgg7705n96m1ji74gbfy9fisdj5pl0kgjhjiq24w"; depends=[dplyr ggplot2 ggthemes plotly rgdal rmapshaper rvest shiny shinyjs tidyr xml2]; }; @@ -5407,15 +5527,16 @@ in with self; { eeptools = derive2 { name="eeptools"; version="1.1.0"; sha256="161gxaqkab9bl915xspqrnm9r4r7ydki482s4axsb0wsqpf2jr13"; depends=[arm data_table ggplot2 maptools memisc vcd]; }; eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; }; effectFusion = derive2 { name="effectFusion"; version="1.0"; sha256="1nx61n4lgnj6wh4arqm62p9xwxqvz4g7bs4b5k3ybkhmh6ns9v5l"; depends=[bayesm cluster ggplot2 MASS Matrix]; }; - effects = derive2 { name="effects"; version="3.1-2"; sha256="1fwkz6z3rya4qn476w9vni15rfvjp2ix87qk0naszn3n1k8bf0l0"; depends=[colorspace lattice lme4 nnet]; }; + effects = derive2 { name="effects"; version="4.0-0"; sha256="0h3247xcccanp0cp18r5k4l87i9862yjr5jc8sxcsfvjzn13xgf6"; depends=[carData colorspace lattice lme4 nnet survey]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; effsize = derive2 { name="effsize"; version="0.7.1"; sha256="0l0ja7qcknn8r5hf7nrjk5cy0ajw0z60ggbyj8qvjzf8qah4mlss"; depends=[]; }; efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; }; ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; }; - egcm = derive2 { name="egcm"; version="1.0.8"; sha256="1mrbm0yzqw344fzgcbwc6bgdn8fv8id80jnfp3jaqjfslfhlpzx7"; depends=[fArma ggplot2 MASS tseries TTR urca xts zoo]; }; + egcm = derive2 { name="egcm"; version="1.0.12"; sha256="0nssf5six1j7z6fss7478zdbsfx60myzw833m7nsnaf1r8n4ixaf"; depends=[ggplot2 MASS pracma quantmod tseries urca xts zoo]; }; + egg = derive2 { name="egg"; version="0.2.0"; sha256="03k6xnbpakzgwlirxcvhrb10qh1pqvj9mv8rhr4snhnf753rb75j"; depends=[ggplot2 gridExtra gtable]; }; eggCounts = derive2 { name="eggCounts"; version="1.4"; sha256="04rhyfckkg3q6n6izbmhh1m6ywywvrr719isnx8qghlx774qab86"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rstan StanHeaders testthat]; }; egonet = derive2 { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; }; - eha = derive2 { name="eha"; version="2.4-5"; sha256="0c1fqvnijsaqsa4c4ss7c6lb9mr5p49bg2y4gmpc0wwyjm8xj0lx"; depends=[survival]; }; + eha = derive2 { name="eha"; version="2.4-6"; sha256="09wbyn0s2cfafjnaq5vb89l2j42irbxx70h6dk8flakp42p62i27"; depends=[survival]; }; ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; }; eiCompare = derive2 { name="eiCompare"; version="2.1"; sha256="0kv4k1zk1gz3fapy2i2ydy0n38hy95i10r3hr3dx8mkkf3nsj46h"; depends=[cubature data_table ei eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; }; eiPack = derive2 { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[coda MASS msm]; }; @@ -5425,7 +5546,7 @@ in with self; { eive = derive2 { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp]; }; eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; - elastic = derive2 { name="elastic"; version="0.7.8"; sha256="0cji7nh6ghjx6di9mw103hyj2am5x75f2lpi0csswbv4r3mslirr"; depends=[curl httr jsonlite]; }; + elastic = derive2 { name="elastic"; version="0.8.0"; sha256="17aqf0a3spwh8k7s3kgnccbgad3sr3w63if96piygjz0lxgc7kzs"; depends=[curl httr jsonlite]; }; elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; }; elasticnet = derive2 { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; }; elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.0"; sha256="0hw2pwfh6k8q1646cprg3d84acwgw5bi7vmp7wrnxkxg7npz5pyz"; depends=[httr jsonlite]; }; @@ -5443,7 +5564,7 @@ in with self; { elo = derive2 { name="elo"; version="0.1.2"; sha256="00yrwzkgvxc7m5pnimr51b4h9vdw1cj17m6al14b3zs0yvf4a8v6"; depends=[Rcpp]; }; elrm = derive2 { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; }; emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; }; - embryogrowth = derive2 { name="embryogrowth"; version="6.5"; sha256="1gbmrcjm8zwm01xq62wrkibmqnig904bnzrpar4d4qb98b6b3gp6"; depends=[deSolve HelpersMG numDeriv optimx]; }; + embryogrowth = derive2 { name="embryogrowth"; version="7.0"; sha256="0nc7nf1rcqfq4myhfmf0z07qy2damysc1xmfiy32wxjnjd7pqn7g"; depends=[deSolve HelpersMG numDeriv optimx]; }; emdbook = derive2 { name="emdbook"; version="1.3.9"; sha256="09xbdyw8a4pvrsg3ryr8drby0njy4avc5wsjj4ffibdaicpchy69"; depends=[bbmle coda lattice MASS plyr]; }; emdi = derive2 { name="emdi"; version="1.1.1"; sha256="1gbjx0pxfzkbp0csgq07iwqqww5lixpkvwn3k53na65gwx9afsq4"; depends=[boot FNN ggmap ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap reshape2 rgeos simFrame]; }; emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; @@ -5468,7 +5589,7 @@ in with self; { endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; }; endorse = derive2 { name="endorse"; version="1.6.0"; sha256="1j75sb2di2c092dilbjj5qsvb52h3zmm7wxflf9kg7xw227wq3zw"; depends=[coda]; }; endtoend = derive2 { name="endtoend"; version="1.0"; sha256="0x8f6h0mznmncqdwvsp2f0x524g5clgvk64qflf373lyn6h1v0ap"; depends=[]; }; - energy = derive2 { name="energy"; version="1.7-0"; sha256="1g4hqi6mgsnd1w4q7dd2m40ljh2jdmvad91ksbq9fscnrqpvji1x"; depends=[boot Rcpp]; }; + energy = derive2 { name="energy"; version="1.7-2"; sha256="19c7bgjnm4ggf7w5mk64c5shkma3sa9wc8x117iqv7pk1bvvyy3p"; depends=[boot Rcpp]; }; energyr = derive2 { name="energyr"; version="0.1.1"; sha256="1mid5f8l6v55pjzfx304a303mkn9b5r3jzmjl2fi2pz4v2jsdw04"; depends=[RgoogleMaps]; }; english = derive2 { name="english"; version="1.1-2"; sha256="1wlqpl85rq49ndrfqlixayp4zzvpad0snln5qirr1i3y2q510dgx"; depends=[]; }; engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; }; @@ -5480,11 +5601,12 @@ in with self; { ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.4"; sha256="14zq22h8nna7j403c1x9py90fwas8fg0vq3im2zh31dyrk1j8d7k"; depends=[chron]; }; ensembleMOS = derive2 { name="ensembleMOS"; version="0.8"; sha256="01pv3nhns9n5fwcngsgjj10657mfg27isxbnhfq36y4cv5igk4jk"; depends=[chron ensembleBMA evd]; }; ensembleR = derive2 { name="ensembleR"; version="0.1.0"; sha256="0xvq1jlsp7gsk46i847nfvadxwlh09gi2rgwss2wf2xmh1855ray"; depends=[caret]; }; + ensemblepp = derive2 { name="ensemblepp"; version="0.1-0"; sha256="1b3rhg8mv1x3caz3xg84cwx8m88055n6yl36d9i4ws6vbj8vx68f"; depends=[]; }; ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; entropart = derive2 { name="entropart"; version="1.4-7"; sha256="18h8jzan7q9wkz0awpzlypvz8xzq7ak0j21jy7nk02k64v7zkpch"; depends=[ade4 ape EntropyEstimation geiger vegan]; }; entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; - envDocument = derive2 { name="envDocument"; version="2.3.0"; sha256="151ibmkq63r7lvh5lrszy7wsmrygvr2789lhcfp11nw3d39b4rqc"; depends=[]; }; - enveomics_R = derive2 { name="enveomics.R"; version="1.1.5"; sha256="0zb7bl92n2h3hhrs7slbqizkjk0rg47lmahmrg9sk0px7ncbjhmv"; depends=[fitdistrplus investr modeest sn]; }; + envDocument = derive2 { name="envDocument"; version="2.4.0"; sha256="0r7h9p0b0gr2l18mv1ydlamsc0iq474dfhp450mdfnw2q289mhrn"; depends=[]; }; + enveomics_R = derive2 { name="enveomics.R"; version="1.1.6"; sha256="115rqddy5llsncj5nbscan26lqr8x9fmyxxl3c8gpiyil8c266ja"; depends=[fitdistrplus investr modeest sn]; }; enviGCMS = derive2 { name="enviGCMS"; version="0.3.4"; sha256="1wjf1rxwzd590qsyljw1pd59kppx91m32p6nkdy4yvbnv39rk8dq"; depends=[BiocParallel genefilter limma mixtools qvalue rcdk RColorBrewer sva xcms]; }; enviPat = derive2 { name="enviPat"; version="2.2"; sha256="1cf1h4v05riivjwil4167sncdxzgxf3r4snx1imjb6s4msx67ibi"; depends=[]; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; }; @@ -5500,7 +5622,7 @@ in with self; { epidata = derive2 { name="epidata"; version="0.1.0"; sha256="1lp6hnjzga787abq94k8v48wlikpp5hj1xwmxc8nj1imyr4r8a4h"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; }; epifit = derive2 { name="epifit"; version="0.1.2"; sha256="1i1ngb5kh03gyx1702fwav3dc3mqry1wjzc7ry36hdw0ngawid34"; depends=[MASS]; }; epinet = derive2 { name="epinet"; version="2.1.7"; sha256="10mqc3xy24mjbk9np5mp41216hj6yc9jqxl3ybgysmd80y3qgf39"; depends=[network]; }; - episensr = derive2 { name="episensr"; version="0.9.0"; sha256="1ldg4flzbia6mk1w88jwj5c2p1cx73izhx2j3nfj57rc1i1lzmih"; depends=[boot ggplot2 gridExtra plyr reshape trapezoid triangle]; }; + episensr = derive2 { name="episensr"; version="0.9.1"; sha256="1sb0lq0rqk5n7l2d62z8832xzx7cf2f25b01bc3nf6v763yrh20g"; depends=[boot ggplot2 gridExtra plyr reshape trapezoid triangle]; }; episheet = derive2 { name="episheet"; version="0.2.0"; sha256="15c4xbam9b60xkkgmbswj4raln49hk43pxp2l75a7j1wykgkif95"; depends=[dplyr ggplot2 magrittr tidyr]; }; episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; }; epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; }; @@ -5532,12 +5654,13 @@ in with self; { errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; }; errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; }; errorlocate = derive2 { name="errorlocate"; version="0.1.2"; sha256="1qlwdvy7i62hpnfrryzmqwmygxa8mjc7q92g6k5n9r2r179q7h09"; depends=[lpSolveAPI validate]; }; - errors = derive2 { name="errors"; version="0.0.2"; sha256="1gpzhadlk34vaqlldgsh2sknb8ff2qf5lxfmh5dfs057gjp1p83d"; depends=[]; }; + errors = derive2 { name="errors"; version="0.1.0"; sha256="0d9wa1wjyd69ym3har51ycggcs66y5z5qzv7r3r2ss7impsvghz3"; depends=[]; }; esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; }; esaddle = derive2 { name="esaddle"; version="0.0.3"; sha256="04imppwls6a485kdfwykk4s0pyxas3i92ccghi780ys29y0nggmy"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; }; esc = derive2 { name="esc"; version="0.3.1"; sha256="0ihld8sklgr2waif3n8ca96x7z5zi1wi4ygf50x5n8h47p0hrj3v"; depends=[dplyr purrr readr sjmisc tibble]; }; eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; }; esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; }; + esmprep = derive2 { name="esmprep"; version="0.1.0"; sha256="0yv73czpvl6xdwwcxgssm6yw33lr3s27v4r67gcbslnidhcbq192"; depends=[lubridate]; }; esreg = derive2 { name="esreg"; version="0.3.1"; sha256="19ikfy0g8yd224ah4gyq2k29lz3gagc6vrcv53awvdadqw0cpz8l"; depends=[quantreg Rcpp RcppArmadillo]; }; estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; }; estimability = derive2 { name="estimability"; version="1.2"; sha256="13b80bpnbrarazjvnpnk91ljjsqgfm2fm3gy66aj09cmmsmv199h"; depends=[]; }; @@ -5565,7 +5688,7 @@ in with self; { evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; }; event = derive2 { name="event"; version="1.1.0"; sha256="1nq34bz9dsixidym3n255vmap3gjx9nfk8pc5s7w026faf96dr2v"; depends=[rmutil]; }; eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; }; - eventdataR = derive2 { name="eventdataR"; version="0.1.0"; sha256="1097938qw4xmv949zjjcj5cjixmngpszjcspqb52dv373a0sgd25"; depends=[]; }; + eventdataR = derive2 { name="eventdataR"; version="0.1.1"; sha256="1vabawwb41v3gs7x3s1w8nll02h544xbsr21c2wbdx9h304rs54m"; depends=[]; }; events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstudies = derive2 { name="eventstudies"; version="1.2"; sha256="0z449j7yrd6j6hhacz6f048ibilib6m97684cz2wc4pqq2wlj8hg"; depends=[boot sandwich testthat xts zoo]; }; evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; }; @@ -5584,7 +5707,7 @@ in with self; { exactci = derive2 { name="exactci"; version="1.3-1"; sha256="1mhigk1nzd24qhzgd1j96zlf38dr96c1y5jbmy6lz2sw7g4mmvgm"; depends=[ssanv]; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; exampletestr = derive2 { name="exampletestr"; version="1.0.1"; sha256="0352rv81isk820srwfpz7bf3349fpbygbq06lmjz8qgjvdfl1r4i"; depends=[devtools filesstrings formatR magrittr purrr roxygen2 stringr]; }; - exams = derive2 { name="exams"; version="2.2-1"; sha256="0dz1ijdfikmxyrz33mz8qkf5kn9796c078ndqk5gfyyxl2jsj6jw"; depends=[]; }; + exams = derive2 { name="exams"; version="2.3-0"; sha256="0y21cx6knx253gka1bib8z0jmyndl4k7c2d8hfh3rwn5bdqyqj53"; depends=[]; }; excerptr = derive2 { name="excerptr"; version="1.3.1"; sha256="0z1qgivk4plfap9j1fllx6wdj6z4nyblgj0rqjvgalk1sjk9b5zl"; depends=[git2r rprojroot rPython]; }; excursions = derive2 { name="excursions"; version="2.2.2"; sha256="1f6vvv33205lj6hsmmhx3q82mkhh0shzyk5hrwzf2nh1cn61w1x0"; depends=[Matrix sp]; }; exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; }; @@ -5604,7 +5727,7 @@ in with self; { expp = derive2 { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[deldir rgeos sp spdep]; }; exprso = derive2 { name="exprso"; version="0.1.8"; sha256="1k3is8f4yfzzkcak9fmm2nk8vi85b0na5r96f3yjbc9qb0av9vb8"; depends=[affy Biobase cluster e1071 kernlab lattice MASS mRMRe nnet pathClass plyr randomForest ROCR sampling]; }; expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; }; - expss = derive2 { name="expss"; version="0.8.1"; sha256="12w5pg51j6hv48is9n4jpdfxrl3af0wf84fkql0mgaqdd8i4wy50"; depends=[data_table DT foreign htmlTable htmltools magrittr matrixStats]; }; + expss = derive2 { name="expss"; version="0.8.2"; sha256="1jsfpvxji8rwvp64x42nvkn9n4gbx36fvzbnbzbnk9jgxvkhs1zv"; depends=[data_table DT foreign htmlTable htmltools magrittr matrixStats]; }; exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; }; exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; }; @@ -5615,7 +5738,7 @@ in with self; { extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; }; extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; }; extraBinomial = derive2 { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; }; - extraDistr = derive2 { name="extraDistr"; version="1.8.6"; sha256="1bklj9d1m4wzbqq6nj80szzdilkcfb90wps19q77nrp8bhhhplqk"; depends=[Rcpp]; }; + extraDistr = derive2 { name="extraDistr"; version="1.8.7"; sha256="1r90q14snx6h665qkij1lza2bs87iw61y6waabdzw6p3cqgg4pds"; depends=[Rcpp]; }; extraTrees = derive2 { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; }; extracat = derive2 { name="extracat"; version="1.7-4"; sha256="1dply8sx9r9vshi5dycxs7bchf5g33qbq7w6i5w830glfy0lk3i5"; depends=[colorspace data_table ggplot2 hexbin plyr reshape2 scales TSP]; }; extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; }; @@ -5634,20 +5757,18 @@ in with self; { ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; }; ezsummary = derive2 { name="ezsummary"; version="0.2.1"; sha256="16rwg1h7gs7mnkmbwfb273fy1pwdq9ng6l4ad00anpmilqcck5ng"; depends=[dplyr tidyr]; }; fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; }; - fArma = derive2 { name="fArma"; version="3010.79"; sha256="1byxyy4afl1gq58r1cmc5p6frdr9rljr1x3pdnc8nj8rr65lkg72"; depends=[fBasics timeDate timeSeries]; }; - fAsianOptions = derive2 { name="fAsianOptions"; version="3010.79"; sha256="1w9ph3rz6cd7g275flzsnqxwd3r5xin6pkini8pbsi9s8hbqv3vl"; depends=[fBasics fOptions timeDate timeSeries]; }; fAssets = derive2 { name="fAssets"; version="3011.83"; sha256="0i3phc8kxwhzf6010bv5k2ff5zlv7aqrwavqmhly4wwby73i39yl"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; }; fBasics = derive2 { name="fBasics"; version="3011.87"; sha256="1x4jv4db0nr2fig6hglk0kv6j27ngkc8qzclgiklbl8wjfrrp9zh"; depends=[gss MASS stabledist timeDate timeSeries]; }; fBonds = derive2 { name="fBonds"; version="3010.77"; sha256="00rc3i0iyqcpsqvc036csa1c8gxwcnniwj3l2irmcalx4p8650w0"; depends=[fBasics timeDate timeSeries]; }; fCertificates = derive2 { name="fCertificates"; version="0.5-4"; sha256="1a49gkzvb83lqqw65lxlaszpicn663hwi9wrbsb3f6z7znylkzaf"; depends=[fBasics fExoticOptions fOptions]; }; fChange = derive2 { name="fChange"; version="0.1.0"; sha256="1pj4q9dsqqgv198kfv410qkpgynhd580bcsigmak598m5jx3rf7l"; depends=[fda lattice reshape2 sandwich sde]; }; fCopulae = derive2 { name="fCopulae"; version="3011.81"; sha256="0r4g567icgiiz6cxi6ak3kzrav9qzsc6zvww5dj1pd8mkd4r1f0y"; depends=[fBasics fMultivar timeDate timeSeries]; }; - fDMA = derive2 { name="fDMA"; version="1.1"; sha256="16ff6v8b71wxk5f35s9m1cybl22ck98kgl8gl3czkyxshbhnxlyw"; depends=[doParallel foreach forecast gplots iterators MSwM png xts zoo]; }; + fDMA = derive2 { name="fDMA"; version="2.0"; sha256="06917d985gzjn7hv72gdz6ygxfqp98bsvdr48qfxv6n8822r5k7h"; depends=[doParallel foreach forecast gplots iterators MSwM png tseries xts zoo]; }; fExoticOptions = derive2 { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[fBasics fOptions timeDate timeSeries]; }; fExpressCertificates = derive2 { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[fCertificates Matrix mvtnorm tmvtnorm]; }; fExtremes = derive2 { name="fExtremes"; version="3010.81"; sha256="0bzgnn0wf7lqhj7b2dbbhi61s8fi2kmi87gg9hzqqi6p7krnz1n5"; depends=[fBasics fGarch fTrading timeDate timeSeries]; }; fGarch = derive2 { name="fGarch"; version="3010.82.1"; sha256="0n5mzqc7lj7h63rf4nw4w3mics02gaf049c7m3bjfbp5cwwnf9pf"; depends=[fBasics timeDate timeSeries]; }; - fICA = derive2 { name="fICA"; version="1.0-3"; sha256="0gbmjg1az3v413xgdzkjinfy5wri8963w38jnk0p0h2zd8gdkpfs"; depends=[JADE Rcpp RcppArmadillo]; }; + fICA = derive2 { name="fICA"; version="1.1-0"; sha256="0lfs31clax57qsrriq9wxjrjv2bckl7lf1csffzfwiqm6sp6mgxg"; depends=[JADE Rcpp RcppArmadillo]; }; fImport = derive2 { name="fImport"; version="3000.82"; sha256="07yqppl8sbfa0x9k4n7hh6hcgyxpcvlk74hhylib4nzqm70bn0sq"; depends=[timeDate timeSeries]; }; fMultivar = derive2 { name="fMultivar"; version="3011.78"; sha256="115hqbbxsdjs5v2rhalg8vz0m5lyg8ppjjqmbq1x21jdnbg6l0fl"; depends=[cubature fBasics mvtnorm sn timeDate timeSeries]; }; fNonlinear = derive2 { name="fNonlinear"; version="3010.78"; sha256="0pmz16b606i3mx05zjln4nyl53ks7rlwgm45ldr9qgmw51pflwz9"; depends=[fBasics fGarch timeDate timeSeries]; }; @@ -5685,26 +5806,29 @@ in with self; { fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; depends=[igraph]; }; fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; }; fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; }; - fastDummies = derive2 { name="fastDummies"; version="0.1.1"; sha256="0h2xqhsiwm0palkdckkh3k38yw3sf775w3vzysz9msrgf1nnasxl"; depends=[data_table]; }; + fastDummies = derive2 { name="fastDummies"; version="0.1.2"; sha256="15c5rkz4d7ghmm052ybd4l0gbbyr0wrihal4fi5y6cvss1jja7gq"; depends=[data_table]; }; fastGHQuad = derive2 { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; }; fastGraph = derive2 { name="fastGraph"; version="1.1"; sha256="1vbi5yssnh8hcbmrq1r437vpvj8hqd3vc8wmcy0nbyvnmyjaxkvb"; depends=[]; }; fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; }; fastICA = derive2 { name="fastICA"; version="1.2-1"; sha256="108z2ymby5y4h8l4l2krqwm28rya93gq09yylgilnm3afvfrfabg"; depends=[]; }; fastJT = derive2 { name="fastJT"; version="1.0.4"; sha256="1pa4qpcf4qmzk6s8qgk60n5ialz8gcj5m8d7xr10cmn4jfwghc7b"; depends=[Rcpp]; }; - fastLink = derive2 { name="fastLink"; version="0.1.1"; sha256="0m81ad6j0s328jf531dfglppfq5xqs1kvkzfar0az8l6xnr9i6sx"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix Rcpp RcppArmadillo RcppEigen stringdist stringr]; }; + fastLink = derive2 { name="fastLink"; version="0.2.0"; sha256="1n8yzwlcvj1bcdzxvlprh5q3wk2mbw7jpc40bjc5mpgrx0vpf95c"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; }; fastM = derive2 { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp RcppArmadillo]; }; fastR = derive2 { name="fastR"; version="0.10.3"; sha256="1sz6krxiamq3rp4h9ah2b1zvyyrlvsn7lpvrjv1xda2c1kqqkvmk"; depends=[lattice mosaic mosaicCalc mosaicData]; }; + fastR2 = derive2 { name="fastR2"; version="0.2.0"; sha256="1xwa4v0j2n0qxn1prhc9x0sz53fhsfbg2m1a6kfdp7cpvvk46pw5"; depends=[dplyr ggformula ggplot2 lattice magrittr maxLik miscTools mosaic numDeriv]; }; fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; }; fastTextR = derive2 { name="fastTextR"; version="1.0"; sha256="0l0f9jvsa68a3vd6mwbhsqd12729nd6nwsnlzrhsg9wj9rx8kpmi"; depends=[Rcpp]; }; fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; }; fastcluster = derive2 { name="fastcluster"; version="1.1.24"; sha256="15drhl22wm8whsy6b3vv754skfddiydb068zn1whrw5sknvkkjc2"; depends=[]; }; fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; }; + fastcox = derive2 { name="fastcox"; version="1.1.3"; sha256="0jn19v6mkwgyz8x63xrfgkgnf0f2rq338r5qkhz690mdzr4c47a3"; depends=[Matrix]; }; fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; }; fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; }; fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; }; fastnet = derive2 { name="fastnet"; version="0.1.3"; sha256="06nxfwv85gm93bcgq53a6z929sqcij0adkg55g5y03hcm8v8v3aa"; depends=[doParallel foreach igraph]; }; fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; }; fastqcr = derive2 { name="fastqcr"; version="0.1.0"; sha256="0hzlp66as7k0bh3biqkngacpkq1hi3y3gp6wg4c5476ywzm83gra"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; }; + fastrtext = derive2 { name="fastrtext"; version="0.2.1"; sha256="06r8bqkc415n1ycq8nqpffq5wp053s2yz50v2k5sbg36laqyschi"; depends=[assertthat Rcpp]; }; fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.2"; sha256="1xqr4azc5gsr7kcm8qzwjpjy72w1b111i61wbm35vns9r38a6cxz"; depends=[kinship2 multgee]; }; fauxpas = derive2 { name="fauxpas"; version="0.1.0"; sha256="1mi19zrgkx25g8j1f948n0ps27dn0rr2jqnhf15w73lpsjbwvi54"; depends=[httpcode R6 whisker]; }; @@ -5719,17 +5843,18 @@ in with self; { fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; }; fcros = derive2 { name="fcros"; version="1.5.4"; sha256="112mgs69p3642rfk1w3dkkyn72icvda0asllanmgjym1lrzdp0lj"; depends=[]; }; fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; }; + fdANOVA = derive2 { name="fdANOVA"; version="0.1.0"; sha256="10c12yns1sv4ph61hma1mymab03xyyx933f27977lw3c0npy7b02"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; }; fda = derive2 { name="fda"; version="2.4.7"; sha256="0371c32kxxvfdh18ldgc2p76dr2436ay0n9prdjwm9v0azp4rp9k"; depends=[Matrix]; }; fda_usc = derive2 { name="fda.usc"; version="1.3.0"; sha256="1ask7g6mqwx8r1hd9vxzdl96z0gyqprswjpfcl7l5l3611m7mzdm"; depends=[fda MASS mgcv nlme rpart]; }; fdaMixed = derive2 { name="fdaMixed"; version="0.5"; sha256="1k2b3z2jj37j6njvxalg8640zlcvi1cm7wkcwp0pia21wydz75ip"; depends=[Formula Rcpp RcppArmadillo]; }; fdaPDE = derive2 { name="fdaPDE"; version="0.1-4"; sha256="0n72x5h00n17yxjniim2qxz2phy1srk04dn6ivvc58k3x252fzkh"; depends=[RcppEigen rgl]; }; fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; }; fdapace = derive2 { name="fdapace"; version="0.3.0"; sha256="1r4s20spsiags7z8hyvbvi9gxjxs4v8hfnrqya872shagk9iadyl"; depends=[Hmisc Matrix numDeriv pracma Rcpp RcppEigen]; }; - fdasrvf = derive2 { name="fdasrvf"; version="1.8.1"; sha256="189yr8y2wypqsyd3smzm852k7da9ssd3gv5y8jy1f1rs501m7pnb"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo viridisLite]; }; + fdasrvf = derive2 { name="fdasrvf"; version="1.8.2"; sha256="10j2zh0jfxi46vf2cf9k561ff3qy6vhp1hj1q2zwvpbxaa1lyjb3"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo viridisLite]; }; fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; }; fdcov = derive2 { name="fdcov"; version="1.0.0"; sha256="1m6yk6ngsxrz5mywp3vqhfjpkskrzgdyvqw7j8k2jgy4l0x04g5g"; depends=[corrplot matlab]; }; fdq = derive2 { name="fdq"; version="0.2"; sha256="1iyplxm6niywfhmdnliy9nvvax1w6sijar8gpsj853cdfvn6kz5m"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; }; - fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9hjbgblmhx5f3ddk16kigzsik9bvw179d1szk33kadfq2vp"; depends=[edgeR MCMCpack]; }; + fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.1"; sha256="0vhm40q63sknzh7ax4mhv41vpg2pn4cinsln6wfk3q4nqkn7bd45"; depends=[discreteMTP MCMCpack]; }; fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; }; fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; }; fds = derive2 { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; }; @@ -5738,12 +5863,12 @@ in with self; { feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; }; features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; }; featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; }; - fecR = derive2 { name="fecR"; version="0.0.1"; sha256="0w31hr2j80ppzwgpnbalkgrxz7ijfr43yw7xk9rjkl8gw2nq4kg6"; depends=[lubridate plyr]; }; + fecR = derive2 { name="fecR"; version="0.0.2"; sha256="1p4166cxajapm158aqbz9p7m8c8dqga1infl6y6wazjnayaib3cb"; depends=[lubridate plyr]; }; fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; }; federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; }; feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; }; fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; }; - fergm = derive2 { name="fergm"; version="0.2.0"; sha256="0mgrbhskxgzkrqg8z31zv2821iwimmwimkg6f9bzg7ib8yn4hfli"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan scales statnet stringr]; }; + fergm = derive2 { name="fergm"; version="0.2.1"; sha256="14asdvr98nh6rayqff9xda54w95bjg4g2f72a21rhyc932d7589g"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan statnet stringr]; }; fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; }; fetchR = derive2 { name="fetchR"; version="2.1-0"; sha256="1rrmky1wg2wz4m8nmvdxwbs4yxnwgdchddvh1dhp171364as3536"; depends=[plotKML rgdal rgeos sp]; }; ff = derive2 { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; }; @@ -5771,8 +5896,7 @@ in with self; { finch = derive2 { name="finch"; version="0.1.0"; sha256="0pqli6l049s9pdk0gphch1pw8i0f1fr3562akms1x7hvdkn9c0i9"; depends=[data_table digest EML plyr rappdirs xml2]; }; findpython = derive2 { name="findpython"; version="1.0.2"; sha256="1x38dbxr6yvxy2z2fvv00y263g66ljbzf3a8znl2fywj462i92xk"; depends=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; - fingerprint = derive2 { name="fingerprint"; version="3.5.4"; sha256="0raxsyni8kbq7q2sfkp4bx6mh8wdk9mxplzi4fbqcf78cxk9bla7"; depends=[]; }; - fingertipsR = derive2 { name="fingertipsR"; version="0.1.0"; sha256="0l19ipmi4zdbckyzz38y8lvq3wfw67aqm8rk6fjyfmr9xbfx5vjc"; depends=[dplyr jsonlite tidyjson]; }; + fingerprint = derive2 { name="fingerprint"; version="3.5.6"; sha256="1qidi88i1wh0gpicklk0f0l4j3azwmh0crpwnandkjx4nk1pfxxs"; depends=[]; }; finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; }; finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; }; fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; }; @@ -5806,7 +5930,7 @@ in with self; { flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; }; flexsurv = derive2 { name="flexsurv"; version="1.1"; sha256="1vj8zsfgq2rv6v7na4w7n7z3farc69qsavm7pnmnhkaylz61gq26"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival]; }; flexsurvcure = derive2 { name="flexsurvcure"; version="0.0.2"; sha256="1lhw2z8i4l822ncziwpw6hg0dzc244q60n7l5aahgdhcr0xgylhz"; depends=[flexsurv gtools survival]; }; - flextable = derive2 { name="flextable"; version="0.2.0"; sha256="0541vawawdvxym5prya2nahsr2v6wyxqq2n4b3rm39wvz5c0gp4y"; depends=[dplyr gdtools htmltools htmlwidgets lazyeval magrittr officer purrr R6 stringr tibble tidyr]; }; + flextable = derive2 { name="flextable"; version="0.3.0"; sha256="0pim9yw33v608c9vjvz0r4xw44v8wwncvnv5j6k5ppm9nmz2x51x"; depends=[gdtools htmltools htmlwidgets lazyeval magrittr officer purrr R6 stringr tibble]; }; flifo = derive2 { name="flifo"; version="0.1.4"; sha256="1yilfnblarimc8mlvvwsgib5sxcfgvgsvgpyzddxb39g6fb7lffs"; depends=[bazar pryr]; }; flip = derive2 { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[cherry e1071 Rcpp RcppArmadillo someMTP]; }; flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; }; @@ -5842,20 +5966,20 @@ in with self; { forcats = derive2 { name="forcats"; version="0.2.0"; sha256="1mvwkynvvgz2vi8dyz11x7xrp53kadjawjcja34hwk1d89qf7g5m"; depends=[magrittr tibble]; }; foreach = derive2 { name="foreach"; version="1.4.3"; sha256="10aqsd3rxz03s1qdb6gsb1cj89mj4vmh491zfpin4skj1xvkzw0y"; depends=[codetools iterators]; }; forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; }; - forecast = derive2 { name="forecast"; version="8.1"; sha256="1f49rxrls2721p9jb6krq6d4qnhdjm4z76kwr1k45sgh2km27s61"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; }; + forecast = derive2 { name="forecast"; version="8.2"; sha256="04mqx1szm22lhiqzncm8ad0kyqhv1y4d6v02gn70d78kxmjangzb"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; }; forecastHybrid = derive2 { name="forecastHybrid"; version="1.1.9"; sha256="03wkfzlg8pcpalakq5cgmhcy9p7ds4x0hqnhsiaja4zghrqbj5b6"; depends=[doParallel foreach forecast ggplot2 reshape2 zoo]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; }; - forega = derive2 { name="forega"; version="1.0"; sha256="0xf9almfikfkxq8mm09lzrvav2v5cg0avpz99i6h5i9qliix1q6r"; depends=[forecast Rcpp robfilter]; }; + forega = derive2 { name="forega"; version="1.0.2"; sha256="0kkfpj63rf6m7zi8pyi4n4m7gihfyfmaws2syw0znpvcd6d6m2l5"; depends=[forecast Rcpp robfilter]; }; foreign = derive2 { name="foreign"; version="0.8-69"; sha256="0s1lxmd85dd0kxx8hwk02w9l7pmpk4bpy7787fbyh2dbq5g9ys0k"; depends=[]; }; forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; }; forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; forestFloor = derive2 { name="forestFloor"; version="1.11.1"; sha256="1sslxq44qmmmdhr7800bz8lj9w2l7f7x1vly3w2z7j1qdijc7nw7"; depends=[kknn randomForest Rcpp rgl]; }; forestinventory = derive2 { name="forestinventory"; version="0.2.0"; sha256="09r5m0nal3ac2aiyqm7ppkcipnjhls5197lmg5xbnllw4icvpfy0"; depends=[plyr]; }; forestmodel = derive2 { name="forestmodel"; version="0.4.3"; sha256="1v1m8dvird2r1jqig492msqpp9sb4s79bhgnrs9y2c0ba46jzykh"; depends=[broom dplyr ggplot2 lazyeval]; }; - forestplot = derive2 { name="forestplot"; version="1.7"; sha256="0sxbh7chmy3aixvwks2mzzx0n6h9zkk6c4nsw3ihll213x8pph4q"; depends=[checkmate magrittr]; }; + forestplot = derive2 { name="forestplot"; version="1.7.2"; sha256="1cqk0fwpbn4an6xn28kpvqmcp3mgv8isg8dy755sv5fkqzzjz1dg"; depends=[checkmate magrittr]; }; formatR = derive2 { name="formatR"; version="1.5"; sha256="19sd23vgs4ac0fwlw40j3676k6mramb0ajlq8hdw23kjwdx1jk47"; depends=[]; }; formattable = derive2 { name="formattable"; version="0.2.0.1"; sha256="1s7jjgm0j24vdwm39933ygh6xnxcfvzy4kl2mmfgas4czfcmd4rf"; depends=[htmltools htmlwidgets knitr rmarkdown]; }; - formula_tools = derive2 { name="formula.tools"; version="1.6.1"; sha256="14n89fljl5x24fka2jab41hwqmjq3a2yl02n58n1li20wrl3zagj"; depends=[operator_tools]; }; + formula_tools = derive2 { name="formula.tools"; version="1.6.8"; sha256="10j7cgzdfkpqnxy9jpw5yd1bwrz55yi8b1zn144wwqb779l2c5yn"; depends=[operator_tools]; }; fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; }; forward = derive2 { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; }; forwards = derive2 { name="forwards"; version="0.1.0"; sha256="0pb101gdf2a4plalhhm34aixkss3lzfg8yj6yfi0d6khjmaza33i"; depends=[]; }; @@ -5878,10 +6002,10 @@ in with self; { fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; }; fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; }; fragilityindex = derive2 { name="fragilityindex"; version="0.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; }; - frailtyEM = derive2 { name="frailtyEM"; version="0.7.0-1"; sha256="1h8ygph0b7w623wf0r7zvq70lk6z2y96j608hxxiqslpnssicx9h"; depends=[expint ggplot2 magrittr msm Rcpp survival]; }; + frailtyEM = derive2 { name="frailtyEM"; version="0.7.2"; sha256="05ar0lypm4xbajxvdilv7l55zr6j83fkp1fi3krpswfaf6yk0yfn"; depends=[expint ggplot2 magrittr msm Rcpp survival tibble]; }; frailtyHL = derive2 { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; }; frailtySurv = derive2 { name="frailtySurv"; version="1.3.2"; sha256="0qsq96p29rxlfkhbmg8cfqdnpzh8wq2nadpiim9d6l0bs20r51gl"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; }; - frailtypack = derive2 { name="frailtypack"; version="2.12.3"; sha256="195j0k2wddlfdcxd3jwalkrgpmang3m94s2c9crgdjr3bv46wphx"; depends=[boot MASS nlme statmod survC1 survival]; }; + frailtypack = derive2 { name="frailtypack"; version="2.12.5"; sha256="0qqy5jp77fkcfxp44k2g6wzccsfg0cv3xd4pdzqizl6dyfdbf3rz"; depends=[boot MASS nlme statmod survC1 survival]; }; frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; }; franc = derive2 { name="franc"; version="1.1.1"; sha256="0agrzdrgfw4a3jn6a2867rf99a87ngv6wi73ys2l7gr7mkpq54v5"; depends=[jsonlite]; }; frbs = derive2 { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; }; @@ -5890,7 +6014,8 @@ in with self; { freesurfer = derive2 { name="freesurfer"; version="1.0"; sha256="0wsj5px7apfia55kajxhh5717sp6n1lh8wr1bdbk6v29cq4svvd6"; depends=[neurobase R_utils reshape2]; }; freqMAP = derive2 { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; }; freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; }; - freqdom = derive2 { name="freqdom"; version="1.0.4"; sha256="0flx4316q8m9v5zy8bxjp18a25p1vwq6wvfs81r0g609ag54vy5b"; depends=[mvtnorm]; }; + freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; }; + freqdom_fda = derive2 { name="freqdom.fda"; version="0.9.1"; sha256="15wq9s3v441dybc8kglpbv9hdvsr9rjjq4qp4d2ipxglfp0iqj9p"; depends=[fda freqdom mvtnorm]; }; freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; }; frequencies = derive2 { name="frequencies"; version="0.1.1"; sha256="0d52kf4r13n59990xhra9i6gfvs4sn7ix54d0c0g56p1rj7hnh79"; depends=[dplyr]; }; frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.1.6"; sha256="06lqy1w3j0k3wddazk9a8pj076sjpr986756cx2z11s6a9j4pkfx"; depends=[urca vars]; }; @@ -5931,17 +6056,18 @@ in with self; { funrar = derive2 { name="funrar"; version="1.2.0"; sha256="0dsp3aldvnc7lkp6sl89p0i7yga7wvjvl77zkjgjhxwpr8a2ry22"; depends=[cluster dplyr]; }; funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; }; funtimes = derive2 { name="funtimes"; version="4.0"; sha256="0a0xpybalk38p3n0fd5f3g4yav99j6ck03d1pkx0w2yqqxnviqhw"; depends=[dbscan Jmisc Kendall]; }; - furniture = derive2 { name="furniture"; version="1.5.4"; sha256="1lmxrmlkxn7l42mgl7ln9cvlmvwlmyim9k5ldnrb9wjrsh64bfhc"; depends=[knitr]; }; + furniture = derive2 { name="furniture"; version="1.6.0"; sha256="0gd61sf3n6mb0z4wnmdq1ifw6b73saafbrfscf7m8fz6ml6rfiy2"; depends=[knitr]; }; fuser = derive2 { name="fuser"; version="1.0.0"; sha256="0l2ddc3lal3gvzkn8b09i7pzd9nvqnr45naz3ni52nmgygwdk5ma"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; }; + fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; }; futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; }; futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; }; futile_matrix = derive2 { name="futile.matrix"; version="1.2.6"; sha256="10v7ffjm8az75lb39526p3y8b1zhmmzx07pybiy20zydznhyvv2p"; depends=[futile_logger lambda_r lambda_tools RMTstat]; }; futile_options = derive2 { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; futility = derive2 { name="futility"; version="0.1"; sha256="0nbsdk4abjshjvd4nrcx0ai88h2i8lf3ml1prz83zsvivb8dnam0"; depends=[]; }; - future = derive2 { name="future"; version="1.6.0"; sha256="030bp0s511m65ncilq65r45jgbv6cg8zaf6x66yhpg21pafkc7ys"; depends=[digest globals listenv]; }; - future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.14.1"; sha256="0wa97z4mkip29mqaj0hp9iscvnmphidrp0l637qv53m2cfvmg62z"; depends=[BatchJobs future R_utils]; }; - future_batchtools = derive2 { name="future.batchtools"; version="0.5.0"; sha256="1agv44cwf3l0ax7nra83j96l17lyvrbxzyssrggilafxla3bfzrp"; depends=[batchtools future]; }; + future = derive2 { name="future"; version="1.6.1"; sha256="07fy6njcpc823i04f6i6k0likq84n5ybp0dpvqh12ll6pzgl338v"; depends=[digest globals listenv]; }; + future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.15.0"; sha256="0r1bnp9mnv8jk9d6dpr94cqn4zihpm7cgxqj0c3l0x9b6i0ny3z2"; depends=[BatchJobs future R_utils]; }; + future_batchtools = derive2 { name="future.batchtools"; version="0.6.0"; sha256="0npvy8d927k3ilmnwcq1fh5lvpdr009pyc93ils5qhwhfma3wfh0"; depends=[batchtools future]; }; futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; }; fuzzr = derive2 { name="fuzzr"; version="0.2.1"; sha256="10f9qd7cn0sqk02b5p1iq9prf5kjdivn0fkky4lb7chqvk2cwbv5"; depends=[assertthat progress purrr]; }; fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; }; @@ -5982,7 +6108,7 @@ in with self; { gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; }; gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; }; gaiah = derive2 { name="gaiah"; version="0.0.2"; sha256="1qc3crjxramyxl86dp8mcmvskixny7x6ji0jqf5dqf5r5qc7zrs9"; depends=[dplyr geosphere ggplot2 lazyeval magrittr maptools raster rgeos sp stringr tidyr]; }; - gains = derive2 { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; }; + gains = derive2 { name="gains"; version="1.2"; sha256="1nmrhc7qjlyzn04r1qyjdws5fin3idmi789kbxzilax12ya8xr7k"; depends=[]; }; galts = derive2 { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[DEoptim genalg]; }; gam = derive2 { name="gam"; version="1.14-4"; sha256="13ma6zkqf1xlyrjlp228b2kq6pgh3fg9a7xmy3r3p0y40zvxfrba"; depends=[foreach]; }; gamCopula = derive2 { name="gamCopula"; version="0.0-4"; sha256="1nj5pxcbr6k7k1m44ky306yycpx20pw8awlx7lzyw1rx1hrv5ivb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; @@ -6047,26 +6173,28 @@ in with self; { gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; }; gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; }; gdistance = derive2 { name="gdistance"; version="1.2-1"; sha256="1wygcx0iki7g10f9gjbycrjjadmsw3153ha9rnqvc9hwwf34m9y1"; depends=[igraph Matrix raster sp]; }; - gdm = derive2 { name="gdm"; version="1.3.3"; sha256="0vn2hsacz8n2iikdva7csbxvvb6bk7p451k6phvrpgp87m712abv"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; + gdm = derive2 { name="gdm"; version="1.3.4"; sha256="1z2g1gn8vxrcvyq5lw78wizilcq741ka9xf3isj2wxfhx9a8mqzi"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; gdmp = derive2 { name="gdmp"; version="0.1.0"; sha256="1dlzxf17ssm10pw14mk5lk0plgav2mj8xf39dacyg9hlrz9pjwki"; depends=[]; }; gdns = derive2 { name="gdns"; version="0.2.1"; sha256="0dvrknhx0d00yi429zjdcs3ghgbpfjhrclkn6cicd049qdp4q396"; depends=[dplyr httr jsonlite purrr stringi tibble]; }; gdpc = derive2 { name="gdpc"; version="1.0.2"; sha256="03gh69vb3zmsi7rlikl3a7vr7sar3x12d8lar2qa0nfksn0qa6dk"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; }; - gdtools = derive2 { name="gdtools"; version="0.1.5"; sha256="09y9x09gri33ghhrvjjnj5k5rk0kdpsk3wq02cln8gmywd6728vk"; depends=[Rcpp withr]; }; + gdtools = derive2 { name="gdtools"; version="0.1.6"; sha256="103wnc8sq0iwcnj4j14hd420d2dqdyf13s3f25icsznrlyzdkhf5"; depends=[Rcpp withr]; }; gear = derive2 { name="gear"; version="0.1.1"; sha256="1sqj9pz15j1v6fm4q2dp0zhdmy9zmmhmgxjwria5ihrp3b5hvwry"; depends=[lattice optimx sp]; }; gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; }; gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; }; geeM = derive2 { name="geeM"; version="0.10.0"; sha256="0bk99kwh6xapkaxc3yis5x3d49j7pb45hq4ksbmkhz6ba21c4sn5"; depends=[Matrix]; }; geepack = derive2 { name="geepack"; version="1.2-1"; sha256="13fkz38rsdk1byv6rdpdmphz5dd31r4h8ms49hali6hjh5rydzvy"; depends=[]; }; geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; }; + geex = derive2 { name="geex"; version="1.0.3"; sha256="0px197mz3qfx7s4wfdjlgjpss03y7wid1qa34xf4xan05dnrrnzc"; depends=[lme4 Matrix numDeriv rootSolve]; }; geigen = derive2 { name="geigen"; version="2.1"; sha256="1alssnwypnf20bc26q50baja6g0drwclajlsqamamss0mfc8hsnh"; depends=[]; }; geiger = derive2 { name="geiger"; version="2.0.6"; sha256="1zry3iclj7yciiiysbq6z0kn759c7hdy5fq0dcszkskqcd92qfz1"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; }; gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; }; gem = derive2 { name="gem"; version="0.19"; sha256="11gzqpc9s1bkx1w6ncjylmfqqf3wj5hgca4lzygvlni9xz7pk517"; depends=[signal]; }; - gemlog = derive2 { name="gemlog"; version="0.20"; sha256="1f36p2ggba2rkkp7i6y9sgwjg2ygjhb01ww8adfivksgj103ww8v"; depends=[signal]; }; + gemlog = derive2 { name="gemlog"; version="0.24"; sha256="10yw5q2mni3nls87hbsn3kndxj7ln81jhzb3nbqqnqknbmm55pqd"; depends=[signal]; }; gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; }; gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; gemtc_jar = derive2 { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; }; + genBaRcode = derive2 { name="genBaRcode"; version="1.0.0"; sha256="0313kyhy9bg9rabxk2jdgxq2brhj2kkiq0xyd3mlq6j9c626pqi8"; depends=[ape Biostrings ggnetwork ggplot2 igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist visNetwork]; }; genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; }; genMOSSplus = derive2 { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; }; genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; }; @@ -6075,6 +6203,7 @@ in with self; { gencve = derive2 { name="gencve"; version="0.3"; sha256="00wbmaffm7mbfv3zl6mb24w1df1a8p24girwdh3a522lw3045iwf"; depends=[C50 class e1071 glmnet lars MASS nnet plus randomForest rpart]; }; gendata = derive2 { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; }; gender = derive2 { name="gender"; version="0.5.1"; sha256="0qiwqnpk2pzwvvvnnny0wmmrix1aq3kwnk6n9jyvqzh0v9bzd65g"; depends=[dplyr httr jsonlite]; }; + genderBR = derive2 { name="genderBR"; version="1.0.1"; sha256="1sbxp0wz138xxcv31xz411gp7krzghvfmjfg5hmv66l8014s6s6c"; depends=[dplyr httr jsonlite]; }; genderizeR = derive2 { name="genderizeR"; version="2.0.0"; sha256="0r9r5x93zr58sfrww3l2vyvjyj8lir2yds08y6dzf88rs9v15w3c"; depends=[data_table httr magrittr stringr tm]; }; gendist = derive2 { name="gendist"; version="1.0"; sha256="0n3ax7iy40ymrxhmb88w31a4aacaps9f1iild42afin7i7vy4dq9"; depends=[]; }; geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; @@ -6084,7 +6213,7 @@ in with self; { genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; }; genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; genepop = derive2 { name="genepop"; version="1.0.5"; sha256="17s3azcq1fjjqi5n8rw071k1as4nnwvppmdaz2l5scn0wv120vcq"; depends=[Rcpp]; }; - generalCorr = derive2 { name="generalCorr"; version="1.0.6"; sha256="0xiaw2ngqj4pigcj6dv0qbj20954m41cvhyjpznny23g85d47gk9"; depends=[meboot np psych xtable]; }; + generalCorr = derive2 { name="generalCorr"; version="1.0.8"; sha256="04mwx0hkg8k4fhw841l3nb3nly1s77kc6ivrnj3kv7z009f1a0jd"; depends=[meboot np psych xtable]; }; generalhoslem = derive2 { name="generalhoslem"; version="1.2.5"; sha256="1kx2yzaawagxd0vx29h74ik1zccasikr6qzks3m09hgmc6g4kf2p"; depends=[epiR MASS reshape]; }; generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; }; genetics = derive2 { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; }; @@ -6097,7 +6226,7 @@ in with self; { genpathmox = derive2 { name="genpathmox"; version="0.3"; sha256="0r1iqwm5jh93lbh87ks5qm4qqsp98928vg7qmv1pkahdlvl3ramw"; depends=[diagram mice plspm quantreg]; }; genridge = derive2 { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; }; gensemble = derive2 { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; }; - gensphere = derive2 { name="gensphere"; version="1.0"; sha256="184ky31l42k6x2di21hr2x1l35ksvr5yq8sr35mn642zckxx2y6g"; depends=[geometry mvmesh rgl SphericalCubature]; }; + gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; }; geo = derive2 { name="geo"; version="1.4-3"; sha256="0yxlafm99ypwf1700nh3hnnpndb6ghwwbi5sp6715zjbkkx94482"; depends=[mapdata maps]; }; geoBayes = derive2 { name="geoBayes"; version="0.3.3"; sha256="1jw0fj39gzf4cislc889ndgj34svcdxk0jz85ssk936g9gp0mm0c"; depends=[coda sp]; }; geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; }; @@ -6111,12 +6240,13 @@ in with self; { geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; }; geohash = derive2 { name="geohash"; version="0.3.0"; sha256="1yabnf0a6jd4r6zh83sxb9wcn4vs8csp7c80qs6pi1nx016lirx7"; depends=[Rcpp]; }; geojson = derive2 { name="geojson"; version="0.1.2"; sha256="0f8zimw50ryi776l5yxx5pi11559sa2278plvx289v3lfb20f7ii"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; - geojsonR = derive2 { name="geojsonR"; version="1.0.2"; sha256="1gx80rd1vg1j6vns24myybbi1k2c8q7z15jzsapasyw83ncjwy6w"; depends=[R6 Rcpp RcppArmadillo]; }; - geojsonio = derive2 { name="geojsonio"; version="0.4.0"; sha256="0y6bf0c0c05gal6j7m4kx7jcygrlwy99qzknqfglpbqkl5g6j7rq"; depends=[geojson httr jsonlite magrittr maptools readr rgdal rgeos sp V8]; }; + geojsonR = derive2 { name="geojsonR"; version="1.0.3"; sha256="102crv0yk28j71zlwaz4892fvvf040v533w4p3gq8kl71v35l5jd"; depends=[R6 Rcpp RcppArmadillo]; }; + geojsonio = derive2 { name="geojsonio"; version="0.4.2"; sha256="0lim5jgwnfaskmvhasb0wfk2bsa8zcwi2frxkyh0551c7ff4m9q7"; depends=[geojson httr jsonlite magrittr maptools readr rgdal rgeos sp V8]; }; geojsonlint = derive2 { name="geojsonlint"; version="0.2.0"; sha256="05j7059s1hs8i2fkmkv0mqmda3bgk5zbyi865ab0vl361wiwmdya"; depends=[httr jsonlite jsonvalidate V8]; }; geoknife = derive2 { name="geoknife"; version="1.5.5"; sha256="0azb98zk4ayfm0z9vz5h59490xvng16p3gpdn60ca9mwdikyxks3"; depends=[curl httr sp XML]; }; geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; geomedb = derive2 { name="geomedb"; version="0.1"; sha256="1kx6775ms9if8v4k7mm47l6dic6m3d1dlnw2dyqjlzmip4d70zfc"; depends=[adegenet httr]; }; + geomerge = derive2 { name="geomerge"; version="0.3.0"; sha256="12r60rxsi6x30q8h7mx0m50avvssm493qzyxiva7nglydcmhjn9r"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; geometa = derive2 { name="geometa"; version="0.1-0"; sha256="1p030v19851pp9x7d4rz51qpfr7vdk3zfihm4vx5yvn5r3ls3fr8"; depends=[R6 XML]; }; geometry = derive2 { name="geometry"; version="0.3-6"; sha256="0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib"; depends=[magic]; }; geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; }; @@ -6161,51 +6291,55 @@ in with self; { ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.5"; sha256="1biw91a8p13h62v4w3yim6ghr98khmyhb3qd0h04asf91vvmpxbv"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; }; ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; }; + ggconf = derive2 { name="ggconf"; version="0.1"; sha256="1h7z4amlycfddisf8ix5kmax56ix8hdllfn77rf4fs5sbqsqxkdm"; depends=[ggplot2 rly tibble]; }; ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.1"; sha256="04jq1qpsgy8bgpilp1a02va4vz0adkjwrz9znmhv54q81qiv7h51"; depends=[ggplot2 reshape2]; }; ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; }; ggdmc = derive2 { name="ggdmc"; version="0.1.3.9"; sha256="07a9g6kwq4hg5zlcxndwmyprl3di7fzsn2960qyixn5bzrfk7sh2"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; }; gge = derive2 { name="gge"; version="1.2"; sha256="00kwm4xsr8796qm98b00rlznaicgn0aagkqn2h1qmdw70scifg8l"; depends=[Rcpp reshape2 rgl]; }; ggedit = derive2 { name="ggedit"; version="0.2.1"; sha256="0l2ryp8xcyqsgfcywr3y6c2y8j42c15dyrcmfhfimbzy52bmnqxy"; depends=[colourpicker dplyr ggplot2 miniUI plyr reshape2 rstudioapi scales shiny shinyAce shinyBS]; }; - ggeffects = derive2 { name="ggeffects"; version="0.2.1"; sha256="1630kganb2x9v4ihaz6vdzvi7pigjii1mmr56h5v7vgxzp7kkwxx"; depends=[dplyr effects ggplot2 magrittr Matrix prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr]; }; + ggeffects = derive2 { name="ggeffects"; version="0.2.2"; sha256="0yxsb4309m5kxyidbrp0x2mv071figk1jksqlnqimybif0mygvpr"; depends=[dplyr effects ggplot2 magrittr prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr]; }; ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; ggfittext = derive2 { name="ggfittext"; version="0.4.3"; sha256="0s1v8kpbjj1vvpdhkwcgjy93j9r2qcqn4nfxcca30n9gk5phsmp7"; depends=[ggplot2 stringi]; }; ggforce = derive2 { name="ggforce"; version="0.1.1"; sha256="0y49anv5sj1qn1ifcxg1krkkv4z3dlan5lya36vfmzzdamfgq5p6"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; }; - ggformula = derive2 { name="ggformula"; version="0.5"; sha256="14d8lilv688l2z9vdzkv2ngasink8x0pc2ssq22hny03v1il794g"; depends=[ggplot2 glue magrittr mosaicCore rlang stringr tibble tidyr]; }; + ggformula = derive2 { name="ggformula"; version="0.6"; sha256="0ibzp6m9i87kqi3xjjkgc4lvbhhcvw0j90axr1v8khj2zaxsbwnx"; depends=[ggplot2 magrittr mosaicCore rlang stringr tibble]; }; ggfortify = derive2 { name="ggfortify"; version="0.4.1"; sha256="19jwcz1z6g7l65l6cj8zspypfb86pn3x18vzdcgf932n14g646d2"; depends=[dplyr ggplot2 gridExtra scales tibble tidyr]; }; + gggenes = derive2 { name="gggenes"; version="0.2.0"; sha256="1s3lkdl9wmhcdra90bv8zzb16h2sdmpr15x8c3d0gfw7yir6prj2"; depends=[ggplot2]; }; ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; }; ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; }; gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; }; ggimage = derive2 { name="ggimage"; version="0.0.4"; sha256="1r9rl3sw5frncsq091924p5lk9z11inpvdk39byzabz2ybi6wzp8"; depends=[EBImage ggplot2 gridGraphics scales tibble]; }; - ggiraph = derive2 { name="ggiraph"; version="0.4.0"; sha256="1q69621928skb2kvms5i73a4rmha4nrgbhdq0bb7p150c7ni3lvi"; depends=[ggplot2 htmltools htmlwidgets plyr rvg uuid xml2]; }; + ggiraph = derive2 { name="ggiraph"; version="0.4.1"; sha256="1bda2p84dia2kgran40d45wag45kpbrq19vxd0j9p07n1s86014m"; depends=[ggplot2 htmltools htmlwidgets plyr rvg uuid xml2]; }; ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.1.0"; sha256="09fiwkaai4sy5kxy4p0c4ldb8ya63czff53hbm6d8fm858fw2byw"; depends=[ggiraph ggplot2 mapproj mgcv moonBook mycor plyr reshape2 scales XML]; }; - ggjoy = derive2 { name="ggjoy"; version="0.3.0"; sha256="15ycypm1imdg4cdg3qcgsj3chjwlaq84qr274r6wav6svrr52vdv"; depends=[ggplot2 plyr purrr scales]; }; - gglasso = derive2 { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; }; + ggjoy = derive2 { name="ggjoy"; version="0.4.0"; sha256="1s24zn7gmk52bvjjhanxby7rxbnc2yfl0nx5nv7x7z0zja8gg7nb"; depends=[ggplot2 ggridges]; }; + gglasso = derive2 { name="gglasso"; version="1.4"; sha256="0r4zfgkys8104iw1vzww3qid8a6dyn03x0jlgwrdvavfj86yhq54"; depends=[]; }; gglogo = derive2 { name="gglogo"; version="0.1.3"; sha256="1dq0bixz44p32kpma5wrqjqklal2ipjmqdwqap0xch542drlpqbn"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2]; }; ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; }; ggm = derive2 { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; }; ggmap = derive2 { name="ggmap"; version="2.6.1"; sha256="0mssb09w818jv58h7mly9y181pzv22sgcd4a079cfpq04bs0wigw"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; }; ggmcmc = derive2 { name="ggmcmc"; version="1.1"; sha256="09b89cnmdmiwy18igzxjiq60l1xqjh022fw3rhd5kx7lnh02yza3"; depends=[dplyr GGally ggplot2 tidyr]; }; ggmosaic = derive2 { name="ggmosaic"; version="0.1.2"; sha256="1mxa09914j9i8b14brl70a7j7ngycj8wkil3sqkd4jwplaszvhsn"; depends=[dplyr ggplot2 gridExtra NHANES plotly productplots purrr tidyr]; }; + ggmuller = derive2 { name="ggmuller"; version="0.2.2"; sha256="111ldv4h7hcc27lpxyxcm2nr0iks3dczfk3z9zd1y5pl9s7wlkp2"; depends=[ape dplyr ggplot2]; }; ggnetwork = derive2 { name="ggnetwork"; version="0.5.1"; sha256="13qisn4msjzkpcmn7rh2c4ymqfxp9bayrvqngp9pysfmr6wvc6ia"; depends=[ggplot2 ggrepel network sna]; }; ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; }; ggplot2 = derive2 { name="ggplot2"; version="2.2.1"; sha256="0543782ddv2hp6s0l702mnxfg8n7a6qlbm8bm55x22hnqgz8kg2z"; depends=[digest gtable lazyeval MASS plyr reshape2 scales tibble]; }; ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; }; ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; }; - ggpmisc = derive2 { name="ggpmisc"; version="0.2.15"; sha256="00a909bdzkh28b7jkllxxqd1avcspny12y5rqpxddj90xv34zjah"; depends=[broom dplyr ggplot2 lubridate MASS plyr polynom splus2R tibble xts zoo]; }; + ggpmisc = derive2 { name="ggpmisc"; version="0.2.16"; sha256="1hq5zpc3zf4hq49ykrzrgj92cmh6gjsq6kpzcvzvnm5wyh9yy2iq"; depends=[broom dplyr ggplot2 lubridate MASS plyr polynom splus2R tibble xts zoo]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; }; ggpubr = derive2 { name="ggpubr"; version="0.1.5"; sha256="1ny0z5lc50hnsg21s7c5dyl4c79c34cqfkpi091dzs61w79m27jp"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif gridExtra magrittr purrr scales tidyr]; }; ggpval = derive2 { name="ggpval"; version="0.2.0"; sha256="1nwf3cz1258khp1barxxp28326bagvlsfhg4rcccbxcpny9vbl7d"; depends=[data_table ggplot2]; }; ggquiver = derive2 { name="ggquiver"; version="0.1.0"; sha256="0p6li7cxjy54qrmaf9ja6aknnlxwq4sl0z1yip1mznb5rhv6lpxw"; depends=[dplyr ggplot2]; }; ggraph = derive2 { name="ggraph"; version="1.0.0"; sha256="0xkhqkckqz201601aqznrgnlgqzs7is1nfpdyalag58q5wl934j8"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; }; - ggraptR = derive2 { name="ggraptR"; version="0.1"; sha256="060ksjq790rvv9kyyf6v6z0irawlw3hxaq8n0dvzmfkw58pk5fpd"; depends=[dplyr DT futile_logger ggplot2 ggthemes shiny shinyBS shinyjs]; }; + ggraptR = derive2 { name="ggraptR"; version="1.0"; sha256="1n3ildrm8jh6m1j8njx1icbjhpkv3d2ndx59d6ddyg4np09cmp8w"; depends=[assertthat backports colorspace colourpicker DBI dplyr DT evaluate futile_logger futile_options gdtools GGally ggplot2 ggthemes gtable htmltools htmlwidgets httpuv labeling lambda_r lazyeval magrittr miniUI munsell plyr RColorBrewer Rcpp reshape rmarkdown rprojroot scales shiny shinyBS shinyjs stringi stringr svglite tibble xtable yaml]; }; ggrepel = derive2 { name="ggrepel"; version="0.6.5"; sha256="0lm78662p1iajkcvq82g08zsv3s4lfmkpggg1wk9wpvmk78yj2in"; depends=[ggplot2 Rcpp scales]; }; + ggridges = derive2 { name="ggridges"; version="0.4.1"; sha256="0kfa3icqdalqdg1klxjrhfl7if35d3wnsiyl86bprw5dyqyh3lh3"; depends=[ggplot2 plyr scales]; }; ggsci = derive2 { name="ggsci"; version="2.7"; sha256="15ay3dgdzaxxyspdai50i66r44v2qz3y2am3wkazg3afcs2qszk4"; depends=[ggplot2 scales]; }; ggseas = derive2 { name="ggseas"; version="0.5.1"; sha256="1r23j701rvia49si42fbi6zws7x9r92h1bcp0a15h28hpl7zlp7l"; depends=[ggplot2 seasonal zoo]; }; ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; }; ggsignif = derive2 { name="ggsignif"; version="0.4.0"; sha256="1rn58d7pb3axk6chiihryykrzw76adaa2yiafq4d0j6qbhax78f7"; depends=[ggplot2]; }; ggsn = derive2 { name="ggsn"; version="0.4.0"; sha256="0si3llqlb0dg482cqxhv5lm6raawqwpcd5ymjicw3780xq7d7mrk"; depends=[ggplot2 maptools png]; }; ggspatial = derive2 { name="ggspatial"; version="0.2.1"; sha256="11vminz4kwv1ny4v9h23sp7j7d45q6v4804xv9fp04qgzbzi9lv8"; depends=[abind ggplot2 maptools plyr raster reshape2 rgdal rosm scales sp]; }; - ggspectra = derive2 { name="ggspectra"; version="0.2.1"; sha256="1q8l5zfkv4jzacb8pp7b2yp99ack4by4z2iw9l4j2n689v9wjs40"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; }; + ggspectra = derive2 { name="ggspectra"; version="0.2.2"; sha256="162hbi3nygxrazckmjc8nah2i49mwr0kddqrgvdzwqwn05ysdw53"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; }; ggstance = derive2 { name="ggstance"; version="0.3"; sha256="0sr84nasr8x8ib3mdsjck73gbfg9xba50s5nxdij0ah9xqnpyhpi"; depends=[ggplot2 lazyeval plyr purrr]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; ggtern = derive2 { name="ggtern"; version="2.2.1"; sha256="05dszysn1qr5s4ji4il91pv19xjh5yd09w9f153fmg4cyfl716iz"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; }; @@ -6217,6 +6351,7 @@ in with self; { ghit = derive2 { name="ghit"; version="0.2.18"; sha256="117dn7j4nsdbdj1c1zndfikih3gxgxnkdxi3z0qmrbpsb9l4h1ic"; depends=[git2r]; }; ghyp = derive2 { name="ghyp"; version="1.5.7"; sha256="195hsskh2ykafqr93f675xqsmhbrki3abi61hk78bzy09n1d4jfk"; depends=[gplots numDeriv]; }; giRaph = derive2 { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; }; + gibble = derive2 { name="gibble"; version="0.0.1"; sha256="0cxxd02njjkd5z0n9qy5w1rdwhirjjbn2p4i9m9q68li9cwi4r2i"; depends=[dplyr tibble]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gifti = derive2 { name="gifti"; version="0.7.4"; sha256="02z6r9p0vx22ja2bs6hqb9hjwlcnb8g0kcphqpj6ivkanwh6702w"; depends=[base64enc R_utils xml2]; }; gimme = derive2 { name="gimme"; version="0.2-2"; sha256="1fx6vh0zzrn2vqbaprv0iyihx4y93qshi82jgi9lrjhaaqw3dmfh"; depends=[gWidgets igraph lavaan qgraph]; }; @@ -6229,11 +6364,12 @@ in with self; { gitlabr = derive2 { name="gitlabr"; version="0.9"; sha256="0i9sqqvn9xzknybsj9nmi6kclw8c35shy658li17455d28gv4653"; depends=[base64enc dplyr httr magrittr purrr stringr tibble yaml]; }; gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; }; givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; }; - gjam = derive2 { name="gjam"; version="2.1.5"; sha256="11p84p0qp8m3r9pkp0wpzwm9q8rinvsg03zjx5d9zzpf7l0d8zz8"; depends=[MASS RANN Rcpp RcppArmadillo]; }; + gjam = derive2 { name="gjam"; version="2.1.6"; sha256="07xx71bk3wwpznmpi2pads6rcf6vx00i2cwyfn9zmg52282kdl4i"; depends=[MASS RANN Rcpp RcppArmadillo]; }; gk = derive2 { name="gk"; version="0.5.0"; sha256="0ixkl9jrmd4bcd3m34whfcikvwqbcdnzcd6gf5bdv81r0ygc5jml"; depends=[Ecdat lubridate progress]; }; gkmSVM = derive2 { name="gkmSVM"; version="0.71.0"; sha256="1zpxgxmf2nd5j5wn00ps6kfxr8wxh7d1swr1rr4spq7sj5z5z0k0"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; }; glamlasso = derive2 { name="glamlasso"; version="2.0.1"; sha256="1x87nv29r309l539qccbcll4kn889sdds6gvrhyvw68rs370pn2l"; depends=[Rcpp RcppArmadillo]; }; glarma = derive2 { name="glarma"; version="1.5-0"; sha256="1afcccjayz6sj39mcg9h54d7dd1as8l63nxfw17bdh18zidr6ghi"; depends=[MASS]; }; + glassdoor = derive2 { name="glassdoor"; version="0.7.6"; sha256="0zgkz32vp71fyy25lx4kaa5gj5aj7glhxa0yqnawl1j1a4klj3v3"; depends=[httr xml2]; }; glasso = derive2 { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; }; glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; }; glcm = derive2 { name="glcm"; version="1.6.1"; sha256="0xzfhafc7326v3g1xngp584039iknw3q3bcx8f0j4ig125in7sxk"; depends=[Rcpp RcppArmadillo]; }; @@ -6256,12 +6392,12 @@ in with self; { glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; }; glmmML = derive2 { name="glmmML"; version="1.0.2"; sha256="0ndvp7a7dxq6ygdwzq783ci1y0zb4xwnj6g4w1cm8zvqak8dxjdb"; depends=[]; }; glmmTMB = derive2 { name="glmmTMB"; version="0.1.1"; sha256="1ckij5jrqijwljqkj624q6li0bv8vxb3aglwbfi034zc0iwiba1b"; depends=[lme4 Matrix nlme RcppEigen TMB]; }; - glmmsr = derive2 { name="glmmsr"; version="0.1.1"; sha256="07z4j7845hz3hcv438njnqf1yfp8prqby03h3s1ql1w8d342670i"; depends=[BH lme4 Matrix R6 Rcpp RcppEigen]; }; - glmnet = derive2 { name="glmnet"; version="2.0-10"; sha256="07n2hz4fvjyv0siai8z8wqwfj8d58i8n1vzf1ckdfzp4kxa3z08d"; depends=[foreach Matrix]; }; + glmmsr = derive2 { name="glmmsr"; version="0.2.0"; sha256="1p9k8iiv3n3jvp20lfbrrfnml809kndfwbw8vilb4dhx9bqds3c9"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; }; + glmnet = derive2 { name="glmnet"; version="2.0-13"; sha256="1zdqp6wnqxzp5qn2ky47phbkrxv3cpgbwmdp896h3xxjvp58sa7k"; depends=[foreach Matrix]; }; glmnetUtils = derive2 { name="glmnetUtils"; version="1.1"; sha256="0abvxkwfadh56672qh16vql49js9ar8cz8is0bs6i8jgsl5csz91"; depends=[glmnet Matrix]; }; - glmnetcr = derive2 { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; }; + glmnetcr = derive2 { name="glmnetcr"; version="1.0.3"; sha256="0w04m0q7w5xxm0yv14f2g1ykpy54pxzdplr0xcz9mn43wi4sl65a"; depends=[glmnet]; }; glmpath = derive2 { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; }; - glmpathcr = derive2 { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; }; + glmpathcr = derive2 { name="glmpathcr"; version="1.0.4"; sha256="01jn8ryx6sp6qd0cx5m8n3dpkrb0665qw5ads9ai24g6ssl1y6bd"; depends=[glmpath]; }; glmulti = derive2 { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; }; glmvsd = derive2 { name="glmvsd"; version="1.4"; sha256="03axsn85axs4d6fdlr3wcdwq6qa4991svkqc7k9r52kk1ar0w5zz"; depends=[brglm glmnet MASS ncvreg]; }; glmx = derive2 { name="glmx"; version="0.1-1"; sha256="06v2qxgr16w0qnfhjr9vdqcad5v475pwg2yhw0i236yzqbnsssh6"; depends=[Formula lmtest MASS sandwich]; }; @@ -6276,6 +6412,7 @@ in with self; { glue = derive2 { name="glue"; version="1.1.1"; sha256="01awmqby7rwzhzr51m7d87wqibx7ggl6xair8fi3z3q1hkyyv7ih"; depends=[]; }; glycanr = derive2 { name="glycanr"; version="0.3.0"; sha256="1s3xhg31xc3x4gzxjpn9mbb7dw4m49na2mdlgr5wh1z9gxdc06pa"; depends=[coin dplyr ggplot2 tidyr]; }; gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; }; + gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; }; gmailr = derive2 { name="gmailr"; version="0.7.1"; sha256="1gniwwl0ci0wm7a3ai2lqrr590smmkdgyf3aarw6bdygn8hr3s3y"; depends=[base64enc crayon httr jsonlite magrittr mime]; }; gmapsdistance = derive2 { name="gmapsdistance"; version="3.1"; sha256="1hsijd1ahsppmxpnx690s27lry1w3c8r9jynhj0rsr4w6jmxikc2"; depends=[RCurl XML]; }; gmatrix = derive2 { name="gmatrix"; version="0.3"; sha256="0ni5scx48m99jg9a5l93qvfkz6v5m7d5c0fwhp14mgiw32ff1s1r"; depends=[]; }; @@ -6285,7 +6422,7 @@ in with self; { gmnl = derive2 { name="gmnl"; version="1.1-3"; sha256="05p2kikv8zz9ldc6xi5bz7fyinpd0sp2v82hxhx6h54hfa6i7b9v"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; }; gmodels = derive2 { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; }; gmp = derive2 { name="gmp"; version="0.5-13.1"; sha256="0xh9dli4i7hyjywsn2h780cxl3k7v0q421djyr1wshk7l9s5701g"; depends=[]; }; - gmt = derive2 { name="gmt"; version="2.0-0"; sha256="146rdvfi7f1s28zvy6h11myq61jy4di2ghzxlvwy04q3hphm1nj7"; depends=[coda Hmisc lattice]; }; + gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; }; gmum_r = derive2 { name="gmum.r"; version="0.2.1"; sha256="127h76nm99ldpaznys5y4rnrvq0kh5pcsjmw21hz79a8rjni7r16"; depends=[BH ggplot2 httr igraph Matrix Rcpp RcppArmadillo SparseM]; }; gnlm = derive2 { name="gnlm"; version="1.1.0"; sha256="0fv89cvbnp9n3lgg6y4sqmz9jzcgwj7vd92rwg7hixwrjyqpan4z"; depends=[rmutil]; }; gnm = derive2 { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; }; @@ -6307,9 +6444,11 @@ in with self; { googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.4.1"; sha256="0qd0r04yh1w58zgm9fyw1dsl6v7cmgrmmj9wpxanpdsjx8yvd3hk"; depends=[assertthat dplyr googleAuthR httr magrittr purrr tidyr]; }; googleAuthR = derive2 { name="googleAuthR"; version="0.5.1"; sha256="1ba8a4yc6l3ycamcqqq7mwqi9bw4y1xb29svww9gzha3yngy3740"; depends=[devtools formatR httr jsonlite miniUI R6 shiny testthat]; }; googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.3.0"; sha256="1r5sg2r94wxwvk7cg7vlv4gf2a2ccl31b069y370kjwlk26q7k4s"; depends=[assertthat googleAuthR httr jsonlite]; }; - googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.1.0"; sha256="173y7m2j6iw848djjawkiy22fg56hnpx0m0q1halzwycqx6z08vc"; depends=[future googleAuthR jsonlite]; }; + googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.2.0"; sha256="1kslsi7gc4na8pm8dyizswf9pfpdq1rprn08rd7kbxsisclbzc7y"; depends=[assertthat future googleAuthR httr jsonlite]; }; + googleLanguageR = derive2 { name="googleLanguageR"; version="0.1.0"; sha256="11z6sai3dha9j6v0v35v86nsdrv9w9xndnaal3fwdh45c07cr8a0"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; googlePublicData = derive2 { name="googlePublicData"; version="0.15.7.28"; sha256="1bkfj88rn8ai0kbjbd0s3zih6iz018xybr13w2h9i6wdi3dhs75s"; depends=[XLConnect XML]; }; googleVis = derive2 { name="googleVis"; version="0.6.2"; sha256="1idnp9ndgg2dwybdpw7q3pkaw9kw2vy2xkls9qykrpz1p6nf3mn1"; depends=[jsonlite]; }; + googledrive = derive2 { name="googledrive"; version="0.1.1"; sha256="1fshv85s4ldw2kc7lbbdvrl260pz76z04awx1n6lg0f5xmba9rfg"; depends=[curl glue httr jsonlite purrr rlang tibble uuid]; }; googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; }; googlesheets = derive2 { name="googlesheets"; version="0.2.2"; sha256="18q0xmxn09b52rmky7gr5flp0awndcnsgb7zcvkzvkrkvmwad52b"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tidyr xml2]; }; googleway = derive2 { name="googleway"; version="2.2.0"; sha256="11x8h5amczydh8d7wrqqwyk386k63kxhbbivb2gw1fi7ffyi24jb"; depends=[curl htmltools htmlwidgets jpeg jsonlite magrittr Rcpp shiny]; }; @@ -6333,18 +6472,20 @@ in with self; { grImport = derive2 { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; }; gradDescent = derive2 { name="gradDescent"; version="2.0.1"; sha256="0kxyvr30hygg82s5m7nng02fvn6nak43y2v18445xbb05y6f5gmx"; depends=[]; }; grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; + gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; }; gramEvol = derive2 { name="gramEvol"; version="2.1-3"; sha256="0z2511zhs2gcdkwp29n6fpafhn49h69yi56nmrhh9zc8jqj1rwpa"; depends=[]; }; granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; }; graphTweets = derive2 { name="graphTweets"; version="0.3.2"; sha256="13kab1nz85ghs5n882ss513di30b7lg72h676v37404ypj5a1vi1"; depends=[dplyr igraph reshape2]; }; - graphicalVAR = derive2 { name="graphicalVAR"; version="0.2"; sha256="0z1qjvyqlalplmwz898rhbjkj6fg1dsgpxn6828qmw3is36g74xg"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; + graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.1"; sha256="1z4x32ji71rq1x89r3wmjhm1fq7klggpz6c1cf45fvcd9qs6ykhk"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; }; - graphkernels = derive2 { name="graphkernels"; version="1.2"; sha256="06lh4w0xw1apz70s9qzlhlayzh6nyd6v512lc90a0g7n6xw1fqvg"; depends=[igraph Rcpp RcppEigen]; }; - graphql = derive2 { name="graphql"; version="1.3"; sha256="14abyr4h49i75aq5x49f6jv6053hyq9a77v7wad88zcbcs3p1n9p"; depends=[jsonlite Rcpp]; }; + graphkernels = derive2 { name="graphkernels"; version="1.4"; sha256="1dwk1bd2nx9kdzxq31cgynd75r7am49ygkaryb6iqcmva1wc5xs0"; depends=[igraph Rcpp RcppEigen]; }; + graphon = derive2 { name="graphon"; version="0.1.1"; sha256="13ng0lxv0j40zwzgxh84mlxqfp1qff6v5dmvb6s9h9khj1vfxczs"; depends=[ROptSpace]; }; + graphql = derive2 { name="graphql"; version="1.4"; sha256="103vggx9273dg4fkrhik4p1vj8qh7gxavyh933qxhajpmhnfhksh"; depends=[jsonlite Rcpp]; }; graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; }; graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; }; - grattan = derive2 { name="grattan"; version="1.5.1.1"; sha256="04m15v9c4kf5jfyr62l8xxcg7qyrbf17d5qf2h91cwrjq9w93lsx"; depends=[assertthat data_table dplyr forecast lazyeval lubridate magrittr purrr Rcpp rsdmx zoo]; }; + grattan = derive2 { name="grattan"; version="1.5.1.2"; sha256="0jpqm3m9nz5ml96s2w1kp99h65zxmfq49va8w1gvqq3iqrf5bdhj"; depends=[assertthat data_table dplyr forecast lazyeval lubridate magrittr purrr Rcpp rsdmx zoo]; }; gravity = derive2 { name="gravity"; version="0.3"; sha256="0makhi5hfs2x891ss6whq49rp73j6h5x5m4dvd0d175y06n4hg3s"; depends=[lmtest multiwayvcov sandwich]; }; grec = derive2 { name="grec"; version="1.1.1"; sha256="1qn1vbhlw42wqg9vj5plb12pg9xskn32z27ifyzm4kggp1vckgbf"; depends=[imagine raster]; }; greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; @@ -6354,7 +6495,7 @@ in with self; { grf = derive2 { name="grf"; version="0.9.3"; sha256="107w6mxn5irwxvx8ck6vv4l8ix10a6283grf3xs10ralmlc4y5kh"; depends=[Rcpp]; }; gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; }; - gridExtra = derive2 { name="gridExtra"; version="2.2.1"; sha256="0638ihwl00j76ivaxxhxvi8z573lwy1jym3srr78mx6dbdd4bzj4"; depends=[gtable]; }; + gridExtra = derive2 { name="gridExtra"; version="2.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; }; gridGraphics = derive2 { name="gridGraphics"; version="0.2"; sha256="1lxqr257gqyasln8j0538jyb9q0s6i72cxx8i6sya7w7dwgrv1xp"; depends=[]; }; gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; }; gridSVG = derive2 { name="gridSVG"; version="1.5-1"; sha256="13l7mn8kx36g74f39nq6c39d7l0zkkkgnmfmy5g8qnydw5qn5bkq"; depends=[jsonlite XML]; }; @@ -6375,7 +6516,7 @@ in with self; { growthcurver = derive2 { name="growthcurver"; version="0.2.1"; sha256="0q70g940ggpwnx2cpq2j8ambfbj9sqw6ivyp9cya1nbn05bah9ds"; depends=[caTools minpack_lm]; }; growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; }; - growthrates = derive2 { name="growthrates"; version="0.6.5"; sha256="1bnp51hlcb2gpm7j9llbnxjgimbrdsshjxl19ka9w1ba423v2ja2"; depends=[deSolve FME lattice]; }; + growthrates = derive2 { name="growthrates"; version="0.7.0"; sha256="0favz0v7q79m630xqsznyckvch1q3mrf19wj1if17l98bys7x9js"; depends=[deSolve FME lattice]; }; grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; }; grplasso = derive2 { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; }; grppenalty = derive2 { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; }; @@ -6427,7 +6568,7 @@ in with self; { gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; }; h2o = derive2 { name="h2o"; version="3.10.5.3"; sha256="0xk9aa87dch138k6zagcanqifs44shjv3da0yajrx4pgghl8xdmb"; depends=[jsonlite RCurl]; }; - h5 = derive2 { name="h5"; version="0.9.8"; sha256="1i7ymbqcmv8b9v8jdaqs49638m7xib5k92d62jh6h4il8l10rykx"; depends=[Rcpp]; }; + h5 = derive2 { name="h5"; version="0.9.9"; sha256="14p7i1sj24ky87kd7qr3n9fc9l64s0bp0rwbyl6i2x69xn75gpsx"; depends=[Rcpp]; }; hBayesDM = derive2 { name="hBayesDM"; version="0.4.0"; sha256="0x7lpfx3d559fzkmrj3fb057zb3jm2y5l55zaqy0w7pnzgdpqnh6"; depends=[ggplot2 loo mail Rcpp rstan rstantools]; }; hIRT = derive2 { name="hIRT"; version="0.1.2"; sha256="0pqp6bycr13di1hbi5sqnkiannz2hyg0ysshswv2i9fp0vkhdhqf"; depends=[pryr rms]; }; hNMF = derive2 { name="hNMF"; version="0.3"; sha256="1kil1dkh8yqm5z2krc6n73hpm5m0h2dwwz4fg2xzvk5hsbg9qff3"; depends=[NMF nnls oro_nifti R_matlab rasterImage spatialfil]; }; @@ -6439,7 +6580,7 @@ in with self; { hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; }; haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; }; haplo_stats = derive2 { name="haplo.stats"; version="1.7.7"; sha256="1rag22sqy8r87w5a1dww5cxknacm6975bpp74vw9zr04ldx4c64k"; depends=[rms]; }; - haploR = derive2 { name="haploR"; version="1.6.0"; sha256="1wa3q1746j1y4jbb3zj36mk89pfrj1xpdjg7my35dm042h1hn9xb"; depends=[httr plyr RUnit tibble XML]; }; + haploR = derive2 { name="haploR"; version="1.6.1"; sha256="1w945n310q2pmywqh3jr39ab8k5p6na6d70mgksrmvqrf8h7x8ly"; depends=[httr plyr RUnit tibble XML]; }; haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; }; haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; }; haplotypes = derive2 { name="haplotypes"; version="1.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; }; @@ -6466,7 +6607,7 @@ in with self; { hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; }; hcp = derive2 { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; }; hda = derive2 { name="hda"; version="0.2-14"; sha256="0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b"; depends=[e1071]; }; - hddplot = derive2 { name="hddplot"; version="0.57-2"; sha256="1mckgd99wvxbqvpyx231r97kysppnn1xggy8jvnc31sxq8m9gfr7"; depends=[MASS multtest]; }; + hddplot = derive2 { name="hddplot"; version="0.57-5"; sha256="01ljwb4glignq78gpm3n8ap8ws1ss7ibdy7ybdvhnm5zj6nnvjpp"; depends=[MASS multtest]; }; hddtools = derive2 { name="hddtools"; version="0.7"; sha256="0acvdysyyv5i109adh1prrc9ifwadb0gk303hh3b0g69wysnmhl8"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr tibble XML zoo]; }; hdeco = derive2 { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; }; hdi = derive2 { name="hdi"; version="0.1-6"; sha256="1lzy4jcz14j1qi6z4j1sq7z3z75n8jygnzlvqjf45vn1sqil17cq"; depends=[glmnet linprog MASS scalreg]; }; @@ -6476,21 +6617,21 @@ in with self; { hdpca = derive2 { name="hdpca"; version="1.0.0"; sha256="1sv7caw4nhpcvsb7fxpvf2b5zskvfsv004hrqc51b5jx4fsc7y92"; depends=[boot lpSolve]; }; hdrcde = derive2 { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[ash KernSmooth ks locfit mvtnorm]; }; hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; }; - healthcareai = derive2 { name="healthcareai"; version="0.1.12"; sha256="1ipw5y7k0m33mnpqbcwdbqzhsh65fb10kym11wc4n2pfsml498w1"; depends=[caret data_table DBI doParallel e1071 grpreg lme4 odbc pROC R6 ranger ROCR RODBC RSQLite]; }; + healthcareai = derive2 { name="healthcareai"; version="1.0.0"; sha256="1pcibdg34s46628s6jzfn8vk8nhm17y6j8y8qpdp086pzc8nmfwx"; depends=[caret data_table DBI doParallel e1071 grpreg lme4 odbc pROC R6 ranger ROCR RSQLite xgboost]; }; heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; }; heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; }; heatmap3 = derive2 { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k2j7pniamkywfvwrifdk7jbds70zsi30ph5"; depends=[fastcluster]; }; heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; }; heatmaply = derive2 { name="heatmaply"; version="0.10.1"; sha256="0lanin04lzsf0fzy0ap055yw1bl26nnkd0d08y20fprkgz2ykh48"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis]; }; heavy = derive2 { name="heavy"; version="0.38.1"; sha256="12s4g0m5qi4yg26p9l3qay1gfhixma66ls0kf8lkaswzgd7761hp"; depends=[]; }; - heemod = derive2 { name="heemod"; version="0.9.1"; sha256="1ga1g9azhkbn716p0hrkm5k7ab9mnlc7w74rkd8qv4f05av0b4xv"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble tidyr]; }; + heemod = derive2 { name="heemod"; version="0.9.2"; sha256="0qln5c4m11vxpsa0l07qrzs006b05hsl342pc5dgz0hwdpn5dd9j"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble]; }; hei = derive2 { name="hei"; version="0.1.0"; sha256="1cvwdkm5c9p3cfgpgdj0r7222mzz1jghq2i5f20xh3786gx05sqd"; depends=[nhanesA]; }; heims = derive2 { name="heims"; version="0.2.4"; sha256="07w5qy0fn7f2lz6zq52fxa2zgjfddga4p3x3c7rmq83jilhasppl"; depends=[bit64 data_table dplyr fastmatch fst lubridate magrittr]; }; helixvis = derive2 { name="helixvis"; version="0.1.0"; sha256="1ycvgjbcghbdaw65v3b81pxf33226lr4cbk5l943jg7m738qsfhd"; depends=[rJava]; }; hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; }; helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; }; - heplots = derive2 { name="heplots"; version="1.3-3"; sha256="0j644a0r4ycfg57p9ymlb3jb9bd797vwlw1ps24injsz71wbhnh0"; depends=[car MASS]; }; + heplots = derive2 { name="heplots"; version="1.3-4"; sha256="0qrx2qiy5w1hdy48ipa5is3k6dmz9gnfk5pckqpxp3hd0ip3217f"; depends=[car MASS]; }; here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; }; hergm = derive2 { name="hergm"; version="3.1-0"; sha256="17mxn2ff7yzj95vjsppvz7c9a5g6a2z9zyf34xvvxp9031zhrf46"; depends=[ergm latentnet mcgibbsit network sna]; }; heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; }; @@ -6547,7 +6688,7 @@ in with self; { hkevp = derive2 { name="hkevp"; version="1.1.4"; sha256="01m5yywi4vjnwhdayaqaqcp5lz70mllj5ifnwdb4c60wm9aby9pm"; depends=[Rcpp RcppArmadillo]; }; hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; }; hmeasure = derive2 { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; }; - hmi = derive2 { name="hmi"; version="0.7.4"; sha256="00wq099sb3mqhvfirfrr6lqz1dh6ld08s474ijnf24xxgfbyl6ls"; depends=[boot linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nnet pbivnorm tmvtnorm]; }; + hmi = derive2 { name="hmi"; version="0.7.8"; sha256="1wyjp1xmni18fq3v4n75qbmavvfidrqrvagd9kghg59jhc8jk988"; depends=[boot linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nnet pbivnorm tmvtnorm]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="0.2-4"; sha256="096flx2b9s66dasqj05zrkxsmg3lj6j5w0pwrw3b1qkpp9dvlrkb"; depends=[]; }; hmmm = derive2 { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; }; hms = derive2 { name="hms"; version="0.3"; sha256="127znf522r5mn3k6frhdd7pqh063bs3l85gn9h7cx50hpjf2as4k"; depends=[]; }; @@ -6555,7 +6696,7 @@ in with self; { hoa = derive2 { name="hoa"; version="2.1.4"; sha256="15klcpmja4afwmpfxrxgrfis0vj7fil8k15jc3p0lqz3dhvq0dvf"; depends=[statmod survival]; }; hoardeR = derive2 { name="hoardeR"; version="0.9.2"; sha256="0sss3ki2w0aqyp084pprycw8d8vgm60z41iq6g9nxhqhr9xy5kdw"; depends=[bamsignals Biostrings data_table GenomicRanges GenomicTools httr IRanges MASS R_utils RCurl Rsamtools seqinr stringr XML]; }; hoardr = derive2 { name="hoardr"; version="0.2.0"; sha256="13bjycnr1v524c5wxigdd3kn8bx1sgwdqb10hbmbyjxffabacafr"; depends=[digest R6 rappdirs]; }; - holdem = derive2 { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; }; + holdem = derive2 { name="holdem"; version="1.2"; sha256="0mcb4civ4p7apm7kfl88apvb4yznsmn4hggfggmjhs046g6bi2p7"; depends=[]; }; homals = derive2 { name="homals"; version="1.0-6"; sha256="1xfpb6mxfk18ad2fggljr2g01gy4c290axc3vgwngmmimmcvh4cy"; depends=[ape rgl scatterplot3d]; }; homeR = derive2 { name="homeR"; version="0.3.0"; sha256="0gi383392rs7snb2l9760vkws5hqfikyaj3i7cyby9g1sc2s6yx8"; depends=[]; }; hommel = derive2 { name="hommel"; version="1.1"; sha256="1vrfw3zxj6hlfr5czrhmx67bjbd94whfgdmsdzlmdpmj0w5r0naz"; depends=[Rcpp]; }; @@ -6582,6 +6723,7 @@ in with self; { hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive2 { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; }; htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; }; + htm2txt = derive2 { name="htm2txt"; version="1.0.0"; sha256="1zq1rr7ary79pag13xhz51h509vqczvkvh42nhshv8ri5d3xqg9p"; depends=[gsubfn]; }; htmlTable = derive2 { name="htmlTable"; version="1.9"; sha256="0ciic1f4iczq14j81fg7kxibn65sy8z1zxkvk1yxnxxg6dzplj2v"; depends=[checkmate htmlwidgets knitr magrittr stringr]; }; htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; }; htmltidy = derive2 { name="htmltidy"; version="0.3.1"; sha256="004a2wwsnx3mnm6v1mjlaq08gcgm60xahh520vfyrsp56b7j29ky"; depends=[htmltools htmlwidgets Rcpp XML xml2]; }; @@ -6591,7 +6733,7 @@ in with self; { hts = derive2 { name="hts"; version="5.1.4"; sha256="0n1gna2694yih5kaiw59crdlfcdfm9dqhjpkcwaskgrpmh08wnkd"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; httk = derive2 { name="httk"; version="1.7"; sha256="1l29wpb03l7lk7y4lzjpxksr96jymg4sdvh7amd6068kdch0lqqp"; depends=[data_table deSolve msm mvtnorm survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; - httpcache = derive2 { name="httpcache"; version="1.0.0"; sha256="0p0c2n1n5nrmnii9myp9blzwg996xgm15law9f073an4xvfg2kd2"; depends=[digest httr jsonlite]; }; + httpcache = derive2 { name="httpcache"; version="1.0.2"; sha256="0bggfsxf42mdx2zj6ipqd7a328j7py0ldc31452f6lccc7xryp46"; depends=[digest httr jsonlite]; }; httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; }; httping = derive2 { name="httping"; version="0.1.0"; sha256="1bhy5mh0hz83rjmvh7wl211nqkz58gxsgkwlkmjrdfzc2cparxjz"; depends=[httpcode httr jsonlite magrittr pryr]; }; httptest = derive2 { name="httptest"; version="2.1.2"; sha256="1145aca2bkqk39xp6m2vc8plh3xcgcdi5dwp1c30yifbqa3szamh"; depends=[digest httr jsonlite testthat]; }; @@ -6605,8 +6747,8 @@ in with self; { hunspell = derive2 { name="hunspell"; version="2.6"; sha256="02z7d3s9mc2gg6ha9hwvpnxrx9vjpppjpggg8cgj88c09y943fkq"; depends=[digest Rcpp]; }; hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; }; hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; }; - hutils = derive2 { name="hutils"; version="0.1.2"; sha256="12hh69y0hvvbyw0p1z6r4kkbhp82vk8p5afcaq7g4y7liayfmdyh"; depends=[data_table fastmatch magrittr]; }; - huxtable = derive2 { name="huxtable"; version="0.3.0"; sha256="1h74n8vkza0n6mfzliadm2dhjy154lzjp2n917r26rra4xwjknrx"; depends=[crayon dplyr htmltools knitr lazyeval rmarkdown tibble xtable]; }; + hutils = derive2 { name="hutils"; version="0.8.0"; sha256="12ql3iaxksfy1vkdxbx5jrn4sjh4l00l9xyi4kq4h6vyag4f0fzf"; depends=[data_table fastmatch magrittr]; }; + huxtable = derive2 { name="huxtable"; version="0.3.1"; sha256="1nfkzdqgj6n81m68n0cc8rvm11wyc1bs74kzanrr39varjfq2xjz"; depends=[crayon dplyr htmltools knitr lazyeval rmarkdown tibble xtable]; }; hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; }; hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; }; hwwntest = derive2 { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; }; @@ -6641,7 +6783,7 @@ in with self; { iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; }; iClick = derive2 { name="iClick"; version="1.2"; sha256="04d82wbddvj73cw6ys492nasvxcj8m5594zf9r41y72i5yha11pa"; depends=[fBasics forecast lattice lubridate openair rugarch timeDate timeSeries]; }; iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; }; - iDINGO = derive2 { name="iDINGO"; version="1.0.0"; sha256="1773rsjcjcmm5hc3qx2hnwq9ifvjdc5dcgrzibkd6l55ki049njp"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; }; + iDINGO = derive2 { name="iDINGO"; version="1.0.1"; sha256="1ias99v9a4rb3w19cjp20mk0r3kq22kpcjq92yykmjhmklp55i20"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; }; iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; }; iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; }; iECAT = derive2 { name="iECAT"; version="0.8"; sha256="0kv8db7ss3vk21ccl8qfj4x69npfzwmm3piddj9l0vwrwd3ccl32"; depends=[MetaSKAT SKAT]; }; @@ -6650,7 +6792,7 @@ in with self; { iGasso = derive2 { name="iGasso"; version="1.4"; sha256="17xxqncl5xcphdqclghcazygcgibf8ijdf4kkl3ga11xf70sahj2"; depends=[CompQuadForm lattice]; }; iJRF = derive2 { name="iJRF"; version="1.1-4"; sha256="1fgbc0z647vwybffzp4iips86pxakd25dlk5jqgm049s6pa8m73v"; depends=[ggplot2]; }; iLaplace = derive2 { name="iLaplace"; version="1.1.0"; sha256="1z752yw3nvqj1ckf23262phkw849cb5p4m14v108xf2dizyzggxg"; depends=[doParallel fastGHQuad foreach iterators Rcpp RcppArmadillo]; }; - iMediate = derive2 { name="iMediate"; version="0.3"; sha256="1w4bcy54k2dqgckcjnk9bi253cjij4rl603m4jw6x8ixpahgkcr1"; depends=[mediation]; }; + iMediate = derive2 { name="iMediate"; version="0.4"; sha256="0pwvzd0k9m2jd7sizl436vs63rg9yinisrb0flz34yj5avn6rmb0"; depends=[mediation mvtnorm plotly]; }; iMessager = derive2 { name="iMessager"; version="1.0"; sha256="1w0l2qpcgglg13bnqdnz8xnfq2mxkk5g6cblvf2v5y03c2gpmm86"; depends=[]; }; iNEXT = derive2 { name="iNEXT"; version="2.0.12"; sha256="1041r5k0k3kzik5vwyd62s4yc85lnnxbg5gbbl0kl629kikymb6y"; depends=[ggplot2 reshape2]; }; iNOTE = derive2 { name="iNOTE"; version="1.0"; sha256="1969xmgfv9405r09zpd2icvjd9vvzw4dx5qaqxk1a0jvbvhp3h88"; depends=[CompQuadForm mixtools plyr]; }; @@ -6684,7 +6826,7 @@ in with self; { icd = derive2 { name="icd"; version="2.2"; sha256="0yf7xyzwvgfcbccsz89nywkrfg9hp8m2l7pn28kwxn5k0jnm1cmw"; depends=[checkmate magrittr Rcpp testthat]; }; icd9 = derive2 { name="icd9"; version="1.3.1"; sha256="0yrgg1vf9jf0kv4qbvc0d8n26csxx79g2196ijgq43rhprrrm1y6"; depends=[checkmate fastmatch Rcpp]; }; icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; }; - icenReg = derive2 { name="icenReg"; version="2.0.2"; sha256="1k287mn1xf99vj5am96zvhl5if6qkm23rdnmcc924dw04lrdicc3"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; + icenReg = derive2 { name="icenReg"; version="2.0.3"; sha256="1g0jzbw23dmh54ksxnjr8a1i5b9hfivczk5il017w3i8bdadpx65"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; }; icesAdvice = derive2 { name="icesAdvice"; version="1.3-1"; sha256="1afkb5f48f03l9hcjv7xgm6nindk4gn6f38k51pf31a7rxg0114x"; depends=[]; }; icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; }; @@ -6699,7 +6841,7 @@ in with self; { idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; idbr = derive2 { name="idbr"; version="0.2"; sha256="1hhwn93arkzqs5ns9ll7rwqq5gyngixbicly9asw0dgjn12n5p7x"; depends=[countrycode dplyr httr jsonlite]; }; idefix = derive2 { name="idefix"; version="0.1.2"; sha256="00whk6w8mfh8z7l4lhb7c26yniq9a59ja1qfiy6dsxfdcbwdbcnd"; depends=[dplyr gtools MASS maxLik Rdpack scales]; }; - idem = derive2 { name="idem"; version="2.2"; sha256="1kgz5126qm6iqx4w2msfw8nmh4ym9jjkxg16m6z5i1lg3vrpzjkj"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; }; + idem = derive2 { name="idem"; version="3.0"; sha256="15k6gk3v2hijdfabc1c2xabm5v84hgs0p9lpddrpir3h5jzilr3i"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; }; idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; }; @@ -6736,6 +6878,7 @@ in with self; { imp4p = derive2 { name="imp4p"; version="0.4"; sha256="1g5q6y8xxk9176172yvryfg6y33jnhvqicps8p7kljwq8k099dxn"; depends=[imputeLCMD Iso Rcpp truncnorm]; }; implyr = derive2 { name="implyr"; version="0.2.1"; sha256="0f9raar2amkbgk7hr7zdzwls3nlkrml73vdzjz2ycmfi521gsp9y"; depends=[assertthat DBI dbplyr dplyr rlang]; }; r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; + importar = derive2 { name="importar"; version="0.1.0"; sha256="188ad139fa6plla1rraqwi8dvi4xfknm92nb72z21ahdpkdp80i3"; depends=[]; }; imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; }; imputeLCMD = derive2 { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; }; imputeMDR = derive2 { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; }; @@ -6760,7 +6903,7 @@ in with self; { inegiR = derive2 { name="inegiR"; version="1.2.0"; sha256="14mpjyc85l9sznhn29cxk37l3y5yxclqiv2kgcwf8prpxfgwy83l"; depends=[jsonlite plyr XML zoo]; }; ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; - inferference = derive2 { name="inferference"; version="0.4.62"; sha256="12iag6l2digxb056qc765xi27ayc4qyqdqzbhxscr8a5lxfkdn4p"; depends=[Formula lme4 numDeriv]; }; + inferference = derive2 { name="inferference"; version="0.5.4"; sha256="1i164dh82q3k9ql0hgrbflzyc15zdcn2b324mjz84pfhbp2qp4hn"; depends=[Formula lme4 numDeriv]; }; inferr = derive2 { name="inferr"; version="0.1.1"; sha256="148n1dwfjzzcahsqy9s3wlgpf9p6jpcn692j7dvyaw6rdk3bq1i3"; depends=[dplyr magrittr purrr Rcpp tibble tidyr]; }; inflection = derive2 { name="inflection"; version="1.3"; sha256="168ms6hfakr6wql45r9qvk7hpas6sgpaiqyxicihsq0j3dpzvys4"; depends=[]; }; influence_ME = derive2 { name="influence.ME"; version="0.9-9"; sha256="0f6d2hvs9qllyfpsp2cgh7w8yjxafclbk47n8av7j9zpp7s5yg9v"; depends=[lattice lme4 Matrix]; }; @@ -6791,6 +6934,7 @@ in with self; { intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; }; intamap = derive2 { name="intamap"; version="1.4-1"; sha256="1shyxlps1rxqavrvg55gw0c9115q0j3yw78ilavig7036zx5lazv"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; }; intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[automap gstat intamap spatstat spcosa]; }; + intccr = derive2 { name="intccr"; version="0.2.0"; sha256="0sm66c0ivvky01k5v28k7rc6ba15jpnalhgc019nbrly1s5kyqcy"; depends=[alabama doParallel foreach]; }; integIRTy = derive2 { name="integIRTy"; version="1.0.5"; sha256="13p1r3rccsmaqwn0mrskr86jpww72aaq8zf2a8rnbpzkfrq9ni14"; depends=[abind doParallel foreach ltm MASS mclust]; }; interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; }; interactionTest = derive2 { name="interactionTest"; version="1.0.1"; sha256="021qsg9rglc4vj3hkrvfm2snd77zna7ql2i0m5hf77yzxxc35jc6"; depends=[]; }; @@ -6829,7 +6973,7 @@ in with self; { ipdw = derive2 { name="ipdw"; version="0.2-6"; sha256="1jfixvywxdhnpqz62ld2c8n6yacg88q3y1n1aisqqb7szz0zf23z"; depends=[gdistance raster sp]; }; ipflasso = derive2 { name="ipflasso"; version="0.1"; sha256="12cyn7wpkrjqrjccb26mi375ijqplps4216ldj7w3az9g8pzihv3"; depends=[glmnet survival]; }; ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; }; - ipft = derive2 { name="ipft"; version="0.6"; sha256="0xp9ab801yavxq8pvcabx1grhq2hrhnx6lvkv9k02qvyrgp3jkwp"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; + ipft = derive2 { name="ipft"; version="0.7.1"; sha256="1vprm3dlfh5bqn3hk5sdx2d8qdagn1a3crg8s9w1jykp7ivnahac"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; iplots = derive2 { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; }; ipred = derive2 { name="ipred"; version="0.9-6"; sha256="1vrw1pqcpnc04x1r2h9grdfm6bivs358sww5gg90jwlvxcw69lxq"; depends=[class MASS nnet prodlim rpart survival]; }; iprior = derive2 { name="iprior"; version="0.6.5"; sha256="11zb8vs8pv5cbdvfd4s70l2ars3f78lasrvp691s5hvkv882lq51"; depends=[RColorBrewer Rcpp RcppEigen]; }; @@ -6852,6 +6996,7 @@ in with self; { isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; }; island = derive2 { name="island"; version="0.1.3"; sha256="1wb44zyfkgk62aidw5qg660473dxh9nyahmxzxn7ffmi8a0hmdnf"; depends=[]; }; ismev = derive2 { name="ismev"; version="1.41"; sha256="19vmjgz1baqkryi34ffhjznc46z3zwqaqblwafhk9fd50xgn4bi6"; depends=[mgcv]; }; + isnullptr = derive2 { name="isnullptr"; version="1.0.0"; sha256="11pkkvbnbjcpx4nzas2cksmwz6naf6w9d6djk8b34yhnxlvhg09z"; depends=[]; }; isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; }; isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; }; isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; }; @@ -6866,11 +7011,11 @@ in with self; { iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; }; iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; }; iterators = derive2 { name="iterators"; version="1.0.8"; sha256="1f057pabs7ss9h1n244can26qsi5n2k3salrdk0b0vkphlrs4kmf"; depends=[]; }; - iterpc = derive2 { name="iterpc"; version="0.3.0"; sha256="1l1qsjmqwabbmrvl4rx50fynn1p62f0g48hkx71p3gv9asr4zifz"; depends=[gmp iterators Rcpp]; }; + iterpc = derive2 { name="iterpc"; version="0.3.3"; sha256="1dqckb3raq5d6fy0h4ikg2xk61pin1hd4cdvpbngzgjzn6b5q1f6"; depends=[gmp iterators Rcpp]; }; itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; }; itertools2 = derive2 { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; }; itree = derive2 { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; }; - itsadug = derive2 { name="itsadug"; version="2.2"; sha256="01a80a6vni3g4xph3p8i0jrlqgqhdyswhv7w6vbxhbmawbzffxyx"; depends=[mgcv plotfunctions]; }; + itsadug = derive2 { name="itsadug"; version="2.3"; sha256="0wzdy82h05264n9cr84w5j98vz24was9hh1y0wdp56ws3dfbav9m"; depends=[mgcv plotfunctions]; }; itsmr = derive2 { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; }; itunesr = derive2 { name="itunesr"; version="0.1"; sha256="0vfn3vvbfl0ckgr50449xffj8726wsa120ibppbzhalp8rb6hq4a"; depends=[curl jsonlite lubridate xml2]; }; ivbma = derive2 { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; }; @@ -6884,12 +7029,13 @@ in with self; { jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; }; jaatha = derive2 { name="jaatha"; version="3.2.0"; sha256="00886j0cabrq6a69w8s1gsfkmx1wqs1vpxjafpm71msk54r0dj55"; depends=[assertthat R6]; }; jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; }; - jackstraw = derive2 { name="jackstraw"; version="1.1"; sha256="0p79b8vgjspi3hjqqrhrfvf0k9rzg7ycn7azax3pk28j2cvi30j2"; depends=[corpcor lfa]; }; + jackstraw = derive2 { name="jackstraw"; version="1.1.1"; sha256="18iah8sq64p7c6rxs21w8rbxvbmbh03jzqbam1ilp46ayfqzk9qc"; depends=[corpcor lfa]; }; jacpop = derive2 { name="jacpop"; version="0.5"; sha256="056c82d4a10rgq0p4p63y9i94dy1kqp3yh7xms9nx9q2xb940xb5"; depends=[]; }; jagsUI = derive2 { name="jagsUI"; version="1.4.4"; sha256="0jfziaxxrlf1izp7s61d7xckdx33hnbq1cs2zlp7c9bcpp4mdkzv"; depends=[coda lattice rjags]; }; james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; }; janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; }; janitor = derive2 { name="janitor"; version="0.3.0"; sha256="1x2598yv6r2z4q13vbzsqns6d4q0bki97sqsm67pp77djpw8wkay"; depends=[dplyr magrittr tidyr]; }; + jaod = derive2 { name="jaod"; version="0.1.0"; sha256="0wh1nlfhks4c1dga6h7554pg44pamj73x5in71k2xw0yp292zm6x"; depends=[crul jsonlite tibble]; }; jcolors = derive2 { name="jcolors"; version="0.0.1"; sha256="0a5p8778s14rk7xsivmb0g0c4kzdvbhyxsl8v1lk3cpq6898zv2d"; depends=[ggplot2 scales]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; jiebaR = derive2 { name="jiebaR"; version="0.9.1"; sha256="1qv4k5fgi40ppivdk3mxkhawyf2443h2lz5b9gvai9sqj6vf0s8k"; depends=[jiebaRD Rcpp]; }; @@ -6898,14 +7044,14 @@ in with self; { jmetrik = derive2 { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; }; jmotif = derive2 { name="jmotif"; version="1.0.2.900"; sha256="0zgj1g8vy2cj2kyschbr1xb1mb862gniva0sa8qr9p8vvb03ja4v"; depends=[Rcpp RcppArmadillo]; }; jmuOutlier = derive2 { name="jmuOutlier"; version="1.3"; sha256="1lzqpdy2987szihsjaq6l1iggjhji0li4cj7914myj3vzfcif8gw"; depends=[]; }; - jmv = derive2 { name="jmv"; version="0.7.5.6"; sha256="0kkjschr24635nar2jwaq14nvavjcpj5sbikdb2bhs5b983ij98y"; depends=[afex BayesFactor car GGally ggplot2 GPArotation jmvcore lavaan lsmeans multcomp mvnormtest PMCMR psych R6 vcd vcdExtra]; }; - jmvcore = derive2 { name="jmvcore"; version="0.7.1"; sha256="1dfr5kgylax8m8hx3cbifiq32dcrj6dawbzacanvb50rcfizn6n4"; depends=[base64enc R6 rjson]; }; + jmv = derive2 { name="jmv"; version="0.8"; sha256="0zxq16yn3hn4hnlm7914pz1zdypppa25vdbv11qvp77mhprpvj4f"; depends=[afex BayesFactor car GGally ggplot2 ggridges GPArotation jmvcore lavaan lsmeans multcomp mvnormtest PMCMR psych R6 vcd vcdExtra]; }; + jmvcore = derive2 { name="jmvcore"; version="0.8"; sha256="1ii0prwnxaxk32wnyzi6gm89s4v4sh2xwj3ipwb3m8yzf1g8a8kr"; depends=[base64enc R6 rjson]; }; jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; }; joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; }; - joineR = derive2 { name="joineR"; version="1.2.1"; sha256="05q8wky14j36c09qn9sgrp90wswj9x2s438vfaqf4m1znpgv4h3g"; depends=[lattice MASS nlme statmod survival]; }; + joineR = derive2 { name="joineR"; version="1.2.2"; sha256="0xx89ykympdff8a5zz58syj771kbpzrq393hw5z1rgjswzlyi8r9"; depends=[lattice MASS nlme statmod survival]; }; joineRML = derive2 { name="joineRML"; version="0.3.0"; sha256="04v6nqrq4yw3i5xgc4rsqfyb1a4q7iyhlsyq7mhpwydzxxg7nwdg"; depends=[ggplot2 lme4 MASS Matrix mvtnorm nlme Rcpp RcppArmadillo survival]; }; - joint_Cox = derive2 { name="joint.Cox"; version="2.12"; sha256="1g79afhrs6xf4rk2h00v11pw6r9539ds7qhsy5vra4sa79qqfa1g"; depends=[survival]; }; - jointDiag = derive2 { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; }; + joint_Cox = derive2 { name="joint.Cox"; version="2.13"; sha256="061qfx4n3s1nfp77rar25762x79wjr3g39l5d3yvia1csjcm6xyy"; depends=[survival]; }; + jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; depends=[]; }; jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; }; jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; jomo = derive2 { name="jomo"; version="2.4-1"; sha256="0hjpvxm8zbvbnhjhk959fd3wrx4igqgzlxphv1hcc2iyz2975fl8"; depends=[lme4]; }; @@ -6921,14 +7067,14 @@ in with self; { jsonlite = derive2 { name="jsonlite"; version="1.5"; sha256="00lfg464jhf7k01bal9pcjvbdf5cxk6xi2h46hccp1x3h883g434"; depends=[]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.0.0"; sha256="08c1s8fk95np4l6km077dmd1nibhhggi80f5465hhbq521gm0awl"; depends=[V8]; }; jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; }; - jtools = derive2 { name="jtools"; version="0.5.0"; sha256="04v2nw3k3k82vrs7n90njkjjmblqjr59kyhnq7arnmy308cb453v"; depends=[]; }; + jtools = derive2 { name="jtools"; version="0.7.1"; sha256="1hnbf13ymskpcal5d0zv6d4h5wv5ld8w63s4m2sf7j0573v7pbvs"; depends=[boot]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jug = derive2 { name="jug"; version="0.1.7"; sha256="01m6hyr26f6zih49pz2bmmr8ypdl1qiz0wv3padcy68kaccf44a4"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; }; junr = derive2 { name="junr"; version="0.1.2"; sha256="1b1x0fma51wapchia49351wig57fgwc5sw7xsm8rb1g30k294rkz"; depends=[httr jsonlite]; }; jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; }; jwutil = derive2 { name="jwutil"; version="1.1.1"; sha256="114vph86722v89iwyla7skl06cv87ymfy6nmca5iyxwx1z78zddz"; depends=[checkmate Rcpp]; }; kSamples = derive2 { name="kSamples"; version="1.2-7"; sha256="0f19rjngk0lg6s8c6h5l55qpxp8sl4vxj3kpi05cizzncny9b9bj"; depends=[SuppDists]; }; - kableExtra = derive2 { name="kableExtra"; version="0.4.0"; sha256="01zp3q78rs7nwmh6xdzjyk108b4bmdn531rpgiim0rvvci6gyj46"; depends=[knitr magrittr readr rmarkdown rvest stringr xml2]; }; + kableExtra = derive2 { name="kableExtra"; version="0.5.2"; sha256="10lsvn8z2pqsg40a58h9la6g1189v85wr15ps2i8rcd4czrdp53j"; depends=[knitr magrittr readr rmarkdown rvest stringr xml2]; }; kamila = derive2 { name="kamila"; version="0.1.1.1"; sha256="06jl868i8a6zg3pyaf1r6ccd33ya5f83apc5w6d3m111dzdqqlcy"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; }; kangar00 = derive2 { name="kangar00"; version="1.1"; sha256="1rm3mjghgfq8fliha6flqvcb6m4xag1697c0q5smg515453l0s0p"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; }; kantorovich = derive2 { name="kantorovich"; version="2.0.0"; sha256="0y965nkhgk0z2q2j3sycfg76aqqi3ry8avg0bz9xggpd60bhh5vd"; depends=[gmp lpSolve rcdd Rglpk]; }; @@ -6947,19 +7093,20 @@ in with self; { kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; }; kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; }; kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; }; - keras = derive2 { name="keras"; version="2.0.5"; sha256="12f7b1fyaj8gwj9j4fzw32zkn72a0x7z0hjnphv04wp97wagsb31"; depends=[magrittr R6 reticulate tensorflow tfruns]; }; + keras = derive2 { name="keras"; version="2.0.6"; sha256="1q7jp5a89glswa8dcy30v5gxw7fll20k2pgarxqd04an44lhi9ql"; depends=[magrittr R6 reticulate tensorflow tfruns]; }; kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; }; kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; }; kergp = derive2 { name="kergp"; version="0.2.0"; sha256="1xamj19v84m1f9ls8ac8xbm6airyjf96i1l48yy4l2rvjdmx6m9l"; depends=[doParallel MASS numDeriv Rcpp testthat]; }; kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.2"; sha256="04bdggxvggmppp289n2zw6ijdm7y05gws6z7bp6fr8n1zsxy2w3c"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; }; kerndwd = derive2 { name="kerndwd"; version="2.0.1"; sha256="1grinlqjjsxw1x152f9y38lhijh74zc831ddc0lk2niq2rvzszdw"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; - kernelboot = derive2 { name="kernelboot"; version="0.1.1"; sha256="0pg05k87x97bpjnxi1dvfik5kykmgyy7njmn03mmrcrqwfl79kdz"; depends=[future Rcpp]; }; + kernelboot = derive2 { name="kernelboot"; version="0.1.2"; sha256="0k06zxq8978v7zsfylxld64819vd3wj33brpxz0fan3ni01rh7kn"; depends=[future Rcpp]; }; kernlab = derive2 { name="kernlab"; version="0.9-25"; sha256="0qnaq9x3j2xc6jrmmd98wc6hkzch487s4p3a9lnc00xvahkhgpmr"; depends=[]; }; kernplus = derive2 { name="kernplus"; version="0.1.0"; sha256="0wibp4bbzxmjdyhp643v76accjy1w8jixmwgsdfrq2yjxacgnwcb"; depends=[circular KernSmooth mixtools]; }; kernscr = derive2 { name="kernscr"; version="1.0.3"; sha256="0h3xv76dxch8kv4z7cgx60iaikk6906n75c4kc1mccpw0jvyxrvb"; depends=[MASS mvtnorm]; }; keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; }; keypress = derive2 { name="keypress"; version="1.1.1"; sha256="0w8hcxxx47zyz2cbz2s8va2rfb6s2ziw9ck1slq9kh3aqsx3i9g0"; depends=[]; }; + keyring = derive2 { name="keyring"; version="1.0.0"; sha256="0asa62cgs08k0g0yhvsxr2k8rfxy3hqkd4hrv0396394v13b08w5"; depends=[assertthat getPass openssl R6]; }; keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; }; kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; }; kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; }; @@ -6982,7 +7129,7 @@ in with self; { kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; kmcudaR = derive2 { name="kmcudaR"; version="1.0.0"; sha256="1adixf4nsgnk8rgvcv37aznh8gxrfwn19ihh3c6siss51hlmhln2"; depends=[Rcpp RcppEigen]; }; kmeans_ddR = derive2 { name="kmeans.ddR"; version="0.1.0"; sha256="1i87cxakjbq1xwyjyyzv1xiqbrncsqx6baviidcdm3n0pakrqdsg"; depends=[ddR Rcpp]; }; - kmi = derive2 { name="kmi"; version="0.5.2"; sha256="0w440r3daksghvimbm0avp6c3rjvxaxsawvn7ig5bwnw60kry9il"; depends=[mitools survival]; }; + kmi = derive2 { name="kmi"; version="0.5.3"; sha256="0b3nibvi0skrx3mjfzypqmdqx8s9zkn11f0ljscqpjr28idx4hr0"; depends=[mitools survival]; }; kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; }; kml3d = derive2 { name="kml3d"; version="2.4.2"; sha256="1a3hqyhrsh12l1j1xlz4zy88impw3biz6w2qc80r11m549h0m6s9"; depends=[clv kml longitudinalData misc3d rgl]; }; kmlShape = derive2 { name="kmlShape"; version="0.9.5"; sha256="1p35ihjq84jnzq78yksdblc0c1qcn13f8n4khddsxcqvk3a44xb1"; depends=[class kml lattice longitudinalData]; }; @@ -6996,17 +7143,18 @@ in with self; { knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; }; knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; }; knockoff = derive2 { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; }; - knor = derive2 { name="knor"; version="0.0-1"; sha256="03npxd3jv8386z15lcq1w402f8r12cjy5yzbprd5wi83g7sbg4fp"; depends=[Rcpp]; }; + knor = derive2 { name="knor"; version="0.0-2"; sha256="1fpck9n3p16ii4ycr4daz8if71yps2bb4rq53sy2q4z9gqq7fr2q"; depends=[Rcpp]; }; knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; }; kntnr = derive2 { name="kntnr"; version="0.4.1"; sha256="0d78mgmz2yhfbf4m5jaa28aazaw2wf9vf1vxl53wrnpy0hxw329y"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr tibble]; }; koRpus = derive2 { name="koRpus"; version="0.10-2"; sha256="1ykaky10zkj76w44fhk6kb6dqz1pgncmdnz4r2amcm08a8h96gsr"; depends=[data_table]; }; kobe = derive2 { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[coda emdbook ggplot2 MASS plyr reshape]; }; kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; }; - kohonen = derive2 { name="kohonen"; version="3.0.2"; sha256="1dg2jmdlp888bcfkpmd8w9w9dj7y9r94fgr7gl2fkhlhkid9ss78"; depends=[MASS Rcpp]; }; + kohonen = derive2 { name="kohonen"; version="3.0.4"; sha256="1aq98qbmbzsdyimhn28qiyqfrwkwq70qmm5yhx0rvhjq53bn9622"; depends=[MASS Rcpp]; }; kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.2.0"; sha256="1sk7r5v3d65w126vin9gawan3f21zrd9ps974l9nxj7kv1pa3szh"; depends=[digest dplyr httr purrr rgdal shiny xml2]; }; kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; }; komadown = derive2 { name="komadown"; version="0.1.0"; sha256="08rg2qz4dmxl4xi0d7wdl2xgdmsc29fdc0yi40yddzrbpj4vs2z4"; depends=[bookdown knitr rmarkdown]; }; kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; }; + kpeaks = derive2 { name="kpeaks"; version="0.1.0"; sha256="1qxpncwyshv35h1190py6a69mljabfcjjs7v17a2rb5asahy3rk8"; depends=[]; }; kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; }; kpodclustr = derive2 { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; }; kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; }; @@ -7030,7 +7178,7 @@ in with self; { l0ara = derive2 { name="l0ara"; version="0.1.5"; sha256="15qajzpvqnikg9k199cqvwp9qbrxx4zr9lsvyad96pa9qr156gvb"; depends=[Rcpp RcppArmadillo]; }; l1kdeconv = derive2 { name="l1kdeconv"; version="1.2.0"; sha256="1mk92sz9nsmxsn7yplhfcz07k022lrr61114ckrmm0x8hfd89zj8"; depends=[ggplot2 mixtools]; }; l2boost = derive2 { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; }; - laGP = derive2 { name="laGP"; version="1.4"; sha256="186ab5j0r716jxk4gvaw78s2vafj24gy9qz0wbfhalkf1hp7yblw"; depends=[tgp]; }; + laGP = derive2 { name="laGP"; version="1.5"; sha256="0b308biwkjndzr9jrxi8m2yc55kyik17xza1xfgghksix2wc2mgz"; depends=[tgp]; }; labdsv = derive2 { name="labdsv"; version="1.8-0"; sha256="0rbf7cswnj534jdi5hfaai12nbxj6l96f02c73ynraqvdqxb1bnz"; depends=[cluster MASS mgcv]; }; label_switching = derive2 { name="label.switching"; version="1.6"; sha256="0k6f31gwcjfncsgd5cm9zygplif2wr8zjqrw4gmrnxcgp2z58a9w"; depends=[combinat lpSolve]; }; labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; @@ -7046,7 +7194,7 @@ in with self; { lakemorpho = derive2 { name="lakemorpho"; version="1.1.0"; sha256="1qdh67a6a6iibvvba12z763xf989qfh08b3xgk1hy1irgc8myvll"; depends=[cluster geosphere maptools raster rgdal rgeos sp]; }; laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; lamW = derive2 { name="lamW"; version="1.3.0"; sha256="00qa1sxyqb2r7f9yidg43cq2v1285f45xpm3z928jpi424mpg0fc"; depends=[Rcpp RcppParallel]; }; - lambda_r = derive2 { name="lambda.r"; version="1.1.9"; sha256="1j6287iqvs3ill6r5g6ksf5809qp0l0nf20ib8266m1r09lc9j14"; depends=[]; }; + lambda_r = derive2 { name="lambda.r"; version="1.2"; sha256="0vql32np716dpd0kjn7s7wgawd02ysgp2a5il4kb19nlw661ii3x"; depends=[]; }; lambda_tools = derive2 { name="lambda.tools"; version="1.0.9"; sha256="1wslxxh6rxny3n06y16dqwpczi3k42vrq4pbwwshl6kzhl56r45b"; depends=[lambda_r]; }; landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; }; landpred = derive2 { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; }; @@ -7078,7 +7226,7 @@ in with self; { lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; }; lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; }; lavaanPlot = derive2 { name="lavaanPlot"; version="0.1.0"; sha256="13m4rsh0nbqfnyasbrf3bw844jg1l7bqd2drckrqwss2h7ks029q"; depends=[DiagrammeR lavaan]; }; - lawn = derive2 { name="lawn"; version="0.3.0"; sha256="0rws76dzpi2gpn90la663r1g9ywvpvjicjmgb6z7k5xg1gspgs5c"; depends=[jsonlite magrittr V8]; }; + lawn = derive2 { name="lawn"; version="0.4.0"; sha256="1fg5bn2h1lqxnbmf317nh8myi6zg2qj60hxdhqcsqczjk3b6a2n5"; depends=[jsonlite magrittr V8]; }; lawstat = derive2 { name="lawstat"; version="3.1"; sha256="0sdsxh2h06d3maqd1pvmnnvphaxav0z2kv5wpiy7dg17cgwv35c2"; depends=[Hmisc Kendall mvtnorm VGAM]; }; lazy = derive2 { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; }; lazyData = derive2 { name="lazyData"; version="1.1.0"; sha256="0mbmmx6dh8ph4lrx1b4gxbwz3jwxv4nqi0xvfzpzrm3bwbsjc634"; depends=[]; }; @@ -7105,7 +7253,9 @@ in with self; { ldlasso = derive2 { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; }; ldr = derive2 { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; }; ldstatsHD = derive2 { name="ldstatsHD"; version="1.0.1"; sha256="152dlphxxzllgf7al8k34qcfg6n8ajxqym62i61ahbbgjlcd0x9r"; depends=[camel cluster corpcor evd fExtremes huge igraph MASS Matrix qvalue RBGL robustbase VGAM]; }; + leabRa = derive2 { name="leabRa"; version="0.1.0"; sha256="08yiwyfg9bp4i9w5yyw9p63wyvgj39kd64y3h21j2jmpw8zxncdq"; depends=[plyr R6]; }; leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; }; + leafSTAR = derive2 { name="leafSTAR"; version="1.0"; sha256="16zfaj0v6dx6mhy6m126lxa6w0dzfw4acm83jlbrizaz52amhv6a"; depends=[]; }; leaflet = derive2 { name="leaflet"; version="1.1.0"; sha256="05faikqdlbsj9lvl1lvhmagys71597jvgah8b9f1fqhgyj0bwx7l"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; }; leaflet_esri = derive2 { name="leaflet.esri"; version="0.2"; sha256="18y3hzbn4apn209rww8hk4mkx5ix6b6z01ydr31d39bqlgg6n7zf"; depends=[htmltools htmlwidgets leaflet leaflet_extras magrittr shiny]; }; leaflet_extras = derive2 { name="leaflet.extras"; version="0.2"; sha256="1baxcgcxizyf05w8gb5zjmvrsbrhpwvrxrblcv5vpy4vk73921v1"; depends=[htmltools htmlwidgets leaflet magrittr shiny stringr]; }; @@ -7122,9 +7272,9 @@ in with self; { learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; }; lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; - lemon = derive2 { name="lemon"; version="0.3.0"; sha256="1ivam4b4sgvadazqn9f3dr5ffal723yk3l5rw35p8rmc3kmlhn7z"; depends=[ggplot2 gridExtra gtable knitr lattice RCurl]; }; + lemon = derive2 { name="lemon"; version="0.3.1"; sha256="0p0hvw0ndqcxcg8sqwk1kfrlksp985vd4jpkww7ijmw6kmwl9mwy"; depends=[ggplot2 gridExtra gtable knitr lattice RCurl]; }; lero_lero = derive2 { name="lero.lero"; version="0.1"; sha256="1jndsgy48fn085ilkh8dfc3w76kfnfj0x70d1m3h59zxi3x9lb82"; depends=[stringr]; }; - lessR = derive2 { name="lessR"; version="3.6.5"; sha256="1r0b18l47nwyfclqy19hyra94bi2bv960myq6vjiyarv1lhk8f3g"; depends=[ellipse foreign lattice latticeExtra leaps png readxl robustbase sas7bdat triangle]; }; + lessR = derive2 { name="lessR"; version="3.6.6"; sha256="1i02i9lzgx8rf5x7pcp1vxvsgdl9jdnldj7q7qg22blaphdbl7qb"; depends=[ellipse foreign lattice latticeExtra leaps png readxl robustbase sas7bdat triangle]; }; lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; letsR = derive2 { name="letsR"; version="3.0"; sha256="1mm0d7v29d594w2xxv6h1k6dsav2cs31hi64lyxjar1bi4snp6hj"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; }; @@ -7138,19 +7288,19 @@ in with self; { lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; }; lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; }; lgcp = derive2 { name="lgcp"; version="1.4"; sha256="10gnfqq5vx18w6f52fliyfnrjmyns9q5q59pn2m82q2fqwaz26d8"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; }; - lgtdl = derive2 { name="lgtdl"; version="1.1.4"; sha256="0y519hgrm2ynbhbs61vi8gkhwqgn69wpnd391wpgf4yrg2lx064b"; depends=[]; }; + lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; }; lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; }; lhs = derive2 { name="lhs"; version="0.14"; sha256="1qnr3s9511nq3xqdbngllmw3mvnnpblma5dafyghxlpvydc2l481"; depends=[]; }; libamtrack = derive2 { name="libamtrack"; version="0.6.3"; sha256="0pdwrz19q1yls0rgr4579f31j86awizx3j31h7vdh6y70ngpmb82"; depends=[]; }; libcoin = derive2 { name="libcoin"; version="0.9-3"; sha256="1gmgppc5vf11zmsbyayljijd9n3n9j0ns1hia0x7m5jm6nyjxgql"; depends=[mvtnorm]; }; libsoc = derive2 { name="libsoc"; version="0.5"; sha256="0p01mcwnkb4g3dq0mx1gbwfbznp4b2dmhs8k8wmnh7wll16v9i6z"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0"; sha256="0qk70rl76lz2izgp2c1asx0yvi8xgfq1yg579kcygxk4pnxjdwv4"; depends=[Rcpp]; }; - lidR = derive2 { name="lidR"; version="1.2.1"; sha256="0kaz9v75raicrjjg4xwzm9qgljpa95ki716a78bj95kcqc556104"; depends=[data_table geometry gstat lazyeval magrittr RANN raster Rcpp RcppProgress rgeos rgl rlas settings sp]; }; + lidR = derive2 { name="lidR"; version="1.3.1"; sha256="162gf587rhpfx29kxlq21axhvjxkj9bx5zryl3vfzad9309n0an9"; depends=[data_table gdalUtils geometry gstat lazyeval magrittr mapedit mapview memoise raster Rcpp RcppProgress rgeos rgl rlas settings sp stringr]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.3"; sha256="0qjx7czyrk47lnpq3aw43hh2z8b8yiqllcayk911f1hpf5vwbcir"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; }; lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; }; - liftLRD = derive2 { name="liftLRD"; version="1.0-5"; sha256="0v0aczf9s3vr9kk7n6z9spwc82hf418v9vjiyfri3npn3ib112b7"; depends=[adlift nlt]; }; + liftLRD = derive2 { name="liftLRD"; version="1.0-6"; sha256="1mnrhdig7kb7g6ffw7x9l8bpn66y7bh3n6ds5r2gb3nplnidi45y"; depends=[adlift nlt]; }; liftr = derive2 { name="liftr"; version="0.6"; sha256="1i4d9fsyik8i0dcpp8drsm3xmjnmb8i48fxgci959n8f7w384w57"; depends=[knitr rmarkdown rstudioapi stringr yaml]; }; lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; }; likeLTD = derive2 { name="likeLTD"; version="6.2.1"; sha256="1b5rg1nijc4vsl7xabq35ini84rpnd1yrxsk1vr7wd57yac25mmk"; depends=[DEoptim gdata ggplot2 gtools rtf]; }; @@ -7158,14 +7308,16 @@ in with self; { likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.45"; sha256="0sl0q6w49l89i6s80scsr5lrr8jgdd0788i4b87w985zaxjqrh03"; depends=[alabama cond nleqslv pracma Rsolnp]; }; likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; limSolve = derive2 { name="limSolve"; version="1.5.5.3"; sha256="1ll6ir42h3g2fzf0wqai213bm82gpwjj2hfma2np3mz024sc09rg"; depends=[lpSolve MASS quadprog]; }; + lime = derive2 { name="lime"; version="0.3.0"; sha256="0ly921qf1hhcg6djbqxn0r6pbqxx4dznjy17hmskk9dmm7cadipf"; depends=[assertthat ggplot2 glmnet htmlwidgets Matrix Rcpp RcppEigen shiny shinythemes stringdist stringi]; }; limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; linERR = derive2 { name="linERR"; version="1.0"; sha256="1mhiyqfpwagg161ncp5ndd22hlh12qzr360nms13rgyd8a077cq7"; depends=[survival]; }; linLIR = derive2 { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; }; linbin = derive2 { name="linbin"; version="0.1.2"; sha256="0shw976nlryjvmvnyyiycchqs7zcg5flalywm1ymnv62nw3n55xs"; depends=[]; }; lindia = derive2 { name="lindia"; version="0.9"; sha256="1qma8wr0fkwx03x971crkh8cfc8z4374py1r1wvszj9wzi4vfp5r"; depends=[ggplot2 gridExtra MASS]; }; linear_tools = derive2 { name="linear.tools"; version="1.3.0"; sha256="14lp3gifzbid82lkr7rdqajz2abp8m7y8irpwx6s8w66djjfckda"; depends=[ggplot2 magrittr plyr pryr scales stringr]; }; + linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; }; lineup = derive2 { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; }; - lingtypology = derive2 { name="lingtypology"; version="1.0.6"; sha256="117jq315bp5ykdld1aban8xww8x8gvjg02rkqh1n0slkcsc4wkg0"; depends=[leaflet magrittr MASS rowr sp stringdist]; }; + lingtypology = derive2 { name="lingtypology"; version="1.0.7"; sha256="1257yxhqizzhl8cdllagk05ny5k4wsh1kgjc1vy7i0x7zi8jlkk1"; depends=[leaflet magrittr MASS rowr sp stringdist]; }; link2GI = derive2 { name="link2GI"; version="0.1-0"; sha256="1i16yf387izv8vn0z8f7wgk02hld83lhfb5c263mn1v3q5zj9kki"; depends=[gdalUtils raster rgdal rgrass7 sf sp]; }; linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; }; linkcomm = derive2 { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; }; @@ -7187,7 +7339,7 @@ in with self; { listviewer = derive2 { name="listviewer"; version="1.4.0"; sha256="1273vk8pk393ciwahvpmdh9z4xdlhw3a7mlm7jsqxqnsrc6jrz3x"; depends=[htmltools htmlwidgets shiny]; }; liteq = derive2 { name="liteq"; version="1.0.0"; sha256="1r3rbn0a5nnwrhfdygn1hlvv0n3nd1ayddvkpdv5ibsp5fl5vjhy"; depends=[assertthat DBI rappdirs RSQLite]; }; littler = derive2 { name="littler"; version="0.3.2"; sha256="0anwlxyj82xgrccb3pf6glrkqbkw1871hj4b1qrkmd5ss2f3xq9j"; depends=[]; }; - liureg = derive2 { name="liureg"; version="1.01"; sha256="0qk1wgib4cljfq9qp99p5ls68d665m42cn4nkqmqjf1na96lq7ll"; depends=[]; }; + liureg = derive2 { name="liureg"; version="1.1.1"; sha256="11cybb1i3a0na3yadzwmn1hlglqk0zdzxj0n07ygsxrdq7sxbpnj"; depends=[]; }; livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; }; ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; }; llama = derive2 { name="llama"; version="0.9.1"; sha256="1cvm58kivjw77a2fy1jwsajzl1d0i3i123p6glpwdlqn6rlharck"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; }; @@ -7197,7 +7349,7 @@ in with self; { lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; }; lm_br = derive2 { name="lm.br"; version="2.9.3"; sha256="1xadz0rygm58igk0ig0w45132gnsvjxvwqzca4m6v6i6lz9x55pf"; depends=[Rcpp]; }; lmPerm = derive2 { name="lmPerm"; version="2.1.0"; sha256="1ss2hcfxqvfq4n6hypv7jp0n0apby9payxzaswaysr5368lkidn3"; depends=[]; }; - lmSupport = derive2 { name="lmSupport"; version="2.9.8"; sha256="1g96540krrvycy7m3avhwazkmnyngk9lrjggny4wxhzn49i8p4ga"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; + lmSupport = derive2 { name="lmSupport"; version="2.9.11"; sha256="1yvckfahw3kq0r28ggrml7qhgm4ib5ihd971zxg62li4inrkri6b"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; lme4 = derive2 { name="lme4"; version="1.1-13"; sha256="13j4a721rx0272pdxrz6nabjv56xb6srklq5w4z1abc82lyvda2z"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; }; lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; @@ -7223,7 +7375,7 @@ in with self; { lmomco = derive2 { name="lmomco"; version="2.2.7"; sha256="1xrw2a3iyp0i2kmcwgq0sr10v40q5c2n84xx8dxpvl3978vqidj8"; depends=[goftest Lmoments MASS]; }; lmridge = derive2 { name="lmridge"; version="1.0"; sha256="07zchmdcyz8agrs9q2ydcgicz3sxg893vv4rsynlpgyk2z5xnnjf"; depends=[]; }; lmtest = derive2 { name="lmtest"; version="0.9-35"; sha256="107br1l7p52wxvazs031f4h5ryply97qywg9dzrkw4ydnvqq4j9g"; depends=[zoo]; }; - lmvar = derive2 { name="lmvar"; version="1.2.1"; sha256="0zgrrf8ilppzk030zqpqaw95fq0mh098qd5rgg4bpykzq1gfq58d"; depends=[Matrix matrixcalc maxLik]; }; + lmvar = derive2 { name="lmvar"; version="1.3.0"; sha256="0iczn4r83gdsvb8hk7av3pjf3am0z7hpqdn7xqpnyby5sqga5kv9"; depends=[Matrix matrixcalc maxLik]; }; loa = derive2 { name="loa"; version="0.2.38"; sha256="1k57n3j8nh0frgabhb5gh0scmgp5gzn2zc9l206mklbw06jkdp96"; depends=[lattice MASS mgcv png RColorBrewer RgoogleMaps]; }; localdepth = derive2 { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; }; localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; }; @@ -7293,15 +7445,15 @@ in with self; { lsgl = derive2 { name="lsgl"; version="1.3.6"; sha256="0zkv5xgwrnwx0w0qpzsg7krd7fdnlr3a85q64xj1wx0gd578dqq6"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; lsl = derive2 { name="lsl"; version="0.5.5"; sha256="0555za3yqqdbcpxrl6vzj494784xl1wsmwp1apszaqncz2vwc9pg"; depends=[ggplot2 lavaan reshape2]; }; - lsmeans = derive2 { name="lsmeans"; version="2.26-3"; sha256="0pxpdvdlh0lf45f1b0s53dk8y73j2xnyvzixj1jnafmw1w6bj778"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; }; + lsmeans = derive2 { name="lsmeans"; version="2.27-2"; sha256="18b69cg09zkcxlvb838157gzr9bqwdnzf9vrwzr1vpzwdybl7np0"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; }; lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; }; lspls = derive2 { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; lsplsGlm = derive2 { name="lsplsGlm"; version="1.0"; sha256="1qh68r033fwq1hc19h2srl1k6znvvvrcp38ghxadsksjfxllvniy"; depends=[]; }; lsr = derive2 { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; }; lss = derive2 { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; }; ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; }; - ltm = derive2 { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; }; - ltmle = derive2 { name="ltmle"; version="0.9-9-3"; sha256="04y0gl44ayyp8n3d92i0dkyanalc25da6prrqmiaw9nr3ykjj78l"; depends=[Matrix matrixStats speedglm]; }; + ltm = derive2 { name="ltm"; version="1.1-0"; sha256="1gxjz3rn5bacv7xdlinzk6rdcwragb76grjpk5wqs4shqbk0rld2"; depends=[MASS msm polycor]; }; + ltmle = derive2 { name="ltmle"; version="0.9-10"; sha256="0j52jjjcrvalaan26msykwhz63p7jym6ilgh562cjv4jpi9bxplk"; depends=[Matrix matrixStats speedglm]; }; ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; }; ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; ltsk = derive2 { name="ltsk"; version="1.0.4"; sha256="1p026ryq31iw7d8mbi4m2q43g5frj47387w8g46j50bcv11hh2zm"; depends=[fields gstat sp]; }; @@ -7318,7 +7470,7 @@ in with self; { luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; }; lvec = derive2 { name="lvec"; version="0.1.1"; sha256="1mpw01z0n0cql451qmi0b77pbfkhx6jyc4zzs5nl82jb6x3y20wn"; depends=[BH]; }; lvm4net = derive2 { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; }; - lvnet = derive2 { name="lvnet"; version="0.3.1"; sha256="1bzykd70j8xbvpxqwdac49pv7ndvjqljwywhbf6sn3yvq72n3hlj"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; + lvnet = derive2 { name="lvnet"; version="0.3.2"; sha256="0ynp7399q98dgh51fkw1r1z8iy3qm41ny887a955n8kp8pp9l737"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; }; lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; }; lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; }; @@ -7327,6 +7479,7 @@ in with self; { m4fe = derive2 { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1zwxxfp6nbirp1rz901v843ph"; depends=[]; }; mAr = derive2 { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; }; mBvs = derive2 { name="mBvs"; version="1.0"; sha256="0qq6yaqvpg3akwbbaamv1a5rsrwdsq5z161w0prvq8qcbyfwclni"; depends=[]; }; + mExplorer = derive2 { name="mExplorer"; version="1.0.0"; sha256="1563d9r7f25vw5vsph21z3dwz9n40dpaiyx28ay1bbp5i1x2l3rb"; depends=[nnet qusage]; }; mFilter = derive2 { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; }; mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; }; mHG = derive2 { name="mHG"; version="1.1"; sha256="1rz5ncrvvv9h9grls15apa63v2nh9j87fmp4mwjjil37jx6a5zki"; depends=[]; }; @@ -7347,15 +7500,16 @@ in with self; { maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; }; madness = derive2 { name="madness"; version="0.2.2"; sha256="0facd1km06kjd70prkjkns8x2nyavj4m7lgiyxd7gpr9plba5wmr"; depends=[expm Matrix matrixcalc]; }; madr = derive2 { name="madr"; version="1.0.0"; sha256="0lzg75kphz4a0w6n0jbsq87g72jvrbkyas4j813mryq2nv4lmsl4"; depends=[]; }; - madrat = derive2 { name="madrat"; version="1.8.0"; sha256="0a37nc7frciji990dfj1hx5rgiv5l7dvgdgrp0yh56636v6lpvyz"; depends=[digest magclass spam]; }; + madrat = derive2 { name="madrat"; version="1.22.1"; sha256="0wk2svhi4209p8ab8i2g9q22kswpisphb2a9ln5lzwdhnryk4ya9"; depends=[digest magclass spam stringr]; }; mads = derive2 { name="mads"; version="0.1.5"; sha256="1ac34iff9hvl1bxk3gs5s3i311g9y59nd6v9jhvnfd6wfhck7krs"; depends=[mrds]; }; madsim = derive2 { name="madsim"; version="1.2.1"; sha256="11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq"; depends=[]; }; mafs = derive2 { name="mafs"; version="0.0.2"; sha256="1yx4y73hnd30x6cad7md07aiikhdsa6bsbha72j9vlncaj8d504m"; depends=[cmprsk colorspace CombMSC Epi etm forecast forecastHybrid fracdiff ggplot2 ggseas gtable munsell numDeriv plyr quadprog Rcpp scales tictoc tidyr timeDate tseries zoo]; }; - magclass = derive2 { name="magclass"; version="4.39"; sha256="0i0wfvfnvzc1gpgfhfn4765cjs92hhgrbwch04ci1dvmxmplnbxn"; depends=[abind maptools ncdf4 reshape2 sp]; }; + magclass = derive2 { name="magclass"; version="4.51.1"; sha256="1p4pbwjkn9ic3vqjh9m4b18s78f8wx0815n4dyg9pin8p14klzil"; depends=[abind maptools ncdf4 reshape2 sp]; }; magic = derive2 { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; }; - magicaxis = derive2 { name="magicaxis"; version="2.0.1"; sha256="065x7076kps7bk66j0ivazqlqcich82y5fbb2953wwlnficx37wl"; depends=[celestial mapproj MASS plotrix sm]; }; + magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; }; + magicaxis = derive2 { name="magicaxis"; version="2.0.3"; sha256="08nkf9k2ijlm52ybncfiwrghy911wpvwpvdvllcz2d4slk1vdakj"; depends=[celestial mapproj MASS plotrix sm]; }; magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; }; - magick = derive2 { name="magick"; version="1.2"; sha256="035igzv57l2mimfhqqf44gg733cpqx5av12xyxmp5wcf71k3xm10"; depends=[curl Rcpp]; }; + magick = derive2 { name="magick"; version="1.3"; sha256="1bb5mcbxi917m4pxi8hk76h276kysgmsbq3vdnzl2nhh38d1ayfg"; depends=[curl magrittr Rcpp]; }; magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; }; magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; }; mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; @@ -7367,16 +7521,18 @@ in with self; { mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; }; mandelbrot = derive2 { name="mandelbrot"; version="0.2.0"; sha256="04a288jj8h1a04r584a02wg9dm3c6zifhqwj964ybsvgb4m6g99s"; depends=[reshape2]; }; + manet = derive2 { name="manet"; version="1.0"; sha256="1hb5mv05zcv4s2bpyh3vgkyf4r78fyvcwl3p1kwlwqn9cv1lgci2"; depends=[combinat igraph MCMCpack]; }; mangoTraining = derive2 { name="mangoTraining"; version="1.0-7"; sha256="0lw46j44jhdcyh079a7zjmxcnv5c6qsfachinlwv3ild1gwggr3p"; depends=[]; }; manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; }; manifestoR = derive2 { name="manifestoR"; version="1.2.4"; sha256="1hd4qsa2xsa1dq5jnwh1bph34glkpaabjmsnavdjhkfzjilp32ya"; depends=[base64enc dplyr functional httr jsonlite magrittr NLP psych tibble tm zoo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; manipulateWidget = derive2 { name="manipulateWidget"; version="0.7.0"; sha256="1xiiaaay8szmw36vli3kgg4mn73hjdbaqq0w0l01wc2qhv3fa30n"; depends=[base64enc htmltools htmlwidgets knitr lazyeval miniUI shiny]; }; + mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; mapdata = derive2 { name="mapdata"; version="2.2-6"; sha256="0k3hsnyvax20jph384gca10rl7a9fcglgkqcjsc5hndx3qrwpanv"; depends=[maps]; }; mapedit = derive2 { name="mapedit"; version="0.3.2"; sha256="0x1jyll45kx1q3bq3visyq75jvinhw3h0yy1n1rams61vvxrqfxk"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; }; mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; - mapmisc = derive2 { name="mapmisc"; version="1.6.2"; sha256="0555yv0snhfrvvjdc3hz32s0lw5k395paz8ypw4lp5h9hlk4b8r6"; depends=[raster sp]; }; + mapmisc = derive2 { name="mapmisc"; version="1.6.3"; sha256="0akrrm5zrsgq0i69m1wb43xy5nh2w8fa05zz6fpwdmpjy4x09c2g"; depends=[raster sp]; }; mapplots = derive2 { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; }; mapproj = derive2 { name="mapproj"; version="1.2-5"; sha256="0rjz37r4rizk2c6jaf54f0kfb60dqv6b262cnhiwjl55d4x6l0pk"; depends=[maps]; }; mapr = derive2 { name="mapr"; version="0.3.4"; sha256="14f7zfzxb1h935bbybj2l2n4a62cnq0wvgmc09in0fvnl75jl971"; depends=[ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; }; @@ -7431,7 +7587,7 @@ in with self; { mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; }; mbest = derive2 { name="mbest"; version="0.5"; sha256="0l6vmcqkd2b0b90jmsswrhbdmhq2x92g7sr2l99rp7xp1cxdq02w"; depends=[bigmemory foreach lme4 logging nlme]; }; mbgraphic = derive2 { name="mbgraphic"; version="1.0.0"; sha256="0b4xr2ycx8v56fp40lnxv69qfp0yzai2hdwk3kw4wsmir91d2a91"; depends=[diptest dplyr extracat GGally ggplot2 gridExtra hexbin magrittr mgcv Rcpp scagnostics scales seriation shiny]; }; - mbir = derive2 { name="mbir"; version="1.0"; sha256="1m6d31br19wy3hz2d79df6qkdiyy8il7hf02md5bfvw4jvy2rh8z"; depends=[]; }; + mbir = derive2 { name="mbir"; version="1.1"; sha256="0nn4spw8bx0wnshwnph06wxdshxxcs100d5wh0apwrhz3w8xv2x6"; depends=[]; }; mblm = derive2 { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; }; mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; }; mboost = derive2 { name="mboost"; version="2.8-1"; sha256="163pf6dhl46w9n069pybqqc8khafhdkqhf9fmm095g66ypdbga4n"; depends=[lattice Matrix nnls party quadprog stabs survival]; }; @@ -7439,7 +7595,7 @@ in with self; { mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; }; mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; }; mcIRT = derive2 { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp RcppArmadillo]; }; - mcMST = derive2 { name="mcMST"; version="1.0.0"; sha256="0bw1ka9ics39khadzcwi4bqqswhgwa52mqf65bp8aml445gd62l1"; depends=[BBmisc checkmate ecr ggplot2 gtools lhs parallelMap reshape2 vegan]; }; + mcMST = derive2 { name="mcMST"; version="1.0.1"; sha256="18ka76g9pgpycaw0hl8vxpabd8584q1l5d3xmrzy1zwincsg7vgs"; depends=[BBmisc checkmate ecr ggplot2 gtools lhs parallelMap reshape2 vegan]; }; mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; depends=[PAFit RColorBrewer Rcpp]; }; mcbiopi = derive2 { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; }; mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; }; @@ -7455,10 +7611,12 @@ in with self; { mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; }; mclogit = derive2 { name="mclogit"; version="0.5.1"; sha256="1qnkkjq7gxivpz3mmbq5dx9a128r3xhrdzx96kc80h3w67yc7hbl"; depends=[Matrix memisc]; }; mclust = derive2 { name="mclust"; version="5.3"; sha256="0h5syvpg3azrz5d10z2afilaa27jb4azi38idzlv05mfcs16s6rb"; depends=[]; }; + mclustcomp = derive2 { name="mclustcomp"; version="0.1.0"; sha256="1j3r1gv6lbs40l1z5qn8010a7mqx7lnq2dkagx17bffg7d9pxv81"; depends=[Rcpp RcppArmadillo]; }; mcmc = derive2 { name="mcmc"; version="0.9-5"; sha256="1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6"; depends=[]; }; mcmcplots = derive2 { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; }; mcmcse = derive2 { name="mcmcse"; version="1.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; }; mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; }; + mcompanion = derive2 { name="mcompanion"; version="0.4-5"; sha256="18l29cbggf5mdab8vdzmbsnc0p77llaq3ylp07a7gsq44bys8zq0"; depends=[gbutils MASS Matrix Rdpack]; }; mcparallelDo = derive2 { name="mcparallelDo"; version="1.1.0"; sha256="1ivh0d4f7ks6xwcjywk62h1zhr7h5bbhzpisky7973wi4g8vipbn"; depends=[checkmate R_utils R6]; }; mcprofile = derive2 { name="mcprofile"; version="0.2-3"; sha256="0rakaa1p6z0p4jl4df357vi58wzph81ik6plc8zzl370r8mj1y8q"; depends=[ggplot2 mvtnorm quadprog]; }; mcr = derive2 { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; }; @@ -7477,7 +7635,8 @@ in with self; { mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; }; mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; }; mdsr = derive2 { name="mdsr"; version="0.1.4"; sha256="1g9a6g8rf2svndis7569bnbj3jx1mgli172fjzdypfnhiyhd46vb"; depends=[babynames DBI dbplyr downloader dplyr ggplot2 mosaic RMySQL tidyverse]; }; - meanShiftR = derive2 { name="meanShiftR"; version="0.50"; sha256="0wb08x9vanwfzs7ijskl53118jvy3z48gqda7gn33aq82dkablza"; depends=[]; }; + mdw = derive2 { name="mdw"; version="2017.8-27"; sha256="0rsp6s15fgb7rni2qhgjx6dz1byvbaan5zhi6ixskpfs3z6h8fv8"; depends=[]; }; + meanShiftR = derive2 { name="meanShiftR"; version="0.51"; sha256="0qcciayriygfwkb15n863amcpcfl97fr1sarwm3d269idf5m7w6x"; depends=[]; }; meanr = derive2 { name="meanr"; version="0.1-0"; sha256="1vbsqcbgbv0h4ld45cfpasy5sy5a019zn1fh141ylhsd9czrb9d4"; depends=[]; }; measuRing = derive2 { name="measuRing"; version="0.4"; sha256="165j3i5295hxzqg8l2hrd61a0fh9xmw61dpx8js8qjz1zi9rm84x"; depends=[dplR pastecs png tiff]; }; measurements = derive2 { name="measurements"; version="1.1.0"; sha256="1zi6mpwyxycbphq48s7vfc8gm76nidpa2gafp0jxiv56rwpv3jc3"; depends=[]; }; @@ -7485,19 +7644,20 @@ in with self; { medSTC = derive2 { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; medfate = derive2 { name="medfate"; version="0.2.2"; sha256="1vw9j04063sjwyfdkk94xsgz5zps7vmqha6dbsvi8ncb951cfijp"; depends=[meteoland Rcpp sp spdep]; }; - medflex = derive2 { name="medflex"; version="0.6-1"; sha256="0i3808qh4ryqcgx5rl60d4xdy25wzx008abijg5fcirsrdly7j91"; depends=[boot car Matrix multcomp sandwich]; }; + medflex = derive2 { name="medflex"; version="0.6-4"; sha256="0nd9izvmmpdw87y5f0hrz2fml51x53zvvn0irdc1ass3cj1b7bxc"; depends=[boot car Matrix multcomp sandwich]; }; mediation = derive2 { name="mediation"; version="4.4.6"; sha256="0prhpy9y26s388p9gv5sv4h5airixwy6ffjphhxmyp9h07088xxi"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; }; medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; }; medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; }; + medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; }; mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; }; mefa4 = derive2 { name="mefa4"; version="0.3-4"; sha256="11zg30i2fkxdv8fn7jilbmm7k5g0ls8f91bpq6qiwiagwg8gj2lh"; depends=[Matrix pbapply]; }; meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; }; - meltt = derive2 { name="meltt"; version="0.3.1"; sha256="0aypq23pdkb0q72g81ffylc0skm26p2wcy23byn86ydn09bbazk5"; depends=[ggmap ggplot2 plotGoogleMaps plyr reticulate scales sp]; }; + meltt = derive2 { name="meltt"; version="0.3.2"; sha256="0d66mxjn1a3a4m8pg45py9a2ylmaab1yly11pfa669cjkih76lz8"; depends=[ggmap ggplot2 plotGoogleMaps plyr reticulate scales sp]; }; melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; }; - mem = derive2 { name="mem"; version="2.9"; sha256="0syfhvxqxc2gcrmcpfgb3qafdih1dxkkg73gwg6cv8ly4406qhk5"; depends=[boot mixtools RColorBrewer reshape2 sm stringr]; }; - memapp = derive2 { name="memapp"; version="2.3"; sha256="0zsmrxnshyxzi18krrl6652wdwvgbaxwl8sxvjixf2j3chz6m6qd"; depends=[DT formattable ggplot2 ggthemes mem openxlsx plotly RColorBrewer readxl reshape2 RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr]; }; + mem = derive2 { name="mem"; version="2.10"; sha256="1g122njbl50cdwga52zaf5iv3ds71yxzzyysffqsz4lg4khpr862"; depends=[boot mixtools RColorBrewer reshape2 sm stringr]; }; + memapp = derive2 { name="memapp"; version="2.5"; sha256="0lslxhxdfmb24142bs2xxcv1scgfgywz4275cszcvr86l20c0hh0"; depends=[DT formattable ggplot2 ggthemes mem openxlsx plotly RColorBrewer readxl reshape2 RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr]; }; memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; }; - memisc = derive2 { name="memisc"; version="0.99.13.2"; sha256="0jq55j3a5qfwcrakyhrhifyq0q484ws34zk9dpkrkbnjzyqfg4ap"; depends=[lattice MASS repr]; }; + memisc = derive2 { name="memisc"; version="0.99.14.2"; sha256="1z2qqr24dz0prxbyfgwcg8nsj9svvgm7wymclb0yy4qppsz0cmw6"; depends=[lattice MASS repr]; }; memo = derive2 { name="memo"; version="1.0"; sha256="1pqlsn79gpm0d5bxnjg1c1gjaqdrdvcjvr84zpfk6nmsb2862w48"; depends=[digest]; }; memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; }; memuse = derive2 { name="memuse"; version="3.0-1"; sha256="1fxjw209sjk9cfbbfw1ixnf2s8zzc73gnksxa9qax4mp6145i1w5"; depends=[]; }; @@ -7505,7 +7665,7 @@ in with self; { merTools = derive2 { name="merTools"; version="0.3.0"; sha256="1kc32zm1wmmivf1qfs6vi7y8kwibj6sr540is82dyh7xdmbc5mx3"; depends=[abind arm blme broom dplyr DT ggplot2 lme4 mvtnorm shiny]; }; merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; }; meshsimp = derive2 { name="meshsimp"; version="0.1.1"; sha256="0cdgq4vfjf0h6l55v687k5xs0nwmlpqmw424xgnsfnwxw5ljcvb1"; depends=[plot3D Rcpp RcppEigen]; }; - metRology = derive2 { name="metRology"; version="0.9-23-2"; sha256="16hdcrqa15mf2cfgl6r9awd0y2kwrdbld8sxqmwnchlvdbm6gib4"; depends=[MASS numDeriv robustbase]; }; + metRology = derive2 { name="metRology"; version="0.9-26-2"; sha256="1i9lxgphn8nmkcp2zgjs6ylbccmfgv9lfch00xmx1xfb538jz82q"; depends=[MASS numDeriv robustbase]; }; metScanR = derive2 { name="metScanR"; version="1.0.0"; sha256="0fy4r1bwi792f5z7d2c49yzx9flc6fhfmjxn0d0m4cci634nf1cb"; depends=[geosphere ggmap leaflet plotly plyr RColorBrewer RCurl rjson sp]; }; meta = derive2 { name="meta"; version="4.8-4"; sha256="0s2f1n404gfjf4k1h7x3jcys56x83y35zir7gyc32ydn88zfn57z"; depends=[]; }; meta4diag = derive2 { name="meta4diag"; version="2.0.5"; sha256="0hwzwyzr23sqlqpx2372419167wad1q7spyzmcxhf4f5hmqv14c9"; depends=[caTools shiny shinyBS sp]; }; @@ -7517,15 +7677,16 @@ in with self; { metaSEM = derive2 { name="metaSEM"; version="0.9.14"; sha256="0hzx2wp81hf3dkkq3vq8dpi8cxhkas6xv3zj822zchc1nwk4dn8g"; depends=[ellipse MASS Matrix mvtnorm OpenMx]; }; metabolomics = derive2 { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; }; metacoder = derive2 { name="metacoder"; version="0.1.3"; sha256="1kbxv4gvpq33vg0ri9mqkaqxlqhnccycha30dv48n4m4f3s7h8ad"; depends=[ape dplyr ggplot2 igraph lazyeval magrittr RColorBrewer RCurl readr reshape reshape2 scales seqinr stringr taxize traits zoo]; }; - metacom = derive2 { name="metacom"; version="1.4.7"; sha256="1xy86jc23h6l8lrcrs6ajbwqka20s6nyzyjyfzqj94k3idzcwqlk"; depends=[vegan]; }; + metacom = derive2 { name="metacom"; version="1.4.9"; sha256="1l3agymxz3qlrk0kzwlkqhalyw5ylsl6l0an8xcljgclymrb27j0"; depends=[vegan]; }; metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; }; metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; }; metafor = derive2 { name="metafor"; version="2.0-0"; sha256="0h14wd7hr1d40p5r70f2jgdgj24jwpnr4nrj6yp5qjr466v81z96"; depends=[Matrix nlme]; }; + metaforest = derive2 { name="metaforest"; version="0.1.0"; sha256="1jmd3rr3w9mdxgc1kqz7pc64pa8vrl4qf92h64791x1p8s71cpzk"; depends=[edarf ggplot2 metafor ranger reshape2]; }; metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; }; metagear = derive2 { name="metagear"; version="0.4"; sha256="0ww1j34600y99wyanj9ffg1019xqshb9c32wiqnsblyw8pq4va5f"; depends=[EBImage gWidgets gWidgetsRGtk2 hexView MASS Matrix metafor RCurl stringr]; }; metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; }; metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; }; - metamisc = derive2 { name="metamisc"; version="0.1.5"; sha256="1rq5bqdij71gf06i20mj6491pv6xjwyjj4m2qhzg41g4dn0bfsac"; depends=[ellipse lme4 metafor mvtnorm]; }; + metamisc = derive2 { name="metamisc"; version="0.1.6"; sha256="1y5hg8lp3n63q9p9xv0304i9g912xsy815lx50jcr9fx4w35i3dx"; depends=[ellipse lme4 metafor mvtnorm]; }; metansue = derive2 { name="metansue"; version="2.0"; sha256="102cddahlzm0b76y6pr7jxqxf28j6y3hsjd17fpnyvrwnzhqbz5m"; depends=[]; }; metap = derive2 { name="metap"; version="0.8"; sha256="06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"; depends=[lattice]; }; metaplot = derive2 { name="metaplot"; version="0.1.6"; sha256="0fkgsi6jbpp3fchl9dc4bn9ccjhvcn0s7ij7lvpwkvbxvfjwjsml"; depends=[dplyr encode fold lattice lazyeval magrittr rlang]; }; @@ -7539,7 +7700,7 @@ in with self; { meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; meteoForecast = derive2 { name="meteoForecast"; version="0.51"; sha256="1k5m561b6hpqvzrg5l16523ig1rxcsi4s172jmya039cwyk8mqfp"; depends=[ncdf4 raster sp XML zoo]; }; meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; - meteoland = derive2 { name="meteoland"; version="0.5.9"; sha256="1kjnwl1mhp5zwfgfngc48388xdppv96b9clnk7r9l714nk58mq10"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; }; + meteoland = derive2 { name="meteoland"; version="0.6.4"; sha256="1bdwcrc55jlsljc8r16ccnfi2gfzglzjfghjyk4b9kdsqkm2xa85"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; }; metricTester = derive2 { name="metricTester"; version="1.3.3"; sha256="0sggd32ivzvi0xn0gn0hx0kp1zp1qzpzy1n6slqa3vda4f67l4yp"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; }; metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; }; mets = derive2 { name="mets"; version="1.2.2"; sha256="1rdljq4069n7i05sqi75bcp1zpq69m13vf1nrjfg568cpwmr4m37"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; }; @@ -7550,7 +7711,7 @@ in with self; { mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; }; mfx = derive2 { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; }; mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; }; - mgcv = derive2 { name="mgcv"; version="1.8-18"; sha256="011mgcypr56xvm9nizsfsb2285kzql93x0d3lzg849g39vbpp4s2"; depends=[Matrix nlme]; }; + mgcv = derive2 { name="mgcv"; version="1.8-22"; sha256="1546p6aflg3z6xl2mns1n2c3j8q2spr9cjggj9rn33vrrhsv4fss"; depends=[Matrix nlme]; }; mglR = derive2 { name="mglR"; version="0.1.0"; sha256="1b7nd913d4a1szgw2qnhlnjqhfxr95xag6jwjcb2wnnxd12lib7n"; depends=[biomaRt dplyr gdata ggplot2 gplots magrittr stringr]; }; mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; }; mgm = derive2 { name="mgm"; version="1.2-1"; sha256="131zw61d2g39pzgy7ap95ah6mgbbybcpci665cxshascmlki3rpr"; depends=[glmnet Hmisc matrixcalc stringr]; }; @@ -7572,7 +7733,7 @@ in with self; { micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; }; micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; }; mice = derive2 { name="mice"; version="2.30"; sha256="1r673x51vs3w7kz4bkp2rih4445hcmajw86gjwz7m2piajwvs817"; depends=[lattice MASS nnet Rcpp rpart survival]; }; - miceadds = derive2 { name="miceadds"; version="2.6-21"; sha256="05jv6w4r40k9z81i0jzyz3mmcxf2m142dwcmgxams0nb76n446wn"; depends=[CDM lme4 mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; }; + miceadds = derive2 { name="miceadds"; version="2.7-19"; sha256="1znshkz1rc934rkl08axiszl24ziibs7namqacfcdh1jz2jrggxv"; depends=[CDM lme4 mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; }; micemd = derive2 { name="micemd"; version="1.1.0"; sha256="0y452xsrxdcb3kahya1f969lrf9lq9cv7zxsdf329x3q563lrcsm"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; micompr = derive2 { name="micompr"; version="1.0.2"; sha256="1hmxi5wz7vfnvawh50zk316gr3ry59m820ddj2v9p7cxq21hwv9i"; depends=[]; }; microPop = derive2 { name="microPop"; version="1.3"; sha256="072qldi020m84j9crfvzvw2nzn5fagqmjjzb7g7i70zwqhl1kjsa"; depends=[deSolve]; }; @@ -7580,6 +7741,7 @@ in with self; { microbenchmark = derive2 { name="microbenchmark"; version="1.4-2.1"; sha256="0qn5r1a6qidghcisc2hpbdmj62pnixc3zz6p4ipk8mvakf0hdsvg"; depends=[ggplot2]; }; microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; }; microcontax = derive2 { name="microcontax"; version="1.0"; sha256="0l5mfgda5xagjbh9bwv328k3m7kgggdm90rc8fr1ic59hvg56f3g"; depends=[microseq]; }; + microdemic = derive2 { name="microdemic"; version="0.1.0"; sha256="0sywdgxldmlin3bdns8549xlngn6qm6rql2avb2m5z7w4q7ql4d5"; depends=[crul data_table jsonlite tibble]; }; micromap = derive2 { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; }; micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; }; micropan = derive2 { name="micropan"; version="1.1.2"; sha256="0rvaampr5vlpz253lhy330380646g2vqj1hqp6gsk0gp0hdlkd7g"; depends=[igraph microseq]; }; @@ -7625,6 +7787,7 @@ in with self; { missDeaths = derive2 { name="missDeaths"; version="2.5"; sha256="0pslssgf580zd0dd7m0l97bzgxnywj2qac0agxv6ih1a0xlxz874"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; }; missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; }; missMDA = derive2 { name="missMDA"; version="1.11"; sha256="185ia5zg5gdrkjpj5sql46lz5svw77wjy9zplpqhrmgx43fv0w0i"; depends=[FactoMineR mice mvtnorm]; }; + missRanger = derive2 { name="missRanger"; version="1.0.0"; sha256="0advj6a57pj79xn43gxp7ll4b3y7hl5cvz5d7hw69f4yk4blwkjr"; depends=[FNN ranger]; }; mistat = derive2 { name="mistat"; version="1.0-4"; sha256="0gzng0kl3handy3k7g62c4sdcf9l6x0b69jxmfrwfd4297f57n9n"; depends=[]; }; mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; }; mitml = derive2 { name="mitml"; version="0.3-5"; sha256="1s888r9y2ri39b48h1iypps6lddqkqv3g31l2sjmi2pvyccfpkwb"; depends=[haven jomo pan]; }; @@ -7657,11 +7820,11 @@ in with self; { mize = derive2 { name="mize"; version="0.1.1"; sha256="18mnpwwbwlyx0ixsjqai28ahp4g0wncv8c5qwy17xq2zbhwlq3jh"; depends=[]; }; mizer = derive2 { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; }; mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; }; - mkin = derive2 { name="mkin"; version="0.9.46"; sha256="0b4sw7xw8qvdab0a3qh8j7khaa5vinhxrgmnnwnxkmiqv33b08i7"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; }; + mkin = derive2 { name="mkin"; version="0.9.46.1"; sha256="094kdhawkdl30rw9r0djqk6hzw3vbg1b3yl0mhbqawlfnjca97ca"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; }; mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; mlDNA = derive2 { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; }; mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; - mlVAR = derive2 { name="mlVAR"; version="0.3.3"; sha256="1psw3kcfq23c4i1qq4vfgjwd1lgjhhhly6bwz37ky5l753lvl9yf"; depends=[abind arm clusterGeneration corpcor dplyr lme4 mvtnorm plyr qgraph]; }; + mlVAR = derive2 { name="mlVAR"; version="0.4"; sha256="08iaq6wq0ngd60nhmlj8c0x8r1fal1zfv2zpd6ll54szcvdbxahr"; depends=[abind arm clusterGeneration corpcor dplyr lme4 MplusAutomation mvtnorm plyr qgraph]; }; mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; }; mldr = derive2 { name="mldr"; version="0.3.22"; sha256="0q5dpqx6zapawjjq8rqk112w5qsk7r6sc90y63yvllk9yhdgygyw"; depends=[circlize shiny XML]; }; mldr_datasets = derive2 { name="mldr.datasets"; version="0.3.15"; sha256="1xivwmv6hvl026c5ymc23fr36sk797dxn2wa9lp20dgh5s0cq10n"; depends=[]; }; @@ -7683,11 +7846,11 @@ in with self; { mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; }; mlt = derive2 { name="mlt"; version="0.2-0"; sha256="09pvqyyzlb76x47v2lbgsdrld0z0r1v3c29q3a0dsx62ia367mqr"; depends=[alabama basefun BB numDeriv quadprog sandwich survival variables]; }; mlt_docreg = derive2 { name="mlt.docreg"; version="0.2-0"; sha256="1n23bjfjacyq7b9n47ai9is8p0ka6m36085c0q1i47zpz5kv6d5k"; depends=[mlt numDeriv]; }; - mltools = derive2 { name="mltools"; version="0.3.1"; sha256="0a439cgkpvm5b00s4jss21x5cqlik8ncwd4vfa1qwzrr73kzvksp"; depends=[data_table Matrix]; }; + mltools = derive2 { name="mltools"; version="0.3.3"; sha256="0r2i46hkzckgl3ly7sdzkzi94bwzkni2rqyrz647r5rhjqhfgkhj"; depends=[data_table Matrix]; }; mlxR = derive2 { name="mlxR"; version="3.2.0"; sha256="1a0104h4b0qag20xv5sg8m4b0ndvz843lnc4jypfxns3bi5k4v1m"; depends=[ggplot2 Rcpp XML]; }; - mma = derive2 { name="mma"; version="5.0-0"; sha256="1k65ar8nhv7ya254ap94hbx91siqcwxlg3yac85xxxs9rr6b27bf"; depends=[car doParallel foreach gbm gplots survival]; }; - mmand = derive2 { name="mmand"; version="1.5.2"; sha256="11fvicwkiw5r6yg7psqarfkb0cfsjj87lz0d4mr1hrncfrz0yz55"; depends=[Rcpp]; }; - mmap = derive2 { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; }; + mma = derive2 { name="mma"; version="5.0-1"; sha256="02y8fahaz3lxix9cg9sxpyap441k1az9bf1zadqzx8mvw510ixvs"; depends=[car doParallel foreach gbm gplots survival]; }; + mmand = derive2 { name="mmand"; version="1.5.3"; sha256="1n0h7nia9jjc11g8417nfd3wsg4m3bmblm9bsjd0b52vqxhpxmzh"; depends=[Rcpp]; }; + mmap = derive2 { name="mmap"; version="0.6-15"; sha256="0p3dsq0vffb0x0i8xh8p1r0b2hwk4zfi6nbwsi3cyaj1m7dzm0fh"; depends=[]; }; mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; }; mmcm = derive2 { name="mmcm"; version="1.2-6"; sha256="0lk2lk8j4hq6shw3vpq53gvh2w1gwkayvgfny4i04k5fglbwivg7"; depends=[mvtnorm]; }; mmds = derive2 { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; }; @@ -7706,7 +7869,7 @@ in with self; { mnlogit = derive2 { name="mnlogit"; version="1.2.5"; sha256="0vwragk71hisz7dy4h5i6zl9yp6wvzwlnfyw2kprnd94y02laq63"; depends=[Formula lmtest mlogit]; }; mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; }; - mnreadR = derive2 { name="mnreadR"; version="0.1.0"; sha256="0sw4hinfcxnj906zfv6yhwf6c9khlfqp1biga32agvvkgnk5b1ni"; depends=[dplyr]; }; + mnreadR = derive2 { name="mnreadR"; version="1.1.0"; sha256="15zlksrqkp8kqfaqvmg83cxyyvmxnxs0ybl79ksc5j7h28j3nh8j"; depends=[dplyr ggplot2]; }; mockery = derive2 { name="mockery"; version="0.3.0"; sha256="1ydgxqdzwn68b84a7557nasgm1r5jk2mivzwq9x71p7zwqf4c8vd"; depends=[testthat]; }; mockr = derive2 { name="mockr"; version="0.1"; sha256="0340v6189ivlzzriwk7yhf3v2k651x05fd1xrqfxxjgwhysaqj6z"; depends=[lazyeval]; }; mod09nrt = derive2 { name="mod09nrt"; version="0.14"; sha256="1wn1y33bj9r712l0f063j5gcl423anjzmvgfy0ddihcrbpz4l7a0"; depends=[]; }; @@ -7720,6 +7883,7 @@ in with self; { modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; modelr = derive2 { name="modelr"; version="0.1.1"; sha256="1rqw0b583vp107zqp4h3wj51dvv4hb3wszfr1f5f48xassc53f95"; depends=[broom dplyr lazyeval magrittr purrr tibble tidyr]; }; modeltools = derive2 { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; }; + modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; }; modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; }; modest = derive2 { name="modest"; version="0.1"; sha256="0nwa71pk015pqamiyrbcq0pxdq43mvcq8zpvfn2xmzcjhm30770b"; depends=[knitr shiny shinyBS]; }; modeval = derive2 { name="modeval"; version="0.1.3"; sha256="10yjba2dlwrgd3ycw10y1sa3xdxf2spq829bbxwfissc5l9gk48x"; depends=[caret dplyr e1071 ggplot2 gridExtra knitr magrittr mlbench ModelMetrics psych purrr stringr tibble]; }; @@ -7732,11 +7896,11 @@ in with self; { mogavs = derive2 { name="mogavs"; version="1.0.1"; sha256="1bzjrcisbg0fb8kj8x9ngd9i1nrhif1rdacz6nrny6xrmw0m3ckp"; depends=[cvTools]; }; mokken = derive2 { name="mokken"; version="2.8.7"; sha256="04crg01wshvb88s4kw1sfdyywm7zzprc7mi2nxymrllppz2msd4w"; depends=[poLCA]; }; moko = derive2 { name="moko"; version="1.0.1"; sha256="1d1gyv44z8k196hfh8a9iccmlrwb42bj1xzabs07h306gpi9m73d"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; }; - molaR = derive2 { name="molaR"; version="4.2"; sha256="1xz4vfb9rkw731cxjqvh7hpcm2lly9hmxp951il536gwb665jh1j"; depends=[alphahull rgl Rvcg]; }; + molaR = derive2 { name="molaR"; version="4.3"; sha256="1bzk7k6d1zbi0fhf9xwdg5mv7dcgajjbb6wxafx4nc2fjxhlldzi"; depends=[alphahull rgl Rvcg]; }; mombf = derive2 { name="mombf"; version="1.9.5"; sha256="1s776bvfkivif7i3338l1pk8qi5b6b7sxb9zgcidw4kwmj388rdd"; depends=[actuar mgcv mvtnorm ncvreg survival]; }; momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; }; moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; }; - momentuHMM = derive2 { name="momentuHMM"; version="1.1.0"; sha256="1iwx6hbrfvpfgyhsfq8hibmvc0v3s209pdmvskgp4w9lhfljfxvb"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel foreach geosphere ggmap ggplot2 gstat MASS mitools moveHMM mvtnorm nleqslv numDeriv qdapRegex raster Rcpp RcppArmadillo sp splines2 survival]; }; + momentuHMM = derive2 { name="momentuHMM"; version="1.1.1"; sha256="10n9w861dknh4ifqp4ry0wzl26nrz18yz5kasl4l9xx3i31qmlnb"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel foreach geosphere ggmap ggplot2 gstat LaplacesDemon MASS mitools moveHMM mvtnorm nleqslv numDeriv qdapRegex raster Rcpp RcppArmadillo sp splines2 survival]; }; momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; }; mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; mongolite = derive2 { name="mongolite"; version="1.2"; sha256="19zhscsgqvzx5gqryzl82dw6impc6sacx2shanmnj4zfgs7bgwqr"; depends=[jsonlite openssl]; }; @@ -7754,10 +7918,11 @@ in with self; { mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; }; morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; }; morse = derive2 { name="morse"; version="2.2.0"; sha256="0l52hwhbspf1d6wi0qnwgwjjc1kkixkfdsf81jvwshnxbci4s3kw"; depends=[coda dplyr epitools ggplot2 gridExtra reshape2 rjags stringr]; }; - mosaic = derive2 { name="mosaic"; version="1.0.0"; sha256="0ih7m5x0h32z36k0fpi1s6gj06zajbbg09hl9ff6c32p6mw171vz"; depends=[dplyr ggdendro ggformula ggplot2 glue gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicCore mosaicData readr tidyr]; }; + mosaic = derive2 { name="mosaic"; version="1.1.0"; sha256="18d8qxrxldyjb2aanbih5qh91wi5gcf989j6vcnnikgvxyxizz1s"; depends=[dplyr ggdendro ggformula ggplot2 glue gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicCore mosaicData readr tidyr]; }; mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.0"; sha256="05s14rmgi15xcz50hcz7l26l95yx9g4i3kihzh0laz8bpi443i39"; depends=[MASS mosaic mosaicCore]; }; - mosaicCore = derive2 { name="mosaicCore"; version="0.2.0"; sha256="16qgdjkig8srazn8rbrhmv6z9rhvyb0m2lv9n11x662xhpbbq6nw"; depends=[dplyr lazyeval rlang tidyr]; }; + mosaicCore = derive2 { name="mosaicCore"; version="0.4.0"; sha256="0624lnflwhraqrp3h3s5ryi3skn74gr0b10fq77qmp5h4is3cbc0"; depends=[dplyr lazyeval rlang tidyr]; }; mosaicData = derive2 { name="mosaicData"; version="0.14.0"; sha256="0f092wp2lpj8rk6r2bd5mxp4q3n7ia9h838z8prrz56vwh3gbpw0"; depends=[]; }; + mosaicModel = derive2 { name="mosaicModel"; version="0.3.0"; sha256="1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w"; depends=[caret dplyr ggformula ggplot2 knitr lazyeval MASS mosaicCore testthat tibble tidyr tidyverse]; }; moult = derive2 { name="moult"; version="2.0.0"; sha256="177fhi3f5qsg2k4qb1cgviq96aln80qwri1hf9yym6wrzn8crj7r"; depends=[Formula Matrix]; }; mountainplot = derive2 { name="mountainplot"; version="1.2"; sha256="1bbgkps1yhfa0lmapqkhhl5mc63p0gzszxw2g910dbi1cjc0pphx"; depends=[lattice]; }; mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; @@ -7790,17 +7955,18 @@ in with self; { mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; mregions = derive2 { name="mregions"; version="0.1.4"; sha256="1xlgbjm339wr2rs5i6ddyp1lmfgzjb53gw44c3cj1x5qx1jrp7b1"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; }; mrfDepth = derive2 { name="mrfDepth"; version="1.0.4"; sha256="0dfx85yd4swd2cwm7pmxa3q7sgqkrj1sr145i13cdcp76wh95hp1"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; - mrgsolve = derive2 { name="mrgsolve"; version="0.8.6"; sha256="0iv093j9jfpq82qs57kp7clxvsa23iipww2gd9vlqmv8pl9zc0cn"; depends=[BH dplyr lazyeval magrittr Rcpp RcppArmadillo tibble]; }; + mrgsolve = derive2 { name="mrgsolve"; version="0.8.9"; sha256="1k6rzmhkgp2gc2m5d2zz1b0cn1czmgsl1h3gw61gmz8gkw55835y"; depends=[BH dplyr lazyeval magrittr Rcpp RcppArmadillo tibble]; }; mri = derive2 { name="mri"; version="0.1.1"; sha256="07lqr9fv0nqd626jpqa6x1qxf85r1j4r5brv760dll1p2kl060gw"; depends=[]; }; mritc = derive2 { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; }; mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; }; ms_sev = derive2 { name="ms.sev"; version="1.0.4"; sha256="1sr2rgiskgwjhwif70qj6ga8i8kg4bh342hff66b2a54rxrchmw5"; depends=[]; }; - msBP = derive2 { name="msBP"; version="1.3"; sha256="180gx1cml6wl5sp359cqfi8qj1l3jgakzrwxcpacxqqmijgnx1jf"; depends=[DPpackage]; }; + msBP = derive2 { name="msBP"; version="1.3-1"; sha256="0ziqzkylawc6kpcfzqwrwn6vp0562rd2yx5a4zg8p1n0y2gdpdzc"; depends=[]; }; msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; }; msaFACE = derive2 { name="msaFACE"; version="0.1.0"; sha256="1lh8crz507nlddm946lmn73xbnsh4cs0kg238ysnsvxs726c83fs"; depends=[]; }; msaR = derive2 { name="msaR"; version="0.2.0"; sha256="1yj70wxpqbjiwfskb68nx2criz3v426b1wnc9bnsl9cr417zhn9s"; depends=[ape htmlwidgets]; }; - msaenet = derive2 { name="msaenet"; version="2.6"; sha256="16h08jfghlzpbivglawm0qj4kgqnghx08p7dsqzwkxgywv6x6a2b"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; + msaenet = derive2 { name="msaenet"; version="2.7"; sha256="15jxdyc2s0dzjm6665win9y96ijyiv3ggin54z4rrh7qgv6vs7xa"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; + mschart = derive2 { name="mschart"; version="0.2.1"; sha256="0pbzs05gx0qxyggaqld3ysi3aqdqrggj6d3zbzcj3m93q6xpabv8"; depends=[cellranger data_table officer purrr R6 writexl xml2]; }; mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; }; mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; }; msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; }; @@ -7833,9 +7999,9 @@ in with self; { mudfold = derive2 { name="mudfold"; version="1.0"; sha256="1zh9qh2ja91lk2z4lpkqinn63v577qivbl0qh3xixfr63primby7"; depends=[ggplot2 gtools reshape2 zoo]; }; muhaz = derive2 { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; }; muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; }; - multcomp = derive2 { name="multcomp"; version="1.4-6"; sha256="18pd5v288g4d3kyp1wg0fv6ypyhqq9y17fdxkj0ljsj1f7kgp7py"; depends=[codetools mvtnorm sandwich survival TH_data]; }; + multcomp = derive2 { name="multcomp"; version="1.4-7"; sha256="0njhm9b0znnp1pj7sfg8mnqvc6pkc7vrb82wzwpsywp1f5nbdgx3"; depends=[codetools mvtnorm sandwich survival TH_data]; }; multcompView = derive2 { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; }; - multdyn = derive2 { name="multdyn"; version="1.5.1"; sha256="1rqvfgz3lcjb1lgzp2w6wzqdysj4c1qrw77nrdc14pgm59g2vvvl"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; + multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; multfisher = derive2 { name="multfisher"; version="1.0"; sha256="1pc3f6f87n29cb4caszp4arpy33pc3a0iwmrqinhyw66xjnqm8qp"; depends=[]; }; multgee = derive2 { name="multgee"; version="1.6.0"; sha256="17qrfvxxapqzjy2ps7kk9k9hkmb9zdxflwclyagp1amgv50la49f"; depends=[gnm VGAM]; }; multiApply = derive2 { name="multiApply"; version="0.0.1"; sha256="1hgvvi00297rri9k5mnz7kmzpf1yxjmj153wwx4a68wv2mf9sx44"; depends=[abind doParallel foreach future plyr]; }; @@ -7851,13 +8017,14 @@ in with self; { multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; }; multigraph = derive2 { name="multigraph"; version="0.71"; sha256="1h162vhx439fmkq0pi95d3lsrcjf06kii91hamj66dpjg9wma8q7"; depends=[multiplex]; }; multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; }; + multilaterals = derive2 { name="multilaterals"; version="1.0"; sha256="11zfdhn6qzqz0n31g23bn40wnfzkjndb753iiqvihirphzb74v5v"; depends=[ape igraph]; }; multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; }; multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.4"; sha256="0v4mhdpagmkjsc8x4wlqxa88yl3v0y91a1bbq1lh3rhqfmp9yra5"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; }; multimark = derive2 { name="multimark"; version="2.0.1"; sha256="0d283gvzqmdwr1sxgfb5ir9zw0sahj1wph7izcy1h63h6qlci828"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; }; multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; - multinet = derive2 { name="multinet"; version="1.1"; sha256="0jhq6lhc81fl0m5zy7131xrdzvy4iqgixdbzc4klnzijzjsm22yi"; depends=[igraph Rcpp]; }; + multinet = derive2 { name="multinet"; version="1.1.1"; sha256="13f7gqf45ydnyiv36gwcrc8mgv5gy61fak0in7f8bss4bvfldbxx"; depends=[igraph Rcpp]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; - multipanelfigure = derive2 { name="multipanelfigure"; version="0.9.0"; sha256="1vblwn15817xxixbcy2smsp51cjyfvh34c1v9ddxypj9ycx09zd3"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; }; + multipanelfigure = derive2 { name="multipanelfigure"; version="0.10.5"; sha256="0am4vi8mwbrvg6lmh53xp70mwi0klkpd11bd262kcfz125hbjy7n"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; }; multipleNCC = derive2 { name="multipleNCC"; version="1.2-1"; sha256="080wpyifpw41p6jip2ia7439jdhzyb7lbhs2qzzg0hn6c0qq7mrr"; depends=[mgcv survival]; }; multiplex = derive2 { name="multiplex"; version="2.7"; sha256="1da28sb2rsnhs3bisgc4npjky3v1rssqh4jb0l51p50p665b5sjz"; depends=[]; }; multiplyr = derive2 { name="multiplyr"; version="0.1.1"; sha256="0bsf2zhzqwl3skg26fm27j2wpifky0mph26acrlq8p72njkbcw4d"; depends=[bigmemory bigmemory_sri magrittr]; }; @@ -7884,9 +8051,9 @@ in with self; { mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; }; mutoss = derive2 { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[multcomp multtest mvtnorm plotrix]; }; mutossGUI = derive2 { name="mutossGUI"; version="0.1-10"; sha256="16fgmpnym9nhiywqimjgv10swrvs3whp0nlzsw573vv0k6qjmwd2"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; }; - mvLSW = derive2 { name="mvLSW"; version="1.2"; sha256="0xa79asrb57c5jssyb51b95v5szv1006gh08bfwnlyjbbfngs4wd"; depends=[fields wavethresh xts zoo]; }; + mvLSW = derive2 { name="mvLSW"; version="1.2.1"; sha256="012p828pyzz6xnv2akax5hx79v522dg4a2gqrjss526qylpg5j9l"; depends=[fields wavethresh xts zoo]; }; mvMORPH = derive2 { name="mvMORPH"; version="1.0.9"; sha256="09368vgyb1s18awfr07hs1s40n2h15hy08fmir3ayhdfrdain4k6"; depends=[ape corpcor phytools spam subplex]; }; - mvPot = derive2 { name="mvPot"; version="0.1.2"; sha256="0ni953ncm8h4ap0gjimlxjypgjaj2crlx4vscqi7a158hphahj2g"; depends=[evd gmp MASS numbers]; }; + mvPot = derive2 { name="mvPot"; version="0.1.3"; sha256="16m9i33sbgx69426i1nkimkrp75a6jbmkzlsp9bjbm7iyxdcl48b"; depends=[evd gmp MASS numbers]; }; mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; }; mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.3.3"; sha256="18gnxs1cx4f7r3m2vgrkmm41vwkamk9mn5hcgjacv2adl0ihnagd"; depends=[ape corpcor mvtnorm numDeriv ouch]; }; @@ -7900,15 +8067,16 @@ in with self; { mvdalab = derive2 { name="mvdalab"; version="1.2"; sha256="0jgvpspvfj4m79rn8bfb7rihh6w948b7z66qisckdmv6wyxwwr4i"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; }; mvglmmRank = derive2 { name="mvglmmRank"; version="1.1-2"; sha256="1051l10fbr7m9rmrlvj98660f0pn992n3vxiwnhml07wvvdknw3d"; depends=[Matrix numDeriv]; }; mvinfluence = derive2 { name="mvinfluence"; version="0.8"; sha256="08p5hxqa8qp8g52w2d3jqbjzrv607fdm80k6vwaz63fxhk8h82wq"; depends=[car heplots]; }; - mvmesh = derive2 { name="mvmesh"; version="1.4"; sha256="14yk09s1ym4p9nijxqasd3060hncmr1br7lv9rk9vm96bgi6l1rc"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; + mvmesh = derive2 { name="mvmesh"; version="1.5"; sha256="0my43559jh8ln1fx5rh5vw24vr6kxpd2h5scylfxfv2qfk794l0b"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; mvmeta = derive2 { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; }; mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; }; - mvna = derive2 { name="mvna"; version="2.0"; sha256="0qy4s8v20ccjdgqj3lgnl903b7m1rgc5lq8w66d5dl41s0jlnmx6"; depends=[lattice]; }; + mvna = derive2 { name="mvna"; version="2.0.1"; sha256="10i42hjm5bk62c20pmxhya283yzw1902ivkflmyqy79jri266dxf"; depends=[lattice]; }; mvnfast = derive2 { name="mvnfast"; version="0.2.2"; sha256="1b548cl6gf5vks90z7hf4nl5hbl5jb1r50vnpv1hsjv2qbn0k9hr"; depends=[BH Rcpp RcppArmadillo]; }; mvngGrAd = derive2 { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; }; mvnmle = derive2 { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; }; mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; }; mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; }; + mvord = derive2 { name="mvord"; version="0.0.1"; sha256="0lx7gs9yi43am6rynqm8kiddi8jyn6q06vn886w5y2wm1hqxpw59"; depends=[MASS optimx pbivnorm]; }; mvoutlier = derive2 { name="mvoutlier"; version="2.0.8"; sha256="07a2pv8bw5k0faiy0skdchg7c0n236saq5d8plqq7234n3rjl8pg"; depends=[robCompositions robustbase sgeostat]; }; mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; }; @@ -7971,7 +8139,7 @@ in with self; { nearfar = derive2 { name="nearfar"; version="1.1"; sha256="0i2nc1b4vslgjj29x5q24yxv9l3i0g5hcrbm9xy1b3039n70cwix"; depends=[car GenSA MASS nbpMatching]; }; neariso = derive2 { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; }; neat = derive2 { name="neat"; version="1.1.1"; sha256="12q9g8b0cf9j9cp0xc4h4bs4jv251arq9pf7c2hqgvirgr10ni2g"; depends=[igraph]; }; - neatmaps = derive2 { name="neatmaps"; version="1.0.2"; sha256="01kxn6r77grxvb40k4w548dpal74j3sdr33622aqrjvg7r8w1w3k"; depends=[dendextend flexdashboard ggplot2 heatmaply igraph knitr plotly pvclust]; }; + neatmaps = derive2 { name="neatmaps"; version="1.0.5"; sha256="13v23xsvc5jd3pv5z931h4gdwwf5d2qfix8pqgnj726d94cjgiig"; depends=[dendextend ggplot2 heatmaply igraph pvclust]; }; needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; }; needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; negenes = derive2 { name="negenes"; version="1.0-5"; sha256="0fdhc0v0b820wfg3sypvya7zhg7mhfmdbfiwn1lj3a2xg01zvc2n"; depends=[]; }; @@ -8016,7 +8184,7 @@ in with self; { nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; - nima = derive2 { name="nima"; version="0.3.0"; sha256="10g0a8qa64sk16xrya3qhrlrjbjyq7ndv208xz36knp5az2n27ak"; depends=[assertthat ggplot2 gridExtra plyr survival]; }; + nima = derive2 { name="nima"; version="0.4.5"; sha256="1fllq76k4r07ymd58s865hgg3yrmwa34kr5mjd89n50mm1m110mh"; depends=[assertthat devtools ggplot2 ggthemes gridExtra gtools plyr ProjectTemplate scales survival]; }; nimble = derive2 { name="nimble"; version="0.6-6"; sha256="0y1gziq7aks5kzzpwn852w6d9b3gj6vky0m4hwd302ps4gw1i6k3"; depends=[coda igraph]; }; nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; }; nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; }; @@ -8040,7 +8208,7 @@ in with self; { nlstimedist = derive2 { name="nlstimedist"; version="1.1.1"; sha256="1222vj2w4f8xh7fkrzlyarr7980a6wj047p5p0nw3cfna3mmhi5b"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; }; nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; }; nlt = derive2 { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; }; - nlts = derive2 { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[acepack locfit]; }; + nlts = derive2 { name="nlts"; version="0.2-2"; sha256="0bx6xqa3j0k01p43vnv5lcv2pryjzgsak77y1cr9rm2xwqa3j6az"; depends=[acepack locfit]; }; nmaINLA = derive2 { name="nmaINLA"; version="0.1.1"; sha256="0976jafmdhy2rz5fcarb7hh1vaanm8l2610hk06f5k93xjhypg8j"; depends=[]; }; nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; }; nmw = derive2 { name="nmw"; version="0.1.1"; sha256="0dqcix916as40h54i78g4437k8zbdlwbdfzmjyp08i9xr0gc0a80"; depends=[]; }; @@ -8052,13 +8220,14 @@ in with self; { noaastormevents = derive2 { name="noaastormevents"; version="0.1.0"; sha256="1pkfmvp20f6xi2iy7l6c67zspp9f4wkrh7s308hlklms2difhp6m"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer stringr tidyr viridis XML]; }; nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; }; nodiv = derive2 { name="nodiv"; version="1.1.6"; sha256="1srcmv4mmmsmkk4nbbnmrkv4z19l80agvwlh2q1j7xdi26wpqc5r"; depends=[ape picante raster sp vegan]; }; - nofrills = derive2 { name="nofrills"; version="0.1.0"; sha256="1cxfzpqi1ydzmcpix3qs4hdy9fjvc9l0drplrk4fqhzyml9k9a98"; depends=[rlang]; }; + nofrills = derive2 { name="nofrills"; version="0.2.0"; sha256="07c7hwml49dzslbxlq8m6h6xfya5a2s0fg177mv436387qrdyf1n"; depends=[rlang]; }; noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; }; nomclust = derive2 { name="nomclust"; version="1.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; }; - nomogramEx = derive2 { name="nomogramEx"; version="2.0"; sha256="1as0hbmb37z9izz95x9rd98a0fs4b6zbhzjpgnyq5c1j4219vzs3"; depends=[pracma rms]; }; + nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; }; noncensus = derive2 { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; }; noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; }; + noncomplyR = derive2 { name="noncomplyR"; version="1.0"; sha256="1a9m6r9cizw42nmy24jdsrsbllg5z84fs8b239axnh1fxzskg2qy"; depends=[MCMCpack]; }; nonlinearICP = derive2 { name="nonlinearICP"; version="0.1.2.1"; sha256="1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np"; depends=[caTools CondIndTests data_tree randomForest]; }; nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; }; nonmem2R = derive2 { name="nonmem2R"; version="0.1.7"; sha256="1a3azvf9dbmi3l3crmkv1qvrd0j1d14x4s9hjk2r1cayiazpmbib"; depends=[lattice latticeExtra MASS mvtnorm xpose4]; }; @@ -8071,7 +8240,7 @@ in with self; { nontargetData = derive2 { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; }; nopaco = derive2 { name="nopaco"; version="1.0.3"; sha256="1sbjgzd7q2gjhs5qsy23w30cv73d9d6g08ymq18wppqpir5hikh2"; depends=[Matrix]; }; nopp = derive2 { name="nopp"; version="1.0.8"; sha256="0yjnzxlmadh2g0frfwm7rrr0kqb5pjvrnjmzl6pikzr99yh8aags"; depends=[MASS mlogit]; }; - nor1mix = derive2 { name="nor1mix"; version="1.2-2"; sha256="14djjhhivl49jnsmnydcswmc6bzfvgjjg7pibg32a9p3y2f0lmnq"; depends=[]; }; + nor1mix = derive2 { name="nor1mix"; version="1.2-3"; sha256="1bvk888qml9qr7q703s7qzgm0sqfchcjdjqwqllm5vrjx0cnapj3"; depends=[]; }; nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; }; norm = derive2 { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; }; norm2 = derive2 { name="norm2"; version="2.0.1"; sha256="09447dng9px1ynfp382vjmh5iqdnhc7kxg28cbmqx7ncj1z5a2bm"; depends=[]; }; @@ -8081,13 +8250,13 @@ in with self; { normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; }; nortest = derive2 { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; }; nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; }; - nos = derive2 { name="nos"; version="1.0.0"; sha256="0p60jfknmkpmh9a5590xcdra8473f0h063w3xj2sq8myv1hgd2q1"; depends=[dplyr gmp]; }; + nos = derive2 { name="nos"; version="1.1.0"; sha256="0hbncama8cx8q0rc56bil38fbj33z49v4d6zdkvxs6wgmmglnrfs"; depends=[dplyr gmp]; }; nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; }; not = derive2 { name="not"; version="1.0"; sha256="1hwrka8a5jygm3zjh5jhzjx2bvdqip7pb5009vkk7k0sp8m760kq"; depends=[]; }; notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; }; notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; }; novelist = derive2 { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; }; - nowcasting = derive2 { name="nowcasting"; version="0.0.82"; sha256="0czm3xk993r1fynjy8pi7381916kg5311as1xqhx0hizkl1b1p7j"; depends=[corpcor DBI httr matlab RCurl RMySQL seasonal stringr xts zoo]; }; + nowcasting = derive2 { name="nowcasting"; version="0.0.90"; sha256="0ggrsv92s4hpf960m1vbnnlkzp15v35vilabvzb665y53sj8wb6x"; depends=[corpcor httr lubridate matlab RCurl xts zoo]; }; noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; }; np = derive2 { name="np"; version="0.60-3"; sha256="12hzmhh59dfifssj08bjwxszxy38irami70bq14dxlm48fjyz17g"; depends=[boot cubature quantreg]; }; npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; }; @@ -8106,9 +8275,10 @@ in with self; { npmr = derive2 { name="npmr"; version="1.1"; sha256="1ss8ypvv6qcdxv7l3szivliwmhidmzi3572p3nz96ysndf56akl4"; depends=[]; }; npmv = derive2 { name="npmv"; version="2.4.0"; sha256="04lfks2rlax59gxdnbgkpmk2vaax718z6hkgsvmyxf52iby6rvlr"; depends=[Formula]; }; nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; }; + npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; }; npregfast = derive2 { name="npregfast"; version="1.4.0"; sha256="1p5hp8mld05p03lrgyqwdh5wg4qh7n2bqx9w5p7z4dvvh6h67nji"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; - nprobust = derive2 { name="nprobust"; version="0.0.1"; sha256="13fc84ahv2gid3b1iyyc151v10pafaxbbym3g891ivxglyw10zy1"; depends=[Rcpp RcppArmadillo]; }; - nproc = derive2 { name="nproc"; version="2.0.6"; sha256="07f5awjc7ds8xghvkvc0z6jna4n09syr63941n8g2q9099rvw9kc"; depends=[ada e1071 glmnet MASS randomForest ROCR tree]; }; + nprobust = derive2 { name="nprobust"; version="0.1.1"; sha256="0aynp42y0qn0jl9f26rk358hjdswkz6anwvni7frxnkb7l1vyrd5"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + nproc = derive2 { name="nproc"; version="2.0.9"; sha256="0n2jjizwdrdf9jq409lv7z0bxvy7dk7lki6xfp5fmsdcd2dmshly"; depends=[ada e1071 glmnet MASS randomForest ROCR tree]; }; npsf = derive2 { name="npsf"; version="0.2.0"; sha256="0cww1fi0amgc9n1hbfy3z7xgwrbcdwvsr2d6l8lpsr1bdcpgbjzv"; depends=[Formula]; }; npsm = derive2 { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[plyr Rfit]; }; npsp = derive2 { name="npsp"; version="0.5-3"; sha256="0ck6iymfc73bzrifdc2sagcliz1yakqk1yv67a3ykha996jsrx99"; depends=[quadprog]; }; @@ -8131,7 +8301,7 @@ in with self; { numKM = derive2 { name="numKM"; version="0.1.0"; sha256="0pnwb7skp5jx5ibgfkympq59m9sf71gvk5zc0fwik539vrzfykdf"; depends=[survival]; }; numOSL = derive2 { name="numOSL"; version="2.3"; sha256="1bcj1qk3nx1jqhldx9rcwphvlxspz3bj4vb891hkw2fa2i4559c5"; depends=[]; }; numbers = derive2 { name="numbers"; version="0.6-6"; sha256="05qmv12b90vkzf2b50qjnp8hja6rms91jj97knx70n2yhpb2lnd9"; depends=[]; }; - numform = derive2 { name="numform"; version="0.0.5"; sha256="1i0dj5gsqiiinngrxnl61c7rmwkq3ybd5irh3b6zh3b0dxgjpdn4"; depends=[]; }; + numform = derive2 { name="numform"; version="0.3.0"; sha256="1lxb4gqa5z3ncrh95i10cnv3kxnvc4lqs7yypdhqn5yidddvcydj"; depends=[]; }; nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; }; nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; nutshell_bbdb = derive2 { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; }; @@ -8154,9 +8324,8 @@ in with self; { obs_agree = derive2 { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; }; obsSens = derive2 { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; }; observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; }; - oc = derive2 { name="oc"; version="0.96"; sha256="110pf3rqcab0671djx25jwwl8rbaskcd2lrcv56d786j693y2ash"; depends=[pscl]; }; occ = derive2 { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; }; - oce = derive2 { name="oce"; version="0.9-21"; sha256="1nwnfs75mdq0s13jz5l9zv1rjx5637yljhrc56sghwq38gi1mpal"; depends=[gsw]; }; + oce = derive2 { name="oce"; version="0.9-22"; sha256="0wxgk4hr5s0kz3qby7zwrp8pdpcwb4p67mrza5gh90kv0hfirnjh"; depends=[gsw testthat]; }; oceanmap = derive2 { name="oceanmap"; version="0.0.9"; sha256="07awxbj0gc1k8f6myqk5g54qk1n3bammrpfqi0rbfambgzrw3n5c"; depends=[abind extrafont fields mapdata maps maptools marmap ncdf4 plotrix raster sp]; }; ocedata = derive2 { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; }; ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; }; @@ -8168,15 +8337,16 @@ in with self; { odfWeave = derive2 { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; }; odfWeave_survey = derive2 { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; }; odpc = derive2 { name="odpc"; version="1.0.0"; sha256="1mhak9drp0a7h1yrbk08cs00hbvkfkj8r1y6klhr40sdych4q506"; depends=[forecast gdpc Rcpp RcppArmadillo]; }; + odr = derive2 { name="odr"; version="0.3.2"; sha256="0bp6aw0mv649clrm84firm4wdrxardpzgwaqddkzi222czgba7is"; depends=[]; }; oec = derive2 { name="oec"; version="2.4"; sha256="18pww1isp8w1g1l7xrxlxdv27abwmwp7rd6q1gn5kqn5sdq0spc6"; depends=[curl dplyr jsonlite readr servr]; }; oem = derive2 { name="oem"; version="2.0.6"; sha256="1q8nwxmf9gizwsn2795qah7f4fb8zhygqxj6kwdy5j7afr1h3zjz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; - officer = derive2 { name="officer"; version="0.1.5"; sha256="1hwvskhaz4lv4wbhsxpbk1xh8nr0blza7x58xgpz4gksg0nwan2f"; depends=[base64enc digest dplyr gdtools ggplot2 htmltools magrittr purrr R_utils R6 Rcpp tibble uuid xml2 zip]; }; + officer = derive2 { name="officer"; version="0.1.7"; sha256="0gyl3pm80cg035gwk090475zhhgb8s34y9pkjnbs6cdkk21f1d35"; depends=[base64enc digest dplyr ggplot2 htmltools magrittr purrr R_utils R6 Rcpp tibble uuid xml2 zip]; }; oglmx = derive2 { name="oglmx"; version="2.0.0.3"; sha256="02skdnf89ryl4d8ja1a9mj1jzzmjqjgfdcsf6v5dpjn1z9aycc6c"; depends=[maxLik]; }; oii = derive2 { name="oii"; version="1.0.1"; sha256="0w1afajkr5vly9qi1r2iz1ikbvyvy6hcbc10g8s7g6zi8db5dgf4"; depends=[Deducer gmodels rapportools]; }; okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; }; okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; }; - olsrr = derive2 { name="olsrr"; version="0.2.0"; sha256="0xlp54wag3k0bqy22vly953xf5jslrpx1z4vj5rbivnnfxaw3ixk"; depends=[dplyr ggplot2 goftest gridExtra magrittr nortest purrr Rcpp tibble tidyr]; }; + olsrr = derive2 { name="olsrr"; version="0.3.0"; sha256="0y5s11bqkir4wllk2aigll8791hw5pxn9qk9i32n9d8h5s88spdg"; depends=[dplyr ggplot2 goftest gridExtra magrittr nortest purrr Rcpp tibble tidyr]; }; omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; }; ompr = derive2 { name="ompr"; version="0.6.0"; sha256="1yjzi2xg9543g0bwx95anvx2sckdmbbh7k4hmljff2lrpffwf735"; depends=[dplyr lazyeval Rcpp]; }; @@ -8200,11 +8370,12 @@ in with self; { openSTARS = derive2 { name="openSTARS"; version="1.0.0"; sha256="0arry24nkd50nkdnddzxagrpy4lky9smc4xr1nl6q9nwxyfgdskg"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; }; openVA = derive2 { name="openVA"; version="1.0.3"; sha256="09wbhl0g6q1rhi6yr3wpbns4ik7jalpagacn6am09i6zvmz8745j"; depends=[ggplot2 InSilicoVA InterVA4 nbc4va Tariff]; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; }; - openair = derive2 { name="openair"; version="2.1-0"; sha256="0ybly7xmxrlyn12al2pk1w1yjm857npj3ih3zl1p0sd744x8pm6w"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval lubridate mapproj MASS mgcv plyr RColorBrewer Rcpp reshape2]; }; + openair = derive2 { name="openair"; version="2.1-5"; sha256="19fqg05swsxqs19gi125h9xq43s44fxg51q05y4fhgsvxbvd7aj9"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval lubridate mapproj MASS mgcv plyr RColorBrewer Rcpp reshape2]; }; opencage = derive2 { name="opencage"; version="0.1.2"; sha256="1wnv5mgapdnkpg62sv0375jac2rdnchggjfjnr07bziwpf3xj74d"; depends=[dplyr httr jsonlite memoise]; }; opencpu = derive2 { name="opencpu"; version="2.0.4"; sha256="1vxc52qh5mgfga689l8w0isrxxnd2jmgkh9fha2hhyk874hhcawq"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; }; - openintro = derive2 { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; }; - openssl = derive2 { name="openssl"; version="0.9.6"; sha256="0ffwllii8xl6sa2v66134g0fwaw1y3zn3mvaa4nrc120vv5d3mkd"; depends=[]; }; + opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; + openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; }; + openssl = derive2 { name="openssl"; version="0.9.7"; sha256="178fcp9f245i0k9s2w45kbw0ml0r9pfc73ak8hvicw4jz639wzb9"; depends=[]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; openwindfarm = derive2 { name="openwindfarm"; version="0.1.0"; sha256="1f1pmp1h283ypyl0bz54ps0b6hwax59mmlfl0qzickmq4wjdn0qz"; depends=[anytime dplyr foreach httr leaflet magrittr readr]; }; openxlsx = derive2 { name="openxlsx"; version="4.0.17"; sha256="1mq4lasp12kc30sxcsmz9gskd114l8s7z7wd6svv2nm8qllrhsqi"; depends=[Rcpp]; }; @@ -8240,6 +8411,7 @@ in with self; { optparse = derive2 { name="optparse"; version="1.4.4"; sha256="1ff4wmsszrb3spwfp7ynfs8w11qpy1sdzfxm1wk8dqqvdwris7qb"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; }; optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; }; + optrdd = derive2 { name="optrdd"; version="0.9"; sha256="1l27rs4ry8qsak7fbdnx06bwhzyp432d4slj4bb18agm192j1rq3"; depends=[Matrix quadprog]; }; optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; }; opusminer = derive2 { name="opusminer"; version="0.1-0"; sha256="1m4gsjylz58pbmhgcy4l9hqdsgy8ra1zg0d3rb6h2qiwfyfm0yh4"; depends=[arules Matrix Rcpp]; }; orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; }; @@ -8275,6 +8447,7 @@ in with self; { oro_pet = derive2 { name="oro.pet"; version="0.2.3"; sha256="06agl6rvd01h6mnilj0vl52dxw6b7b41vl6vmbvaq5qy1wmiaiz7"; depends=[oro_dicom oro_nifti]; }; orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; }; orsk = derive2 { name="orsk"; version="1.0-3"; sha256="0j8bz5kddzglcljycxy8lv8h5f6hvz88nzwq3b9cdyayd8mlbxs2"; depends=[BB BHH2]; }; + orthoDr = derive2 { name="orthoDr"; version="0.1.0"; sha256="1lh65g6jk2ciig9z6mc477wwwar9z7bcfid12ki9390icxz5f464"; depends=[plot3D pracma Rcpp RcppArmadillo rgl survival]; }; orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; }; orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; }; osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; }; @@ -8372,7 +8545,7 @@ in with self; { parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; }; parfm = derive2 { name="parfm"; version="2.7.5"; sha256="1wnklksqybhaqwsfifwv8gmqjl6g9dm9s4z131mbjn4dm7bj1bra"; depends=[msm optimx sn survival]; }; parfossil = derive2 { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[foreach fossil]; }; - parlitools = derive2 { name="parlitools"; version="0.2.0"; sha256="0i64phiga3m496xgdqg4vf5086b58xrkwrz0g6ara6jjqrliykl1"; depends=[dplyr hansard httr jsonlite mnis sf stringi tibble]; }; + parlitools = derive2 { name="parlitools"; version="0.2.1"; sha256="14nzcbjddwnsiwwksl7bf2qk1kzzcnjc0b47ilqiq4nc4c386im3"; depends=[dplyr hansard httr jsonlite mnis sf stringi tibble]; }; parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; }; parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; }; parsec = derive2 { name="parsec"; version="1.1.2"; sha256="1hf3c23rnxckw4s2vqzbhkjgiir1nv1811saximj0mbih9w2vqpf"; depends=[]; }; @@ -8382,6 +8555,7 @@ in with self; { partialAR = derive2 { name="partialAR"; version="1.0.10"; sha256="18hw0azhvd3737wi5cy8ympwfrj6ag01w1a4csy6kl2kifldg6b7"; depends=[data_table FKF ggplot2 MASS plot3D Rcpp tseries urca zoo]; }; partialCI = derive2 { name="partialCI"; version="1.1.0"; sha256="00gdr25zz327iscasm74bxj0k6h94m59qwaf9vf8xcqfpp0n22wa"; depends=[data_table FKF ggplot2 glmnet MASS partialAR Rcpp TTR zoo]; }; partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; + partitionComparison = derive2 { name="partitionComparison"; version="0.2.2"; sha256="1dhwwifq1f4i1qi2sdnhiampbj6bpwc65j3qnbiikzcchs1mb6nd"; depends=[lpSolve Rdpack]; }; partitionMap = derive2 { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; }; partitionMetric = derive2 { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; }; partitions = derive2 { name="partitions"; version="1.9-19"; sha256="1pklfnjdc094c8nzkqcdvqzdh8v3p5n8jbg4pf9678iw648saiyx"; depends=[gmp polynom]; }; @@ -8410,7 +8584,7 @@ in with self; { patternize = derive2 { name="patternize"; version="0.0.1"; sha256="0xmz7ca555275a4x89vdmyk9x3m3sk964iwspv0dnxsmx5s1xmz7"; depends=[abind Morpho raster rgdal RNiftyReg sp]; }; patternplot = derive2 { name="patternplot"; version="0.1"; sha256="1k167vfwizwk6m0qpq9p0wq7y2g9ib6wi9j64wmvpqjw8k77l00r"; depends=[dplyr ggplot2 gtable jpeg png Rcpp RcppParallel]; }; pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; - pavo = derive2 { name="pavo"; version="1.1.0"; sha256="0n4jk8dy5ydrdxmvigawfjpng4l7dq9ay4lassbg9qgc260cd45a"; depends=[geometry mapproj rcdd scatterplot3d]; }; + pavo = derive2 { name="pavo"; version="1.3.0"; sha256="0jp9k2wszzzwzn9bgxikv58mqxvxswi2hkzqr270vidc71qyngy8"; depends=[geometry mapproj pbmcapply rcdd]; }; pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; }; pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; }; pbapply = derive2 { name="pbapply"; version="1.3-3"; sha256="0iqhymf65jffh00qf056h1p76xf92bfmij6aymlmgnvn24fv4ybk"; depends=[]; }; @@ -8437,7 +8611,7 @@ in with self; { pcaPP = derive2 { name="pcaPP"; version="1.9-72"; sha256="0i2822bv86dpqmk3q17x61nsp3gjjnn4nr8191rwvbiib7xhpgaq"; depends=[mvtnorm]; }; pcadapt = derive2 { name="pcadapt"; version="3.0.4"; sha256="031ql3xppjkqrm17bvccj61hyf38skjb4qv6rs0l1h2ib8jql8ka"; depends=[ggplot2 MASS robust vcfR]; }; pcalg = derive2 { name="pcalg"; version="2.5-0"; sha256="002y7b0r750nbnrg8w53q2fyvk13jk4jrqlf3f2777qw7si5vmz3"; depends=[abind bdsmatrix BH clue corpcor dagitty fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; - pcdpca = derive2 { name="pcdpca"; version="0.2.1"; sha256="0vl661pjlfcgqmnw3c1032aci4akld1pqxchb2fh8y5wap1nhypa"; depends=[fda freqdom]; }; + pcdpca = derive2 { name="pcdpca"; version="0.4"; sha256="0ys4hrin0w3f87d1d986wvrfkfwapzj9hz7d7v92r60ns74g7r5m"; depends=[fda freqdom]; }; pcensmix = derive2 { name="pcensmix"; version="1.2-1"; sha256="1yrz4hdj52in8z65qyl18kh7frv75rb8ss5ljv3vbm6yhxi32jnd"; depends=[]; }; pcev = derive2 { name="pcev"; version="1.1.1"; sha256="0vhn5514dnmhv98bchvsfd6pfjmvbc7hhb9zabgf8syk9rh8y9h8"; depends=[RMTstat]; }; pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; @@ -8454,7 +8628,7 @@ in with self; { pdfetch = derive2 { name="pdfetch"; version="0.2.2"; sha256="0nr34c7iyv2gbxrdbpkk43b61c7g9z85kgzahzq1wcx08x49bpxs"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; }; pdfsearch = derive2 { name="pdfsearch"; version="0.1.1"; sha256="0k62j6ilv8rmmmasqyb3hklhjqg22jiyx0sxd7f8n0xmlfcjgfqi"; depends=[pdftools tibble]; }; pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; }; - pdftools = derive2 { name="pdftools"; version="1.3"; sha256="0gaf51xfv56idw49pf9l0yzgncwmwxhg4idmbpj6xyzdbjdmr6hz"; depends=[Rcpp]; }; + pdftools = derive2 { name="pdftools"; version="1.4"; sha256="0qm90dq1cjn57csvmls9yznpb7bb0w986990kwwh21i9pkl9rc3n"; depends=[Rcpp]; }; pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; }; pdmod = derive2 { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; }; pdolsms = derive2 { name="pdolsms"; version="0.2"; sha256="18gwr1xnm7jbqna911b7haa9sv1i2qvq18w00dkbnj796rh0h78f"; depends=[reshape2]; }; @@ -8488,6 +8662,7 @@ in with self; { pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; }; perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; }; perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; }; + perccalc = derive2 { name="perccalc"; version="1.0.0"; sha256="0327jj67gqq05a6fd5iac3b47ch7mgslalk4hr92v6svh8cz4syv"; depends=[broom devtools dplyr ggplot2 haven magrittr MASS multcomp purrr tibble tidyr tidyverse]; }; performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; }; pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; }; perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; @@ -8500,7 +8675,7 @@ in with self; { permute = derive2 { name="permute"; version="0.9-4"; sha256="1w8wzk1fg9q7wvisnfp2js70dg0m9wi12gkdhpyngpbdcgssahd5"; depends=[]; }; perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; - personalized = derive2 { name="personalized"; version="0.0.2"; sha256="1p7hs9fg8xbxmpj9xmjkcvzk5v527zzbka9dni40pvcsw8419r31"; depends=[gbm ggplot2 glmnet mgcv survival]; }; + personalized = derive2 { name="personalized"; version="0.1.0"; sha256="1xdiddzifaqfsm6pr477whj09i549jd9qzvn3vag5plc276vsv2g"; depends=[foreach gbm ggplot2 glmnet mgcv plotly survival]; }; personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; }; perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; }; perturb = derive2 { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; }; @@ -8532,7 +8707,7 @@ in with self; { phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; }; pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; }; pheno2geno = derive2 { name="pheno2geno"; version="1.3.1"; sha256="1k1hw5qxrwxy502zkcfcz0nxjqmvdk1fgghjc512vq7x5znblz3v"; depends=[mixtools qtl VGAM]; }; - phenology = derive2 { name="phenology"; version="5.4"; sha256="0i528yhmlyyinczhkymchhmmmd9x6xm94i2dnad834jcdhhhr44y"; depends=[HelpersMG lmf numDeriv optimx]; }; + phenology = derive2 { name="phenology"; version="6.0"; sha256="0r7h7rg3dl2c1gz6vmy89sw1sdcikav1aj6i8qwmslgjwd1qh6ci"; depends=[HelpersMG lmf numDeriv optimx]; }; phenopix = derive2 { name="phenopix"; version="2.3.1"; sha256="1yy163nh2b74m0v7f2gkgxaplvw4whs2h30bkw4chl0zyrcrci86"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster SDMTools sp stringr strucchange zoo]; }; phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; }; philentropy = derive2 { name="philentropy"; version="0.0.3"; sha256="00fpbmxg8m8apjb6cdrhh9rw3vp1j65ccvsqj1xlfcn1x5l1h3h8"; depends=[dplyr KernSmooth Rcpp]; }; @@ -8540,8 +8715,8 @@ in with self; { phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; }; phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; }; phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; }; - phonics = derive2 { name="phonics"; version="0.7.4"; sha256="0s5v9w3dcscjc7snv4nlhd4zm2dhxwv9jp6xaxp5wpwys5mim1ms"; depends=[BH Rcpp]; }; - photobiology = derive2 { name="photobiology"; version="0.9.16"; sha256="1s79ysx3lx194a06c9j9qqqa08f91kmy8hbv5ik5lg6fal3lkam5"; depends=[caTools dplyr lubridate plyr polynom splus2R tibble]; }; + phonics = derive2 { name="phonics"; version="0.7.5"; sha256="0llwn0ws5g0ri6bywj5jkx67954xil8w666nhy9jwnx0jzpa0cf2"; depends=[BH Rcpp]; }; + photobiology = derive2 { name="photobiology"; version="0.9.17"; sha256="02xk0vpcfmwsr8h2yjgp5lh6rlzv26yz14r78z686g02hpzcf0d8"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; }; photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.13"; sha256="1zagvdaiv8d5frwki20wwvbyw4a9in3k8560janbmd161xh13ii0"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl reshape2 tibble]; }; photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.2"; sha256="0m8bwpvr3g0xdcpjg0pm5qp7b941y85gdzw24vc1nhfmzwd0lxn0"; depends=[photobiology]; }; photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.1"; sha256="19pzb12qisv5hy7rps0dp9bq8zanpyr2yn41i6rd8hk80fknjha6"; depends=[photobiology]; }; @@ -8551,8 +8726,9 @@ in with self; { phreeqc = derive2 { name="phreeqc"; version="3.3.10"; sha256="0hcdjj1wgfknqf5yx50b9vz5f72siw4dslyvk2xbrfnwbzzz4qib"; depends=[]; }; phtt = derive2 { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; }; phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; }; + phuse = derive2 { name="phuse"; version="0.1.4"; sha256="04q9aylm8k7yahsv19d2b1xd0lqr5iab55in45sa51nz93d3bs45"; depends=[git2r RCurl shiny yaml]; }; phybreak = derive2 { name="phybreak"; version="0.2.0"; sha256="0vapc0w308wv1cd72p2xbj3q7jfnxwp08g5g8855a38pcn3njbfg"; depends=[ape phangorn Rcpp stringr]; }; - phyclust = derive2 { name="phyclust"; version="0.1-19"; sha256="109m7q393xv17x4rhcxvhz25x42c79smw9xr8zppmkqdzx6f75w0"; depends=[ape]; }; + phyclust = derive2 { name="phyclust"; version="0.1-20"; sha256="0i1rhq54p9069z1ms60dfg6jvmmn5rc0ni6sxxkdm1p3n72zrl1f"; depends=[ape]; }; phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; phylin = derive2 { name="phylin"; version="1.1.1"; sha256="1hxmh5jgcz41bhmi8kvimw0b6m4p3yq85bh79hl7xbx2kshxmvzq"; depends=[]; }; phyloTop = derive2 { name="phyloTop"; version="2.0.1"; sha256="1mwifnmq4zk83vj7886ndz6i3xa9dyxsz9p4b0ah53cdvbcqcspd"; depends=[ape igraph NHPoisson phylobase]; }; @@ -8586,6 +8762,7 @@ in with self; { pingr = derive2 { name="pingr"; version="1.1.2"; sha256="17fh2gjlmwy6wy8i24q76fivjig8jm05g9kvfz81q0h6b5zxnpmg"; depends=[]; }; pinnacle_API = derive2 { name="pinnacle.API"; version="2.0.9"; sha256="1pq7q2wa4g8gxbyiascygnng53ihwmf5hsazwbyzjqgyyhi0hd9m"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; }; pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; }; + pinp = derive2 { name="pinp"; version="0.0.2"; sha256="1d4csr3ida6srw4ykbggka766j25kb2d450nhbschrgp345g81ra"; depends=[knitr rmarkdown]; }; pinyin = derive2 { name="pinyin"; version="1.1.0"; sha256="15zv8rqz61a52pv47b0cdmmnm8ynb30ypyki7dprpdidrz3mhk8m"; depends=[]; }; pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; }; pipeGS = derive2 { name="pipeGS"; version="0.2"; sha256="1p014fw3lxaspcmb3qgirz815ykycjh5r4ql59pi46ryxharn19j"; depends=[]; }; @@ -8596,12 +8773,12 @@ in with self; { pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; }; piton = derive2 { name="piton"; version="0.1.1"; sha256="1265y4lv2m5nwrh25sahjkxwmivpxgh9shrdidlmaman7zs6cclr"; depends=[Rcpp]; }; pivottabler = derive2 { name="pivottabler"; version="0.3.0"; sha256="0r72j3pp66ph19z16l1hx7b1xa8z8q2dndd4wg36pq7b93j8rr3p"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; }; - pixiedust = derive2 { name="pixiedust"; version="0.7.5"; sha256="07jrr20ch96dq09gbmmk63f7i44lydq1h0h2lryby8pnkz452nhf"; depends=[broom checkmate dplyr Hmisc htmltools knitr lazyWeave magrittr stringr tidyr]; }; + pixiedust = derive2 { name="pixiedust"; version="0.8.1"; sha256="1cpxsh3y9k66mkmks7mn3q4zjix1i8jc0dl62wrwwsp379vxcc3r"; depends=[broom checkmate dplyr Hmisc htmltools knitr magrittr scales stringr tidyr]; }; pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; pkgKitten = derive2 { name="pkgKitten"; version="0.1.4"; sha256="0c44zrvpyz87s5mjhsqdrkyrvyzhyldnq371bwnn9crbpbac3wnd"; depends=[]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.1"; sha256="0h2sp93fqqjbfqgq82a3i94ybnndx6ghaal8pbf99firnsjb40mb"; depends=[]; }; pkgcopier = derive2 { name="pkgcopier"; version="0.0.1"; sha256="04vpjf8nvqnpry54f1wwrnmipd5m6gqd89c3vkryqx88jk85jd8s"; depends=[httr stringr]; }; - pkggraph = derive2 { name="pkggraph"; version="0.2.0"; sha256="1mb6vr177xvm3s00c9s7g4ilqz5ln0fv8jyjzrb0pkjm94f6l0vf"; depends=[curl dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 RColorBrewer tibble]; }; + pkggraph = derive2 { name="pkggraph"; version="0.2.2"; sha256="0pzqlim84b22ahq5yr50ybffqa0f5k5ch372v37nw1ndzci211d8"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; }; pkgmaker = derive2 { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[codetools digest registry stringr xtable]; }; pkmon = derive2 { name="pkmon"; version="0.9"; sha256="1zcjz1h45qv81rwnjsgc9iwmrwpnsy917y7h66pz98wzszlxcsd2"; depends=[]; }; pkr = derive2 { name="pkr"; version="0.1.1"; sha256="0mwrpkmf016lpwkjhhjpq7bw18mvshpyhwgmgqfrfl9gfbq4gphd"; depends=[binr foreign forestplot]; }; @@ -8613,7 +8790,7 @@ in with self; { plan = derive2 { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; }; planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; }; planor = derive2 { name="planor"; version="1.3-7"; sha256="01qlfv33adf3qyg6yzpigr4mm891xix39z8nkfz5d9q9iyx6fmx6"; depends=[bit64 conf_design Rcpp RcppArmadillo]; }; - plantecophys = derive2 { name="plantecophys"; version="1.2-9"; sha256="021g81ianfpvrf6w6azblrmdrd7c1jklh0wjk0b5vxzla10dnfjd"; depends=[]; }; + plantecophys = derive2 { name="plantecophys"; version="1.3"; sha256="0paqank2n262iizs09k40d3za2b81knnifj7y6pr2s33crbkm9qx"; depends=[]; }; plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; }; plater = derive2 { name="plater"; version="1.0.1"; sha256="0v5b9r6iha18qvrjpbr1p8fy06nf31x63ch5cnb4axyqa0x5skpp"; depends=[dplyr]; }; platetools = derive2 { name="platetools"; version="0.0.2"; sha256="0xan3h3djhgjbqn8f7yzlkm25l0fzq86zhb5xwfib4yajnb2dspa"; depends=[dplyr ggplot2 plyr RColorBrewer]; }; @@ -8629,7 +8806,7 @@ in with self; { plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; }; pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; }; plogr = derive2 { name="plogr"; version="0.1-1"; sha256="13zliqlbkl8b04k9ga0sx5jsh7k867gracgl84l2a9kcqy9mqx92"; depends=[]; }; - plot3D = derive2 { name="plot3D"; version="1.1"; sha256="1xy4h9k1ddz040ns7dfqqckkmb165f2h4xfz44h8lfwazr59dzgg"; depends=[misc3d]; }; + plot3D = derive2 { name="plot3D"; version="1.1.1"; sha256="0chn70fqwyca8lbnjnpbcj08ni0dfbax2gjmzhk2c4w72c04mzpn"; depends=[misc3d]; }; plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; }; plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; }; plotKML = derive2 { name="plotKML"; version="0.5-8"; sha256="0rd9242li967w253xhfywg72d3v1n5dybjxldkjgdix17gddwn5k"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; }; @@ -8637,7 +8814,7 @@ in with self; { plotMElm = derive2 { name="plotMElm"; version="0.1.4"; sha256="17fif2rqsf4f9jr4s7nr7wikwg63nibz6yjkldf7yh1qqqfikd2g"; depends=[ggplot2 interactionTest]; }; plotROC = derive2 { name="plotROC"; version="2.2.0"; sha256="08dszp08mvw7lpvznlq3xw5bayl05lmnf4v2pmy5snyyxd9zsv4x"; depends=[ggplot2 gridSVG plyr shiny]; }; plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; }; - plotfunctions = derive2 { name="plotfunctions"; version="1.2"; sha256="1kc551501f0j13z0i49hq9na1jzzjx65vw39fj3kasm8dww2npkl"; depends=[]; }; + plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; }; plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; plotly = derive2 { name="plotly"; version="4.7.1"; sha256="0wj9lw7w28z8w9ip9vadv6sydjhqyg65kfiai9m3bndzz50b1m3w"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr purrr RColorBrewer scales tibble tidyr viridisLite]; }; plotmo = derive2 { name="plotmo"; version="3.3.4"; sha256="1j2nc6n5kv6zvxwlr1cr1shxdcihw7d5k7z0a90phmdp834x8agy"; depends=[plotrix TeachingDemos]; }; @@ -8653,7 +8830,7 @@ in with self; { plsVarSel = derive2 { name="plsVarSel"; version="0.9.1"; sha256="0jwhdcrr68562q83528h7x3kjadfzn6j5l02axyfvflzgdnxwcnc"; depends=[bdsmatrix genalg MASS mvtnorm pls progress]; }; plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive2 { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; }; - plsgenomics = derive2 { name="plsgenomics"; version="1.3-2"; sha256="1ihy4jp0hwi5v0s123ckbl0y6j8zhxh1im5sk46h1fdprfi5hxsa"; depends=[boot MASS]; }; + plsgenomics = derive2 { name="plsgenomics"; version="1.5-1"; sha256="0d2k3h2cwwhcv7mbxqypd7g6yp1l6j32n3wslm348zmcx50j9pn4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; }; plspm = derive2 { name="plspm"; version="0.4.9"; sha256="03aj1ffq11hh931dbkxy9ba74xyvzmr1ylrj4fw1rbryrwqg89v6"; depends=[amap diagram shape tester turner]; }; plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; }; plspolychaos = derive2 { name="plspolychaos"; version="1.1-1"; sha256="078arfv8z5nfrmsfi0n7hskmv394ysi6nhlskpy5cg37lqiwh0r1"; depends=[lhs MASS]; }; @@ -8711,18 +8888,19 @@ in with self; { polysat = derive2 { name="polysat"; version="1.7-2"; sha256="0ahx2pvlv2vdfiskwgawcrp447249ha0dq4qkhav3hpyvdg3in38"; depends=[]; }; polywog = derive2 { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; }; pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; - pomp = derive2 { name="pomp"; version="1.14"; sha256="0zi1hahx4g1jjbvrmn0d2ci2aijw9qd7fxy19d1n65hkfk131iqy"; depends=[coda deSolve digest mvtnorm nloptr subplex]; }; + pomp = derive2 { name="pomp"; version="1.15"; sha256="1cba1wj1af7rb3ng8lm1m7zbvcjspak4ppz36ix5hbs956mxi8ss"; depends=[coda deSolve digest mvtnorm nloptr subplex]; }; pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; }; + pool = derive2 { name="pool"; version="0.1.1"; sha256="0dk89xgrhhgmiv1h5j2vn6w0d4srfgg19ns0mnp5p39s61bayij9"; depends=[DBI dbplyr dplyr later R6]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; }; - popEpi = derive2 { name="popEpi"; version="0.4.2"; sha256="1jngfvkds7mj3a72l1bi4c4mmcafgnxmbbrc4siwwp06skxhffvp"; depends=[data_table Epi survival]; }; + popEpi = derive2 { name="popEpi"; version="0.4.3"; sha256="0d3pfxi4ab2jijgj9h3wnjadl1mhg99bc1agyqjg9v6l1k34kbwb"; depends=[data_table Epi survival]; }; popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; popRange = derive2 { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; }; popReconstruct = derive2 { name="popReconstruct"; version="1.0-4"; sha256="14lp0hfnzbiw81fnq7gzpr4lxyfh3g0428rm9jwjh631irz3fcc9"; depends=[coda]; }; popbio = derive2 { name="popbio"; version="2.4.3"; sha256="1c34izyp6gpic3yv1rhg1snv2irw0bj9r1w9b892l7x0mxxmn2bl"; depends=[]; }; popdemo = derive2 { name="popdemo"; version="0.2-3"; sha256="0r3qdvwjwqzqxk3zp9vfzxwmc5fhjzn0ka91b37g62nanwxiyayw"; depends=[expm]; }; poplite = derive2 { name="poplite"; version="0.99.17.3"; sha256="0fqkwxlzj92rh187wns7zrygsgch1gw3l8kmnpvc59gdbk1wbbi7"; depends=[DBI dplyr igraph lazyeval RSQLite]; }; - poppr = derive2 { name="poppr"; version="2.4.1"; sha256="05nds9srzkmdi33xfq3lfmyjirn8x3nacpkq1jymf6kzab0sgn8v"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn reshape2 shiny vegan]; }; + poppr = derive2 { name="poppr"; version="2.5.0"; sha256="18r89wdad8yja8jgdvispwx67ssj26yf2rdd1j4x0w9r3cpxxkmm"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn rlang shiny vegan]; }; popprxl = derive2 { name="popprxl"; version="0.1.3"; sha256="1l842zgn04s8ghbcp8s2lzg7lgc809xd7hg9crnyp23c2cr0jlvi"; depends=[poppr readxl]; }; popsom = derive2 { name="popsom"; version="4.2"; sha256="11d6z3qsq94k0557pnwa0h4pc718360lvg9jkblp8abnj52lcvvv"; depends=[class fields ggplot2 som]; }; poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; }; @@ -8734,15 +8912,16 @@ in with self; { postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; }; potts = derive2 { name="potts"; version="0.5-7"; sha256="194996wr4rnpr42xqfi5yrcnxvd82all2fxki95dklr2qfjxg98a"; depends=[]; }; powdist = derive2 { name="powdist"; version="0.1.3"; sha256="1j8i3nyr9xbs4acrqpblnqny5wj3ds59s1aayb3iv3z68pj2vz6j"; depends=[VGAM]; }; - poweRlaw = derive2 { name="poweRlaw"; version="0.70.0"; sha256="1p2la3hslxq2xa8jkwvci6zcpn47cvyr9xqd5agp1riwwp2xw5gh"; depends=[VGAM]; }; + poweRlaw = derive2 { name="poweRlaw"; version="0.70.1"; sha256="04sr0nhdd1v915m0zf5gasznzgi08ykcy20kkwdw0l5mvvdbic8m"; depends=[VGAM]; }; powell = derive2 { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; }; powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; }; powerCompRisk = derive2 { name="powerCompRisk"; version="0.1.1"; sha256="0qsgibjzf6qx778s126c2k7nbf8f10gsh4cfkkhkxcv344rqxg10"; depends=[MASS mvtnorm]; }; powerEQTL = derive2 { name="powerEQTL"; version="0.1.3"; sha256="1045vkzl5p20mqlsm0j6vnyyvfz5v6jyy443c38sw1cps0a09i1n"; depends=[powerMediation]; }; powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; }; - powerMediation = derive2 { name="powerMediation"; version="0.2.7"; sha256="1zqkwwlv57k5b86lcqjbdn11xgxayhsdqrq64n5pai8n4jxrkr5g"; depends=[]; }; + powerMediation = derive2 { name="powerMediation"; version="0.2.8"; sha256="1mfsap5li6limmr9pfv98wgsnx7a23abjx067vrvg0s5m03v52yi"; depends=[]; }; powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.0.9"; sha256="0f8i867zc1yjdp66rjb1cp92fcfrlq167z3d0c4iv355wv4s35az"; depends=[survival]; }; powerbydesign = derive2 { name="powerbydesign"; version="1.0.3"; sha256="0dv4j0kwdzvxnq587vs1dsy2yci3v3q2smncpscpcsalp38rvx4i"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; + powerlmm = derive2 { name="powerlmm"; version="0.1.0"; sha256="0fsd3h94va5hn0nqxdalchw02s4daxq8dlgdxb5a4nigg64lfkm2"; depends=[ggplot2 ggsci gridExtra lme4 lmerTest MASS Matrix pbmcapply scales testthat]; }; powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; }; ppcc = derive2 { name="ppcc"; version="1.0"; sha256="022c8w7ws7fw6yy572rn6m8ki14d2ph7nd2hk2c6mmx2c4lbc20v"; depends=[]; }; @@ -8762,8 +8941,8 @@ in with self; { prc = derive2 { name="prc"; version="2015.6-24"; sha256="0sf664zqcq6xylhd7rvm2l2xj3f4j6llaj7j4b4847wfxnas2j02"; depends=[kyotil nlme]; }; prcbench = derive2 { name="prcbench"; version="0.7.3"; sha256="0xdmwjhxpcdaiqawhmlpr4ddlx22xk3rywa70jpm1vk5hc9pwivk"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; }; prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; }; - prcr = derive2 { name="prcr"; version="0.1.4"; sha256="0yb0bi3kipq4r6g0fai2pb1gjxkd6gsjkf06irp2idx8r42ipl54"; depends=[dplyr ggplot2 tibble tidyr]; }; - pre = derive2 { name="pre"; version="0.3.0"; sha256="1jk99pribb1cs6rlfcs7iqvjzxyblqslh7mykcbkvh9anbipkcwa"; depends=[earth Formula glmnet MatrixModels partykit stringr]; }; + prcr = derive2 { name="prcr"; version="0.1.5"; sha256="1hfr0jijnj5nd25rh16i81bsz8kwz0q9vmn7bqgy467cwvypg9k2"; depends=[class dplyr ggplot2 irr lpSolve purrr tibble tidyr]; }; + pre = derive2 { name="pre"; version="0.4"; sha256="0az0dfmzfzin7zbbgqzg8y6f6dajj2y88dddlzy3rav580n3dvwg"; depends=[earth Formula glmnet MatrixModels partykit stringr]; }; preText = derive2 { name="preText"; version="0.6.0"; sha256="0cw74vix6cd6algadl8m8i236gvkhapkfjhra5y5cficvfzqbdgk"; depends=[cowplot ecodist ggplot2 proxy quanteda reshape2 topicmodels vegan]; }; precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; }; precrec = derive2 { name="precrec"; version="0.9.1"; sha256="0kppl4x8ji8hzll5wss1nzlk8qvf4g78f14x4c2b8dcxjikgl939"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; }; @@ -8772,9 +8951,10 @@ in with self; { predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; }; predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; + predtoolsTS = derive2 { name="predtoolsTS"; version="0.1.0"; sha256="08j9q46a0xq9z5n78zbk35745rv7ni2ymz500b02f04hl2x7wrrm"; depends=[caret forecast Metrics tseries TSPred]; }; prefeR = derive2 { name="prefeR"; version="0.1.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; }; preference = derive2 { name="preference"; version="0.1.0"; sha256="15h5p86sdp3xm4qpqr4kh54j57cxw534qk1lxn27m1vyp8rs280k"; depends=[]; }; - prefmod = derive2 { name="prefmod"; version="0.8-33"; sha256="0wklp3djy3z8lq0vrjrzqha6r8z00jwdm6d9ffyq5vhimmbirzj8"; depends=[colorspace gnm]; }; + prefmod = derive2 { name="prefmod"; version="0.8-34"; sha256="1fkqp75w3im6b0l4sfs1yr2id8ffp2xbpb6lkgnv833cri787d5x"; depends=[colorspace gnm]; }; prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; }; preprocomb = derive2 { name="preprocomb"; version="0.3.0"; sha256="08dhzil8prmjb6if0yba9pjncfxf5zzvlrrabva7c5jhny806c5g"; depends=[arules caret clustertend DMwR doParallel e1071 foreach randomForest zoo]; }; preprosim = derive2 { name="preprosim"; version="0.2.0"; sha256="1z10ranfal51vzsnndfaw5aqddh2w1xx8h50j1p7gx4fi90d0waq"; depends=[caret DMwR doParallel e1071 foreach ggplot2 reshape2]; }; @@ -8786,7 +8966,7 @@ in with self; { prettyR = derive2 { name="prettyR"; version="2.2"; sha256="026cgbrqs799lg06qlwx1r9ramil790qxrb1cyl4w7mzf8sfpgn9"; depends=[]; }; prettycode = derive2 { name="prettycode"; version="1.0.0"; sha256="1zba83b5sk8jyag8jz8gipn6qpxwfsfg1xcxamfvpmzjicajzhbx"; depends=[crayon withr]; }; prettydoc = derive2 { name="prettydoc"; version="0.2.0"; sha256="1zpvi4lyjazhj2h6m3j46x93s9c2300xqylaqy6gp1yjn9im36dp"; depends=[rmarkdown]; }; - prettymapr = derive2 { name="prettymapr"; version="0.2.1"; sha256="1839zhc4s9pkl6fq0jd613cbyrwj4a9h04r9c5ki3jkcwi3w80jq"; depends=[digest httr plyr rjson]; }; + prettymapr = derive2 { name="prettymapr"; version="0.2.2"; sha256="151jp0l728krmxcyzwjh01mvd1zhqijq0nsgjaqsh0q8n3jmndi0"; depends=[digest httr plyr rjson]; }; prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; }; prevR = derive2 { name="prevR"; version="3.3"; sha256="11syifnv0mgbybsphgaj3a2j29p2q0l4y4w008n2r9s359arjj8m"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; }; @@ -8798,17 +8978,16 @@ in with self; { princurve = derive2 { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; }; prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; }; - prioritylasso = derive2 { name="prioritylasso"; version="0.2.0"; sha256="138yqpra00zs12bfj2lr1v8s3cmndl0q7fjv3s89ry2p84rlq8vr"; depends=[glmnet survival]; }; + prioritylasso = derive2 { name="prioritylasso"; version="0.2.1"; sha256="1wcykrhv1d762h7k7qkvnsjk7l6sincmh6vc6wmgpmmwx5nch70x"; depends=[glmnet survival]; }; prism = derive2 { name="prism"; version="0.0.7"; sha256="03z1m09vf2gd277xp3y5nhvgrp0fnbr2x0r9b92kp46ca09fq9y8"; depends=[ggplot2 httr raster]; }; prisonbrief = derive2 { name="prisonbrief"; version="0.1.0"; sha256="1fnhg6vqdabdnhvgd19vnkfrdgz8a53snfrx6m6mmdwb6cvavb8m"; depends=[data_table dplyr httr magrittr passport rlang rnaturalearth rnaturalearthdata rvest stringr tibble tidyr xml2]; }; pro = derive2 { name="pro"; version="0.1.1"; sha256="0f0iliq7bhf313hi0jbwavljic4laxfc0n3gac5y6hzm39gvvgag"; depends=[]; }; - prob = derive2 { name="prob"; version="1.0-0"; sha256="0gnp3q3dm176c1n7vdgisv3p11m2jk1hiza1yi8qaqyd9mfh86bg"; depends=[combinat fAsianOptions]; }; probFDA = derive2 { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; }; probemod = derive2 { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; }; probsvm = derive2 { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; proccalibrad = derive2 { name="proccalibrad"; version="0.14"; sha256="0vr55rpcqh9wvy3bklssrimp42x85w3sanjgshfij657v68vmx46"; depends=[]; }; processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; }; - processmapR = derive2 { name="processmapR"; version="0.1.0"; sha256="0ng48vwjsn1kmviyz41v1x4d3wd4bwycyfim079hs6adf0wq6vys"; depends=[bupaR DiagrammeR dplyr edeaR ggplot2 ggthemes]; }; + processmapR = derive2 { name="processmapR"; version="0.2.0"; sha256="02gj8h30bmz02qhr2xw6b72sa872cn57blszhw1llfmk7ml1zys2"; depends=[bupaR data_table DiagrammeR dplyr edeaR ggplot2 ggthemes glue miniUI purrr shiny stringr]; }; processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; }; processx = derive2 { name="processx"; version="2.0.0.1"; sha256="0yw23lp9xjvbpswzghkmjiayw7p19hbvmgv58k3i6b8g5nav4qcg"; depends=[assertthat crayon debugme R6]; }; prodest = derive2 { name="prodest"; version="0.1.1"; sha256="1j8gqxswwvnd45givadlvblnsc3qli228gz77d7alc19qf1wrrvz"; depends=[DEoptim dplyr Matrix Rsolnp]; }; @@ -8834,9 +9013,9 @@ in with self; { propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; }; propagate = derive2 { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; }; properties = derive2 { name="properties"; version="0.0-8"; sha256="1x7zln1indckl090p9kv40snamkac3b8q45387jdqxajmsallxmb"; depends=[]; }; - prophet = derive2 { name="prophet"; version="0.1.1"; sha256="1knkkm3ai91rcak5c5199gjqazq3db8202knk7b846w0n4f77hn3"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr zoo]; }; + prophet = derive2 { name="prophet"; version="0.2"; sha256="1v8jznwy0158mpaym5a98d088zsrcaa1qfbqbqcdjzv0lv9wn0rr"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr]; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; - propr = derive2 { name="propr"; version="3.0.6"; sha256="1mnx6x0mmqbjj312jrr3nyl1lv7m765nla344wnliaaxwzkylgf9"; depends=[fastcluster ggplot2 igraph Rcpp]; }; + propr = derive2 { name="propr"; version="3.0.7"; sha256="0asp57f6z0v4qlngd84x0h72y3sc6j50yhxh0nxn47ngcxa0z07h"; depends=[fastcluster ggplot2 igraph Rcpp]; }; prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; }; protViz = derive2 { name="protViz"; version="0.2.31"; sha256="05bmxc5hq2bpd8saqs36wwkmbywkw7rm3b4zl1dxpdpxmywsbf1a"; depends=[Rcpp]; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; @@ -8845,7 +9024,7 @@ in with self; { proto = derive2 { name="proto"; version="1.0.0"; sha256="1l843p8vckjckdhgv37ngv47fga5jzy0n00pmipvp05nnaixk54j"; depends=[]; }; protoclass = derive2 { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; }; protoclust = derive2 { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; }; - protolite = derive2 { name="protolite"; version="1.6"; sha256="10ly0rscpmgdakzlr27h6d78d6ixvrh76xcyx68caffr3zydlfyq"; depends=[jsonlite Rcpp]; }; + protolite = derive2 { name="protolite"; version="1.7"; sha256="002vncki8r33z9k208h19q90jwjy3d58fk3xzkh6cbsv4hgay9g0"; depends=[jsonlite Rcpp]; }; proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; }; prototest = derive2 { name="prototest"; version="1.1"; sha256="0v65abrn73wgwnrrf6gv9f7p0qy12xlk9ishq9lq4qal1wlsrrjs"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; }; protr = derive2 { name="protr"; version="1.4-1"; sha256="01ly3908j4biabn9nwx2pfjsidgyf9zw8p50pd5342r0rvmg79dy"; depends=[]; }; @@ -8856,9 +9035,10 @@ in with self; { pryr = derive2 { name="pryr"; version="0.1.2"; sha256="1in350a8hxwf580afavasvn3jc7x2p1b7nlwmj1scakfz74vghk5"; depends=[codetools Rcpp stringr]; }; psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; }; psbcGroup = derive2 { name="psbcGroup"; version="1.4"; sha256="0l1hmgw4sislryws8hv7r2nglhcs6g9khg0372a70djvhz2l6gfi"; depends=[LearnBayes mvtnorm SuppDists]; }; - pscl = derive2 { name="pscl"; version="1.4.9"; sha256="15fij6n43hry1plgzrak9vmk9xbb7n4v2frv997bhwxbs6jhhfhf"; depends=[lattice MASS]; }; + pscl = derive2 { name="pscl"; version="1.5.1"; sha256="1905467qwd2jhc7cfrshpffj65vi0vsfnsg4pshpv68hs12924w3"; depends=[MASS]; }; pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; }; psd = derive2 { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; }; + psda = derive2 { name="psda"; version="1.0.0"; sha256="0zsvm6rqcxv186xbi8nqd4ak93lhrm1hp7339cks140vdp8yl7ys"; depends=[ggplot2 plyr raster rgeos sp]; }; pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; }; pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; }; pseval = derive2 { name="pseval"; version="1.3.0"; sha256="1iv3fa7ar9i7v9j5axbasmn8l8nvry4zvmb7fd8aql82f22szmbj"; depends=[survival]; }; @@ -8871,7 +9051,7 @@ in with self; { pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; }; pstest = derive2 { name="pstest"; version="0.1.1"; sha256="0k8413ilpbz23v210wz80mli7ajpc8p7y4pbn1za371qw04b81c5"; depends=[harvestr]; }; psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; - psych = derive2 { name="psych"; version="1.7.5"; sha256="0mzzd9qj57qn5cnmd3w31gyp7big70pyx7nkxiqv1q0ys3sg6i25"; depends=[foreign lattice mnormt nlme]; }; + psych = derive2 { name="psych"; version="1.7.8"; sha256="0daismb8pdk392vdy304hqx0m3jx62gx3a0hygjygc125rhfla7k"; depends=[foreign lattice mnormt nlme]; }; psychmeta = derive2 { name="psychmeta"; version="0.1.0"; sha256="0xrw24d09imzhh4r2dpby4ps10d211yp8nfixvi04pjhk8dz16j4"; depends=[boot dplyr ggplot2 MASS metafor reshape2 tibble tmvtnorm]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; psychomix = derive2 { name="psychomix"; version="1.1-4"; sha256="15yk3z11w4bzk6vljr13bkfhzycypww6blc1djb5iwl635xq1c49"; depends=[flexmix Formula lattice modeltools psychotools]; }; @@ -8885,7 +9065,7 @@ in with self; { ptw = derive2 { name="ptw"; version="1.9-12"; sha256="111b0s66p7fk6z6bnm3wckpfjxr1gshv0rqqy5wy6qg60hp7bcfd"; depends=[nloptr]; }; ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; }; ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; }; - pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.10"; sha256="0q4miancvvb7c3l9m9k1ij623k1f4h84zihgafvib5xy5mhzb312"; depends=[boot R2HTML RCurl XML]; }; + pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.11"; sha256="01b4dd28x3a25d0s8k0dwbcr6asaqh2b9c4fddg683i54q483lkd"; depends=[boot R2HTML RCurl XML]; }; pubprint = derive2 { name="pubprint"; version="0.2.1"; sha256="0lcav93i4lw0j491q8ga47iyski2kvmqvppq0jwa3144zfb3hnic"; depends=[stringr]; }; pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; }; pulsar = derive2 { name="pulsar"; version="0.2.5"; sha256="1qmyhj32dygnvqvjysvlhlxv9y8lyfnm8hzaycmh8g3lhymk2k9c"; depends=[Matrix]; }; @@ -8921,16 +9101,18 @@ in with self; { qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; }; qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; }; qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; - qdap = derive2 { name="qdap"; version="2.2.5"; sha256="13isxmi9vknl5c71434r16j301i86zpbzcqch8hiay51x3wbf2f0"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; + qdap = derive2 { name="qdap"; version="2.2.8"; sha256="1fxkfxhsxjbgicb065vldjpfwvz5m5cbgc5yn6n3i8bybw68wp2w"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.6"; sha256="1icivvsi33494ycd7vfqm9zx2g2rc1m3dygs3bi0ndi798z1cvx2"; depends=[]; }; qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; }; qdapTools = derive2 { name="qdapTools"; version="1.3.3"; sha256="0a28jn57d2fas3009cm10z07fq77ql3ffcrhcxsiimb57179wj0n"; depends=[chron data_table RCurl XML]; }; qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; qfasar = derive2 { name="qfasar"; version="1.2.0"; sha256="067wnwwz8s0yxig13wrjq37w62kf8p5pa8my5lfpc1ik1b7iysby"; depends=[Rsolnp]; }; - qgraph = derive2 { name="qgraph"; version="1.4.3"; sha256="1ymgi1ls2q22rwx1hv3h6flgfjx5l2dbmzh804jlq68wh8xf496j"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; }; + qgam = derive2 { name="qgam"; version="1.1.1"; sha256="15f2c0n4j8q1vgd3hi2q7lmf78a3zxi5a01p0lq0916jms08lk27"; depends=[doParallel mgcv plyr shiny]; }; + qgraph = derive2 { name="qgraph"; version="1.4.4"; sha256="0hgqjf5ljyrni0ifkq9x0ninyqwsaqd9z9i4d4phrww586590apn"; depends=[BDgraph colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; }; qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; }; qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; }; - qicharts = derive2 { name="qicharts"; version="0.5.4"; sha256="0lq9faksp18mgb6pa7qhbm9frd6f4675623d797snvnm67aiy8fa"; depends=[ggplot2 lattice latticeExtra scales]; }; + qicharts = derive2 { name="qicharts"; version="0.5.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; }; + qicharts2 = derive2 { name="qicharts2"; version="0.1.1"; sha256="16pjk3np2y3isd147f65islxmjwalrzgh91qgsd990xhdyf3kqcy"; depends=[dplyr ggplot2 scales]; }; qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; }; qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; }; qlcData = derive2 { name="qlcData"; version="0.1.0"; sha256="00xfr7dywvadyhs2z32za06fzdzmm20sn31grin0b3xw5qndai0f"; depends=[stringi yaml]; }; @@ -8948,6 +9130,7 @@ in with self; { qrNLMM = derive2 { name="qrNLMM"; version="1.4"; sha256="0h1jra247flipv4pwww8rn61pj8jxpiaw74f2czs950klnznp1xm"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; }; qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; }; qrcm = derive2 { name="qrcm"; version="2.1"; sha256="0wp6ynckh66gxi569wbvn5szwih4g0c21zrrpz3zfavhqwk7srgf"; depends=[pch survival]; }; + qrcmNP = derive2 { name="qrcmNP"; version="0.1.0"; sha256="0fhbycxzmz3bpr6y2i4aphqfclfriifrc8w10p8z10l8sabifrsx"; depends=[qrcm survival]; }; qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; }; qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; }; qrfactor = derive2 { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[cluster maptools mgraph mvoutlier pvclust]; }; @@ -8962,7 +9145,7 @@ in with self; { qte = derive2 { name="qte"; version="1.2.0"; sha256="1l911z52v3jp0b2agvwfny8d4yq0llrdp873j4mw696x50awj8py"; depends=[BMisc formula_tools ggplot2 Hmisc quantreg texreg]; }; qtl = derive2 { name="qtl"; version="1.41-6"; sha256="067az4v432zxp6lxck8d7vlh9w4r13r0mvw5zsglyaqwsh3d9sad"; depends=[]; }; qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; - qtlbook = derive2 { name="qtlbook"; version="0.18-5"; sha256="0qvfi8q92n9pa3zbinkk54404m0awhxla9ccflczgaq0vij2n7wf"; depends=[qtl]; }; + qtlbook = derive2 { name="qtlbook"; version="0.18-6"; sha256="0kbz7icp6fzl2bgk50fcg8x704aijpz3xbqrzraj7qa3z8gakaj6"; depends=[qtl]; }; qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; }; qtlcharts = derive2 { name="qtlcharts"; version="0.9-6"; sha256="021gx5qzrc7jbgpp91mn36czr7fsh37wf3c7cifcv3xwzc54j4dd"; depends=[htmlwidgets qtl]; }; qtlhot = derive2 { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[corpcor lattice mnormt qtl]; }; @@ -8978,12 +9161,12 @@ in with self; { qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; }; qualV = derive2 { name="qualV"; version="0.3-3"; sha256="1yyqk223ydcc0125gsn33a4mcdp8bd76fpn8kj9bfz9g78b8dqmx"; depends=[KernSmooth]; }; qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; }; - qualpalr = derive2 { name="qualpalr"; version="0.4.1"; sha256="0n2279ryx9x90c63dbk76rr473rj16x19l32vvm91r59ia2zl948"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; }; + qualpalr = derive2 { name="qualpalr"; version="0.4.2"; sha256="0lgg8r7w2fwd2nw8x3k876pyc9r3igqri57akc5fwi92gb8grj5b"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; }; qualtRics = derive2 { name="qualtRics"; version="2.0"; sha256="140scg03k2mzhadjsr85dm1z36a2g971iyypc2srh14gvd2w1n5l"; depends=[assertthat httr jsonlite lubridate sjlabelled stringr yaml]; }; qualvar = derive2 { name="qualvar"; version="0.1.0"; sha256="07vpq5nyh40y1sq1fsg97z7bbardqakq6bx635v42pv00480h9sh"; depends=[]; }; quantable = derive2 { name="quantable"; version="0.2.2"; sha256="179bqqrga8mpigchfmhf11sc75frhd9nd6yqclz85lnd6gl16yd7"; depends=[caret e1071 gplots Matrix pROC RColorBrewer scales]; }; quantchem = derive2 { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; }; - quanteda = derive2 { name="quanteda"; version="0.99"; sha256="0w34nkga8xhs219501vh6ks8s09qr44i44n9w8z23y2g2k65va65"; depends=[data_table fastmatch ggplot2 lubridate Matrix Rcpp RcppArmadillo RcppParallel RSpectra SnowballC stringi wordcloud XML yaml]; }; + quanteda = derive2 { name="quanteda"; version="0.99.9"; sha256="0rln64zykl4mwm7zs0jqkbrh9m7vafwdh6kyiylgw5vv3i7h06gm"; depends=[data_table fastmatch ggplot2 lubridate magrittr Matrix Rcpp RcppArmadillo RcppParallel RSpectra SnowballC stringi wordcloud XML yaml]; }; quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; }; quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; }; quantmod = derive2 { name="quantmod"; version="0.4-10"; sha256="12v83w2q8agvwwrjg9xwpamxmnqjays5xw51lhgbmnksasm40003"; depends=[curl TTR xts zoo]; }; @@ -9009,7 +9192,7 @@ in with self; { quipu = derive2 { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae pixmap shiny stringr xtable]; }; quotedargs = derive2 { name="quotedargs"; version="0.1.0"; sha256="1wnzcywrahcf2wwxnwqfxbfmrhzlq2ghfzbhs10gj9nsbbp1l0ch"; depends=[]; }; qut = derive2 { name="qut"; version="1.2"; sha256="1w6zsjphzfb1gby21cq20j8cclj15xklwga821sj07x3nchgn421"; depends=[flare glmnet lars Matrix]; }; - qvcalc = derive2 { name="qvcalc"; version="0.9-0"; sha256="0gccxl6l6ibffxkjzfmh2scm8f3bnqwm1hr7ss7dqshhxw21kd5c"; depends=[]; }; + qvcalc = derive2 { name="qvcalc"; version="0.9-1"; sha256="1ll71yww8rsbp0qa60w7vdna8yk60cq66cjn5cdk3bkdwyni28yy"; depends=[]; }; qwraps2 = derive2 { name="qwraps2"; version="0.2.4"; sha256="18ail1y3kpiiwgkf7zn1acfz1ipz7wbk8pcmlganayr8p9yv7sh2"; depends=[dplyr ggplot2 knitr Rcpp tidyr]; }; r_jive = derive2 { name="r.jive"; version="2.1"; sha256="0l0bhhp6bdc84pzxi7gnsxx3scycw0zahrnc496wx3j43np9hlsg"; depends=[abind gplots SpatioTemporal]; }; r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; @@ -9033,9 +9216,9 @@ in with self; { rChoiceDialogs = derive2 { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; }; rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; }; rDEA = derive2 { name="rDEA"; version="1.2-5"; sha256="1wsi2dkq9izvbhdqmd4qk8i277r1j38dk59fcmnxnwqvk6ar6nrb"; depends=[maxLik slam truncnorm truncreg]; }; - rDNA = derive2 { name="rDNA"; version="1.31"; sha256="051000q3wb9bjcwm3v60yfy1gpr6amvciy5sh498kl5vq7nv5wlv"; depends=[rJava]; }; rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; }; rDVR = derive2 { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; }; + rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; }; rEDM = derive2 { name="rEDM"; version="0.5.4"; sha256="1vhhc1yfswvba6qfff5y9l96g8xjw0szshzs4hd4yxh6rq1bnjlr"; depends=[Rcpp RcppEigen]; }; rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; }; rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; @@ -9058,7 +9241,7 @@ in with self; { rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.8.7"; sha256="17vq8lapiviyibl1jm12a73qq98bgpnh7xp66jnv3lfksv9q3ck6"; depends=[plyr]; }; rLiDAR = derive2 { name="rLiDAR"; version="0.1.1"; sha256="1w0yi4ygw0l9ydbllqjylp30d401bsf7b6fng6qg3pssbi9v3kln"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; }; rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; - rMR = derive2 { name="rMR"; version="1.0.4"; sha256="1md0xkl87qqylwh5zbx9awa5i4f573v4glgaf4k8h5ls4icaaav4"; depends=[biglm]; }; + rMR = derive2 { name="rMR"; version="1.0.5"; sha256="18p2z2njb6j8pj7i1mdwl91qynwqmszy8pck02bdynzdag47wl6r"; depends=[biglm]; }; rMouse = derive2 { name="rMouse"; version="0.1"; sha256="0pzxasap5kwxqq36mb4zi139jllsl4vk06dw2pv9xnwdxiszr3gp"; depends=[rJava]; }; rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; }; rNOMADS = derive2 { name="rNOMADS"; version="2.3.6"; sha256="007yha5ils7wdbld6id3gfgm99cks3vc64awammrv0kvq85c8g8k"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; }; @@ -9072,6 +9255,7 @@ in with self; { rSCA = derive2 { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; }; rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; }; rSPACE = derive2 { name="rSPACE"; version="1.2.0"; sha256="1nmv8niqc34mipzhny1mlwc9v4kck02ixmm1i25cqdfhsng03dma"; depends=[ggplot2 plyr raster RMark sp tcltk2]; }; + rSQM = derive2 { name="rSQM"; version="1.2.42"; sha256="0s4ncvrhxnpnxmrilsx6y57s00nc859b9czh08i6na1z31354cpj"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; }; rSymPy = derive2 { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; }; rTableICC = derive2 { name="rTableICC"; version="1.0.4"; sha256="0if18is64m3ka2dxfbj7vb1lbwwhn2hgfh3kdh7d47nr3z4ak7p0"; depends=[aster partitions]; }; rTensor = derive2 { name="rTensor"; version="1.3"; sha256="0ra34sn4g92r6asrn4la2wbsi2y0hnyx163wwi4v0j6f57bslhdw"; depends=[]; }; @@ -9107,6 +9291,7 @@ in with self; { randNames = derive2 { name="randNames"; version="0.2.3"; sha256="0vhzg14yg4c9inzxin8prfzh6nhf8fvbi4hbn122fyqyp5d6f8zi"; depends=[httr jsonlite tibble]; }; randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; }; randgeo = derive2 { name="randgeo"; version="0.2.0"; sha256="056c522zw2x4ab7z2bpkw9byfn1gzsfavbjaxdgwi4n934f46h14"; depends=[]; }; + randnet = derive2 { name="randnet"; version="0.1"; sha256="1mpz3dsbzd5hffv2v5p6jdp0z07f7rhgcjinr1lwggvxw37xwrkj"; depends=[AUC entropy irlba Matrix poweRlaw RSpectra]; }; random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; }; random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; }; randomForest = derive2 { name="randomForest"; version="4.6-12"; sha256="1i43idaihhl6nwqw42v9dqpl6f8z3ykcn2in32lh2755i27jylbf"; depends=[]; }; @@ -9141,7 +9326,7 @@ in with self; { rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; rarhsmm = derive2 { name="rarhsmm"; version="1.0.4"; sha256="0fc22sg4b3r1fjcmgc6kvpw1vxb29i8a1qlrkic8jmd1370dh61w"; depends=[glmnet]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; - rase = derive2 { name="rase"; version="0.3-2"; sha256="1c8navn518prz8j644bg1fzx8q1jgnl5src5kagq53ln7fs6jq73"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; + rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; raster = derive2 { name="raster"; version="2.5-8"; sha256="1k34caqj8fab7am44zmp1szk0w15rjc04xz3phzm2l1lg2yjm6a7"; depends=[Rcpp sp]; }; rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; }; rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; }; @@ -9153,7 +9338,7 @@ in with self; { ratesci = derive2 { name="ratesci"; version="0.2-0"; sha256="0gviaiia2jih6xx1maf9ajizmgh4vdbca4r17h9m817v3xn21y7b"; depends=[]; }; rationalfun = derive2 { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; }; ratios = derive2 { name="ratios"; version="1.1.0"; sha256="1nss6xfkm5axp8mld1aiqaygrmrwl2jn9k2476la2j3pla047xgm"; depends=[data_table stringr]; }; - rattle = derive2 { name="rattle"; version="4.1.0"; sha256="0ww4bwwvivpk049lpv6k29zxkb0islhwh2qnlrvasgh2b9yig25p"; depends=[magrittr RGtk2 stringi]; }; + rattle = derive2 { name="rattle"; version="5.1.0"; sha256="0xxf2wpazsk29y2byyk010n59vmzmhm4phpsqvklmsr1v3m10pvp"; depends=[cairoDevice dplyr ggplot2 magrittr RGtk2 rpart_plot stringi stringr tidyr XML]; }; rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; }; raw = derive2 { name="raw"; version="0.1.5"; sha256="0w0k35izvsi8vwp38har4ygh1zxnz7hfla8d8fcbvckpfbkwpggp"; depends=[]; }; rbamtools = derive2 { name="rbamtools"; version="2.16.6"; sha256="1sb18qx68fnj1d598lw8fkqnxp3c5s704g6cnhwy299gppj3xg1d"; depends=[refGenome]; }; @@ -9169,6 +9354,7 @@ in with self; { rbmn = derive2 { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; }; rbokeh = derive2 { name="rbokeh"; version="0.5.0"; sha256="1lpbph6bhh9rf5rs0ivp8dchx8i8ylz5nr7xc2xv9bnwlwj35729"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; }; rbounds = derive2 { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; }; + rbtt = derive2 { name="rbtt"; version="0.1.0"; sha256="1gbsb0vmqxcl28c5nn0rz95bxrvl7i0b17lq90cj5ahbk6x9jblz"; depends=[data_table]; }; rbugs = derive2 { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; }; rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; }; @@ -9217,6 +9403,7 @@ in with self; { rdrop2 = derive2 { name="rdrop2"; version="0.7.0"; sha256="03r3iqi796y7s8bnyca6nya2ys7s1rdxm00sy9c7l7sh0z6npcq4"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; }; rdryad = derive2 { name="rdryad"; version="0.2.0"; sha256="16wbf0hpb4pgjcq84s7ac0y1cm5i33l8n6li5z8ynivdj9w9fb46"; depends=[httr oai solr xml2]; }; rdwd = derive2 { name="rdwd"; version="0.8.0"; sha256="1j5yz5qlf7xv722rh8qsbazksgs7mwv2s789lnlpr8cv127qfh8d"; depends=[berryFunctions pbapply]; }; + re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; }; reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; }; reReg = derive2 { name="reReg"; version="1.0-0"; sha256="0xd78frrzykdrdwj39vv5m11s5v3xg9fym200gz7sffw8vjv3z96"; depends=[aftgee BB MASS SQUAREM survival]; }; reactR = derive2 { name="reactR"; version="0.1.2"; sha256="011ga8f72qq0ljqc7j0qvcbbr2jg167ri1yny65n55dls80flmng"; depends=[htmltools]; }; @@ -9238,7 +9425,7 @@ in with self; { readxl = derive2 { name="readxl"; version="1.0.0"; sha256="1bf7gxw9r11m4llyymplxiaa4gzgyj4bwmwad5in756pzq3jzmpv"; depends=[cellranger Rcpp tibble]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; rebird = derive2 { name="rebird"; version="0.4.0"; sha256="1awwjr0gsd7hksh84fz5p17qwd857zn03fc2q0kzncy6q6iiw481"; depends=[dplyr httr jsonlite]; }; - rebmix = derive2 { name="rebmix"; version="2.9.2"; sha256="1vwral852bxb45ms7zvxd6q40ybnf8yjxklipzgw4ygk322mziww"; depends=[mvtnorm]; }; + rebmix = derive2 { name="rebmix"; version="2.9.3"; sha256="1dw1az7wzkhxcc8ixcmdxrlc4hzi2c4093brvj1m4z44mrw28vws"; depends=[mvtnorm]; }; rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; }; rebus_base = derive2 { name="rebus.base"; version="0.0-3"; sha256="1n2khszcya9k6379bdkq47xi2nw9jngiwj7z8a14wfswqydczv6y"; depends=[]; }; rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; }; @@ -9248,13 +9435,13 @@ in with self; { rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; }; recipes = derive2 { name="recipes"; version="0.1.0"; sha256="0rydk403qihxmcv3zz323r3ywk4g1v7ibvj452rxhm0z22sqk9kb"; depends=[ddalpha dimRed dplyr gower ipred lubridate magrittr purrr RcppRoll rlang tibble tidyselect timeDate]; }; recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; }; - recmap = derive2 { name="recmap"; version="0.5.20"; sha256="1ld3ifcn9rwgk4hiislmdkz73sdxagrbynq9x3mswjifx1hlqj6d"; depends=[GA Rcpp sp]; }; + recmap = derive2 { name="recmap"; version="0.5.24"; sha256="0ijs331f9x6r2qamx5b47x4wblz2pg7k5b7593hdwhiiwzh5c0ly"; depends=[GA Rcpp sp]; }; recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; }; recommenderlab = derive2 { name="recommenderlab"; version="0.2-2"; sha256="13mgkxrcwh5ry699my3w6xgm6rabsk9fd5qqsdwzy7cfq6xkq7cg"; depends=[arules irlba Matrix proxy registry]; }; recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; }; recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; }; reconstructr = derive2 { name="reconstructr"; version="2.0.0"; sha256="1pa6b8zns9495f1bdifvx19hsy5808hqbxb2bn1srwnr4s3ma1zi"; depends=[openssl Rcpp]; }; - recosystem = derive2 { name="recosystem"; version="0.4.1"; sha256="1gnq2gq47qwinack3f95d7c8877qia44zk9pnj1sx83jjs8sxk8p"; depends=[Rcpp]; }; + recosystem = derive2 { name="recosystem"; version="0.4.2"; sha256="1bn6l23gqmfpr6w60ph7zgv53vy3vnq9zdy5x0a8n1yp6b0lw48x"; depends=[Rcpp RcppProgress]; }; red = derive2 { name="red"; version="1.2.0"; sha256="0g15yx1wk70ds3qadfzv2hkiyliwfgzc1h66klhqi1n4f8gsalcz"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; }; redR = derive2 { name="redR"; version="1.0.0"; sha256="01safawd9ai34fqxjpc161yzpsk31hfyl8ybcfvdj7a9vdbvcb5i"; depends=[imager]; }; reda = derive2 { name="reda"; version="0.3.1"; sha256="0313x4vm0jm0lgzspv0ldsblmjgy13dqbsafpikkh603k5pkq1js"; depends=[ggplot2 splines2]; }; @@ -9276,6 +9463,7 @@ in with self; { regRSM = derive2 { name="regRSM"; version="0.5"; sha256="0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s"; depends=[doParallel foreach Rmpi]; }; regclass = derive2 { name="regclass"; version="1.5"; sha256="0kha9b5ki55ggwh8cmlphg1alf1dq8if5dknisfbvd3f2x4dqf02"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; }; regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; }; + regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; }; regexr = derive2 { name="regexr"; version="1.1.0"; sha256="1gjv4wl4gjsh5rr0kz057x9j4dhikrm3zzlmxlhd1f9srjdmcdzy"; depends=[]; }; reghelper = derive2 { name="reghelper"; version="0.3.3"; sha256="0lsdsxi3nawqdzs7k1xma95mmywl86k517cihiv8q2s4maihsja3"; depends=[ggplot2 lme4 nlme]; }; registry = derive2 { name="registry"; version="0.3"; sha256="0c7lscfxncwwd8zp46h2xfw9gw14dypqv6m2kx85xjhjh0xw99aq"; depends=[]; }; @@ -9284,7 +9472,7 @@ in with self; { regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; }; regress = derive2 { name="regress"; version="1.3-15"; sha256="1cgr0r49cmr8nzs2lr2cm8lli1i8azyas0lbnf1681kyab15c0r7"; depends=[]; }; regsel = derive2 { name="regsel"; version="0.2"; sha256="0wwwpawqsqimaldy0zxnqsy23nwp30ypa5dnrnndwhbs4qz99c9w"; depends=[elasticnet glmnet]; }; - regsem = derive2 { name="regsem"; version="0.8.1"; sha256="14y69n0br9dz40kppwhc47g46r0naqxvz03l9pf62idl9ivgkqsf"; depends=[lavaan Rcpp RcppArmadillo]; }; + regsem = derive2 { name="regsem"; version="0.9.2"; sha256="1xbqmsgw98hwwyx4cf9qsjhkwkzhv14fsnwb3jrmqmmcg97w4rwp"; depends=[lavaan Rcpp RcppArmadillo]; }; regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; }; regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; }; @@ -9323,9 +9511,9 @@ in with self; { repijson = derive2 { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; }; replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; }; replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; }; - replyr = derive2 { name="replyr"; version="0.5.2"; sha256="1a1z9xxwcyhyy03xq60xirl9f307l45xwi09h49c2r51l662n12f"; depends=[DBI dplyr RSQLite wrapr]; }; + replyr = derive2 { name="replyr"; version="0.5.3"; sha256="1v05a3lyb63fcygwg4392lnrmr0zsk26x18a78jrnqnrx8c00wg2"; depends=[DBI dplyr RSQLite wrapr]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; - repo = derive2 { name="repo"; version="2.0.2"; sha256="1rgcgl1a0sz3mnj0ny7507bkrlxbbh7ab39jwfm99ssipia12jjh"; depends=[digest]; }; + repo = derive2 { name="repo"; version="2.1.1"; sha256="0raxdjar1fzfr4122zd5hq9pifs13kkswpc0lfqxfzk9izwdk5f7"; depends=[digest]; }; repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; }; reportROC = derive2 { name="reportROC"; version="1.0"; sha256="0w570vvpwnz78kx4pfgri4lfx7l8xn6zjclimx2rskx5c2z3q5w7"; depends=[pROC]; }; reportReg = derive2 { name="reportReg"; version="0.1.0"; sha256="1xnrc7c73d5gwz6381z2nikg7jy1sygm6iw6raah8yrdzv5d816d"; depends=[]; }; @@ -9339,6 +9527,7 @@ in with self; { reprex = derive2 { name="reprex"; version="0.1.1"; sha256="0jxsnlspy12dnbpkghkmkr6p6783dhvsk3g9mj7gpn5j74qfk6li"; depends=[callr clipr knitr rmarkdown whisker]; }; reproducer = derive2 { name="reproducer"; version="0.1.9"; sha256="092gz58sanpawgg0jk1634x9ki0jw460csbb6cywp0ndghswfgwh"; depends=[ggplot2 gridExtra lme4 MASS metafor openxlsx xtable]; }; reproducible = derive2 { name="reproducible"; version="0.1.3"; sha256="0a5czpvydy5z98yh6dbhwfya5jix630g0zh3yf1xja069fj6bgav"; depends=[archivist data_table devtools digest fastdigest git2r magrittr raster sp]; }; + repurrrsive = derive2 { name="repurrrsive"; version="0.1.0"; sha256="1ffldcs30xa4wcd825bgpcmqsndfyxx70dfmbb3c86ic9kq17p01"; depends=[tibble]; }; reqres = derive2 { name="reqres"; version="0.2.0"; sha256="1sy88adw45fxyvi4ma25zplsvqi71rknjc0qi66p7yfs260l9hgj"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; }; request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; }; requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; }; @@ -9355,10 +9544,10 @@ in with self; { restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; }; restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; }; restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; }; - restriktor = derive2 { name="restriktor"; version="0.1-55"; sha256="1yrzx7w14s04ppc16iw2hialx1k6k45ag9702vm8cnf31hm14kxp"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; + restriktor = derive2 { name="restriktor"; version="0.1-70"; sha256="07j6ypd5jms7kfk0fnlncvwdbmjbfpq3j1fb5j6s2kqn8d21wqy7"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; }; rethinker = derive2 { name="rethinker"; version="1.0.0"; sha256="0a28r0rkg4m6jsrvczkkpdqrca3q5l5pgb4wyz6pvy5scjlvmpls"; depends=[rjson]; }; - reticulate = derive2 { name="reticulate"; version="1.0"; sha256="0ych5f6kp9gq9lgwhi4ga3n4abqgqbbxfbw3ib6wsq0dgvz9d2p9"; depends=[jsonlite Rcpp]; }; + reticulate = derive2 { name="reticulate"; version="1.1"; sha256="0ahfhir3mg33zry5i1l584ics37viw6pga9i5v0y6v1kr5krjmrn"; depends=[jsonlite Rcpp]; }; retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; retistruct = derive2 { name="retistruct"; version="0.5.12"; sha256="11m4i29i3zqh9chyjgdhzqj4yqlslfm8y4q0x14xxc2r9lqbkj9l"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; @@ -9372,7 +9561,7 @@ in with self; { rex = derive2 { name="rex"; version="1.1.1"; sha256="0cs13hqv2wb549rhq84psky401pz8r41ia7c0pnyvhxfa2l6zrr8"; depends=[lazyeval magrittr]; }; rexpokit = derive2 { name="rexpokit"; version="0.26.1"; sha256="12zg56gv9miqlhyi4c61nk2fpgz40xi1kd2wzgs4sjwxn5g8cgvk"; depends=[Rcpp]; }; rfPermute = derive2 { name="rfPermute"; version="2.1.5"; sha256="0c7yi395j640mvnr1qlm9hy1w6vva33fa2lqb3amzkafy4j1cs63"; depends=[abind ggplot2 gridExtra randomForest reshape2 swfscMisc]; }; - rfUtilities = derive2 { name="rfUtilities"; version="2.1-0"; sha256="0zjk7rb9k0fpamdll57zxrihvxykn1821v7xkwgfhkwl9rxi8s0f"; depends=[randomForest]; }; + rfUtilities = derive2 { name="rfUtilities"; version="2.1-1"; sha256="0dycsq5w4a2j5xzk5i8mbv742ryv1q0lyi3i7yfjl9vfbm1p1wjw"; depends=[randomForest]; }; rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; }; rfishbase = derive2 { name="rfishbase"; version="2.1.2"; sha256="1w8jk6qfhyzzmxf8qnqqwckm4syrqimi8k6dqmwflgxz6bsxcz0v"; depends=[dplyr httr lazyeval tidyr]; }; rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; }; @@ -9385,20 +9574,20 @@ in with self; { rgam = derive2 { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; }; rgbif = derive2 { name="rgbif"; version="0.9.8"; sha256="17pixyx2wicxdwqz7mziharanqdv865hmb9lz2kfqy1gzpv29jp2"; depends=[crul data_table geoaxe ggplot2 jsonlite magrittr oai tibble whisker wicket xml2]; }; rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; - rgdal = derive2 { name="rgdal"; version="1.2-8"; sha256="09dawi9a4b97vi0flga7b2iy3xgpm03qxjy9j0c0j47b1vkwfz5q"; depends=[sp]; }; + rgdal = derive2 { name="rgdal"; version="1.2-11"; sha256="06hna03nk74hsqyzn9px8gy9m2yk8azc0y5if4j1mdxv0agkydwv"; depends=[sp]; }; rgenoud = derive2 { name="rgenoud"; version="5.7-12.4"; sha256="19y0297fsxggjrdjv8n3a5klbqf8y3mq4mmdz6xx28cz3k65dk4n"; depends=[]; }; rgeoapi = derive2 { name="rgeoapi"; version="1.1.0"; sha256="0k8p1l0vrgx0bifbc2i9gxxwih513vbqhjh7fiifyfq3r74i4j7k"; depends=[httr magrittr rjson]; }; rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; }; - rgeos = derive2 { name="rgeos"; version="0.3-23"; sha256="0p04szj4bcsycj6lgnq65dgsc3w807hdqp5zrd5zxgclhqryq9nm"; depends=[sp]; }; + rgeos = derive2 { name="rgeos"; version="0.3-25"; sha256="0fjk2xmly0p27r6rmcns1m2xza8fwl6is4126xpaj1c9nhg684yi"; depends=[sp]; }; rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; }; rggobi = derive2 { name="rggobi"; version="2.1.21"; sha256="0zi4rhggngm0y8dsjxqlr2mmfc5wzi7l1qcp5gin4bjlbyf8yb3z"; depends=[RGtk2]; }; rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; }; rgl = derive2 { name="rgl"; version="0.98.1"; sha256="11k93b3wkfasx63w0niin1ns1kgzrmjm66la7kvp5rljw3cvwjaz"; depends=[htmltools htmlwidgets jsonlite knitr magrittr shiny]; }; - rglobi = derive2 { name="rglobi"; version="0.2.9"; sha256="15kc3gb998ryrnpw6nn87vsg63xknchs0hbl33g9napyj5wjmmiw"; depends=[RCurl rjson]; }; + rglobi = derive2 { name="rglobi"; version="0.2.10"; sha256="1y4li552ly5ww7rd6da7kbm5v5r6hwm7n2475dwlqyshnsc3x3gh"; depends=[RCurl rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; rgp = derive2 { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; }; rgpui = derive2 { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[emoa rgp shiny]; }; - rgr = derive2 { name="rgr"; version="1.1.13"; sha256="1l6cf3hmi6mzsqg6dpnw90a6ljhvwar4rjjkamx4mc9hlfsrkggq"; depends=[fastICA MASS]; }; + rgr = derive2 { name="rgr"; version="1.1.14"; sha256="1g5ssxfamghl7d8smlb9zwk31zf5m090y9f88nripad4k9l58fkl"; depends=[fastICA MASS]; }; rgrass7 = derive2 { name="rgrass7"; version="0.1-9"; sha256="079rkzxpp6l9gppnag83sq87y5l6pby3k0dg32065sr758yr3vx0"; depends=[sp XML]; }; rgw = derive2 { name="rgw"; version="0.1.0"; sha256="12f7bsfg24cld9y47jyqxswgc1bk4adbhhdpycapinbcfhyzc91p"; depends=[]; }; rhandsontable = derive2 { name="rhandsontable"; version="0.3.4"; sha256="1ng97l2x9hyqv3cckis81p5bxm4wndv6sipyxy26x9pnyw9lq3kp"; depends=[htmlwidgets jsonlite magrittr]; }; @@ -9444,7 +9633,7 @@ in with self; { rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; }; rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; }; rlang = derive2 { name="rlang"; version="0.1.2"; sha256="1yc5qyq6h0nrya7m2fqnfv19zh5xwsl28jx6zi2g1zz6ra4cvkwh"; depends=[]; }; - rlas = derive2 { name="rlas"; version="1.1.4"; sha256="0cf5ixz7hpjwfny23yf622z7d1l282las5q8jh675v5ai67ayyb0"; depends=[data_table Rcpp]; }; + rlas = derive2 { name="rlas"; version="1.1.5"; sha256="04s71d724yjwdlh5906l6c4dra3q6pqvvqimlx51jjb75yf761pv"; depends=[data_table Rcpp]; }; rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; }; rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; }; rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; }; @@ -9464,7 +9653,7 @@ in with self; { rmdformats = derive2 { name="rmdformats"; version="0.3.3"; sha256="06nyrdhy26mvgfb1bnlbd8hslybpc01a30a40wwlc3ay7yp0nzrj"; depends=[bookdown htmltools knitr questionr rmarkdown]; }; rmdshower = derive2 { name="rmdshower"; version="2.0.0"; sha256="0prxq0zakcm5lh1ki15d1d267yxr43295zcxigpy011lawccaglm"; depends=[rmarkdown]; }; rmeta = derive2 { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; }; - rmetasim = derive2 { name="rmetasim"; version="3.0.5"; sha256="0a5pn146ds4biswh59kaddzryd80l54rhcaqsryhmv6pp4ywg5a1"; depends=[ade4 adegenet gtools pegas]; }; + rmetasim = derive2 { name="rmetasim"; version="3.1.3"; sha256="1i1rrfgjh1axvd6kdjlm19i3qj0zif7k4dvlfh64ayg8i3nwb38p"; depends=[ade4 adegenet gtools pegas]; }; rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; }; @@ -9474,7 +9663,7 @@ in with self; { rms = derive2 { name="rms"; version="5.1-1"; sha256="1qxzs640yq61629d0fb9ydbx222fbd7q922jrw5v8d64yn6r92f4"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; }; rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; }; rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; }; - rmumps = derive2 { name="rmumps"; version="5.1.1-2"; sha256="17yngpzzka93ryma8sdbdpnzji8501l90vvajqxfn9dyrwyq0hpy"; depends=[Rcpp]; }; + rmumps = derive2 { name="rmumps"; version="5.1.1-3"; sha256="1bkz6kdyjrz88f0awp9zx0kv3jx2fqpnf8ip2vhrpwcgrbv6d0d8"; depends=[Rcpp]; }; rmutil = derive2 { name="rmutil"; version="1.1.0"; sha256="0f30afqbzrsgbnfpniwhbw4b8hlzc5zyaixvn9giggzwczfnf29k"; depends=[]; }; rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; }; rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; }; @@ -9495,10 +9684,10 @@ in with self; { robCompositions = derive2 { name="robCompositions"; version="2.0.6"; sha256="1r74w6ssq9fhjain02hr9sz0x2j1fi1waw7319gls69kp73b51hw"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM]; }; robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; robeth = derive2 { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; }; - robets = derive2 { name="robets"; version="1.2"; sha256="0nsp3wwwpnyv94ga3rqndddh374hz70gi1fsvp8gc050sxhmmml0"; depends=[forecast Rcpp]; }; + robets = derive2 { name="robets"; version="1.3"; sha256="123f08h763ifd2ydh1hp3jp6gqnc12cia9ndlp8jxkck8l3pnwkh"; depends=[forecast Rcpp]; }; robfilter = derive2 { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; }; robmed = derive2 { name="robmed"; version="0.1.1"; sha256="1716vzci0lmim4n28bc2pjky1shjxqrclgllj3hc4dzf8j22dxbz"; depends=[boot ggplot2]; }; - robotstxt = derive2 { name="robotstxt"; version="0.4.0"; sha256="11swx64aavim9q47b9qv4h9kpshq80wcb2ib74dmkjckmd8yxyjy"; depends=[httr stringr]; }; + robotstxt = derive2 { name="robotstxt"; version="0.4.1"; sha256="1azsdddy5vcr0qw6fh2n9hz4j4lq6p04p6ckvckkbf6a52bmnifa"; depends=[httr magrittr stringr]; }; robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; }; robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; }; robust = derive2 { name="robust"; version="0.4-18"; sha256="1b7qh1aff500nd6dh4y2ipmjgdiq8991shflb63pc39vpc0ny6g4"; depends=[fit_models lattice MASS robustbase rrcov]; }; @@ -9563,7 +9752,7 @@ in with self; { rpdo = derive2 { name="rpdo"; version="0.2.2"; sha256="1yzvi4givrwpbs56p2vf0gciaigq50qq0r0n5lyaqk73azzhnhxc"; depends=[curl datacheckr dplyr lubridate magrittr readr stringr tidyr]; }; rpf = derive2 { name="rpf"; version="0.53"; sha256="16d28i8s7f6ag1jvxw1ns8pi3s1rbxp9z9l13bxsm6cd6kq5jgrq"; depends=[mvtnorm RcppEigen]; }; rpg = derive2 { name="rpg"; version="1.5"; sha256="0hjfzikaryr55xjfw7zjdby4ja59rxq9ikycgbpapvpy2q9py5yp"; depends=[getPass RApiSerialize Rcpp uuid]; }; - rpgm = derive2 { name="rpgm"; version="1.0.1"; sha256="15qg4hd2bs7wc2snm3m0vl1mv34ppf4w61da42ix7jc1ya9n3990"; depends=[]; }; + rpgm = derive2 { name="rpgm"; version="1.0.2"; sha256="1pr4s6q9cbw3895c2wal9ydd0fqrcancc35y5nchy0bbmgqagzpg"; depends=[]; }; rphast = derive2 { name="rphast"; version="1.6.5"; sha256="1jff94hx7skvd6icbrcyabsvz80sgqqv28vz91mcz5jh6v6afhl3"; depends=[]; }; rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; }; rpivotTable = derive2 { name="rpivotTable"; version="0.2.0"; sha256="0h7za8bmyg7b150l7a2jz6czxdh4gi0q0gv6ddpdlgk86slw9nmh"; depends=[htmlwidgets]; }; @@ -9576,11 +9765,11 @@ in with self; { rpostgis = derive2 { name="rpostgis"; version="1.3.0"; sha256="09q54si187wv2bh2akrdan3d1klx9jczi6bllpl5iwjp1wasxiys"; depends=[DBI raster rgeos RPostgreSQL sp]; }; rpostgisLT = derive2 { name="rpostgisLT"; version="0.5.0"; sha256="0dvzprhwdqm763b0n82vzj4blns9chlcpp7wkrsm1w67zakn02mk"; depends=[adehabitatLT DBI rpostgis RPostgreSQL sp testthat]; }; rpql = derive2 { name="rpql"; version="0.5"; sha256="1d5mr04jk08l617zkqn13njglwj0w9an1rix937bcxw69blshahi"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm]; }; - rprev = derive2 { name="rprev"; version="0.2.3"; sha256="14p79f0mkvgwk8bwjnr7gvkvs8c632z7hddcyyrwldpilwyjnsgc"; depends=[doParallel dplyr foreach ggplot2 lazyeval magrittr rms survival tidyr]; }; + rprev = derive2 { name="rprev"; version="0.2.4"; sha256="1krrplgi2qfcm5kdz2am8fq8kjx67gjwxyd4ylf406r18xbvjd1d"; depends=[doParallel dplyr foreach ggplot2 lazyeval magrittr rms survival tidyr]; }; rprime = derive2 { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; }; rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; }; rprojroot = derive2 { name="rprojroot"; version="1.2"; sha256="1fgyxv1zv04sllcclzz089xl6hpdzac7xk61l0l4acb7rqsx5d18"; depends=[backports]; }; - rpsftm = derive2 { name="rpsftm"; version="1.1.0"; sha256="028y67pri687xwxf2k32qhyfz45gv49aj3qm3y67c5znsdagj2c0"; depends=[ggplot2 survival]; }; + rpsftm = derive2 { name="rpsftm"; version="1.2.0"; sha256="1k6qnc025l4f1klwllf9whd14v389wj2b5a7q5jj2b7d99pfkqri"; depends=[ggplot2 rootSolve survival]; }; rpst = derive2 { name="rpst"; version="1.0.0"; sha256="10cbgj67lqgh5bawwa0nwj9kfl3jg4vdm121kc61q199v8dw7nrz"; depends=[plotrix survival]; }; rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; }; rptR = derive2 { name="rptR"; version="0.9.2"; sha256="0qa9ml4kmmm0r06akf9azra0z3903w1qfi2zkvzhxahp508l20gs"; depends=[lme4 pbapply]; }; @@ -9595,7 +9784,7 @@ in with self; { rrcovNA = derive2 { name="rrcovNA"; version="0.4-9"; sha256="1qc9xqm5x55dqjx1y7s4a2nwc07v32rygicbb8469knxasf92cs3"; depends=[cluster lattice norm robustbase rrcov]; }; rrecsys = derive2 { name="rrecsys"; version="0.9.7.1"; sha256="03qdpy6n1f4bqnpladzp0qc3ky7ccdjr176m6pla7x205pll03w7"; depends=[ggplot2 knitr MASS Rcpp registry]; }; rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; }; - rredlist = derive2 { name="rredlist"; version="0.3.0"; sha256="1w59rqwgx3hr9icw8pzwc95117vrqkj3mq197kp0qy8xbkf83h8v"; depends=[crul jsonlite]; }; + rredlist = derive2 { name="rredlist"; version="0.4.0"; sha256="0j2hab26zs9dyg9fggza7yffbvwvnmrk5frbfs2ys8h3hg2x6ncy"; depends=[crul jsonlite]; }; rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; }; rrepast = derive2 { name="rrepast"; version="0.6.0"; sha256="1d6nk6437c4bxbyvpzdlgd1kxh651979m0k7aadi9fl77i5k2x3w"; depends=[digest ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.2"; sha256="1d9dwgw8la8wwq9cdnl7qibkzbdl4cj0qvf05x7w13ip973dwpaq"; depends=[eha mc2d msm tkrplot]; }; @@ -9606,7 +9795,7 @@ in with self; { rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; rsample = derive2 { name="rsample"; version="0.0.1"; sha256="1l2b6wy9pgq84c40wpj5rnbx25cdp226fw6lmx93wri29a613652"; depends=[broom dplyr purrr rlang tibble tidyr]; }; rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; - rscala = derive2 { name="rscala"; version="2.3.1"; sha256="01hhw6gsl95r0cm1zfgm7s64diqik14wzvc99sw1xkykmq8shjc9"; depends=[]; }; + rscala = derive2 { name="rscala"; version="2.3.5"; sha256="0y92n0fciz0sn23i992p64smq8q9llj8yvwz5crqjjp9yv23hxcd"; depends=[]; }; rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; }; rsconnect = derive2 { name="rsconnect"; version="0.8.5"; sha256="0y2sajcw1yngig06l7bxzcw993jbx13fl47fag9fa4f70qpnnwmq"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; }; rscopus = derive2 { name="rscopus"; version="0.4.6"; sha256="0s8ahdp884yy2hpa5kq9d4kcnr0hx662wp7h0qi399pc0y1rydwm"; depends=[httr plyr]; }; @@ -9626,20 +9815,22 @@ in with self; { rsoi = derive2 { name="rsoi"; version="0.3.0"; sha256="0syl90akbbg50pyhsa4nyq2r4psi2n6qg48a4nxprgz412n8rjbv"; depends=[dplyr lubridate readr]; }; rsolr = derive2 { name="rsolr"; version="0.0.8"; sha256="1swhg7hnkdphnw0d9jrzn18nk2v5a6ny7n652fh8d0k88a27xx4d"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; }; rspa = derive2 { name="rspa"; version="0.2.1"; sha256="0m3h25jxfccdqy4gf3cls4wcdpw580yfmb3lvw4ndfva8lj2q6sy"; depends=[lintools validate]; }; - rsparkling = derive2 { name="rsparkling"; version="0.2.1"; sha256="1kc34li3an6nzyf81w02p0dk8jys50mvl8cdz25vjr01d2dh5vf6"; depends=[h2o sparklyr]; }; + rsparkling = derive2 { name="rsparkling"; version="0.2.2"; sha256="0ji7890ba6ry553kgffsgsqmk5lawg3jyd4y6y59a2a4ysvvwq8z"; depends=[h2o sparklyr]; }; rsq = derive2 { name="rsq"; version="1.0"; sha256="151f7pngx54wpawb5hchacj0rbymdzyki16fkj9291cfz1cqbcx9"; depends=[MASS]; }; rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; }; rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; }; rstan = derive2 { name="rstan"; version="2.16.2"; sha256="0irqh4ggk23s3c0ipihwv8m0qmkxh5j7vdxgnsarhqca6254r2vb"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; }; rstanarm = derive2 { name="rstanarm"; version="2.15.3"; sha256="00x4ayqp31sypzhbdg6pv627w1p134qlgn7jvgxszihc7dcfb7fg"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders]; }; + rstansim = derive2 { name="rstansim"; version="0.1.1"; sha256="09hg4ishzp6q90nrl94h21al0ad0jn7fr8brp8f0xa9cvkwlzjpg"; depends=[doRNG doSNOW foreach loo Rcpp rstan]; }; rstantools = derive2 { name="rstantools"; version="1.3.0"; sha256="080mn4yh7fhd5qww1zr6l14gfsk5d6fakm8x2lmsqkn42j2i6cw9"; depends=[]; }; rstatscn = derive2 { name="rstatscn"; version="1.1.1"; sha256="0aj4x3lyrldpgh90v90qbxylndacn5ri5yqff3qy53q45ar7yji3"; depends=[httr jsonlite]; }; rstiefel = derive2 { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; }; - rstpm2 = derive2 { name="rstpm2"; version="1.3.4"; sha256="0vm5w597lz3zzklm21avxm88lqgrn9k2hlfh4yvmqk4vmwp4qkcc"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; }; + rstpm2 = derive2 { name="rstpm2"; version="1.4.1"; sha256="0pgy9a8llj0zzzc06afzd0w11mdbx3xvmjf0qpzvsid1zqdbcqxr"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; }; rstream = derive2 { name="rstream"; version="1.3.5"; sha256="1wprsnwl63cc4a6j5h18r09wlh32bq5z6hj6r5klp7rkpjchsplp"; depends=[]; }; - rstudioapi = derive2 { name="rstudioapi"; version="0.6"; sha256="1zkvz72z6nw0xc8bhb21y5x1nk6avijs0w8n4vsbvw9sn76wc96s"; depends=[]; }; + rstudioapi = derive2 { name="rstudioapi"; version="0.7"; sha256="133s75q2hr6jg28m1wvs96qrbc9c4vw87migwhkjqb88xxvbqhd5"; depends=[]; }; rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; }; rsunlight = derive2 { name="rsunlight"; version="0.4.2"; sha256="1m4ya960zjqxbjcjj42gjmdy40ac7m471fkfsd0r6w675qbiiw87"; depends=[httr jsonlite plyr stringr]; }; + rsurface = derive2 { name="rsurface"; version="1.0.2"; sha256="0lmwk8gk9h9np5fp652zvlapfdwgifarmib23dnifn5d904ia2sl"; depends=[plotly rsm]; }; rsurfer = derive2 { name="rsurfer"; version="0.1"; sha256="1qxnvhlwdiianzkj3hidg1qkqzai0ds8k1y67cvjlfcdyy4f01w9"; depends=[gdata stringr]; }; rsvd = derive2 { name="rsvd"; version="0.6"; sha256="0vrsgxbbk5n51i1s80bixcxph2ws86zpbdqs81yfvnzghrc99nas"; depends=[]; }; rsvg = derive2 { name="rsvg"; version="1.1"; sha256="17jfspbvlfp2cdw9s4m128rqw5kvb7i5h335569n3518spqmgi4f"; depends=[]; }; @@ -9674,7 +9865,7 @@ in with self; { runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; }; runjags = derive2 { name="runjags"; version="2.0.4-2"; sha256="035sxmh0b0m6dwz8qbpsmw2p7ihkx3cxgkhj27i0j6dsjryl3x4p"; depends=[coda lattice]; }; rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; }; - rust = derive2 { name="rust"; version="1.2.2"; sha256="0q2wc9jvlf063lkf3m1qz587wsgjiba8bfl6hw0v3myshjqx08xm"; depends=[Rcpp RcppArmadillo spatstat]; }; + rust = derive2 { name="rust"; version="1.2.3"; sha256="13aa8hq2zzzm1ydcva1067shxasqwhyfc4mxyvp4gsspgbpf8q2n"; depends=[Rcpp RcppArmadillo spatstat]; }; ruv = derive2 { name="ruv"; version="0.9.6"; sha256="12zi775nx6k1j9sz691x6r9r0arfnhwddf5nxbr1xk25dj9qa210"; depends=[]; }; rv = derive2 { name="rv"; version="2.3.2"; sha256="108s9q19h5ypxb9w4a8nk97js261izag1sf75g4xfqblwxxrbflc"; depends=[]; }; rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; @@ -9684,10 +9875,12 @@ in with self; { rversions = derive2 { name="rversions"; version="1.0.3"; sha256="0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"; depends=[curl xml2]; }; rvertnet = derive2 { name="rvertnet"; version="0.6.0"; sha256="1xxk4951vdg7qd1bn0hnnrsgnamdayc0vdw6kswpkbnzi9bfsmdk"; depends=[crul dplyr ggplot2 jsonlite maps]; }; rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; }; - rvg = derive2 { name="rvg"; version="0.1.4"; sha256="0jrnikx1d523amx32r34h4p64ipxs7i722rmlsg1nq39cb4dc36v"; depends=[gdtools officer Rcpp xml2]; }; + rvg = derive2 { name="rvg"; version="0.1.5"; sha256="1ssvglkq8f0zmrsn55nwfw8zrsk9nlsb3mbvhmnzg4xl967zdfwz"; depends=[gdtools officer Rcpp xml2]; }; rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; - rwalkr = derive2 { name="rwalkr"; version="0.2.0"; sha256="0z5g45m3ica6r5ah1jnsrvgnxsbwh5n7c5f3dhkgf4m2j6cdpl8g"; depends=[dplyr tidyr]; }; + rvinecopulib = derive2 { name="rvinecopulib"; version="0.1.0.1.1"; sha256="015cmq7hdizzb49jr0y6zgrr4ncwn17s166r3bbfnln814bq6g86"; depends=[BH lattice Rcpp RcppEigen RcppProgress]; }; + rwalkr = derive2 { name="rwalkr"; version="0.3.1"; sha256="04pkzifj1gx7915s8d3gq9w90vcpy8lchag6r72qg4p78lq1qjbk"; depends=[dplyr httr tidyr]; }; rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; }; + rwc = derive2 { name="rwc"; version="1.1"; sha256="0gdpskj87wjnpas90i3iqn1qv6frrki2xqiyyakg3zpaviw1imag"; depends=[MASS Matrix mvtnorm raster]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; @@ -9723,7 +9916,7 @@ in with self; { sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; }; saeRobust = derive2 { name="saeRobust"; version="0.1.0"; sha256="1zin9ix4wx3qbx2mfjyn61l0g1k4dgn4ps79qn21y6l9r647ya9q"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules Rcpp RcppArmadillo spdep]; }; saeSim = derive2 { name="saeSim"; version="0.9.0"; sha256="19l41qpwspccphmgxi20p7f473lxxh8d86b0wyy5jq24phhd8awx"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; - saemix = derive2 { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; }; + saemix = derive2 { name="saemix"; version="2.1"; sha256="1g52vkqg2dfld7miakkmp23yf4yzc7ka0hbg2fl6ya9cq9m7wyqq"; depends=[]; }; saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; }; safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; }; safer = derive2 { name="safer"; version="0.1.0"; sha256="04hwncx9g9c6lb4l9f12nyld5wq4fqr8v4w0m64qhwyiv0zi8sh1"; depends=[assertthat base64enc sodium]; }; @@ -9764,12 +9957,13 @@ in with self; { sca = derive2 { name="sca"; version="0.9-0"; sha256="1xqdcxxsrsl8v2i8ifqcgb38vayz8ymay2sw4m9hmpma54a6r9j5"; depends=[]; }; scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; }; scagnostics = derive2 { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; }; - scales = derive2 { name="scales"; version="0.4.1"; sha256="1lqccfmqdwrw0cjyqvw2zvgpk2jvnqrfb303l1raqyyf3zxqhav4"; depends=[dichromat labeling munsell plyr RColorBrewer Rcpp]; }; + scaleboot = derive2 { name="scaleboot"; version="0.3-4"; sha256="16shdj4b8pbdbphqzw7r5xzx6k2qfkr729inv21gkp9qcp4h0vrm"; depends=[mvtnorm pvclust]; }; + scales = derive2 { name="scales"; version="0.5.0"; sha256="0zg9wfzmsdjxpbld0nzv7hcpq5r0wazqxmn7grvvif2agj0w1z6v"; depends=[dichromat labeling munsell plyr R6 RColorBrewer Rcpp viridisLite]; }; scalpel = derive2 { name="scalpel"; version="1.0.0"; sha256="0zk81q2f49vrbprlvjq3q4s2ak7rrlpj55rrfkqr8nq1vvi6nxd2"; depends=[gam igraph Matrix protoclust R_matlab SDMTools]; }; scalreg = derive2 { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; }; - scam = derive2 { name="scam"; version="1.2-1"; sha256="039iym85khym5m6g712lbd5s0c6dfw9xlpvlj29rwlcl1dkr1g7v"; depends=[Matrix mgcv]; }; + scam = derive2 { name="scam"; version="1.2-2"; sha256="04w0y2l4h3xddb6mzyhf0mcx6kbphrmjyfc59cqw9z88sssfrmm7"; depends=[Matrix mgcv]; }; scan = derive2 { name="scan"; version="0.20"; sha256="1xyng9dlfmp7n2h91n4xy9lx3jm205gjiizdqk1yj1qw8mmahvqc"; depends=[nlme]; }; - scanstatistics = derive2 { name="scanstatistics"; version="0.1.0"; sha256="0snscxaw2j406bi29ns0z34lb3q39fq3wikkdnps6gkvxg97614i"; depends=[data_table gamlss_dist magrittr plyr sets]; }; + scanstatistics = derive2 { name="scanstatistics"; version="1.0.0"; sha256="0mgrjkn4yhpyjv313d4arnaipv107nlcbkqzvkv6b2c97z57mpds"; depends=[dplyr emdbook gamlss_dist ismev magrittr plyr purrr Rcpp RcppArmadillo reliaR sets tibble tidyr]; }; scape = derive2 { name="scape"; version="2.3-1"; sha256="0maccnkhn7wf6brwnb5b7nh2yx3afx0h7kji2475mvg19909mddq"; depends=[coda Hmisc lattice]; }; scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; }; scatterD3 = derive2 { name="scatterD3"; version="0.8.1"; sha256="1fyk2z8ari73nbah2r4c677nm3v0whfia6sh39gr674cczp6vc8q"; depends=[digest ellipse htmlwidgets]; }; @@ -9791,6 +9985,7 @@ in with self; { sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; }; scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; }; score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; + scorecard = derive2 { name="scorecard"; version="0.1.0"; sha256="08fmlbg2r149dynbdn1dynknmxy6a98bcsry1fsffmris6g84a0m"; depends=[data_table ggplot2 gridExtra]; }; scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; }; scoring = derive2 { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; }; scoringRules = derive2 { name="scoringRules"; version="0.9.3"; sha256="1n26k9vg95gq292xgva65wnzk2whfrpyw8ngq7h8jd5zn9by7fpl"; depends=[MASS Rcpp RcppArmadillo]; }; @@ -9804,7 +9999,6 @@ in with self; { scrypt = derive2 { name="scrypt"; version="0.1.1"; sha256="0lgnmag2yr5r67kqni2mpbvflqzaq8icilcxqja7c8fzw6xxzjrx"; depends=[Rcpp]; }; scs = derive2 { name="scs"; version="1.1-1"; sha256="1qx8b73g5v7mjx85lx5bln6j6i9r7m238i7hm8adr2jrbl33532y"; depends=[Matrix]; }; scuba = derive2 { name="scuba"; version="1.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; }; - scvxclustr = derive2 { name="scvxclustr"; version="0.1"; sha256="0d72hr9jcw513mapx1plif07b4qsi9b9pad6dwrqlh3z8kb8mn4j"; depends=[cvxclustr gglasso igraph Matrix mclust Rcpp RcppEigen]; }; sdPrior = derive2 { name="sdPrior"; version="0.3"; sha256="0d3w75p3r2h07xhp7fj4si1y4sav8vs0lq6h2h4fn4f2inn3l0vl"; depends=[caTools GB2 MASS]; }; sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; }; sdat = derive2 { name="sdat"; version="1.0"; sha256="1rp2s3y44f3vj0p16j1k2rrs44kmnzy9k0lpcm9ga801nbv93saz"; depends=[]; }; @@ -9819,6 +10013,7 @@ in with self; { sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; }; sdnet = derive2 { name="sdnet"; version="2.3.8"; sha256="10c962wbzgl2zpz7yx5kpryldbbq76qrd5pnz4rlmbaa9kfg08s5"; depends=[]; }; sdprisk = derive2 { name="sdprisk"; version="1.1-5"; sha256="1c6mipq8sh8347i7m7dh47f69fr21xkrsk8yjgsdvcy41h8zijmf"; depends=[numDeriv PolynomF rootSolve]; }; + sdpt3r = derive2 { name="sdpt3r"; version="0.1"; sha256="06mw1h6c8gkhi3vhal17h7px3bb277xz15k2ryqjwc7agzwhmv8c"; depends=[Matrix]; }; sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; sdwd = derive2 { name="sdwd"; version="1.0.2"; sha256="0l0w4jn2p9b7acp8gmlv4w8n662l397kbrm4glslik0vnmjv151w"; depends=[Matrix]; }; seacarb = derive2 { name="seacarb"; version="3.2"; sha256="048wbzap9pc7iv7lh9rzdxawbnnjd6lmw7bfadry5xnw26p6vnad"; depends=[gsw oce]; }; @@ -9830,17 +10025,18 @@ in with self; { seasonal = derive2 { name="seasonal"; version="1.6.1"; sha256="1nvavn84f2zb0f6n352br52wcrcmnxv6vprzcpymrnzik7pyp8y6"; depends=[x13binary]; }; seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; }; seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; }; - secr = derive2 { name="secr"; version="3.0.1"; sha256="0pb388kp6w54zm4a6xycl6gd6xa6jvzcqqwchsbdniaq2vz8r64q"; depends=[abind MASS mgcv nlme raster sp]; }; + secr = derive2 { name="secr"; version="3.1.0"; sha256="0g2fmfbxf69jy2r8adw0hpwhb3a3s9ya9vzjw91l84rid50l4900"; depends=[abind MASS mgcv nlme raster sp]; }; secrdesign = derive2 { name="secrdesign"; version="2.4.0"; sha256="0v9d94ra614884imv29qwhr4zkx3dzssdpz8nv86k1kigx51w1xp"; depends=[abind secr]; }; secret = derive2 { name="secret"; version="1.0.0"; sha256="09b28f7ndc167bbanbdydralykq718fixnrgs5xr9d3fbdhz1vdl"; depends=[assertthat curl jsonlite openssl rprojroot]; }; secrlinear = derive2 { name="secrlinear"; version="1.1.0"; sha256="0crzpsm8c42v8r0xf9rnrxcinjh22sywgv7cc3pq5s5l2526d5dj"; depends=[igraph maptools MASS rgdal secr sp]; }; secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; }; seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; }; + seedCCA = derive2 { name="seedCCA"; version="1.0"; sha256="1grs6ykiyp8p5gh93hgb4niggppbh2wzwl6yx0l1qs9fkcz5zvy7"; depends=[CCA corpcor]; }; seedy = derive2 { name="seedy"; version="1.3"; sha256="1a21sl8i7z12cjaqj08lkq3viazxlgxv82vaarm58fgbpsvdi0m0"; depends=[]; }; seewave = derive2 { name="seewave"; version="2.0.5"; sha256="1ml0jcqb6i6v0xgarvzg51rgax6lsf6y2255jq1kfz4v8n39vnh0"; depends=[tuneR]; }; seg = derive2 { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; }; segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; }; - segmented = derive2 { name="segmented"; version="0.5-2.1"; sha256="1i576xksc761nyv2dmq86nwbgqvp0plz6bjcn69nkdwq2wbizmw8"; depends=[]; }; + segmented = derive2 { name="segmented"; version="0.5-2.2"; sha256="1wdjxkgqjqw5q2nywmgkf6y21lb0alhvaqg0m0dr2xyxf1ii79rs"; depends=[]; }; seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; }; seismicRoll = derive2 { name="seismicRoll"; version="1.1.2"; sha256="183lx9lgmi06lv1l4gbmlmblfgjzhph4aavdnxrykpp6122hsq61"; depends=[Rcpp]; }; sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; }; @@ -9848,7 +10044,7 @@ in with self; { selectapref = derive2 { name="selectapref"; version="0.1.0"; sha256="09kqrr814261mvpzc9x7v0fcnd4wf8fcl52jsx6snf1qp336hw26"; depends=[]; }; selection = derive2 { name="selection"; version="1.0"; sha256="1w2mzb16frcbh55icc5g8ai3hri9j6dhp7h0kc96iaspphnfw4n8"; depends=[fifer norm]; }; selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; }; - selectiveInference = derive2 { name="selectiveInference"; version="1.2.2"; sha256="1rmrvwa54xj3rxmfnhr2vwdxv9s3xlv35pqf08iiy525nqd2hsy5"; depends=[glmnet intervals survival]; }; + selectiveInference = derive2 { name="selectiveInference"; version="1.2.3"; sha256="1fbfnbysy4zzkkwc2w3gkqwficfzn176sksxxadq7l6yv6l1y1d6"; depends=[glmnet intervals survival]; }; selectr = derive2 { name="selectr"; version="0.3-1"; sha256="0jc946456qp3g2icaifrqn4z7z5pn23rfw77796aa8mmlkp7qkyv"; depends=[stringr]; }; selectspm = derive2 { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; }; seleniumPipes = derive2 { name="seleniumPipes"; version="0.3.7"; sha256="1krpzh2gy3yl07c2n1d8q21xjc2qcv5ac1kv7212710bxkdyfad6"; depends=[httr jsonlite magrittr whisker xml2]; }; @@ -9868,13 +10064,13 @@ in with self; { semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; - sensR = derive2 { name="sensR"; version="1.4-7"; sha256="06dzb1sid7wq9i0x6pnsb5srk9z9pv9y8y5br6bkcbm6k3iv5jsv"; depends=[MASS multcomp numDeriv]; }; - sensiPhy = derive2 { name="sensiPhy"; version="0.6.0"; sha256="00fw8fm3n4jlz5v9fvni4ff3x2fv0ixpjddk2mn6cac7yqfsha6p"; depends=[ape caper ggplot2 phylolm]; }; - sensitivity = derive2 { name="sensitivity"; version="1.14.0"; sha256="042bwjp906jmhsp09n03nf6xkzfvgad13f0bkm3nk5qf9xfjfszm"; depends=[boot]; }; + sensR = derive2 { name="sensR"; version="1.5-0"; sha256="01rs0kiv73rqrlgzwf7hnprb029i5sq1h1qjb9q3879jxj4823pf"; depends=[MASS multcomp numDeriv]; }; + sensiPhy = derive2 { name="sensiPhy"; version="0.7.0"; sha256="18sps4nqr38bc2bsy8zq6yq45asd3s88daal7j2lz2ca6wxn5hgp"; depends=[ape caper ggplot2 phylolm phytools]; }; + sensitivity = derive2 { name="sensitivity"; version="1.15.0"; sha256="02vqs1pqzivxpg2ql3wi0530cshdkz7hxvablpd1dzhvjnindknm"; depends=[boot]; }; sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; }; sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; sensitivityfull = derive2 { name="sensitivityfull"; version="1.5.6"; sha256="0g2gc4rms6gd34d23kxj50pjh0yq1h6yiybj4dxwyf6i2652irhq"; depends=[]; }; - sensitivitymult = derive2 { name="sensitivitymult"; version="1.0.1"; sha256="0x07r9xwkbcxhqa1cg9d7gz5k7a81v9999fbxkf0p380rknzcidc"; depends=[]; }; + sensitivitymult = derive2 { name="sensitivitymult"; version="1.0.2"; sha256="19pyq6c7pvr3zkz3dz5p2hhfcvwm0im0bwaw4yhhgin4kqfnfjd5"; depends=[]; }; sensitivitymv = derive2 { name="sensitivitymv"; version="1.3"; sha256="1bxf85q91smnsl2lsig43vk0c63c805d8ry1xh3w6q675djj14ad"; depends=[]; }; sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; }; sensors4plumes = derive2 { name="sensors4plumes"; version="0.9"; sha256="1fyf020bl6p9wdvnsfkmdlllhdwj3l4h9h2paq9dwd7hsr7av48p"; depends=[automap conf_design emdist FNN genalg gstat lattice raster rgdal sp]; }; @@ -9882,7 +10078,7 @@ in with self; { senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; }; sentimentr = derive2 { name="sentimentr"; version="1.0.0"; sha256="1hniwvm2mr85hs6v9pvs04n73a13nf0qkikxkz9bcb3hfgkk8v6c"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean]; }; separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; }; - seplyr = derive2 { name="seplyr"; version="0.1.4"; sha256="0s347da7f9xxzzym05fr6sfwd0mahg4p8x1qxi0wf13myxkpqv6d"; depends=[dplyr rlang]; }; + seplyr = derive2 { name="seplyr"; version="0.1.5"; sha256="0np2z67swh567dhp6l7apfa6rbysq90hgh9wgwkalw7dc3xbzh2j"; depends=[dplyr rlang wrapr]; }; seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; }; seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; }; seqHMM = derive2 { name="seqHMM"; version="1.0.7"; sha256="1pap3i2zxgnxr3frw648hkzbhn4rnz20lzhhvrp89vhc77vh4ds1"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; @@ -9898,7 +10094,7 @@ in with self; { sequenza = derive2 { name="sequenza"; version="2.1.2"; sha256="0f3aj96qvbr1wqimlv6rxg0v34zlrgc6pbdy7sfkwfzs1n44q1xf"; depends=[copynumber squash]; }; sequoia = derive2 { name="sequoia"; version="0.9.3"; sha256="1lxq88bw5fbm2afdh79fs363dvb1c2jsz02dc6c0ndwkwch04igc"; depends=[plyr]; }; sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; }; - serial = derive2 { name="serial"; version="1.2"; sha256="1zjzm5ym8z9g97sff6bg9p5dhjpj6g26wam9j9gklffiry8dd9li"; depends=[]; }; + serial = derive2 { name="serial"; version="1.3"; sha256="1ibwd8xmkd0pwdhivm6h3yd3rsi28mai5n7qcs1bq2mx8hb5lg7f"; depends=[]; }; seriation = derive2 { name="seriation"; version="1.2-2"; sha256="1b6glraxi5zrqzihnh39bbdnzsbd925r9hjpi020d470266g2c8f"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; seroincidence = derive2 { name="seroincidence"; version="1.0.5"; sha256="07lphrp7r3i87633q8g6svk2mxbsvq4blrf8gnm0p99hkmz8wgg9"; depends=[]; }; servr = derive2 { name="servr"; version="0.7"; sha256="0rxh89csqlpyf9wv5wlymya9kbddj79mlmxz2x0xmls12gbrxaaa"; depends=[httpuv jsonlite mime]; }; @@ -9910,33 +10106,34 @@ in with self; { setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; }; settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sf = derive2 { name="sf"; version="0.5-3"; sha256="1jkdqxkijr1p4ks56iwrxqh93r6627n91i8xpgznk2ghysrdzc57"; depends=[DBI magrittr Rcpp units]; }; + sf = derive2 { name="sf"; version="0.5-4"; sha256="1hma75i0x6mvdrq8i4njwkpmp7dvskxv8mwdjm7xx8bmq13flcgw"; depends=[DBI magrittr Rcpp units]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; }; sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; }; - sfdct = derive2 { name="sfdct"; version="0.0.3"; sha256="00vm68w8fxwxkw69lay25mpd7zw86a15v5pi3nxnay8jx7vrmbhc"; depends=[dplyr RTriangle sf sp tibble]; }; + sfdct = derive2 { name="sfdct"; version="0.0.4"; sha256="0q392wgdlv2fdksk2rwqjqddxrzgkr3pg1czzqywr3l07pl7gxbj"; depends=[dplyr RTriangle sf sp tibble]; }; sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; }; sfsmisc = derive2 { name="sfsmisc"; version="1.1-1"; sha256="0jzmbywlyzfxs7hlmyd0iynghfc9qp5sa5lnhr73y8r360yv1ahf"; depends=[]; }; sft = derive2 { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; }; - sgPLS = derive2 { name="sgPLS"; version="1.4"; sha256="0yx3vg9rfm6jvrgfaky2dlbrbksa5475gx3g11x6i35nd2nb2p5z"; depends=[mixOmics]; }; + sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; }; sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; }; sgd = derive2 { name="sgd"; version="1.1"; sha256="1kqpaxyacaq1fkmy4hsj62167gcmqng4pmafpdjdpqxwdqxz9xxf"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; }; - sgee = derive2 { name="sgee"; version="0.2-0"; sha256="1dpbkab3wzcqp9rgy9gxibjs2dcpb5ql1dlgg97rxjr1fkigwxgk"; depends=[copula mvtnorm]; }; + sgee = derive2 { name="sgee"; version="0.5-0"; sha256="040llsmgwdvq8qr02zh4vnpvyqs8zsbla4qrdrjpcmv9ja52ppb9"; depends=[copula mvtnorm]; }; sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; sglOptim = derive2 { name="sglOptim"; version="1.3.6"; sha256="0gzhzfi5q9hgqgzagfdzi4cswpmwic9ggf72qi6axl1hixgmgp0w"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; }; sglasso = derive2 { name="sglasso"; version="1.2.2"; sha256="1yk9wvg98a2l9kdaksy75av9z9iz27v5d2zpsqhabqwkwfh6wkad"; depends=[igraph Matrix]; }; + sglg = derive2 { name="sglg"; version="0.1.0"; sha256="13ai3vd7466ffh5960fnl60na8mqkj2d5fqiaq4vj6ws3sxfq7mr"; depends=[Formula robustloggamma ssym survival]; }; sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; - sgmcmc = derive2 { name="sgmcmc"; version="0.1.0"; sha256="1lrr5ixb0dsjsf5g52137mz6bqm2asgnb70qmdqhkad02c8gqrcz"; depends=[tensorflow]; }; + sgmcmc = derive2 { name="sgmcmc"; version="0.2.0"; sha256="1jqk6bic8g5zsdxa9f6w6j6ha6dnghfdi61cyy9vi94xsmkbkv66"; depends=[tensorflow]; }; sgof = derive2 { name="sgof"; version="2.3"; sha256="12bpyvg5df1m2ar6frpi10zlj3dk9h61r13rzn3w5a3nyk8gljsg"; depends=[poibin]; }; sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; }; shades = derive2 { name="shades"; version="0.2.0"; sha256="1r2xbz1h144pg53g3ayy7n08091gv5zj52p02gv7kihir2kzxj0w"; depends=[]; }; shadow = derive2 { name="shadow"; version="0.3.5"; sha256="1y0j90rhd9jpznknyy76g6qnvrdc52wh9s8khabka4gqjgvrmb98"; depends=[raster rgeos sp]; }; - shallot = derive2 { name="shallot"; version="0.4.0"; sha256="0gnas5h770yvi2k09nyq6yywbd36xp6bnnp7psdvcyvhwx439f64"; depends=[commonsMath rscala]; }; + shallot = derive2 { name="shallot"; version="0.4.1"; sha256="1d9ljq8kgr9qcg545w1jzk71zmv103rj5myc47gsk0c84bbaw0n4"; depends=[commonsMath rscala]; }; shape = derive2 { name="shape"; version="1.4.3"; sha256="1v9xp60p813rnx41vchkh32qmcb4z2zp9l7r1a8a6f8aqylnq3vj"; depends=[]; }; shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; }; shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; - shapes = derive2 { name="shapes"; version="1.2.0"; sha256="0fnwcxnrhy5iqzzmrkbbpr4rirg4ixl96656ywcc1mhwv6d6iw0z"; depends=[MASS rgl scatterplot3d]; }; + shapes = derive2 { name="shapes"; version="1.2.1"; sha256="1f8dy6b2gam0pn4hm10zhw3n5pbmlgkyzgwns5g264x0c49dgbqk"; depends=[MASS rgl scatterplot3d]; }; sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; }; sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; }; sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; @@ -9967,8 +10164,8 @@ in with self; { shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyr = derive2 { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; }; shotGroups = derive2 { name="shotGroups"; version="0.7.3"; sha256="0h6c4fz2b4gpbfqykic6apflvp11bcafqm87gzl0zv8b03ydylxk"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; - showtext = derive2 { name="showtext"; version="0.4-6"; sha256="17qx9zlmp440p4a9mkba89k1rdx11hdl5px33m1766hlsv1x7sf8"; depends=[showtextdb sysfonts]; }; - showtextdb = derive2 { name="showtextdb"; version="1.0"; sha256="14iv5nyc9wszy1yhbggk7zs042kv10lwk92pn9751hfws53yq6hf"; depends=[sysfonts]; }; + showtext = derive2 { name="showtext"; version="0.5"; sha256="1fn3467n3lgl55dh62y7aq5mg3paf6faxp5kp4s04bn33g87zxgx"; depends=[showtextdb sysfonts]; }; + showtextdb = derive2 { name="showtextdb"; version="2.0"; sha256="1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh"; depends=[sysfonts]; }; shp2graph = derive2 { name="shp2graph"; version="0-3"; sha256="0mfb3f64kpd23qa1yb19j7j234snls7yvszp2yxnv9yahk0blifw"; depends=[igraph maptools sp]; }; shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; }; shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; }; @@ -9988,6 +10185,7 @@ in with self; { signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; sigora = derive2 { name="sigora"; version="2.0.1"; sha256="1sgjafr2f7carwnvp0vsvp80jn2bzwlkay38ch63qk9gapsh4imh"; depends=[]; }; sigr = derive2 { name="sigr"; version="0.1.7"; sha256="06phjjs3c53nlyh0hbwlzk5qms7g0yz3lnbd8sb8pl04v6h0y3d3"; depends=[]; }; + sim1000G = derive2 { name="sim1000G"; version="1.32"; sha256="1x0dzg58wb1kzn1j3ad44v3x4lyy7vwsx1hj1klyk7dgnmhlniym"; depends=[hapsim MASS stringr]; }; simEd = derive2 { name="simEd"; version="1.0.2"; sha256="1r8m5sajc362bx5wzjwd75zn05q7j1kxzzdynbxwb2c8k8q83qyq"; depends=[rstream]; }; simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; }; simLife = derive2 { name="simLife"; version="0.3"; sha256="0bqhixr4zg7mwgxdsjk0h5a82dyfkhiv9xafw43w2bpnmyxywdia"; depends=[splancs unfoldr]; }; @@ -10004,7 +10202,7 @@ in with self; { simctest = derive2 { name="simctest"; version="2.5"; sha256="038ipxww0n09sh8al5isbm1fikr8kazwxn9cj2d0wgm6cdpy681n"; depends=[]; }; simecol = derive2 { name="simecol"; version="0.8-9"; sha256="1r4nivm6nicqskx2d2jdlszifhlpjkp6iyzppqkavnrhib7g600j"; depends=[deSolve minqa]; }; simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; }; - simex = derive2 { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; }; + simex = derive2 { name="simex"; version="1.7"; sha256="0dmyxhg3bk23y08xbgwlg791pcl3131im3jkh9x5pjqczfjvim0a"; depends=[]; }; simexaft = derive2 { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; }; simglm = derive2 { name="simglm"; version="0.6.0"; sha256="1kmi5lpx8m14iz0i9z8811cp6fq2x700qsxn6rxrkxbq88a5mdss"; depends=[dplyr Matrix purrr tibble tidyr]; }; simmer = derive2 { name="simmer"; version="3.6.3"; sha256="0kg7grlsi4mbjnfhhb01aj7jnyfznrhr5g3gd0vxl7xnwj6g8ppv"; depends=[BH codetools magrittr R6 Rcpp]; }; @@ -10024,20 +10222,20 @@ in with self; { simrel = derive2 { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; }; simsalapar = derive2 { name="simsalapar"; version="1.0-9"; sha256="0h46acf797lp1hvs8x91nzll3zxiiczfl6vdxxrwizr109jzggcj"; depends=[colorspace gridBase sfsmisc]; }; simsem = derive2 { name="simsem"; version="0.5-13"; sha256="0v6gbfp4659gbpzc1vffg687c8bcd45ddb7jhd0bgx66m28853kk"; depends=[lavaan]; }; - simstudy = derive2 { name="simstudy"; version="0.1.3"; sha256="1ypggcdxlfkgx60csi8r9m1j6rjqly8q50g0w80h68wrf919f51p"; depends=[data_table mvnfast Rcpp]; }; + simstudy = derive2 { name="simstudy"; version="0.1.4"; sha256="040q269qhgrdgrhp41zc5a0g6fjf7xwd8lmr8q7pi9xbzhlr1d6y"; depends=[data_table mvnfast Rcpp]; }; simsurv = derive2 { name="simsurv"; version="0.1.0"; sha256="08w5kbzx3wlksl17kjg9j4dj1f40ddm32mafi75y5c8bwgcfzqzy"; depends=[]; }; simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; }; simule = derive2 { name="simule"; version="1.1.2"; sha256="06x30rvs6fzbc1bgp4262rjljsisy03annsprfa5mm76mk00xm4v"; depends=[igraph lpSolve pcaPP]; }; sinaplot = derive2 { name="sinaplot"; version="1.1.0"; sha256="0zfq6l8wjvdj7rndsfyh0a2xjlxmn2ij1q50hg3xjfpwrjxcsck8"; depends=[plyr]; }; - sinew = derive2 { name="sinew"; version="0.2.1"; sha256="18vdl10r5mhgmdkx01q8xqjxs418ndjzrwgrvnfm98264pkycpk3"; depends=[rstudioapi]; }; + sinew = derive2 { name="sinew"; version="0.3.2"; sha256="0n02lwcb9v8zw1mvdlkwkzwhgbwf7wsb62j6ikmacq5g27b9ws43"; depends=[miniUI rstudioapi shiny yaml]; }; sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; }; siplab = derive2 { name="siplab"; version="1.2"; sha256="0r7gk9qsmbc3ln67cb8p87bq3s2rx6fbavlly1fpzqqv2isf5pq9"; depends=[spatstat]; }; sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; }; - sirt = derive2 { name="sirt"; version="2.1-24"; sha256="12db9dfj759bpi36k9jz7xdr2xv381fxzx28yk23qmw2flhnl5ks"; depends=[CDM coda lavaan lavaan_survey mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; }; + sirt = derive2 { name="sirt"; version="2.2-14"; sha256="1rwjp4ynksfli368llknnl0dg52wjxxfl9n5k5dh5nby6mabqf57"; depends=[CDM coda lavaan lavaan_survey mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; }; sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; }; sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; }; - sitar = derive2 { name="sitar"; version="1.0.9"; sha256="1yjiqykrx0dm0zkssagv50kyp4wj9b0sjmrpgbn9wzimqdb5ijph"; depends=[nlme quantreg]; }; + sitar = derive2 { name="sitar"; version="1.0.10"; sha256="1qsk998fa5839f9yp08sxlj48mzdm46z07x1113q63483k5bnrrc"; depends=[nlme quantreg]; }; sitmo = derive2 { name="sitmo"; version="1.2.1"; sha256="1i4bcri3vz7r49zizzqqw1m188983izvl3ja9q4nblggikif611f"; depends=[Rcpp]; }; sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; sitree = derive2 { name="sitree"; version="0.1-2"; sha256="0scfbj33mdqz10rgw6pznxca0hbmg64k53y30lwal957430yflz5"; depends=[data_table lattice latticeExtra]; }; @@ -10046,9 +10244,9 @@ in with self; { sizeMat = derive2 { name="sizeMat"; version="0.3.0"; sha256="0766wxcc1980ivlib2saagl20y9dm0ar7i43qcqk2jpdbbaky33z"; depends=[MASS matrixStats mcmc MCMCpack]; }; sjPlot = derive2 { name="sjPlot"; version="2.3.3"; sha256="14yl3y4faiw5g3cql8vra4d8xrxn2fri55zsddlgsnqxf1qar5w1"; depends=[broom dplyr effects forcats ggeffects ggplot2 knitr lme4 MASS merTools modelr nlme psych purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; }; - sjlabelled = derive2 { name="sjlabelled"; version="1.0.1"; sha256="1zimqcgv3n861v9adn0yj919yanjkmvmds03ksyg8mhwr290i2hq"; depends=[broom dplyr haven magrittr purrr tibble]; }; + sjlabelled = derive2 { name="sjlabelled"; version="1.0.3"; sha256="18mbdppprbvmpy9lp38fryxr4db8fgcjyjr7301zd75ffb910gm9"; depends=[broom dplyr haven magrittr purrr tibble]; }; sjmisc = derive2 { name="sjmisc"; version="2.6.1"; sha256="1bk1f0kigyhxp40gjdxj60jmw5x984bdp1k170xw9hqfar29dn7x"; depends=[broom dplyr haven magrittr psych purrr rlang sjlabelled stringdist stringr tibble tidyr]; }; - sjstats = derive2 { name="sjstats"; version="0.11.0"; sha256="1hc53a6gvb1ci0vl0pq8pdpn9m67d7pplc00jsfjdc79p1lh0pgk"; depends=[broom coin dplyr glmmTMB lme4 lmtest MASS Matrix modelr nlme purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr]; }; + sjstats = derive2 { name="sjstats"; version="0.11.1"; sha256="12xm6x24ddpzil8ck4w4wlhl8riypi6s08p1ifwap6bsp1grbxz0"; depends=[broom coin dplyr glmmTMB lme4 lmtest MASS Matrix modelr nlme purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr]; }; skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; skeleSim = derive2 { name="skeleSim"; version="0.9.5"; sha256="1m0jwr63v989dalchiv90sfpi6g19rj0x2zgp0bgmjpq3xyamykf"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; }; skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; }; @@ -10063,9 +10261,10 @@ in with self; { sld = derive2 { name="sld"; version="0.3.2"; sha256="0za5pw7ki419ni9pqqzddb10d16nvv5rh5jrkl4f77j0ps2ajylp"; depends=[lmom]; }; sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; }; slfm = derive2 { name="slfm"; version="0.2.2"; sha256="01n9y6kyl7z1ynckp2hkrv2yl9jf30zcbbi3sx9jrcha557fg1cf"; depends=[coda lattice Rcpp RcppArmadillo]; }; - slickR = derive2 { name="slickR"; version="0.1.0"; sha256="0jk9h58v30cl64sfd5730ccv54bsw39d8d57085wrx1kqadsampy"; depends=[base64enc htmlwidgets xml2]; }; + slickR = derive2 { name="slickR"; version="0.2.0"; sha256="1c9z997fj7yq6nx9il8qrnf7lla66a1z823mxj7y92s5bf5308ar"; depends=[base64enc htmlwidgets xml2]; }; slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; }; slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; }; + slowraker = derive2 { name="slowraker"; version="0.1.0"; sha256="1csikr5kcp62wbhkg9079rshy511r1ql8fqr703yc731ja50pnh7"; depends=[NLP openNLP SnowballC]; }; slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; }; sm = derive2 { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.2-5"; sha256="1mwahjgslk82f8bl6qcjs1yadhbnqrxxhvkffkgc2fv3s6lh5d9m"; depends=[]; }; @@ -10091,10 +10290,10 @@ in with self; { smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; }; smoof = derive2 { name="smoof"; version="1.5.1"; sha256="01jkldmxn86vmcmmz81mdlhpm1m3bddj4sv550a3b4wm1r3gddng"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; }; - smooth = derive2 { name="smooth"; version="2.1.0"; sha256="1wv6n9ff7wv9m0pwphd8ymmrwgwg9dj9wnlzx1sazkg0r01bakdf"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; }; - smoothAPC = derive2 { name="smoothAPC"; version="0.1"; sha256="06lpjp408ggj27yw6mw7f96kxly7r8kzikbsdp0y1gzig1qq8nbs"; depends=[colorspace lmtest quantreg rgl SparseM]; }; + smooth = derive2 { name="smooth"; version="2.1.1"; sha256="113la6byqr6sjr9349z3yyh407mvxhk9d1q7qldw55pkp4mrahac"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; }; + smoothAPC = derive2 { name="smoothAPC"; version="0.2"; sha256="06f0d4bjygpgcayzg9cxcb5plhsls0ljla2mrmjnjxpq8g3c3cl8"; depends=[colorspace lmtest quantreg rgl SparseM]; }; smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; }; - smoothSurv = derive2 { name="smoothSurv"; version="1.6"; sha256="1s25gpih0nh8waw4r3iw53n3rc44mlzixkh4i2cykbg5rdrs8pnf"; depends=[survival]; }; + smoothSurv = derive2 { name="smoothSurv"; version="2.0"; sha256="0ypgmqf7mj0x0ibid9qx6cbqn4cpig8333g095b64297bf0syvjc"; depends=[survival]; }; smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; }; smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; }; smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; }; @@ -10104,7 +10303,7 @@ in with self; { smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; }; sn = derive2 { name="sn"; version="1.5-0"; sha256="0fh7xjsfd2x8d9lbnss7raldh24b72b3pvcv7zqa1qprzg7zfr01"; depends=[mnormt numDeriv]; }; sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; }; - snakecase = derive2 { name="snakecase"; version="0.5.0"; sha256="0940ab0in6q5dibpwbw4q59f8r9wy3pryyhqkkivjn6fkb1hmsyd"; depends=[magrittr purrr stringi stringr]; }; + snakecase = derive2 { name="snakecase"; version="0.5.1"; sha256="0mgnmdjrg3xkhfq5mc29ixpaw12fm4052i5733xc2ch6793ikmpm"; depends=[magrittr purrr stringi stringr]; }; snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; snht = derive2 { name="snht"; version="1.0.4"; sha256="01gdqicvazfd27f992j4ngv60sqywwplilqxwrsw21wi7y7c6cfv"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; }; snipEM = derive2 { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; }; @@ -10128,6 +10327,7 @@ in with self; { sofa = derive2 { name="sofa"; version="0.2.0"; sha256="0jjc3r25qprxrhwwzx4b70i51v8gygxwx3x9d1zydx9hw1plk0mb"; depends=[httr jsonlite mime R6]; }; softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; }; softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; }; + softermax = derive2 { name="softermax"; version="0.3.0"; sha256="0shsd7cbj8j8z65flyddkjdpigyyqpw4j6ljl9pl9hwasksi05gk"; depends=[readr xml2]; }; softmaxreg = derive2 { name="softmaxreg"; version="1.2"; sha256="0y1r4n83sv2744lpli65aip0c0cq823asb8gw9yy9yjjc9sbyr9s"; depends=[]; }; soil_spec = derive2 { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[GSIF hexView KernSmooth pls sp wavelets]; }; soilDB = derive2 { name="soilDB"; version="1.8-7"; sha256="0v0f9yngqjsagk5dw734aigwhld7fpadj6521bdk49j74ha0girr"; depends=[aqp Hmisc plyr raster reshape2 sp XML]; }; @@ -10142,14 +10342,14 @@ in with self; { solidearthtide = derive2 { name="solidearthtide"; version="1.0.2"; sha256="0274f7vyjymx6hd7ik68hznip57ni4cxp1bw7z91v1jzp3ch17rv"; depends=[]; }; solr = derive2 { name="solr"; version="0.1.6"; sha256="0hlysi1yw4l98dcb1shznzrgia9pqzfj0p1hmnfz5gz2j64lf4h4"; depends=[assertthat httr plyr rjson XML]; }; solrium = derive2 { name="solrium"; version="0.4.0"; sha256="1jjvwwgyq335mhc4pff2l604x1k2260zwxl6k6k9lfzgcgqylbbw"; depends=[dplyr httr jsonlite plyr tibble xml2]; }; - solvebio = derive2 { name="solvebio"; version="2.0.1"; sha256="06l50vbkcb496z19yvnb7xi5x9vx69ipf4sy28zaq4xy95b5vljc"; depends=[digest dplyr httr jsonlite mime]; }; + solvebio = derive2 { name="solvebio"; version="2.0.2"; sha256="0j7dpwq2l6g0rabrh01r2xw1rgd8yrmnazwkskv5zayfcxfh5las"; depends=[digest dplyr httr jsonlite mime]; }; som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; }; som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; }; soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; }; someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; }; someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; }; somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; }; - sommer = derive2 { name="sommer"; version="2.9"; sha256="0145a7a63wrik1nc716br920mgys959a71w30hxny3nwkbsgw6ij"; depends=[MASS Matrix]; }; + sommer = derive2 { name="sommer"; version="3.0"; sha256="0jfdf4pjkwlm0r6f1njcri7wf4yj9sjgwcg9s3xz17l4fv34vy0x"; depends=[MASS Matrix]; }; somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; }; sonicLength = derive2 { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; }; @@ -10166,6 +10366,7 @@ in with self; { sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; }; sound = derive2 { name="sound"; version="1.4.4"; sha256="1mxwcr978k11p0dznv1gbvb894nixkl4gvhgj015gcl1s63ar5n4"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.2"; sha256="1ig04hdxwailsp4lv5y9q73x7vb6hl4dw9zlb05gbccvid5vmdsh"; depends=[ineq oce pracma seewave tuneR vegan]; }; + soundgen = derive2 { name="soundgen"; version="1.0.0"; sha256="04hbhyk5b9g4q71z4pa70byx8xxadq7921vigkg3c9hv7yxz550d"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny shinyBS tuneR zoo]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; sourceR = derive2 { name="sourceR"; version="1.0.1"; sha256="01qxa44s9szaxl0rdcx4p0wn4vby17hdzdjzpsbls3prsnr0jaad"; depends=[assertthat cluster dplyr gplots gtools hashmap R6 reshape2 SPIn tensorA]; }; sourcetools = derive2 { name="sourcetools"; version="0.1.6"; sha256="0l8c6fql82cb246qh7hfgxb4s35qn0qfgy6dzvkx0zkz1cpqvx69"; depends=[]; }; @@ -10174,7 +10375,7 @@ in with self; { spAddins = derive2 { name="spAddins"; version="0.1.7"; sha256="1ci246770j40zzmsjwjqwkwi6b2w5qwb0n4f4wah5rjf6zjwkd5r"; depends=[rstudioapi]; }; spBayes = derive2 { name="spBayes"; version="0.4-1"; sha256="1cypl3kvcr7nwdkq59zpdhkasz0z5r2gk8hr6wf1a1992k8c33ag"; depends=[abind coda Formula magic]; }; spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.1"; sha256="0pcfy3w2aqld10w9jdcizcy0rdpmdaj8z7qwpam4s2f6sap1q26b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; - spData = derive2 { name="spData"; version="0.2.2"; sha256="1997ilf5r52z8k5xqmqqxzxiiiirhwwcmydlfyai3snmn13apc78"; depends=[]; }; + spData = derive2 { name="spData"; version="0.2.5.0"; sha256="1piqnxmvxksd5viasb5l50incf631fgphrnqfp0x17rz3jdrfzvg"; depends=[]; }; spMC = derive2 { name="spMC"; version="0.3.8"; sha256="1glkyv6wmh766ssdlm4z7dck32r0284kwah0ksmmkwxkfw1qx7xb"; depends=[]; }; spNNGP = derive2 { name="spNNGP"; version="0.1.1"; sha256="0b55arvy5xr592bs2082djyzaa48jbv0y85h7nnj479f8c31grqp"; depends=[coda Formula RANN]; }; spTDyn = derive2 { name="spTDyn"; version="1.0"; sha256="0yrnbf9g1n1hrrra2vp6412wfky1bhy3b6raif9k82xvi9p9m6pz"; depends=[coda sp]; }; @@ -10187,7 +10388,7 @@ in with self; { space = derive2 { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; }; spaceExt = derive2 { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[glasso limSolve]; }; spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; }; - spacetime = derive2 { name="spacetime"; version="1.2-0"; sha256="1qd9bvnqknw8kaqz7xr5gkkhi3h1f2dvd70zax44g912nha13f7h"; depends=[intervals lattice sp xts zoo]; }; + spacetime = derive2 { name="spacetime"; version="1.2-1"; sha256="1i6yrmyr9vc5lr99w7qhr0jqdx97ckjqay5g0lqdrk98sygpfl4g"; depends=[intervals lattice sp xts zoo]; }; spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; }; spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; }; spacyr = derive2 { name="spacyr"; version="0.9.0"; sha256="1d2bfsmkpb3aqfqiiqdxmw85aqdq7880s0f81vs0jy6i64an90x6"; depends=[data_table reticulate]; }; @@ -10203,20 +10404,20 @@ in with self; { spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; }; sparkTable = derive2 { name="sparkTable"; version="1.3.0"; sha256="1fc2nihxfrjpmxm9g9296mz5czd3ydvi1v37g8qgb20j7b73c64h"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; }; sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; }; - sparklyr = derive2 { name="sparklyr"; version="0.6.2"; sha256="0lr487y5gb53yh8in5lhpwq9fnmagknzmj2yx02rgmig8qd4974y"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr httr jsonlite lazyeval rappdirs readr rlang rprojroot rstudioapi shiny withr xml2]; }; + sparklyr = derive2 { name="sparklyr"; version="0.6.3"; sha256="11k8jhlg9n3sb72p5j865plflxfcm4pp15483axhnkck6bhnlb77"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr httr jsonlite lazyeval openssl rappdirs readr rlang rprojroot rstudioapi shiny withr xml2]; }; sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; sparkwarc = derive2 { name="sparkwarc"; version="0.1.1"; sha256="07b66f12fz19042kj7d9p32j9sy3103zvil36xkf21hm9iyg6xph"; depends=[DBI sparklyr]; }; - sparr = derive2 { name="sparr"; version="2.1-11"; sha256="1ypfij8fwsj7nf3g5arc9hrhf1fcwwinhrsbfmgwqs29xl3m9m2g"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; }; + sparr = derive2 { name="sparr"; version="2.1-12"; sha256="13mcmbbr9r1i9qgbchi8v0lx90c42x5m1xycqdgwhyinm71swnqw"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; }; sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; }; - sparseFLMM = derive2 { name="sparseFLMM"; version="0.1.1"; sha256="03j1rvgbzmscs043iyzblfk601bv2vf90sfbii14yqm0mrf27r28"; depends=[data_table MASS Matrix mgcv refund]; }; + sparseFLMM = derive2 { name="sparseFLMM"; version="0.2.0"; sha256="0r7080d2s5vrcwi4h11iiapmdl0l59kd0j8r1avmw9x0d0qw6lh8"; depends=[data_table MASS Matrix mgcv refund]; }; sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3"; sha256="13v8zia1i0k6faiz6faikqmlrp16riwv637yygjq2cq8fcm75pyf"; depends=[Matrix Rcpp RcppEigen]; }; sparseLDA = derive2 { name="sparseLDA"; version="0.1-9"; sha256="1k3sw9kc40yxnfss4vrsx34qxmv8ssddyhbfjhxrdldvblhbwchb"; depends=[elasticnet MASS mda]; }; sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; }; sparseMVN = derive2 { name="sparseMVN"; version="0.2.1"; sha256="1k4jiday24rdiscprwifrc0py13h707ijavspz15jannvjaz9qdh"; depends=[Matrix]; }; sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; }; sparseSVM = derive2 { name="sparseSVM"; version="1.1-2"; sha256="1bv9ipfs275vr1hmz7g7w4rimvbkg15wjh3xj3cx1zam91k384k9"; depends=[]; }; - sparsebn = derive2 { name="sparsebn"; version="0.0.4"; sha256="0msd12gnxijkgazg4dyfqfravsacskbshp00fa4g2vkzmsjai1y0"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; }; - sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.4"; sha256="0473pxzb95ygvhwkvs97d0zmfwlmxnxn3xp125bycv3ns3rgpssy"; depends=[Matrix nnet]; }; + sparsebn = derive2 { name="sparsebn"; version="0.0.5"; sha256="19315nzj9pz98498amlhas6ii3vwvn3qxz5a6136nh2xfwfg2bhc"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; }; + sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.5"; sha256="0hdzrp2wcjl849v7np7ybmyp15zjfqr8gkwhij2qjrpprf7z8s57"; depends=[Matrix nnet]; }; sparsediscrim = derive2 { name="sparsediscrim"; version="0.2.4"; sha256="1sa3yssncbpx8yid5wrnxdq7jl3hy5rskyh60v5x592ijcb2mif0"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm]; }; sparsenet = derive2 { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; }; sparsepp = derive2 { name="sparsepp"; version="0.2.0"; sha256="0ibadyv7lchxw3y1dspjnbhc4pin4dxwqj9rdrdxfbvlx0i3jgxr"; depends=[]; }; @@ -10225,7 +10426,7 @@ in with self; { sparsesvd = derive2 { name="sparsesvd"; version="0.1-1"; sha256="09qpky8vxkpycj6c4vn3nqlidhblgksh3n6w8sww4yhn0pm3rzn5"; depends=[Matrix]; }; sparsevar = derive2 { name="sparsevar"; version="0.0.10"; sha256="069r0kbypmx7pw3z2v9l17qidw3d73rzf5zs6yn1adyvpsddjxi8"; depends=[doParallel flare ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; }; sparsio = derive2 { name="sparsio"; version="1.0.0"; sha256="12nbydgzl3qlanlsfdy8bvg6rxa439lv0z0vbyqssqwky3mmg5c3"; depends=[Matrix Rcpp]; }; - spartan = derive2 { name="spartan"; version="2.3"; sha256="09j5f9f068m83279ncfxpyg8bnk25qjz20a9xlap8dpm50iidr24"; depends=[]; }; + spartan = derive2 { name="spartan"; version="3.0.0"; sha256="1q78l04nbrllrsk14haln5s829rkkhkhmb34xzfgyd8glbi7z4ay"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; }; spass = derive2 { name="spass"; version="1.0"; sha256="1pgv4yzbdv475gp53qz40ys731v9960cyxbp84gff6y5f2y4axah"; depends=[geepack MASS multcomp mvtnorm Rcpp]; }; spatcounts = derive2 { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; }; spate = derive2 { name="spate"; version="1.5"; sha256="1hlh4iwx1lrl8r2gag33z2xdv6k4hg86ch4f0jlqnqkhm9hapshf"; depends=[mvtnorm truncnorm]; }; @@ -10243,8 +10444,9 @@ in with self; { spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; }; spatstat = derive2 { name="spatstat"; version="1.52-1"; sha256="17p7pfdi5cxaafbkwxxfnrfpxniymvxqvlp2icy560rs6x90jjjl"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_utils tensor]; }; + spatstat_data = derive2 { name="spatstat.data"; version="1.1-0"; sha256="1iiyqv305gsr0xbnsnbddcymj9j37w6hgmzv6bxx2kwhmq6lqkj6"; depends=[spatstat_utils]; }; spatstat_local = derive2 { name="spatstat.local"; version="3.5-6"; sha256="0yb3k2szk2z61h2scyj4h78y13qvbd9b1hvwp9n2983w77y0k5dz"; depends=[spatstat spatstat_utils tensor]; }; - spatstat_utils = derive2 { name="spatstat.utils"; version="1.7-0"; sha256="17s092dmq6n9j323q48brngx062308090lrgdkf4fzrwl9f2kp77"; depends=[]; }; + spatstat_utils = derive2 { name="spatstat.utils"; version="1.7-1"; sha256="1j6r71mcch91rm2ww6kqz5685pancpbwyl33jdzwm23rlpcpvr9l"; depends=[]; }; spatsurv = derive2 { name="spatsurv"; version="1.1"; sha256="0fakhz2qc5vb7ym2ik7hilv8g5fn3z7s16hzngq1n591xza5b74g"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; }; spbabel = derive2 { name="spbabel"; version="0.4.8"; sha256="1f0lradf7a3fjkdhbviw24awpqj1pzw1wfvigrqhnmf0jjw3nng3"; depends=[dplyr sp tibble]; }; spc = derive2 { name="spc"; version="0.5.3"; sha256="0y730vh04j4cyz5zfyx4xqfw07ic1l93197640q543adnmil40vf"; depends=[]; }; @@ -10254,13 +10456,13 @@ in with self; { spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; }; spcr = derive2 { name="spcr"; version="2.0"; sha256="1n0lva9brpzxysw6p7l88cj8d46jng2zd7zvr5brqldzd3yl63l9"; depends=[]; }; spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; }; - spdep = derive2 { name="spdep"; version="0.6-13"; sha256="1i7igp3csdc9jy4snmivdxhifvy419gv5dky315hdfm7gr65yd7d"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp]; }; + spdep = derive2 { name="spdep"; version="0.6-15"; sha256="14kmr72zlna77q624y7vb6v8f7rxpf0fjpsaspgyapvgjjz41wb4"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp]; }; spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; }; spdplyr = derive2 { name="spdplyr"; version="0.1.3"; sha256="1f34yzj9z4f1dj7pqaayk0mvabzwa6kc3kwi1pmpikl1afgsyv25"; depends=[dplyr lazyeval rlang sp spbabel tibble]; }; spduration = derive2 { name="spduration"; version="0.16.0"; sha256="1nyv6ffrky8cwwlfq0b4w17ibni6xq61zrc1s7s2hizlp41cnscd"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; }; spdynmod = derive2 { name="spdynmod"; version="1.1.3"; sha256="0qh0kkxs6hk344k3fys0g9yy0xl0kwnwl18bgiak53fd1k7whskq"; depends=[animation deSolve raster sp]; }; spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; }; - speaq = derive2 { name="speaq"; version="2.0.0"; sha256="1yf8pjwr1gn0mh0km7xwpl15619xvn1dasckrd8xiyldi8g3c7ik"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra MassSpecWavelet mQTL reshape2]; }; + speaq = derive2 { name="speaq"; version="2.1.0"; sha256="1alwqwxx5mmmlqwj5dz9dzzwxcs8hyz85kkmj3ajb3wp09z5dhaq"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; }; spec = derive2 { name="spec"; version="0.1.3"; sha256="0i1c5wjrca36zf5ak95i8n57hy1jj8w0qkkpnjqpn3xv3nvqccr2"; depends=[csv encode magrittr]; }; speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; }; speciesgeocodeR = derive2 { name="speciesgeocodeR"; version="1.0-4"; sha256="033877l9sxcvvzpyf9aw19sj8qfscim663j2y2az8bl9c79xw4ph"; depends=[maps raster sp]; }; @@ -10269,12 +10471,14 @@ in with self; { spectral = derive2 { name="spectral"; version="1.0.1"; sha256="0mawgxz1gbzgb3lxm6gfbv3wan0ykziprqym8ajvdjsdq4fwkk2m"; depends=[rasterImage Rcpp]; }; spectral_methods = derive2 { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; }; spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; }; + spectrolab = derive2 { name="spectrolab"; version="0.0.2"; sha256="1s9js7q075v81nva475q5jznj8ms39f9yb0mb91q873r3qxwbgxp"; depends=[devtools prospectr RColorBrewer shiny shinyjs]; }; speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; }; spef = derive2 { name="spef"; version="1.0-5"; sha256="0hbb2vmgx5x135kvb5c525q78m8ccpv4j6hv16v31zka2fjwcj8z"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; }; speff2trial = derive2 { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; }; spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; }; + spelling = derive2 { name="spelling"; version="1.0"; sha256="0r293l451b0fxs6yf5ygak6s9m3alsc1cnpwhzf091blhi76s2jr"; depends=[commonmark hunspell knitr xml2]; }; sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; }; - sperrorest = derive2 { name="sperrorest"; version="2.0.1"; sha256="0ff5ga1fi7j265940wshd4pjzfbr2maw6dican0sx81wnhs3lniy"; depends=[doFuture foreach future gdata magrittr pbapply pbmcapply purrr ROCR rpart stringr]; }; + sperrorest = derive2 { name="sperrorest"; version="2.1.0"; sha256="1qpjqbifqzw92j5b8sc0bp9rjmx3w3np3gzh88kxqapdbq770w47"; depends=[doFuture foreach future gdata magrittr pbapply pbmcapply purrr ROCR rpart stringr]; }; spex = derive2 { name="spex"; version="0.4.0"; sha256="0b2zcpbjr8lqfsmwvmy4lp88xz16v7fyqx1yv10yhcgxlgw0yw8p"; depends=[quadmesh raster sp]; }; spfrontier = derive2 { name="spfrontier"; version="0.2.3"; sha256="0br54kkva4m3yyqfjh3cs5wf4kk3ax6yg0h8cl5qiy38dvssa5qd"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; }; spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; }; @@ -10284,24 +10488,28 @@ in with self; { sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; }; sphet = derive2 { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[Matrix nlme sp spdep]; }; spi = derive2 { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; }; + spiderbar = derive2 { name="spiderbar"; version="0.2.0"; sha256="1lhzj2fvn83plnifwvmdkjf3zpmb5bvqh6ddzf9jhzmfsqa46h7x"; depends=[Rcpp]; }; spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; }; spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-11"; sha256="1f16jvdj6kbiiypnbbj10nj7l88kkrxasrribqpjv7ai62dlximn"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; }; spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; - spind = derive2 { name="spind"; version="2.1.0"; sha256="0mq7c0ps62498cjwxwask3a7mggvcvzhkglw6alps9vz3p1qmi3i"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje sp splancs stringr waveslim]; }; + spind = derive2 { name="spind"; version="2.1.1"; sha256="0d0pjjipnn1jkdi70npfqssz7m72h68dshg7gzpch8ycq8iqz9sz"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje sp splancs stringr waveslim]; }; spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; }; splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; }; - splines2 = derive2 { name="splines2"; version="0.2.5"; sha256="048c43dhrri0xc02897jxgqw7c5ai2nyylhx3bvwsqg0hrj3c7rv"; depends=[]; }; + splashr = derive2 { name="splashr"; version="0.4.0"; sha256="0k6ylq4vrs4ymr8cjvwm4id1kkng76hlg4bzxak4sd9sjk914xp2"; depends=[clipr curl docker formatR HARtools httr jsonlite lubridate magick openssl purrr scales stringi xml2]; }; + splines2 = derive2 { name="splines2"; version="0.2.6"; sha256="1a58pl1a0lc7ljs9q9p3licpzzfr75lcahfzc3hdzhg3zn6m56cx"; depends=[]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.1"; sha256="0gz65acnkil9xjspl2kzpzyhj7lslga9g3p0k79xh25ia6qal5ws"; depends=[lbfgs]; }; splithalf = derive2 { name="splithalf"; version="0.2.0"; sha256="1bpw8mw88aryk4n0bdm4f356wsix6npdpl91qfbwayhdh0g5302f"; depends=[plyr]; }; splitstackshape = derive2 { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; }; splm = derive2 { name="splm"; version="1.4-6"; sha256="1vclsx622zq7kdgb84dd74i6a1b27d0jnx29blzba77d24adyzmh"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; }; + splot = derive2 { name="splot"; version="0.3.0"; sha256="1amz7b9bcc1qr8wa650j1v5bbqq4d0q5xwmxf9rv6npra6c6db7w"; depends=[]; }; spls = derive2 { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; }; splus2R = derive2 { name="splus2R"; version="1.2-2"; sha256="0xrbj8vxy0pc6hl7m8abv71d3hjw47cl51s7j7priadyqczkq6sz"; depends=[]; }; splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-137"; sha256="0bpzv6a05hnqnnz2znnkb3f34r56krhc595zjnn82azxj4a53njh"; depends=[]; }; splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-74"; sha256="0aikw6ckc0a7lrgjlcdmqspgrx0fc4iysd7jynd2lsf1hxy4pz35"; depends=[splusTimeDate]; }; + spm = derive2 { name="spm"; version="1.0.0"; sha256="0q87sbp39axmlnj15srnsysm7d9rpm5q6zic0h6hc1xwp205v0sf"; depends=[gbm gstat psy randomForest sp]; }; spm12r = derive2 { name="spm12r"; version="2.3.1"; sha256="1fkm961phkxy5rmv2vav0a7vy9j89i0gwgfi2rjg682xl473j3gk"; depends=[git2r matlabr neurobase oro_nifti R_utils]; }; - spmoran = derive2 { name="spmoran"; version="0.1.1"; sha256="1l5rigjvh1swj203fh410gsi3vdw42z1544g47jx9cs4s0273saa"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; }; + spmoran = derive2 { name="spmoran"; version="0.1.2"; sha256="19rl14w0zry649c3kgvrmb7bsw3dxsprf52naiqfxxs7qy3pxcm2"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; }; spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; }; spocc = derive2 { name="spocc"; version="0.7.0"; sha256="0ar107c7snbh1iaib3xddng88861h3gc56whicx5krl3zf2xgjqa"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; }; spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; }; @@ -10318,6 +10526,7 @@ in with self; { spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; spsurvey = derive2 { name="spsurvey"; version="3.3"; sha256="1xpjimqkrwm77amqza4713psmg86bvz08gxdi35advq4w614f2w1"; depends=[deldir foreign Hmisc MASS rgeos sp]; }; spt = derive2 { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; }; + sptemExp = derive2 { name="sptemExp"; version="0.1.1"; sha256="0a4y355j24sll8jmm17lh4j13k21b3nlalsxzpzx2gp5xw1x7jr6"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; }; sptm = derive2 { name="sptm"; version="16.7-9"; sha256="0x8824zccrwdl38jbhq8skzcvxb7a3b1zggkd7gmyjd94xvxll9k"; depends=[kyotil survey survival]; }; spuRs = derive2 { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[lattice MASS]; }; spup = derive2 { name="spup"; version="0.1-1"; sha256="0iwmydvd6bwpyr4q3hk2hlvgrvpzrdhnbq0frxadwcaaap75pfv0"; depends=[gstat magrittr mvtnorm purrr raster whisker]; }; @@ -10345,7 +10554,7 @@ in with self; { ssmrob = derive2 { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[MASS mvtnorm robustbase sampleSelection]; }; ssmsn = derive2 { name="ssmsn"; version="0.2.0"; sha256="0fzqdkqhj5hh8pzcwh7i0rglgdq22a5mriyis8r1vhlkdc7n5m39"; depends=[MCMCpack]; }; sspline = derive2 { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; - sspse = derive2 { name="sspse"; version="0.5-1"; sha256="0gih9d0g4kp08c4v01p699lavb491khyj16i8vldhcb194bvs8m5"; depends=[coda]; }; + sspse = derive2 { name="sspse"; version="0.5-2"; sha256="06sysp4jyf79y53i7xl5yvbpvfxrf929zhf3s54wsi6014mbkh23"; depends=[coda]; }; sss = derive2 { name="sss"; version="0.1-0"; sha256="1qg56g60h8c52l8lpxihxsdgnqkxiag1mzh3p388r9hhff7g3g0k"; depends=[assertthat xml2]; }; ssvd = derive2 { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; }; ssym = derive2 { name="ssym"; version="1.5.7"; sha256="0l5d921vlhd4qwddllrgcxpq3bhivvy5ikh3ixdy3s140rzpgwrv"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; }; @@ -10367,7 +10576,7 @@ in with self; { starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; starmie = derive2 { name="starmie"; version="0.1.2"; sha256="06cvl8gk78c55kcf4rd27d4gfzh2lcg7ldynvx4hclvbw7ak9zdq"; depends=[combinat data_table ggdendro ggplot2 ggrepel gridExtra iterpc label_switching MCL MCMCpack proxy purrr readr stringr tidyr]; }; startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; }; - startup = derive2 { name="startup"; version="0.6.1"; sha256="1hxncw08sw9278vdpg8q1gmg2y3crkj9h8cbvf77pgm3jzswpbbc"; depends=[]; }; + startup = derive2 { name="startup"; version="0.7.0"; sha256="0g5wdj31vq83j6hanhckpxxwb8s7i8d5vavwvx9qdci848diid4h"; depends=[]; }; startupmsg = derive2 { name="startupmsg"; version="0.9.4"; sha256="1r9dqrfznsrj7s11m56hkzgfnw3qcgzh07pqipl007zr2av9xwqw"; depends=[]; }; statGraph = derive2 { name="statGraph"; version="0.1.0"; sha256="13wfylb92lzw08fn3p000v87abs7ij2rb82np1rkgsl8w2kica73"; depends=[igraph MASS]; }; statar = derive2 { name="statar"; version="0.6.5"; sha256="0vmdrdq6db16vfl0rb39x8yfnbdzpcrvywfgp4lss6jby3nvjwd9"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr]; }; @@ -10383,10 +10592,10 @@ in with self; { statnet_common = derive2 { name="statnet.common"; version="4.0.0"; sha256="0yw6l5b4qv0jqlg4zyczas7m12a5pyqghs6ydxy2f6v6vxkijvi0"; depends=[]; }; statnetWeb = derive2 { name="statnetWeb"; version="0.4.0"; sha256="0gqvvpz9435wakpgf5jsznwgd3fix1vyabh87bnnfsm3pfs7rf2x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; statprograms = derive2 { name="statprograms"; version="0.1.0"; sha256="1jm8vnzccx34rhypkc5brx52k0f0g4z9cckzib43i5fcqd4skib6"; depends=[]; }; - statquotes = derive2 { name="statquotes"; version="0.2"; sha256="05qsffbgpgzrhk2nbyfa4a63ad06aj09bzcc11h9dl3sdz6jj7gr"; depends=[stringr tidytext wordcloud]; }; - statsgrokse = derive2 { name="statsgrokse"; version="0.1.4"; sha256="1kxkpddmgyyg51fhmllgahnhwixwv6b95nx0viyqa9c5ngix2gd5"; depends=[httr jsonlite stringr]; }; + statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; }; + statsDK = derive2 { name="statsDK"; version="0.1.0"; sha256="00idjwn003gcfj78jf92sqfpaan9i65zgld6mfp24xqwgkblw8jd"; depends=[dplyr ggplot2 jsonlite rjstat stringr tibble tidyr tidyverse]; }; stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; }; - stdReg = derive2 { name="stdReg"; version="2.1"; sha256="0h9h64vk52l7ai50f4pih0qdshsqsx5cm3fj1fjrcpbsfq7azg34"; depends=[data_table survival]; }; + stdReg = derive2 { name="stdReg"; version="2.2.0"; sha256="166f0icz2gmnyp5fd824gylksjizyp2rm2h6i59h8q6brq3r79q8"; depends=[data_table numDeriv survival]; }; stddiff = derive2 { name="stddiff"; version="2.0"; sha256="0mik01a8agcdpjq4r7lcdf3w2jcy6s9gx9zl7plzvnl2r3s5xw5b"; depends=[]; }; stdvectors = derive2 { name="stdvectors"; version="0.0.5"; sha256="0gxylknr146qyg9aj22md076cdhrsz75dg25a1hx8525cm71nwd6"; depends=[Rcpp]; }; steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; }; @@ -10402,7 +10611,7 @@ in with self; { stilt = derive2 { name="stilt"; version="1.1.0"; sha256="0qap66gl1iabwvar4fw7r159slmgzriljn4ikp3pas65y0pw2dz6"; depends=[fields]; }; stinepack = derive2 { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; }; stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; }; - stm = derive2 { name="stm"; version="1.2.2"; sha256="1kv4plz9i446s8vdrh71lk49gvvl6v5dviym4qh63iwkipgz2fy1"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; + stm = derive2 { name="stm"; version="1.3.0"; sha256="07q8kgw46rhj2lgfcxjz2z7b65z1syh5q94lfzp3zqd7lcbfp5yy"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; stmBrowser = derive2 { name="stmBrowser"; version="1.0"; sha256="0jfh0c835a2sxn2cqlmwdlzj2g2dmkfl2z3pkv4fc1ajggw2n7g2"; depends=[httr jsonlite rjson stm]; }; stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; }; stmgp = derive2 { name="stmgp"; version="1.0"; sha256="1v6ahg4icyrz8p0lfiyi2x90allhjvcq8rycinas5mffg7xgpv7d"; depends=[MASS]; }; @@ -10410,12 +10619,11 @@ in with self; { stoRy = derive2 { name="stoRy"; version="0.1.1"; sha256="0ymk5skzsga0jr9chl52njlb23803a7cij0iaw6crssdf3sk226s"; depends=[data_tree R6]; }; stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; }; stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; }; - stochvol = derive2 { name="stochvol"; version="1.3.2"; sha256="08vn2ifbb7yc3b7c5pgklp9wr98vx1gv60gpsqba32xr6ijn49vd"; depends=[coda Rcpp RcppArmadillo]; }; - stockPortfolio = derive2 { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; }; + stochvol = derive2 { name="stochvol"; version="1.3.3"; sha256="0cg61djjfw4jmq71g8kddrihdy9n2vlpzlf7kl2f3p8njc1f8kk2"; depends=[coda Rcpp RcppArmadillo]; }; stocks = derive2 { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; }; stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.0"; sha256="1pxkb0ijx04c4bk6szxhj8lxq6x76m8pyhxpf8xq63h4gh57fxh3"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; }; - storr = derive2 { name="storr"; version="1.1.1"; sha256="0n2shzv7hblff7wrh7ls3q5zp97pisz935laqmyg201vhlypnqfi"; depends=[digest R6]; }; + storr = derive2 { name="storr"; version="1.1.2"; sha256="1bv5qriqh1w8rishwxkm9xzz30ildrpcvnh4g3d8khh5r8dlz5lg"; depends=[digest R6]; }; stosim = derive2 { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[Rcpp tcltk2]; }; stplanr = derive2 { name="stplanr"; version="0.1.9"; sha256="171m2d22wmcchh52sddd8rsna37718019cwb30d2j3zm8wcairgn"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sp stringi stringr]; }; stpm = derive2 { name="stpm"; version="1.6.8"; sha256="0gifkrpp8n4r31i4dfvjfq7w0l6jfid43i94ygqwwv0ca583aw4y"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; }; @@ -10473,8 +10681,8 @@ in with self; { sugrrants = derive2 { name="sugrrants"; version="0.1.0"; sha256="12dqayn8hwbdqqn13v4zywn2h96q1wya4g04qs586qm6wx4p64nk"; depends=[dplyr ggplot2 lubridate magrittr purrr readr rlang tidyr timeDate]; }; summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; }; summarytools = derive2 { name="summarytools"; version="0.6.5"; sha256="1ddvwn0rfyrlfar1kpwggxnpp9dpswdy8v5alcv3kanp540hnmb1"; depends=[Hmisc htmltools matrixStats pander pryr rapportools rstudioapi xtable]; }; - sunburstR = derive2 { name="sunburstR"; version="1.0.0"; sha256="0n6nw35n8c453nminv0kzpfxxhwhh6hdmjja0wg1m2kpai8aj2kw"; depends=[d3r dplyr htmltools htmlwidgets]; }; - suncalc = derive2 { name="suncalc"; version="0.1"; sha256="173yzrzayvc2hidy38arjnsl2344wh80nc355nip9mxd1wwddbzy"; depends=[V8]; }; + sunburstR = derive2 { name="sunburstR"; version="1.0.2"; sha256="16z2c6xaf1mss5qygwpacn1slqzlkb502d1rw40m48v5akfg93sx"; depends=[d3r dplyr htmltools htmlwidgets]; }; + suncalc = derive2 { name="suncalc"; version="0.2"; sha256="0l62zdc9hqjyrd1nphdx57pi64ncw6j389hxbd1xnyrcnszlnwp0"; depends=[V8]; }; supc = derive2 { name="supc"; version="0.1"; sha256="1cq0lr04m409xr3i1hphww4ldr8z3kqq2gmp7hm3yp0iz2gy3m9a"; depends=[BH Rcpp]; }; supclust = derive2 { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; }; supcluster = derive2 { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; }; @@ -10488,7 +10696,7 @@ in with self; { support_BWS2 = derive2 { name="support.BWS2"; version="0.1-1"; sha256="1jay1ak8242vn9a0ippfdd48vdxqqz9j8frbgf5ncffdmzzn1n21"; depends=[]; }; support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; }; supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; }; - sure = derive2 { name="sure"; version="0.1.2"; sha256="0dgilavv8hq9szqz9km4fyqkc06spb5v37db5fs70ybxcisqg99f"; depends=[ggplot2 goftest gridExtra]; }; + sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; }; surface = derive2 { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape geiger MASS ouch]; }; surrosurv = derive2 { name="surrosurv"; version="1.1.15"; sha256="0ns189h33akzl8rs53yg9g1975133wv0csn5cg0lp26b2sh9qp1x"; depends=[copula eha lme4 MASS Matrix msm mvmeta optextras optimx parfm SurvCorr survival]; }; surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-5"; sha256="0pk70q33il9clz0ikzx1cypg5ygnsqp5hgk67xczzbidksjzs4dn"; depends=[flexsurv plotrix survival]; }; @@ -10501,7 +10709,7 @@ in with self; { survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; }; survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; }; survMisc = derive2 { name="survMisc"; version="0.5.4"; sha256="1m24vnhxk410h117mz056j8xkhp1ivjn5wvpprc0rqnd374z6c84"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; }; - survPresmooth = derive2 { name="survPresmooth"; version="1.1-9"; sha256="146ni0xnqd4kfxfxm8nkrgk6v4nrf2hpbb957zh10kmvaa5f9mij"; depends=[]; }; + survPresmooth = derive2 { name="survPresmooth"; version="1.1-10"; sha256="0m1037v857g140lypck5zq2zf52rkdxzaqlj9kjn7h7lp6gif6ia"; depends=[]; }; survRM2 = derive2 { name="survRM2"; version="1.0-2"; sha256="0pvp65c1kkbkcci4l3cvq4a5krmv58jwb9abz5225ql6jyawzlsw"; depends=[survival]; }; survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; }; surveillance = derive2 { name="surveillance"; version="1.14.0"; sha256="0gx6ry2qyapn5lwk5hgl7pdijpqnpc0ccp623g79lzwx98w9rp4k"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; }; @@ -10523,6 +10731,7 @@ in with self; { survsim = derive2 { name="survsim"; version="1.1.4"; sha256="16njbqlzmk34zrh485kc0a52yacdyj9z4z4a9zcq1z5psm87c58m"; depends=[eha statmod]; }; survtmle = derive2 { name="survtmle"; version="1.0.0"; sha256="1sdp88br1ry6yzzav67787n0clpq6vjffxqpkvld93dyvmlb6zb1"; depends=[ggplot2 Matrix plyr stringr SuperLearner tidyr]; }; survutils = derive2 { name="survutils"; version="1.0.0"; sha256="1dha1i2k9dyc9m9awqiq2ypy617zmw9yflfzv182z5fpd491ghrv"; depends=[broom dplyr ggplot2 lazyeval magrittr purrr survC1 survival]; }; + sutteForecastR = derive2 { name="sutteForecastR"; version="0.1"; sha256="13dd0v3l3s7xb1wnpf6qvnvclzab87831z8bsxsq53vpb26xcw1b"; depends=[forecast forecastHybrid fracdiff robets]; }; svDialogs = derive2 { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; }; svDialogstcltk = derive2 { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; }; svGUI = derive2 { name="svGUI"; version="0.9-55"; sha256="1fkkc12mhcbn3s2wzk0xdsp8jl2xmn48ys2an8jhxbww3gplk1rq"; depends=[]; }; @@ -10537,19 +10746,19 @@ in with self; { svWidgets = derive2 { name="svWidgets"; version="0.9-44"; sha256="18k06wldcg6xpyf8nz9rdbig5nhvghn7zgf1316413kq3v90vz7b"; depends=[svMisc]; }; svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; }; svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; }; - svd = derive2 { name="svd"; version="0.4"; sha256="06bw4nypj9p57py2vw26yhzn3gw7clvby1mxbg2s2wj3jyay47p5"; depends=[]; }; + svd = derive2 { name="svd"; version="0.4.1"; sha256="00plnwrjnp3majssr3qbz2zp25z9cfivgpggyfvy4lnc4av5qn3g"; depends=[]; }; svdvis = derive2 { name="svdvis"; version="0.1"; sha256="1z3z86izl2gpxllpx56vn6kkdg9cjjikfd90hdjnfi4bmmpx50dn"; depends=[GGally ggplot2 gridExtra RColorBrewer reshape2 scales]; }; svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; }; svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; }; svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; }; svgViewR = derive2 { name="svgViewR"; version="1.2"; sha256="0h3smaplnkkvbl9c6lwl67jbk34m6sygkh2d82xz66hbyw2i6q7k"; depends=[]; }; - svglite = derive2 { name="svglite"; version="1.2.0"; sha256="1s1gvmlmmna5y4jsn9h6438pg5b86fl4nwfvkgm6n4h6ljfgqyx3"; depends=[BH gdtools Rcpp]; }; + svglite = derive2 { name="svglite"; version="1.2.1"; sha256="1bws3lc4hlhln11zd7lalhiyc43yk6c6vrzy41fkxk1dkjazfx51"; depends=[BH gdtools Rcpp]; }; svmadmm = derive2 { name="svmadmm"; version="0.3"; sha256="15ccda1r9cc6v30j37i052rdwxgw0wg37hwyn2vp8c7bkr0ybgkm"; depends=[kernlab]; }; svmpath = derive2 { name="svmpath"; version="0.955"; sha256="02j5xs4gg8k16imnwk6aram168cv1dqdrky3bszyc98l7xd0nlrj"; depends=[]; }; svs = derive2 { name="svs"; version="1.1.0"; sha256="0575msaxg04ck76mbr815m29y895qvg8b9qg4y0ggv6b1lvwp5p6"; depends=[gtools]; }; svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; swCRTdesign = derive2 { name="swCRTdesign"; version="2.1"; sha256="0c5pya5jgpj5ncrvpzahhrbhl7b39w19f3vl06r8q0nandbn7rwq"; depends=[]; }; - swamp = derive2 { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; }; + swamp = derive2 { name="swamp"; version="1.3.1"; sha256="1l4rk79hbggn31y5skslqsz9bv7lmya4q5ligki3x1677345hyhv"; depends=[amap gplots impute MASS]; }; swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; }; sweep = derive2 { name="sweep"; version="0.2.0"; sha256="11hyv48hldacdbi7avvgmrqk9andjkabdswf1blfb4qyc2z0199v"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; }; sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; }; @@ -10568,6 +10777,7 @@ in with self; { sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.0"; sha256="0p3w7ipyrqrh7nf52h8qmr4fikyinm8an7npmcb7kwjd59rcy554"; depends=[MASS Matrix sybil]; }; sylcount = derive2 { name="sylcount"; version="0.1-0"; sha256="1dxbqbjyvkg7cx234icby9fjdjz1z4l4crqd7kv8m05fv69pg224"; depends=[]; }; syllable = derive2 { name="syllable"; version="0.1.3"; sha256="1ymnczwx58h720hsm0s9zq3ddwg6gn6bgg0m8zw24i0nlivx0yjg"; depends=[data_table stringi textclean textshape]; }; + sylly = derive2 { name="sylly"; version="0.1-2"; sha256="04jbz0rzn2vx9xblfzxyk6x9l1g2s27cdq5ai0gbwgakjn6nx4j7"; depends=[]; }; symDMatrix = derive2 { name="symDMatrix"; version="1.0.0"; sha256="0xss7f7hkrf2afchccfavymylfybnp9nxawqxd2vdjni95kbd595"; depends=[]; }; symbolicDA = derive2 { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; }; symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; @@ -10581,7 +10791,7 @@ in with self; { synthACS = derive2 { name="synthACS"; version="1.0.1"; sha256="0jbhiadgc8f6h7ga685cm5i8y59lf76r8sgd629xfjj4jxn8ckdm"; depends=[acs data_table Rcpp]; }; synthpop = derive2 { name="synthpop"; version="1.3-2"; sha256="0rprvrixpnzc2yxgvp8gq72k145hb1f37fzp9lbpjc7yxy7hncmz"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; }; sys = derive2 { name="sys"; version="1.4"; sha256="0x9npf3hybrh0vsr2bxax31k3x99p6klrc1gplp295mjiqxiy7sk"; depends=[]; }; - sysfonts = derive2 { name="sysfonts"; version="0.6"; sha256="02cf5n4s6knn887nx3mr8fd9cqy67i107c889w5j028l6qk43jxr"; depends=[]; }; + sysfonts = derive2 { name="sysfonts"; version="0.7.1"; sha256="04kimfdp895c6839ss7lqahd77jx3lz2gd3i849c2vkwi89v6vs9"; depends=[]; }; sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; systemfit = derive2 { name="systemfit"; version="1.1-20"; sha256="1qzgx4hn6f71hnk70ccf6inajprrb6my5af8q2manz41577z0ka7"; depends=[car lmtest MASS Matrix sandwich]; }; systemicrisk = derive2 { name="systemicrisk"; version="0.4"; sha256="1qpimrfr75l6phr425m7av02l57yyn1n2if7h26cndf9ynmv6vz1"; depends=[lpSolve Rcpp]; }; @@ -10621,7 +10831,7 @@ in with self; { tcR = derive2 { name="tcR"; version="2.2.1.11"; sha256="1wyxjwyba08m80g2c40sdg3d5brs3qmq8azb6vzwh2wmgqlb5400"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; tcgsaseq = derive2 { name="tcgsaseq"; version="1.6.2"; sha256="1cnakn8v0ijsq7bxw38fiab32cxcfyfm6k30ypsb3rr82hb8kh0l"; depends=[CompQuadForm ggplot2 GSA KernSmooth]; }; tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; - tclust = derive2 { name="tclust"; version="1.2-7"; sha256="1mvqr280c6kwpg98byd0r1y0qf238xn2x15y8npqch6lpcszlb3x"; depends=[cluster mclust mvtnorm sn]; }; + tclust = derive2 { name="tclust"; version="1.3-1"; sha256="1li62wynv81kb17fx7nk63a26qlb78l8fdf63in8yzcl7fkpji7y"; depends=[cluster mclust mvtnorm sn]; }; tcpl = derive2 { name="tcpl"; version="1.2.2"; sha256="1f32qq5816qkyx3n16vgf13g2piv2pqn2nki3c91vg51bwfap7z1"; depends=[data_table DBI numDeriv RColorBrewer RMySQL RSQLite]; }; tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; }; tdr = derive2 { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; }; @@ -10639,10 +10849,10 @@ in with self; { tensorA = derive2 { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; }; tensorBF = derive2 { name="tensorBF"; version="1.0.1"; sha256="1rnsff1ypwhn5z0xsxyk2z7jl6igscma1a0w613i81qf37iy81ba"; depends=[tensor]; }; tensorBSS = derive2 { name="tensorBSS"; version="0.3.1"; sha256="1w8wl3s48wnxmahaklzkipsj3hrwzch8dp084j0zmk6rpbl1q4b7"; depends=[JADE Rcpp RcppArmadillo tensor tsBSS]; }; - tensorflow = derive2 { name="tensorflow"; version="1.3"; sha256="1wivd19jxm2l4iij2cad3hiwb78821dsjlz2bcvrfg8qk4h2pb06"; depends=[config jsonlite processx reticulate tfruns yaml]; }; + tensorflow = derive2 { name="tensorflow"; version="1.3.1"; sha256="12r2bck3vz58cx8fznivda456g3f4xscai4hxcxv64yyz0gr8y1c"; depends=[config jsonlite processx reticulate tfruns yaml]; }; tensorr = derive2 { name="tensorr"; version="0.1.0"; sha256="00zqklz3hqjv20giwqnd1d62x5hdm620hfdkn1x75i87dv92qn8m"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; }; tensr = derive2 { name="tensr"; version="1.0.0"; sha256="05gclhljflkz98hgiq5bgbqjz8icxbdq6b84bn2995cx7v0x85ds"; depends=[]; }; - tergm = derive2 { name="tergm"; version="3.4.0"; sha256="19658k5570z8yxpklbbl87a7pd8i4yygi0ky8lgzb8qymds90v4s"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; }; + tergm = derive2 { name="tergm"; version="3.4.1"; sha256="10sanqbnqdyqafjjcwm99zfnpgrv18z4y2rgaq5wqq7nni184hfm"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; }; termstrc = derive2 { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo]; }; ternvis = derive2 { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[dichromat mapdata maps maptools quadprog]; }; tesseract = derive2 { name="tesseract"; version="1.6"; sha256="1apcmbkrbyrcdjc39w46shbic404pnkmqqdr0bdp193svp5df8rb"; depends=[curl digest rappdirs Rcpp]; }; @@ -10652,7 +10862,7 @@ in with self; { testit = derive2 { name="testit"; version="0.7"; sha256="07qsnhghdgyxdknzq7ngpkf3qw9939m3lvk9dv9nk2zypy4jhcq3"; depends=[]; }; testthat = derive2 { name="testthat"; version="1.0.2"; sha256="0pj1r01x4ny4capr83dfa19hi5i2sjjxky99schzip8zrq5dzxqf"; depends=[crayon digest magrittr praise R6]; }; tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; }; - texPreview = derive2 { name="texPreview"; version="1.0.0"; sha256="1i34w1804p3qwmijj2lqmfjy909axfp8icllr1nilfqbsrrmssbi"; depends=[magick magrittr rstudioapi svgPanZoom xml2 xtable]; }; + texPreview = derive2 { name="texPreview"; version="1.1.0"; sha256="085aa9qgnmf3mqan2pff0gcdrz7kxd84r12lz780r1mr05ckk8zk"; depends=[magick rstudioapi svgPanZoom xml2]; }; texmex = derive2 { name="texmex"; version="2.3"; sha256="0hh633hlzmjrlind51kjs7s1zpx8bwcwfa93yl4swfvn501j1hy9"; depends=[ggplot2 mvtnorm]; }; texmexseq = derive2 { name="texmexseq"; version="0.3"; sha256="08zjsb541xqqs3lj7avx5147g2d0bh3v036x615srjx2pbxzhsvg"; depends=[dplyr ggplot2 testthat]; }; texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; }; @@ -10669,14 +10879,14 @@ in with self; { textreadr = derive2 { name="textreadr"; version="0.5.1"; sha256="03j69xn5ligqypkkhj4w0avl4nzn5c87hz3ycz7cwlm2symkwadw"; depends=[antiword curl pdftools readxl rvest textshape xml2]; }; textreg = derive2 { name="textreg"; version="0.1.4"; sha256="0k7hpvvhacz29d3mvnygg6rqmh9f3ghkcp7kjmvv9jnr2ipw2j21"; depends=[NLP Rcpp tm]; }; textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; }; - textshape = derive2 { name="textshape"; version="1.3.0"; sha256="1pp80zfnbwgslawi0jnkg1xdqcs5qxv5inilx2diy9g11534pxng"; depends=[data_table slam stringi]; }; + textshape = derive2 { name="textshape"; version="1.5.0"; sha256="0hvp3mz7j2qkw38jg9cj92ikhyic1c9w8jk07z3vh3f5cm1klvbm"; depends=[data_table slam stringi]; }; textstem = derive2 { name="textstem"; version="0.0.1"; sha256="09010a5flly5kiifx2jha5zvwncpk1xsgx2idipjnrav01plhin2"; depends=[dplyr hunspell koRpus lexicon quanteda SnowballC textshape]; }; textutils = derive2 { name="textutils"; version="0.1-6"; sha256="0xvsd6pfg4kv40l14xcvmirqiq8rmky4s8v8diagzri3a7i45nqn"; depends=[]; }; tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; }; tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; }; tframe = derive2 { name="tframe"; version="2015.12-1"; sha256="0k0favda3z6zdg7ykc2nnl28gxz7sfzbyr5pcifiyi984pa2zgfx"; depends=[]; }; tframePlus = derive2 { name="tframePlus"; version="2016.7-1"; sha256="12xi2xw4pr78n3cppfknpxmjp2263pb4kqj9v412yxwp82rgb6yk"; depends=[tframe timeSeries]; }; - tfruns = derive2 { name="tfruns"; version="0.9"; sha256="0xi0z42w64sjncf85pwc35bffymink6s70v41iv43f3qi0w533aj"; depends=[]; }; + tfruns = derive2 { name="tfruns"; version="0.9.1"; sha256="1j90phx4xz9myappssx6kj8jgpsjhzhl5f94gqy13mlf36fm97hz"; depends=[config jsonlite magrittr tibble yaml]; }; tgcd = derive2 { name="tgcd"; version="2.0"; sha256="1553f464jpmngdj8fmbjn9cpmrcp4ysgsfx4w7q4pm4csslsqvlr"; depends=[]; }; tggd = derive2 { name="tggd"; version="0.1.1"; sha256="1izar1b3w148vp2r8gv3vpwfndib8ilxcjxgbfzbxn7q5mr73mwa"; depends=[gsl]; }; tglm = derive2 { name="tglm"; version="1.0"; sha256="1gv33jq3bzd5wlrqjvcfb1ax258q9asawkdi64rbj18qp7fg2dbx"; depends=[BayesLogit coda mvtnorm truncnorm]; }; @@ -10692,19 +10902,20 @@ in with self; { threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; }; threg = derive2 { name="threg"; version="1.0.3"; sha256="1ja0w4hhdkw3b1cipbpw8ym27k5lh2m7gibd74mj6gij7rpixrnb"; depends=[Formula survival]; }; thregI = derive2 { name="thregI"; version="1.0.3"; sha256="1nacwpzwzb6v6gxrdrarpnrgmsgnn6nsrg53b6866lcqsg09imvj"; depends=[Formula survival]; }; + threshr = derive2 { name="threshr"; version="1.0.0"; sha256="1zrhmqpz3k2gyddrzg96yyyc1jffj3aic2dmbidxxc97b9g5hi53"; depends=[revdbayes rust]; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; tibble = derive2 { name="tibble"; version="1.3.4"; sha256="02vn6yqzcvmazy5jaqar3wwbrmh83a1bfgsqgk0hgz38i80zgvm7"; depends=[Rcpp rlang]; }; + tibbletime = derive2 { name="tibbletime"; version="0.0.1"; sha256="0c7iyzlldrxwkjvchsc6clv3ylv1krm3grl8wlmdb13iyjfp6p1r"; depends=[assertthat dplyr lubridate magrittr purrr rlang stringr tibble tidyr]; }; tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; }; tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; }; tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; - tidyRSS = derive2 { name="tidyRSS"; version="1.2.1"; sha256="0ccs7njylm9dns8vkda52plxp8is3c5ynb55wcjd50qk44sys867"; depends=[dplyr httr lubridate magrittr tibble xml2]; }; + tidyRSS = derive2 { name="tidyRSS"; version="1.2.2"; sha256="1vyn6fr25b0216716sp26rg3gdklqz60m6hffd01m52pvwvhk9qx"; depends=[dplyr httr jsonlite lubridate magrittr purrr testthat tibble xml2]; }; tidycensus = derive2 { name="tidycensus"; version="0.2"; sha256="0d80yy59avy9h2ksyv6iabiqkqa8bgr1i2s8n43w569fisjzlf9i"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; tidygenomics = derive2 { name="tidygenomics"; version="0.1.0"; sha256="0n6km2zhdmbgacn6rzamrn506d9y3sl6yp2q6fd9x7kzgz09aq4n"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp tidyr]; }; tidygraph = derive2 { name="tidygraph"; version="1.0.0"; sha256="1z0jmhwj3m1xk9zmds2riyqmq189716j5qi6ijgf3xni3n25c0m0"; depends=[dplyr igraph magrittr R6 Rcpp rlang tibble tidyr]; }; - tidyjson = derive2 { name="tidyjson"; version="0.2.2"; sha256="1fim73qbd6jqjlprxv9wzhg0hr20pihdmdbx49yharfs74hf9yv7"; depends=[assertthat dplyr jsonlite]; }; tidyquant = derive2 { name="tidyquant"; version="0.5.3"; sha256="1vvmx0l5vd434gjsqd19vlnzk0hxgh82b1dsf2zwshc9hni1b75l"; depends=[broom curl devtools dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries timetk tseries TTR XLConnect xml2 xts zoo]; }; - tidyr = derive2 { name="tidyr"; version="0.7.0"; sha256="1lg0amx5hs37ajwjxz7ya50q4s28jcdj51kzl10s1x4l1akp7xls"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; }; - tidyselect = derive2 { name="tidyselect"; version="0.1.1"; sha256="0fhqj22g69lba8xavzagm64r0w488shdxha1c529vnfm5hv7fiic"; depends=[glue Rcpp rlang]; }; + tidyr = derive2 { name="tidyr"; version="0.7.1"; sha256="18fii18f967xaw6swn0w744sncx37rfq6gd8d9dccrpyf8647hmr"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; }; + tidyselect = derive2 { name="tidyselect"; version="0.2.0"; sha256="1h10qc5bxk5v0zhmip3gwnzy50fs2gbdvcg2163is0k9a8rifq9r"; depends=[glue purrr Rcpp rlang]; }; tidytext = derive2 { name="tidytext"; version="0.1.3"; sha256="10vdrvadllqrblc0w4ndvgvy9gq5l4nf93g31b1a2xkz2p30zc15"; depends=[broom dplyr hunspell janeaustenr Matrix purrr stringr tokenizers]; }; tidyverse = derive2 { name="tidyverse"; version="1.1.1"; sha256="1ahxs7xzik27xdbzc1ccrkq5knzrn8xf82x3dhh94xi5c8p3ysqx"; depends=[broom dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl rvest stringr tibble tidyr xml2]; }; tidyxl = derive2 { name="tidyxl"; version="0.2.3"; sha256="1rl51qrkzfw65px236x3hryfcfkrv6v1mxy5bqanlxcxyv94pnp2"; depends=[Rcpp]; }; @@ -10712,7 +10923,7 @@ in with self; { tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; }; tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; }; tigerstats = derive2 { name="tigerstats"; version="0.3"; sha256="12wrghipgypkhwwkmaxb6n0qx9fgxk82dc6wlh56rblsvciv2hj0"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData]; }; - tigger = derive2 { name="tigger"; version="0.2.10"; sha256="17dym3d1c1a34m0iwbrbp1xa8k46vi27g897z4mzb5ywk6605kn0"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval tidyr]; }; + tigger = derive2 { name="tigger"; version="0.2.11"; sha256="1kbqlfr3lsiiv0l7dzahna706zb4mx0gfx91220n2ckfc81pyrv5"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval tidyr]; }; tightClust = derive2 { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; }; tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.4"; sha256="0c733mb2fzskrfa4664w6psp80wdr5hc7f9rp516y59a8rr3xzr0"; depends=[DBI RSQLite]; }; tigris = derive2 { name="tigris"; version="0.5.3"; sha256="0ic4l91dd97gmbqm6jgwkx34gsna6asaq14prmjq8y8n4bw7dkvf"; depends=[dplyr httr magrittr maptools rappdirs rgdal rgeos sf sp stringr uuid]; }; @@ -10734,7 +10945,7 @@ in with self; { timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[DBI reshape2 RJSONIO RPostgreSQL shiny xts zoo]; }; timetk = derive2 { name="timetk"; version="0.1.0"; sha256="0z4zb00c4xbjn3ppz6ypcab2ahkr76mj6v68yfxkjb233cb18641"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; }; - timetools = derive2 { name="timetools"; version="1.12.0"; sha256="06yfgnz7nap2zhq1l62xbi17d83d21vjk62jb4mxrg8wprs4arnv"; depends=[]; }; + timetools = derive2 { name="timetools"; version="1.12.2"; sha256="17vw0piqzjr3vkpccksxk0razlvb9pcbwq737xkhabp363b8rqbx"; depends=[]; }; timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; }; timevis = derive2 { name="timevis"; version="0.4"; sha256="08caa5gilh1c0z41lm3ghf6cpnlsdjfm1v7ha73jxv1655kznmpx"; depends=[htmltools htmlwidgets jsonlite magrittr rmarkdown shiny]; }; timma = derive2 { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[QCA Rcpp RcppArmadillo reshape2]; }; @@ -10786,6 +10997,7 @@ in with self; { tourr = derive2 { name="tourr"; version="0.5.5"; sha256="12293kp36kz056zd3fnsaf2gy4g8mcs79ws0vgbs7b0hx09sy9vp"; depends=[]; }; tourrGui = derive2 { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[Cairo colorspace gWidgets RGtk2 tourr]; }; toxboot = derive2 { name="toxboot"; version="0.1.1"; sha256="0sw0mxhcq5k11swlhfpn6xk0nfsambh2yx1721zx75lya27wkmq1"; depends=[data_table tcpl]; }; + toxplot = derive2 { name="toxplot"; version="0.1.0"; sha256="0sl3ihagfxa7xl2l7xsrmvp6j1pxlrsqcljmwpwrn0sd5sdwyjm0"; depends=[dplyr ggplot2 ggthemes tcpl tidyr]; }; toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; }; tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; }; tpe = derive2 { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; }; @@ -10797,7 +11009,7 @@ in with self; { trackeR = derive2 { name="trackeR"; version="0.0.5"; sha256="0c1wfc41a0n9ldz7mmcss3m2c7lz5wjmv5ifwn9h6ih7wng9d707"; depends=[colorspace fda ggmap ggplot2 gridExtra gtable jsonlite leaflet raster RSQLite scam XML zoo]; }; tractor_base = derive2 { name="tractor.base"; version="3.1.0"; sha256="0d3hkxqygyh02v63wny32zdxpsn6m6q8i1630zl1mhrbvq3kmqr5"; depends=[ore reportr]; }; traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; }; - traits = derive2 { name="traits"; version="0.2.0"; sha256="0qsnlp96ilwmaimph0bvkjw4kaqd3wpfy6knd7k5s321b68hqaam"; depends=[data_table dplyr httr jsonlite readr rvest taxize xml2]; }; + traits = derive2 { name="traits"; version="0.3.0"; sha256="155y8j69214xxi1bfk07k30zlpm3q6fmz7ydhnkvw0kv4l0i5pc5"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; }; traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; }; trajectories = derive2 { name="trajectories"; version="0.1-4"; sha256="0vwfbx5s8ywasxwv8cld4s6r96vlyknxipp49rsfpqn94nawhwnx"; depends=[lattice sp spacetime]; }; tranSurv = derive2 { name="tranSurv"; version="1.1-4"; sha256="1vsp12x4h0s1lba1kf7n0v71kgm1dz6cjfp8lffm4ps80nahs63l"; depends=[rootSolve SQUAREM survival]; }; @@ -10819,11 +11031,12 @@ in with self; { treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; treeman = derive2 { name="treeman"; version="1.1.1"; sha256="0j76crs31qniibsdj7dpbbr2jdbhvclfvcscd5dgklvpcspbarch"; depends=[ape bigmemory plyr RJSONIO stringr]; }; treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; + treemapify = derive2 { name="treemapify"; version="2.3.2"; sha256="0cixn3v41fki4iyvwmxsljwacffyb27q87cgnnw7sqf0vnkgb2gy"; depends=[ggfittext ggplot2 plyr reshape2]; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; }; treeplyr = derive2 { name="treeplyr"; version="0.1.3"; sha256="00fkmmzivwy603grfbwdabsik1swkyba7sbwcjzxbgsmx3s472g6"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; }; treespace = derive2 { name="treespace"; version="1.0.0"; sha256="1dc98p5jf9qyr31xa7h7v2zrjmhd3jlzrh2cpmnmhbpfm1cviskj"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn Rcpp RLumShiny scatterD3 shiny shinyBS]; }; treethresh = derive2 { name="treethresh"; version="0.1-11"; sha256="1fksyn9mycr6dpw1yh5b3fa7fk7ndz7q39174daplm55jbrz1dr5"; depends=[EbayesThresh wavethresh]; }; - trelliscope = derive2 { name="trelliscope"; version="0.9.7"; sha256="1hczmi3hjlk1nqd4p2m2hs89a86jrg59rraxw5z5fm0pa92xnzqy"; depends=[base64enc curl data_table datadr digest DistributionUtils ggplot2 hexbin htmltools htmlwidgets jpeg jsonlite lattice png rsconnect shiny]; }; + trelliscope = derive2 { name="trelliscope"; version="0.9.8"; sha256="1581ss5c3f7mnv6s3p9f8kfwnks0l80kxwpxv9mq61w3lf9fksm2"; depends=[base64enc curl data_table datadr digest DistributionUtils ggplot2 hexbin htmltools htmlwidgets jpeg jsonlite lattice png rsconnect shiny]; }; trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; }; trend = derive2 { name="trend"; version="1.0.0"; sha256="1fbzylw90y2h8qmg6hivhrrvv154jgfi77qij9wrh58rl2yq6gsj"; depends=[extraDistr]; }; triangle = derive2 { name="triangle"; version="0.10"; sha256="02s7iblk3fdrjhz0sns76bqrfwi0y0l6vbjfsb5mzq6pn45n0nkv"; depends=[]; }; @@ -10859,11 +11072,14 @@ in with self; { tsbugs = derive2 { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; }; tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; }; tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; }; + tsdf = derive2 { name="tsdf"; version="1.1-2"; sha256="11yapq3ml9clj0sqwibraj3wd7pikh2qrhq4df4m45ib6fiaa3jc"; depends=[gsDesign]; }; tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; }; + tsensembler = derive2 { name="tsensembler"; version="0.0.2"; sha256="0yhm6vayh1yjrvki04f86xvxmrl9pcj92z0gzwyh0j1cqp48sh79"; depends=[Cubist earth gbm glmnet kernlab nnet pls ranger RcppRoll xts zoo]; }; tseries = derive2 { name="tseries"; version="0.10-42"; sha256="1i26ankmbc96w6abqhxhbvhd12m87f2jfb5xrbl01iqmhy2pjzw2"; depends=[quadprog quantmod zoo]; }; tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; }; tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; }; tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; }; + tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; }; tsiR = derive2 { name="tsiR"; version="0.3.0"; sha256="1brlwsbs4rac8z6cf1q3xm1apdi4ban5hj7p3qvz2yx810gbxp1d"; depends=[ggplot2 kernlab reshape2]; }; tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; }; tsna = derive2 { name="tsna"; version="0.2.0"; sha256="09q01jzj1rnv2f2jf7djnq5xrkp7lvykdbf4bfswsy0f95j0asx2"; depends=[network networkDynamic statnet_common]; }; @@ -10879,7 +11095,7 @@ in with self; { tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; }; ttutils = derive2 { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; }; ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; }; - tuber = derive2 { name="tuber"; version="0.9.0"; sha256="0s90mkv14mx1np0aa8chh5fdzx8978i2qn7v6w2aaxqff8q9why6"; depends=[httr plyr]; }; + tuber = derive2 { name="tuber"; version="0.9.1"; sha256="011nlnyj49zb9gyh1h745s748zd486g0nrqgjsmyc6jhv5anmhi1"; depends=[httr plyr]; }; tubern = derive2 { name="tubern"; version="0.1.0"; sha256="0wpn4aig6r1kpncrgrqra4kr0f07rdq7z4p2k0h28f7kww6l52vv"; depends=[httr jsonlite]; }; tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.0"; sha256="0pxsnvzh5gy5dsdsqsmq8hkr597dnnv60b5dw7bqw493lavk2ccm"; depends=[]; }; tufte = derive2 { name="tufte"; version="0.2"; sha256="0yh5xdxapqpf5hgdn8c2jkk63817l2w6bxavw8457r89rnj1022p"; depends=[htmltools knitr rmarkdown]; }; @@ -10907,12 +11123,14 @@ in with self; { twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; }; txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; }; types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; }; + uGMAR = derive2 { name="uGMAR"; version="1.0.1"; sha256="1hjqx6m0617240b438zzk4y1jz0hpcwaj279555mldr6af445h1l"; depends=[Brobdingnag]; }; uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; }; uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; }; ubeR = derive2 { name="ubeR"; version="0.1.4"; sha256="1ilclna04hd1ykcp2b3gcj0v4qznwx0d24yavxnf2yh5d91wr6z2"; depends=[dplyr ggmap ggplot2 ggthemes googleway httpuv httr jsonlite]; }; ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; }; ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; }; udapi = derive2 { name="udapi"; version="0.1.0"; sha256="0hwnrx9qkazja288m6irmwwybiys9npk6sk60acjdczsfrn1hvl0"; depends=[curl httr]; }; + udpipe = derive2 { name="udpipe"; version="0.1.1"; sha256="1q1hl5swn0psds7wdfrng21xar4n1fr1s0qrk1rhv9g3m7a7jlpk"; depends=[data_table Rcpp]; }; udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; }; uiucthemes = derive2 { name="uiucthemes"; version="0.1.1"; sha256="0d1agg94z0qy6k4pbv01p1xb0zh42gkjl5i9kbqblplnk2swkzyi"; depends=[rmarkdown]; }; ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; }; @@ -10929,15 +11147,17 @@ in with self; { uniCox = derive2 { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; }; uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; uniah = derive2 { name="uniah"; version="1.0"; sha256="19zwy33gwa749i81mi9h05k8k3l4xbbln3k6q70fa7ic5lqbbdzj"; depends=[ahaz Iso survival]; }; + unifDAG = derive2 { name="unifDAG"; version="1.0.1"; sha256="1zf2pclddswrssil7ikq75449ks3070jxkzy2lmggq9gyipdypps"; depends=[gmp graph]; }; uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; }; uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; }; uniqueAtomMat = derive2 { name="uniqueAtomMat"; version="0.1-3-2"; sha256="1msk9wzxhqdq6737b5xay1nqyvppb2yjcpnff2l7c7jf4xrlw0pp"; depends=[]; }; unitedR = derive2 { name="unitedR"; version="0.2"; sha256="0glcyji0cypb2687cvyra0zzlzbq0md7qb60abgi0199hf51q3dj"; depends=[plyr]; }; - unitizer = derive2 { name="unitizer"; version="1.4.3"; sha256="0wcr58w1pf91hb3g8sgq7l6cw3idxn550i2aih8ixp1s3r1r757d"; depends=[crayon diffobj]; }; - units = derive2 { name="units"; version="0.4-5"; sha256="0sal0h1px9nbaqmd0d3s1x70lqs34qbj43b3pdrp7hvb4v48q82w"; depends=[udunits2]; }; + unitizer = derive2 { name="unitizer"; version="1.4.4"; sha256="0lx8x8y9hm5ilrw8i04krg9jlrs6j29cpmn723xjasgb3byj2sx6"; depends=[crayon diffobj]; }; + units = derive2 { name="units"; version="0.4-6"; sha256="1vx11yrmpk61gkhafbhhl97c8r4h9zvz9pd257daa8f2gsdkqf6v"; depends=[udunits2]; }; unittest = derive2 { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; }; univOutl = derive2 { name="univOutl"; version="0.1-3"; sha256="0p6x38szag3ngk48rz3vlsph5y6yd2vckpkqfd9h7yz2ziyyy5m6"; depends=[Hmisc robustbase]; }; unix = derive2 { name="unix"; version="1.3"; sha256="1l5w22j0h3qzya13wx7y8lx2baw496vcmn39l2y8r1v38as9dybc"; depends=[]; }; + unjoin = derive2 { name="unjoin"; version="0.0.3"; sha256="08vjgl4dnh9kycrvdq5ngf57fy61n0nc582bi4znv06pq696rkwp"; depends=[dplyr rlang tibble]; }; unmarked = derive2 { name="unmarked"; version="0.12-2"; sha256="1ql8l7kc8py7zand164w3yszqbmwyxvrkjvr10l4hx2mkcnvxzx0"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; }; unpivotr = derive2 { name="unpivotr"; version="0.2.1"; sha256="0gijbx2ziyfh9wl0a8dxnmm31961sdd9hi0i09frkqhxmcch45fx"; depends=[data_table dplyr dtplyr lazyeval magrittr purrr tibble tidyr xml2]; }; unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; }; @@ -10948,7 +11168,7 @@ in with self; { upclass = derive2 { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; }; upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; }; - uptasticsearch = derive2 { name="uptasticsearch"; version="0.0.2"; sha256="0ippi520hrwmrc7p7f5jrxfqlc50gqc901zxzmrwylpjgc56vrzw"; depends=[data_table futile_logger httr jsonlite purrr stringr uuid]; }; + uptasticsearch = derive2 { name="uptasticsearch"; version="0.1.0"; sha256="0kr9lmfp5fa3rcmk0s56pgr4h2pabic17m9yv2sljg7cvx50iss6"; depends=[data_table futile_logger httr jsonlite purrr stringr uuid]; }; uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; }; urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; }; @@ -10965,6 +11185,7 @@ in with self; { ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; }; utf8latex = derive2 { name="utf8latex"; version="1.0.4"; sha256="12isrl056h7y7nr7wk52dnvf3frcp66qqy7si869ark2aj81f959"; depends=[]; }; utility = derive2 { name="utility"; version="1.4.1"; sha256="1q94ax5vp0js4rskklkq91mvz07m4ryn5z1333cxkjmgilv9975j"; depends=[]; }; + utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.1"; sha256="0zlqfl8gvi9ywv5g6wf4c2fck2jcli1pb2p3cnrs74s195zp0jy2"; depends=[data_table stringr]; }; utiml = derive2 { name="utiml"; version="0.1.3"; sha256="08r2qfvxlz50jzvhl0k9pvzf9xs8jm838bv9ncg59ir1b3ijbkk5"; depends=[mldr]; }; uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; }; uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.3"; sha256="1m8n6bans7kkwriqky92vvv2sbdacyq2pvbv2m5p37q7qk5215c2"; depends=[Exact geepack plyr sandwich survival]; }; @@ -10984,9 +11205,9 @@ in with self; { varSel = derive2 { name="varSel"; version="0.1"; sha256="0ddj3swfxzchs75kfi6h25h3c33hpapnd5kcwcijnqhlh902b1r0"; depends=[]; }; varSelRF = derive2 { name="varSelRF"; version="0.7-8"; sha256="0h49rl1j13yfh97rsfsyh9s2c4wajny4rzms2qw77d0cavxqg53i"; depends=[randomForest]; }; varband = derive2 { name="varband"; version="0.9.0"; sha256="16z66rx7xq5zan8pnw100c9r5syw1ml4hgzi9mch52aia23v21p9"; depends=[Rcpp RcppArmadillo]; }; - varbvs = derive2 { name="varbvs"; version="2.0-8"; sha256="1bjw90lz1499ykx1q6yj7qd9bks1794s4yf4lz4c7sm0vbdx31x6"; depends=[lattice latticeExtra Rcpp]; }; + varbvs = derive2 { name="varbvs"; version="2.4-0"; sha256="0f6c9acrir8c8m8mg928azlp31yh49faz5s2g7cbgf5f1pxi07nl"; depends=[lattice latticeExtra Matrix Rcpp]; }; vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; }; - vardpoor = derive2 { name="vardpoor"; version="0.9.8"; sha256="16fjikmjnb08gnwjahz9vjygk1apdgfijzwrv1rf8ny25310z0w2"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; }; + vardpoor = derive2 { name="vardpoor"; version="0.9.10"; sha256="0q5pfdml4hq8sznm10h2fdjcyzyw9y3gfi0ijq2h3rdsgm8ap174"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; }; varhandle = derive2 { name="varhandle"; version="2.0.2"; sha256="1lbhwkkp9dyfhby6s4q3b6wy13wfqdjw3q21kq6k08rz7lsi0wny"; depends=[]; }; variables = derive2 { name="variables"; version="0.0-30"; sha256="182c8c7cwkmrpk01bki94y6f3wgf2zdjvvcfa4paa6bfq8w9ckh3"; depends=[]; }; varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; }; @@ -11002,11 +11223,12 @@ in with self; { vdiffr = derive2 { name="vdiffr"; version="0.2.0"; sha256="1gm5saqi3z6jrngrl1bnqj79c646pmqps42v65qv4w31pwcwaaqc"; depends=[devtools fontquiver gdtools glue htmlwidgets purrr R6 Rcpp rlang shiny svglite testthat xml2]; }; vdmR = derive2 { name="vdmR"; version="0.2.4"; sha256="05y2zaj37ydqrb3lw16mr8brwsdcdyl5bq1kb84shfmmi0qarsqa"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr rgdal rgeos rjson Rook sp]; }; vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; + veccompare = derive2 { name="veccompare"; version="0.1.0"; sha256="03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1"; depends=[corrplot gtools pander purrr qgraph reshape2 VennDiagram]; }; vecsets = derive2 { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; }; vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; }; - vegan = derive2 { name="vegan"; version="2.4-3"; sha256="15zcxfix2d854897k1lr0sfmj2n00339nlsppcr3zrb238lb2mi5"; depends=[cluster lattice MASS mgcv permute]; }; + vegan = derive2 { name="vegan"; version="2.4-4"; sha256="1n57dzv2aid6iqd9fkqik401sidqanhzsawyak94qbiyh6dbd1x9"; depends=[cluster lattice MASS mgcv permute]; }; vegan3d = derive2 { name="vegan3d"; version="1.1-0"; sha256="1rhqk9sj71mrb53r2pgdy87bdq3drx5j4a9ilwvw23dlvjry889l"; depends=[cluster rgl scatterplot3d vegan]; }; - vegclust = derive2 { name="vegclust"; version="1.6.5"; sha256="0y1lh4d2i3nxgc30wp6f14v2p14bx399y4cr5r7gv2gi76c5bhj4"; depends=[sp vegan]; }; + vegclust = derive2 { name="vegclust"; version="1.7.1"; sha256="1k1dcw424s19f8ngsksvdmsayahl1hkxd9v2irf8ljpp688l8idi"; depends=[Rcpp sp vegan]; }; vegdata = derive2 { name="vegdata"; version="0.9.1"; sha256="0w4dk7qcl89w04qgnlna5lk5hxnyrvwmgjjxmnvb6r5dspq7qyad"; depends=[foreign httr jsonlite XML]; }; vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; vegtable = derive2 { name="vegtable"; version="0.1.0"; sha256="12nfw0263vw9x74siqdfmlyf7dxi0kyjrla5wiwn9gfq9xbz1hrj"; depends=[foreign plotKML qdapRegex sp taxlist vegdata]; }; @@ -11023,8 +11245,8 @@ in with self; { vertexenum = derive2 { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; }; vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; }; vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; }; - vetr = derive2 { name="vetr"; version="0.1.0"; sha256="0bm390blcf7idav9rrnnhj9z76w6k53pvxmw99jq1amj7wlg2cf0"; depends=[]; }; - vfcp = derive2 { name="vfcp"; version="1.1.0"; sha256="0y4gql3vps3m029k4nj6bvsni8fn5qibbnxcz8sz5dxcp13c1in0"; depends=[]; }; + vetr = derive2 { name="vetr"; version="0.2.1"; sha256="041sjbyi47g9b3cla8rnrbff3asz9frgajgc6gmajw95aqr9z0l8"; depends=[]; }; + vfcp = derive2 { name="vfcp"; version="1.3.0"; sha256="072y458dy6s1qsylypxp0lccr3faa0vkz2ssvafxh21syg3gidiv"; depends=[copula cubature extraDistr polyCub]; }; vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; }; vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; }; @@ -11054,12 +11276,13 @@ in with self; { vowels = derive2 { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; }; vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; }; voxel = derive2 { name="voxel"; version="1.3.2"; sha256="0sixcan3v5nczmrrxn56rw5dqjq8xx7z3cp18j23jq26mvq4nm34"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti]; }; + vpc = derive2 { name="vpc"; version="1.0.0"; sha256="1d8k7d016qzd6njqraacdzb91j6drm5985aj6bxhcyz499pg3gbi"; depends=[classInt dplyr ggplot2 MASS readr reshape2 survival]; }; vqtl = derive2 { name="vqtl"; version="1.2.0"; sha256="1l5b1bchl08z3bx5y6dbvbw4hnxzb6i5i6h7vv5kd8mbffkdspyb"; depends=[dglm doParallel dplyr evd foreach ggplot2 gtools iterators knitr lazyeval qtl stringr testthat tidyr]; }; vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; }; vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; }; vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; }; - vtreat = derive2 { name="vtreat"; version="0.5.32"; sha256="03hhag3syg9yp6xxf20wxrqbaa1pzjjzdc9bc030gfmmlsgwza3s"; depends=[]; }; + vtreat = derive2 { name="vtreat"; version="0.6.0"; sha256="1xq4v81w6y6z1sah57bsy29642rzg32z0829rhc7slx1w46zqmya"; depends=[]; }; vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; }; wBoot = derive2 { name="wBoot"; version="1.0.3"; sha256="08qgkkv6jvqmxq5gvfp7jbrc3k8mxajfww7k8a3p8888aq411p7q"; depends=[boot simpleboot]; }; @@ -11096,17 +11319,18 @@ in with self; { wbs = derive2 { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; }; wbstats = derive2 { name="wbstats"; version="0.1.1"; sha256="18yws6zgvs773mhml5hn6aqyc2xyas10cg5jvnk4l50wir2qknxq"; depends=[httr jsonlite]; }; wbsts = derive2 { name="wbsts"; version="0.3"; sha256="1h749j20q30lrn3b4ffcap3mvxjpih1gchvv8yag0gbzcs0wc1fm"; depends=[mvtnorm wmtsa]; }; - wccsom = derive2 { name="wccsom"; version="1.2.11"; sha256="0f2p7sllp3916lcf02k179pnl17fdmk8s7bjnkwb93kh513rs1yj"; depends=[class kohonen MASS]; }; wdman = derive2 { name="wdman"; version="0.2.2"; sha256="1a6zav82w0krk0ncm5b79ahy2hc0xakg9i1m2143ih5p6zvcm5m0"; depends=[assertthat binman semver subprocess yaml]; }; weatherData = derive2 { name="weatherData"; version="0.5.0"; sha256="1l207m506wj0jk3skpwhwq66ci4v2jjaz7sbw30ywgpicw9mizs9"; depends=[curl plyr]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; }; + webTRISr = derive2 { name="webTRISr"; version="0.1.0"; sha256="19xal5zg9mg25vzvkz55zm6gkd8b0y3sw3zbbrxn73a1jg8x5v0l"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr stringr]; }; webchem = derive2 { name="webchem"; version="0.2"; sha256="0mxikd2ls0jcal9z0byan1l78965qq8jdyym9ydb4c56g1p2iyl8"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; }; webmockr = derive2 { name="webmockr"; version="0.1.0"; sha256="0jfjn0y62rrwx88vhx4xfgsf36f147b3yzwvpyshxwvxn9khza5i"; depends=[curl jsonlite lazyeval magrittr R6 urltools]; }; webp = derive2 { name="webp"; version="0.4"; sha256="0jsyjynrsrqpbg93rn48xrjclkvwmz2c2lhcfli5djny122ymh6r"; depends=[]; }; webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; }; - webshot = derive2 { name="webshot"; version="0.4.1"; sha256="1ydq3i4rs3dsv6rzzf020ffb7gyjszavw0aqmw34kqcj9yaj4ffs"; depends=[jsonlite magrittr]; }; + websearchr = derive2 { name="websearchr"; version="0.0.1"; sha256="1a174mf5j7z7q57fc1411h5hg54jg18kb00fp911w01mhd2zwmyx"; depends=[]; }; + webshot = derive2 { name="webshot"; version="0.4.2"; sha256="1ljp2c7yj21smr8ihzvmcs29z5gjr9wwfqfp33zrqc8xd8599iq9"; depends=[jsonlite magrittr]; }; webuse = derive2 { name="webuse"; version="0.1.2"; sha256="0ks3pb9ir778j9x4l0s4ly2xa1jc9syddqm65wkck52q3lrarg3l"; depends=[haven]; }; webutils = derive2 { name="webutils"; version="0.6"; sha256="1basl7q2m8y9nw5ksi1kdz6an9pybvsmdd4snrm7a37041xymnps"; depends=[curl jsonlite]; }; webvis = derive2 { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; }; @@ -11136,27 +11360,27 @@ in with self; { widyr = derive2 { name="widyr"; version="0.1.0"; sha256="0vy34phli9jynjdwss8cpadaaizh9bhc1h0amsblc0il6xanviqm"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; }; wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; wikilake = derive2 { name="wikilake"; version="0.3"; sha256="1y4vinm8gxyj6x36nb4xzhx1yf96x1nwlzzhvj4g36rbcix7dn6q"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; }; - wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.10"; sha256="10av87jlfn2lfx37bnhlpdnhg657md9jx3c3frc9a4mm4lhl7rbv"; depends=[hellno httr jsonlite rvest stringr xml2]; }; + wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.14"; sha256="00i38py9n4l0iqkn3257a3jbiwh3hrmx1p9x6rfh9sgfcch8yyj5"; depends=[hellno httr jsonlite RColorBrewer rvest stringr xml2]; }; wikitaxa = derive2 { name="wikitaxa"; version="0.1.4"; sha256="0d6ycn8j40lcc4plv7z34h14icaljywbl7b91gd803wxln4nhr6f"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; }; - wildcard = derive2 { name="wildcard"; version="1.0.3"; sha256="1k4780g1r67p2n6432kx6xqqacl6rrnvdihvgrp5x5cayz7m7z6z"; depends=[magrittr stringi]; }; + wildcard = derive2 { name="wildcard"; version="1.1.0"; sha256="0qkzab84z95g5f4fv3v4wisccgd7k9m3210pz4nvm1x8rfaqfjf1"; depends=[magrittr stringi]; }; wildlifeDI = derive2 { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; }; wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; }; windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; }; windfarmGA = derive2 { name="windfarmGA"; version="1.1.1"; sha256="1fns58q8bzsa6z8dghqs41xiv331pl75d4awrfgwslbg3lrd2x49"; depends=[calibrate data_table dplyr geoR ggplot2 googleVis gstat gtools leaflet maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; }; - wiqid = derive2 { name="wiqid"; version="0.1.1"; sha256="0nibk10hmx4w17cn7x6m6nhybhv2s6vrrgqzn8s4jpffsbdc4cpv"; depends=[coda HDInterval MASS truncnorm]; }; + wiqid = derive2 { name="wiqid"; version="0.1.2"; sha256="0y974yjj5ckjb3kwwgsll8kcxa6kb8kzzkmy1by6f7qz5smkvx4s"; depends=[coda HDInterval MASS truncnorm]; }; withr = derive2 { name="withr"; version="2.0.0"; sha256="0ncq9ygx33rx7aazn53p0a0vbr5xv0r6wbkzcwbhbwyd8k55bgin"; depends=[]; }; wkb = derive2 { name="wkb"; version="0.3-0"; sha256="0s7libkg27jdmcw5qmk5j0cmz3nqq7ny4q8gy4vhbgsgj4gbbdn9"; depends=[sp]; }; - wktmo = derive2 { name="wktmo"; version="1.0.3"; sha256="037hjc7kn171iji8yv2xl6wngxp2dsjw1zrsgpnqnmr9m530a5qf"; depends=[]; }; + wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; }; wle = derive2 { name="wle"; version="0.9-91"; sha256="18gqwrrw618f1xx93n0lk95gpi3lxvfkr6fmlb82v2wiibb7k7ak"; depends=[circular]; }; wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; }; wmtsa = derive2 { name="wmtsa"; version="2.0-2"; sha256="14znrylyazsj3d8nxgh3nvr94ifckan6gwy12b43zsyskzqp9zbg"; depends=[ifultools MASS splus2R]; }; wnominate = derive2 { name="wnominate"; version="1.2"; sha256="0kkdlhliihv45hc0fd25kairxd9r71hcx04ri9l0iy8cyhjs2n12"; depends=[pscl]; }; woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; }; woeBinning = derive2 { name="woeBinning"; version="0.1.4"; sha256="0fjflnhyya93xns2mcklq8vw5zwwivw1ahz4smdmlcpxf35f9cz9"; depends=[]; }; - womblR = derive2 { name="womblR"; version="1.0.1"; sha256="0s1xaqg0xjdv288sd2zd5q6y6fwq9b5h6zpq88rg0b6gkh78sdhy"; depends=[msm mvtnorm Rcpp RcppArmadillo]; }; - wooldridge = derive2 { name="wooldridge"; version="1.0.1"; sha256="05r48x70h8pkasnzkw74p8n5iaj422kf21yx8qfv79ksdwryaxzc"; depends=[]; }; + womblR = derive2 { name="womblR"; version="1.0.2"; sha256="0cnggwi47pmyjqz78vcvdzv3kpss6v4h404w2d7dii0zfqjr7bpk"; depends=[msm mvtnorm Rcpp RcppArmadillo]; }; + wooldridge = derive2 { name="wooldridge"; version="1.2.0"; sha256="1ib7qqmzybk7a171ny0zszh1lw2zgqyz35rb7g6y4ign2ng9ml9k"; depends=[]; }; word_alignment = derive2 { name="word.alignment"; version="1.0.6"; sha256="02hhl8357ykbf04gr8gjb9vkhimmb3fbi5jxrwy8dr0qysnz1kzg"; depends=[data_table openxlsx quanteda]; }; wordbankr = derive2 { name="wordbankr"; version="0.2.0"; sha256="041d5v3gm7bihx85k7kxwlqgg6vs24wzs2h59zf3l3cs39mhrhs5"; depends=[assertthat dplyr magrittr RMySQL stringr tidyr]; }; wordcloud = derive2 { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; }; @@ -11166,7 +11390,7 @@ in with self; { wordspace = derive2 { name="wordspace"; version="0.2-0"; sha256="0rrnbimf68ax1qxsyn7g0kd76abijzxg5i11h93l0fnzi2g2a9xn"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; worldmet = derive2 { name="worldmet"; version="0.7.5"; sha256="08mj3m0r9rnljlsk3x25cp4da3bdv9qc1jgy1wrd1zg5908j6dis"; depends=[dplyr leaflet openair plyr RCurl readr zoo]; }; worms = derive2 { name="worms"; version="0.2.1"; sha256="0qxij56wvhlz9pgc1wp5nr3yi2r0h0r7xvlhhvsflch60gprpi1s"; depends=[httr plyr]; }; - worrms = derive2 { name="worrms"; version="0.1.0"; sha256="0wxdn960gqqbilg2xs9jjks8z1j6rslb8qwj1s9678hw3h8ymfgx"; depends=[crul jsonlite tibble]; }; + worrms = derive2 { name="worrms"; version="0.2.0"; sha256="1mqv2j9235pqdwqnw11b0zdv763wf9wqjqpf3p6fxpmki24j7xk6"; depends=[crul data_table jsonlite tibble]; }; wpp2008 = derive2 { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; }; wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; }; @@ -11176,16 +11400,17 @@ in with self; { wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; }; - wrapr = derive2 { name="wrapr"; version="0.4.0"; sha256="1vzqq5na85k7ds9f68jayysahsb01hb57p8qx3pwdljqiba2pj6i"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="0.4.2"; sha256="0w4gbajgw3qnpb3r7090p5fv825adc1a0y0pijxq0vhk9x1g6ac4"; depends=[]; }; wrassp = derive2 { name="wrassp"; version="0.1.4"; sha256="0w1hzxwk00lk1hkdxxz6vqa6xzw5sf60y54xzfr510yd02x3r1gn"; depends=[]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; + writexl = derive2 { name="writexl"; version="0.2"; sha256="0hclrbn21sc0ifd2c5xfww84jf47412wzs86a73swxxjzcbrkg5k"; depends=[]; }; wrspathrow = derive2 { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; }; wrspathrowData = derive2 { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; }; wrswoR = derive2 { name="wrswoR"; version="1.0-1"; sha256="1czw3g2j6as024wwvxiizvvxjmsxmxhz86jbw2lh95nh61znb7l8"; depends=[logging Rcpp]; }; - wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.1-1"; sha256="1a2ymyf1yww43i79hc912jpyqvbx44qn5bfnjwf4hq3mp707731j"; depends=[curl lazyeval]; }; - wru = derive2 { name="wru"; version="0.1-6"; sha256="1lpfpw4c9nn74n7z5wc42had9k5zrjcd2xjycfknxd8wglwzmd41"; depends=[devtools]; }; + wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.2"; sha256="0vzs2lqq48kzk63xz2k9b7qcy0ph5yyvih6z98jfz36kpdfhdps9"; depends=[curl lazyeval]; }; + wru = derive2 { name="wru"; version="0.1-7"; sha256="1fvbl5i07f6kdwjhirjla4kc1rrmrm8blvn8aa79s87ljagg0ql9"; depends=[devtools]; }; wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; }; - wsrf = derive2 { name="wsrf"; version="1.7.13"; sha256="07dmimn58byr5dyszckazxjs2gjjk6g3si9wa5f10gbgzpc0713p"; depends=[Rcpp]; }; + wsrf = derive2 { name="wsrf"; version="1.7.17"; sha256="0gmlvfcy2iqa5sqhwps3hx0hl9fir8nf5xq62f25sn8i3llw752z"; depends=[Rcpp]; }; wtest = derive2 { name="wtest"; version="1.0"; sha256="0rn2wp4xqd1b95asc1ppscfm21p3r85za778f88kgqax2lx7kq96"; depends=[]; }; wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; }; wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; }; @@ -11199,7 +11424,7 @@ in with self; { xbreed = derive2 { name="xbreed"; version="1.0.1"; sha256="0grrfra9j0k3mqikmrif5qawh4260ayr40irskzpp9ywsixim63h"; depends=[BGLR]; }; xergm = derive2 { name="xergm"; version="1.8.2"; sha256="0rg8b0r27nzjnf0zkwfbkw96439h0b40k1l5lqi5igyr0bm7w0cc"; depends=[btergm GERGM rem tnam xergm_common]; }; xergm_common = derive2 { name="xergm.common"; version="1.7.7"; sha256="0nfls8a1knmnjjrrw0q93qsfrrb9p3yqsm5dxp13z0780vrzxvcj"; depends=[ergm network]; }; - xesreadR = derive2 { name="xesreadR"; version="0.1.0"; sha256="1np1x92vj3s70y9kqfxicd58ip6a611ykl6by5b5lhh0nrhcb783"; depends=[bupaR data_table dplyr tidyr XML xml2]; }; + xesreadR = derive2 { name="xesreadR"; version="0.2.1"; sha256="0q932zkrsg20nchbjf0yynq6c3j6jgslag5n77jc3fdzadk6yf6r"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; xgboost = derive2 { name="xgboost"; version="0.6-4"; sha256="1vfiz44prcjx2y442zc4x1b50k57qwd7sqbz6lq0kiqhp78ivicz"; depends=[data_table magrittr Matrix stringi]; }; xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; @@ -11215,14 +11440,15 @@ in with self; { xoi = derive2 { name="xoi"; version="0.66-9"; sha256="1kd9s9afq5shsaqhrxai9yz60a9imyy5np76fjpkjgyz56kbk6nr"; depends=[qtl]; }; xpose4 = derive2 { name="xpose4"; version="4.6.0"; sha256="1pyzpb6ddvpm3nx49brkam6afzhvf7jg8xnijg9jwd2qfijp8lav"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; }; xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; }; - xslt = derive2 { name="xslt"; version="1.1"; sha256="1mg0kjkc8hwj35ys6ih3ijl6sv1c6hlsmm03i1jm3ifqy27sad7b"; depends=[Rcpp xml2]; }; + xslt = derive2 { name="xslt"; version="1.2"; sha256="1b342hncyn1dba7hz951ckp4qd8j28kyj98b5zcxlcc58acis1nc"; depends=[Rcpp xml2]; }; xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; }; xtable = derive2 { name="xtable"; version="1.8-2"; sha256="0398qkpvlw3dv0myz4mjcyqwpwc2m31l127r8vdzwc71wb6s28qn"; depends=[]; }; xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; }; + xtensor = derive2 { name="xtensor"; version="0.1.1-0"; sha256="06kzk8nrcgxkmm614wlafbrq3m7zm11wf33p3669f52bmkzwam38"; depends=[Rcpp]; }; xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; xtractomatic = derive2 { name="xtractomatic"; version="3.3.2"; sha256="10a1apsjqg0cpr267g5336cl6qr3ax03jcl234l9a8b2nh8sbwi5"; depends=[httr ncdf4 sp]; }; xts = derive2 { name="xts"; version="0.10-0"; sha256="1w7lxy3hbf005fvpzbwiznj8jbxi07s4189vbgxisd35l9a4v6q4"; depends=[zoo]; }; - xxIRT = derive2 { name="xxIRT"; version="2.0.1"; sha256="1a31jyzc37bq3068vq18rdj0fn66jihk7d1qmqk8lq76gg72dwk6"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; }; + xxIRT = derive2 { name="xxIRT"; version="2.0.3"; sha256="10n9rrhp0v71gmn0s2l2qi6sfplwj7anydw6rxqk409wg5is3x93"; depends=[dplyr ggplot2 lpSolveAPI magrittr reshape2]; }; xyloplot = derive2 { name="xyloplot"; version="1.5"; sha256="0h90070m3xgcfky5q6vx6l2lfz0ihwbp2xg25mgmbijz4kg3n9d3"; depends=[]; }; xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; }; yCrypticRNAs = derive2 { name="yCrypticRNAs"; version="0.99.2"; sha256="130zp8na3d50b49bcsqzsmjy2sif865h6vfpc5zmp1fhvkyykkfd"; depends=[biomaRt data_table IRanges mclust MESS Rcpp Rsamtools]; }; @@ -11239,12 +11465,12 @@ in with self; { ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; }; yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; }; yuima = derive2 { name="yuima"; version="1.6.8"; sha256="1x10q2l8xd3h86m333mi6hkb7fpf4q5fbs7gwmlynylkz216b65j"; depends=[cubature expm mvtnorm Rcpp RcppArmadillo zoo]; }; - yuimaGUI = derive2 { name="yuimaGUI"; version="1.1.0"; sha256="1q2v9hpj9j74f7ram92npglrqwyysnvv1bvk64qb7s9lpyv852zk"; depends=[DT ggplot2 quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; + yuimaGUI = derive2 { name="yuimaGUI"; version="1.2.0"; sha256="166hsq1nc0jzkqbz08y3dl0qdi58swascbkm1lc7zhsh6g93azjs"; depends=[DT ggplot2 plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; }; zCompositions = derive2 { name="zCompositions"; version="1.1.1"; sha256="1j6v7mfxhn67mr3q6cvcjj9pqc8a02w114z8q74h3l6jw8ahjg6m"; depends=[MASS NADA truncnorm]; }; zFactor = derive2 { name="zFactor"; version="0.1.6"; sha256="0mgqrqdqgm49yf7hmmnak21srxdvlbp57apjgr72w7iy0pwrlf58"; depends=[data_table dplyr ggplot2 rootSolve tibble tidyr]; }; zTree = derive2 { name="zTree"; version="1.0.4"; sha256="058vjvxn1lw07nxw8rs1b8vnw6ccxh3swrmvjicvr35xmakj8qa0"; depends=[plyr]; }; - zeallot = derive2 { name="zeallot"; version="0.0.4"; sha256="0chwwlnqsp200n65b93hspfzihv73pmlw31xxf7a5nqx64917axq"; depends=[]; }; + zeallot = derive2 { name="zeallot"; version="0.0.5"; sha256="0mv4ajprsyzscibc5c67va4pa8zrcm1ncddkkmpd0aqgby6kn2g8"; depends=[]; }; zebu = derive2 { name="zebu"; version="0.1.1"; sha256="1d1s455vckd7148dycsqcfsdql0l4pzanipqn5k60kla03bic5i5"; depends=[doParallel foreach ggplot2 iterators plyr reshape2]; }; zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; }; zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; @@ -11255,7 +11481,7 @@ in with self; { zip = derive2 { name="zip"; version="1.0.0"; sha256="0rgr9pcdhdq3k8n29h2ircp3ri1ibhrx81gja1y7331v15xyrabg"; depends=[]; }; zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; }; - ziphsmm = derive2 { name="ziphsmm"; version="1.0.6"; sha256="1d1agp57hyxsj0bf6vhj5g5v7f7vnv338kiy7wzji07sc2illw8y"; depends=[Rcpp RcppArmadillo]; }; + ziphsmm = derive2 { name="ziphsmm"; version="1.0.7"; sha256="0ydxxk9rhh4b6rk9x0p04jan1b5vm7mx0vnw6fif5dir87ar146d"; depends=[Rcpp RcppArmadillo]; }; zoeppritz = derive2 { name="zoeppritz"; version="1.0-6"; sha256="0b16w8s26pi5h911jizwqapgwhdh60gcx0khn3kayf9fi40kyzp0"; depends=[]; }; zoib = derive2 { name="zoib"; version="1.4.2"; sha256="0gdbcnxlm9m88c2av4zy0k3yvm2cvg24804xnsi0mwfgwmnngdh5"; depends=[abind coda Formula matrixcalc rjags]; }; zonator = derive2 { name="zonator"; version="0.5.8"; sha256="1slpyg8h5vb695gf31z66m4isibvckbk7b19vbl8s5svgh7ddl12"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; }; From 4a2dd9905c6938285ea559a3f50441d2c2c120b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 29 Sep 2017 15:59:04 +0200 Subject: [PATCH 0453/2806] knot-dns: 2.5.3 -> 2.6.0 --- 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 1df36cd37c7..cdbdf04f445 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.5.3"; + version = "2.6.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "d78ae231a68ace264f5738c8e57481923bcad7413f3f440c06fa6cc0aded9d8e"; + sha256 = "68e04961d0bf6ba193cb7ec658b295c4ff6e60b3754d64bcd77ebdcee0f283fd"; }; outputs = [ "bin" "out" "dev" ]; From 824f2e2a28d46cedc153f28a748e1674ac154ee2 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 29 Sep 2017 16:00:25 +0200 Subject: [PATCH 0454/2806] gitlab-runner: 9.5.0 -> 10.0.0 (#29821) The renaming of gitlab-ci-mutli-runner to gitlab-runner is finally complete. Symlinking is thus no longer needed. --- .../gitlab-runner/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index d6b2ce42cdc..b1607aaaecd 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,22 +1,22 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "9.5.0"; + version = "10.0.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { - url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "05vph5pqw3wlrh76bfgrmhgzsjsf7llzscr9vr7nk3b2pcigawdp"; + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; + sha256 = "13rfpyzrld20pjhkjzx78qfdmi4w86v6nhq3460bcjpi4kwyd24w"; }; docker_arm = fetchurl { - url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0ilp793kbw0n6nhbcdqc1cb05h2ir27c1rkijyxaqvpczrm11lqj"; + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; + sha256 = "19z3rmkmv6z6g27bsjkqkfj8xwpyf9v1fhk2vb81xj5fisjzhmlw"; }; in buildGoPackage rec { inherit version; name = "gitlab-runner-${version}"; - goPackagePath = "gitlab.com/gitlab-org/gitlab-ci-multi-runner"; + goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; commonPackagePath = "${goPackagePath}/common"; buildFlagsArray = '' -ldflags= @@ -27,9 +27,9 @@ buildGoPackage rec { src = fetchFromGitLab { owner = "gitlab-org"; - repo = "gitlab-ci-multi-runner"; + repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0zpyvaflq62qazjw60xnzfw52fqbcmjaqig9y8i6wjzdzlm803f0"; + sha256 = "11gp6l5kqcz4spxq552hsnw480vdhp70zmqlgjr906px3r31j7h3"; }; patches = [ ./fix-shell-path.patch ]; @@ -54,8 +54,6 @@ buildGoPackage rec { postInstall = '' install -d $out/bin - # The recommended name is gitlab-runner so we create a symlink with that name - ln -sf gitlab-ci-multi-runner $bin/bin/gitlab-runner ''; meta = with lib; { From 55720626744d8123a48760c867f8c19205f1567b Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 29 Sep 2017 14:58:03 +0100 Subject: [PATCH 0455/2806] nixos/sysdig: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/sysdig.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 nixos/modules/programs/sysdig.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b3477fba8ae..2b6bbcc097d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -102,6 +102,7 @@ ./programs/spacefm.nix ./programs/ssh.nix ./programs/ssmtp.nix + ./programs/sysdig.nix ./programs/thefuck.nix ./programs/tmux.nix ./programs/venus.nix diff --git a/nixos/modules/programs/sysdig.nix b/nixos/modules/programs/sysdig.nix new file mode 100644 index 00000000000..fbbf2906556 --- /dev/null +++ b/nixos/modules/programs/sysdig.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.sysdig; +in { + options.programs.sysdig.enable = mkEnableOption "sysdig"; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.sysdig ]; + boot.extraModulePackages = [ config.boot.kernelPackages.sysdig ]; + }; +} From ad2c63a23a68f4e93789d2883399ab728928c586 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 29 Sep 2017 10:05:46 -0400 Subject: [PATCH 0456/2806] kotlin: 1.1.50 -> 1.1.51 --- 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 bc24cdfb87e..37093530a3c 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.1.50"; + version = "1.1.51"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "01y7m0r5wa2apd05c38h77060javgbj8072vd08lz4qaw6c6445m"; + sha256 = "1kbwyldfyyd20rnrl5yvyvqiqj9b3v6543vhlqsh5swhhc9nnd0b"; }; propagatedBuildInputs = [ jre ] ; From f488434a6658f2103cf7a4c943b477f113828860 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 29 Sep 2017 10:09:57 -0400 Subject: [PATCH 0457/2806] zcash: 1.0.11 -> 1.0.12 --- pkgs/applications/altcoins/zcash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix index 456ed41931c..5eb4a321246 100644 --- a/pkgs/applications/altcoins/zcash/default.nix +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "09474jdhsg30maqrwfxigbw3llqi8axhh82lz3a23ii2gj68ni55"; + sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s"; }; enableParallelBuilding = true; From 44b6a1509daf214d292dadafaedf8fea994c12a5 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 29 Sep 2017 15:13:34 +0100 Subject: [PATCH 0458/2806] nixos/bcc: init module Looks trival, but it is easy to make the mistake to add linuxPackages.bcc to systemPackages, which breaks if the not the default kernel is used. --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/bcc.nix | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 nixos/modules/programs/bcc.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2b6bbcc097d..e849e634fc9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -73,6 +73,7 @@ ./programs/adb.nix ./programs/atop.nix ./programs/bash/bash.nix + ./programs/bcc.nix ./programs/blcr.nix ./programs/browserpass.nix ./programs/cdemu.nix diff --git a/nixos/modules/programs/bcc.nix b/nixos/modules/programs/bcc.nix new file mode 100644 index 00000000000..3522ab22fa8 --- /dev/null +++ b/nixos/modules/programs/bcc.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ... }: +{ + options.programs.bcc.enable = lib.mkEnableOption "bcc"; + + config = lib.mkIf config.programs.bcc.enable { + environment.systemPackages = [ config.boot.kernelPackages.bcc ]; + boot.extraModulePackages = [ config.boot.kernelPackages.bcc ]; + }; +} From 8c70b5575c0689a4e1818e4f342d10312835c885 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 29 Sep 2017 14:53:56 +0000 Subject: [PATCH 0459/2806] quassel: fix daemon startup Fixes #28911 --- pkgs/applications/networking/irc/quassel/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index d631f4aa214..78646f7a8b2 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -65,6 +65,9 @@ in with stdenv; mkDerivation rec { ++ edf withKDE "WITH_KDE"; preFixup = + lib.optionalString daemon '' + wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" + '' + lib.optionalString buildClient '' wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \ --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" From 49d64a9d537f1cba2f2bb99dbeb269c6afc67727 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 26 Sep 2017 20:47:18 +0200 Subject: [PATCH 0460/2806] fetchFromGitHub: Always add meta.homepage to the derivation The attribute meta.homepage was only added if "fetchFromGitHub = false" which might be unexpected. Now, it will be set unconditionally. --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 833322f3fd2..0fe68b5ef8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -198,7 +198,7 @@ with pkgs; baseUrl = "https://${githubBase}/${owner}/${repo}"; passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ]; varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; - in if fetchSubmodules then + in (if fetchSubmodules then fetchgit ({ inherit name rev fetchSubmodules; url = "${baseUrl}.git"; @@ -209,7 +209,6 @@ with pkgs; fetchzip ({ inherit name; url = "${baseUrl}/archive/${rev}.tar.gz"; - meta.homepage = "${baseUrl}/"; } // lib.optionalAttrs private { netrcPhase = '' if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then @@ -223,7 +222,8 @@ with pkgs; EOF ''; netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ]; - } // passthruAttrs) // { inherit rev; }; + } // passthruAttrs) // { inherit rev; }) + // { meta.homepage = baseUrl; }; fetchFromBitbucket = { owner, repo, rev, name ? gitRepoToName repo rev, From 65dd7539120ad1c6a661c479cef7916352b8c500 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 29 Sep 2017 15:33:08 +0000 Subject: [PATCH 0461/2806] djvu2pdf: fix description --- pkgs/tools/typesetting/djvu2pdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index ce8a60dca86..eb560003a2c 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Creates djvu files from PDF files"; + description = "Convert DjVu files to PDF files"; homepage = http://0x2a.at/s/projects/djvu2pdf; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; From fe02d8c7b62ea341f1148a867b63bd755967ab4c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 29 Sep 2017 16:48:50 +0200 Subject: [PATCH 0462/2806] fetchFromGitHub: Refactor the code And remove the tailing slash from "meta.homepage" as suggested by @orivej (because GitHub doesn't add the final slash). --- pkgs/top-level/all-packages.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fe68b5ef8d..db86a673e59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -198,18 +198,10 @@ with pkgs; baseUrl = "https://${githubBase}/${owner}/${repo}"; passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ]; varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; - in (if fetchSubmodules then - fetchgit ({ - inherit name rev fetchSubmodules; - url = "${baseUrl}.git"; - } // passthruAttrs) - else # We prefer fetchzip in cases we don't need submodules as the hash # is more stable in that case. - fetchzip ({ - inherit name; - url = "${baseUrl}/archive/${rev}.tar.gz"; - } // lib.optionalAttrs private { + fetcher = if fetchSubmodules then fetchgit else fetchzip; + privateAttrs = lib.optionalAttrs private { netrcPhase = '' if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 @@ -222,8 +214,12 @@ with pkgs; EOF ''; netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ]; - } // passthruAttrs) // { inherit rev; }) - // { meta.homepage = baseUrl; }; + }; + fetcherArgs = (if fetchSubmodules + then { inherit rev fetchSubmodules; url = "${baseUrl}.git"; } + else ({ url = "${baseUrl}/archive/${rev}.tar.gz"; } // privateAttrs) + ) // passthruAttrs // { inherit name; }; + in fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; }; fetchFromBitbucket = { owner, repo, rev, name ? gitRepoToName repo rev, From 09d3bab32dc5e943b1eed22086ab976ee7726dc3 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 29 Sep 2017 16:07:38 +0100 Subject: [PATCH 0463/2806] sysdig: remove broken patchelf call patchelf broke sysdig/csysdig binaries --- pkgs/os-specific/linux/sysdig/default.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index fbd2cff1b17..18d473e2194 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -35,23 +35,7 @@ stdenv.mkDerivation rec { export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ''; - libPath = makeLibraryPath [ - zlib - luajit - ncurses - jsoncpp - curl - jq - openssl - libb64 - gcc - stdenv.cc.cc - ]; - - postInstall = optionalString (!stdenv.isDarwin) '' - patchelf --set-rpath "$libPath" "$out/bin/sysdig" - patchelf --set-rpath "$libPath" "$out/bin/csysdig" - '' + optionalString (kernel != null) '' + postInstall = optionalString (kernel != null) '' make install_driver kernel_dev=${kernel.dev} kernel_dev=''${kernel_dev#/nix/store/} From 748ef34f098451652a785455953667520ca14fa4 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 25 Sep 2017 00:45:52 +0200 Subject: [PATCH 0464/2806] assertion should check for encrypted.label of the defined fileSystem --- nixos/modules/tasks/encrypted-devices.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index fa0abb43c0c..6bbf335e7db 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -57,7 +57,7 @@ in config = mkIf anyEncrypted { assertions = map (dev: { - assertion = dev.label != null; + assertion = dev.encrypted.label != null; message = '' The filesystem for ${dev.mountPoint} has encrypted.enable set to true, but no encrypted.label set ''; From f7327c393bea6e01e54260ab1bdcb34f0ec4f15c Mon Sep 17 00:00:00 2001 From: Tom Saeger Date: Fri, 29 Sep 2017 12:23:01 -0500 Subject: [PATCH 0465/2806] peco: 0.2.10 -> 0.5.1: --- pkgs/tools/text/peco/default.nix | 60 +++++++------------------------- pkgs/tools/text/peco/deps.nix | 57 ++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 48 deletions(-) create mode 100644 pkgs/tools/text/peco/deps.nix diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index a58cb87d1db..9f181094ea0 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -1,56 +1,20 @@ -{ stdenv, go, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -let - go-flags = fetchgit { - url = "git://github.com/jessevdk/go-flags"; - rev = "ef51ed2000ee1721c7153e958511907b844b4a9c"; - sha256 = "1abzc7ksglicaz6g6nry006vwvflsidvyzyig85pi3p852z6sc2j"; - }; - go-runewidth = fetchgit { - url = "git://github.com/mattn/go-runewidth"; - rev = "63c378b851290989b19ca955468386485f118c65"; - sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"; - }; - termbox-go = fetchgit { - url = "git://github.com/nsf/termbox-go"; - rev = "bb19a81afd4bc2729799d1fedb19f7bd7ee284cf"; - sha256 = "1zc8pb594l16yipis6xg2ra84bg315p63wqxa5abyam1y0333sn0"; - }; -in stdenv.mkDerivation rec { +buildGoPackage rec { name = "peco-${version}"; - version = "0.2.10"; + version = "0.5.1"; - src = fetchgit { - url = "git://github.com/peco/peco"; - rev = "4952013023ae1d92c10d826e6970c5a68959678d"; - sha256 = "15blxy6a9ph6hm5wn14p025qidbspjy6hhmp4zbbgpxx2l1x8fpg"; + goPackagePath = "github.com/peco/peco"; + subPackages = [ "cmd/peco" ]; + + src = fetchFromGitHub { + owner = "peco"; + repo = "peco"; + rev = "v${version}"; + sha256 = "0jnlpr3nxx8xmjb6w4jlwshzz0p9hlww9919qbkm66afv16k0vm8"; }; - buildInputs = [ go ]; - - sourceRoot = "."; - - buildPhase = '' - mkdir -p src/github.com/jessevdk/go-flags/ - ln -s ${go-flags}/* src/github.com/jessevdk/go-flags - - mkdir -p src/github.com/mattn/go-runewidth/ - ln -s ${go-runewidth}/* src/github.com/mattn/go-runewidth - - mkdir -p src/github.com/nsf/termbox-go/ - ln -s ${termbox-go}/* src/github.com/nsf/termbox-go - - mkdir -p src/github.com/peco/peco - ln -s ${src}/* src/github.com/peco/peco - - export GOPATH=$PWD - go build -v -o peco src/github.com/peco/peco/cmd/peco/peco.go - ''; # */ - - installPhase = '' - ensureDir $out/bin - cp peco $out/bin - ''; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "Simplistic interactive filtering tool"; diff --git a/pkgs/tools/text/peco/deps.nix b/pkgs/tools/text/peco/deps.nix new file mode 100644 index 00000000000..1b884ef995e --- /dev/null +++ b/pkgs/tools/text/peco/deps.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "0c3044bc8bada22db67b93f5760fe3f05d6a5c25"; + sha256 = "05rdnf2c9r0yicg17zsq58i0sm32p0lk8zdnb7nhr0v5hqldvps4"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "8bc97d602c3bfeb5fc6fc9b5a9c898f245495637"; + sha256 = "1h3il3ycgd54flbyqys4hm4gzx1lyn5ja1k79f2y7zbs6y0mf1lz"; + }; + } + { + goPackagePath = "github.com/lestrrat/go-pdebug"; + fetch = { + type = "git"; + url = "https://github.com/lestrrat/go-pdebug"; + rev = "2e6eaaa5717f81bda41d27070d3c966f40a1e75f"; + sha256 = "05dx1f1yln47nazyi50zix82xbnyva3hily4gh5gaz021h01npax"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "737072b4e32b7a5018b4a7125da8d12de90e8045"; + sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; + sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302"; + sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks"; + }; + } +] From a1f1889f5567918adcd7f8097d95c2009da2c26f Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 29 Sep 2017 21:15:52 +0200 Subject: [PATCH 0466/2806] pysmbc: init at 1.0.15.8 --- .../python-modules/pysmbc/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pysmbc/default.nix diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix new file mode 100644 index 00000000000..bb3a65ae624 --- /dev/null +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, samba, pkgconfig +, setuptools }: + +buildPythonPackage rec { + version = "1.0.15.8"; + pname = "pysmbc"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + extension = "tar.bz2"; + sha256 = "07dzxfdqaj6zjg2rxxdww363bh8m02mcvgk47jw005cik9wc2rq5"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ setuptools samba ]; + + meta = with stdenv.lib; { + description = "libsmbclient binding for Python"; + homepage = https://github.com/hamano/pysmbc; + license = licenses.gplv2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c56fe5f1ab..5b42cf3a9c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16879,6 +16879,8 @@ in { pyshp = callPackage ../development/python-modules/pyshp { }; + pysmbc = callPackage ../development/python-modules/pysmbc { }; + pyspread = callPackage ../development/python-modules/pyspread { }; pyx = buildPythonPackage rec { From dba8058f9d40c7821082cded76cb113dd57eee24 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 29 Sep 2017 21:16:42 +0200 Subject: [PATCH 0467/2806] system-config-printer: add (optional) dependency pysmbc Use case: https://askubuntu.com/questions/548361/browse-button-disabled-in-windows-printer-via-samba-for-printer-shares --- pkgs/tools/misc/system-config-printer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index fbef31fb546..72d45c90f10 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; pythonPath = with pythonPackages; - [ pycups pycurl dbus-python pygobject3 requests pycairo pythonPackages.pycurl ]; + [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; configureFlags = [ "--with-udev-rules" From b62012fe2d4a1ce92ea49d35f8ca2ec4c58a249d Mon Sep 17 00:00:00 2001 From: Judson Date: Mon, 25 Sep 2017 18:14:00 -0700 Subject: [PATCH 0468/2806] kafkacat: init at 1.3.1 --- pkgs/development/tools/kafkacat/default.nix | 26 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/kafkacat/default.nix diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix new file mode 100644 index 00000000000..0d5c6e83c01 --- /dev/null +++ b/pkgs/development/tools/kafkacat/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }: + +stdenv.mkDerivation rec { + name = "kafkacat-${version}"; + + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "edenhill"; + repo = "kafkacat"; + rev = "${version}"; + sha256 = "1fgs04rclgfwri6vd9lj0mw545nmscav9p6kh7r28k5ap2g0gak5"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ zlib rdkafka yajl ]; + + meta = with stdenv.lib; { + description = "A generic non-JVM producer and consumer for Apache Kafka"; + homepage = https://github.com/edenhill/kafkacat; + license = licenses.bsd2; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ nyarly ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e94b3f0c0a..b4ef5abd724 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7256,6 +7256,8 @@ with pkgs; jenkins-job-builder = pythonPackages.jenkins-job-builder; + kafkacat = callPackage ../development/tools/kafkacat { }; + kati = callPackage ../development/tools/build-managers/kati { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { From 80dbfe4afb125d10b6d23ba55c727864ba0000a0 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 29 Sep 2017 19:49:59 +0200 Subject: [PATCH 0469/2806] base16-builder: init remove base16 as it was abandoned and one of its sucessors is base17-builder. --- pkgs/misc/base16-builder/default.nix | 16 + .../node-packages-generated.nix | 1437 +++++++++++++++++ pkgs/misc/base16-builder/node-packages.json | 3 + pkgs/misc/base16-builder/node-packages.nix | 16 + pkgs/misc/base16/default.nix | 62 - pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 1473 insertions(+), 63 deletions(-) create mode 100644 pkgs/misc/base16-builder/default.nix create mode 100644 pkgs/misc/base16-builder/node-packages-generated.nix create mode 100644 pkgs/misc/base16-builder/node-packages.json create mode 100644 pkgs/misc/base16-builder/node-packages.nix delete mode 100644 pkgs/misc/base16/default.nix diff --git a/pkgs/misc/base16-builder/default.nix b/pkgs/misc/base16-builder/default.nix new file mode 100644 index 00000000000..be8d42a4292 --- /dev/null +++ b/pkgs/misc/base16-builder/default.nix @@ -0,0 +1,16 @@ +{ stdenv, pkgs }: + +let + # node-packages*.nix generated via: + # + # % node2nix --input node-packages.json \ + # --output node-packages-generated.nix \ + # --composition node-packages.nix \ + # --node-env ./../../development/node-packages/node-env.nix \ + # --pkg-name nodejs-6_x + # + nodePackages = import ./node-packages.nix { + inherit pkgs; + inherit (stdenv) system; + }; +in nodePackages.base16-builder diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix new file mode 100644 index 00000000000..6ec938cfdef --- /dev/null +++ b/pkgs/misc/base16-builder/node-packages-generated.nix @@ -0,0 +1,1437 @@ +# This file has been generated by node2nix 1.3.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "ejs-2.5.7" = { + name = "ejs"; + packageName = "ejs"; + version = "2.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz"; + sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; + }; + }; + "fs-promise-0.3.1" = { + name = "fs-promise"; + packageName = "fs-promise"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz"; + sha1 = "bf34050368f24d6dc9dfc6688ab5cead8f86842a"; + }; + }; + "js-yaml-3.10.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; + sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; + }; + }; + "limax-1.5.0" = { + name = "limax"; + packageName = "limax"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/limax/-/limax-1.5.0.tgz"; + sha1 = "bbe7f2d3231cef709ebef8c32e3c75bce8fa5734"; + }; + }; + "meow-3.7.0" = { + name = "meow"; + packageName = "meow"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; + sha1 = "72cb668b425228290abbfa856892587308a801fb"; + }; + }; + "open-0.0.5" = { + name = "open"; + packageName = "open"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; + sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; + }; + }; + "update-notifier-0.6.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; + sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "any-promise-0.1.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz"; + sha1 = "830b680aa7e56f33451d4b049f3bd8044498ee27"; + }; + }; + "argparse-1.0.9" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; + sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; + }; + }; + "esprima-4.0.0" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; + sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "hepburn-1.0.0" = { + name = "hepburn"; + packageName = "hepburn"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz"; + sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b"; + }; + }; + "pinyin-2.8.3" = { + name = "pinyin"; + packageName = "pinyin"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pinyin/-/pinyin-2.8.3.tgz"; + sha1 = "301ccb4358ccfe802523c4bd640a612bee4d7c4b"; + }; + }; + "speakingurl-13.0.0" = { + name = "speakingurl"; + packageName = "speakingurl"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/speakingurl/-/speakingurl-13.0.0.tgz"; + sha1 = "266c52d2b47585375af058e4783c8d1097a2d3db"; + }; + }; + "bulk-replace-0.0.1" = { + name = "bulk-replace"; + packageName = "bulk-replace"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bulk-replace/-/bulk-replace-0.0.1.tgz"; + sha1 = "f095682a896abd4b3d9e08de409cc222e213f9dd"; + }; + }; + "commander-1.1.1" = { + name = "commander"; + packageName = "commander"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; + sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "nodejieba-2.2.5" = { + name = "nodejieba"; + packageName = "nodejieba"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.5.tgz"; + sha1 = "821441a683fad25ebd2c8dde1401dd43dbeb027a"; + }; + }; + "keypress-0.1.0" = { + name = "keypress"; + packageName = "keypress"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + }; + }; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + }; + }; + "camelcase-keys-2.1.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + }; + }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "normalize-package-data-2.4.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; + "redent-1.0.0" = { + name = "redent"; + packageName = "redent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + }; + "trim-newlines-1.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + }; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + }; + }; + "currently-unhandled-0.4.1" = { + name = "currently-unhandled"; + packageName = "currently-unhandled"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "array-find-index-1.0.2" = { + name = "array-find-index"; + packageName = "array-find-index"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; + }; + }; + "hosted-git-info-2.5.0" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; + sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; + }; + }; + "is-builtin-module-1.0.0" = { + name = "is-builtin-module"; + packageName = "is-builtin-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + }; + }; + "semver-5.4.1" = { + name = "semver"; + packageName = "semver"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; + sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + }; + }; + "validate-npm-package-license-3.0.1" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; + sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + }; + }; + "builtin-modules-1.1.1" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + }; + "spdx-correct-1.0.2" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; + sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + }; + }; + "spdx-expression-parse-1.0.4" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; + sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; + }; + }; + "spdx-license-ids-1.2.2" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; + sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "graceful-fs-4.1.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "error-ex-1.3.1" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; + sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "indent-string-2.1.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + }; + "strip-indent-1.0.1" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + }; + }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; + "boxen-0.3.1" = { + name = "boxen"; + packageName = "boxen"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; + sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; + }; + }; + "configstore-2.1.0" = { + name = "configstore"; + packageName = "configstore"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; + sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; + }; + }; + "is-npm-1.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + }; + "latest-version-2.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; + sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; + }; + }; + "semver-diff-2.1.0" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + }; + "filled-array-1.1.0" = { + name = "filled-array"; + packageName = "filled-array"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; + sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "widest-line-1.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; + sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "dot-prop-3.0.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; + sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.4" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; + sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; + }; + }; + "uuid-2.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; + }; + }; + "write-file-atomic-1.3.4" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; + sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; + }; + }; + "xdg-basedir-2.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; + sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; + }; + }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + }; + "package-json-2.4.0" = { + name = "package-json"; + packageName = "package-json"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; + sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; + }; + }; + "got-5.7.1" = { + name = "got"; + packageName = "got"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; + sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; + }; + }; + "registry-auth-token-3.3.1" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; + sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; + }; + }; + "registry-url-3.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + }; + }; + "is-redirect-1.0.0" = { + name = "is-redirect"; + packageName = "is-redirect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "lowercase-keys-1.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + }; + }; + "node-status-codes-1.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; + sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; + }; + }; + "read-all-stream-3.1.0" = { + name = "read-all-stream"; + packageName = "read-all-stream"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; + sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; + }; + }; + "readable-stream-2.3.3" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; + sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; + }; + }; + "timed-out-3.1.3" = { + name = "timed-out"; + packageName = "timed-out"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; + sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; + }; + }; + "unzip-response-1.0.2" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; + sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "safe-buffer-5.1.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + }; + }; + "string_decoder-1.0.3" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "prepend-http-1.0.4" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + }; + "rc-1.2.1" = { + name = "rc"; + packageName = "rc"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz"; + sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; + }; + }; + "deep-extend-0.4.2" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; + sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + }; + }; + "ini-1.3.4" = { + name = "ini"; + packageName = "ini"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; + sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; + }; +in +{ + base16-builder = nodeEnv.buildNodePackage { + name = "base16-builder"; + packageName = "base16-builder"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base16-builder/-/base16-builder-1.3.0.tgz"; + sha1 = "320eafea9333a8ea2bc8e04bda8db2537c52d23f"; + }; + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + sources."ejs-2.5.7" + (sources."fs-promise-0.3.1" // { + dependencies = [ + sources."any-promise-0.1.0" + ]; + }) + (sources."js-yaml-3.10.0" // { + dependencies = [ + (sources."argparse-1.0.9" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) + sources."esprima-4.0.0" + ]; + }) + (sources."limax-1.5.0" // { + dependencies = [ + (sources."hepburn-1.0.0" // { + dependencies = [ + sources."bulk-replace-0.0.1" + ]; + }) + (sources."pinyin-2.8.3" // { + dependencies = [ + (sources."commander-1.1.1" // { + dependencies = [ + sources."keypress-0.1.0" + ]; + }) + sources."object-assign-4.1.1" + (sources."nodejieba-2.2.5" // { + dependencies = [ + sources."nan-2.3.5" + ]; + }) + ]; + }) + sources."speakingurl-13.0.0" + ]; + }) + (sources."meow-3.7.0" // { + dependencies = [ + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."decamelize-1.2.0" + (sources."loud-rejection-1.6.0" // { + dependencies = [ + (sources."currently-unhandled-0.4.1" // { + dependencies = [ + sources."array-find-index-1.0.2" + ]; + }) + sources."signal-exit-3.0.2" + ]; + }) + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + (sources."normalize-package-data-2.4.0" // { + dependencies = [ + sources."hosted-git-info-2.5.0" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.4.1" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + sources."object-assign-4.1.1" + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.1" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."redent-1.0.0" // { + dependencies = [ + (sources."indent-string-2.1.0" // { + dependencies = [ + (sources."repeating-2.0.1" // { + dependencies = [ + (sources."is-finite-1.0.2" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + ]; + }) + (sources."strip-indent-1.0.1" // { + dependencies = [ + sources."get-stdin-4.0.1" + ]; + }) + ]; + }) + sources."trim-newlines-1.0.0" + ]; + }) + sources."open-0.0.5" + (sources."update-notifier-0.6.3" // { + dependencies = [ + (sources."boxen-0.3.1" // { + dependencies = [ + sources."filled-array-1.1.0" + sources."object-assign-4.1.1" + (sources."repeating-2.0.1" // { + dependencies = [ + (sources."is-finite-1.0.2" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + ]; + }) + sources."widest-line-1.0.0" + ]; + }) + (sources."configstore-2.1.0" // { + dependencies = [ + (sources."dot-prop-3.0.0" // { + dependencies = [ + sources."is-obj-1.0.1" + ]; + }) + sources."graceful-fs-4.1.11" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."object-assign-4.1.1" + sources."os-tmpdir-1.0.2" + (sources."osenv-0.1.4" // { + dependencies = [ + sources."os-homedir-1.0.2" + ]; + }) + sources."uuid-2.0.3" + (sources."write-file-atomic-1.3.4" // { + dependencies = [ + sources."imurmurhash-0.1.4" + sources."slide-1.1.6" + ]; + }) + (sources."xdg-basedir-2.0.0" // { + dependencies = [ + sources."os-homedir-1.0.2" + ]; + }) + ]; + }) + sources."is-npm-1.0.0" + (sources."latest-version-2.0.0" // { + dependencies = [ + (sources."package-json-2.4.0" // { + dependencies = [ + (sources."got-5.7.1" // { + dependencies = [ + (sources."create-error-class-3.0.2" // { + dependencies = [ + sources."capture-stack-trace-1.0.0" + ]; + }) + sources."duplexer2-0.1.4" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-1.0.0" + sources."object-assign-4.1.1" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.1" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + sources."read-all-stream-3.1.0" + (sources."readable-stream-2.3.3" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + ]; + }) + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" + (sources."url-parse-lax-1.0.0" // { + dependencies = [ + sources."prepend-http-1.0.4" + ]; + }) + ]; + }) + (sources."registry-auth-token-3.3.1" // { + dependencies = [ + (sources."rc-1.2.1" // { + dependencies = [ + sources."deep-extend-0.4.2" + sources."ini-1.3.4" + sources."minimist-1.2.0" + sources."strip-json-comments-2.0.1" + ]; + }) + sources."safe-buffer-5.1.1" + ]; + }) + (sources."registry-url-3.1.0" // { + dependencies = [ + (sources."rc-1.2.1" // { + dependencies = [ + sources."deep-extend-0.4.2" + sources."ini-1.3.4" + sources."minimist-1.2.0" + sources."strip-json-comments-2.0.1" + ]; + }) + ]; + }) + sources."semver-5.4.1" + ]; + }) + ]; + }) + (sources."semver-diff-2.1.0" // { + dependencies = [ + sources."semver-5.4.1" + ]; + }) + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Base16 Builder is a nimble command-line tool that generates themes for your favourite programs."; + homepage = "https://github.com/base16-builder/base16-builder#readme"; + license = "MIT"; + }; + production = true; + }; +} \ No newline at end of file diff --git a/pkgs/misc/base16-builder/node-packages.json b/pkgs/misc/base16-builder/node-packages.json new file mode 100644 index 00000000000..3266c128bc4 --- /dev/null +++ b/pkgs/misc/base16-builder/node-packages.json @@ -0,0 +1,3 @@ +[ + "base16-builder" +] diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix new file mode 100644 index 00000000000..bb98d7ab9cc --- /dev/null +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -0,0 +1,16 @@ +# This file has been generated by node2nix 1.3.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + +let + nodeEnv = import ./../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + }; +in +import ./node-packages-generated.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/misc/base16/default.nix b/pkgs/misc/base16/default.nix deleted file mode 100644 index 569370a7944..00000000000 --- a/pkgs/misc/base16/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, fetchgit, fetchurl, ruby, which, coreutils }: - -stdenv.mkDerivation rec { - rev = "9b24598c08a27780f87c318e6145c1468b9880ba"; - name = "base16-2015-09-29_rev${builtins.substring 0 6 rev}"; - - src = fetchgit { - inherit rev; - url = "https://github.com/chriskempson/base16-builder"; - sha256 = "1zicwam16nsdg74rnza65jwwf4mlpkgv35p9gkr8ydy60l7agzwy"; - }; - - patches = [ - (fetchurl { - url = "https://github.com/chriskempson/base16-builder/pull/341.patch"; - sha256 = "1r7i22qr5maxnp8a84mwin0a48klb8fym2hkw15ichkqfn3cdqdn"; - }) - (fetchurl { - url = "https://github.com/chriskempson/base16-builder/pull/331.patch"; - sha256 = "0hbyc9i62ihms00rk1ap0apjw8zf5axrvsk63vdy1hfyd9n5y2yf"; - }) - (fetchurl { - url = "https://github.com/chriskempson/base16-builder/pull/330.patch"; - sha256 = "1gfsbrxzdk3pz9dmyxismc3mzgm0cz8pkmf52iz4s9gq7vkv1d14"; - }) - (fetchurl { - url = "https://github.com/chriskempson/base16-builder/pull/325.patch"; - sha256 = "0n10yzm0n4g77z29s5f69261qy6x6kkjc6nj6ccdjlncz0bk6d8k"; - }) - (fetchurl { - url = "https://github.com/chriskempson/base16-builder/pull/318.patch"; - sha256 = "0c044bimdbiw2n2nzzivzrvxhwk6i93lc4ydah56xhs6pp1x0i60"; - }) - (fetchurl { - url = "https://github.com/chriskempson/base16-builder/pull/346.patch"; - sha256 = "145wblgqz28wq9lvgh1i705y97zblc6d488j7xm230ywy81abbwi"; - }) - ]; - - buildInputs = [ ruby which ]; - - buildPhase = '' - sed -i -e "s|\/bin\/false|${coreutils}/bin/false|" templates/shell/dark.sh.erb - sed -i -e "s|\/bin\/false|${coreutils}/bin/false|" templates/shell/light.sh.erb - patchShebangs base16 - ./base16 - ''; - - installPhase = '' - mkdir -p $out - cp output/* $out -R - ''; - - meta = with stdenv.lib; { - description = "Base16 provides carefully chosen syntax highlighting and a default set of sixteen colors suitable for a wide range of applications. Base16 is both a color scheme and a template."; - homepage = https://github.com/chriskempson/base16; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - platforms = with platforms; unix; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1ed318e143..d1dde24741b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -674,7 +674,7 @@ with pkgs; backup = callPackage ../tools/backup/backup { }; - base16 = callPackage ../misc/base16 { }; + base16-builder = callPackage ../misc/base16-builder { }; basex = callPackage ../tools/text/xml/basex { }; From 3db9841d3469ce08886f013c3d6a1827c04055de Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sat, 30 Sep 2017 00:30:56 +0100 Subject: [PATCH 0470/2806] bcc: fix relocation bug downgrading to llvm 3.9 https://github.com/iovisor/bcc/issues/1276 fixes #29913 --- pkgs/os-specific/linux/bcc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 24686e73e23..bade98dc411 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages, kernel, +{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages_39, kernel, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: stdenv.mkDerivation rec { @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "19lkqmilfjmj7bnhxlacd0waa5db8gf4lng12fy2zgji0d77vm1d"; }; - buildInputs = [ makeWrapper cmake llvmPackages.llvm llvmPackages.clang-unwrapped kernel + # llvm 4.0 leads to segmentation faults, this will be fixed in llvm 5.0 + # https://github.com/iovisor/bcc/issues/1276#issuecomment-319888478 + buildInputs = [ makeWrapper cmake llvmPackages_39.llvm llvmPackages_39.clang-unwrapped kernel flex bison elfutils python pythonPackages.netaddr luajit netperf iperf ]; From b76f9d7a4487f6762791e4fa7966b44451de4fe3 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Fri, 29 Sep 2017 18:06:10 -0700 Subject: [PATCH 0471/2806] ipfs-migrator: init --- .../networking/ipfs-migrator/default.nix | 27 +++++++++ .../networking/ipfs-migrator/deps.nix | 56 +++++++++++++++++++ .../ipfs-migrator/lru-repo-path-fix.patch | 13 +++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 97 insertions(+) create mode 100644 pkgs/applications/networking/ipfs-migrator/default.nix create mode 100644 pkgs/applications/networking/ipfs-migrator/deps.nix create mode 100644 pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix new file mode 100644 index 00000000000..6a4afdb1c17 --- /dev/null +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "ipfs-migrator-${version}"; + version = "6"; + + goPackagePath = "github.com/ipfs/fs-repo-migrations"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "ipfs"; + repo = "fs-repo-migrations"; + rev = "a89e9769b9cac25ad9ca31c7e9a4445c7966d35b"; + sha256 = "0x4mbkx7wlqjmkg6852hljq947v9y9k3hjd5yfj7kka1hpvxd7bn"; + }; + + patches = [ ./lru-repo-path-fix.patch ]; + + meta = with stdenv.lib; { + description = "Migration tool for ipfs repositories"; + homepage = https://ipfs.io/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ elitak ]; + }; +} diff --git a/pkgs/applications/networking/ipfs-migrator/deps.nix b/pkgs/applications/networking/ipfs-migrator/deps.nix new file mode 100644 index 00000000000..2d52ca0ef70 --- /dev/null +++ b/pkgs/applications/networking/ipfs-migrator/deps.nix @@ -0,0 +1,56 @@ +[ + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = https://github.com/dustin/go-humanize; + rev = "79e699ccd02f240a1f1fbbdcee7e64c1c12e41aa"; + sha256 = "0awfqszgjw8qrdw31v74jnvj1jbp7czhd8aq59j57yyj4hy50fzj"; + }; + } + { + goPackagePath = "github.com/jbenet/goprocess"; + fetch = { + type = "git"; + url = https://github.com/jbenet/goprocess; + rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b"; + sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random"; + fetch = { + type = "git"; + url = https://github.com/jbenet/go-random; + rev = "384f606e91f542a98e779e652eed88051618f0f7"; + sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random-files"; + fetch = { + type = "git"; + url = https://github.com/jbenet/go-random-files; + rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; + sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = https://github.com/hashicorp/golang-lru; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "71a035914f99bb58fe82eac0f1289f10963d876c"; + sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm"; + }; + } +] diff --git a/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch b/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch new file mode 100644 index 00000000000..a933a7b5358 --- /dev/null +++ b/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch @@ -0,0 +1,13 @@ +diff --git a/ipfs-1-to-2/go-datastore/lru/datastore.go b/ipfs-1-to-2/go-datastore/lru/datastore.go +index 7eb18eb..cd8dcb7 100644 +--- a/ipfs-1-to-2/go-datastore/lru/datastore.go ++++ b/ipfs-1-to-2/go-datastore/lru/datastore.go +@@ -3,7 +3,7 @@ package lru + import ( + "errors" + +- lru "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/golang-lru" ++ lru "github.com/hashicorp/golang-lru" + + ds "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore" + dsq "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore/query" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1dde24741b..122cca8bc38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2690,6 +2690,7 @@ with pkgs; iperf = iperf3; ipfs = callPackage ../applications/networking/ipfs { }; + ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipmitool = callPackage ../tools/system/ipmitool { static = false; From f46616db5a4c9632b4c8ab945ede2eb0affe839d Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Fri, 29 Sep 2017 18:07:35 -0700 Subject: [PATCH 0472/2806] ipfs: disable autoMigrate option for now --- nixos/modules/services/network-filesystems/ipfs.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 36e5efecf43..d4a695ef588 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -7,7 +7,7 @@ let ipfsFlags = toString ([ (optionalString cfg.autoMount "--mount") - (optionalString cfg.autoMigrate "--migrate") + #(optionalString cfg.autoMigrate "--migrate") (optionalString cfg.enableGC "--enable-gc") (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") (optionalString (cfg.defaultMode == "offline") "--offline") @@ -36,6 +36,7 @@ let baseService = recursiveUpdate commonEnv { wants = [ "ipfs-init.service" ]; + # NB: migration must be performed prior to pre-start, else we get the failure message! preStart = '' ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214) ipfs --local config Addresses.API ${cfg.apiAddress} @@ -97,11 +98,17 @@ in { description = "systemd service that is enabled by default"; }; + /* autoMigrate = mkOption { type = types.bool; default = false; - description = "Whether IPFS should try to migrate the file system automatically"; + description = '' + Whether IPFS should try to migrate the file system automatically. + + The daemon will need to be able to download a binary from https://ipfs.io to perform the migration. + ''; }; + */ autoMount = mkOption { type = types.bool; From 812ddbf4068ed25f67976edef69e26b62538d672 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 11 Sep 2017 18:08:45 +0800 Subject: [PATCH 0473/2806] falkon: init at 2.1.2.1 --- .../networking/browsers/falkon/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/networking/browsers/falkon/default.nix diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix new file mode 100644 index 00000000000..715fefe17d8 --- /dev/null +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake +, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: + +stdenv.mkDerivation rec { + # Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a + # release but it is basically 2.1.2 with the falkon name + name = "falkon-${version}.1"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "KDE"; + repo = "falkon"; + rev = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db"; + sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy"; + }; + + preConfigure = '' + export NONBLOCK_JS_DIALOGS=true + export KDE_INTEGRATION=true + export GNOME_INTEGRATION=false + export FALKON_PREFIX=$out + ''; + + dontUseCmakeConfigure = true; + + buildInputs = [ + libpthreadstubs libxcb libXdmcp + kwallet + qtsvg qtwebengine qtx11extras + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "QtWebEngine based cross-platform web browser"; + homepage = https://community.kde.org/Incubator/Projects/Falkon; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44e76bf41bf..af24833605d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15962,6 +15962,8 @@ with pkgs; gst-plugins-bad = null; }; + falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; + qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; From 1d7763e58382dcf4de978c0f0601712ea399c254 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 30 Sep 2017 02:08:09 +0000 Subject: [PATCH 0474/2806] nerdfonts: derivations is not fixed output --- pkgs/data/fonts/nerdfonts/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 6b1ebfd68d0..8815bf68838 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -20,10 +20,6 @@ stdenv.mkDerivation rec { ./install.sh ${withFont} ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1f3qvzl7blqddx3cm2sdml7hi8s56yjc0vqhfajndxr5ybz6g1rw"; - meta = with stdenv.lib; { description = '' Nerd Fonts is a project that attempts to patch as many developer targeted From 3fa6afdb35c94a02d6f5a01fb1c8927814877fac Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 14 Sep 2017 12:18:21 +0800 Subject: [PATCH 0475/2806] kgraphviewer: 2.2.0 -> 2.4.2 This also moves it from qt4 to qt5/kf5. --- .../graphics/kgraphviewer/default.nix | 38 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 6c2be6ea73c..8f043816ba0 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,24 +1,38 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs4, boost, graphviz +{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook +, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons +, qtbase, qtsvg +, boost, graphviz }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "kgraphviewer-${version}"; - version = "2.2.0"; + version = "2.4.2"; src = fetchurl { - url = "mirror://kde/stable/kgraphviewer/${version}/src/${name}.tar.xz"; - sha256 = "1vs5x539mx26xqdljwzkh2bj7s3ydw4cb1wm9nlhgs18siw4gjl5"; + url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz"; + sha256 = "1jc5zfgy4narwgn7rscfwz7l5pjy0jghal6yb3kd4sfadi78nhs9"; }; - buildInputs = [ kdelibs4 boost graphviz ]; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + buildInputs = [ + qtbase qtsvg + boost graphviz + ]; + + nativeBuildInputs = [ + cmake extra-cmake-modules pkgconfig wrapGAppsHook + kdoctools + ]; + + propagatedBuildInputs = [ + kconfig kinit kio kparts kwidgetsaddons + ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A Graphviz dot graph viewer for KDE"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + license = licenses.gpl2; + maintainers = with maintainers; [ lethalman ]; + platforms = platforms.linux; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1dde24741b..03a4a5fa53e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15129,7 +15129,7 @@ with pkgs; keymon = callPackage ../applications/video/key-mon { }; - kgraphviewer = kde4.callPackage ../applications/graphics/kgraphviewer { }; + kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; khal = callPackage ../applications/misc/khal { }; From bb4efe17e4d20fe15f4c1c0d3e6f9c79b76ac9a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Sep 2017 16:13:48 +0200 Subject: [PATCH 0476/2806] LTS Haskell 9.6 --- .../configuration-hackage2nix.yaml | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2f1abe68dce..fad70337e94 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.5 + # LTS Haskell 9.6 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -54,7 +54,7 @@ default-package-overrides: - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - aeson-compat ==0.3.6 - - aeson-diff ==1.1.0.3 + - aeson-diff ==1.1.0.4 - aeson-extra ==0.4.0.0 - aeson-generic-compat ==0.0.1.0 - aeson-injector ==1.0.10.0 @@ -215,7 +215,7 @@ default-package-overrides: - avwx ==0.3.0.2 - aws ==0.16 - axiom ==0.4.6 - - b9 ==0.5.32 + - b9 ==0.5.35 - backprop ==0.0.3.0 - bake ==0.5 - bank-holidays-england ==0.1.0.6 @@ -252,7 +252,7 @@ default-package-overrides: - binary-tagged ==0.1.4.2 - binary-typed ==1.0 - bindings-DSL ==1.0.23 - - bindings-GLFW ==3.1.2.2 + - bindings-GLFW ==3.1.2.3 - bindings-libzip ==1.0.1 - bioace ==0.0.1 - bioalign ==0.0.5 @@ -399,7 +399,7 @@ default-package-overrides: - cmark ==0.5.6 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.17 + - cmdargs ==0.10.18 - code-builder ==0.1.3 - code-page ==0.1.3 - codo-notation ==0.5.2 @@ -763,13 +763,13 @@ default-package-overrides: - ghc-events ==0.6.0 - ghc-exactprint ==0.5.5.0 - ghc-heap-view ==0.5.10 - - ghcid ==0.6.6 + - ghcid ==0.6.7 - ghcjs-base-stub ==0.1.0.4 - ghcjs-codemirror ==0.0.0.1 - ghcjs-perch ==0.3.3.2 - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.0.2 - - ghc-syb-utils ==0.2.3.2 + - ghc-syb-utils ==0.2.3.3 - ghc-tcplugins-extra ==0.2.1 - ghc-typelits-extra ==0.2.3 - ghc-typelits-knownnat ==0.3.1 @@ -916,7 +916,7 @@ default-package-overrides: - gogol-youtube-reporting ==0.3.0 - google-cloud ==0.0.4 - google-oauth2-jwt ==0.2.2 - - GPipe ==2.2.1 + - GPipe ==2.2.3 - GPipe-GLFW ==1.4.1.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 @@ -997,7 +997,7 @@ default-package-overrides: - haskell-tools-rewrite ==0.8.1.0 - haskintex ==0.7.0.1 - hasmin ==0.3.2.4 - - hasql ==0.19.18.1 + - hasql ==0.19.18.2 - hasql-migration ==0.1.3 - hasql-pool ==0.4.1 - hasql-transaction ==0.5 @@ -1033,7 +1033,7 @@ default-package-overrides: - hexml ==0.3.2 - hexpat ==0.20.13 - hexstring ==0.11.1 - - hformat ==0.3.0.0 + - hformat ==0.3.1.0 - hfsevents ==0.1.6 - hid ==0.2.2 - hidapi ==0.1.4 @@ -1057,7 +1057,7 @@ default-package-overrides: - hlint ==2.0.9 - hmatrix ==0.18.0.0 - hmatrix-gsl ==0.18.0.1 - - hmatrix-gsl-stats ==0.4.1.6 + - hmatrix-gsl-stats ==0.4.1.7 - hmatrix-special ==0.4.0.1 - hmpfr ==0.4.3 - hoauth2 ==1.3.0 @@ -1272,7 +1272,7 @@ default-package-overrides: - jwt ==0.7.2 - kan-extensions ==5.0.2 - kansas-comet ==0.4 - - katip ==0.5.0.1 + - katip ==0.5.0.2 - kawhi ==0.3.0 - kdt ==0.2.4 - keter ==1.4.3.2 @@ -1339,7 +1339,7 @@ default-package-overrides: - linked-list-with-iterator ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.2.0 - - List ==0.6.0 + - List ==0.6.1 - list-fusion-probe ==0.1.0.6 - ListLike ==4.5.1 - list-prompt ==0.1.1.0 @@ -1381,7 +1381,7 @@ default-package-overrides: - markdown-unlit ==0.4.0 - markov-chain ==0.0.3.4 - markup ==3.1.0 - - marvin ==0.2.3 + - marvin ==0.2.5 - marvin-interpolate ==1.1.2 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 @@ -1491,7 +1491,7 @@ default-package-overrides: - mysql ==0.1.4 - mysql-haskell ==0.8.0.0 - mysql-haskell-openssl ==0.8.0.0 - - mysql-simple ==0.4.2.0 + - mysql-simple ==0.4.3 - nagios-check ==0.3.2 - names-th ==0.2.0.3 - nano-erl ==0.1.0.1 @@ -1650,7 +1650,7 @@ default-package-overrides: - pinboard ==0.9.12.5 - pinch ==0.3.2.0 - pinchot ==0.24.0.0 - - pipes ==4.3.4 + - pipes ==4.3.5 - pipes-attoparsec ==0.5.1.5 - pipes-bytestring ==2.1.6 - pipes-cacophony ==0.5.0 @@ -1736,8 +1736,8 @@ default-package-overrides: - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.4 - - protocol-buffers ==2.4.3 - - protocol-buffers-descriptor ==2.4.3 + - protocol-buffers ==2.4.4 + - protocol-buffers-descriptor ==2.4.4 - proto-lens ==0.2.1.0 - proto-lens-arbitrary ==0.1.1.1 - proto-lens-combinators ==0.1.0.7 @@ -1911,7 +1911,7 @@ default-package-overrides: - servant-auth-cookie ==0.5.0.5 - servant-blaze ==0.7.1 - servant-cassava ==0.9 - - servant-checked-exceptions ==0.4.0.0 + - servant-checked-exceptions ==0.4.1.0 - servant-client ==0.11 - servant-docs ==0.11 - servant-elm ==0.4.0.1 @@ -1972,7 +1972,7 @@ default-package-overrides: - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 - snap-core ==1.0.3.1 - - snap-server ==1.0.3.1 + - snap-server ==1.0.3.3 - snowflake ==0.1.1.1 - snowtify ==0.1.0.3 - soap ==0.2.3.5 @@ -2074,7 +2074,7 @@ default-package-overrides: - SVGFonts ==1.6.0.2 - svg-tree ==0.6.2 - swagger ==0.3.0 - - swagger2 ==2.1.5 + - swagger2 ==2.1.6 - syb ==0.7 - symbol ==0.2.4 - symengine ==0.1.2.0 @@ -2178,7 +2178,7 @@ default-package-overrides: - thread-local-storage ==0.1.1 - threads ==0.5.1.5 - threepenny-editors ==0.4.1 - - threepenny-gui ==0.8.1.0 + - threepenny-gui ==0.8.2.0 - threepenny-gui-flexbox ==0.4.2 - th-reify-compat ==0.0.1.2 - th-reify-many ==0.1.8 @@ -2207,7 +2207,7 @@ default-package-overrides: - tls ==1.3.11 - tls-debug ==0.4.4 - tls-session-manager ==0.0.0.1 - - tmp-postgres ==0.1.0.8 + - tmp-postgres ==0.1.1.0 - token-bucket ==0.1.0.1 - torrent ==10000.1.1 - tostring ==0.2.1.1 From b0007d412336b479646c333308f307f3f1aa9cea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Sep 2017 16:19:57 +0200 Subject: [PATCH 0477/2806] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.6-8-gdff50aa from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/231c20802c231f5c6f2d0ca5505d7a6aa7cd0b55. --- .../haskell-modules/hackage-packages.nix | 1973 ++++++++++------- 1 file changed, 1198 insertions(+), 775 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3399ce8dd9b..749e0e1beb5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1419,12 +1419,12 @@ self: { ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes , BiobaseXNA, bytestring, cereal, containers, deepseq, directory , filepath, PrimitiveArray, split, tasty, tasty-quickcheck - , tasty-silver, tasty-th, vector, vector-th-unbox + , tasty-silver, tasty-th, text, vector, vector-th-unbox }: mkDerivation { pname = "BiobaseBlast"; - version = "0.2.0.0"; - sha256 = "0x4skz0akhhxplwk7v7jnyfgih4iwv8p5lkfh2cn1dm79bkbyj53"; + version = "0.2.1.0"; + sha256 = "1vrdnb8mjl6r02b37w3r25pf6kxn97w7zya148qpnlfgc2ffa23a"; libraryHaskellDepends = [ aeson attoparsec base binary BiobaseTypes BiobaseXNA bytestring cereal containers deepseq directory PrimitiveArray vector @@ -1432,7 +1432,7 @@ self: { ]; testHaskellDepends = [ base bytestring containers filepath split tasty tasty-quickcheck - tasty-silver tasty-th + tasty-silver tasty-th text ]; homepage = "https://github.com/choener/BiobaseBlast"; description = "BLAST-related tools"; @@ -6059,25 +6059,6 @@ self: { }) {}; "GPipe" = callPackage - ({ mkDerivation, base, Boolean, containers, exception-transformers - , gl, hashtables, linear, transformers - }: - mkDerivation { - pname = "GPipe"; - version = "2.2.1"; - sha256 = "1g5712apfv1jzi12shpzfp16274gfbjgf7r49fp1dawxnj8j734g"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base Boolean containers exception-transformers gl hashtables linear - transformers - ]; - homepage = "https://github.com/tobbebex/GPipe-Core#readme"; - description = "Typesafe functional GPU graphics programming"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; - - "GPipe_2_2_3" = callPackage ({ mkDerivation, base, Boolean, containers, exception-transformers , gl, hashtables, linear, transformers }: @@ -6093,7 +6074,7 @@ self: { homepage = "https://github.com/tobbebex/GPipe-Core#readme"; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GPipe-Collada" = callPackage @@ -10793,13 +10774,11 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "KdTree"; - version = "0.2.1"; - sha256 = "1vj1kbhyqh0xzwyr9v6fdyakx508vbf6n494z81yndisp115qi61"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ QuickCheck ]; - homepage = "https://github.com/ijt/kdtree"; + version = "0.2.2.1"; + sha256 = "056396l7rj2c8lxzm53vf9dq8jc5wqhb3lzhbxif1p6fapd6whcf"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/binarysunrise-io/kdtree"; description = "KdTree, for efficient search in K-dimensional point clouds"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -11424,20 +11403,20 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "List"; - version = "0.6.0"; - sha256 = "12cql8hrahbv8srp2h0g1mwh0pc56w0dxmi2zxvdqbc0p0v25ph3"; + version = "0.6.1"; + sha256 = "0ar4bpfv9nqc3bdwg6rlcnwr5si2df38ch8m2wnnl0346yzvmjni"; libraryHaskellDepends = [ base transformers ]; - homepage = "http://github.com/yairchu/generator/tree"; + homepage = "http://github.com/yairchu/generator"; description = "List monad transformer and class"; license = stdenv.lib.licenses.bsd3; }) {}; - "List_0_6_1" = callPackage + "List_0_6_2" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "List"; - version = "0.6.1"; - sha256 = "0ar4bpfv9nqc3bdwg6rlcnwr5si2df38ch8m2wnnl0346yzvmjni"; + version = "0.6.2"; + sha256 = "0y5qk6pzpcha01pa9133qgmmk9nkgjqxaxlg04993i9g43hjpff4"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/yairchu/generator"; description = "List monad transformer and class"; @@ -12584,6 +12563,27 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "MusicBrainz_0_3_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra + , HTTP, http-conduit, http-types, monad-control, resourcet, text + , time, time-locale-compat, transformers, vector, xml-conduit + , xml-types + }: + mkDerivation { + pname = "MusicBrainz"; + version = "0.3.1"; + sha256 = "1zgk2ms1a5zd6wndc41z3f8p2pfygiijpijxbjhr1fqwb2bzs61m"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra HTTP http-conduit + http-types monad-control resourcet text time time-locale-compat + transformers vector xml-conduit xml-types + ]; + homepage = "http://floss.scru.org/hMusicBrainz"; + description = "interface to MusicBrainz XML2 and JSON web services"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MusicBrainz-libdiscid" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -15860,6 +15860,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "SVGFonts_1_6_0_3" = callPackage + ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg + , bytestring, cereal, cereal-vector, containers, data-default-class + , diagrams-core, diagrams-lib, directory, parsec, split, text + , tuple, vector, xml + }: + mkDerivation { + pname = "SVGFonts"; + version = "1.6.0.3"; + sha256 = "11sqycvvsg9avxqh3z82x3wllhy6a9c0d36qzm2w6w4hg5iqi3xw"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base blaze-markup blaze-svg bytestring cereal + cereal-vector containers data-default-class diagrams-core + diagrams-lib directory parsec split text tuple vector xml + ]; + description = "Fonts from the SVG-Font format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "SVGPath" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -19693,20 +19714,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "accelerate_1_1_0_0" = callPackage - ({ mkDerivation, base, base-orphans, containers, deepseq, directory - , exceptions, fclabels, filepath, ghc-prim, hashable, hashtables - , mtl, pretty, template-haskell, time, transformers, unique, unix - , unordered-containers + "accelerate_1_1_1_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base-orphans, containers + , deepseq, directory, exceptions, fclabels, filepath, ghc-prim + , hashable, hashtables, mtl, template-haskell, time, transformers + , unique, unix, unordered-containers }: mkDerivation { pname = "accelerate"; - version = "1.1.0.0"; - sha256 = "02nv7h7qfayw5aggh2jhaccnrx2lq0f0h3aqacw8ml22asffbzj8"; + version = "1.1.1.0"; + sha256 = "1qcfhaz48fmn2di5g65mmwmqhvgl194k922nps5qa3mx5d3q5x54"; libraryHaskellDepends = [ - base base-orphans containers deepseq directory exceptions fclabels - filepath ghc-prim hashable hashtables mtl pretty template-haskell - time transformers unique unix unordered-containers + ansi-wl-pprint base base-orphans containers deepseq directory + exceptions fclabels filepath ghc-prim hashable hashtables mtl + template-haskell time transformers unique unix unordered-containers ]; homepage = "https://github.com/AccelerateHS/accelerate/"; description = "An embedded language for accelerated array processing"; @@ -19773,8 +19794,8 @@ self: { }: mkDerivation { pname = "accelerate-blas"; - version = "0.1.0.0"; - sha256 = "0jxcq97z75pqdh9f18lsz4pih693n5ffcx02aa752s6y3qv2s2kb"; + version = "0.1.0.1"; + sha256 = "0rjcga34ipml402gikwvdxnpdjrmh9vnhd8wvcv109gs1ih6pafd"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda @@ -21431,34 +21452,6 @@ self: { }) {}; "aeson-diff" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , edit-distance-vector, filepath, Glob, hashable, hlint, mtl - , optparse-applicative, QuickCheck, quickcheck-instances - , scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-diff"; - version = "1.1.0.3"; - sha256 = "13fbb270zaljgimy6pnyy2n8iwcxnb2pgs9b55qr94k3jnrjnl0g"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring edit-distance-vector hashable mtl scientific - text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring optparse-applicative text - ]; - testHaskellDepends = [ - aeson base bytestring directory doctest filepath Glob hlint - QuickCheck quickcheck-instances text unordered-containers vector - ]; - homepage = "https://github.com/thsutton/aeson-diff"; - description = "Extract and apply patches to JSON documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-diff_1_1_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , edit-distance-vector, filepath, Glob, hashable, hlint, mtl , optparse-applicative, QuickCheck, quickcheck-instances @@ -21484,7 +21477,6 @@ self: { homepage = "https://github.com/thsutton/aeson-diff"; description = "Extract and apply patches to JSON documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-extra" = callPackage @@ -22376,8 +22368,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.2"; - sha256 = "19d9bshjf5sivgzcbb0yl00i1z1kq3jr6xr7gddikh9wl0flnp9r"; + version = "5.3"; + sha256 = "0apx1i3v5p416wa9d0s8qacras3p137f9djbyv5miz5n7yhmlfi3"; libraryHaskellDepends = [ array base binary containers deepseq mtl mwc-random random vector ]; @@ -22427,8 +22419,8 @@ self: { }: mkDerivation { pname = "aivika-experiment"; - version = "5.0"; - sha256 = "1bcmkpzdmca0xcnvmbvsb5g0gsrxbrhf7lc3nig472w0pxa0xhg9"; + version = "5.1"; + sha256 = "1zqw54pinc2cav0svhiwzqkw5s90sdj6sdxkaagjanz0myp4pf1w"; libraryHaskellDepends = [ aivika aivika-transformers base containers directory filepath mtl network-uri parallel-io split @@ -22440,14 +22432,15 @@ self: { "aivika-experiment-cairo" = callPackage ({ mkDerivation, aivika-experiment, aivika-experiment-chart, base - , Chart, Chart-cairo + , Chart, Chart-cairo, colour, lens }: mkDerivation { pname = "aivika-experiment-cairo"; - version = "5.0"; - sha256 = "1ybynnr9yiv9vi3v1zww9hlf7klm6kggs56basgpn7lzv5qdaz07"; + version = "5.1"; + sha256 = "0ya9zl73zjq6xnr5b6a15jcw9dvsjhlj2xz0xlc402v96siwb690"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-cairo + colour lens ]; homepage = "http://www.aivikasoft.com"; description = "Cairo-based charting backend for the Aivika simulation library"; @@ -22461,8 +22454,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "5.0"; - sha256 = "0hmdb6bk8iy3y4dq5pkf1yqwgxl3mjyhl4lqjj0pz24bxxwlg33z"; + version = "5.1"; + sha256 = "1g6ax9a8mywqwhazlx888zrapnl4m2pcar1kjbjxga0j9p8qxrpl"; libraryHaskellDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split @@ -22474,15 +22467,15 @@ self: { "aivika-experiment-diagrams" = callPackage ({ mkDerivation, aivika-experiment, aivika-experiment-chart, base - , Chart, Chart-diagrams, containers, filepath + , Chart, Chart-diagrams, colour, containers, filepath, lens }: mkDerivation { pname = "aivika-experiment-diagrams"; - version = "5.0"; - sha256 = "013l4zp8pxz34xjkl7q9hwy4sk75k8gdwhg5kc5hsmw9nm47xa72"; + version = "5.1"; + sha256 = "13vgcm5dmqml9751wylvshxvgx8bgki2ymfp87l1llrp8qfxy95j"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-diagrams - containers filepath + colour containers filepath lens ]; homepage = "http://www.aivikasoft.com"; description = "Diagrams-based charting backend for the Aivika simulation library"; @@ -22495,8 +22488,8 @@ self: { }: mkDerivation { pname = "aivika-gpss"; - version = "0.3"; - sha256 = "00pmkhyyk12di9kc1z9zsab44sprra9j5l0byb0h74526jrrcq2b"; + version = "0.4"; + sha256 = "0yrpbq0ppck1z9d7whzfknia16sac6jpr80mi8bw6g65hjcg3z1g"; libraryHaskellDepends = [ aivika aivika-transformers base containers hashable mtl unordered-containers @@ -22545,8 +22538,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.2"; - sha256 = "1mz5wa66xazhh5x2wm01d7ixqg82zxls0ggkbixcjdm23a0560c1"; + version = "5.3"; + sha256 = "08c8hkc1sbq08dsj25sb6ik9nq0insv0k8j42klbpgzmmc4pjvxd"; libraryHaskellDepends = [ aivika array base containers mtl mwc-random random vector ]; @@ -25119,7 +25112,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "amqp_0_17_0" = callPackage + "amqp_0_18_1" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations , monad-control, network, network-uri, split, stm, text, vector @@ -25127,8 +25120,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.17.0"; - sha256 = "18g63nx7ksbqs45nr3nfw0hii9niw0bw5s35vk4xnchhj9f3ibwr"; + version = "0.18.1"; + sha256 = "0j728d7q013gcqv0m6vpm401hnpbmzzb3i6br8kpxybdjzmy4y26"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25176,8 +25169,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.2.1.4"; - sha256 = "01q9n53p2797hzsyl0y4w9fi99xhq4n2dad8q8d7a884slv73q8x"; + version = "0.2.1.5"; + sha256 = "1r0h93nivl0pvl6mppz18jpi3csar37ii867a2yfg7g4a5lra3hf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -25362,6 +25355,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "android-activity" = callPackage + ({ mkDerivation, base, data-default }: + mkDerivation { + pname = "android-activity"; + version = "0.1"; + sha256 = "07mgmpcwj7xi3ibmlcz45l645s5cbfnkr1brlhrzbnbyx72x7dr6"; + libraryHaskellDepends = [ base data-default ]; + homepage = "https://github.com/obsidiansystems/android-activity"; + description = "Turn regular Haskell programs into Android Activities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "android-lint-summary" = callPackage ({ mkDerivation, base, basic-prelude, data-default, directory , filemanip, hspec, hxt, lens, mtl, optparse-applicative @@ -25915,14 +25920,16 @@ self: { }) {inherit (pkgs) openssl;}; "apecs" = callPackage - ({ mkDerivation, base, containers, criterion, linear, mtl - , QuickCheck, vector + ({ mkDerivation, async, base, containers, criterion, linear, mtl + , QuickCheck, template-haskell, vector }: mkDerivation { pname = "apecs"; - version = "0.2.1.1"; - sha256 = "1611vwvp5ldminjcj59s4xhvgcrla1n4zk082mh0fbpil4ww2ad9"; - libraryHaskellDepends = [ base containers mtl vector ]; + version = "0.2.4.0"; + sha256 = "0jfwg96hkymzh3xqzk8hw0zwszxb4l159wl4kdqpf25wbqpz4qr2"; + libraryHaskellDepends = [ + async base containers mtl template-haskell vector + ]; testHaskellDepends = [ base containers QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion linear ]; homepage = "https://github.com/jonascarpay/apecs#readme"; @@ -27938,11 +27945,11 @@ self: { pname = "ast-monad"; version = "0.1.0.0"; sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i"; - revision = "1"; - editedCabalFile = "1rvdxx5gl22jp528z7b75fwm1dhfsdx2hhvwvfaw3wc59a66gmml"; + revision = "2"; + editedCabalFile = "1l5adjj7bianjclqzgvi4qhlb6lvb7v67qfqx2ghk3arq8ifghwj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - homepage = "https://github.com/mkdag/ast-monad#readme"; + homepage = "https://github.com/mouri111/ast-monad#readme"; description = "A library for constructing AST by using do-notation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -27953,9 +27960,11 @@ self: { pname = "ast-monad-json"; version = "0.1.0.1"; sha256 = "0a0pzcma574rrx6klfgk16y6ng22glwj1l5c3rz5w32a22ildfz6"; + revision = "1"; + editedCabalFile = "05gavjyjxfmw8q8l4dvx2p5vxaszg4kbivknn3pg5495bgd8br9s"; libraryHaskellDepends = [ ast-monad base text ]; testHaskellDepends = [ ast-monad base hspec text ]; - homepage = "https://github.com/mkdag/ast-monad-json#readme"; + homepage = "https://github.com/mouri111/ast-monad-json#readme"; description = "A library for writing JSON"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -28830,6 +28839,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec-ip" = callPackage + ({ mkDerivation, attoparsec, base, ip }: + mkDerivation { + pname = "attoparsec-ip"; + version = "0.0.0"; + sha256 = "08hgjmi9nlgg9qavsh5sl0s52yzh7vk6c933dgx9k16vk456r2y4"; + libraryHaskellDepends = [ attoparsec base ip ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/athanclark/attoparsec-ip#readme"; + description = "Parse IP data types with attoparsec"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "attoparsec-iso8601" = callPackage ({ mkDerivation, attoparsec, base, base-compat, text, time }: mkDerivation { @@ -28875,6 +28897,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "attoparsec-path" = callPackage + ({ mkDerivation, attoparsec, base, path, QuickCheck + , quickcheck-instances, text + }: + mkDerivation { + pname = "attoparsec-path"; + version = "0.0.0.1"; + sha256 = "035n430iwqkfkxpphgn8xjd3h5qav8dwd1gm4a3v3z8h49i2cwfh"; + libraryHaskellDepends = [ attoparsec base path text ]; + testHaskellDepends = [ + attoparsec base QuickCheck quickcheck-instances text + ]; + homepage = "https://github.com/athanclark/attoparsec-path#readme"; + description = "Convenience bindings between path and attoparsec"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "attoparsec-text" = callPackage ({ mkDerivation, array, attoparsec, base, containers, text }: mkDerivation { @@ -28958,15 +28997,15 @@ self: { }) {}; "attoparsec-uri" = callPackage - ({ mkDerivation, attoparsec, base, bytedump, n-tuple, strict, text - , vector + ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip + , strict, text, vector }: mkDerivation { pname = "attoparsec-uri"; - version = "0.0.1"; - sha256 = "0bjfk1ljm16kzb3415973w5z3zhjbb2yyphwr6v3givszgwryq6g"; + version = "0.0.2"; + sha256 = "096w3zb9a0fcqcnzl7lb9n27hgbaj6f5n93vll7rih972657h0my"; libraryHaskellDepends = [ - attoparsec base bytedump n-tuple strict text vector + attoparsec attoparsec-ip base bytedump ip strict text vector ]; homepage = "https://github.com/athanclark/attoparsec-uri#readme"; description = "URI parser / printer using attoparsec"; @@ -29628,8 +29667,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.1.0.1"; - sha256 = "0pn3pll7yjkfiqllndsn5mcm07my6mgjzd7amncvl3pykw75w0jq"; + version = "0.2.0.0"; + sha256 = "1bs2fpka2pz58hj1x8pv27vm2sdap7rp83fasali228iigvlp9cc"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -29641,7 +29680,7 @@ self: { scientific semigroups tagged template-haskell text unordered-containers vector ]; - homepage = "https://github.com/GaloisInc/avro.git"; + homepage = "https://github.com/haskell-works/hw-haskell-avro.git"; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -30416,39 +30455,6 @@ self: { }) {}; "b9" = callPackage - ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes - , bytestring, conduit, conduit-extra, ConfigFile, directory - , filepath, free, hashable, hspec, hspec-expectations, mtl - , optparse-applicative, parallel, parsec, pretty, pretty-show - , process, QuickCheck, random, semigroups, syb, template, text - , time, transformers, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "b9"; - version = "0.5.32"; - sha256 = "0d3ymgk83kfxzfd0a9x97sjcax4vd27p2dskpfiykqsn7wgylhhw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bifunctors binary boxes bytestring conduit - conduit-extra ConfigFile directory filepath free hashable mtl - parallel parsec pretty pretty-show process QuickCheck random - semigroups syb template text time transformers unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - base bytestring directory optparse-applicative - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations QuickCheck - semigroups text unordered-containers vector yaml - ]; - homepage = "https://github.com/sheyll/b9-vm-image-builder"; - description = "A tool and library for building virtual machine images"; - license = stdenv.lib.licenses.mit; - }) {}; - - "b9_0_5_35" = callPackage ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes , bytestring, conduit, conduit-extra, ConfigFile, directory , filepath, free, hashable, hspec, hspec-expectations, mtl @@ -30479,7 +30485,6 @@ self: { homepage = "https://github.com/sheyll/b9-vm-image-builder"; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "babl" = callPackage @@ -33029,31 +33034,6 @@ self: { }) {esound = null;}; "bindings-GLFW" = callPackage - ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor - , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm - , mesa, template-haskell, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "bindings-GLFW"; - version = "3.1.2.2"; - sha256 = "1j9za3fikmy9x6iaypa7fn5hypnavhs58y4s1ycgd80cbfiqawsk"; - libraryHaskellDepends = [ base bindings-DSL template-haskell ]; - librarySystemDepends = [ - libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr - libXxf86vm mesa - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - description = "Low-level bindings to GLFW OpenGL library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; - inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; - inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; - inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; - inherit (pkgs) mesa;}; - - "bindings-GLFW_3_1_2_3" = callPackage ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm , mesa, template-haskell, test-framework, test-framework-hunit @@ -33072,7 +33052,6 @@ self: { ]; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; @@ -33309,11 +33288,11 @@ self: { ({ mkDerivation, base, bindings-DSL, gpgme }: mkDerivation { pname = "bindings-gpgme"; - version = "0.1.6"; - sha256 = "0mwlb1fk852pk6an3ay9mgxmxqf6f6bzm965agm80yhr2ab3iqhq"; + version = "0.1.7"; + sha256 = "0jz6v52alvczvmwlik0qvw3bfilhzpyp9wd1g92214j2iblyjk8i"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ gpgme ]; - homepage = "http://bitbucket.org/mauricio/bindings-gpgme"; + homepage = "https://github.com/jwiegley/bindings-dsl"; description = "Project bindings-* raw interface to gpgme"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; @@ -34929,6 +34908,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blank-canvas_0_6_1" = 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"; + 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; + }) {}; + "blas" = callPackage ({ mkDerivation, base, ieee, QuickCheck, storable-complex }: mkDerivation { @@ -36144,15 +36149,15 @@ self: { }: mkDerivation { pname = "boomange"; - version = "0.1.3.3"; - sha256 = "0am2b5f6a47khka31mxynl9j2fisa6zyfk3ca8yna02hdkw3rlf6"; + version = "0.1.3.5"; + sha256 = "017klwzi30qmrvxy19i8swnmgzxfimq9q647kvw001yx9nsf204n"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base containers descrilo directory filepath simtreelo ]; - description = "A Bookmarks manager with a HTML generator"; + description = "A bookmarks manager with an HTML generator"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -36723,10 +36728,8 @@ self: { }: mkDerivation { pname = "brittany"; - version = "0.8.0.2"; - sha256 = "001nfcdj366avjcjz199s630v3z6r9mrj22b16qcixnwm3pzpxr7"; - revision = "1"; - editedCabalFile = "16ks5wxyjlgh7krvkr072pkhj4f5sa8bpnw1y15swx5d8xinp40w"; + version = "0.8.0.3"; + sha256 = "0a468lq4gnhax4kfrwi2ligc4mjbrs0jqxgh1f4j86ql53k4mpg9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39449,6 +39452,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) cairo;}; + "cairo_0_13_4_1" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, cairo + , gtk2hs-buildtools, mtl, text, utf8-string + }: + mkDerivation { + pname = "cairo"; + version = "0.13.4.1"; + sha256 = "04ig1v3nyiqycrh2xipmw0mynnsnf6pyr2qgk57dravaisf89s02"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ + array base bytestring mtl text utf8-string + ]; + libraryPkgconfigDepends = [ cairo ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Cairo library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "cairo-appbase" = callPackage ({ mkDerivation, base, cairo, glib, gtk }: mkDerivation { @@ -42281,8 +42304,8 @@ self: { }: mkDerivation { pname = "checkmate"; - version = "0.2.0"; - sha256 = "0xa420vgyykzxphzy79qlraq36kkxdj8iqx9rhhx1rl3sz3d2ndh"; + version = "0.2.1"; + sha256 = "0ks073hppsafbg4cy021yc6pnp0p5gm15qr1067a0w0sny5z81z3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44894,27 +44917,6 @@ self: { }) {}; "cmdargs" = callPackage - ({ mkDerivation, base, filepath, process, template-haskell - , transformers - }: - mkDerivation { - pname = "cmdargs"; - version = "0.10.17"; - sha256 = "1nklhglfa83s9rd8x4j40bvnzdvd81pwdq902sv51mnfyk5a8drl"; - 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_18" = callPackage ({ mkDerivation, base, filepath, process, template-haskell , transformers }: @@ -44933,7 +44935,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 @@ -45059,8 +45060,8 @@ self: { }: mkDerivation { pname = "cmv"; - version = "1.0.5"; - sha256 = "12nkz10i54g7p3a3c9psizd4gjj8d3w4ylps1zwqb7anvy1nqw4c"; + version = "1.0.6"; + sha256 = "1djqw8szaq8p8mhxp4789gx5mgibdlcwhbkilzc5zcxf619pn3c1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45724,8 +45725,8 @@ self: { }: mkDerivation { pname = "colorless"; - version = "0.0.2"; - sha256 = "0bmyiziqw4jsjf7wk0ckdvlmnrzqwhi78x3hknw8kzh6y8c0qyk9"; + version = "2.1.0"; + sha256 = "1dr8isfvwhfh3j59yrvvyjrqq17iw0qi5xapfhgv7xjsq8lw2wpx"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async monad-control monad-logger mtl random scientific text @@ -46662,8 +46663,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.5.2.0"; - sha256 = "12r2kkn6gxp5aj3fzdyfazi2nzgfvvk6cp9rb5y0ak2llvsh5jm4"; + version = "0.5.3.0"; + sha256 = "0pmgrdlrk4l7bmbfvsbvysa3n2h14ca919fl7cr1bg9yk2mb2s7s"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -46687,8 +46688,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.5.2.0"; - sha256 = "02kx3dsqfqwn07lxhvj6gxw4p0h5yv8r1nndzi6d8lil38rx9gap"; + version = "0.5.3.0"; + sha256 = "07ps031qnkhd5yb7w0c9y69n22npa5y9rzxy934p6x32ni5v0mvz"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -46704,8 +46705,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.5.2.0"; - sha256 = "1s19y7cnsk7k0hsc124xnvcj35vmdk1yqwvv15xf2qilvp3ppzxw"; + version = "0.5.3.0"; + sha256 = "0xz264i115nj2b6k74s1csi29lrszambbhy7ibz7nwqr2qs56yzw"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base vinyl @@ -46725,8 +46726,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.5.2.0"; - sha256 = "0bymnfw5d3nzwrbmnq1jpdvvm86p7c3y7s779dlpmdcsq2wxvp92"; + version = "0.5.3.0"; + sha256 = "0fw6rsz7arndmp9d6xgvkx9vqqrv6kvhgchl0hqv4jfaxhwdv3gc"; libraryHaskellDepends = [ base composite-base ekg ekg-core lens text vinyl ]; @@ -46742,8 +46743,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.5.2.0"; - sha256 = "1k2h9acbk4g8rfqpg9r689k5nr8cgj385797mkca3f76xrzlxbfl"; + version = "0.5.3.0"; + sha256 = "09sjvs7bxca789pfrhgbsy2v08060mraciwl867byq3s8aq5c971"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -46809,8 +46810,8 @@ self: { ({ mkDerivation, base, base-prelude }: mkDerivation { pname = "compound-types"; - version = "0.1.3.1"; - sha256 = "1wihx553vgdllij40lwph5ciy8mpdls9rv7vw9sjhl3r0gmppil1"; + version = "0.1.4"; + sha256 = "1lnmlql90v66vs2dr5lqg2lzfvf7m3z8naazfzj7zdyqjf9jnpkc"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base-prelude ]; homepage = "https://github.com/nikita-volkov/compound-types"; @@ -47532,6 +47533,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_2_12_1" = 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq @@ -50496,8 +50525,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "0.3"; - sha256 = "12n311m8maj72hg8dvnjj1mmfas45a8iipi6sd4dq808cq5nbx7z"; + version = "0.5"; + sha256 = "11svy9z96964b9cfh2x7cnibq785vnb4v9r6jvhbakda634c61mg"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck @@ -52119,6 +52148,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ctrie_0_2" = callPackage + ({ mkDerivation, async, atomic-primops, base, containers, criterion + , deepseq, hashable, primitive, QuickCheck, random, random-shuffle + , stm, test-framework, test-framework-quickcheck2, transformers + , unordered-containers + }: + mkDerivation { + pname = "ctrie"; + version = "0.2"; + sha256 = "0568v5m5k8dyqx5sfcr13mh1qay13m1wbcjszxiidvb5kz9sdqr0"; + libraryHaskellDepends = [ atomic-primops base hashable primitive ]; + testHaskellDepends = [ + base containers hashable QuickCheck test-framework + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + async base containers criterion deepseq hashable random + random-shuffle stm transformers unordered-containers + ]; + homepage = "https://github.com/mcschroeder/ctrie"; + description = "Non-blocking concurrent map"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cube" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, hspec, STL }: @@ -56585,6 +56639,25 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "dejafu_0_8_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, deepseq, exceptions + , leancheck, mtl, random, ref-fd, semigroups, transformers + , transformers-base + }: + mkDerivation { + pname = "dejafu"; + version = "0.8.0.0"; + sha256 = "0im33v22m0b9lkq2430g9q5b21qz26sr7zrg4sfr4yn8rr0bgzfa"; + libraryHaskellDepends = [ + base concurrency containers deepseq exceptions leancheck mtl random + ref-fd semigroups transformers transformers-base + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Systematic testing for Haskell concurrency"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -57148,12 +57221,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "derulo" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "derulo"; + version = "0.0.3"; + sha256 = "19g7nrgd5z7larkw1nb4vm9hfid1j8s2pcqyqflff4mp764m2ipg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/tfausak/derulo#readme"; + description = "Parse and render JSON simply"; + license = stdenv.lib.licenses.mit; + }) {}; + "descrilo" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "descrilo"; - version = "0.1.0.4"; - sha256 = "0hi185nbxmx3pfbml3qsrnk506nsq93aib10sw374vqyicw958qp"; + version = "0.1.0.5"; + sha256 = "13pmncbss1fwzc8n37rc7czdpjh12iim5nc10p0486ka5asxcc95"; libraryHaskellDepends = [ base ]; description = "Loads a list of items with fields"; license = stdenv.lib.licenses.gpl3; @@ -57636,6 +57725,8 @@ self: { pname = "diagrams-canvas"; version = "1.4"; sha256 = "1sbnnmj85vm6kjgzvrd3jyg40crz0i16ik6q3prwm4c38zr2yqih"; + revision = "1"; + editedCabalFile = "174nkb6ki100zh0hbrj8p4n52031jny6683n80i602544iikvbn9"; libraryHaskellDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances @@ -58924,6 +59015,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "direct-sqlite_2_3_21" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, directory + , HUnit, temporary, text + }: + mkDerivation { + pname = "direct-sqlite"; + version = "2.3.21"; + sha256 = "101pjvldzbvavjgpzwl0xnpqp0wy7bz1ryfx4sim3w00xj7csfys"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring directory HUnit temporary text + ]; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "directed-cubical" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , parallel, QuickCheck, unordered-containers, vector @@ -58941,12 +59050,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_1_3" = callPackage + "directory_1_3_1_4" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.1.3"; - sha256 = "1ai5qaj20f26gyg8yb34q45rlzcqziis20xlqfff18626mgl154a"; + version = "1.3.1.4"; + sha256 = "05366w53m2g38ywgbnxs89iivxg738xhyhsszm63xq1pyy90nz4f"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -59195,8 +59304,8 @@ self: { pname = "discrimination"; version = "0.2.1"; sha256 = "1krcpv1vp8wa4kdlg3ikx895vf96czkw0i3sczw8vyascczs8cdl"; - revision = "2"; - editedCabalFile = "0byjk3k7f7jvx8kd2y2mi8fl93p85rbn2ycmg0yhb7wlyi7hzyfp"; + revision = "3"; + editedCabalFile = "1g0dixgjmdc1hr7b9w57rm7agp3419bd2akv9wysghmsvf3j7893"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-prim hashable primitive profunctors promises semigroups transformers @@ -60459,8 +60568,8 @@ self: { }: mkDerivation { pname = "docker-build-cacher"; - version = "1.1"; - sha256 = "0rc6i4s8iw1qbz9nicbcqjv2b0pr0vzkld8srs4ns41nq4brcdbn"; + version = "1.7.1"; + sha256 = "0b10irbr75y0hl9mzpp6ws72gk3vqzpy5axdqa7f45zaxam8iim9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60758,16 +60867,16 @@ self: { "dom-parser" = callPackage ({ mkDerivation, base, case-insensitive, containers, data-default - , hspec, lens, mtl, open-union, scientific, semigroups, shakespeare - , text, transformers, type-fun, xml-conduit, xml-lens + , hspec, lens, mtl, scientific, semigroups, shakespeare, text + , transformers, xml-conduit, xml-lens }: mkDerivation { pname = "dom-parser"; - version = "2.0.0"; - sha256 = "0f6grib1a2nlw9fvkdzkpx4y9i4dajkmir0qgsrd7mrhff2h7qlx"; + version = "3.0.0"; + sha256 = "143lvcx11dmj3f0aa4h7wh693ak6nbjyc7bz18w0iwpvp9krgla9"; libraryHaskellDepends = [ - base case-insensitive containers lens mtl open-union scientific - semigroups text transformers type-fun xml-conduit xml-lens + base case-insensitive containers lens mtl scientific semigroups + text transformers xml-conduit xml-lens ]; testHaskellDepends = [ base data-default hspec lens semigroups shakespeare text @@ -60800,17 +60909,19 @@ self: { }) {}; "domain-auth" = callPackage - ({ mkDerivation, appar, base, binary, blaze-builder, bytestring - , containers, crypto-pubkey-types, dns, iproute, network, RSA, SHA + ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base + , bytestring, containers, cryptonite, dns, doctest, iproute, memory + , network, pretty-simple, word8, x509 }: mkDerivation { pname = "domain-auth"; - version = "0.2.1"; - sha256 = "1b1kw4pkm1f5z5qwyfpppk5rjqzi4i7b2vx4zmb2cd9398dnkj4a"; + version = "0.2.2"; + sha256 = "0ipmj209wdvqy8cncsq2bbnnms2ymd3n5kbiv2ydm8ahpiav5dhx"; libraryHaskellDepends = [ - appar base binary blaze-builder bytestring containers - crypto-pubkey-types dns iproute network RSA SHA + asn1-encoding asn1-types attoparsec base bytestring containers + cryptonite dns iproute memory network word8 x509 ]; + testHaskellDepends = [ base doctest pretty-simple ]; description = "Domain authentication library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -63373,6 +63484,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "either-list-functions" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "either-list-functions"; + version = "0.0.0.1"; + sha256 = "1k5zpyii5wkzr1xzfbkl015sj91pghl93ifjs6shgyysyh6b62z5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/chris-martin/either-list-functions#readme"; + description = "Functions involving lists of Either"; + license = stdenv.lib.licenses.asl20; + }) {}; + "either-unwrap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -63650,6 +63774,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-statsd_0_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, ekg-core, network, text, time + , unordered-containers + }: + mkDerivation { + pname = "ekg-statsd"; + version = "0.2.2.0"; + sha256 = "1z1si5zglmwq0qxhd4s8zmp8rps8z4xqnk4l8wlal79f1qkz9862"; + libraryHaskellDepends = [ + base bytestring ekg-core network text time unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg-statsd"; + description = "Push metrics to statsd"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-wai" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json , filepath, http-types, network, text, time, transformers @@ -67498,6 +67639,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extensible_0_4_5" = callPackage + ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim + , lens, monad-skeleton, mtl, primitive, profunctors, QuickCheck + , semigroups, StateVar, tagged, template-haskell, transformers + }: + mkDerivation { + pname = "extensible"; + version = "0.4.5"; + sha256 = "10cs47fdl79dasq5afbj5b47ybmvfsx589bwy6y3qcmlwybjnmlj"; + libraryHaskellDepends = [ + base comonad constraints deepseq ghc-prim monad-skeleton mtl + primitive profunctors QuickCheck semigroups StateVar tagged + template-haskell transformers + ]; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extensible-data" = callPackage ({ mkDerivation, base, data-lens, hashable, template-haskell , unordered-containers @@ -67686,8 +67848,8 @@ self: { ({ mkDerivation, base, leancheck, speculate, template-haskell }: mkDerivation { pname = "extrapolate"; - version = "0.2.3"; - sha256 = "10zzsikammd770pwa3h9cj8ha2dyrcp9111qv9bskvr2bcx8axgq"; + version = "0.2.4"; + sha256 = "14i1kb4l1wnc47fp2if95yk5jrb4s0p81c8bgda7lwihas9x8h9r"; libraryHaskellDepends = [ base leancheck speculate template-haskell ]; @@ -68088,8 +68250,8 @@ self: { ({ mkDerivation, base, ghc-prim, integer-gmp, strict-base }: mkDerivation { pname = "fast-mult"; - version = "0.1.0.0"; - sha256 = "19ra4sl10qawn2ig97ls0ib2sfy2b891gkjl4k7nia5lqp69smjh"; + version = "0.1.0.2"; + sha256 = "0lpgfb1a2kf0c9w9br2izzqn0f66pchydnq87a7z74lzs5jm1bba"; libraryHaskellDepends = [ base ghc-prim integer-gmp strict-base ]; homepage = "https://github.com/clintonmead/fast-mult#readme"; description = "Numeric type with asymptotically faster multiplications"; @@ -73173,6 +73335,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "frisby_0_2_1" = callPackage + ({ mkDerivation, array, base, containers, mtl, semigroups }: + mkDerivation { + pname = "frisby"; + version = "0.2.1"; + sha256 = "1xlfidsivvq9a152k3cg3ancyma3lc177jcbk6c0cgpd7zzpiib4"; + libraryHaskellDepends = [ array base containers mtl semigroups ]; + homepage = "http://repetae.net/computer/frisby/"; + description = "Linear time composable parser for PEG grammars"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "from-sum" = callPackage ({ mkDerivation, base, doctest, Glob, mtl }: mkDerivation { @@ -74393,6 +74568,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gauge" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, basement, bytestring + , code-page, containers, deepseq, directory, foundation, HUnit + , math-functions, mwc-random, optparse-applicative, QuickCheck + , statistics, tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "gauge"; + version = "0.1.0"; + sha256 = "10hxx7n8hpcivi0g34w85dsvfx4l926rv1b6s88hyhpwj4qyvxb5"; + libraryHaskellDepends = [ + ansi-wl-pprint base basement code-page containers deepseq + foundation math-functions mwc-random optparse-applicative vector + ]; + testHaskellDepends = [ + base bytestring deepseq directory foundation HUnit QuickCheck + statistics tasty tasty-hunit tasty-quickcheck vector + ]; + homepage = "https://github.com/vincenthz/hs-gauge"; + description = "small framework for performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gbu" = callPackage ({ mkDerivation, base, containers, fgl, Graphalyze, haskell98, mtl , regex-posix @@ -74508,6 +74706,38 @@ self: { inherit (pkgs) libjpeg; inherit (pkgs) libpng; inherit (pkgs) zlib;}; + "gdax" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base + , base64-bytestring, byteable, bytestring, containers, cryptohash + , exceptions, http-client, http-client-tls, lens, lens-aeson, mtl + , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th, text + , time, uuid, vector, websockets, wreq, wuss + }: + mkDerivation { + pname = "gdax"; + version = "0.5.0.1"; + sha256 = "0bjypc6szmdz0ldbbj3n5a4qf78x00yxvml2n647q5p4laan843a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base base64-bytestring byteable bytestring + cryptohash exceptions http-client http-client-tls lens lens-aeson + mtl scientific text time uuid vector websockets wreq wuss + ]; + executableHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring text + websockets wuss + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring containers exceptions lens + lens-aeson mtl tasty tasty-hunit tasty-quickcheck tasty-th text + time vector websockets wuss + ]; + homepage = "https://github.com/AndrewRademacher/gdax"; + description = "API Wrapping for Coinbase's GDAX exchange"; + license = stdenv.lib.licenses.mit; + }) {}; + "gdiff" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -74589,6 +74819,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "gedcom" = callPackage + ({ mkDerivation, array, base, bytestring, containers, megaparsec + , monad-loops, mtl, text-all, time + }: + mkDerivation { + pname = "gedcom"; + version = "0.1.0.0"; + sha256 = "099y6vgw81v31aijyl81hdijs5vry77jg4qy2gl8w7scn2zp2p58"; + libraryHaskellDepends = [ + array base bytestring containers megaparsec monad-loops mtl + text-all time + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/CLowcay/hs-gedcom"; + description = "Parser for the GEDCOM genealogy file format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "geek" = callPackage ({ mkDerivation, aeson, aeson-pretty, air, air-extra, air-th, base , bytestring, containers, curl, data-default, directory, filepath @@ -76772,19 +77020,6 @@ self: { }) {}; "ghc-syb-utils" = callPackage - ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }: - mkDerivation { - pname = "ghc-syb-utils"; - version = "0.2.3.2"; - sha256 = "1h05blm311cg0ricd9skb0m115512mmrrp7g6qh4bbihjmy0l5nb"; - libraryHaskellDepends = [ base ghc syb ]; - testHaskellDepends = [ base directory filepath ghc ghc-paths ]; - homepage = "http://github.com/nominolo/ghc-syb"; - description = "Scrap Your Boilerplate utilities for the GHC API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-syb-utils_0_2_3_3" = callPackage ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }: mkDerivation { pname = "ghc-syb-utils"; @@ -76795,7 +77030,6 @@ self: { homepage = "http://github.com/nominolo/ghc-syb"; description = "Scrap Your Boilerplate utilities for the GHC API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage @@ -77071,34 +77305,6 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.6.6"; - sha256 = "1c3axfzs8dwg0kgicggngbi8j62nzwvzpnzfdwxp7nhi462ngxb2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cmdargs directory extra filepath process terminal-size time - unix - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - homepage = "https://github.com/ndmitchell/ghcid#readme"; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_6_7" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time, unix @@ -77123,7 +77329,6 @@ self: { homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -77250,6 +77455,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghcjs-fetch" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , ghcjs-base-stub, http-types + }: + mkDerivation { + pname = "ghcjs-fetch"; + version = "0.1.0.0"; + sha256 = "0ya6n8716likfgmm69z8q6dj4gf1w7063ni24di8xbv5ylxa0d39"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive ghcjs-base-stub http-types + ]; + homepage = "https://github.com/cocreature/ghcjs-fetch#readme"; + description = "GHCJS bindings for the JavaScript Fetch API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghcjs-hplay" = callPackage ({ mkDerivation, base, bytestring, containers, directory , ghcjs-perch, mtl, transformers, transient, transient-universe @@ -78452,7 +78673,6 @@ self: { , persistent, persistent-sqlite, persistent-template, process , QuickCheck, random, regex-tdfa, resourcet, rsync, SafeSemaphore , sandi, securemem, shakespeare, socks, split, stm, stm-chans - , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun , template-haskell, text, time, torrent, transformers, unix , unix-compat, unordered-containers, utf8-string, uuid, wai , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core @@ -78460,12 +78680,12 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20170818"; - sha256 = "0ybxixbqvy4rx6mq9s02rh349rbr04hb17z4bfayin0qwa5kzpvx"; + version = "6.20170925"; + sha256 = "0kzqndnazqhm777gaym7lp6rknhll3b6lr19y4cxqpr1baslvcf0"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" - "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" + "-ftahoe" "-ftdfa" "-f-testsuite" "-ftorrentparser" "-fwebapp" "-fwebapp-secure" "-fwebdav" "-fxmpp" ]; isLibrary = false; @@ -78485,15 +78705,15 @@ self: { network-multicast network-uri old-locale optparse-applicative path-pieces persistent persistent-sqlite persistent-template process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi - securemem shakespeare socks split stm stm-chans tasty tasty-hunit - tasty-quickcheck tasty-rerun template-haskell text time torrent - transformers unix unix-compat unordered-containers utf8-string uuid - wai wai-extra warp warp-tls yesod yesod-core yesod-default - yesod-form yesod-static + securemem shakespeare socks split stm stm-chans template-haskell + text time torrent transformers unix unix-compat + unordered-containers utf8-string uuid wai wai-extra warp warp-tls + yesod yesod-core yesod-default yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which ]; + doCheck = false; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; installPhase = "make PREFIX=$out BUILDER=: install"; checkPhase = '' @@ -78886,6 +79106,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "github_0_17_0" = callPackage + ({ mkDerivation, aeson, aeson-compat, base, base-compat + , base16-bytestring, binary, binary-orphans, byteable, bytestring + , containers, cryptohash, deepseq, deepseq-generics, exceptions + , file-embed, hashable, hspec, http-client, http-client-tls + , http-link-header, http-types, iso8601-time, mtl, network-uri + , semigroups, text, time, tls, transformers, transformers-compat + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "github"; + version = "0.17.0"; + sha256 = "1w9r40c2wjzlc503g30br6dwq213b2q6qap4r1nlk13z9r57c9mk"; + libraryHaskellDepends = [ + aeson aeson-compat base base-compat base16-bytestring binary + binary-orphans byteable bytestring containers cryptohash deepseq + deepseq-generics exceptions hashable http-client http-client-tls + http-link-header http-types iso8601-time mtl network-uri semigroups + text time tls transformers transformers-compat unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + aeson-compat base base-compat file-embed hspec unordered-containers + vector + ]; + homepage = "https://github.com/phadej/github"; + description = "Access to the GitHub API, v3"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github-backup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, git, github, hslogger, IfElse, MissingH @@ -79376,8 +79627,8 @@ self: { ({ mkDerivation, base, linear }: mkDerivation { pname = "gjk2d"; - version = "0.1.0.0"; - sha256 = "08fqm3may9vvifp3fvqvmv7n3i05w9w01c2dmg930fwlrw5lly9b"; + version = "0.1.0.1"; + sha256 = "0yvbh660p65njr33py743ifjlm4njmb15b5sghbhhdi5g1b9qn6w"; libraryHaskellDepends = [ base linear ]; testHaskellDepends = [ base linear ]; homepage = "https://github.com/suzumiyasmith/gjk2d#readme"; @@ -79672,6 +79923,25 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "glib_0_13_5_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , gtk2hs-buildtools, text, utf8-string + }: + mkDerivation { + pname = "glib"; + version = "0.13.5.0"; + sha256 = "1bd6lfl8l08s28g9wky2bpyl2kh8vhycdni2wh3m7iq91madxgbj"; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ + base bytestring containers text utf8-string + ]; + libraryPkgconfigDepends = [ glib ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the GLIB library for Gtk2Hs"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "glicko" = callPackage ({ mkDerivation, base, containers, data-default, deepseq, hspec , lens, parallel, QuickCheck, statistics @@ -79725,10 +79995,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.23"; - sha256 = "0iv4n6i63f1x1808a3dvrbxyibi7jd1c8barsqbf9h1bqwazgsah"; - revision = "2"; - editedCabalFile = "14jk02g995qpa1amkngy7vqyxjfxmmwr0585sjg2d6jw2wrzydal"; + version = "2.24"; + sha256 = "1fhpwr7v2ad49j9699f5za1ww2m1ln39cvnm82z57cngjghpnngs"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -79753,8 +80021,8 @@ self: { }: mkDerivation { pname = "gll"; - version = "0.4.0.3"; - sha256 = "13s1bmxrm3vxivywrhj0za746157fv38kalf0vk593psj03f5scv"; + version = "0.4.0.4"; + sha256 = "01qnvynldllb4qdvg29r64qq17qb1fs8yg7jgyj3f8ajgyi5jn9q"; libraryHaskellDepends = [ array base containers pretty regex-applicative text TypeCompose ]; @@ -83158,16 +83426,17 @@ self: { }) {}; "graphite" = callPackage - ({ mkDerivation, base, containers, graphviz, hashable, hspec - , process, QuickCheck, random, unordered-containers + ({ mkDerivation, base, bytestring, cassava, containers, graphviz + , hashable, hspec, process, QuickCheck, random + , unordered-containers, vector }: mkDerivation { pname = "graphite"; - version = "0.4.0.0"; - sha256 = "1xfa0wqgnbwn4wbkxk8hy70gkg20175d7scmvb8brin7ygy6pnxk"; + version = "0.4.1.0"; + sha256 = "1qk3inkd9lrvhds553z0jvflpalmr02hgx4656x0qp2yqh9nvp96"; libraryHaskellDepends = [ - base containers graphviz hashable process QuickCheck random - unordered-containers + base bytestring cassava containers graphviz hashable process + QuickCheck random unordered-containers vector ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/alx741/graphite#readme"; @@ -84182,6 +84451,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtk2 = pkgs.gnome2.gtk;}; + "gtk_0_14_7" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers + , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text + }: + mkDerivation { + pname = "gtk"; + version = "0.14.7"; + sha256 = "0fqbr1h2zxa4g6jyias163bnlsnsdhfzfansc63qzh9y10vc2hn4"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ + array base bytestring cairo containers gio glib mtl pango text + ]; + libraryPkgconfigDepends = [ gtk2 ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Gtk+ graphical user interface library"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {gtk2 = pkgs.gnome2.gtk;}; + "gtk-helpers" = callPackage ({ mkDerivation, array, base, gio, glib, gtk, mtl, process , template-haskell @@ -84336,6 +84625,31 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "gtk2hs-buildtools_0_13_3_0" = callPackage + ({ mkDerivation, alex, array, base, Cabal, containers, directory + , filepath, happy, hashtables, pretty, process, random + }: + mkDerivation { + pname = "gtk2hs-buildtools"; + version = "0.13.3.0"; + sha256 = "1kz5631vpi4wbi0jldj7gs1xc86vfxdcs750a72x3nbdddbc0asv"; + revision = "1"; + editedCabalFile = "0nbfvza67z6wi7lgpa8zdr7smqzh5xjvhjd7a4iigls8jj74h78s"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base Cabal containers directory filepath hashtables pretty + process random + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Tools to build the Gtk2Hs suite of User Interface libraries"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gtk2hs-cast-glade" = callPackage ({ mkDerivation, base, glade, gtk, gtk2hs-cast-glib, hint , template-haskell @@ -84493,6 +84807,32 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gtk3;}; + "gtk3_0_14_7" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers + , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time + , transformers + }: + mkDerivation { + pname = "gtk3"; + version = "0.14.7"; + sha256 = "0mvzpx4ciral5hnz2iimwag4gbjjciqhjxbbdssg8mg4yvzpb99s"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ + array base bytestring cairo containers gio glib mtl pango text + ]; + libraryPkgconfigDepends = [ gtk3 ]; + executableHaskellDepends = [ + array base cairo text time transformers + ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Gtk+ 3 graphical user interface library"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gtk3-mac-integration" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib , gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl @@ -89347,6 +89687,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashtables_1_2_2_1" = callPackage + ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: + mkDerivation { + pname = "hashtables"; + version = "1.2.2.1"; + sha256 = "1g7nvj4cmscv1jjhms1pxb2gj4rflg2pcj3pb2z7x9fck8557bbs"; + libraryHaskellDepends = [ + base ghc-prim hashable primitive vector + ]; + homepage = "http://github.com/gregorycollins/hashtables"; + description = "Mutable hash tables in the ST monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashtables-plus" = callPackage ({ mkDerivation, base, criterion-plus, deepseq, hashable , hashtables, lens, loch-th, mtl, mwc-random, placeholders @@ -92614,35 +92969,6 @@ self: { }) {inherit (pkgs) aspell;}; "hasql" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , criterion, data-default-class, dlist, either, hashable - , hashtables, loch-th, mtl, placeholders, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rebase, rerebase, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, transformers, vector - }: - mkDerivation { - pname = "hasql"; - version = "0.19.18.1"; - sha256 = "1cmr3l9gb639spqdw8if1da23qhlifr4jyxgfmy61l81mm42zjfb"; - libraryHaskellDepends = [ - attoparsec base base-prelude bytestring bytestring-strict-builder - contravariant contravariant-extras data-default-class dlist either - hashable hashtables loch-th mtl placeholders postgresql-binary - postgresql-libpq profunctors semigroups text transformers vector - ]; - testHaskellDepends = [ - bug data-default-class QuickCheck quickcheck-instances rebase - rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - benchmarkHaskellDepends = [ bug criterion rerebase ]; - homepage = "https://github.com/nikita-volkov/hasql"; - description = "An efficient PostgreSQL driver and a flexible mapping API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql_0_19_18_2" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, data-default-class, dlist, either, hashable @@ -92669,7 +92995,6 @@ self: { homepage = "https://github.com/nikita-volkov/hasql"; description = "An efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -95545,6 +95870,8 @@ self: { pname = "hetero-dict"; version = "0.1.1.0"; sha256 = "0s9ild828xa628x6swrk4v2jnqdkam18bamrarvgp6q9b4b8y2w8"; + revision = "1"; + editedCabalFile = "155bm9b10ar0vhwy46dz68h53379x31xzkdzvhki3y0ln5j8y74i"; libraryHaskellDepends = [ aeson base primitive template-haskell text unordered-containers ]; @@ -96080,23 +96407,6 @@ self: { }) {}; "hformat" = callPackage - ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec - , text - }: - mkDerivation { - pname = "hformat"; - version = "0.3.0.0"; - sha256 = "00l0jcigcrk8yphfgyd8kzc06k7rlka26qc565w4rj9s9dn67y6s"; - libraryHaskellDepends = [ - ansi-terminal base base-unicode-symbols text - ]; - testHaskellDepends = [ base base-unicode-symbols hspec text ]; - homepage = "http://github.com/mvoidex/hformat"; - description = "Simple Haskell formatting"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hformat_0_3_1_0" = callPackage ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec , text }: @@ -96111,7 +96421,6 @@ self: { homepage = "http://github.com/mvoidex/hformat"; description = "Simple Haskell formatting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hfov" = callPackage @@ -96371,8 +96680,8 @@ self: { }: mkDerivation { pname = "hgis"; - version = "0.1.3.5"; - sha256 = "1vmx21s0q9w21118m60hzrfk1p704m7675k7idrqlwd4da54ib7c"; + version = "0.1.3.6"; + sha256 = "1f4hj30ivx37lcxpmhvxchn153rbdxz91lcdphagf1j1j3imx1zw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98687,23 +98996,6 @@ self: { }) {inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage - ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex - , vector - }: - mkDerivation { - pname = "hmatrix-gsl-stats"; - version = "0.4.1.6"; - sha256 = "0wfdj4difqr20ls8i6jlxxsip19xwi8msal7d1l2a995663vpx8v"; - libraryHaskellDepends = [ - base binary hmatrix storable-complex vector - ]; - libraryPkgconfigDepends = [ gsl ]; - homepage = "http://code.haskell.org/hmatrix-gsl-stats"; - description = "GSL Statistics interface"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) gsl;}; - - "hmatrix-gsl-stats_0_4_1_7" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex , vector }: @@ -98718,7 +99010,6 @@ self: { homepage = "http://code.haskell.org/hmatrix-gsl-stats"; description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gsl;}; "hmatrix-mmap" = callPackage @@ -99225,8 +99516,8 @@ self: { }: mkDerivation { pname = "hnormalise"; - version = "0.4.2.0"; - sha256 = "1h38qr8d8dbn81bghh3imb7jink6b06wadbpyg4axfr39s21xvkg"; + version = "0.4.7.0"; + sha256 = "0ag600ms1kay8hg2axv65d4nr699c6fq7p2gdjzjjr2cvs6l06ws"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100809,29 +101100,29 @@ self: { }) {}; "hpack" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring - , containers, deepseq, directory, filepath, Glob, hspec - , interpolate, mockery, QuickCheck, temporary, text + ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal + , containers, deepseq, directory, filepath, Glob, hspec, HUnit + , interpolate, mockery, pretty, QuickCheck, temporary, text , unordered-containers, yaml }: mkDerivation { pname = "hpack"; - version = "0.18.1"; - sha256 = "1ssawa6187m0xzn7i5hn154qajq46jlpbvz1s28qk4bigpv38m7k"; + version = "0.19.1"; + sha256 = "0ncq8kpmsz6lhqajap9ql5ln3pva9hxwk69hsi3x0dgjvkivpsaf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base-compat bytestring containers deepseq directory - filepath Glob text unordered-containers yaml + aeson base base-compat bytestring Cabal containers deepseq + directory filepath Glob pretty text unordered-containers yaml ]; executableHaskellDepends = [ - aeson base base-compat bytestring containers deepseq directory - filepath Glob text unordered-containers yaml + aeson base base-compat bytestring Cabal containers deepseq + directory filepath Glob pretty text unordered-containers yaml ]; testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring containers deepseq - directory filepath Glob hspec interpolate mockery QuickCheck - temporary text unordered-containers yaml + aeson base base-compat bytestring Cabal containers 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"; @@ -104136,8 +104427,8 @@ self: { pname = "hspec-contrib"; version = "0.4.0"; sha256 = "05hchslqqg0k5ksrgy3n8gay0xxnr1zjp4zfj4zp4v0pxq0j57kg"; - revision = "1"; - editedCabalFile = "07p0pckzyih1zc56v2cnchxjsbx4w69b10j343c0yvicq6yjyrkb"; + revision = "2"; + editedCabalFile = "029h7dl49vlrhn62v8kgk8zdavjjc80ga1m8fwhl0pnmvnfkn7sq"; libraryHaskellDepends = [ base hspec-core HUnit ]; testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ]; homepage = "http://hspec.github.io/"; @@ -105755,6 +106046,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "html-conduit_1_2_1_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , containers, hspec, HUnit, resourcet, tagstream-conduit, text + , transformers, xml-conduit, xml-types + }: + mkDerivation { + pname = "html-conduit"; + version = "1.2.1.2"; + sha256 = "172ip4rkn2y3mpzjrj2h3nrmxrf90gcl8ax6dgdhrdjsyg4h8vjk"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra 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 @@ -107354,12 +107667,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "hunit-dejafu_0_7_0_0" = callPackage + "hunit-dejafu_0_7_0_1" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.7.0.0"; - sha256 = "0pp3rxzb00glkc9fn45hik7rn4dwampdbh7va0gdlzh1jma6wpgw"; + version = "0.7.0.1"; + sha256 = "01qa52j5xkksq0z24c8shm04q1gxnqm1m3sqpm1s27ywbivl9n6i"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -107999,8 +108312,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "1.1.0"; - sha256 = "0srp47c5s295qmf5vjfz4qfs19xn407c58iv51lij674c587vsvb"; + version = "1.2.0"; + sha256 = "0v2l7g524wz45mnqdqrs33qbb1psm33jlfl1hlnd22dxfw7mhdhl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112140,6 +112453,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "instance-control_0_1_2_0" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "instance-control"; + version = "0.1.2.0"; + sha256 = "0wvb3hia5n0nmfd5ih17qp6f7517s164c5mhrn29ai7vv20x6vbx"; + libraryHaskellDepends = [ base mtl transformers ]; + homepage = "https://github.com/lazac/instance-control"; + description = "Controls how the compiler searches for instances using type families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "instant-aeson" = callPackage ({ mkDerivation, aeson, base, instant-generics, tasty , tasty-quickcheck @@ -116773,8 +117099,8 @@ self: { }: mkDerivation { pname = "jvm-binary"; - version = "0.0.1"; - sha256 = "0lhk31d0a369jnmyw253wkm1ymdc80a3iw67av4x3d4jajq68kys"; + version = "0.0.2"; + sha256 = "1hdqhp84il50c6wimdvxwdd95gw580hskhmrnn2snqcwj7n1ywfh"; libraryHaskellDepends = [ base binary bytestring containers text vector ]; @@ -116783,7 +117109,7 @@ self: { tasty-discover tasty-hspec tasty-quickcheck text ]; benchmarkHaskellDepends = [ base bytestring criterion ]; - homepage = "https://github.com/kalhauge/jvm-binary#readme"; + homepage = "https://github.com/ucla-pls/jvm-binary#readme"; description = "A library for reading Java class-files"; license = stdenv.lib.licenses.mit; }) {}; @@ -117296,8 +117622,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.5.0.1"; - sha256 = "085gvjki8ifq83hz9im53yjzwpz9jr01vn09y4gvwlxniys70yc2"; + version = "0.5.0.2"; + sha256 = "1kiangj6l29ddchfzfp4xjnpnddyc9jzrg08b70z3jxbdv2vgvyg"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -117320,7 +117646,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katip_0_5_0_2" = callPackage + "katip_0_5_0_3" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , filepath, hostname, microlens, microlens-th, monad-control, mtl @@ -117332,8 +117658,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.5.0.2"; - sha256 = "1kiangj6l29ddchfzfp4xjnpnddyc9jzrg08b70z3jxbdv2vgvyg"; + version = "0.5.0.3"; + sha256 = "18gpj6h9h90nvpb0fb1ns2ygzip4r0v7hna4q1d6gmz88j28s66a"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -121434,6 +121760,20 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "leancheck_0_6_7" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.6.7"; + sha256 = "1aia20p6r9b4xncv5r7y1a2zff37ky0v0m3fd5idlg3sshsd02kv"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/rudymatela/leancheck#readme"; + description = "Cholesterol-free property-based testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "leankit-api" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, curl, split }: mkDerivation { @@ -122453,6 +122793,28 @@ self: { license = "GPL"; }) {}; + "lhs2tex_1_20" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, mtl, process + , regex-compat + }: + mkDerivation { + pname = "lhs2tex"; + version = "1.20"; + sha256 = "0fmhvxi1a839h3i6s2aqckh64bc0qyp4hbzc3wp85zr5gmzix1df"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ + base Cabal directory process regex-compat + ]; + executableHaskellDepends = [ + base directory filepath mtl process regex-compat + ]; + homepage = "https://github.com/kosmikus/lhs2tex"; + description = "Preprocessor for typesetting Haskell sources with LaTeX"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lhslatex" = callPackage ({ mkDerivation, base, directory, filepath, process, regex-posix }: mkDerivation { @@ -123367,8 +123729,8 @@ self: { ({ mkDerivation, base, containers, gjk2d, lens, linear, mtl }: mkDerivation { pname = "light"; - version = "0.1.0.0"; - sha256 = "1zzf5bi8b6in6dvfv4wfmghcvibia5c0waji9y734kp617lsjxl3"; + version = "0.2.0.0"; + sha256 = "1nrzh3z2fxkzws80amxw112idwlwb7r07igr0381jryfacip0ryy"; libraryHaskellDepends = [ base containers gjk2d lens linear mtl ]; testHaskellDepends = [ base containers lens linear ]; homepage = "https://github.com/suzumiyasmith/light#readme"; @@ -123574,7 +123936,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "line_4_0_0" = callPackage + "line_4_0_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text @@ -123582,8 +123944,8 @@ self: { }: mkDerivation { pname = "line"; - version = "4.0.0"; - sha256 = "1xg8d1q7y57k615pdqfn0rx94n49qz9d4647dqyg9gjd7qhzcmkx"; + version = "4.0.1"; + sha256 = "0z36847iamf18b38nz6mcps599cnn17046n61y94g1q7rmfsppx1"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptohash-sha256 http-conduit http-types scotty text time transformers wai @@ -123593,7 +123955,7 @@ self: { hspec-wai QuickCheck quickcheck-instances raw-strings-qq scotty text time transformers ]; - homepage = "https://github.com/noraesae/line"; + homepage = "https://github.com/utatti/line"; description = "Haskell SDK for the LINE API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -123691,14 +124053,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "linear-accelerate_0_5" = callPackage + "linear-accelerate_0_5_0_1" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear }: mkDerivation { pname = "linear-accelerate"; - version = "0.5"; - sha256 = "1whgf5bxl8knh04n7brgy7a7awdsxkyvkrqqpskyiii5bya21q7r"; + version = "0.5.0.1"; + sha256 = "0khbh6z348pv2jwyfip50hvls7pqa91bwkzks4988vxh54mp2i1l"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear @@ -125890,8 +126252,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.2.1"; - sha256 = "0qy1i40ypjcsvqy63jgn824a8iclvw49bhnkxab4k5vjhypd78ga"; + version = "1.2.2"; + sha256 = "0hxw0j3zp6vs4si1v8ziy0g2a06smny6fmjqhd9v5hvdcfnqnm9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129108,43 +129470,6 @@ self: { }) {}; "marvin" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, configurator - , deepseq, directory, filepath, hashable, haskeline, hspec - , http-client, http-client-tls, http-types, irc-conduit, lens - , lifted-async, lifted-base, marvin-interpolate, monad-control - , monad-logger, monad-loops, mtl, mustache, network-uri - , optparse-applicative, random, stm, text, text-icu, time - , transformers, transformers-base, unordered-containers, vector - , wai, warp, warp-tls, websockets, wreq, wuss - }: - mkDerivation { - pname = "marvin"; - version = "0.2.3"; - sha256 = "0gam200i0d9wd7f2kz4qy7f7wlbkxkbzlacgaamxib6q5dk3kx3r"; - revision = "1"; - editedCabalFile = "1aszssi82ap0y6bkviv3vn6cdh3vb0pv1znvs2z5k52r4wwa8h55"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring conduit configurator deepseq hashable - haskeline http-client http-client-tls http-types irc-conduit lens - lifted-async lifted-base marvin-interpolate monad-control - monad-logger monad-loops mtl network-uri optparse-applicative - random stm text text-icu time transformers transformers-base - unordered-containers vector wai warp warp-tls websockets wreq wuss - ]; - executableHaskellDepends = [ - aeson base bytestring configurator directory filepath mustache - optparse-applicative text - ]; - testHaskellDepends = [ base hspec ]; - homepage = "https://marvin.readthedocs.io"; - description = "A framework for modular, portable chat bots"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "marvin_0_2_5" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, configurator , deepseq, directory, filepath, hashable, haskeline, hspec , http-client, http-client-tls, http-types, irc-conduit, lens @@ -129177,7 +129502,6 @@ self: { homepage = "https://marvin.readthedocs.io"; description = "A framework for modular, portable chat bots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "marvin-interpolate" = callPackage @@ -131447,8 +131771,8 @@ self: { }: mkDerivation { pname = "micrologger"; - version = "0.4.0.0"; - sha256 = "03np1fkbjqa1lnnpb2fci8r9r8nhbixyjljb9i64fnckj3qvfkj9"; + version = "0.4.0.1"; + sha256 = "0bw552jh0dnrdl1hsbi3pvh0ip3vp3l7z2xqmndq5qayfbqzdpa1"; libraryHaskellDepends = [ aeson base containers text text-format time transformers ]; @@ -132409,19 +132733,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_7_8_0" = callPackage + "miso_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, lucid - , servant, servant-lucid, text, vector + , servant, servant-lucid, text, transformers, vector }: mkDerivation { pname = "miso"; - version = "0.7.8.0"; - sha256 = "1rzfdd2wcmmc2vmrh5v0blqkjszbpmvx5yhq99c5zss8ir7x4a9w"; + version = "0.8.0.0"; + sha256 = "1z49dd3g30fhk6kvm5lfrzapsbf3381bmgyzsp34f67fdjxmdj8w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers lucid servant servant-lucid text - vector + transformers vector ]; homepage = "http://github.com/dmjio/miso"; description = "A tasty Haskell front-end framework"; @@ -137219,25 +137543,6 @@ self: { }) {}; "mysql-simple" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light - , text, time - }: - mkDerivation { - pname = "mysql-simple"; - version = "0.4.2.0"; - sha256 = "0050z2hhdg9zmqczghjc609aaaqjzrxrfly68d4m5046wz4lnkx8"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder blaze-textual - bytestring mysql old-locale pcre-light text time - ]; - testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/paul-rouse/mysql-simple"; - description = "A mid-level MySQL client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mysql-simple_0_4_3" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light , text, time @@ -137254,7 +137559,6 @@ self: { homepage = "https://github.com/paul-rouse/mysql-simple"; description = "A mid-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-simple-quasi" = callPackage @@ -137443,8 +137747,8 @@ self: { }: mkDerivation { pname = "nakadi-client"; - version = "0.2.0.1"; - sha256 = "1vg1aflms5hwbx86a9hrs84y9fl6wi2ihgq32ag763kbih3wvcsr"; + version = "0.3.0.0"; + sha256 = "14cr81b6x7cf10zja1vvpqhz9wanq50wwxhkvfx8w1s44skwvasy"; libraryHaskellDepends = [ aeson aeson-casing base bytestring conduit conduit-combinators conduit-extra containers hashable http-client http-client-tls @@ -140107,8 +140411,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.8.0.0"; - sha256 = "0l4g7nxa2lhf804q17my3fz7hblzidn1rp2si0b9nnbl9h7264sq"; + version = "0.8.0.5"; + sha256 = "1qiaz3jah863xzbzck2dndy06rhizb6nniqnn38n32nln3bsmqcz"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -144749,6 +145053,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "packed-multikey-map" = callPackage + ({ mkDerivation, base, constraints, containers, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, transformers, vector + }: + mkDerivation { + pname = "packed-multikey-map"; + version = "0.1.0.0"; + sha256 = "19bh697xazsi22krwjgy83hv1pscnaqx544d5pk0q71wnync5m89"; + libraryHaskellDepends = [ + base constraints containers QuickCheck transformers vector + ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + homepage = "https://github.com/leftaroundabout/packed-multikey-map"; + description = "Efficient “spreadsheet table” like maps with multiple marginals"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "packedstring" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -145254,18 +145575,20 @@ self: { }) {}; "pandoc-include-code" = callPackage - ({ mkDerivation, base, containers, filepath, pandoc-types - , pcre-heavy, process + ({ mkDerivation, base, filepath, mtl, pandoc-types, process, tasty + , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "pandoc-include-code"; - version = "0.3.0"; - sha256 = "0x3cx817rs1gmc9c9syn7dqlp1xx1mxr5grh19c7462vw9hyp3ji"; - isLibrary = false; + version = "1.1.0.0"; + sha256 = "1ygdmnmr4lw7f83xhqaa7m074ii6wbrsx148i9qx3inz5z2rm9b5"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - base containers filepath pandoc-types pcre-heavy process + libraryHaskellDepends = [ + base filepath mtl pandoc-types process text unordered-containers ]; + executableHaskellDepends = [ base pandoc-types ]; + testHaskellDepends = [ base pandoc-types tasty tasty-hunit ]; homepage = "https://github.com/owickstrom/pandoc-include-code"; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; @@ -145503,6 +145826,27 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) pango;}; + "pango_0_13_4_0" = callPackage + ({ mkDerivation, array, base, Cabal, cairo, containers, directory + , filepath, glib, gtk2hs-buildtools, mtl, pango, pretty, process + , text + }: + mkDerivation { + pname = "pango"; + version = "0.13.4.0"; + sha256 = "1m7as420nh55n0hywnl6rbm7zj4s1ry38xvb1gk3np7k87lwf20z"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; + libraryHaskellDepends = [ + array base cairo containers directory glib mtl pretty process text + ]; + libraryPkgconfigDepends = [ pango ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Pango text rendering engine"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.gnome2) pango;}; + "panhandle" = callPackage ({ mkDerivation, aeson, base, containers, derive , lazysmallcheck2012, pandoc, pandoc-types, QuickCheck, syb, tagged @@ -146962,8 +147306,8 @@ self: { }: mkDerivation { pname = "pasta"; - version = "0.1.0.2"; - sha256 = "0ycbvj7g47ch6w6vsf4akayh7b9gzg128j3ad937wkvyi31fpdak"; + version = "0.1.0.3"; + sha256 = "05c3gh2cfn9hafwz1cz9wn3axbn90xrp9pr2yq4piwvmbwi7ifxx"; libraryHaskellDepends = [ base microlens microlens-th protolude semigroups text text-show ]; @@ -149995,29 +150339,6 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; - version = "4.3.4"; - sha256 = "08am4yxn0f2aizyh34g6nwm7l9i2bxd0s38dsfwqm6h0sdvfsffb"; - libraryHaskellDepends = [ - base exceptions mmorph mtl transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes_4_3_5" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, semigroups, test-framework , test-framework-quickcheck2, transformers, void @@ -150038,7 +150359,6 @@ self: { ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -155557,8 +155877,8 @@ self: { ({ mkDerivation, base, deepseq, mtl, time }: mkDerivation { pname = "progress-reporting"; - version = "1.0.0"; - sha256 = "1y1klrryvq6diibdw8sga03r2rq5cqvd66nhadzc8wbq03azppcd"; + version = "1.1.0"; + sha256 = "02j1i28hcd54w1j9p0d8xzc1bns7swd8js5f6d6ppikc82hlb9bj"; libraryHaskellDepends = [ base deepseq mtl time ]; description = "Functionality for reporting function progress"; license = stdenv.lib.licenses.lgpl3; @@ -155958,8 +156278,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.7.7"; - sha256 = "04aglqwvnw40pxg479mhi1i81547bb7s26qrg9gga8xs1cqgnfbs"; + version = "4.8.1"; + sha256 = "14q1zd6bvrfcs21pklxd6wgiqpb92v0464k4zhq9l31v4k2p5zpk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156377,23 +156697,6 @@ self: { }) {}; "protocol-buffers" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string - }: - mkDerivation { - pname = "protocol-buffers"; - version = "2.4.3"; - sha256 = "1spxilp6zk30ijcr3vqgnzbznc0g3050cy9258931vz2zfkjc6kd"; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string - ]; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers_2_4_4" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string }: @@ -156408,25 +156711,9 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor" = callPackage - ({ mkDerivation, base, bytestring, containers, protocol-buffers }: - mkDerivation { - pname = "protocol-buffers-descriptor"; - version = "2.4.3"; - sha256 = "1wwn4lwzl0l8bbw99hdh9xizc39hvjr9cxc5sww8f4zh2vbyw99p"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers protocol-buffers - ]; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers-descriptor_2_4_4" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; @@ -156439,7 +156726,6 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor-fork" = callPackage @@ -156734,6 +157020,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psqueues_0_2_4_0" = 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pstemmer" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -156749,6 +157059,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pthread" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "pthread"; + version = "0.1.1"; + sha256 = "1b0fqz06yi8g7gpsnkl12dxkkrm00701274f6whk12ixr9d32405"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/tweag/pthread"; + description = "Bindings for the pthread library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pub" = callPackage ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes , pipes-bytestring, text @@ -157038,8 +157360,8 @@ self: { ({ mkDerivation, base, containers, libpulseaudio, stm, unix }: mkDerivation { pname = "pulseaudio"; - version = "0.0.2.0"; - sha256 = "13h79hav744nvvkxdhprq061xwz31yh9klp0r4ksmgclgjpsrjvj"; + version = "0.0.2.1"; + sha256 = "12xqclasgqwkwq0wx96qhd6xl98i1amchan71p0r55x5rw2ji0hv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers stm unix ]; @@ -162140,6 +162462,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "references_0_3_3_0" = callPackage + ({ mkDerivation, array, base, containers, directory, either + , filepath, HUnit, instance-control, lens, mtl, template-haskell + , text, transformers, uniplate + }: + mkDerivation { + pname = "references"; + version = "0.3.3.0"; + sha256 = "186x1j6yg2fh4a96b68jq7kwx2s1kxdbl4yi4izfgvxwimpzcr8w"; + libraryHaskellDepends = [ + array base containers directory either filepath instance-control + mtl template-haskell text transformers uniplate + ]; + testHaskellDepends = [ + array base containers directory either filepath HUnit + instance-control lens mtl template-haskell text transformers + uniplate + ]; + homepage = "https://github.com/lazac/references"; + description = "Selectors for reading and updating data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "refh" = callPackage ({ mkDerivation, base, clippard, cmdargs, directory, filepath , haskheap, network @@ -167827,18 +168173,13 @@ self: { }) {inherit (pkgs) libsodium;}; "salve" = callPackage - ({ mkDerivation, base, criterion, deepseq, doctest, microlens - , semver, semver-range - }: + ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "0.0.8"; - sha256 = "0hss6fqzp3307v52g0n3ryx2grs7v1rh2haxjs4hyi60acrnycb1"; + version = "0.0.9"; + sha256 = "0x16rdrm8i2jwbi1zd7zj43r3h7jb9fzb33b5nbwkwfh397sm11h"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest microlens ]; - benchmarkHaskellDepends = [ - base criterion deepseq semver semver-range - ]; + testHaskellDepends = [ base doctest ]; homepage = "https://github.com/tfausak/salve#readme"; description = "Semantic version numbers and constraints"; license = stdenv.lib.licenses.mit; @@ -168643,8 +168984,8 @@ self: { }: mkDerivation { pname = "scat"; - version = "1.1.0.2"; - sha256 = "0dh23v8kx2qnf392afznv3iixvwr4220my9nnlxgz1mhn77d51ln"; + version = "1.1.0.3"; + sha256 = "0i1hmjb91khk3m7r29bb78556mlr9j75gf3pq5fdvz9slq1flagb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -168815,6 +169156,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "schematic_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema + , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens + , mtl, regex-compat, scientific, singletons, smallcheck, tagged + , text, unordered-containers, validationt, vector, vinyl + }: + mkDerivation { + pname = "schematic"; + version = "0.3.0.0"; + sha256 = "0nrq36s646h6lrfqw9hf7ysmc8b2x7dkrj07x1dy2x1ihph5my12"; + libraryHaskellDepends = [ + aeson base bytestring containers hjsonschema mtl regex-compat + scientific singletons smallcheck tagged text unordered-containers + validationt vector vinyl + ]; + testHaskellDepends = [ + aeson base bytestring containers hjsonschema hspec hspec-core + hspec-discover hspec-smallcheck HUnit lens regex-compat singletons + smallcheck tagged text unordered-containers validationt vinyl + ]; + description = "JSON-biased spec and validation tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scholdoc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html , blaze-markup, bytestring, containers, criterion, data-default @@ -171609,37 +171975,6 @@ self: { }) {}; "servant-checked-exceptions" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob - , hspec-wai, http-api-data, http-client, http-media - , natural-transformation, optparse-applicative, profunctors - , servant, servant-client, servant-docs, servant-server, tagged - , tasty, tasty-hspec, tasty-hunit, text, wai, warp - }: - mkDerivation { - pname = "servant-checked-exceptions"; - version = "0.4.0.0"; - sha256 = "10visfbj6zjf8b78hzq8c2xb9psdjzq6amqr5wkgbm6qanjab8kd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring deepseq http-media profunctors servant - servant-client servant-docs servant-server tagged text - ]; - executableHaskellDepends = [ - aeson base http-api-data http-client natural-transformation - optparse-applicative servant servant-client servant-docs - servant-server text wai warp - ]; - testHaskellDepends = [ - base bytestring doctest Glob hspec-wai servant servant-server tasty - tasty-hspec tasty-hunit wai - ]; - homepage = "https://github.com/cdepillabout/servant-checked-exceptions"; - description = "Checked exceptions for Servant APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-checked-exceptions_0_4_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob , hspec-wai, http-api-data, http-client, http-media , natural-transformation, optparse-applicative, profunctors @@ -171668,7 +172003,6 @@ self: { homepage = "https://github.com/cdepillabout/servant-checked-exceptions"; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-client" = callPackage @@ -172261,6 +172595,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-purescript_0_9_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, http-types, lens, mainland-pretty, purescript-bridge + , servant, servant-foreign, servant-server, servant-subscriber + , text + }: + mkDerivation { + pname = "servant-purescript"; + version = "0.9.0.0"; + sha256 = "06r43f36r5y3vzzw5b9ij0pprjdyabr33h6w4h47kg6cdkwmy2sh"; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath http-types lens + mainland-pretty purescript-bridge servant servant-foreign + servant-server servant-subscriber text + ]; + testHaskellDepends = [ + aeson base containers lens mainland-pretty purescript-bridge + servant servant-foreign servant-subscriber text + ]; + homepage = "https://github.com/eskimor/servant-purescript#readme"; + description = "Generate PureScript accessor functions for you servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-pushbullet-client" = callPackage ({ mkDerivation, aeson, base, http-api-data, http-client , http-client-tls, microlens, microlens-th, pushbullet-types @@ -172337,6 +172696,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-rawm" = callPackage + ({ mkDerivation, base, bytestring, filepath, http-client + , http-media, http-types, resourcet, servant, servant-client + , servant-docs, servant-server, text, transformers, wai + , wai-app-static, warp + }: + mkDerivation { + pname = "servant-rawm"; + version = "0.1.0.0"; + sha256 = "0h3s0sca9x612lr2ndv0vccdyscb93amqiwg511rwh6i5y0jrv7d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring filepath http-client http-media http-types + resourcet servant servant-client servant-docs servant-server wai + wai-app-static + ]; + executableHaskellDepends = [ + base bytestring http-client http-media http-types servant + servant-client servant-server text transformers wai warp + ]; + homepage = "https://github.com/cdepillabout/servant-rawm"; + description = "Embed a raw 'Application' in a Servant API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-response" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -173058,6 +173443,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sessiontypes" = callPackage + ({ mkDerivation, base, deepseq, diagrams-lib, diagrams-svg + , directory, exceptions, hspec, mtl, transformers, vector + }: + mkDerivation { + pname = "sessiontypes"; + version = "0.1.0"; + sha256 = "0p5img64ksk2a4in4qamizyp1w59y4hcwv5ll0c0nis7flzyy3js"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq diagrams-lib diagrams-svg mtl transformers vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base directory exceptions hspec ]; + homepage = "https://github.com/Ferdinand-vW/sessiontypes#readme"; + description = "Session types library"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "sessiontypes-distributed" = callPackage + ({ mkDerivation, base, binary, bytestring, distributed-process + , distributed-static, exceptions, hspec, network-transport-tcp + , rank1dynamic, sessiontypes + }: + mkDerivation { + pname = "sessiontypes-distributed"; + version = "0.1.0"; + sha256 = "1q0y37iwjafcb70fv42hny44ay0bpzbvss48h10dahvsmzpqkk8a"; + libraryHaskellDepends = [ + base binary bytestring distributed-process distributed-static + exceptions rank1dynamic sessiontypes + ]; + testHaskellDepends = [ + base distributed-process hspec network-transport-tcp sessiontypes + ]; + homepage = "https://github.com/Ferdinand-vW/sessiontypes-distributed#readme"; + description = "Session types distributed"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "set-cover" = callPackage ({ mkDerivation, base, containers, enummapset, psqueues, utility-ht }: @@ -173709,6 +174135,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "shake-language-c_0_11_0" = callPackage + ({ mkDerivation, base, data-default-class, directory, doctest + , fclabels, hspec, process, shake, split, unordered-containers + }: + mkDerivation { + pname = "shake-language-c"; + version = "0.11.0"; + sha256 = "07ck1y3z3081s1m3yff37z6v2lp0gilqj0jb0l4vphszkckasx11"; + libraryHaskellDepends = [ + base data-default-class fclabels process shake split + unordered-containers + ]; + testHaskellDepends = [ base directory doctest hspec shake ]; + doCheck = false; + homepage = "https://github.com/samplecount/shake-language-c"; + description = "Utilities for cross-compiling with Shake"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shake-minify" = callPackage ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }: mkDerivation { @@ -173803,8 +174249,8 @@ self: { }: mkDerivation { pname = "shakers"; - version = "0.0.31"; - sha256 = "134v3rzyhf5yv417dp90f9phgm4mdbhc5sv9l44jdbhplnmahh2m"; + version = "0.0.33"; + sha256 = "1wn0bk867nbzcg6c6a8q5sa4ma60r3zc46ykpdla34k61nq5g3qy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175845,8 +176291,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "simtreelo"; - version = "0.1.1.1"; - sha256 = "0r0vrn4lsl14px7axhigpy3y5hm8q5hwhgzn61qd0s80a8p0r68c"; + version = "0.1.1.2"; + sha256 = "1wn3hycwn0i25jad096g6hzkxrm64j2hpjdpp8lr69mdrcmn2gmx"; libraryHaskellDepends = [ base containers ]; description = "Loader for data organized in a tree"; license = stdenv.lib.licenses.gpl3; @@ -176393,7 +176839,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_4" = callPackage + "skylighting_0_4_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -176402,8 +176848,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.4"; - sha256 = "12zr4baf755y1v842mfb17wkv6bfjw46r650yzl29ji5s8fm6v3j"; + version = "0.4.1"; + sha256 = "0dsngs2nw2ijhxxwa8d7fb9rxgqz6kgimbsvxmhpd5s4y6a1ygf4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177559,54 +178005,6 @@ self: { }) {}; "snap-server" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , bytestring, bytestring-builder, case-insensitive, clock - , containers, criterion, deepseq, directory, filepath, HsOpenSSL - , http-common, http-streams, HUnit, io-streams, io-streams-haproxy - , lifted-base, monad-control, mtl, network, old-locale - , openssl-streams, parallel, QuickCheck, random, snap-core - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, threads, time, transformers, unix, unix-compat, vector - }: - mkDerivation { - pname = "snap-server"; - version = "1.0.3.1"; - sha256 = "0zawrbjncb5nbnahx70078sb9ai0dyqzghcn06qgy3vzk195gwfi"; - configureFlags = [ "-fopenssl" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - case-insensitive clock containers filepath HsOpenSSL io-streams - io-streams-haproxy lifted-base mtl network old-locale - openssl-streams snap-core text time unix unix-compat vector - ]; - executableHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - case-insensitive clock containers directory HsOpenSSL io-streams - io-streams-haproxy lifted-base mtl network old-locale - openssl-streams snap-core text time transformers unix unix-compat - vector - ]; - testHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder bytestring - bytestring-builder case-insensitive clock containers deepseq - directory filepath HsOpenSSL http-common http-streams HUnit - io-streams io-streams-haproxy lifted-base monad-control mtl network - old-locale openssl-streams parallel QuickCheck random snap-core - test-framework test-framework-hunit test-framework-quickcheck2 text - threads time transformers unix unix-compat vector - ]; - benchmarkHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - criterion io-streams io-streams-haproxy snap-core vector - ]; - homepage = "http://snapframework.com/"; - description = "A web server for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "snap-server_1_0_3_3" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, bytestring-builder, case-insensitive, clock , containers, criterion, deepseq, directory, filepath, HsOpenSSL @@ -177652,7 +178050,6 @@ self: { homepage = "http://snapframework.com/"; description = "A web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-templates" = callPackage @@ -180876,8 +181273,8 @@ self: { }: mkDerivation { pname = "squeal-postgresql"; - version = "0.1.1.2"; - sha256 = "1kfdyy6an151ans0p4xk102fjgn23hqsgyy05izb4z3mzahk6qij"; + version = "0.1.1.4"; + sha256 = "0s0dl4l6zbxi9a37ybrg8kq7yf642kayr6yjjp21i0wd0sa71b2h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181302,7 +181699,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stache_1_1_2" = callPackage + "stache_1_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec , megaparsec, mtl, template-haskell, text, unordered-containers @@ -181310,8 +181707,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "1.1.2"; - sha256 = "1zwl8a8ank1zwssz5yq00mcmvimnn3hcsv8z973gkmwhisp0alrz"; + version = "1.2.0"; + sha256 = "050b7rnwh7cphsakh05s6hjc5ddfm0637yahq1igs0kp32d6pmv0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -183414,15 +183811,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_9_0" = callPackage + "stratosphere_0_10_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable , hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.9.0"; - sha256 = "12fx6c6z1fj13y0p6limmfz80ga5xvpz474lnqi5fz5sgnp1cpxa"; + version = "0.10.0"; + sha256 = "195rr247bzrnnvjv7i13z88xbpajxk34n94ywqvfyf3457466iqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185775,37 +186172,6 @@ self: { }) {}; "swagger2" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring - , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob - , hashable, hspec, http-media, HUnit, insert-ordered-containers - , lens, mtl, network, QuickCheck, scientific, template-haskell - , text, time, transformers, transformers-compat - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.1.5"; - sha256 = "1sxv03fgafr21824wcz68l4nvazk6j31z74xa7njg7d3mc5w66pw"; - revision = "1"; - editedCabalFile = "1jv3jbnz0hsfvqnvv6diq4yav85jsqs9b5k1rx7b96nvh1ik3p4q"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base base-compat bytestring containers generics-sop hashable - http-media insert-ordered-containers lens mtl network scientific - template-haskell text time transformers transformers-compat - unordered-containers uuid-types vector - ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - text time unordered-containers vector - ]; - homepage = "https://github.com/GetShopTV/swagger2"; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "swagger2_2_1_6" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob , hashable, hspec, http-media, HUnit, insert-ordered-containers @@ -185832,7 +186198,6 @@ self: { homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -188370,12 +188735,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "tasty-dejafu_0_7_0_0" = callPackage + "tasty-dejafu_0_7_0_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.7.0.0"; - sha256 = "0713gck8zdcd303zaq52g0ca9x28arwj9n1brfyzqscac95bcccc"; + version = "0.7.0.1"; + sha256 = "01n9j9sc4lvm0s2giwqc5ig16jyww61h81m0bcjk2jzmnsk9mp7g"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -188404,15 +188769,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-discover_4_0_0" = callPackage + "tasty-discover_4_1_1" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-discover"; - version = "4.0.0"; - sha256 = "00nz89sgdx3l4ba0l85qgab1g0ywqa0yl7c1ypglqldpyqnbg4g6"; + version = "4.1.1"; + sha256 = "0lsz73rnvwb6z522bxfhlslvvymnjw7kw4fs8llwr3w6cvzl5vfj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190540,8 +190905,8 @@ self: { ({ mkDerivation, base, haskell-src-meta, template-haskell }: mkDerivation { pname = "testCom"; - version = "0.1.0"; - sha256 = "0wwh32sn5vgsm1yy741mp57ng17dwsailkz6isa37r71lcvaqj98"; + version = "0.2.0"; + sha256 = "1gp8ylpp6315srcr1pi78a9f6kr24kp5dyfml9yibj35qd6wdil2"; libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; testHaskellDepends = [ base haskell-src-meta template-haskell ]; description = "Write your tests in comments"; @@ -190712,6 +191077,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "texbuilder" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , cryptonite, deepseq, directory, extra, filepath, hinotify, mtl + , optparse-applicative, process, temporary, unix + }: + mkDerivation { + pname = "texbuilder"; + version = "0.1.1.1"; + sha256 = "14fg4hxyfvv54n85495dbk6avccms92kw5jzgycylnk8aiw2nxa4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base bytestring containers cryptonite deepseq + directory extra filepath hinotify mtl optparse-applicative process + temporary unix + ]; + homepage = "https://gitlab.com/xaverdh/tex-builder#texbuilder"; + description = "View your latex output while editing"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, network-uri, pandoc-types, parsec, process, split, syb @@ -192707,31 +193093,6 @@ self: { }) {}; "threepenny-gui" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , data-default, deepseq, exceptions, file-embed, filepath, hashable - , network-uri, safe, snap-core, snap-server, stm, template-haskell - , text, transformers, unordered-containers, vault, vector - , websockets, websockets-snap - }: - mkDerivation { - pname = "threepenny-gui"; - version = "0.8.1.0"; - sha256 = "13wafs0m9qiadnc9pyzhs8xc5lk7k4cd1fspm938r1jnwslj05ch"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson async base bytestring containers data-default deepseq - exceptions file-embed filepath hashable network-uri safe snap-core - snap-server stm template-haskell text transformers - unordered-containers vault vector websockets websockets-snap - ]; - homepage = "http://wiki.haskell.org/Threepenny-gui"; - description = "GUI framework that uses the web browser as a display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "threepenny-gui_0_8_2_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, deepseq, exceptions, file-embed, filepath, hashable , network-uri, safe, snap-core, snap-server, stm, template-haskell @@ -192754,7 +193115,6 @@ self: { homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threepenny-gui-contextmenu" = callPackage @@ -194118,6 +194478,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tinyfiledialogs" = callPackage + ({ mkDerivation, base, c2hs, text }: + mkDerivation { + pname = "tinyfiledialogs"; + version = "0.1.0.0"; + sha256 = "0csj7ca5r6vqkviz3q570bsmdssm144sb9wyi7d9jpl0n3khpdm1"; + libraryHaskellDepends = [ base text ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/mtolly/tinyfiledialogs"; + description = "Wrapper around the 'tiny file dialogs' C library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tinylog" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , double-conversion, fast-logger, text, transformers, unix-time @@ -194505,27 +194878,6 @@ self: { }) {}; "tmp-postgres" = callPackage - ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover - , network, postgresql-simple, process, temporary, unix - }: - mkDerivation { - pname = "tmp-postgres"; - version = "0.1.0.8"; - sha256 = "11cs5cq99gxkfj0x14kkcsn6mnh9c7d8hw1kdj598fy1gic5c94n"; - libraryHaskellDepends = [ - base directory network process temporary unix - ]; - testHaskellDepends = [ - base bytestring directory hspec hspec-discover postgresql-simple - process temporary - ]; - homepage = "https://github.com/jfischoff/tmp-postgres#readme"; - description = "Start and stop a temporary postgres for testing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "tmp-postgres_0_1_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover , network, postgresql-simple, process, temporary, unix }: @@ -196893,7 +197245,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "turtle_1_4_3" = callPackage + "turtle_1_4_4" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , criterion, directory, doctest, foldl, hostname, managed , optional-args, optparse-applicative, process, semigroups, stm @@ -196902,8 +197254,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.4.3"; - sha256 = "0dyb99p1ymcjbpi0w3ksj0aj2pzs6fb6vp1n7m2bb1h5dp15rzrf"; + version = "1.4.4"; + sha256 = "0ixq9fdmcg2adiy9zgg3qmk6dwdahyw95aaqnf98jxi2j1h2aijz"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock directory foldl hostname managed optional-args optparse-applicative process semigroups stm @@ -200741,6 +201093,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring_0_3_0_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, blaze-builder + , bytestring, containers, criterion, deepseq, deepseq-generics + , fail, generics-sop, HUnit, network-uri, QuickCheck + , quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, th-lift-instances + , transformers + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.3.0.0"; + sha256 = "0slbwh138y3j0mb50g39ylr18l80vn6hsszm83d9797nlh0nb5rn"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring containers fail + template-haskell th-lift-instances + ]; + testHaskellDepends = [ + attoparsec base base-compat blaze-builder bytestring containers + generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck transformers + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq deepseq-generics + network-uri + ]; + homepage = "https://github.com/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-bytestring-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { @@ -200755,6 +201138,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring-aeson_0_1_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: + mkDerivation { + pname = "uri-bytestring-aeson"; + version = "0.1.0.4"; + sha256 = "1nm9d3xq56rrjggky28q72n8afk5nh6m1bbi6j5z538qwccyg348"; + libraryHaskellDepends = [ + aeson base bytestring text uri-bytestring + ]; + homepage = "https://github.com/reactormonk/uri-bytestring-aeson"; + description = "Aeson instances for URI Bytestring"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, deepseq , failure, monad-control, network, system-fileio, system-filepath @@ -207500,8 +207898,8 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.0.3"; - sha256 = "0ygq4h0ihwjxmndd30j2y9sdghnysh78izszg8fdhdl7ncnmpv70"; + version = "0.1.0.5"; + sha256 = "0aj0jpj2w46fdzvddc76l62cmcwvsndc1vj6z391bybw4q8khlmd"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ]; homepage = "https://github.com/erikd/wide-word"; @@ -210226,6 +210624,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xml-hamlet_0_4_1_1" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, parsec + , shakespeare, template-haskell, text, xml-conduit + }: + mkDerivation { + pname = "xml-hamlet"; + version = "0.4.1.1"; + sha256 = "0bfhk3hdg70j91g5i9ygz0nmbpffnxa4kh5h828fdgml54i5sv2d"; + 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 { @@ -210303,16 +210723,19 @@ self: { "xml-isogen" = callPackage ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck - , semigroups, template-haskell, text, xml-conduit-writer + , semigroups, template-haskell, text, xml-conduit + , xml-conduit-writer }: mkDerivation { pname = "xml-isogen"; - version = "0.1.0"; - sha256 = "1bjy00an6ccrw8x1hpd5fwa4acgd00xn0kzhaj0w60g174cnfrmf"; + version = "0.2.0"; + sha256 = "1dmf660cyrs96ih1swlw44spd2g05dfikpak9mmjag40mab36116"; libraryHaskellDepends = [ base dom-parser lens mtl QuickCheck semigroups template-haskell - text xml-conduit-writer + text xml-conduit xml-conduit-writer ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/typeable/xml-isogen"; description = "Generate XML-isomorphic types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -211895,8 +212318,8 @@ self: { }: mkDerivation { pname = "yate"; - version = "0.1.0.1"; - sha256 = "01ijsfvi9whasxqv1iydmi123lc4kwy3qhg70kc6h1vsfzcwz94g"; + version = "0.1.0.2"; + sha256 = "1wb9y69fgyqngfl8nddrsk22d532cba62av99qkd9xgjgsm61ki1"; libraryHaskellDepends = [ aeson attoparsec base mtl scientific template-haskell text unordered-containers vector From 3fc0c769b0c70b706a10497c100df22dbe8c0640 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Sep 2017 11:33:44 +0200 Subject: [PATCH 0478/2806] git-annex: update to version 6.20170925 --- 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 8b2dbdf27f1..61b8d8c5966 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -98,7 +98,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "15d29hmbl146axjgbm4qhxpz6ypcq1bjf2aj29yhwh5jmznh58i2"; + sha256 = "03fa03n4zkpj5z3ma1ahvnxd85dni2aikqayqf838jvfl7bd5b9n"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From 49fafc77b4335694941705c87548d61afccb2942 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Sep 2017 11:40:12 +0200 Subject: [PATCH 0479/2806] haskell-stack: jailbreak build to support hpack 0.19 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 61b8d8c5966..6c951bac748 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -971,4 +971,8 @@ self: super: { hackage-db = self.hackage-db_2_0; optparse-applicative = self.optparse-applicative_0_14_0_0; }); + + # Break "hpack >=0.17.0 && <0.19". + stack = doJailbreak super.stack; + } From bc265e041a0a640724cae2e15c9637595e6eceef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 Sep 2017 18:56:41 +0200 Subject: [PATCH 0480/2806] haskell-hspec-core: disable test suite until transient failures are fixed https://github.com/hspec/hspec/issues/330 --- pkgs/development/haskell-modules/configuration-common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6c951bac748..ac1420051da 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -58,13 +58,15 @@ self: super: { hasql-postgres = dontCheck super.hasql-postgres; hspec-expectations = dontCheck super.hspec-expectations; hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; }; - hspec-core = super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }; HTTP = dontCheck super.HTTP; nanospec = dontCheck super.nanospec; options = dontCheck super.options; statistics = dontCheck super.statistics; http-streams = dontCheck super.http-streams; + # https://github.com/hspec/hspec/issues/330 + hspec-core = dontCheck (super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }); + # segfault due to missing return: https://github.com/haskell/c2hs/pull/184 c2hs = dontCheck super.c2hs; From e5701989807e18922b92119a7646a28a51175088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 30 Sep 2017 11:37:47 +0200 Subject: [PATCH 0481/2806] lshw: fix built-in version info Currently lshw says its version is "unknown". Make it report the current package version instead. --- pkgs/tools/system/lshw/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index dc5b75b0f4a..a26237bc045 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3"; })]; + # Fix version info. + preConfigure = '' + sed -e "s/return \"unknown\"/return \"${version}\"/" \ + -i src/core/version.cc + ''; + buildInputs = lib.optionals withGUI [ gtk2 pkgconfig sqlite ]; makeFlags = [ "PREFIX=$(out)" ]; From 79df9105bab9a7bc96f2b00391a03b3c242ab024 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 30 Sep 2017 11:33:14 +0200 Subject: [PATCH 0482/2806] giac, xcas: init at 1.4.9 --- .../science/math/giac/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/science/math/giac/default.nix diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix new file mode 100644 index 00000000000..d1645bf9010 --- /dev/null +++ b/pkgs/applications/science/math/giac/default.nix @@ -0,0 +1,63 @@ +{stdenv, fetchurl, gmp, mpfr, pari, ntl, gsl, blas, +readline, gettext, liblapackWithAtlas, bison, yacc, flex, +mpfi, libpng, libao, gfortran, texlive, hevea, perl, +enableGui ? true, mesa ? null, xorg ? null, fltk ? null, +}: + +assert enableGui -> mesa != null && xorg != null && fltk != null; + +stdenv.mkDerivation rec { + name = "giac-${version}"; + version = "1.4.9"; + + src = fetchurl { + url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/${name}.tar.bz2"; + sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai"; + }; + + + patchPhase = '' + for i in doc/*/Makefile* ; do + substituteInPlace "$i" --replace "/bin/cp" "cp"; + done; + ''; + + nativeBuildInputs = [ + texlive.combined.scheme-small hevea + ]; + + buildInputs = [ + gmp mpfr pari ntl gsl mpfi liblapackWithAtlas bison yacc flex readline + gettext blas libpng gfortran perl + ] ++ stdenv.lib.optionals enableGui [ + mesa fltk xorg.libX11 + ]; + + enableParallelBuilding = true; + hardeningDisable = [ "format" "bindnow" "relro" ]; + + configureFlags = [ + "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" + "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa" + "--enable-ao" ] ++ stdenv.lib.optionals enableGui [ + "--enable-gui" "--with-x" + ]; + + postInstall = '' + # example Makefiles contain the full path to some commands + # notably texlive, and we don't want texlive to become a runtime + # dependency + for file in $(find $out -name Makefile) ; do + sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ; + done; + ''; + + meta = with stdenv.lib; { + description = "A free computer algebra system (CAS)"; + homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; + license = licenses.gpl3Plus; + ## xcas is buildable on darwin but there are specific instructions I could + ## not test + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbd6a59088d..24d8aa5ddaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18435,6 +18435,9 @@ with pkgs; gfan = callPackage ../applications/science/math/gfan {}; + xcas = callPackage ../applications/science/math/giac { }; + giac = xcas.override { enableGui = false;}; + ginac = callPackage ../applications/science/math/ginac { }; glucose = callPackage ../applications/science/logic/glucose { }; From b5d11a76031bd1c2909abcc49e1a4b42c496a4c2 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 30 Sep 2017 11:15:53 +0000 Subject: [PATCH 0483/2806] aseprite: 1.2-beta12 -> 1.2.2 --- pkgs/applications/editors/aseprite/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 9a0d1bb5e72..39be7f53406 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "aseprite-${version}"; - version = if unfree then "1.2-beta12" else "1.1.7"; + version = if unfree then "1.2.2" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "1zgsr03d4vwdj2qyiwfwfqsbqngp85n13i3xwbkfkbja036c5yhc" + then "1ldi7zikl1g6rq3g9lkypx5wqzza5j0054j1r8bh7lyvb0szicig" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { libX11 libXext libXcursor libXxf86vm ] ++ lib.optionals unfree [ cmark ]; + postPatch = '' + sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-" + ''; + cmakeFlags = [ "-DENABLE_UPDATER=OFF" "-DUSE_SHARED_CURL=ON" From 8f4084004e24bdd056e4161b6c92407ba18affaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 7 Sep 2017 01:11:37 +0200 Subject: [PATCH 0484/2806] glusterfs: 3.10.2 -> 3.12.1 Changes: * The patch `glusterfs-fix-unsubstituted-autoconf-macros` was deleted because the issue was fixed upstream: https://bugzilla.redhat.com/show_bug.cgi?id=1450588 * The `glusterd-ganesha.c` part of `glusterfs-use-PATH-instead-of-hardcodes` was detleted because `glusterd-ganesha.c` was removed upstream without replacement that has the relevant hardcoded paths. Closes https://github.com/NixOS/nixpkgs/pull/29062 --- pkgs/tools/filesystems/glusterfs/default.nix | 5 +- ...10-glusterfind-var-data-under-prefix.patch | 16 +- ...fs-fix-unsubstituted-autoconf-macros.patch | 236 ------------------ ...sterfs-use-PATH-instead-of-hardcodes.patch | 23 -- 4 files changed, 10 insertions(+), 270 deletions(-) delete mode 100644 pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 0bdb7413f22..dc15866f3cd 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "3.10.2"; + version = "3.12.1"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "09hpvw42sc77nc3bfv7395wjn7fxvp0n8qnmrlyxq83hf0w81gfs"; + sha256 = "14l6p2zyjsrnjvf0lipq32p517zk813nqv06pjq6kcqkmy038wdv"; }; buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline @@ -71,7 +71,6 @@ rec { patches = [ ./glusterfs-use-PATH-instead-of-hardcodes.patch - ./glusterfs-fix-unsubstituted-autoconf-macros.patch ./glusterfs-python-remove-find_library.patch # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed ./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch index 8a3da0d6db7..f679fb8f4c1 100644 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch @@ -1,27 +1,27 @@ -From 965eb1e08e10ff82bb91d485dc24672acc7c72cf Mon Sep 17 00:00:00 2001 +From f523afac49e24ecc0fa4ad85195135689cf445f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= -Date: Fri, 8 Sep 2017 00:51:53 +0200 +Date: Wed, 27 Sep 2017 21:36:41 +0200 Subject: [PATCH] Fix "glusterfind saves var data under $prefix instead of localstatedir". Fixes #1489610 -Change-Id: I6d71297fb7a5a9d12cc3726b4a4ad94efcd644f9 +Change-Id: Id2362c20f34346c37acfb9eb1ad105d0b7b8b60f --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 0c3a38689..d508fda71 100644 +index f87d8a454..b4d3f5d10 100644 --- a/configure.ac +++ b/configure.ac -@@ -1057,7 +1057,7 @@ if test "x$prefix" = xNONE; then - prefix=$ac_default_prefix +@@ -1118,7 +1118,7 @@ if test "x$exec_prefix" = xNONE; then + exec_prefix="$(eval echo $prefix)" fi - GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs" + GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" -GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" +GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/var/lib/misc/glusterfsd" prefix=$old_prefix + exec_prefix=$old_exec_prefix - ### Dirty hacky stuff to make LOCALSTATEDIR work -- 2.12.0 diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch deleted file mode 100644 index de3c2fa9f62..00000000000 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch +++ /dev/null @@ -1,236 +0,0 @@ -From b37e0222a6a60505868a6fbb8591608cdc4bba57 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= -Date: Sat, 13 May 2017 15:33:27 +0200 -Subject: [PATCH] Revert "build/packaging: Debian and Ubuntu don't have - /usr/libexec". Fixes #1450588 - -This reverts commit 18509e436f8a728ef522f3e76e2f2dc30e1bd8ac. - -This fixes autoconf unsubstituted strings to appear in generated source code. ---- - cli/src/Makefile.am | 2 +- - configure.ac | 12 ++++++------ - events/src/Makefile.am | 8 ++++---- - extras/Makefile.am | 2 +- - geo-replication/src/Makefile.am | 8 ++++---- - geo-replication/syncdaemon/Makefile.am | 2 +- - tools/gfind_missing_files/Makefile.am | 4 ++-- - tools/glusterfind/Makefile.am | 4 ++-- - tools/glusterfind/src/Makefile.am | 2 +- - xlators/features/ganesha/src/Makefile.am | 2 +- - xlators/mgmt/glusterd/src/Makefile.am | 2 +- - 11 files changed, 24 insertions(+), 24 deletions(-) - -diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am -index 5ef9389..f5b8d00 100644 ---- a/cli/src/Makefile.am -+++ b/cli/src/Makefile.am -@@ -18,7 +18,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ - -I$(top_builddir)/rpc/xdr/src\ - -DDATADIR=\"$(localstatedir)\" \ - -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ -- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ -+ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\ - -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\ - $(XML_CPPFLAGS) - -diff --git a/configure.ac b/configure.ac -index c9742e2..0c3a386 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1056,24 +1056,24 @@ old_prefix=$prefix - if test "x$prefix" = xNONE; then - prefix=$ac_default_prefix - fi --GLUSTERFS_LIBEXECDIR="$libexecdir/glusterfs" --GLUSTERFSD_MISCDIR="$prefix/var/lib/misc/glusterfsd" -+GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs" -+GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" - prefix=$old_prefix - - ### Dirty hacky stuff to make LOCALSTATEDIR work - if test "x$prefix" = xNONE; then -- test $localstatedir = '$prefix/var' && localstatedir=$ac_default_prefix/var -+ test $localstatedir = '${prefix}/var' && localstatedir=$ac_default_prefix/var - localstatedir=/var -- LOCALSTATEDIR=$localstatedir -+ LOCALSTATEDIR=$(eval echo ${localstatedir}) - else -- LOCALSTATEDIR=$localstatedir -+ LOCALSTATEDIR=$(eval echo ${localstatedir}) - fi - - old_prefix=$prefix - if test "x$prefix" = xNONE; then - prefix=$ac_default_prefix - fi --GLUSTERD_VOLFILE="$sysconfdir/glusterfs/glusterd.vol" -+GLUSTERD_VOLFILE="$(eval echo ${sysconfdir})/glusterfs/glusterd.vol" - prefix=$old_prefix - - -diff --git a/events/src/Makefile.am b/events/src/Makefile.am -index 8493abd..87282c6 100644 ---- a/events/src/Makefile.am -+++ b/events/src/Makefile.am -@@ -5,7 +5,7 @@ EXTRA_DIST = glustereventsd.py __init__.py eventsapiconf.py.in \ - BUILT_SOURCES = eventtypes.py - CLEANFILES = eventtypes.py - --eventsdir = $(GLUSTERFS_LIBEXECDIR)/events -+eventsdir = $(libexecdir)/glusterfs/events - events_PYTHON = __init__.py gf_event.py eventsapiconf.py eventtypes.py \ - utils.py - -@@ -13,7 +13,7 @@ eventtypes.py: $(top_srcdir)/events/eventskeygen.py - $(PYTHON) $(top_srcdir)/events/eventskeygen.py PY_HEADER - - if BUILD_EVENTS --eventspeerscriptdir = $(GLUSTERFS_LIBEXECDIR) -+eventspeerscriptdir = $(libexecdir)/glusterfs - eventsconfdir = $(sysconfdir)/glusterfs - eventsconf_DATA = eventsconfig.json - -@@ -24,10 +24,10 @@ eventspeerscript_SCRIPTS = peer_eventsapi.py - install-exec-hook: - $(mkdir_p) $(DESTDIR)$(sbindir) - rm -f $(DESTDIR)$(sbindir)/glustereventsd -- ln -s $(GLUSTERFS_LIBEXECDIR)/events/glustereventsd.py \ -+ ln -s $(libexecdir)/glusterfs/events/glustereventsd.py \ - $(DESTDIR)$(sbindir)/glustereventsd - rm -f $(DESTDIR)$(sbindir)/gluster-eventsapi -- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_eventsapi.py \ -+ ln -s $(libexecdir)/glusterfs/peer_eventsapi.py \ - $(DESTDIR)$(sbindir)/gluster-eventsapi - - uninstall-hook: -diff --git a/extras/Makefile.am b/extras/Makefile.am -index 9dfc93d..53ac476 100644 ---- a/extras/Makefile.am -+++ b/extras/Makefile.am -@@ -1,4 +1,4 @@ --addonexecdir = $(GLUSTERFS_LIBEXECDIR) -+addonexecdir = $(libexecdir)/glusterfs - addonexec_SCRIPTS = peer_add_secret_pub - - EditorModedir = $(docdir) -diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am -index 9937a0b..87435d5 100644 ---- a/geo-replication/src/Makefile.am -+++ b/geo-replication/src/Makefile.am -@@ -1,4 +1,4 @@ --gsyncddir = $(GLUSTERFS_LIBEXECDIR) -+gsyncddir = $(libexecdir)/glusterfs - - gsyncd_SCRIPTS = gverify.sh peer_gsec_create \ - set_geo_rep_pem_keys.sh peer_mountbroker peer_mountbroker.py \ -@@ -21,7 +21,7 @@ noinst_HEADERS = procdiggy.h - - AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ - -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ -- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -DUSE_LIBGLUSTERFS \ -+ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" -DUSE_LIBGLUSTERFS \ - -DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\" - - AM_CFLAGS = -Wall $(GF_CFLAGS) -@@ -35,11 +35,11 @@ $(top_builddir)/libglusterfs/src/libglusterfs.la: - install-exec-hook: - $(mkdir_p) $(DESTDIR)$(sbindir) - rm -f $(DESTDIR)$(sbindir)/gluster-mountbroker -- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_mountbroker.py \ -+ ln -s $(libexecdir)/glusterfs/peer_mountbroker.py \ - $(DESTDIR)$(sbindir)/gluster-mountbroker - - rm -f $(DESTDIR)$(sbindir)/gluster-georep-sshkey -- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_georep-sshkey.py \ -+ ln -s $(libexecdir)/glusterfs/peer_georep-sshkey.py \ - $(DESTDIR)$(sbindir)/gluster-georep-sshkey - - -diff --git a/geo-replication/syncdaemon/Makefile.am b/geo-replication/syncdaemon/Makefile.am -index f80fb26..7cdaf45 100644 ---- a/geo-replication/syncdaemon/Makefile.am -+++ b/geo-replication/syncdaemon/Makefile.am -@@ -1,4 +1,4 @@ --syncdaemondir = $(GLUSTERFS_LIBEXECDIR)/python/syncdaemon -+syncdaemondir = $(libexecdir)/glusterfs/python/syncdaemon - - syncdaemon_PYTHON = gconf.py gsyncd.py __init__.py master.py README.md repce.py \ - resource.py configinterface.py syncdutils.py monitor.py libcxattr.py \ -diff --git a/tools/gfind_missing_files/Makefile.am b/tools/gfind_missing_files/Makefile.am -index f77f789..043c34c 100644 ---- a/tools/gfind_missing_files/Makefile.am -+++ b/tools/gfind_missing_files/Makefile.am -@@ -1,4 +1,4 @@ --gfindmissingfilesdir = $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files -+gfindmissingfilesdir = $(libexecdir)/glusterfs/gfind_missing_files - - gfindmissingfiles_SCRIPTS = gfind_missing_files.sh gfid_to_path.sh \ - gfid_to_path.py -@@ -21,6 +21,6 @@ uninstall-local: - - install-data-local: - rm -f $(DESTDIR)$(sbindir)/gfind_missing_files -- ln -s $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files -+ ln -s $(libexecdir)/glusterfs/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files - - CLEANFILES = -diff --git a/tools/glusterfind/Makefile.am b/tools/glusterfind/Makefile.am -index 92fa614..37f23be 100644 ---- a/tools/glusterfind/Makefile.am -+++ b/tools/glusterfind/Makefile.am -@@ -6,7 +6,7 @@ bin_SCRIPTS = glusterfind - - CLEANFILES = $(bin_SCRIPTS) - --deletehookscriptsdir = $(GLUSTERFS_LIBEXECDIR)/glusterfind/ -+deletehookscriptsdir = $(libexecdir)/glusterfs/glusterfind/ - deletehookscripts_SCRIPTS = S57glusterfind-delete-post.py - - uninstall-local: -@@ -16,5 +16,5 @@ install-data-local: - $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys - $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/ - rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post -- ln -s $(GLUSTERFS_LIBEXECDIR)/glusterfind/S57glusterfind-delete-post.py \ -+ ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \ - $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post -diff --git a/tools/glusterfind/src/Makefile.am b/tools/glusterfind/src/Makefile.am -index e4469c1..541ff94 100644 ---- a/tools/glusterfind/src/Makefile.am -+++ b/tools/glusterfind/src/Makefile.am -@@ -1,4 +1,4 @@ --glusterfinddir = $(GLUSTERFS_LIBEXECDIR)/glusterfind -+glusterfinddir = $(libexecdir)/glusterfs/glusterfind - - glusterfind_PYTHON = conf.py utils.py __init__.py \ - main.py libgfchangelog.py changelogdata.py -diff --git a/xlators/features/ganesha/src/Makefile.am b/xlators/features/ganesha/src/Makefile.am -index 78715d6..54cfcb3 100644 ---- a/xlators/features/ganesha/src/Makefile.am -+++ b/xlators/features/ganesha/src/Makefile.am -@@ -12,7 +12,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ - -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\ - -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ - -DGANESHA_DIR=\"$(sysconfdir)/ganesha\" \ -- -DGYSNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -+ -DGYSNCD_PREFIX=\"$(libexecdir)/glusterfs\" - - AM_CFLAGS = -Wall $(GF_CFLAGS) - -diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am -index 23ebf37..4f2fffd 100644 ---- a/xlators/mgmt/glusterd/src/Makefile.am -+++ b/xlators/mgmt/glusterd/src/Makefile.am -@@ -47,7 +47,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ - -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/rpc-lib/src \ - -I$(CONTRIBDIR)/mount -I$(CONTRIBDIR)/userspace-rcu \ - -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \ -- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" \ -+ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" \ - -DCONFDIR=\"$(localstatedir)/run/gluster/shared_storage/nfs-ganesha\" \ - -DGANESHA_PREFIX=\"$(libexecdir)/ganesha\" \ - -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(XML_CPPFLAGS) --- -2.7.4 - diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch index eb4bd5b7d56..acb15464e48 100644 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch @@ -41,29 +41,6 @@ index e9f80fe81..6380dd867 100644 progname, strerror (errno)); #endif /* GF_LINUX_HOST_OS */ exit (1); -diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c -index da1fee066..dcb9e5725 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c -+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c -@@ -122,15 +122,15 @@ manage_service (char *action) - int i = 0; - int ret = 0; - struct service_command sc_list[] = { -- { .binary = "/bin/systemctl", -+ { .binary = "systemctl", - .service = "nfs-ganesha", - .action = sc_systemctl_action - }, -- { .binary = "/sbin/invoke-rc.d", -+ { .binary = "invoke-rc.d", - .service = "nfs-ganesha", - .action = sc_service_action - }, -- { .binary = "/sbin/service", -+ { .binary = "service", - .service = "nfs-ganesha", - .action = sc_service_action - }, diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index 0e6629cf0..fcb4738b7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c From df812e348774a3d241eed4632fde80f7163c7a0e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 30 Sep 2017 14:38:39 +0200 Subject: [PATCH 0485/2806] global: a naoive complete evaluation will fail, make it fail faster Hopefully the message will make accidental full evaluations of NixPkgs (and their inevitable failures) easier to notice and debug. By suggestion from @grahamc (in his IRC gchristensen form) --- pkgs/top-level/all-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03a4a5fa53e..da57a8eda06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -55,6 +55,13 @@ with pkgs; stringsWithDeps = lib.stringsWithDeps; + ### Evaluating the entire NixPkgs naively will fail, make failure fast + AAAAAASomeThingsFailToEvaluate = throw '' + Please be informed that this pseudo-package is not the only part of + NixPkgs that fails to evaulate. You should not evaluate entire NixPkgs + without some special measures to handle failing packages, like those taken + by Hydra. + ''; ### Nixpkgs maintainer tools From cdd5176fe243f1a9ce14db2cf994dfb584116d96 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Sat, 30 Sep 2017 11:52:25 +0100 Subject: [PATCH 0486/2806] lua-iconv: init at 7 --- pkgs/top-level/lua-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 98192d2c3d7..00550df1099 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -215,6 +215,31 @@ let ''; }; + lua-iconv = buildLuaPackage rec { + name = "lua-iconv-${version}"; + version = "7"; + src = fetchFromGitHub { + owner = "ittner"; + repo = "lua-iconv"; + rev = "e8d34024a6b185a759733915f116cc5588550261"; + sha256 = "0rd76966qlxfp8ypkyrbif76nxnm1acclqwfs45wz3972jsk654i"; + }; + + preBuild = '' + makeFlagsArray=( + INSTALL_PATH="$out/lib/lua/${lua.luaversion}" + ); + ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; + description = "Lua bindings for POSIX iconv"; + maintainers = [ maintainers.richardipsum ]; + homepage = "https://ittner.github.io/lua-iconv/"; + }; + }; + luasec = buildLuaPackage rec { name = "sec-0.6"; src = fetchFromGitHub { From e479b5ea6fca0e44f010ef47d780674747c6a27d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 30 Sep 2017 10:05:39 -0400 Subject: [PATCH 0487/2806] linux-copperhead: 4.13.3.a -> 4.13.4.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 a2bf0564783..d0d5466ff0f 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.13.3"; + version = "4.13.4"; revision = "a"; - sha256 = "1w1waqrzji17f7zmnkr7afbd2yz0xqf6m3g8dz2bkd2kzv07vzx5"; + sha256 = "0l6xg06w0qicb64h8f6ldic947kn9a68wnad8pjwm89vy8vy4zqm"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 03bfcd5953ed1e0fe746b284da8c9e1faad8a508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 30 Sep 2017 11:08:24 -0300 Subject: [PATCH 0488/2806] deepin-gtk-theme: init at 17.10.4 --- pkgs/misc/themes/deepin/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/misc/themes/deepin/default.nix diff --git a/pkgs/misc/themes/deepin/default.nix b/pkgs/misc/themes/deepin/default.nix new file mode 100644 index 00000000000..d8a3ecaa411 --- /dev/null +++ b/pkgs/misc/themes/deepin/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "deepin-gtk-theme-${version}"; + version = "17.10.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-gtk-theme"; + rev = version; + sha256 = "1hb0y72fzmcj2yl6q7mbc0c7yxkd1qgnyw4vixdqxnxk2c82sxzw"; + }; + + buildInputs = [ gtk-engine-murrine ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "Deepin GTK Theme"; + homepage = https://github.com/linuxdeepin/deepin-gtk-theme; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03a4a5fa53e..8dffd9ae545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18074,6 +18074,8 @@ with pkgs; orion = callPackage ../misc/themes/orion {}; + deepin-gtk-theme = callPackage ../misc/themes/deepin { }; + albatross = callPackage ../misc/themes/albatross { }; gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; From 3763b48cb58ea38b314e583ad1edeaf05b8ac27d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 30 Sep 2017 17:23:58 +0100 Subject: [PATCH 0489/2806] firefox-devedition-bin: 56.0b5 -> 57.0b4 --- .../firefox-bin/devedition_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 2da11eac98d..2ce8dd8190e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,955 +1,955 @@ { - version = "56.0b5"; + version = "57.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ach/firefox-57.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "42b7889e0358946f0852079433eb84ac49b88eacd5baa1213082fff71a8bb2b060b50b6356c20cb2b59ebeaffc245f04ed086a4fe466886f5865c857f99b9ce4"; + sha512 = "89c24fdc8c2f6890239c9cf907a52ff18a20d46286aef8397ca0ea70ad3ef213286728e80c1bdc288f9f3f5ddde6177c0573f3e25e18cd88169bf4509ce1f647"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/af/firefox-57.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "c784881efa9b4ebb8e5a892a4d9fed02f85f541461e6fc8065d9a6a8db629636e00eaea7d1cb009005de829387a4c5614465e696ecba66af2516cfbff35f6d82"; + sha512 = "d262ac9e5f477afdcec1244d2e70684e308cf9783f94da76d2401a0dc24223d19f1ed7e9deb51dd682292213f1cbcf70439275387aab509205b5f618414d9563"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/an/firefox-57.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "8440277fcbf3b927ee5bddeb572d55ef2f23997016f8cd5b21e88d969cd863a3ed7076d9cacdec4939e58ec2bc706099a322336c2fd4b796435165d55f206112"; + sha512 = "bc8ba4a5732591680a8a7cfe6bf56f23fb40782ec439a1a8eadd822b11d6ffd830b82a67e4b99b60a607907597abeebb35ea838695f75c48fd6e3b9341d577ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ar/firefox-57.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "4cc24cf7ae84bdb9520ebd6816a46c6311ea92dc50c2fd8fdbb4eb2384bb45357b9dbef641ffd5be1ff4fcbbd23b2fbe53d68136717fdd3031564309cffbc2ff"; + sha512 = "23093e975a8401e306a876f47aa5c1afd93e1d17e5d9f915e967397f1c920456fc63fec2312aff23d076105cc4f567050317f3d48a1d32a016313a51df7e7f4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/as/firefox-57.0b4.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "2d0d1f5fbff86c7e0f53ed4c721e6b2e1bc8169aa5a2c75f4752347614da669b3d097e68e62b0b53373c408818ea01fc9716a7a0b1932f6ba7273d6f31fb99aa"; + sha512 = "8c179446514b3ff29e708064418c035c5a138776c8dfd957562302e192829994813ebf27fb491e0cd204399dc1ccc04f6eb5598c87dcca53e507db7656557f8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ast/firefox-57.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "fc7f099bb283540974eff2dfbec5fb212b3a27aa09be8d04ff847d99fa37183435f296cae389fe4161c436d3005935acbdbe00373c54cc5d18b140f26c3d829b"; + sha512 = "4a2bb2543e66936dbe1bb5d80c3478ebeb00eb11fb8a83c8aab18440b93e4cb59c24fb7b14687f940d19cff4c9a36e255766ae712c224a02635e41e5e2e84a18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/az/firefox-57.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "557ddac93830536ace4fba1ab634e1eee14fa3c09c3dd95a16c169437f8c255d5eee4ee54791d8fa1f97123b9ebbf91a57cb70cb4fdb61b8805c2252f1640329"; + sha512 = "cb2cfa9956725d58eacb6b5d9317cb050ef959cd92b64fe2de5c3390855e0976d5a79805c134f36d80bad1c2aa71204bc04163c0a1bebf6977a96449f603d0fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/be/firefox-57.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "420b8d556a0b6364e48eb04eab3e29a63c63f52942384c0d9ae19532754b51c98bb0b8d19c871c92d8d9127cd289dd0a74c30e7167d86e32d378a7820bcee184"; + sha512 = "33555541b57d1e056bd2706834ca47f9b93ca70a1a81535189a49e50633f164372ffa5b36a0d47607edadc93b0e1b502ccec22aa6956764e0461cd5ffad133de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bg/firefox-57.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b63385545d6d006e0febe92a835ad4b809a24bcc9c44d356bdfb2338819e6430d0c73922a45fcbd6fc076362794daf7a68a9662aecab6e610a518ac604757910"; + sha512 = "6a829c951817812dc021f76267dfe86c2e1ab81640f1538754b894ce8ffa4d0bafbe19cab81bb96d1b3177ee2c65312f7ec70fc68effe06f9a5a79884b69a951"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bn-BD/firefox-57.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "3d4754940f51a21bc3e881bc454349ed9bd6cec84395566d76d1dccd8c8464cb8e485f35d1e920c7ec0ec93304c16d3d323a94a00f3ffffaf5fdbce46da24da4"; + sha512 = "f1e96e42d57ecde22ebf14534a96b7253dee92cfae55fa6d9c5570060abb9f25a871ff73357f84f1b015d31b792b77568d5aee434f74576ddf15f9e62110fb74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bn-IN/firefox-57.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "fe16eb336eaadca6c73ef1655011ec8acfa3d4166f21909ffba109fd90190810b66ef3519d172b0f963f41776616ab41b25dceb8f9a6b775c8df5f305f6f1555"; + sha512 = "ade99a45c062478797b570e5887e8702544f6bf47cee57df6b6493d05c099fa274c335ed84723df8a699aed58996bef3379ea76b7d6290212cd5a532c2158c35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/br/firefox-57.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "17b0a958074d4db010410fc2278a8a2a4777fa68c8796b28f70d0b65ffc341de283ea6b89410c5228482cb920ca21031784d4e7a3afc01c8ed0b0412bbca8cfa"; + sha512 = "cd7cfec9f80673147b07118e71608f3486b8f53b3d9b0fdf4052c9afd2d93e6dbe87f6d10d68a658e7d958a832961d47aa663d2d08e1e2c217f5dacc446f9221"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bs/firefox-57.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "536f92ea3b7b390414bbc9178d855fb3783d5659ff165d6846b5233dc9e46fd46323783342f939b8daa2489be4df7f3f33859f629437693dcfd3fdd982192905"; + sha512 = "01bd5f3a28f24441f41f06becd22e4f5c409b2c7f4eaa19685ce49606e26f598874268adf7a579aafdd17159ec4ede03cedaba37a3168bdd19162f10af7ccbfd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ca/firefox-57.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "f7b36fcba699aef0438192bbcc13cb6426b69036f1256c07422e78df45220960dd122f9eaf62984041c142f2fc16f858561d9efaa509852696d0c869f097df8c"; + sha512 = "dffb22850e7ec4b98484de8c1e92faf62dfad8c8a221ac96d393e11e53c2bdc638fc1d3d1bff2987e483f6a7784eb812d9a1aed79278b1c371bca27d23904551"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/cak/firefox-57.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "6c4abfb4873d08ff30ed48612e536106522dd39921da4e3303d752f468e64552a77a65631474e2e2342d1f6dc4ed94ba74b2c6c0bd15dc559468195c2ff3e95d"; + sha512 = "52906187bc01333ff67bc6ce4f493412ed77bf85b6bb18d06520acac5fed6790db9fe23c2c4bbc751706a6232e42ca62a566523ef4d074410b96a54651023315"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/cs/firefox-57.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "be8c3a83f0d74f7860603ba0665cac831d787eacc427f8bd42ea118409ae9f1866a75ce06a4bf88c732847e9df5cdaef33ccd25d9dcfb5b6795af2bb5f83c971"; + sha512 = "749d3d5781f266324aaa8c7d3bab777ac23518fc69bd3f1e1f4b3dbeb28cab17372327ca5622aad3841a56c52458c7cb4cff1d43b4fcc47a0e071f4c83f07fbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/cy/firefox-57.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a5473c8f20f36d755ec01feaaf62281f199041b1bc938c7477bc4205c488265457fba6d204f7dddcc67f37e1c92ae2bd312a8406a3aea0a34e50ed3dda364a20"; + sha512 = "ed5cdd72190aaa2a7cb762bf5ed3c5e1fa7f6b2e0b168810b4f229421965520ad796ed27ca6c0c4e221d63c43c8034ee1bdecf46caa913d48c6e5eec1c132613"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/da/firefox-57.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "0408c697dc971b6eb5225a3038a79c18fad96a75ed87e3f061665d00baf27c05e060835b3b77393bd50247c1a13ffc2314805460bf5d5f881ad0a48ceeb090fc"; + sha512 = "84194c9496c0f74a4880a4d1d18c9c1c9b82a684cc9b1316d8f31980e8bed40125b68eea826063a6c12e04f7d55128fd34a954dfaaa37182f56eeb485867c3e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/de/firefox-57.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "1c93a760f4847163841dded76414669bc94aafddcd4b1b366f72db92e10575dbd52612ff5c906449dff510ae108f13cf39e6e836071c1d4b173dd211a98bc874"; + sha512 = "57e129dac6eea631934e1c0be296fa8cbb54dfef73d5a2233655a5a08589dfdb4794eaff22515f000f6fdfa761b9c24e6d72dbdd406153047eaccc57328cea42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/dsb/firefox-57.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "622bd1d9399e6be83c1d03a8a99b31ae1561c45a2bd1a62677c0298408125cb54df7e76df7b26ab741590ac7dfde9e0df0c3b8e202e0267ef775705b73fd4299"; + sha512 = "b3c00e1aef9f55d75a93d7c5c48b6e02bad615c893394055d82a1aefab32e1a5edd82d48f8e0c0c9b550c390b543ffd91a5ef104ab39562025c3fb3992ba1802"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/el/firefox-57.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c716d48bf2ba9eb8e2ba6d15d96a0378478937594376da77699e4239ca7b410d8088b97eb7a2076f05611348b6376c5fd1219166ab81d84022f958b1febae751"; + sha512 = "1031ec1f99f03fbb52da4dcf7022bd056fb4a59e15211eb90465cb7a38b42733621bccabbef26d582e9c9fbef20b5d8df4d2c1b96892653220abb02a2e026758"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/en-GB/firefox-57.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "b19aa13d69cbbc5d63e4e6f819d6ad888a686a07a6b62b8ee2c745fc8fb4d7340dfbd3fc31b2a7e4f23be1e187a15455e0a5a3a9065b759e574f7c9c756917dc"; + sha512 = "92ddb6e3253d09be9869bf43f46cc438a179a8548011c28f034100aacd4c7c713b3235beca9aca6c8cd3374fe30924b47706f848f9db4ff48faa1b40b83f96b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/en-US/firefox-57.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "613dc9d25997f80927b6b7b850fdf9b4287497bff2446a490274faf99a4fabd2b2b6140bce560f8edb5dc1f3da09a9a855547afcbace3ffcf2172befca74a0e6"; + sha512 = "039bbed397137d411448f4090ee7df8b32e119e844547d209105e3d30782c68ef4fc6ebff5d4747efb897dddf3d07d21201d42a6084821ccc82b98b3d6588cf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/en-ZA/firefox-57.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "c0f5506e770d57bd5f5bbe84c89126e835833c059dd064b2b4af3aa31514d0223cd3b3bbc23fd99828c9dd07bbe63eab89415667ba1b269a2db2c90d165f492c"; + sha512 = "3cddea06dbfd115013f3c29d7dbbab73fbb4546b6aa16db708c88dd1a042e885e262e1eafcce76091b881cf74a4e55479d0362acc8b0fcb06fdbbee3ff4c2b97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/eo/firefox-57.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ff63cea657e4e78caf74a0382624accc1f4f4870af36a8b425df305e71a84d605bc2fe2c91636130053092518763fb2ad0eb2e2c73ff443b1c05fe0c31f892c5"; + sha512 = "0ba19868f136b4a621df3990a784993f78ccdff291ba61aff85e1db692d090e9e5bf1721cf71dd61714d8ebb78c8b6f9bf1ea423075a69ae21415bae93f4b7e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-AR/firefox-57.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "00c89d9dce0deffb2fa536172e040f4f75f170c8427aa3bffd5c1bc526af45b439c28e1973db1a3ce459e5fdee40a0c817b5580b9cfc68f85259cc27feea6b09"; + sha512 = "d4bfe8cc057abfe1ad51ce4e2aa76bfab5db4fe9fc256d7d4fe6810f434ec7c5068f9c9f07dba7b358978d733176c3eff7986a96856b0bc662a92a73727d1578"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-CL/firefox-57.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "6aa8d504e2aaf86dbae7f637921e8e354f63e98f59be261f80256544cc5568c6f8c616fc72948bdc1d30cff62dd36513c838fae9207a8b7eadd7b20e5fa017aa"; + sha512 = "7a17c0314dab8e29163a18d7e14d5963d908b8b290d5f8fc3f34c4b2b4eecb036d5f41d9f2d1ac4334c4a9c082831ecf01f8d0540573caf4c611b2da3658f4ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-ES/firefox-57.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ac3494d7704c2962cd4c00d5fce1fa9581f0565dd5f6dd90eec1638237956f8204dc68b590ce75e5ce6961d786a7e722d5ad0dccf036bfd51ffac530a8f56519"; + sha512 = "27c859d93a32cbc1501243b975eccbcef0e7b0b41d3149ed941197e61b1d48d85247a8c5bd22e3cfa445d42ca2f8d44e7b95ddc165e703d3afaf41a499b158ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-MX/firefox-57.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "6fdbb08c25feec44b38e6b4beafde422fc04bfc1c54e049a1b863c8fa4954a2b1ebfa5a4d26c507e83b446d2b836d922f4c6cbb71f77cf616c7088470e73bcc8"; + sha512 = "6f570232aaaa41332f69b7df59ec3822870e53e8f8c012dddefb36bcd2c6252677e63d8be837d0f6007a72ced19b88b5e9b1f837a72a97ba271e086e1f7c43b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/et/firefox-57.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "317b05efdf3e14b907d7240d8102a2a826d2906a52bf83ecbef8f184d813af7b764521b2c884e70e29f50c23074b41d4887dfbab9b6fcbdb54c022cf2d16ccff"; + sha512 = "7c5b92e5801824f3e3174dc5d9bd4604689520d7c466658d0c987eb0351bb0c24ae4fbed019aa71e57309d2458cee38bfa4aaf6a6f122e8ae73493c44f177156"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/eu/firefox-57.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "7a81f3320c8adb613f80074a95cc877589eeb8b5ea47408fe526641059ac3c70c8b6a381db2f8b1c575acd2aaa857499277ee6a0b0e294038c4d29800bbd469b"; + sha512 = "9717f966ef2d75666258ea45c100645c2a078b4ca2ce0e9090058b65e4eb605f1715ef834251032bec627ee66e63ff11c85af6e7cdb97ee74285a0853bcf6d85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fa/firefox-57.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "86a5c82dab2766fa00991409fe28f81ec0d2ed0ac67b9854c5a78e55677e58b223edc13a4e122397eecc34b46bd5dac80d3e61d3f35eaf1a49ca544193de3a52"; + sha512 = "44e20e83215619ff639ec12c5e60d5435d617438a7934d7e6d5cc6e865c3b6caba184fa8a786576c127eead4d87cc37cb6ba9cae72d59ee822d746d5790d2381"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ff/firefox-57.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "349863d7a8a3b2637296422fa750f72fc14df88c944c06f8ad1e8dbb3215a7d5106a331691712127a5229a48eebb090c750b9fece25da5c34261e9ee64c2eec0"; + sha512 = "c2fc1b3b865652b90c8ac44322369b2278cbf4d95531111d4bc29735878660d8c4bdc58d8a2217454ec3880222a3d695b874d06173536217a5391314f087dcf6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fi/firefox-57.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "83687fd94ef6ce5def8dc427b08e50b1c0a41f97b81c6d7ffb83863aecd3f97f3c3f6301a4d5f5c1ea8833d72e41d67955bd4664502e6cf75b4b327e98fe0552"; + sha512 = "8253a890bb6db0eb278d828c51cbeae4331c55b2b4e36ce089249567ae74570008feb72929534750bc47b8ccacd64802e63faf00c354622a548a5fd1377b49e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fr/firefox-57.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2527eb06212a1e1063f91fc59af54ec427ef1d23ca9d1f1f4232be964679ad33bcfbf7acda4e3c3ced32f584761f7f506c2744552877fe3db35a36387d995263"; + sha512 = "df0483afb1bc2b2981290fe6a0789ad153ca529700b86a7f995303b22331b5faf17ca3bcc916f2bfe5efadf66d0b08d315c6c8cfea0073e1a31e35769cd00761"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fy-NL/firefox-57.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "7a64a19cd37c1059fd338790d8aed3b9d0f9319ff8075567b98f721a2c3f2cac9dd09f5a678bd8f4792580bef2558a858bfc6ce33afb8bbd8c40afc3f85cceb8"; + sha512 = "38ea18ffd76eb89f317696c9bdd2bdf3061579b277680d86a85f655f915c75d9b0452bd320f8818a890e1b6332c22eca98c5c0fa2180d25586ccb278019df67b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ga-IE/firefox-57.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8b29fe1838e333ac3704994865bf61b11b99b8f91b46fffea30047232b8bee3589f4f27ca392a64abcdb902042ddb4cd0860dba97577a062f21f4cd994d63366"; + sha512 = "86c90f9f4dacd8111337341dfce981edf919c176c9ce08747619380de2ee1ed1ebd8b1f15d18e7d96f7db3b89fec6012421dd8d6c4f84707ddf98d30bd019db6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gd/firefox-57.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "979009a44710a0206a035bd752b2c61f2178a354a692b327028cd5896a18ae4357955303dbea9326393bd993e9b088fd587d82917fc89c93a45275bdce3f3079"; + sha512 = "eafb289aa4e7f6979a9578794c6f119eff119ed606b576ef732a2f6838455b0358f4c7acc6103ffee35a0dd5cda6e5438ae83b73dfc9ba0d65dba95e38e274d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gl/firefox-57.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "8a6826171d549fc69cd63e6916e9c4abe10c76d0f1c149e6282c48e6f6895726d41714e8c83b4a5128bd9790bb45f186bc4dfee03f06e22d18be859cf31cad66"; + sha512 = "bc52599558f41f399ce45449ecfff16f8a053f56808c85714a8c9e58187e440411a80b8047e46ee4cbf364e4e32eab16a13e31276b1d6d4380f3da5ebaee6fc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gn/firefox-57.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "8009c5297c726346ab7c24bb88ad4a7a4466dd19f01a526e1786887115600b06b37a2b80449ac1ae207f2f4c07b6a2343f349a7c314c7b7d1e934769bde47a9a"; + sha512 = "c4e521fa548e7fa0e5210f419fe5d76d357eff83e64b2755a708a3126d2404e31e929858eb216ef7891dc39870e8599f9f18b2743678f392275f589f90af8cd4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gu-IN/firefox-57.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "329ed99e9553ccf99f5cc0d1f69c1c1aa931ad12720c2d3f340e2e139d35f142d97fe8ca43f1ea80b2d366379d46f8ca0ccc2e774ba9f9f1ee1b67599e794627"; + sha512 = "5981274b6889b5e21ecd80a37f14b1c41ea217a7fe59d68e8d545fd6ab0aa8b3af0b3caf242f9aac9cc67eeae4f6b989050a17f180ec5594558fdf10cab21825"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/he/firefox-57.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "f2623131ed9451d74ade849c33bb04b38ba3d555e06ee45a5b82ca4f6eefe55a4797e5d53231916bbe3589ac277387a103aa9675a32ca372af53b4778cb44133"; + sha512 = "7f321af8d6c3dabd58afdfdb30f2f8bc77b8bd6c1824016464d1713e570d90ddc3e07c77b46972aff603ce804e0181090ba0a2993a838cf82244bcace82734ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hi-IN/firefox-57.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "33f35fbf42679b48911ab20189d470daae6c31f767fb0359ce674ddd72150013dbeadc9a3a73a116a4d39b725cc54622b3fd19e84e5b388edbe2efb9231e53af"; + sha512 = "79764ad66fb22cd375b121ccc2f5ef4673a9a589fb2c4a1f58185b80f84d1dfa33e960475faebbcdecef95d7aed16bd6cc9f064a48e0db81d1732d31ee7e6aea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hr/firefox-57.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "4ef717da1b5ada94ab5d41d529605de22270f5d9f037b7bf3f19703cde55b6757fe396c087692faa0fbc500a60a4a6562f8fbb9c36e3deb859601c967c68f112"; + sha512 = "77dd03a3c6328c38e022cee9e101ab8114dc8632067737c937313cd45e9fb669ac7bc88d5dde2733a0461c7e4bdf8dba65524cee4e5ba3cfec704e3b205406ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hsb/firefox-57.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "2bdb5e05436c24c0c4b856f2d2feffc32165240b2b7943ea5a7c93f46b1068eb21bdeac2605ab35d40ce596c9aaabd8809523a3cf768615eb6c03d9661ab815d"; + sha512 = "0b916b5b97acba7674e1fd6dca9c437cb5feb352cd6e98f31fd9f9e24b532d5309b9dba2e2936b2c2775488f0e0262f849ac08d4878d6a8329115e781f46ce4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hu/firefox-57.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "81cdebd0af73a7b8983e2de296f12244a6b0a92be865d0fbe089d74af127663cc3003e822bf525316bb14664ccfa3412b7424069d1b7abd17ce1e54cd5f66c7a"; + sha512 = "48564c044d224ab4a02d0b33479a824b1e3d801a0d9e310b1ef2b8d2fe27dc392553af688b213be013c2b12bf22bec6cd69482682c9290dfb301187d0af03db8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hy-AM/firefox-57.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "f4f0e9009478904018eed8fcb6da30fa5607b5b00ee7521aa290dd13ae52e616e5903ea22e6e40f87340e3740b3d415b53bfd415ad288d601ced9318585667f9"; + sha512 = "93b53ce5a08bfc9bcb7e9c59ae9a50891778625e6b716d317097ab2af5cc972df270e205b37b41801eb315f2a73d469b5922a753e838e7fff4e6cc827ce682c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/id/firefox-57.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "75da4e9be3ecce3227a3a914d9e5da90de8d4abcf49a4eb1c119d842a97a6cb789b703d3199ede4ca03502fc9e0a940c1829c85eea6adb7fbb4456d71838c39f"; + sha512 = "dba243ba98ee8674bb9a252e88c6970efbe68e27ab363eea8d69769925139d2f71dc34816ae6738992b5bb07b715d6ad82be19fe7db886b366558051e7b25cdb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/is/firefox-57.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "6a3d0d38f257571c865295a6b3542c1bdb8de2344c5402b8f46a85adfeb367444fd1c693611f7b0fe7160a7552086d0d2b0247fa7757d19df1eb8375f2655b06"; + sha512 = "9f997a155617259f13117e5be74c286e66ef8c0440869ccb6e2c531185a26c6c64c6c4c4d6a0adb49a589d85ac3a7e90ed1df602dcee594e6a84f1c9f245ed40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/it/firefox-57.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "650239200182d14069faf4557ccd02f155af0c954e1aee11909c648067421fc27f8334fb038a60eb9c0fc661edc0bd43e7a87ce345a4580bbfde798c5ed301cd"; + sha512 = "185fa90e5dc1a755e2bc109b8867433b8dceb4caa00451d4358f694b6e3be4778cc1fde187e092a0bb37051eb65f0b8209dad709d87233c604d53124650e94ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ja/firefox-57.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "da783d020fec47024e27049a163c415ad050e65d0194324bcbd1faf9005b03fe02c2e1349855c8e00301a13a5507ce3bfce58506f375a4276fb912dece622229"; + sha512 = "a3ea11ce5fac0039b08b14f7b83ca00265c6f26e0504b5a0d74d234f9c214e44394253165a01e82fce416a998034b2bc121cf79e9cf28d7795dc2cd9ab48b0af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ka/firefox-57.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4934648edf61441922dae1703ea70b5c670e798955891961432709ec04feb46280ee8cd924f37ebe4244f069d3d3f9d6dea71d09100fe7e11652e30a9c16508f"; + sha512 = "aa1eb7803bb9aa61629ed349100e5912311802eb0e1b55ca4691e3411ba2dd5b583a6b6b7a027de26ed9753d1498086c0ff2c7f831a21cf0d7f0e8f8a5a9557e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/kab/firefox-57.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "82f28e1309b49921e735f0bc3818664c912877ff6608161f7ce86ee821857e321cbea7db52b8e640fe989d5b52c2b5069506b0af68e6fb89660b79e7c5cda95e"; + sha512 = "a9f6086b6d0eb2c5e9d7d78821f1d1ff6f8139c63d31828bfb42a0946011235f4748688cdd1142428439d34d106dd746cf34fc393aeab8ac34e84ce0516b427c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/kk/firefox-57.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "befd1cda746b5c795584e066883835d16cdbfbac14e5e919140fb0ff2d695f0f793f7f27fcb60f2d98ba9c9df0f2c3323b72decc6aab8b40e64d7fc2a9b01314"; + sha512 = "d0a7a3c4e9f71f3c9741f2f3ef68effec78551559a7c836d6b87c6dd52aab5f2b49db07f7528cb4e7de53b3d505bf82cb961cdaf517ed14cb322fb09e20fbea8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/km/firefox-57.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c302d0da1baeb0c96e134c40b97c1fc095223c45916496074857a39a16f8505c929a6eb2d73cfd679b99298b305c061734426177d5c7f72e616c3cc792179e67"; + sha512 = "c9086ca7ffb62ddeda314a5bc48819391cafb891b8e674383199893741ed9bbf03ae283e2c9b3d391c6184be4a2ec779517ccbd000926d964513f6aaa9db02e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/kn/firefox-57.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "0318de8cfa51d459cf852a073d064fd3a129c081897a35bc2e1e456bf5149b305a80f2a01389f271c844db786c4ce00feea6b011ab3c7fe0f5102b73a65bfb8f"; + sha512 = "c530a3dcbf4f75239ef7c7b63736b9cdb2f2014c284e8d920552cc7ee4bc0dbb623f84c98d24dd169a5ed3683c816fdeb151c7d383f800682b5ff5e55af90ade"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ko/firefox-57.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "747fcd8849372aec24c6a0c25a9e8df28d1afd6255f60be64d050204fd72bfed385f11dc3ca6d721bfe05b13d13b0b0b45343c75a7bba5950042d5984ffbb831"; + sha512 = "d57ec107d152b081bf112e7576d3b205f50f802b26b9723b8906dea4c5222a5c84a81185a64332ea1552e6db30bf5a1b4e5826ccd490e4eca79892ad879068c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/lij/firefox-57.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "102a20ffef4e3720f0cec2ec9d5803a8f5abbd66c99195729929225acbe292f92f4e505119f1207a5d0d1b0a148b3b484bb22174acfd6d6d79b464ad3c61be70"; + sha512 = "8bf173b76a2a63ff7201ee31a7738f928ac9809fc27c650d16c755808f7c3c00d60abb2733b40da993a6b3a02908c788ebd73b99ba4ae68c626101060e2dc311"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/lt/firefox-57.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "23e3efe3f8fd80907e685090f82305cac2be37c7f8a38c840b392d3f5eb7ba3a607bbb35c4a6c6191c401c6247d1f8c4ba2b32cc857c848aa8d4d380e41c6808"; + sha512 = "07306c0631bb5bcdc188b68c458c85cc02caef0544014acd1238a06bd5efb92e78fd6c3de7e15ec38b186861277160f65673fba3f7f7ea0a825f7e13cc514b21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/lv/firefox-57.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9b784af41d5be080cefeeaeb4519bf0f25a9c201853fe078cd91e6074c678cad8ba69c1bf2c1dd018f41dc6c645dd3b7bafebd402a04f2fda93a05a0019b1d94"; + sha512 = "d11cadcaaaffc61d62f4dbee9991c0a4f11fcf7ac279223d33bbc2ddfca0243bbbe136e5e19736f206dca5b4da2b71e31700f2b1dc9b15339163c68ea3ea128b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/mai/firefox-57.0b4.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "d61f3668ba4c7187b00fdef5a3bc46601c90a148be468ce021a42b3218f9a30bd8f4780e80fedd98d7e1133ea0e899ef02dcf2d715688a6e384aa7db542337bc"; + sha512 = "f29cad32380d7c11627a8f839c882feb8a9af9d6bac0a0270b3a660f7d216474dd4a54b9a06a6f84c8b94b0d01fccbb8e2cd298a66e3a1af1af5abefe9afaff4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/mk/firefox-57.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "79d34cc870eb41c5d709d52b16b448b7e2d6f35877957e2173cdaa6f66dc889fa489258cf7b0bed1e7e87b187199eba799396e65bdcfcbf1d0ec0b258b2665f5"; + sha512 = "47835be1baaff9a1943d5171e6a6c9d44279760348af1ff172fbf8c3ba27d50236883acc92a69a8df0764064f186a401895fd38ff0f73b6b19dfbc5fed85b14f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ml/firefox-57.0b4.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "9fcf038b2f891d62ed7b26fec3bcdbecbcf530756f38887c4f1a71c58cb2fc82af9320b03cfbdb5762c80eae7620fa0116f32d22fca5186e7a1b2738ad0d71d8"; + sha512 = "864d4cf9f2bcb40d2c178620e621df1450750bd305eb0386e7471c57396f5453607664c177790ef2177042a269c034e5f2a3c0789a761d83152bf8d1b9407846"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/mr/firefox-57.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "cfa9eef24205cec3d1b4a6ce58f4814d33d9806ae885702d3c0ea96994126ad9d79caa7551780f3581db0de7802f7e4cc666fd9d5bd55dc7da64fe4d5dbadc2a"; + sha512 = "040bfd4ac501aae9bc8e05cc58563eb8804590c286fab7e30614de0df0aad6f7f09ad87e5b808fb5211fc97bb64eb9046e6f3daec96a38e952bd83011d09b17f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ms/firefox-57.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "0be1321aa5aba417b5ef27c1b6ddbbf10d915cfb3ebc6f70a7473f31284a4f6ecd7ad61ef27156fa8b6008598b0aae3b3b272ae4f0db2ff477083e037616efd3"; + sha512 = "ef093c216bb6d7c7a9b6bc200739d678ad042f19bb98ae734fab9f7592405b80c1a8111ad76722615850781f97355a5788a089bef4d088bc76ad592212aeac95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/my/firefox-57.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "ea25f3df7053cb85b3cef5b3428c1e023e6631c7fb836421e5afb9794913057feac1083e08385ec595c7fe9ab578aa5c8728dff9f338f4d1aff09697c0985c60"; + sha512 = "a1e6a303c084df5bfc74e7951de8bd59ea3ab58e25fa880afe7cb12be6399bd6f65db0f517e0656b165ed3083354943dc751d7f77e4dbe4abfea329553b4e28d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/nb-NO/firefox-57.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "6eb487bff2f942fc7c319551eb2558973235cf05cb47e5a8b7273c0cd2d9162ae96345aa3dcd38710d4169f84fbb5ff28aa16277d98a4aa0864c9608f98b8f89"; + sha512 = "848b504eadb4db1597a5722a42cc163af2fde27796644d4a3595883d7d5a86d19ca341b651a2825d8cac442a14688c3e1bf6b9da947f747ed20f9e9f269fdb41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/nl/firefox-57.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "20587b5fa98ac42adc9b83c704c5c9eda0bd2b0c40475b71d11f289c14c5df3e7811c4b4661d82baa99436ef143dd8185d2fc30bfdb8eb4c64ff72c5986c3df5"; + sha512 = "26c55fc46b96087acb71a7750cf6105afc07050f3779c53618d537e7dd009863add11d6ed8ca021f5a56eb3d3ba08a2928228f2b5b72e2d49af76e00c465e40a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/nn-NO/firefox-57.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c231055deea74c29c30a79be5e592cc5ce21aacbc3bb53d8d7a35ff5f6ddf7624e6d4f3257c7fc2c99bcd2f22359c38ce10508f31b786bed90c9f68c3e916c6b"; + sha512 = "28fd2fd88780cbcc8ae4a0d6a6958ce0b90ee33338061d6626419be50753f69816d9eab758279566472fccdb7ca5abc8ff257e32e93c3d7cbdd37c4f2f5f14c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/or/firefox-57.0b4.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "092bcdfcb26c272dfdcea1a8b05745fec1d6d41c6b8ed930f44d7bbd83cb190857ec58e084ab602ee2499ef73743a4a6582e1f53b59151285978a9a1e64f2d35"; + sha512 = "cbdf442439fb2c6c2c673cfc7def6262961bee951cd07259a4a39ff453dfc2323dd7653208bb1fa6e72c768935079e71d11afc22779f9eacd529feb6e03ce125"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pa-IN/firefox-57.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "31d2ba332a534e7d8763a7413bdd24643313712635d050183aee8524612a9f122a5acbf89c674d69dc609897942f3613c9cf8fac7b92e1c22863cb54fbc0aa70"; + sha512 = "5df8c198c9a9e2a3acc8bcf19587b0ac40adad2cdda6a2b4ba040eb1e7e7274ab9753a28d07059b1d3d30c6b9f2efd35419bac560b856dd8afe45aecd1650ec2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pl/firefox-57.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "4180fc65b77aed5c93d6622da562e9fe7a6bc7af70747795bb37427e822c1e007b1be6fb3d50a12fc3f90e459d2e687403cb3f2df7320d6381795149977f6a1f"; + sha512 = "9406068dabf1382437a42db3da95e16909c768841294b5582091222bc3c81c62775c27865bbf8e0966edf0dad915693fc7b8250aec9a5f1218966564149c18ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pt-BR/firefox-57.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "2d2defaee8947f5177603f60e21499aa4f192ac8a6ae53060d51bcc418654cb95cb20fdfebc052fdcfb397109b868a35c6ba8419886a499736e5655784607693"; + sha512 = "d4eb83f228582cb2bafdce1427940fe86b3f2de3d66be9df269ac7211f203b19d09ac93be085420883ef89b196ba560627f929a5ad898ddac59a6260fc97dc5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pt-PT/firefox-57.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "05da355fd644ced4c3aaf54e2f6f1a11f07d2952edf9511c60fb699e4bf5ba195044387d2687b4fa3a5b5413dda3d91acd6ffb28ba6e2b7210ed00ae5bcd2eac"; + sha512 = "acb5a7f161fe869084e1ac75c6939b3f9d6ed60512aeb4677646d6dec08b6875092ae7ae403bbcb928fe7377d0c2a94b1cbe701e02dbddbd895bbe44aff5db31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/rm/firefox-57.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "dd2bd357d4652008b5f07d318b32383d8d30c6324482aa7fb52c3e821d4b3ac162ec26e5f521f661416356b87d013ed50da9612eb43b5fc3b95e37cdc25fdfa8"; + sha512 = "ff2b2d89336b08eee804ac057cddb5e0891328cb1ef9809357de670fb2d0bee84106f2030afe78972a4343de5f1cecba8e3db1cd7ace38a96a41527b410abdc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ro/firefox-57.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "ef8cf533b848e7e6bd0859506b964632ab9497bb70755f957c5ab61d64c87ecba173cb871e35b35e090682d34b424ee90514062a429deac68bfaafe561195b51"; + sha512 = "610685ebc89753f4f23b46f84a916c7ecc2e541eaddc41161d34ba04d30a9d896a090f3bf1a1ea192b7c2bee59c3acd552af62ef46e6d79db135cb2cd23bb073"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ru/firefox-57.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ee6a95e2a69980170adaf7c60dd23764deeb86f171142985733e967f8ad7e842a58ebddad5e828ab308872f40955a3e53bba1f818b38b075f531289fdbea795c"; + sha512 = "46b57a8e73f14ac0ab75c578f948765b672e0f1aaa8c26b299864bf675f636e5e41b0cd62bcc56d67adccef2bced28da29bc3d45d5d78bfe1edbb91ed10bdaec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/si/firefox-57.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "fa4287dc50567a52441f583eb0e12c4de4064a51b12e80c195f1a583dcbcae51f4b8b45804080c2437999123581f24a490df25cb27aa563e47ae05a135a21748"; + sha512 = "1e07f52ad4ced6963287f873eadbbabf901bfa55910dbf768e32d2887786471ac34322ba12529182e9258d1565b07746393f4b472d4e67f031d59ff40c699143"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sk/firefox-57.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d4110c9bc7eed9f037145afb5399a88565e0d94430ac56cc8ba8aa3640ceaecef0fb31cae7add7e893b6f223dffee62578f5243cba944cb157328a6d69768b9c"; + sha512 = "45af02b4c15440f7d036e3f76c3335629041235511bc6b10eff4d1c1e65e98db3d94ab76724145a45bafc7662fe74efce0b2f192d17bfaccc76d725b89163011"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sl/firefox-57.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "bb06ac7d7a6f38e67061a83d6eb76b86a45a37f3c77e805dced9db8c6329c404acefc4e688d8a05c962f911996617a1430b66d2dca0334bd861ba841775b2225"; + sha512 = "b578a153dedb4a2c522a1b03c8cf6a2b0666c0302977bbe32522bc1967c786ce61280ac5c7e9db74aadae60820faf71047119656450f36ed83a2abf184c18aad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/son/firefox-57.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "8fc6940edb2a41e9bc2a0474a3302434a754a185a5c71be3b702112a5683e348dc9045ad95f7c0babdaabbd5737ac8954238b6db81b870fb0987626fc4e4ce6c"; + sha512 = "c01bdcb4fb0c3d492011cafd64e44f5becede34a71168d3b774e6732fdc7cb615a42ccd7710a76e728a1cd874cfe56fcddd57dd7c4d538b05f30e1acc8294d85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sq/firefox-57.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "2c0da802929f7961b517ce6028fbdbb4191e0387ff175cee08663581539d7dfba71617304f2b7fcc3045f8e30a3427a7a5d749bb641c18a90ec515cbc8dd1437"; + sha512 = "c589f7b55591fa412e643c7a3cd51067051302711ecae0a1d9a288e86cb5fa62a06b792a7a0b632e11f937c2bd0ba16738e14783fb2dfa54ea3a8eeeda4697d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sr/firefox-57.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "92f51e7aef94bab43fd58b16f17cc3a9086ff754d039783e2829adb3dc5df2d9e39256221ba1576299da79c17b735f0f51046edefb4886a022cc23314a831b43"; + sha512 = "cb10eeda85968b9454a45850bdb99c25f96baab18f8b797c5bc5fca959126cf61d6ac21017d65169668e1884bb0bb9ec8b6e49c6b3a5cbc8ab917c001dad9573"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sv-SE/firefox-57.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "2e9806909a770d44da18b381d428ce2ca27d0808fe1d39e698c0ce5cf48505ef248f236f8f38ff66fe5d98dadaf516d0c62f3071dc1ddb0955356a9bae3a8af6"; + sha512 = "2df553437b2eb792fbbeaed55282c97e56bb613431aaa832dc11748c5e4797e8666cdd9d2e2ad58c95d284c8bf7ae09504ee99b38673b9cbfa99eeb0a1aa6cd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ta/firefox-57.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "bea6475ad949b4dd35dcbee67e4d1a8d462cd04eaa8ed637b8dc7b7dd386c7eb51d7e7469282bd3d5ad368cb50adc16a888421a1bb6ebed2d6b8892c96f30c8a"; + sha512 = "50c923efb24cdd29cec576b60d24d6796ae2ba5c747de80228c5eb462e2dabf38b8ff652d2300e82205e1f455a5204e5637a859224c21b6c2235b5249aba399e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/te/firefox-57.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "37db9e889edeecc36bdc313941f96abaa96c8a584a58f2b43abcaa8843cd5fd25d4abbb345c567f129f34d67eafb1d5c2cebbf3c4ca9139a8f9377f847a7ebc2"; + sha512 = "21c35afee798548eeb4d0cd6d06c304b642bb023e2a17684d689dbba131301030aefaa66c875f4be80626b628de7235d240c24cb84d171ff6c87368668f85758"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/th/firefox-57.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "15f011ea725e90c2750ed7949a33109f08f44816d722762c6e3692d2570d2bb4671c861dc20a8b0b091bb0b00c11baee6bf449dba818dd5fffeaacda9fee08b7"; + sha512 = "0c8e1493da42c336a5b10ac353d82d052c8229a61b60b9cdfa234bee50eb3a48fb4f987caf9f66097d9b41a4bd68e8f301d2176c74466cf2cda8e92c63aabb90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/tr/firefox-57.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "5313c9dbedee7483215285d3909568e988fdf13ce6039d2eefcbf75754a644136a155f442112e7e19df9983d83ce349dfe5eececa4b45971db72fb2fbed80f5d"; + sha512 = "df48a1bb19a27ca16b3e3a5c1193073467fc543a2f9e05ebefeebbc8c9de98b34c0616b5a5b2366bd768d6f8898c42b20427a3582d8d6fdbd5647d58f50af620"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/uk/firefox-57.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4a127bdd6284fe3b8eea6ce8f5b22cb46f5e1ac066186cbd90afbd8419ed7d0d31b786f210c0a3c0fe2a2b327e2cf6b2f73b45a829b9c5d092eb2e048178da82"; + sha512 = "d85e2dc562e6f47bd169d61716798cece411853f57e777b2ad9349a822680c763a12fb130c851283e4dc9a838cde3c20165124f5d1d3672f897b2da4059ee98e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ur/firefox-57.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "755842ae826e377e33c767971c43a62ac6953f58ff2d23f0109e13bfaf608757603902d2576665f605192e1094504eb02df0636b5f666ea84eacf956ddee2841"; + sha512 = "8ac48e7f20342d7d662b163c0bc4452ff8b3d826f12d8fddc3356518c6f4d8bc7eb21935dba982023089823df67956a2eac0a18609c7f455fd91667727c8ad5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/uz/firefox-57.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "34d5f4446ae341433b0aefd7a76d3e9d6125c60d28480eb70ecfba5d7a7060e1dcc085b088eaa7ecd7d0e6814be8ed9fead537c46b404426976ba21d2d9436d0"; + sha512 = "6f25afef779901e9c61c0c0d8d7596174a0c98e9bef33e78d6f22d20da4e5c0d05196f9d8fa46e71d2f2c049c517a37fa46af2fa52302ac0b67ccc64ff89d820"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/vi/firefox-57.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "272544bd42a3d22f3598884c906d1ba31df7e4b4debd55aa02110a05af74a0544e5c7fcff8937c9671b25c1637f8de399fe82eb0798ddbe40618b4a020c9c53e"; + sha512 = "74a2fe96d21c7963333209f4907d542165eb6db0e764e66b9b9854b0417cc7b308dcb7b05445d2ea53259e6dd71348439badc210bbb3977f9cab860e337827bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/xh/firefox-57.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "ad0aa5402a6ffd28516d428e6f11a8aa84c68291f6722bd35776b27a8359b70466833f504db181ac5d13f8f3ba9fb87df118b5a82b473ad9a5c752b76cf1ccc7"; + sha512 = "1b060fef0a070434a94abc728993e2c1203b98886d7ae288b15d32eda082d647c321cd29e38cdbd160fa8123e3661b702d280807761fd46e5666f44861001993"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/zh-CN/firefox-57.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "348779865bf610de937e073b364e2e384792bda2d5d6932187717f9ab1af547efe6483fc6b09e9bd72bd3bad908507d3bd67c13d196dc7e1857f6f658dfd6361"; + sha512 = "2f12263c8fd4cedf9969eb25f24e6c211d95a764022eb0c793f25a5e071dcc7faa5c91c91441750ce0ab3f8e76cd317732ff661ea16c1d31e683eab30238b9ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/zh-TW/firefox-57.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "3c444d575c000b34f8c536a48688f35166bda3b9702841c9f023430089919cb9c368ab0507e4949e3258a50fd3915fe21963e3c39a29644d4313698e9ec8ceb0"; + sha512 = "25ac9e23f8f82b6baf9e8dc50361732ac18edb286e6ac673f82c0bd592fe26a61b2a1db012a904f48599fdf62d877f76b10262c0a293f0dc32de148a7417633b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ach/firefox-57.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f42a579de711981143832279c2dada8aa915ede2f9e601fc4d5c15b2c6497dda9c6d651fc6b9865e7827dc4f4b2da944f245dc97a73db27ec8b7aab74ee17f9a"; + sha512 = "a0d4648b606e7862db1bd144a68d6bdbd8e926675e58d431ab6dd444eb73b2d5d4bdf7ec83dc3604377166f6ffd2f5ab8e009ac2b64649194f5d3474d101d153"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/af/firefox-57.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "8075a2593835c69f9e2b97b0fd311355cfab0257351684e0c4dd2c3fa8105aa63a946dcf196f4dc3256883fb360c4474560be1846cc06b23058da5d87935e658"; + sha512 = "c745a2b46f5eb4da7cf10400186913dc69b18284402f491334ab9f335296f60a6781cc09491cab174eb92c6eb6c65f8ab2fc556eaec7dd13be37ef4328084c47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/an/firefox-57.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "18247733d65e0cf282b38ac1b52370b9e0053951d726c283adf4b52738dad9633f9a670a65dd1fbf6d84802ed4cfee26adf19c05abcfe1787c3cab3d11ba7794"; + sha512 = "7aeb7e50e14ac323d68f0ac48fd702be8b3f30b56619b5213498701b4868d90e7ccbe46343cdd0cf950b67f9d51da6413d89445d4ab77f4ec465fb74a1623831"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ar/firefox-57.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a15777a29eddc3dcd3d9e7de970faaa10321ad991eb82956887533c9a414b6dc0e6eec6797996b5b1c286c387c5a8b01df28fbb4a5efa485712ed8c9477ccffc"; + sha512 = "177da0fb662a99226889d4ad063b5af18f1cf8816a685d60c767b90dc2db0c460bd62c239d3045bae92bd1f4df129337e278bf95d5db103cbb6028ccf869c070"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/as/firefox-57.0b4.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "5a2d3cdb707ccd9c663613e177832318517e66de05e825da66935a3756a07cd2aaeae6adb196cd6a305202a3b4990e6dde1b7e4b30144023fcf9e4b77c55f0ff"; + sha512 = "dcfd4127df6b3f0d0ceef142c209223e7ef74e5fdc971072d6d43d5db1545b7d9f155185752688168bc1e461fb201d3d01246dd3c18ae006304144771f555483"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ast/firefox-57.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "08d9e6cc8a58895569667f42b6684cf342d2bc015a49f7a5ccf09f26384e7194833a3c0380385d8d0d4b1ad104c74f549ff94d03dcaf7f97cd9722e454a3a14f"; + sha512 = "ec31d580e6b8e5ae6e06e1a713a42f3712fc3253d64cff1a1c957211cd01ee09929643e0a8637bd11d51283cd99ad46e26568ae6cbcc4812720ec1ddb48832d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/az/firefox-57.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "327e8ed170e1d571eae445b1206c83a7c25b4c09437d7d96f88fca5d95946ed0fe1c9c44a3776490e339050f9ac050378e9fd79819409e4432feb2d1e130ec89"; + sha512 = "e053d3b208023d799beb3be82944e9fe6b3ab8bee83e6e0a39f2e0739c77aa267d80096557e191d9b0dadad385ccdd55256ba875fa3bcca4cc3a850a1acf6908"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/be/firefox-57.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ca96078fe9eb12c9acdbb315addca23aca87a923d51edeace03263ced2eab68a985030360a36af8f4843aa4f2af02609ad39517689a9ef219d29080f12605f34"; + sha512 = "1e6f1e36a0b48994026da658cefa8cfde0f1f2c0eee66fb14c7f7beb18a485eaf14c47d22c4586659399dde7c6e352d8ecf4d3ebb3393ea3dd2c3796a4b69b2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bg/firefox-57.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "92fd642c41c4b5874e02829c155f6ee7a1f11779b35f43c446bacc36febdfdb415e7d30e6039c4f70df3fd7635a9f187863b249e2a352b60796d1c0bec300d9d"; + sha512 = "68ba57eece50ece15eb6856593dc09496e2e120c76dc21d7dd0b00eddb8a15308cbee2e42995b530024fb0934323a7a0437c2bf5b5a6a9de22105abd023b04bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bn-BD/firefox-57.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "c3ecd61ffe1177d786491eda2c776bdc136a36e756d083aebbd3add157d27f4c736fe953e2065956a13203acfe95ebfa4eb0a65c8518423b34a74ceac8248d80"; + sha512 = "96f300f3ce1920260426bae867f53a2bdca2fab085bd6f47e39f804ab298df1301ec58666a849e3c2d718c57ebd0c3bd5dc5da3e80884958dd4b4ec2287ce86a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bn-IN/firefox-57.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "bb21a47a80862251a8d5120133bbdad67490572d794f1a7d76ffba77f8cdc9029066c176f2b423b8ec49342b390c35d95c29039044165b874cde42a852eca727"; + sha512 = "887638fdcd191d2c073a4a5b7c3989b47af586a912864d0adac7b00c062ce6699a579e7362862c2f98d29c088db2e85e41f724939d04c1e496f1e48bacb76efb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/br/firefox-57.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "fc9342c239310ccc8231b25707e5a7598cd4d77aad3990feed5c48750c677c3fe4354279cc39cf367a872f25c9ba95c805cff9193d13aff801d95b9c5d5f70a2"; + sha512 = "c8b1391f54fb128a59ce1b0d4e506b27510e1c117d0f0044b67cea248ab82014e8f64d937f4c703a39d3603d8341f34d36e650ecc3a8dc10002943187545b77b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bs/firefox-57.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "3f8da7b739effdf144d2b2d104d27501575452fa20a07419910dc8fa8f2b8a92ef421c3d774e8032a2f234ca95c55efd28e8d99347f7afcdc59f5eaa5dc6ff29"; + sha512 = "b7d89d6ff57f44c61693991eb67f0ee30a8e8daf0935be51a3ef5953e38ad3706bf16ca13e344038016a77fdae7566796f60a285304ab14638264449c25780d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ca/firefox-57.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "1c1f8a7886de815c14da3586e9dfee316f05ad9943e9c952ca44b098786a0f721a89e9ee566f2bc08c664636558006cfefe5823053dc4f23065e636056b3b5c9"; + sha512 = "ee829172889a002199f07ac806d512f9753b565fa992931039cffce764ae53495446cc55b3a1b3c68a805cee09db1249e06296b847928cda9773bc0d670d4445"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/cak/firefox-57.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "9992fb1ccf287e3858ac6686a43b7515370f8043fa2c2fcc814bb1ba49106f1b83fe8d8abc72df43f3008b8cea56f97254e0360a0cc4808e923515bca53dc3ed"; + sha512 = "8bfd9a39d151410dac0e2479e3918d74604cf9773db63d077281aa94d29db102c14ec86fe24d00187a0a790e4bc2beb8af467fda205d69c5b3c918c22b7327a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/cs/firefox-57.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e6c99e5533e988c10615286bf3bbb588ac9854ddff12690537cbe64cf209ad5512649690463f61b7d08bcb57ef246191c8c4d697f6de80248fd8eb72e0518c0f"; + sha512 = "c6fcbbaeeb39f1a842045b9a919fced5dfc5e13aa760504599a376692c7b84254365d50e4cc02af5d5bae378c8503dc02f755a8594eeff0e78c79726b44422d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/cy/firefox-57.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "92cee85be1caee2c9221dae96a5989aeec61451ba3ea6923c7ef713a56b168d871f78bf993685f1e6e56cf13b47aae067070eb9f08d58304722ecc57663b89b6"; + sha512 = "e404cd8e0f699ff3a09f398ca29800739afd23e5a0ef6299ec47c65771de295d2f071454111fc3596eb77656ff92cba088620084f41e21e4e2a44706957a23c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/da/firefox-57.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7491a8d2523dcee7c7b9e2ae7ff43edf179cea94dd078d447cb8346ccc1a2053ba01edb5083a8b616e67fb5c53b88ce8c63ea9efa0ddd309a104750360c27ad9"; + sha512 = "e9902fbad8c46b156f3331c7578a8223ed8b167db7e83333bb57fcd292fc2010fc1be16cdffb611238e0d2a310c6cb25f11317c100ecd5ba140d86890ba563b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/de/firefox-57.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "32bc1d2d6e0702360296accc324836a61cc68611cdaf01abee71d151f02044d467b985e4ea998bed6a8bfd30fe9fff30f55b271a15c9cd3ff94f493b3157a2b6"; + sha512 = "0ed09f934f6d9b862ccf8dad186d510d380f9fa9afcdaf3093badee786c17db3d7baa1061370f4c505af10b4541af2fe368e9fe5a274778e54128999bd88c585"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/dsb/firefox-57.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "fa09fd3afcefc4df3854f599d5077652561b7763dd54c0a95db2107b19146c74152f9059fc9e54844c9b31ec26e1392534dadf1ae592aaa170ba3bb8ef8ed0e3"; + sha512 = "c126ae75872980e5172b5b47813643ad9ea7d1d9e78e15aeea6bf0e4701ec21c83715a5313d570d121dd184751b8c7a0bee708f628ec2bd470c781719707f1e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/el/firefox-57.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "1d95c37d13df3b04f21780fe9cf95b70115adb4f647a720083ed00e6bfcbdaf26f62e9a265cc524b852a7c44b68fa4d37ac08db070eeec1fc3cfaba1fe83184b"; + sha512 = "5560e090a6c9a1d0b48fc16d983fc9c5321137202826cc14cdd6dccffbcaf202724eb2629162fa7ed8acb0537c8839a904df69778a0dd77b2caf78976fb9de80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/en-GB/firefox-57.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "09b6f11cba4862647d37278ebd7f9f2e8105e0392130b6d30f722f3d06c75f108abc509354a7bcf1da4d4709af76dacbb66a56d5a7d0733a4f2287202a40351b"; + sha512 = "85ad619fa280092dd6674a35e95e07d6f590be9d26dfb48249092d5687c06770854d83c09e36ba22a4c8d1dd8bfdef104276c6a761ca3d26d5b1acc104c8e5ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/en-US/firefox-57.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0461eb469f6e1ddd9f32f3a970b6afae3e551d72f14397d1f6955defff87d8ecf2bf2cff47a84f7989f23c4943466b09ab47bae1bc2849691fad87ce8f62c318"; + sha512 = "db935918745a225db24499444723443437d1c68f17a83c7e524620328872f58d702ce6e16f7f0e641e7f67a53846804f5d49ba324ed66905ae4f019256225053"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/en-ZA/firefox-57.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d5864881455d7ca5cc9dcf032e5ab786f6e7e9cf900aae7ba40061dc0df526c29767e792515e35c7bdfcbf71b9163d85a7b80e03b0865d36e5d5dc524c4ebd05"; + sha512 = "0dd3ef914cd5ff9ed64e475f8881bc6b0897193771f9faf0429105c21d5dface47f643c298dea8d539ed1f362b59a4f15d3097e623063f49968dd5aadaef35eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/eo/firefox-57.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "4a16209388b1ff42c355a8b0af3c9340035854deea138ebc206cfbc610ac07e18b7099f18c67d59f45104a754919ad3ce65975f94fb2fd8c1b22389c7af676a1"; + sha512 = "0d85aec2cbce71e7dd30808df937bcae92f806dcb41e6e22283add504333538561deb7377454946e61ee9ce8e2366cc0be926f5d6f032f3f09fb6183eeaa7d3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-AR/firefox-57.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "df195bf219be42563df30fd59504b1721d77db945adee200e8c8b9af7aceeb3ab2a4f2a3cb5a1707a862441f580a3d6cb02beb0bae5ef8cf677c0b20da2b3e8d"; + sha512 = "6b0d3bfbb399d444b18d42c8dede4c9f8adea846fe89931112eca0196fc2bf924e767d849d37a1ab599e27a39c02403d5df15bfd814fae91d2aa4094723ddbb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-CL/firefox-57.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9d5d54c44c019de98838ee5dceec8632d5944ea00d88de42c983e7b01e14b1a3e7fc390a16a60bb4fc00333bf862a58efe8079c9b57b2957c4020e49bcba0bb1"; + sha512 = "accee76187bd35e36b282f6187ab6ef93399e1d703b29c3c60deea9572c28c00f2430b26a5b94d9d894b9ade20e547a1330a68f0e5f05c433b20a0e969f3bff4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-ES/firefox-57.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "3e02e852544d0f78d2e842ec38cce1d9e43440d04fd4b8e43932ae184b43a8e3ffa21a85c76d0d506235f871b695cbbe277d07d4ee3eef2c997843e5a170af89"; + sha512 = "471326ae89d980943c8a2f110c57352c0e1498f131454d019ef1a3ff63414649a9a2d894a114a802c508db1117b95b7f09a0e5296633f6be8c3fe5bc140aadaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-MX/firefox-57.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "b9d1450d16ca587ba9fbf4000bdfd528ba3932785b63e948211f6f1fbbdcfce7898739ec6aa2d76a3464a1802393f45841167598f5a933b3800940d432a6b12b"; + sha512 = "c6af789d6db42cbab5b1524d35cdfc781ae4e836c81aa98eaba72c43b8aaee2e8eea1383c1be71e6816cca1278bc7d6809bbbb2503625e682d4a2ca00f509c71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/et/firefox-57.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "68de6b9772aa4caa43f48025e145c70bd685a0f14bfc87de0668d6617f8f38be7871528e30a79ae42d86c998f8a36ee3455b4434bfaf76fd86760a3150eb6ac1"; + sha512 = "c72c23482222ee411f0781d5a3c93561d2b8234e7797570dfda0b69e92f7593b1ce7083676be8d8fa720f2b05d6cd052be2202782a7fb72fc30b85fd742df45b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/eu/firefox-57.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "a1b1476ceb14e9a8732a5d52e114f3413d012538b4d41e601a6824b2c71346c5e1bef236c3b02a2104859b431fbe1bcf9d2c9ed9d5a616a6b17db8dbf58185d7"; + sha512 = "2a6718e8f2d3803e61169813fcef9d016b672f7f8358ece119ae71b2535f3933d032bf133e1c36305cf7e02bc94c53d1ab8998f53aeb775c3056b8449ad971d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fa/firefox-57.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "b063e2b73a0a8bebd7476b60b0a15fa3a80d6aa5fa51b68aa7bc964d21278ecbdac306ba2be1df06bdb205c396e5cc1253adef47ad395720e1938cbe30208f8c"; + sha512 = "c0980b33767e2bc99a42741b9d35d2b7841a637975759731bc9c8be6a34932a01006453e19e487fa06f37ad9dd97d4b3fcc9563f4a6dcf8998576db5262df999"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ff/firefox-57.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "8a60c7640e7adda279b33d3c5e8c3981bd197118d38adcee7d9c053902680e329533c256c7361f2c7626f55d3550de193997e7212055338da8959b821c95289f"; + sha512 = "5e6aafab13381f2c5c4f26dbd3bdb56296b3d92e9f9b9989f09adf1163edb587eacac2a63a9fc1283dc0ce9620fde08af50ac4558faace09675f6256523329ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fi/firefox-57.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9845de20dab7f981f3762c983244f1c812768a40ef7fbea61f12df2fba80fd6664166d1376559a73edf6783b558d443b95f2840207ef4b6653012f2bfcb50fd5"; + sha512 = "94b3734bff09df66782f2cda93015be2d8f7ba90cadc272560ff232b8c01612cc733476ab3f6b3e27f52625102684ac11ecf58571a11f06806abadcf1c1e95f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fr/firefox-57.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "21ed69aa109aa0931b6a3fade415df4347e3a387ddd8efa2dd0789c7bba5f74d1242b59df2641d8b968cb2edad19b24a370fcbf322d382ff60c7f7bfb3565b70"; + sha512 = "f4f9202c458171026c5770b3b471882df609dc029313b0914856e445dbed38da598bd96291a44dfeafb0dda82adb4ead3b9e5443e1493b8d861b11b1cdd92480"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fy-NL/firefox-57.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "2e04e3f247cd3941748c71c63f35a7a328b7920f9ebec417a7b48457ca6b4c900e14139fc921a1e6a9dd5e9d766a35a5241849f20a5e1abd3ee96fdbb28ed48e"; + sha512 = "72c71addde606c99df99f0b405f61e0b1cbebb10cc1a9467a3dce9092d3c17fc76fa8a737f8140db00fb03da513751b7518e7521fbff2ff36b4df36a8fbf1ee9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ga-IE/firefox-57.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4d129d34f70069fb82f50dfe9987192b2f32186f6b9ec7497abafde3c02c65724ffefdef360cc27c39bcc77117bc373a516703dde68af5b1907713060cceeecf"; + sha512 = "1b23e5ccb911a0a683e356c413fb1c2b853e9e14c3415c0c11da72939107d4294f9f3abc579e2da7de613c32c65a4e8d6e05e6d7d65076619d18dcb38056ec86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gd/firefox-57.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "41f29605f42672f0c178b5efcd3f20f647647c84a0b6a0cf814712758b41aed844517452c421592d6d44a7f2b1924eeae71092bce70c1862517cf776fc563739"; + sha512 = "59b0ab5d6a04f2d9cc818b7184ec727d95cdf061095111878af58448739481f94e98d7818647d03a302815ea77e0832471ff072c6caa106227849eba56de75ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gl/firefox-57.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "4004eb49e097e9e5e135b2d6d13a637a7c8eabcc8b181c068d8fc2b6991129820ceab18a13e4e3054b8486b9a0a3a6fa4a3246d4af21e51052438dc77bdf230b"; + sha512 = "36c45ed8de93cda743a5d054f3273db4878ce2ecc9d78cdabba4be93f2e466e111a344a05977cfa52b52ee905b0d053b5f509bde6e2e26f14a3391b37eb054af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gn/firefox-57.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "b66153345fb4e611a476275fcb43d4742468fc83e1a109b30aebdbf86b8e661d06f29c950a265d4e929f949415f902f80ad5d418f3fd9a0c310d2ba7d7b8dd86"; + sha512 = "d658ab947e261a3eac0ffcd9f4d56eba634bb964799202e3717f5c41936e64de5523ab16b8b35daba1de7c625c8eb31101596fc73056065e4f8bcc8af8de1197"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gu-IN/firefox-57.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "446760799bc1b453e1f1d1be21076cd7164f96a2d2628e8e6d48304d2c03df939e43ef66b97405196a9879eeb07deb728985d7c4fd0c021558121627d5f94145"; + sha512 = "9faf44b19f5730dd09fd32b3109249cade91fe4c464dada869e11211bf7d3c2039c65bfe4729c488ed53159a08cec5250e7c2fb55139a8af3a40b1cba40413e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/he/firefox-57.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "73fa828925f54f3bf1447e81230543909bbe5af400ffad5c1af54ea20aa8f24a7c7c98d75e92e391a9b5f2bba41fec85a54f161528a0aac418e2bba8b63954a7"; + sha512 = "0cc925fd0f9d2d89c49a195e4f568f5c9f570175f31f86154cff6875860bc11db0103508f5985d073dc7c37c9ab5fffc6f50b94e47a3f47f7fa02678f4afc33b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hi-IN/firefox-57.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "bf5f891911d699de47349b6dc8ef1fea3d4e6ff1ea243e50b615035ddee991d94f57bc2eb191bac15e899c63037c976adb051f8c03a10fa0b170041b36f79a57"; + sha512 = "934c1a6d4f148fc2d87b2ff2be5a4a31ed463caaba84b9330f0cf8e7bc56630665ef4566f03bd8f7da5111400ede564ce8d4cf14a4a34c48877aa710962f3798"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hr/firefox-57.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e840ce4d1fdc373b22f3b8b6b33ed86ed19721d5f8fb52dd550f75d71ee6204d0baaf4856f090a710c622c5279944421f0efbba0bede9350055a4cba95e5bef1"; + sha512 = "65c92cbe069e7b67be5b092c070741490a5fc409fd3d0e8a03e7346702398ce717f45e80c909851a4699cbea218a5e7a49049429fc54d850ccb28b23382681ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hsb/firefox-57.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "139d7d9d831cd89b3f9db005b1e93908c5a0d3e7bc77923cd2ea78ae3443c26fb8458c3ddb5055f381f99e9851002c0929f058869aaedea2accb2f616917b1df"; + sha512 = "27df62d51e97a63beecf1d842280ada91619f18372679b25580f9248dcff5a45c19d64b2c2912f0daaf9c5169cc3c8f58ca5e7dfd360b292dd88d8dfe1b428dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hu/firefox-57.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "7e121659835fb0b175f5b19fa3a6049285ff8ad87309572eed8616e3f418591311dce94f724ff6bdac34bc5480f656fbe54b1202d900d7bd73f034fd06f766f0"; + sha512 = "1b84d77cf561041ce0b0213111b5830cd95e40dbd447e16b23bf93d241f0dd9cb5510c29ecaad63dd3818f6a8f6070eb8314af28311deb012d3e8f4ca2390da9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hy-AM/firefox-57.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "db9f64ae24566a158bb27525ea5f6623a433f4c59b78601d289d42d8b8d128ad8957cef953ed27f6af93b91cb01752cc010af398869693940030a3ef8534a903"; + sha512 = "691d45d0ac7c8db9da1f73fb466eabe56d1a70e7fe08293fc6ad95e5df1da461593e89bb06122fe4a29395f75f2cb6a1abb568ca798130f9b4d03795eb8b165f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/id/firefox-57.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "413933af7bcd519529140a6609d0ce179140477bada96bbd5863f4f5159dd322ca0951b5e5401afdd1865e5f1aeb01ce6c535b121a002d8cf00db55c2a2fbdb2"; + sha512 = "1592365d75275ed597342602625a591b2fd31d204c39a68dc216fd353d317d811e17549b73486de9a001015fe415c918b1057a7f85093906a9fc612b8eaddc34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/is/firefox-57.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "6ba6a3f75ecff44391690b5f720159e86095eb7c5cae34bec0e9986071a8a4bc31cd03941c46ba40852fa6689f0b241d117f76ffefbef9c85c519bbcfb4246c2"; + sha512 = "b7f33d0d15e2c6b53d0f43feb767967e49288e5b108f18de9a74acf289dc56f0c4b477594de02eed7402150f8df77d1194f140ed64c99a6ce7749b32dbf91ca5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/it/firefox-57.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "489893f4dedad8a3ac628454bdd2452aede7f37748d4af32b2ad5a1d1da4703c19c9718811d3ab6eb47becf4be60bb18c3c97476983a70cb135136839504616e"; + sha512 = "d96117f473e639863766280a59ea5c944cf916ab7c796eb59d0701ff5096d0efd93ec49c1d790eb3e16db139e3ad482fc7be2a6c214104874030a16eeb882629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ja/firefox-57.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d2e45cdccd321f8056e7b092f07cfc5da8150b96ec4d9eacb42c391c2b38ec4ab38f9467c4f5fab7608da606d2d87b94c20b5306cd4aaf881aec353348fc7574"; + sha512 = "a535bc29f4f97e223716dc7d3eca6dc3cb8e04fa79c0a3880d116275ef6eec41a9458007a33fbe527c664aec9fdac24d56db04c8547c93fcbcbf33fd461ce217"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ka/firefox-57.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "06cdbd6010fe2e0017dbaa9c0bd8b84a6133d607837afc3eb35488bbd0459c0ebee50e4352afa218bde546315cf0aeee3a34b9dfc00b03fbf6f6e3c205735030"; + sha512 = "3bfc8c1b414bf8f38caf7f29342024a09d56c34fb66ff2bde2ea953ea2f22891d85a014e6ff767dc895d692b45927ff45b63277dfaa72c8f90e78ca172daf4c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/kab/firefox-57.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d2944780c51ae3641ae51d34e082222692352c75b1c85bfad15cf97b3083fea3b8f3f39938d35bd6d452d102321d1b598c30e85fa576eac32bc623e37e36c432"; + sha512 = "ec3672acb496fa5e19f148ceab4950f05286f73dc1a00ed41388f14ac8945ca23b9c2d64f50826a49e2874b51b7b9fa61f8c345e968f77461d9daf9e8f616c8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/kk/firefox-57.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "eae250b6981a4b932dfab0cce9f31fea9ae32ffdee5021346362ad3151421948db9781cf8b98b2c77becb4541047d7d0cdbbda731aa24b7827374078a575ba55"; + sha512 = "659663a9d889f31384e8734728de5ac7b0902587360a8da0ca596034d0f2f4a886d5c46a99a0103a9899f30078e384c1389886db8db5a657659d512fff8763a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/km/firefox-57.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "fd5f9e8f999b173decebffa5f449ff0681b5ce7258b56dffd909d86364567b3e53238159648ca12a6c76ab5abf5903a6fd82207e8e5c8ae657aa6a0c650b1f6d"; + sha512 = "7c0e9cc3644bf38d042da7ce5ecc4d2c533c6215919def5be6a993daf7eba0f10a70f571361d0ccaa989e6a2abe3a273ea56099cff5bd47e0a6536066f23c824"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/kn/firefox-57.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "22f0e3b45877de32edde2f351d9434a9d6676c51bc70233c289386fa752ad5768d2fab202f74f2c62ffcb1fec2e2d318041689352d93f8dd13608e9243191b68"; + sha512 = "150fcc5ba1aa0d9afb4ecb0ce9dda85a404c5aebabef5f0e3c00ea2fadfde52593a466c3582fe7545dcdd28fade62dd5947b7aff473b3d6e7060be67a78ecae6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ko/firefox-57.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "631bb19fc65075b18e4c88d60b5a76e39d8a7516a44c2df5375668ca86775e577cd60e5b9e445073a47c9d117d7e96d9e8a5b2422749e0dd3622530abe21aa42"; + sha512 = "2e48ab21047dc311ab8db94ebe60c04b7bd61da5b56f39d56d6c7745efbe4d64f1ea54c370d197ca4c0bfada9a94afb96a33132b81148c18d8e69b31f0440108"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/lij/firefox-57.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "ae267046c3a6ca584c85f5a8d4da3516957313cc68e554fef796fdab92a2d450effa15efcbca5686f46a4dfd6ad1f61bba529d9cbacff0e65a857052b95ecba1"; + sha512 = "6410f7bc134698e71dd8785885c470987afdb2d75ca5c0f49ea70c2cb0f4d1b1f93397b6974000082609b8d7007f304f917f9a3dc8d713f13968190b43a0f4e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/lt/firefox-57.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "db979def47bdc8b13060aeb2f0741c4e28d5e1bf0480703f26c0d7e5cef48c10e3d75260fdc6699668cfa3374de5ee25b150f3d5e0857ce801aeb187a8e7c4d6"; + sha512 = "78e6f46015aeb56575c0c508f572fce65d1caa8af288d1db0dd157c54ecefcb821338f39e2c47021a4ec3be7c2bae0ebaa08c035d3755bc32e074a7ea87d7f9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/lv/firefox-57.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "a703df8a6c1a381a281ebb9bf4008637009da5f66194a4f85afbf2ae980de5a118e0ffdd35aea7e8521026140f2c003afce8ea1c906ab90c1db7aa4025d03be0"; + sha512 = "1972a6030332a571ae67b7856cff277101614b8e7d8f82dc204bf45a3a4838a214d00e23972cda731931f4dc202388896da6ffbb8c508cd4be45694ef1d934c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/mai/firefox-57.0b4.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ba9015d716e0d15b36cf7e83a28d99310a87cb2242b9e920ba8fa9112567cd0de1dab1cb8fad6ec26f381ea1cddc0b40b4c41d91450c1c76124b3c53869bc27d"; + sha512 = "269841cbfa1b70b070cc619beeca5c4cb9c03a9d0643f5d1d95661e12153c66cdbd8f92807352ea9ddfd438cac8fc7da170c467a8f6712e1e00b152dfcaf15c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/mk/firefox-57.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "12c4a7dada07fb6a643675d5f504cb76e00489879fe3f2ac2e9647e053fd508b18c56f2aca172aa12988cab6672c75179e7366cb43791a443ef70dc88d0897f7"; + sha512 = "948135fd1a957eb5b1f4731d684f37b0e7fb78d2861e5be55ee23fb03484cf59f2e66543aed1764fb66b69d4779e39dc0c5104f52feeceb602285bf4b6e46d09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ml/firefox-57.0b4.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "f6c93dfdc19487c1d61fba8a001680b9556ffed9599d4875e3e13e8df07dd49ce266c545aae9718e2657425815c643b803c170b620fb28c7e2727e92fcae0b91"; + sha512 = "db7eb47a5d357a67b5522361cabd690455eb17d25a9de290c79885fb3a0334a5149eac03e92af9e0dbb25fafb18dab73dc49ad0f0ef7451e7f1ec360bfd6ca4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/mr/firefox-57.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "eab3ac3f2afbc091a0fc02a6fd6e0bdc2dc232e06019d2b7ad3004aaa069f7afb1d4a89b7b0932e80589eeb262ee3e0b54f75ec09e2d09f58481d08c85bc7b09"; + sha512 = "a416334034eb327d9affb8eef3331fb9627d4eed9b680c312bb4adb1ea64438f95b89117ad1db8ba1e8e8f2d5408668bc7ff6e1cd2b241641221cf591eb847ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ms/firefox-57.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "99c3905d7b081407c6b044aca8c238e00ff2b6a4ef1cd24813746efc862a50fe7f2f3ebc79cf2f436e95cb3214894d991f8c1b003e52b70b2865970daf55c148"; + sha512 = "2c486e99e052065705c3f49f743e703a1cd49083b08df6170c58eb1155a1a30c56418263adef4acd4677a0a812c9682a87d470ef0e0907057bb14ec10447f36a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/my/firefox-57.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e391c752eee676f298ff37d086edaece84578e0bafb099f4ed8e0790d64de9ba64f4cf15c4218b70d519507f767572af7fd269b93d1766d2fc76a7fbd8a09848"; + sha512 = "31718e334380c9937aa8003d3586931de21bf0ced0b28db57baab82d2e0328e64c1b390676ae4949c622544918aae727e925ddba04abb97b756f601ad22c13fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/nb-NO/firefox-57.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "99be4ca9b8178d6ed7d7f1c7ed466bc7113087faf7256064ccc0638366c554a7443b5ec83bb85b00689d2d4787f04268dd736eb62261cad69927d68ca6b83061"; + sha512 = "051209a5d65615732d7353e24a500dabd3cfa4a3f5f8dd4ef61c1d4a11236cbf59915fe3ae14cd7c524898f01bfc40f1565ecbe6998b9061657db4a330eb6a28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/nl/firefox-57.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "de3eb748339672383aa8ac01cb2494bbfcf08e1f694a5505ea2407374e44cb339f857c2a45f72da3831e0f800ac2b78ad159cf3c795244c0b7ac13c2cad50240"; + sha512 = "ea61e410ce32be3bb5c9bcc2463ca1eb6855b18c1b6511cda81b4203d86e1cce6d01329d60ee60b96340f9d6abe17e2ed567c5a7cb96797ba88525404b5dcb5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/nn-NO/firefox-57.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "bc45d70e14ec14122e45dc62a1b3acadc5a3de2a9ad6bb70d848c2952ced6ef3032a336579504fcf474bc3f12f7b8eeb6c92e529053ff3592a167b999bbe67cf"; + sha512 = "db9c3a1ee0630afded4ec215880050973dbeb2bb98995743497f01c79f90c1609846f4dc03f6f1da4b1274b23f95ce69f4ad6de0f2f94acf10df21615d00532e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/or/firefox-57.0b4.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "91d846d406acc1e453a09b5de1fea0760564478a680511afc54e40c5dacaed602f8ab942dd77f25c1d89a507b867126969c36c0098763eaac10f047912cf83f1"; + sha512 = "9d8408c76a2dd72273827f0fce70b3346a910ee73df52b1c5129bcd6e79d7b768d311f5ce4b4867af5a32d6491b75f816793ccbc3da6e0d7ba2f06a7e2386d30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pa-IN/firefox-57.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "5c20abd276309d82e772989dbc8c8daa6997bddb67d794cb39c0af364407d57ba9d28054116af38d5b42ec339c16eefdf3266355560460b64957504833c7936a"; + sha512 = "fabf259bb80a312ab1ed6997f7c2b605e5c19fc87adff388fa8188181038d1ba719075a23cc4195efca5c8ed4f8066277b2db0b581d10f64f1d6d206b29a624f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pl/firefox-57.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "470f2e471aedff4520ecbfda764710181cb6cf044204968f14f68bfc34f07a07a8b6e80d4dfe6f0abb1b4a79a5ec5169e552a3588eef7265df9d3bb91da731a8"; + sha512 = "35b31f5c5979ff0e30f52d3012db119abac393fb6948ae930e8efc17047235b06bc6bb0a2546677c943933a600e04d037e443b6c225893082802d5d876f900ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pt-BR/firefox-57.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "3487002948274414166cbf1527be353e9bc2267c672c2d14d731c162684e323543c5b54a43bf1f66353337e3df30fd45dbc90f0dfa8e07d8c4d77883ba1ea909"; + sha512 = "cb118f08e74101373a3d1f586b5b7ed47d9f4bdd89e922ca430a92797e3cb141bc847b827b579412487ef5d8bd1ad933656db9929a14a91512af61d23b897a2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pt-PT/firefox-57.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "7f1b57fae5a4a8981a2b5fe1ade023e1845af866ebf60f56d88c3cf8c9fdeb42aa1c48f5a3f8f535aa310d7f53ea2afb3787cacb8a211649be9ecfec0d7a1451"; + sha512 = "b561940da41b9d88819d7a86402d0b5973950f2d90789540c2be6a0b1981e80f2e2d163dc1b2d0a1e1e0fdbcef9927223b2d85b364126ec894e6f715d054956e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/rm/firefox-57.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a73cfe38beacfc621cd10373a774b4ec517ea336e0249b7abd5500a9838fb3ff7b903f64c82fe3a8cc91f89f2bddcdb2d16fb41617a0be69eed67c47f8f5cca9"; + sha512 = "41ed27048f63ff77be3ec90144e94ef5a7ec846e88c1d90729cb00518eb1f9de5fd3e94975ab49954aab98850e8930b97f59bc6c1bff8b69520e81d94bed46ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ro/firefox-57.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "f18d20b7ccf069b843dd9acd3bb46c2d41408b319ac32114aaada886d43cb679b4624512637b1202fac9977d1a657deeb7dc662623e69c2e04b558ae0ca0ec39"; + sha512 = "c5c2359a7f183ddd7275b64ccd3a7f8fa48435d8595db1b7f388e557f02669c12aaa746756fe77ebbd83496d36cec3cfeaa8baf6dc8eeb731af1ad970ff0e325"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ru/firefox-57.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "4ac1c79dce2a208c461a6a8bbd447aa4aa40b8dfd3bd1b8bf3dec3fe5610f8bb51d65052ea23f81d0792f6a4d6b49ae0cec1e82199e8b7c94788290073bb7681"; + sha512 = "1711a76df67b6ba5bfcac6015d92cdd5fa51643e3955487fc6df6176840ab910aec593b6bb041e2ad0259bd45d8aa0da7a6ef75bbdd38b0821b2524ea7de9452"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/si/firefox-57.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "d5c0c9fa140ec72b805f5aae8374cd0f56d21973fea5ab14f68040f38d15ed32d0c7542456eaf40f100006d79acd006cbcde1cecae81efca5097ad25d6d3171a"; + sha512 = "57c49bab469d7b17c6f9d79003b52a778c40d5dfb27cc238168809041aff849c843cc6442b1dba1503a6e89f1f2168ed191e0256aceb38fe990f9806bd4f2870"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sk/firefox-57.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "c5cd6793ac43b865c025f64c1cc10e2771be1e0ff6578258aac3cc433545228949c6bf33fc2764cf7272f76026549857124b535ffc64018879a7b7afd534f05e"; + sha512 = "be5dce90f29f97c0670531b58d3199e22e2638169d2deb62e9ac2c294d7ee768445e47661e7b4bef40b0e9dd6d526581b072f808c005722f9640d980a5a1da1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sl/firefox-57.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5fc23876fa9cea6ea3209bacea4ea3975e7979c0ed0ee023857288ab286a4d6366c7267fea5ca7a4a5d4ee11287af490fb6bfb7e287d0f3ab70bae715e2ae049"; + sha512 = "7dd6e621e4ca75d22d97ffb7649223eb31785d140058ac9d245f76e45d8c0fb85c7cc3da0b47fbf678e014e5a81c162df80a9e2d9c9700f9121cd9bfd49c7be3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/son/firefox-57.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "db1c80a5dcfa6aff3b9e8abf2a89946cf13a7ba045124bc37dacd761011ad3757319dac52a084a7b79acc0a1a813ae0d4507045c7cea01c3d06d0c6fb89579bc"; + sha512 = "00963fcbfd0fe449387c4b2bd7106df566641454b1988eed3f5a9ff285793c6fe9777b23836b2fb7b5ed6db2cfd4219b8cdcbd67339b453e6ed0fc7534547f29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sq/firefox-57.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3b73fd94fbd37d486a4bc2b0c874101dca703cd0561e6b8bc19c4c3297c6fe6aabcec3d4274c361d6eb40f3851f262ac6b87d4efc6d025a236b90bf9c3c41e16"; + sha512 = "5a5e2531c75c4f120babe6ef575939b29e5b49363cf2788a14440e628009f7a2d32911b1ba16f88b55e85af8eb754aed0790471efdd834c1ab0bfff827b86b99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sr/firefox-57.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b827604905e7a0883d6e6d12295707c23077f2e7605b10084fcd9bf927a61401169e4b786d88e119f65b173d832cdeffe9163ad1b5522e2cc1b49693f4065f6d"; + sha512 = "5b35e346cb017076a5ddde6a9a4a3a8de572e6799e194fa6ea358ce50a8df22f8ca5bbb316b4f17a8ea5260fd3e025af00f7c362263f84efe64254f1977c8d78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sv-SE/firefox-57.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7dd79aa34c6645459de8c8a6d54f050d381a048a960da3d44238ec6d5579fe9856052a167e861bb72c4b73946836ef66f4b5cc9a2aa6894f7d59a8545583cd46"; + sha512 = "6f52f537acd049e0602028fc1a852bb4a5adaa0649cb85a4361011e544f08ba5e1ad5917abc9a405a30f4fbf9eaf0acab1aaaabfddb4d5e1b4d030a600052bc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ta/firefox-57.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "8bb836b634363a5ab120cb7fe94de9d8e7a0a66fe0b78443bd3b65fc6c9225b3bceb42539e9cd0bc424115a24938c809a36149a70796a854f4f76f009946f628"; + sha512 = "a24286bccc8408833d689549e59792d12e16d985a0eb0eab386a2c220f5d01f9bcbef6862d7115154586fbf711df08fca0383978793d5d672c196e17a82830a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/te/firefox-57.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "5f9c4eccc27acff2e6bd388c4e8bda7813550de17747f7bac13c3d72d58babbc1f63051053cbffd9a670af0a317a2e81ec3ad77f1a04a969f8333fd87d6f2f29"; + sha512 = "0e16d70eeb4f89ae7d02326053f1be58768213f4c50e60b4160e54b79b2b80beef8c2d161190b3276350b7b47dbfe44bc59e63bc95e9b0ad08491a0876574f06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/th/firefox-57.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "b05172f35cd062bc21125ee6230135c30afc3865612088c2bcc7e6e013817452a4dd9e5d269a8b2ebeb144d0c0864a155e40bf59312fa7cff7ee3da7d80ba55a"; + sha512 = "1145d91d10339ec6fe757f366d59568f76b1ade1be456547dc80719a85dc8bdf4e5f1be943335496c489891c3f18cefd9bf83ce2239a25890ba7de8981400319"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/tr/firefox-57.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "06e2ae2b1d3c1c06225fb24cf9a7148e80b56a2359c218ac55a04c4a21d0ebcb13c357bb455157ecdeff7b1fe9a0841a73b4facbc4a53e7529793d5f1a3ff70e"; + sha512 = "60031ede41569676d339df3abdc391c581ab01d4feed901346e77b33fc8d441bf501c521344caabc3dc59b6b537f8ef3f3edc0ec32f94b1c5386730b4b17b29d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/uk/firefox-57.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bc8cca21ae9a19a0a345e08a304d4a9964e448b3787ff9d61985082d9e04ada1709924020842f8fa68ef7238ac551f575a5540e1a2254ca7f54f9fc403c25e10"; + sha512 = "7c0554464057c27ac32ed1fea09a7bb05e5008b84ff5c1db0029a32fa7df0d4b5a47df7928bd138c8a8285c4a3146b8eb77b349c4352ca6b87ee8e804aba36f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ur/firefox-57.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "d4b02d24bd952c67d298ed8fd27e7565d6ab9533d8acd69aa9a1dfe2573471378480523092c01f929f25e81cb43817bc4c0c1dbff88031439b0a358c5bec9eb1"; + sha512 = "7f504ebcd65f30b2aa5fec962498457abb48a77fcbe5e9b50290500f7a78cc2cd8ede0395529d2edc081124fc980c85d37628529f10ab011f70eb40c9533385d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/uz/firefox-57.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "6db32dfb929b7939a2f54e198fc6bde10cb0aa2d9b1e39156ea1dba35ec7957fa87e5c7ffe1adbcf9ce0fb2d16eb324a8a6e49a6ff304bc369c52e91d050c714"; + sha512 = "84f281673ed51f8c36ac72bd2a8a6d5109023a30110e70c1afc1befa0553f3a06c0718a45ba878e0d0609585e9041eb22ca0c67b8b9754be2fd4300b2c4ef1b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/vi/firefox-57.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "7cb643e9a6d920b813e7c2e12e17b5b1ee135178e208bf152eba388c9e68389d3e90425a86d45597253c729562bbd2c4b582d86d2ed2aadaf0780a08ed787421"; + sha512 = "c9ba75084be67969c6eaed06cd33565f61bf86a2adee935b63ffe85a3ec225fd2a5188d7e29a4dc8a42c2fabaca574c1e3024bd06be758786aead5d27ed51d0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/xh/firefox-57.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "254e006f0ce5dad4d1b7681fcf8569b7e7735e9b534f626d517c58f33da483c9de00990d77530fbc3147b2a26c5bf8c0834e7c029ee632890ca98e14328207f9"; + sha512 = "cb8adfe92c17479f9d99d8d96ec4f67020f302256f0971efc710fcaa83acf6340dc5a4ae9bc687abf875b38809fd201a1be0e6b1b88504b26b9086941e6a92d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/zh-CN/firefox-57.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "30dd152aab923fbc4398fec06d5558aa1abd0d9c690ad4ded7d1695fa4355e5046c4279c450e856c87e32699354d657279958ce1b7c01d646e89faed1acc142f"; + sha512 = "765196a4790be391b11e58402127138041c3911d19c4f6f8d6fd06ce7f281724c321c031b190732f9e3e0ed966bf1e447627228f67847ef7144124c82018c04a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/zh-TW/firefox-57.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f2d7bbb0cff7e0d0c77dfa42bdd268c06dfe1b5d3135baf4e095dd9f36e25f8bbfb3f06851eef314816d53e5118da6a719c45071542e54d9e4798b2d13b06580"; + sha512 = "c1e0fa2fe1e2929b3f1eff68f1960743cd149f2dd023c830fe9585302f7eb8f8ca4e4d33657ac08a144cd4171154d5d78a106d1d921970df541dd994e534db6e"; } ]; } From ab061940dd7008d4aebb28230e5389eac0ed7286 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 30 Sep 2017 18:59:00 +0200 Subject: [PATCH 0490/2806] hamster-time-tracker: wrap services Hamster did not start because the PYTHONPATH was not set for its services. Closes: #27498 --- pkgs/applications/misc/hamster-time-tracker/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index b8bd514c9ff..51a14fb20d0 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -31,6 +31,10 @@ pythonPackages.buildPythonApplication rec { python waf build ''; + postFixup = '' + wrapPythonProgramsIn $out/lib/hamster-time-tracker "$out $pythonPath" + ''; + installPhase = '' python waf install ''; From 181c6216d4e2f8bc3c4180f6c2ba291bd6193347 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 30 Sep 2017 19:03:07 +0200 Subject: [PATCH 0491/2806] pytrainer: 1.10.0 -> 1.11.0 Also explicitly use python2 and default to running without webkit. --- pkgs/applications/misc/pytrainer/default.nix | 39 ++++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index bc6b4e16a37..ecc4c341a68 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,38 +1,45 @@ -{ stdenv, fetchurl, pythonPackages, sqlite, gpsbabel }: +{ stdenv, fetchFromGitHub, perl, python2Packages, sqlite, gpsbabel +, withWebKit ? false }: let # Pytrainer needs a matplotlib with GTK backend. Also ensure we are # using the pygtk with glade support as needed by pytrainer. - matplotlibGtk = pythonPackages.matplotlib.override { + matplotlibGtk = python2Packages.matplotlib.override { enableGtk2 = true; - pygtk = pythonPackages.pyGtkGlade; + pygtk = python2Packages.pyGtkGlade; }; in -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "pytrainer-${version}"; - version = "1.10.0"; + version = "1.11.0"; - src = fetchurl { - url = "https://github.com/pytrainer/pytrainer/archive/v${version}.tar.gz"; - sha256 = "0l42p630qhymgrcvxgry8chrpzcp6nr3d1vd7vhifh2npfq9l09y"; + src = fetchFromGitHub { + owner = "pytrainer"; + repo = "pytrainer"; + rev = "v${version}"; + sha256 = "1x4f1ydjql0aisvxs5kyi9lx35b4q3768dx42fyzq1nxdwzaqyvy"; }; namePrefix = ""; - # The existing use of pywebkitgtk shows raw HTML text instead of - # map. This patch solves the problems by showing the file from a - # string, which allows setting an explicit MIME type. - patches = [ ./pytrainer-webkit.patch ]; + patches = [ + # The test fails in the UTC timezone and C locale. + ./fix-test-tz.patch - propagatedBuildInputs = with pythonPackages; [ - dateutil lxml matplotlibGtk pyGtkGlade pywebkitgtk - sqlalchemy_migrate + # The existing use of pywebkitgtk shows raw HTML text instead of + # map. This patch solves the problems by showing the file from a + # string, which allows setting an explicit MIME type. + ./pytrainer-webkit.patch ]; - buildInputs = [ gpsbabel sqlite ]; + propagatedBuildInputs = with python2Packages; [ + dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate + ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ]; + + buildInputs = [ perl gpsbabel sqlite ]; # This package contains no binaries to patch or strip. dontPatchELF = true; From 03eae7a38dd5795f30c88bf231ed0e36ae0db5d5 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 30 Sep 2017 19:06:27 +0200 Subject: [PATCH 0492/2806] pytrainer: add missing patch file --- .../misc/pytrainer/fix-test-tz.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/applications/misc/pytrainer/fix-test-tz.patch diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch new file mode 100644 index 00000000000..359e28c41c3 --- /dev/null +++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch @@ -0,0 +1,33 @@ +diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py +--- pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py 1980-01-02 00:00:00.000000000 +0100 ++++ pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py 2017-09-30 18:56:43.127016847 +0200 +@@ -69,7 +69,7 @@ class ActivityTest(unittest.TestCase): + self.assertEquals(self.activity.time, self.activity.duration) + + def test_activity_starttime(self): +- self.assertEquals(self.activity.starttime, '12:58:23 PM') ++ self.assertEquals(self.activity.starttime, '12:58:23') + + def test_activity_time_tuple(self): + self.assertEquals(self.activity.time_tuple, (2, 3, 46)) +diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py +--- pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py 1980-01-02 00:00:00.000000000 +0100 ++++ pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py 2017-09-30 18:55:45.078128980 +0200 +@@ -23,7 +23,7 @@ class GarminTCXv2Test(unittest.TestCase) + self.fail() + + def test_workout_summary(self): +- summary = [(0, False, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')] ++ summary = [(0, False, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] + try: + current_path = os.path.dirname(os.path.abspath(__file__)) + data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/" +diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py +--- pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py 1980-01-02 00:00:00.000000000 +0100 ++++ pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py 2017-09-30 18:56:23.448720166 +0200 +@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase + def test_getDateTime(self): + utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') + self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime) +- self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime) ++ self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime) From 64c3a2e98a9521545690664cfdeb714228c6fabc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 30 Sep 2017 13:22:25 -0400 Subject: [PATCH 0493/2806] all-packages: Remove obsolete comment on pkg-config Thanks to @orivej for noticing this. --- pkgs/top-level/all-packages.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3b5cb57292..d18c0861c5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7376,12 +7376,6 @@ with pkgs; pmccabe = callPackage ../development/tools/misc/pmccabe { }; - /* Make pkgconfig always return a nativeDrv, never a proper crossDrv, - because most usage of pkgconfig as buildInput (inheritance of - pre-cross nixpkgs) means using it using as nativeBuildInput - cross_renaming: we should make all programs use pkgconfig as - nativeBuildInput after the renaming. - */ pkgconfig = callPackage ../development/tools/misc/pkgconfig { fetchurl = fetchurlBoot; }; From 72a25bf38cd5e42c5a694996a2c6a84bb3b6fefd Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 30 Sep 2017 19:59:38 +0200 Subject: [PATCH 0494/2806] shared-mime-info: 1.8 -> 1.9 --- pkgs/data/misc/shared-mime-info/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 484aa4e5a23..64b0fd0c38a 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,24 +1,25 @@ {stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool , libxml2, glib}: -let version = "1.8"; in +let version = "1.9"; in stdenv.mkDerivation rec { name = "shared-mime-info-${version}"; src = fetchurl { url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "1sc96lv9dp1lkvs8dh3ngm3hbjb274d363dl9avhb61il3qmxx9a"; + sha256 = "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw"; }; nativeBuildInputs = [ pkgconfig gettext intltool perl perlXMLParser libxml2 glib ]; - meta = { + meta = with stdenv.lib; { inherit version; description = "A database of common MIME types"; homepage = http://freedesktop.org/wiki/Software/shared-mime-info; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.mimadrid ]; }; } From 8836c4d71b13a3052fc5f360a987dea859c9bf5e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 30 Sep 2017 21:27:32 +0300 Subject: [PATCH 0495/2806] hdf5-fortran: Mark broken on Darwin Never succeeded. https://hydra.nixos.org/build/62044922 --- pkgs/tools/misc/hdf5/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 257ade40727..1b979bae090 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.free; # BSD-like homepage = https://www.hdfgroup.org/HDF5/; platforms = stdenv.lib.platforms.unix; + broken = (gfortran != null) && stdenv.isDarwin; }; } From d2f4539e5f49e4f92bf3c32d466ba0f507c41200 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 30 Sep 2017 21:44:09 +0300 Subject: [PATCH 0496/2806] pythonPackages.cgroup-utils: Linux only https://hydra.nixos.org/build/61731047 --- pkgs/development/python-modules/cgroup-utils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index ed0623fa778..e565e23458c 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utility tools for control groups of Linux"; maintainers = with maintainers; [ layus ]; + platforms = platforms.linux; license = licenses.gpl2; }; } From fd97fa71dd53e47f6efb3db1e0686e81b9d1d38b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 30 Sep 2017 22:32:27 +0300 Subject: [PATCH 0497/2806] darwin: Disable some more packages that have never built streamripper: https://hydra.nixos.org/build/61726659 racket: https://hydra.nixos.org/build/61750850 radare: https://hydra.nixos.org/build/61756146 stockfish: https://hydra.nixos.org/build/61726172 --- pkgs/applications/audio/streamripper/default.nix | 2 +- pkgs/development/interpreters/racket/default.nix | 2 +- pkgs/development/tools/analysis/radare/default.nix | 2 +- pkgs/games/stockfish/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 2df1e1e3b3b..47d9381b2de 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = http://streamripper.sourceforge.net/; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index fbb07468e5c..1a9475df284 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { homepage = http://racket-lang.org/; license = licenses.lgpl3; maintainers = with maintainers; [ kkallio henrytill vrthra ]; - platforms = platforms.x86_64; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index 6b7ba2a81cb..7ca0291fad9 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = http://radare.org/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 629d7b1ea82..14b9b424345 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { much stronger than the best human chess grandmasters. ''; maintainers = with maintainers; [ luispedro peti ]; - platforms = with platforms; i686 ++ x86_64; + platforms = ["x86_64-linux" "i686-linux"]; license = licenses.gpl2; }; From 10a612120fc7426c7038fdac9a1d1fefed2b3fa9 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 30 Sep 2017 21:40:50 +0200 Subject: [PATCH 0498/2806] xcas, giac: add myself as maintainer --- lib/maintainers.nix | 1 + pkgs/applications/science/math/giac/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a978313c42c..28636f64aa6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -575,6 +575,7 @@ swarren83 = "Shawn Warren "; swflint = "Samuel W. Flint "; swistak35 = "Rafał Łasocha "; + symphorien = "Guillaume Girol "; szczyp = "Szczyp "; sztupi = "Attila Sztupak "; taeer = "Taeer Bar-Yam "; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index d1645bf9010..5f1af4fe9c6 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { ## xcas is buildable on darwin but there are specific instructions I could ## not test platforms = platforms.linux; + maintainers = [ maintainers.symphorien ]; }; } From 1b56f7cbb497df74ffc078f9a6838263eb38cc43 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 29 Sep 2017 02:00:12 +0200 Subject: [PATCH 0499/2806] openmodelica: mark as broken, unmaintained (cherry picked from commit d9298e3a00edc796b040373a64a6284f60813278) --- pkgs/applications/science/misc/openmodelica/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 8d673a15fa8..9e9a10a011e 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = with maintainers; [ smironov ]; platforms = platforms.linux; + broken = true; }; } From d7d774deea78cec9cc9bb855a073e666405f7465 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 29 Sep 2017 02:13:55 +0200 Subject: [PATCH 0500/2806] gplates: mark as broken (cherry picked from commit 5b09ca07b8cf3ea87838a5b4af555e2830948ff1) --- pkgs/applications/science/misc/gplates/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 05e0091108a..c8f89c398b1 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = https://www.gplates.org; license = licenses.gpl2; platforms = platforms.all; + broken = true; }; } From 25b17ae1d78e0c2d48ac4a16a70f548661570add Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 30 Sep 2017 19:43:19 +0200 Subject: [PATCH 0501/2806] htslib: 1.5.0 -> 1.6.0 --- .../libraries/science/biology/htslib/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 5a08e32e7e9..a7e1c46c70a 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchurl, zlib, bzip2, lzma, curl }: +{ stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "${major}.0"; pname = "htslib"; - major = "1.5"; + major = "1.6"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2"; - sha256 = "0bcjmnbwp2bib1z1bkrp95w9v2syzdwdfqww10mkb1hxlmg52ax0"; + sha256 = "1jsca3hg4rbr6iqq6imkj4lsvgl8g9768bcmny3hlff2w25vx24m"; }; + propagatedNativeBuildInputs = [ perl ]; + buildInputs = [ zlib bzip2 lzma curl ]; configureFlags = "--enable-libcurl"; # optional but strongly recommended installFlags = "prefix=$(out)"; + enableParallelBuilding = true; + + doCheck = true; + + preCheck = '' + find test -name "*.pl" -exec sed -ie 's|/usr/bin/\(env[[:space:]]\)\{0,1\}perl|${perl}/bin/perl|' {} + + ''; + meta = with stdenv.lib; { description = "A C library for reading/writing high-throughput sequencing data"; license = licenses.mit; From ee2c76693e0ac2917fc74c737e0eee18a852fe6c Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 30 Sep 2017 19:44:48 +0200 Subject: [PATCH 0502/2806] samtools: 1.5.0 -> 1.6.0 --- .../science/biology/samtools/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index f8391a2d6b3..0f1f4692eb7 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -1,21 +1,31 @@ -{ stdenv, fetchurl, zlib, htslib, ncurses ? null }: +{ stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - major = "1.5"; + major = "1.6"; version = "${major}.0"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2"; - sha256 = "1xidmv0jmfy7l0kb32hdnlshcxgzi1hmygvig0cqrq1fhckdlhl5"; + sha256 = "17p4vdj2j2qr3b2c0v4100h6cg4jj3zrb4dmdnd9d9aqs74d4p7f"; }; buildInputs = [ zlib ncurses ]; + propagatedBuildInputs = [ htslib ]; + configureFlags = [ "--with-htslib=${htslib}" ] ++ stdenv.lib.optional (ncurses == null) "--without-curses"; + enableParallelBuilding = true; + + doCheck = true; + + preCheck = '' + sed -ie 's|/usr/bin/\(env[[:space:]]\)\{0,1\}perl|${perl}/bin/perl|' test/test.pl + ''; + meta = with stdenv.lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; From bebccf176effdb520f5c1ee0087caf6d10b9cd54 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 30 Sep 2017 19:45:26 +0200 Subject: [PATCH 0503/2806] bcftools: 1.5.0 -> 1.6.0 --- .../science/biology/bcftools/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index cfd72601d1e..b6fc8af4324 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, perl }: +{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, perl, bash }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - major = "1.5"; + major = "1.6"; version = "${major}.0"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2"; - sha256 = "0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz"; + sha256 = "10prgmf09a13mk18840938ijqgfc9y92hfc7sa2gcv07ddri0c19"; }; - buildInputs = [ zlib bzip2 lzma perl ]; + + nativeBuildInputs = [ bash ]; + + buildInputs = [ zlib bzip2 lzma ]; + + propagatedBuildInputs = [ htslib ]; makeFlags = [ "HSTDIR=${htslib}" @@ -19,6 +24,15 @@ stdenv.mkDerivation rec { "CC=cc" ]; + enableParallelBuilding = true; + + doCheck = true; + + preCheck = '' + sed -ie 's|/usr/bin/\(env[[:space:]]\)\{0,1\}perl|${perl}/bin/perl|' test/test.pl test/csq/{sort-csq,make-csq-test} misc/plot-vcfstats + sed -ie 's|/bin/bash|${bash}/bin/bash|' test/test.pl + ''; + meta = with stdenv.lib; { description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants"; license = licenses.mit; From 5449dd2bb743b791590647cee4da24699bbbddf8 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Sep 2017 16:10:37 +0000 Subject: [PATCH 0504/2806] mednafen: 0.9.47 -> 0.9.48, disable PIC, unversioned docs --- pkgs/misc/emulators/mednafen/default.nix | 42 ++++++++++++++---------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index a03695eed77..1172a89caf3 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,36 +1,42 @@ -{ stdenv, fetchurl, pkgconfig -, libX11, mesa, freeglut -, libjack2, libcdio, libsndfile, libsamplerate -, SDL, SDL_net, zlib -}: +{ stdenv, fetchurl, pkgconfig, freeglut, mesa, libcdio, libjack2 +, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: -with stdenv.lib; stdenv.mkDerivation rec { - name = "mednafen-${version}"; - version = "0.9.47"; + version = "0.9.48"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${name}.tar.xz"; - sha256 = "0flz6bjkzs9qrw923s4cpqrz4b2dhc2w7pd8mgw0l1xbmrh7w4si"; + sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; }; - buildInputs = - [ pkgconfig libX11 mesa freeglut libjack2 libcdio - libsndfile libsamplerate SDL SDL_net zlib ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + freeglut + mesa + libcdio + libjack2 + libsamplerate + libsndfile + libX11 + SDL + SDL_net + zlib + ]; + + hardeningDisable = [ "pic" ]; - # Install docs postInstall = '' - mkdir -p $out/share/doc/$name - cd Documentation - install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt + mkdir -p $out/share/doc + mv Documentation $out/share/doc/mednafen ''; meta = with stdenv.lib; { description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; - homepage = http://mednafen.github.io/; + homepage = https://mednafen.github.io/; license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } From 333a425e36cc2305fc70fc15266645a0f1281d80 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Sep 2017 16:13:38 +0000 Subject: [PATCH 0505/2806] mednafen-server: use $out/share/mednafen-server for standard.conf --- pkgs/misc/emulators/mednafen/server.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index 91a74171da9..75eeeea4c00 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -1,25 +1,21 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mednafen-server-${version}"; version = "0.5.2"; src = fetchurl { - url = "https://mednafen.github.io/releases/files/mednafen-server-0.5.2.tar.xz"; + url = "https://mednafen.github.io/releases/files/mednafen-server-${version}.tar.xz"; sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq"; }; - postInstall = '' - mkdir -p $out/share/$name - install -m 644 -t $out/share/$name standard.conf - ''; + postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf"; meta = with stdenv.lib; { description = "Netplay server for Mednafen"; - homepage = http://mednafen.github.io/; + homepage = https://mednafen.github.io/; license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } From 85049c5aad2ad3b82260019c205821f64b71c9e3 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sat, 30 Sep 2017 22:43:20 +0200 Subject: [PATCH 0506/2806] ruby: 2.3.4 -> 2.3.5 Fixes CVE-2017-14033, CVE-2017-0898 --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b4cd9f3f418..2e7d7f97819 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -204,11 +204,11 @@ in { }; }; - ruby_2_3_4 = generic { - version = rubyVersion "2" "3" "4" ""; + ruby_2_3_5 = generic { + version = rubyVersion "2" "3" "5" ""; sha256 = { - src = "1hy0zr4vwkqcjbykh2hp0d6ifkrhgskaxlzy6878sc9kr4bqzqcq"; - git = "0jjhgdjv3aayxb0flxjiny7xfzh3ggrqcpvgjv2ydm25padfbqmp"; + src = "1k6x4g68lq30i0myip5bn56rcbwjxmqq95j1fkdgbvwbnaxzfqjl"; + git = "0spwqz4b5xxqzs13azsd4xz4jkc3is7d9q4s6s2qilb8ib4863jl"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index cdf1bf26717..5bc1b858425 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -29,7 +29,7 @@ rec { "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.4" = ops useRailsExpress [ + "2.3.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da57a8eda06..3da3be23d88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6656,7 +6656,7 @@ with pkgs; ruby_2_0_0 ruby_2_1_10 ruby_2_2_7 - ruby_2_3_4 + ruby_2_3_5 ruby_2_4_2; # Ruby aliases @@ -6664,7 +6664,7 @@ with pkgs; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_7; - ruby_2_3 = ruby_2_3_4; + ruby_2_3 = ruby_2_3_5; ruby_2_4 = ruby_2_4_2; scsh = callPackage ../development/interpreters/scsh { }; From e1cc156f721a130101b4adb2c6b772b51a09821a Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 30 Sep 2017 16:32:56 +0000 Subject: [PATCH 0507/2806] mednaffe: GTK3, correct license, find mednafen w/o patching source --- pkgs/misc/emulators/mednaffe/default.nix | 23 ++++++++++++----------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index a72192b1fcf..c62d9c90ca7 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, mednafen }: +{ stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkgconfig, wrapGAppsHook +, gtk2 ? null, gtk3 ? null, mednafen }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "mednaffe-${version}"; @@ -11,19 +14,17 @@ stdenv.mkDerivation rec { sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m"; }; - patchPhase = '' - substituteInPlace src/mednaffe.c \ - --replace 'binpath = NULL' 'binpath = "${mednafen}/bin/mednafen"' - ''; + nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig wrapGAppsHook ]; + buildInputs = [ gtk2 gtk3 mednafen ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtk2 mednafen ]; + configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ]; + postInstall = "wrapProgram $out/bin/mednaffe --set PATH ${mednafen}/bin"; - meta = with stdenv.lib; { - description = "A GTK based frontend for mednafen"; + meta = { + description = "GTK-based frontend for mednafen emulator"; homepage = https://github.com/AmatCoder/mednaffe; - license = licenses.gpl3; - maintainers = with maintainers; [ sheenobu ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sheenobu yegortimoshenko ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da57a8eda06..fc06c48ae49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3265,7 +3265,9 @@ with pkgs; mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe/default.nix { }; + mednaffe = callPackage ../misc/emulators/mednaffe/default.nix { + gtk2 = null; + }; megacli = callPackage ../tools/misc/megacli { }; From 63274d615a9367bae28a2d55469b938225ddca3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Sep 2017 20:18:39 +0200 Subject: [PATCH 0508/2806] qmapshack: init at 1.9.1 --- pkgs/applications/misc/qmapshack/default.nix | 33 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/misc/qmapshack/default.nix diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix new file mode 100644 index 00000000000..7330dfa4f19 --- /dev/null +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromBitbucket, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }: + +stdenv.mkDerivation rec { + name = "qmapshack-${version}"; + version = "1.9.1"; + + src = fetchFromBitbucket { + owner = "maproom"; + repo = "qmapshack"; + rev = "V%20${version}"; + sha256 = "1yswdq1s9jjhwb3wfiy3kkiiaqzagw28vjqvl13jxcnmq7y763sr"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtscript qtwebkit gdal proj routino quazip ]; + + cmakeFlags = [ + "-DROUTINO_XML_PATH=${routino}/share/routino" + "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip" + "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home; + description = "Plan your next outdoor trip"; + license = licenses.gpl3; + maintainter = with maintainers; [ dotlambda ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da57a8eda06..f96e8ce0cae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16013,6 +16013,8 @@ with pkgs; qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; + qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; + qmetro = callPackage ../applications/misc/qmetro { }; qmidinet = callPackage ../applications/audio/qmidinet { }; From 40ed22650737a444fee7883e69e852fd4b808133 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Sep 2017 23:16:18 +0200 Subject: [PATCH 0509/2806] treewide: mark a bunch of failing builds as broken (cherry picked from commit 23fdbaa37599f490435056b9865023870656571b) [dezgeg: Un-mark shotcut, tokei & uchiwa that do build on master] --- nixos/release.nix | 2 +- pkgs/applications/audio/gnaural/default.nix | 1 + pkgs/applications/gis/grass/default.nix | 1 + pkgs/applications/graphics/meshlab/default.nix | 2 +- pkgs/applications/graphics/synfigstudio/default.nix | 2 ++ .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 1 + .../science/machine-learning/torch/torch-distro.nix | 3 +++ pkgs/applications/video/natron/default.nix | 1 + pkgs/applications/video/shotcut/default.nix | 4 ---- pkgs/development/compilers/rust/beta.nix | 1 + pkgs/development/compilers/rust/nightly.nix | 1 + pkgs/development/compilers/rust/rustc.nix | 2 ++ pkgs/development/compilers/swift/default.nix | 1 + pkgs/development/libraries/qxt/default.nix | 1 + pkgs/development/ocaml-modules/curses/default.nix | 1 + pkgs/development/tools/casperjs/default.nix | 1 + pkgs/games/odamex/default.nix | 1 + pkgs/games/spring/default.nix | 1 + 18 files changed, 21 insertions(+), 6 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index 7dc973a627c..ee706ff986d 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -303,7 +303,7 @@ in rec { #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; - tests.pgjwt = callTest tests/pgjwt.nix {}; + #tests.pgjwt = callTest tests/pgjwt.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; tests.pumpio = callTest tests/pump.io.nix {}; diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 2b78d1a4b6d..d68a48da090 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 790997e328b..5e4e838f345 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation { description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; + broken = true; }; } diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 07789fce3a9..d73697673bf 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - broken = stdenv.isLinux && stdenv.isi686; + broken = true; }; } diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index ea0d2338252..e34de18e328 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -42,6 +42,8 @@ let ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libxmlxx pango pkgconfig autoreconfHook ]; + + meta.broken = true; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 1afb1fa3490..542bcbc41b0 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ lluchs ]; platforms = [ "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 5ff510a52ce..91adb5283fd 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -105,6 +105,7 @@ let installPhase = '' make install-extra $makeFlags ''; + meta.broken = true; }; luafilesystem = buildLuaRocks { @@ -123,6 +124,7 @@ let luaffifb = buildLuaRocks { name = "luaffifb"; src = "${distro_src}/extra/luaffifb"; + meta.broken = true; }; sundown = buildLuaRocks rec { @@ -267,6 +269,7 @@ let preBuild = '' export Torch_DIR=${torch}/share/cmake/torch ''; + meta.broken = true; }; trepl = buildLuaRocks rec { diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 75dccbafd3f..550cd2930cd 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -122,5 +122,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 88cb43b4d91..2fd0d57b4e2 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -52,9 +52,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; - - # after qt5 bump it probably needs to be updated, - # but newer versions seem to need newer than the latest stable mlt - # broken = true; }; } diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix index 93aaeb9e16e..876c54a298b 100644 --- a/pkgs/development/compilers/rust/beta.nix +++ b/pkgs/development/compilers/rust/beta.nix @@ -25,6 +25,7 @@ rec { ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; doCheck = false; + broken = true; }; cargo = callPackage ./cargo.nix rec { diff --git a/pkgs/development/compilers/rust/nightly.nix b/pkgs/development/compilers/rust/nightly.nix index b69dffbd8b3..37a234ea129 100644 --- a/pkgs/development/compilers/rust/nightly.nix +++ b/pkgs/development/compilers/rust/nightly.nix @@ -22,6 +22,7 @@ rec { ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; doCheck = false; + broken = true; }; cargo = callPackage ./cargo.nix rec { diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index f5bcc73fd6d..73d78319b8c 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -10,6 +10,7 @@ , targetPatches , targetToolchains , doCheck ? true +, broken ? false , buildPlatform, hostPlatform } @ args: @@ -154,5 +155,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; + broken = broken; }; } diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 6cc9f372b97..7484d2568be 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -263,6 +263,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; # Swift doesn't support 32bit Linux, unknown on other platforms. platforms = [ "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 78dbe136672..5ed05ec6b32 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ forkk ]; + broken = true; }; } diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 4fd75e7aac5..834b810183b 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = ocaml.meta.platforms or []; + broken = true; }; } diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index 4485e678ab5..e07b3cd9db7 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -50,5 +50,6 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index ab2cd1090fb..44117166256 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ MP2E ]; + broken = true; }; } diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 634389d1410..40e97567d39 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; platforms = platforms.linux; + broken = true; }; } From 6024b7abe8efde40121a2e96b94b7eca7c6180b0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 28 Sep 2017 22:30:25 -0300 Subject: [PATCH 0510/2806] twolame: init at 2017-09-27 --- .../development/libraries/twolame/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/twolame/default.nix diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix new file mode 100644 index 00000000000..54ba8470fc5 --- /dev/null +++ b/pkgs/development/libraries/twolame/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub +, autoreconfHook, pkgconfig +, libsndfile }: + +stdenv.mkDerivation rec { + + name = "twolame-${version}"; + version = "2017-09-27"; + + src = fetchFromGitHub { + owner = "njh"; + repo = "twolame"; + rev = "977c8ac55d8ca6d5f35d1d413a119dac2b3b0333"; + sha256 = "1rq3yc8ygzdqid9zk6pixmm4w9sk2vrlx217lhn5bjaglv7iyf7x"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libsndfile ]; + + meta = with stdenv.lib;{ + description = "A MP2 encoder"; + longDescription = '' + TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on + tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 + code and portions of LAME. + ''; + homepage = http://www.twolame.org/; + license = with licenses; [ lgpl2Plus ]; + platforms = with platforms; [ unix ]; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03a4a5fa53e..11b5aff9882 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10720,6 +10720,8 @@ with pkgs; tremor = callPackage ../development/libraries/tremor { }; + twolame = callPackage ../development/libraries/twolame { }; + udns = callPackage ../development/libraries/udns { }; uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; From fcd3061e2a23d77314df91005494423a9641a7b1 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 30 Sep 2017 18:13:24 -0400 Subject: [PATCH 0511/2806] rclone: 1.37 -> 1.38 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 6dd6b5ebced..ad51703bd6f 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.37"; + version = "1.38"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "0krmdwzl4c68vxpbycqy2xba8vvqbka7xh3k2q6ldxsd8y2rypym"; + sha256 = "0f56qm4lz55anzqf6dmjfywmvqy10zi5cl69zz8lda8lmvrpjm1d"; }; outputs = [ "bin" "out" "man" ]; From baa7e397c1da5abda9de445e61f5efa735a57f11 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Oct 2017 00:22:36 +0200 Subject: [PATCH 0512/2806] gnome3.nautilus: add thumbnailers Nautilus, resp. gnome-desktop, scans `thumbnailers` directories under the paths in `XDG_DATA_DIRS`. gdk-pixbuf was not, for some reason, listed in the variable, therefore Nautilus did not generate image thumbnails. I also add librsvg to the variable so that SVG files can be rendered. It does not work at the moment, though, because of incorrect path to the renderer. --- pkgs/desktops/gnome-3/core/nautilus/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index d508f148359..f987df46034 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif , gtk, gnome3, libunique, intltool, gobjectIntrospection, gnome-autoar, glib -, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux }: +, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux, gdk_pixbuf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { # fatal error: gio/gunixinputstream.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + ) + ''; + # hardeningDisable = [ "format" ]; enableParallelBuilding = true; From 0c14753a4a122109690a6d968c63813e55b5e5a5 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 30 Sep 2017 13:34:11 +0000 Subject: [PATCH 0513/2806] giac: refactor --- .../science/math/giac/default.nix | 44 ++++++++++--------- pkgs/top-level/all-packages.nix | 8 ++-- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 5f1af4fe9c6..4ef00d56f18 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,47 +1,51 @@ -{stdenv, fetchurl, gmp, mpfr, pari, ntl, gsl, blas, -readline, gettext, liblapackWithAtlas, bison, yacc, flex, -mpfi, libpng, libao, gfortran, texlive, hevea, perl, -enableGui ? true, mesa ? null, xorg ? null, fltk ? null, +{ stdenv, fetchurl, texlive, bison, flex +, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas +, readline, gettext, libpng, libao, gfortran, perl +, enableGUI ? false, mesa ? null, xorg ? null, fltk ? null }: -assert enableGui -> mesa != null && xorg != null && fltk != null; +assert enableGUI -> mesa != null && xorg != null && fltk != null; stdenv.mkDerivation rec { - name = "giac-${version}"; + name = "${attr}-${version}"; + attr = if enableGUI then "giac-with-xcas" else "giac"; version = "1.4.9"; src = fetchurl { - url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/${name}.tar.bz2"; + url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/giac-${version}.tar.bz2"; sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai"; }; - - patchPhase = '' - for i in doc/*/Makefile* ; do + postPatch = '' + for i in doc/*/Makefile*; do substituteInPlace "$i" --replace "/bin/cp" "cp"; done; - ''; + ''; nativeBuildInputs = [ - texlive.combined.scheme-small hevea + texlive.combined.scheme-small bison flex ]; + # perl is only needed for patchShebangs fixup. buildInputs = [ - gmp mpfr pari ntl gsl mpfi liblapackWithAtlas bison yacc flex readline - gettext blas libpng gfortran perl - ] ++ stdenv.lib.optionals enableGui [ + gmp mpfr pari ntl gsl blas mpfi liblapackWithAtlas + readline gettext libpng libao gfortran perl + ] ++ stdenv.lib.optionals enableGUI [ mesa fltk xorg.libX11 ]; + outputs = [ "out" ]; + enableParallelBuilding = true; hardeningDisable = [ "format" "bindnow" "relro" ]; configureFlags = [ - "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" - "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa" - "--enable-ao" ] ++ stdenv.lib.optionals enableGui [ - "--enable-gui" "--with-x" - ]; + "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" + "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa" + "--enable-ao" + ] ++ stdenv.lib.optionals enableGUI [ + "--enable-gui" "--with-x" + ]; postInstall = '' # example Makefiles contain the full path to some commands diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24d8aa5ddaf..28a6eafe130 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9279,8 +9279,8 @@ with pkgs; libminc = callPackage ../development/libraries/libminc { }; - libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; - + libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmkv = callPackage ../development/libraries/libmkv { }; libmms = callPackage ../development/libraries/libmms { }; @@ -18435,8 +18435,8 @@ with pkgs; gfan = callPackage ../applications/science/math/gfan {}; - xcas = callPackage ../applications/science/math/giac { }; - giac = xcas.override { enableGui = false;}; + giac = callPackage ../applications/science/math/giac { }; + giac-with-xcas = giac.override { enableGUI = true; }; ginac = callPackage ../applications/science/math/ginac { }; From 3c0d7523bb803464f6917c069b026838f0fb0d00 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 30 Sep 2017 19:14:20 -0400 Subject: [PATCH 0514/2806] plex: 1.9.1.4272 -> 1.9.2.4285 --- pkgs/servers/plex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 37c5c633825..31746689719 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.9.1.4272"; - vsnHash = "b207937f1"; - sha256 = "e7e313700d994e9c406706cf5dbaab6974a998b5e7f556a014e66eaa4f9cf9c8"; + version = "1.9.2.4285"; + vsnHash = "9f65b88ae"; + sha256 = "0rz53kb4r32s734jhb3n65dcmb0mylhb6wcqinp0dg8w39ncv571"; }; in stdenv.mkDerivation rec { From adbba9d5f6f1769fe3bedc7033910cfbd8c9c2c6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 18 Jul 2017 01:44:55 +0200 Subject: [PATCH 0515/2806] gnome3.gcr: propagate pkg-config dependencies The pinentry_gnome package requires gcr. Unfortunately, when configure asks about the library (or `pkg-config --libs gcr-base-3` is used) it fails because glib is not in scope. ``` $ pkg-config --libs gcr-base-3 Package glib-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `glib-2.0.pc' to the PKG_CONFIG_PATH environment variable Package 'glib-2.0', required by 'gcr-base-3', not found ``` This commit moves glib and gtk to `propagatedBuildInputs` so pkgconfig could find them. See also 38b58bab62d60c3cd8a1cb0d3ccf3ade5d9cb2ee --- pkgs/desktops/gnome-3/core/gcr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 0798d69f9e6..e04bb734aea 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ - pkgconfig intltool gnupg glib gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32 + pkgconfig intltool gnupg gobjectIntrospection libxslt + libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32 ]; - propagatedBuildInputs = [ p11_kit ]; + propagatedBuildInputs = [ glib gtk p11_kit ]; #doCheck = true; From 4ad98786a0dd5b87f0d200ec27c05e02fceee3b9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Jul 2017 22:37:09 +0200 Subject: [PATCH 0516/2806] pinentry: add GNOME 3 frontend support --- pkgs/tools/security/pinentry/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 667831373c5..51fd4714161 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,12 +1,12 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null +, libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt4 ? null }: let mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; mkEnable = mkFlag "enable" "disable"; mkWith = mkFlag "with" "without"; - hasX = gtk2 != null || qt4 != null; + hasX = gtk2 != null || gcr != null || qt4 != null; in with stdenv.lib; stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn"; }; - buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ]; + buildInputs = [ libgpgerror libassuan libcap gtk2 gcr ncurses qt4 ]; prePatch = '' substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { (mkEnable (ncurses != null) "pinentry-curses") (mkEnable true "pinentry-tty") (mkEnable (gtk2 != null) "pinentry-gtk2") + (mkEnable (gcr != null) "pinentry-gnome3") (mkEnable (qt4 != null) "pinentry-qt4") ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fced3a1bb8..97815af9045 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3866,6 +3866,10 @@ with pkgs; gtk2 = null; }; + pinentry_gnome = pinentry_ncurses.override { + gcr = gnome3.gcr; + }; + pinentry_qt4 = pinentry_ncurses.override { inherit qt4; }; From 75bf151d251e3dc03e3188991f36c482f6eeed7d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 18 Jul 2017 04:32:36 +0200 Subject: [PATCH 0517/2806] pinentry: fix configure arguments pinentry 0.9.6 changed the `qt4` flag to just `qt`. Additionally, the `--with-x` option has not been there for a while. This commit renames and removes the flags, respectively. --- pkgs/tools/security/pinentry/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 51fd4714161..10a9d3504ac 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,7 +6,6 @@ let mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; mkEnable = mkFlag "enable" "disable"; mkWith = mkFlag "with" "without"; - hasX = gtk2 != null || gcr != null || qt4 != null; in with stdenv.lib; stdenv.mkDerivation rec { @@ -40,12 +39,11 @@ stdenv.mkDerivation rec { configureFlags = [ (mkWith (libcap != null) "libcap") - (mkWith (hasX) "x") (mkEnable (ncurses != null) "pinentry-curses") (mkEnable true "pinentry-tty") (mkEnable (gtk2 != null) "pinentry-gtk2") (mkEnable (gcr != null) "pinentry-gnome3") - (mkEnable (qt4 != null) "pinentry-qt4") + (mkEnable (qt4 != null) "pinentry-qt") ]; nativeBuildInputs = [ pkgconfig ]; From feddf1b2780cb97e120d3102259084c15dbd975f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 18 Jul 2017 06:06:57 +0200 Subject: [PATCH 0518/2806] pinentry: add optional libsecret dependency libsecret is used for cacheing passwords. --- pkgs/tools/security/pinentry/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 10a9d3504ac..0d957fc97e0 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt4 ? null +, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt4 ? null }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn"; }; - buildInputs = [ libgpgerror libassuan libcap gtk2 gcr ncurses qt4 ]; + buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ]; prePatch = '' substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses @@ -38,12 +38,13 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - (mkWith (libcap != null) "libcap") - (mkEnable (ncurses != null) "pinentry-curses") - (mkEnable true "pinentry-tty") - (mkEnable (gtk2 != null) "pinentry-gtk2") - (mkEnable (gcr != null) "pinentry-gnome3") - (mkEnable (qt4 != null) "pinentry-qt") + (mkWith (libcap != null) "libcap") + (mkEnable (libsecret != null) "libsecret") + (mkEnable (ncurses != null) "pinentry-curses") + (mkEnable true "pinentry-tty") + (mkEnable (gtk2 != null) "pinentry-gtk2") + (mkEnable (gcr != null) "pinentry-gnome3") + (mkEnable (qt4 != null) "pinentry-qt") ]; nativeBuildInputs = [ pkgconfig ]; From b34a8912955ef23c166e4f3d0e5af42f1c10c24a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 18 Jul 2017 15:54:47 +0200 Subject: [PATCH 0519/2806] gnome3.gcr: prevent dependency cycle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When overriding gnupg to uss pinentry gnome3 frontend, there is a dependency cycle: gnupg → pinentry_gnome → gcr → gnupg This commit overrides the gnupg required by gcr to not build GUI. --- pkgs/desktops/gnome-3/core/gcr/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index e04bb734aea..21b9d89e3c3 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -7,8 +7,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ - pkgconfig intltool gnupg gobjectIntrospection libxslt + buildInputs = let + gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome + in [ + pkgconfig intltool gpg gobjectIntrospection libxslt libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32 ]; From 3f7e3db74426f658b4625505d262c1f7b288606d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Sep 2017 18:32:50 +0200 Subject: [PATCH 0520/2806] pinentry: make GTK3 the default front-end See: https://github.com/NixOS/nixpkgs/issues/18559 --- nixos/modules/config/no-x-libs.nix | 2 +- pkgs/top-level/all-packages.nix | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index ae3e17ac27b..ec3103b4a40 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -35,7 +35,7 @@ with lib; networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; }; networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; }; networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; }; - pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; }; + pinentry = pkgs.pinentry.override { gcr = null; gtk2 = null; qt4 = null; }; }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97815af9045..b778fa33146 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3860,14 +3860,16 @@ with pkgs; pinentry = callPackage ../tools/security/pinentry { libcap = if stdenv.isDarwin then null else libcap; qt4 = null; + gtk2 = null; + gcr = gnome3.gcr; }; pinentry_ncurses = pinentry.override { - gtk2 = null; + gcr = null; }; - pinentry_gnome = pinentry_ncurses.override { - gcr = gnome3.gcr; + pinentry_gtk2 = pinentry_ncurses.override { + inherit gtk2; }; pinentry_qt4 = pinentry_ncurses.override { From 3c22ef8c0efe03c80a4c99f81fd0f255deda5443 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Sep 2017 14:33:00 +0000 Subject: [PATCH 0521/2806] ppsspp: 1.3 -> 1.4.2 --- pkgs/misc/emulators/ppsspp/default.nix | 50 ++++++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index ac11b574ca1..4c6093b0ba6 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,37 +1,41 @@ -{ stdenv, fetchgit, zlib, libpng, qt4, qmake4Hook, pkgconfig -, withGamepads ? true, SDL # SDL is used for gamepad functionality -}: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia +, glew, libzip, snappy, zlib, withGamepads ? true, SDL2 }: -assert withGamepads -> (SDL != null); - -let - version = "1.3"; - fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF"); -in +assert withGamepads -> (SDL2 != null); with stdenv.lib; -stdenv.mkDerivation rec{ - name = "PPSSPP-${version}"; - src = fetchgit { - url = "https://github.com/hrydgard/ppsspp.git"; - rev = "refs/tags/v${version}"; +stdenv.mkDerivation rec { + name = "PPSSPP-${version}"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "hrydgard"; + repo = "ppsspp"; + rev = "v${version}"; fetchSubmodules = true; - sha256 = "0l8vgdlw657r8gv7rz8iqa6zd9zrbzw10pwhcnahzil7w9qrd03g"; + sha256 = "0m4qkhx7q496sm7ibg2n7rm3npxzfr93iraxgndk0vhfk8vy8w75"; }; - buildInputs = [ zlib libpng qt4 ] - ++ (if withGamepads then [ SDL ] else [ ]); + patchPhase = '' + echo 'const char *PPSSPP_GIT_VERSION = "${src.rev}";' >> git-version.cpp + substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share + ''; - nativeBuildInputs = [ pkgconfig qmake4Hook ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qtbase qtmultimedia glew libzip snappy zlib ] + ++ optionals withGamepads [ SDL2 SDL2.dev ]; - qmakeFlags = [ "PPSSPPQt.pro" ]; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DUSING_QT_UI=ON" ]; - preConfigure = "cd Qt"; - installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin"; + installPhase = '' + mkdir -p $out/bin $out/share/ppsspp + mv PPSSPPQt $out/bin/ppsspp + mv assets $out/share/ppsspp + ''; meta = { - homepage = http://www.ppsspp.org/; - description = "A PSP emulator, the Qt4 version"; + homepage = https://www.ppsspp.org/; + description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fuuzetsu AndersonTorres ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcefe7f9ed4..cffd36ee412 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19107,7 +19107,7 @@ with pkgs; pjsip = callPackage ../applications/networking/pjsip { }; - PPSSPP = callPackage ../misc/emulators/ppsspp { SDL = SDL2; }; + PPSSPP = libsForQt5.callPackage ../misc/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; From 055759d27a34a0b5654c7cc1380f60023eb2f91e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 30 Sep 2017 11:59:35 +0000 Subject: [PATCH 0522/2806] yabause: Qt4 -> Qt5, disable emu-compatibility.com in About menu emu-compatibility.com is now defunct and thus should not be in About menu. Other minor changes: * linkage-rwx-linux-elf.diff -> linkage-rwx-linux-elf.patch * Mark some inputs as optional * Do not build with Doxygen by default: it does not produce any outputs * Do not build with OpenAL by default: SDL2 handles sound when present * Do not build with FreeGLUT by default: deprecated at upstream --- pkgs/misc/emulators/yabause/default.nix | 36 +++++++++---------- .../yabause/emu-compatibility.com.patch | 10 ++++++ ...x-elf.diff => linkage-rwx-linux-elf.patch} | 0 pkgs/top-level/all-packages.nix | 5 +-- 4 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 pkgs/misc/emulators/yabause/emu-compatibility.com.patch rename pkgs/misc/emulators/yabause/{linkage-rwx-linux-elf.diff => linkage-rwx-linux-elf.patch} (100%) diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 23d91040b12..2fc60b543e6 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,35 +1,33 @@ -{ stdenv, fetchurl, config -, cmake, pkgconfig -, doxygen -, qt -, libXmu, mesa, openal, SDL2, freeglut -}: +{ stdenv, fetchurl, cmake, pkgconfig, qtbase, mesa +, freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { - name = "yabause-${meta.version}"; + name = "yabause-${version}"; + # 0.9.15 only works with OpenGL 3.2 or later: + # https://github.com/Yabause/yabause/issues/349 + version = "0.9.14"; src = fetchurl { - url = "http://download.tuxfamily.org/yabause/releases/${meta.version}/${name}.tar.gz"; + url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz"; sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm"; }; - patches = [ ./linkage-rwx-linux-elf.diff ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qtbase mesa freeglut openal SDL2 ]; - buildInputs = - [ cmake pkgconfig doxygen qt libXmu mesa openal SDL2 freeglut ]; + patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ]; - cmakeConfigureFlags = [ - "-DYAB_PORTS='qt'" - "-DYAB_OPTIMIZED_DMA='ON'" - "-DYAB_NETWORK='ON'" ] ; + cmakeFlags = [ + "-DYAB_NETWORK=ON" + "-DYAB_OPTIMIZED_DMA=ON" + "-DYAB_PORTS=qt" + ] ; meta = with stdenv.lib; { - version = "0.9.14"; description = "An open-source Sega Saturn emulator"; - homepage = http://yabause.org/; + homepage = https://yabause.org/; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintaines; [ AndersonTorres ]; platforms = platforms.linux; }; } -# TODO: Qt5 diff --git a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch new file mode 100644 index 00000000000..5f13d2ee183 --- /dev/null +++ b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch @@ -0,0 +1,10 @@ +--- a/src/qt/ui/UIYabause.ui 2017-09-28 13:23:04.636014753 +0000 ++++ b/src/qt/ui/UIYabause.ui 2017-09-28 13:23:21.945763537 +0000 +@@ -230,7 +230,6 @@ + + &Help + +- + + + diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff b/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch similarity index 100% rename from pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff rename to pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcefe7f9ed4..eba9b71f707 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19446,8 +19446,9 @@ with pkgs; xzoom = callPackage ../tools/X11/xzoom {}; - yabause = callPackage ../misc/emulators/yabause { - qt = qt4; + yabause = libsForQt5.callPackage ../misc/emulators/yabause { + freeglut = null; + openal = null; }; yadm = callPackage ../applications/version-management/yadm { }; From c93c7752e9a4cf3b90f1c9e0692973ee131b0d6d Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Sep 2017 15:06:34 +0000 Subject: [PATCH 0523/2806] darcnes: use web.archive.org links, clean up --- pkgs/misc/emulators/darcnes/default.nix | 32 +++++++++++-------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index 12c76c89790..70e7351e295 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/misc/emulators/darcnes/default.nix @@ -1,28 +1,24 @@ -{stdenv, fetchurl, libX11, libXt, libXext, libXaw }: +{ stdenv, fetchurl, libX11, libXt, libXext, libXaw }: -assert stdenv.system == "i686-linux"; +stdenv.mkDerivation rec { + name = "darcnes-${version}"; + version = "9b0401"; -stdenv.mkDerivation { - name = "darcnes-9b0401"; src = fetchurl { - url = http://www.dridus.com/~nyef/darcnes/download/dn9b0401.tgz; + url = "https://web.archive.org/web/20130511081532/http://www.dridus.com/~nyef/darcnes/download/dn${version}.tgz"; sha256 = "05a7mh51rg7ydb414m3p5mm05p4nz2bgvspqzwm3bhbj7zz543k3"; }; - buildInputs = [ libX11 libXt libXext libXaw ]; - - installPhase = '' - mkdir -p $out/bin - cp darcnes $out/bin - ''; - patches = [ ./label.patch ]; - meta = { - homepage = http://www.dridus.com/~nyef/darcnes/; - description = "Multi-System emulator, specially for NES"; - /* Prohibited commercial use, credit required. */ - license = stdenv.lib.licenses.free; - }; + buildInputs = [ libX11 libXt libXext libXaw ]; + installPhase = "install -Dt $out/bin darcnes"; + meta = { + homepage = https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/; + description = "Sega Master System, Game Gear, SG-1000, NES, ColecoVision and Apple II emulator"; + # Prohibited commercial use, credit required. + license = stdenv.lib.licenses.free; + platforms = [ "i686-linux" ]; + }; } From bc334e1599dc4658a029b42b80e524173ea489e8 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 30 Sep 2017 23:38:28 +0000 Subject: [PATCH 0524/2806] qbittorrent: 3.3.15 -> 3.3.16, drop patch, enable parallel build --- .../networking/p2p/qbittorrent/default.nix | 12 ++++-------- .../p2p/qbittorrent/fix-lrelease.patch | 18 ------------------ 2 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 3baa5a8e480..9b6f2f1f1bb 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -6,15 +6,15 @@ }: assert guiSupport -> (dbus_libs != null); - with stdenv.lib; + stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.3.15"; + version = "3.3.16"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "1bnfnbkdg0088h25zzhlpcdh30y0k1m76bkhjsj1aali765c1fx7"; + sha256 = "0mxyn2pajvb55bhcaz55v64p2xzy15p0yy174s62b5y3f8cac27a"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -33,11 +33,7 @@ stdenv.mkDerivation rec { (if webuiSupport then "" else "--disable-webui") ] ++ optional debugSupport "--enable-debug"; - # The lrelease binary is named lrelease instead of lrelease-qt4 - patches = [ ./fix-lrelease.patch ]; - - # https://github.com/qbittorrent/qBittorrent/issues/1992 - enableParallelBuilding = false; + enableParallelBuilding = true; meta = { description = "Free Software alternative to µtorrent"; diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch deleted file mode 100644 index a906803e433..00000000000 --- a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/qm_gen.pri b/qm_gen.pri -index 5454440..2d5990c 100644 ---- a/qm_gen.pri -+++ b/qm_gen.pri -@@ -5,12 +5,7 @@ isEmpty(QMAKE_LRELEASE) { - win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe - else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease - unix { -- equals(QT_MAJOR_VERSION, 4) { -- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 } -- } -- equals(QT_MAJOR_VERSION, 5) { -- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 } -- } -+ !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } - } else { - !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } - } From 4810ee42927e2d37e1229859576578e06f4f58c5 Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 1 Oct 2017 02:39:01 +0100 Subject: [PATCH 0525/2806] nim: 0.17.0 -> 0.17.2 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 101f8ab64ba..fde4861e982 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nim-${version}"; - version = "0.17.0"; + version = "0.17.2"; src = fetchurl { url = "http://nim-lang.org/download/${name}.tar.xz"; - sha256 = "16vsmk4rqnkg9lc9h9jk62ps0x778cdqg6qrs3k6fv2g73cqvq9n"; + sha256 = "1gc2xk3ygmz9y4pm75pligssgw995a7gvnfpy445fjpw4d81pzxa"; }; doCheck = true; From e8ab9f97c5f951a6c937bad094c26369d4e06235 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 1 Oct 2017 01:22:41 +0000 Subject: [PATCH 0526/2806] merkaartor: 0.18.2 -> 0.18.3, Qt4 -> Qt5 --- pkgs/applications/misc/merkaartor/default.nix | 24 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index a1744f7a2c0..d1befec3408 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook, boost, proj, gdal, sqlite, pkgconfig }: +{ stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj +, qtbase, qtsvg, qtwebkit }: stdenv.mkDerivation rec { name = "merkaartor-${version}"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; rev = version; - sha256 = "1a8kzrc9w0b2a2zgw9dbbi15jy9ynv6nf2sg3k4dbh7f1s2ajx9l"; + sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88"; }; - buildInputs = [ qt4 boost proj gdal sqlite ]; + nativeBuildInputs = [ qmake pkgconfig ]; - nativeBuildInputs = [ qmake4Hook pkgconfig ]; + buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; - meta = { - description = "An openstreetmap editor"; - homepage = http://merkaartor.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - inherit (qt4.meta) platforms; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "OpenStreetMap editor"; + homepage = http://merkaartor.be/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcefe7f9ed4..a5305900916 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15376,7 +15376,7 @@ with pkgs; mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; meshlab = callPackage ../applications/graphics/meshlab { }; From 31ab1a35bf96f9f2e9f0c9016d6bbd9f540f69d1 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 1 Oct 2017 01:50:29 +0000 Subject: [PATCH 0527/2806] focuswriter: 1.5.3 -> 1.6.7, Qt4 -> Qt5, GPLv2 -> GPLv3 --- .../editors/focuswriter/default.nix | 24 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 28106cf876b..10816e0a283 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, pkgconfig, hunspell }: +{ stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia }: stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.5.3"; + version = "1.6.7"; src = fetchurl { - url = http://gottcode.org/focuswriter/focuswriter-1.5.3-src.tar.bz2; - sha256 = "1i58jxbiy95ijf81g8c3gwxhcg3irzssna3wv7vhrd57g4lcfj0w"; + url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; + sha256 = "10rqzinr6yd6ca06rklg34kdc08a3xgygfzmprsfg7gdsybfay5z"; }; - buildInputs = [ qt4 qmake4Hook pkgconfig hunspell ]; - - qmakeFlags = [ "PREFIX=/" ]; + nativeBuildInputs = [ pkgconfig qmake qttools ]; + buildInputs = [ hunspell qtbase qtmultimedia ]; + enableParallelBuilding = true; + + qmakeFlags = [ "PREFIX=/" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "Simple, distraction-free writing environment"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.madjar ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ madjar ]; + platforms = platforms.all; homepage = https://gottcode.org/focuswriter/; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcefe7f9ed4..59753832269 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14368,7 +14368,7 @@ with pkgs; fmsynth = callPackage ../applications/audio/fmsynth { }; - focuswriter = callPackage ../applications/editors/focuswriter { }; + focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { }; font-manager = callPackage ../applications/misc/font-manager { }; From 4126100103c5e9419378a010b5bb9ed8e6f6917c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 30 Sep 2017 23:20:52 -0300 Subject: [PATCH 0528/2806] entr: 3.8 -> 3.9 --- pkgs/tools/misc/entr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 582e01c6f2f..d37655134c5 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.8"; + version = "3.9"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "1g969gw92q8pd3zfbx37w14l92xd3nzi24083x47dns8v69ygcgb"; + sha256 = "0xk8y8asy0wxi5jx03c521p9919gjr8053lxpfzn83jkmqc8zmq2"; }; postPatch = '' From a67bcf91d99453d93b0f64b54145a75f65b17776 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 1 Oct 2017 02:46:25 +0000 Subject: [PATCH 0529/2806] far2l: unstable-2017-09-25 -> unstable-2017-09-30 --- pkgs/applications/misc/far2l/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index ad1a1b951bd..7bd876f1d4a 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -3,15 +3,15 @@ with stdenv.lib; stdenv.mkDerivation rec { - rev = "73e52ccbc7626631b6898c7324413ee1fc09bc0e"; - build = "unstable-2017-09-25.git${builtins.substring 0 7 rev}"; + rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26"; + build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = rev; - sha256 = "0pg1l2k5ycm6whr39gshpbgw62v51rfz3ddi6qhcx0nyzxcrczy5"; + sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; From c1716cd4c695e32e8f7667177f3bee2c9a078c69 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 1 Oct 2017 02:51:17 +0000 Subject: [PATCH 0530/2806] rosegarden: Qt4 -> Qt5 --- .../applications/audio/rosegarden/default.nix | 42 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 4fec0d0c37b..5966d4253f5 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,23 +1,35 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, ladspaPlugins, ladspaH, - dssi, liblo, liblrdf, fftwSinglePrec, libsndfile, - libsamplerate, perl, makedepend, libjack2, - withLirc ? false, lirc ? null } : +{ stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools +, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2 +, liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }: stdenv.mkDerivation (rec { version = "17.04"; name = "rosegarden-${version}"; src = fetchurl { - url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; + url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq"; }; - QTDIR = qt4; + patchPhase = '' + substituteInPlace src/CMakeLists.txt --replace svnheader svnversion + ''; + + nativeBuildInputs = [ cmake makedepend perl pkgconfig qttools ]; buildInputs = [ - cmake qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec - libsndfile libsamplerate perl makedepend libjack2 - ] ++ stdenv.lib.optional withLirc [ lirc ]; + dssi + fftwSinglePrec + ladspaH + ladspaPlugins + libjack2 + liblo + liblrdf + libsamplerate + libsndfile + lirc + qtbase + ]; enableParallelBuilding = true; @@ -25,11 +37,15 @@ stdenv.mkDerivation (rec { homepage = http://www.rosegardenmusic.com/; description = "Music composition and editing environment"; longDescription = '' - Rosegarden is a music composition and editing environment based around a MIDI sequencer that features a rich understanding of music notation and includes basic support for digital audio. - Rosegarden is an easy-to-learn, attractive application that runs on Linux, ideal for composers, musicians, music students, and small studio or home recording environments. - ''; + Rosegarden is a music composition and editing environment based around + a MIDI sequencer that features a rich understanding of music notation + and includes basic support for digital audio. - maintainers = [ maintainers.lebastr ]; + Rosegarden is an easy-to-learn, attractive application that runs on Linux, + ideal for composers, musicians, music students, and small studio or home + recording environments. + ''; + maintainers = with maintainers; [ lebastr ]; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcefe7f9ed4..5f363bcfddd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4200,7 +4200,7 @@ with pkgs; rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; - rosegarden = callPackage ../applications/audio/rosegarden { }; + rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; rowhammer-test = callPackage ../tools/system/rowhammer-test { }; From 0bf5a55a8b1f8dfc51a8173880b06dea60f082f6 Mon Sep 17 00:00:00 2001 From: Evan Wallace Date: Sun, 1 Oct 2017 05:16:16 +0000 Subject: [PATCH 0531/2806] sfml: 2.4.1 -> 2.4.2 --- pkgs/development/libraries/sfml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 05ecbfff906..d34280c1624 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -3,14 +3,14 @@ }: let - version = "2.4.1"; + version = "2.4.2"; in stdenv.mkDerivation rec { name = "sfml-${version}"; src = fetchurl { - url = "https://github.com/LaurentGomila/SFML/archive/${version}.tar.gz"; - sha256 = "13irazmqk9vcgkigsjcxns7xjmnz1gifw0b656z1rpz208diklgr"; + url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; + sha256 = "cf268fb487e4048c85e5b2f53d62596854762c98cba1c1b61ccd91f78253ef4b"; }; buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew libXrandr libXrender udev xcbutilimage From 0acf94bb9fa466d106e8e63884304d5ccdb37a6e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 07:12:52 +0000 Subject: [PATCH 0532/2806] htslib: fix up --- .../science/biology/htslib/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index a7e1c46c70a..b3c6d9f26d4 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "${major}.0"; pname = "htslib"; - major = "1.6"; + version = "1.6"; src = fetchurl { - url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2"; + url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2"; sha256 = "1jsca3hg4rbr6iqq6imkj4lsvgl8g9768bcmny3hlff2w25vx24m"; }; - propagatedNativeBuildInputs = [ perl ]; + # perl is only used during the check phase. + nativeBuildInputs = [ perl ]; buildInputs = [ zlib bzip2 lzma curl ]; @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { installFlags = "prefix=$(out)"; + preCheck = '' + patchShebangs test/ + ''; + enableParallelBuilding = true; doCheck = true; - preCheck = '' - find test -name "*.pl" -exec sed -ie 's|/usr/bin/\(env[[:space:]]\)\{0,1\}perl|${perl}/bin/perl|' {} + - ''; - meta = with stdenv.lib; { description = "A C library for reading/writing high-throughput sequencing data"; license = licenses.mit; @@ -35,4 +35,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.mimadrid ]; }; } - From 09a53969828ead5dd6a231e5db3b4a765fca47d3 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 07:30:56 +0000 Subject: [PATCH 0533/2806] samtools: fix up --- .../science/biology/samtools/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 0f1f4692eb7..640f32671bb 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,29 +3,28 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - major = "1.6"; - version = "${major}.0"; + version = "1.6"; src = fetchurl { - url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2"; + url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; sha256 = "17p4vdj2j2qr3b2c0v4100h6cg4jj3zrb4dmdnd9d9aqs74d4p7f"; }; - buildInputs = [ zlib ncurses ]; + nativeBuildInputs = [ perl ]; - propagatedBuildInputs = [ htslib ]; + buildInputs = [ zlib ncurses htslib ]; configureFlags = [ "--with-htslib=${htslib}" ] ++ stdenv.lib.optional (ncurses == null) "--without-curses"; + preCheck = '' + patchShebangs test/ + ''; + enableParallelBuilding = true; doCheck = true; - preCheck = '' - sed -ie 's|/usr/bin/\(env[[:space:]]\)\{0,1\}perl|${perl}/bin/perl|' test/test.pl - ''; - meta = with stdenv.lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; From d73bd7f50ab09ad511851f9b2ee812cc17136edf Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 07:31:55 +0000 Subject: [PATCH 0534/2806] bcftools: fix up --- .../science/biology/bcftools/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index b6fc8af4324..db12fc00c87 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, perl, bash }: +{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, bash }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - major = "1.6"; - version = "${major}.0"; + version = "1.6"; src = fetchurl { - url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2"; + url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2"; sha256 = "10prgmf09a13mk18840938ijqgfc9y92hfc7sa2gcv07ddri0c19"; }; + nativeBuildInputs = [ perl ]; - nativeBuildInputs = [ bash ]; - - buildInputs = [ zlib bzip2 lzma ]; - - propagatedBuildInputs = [ htslib ]; + buildInputs = [ htslib zlib bzip2 lzma curl ]; makeFlags = [ "HSTDIR=${htslib}" @@ -24,15 +20,16 @@ stdenv.mkDerivation rec { "CC=cc" ]; + preCheck = '' + patchShebangs misc/ + patchShebangs test/ + sed -ie 's|/bin/bash|${bash}/bin/bash|' test/test.pl + ''; + enableParallelBuilding = true; doCheck = true; - preCheck = '' - sed -ie 's|/usr/bin/\(env[[:space:]]\)\{0,1\}perl|${perl}/bin/perl|' test/test.pl test/csq/{sort-csq,make-csq-test} misc/plot-vcfstats - sed -ie 's|/bin/bash|${bash}/bin/bash|' test/test.pl - ''; - meta = with stdenv.lib; { description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants"; license = licenses.mit; From 77500400bad1686522588fdcef455ab0ac3f3e34 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 08:33:02 +0000 Subject: [PATCH 0535/2806] ppsspp: fix up --- pkgs/misc/emulators/ppsspp/default.nix | 4 +++- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 4c6093b0ba6..159eefad666 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -5,7 +5,7 @@ assert withGamepads -> (SDL2 != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "PPSSPP-${version}"; + name = "ppsspp-${version}"; version = "1.4.2"; src = fetchFromGitHub { @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { mv assets $out/share/ppsspp ''; + enableParallelBuilding = true; + meta = { homepage = https://www.ppsspp.org/; description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3abaa7402fb..9de63505831 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -25,7 +25,7 @@ in mapAliases (rec { accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 - adobeReader = adobe-reader; + adobeReader = adobe-reader; # added 2013-11-04 aircrackng = aircrack-ng; # added 2016-01-14 ammonite-repl = ammonite; # added 2017-05-02 arduino_core = arduino-core; # added 2015-02-04 @@ -117,6 +117,7 @@ mapAliases (rec { pidgin-with-plugins = pidgin; # added 2016-06 pidginlatexSF = pidginlatex; # added 2014-11-02 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 + PPSSPP = ppsspp; # added 2017-10-01 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 QmidiNet = qmidinet; # added 2016-05-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cffd36ee412..20ed6f43f39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19107,7 +19107,7 @@ with pkgs; pjsip = callPackage ../applications/networking/pjsip { }; - PPSSPP = libsForQt5.callPackage ../misc/emulators/ppsspp { }; + ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; From e57f8b67f3aba7f94a63826d1ddcf21da6384398 Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Wed, 27 Sep 2017 22:30:52 +0700 Subject: [PATCH 0536/2806] gmsh: 2.12.0 -> 3.0.5 --- pkgs/applications/science/math/gmsh/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index b5596120592..bb24ac9bd49 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, fltk, libjpeg +{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg , zlib, mesa, mesa_glu, xorg }: -let version = "2.12.0"; in +let version = "3.0.5"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "02cx2mfbxx6m18s54z4yzbk4ybch3v9489z7cr974y8y0z42xgbz"; + sha256 = "ae39ed81178d94b76990b8c89b69a5ded8910fd8f7426b800044d00373d12a93"; }; # The original CMakeLists tries to use some version of the Lapack lib # that is supposed to work without Fortran but didn't for me. patches = [ ./CMakeLists.txt.patch ]; - buildInputs = [ cmake blas liblapack gfortran fltk libjpeg zlib mesa + buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa mesa_glu xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE ]; + enableParallelBuilding = true; + meta = { description = "A three-dimensional finite element mesh generator"; homepage = http://gmsh.info/; From 2847acf517475bdac6731b96ec406006f5105494 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 08:59:12 +0000 Subject: [PATCH 0537/2806] gpac: fix up --- pkgs/applications/video/gpac/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index c3f949ae5b7..7a8b66d2d28 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -13,9 +13,13 @@ stdenv.mkDerivation rec { # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended - nativeBuildInputs = [ pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig ]; - meta = { + buildInputs = [ zlib ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Open Source multimedia framework for research and academic purposes"; longDescription = '' GPAC is an Open Source multimedia framework for research and academic purposes. @@ -30,12 +34,8 @@ stdenv.mkDerivation rec { And some server tools included in MP4Box and MP42TS applications. ''; homepage = https://gpac.wp.imt.fr; - license = stdenv.lib.licenses.lgpl21; - - maintainers = [ - stdenv.lib.maintainers.bluescreen303 - stdenv.lib.maintainers.mgdelacroix - ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21; + maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; + platforms = platforms.linux; }; } From 7742797e673408d166f6608661773dc609b0f9b2 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 1 Oct 2017 10:19:39 +0100 Subject: [PATCH 0538/2806] telegraf: 1.3.0 -> 1.4.1 --- pkgs/servers/monitoring/telegraf/default.nix | 8 +- .../{deps-1.3.0.nix => deps-1.4.1.nix} | 111 ++++++++++++++---- 2 files changed, 93 insertions(+), 26 deletions(-) rename pkgs/servers/monitoring/telegraf/{deps-1.3.0.nix => deps-1.4.1.nix} (84%) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index b34fc648531..8e11fe877c8 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.3.0"; + version = "1.4.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,9 +12,13 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "0vcv4ylqzp4fvmpd3n5m0n2kxx39fcp9x62ny7cja4wraq36mdn0"; + sha256 = "1q0xl599zyqyralsl6mml1xl0h2206564sa2azivjmg48z7blcll"; }; + buildFlagsArray = [ ''-ldflags= + -X main.version=${version} + '' ]; + goDeps = ./. + builtins.toPath "/deps-${version}.nix"; meta = with lib; { diff --git a/pkgs/servers/monitoring/telegraf/deps-1.3.0.nix b/pkgs/servers/monitoring/telegraf/deps-1.4.1.nix similarity index 84% rename from pkgs/servers/monitoring/telegraf/deps-1.3.0.nix rename to pkgs/servers/monitoring/telegraf/deps-1.4.1.nix index bb31a496603..4391d58164f 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.3.0.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.4.1.nix @@ -1,4 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { goPackagePath = "collectd.org"; @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Shopify/sarama"; - rev = "574d3147eee384229bf96a5d12c207fe7b5234f3"; - sha256 = "02ckm91bngkrbvkf4j7s5swrjjv3dr9kn9glwyc15apjv2ynkc4j"; + rev = "c01858abb625b73a3af51d0798e4ad42c8147093"; + sha256 = "139fyfi2h6qas83kan0kpm9d92985nl1fyhijswy37d6ia86797w"; }; } { @@ -45,13 +45,22 @@ sha256 = "10lmpz5vf2ysw8gnl0z8ravl4vvy48nbh8xpk2zzgifb6yn3x192"; }; } + { + goPackagePath = "github.com/apache/thrift"; + fetch = { + type = "git"; + url = "https://github.com/apache/thrift"; + rev = "4aaa92ece8503a6da9bc6701604f69acf2b99d07"; + sha256 = "1my582c0ln1byxid5acdd6dk7lvi7lwd6gka10s4bp4w3xrd55x8"; + }; + } { goPackagePath = "github.com/aws/aws-sdk-go"; fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "7524cb911daddd6e5c9195def8e59ae892bef8d9"; - sha256 = "0dm8zfv3jdrbnhm1yyq6507v5lzi6wwhrpwkdswhf0ihgc9ca90z"; + rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0"; + sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl"; }; } { @@ -63,6 +72,15 @@ sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; }; } + { + goPackagePath = "github.com/bsm/sarama-cluster"; + fetch = { + type = "git"; + url = "https://github.com/bsm/sarama-cluster"; + rev = "ccdc0803695fbce22f1706d04ded46cd518fd832"; + sha256 = "1jbb03bygjzzs6wyxp6cp057kyiyv80schwlhgi366nizp52hd56"; + }; + } { goPackagePath = "github.com/cenkalti/backoff"; fetch = { @@ -113,8 +131,17 @@ fetch = { type = "git"; url = "https://github.com/docker/docker"; - rev = "b89aff1afa1f61993ab2ba18fd62d9375a195f5d"; - sha256 = "1lkj1wmv4nfj3vrrdc072p5iib8p1l0y52mlg55p94b20v18ph2m"; + rev = "f5ec1e2936dcbe7b5001c2b817188b095c700c27"; + sha256 = "1y3rkzgg8vpjq61y473lnh0qyc6msl4ixw7ci2p56fyqrhkmhf96"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"; + sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb"; }; } { @@ -279,15 +306,6 @@ sha256 = "1a57hm0zwyi70am670s0pkglnkk1ilddnmfxz1ba7innpkf5z6s7"; }; } - { - goPackagePath = "github.com/klauspost/crc32"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/crc32"; - rev = "cb6bfca970f6908083f26f39a79009d608efd5cd"; - sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n"; - }; - } { goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; fetch = { @@ -351,6 +369,24 @@ sha256 = "04npqz6ajr4r2w5jfvfzppr307qrwr57w4c1ppq9p9ddf7hx3wpz"; }; } + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8"; + sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1"; + }; + } + { + goPackagePath = "github.com/openzipkin/zipkin-go-opentracing"; + fetch = { + type = "git"; + url = "https://github.com/openzipkin/zipkin-go-opentracing"; + rev = "1cafbdfde94fbf2b373534764e0863aa3bd0bf7b"; + sha256 = "1vpl3mpvhljzpnll67ip3m9aazy3dvgi57n7w3pn8kg3b7kr4rwj"; + }; + } { goPackagePath = "github.com/pierrec/lz4"; fetch = { @@ -369,6 +405,15 @@ sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja"; }; } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } { goPackagePath = "github.com/prometheus/client_golang"; fetch = { @@ -437,8 +482,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "70693b6a3da51a8a686d31f1b346077bbc066062"; - sha256 = "0mrmwfpq8irqbmcqx64x7n1dw0qpl9kz4vbwm7c8bpfpjqmmni6b"; + rev = "9a4a9167ad3b4355dbf1c2c7a0f5f0d3fb1e9ab9"; + sha256 = "0pzvkszga4clj3nqlbs9g9rk7jxb8jdcszhscwgk1chqqwifhyxj"; }; } { @@ -541,12 +586,12 @@ }; } { - goPackagePath = "gopkg.in/dancannon/gorethink.v1"; + goPackagePath = "gopkg.in/asn1-ber.v1"; fetch = { type = "git"; - url = "https://gopkg.in/dancannon/gorethink.v1"; - rev = "edc7a6a68e2d8015f5ffe1b2560eed989f8a45be"; - sha256 = "0602082mfypdm98i963sdvij8l5ia5cw9r9cy7m6a60cvh1xmaka"; + url = "https://gopkg.in/asn1-ber.v1"; + rev = "4e86f4367175e39f69d9358a5f17b4dda270378d"; + sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk"; }; } { @@ -558,6 +603,24 @@ sha256 = "1p1sljfpbg2bp4qv7ghvz1wcmmsbcfclsninxa97kr0v7na7jw5p"; }; } + { + goPackagePath = "gopkg.in/gorethink/gorethink.v3"; + fetch = { + type = "git"; + url = "https://gopkg.in/gorethink/gorethink.v3"; + rev = "7ab832f7b65573104a555d84a27992ae9ea1f659"; + sha256 = "1pri52ac45aqf5a2kmsd4mfhyfbkd1snkjbvanrdgipikysxi696"; + }; + } + { + goPackagePath = "gopkg.in/ldap.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/ldap.v2"; + rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f"; + sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895"; + }; + } { goPackagePath = "gopkg.in/mgo.v2"; fetch = { @@ -572,8 +635,8 @@ fetch = { type = "git"; url = "https://gopkg.in/olivere/elastic.v5"; - rev = "ee3ebceab960cf68ab9a89ee6d78c031ef5b4a4e"; - sha256 = "0pby1b8s0h964cq6nld0arapkbfqb8vzm1k41cnxjq14ryh8adlh"; + rev = "3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26"; + sha256 = "1zkwprs68q1r7pigb59n8zbw8610z9r1pi6r0s28kzdgiv30sfdm"; }; } { From d67137dd5576562edc7b57e8a00c466e3ba6cefd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 11 Aug 2017 11:42:46 +0100 Subject: [PATCH 0539/2806] iwd: 2017-06-02 -> 2017-09-22 --- pkgs/os-specific/linux/iwd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index adaca90650d..52c98049413 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,16 +3,16 @@ let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "58e873d7463f3a7f91e02260585bfa50cbc77668"; - sha256 = "12k1f1iarm29j8k16mhw83xx7r3bama4lp0fchhnj7iwxrpgs4gh"; + rev = "e0dbdfbd5992bd3e78029b83930b9020e74cdaa5"; + sha256 = "031m1vvcrhggnyvvqyrqpzldi2amsbvhdfcxrypzqz58vysk69vm"; }; in stdenv.mkDerivation rec { - name = "iwd-unstable-2017-06-02"; + name = "iwd-unstable-2017-09-22"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; - rev = "6c64ae34619bf7f18cba007d8b0374badbe7c17e"; - sha256 = "19rkf6lk213hdfs40ija7salars08zw6k5i5djdlpcn1j6y69i36"; + rev = "31631e1935337910c7bc0c3eb215f579143c1fe0"; + sha256 = "0xl8ali5hy7ragdc4palm857y0prcg32294hv3vv28r9r4x4llcm"; }; configureFlags = [ From acf0ee69ba8a4a4713b085e99fd7ddaf0daccd4b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 27 Sep 2017 18:24:29 +0200 Subject: [PATCH 0540/2806] vim-plugins: add `overrideAttrs` support for `buildVimPluginFrom2Nix` --- pkgs/misc/vim-plugins/vim-utils.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index b659266ace7..23749fd4ce6 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -373,8 +373,10 @@ rec { } ''; - addRtp = path: derivation: - derivation // { rtp = "${derivation}/${path}"; }; + addRtp = path: attrs: derivation: + derivation // { rtp = "${derivation}/${path}"; } // { + overrideAttrs = f: buildVimPlugin (attrs // f attrs); + }; buildVimPlugin = a@{ name, @@ -389,7 +391,7 @@ rec { addonInfo ? null, ... }: - addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // { + addRtp "${rtpPath}/${path}" a (stdenv.mkDerivation (a // { name = namePrefix + name; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; From 2cc22aca753e8959765addedc4dc44955a8304a6 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Tue, 5 Sep 2017 14:12:27 +0300 Subject: [PATCH 0541/2806] xflux-gui: 2016-09-21 -> 1.1.10 --- pkgs/tools/misc/xflux/gui.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 1fd3b3d8371..d8959687945 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -4,13 +4,13 @@ }: pythonPackages.buildPythonApplication rec { name = "xflux-gui-${version}"; - version = "2016-09-21"; + version = "1.1.10"; src = fetchFromGitHub { repo = "xflux-gui"; owner = "xflux-gui"; - rev = "0b56204477494b473a390e8b0db043437ec14f32"; - sha256 = "15pr8f31jnhqjlpvasnj6cmm6hw5gljphh2pxzav3zd9bp4yl56r"; + rev = "v${version}"; + sha256 = "1k67qg9y4c0n9ih0syx81ixbdl2x89gd4arwh71316cshskn0rc8"; }; propagatedBuildInputs = with pythonPackages; [ @@ -32,7 +32,6 @@ pythonPackages.buildPythonApplication rec { postFixup = '' wrapGAppsHook - makeWrapperArgs="''${gappsWrapperArgs[@]}" wrapPythonPrograms patchPythonScript $out/${pythonPackages.python.sitePackages}/fluxgui/fluxapp.py ''; From fa2adc6129ece97beef0f7bf6dd2e16bf5e4693a Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 1 Oct 2017 10:56:05 +0100 Subject: [PATCH 0542/2806] mkdocs: run tests --- .../tools/documentation/mkdocs/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 1aecb267552..144bd059634 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -1,4 +1,4 @@ -{ lib, python }: +{ lib, python, fetchFromGitHub }: with python.pkgs; @@ -7,11 +7,21 @@ buildPythonApplication rec { version = "0.16.3"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "0z9n0dnidnvm511pdzf73grmr4xn59znkfalq8x9gw5v7lqwa2mc"; + src = fetchFromGitHub { + owner = "mkdocs"; + repo = "mkdocs"; + rev = version; + sha256 = "0gssa5gbd1y2v3azdhf2zh7ayx4ncfag4r2a6fi96jbic64r3qrs"; }; + checkInputs = [ + nose nose-exclude mock + ]; + + NOSE_EXCLUDE_TESTS="mkdocs.tests.gh_deploy_tests.TestGitHubDeploy;mkdocs.tests.config.config_tests.ConfigTests"; + + checkPhase = "nosetests mkdocs"; + propagatedBuildInputs = [ tornado livereload From a58120cebd55f9cc88eea9b4866f1c71ce168e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 1 Oct 2017 11:56:08 +0200 Subject: [PATCH 0543/2806] ibus: hack-fix build after glib update It isn't nice, but I didn't see any other quick way to fix this. --- pkgs/tools/inputmethods/ibus/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 3b076bb8ff6..69ac0ad3ef6 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -50,6 +50,12 @@ let }; pyEnv = python3.buildEnv.override { extraLibs = [ python3.pkgs.pygobject3 ]; + + # ImportError: No module named site + postBuild = '' + makeWrapper '${glib.dev}/bin/glib-genmarshal' "$out"/bin/glib-genmarshal \ + --unset PYTHONPATH + ''; }; in stdenv.mkDerivation rec { name = "ibus-${version}"; From 6f71cce5304a51e004a1cd383a3659f7f2f0591d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 1 Oct 2017 11:00:26 +0100 Subject: [PATCH 0544/2806] python.pkgs.livereload: enable tests --- .../python-modules/livereload/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index fba324d4393..fa9067fa0fe 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -1,10 +1,11 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , nose , django , tornado , six +, pytest }: buildPythonPackage rec { @@ -12,15 +13,20 @@ buildPythonPackage rec { version = "2.5.1"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "0b2yyfnpddmrwjfqsndidzchkf3l9jlgzfkwl8dplim9gq6y2ba2"; + src = fetchFromGitHub { + owner = "lepture"; + repo = "python-livereload"; + rev = "v${version}"; + sha256 = "1irs59wqmffp8q4l9fh7givs05mamlgm5n7ga49gwxp5imwrdzba"; }; buildInputs = [ nose django ]; propagatedBuildInputs = [ tornado six ]; + checkInputs = [ pytest ]; + checkPhase = "pytest tests"; + meta = { description = "Runs a local server that reloads as you develop"; homepage = "https://github.com/lepture/python-livereload"; From a2ce4f25fe082bf3d53c5ba92710d05bddf3ade5 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Sun, 1 Oct 2017 12:44:06 +0200 Subject: [PATCH 0545/2806] 17.09 release notes: fix typo --- nixos/doc/manual/release-notes/rl-1709.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 4e4b0178a08..66f7b01db72 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -534,7 +534,7 @@ FLUSH PRIVILEGES; Nixpkgs overlays may now be specified with a file as well as a directory. The value of <nixpkgs-overlays> may be a file, and ~/.config/nixpkgs/overlays.nix can be used instead of the - ~/.config/nixpkgs/overalys directory. + ~/.config/nixpkgs/overlays directory. See the overlays chapter of the Nixpkgs manual for more details. From d943f68a985d783c88fb8a874f7c84c86fa701dd Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 11:05:40 +0000 Subject: [PATCH 0546/2806] botocore: 1.5.71 -> 1.7.20 --- 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 0d3b38066b5..956f1d297fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2184,11 +2184,11 @@ in { botocore = buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.5.71"; + version = "1.7.20"; src = fetchPypi { inherit pname version; - sha256 = "1fgg28halsy4g43wjpkbd6l0wqiwyzkd4zjrzbbyzw4dxbsf3xfm"; + sha256 = "16sy35bp9i2g9785l8jzcd4ddc2nydqs3wnkqwi36xx6l3bdbn13"; }; propagatedBuildInputs = with self; [ From 4ae505074144b5dcc91b76963febbc25632f00a8 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 11:07:50 +0000 Subject: [PATCH 0547/2806] boto3: 1.4.4 -> 1.4.7 --- 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 956f1d297fb..986e977624f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2145,13 +2145,13 @@ in { boto3 = buildPythonPackage rec { name = "boto3-${version}"; - version = "1.4.4"; + version = "1.4.7"; src = pkgs.fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "1zngj38a2dmc02p3ha9crzv9k682f0zgyyfx1bgg8hwwrnggikwl"; + sha256 = "0ca08xkkx6py08gqgn1aci9pklidwivxbvpwjv7623jr21avakdi"; }; propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++ From 156c4799bf3da0c7ba663fe3334d043f8f467126 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 11:08:24 +0000 Subject: [PATCH 0548/2806] tiros: 1.0.38 -> 1.0.39 --- pkgs/development/python-modules/tiros/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index ab7de4bfa77..c0056eb66b3 100644 --- a/pkgs/development/python-modules/tiros/default.nix +++ b/pkgs/development/python-modules/tiros/default.nix @@ -1,20 +1,15 @@ -{ stdenv -, fetchPypi -, buildPythonPackage -, semantic-version -, boto3 -, flask -, docutils +{ stdenv, fetchPypi, buildPythonPackage +, semantic-version, boto3, flask, docutils, requests }: buildPythonPackage rec { pname = "tiros"; name = "${pname}-${version}"; - version = "1.0.38"; + version = "1.0.39"; src = fetchPypi { inherit pname version; - sha256 = "0k668z9gb5vh304gysynj4rxgi24wy2vl4a33dnwkri2g6db3s4n"; + sha256 = "10wh84lpl7k8i69hlxwrzp2lln63w2afv9l7ij7r3lqjwd0z0skr"; }; patchPhase = '' @@ -22,5 +17,5 @@ buildPythonPackage rec { sed -i "s/'datetime',//" setup.py ''; - propagatedBuildInputs = [ semantic-version boto3 flask docutils ]; + propagatedBuildInputs = [ semantic-version boto3 flask docutils requests ]; } From a56d75e87c5df9e4938468cb23a195cff8622022 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 11:08:41 +0000 Subject: [PATCH 0549/2806] awscli: 1.11.108 -> 1.11.162 --- 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 986e977624f..f43a32e7f52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -776,12 +776,12 @@ in { in buildPythonPackage rec { name = "${pname}-${version}"; pname = "awscli"; - version = "1.11.108"; + version = "1.11.162"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "1wz76hkljc25zzfa2l5jv0mbr5vx6d9ixq4sq0p3zf3l45ql6mdf"; + sha256 = "0ff17fdzzncrzl7ps1cyrs0c5f82ncbvflnjz8sd1vkcmn9yij8r"; }; # No tests included From a093bf8b88606c00188227245600038f5422f86e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Oct 2017 14:47:41 +0200 Subject: [PATCH 0550/2806] gnome3.gnome_control_center: fix thumbnailers path Just like Nautilus (see #29970), GNOME Control Center also uses gnome-desktop for generating thumbnails. In particular, it tries to make a thumbnail from a file choosen as a profile picture, and when it does not succeed, it will not allow that file to be chosen. Of course, whithout a thumbnailer, it will always fail. https://github.com/GNOME/gnome-control-center/blob/43129a1cfd30374c3ff45c54eae9ee5cd68ae1b6/panels/user-accounts/um-photo-dialog.c#L190-L192 Since gnome-desktop scans `thumbnailers` directories under the paths in `XDG_DATA_DIRS`, gdk-pixbuf had to be added to the path to provide access to image thumbnailer. --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index b116c2902da..a6cc7ec962a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -41,6 +41,9 @@ stdenv.mkDerivation rec { preFixup = with gnome3; '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share" + # Thumbnailers (for setting user profile pictures) + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" ) for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" From dd200f81972217866c6cb41268a5820a2ea31ad6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Oct 2017 01:30:17 +0200 Subject: [PATCH 0551/2806] librsvg: fix thumbnailer path librsvg hooks itself into gdk-pixbuf and then uses gdk-pixbuf-thumbnailer as the thumbnailer, extending its supported MIME type list. Unfortunately, librsvg assumes the thumbnailer will be located in the same bindir as librsvg binaries would, which is not true on Nix-powered systems. This commit corrects the bindir path of the thumbnailer to the gdk_pixbuf derivation. --- pkgs/development/libraries/librsvg/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 447712fc7db..7845f28adc9 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation rec { -i gdk-pixbuf-loader/Makefile sed -e "s#\$(GDK_PIXBUF_QUERYLOADERS)#GDK_PIXBUF_MODULEDIR=$GDK_PIXBUF/loaders \$(GDK_PIXBUF_QUERYLOADERS)#" \ -i gdk-pixbuf-loader/Makefile + + # Fix thumbnailer path + sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk_pixbuf}/bin\1#g" \ + -i gdk-pixbuf-loader/librsvg.thumbnailer.in ''; # Merge gdkpixbuf and librsvg loaders From 05d2603173d428196b0f75703f5f1ee61e31c0ad Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 1 Oct 2017 15:24:18 +0200 Subject: [PATCH 0552/2806] proot: fix aarch64 build --- pkgs/tools/system/proot/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 5d65267311f..08d5f7665aa 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, talloc, docutils +{ stdenv, fetchFromGitHub, fetchpatch +, talloc, docutils , enableStatic ? false }: stdenv.mkDerivation rec { @@ -17,6 +18,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + (fetchpatch { # debian patch for aarch64 build + sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv"; + url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch"; + }) + ]; + preBuild = stdenv.lib.optionalString enableStatic '' export LDFLAGS="-static" ''; From ab8e5f66aada83d02723e71c2b98ac0264d7fd09 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 1 Oct 2017 15:24:30 +0200 Subject: [PATCH 0553/2806] proot: add makefu as maintainer --- pkgs/tools/system/proot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 08d5f7665aa..640750b4f2d 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ ianwookim nckx ]; + maintainers = with maintainers; [ ianwookim nckx makefu ]; }; } From a217f57292b940ea66765f8f0cde100640ba7b58 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 24 Sep 2017 23:04:48 +0000 Subject: [PATCH 0554/2806] fonts/libertine: remove darwin from supported platforms --- pkgs/data/fonts/libertine/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index 82a9a4a952a..91a7932c2ca 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHash = "1mj0j0hkp8pn7jcs4pvcan6whba60bfd671g3vhx3s9kxwf7xjvr"; - meta = { + meta = with stdenv.lib; { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; - platforms = stdenv.lib.platforms.all; + platforms = platforms.linux; + maintainers = [ maintainers.volth ]; }; } From d0fbe1b411cee9e85202e01e9b58c2b4647a587e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 30 Sep 2017 15:47:25 +0200 Subject: [PATCH 0555/2806] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.6-11-g74d58ee from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/b7879861603b6c0f06cdd21c47b414949581faed. --- .../haskell-modules/hackage-packages.nix | 271 ++++++++++++++---- 1 file changed, 209 insertions(+), 62 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 749e0e1beb5..d8c2d47374a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2608,6 +2608,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Cassava" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring + , bytestring-builder, containers, deepseq, hashable, HUnit, Only + , QuickCheck, quickcheck-instances, scientific, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , unordered-containers, vector + }: + mkDerivation { + pname = "Cassava"; + version = "0.5.1.0"; + sha256 = "1z9y8vzsb0qxfx72w0nb77n0ibha48dv4sg3wv02xrrbz95nwlrh"; + revision = "1"; + editedCabalFile = "1ijb77wqccqgjq0g04m3rk3iygm6hwbmrc50svah19vpl3mkz102"; + libraryHaskellDepends = [ + array attoparsec base bytestring bytestring-builder containers + deepseq hashable Only scientific text unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hashable HUnit QuickCheck + quickcheck-instances scientific test-framework test-framework-hunit + test-framework-quickcheck2 text unordered-containers vector + ]; + homepage = "https://github.com/hvr/cassava"; + description = "A CSV parsing and encoding library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Catana" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -29800,6 +29827,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aws_0_17_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, blaze-builder, byteable, bytestring + , case-insensitive, cereal, conduit, conduit-combinators + , conduit-extra, containers, cryptohash, data-default, directory + , errors, filepath, http-client, http-client-tls, http-conduit + , http-types, lifted-base, monad-control, mtl, network, old-locale + , QuickCheck, quickcheck-instances, resourcet, safe, scientific + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, transformers-base, unordered-containers + , utf8-string, vector, xml-conduit + }: + mkDerivation { + pname = "aws"; + version = "0.17.1"; + sha256 = "1q4qh58vj8447a4fl88n3nkpdc4yv293qsh02w6zvszd6ch61yh7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring + blaze-builder byteable bytestring case-insensitive cereal conduit + conduit-extra containers cryptohash data-default directory filepath + http-conduit http-types lifted-base monad-control mtl network + old-locale resourcet safe scientific tagged text time transformers + unordered-containers utf8-string vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring conduit-combinators errors http-client + http-client-tls http-types lifted-base monad-control mtl QuickCheck + quickcheck-instances resourcet tagged tasty tasty-hunit + tasty-quickcheck text time transformers transformers-base + ]; + homepage = "http://github.com/aristidb/aws"; + description = "Amazon Web Services (AWS) for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -36654,7 +36719,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_24_2" = callPackage + "brick_0_25" = callPackage ({ mkDerivation, base, containers, contravariant, data-clist , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm , template-haskell, text, text-zipper, transformers, vector, vty @@ -36662,8 +36727,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.24.2"; - sha256 = "162p1sgiq25zymjnvjzkbblwwl7544ph7y8kpa1x07w7x9bq2jw3"; + version = "0.25"; + sha256 = "0yj1lw8a82xw5kkaqq5dhffzw8gcjb8cb1wjbsyc3hgcscy9vn9m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59398,6 +59463,18 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "display" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "display"; + version = "0.0.0"; + sha256 = "1z5spl8l4n2x17szlyra2m1973ppgd9xqw851zgnmrvlp79gr0ls"; + libraryHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/chrisdone/display#readme"; + description = "Display things for humans to read"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "display-haskell-do" = callPackage ({ mkDerivation, aeson, base, text }: mkDerivation { @@ -98376,37 +98453,36 @@ self: { "hledger" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , cmdargs, containers, criterion, csv, data-default, directory - , file-embed, filepath, hashable, haskeline, here, hledger-lib - , html, HUnit, megaparsec, mtl, mtl-compat, old-time, parsec - , pretty-show, process, regex-tdfa, safe, shakespeare, split - , tabular, temporary, terminfo, test-framework + , cmdargs, containers, criterion, csv, data-default, Diff + , directory, file-embed, filepath, hashable, haskeline, here + , hledger-lib, html, HUnit, megaparsec, mtl, mtl-compat, old-time + , parsec, pretty-show, process, regex-tdfa, safe, shakespeare + , split, tabular, temporary, terminfo, test-framework , test-framework-hunit, text, time, timeit, transformers - , unordered-containers, utf8-string, wizards + , unordered-containers, utf8-string, utility-ht, wizards }: mkDerivation { pname = "hledger"; - version = "1.3.1"; - sha256 = "0h2ljdncxg5f17llnck6136mn9dn83ql85apnm04sm9cxq7iqqxd"; - revision = "1"; - editedCabalFile = "165jja9hj9f949g26issn8qra7zairm3s48q5kamy6qshbhfy0km"; + version = "1.4"; + sha256 = "146llzlpijcai3cfqcd4l4dcyjq6j6wd6pinkllja73vpx7wyi75"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv - data-default directory file-embed filepath hashable haskeline here - hledger-lib HUnit megaparsec mtl mtl-compat old-time pretty-show - process regex-tdfa safe shakespeare split tabular temporary - terminfo text time transformers unordered-containers utf8-string - wizards + data-default Diff directory file-embed filepath hashable haskeline + here hledger-lib HUnit megaparsec mtl mtl-compat old-time + pretty-show process regex-tdfa safe shakespeare split tabular + temporary terminfo text time transformers unordered-containers + utf8-string utility-ht wizards ]; executableHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv data-default directory file-embed filepath haskeline here hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary - terminfo text time unordered-containers utf8-string wizards + terminfo text time unordered-containers utf8-string utility-ht + wizards ]; testHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv @@ -98414,12 +98490,12 @@ self: { hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo test-framework test-framework-hunit text time - unordered-containers utf8-string wizards + unordered-containers utf8-string utility-ht wizards ]; benchmarkHaskellDepends = [ ansi-terminal base base-compat criterion directory file-embed - filepath here hledger-lib html pretty-show process tabular - temporary time timeit + filepath here hledger-lib html pretty-show process shakespeare + tabular temporary terminfo time timeit utility-ht ]; homepage = "http://hledger.org"; description = "Command-line interface for the hledger accounting tool"; @@ -98435,10 +98511,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.3.1"; - sha256 = "149v81qslajzkr13ba7j4qqliagaq88v3d3pw301haf4v3wz9sv4"; - revision = "1"; - editedCabalFile = "11rsyhfxjr87j9m3frnkq6mssj6isay29v61l280a1bd5r58zcr3"; + version = "1.4"; + sha256 = "00vpl1ch1v80f37y8yn2psdzm7ccxpfn3jp93xqxbasksxfawfa7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -98499,8 +98573,8 @@ self: { pname = "hledger-iadd"; version = "1.2.6"; sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36"; - revision = "1"; - editedCabalFile = "1mr997ryvxv3aq0km3f1h2y0i79m0lb7pl8mn3way5wa82x10kbg"; + revision = "2"; + editedCabalFile = "0a9ciakp892i0g8kf199lh4x0gzisbjaidihhinkf7gk3f40p3il"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98571,10 +98645,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.3.2"; - sha256 = "1qlfzw8nh4isfjqmnq16qrfas9flhyn2b6mf9nvcg0bgm4m7hs7n"; - revision = "1"; - editedCabalFile = "1frcbzksnpxl6m7jn6sj9am3f65gs5zp1pzr6jb7a5kxkdkpmyv1"; + version = "1.4"; + sha256 = "15hyrpn0ifwx4x22hggjdm1xz0jyk8p5wnrynzxy9ali0wci1qxq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring @@ -98605,10 +98677,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.3.1"; - sha256 = "1mnvqhp32m9xfyabzl19djy74v5nr9mwaanpnwxqp1wkifq7cmxs"; - revision = "1"; - editedCabalFile = "0va8jvqakgsra3za7k9j8mjmn6k39881zv0l8hh069dhk7yqd49r"; + version = "1.4"; + sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -98654,10 +98724,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.3.2"; - sha256 = "0lcrgg6d0gpi9z855byjibzr82bbvmr6bbca5k3ivigd0yzc467d"; - revision = "1"; - editedCabalFile = "11imvlhh7lxml59fncmx5dw76gjfby75czfqz3ywk6zcsznjbl80"; + version = "1.4"; + sha256 = "1l5mxvhgvn3q1ds9qmqkdmrs82619nvs13gmjsynr0vbbx52zw7h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -98665,25 +98733,25 @@ self: { base base-compat blaze-html blaze-markup bytestring clientsession cmdargs conduit-extra data-default directory filepath hjsmin hledger hledger-lib http-client http-conduit HUnit json megaparsec - mtl safe shakespeare template-haskell text time transformers wai - wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form - yesod-static + mtl parsec safe shakespeare template-haskell text time transformers + wai wai-extra wai-handler-launch warp yaml yesod yesod-core + yesod-form yesod-static ]; executableHaskellDepends = [ base base-compat blaze-html blaze-markup bytestring clientsession cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib http-client http-conduit HUnit json parsec safe - shakespeare template-haskell text time transformers wai wai-extra - wai-handler-launch warp yaml yesod yesod-core yesod-form - yesod-static + hledger hledger-lib http-client http-conduit HUnit json megaparsec + mtl parsec safe shakespeare template-haskell text time transformers + wai wai-extra wai-handler-launch warp yaml yesod yesod-core + yesod-form yesod-static ]; testHaskellDepends = [ base base-compat blaze-html blaze-markup bytestring clientsession cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib hspec http-client http-conduit HUnit json safe - shakespeare template-haskell text time transformers wai wai-extra - wai-handler-launch warp yaml yesod yesod-core yesod-form - yesod-static yesod-test + hledger hledger-lib hspec http-client http-conduit HUnit json + megaparsec mtl parsec safe shakespeare template-haskell text time + transformers wai wai-extra wai-handler-launch warp yaml yesod + yesod-core yesod-form yesod-static yesod-test ]; homepage = "http://hledger.org"; description = "Web interface for the hledger accounting tool"; @@ -104457,6 +104525,7 @@ self: { quickcheck-io random setenv silently temporary tf-random time transformers ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; @@ -127680,6 +127749,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lxd-client" = callPackage + ({ mkDerivation, aeson, async, base, bimap, bytestring, connection + , containers, data-default, directory, either, exceptions, filepath + , hspec, hspec-core, http-api-data, http-client, http-client-tls + , http-media, http-types, mtl, network, random, semigroups, servant + , servant-client, text, tls, transformers, turtle, unix, uuid + , websockets, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "lxd-client"; + version = "0.1.0.2"; + sha256 = "1m1rqzbjnd73p6y2iak5fpdq15n52pn2lancvr5s0japw45knqhz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bimap bytestring connection containers + data-default directory either exceptions filepath http-api-data + http-client http-client-tls http-media http-types mtl network + semigroups servant servant-client text tls transformers unix + websockets x509 x509-store x509-validation + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base exceptions hspec hspec-core random text turtle uuid + ]; + homepage = "https://github.com/hverr/haskell-lxd-client#readme"; + description = "LXD client written in Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "lye" = callPackage ({ mkDerivation, base, containers, free, HCodecs, lens, parsers , transformers, trifecta @@ -140411,8 +140510,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.8.0.5"; - sha256 = "1qiaz3jah863xzbzck2dndy06rhizb6nniqnn38n32nln3bsmqcz"; + version = "0.8.0.6"; + sha256 = "12lynhl8kn5vpp9ajaiv0vylbyzf16bykprjvg16nvvw5maww1ll"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -149567,8 +149666,8 @@ self: { pname = "pgdl"; version = "10.9"; sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; - revision = "3"; - editedCabalFile = "0ia214ixkjaz26j998visf4x25g12fwb5z6cpi31r7wz5lhz5z39"; + revision = "4"; + editedCabalFile = "04kg2i0y7yb0577kk8v1v7rgji80agmi0aq350lf0rl77r2ksy85"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164809,6 +164908,7 @@ self: { data-default-class hspec hspec-core http-client http-types mtl QuickCheck text time unordered-containers ]; + doCheck = false; homepage = "https://github.com/mrkkrp/req"; description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; license = stdenv.lib.licenses.bsd3; @@ -164838,6 +164938,7 @@ self: { data-default-class hspec hspec-core http-client http-types monad-control mtl QuickCheck retry text time unordered-containers ]; + doCheck = false; homepage = "https://github.com/mrkkrp/req"; description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; license = stdenv.lib.licenses.bsd3; @@ -181699,7 +181800,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stache_1_2_0" = callPackage + "stache_1_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec , megaparsec, mtl, template-haskell, text, unordered-containers @@ -181707,8 +181808,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "1.2.0"; - sha256 = "050b7rnwh7cphsakh05s6hjc5ddfm0637yahq1igs0kp32d6pmv0"; + version = "1.2.1"; + sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -183077,8 +183178,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "stemmer-german"; - version = "0.1.1.0"; - sha256 = "1m0jhmdh51g7cqy51h1xqkdiz8il22xkfq5h4vzabllvyiii3anm"; + version = "0.1.1.1"; + sha256 = "037dw03zb4xdfbzp8js04ymrxii7rsin7pwiansa9khb29w2jqsn"; libraryHaskellDepends = [ base text ]; description = "Extract the stem of a German inflected word form"; license = stdenv.lib.licenses.mit; @@ -186576,6 +186677,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + "symmetric-properties" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit }: + mkDerivation { + pname = "symmetric-properties"; + version = "0.1.0.0"; + sha256 = "10q6w071fa9nyrg7kz9zil3jz7xpvp5l8ni4kddra10dp2hnwg80"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base hspec HUnit ]; + homepage = "https://github.com/joelburget/symmetric-properties#readme"; + description = "Monoids for sameness and uniqueness"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "symon" = callPackage ({ mkDerivation, ansi-terminal, base, monad-loops, random }: mkDerivation { @@ -194482,8 +194596,8 @@ self: { ({ mkDerivation, base, c2hs, text }: mkDerivation { pname = "tinyfiledialogs"; - version = "0.1.0.0"; - sha256 = "0csj7ca5r6vqkviz3q570bsmdssm144sb9wyi7d9jpl0n3khpdm1"; + version = "0.2.0.0"; + sha256 = "16vzn532204vs39lfsf7q20zkhncqgk1vzqls9x2cy8kzdzrqlm4"; libraryHaskellDepends = [ base text ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/mtolly/tinyfiledialogs"; @@ -196325,6 +196439,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "treefold" = callPackage + ({ mkDerivation, base, containers, criterion, doctest, hedgehog + , parallel, random + }: + mkDerivation { + pname = "treefold"; + version = "0.1.0.0"; + sha256 = "1svpbrvw7j35kp25mcddallfl9miafdyb2dm2wbmj461sh95qd7g"; + libraryHaskellDepends = [ base parallel ]; + testHaskellDepends = [ base doctest hedgehog ]; + benchmarkHaskellDepends = [ base containers criterion random ]; + homepage = "https://github.com/oisdk/treefold"; + license = stdenv.lib.licenses.mit; + }) {}; + "treemap" = callPackage ({ mkDerivation, base, containers, deepseq, semigroups, strict , tasty, tasty-hunit, text, transformers @@ -210546,6 +210675,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-conduit-writer_0_1_1_2" = callPackage + ({ mkDerivation, base, containers, data-default, dlist, mtl, text + , xml-conduit, xml-types + }: + mkDerivation { + pname = "xml-conduit-writer"; + version = "0.1.1.2"; + sha256 = "0n5fk6sj5grcfz51psbf8h4z40hd4dk8zpk870c6ipm2s9dc1488"; + libraryHaskellDepends = [ + base containers data-default dlist mtl text xml-conduit xml-types + ]; + testHaskellDepends = [ base text ]; + homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer"; + description = "Warm and fuzzy creation of XML documents"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-enumerator" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , blaze-builder, blaze-builder-enumerator, bytestring, containers From b92f59029a4ae358040fa54380bb61386266e739 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Oct 2017 15:41:41 +0200 Subject: [PATCH 0556/2806] haskell-hspec-core: enable test suite again --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ac1420051da..74291cf70a3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -56,16 +56,14 @@ self: super: { clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; - hspec-expectations = dontCheck super.hspec-expectations; hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; }; + hspec-core = super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }; + hspec-expectations = dontCheck super.hspec-expectations; HTTP = dontCheck super.HTTP; + http-streams = dontCheck super.http-streams; nanospec = dontCheck super.nanospec; options = dontCheck super.options; statistics = dontCheck super.statistics; - http-streams = dontCheck super.http-streams; - - # https://github.com/hspec/hspec/issues/330 - hspec-core = dontCheck (super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }); # segfault due to missing return: https://github.com/haskell/c2hs/pull/184 c2hs = dontCheck super.c2hs; From e4615f880c664c147da84e51f28c9dd7e825d33b Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sun, 1 Oct 2017 09:11:21 -0700 Subject: [PATCH 0557/2806] tig: 2.2.2 -> 2.3.0 --- .../version-management/git-and-tools/tig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index f5e5fddd3b7..bed0ef35827 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.2.2"; + version = "2.3.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "1zbj4pfcnj1d0zfhx5jw9x7f2hz99mry20bgyyvrij2vj8gf5vk4"; + sha256 = "04qw3fyamm1lka9vh7adrkr2mcnwcch9ya5sph51jx6d4jz1lih5"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; From d387bc8936b5911a288d86e8402ef26a6188afa7 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 29 Sep 2017 16:15:59 +0200 Subject: [PATCH 0558/2806] pgjwt: 0.0.1 -> unstable-2017-04-24 - updated to the latest revision - fixed version format as there are no releases yet --- pkgs/servers/sql/postgresql/pgjwt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/pgjwt/default.nix index b4955f8184c..3e01d9bfe2c 100644 --- a/pkgs/servers/sql/postgresql/pgjwt/default.nix +++ b/pkgs/servers/sql/postgresql/pgjwt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "pgjwt-${version}"; - version = "0.0.1"; + version = "unstable-2017-04-24"; src = fetchFromGitHub { owner = "michelp"; repo = "pgjwt"; - rev = "12a41eef15e6d3a22399e03178560d5174d496a3"; - sha256 = "1dgx7kqkf9d7j5qj3xykx238xm8jg0s6c8h7zyl4lx8dmbz9sgsv"; + rev = "546a2911027b716586e241be7fd4c6f1785237cd"; + sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf"; }; dontBuild = true; installPhase = '' From d09604155b428e9de5de6d18e04870a9a0fa290a Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 29 Sep 2017 16:18:21 +0200 Subject: [PATCH 0559/2806] perlPackages/TAPParserSourceHandlerpgTAP: 3.30 -> 3.33 - update and refactor a bit --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eae18c1b5ed..2c721cbc2c5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12857,11 +12857,11 @@ let self = _self // overrides; _self = with self; { }; }; - TAPParserSourceHandlerpgTAP = buildPerlModule { - name = "TAP-Parser-SourceHandler-pgTAP-3.30"; + TAPParserSourceHandlerpgTAP = buildPerlModule rec { + name = "TAP-Parser-SourceHandler-pgTAP-3.33"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.30.tar.gz; - sha256 = "08gadqf898r23sx07sn13555cp9zkwp8igjlh1fza2ycfivpfl9f"; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; + sha256 = "35q46y2hbp2ij5n9ir76lmspqj3n8gb0z9l5ipb5g7q90l160m4k"; }; meta = { homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/; From 2ebc40f95f5195beffaa47bf7ef192cbd635f9ba Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 29 Sep 2017 16:20:15 +0200 Subject: [PATCH 0560/2806] pgtap: init at version 0.97.0 --- pkgs/servers/sql/postgresql/pgtap/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/pgtap/default.nix diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix new file mode 100644 index 00000000000..b17446ca778 --- /dev/null +++ b/pkgs/servers/sql/postgresql/pgtap/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }: + +stdenv.mkDerivation rec { + name = "pgtap-${version}"; + version = "0.97.0"; + + src = fetchFromGitHub { + owner = "theory"; + repo = "pgtap"; + rev = "v${version}"; + sha256 = "1vzc8pxzi0rbywmrvx7i5awngsvzcz75i4jl9bk2vqr223chax6f"; + }; + + nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; + + installPhase = '' + install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "pgTAP is a unit testing framework for PostgreSQL"; + longDescription = '' + pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL. + It includes a comprehensive collection of TAP-emitting assertion functions, + as well as the ability to integrate with other TAP-emitting test frameworks. + It can also be used in the xUnit testing style. + ''; + maintainers = with maintainers; [ willibutz ]; + homepage = http://pgtap.org; + inherit (postgresql.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c945bbe4060..2b7803c6131 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2475,6 +2475,8 @@ with pkgs; pgjwt = callPackage ../servers/sql/postgresql/pgjwt {}; + pgtap = callPackage ../servers/sql/postgresql/pgtap {}; + pigz = callPackage ../tools/compression/pigz { }; pixz = callPackage ../tools/compression/pixz { }; From 2239dc6234efda7a8ae7dd746bf9472349a837d2 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 1 Oct 2017 19:38:45 +0200 Subject: [PATCH 0561/2806] glusterfs service: fix issues with useRpcbind --- nixos/modules/services/network-filesystems/glusterfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index 15777d45f78..8ac9f801dcb 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -156,7 +156,7 @@ in wantedBy = [ "multi-user.target" ]; requires = lib.optional cfg.useRpcbind "rpcbind.service"; - after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind [ "rpcbind.service" ]; + after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service"; preStart = '' install -m 0755 -d /var/log/glusterfs From 4219de070d67e249b14b52ab0a6847bca0108e7f Mon Sep 17 00:00:00 2001 From: "John M. Harris, Jr" Date: Sun, 1 Oct 2017 12:52:14 -0400 Subject: [PATCH 0562/2806] kore: init at 2.0.0 --- lib/maintainers.nix | 1 + pkgs/development/web/kore/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/development/web/kore/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8d4b49be461..f384b997a86 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -287,6 +287,7 @@ joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; johbo = "Johannes Bornhold "; + johnmh = "John M. Harris, Jr. "; johnramsden = "John Ramsden "; joko = "Ioannis Koutras "; jonafato = "Jon Banafato "; diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix new file mode 100644 index 00000000000..28c121d62cc --- /dev/null +++ b/pkgs/development/web/kore/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation { + name = "kore-2.0.0"; + + src = fetchFromGitHub { + owner = "jorisvink"; + repo = "kore"; + rev = "2.0.0-release"; + sha256 = "1jjhx9gfjzpsrs7b9rgb46k6v03azrxz9fq7vkn9zyz6zvnjj614"; + }; + + buildInputs = [ openssl ]; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "An easy to use web application framework for C"; + homepage = https://kore.io; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ johnmh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c945bbe4060..cbe85f4af27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2828,6 +2828,8 @@ with pkgs; knockknock = callPackage ../tools/security/knockknock { }; + kore = callPackage ../development/web/kore { }; + partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; From 7d09fc6ea78a9788a74b13e2e13aa2f9e9547bf2 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 29 Sep 2017 16:22:51 +0200 Subject: [PATCH 0563/2806] nixos/tests: rewrite pgjwt test - now using the test contained in the pgjwt source repo - also compatible with the new `superUser` option of the `postgresql` service --- nixos/tests/pgjwt.nix | 56 +++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix index 2cf2963ae31..5af2f38035e 100644 --- a/nixos/tests/pgjwt.nix +++ b/nixos/tests/pgjwt.nix @@ -1,42 +1,42 @@ -import ./make-test.nix ({ pkgs, ...} : +import ./make-test.nix ({ pkgs, lib, ...}: let - test = pkgs.writeText "test.sql" '' - CREATE EXTENSION pgcrypto; - CREATE EXTENSION pgjwt; - select sign('{"sub":"1234567890","name":"John Doe","admin":true}', 'secret'); - select * from verify('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ', 'secret'); + test = with pkgs; runCommand "patch-test" { + nativeBuildInputs = [ pgjwt ]; + } + '' + sed -e '12 i CREATE EXTENSION pgcrypto;\nCREATE EXTENSION pgtap;\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > $out; ''; in -{ +with pkgs; { name = "pgjwt"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ spinus ]; + meta = with lib.maintainers; { + maintainers = [ spinus willibutz ]; }; nodes = { - master = - { pkgs, config, ... }: - - { - services.postgresql = let mypg = pkgs.postgresql95; in { - enable = true; - package = mypg; - extraPlugins =[pkgs.pgjwt]; - initialScript = pkgs.writeText "postgresql-init.sql" - '' - CREATE ROLE postgres WITH superuser login createdb; - ''; - }; + master = { pkgs, config, ... }: + { + services.postgresql = { + enable = true; + package = postgresql96; + extraPlugins = [ pgjwt pgtap ]; + initialScript = writeText "postgresql-init.sql" + '' + CREATE ROLE postgres WITH superuser login createdb; + ''; }; + }; }; - testScript = '' + testScript = { nodes, ... }: + let + sqlSU = "${nodes.master.config.services.postgresql.superUser}"; + pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}"; + in + '' startAll; $master->waitForUnit("postgresql"); - $master->succeed("timeout 10 bash -c 'while ! psql postgres -c \"SELECT 1;\";do sleep 1;done;'"); - $master->succeed("cat ${test} | psql postgres"); - # I can't make original test working :[ - # $master->succeed("${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}/bin/pg_prove -d postgres ${pkgs.pgjwt.src}/test.sql"); - + $master->copyFileFromHost("${test}","/tmp/test.sql"); + $master->succeed("${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql"); ''; }) From 717e6ac0c55afb075e718a0ec01aedc5a2158420 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 18:43:22 +0000 Subject: [PATCH 0564/2806] kore: fix up --- pkgs/development/web/kore/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index 28c121d62cc..eac2046a233 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -1,18 +1,27 @@ { stdenv, fetchFromGitHub, openssl }: -stdenv.mkDerivation { - name = "kore-2.0.0"; +stdenv.mkDerivation rec { + name = "kore-${version}"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jorisvink"; repo = "kore"; - rev = "2.0.0-release"; + rev = "${version}-release"; sha256 = "1jjhx9gfjzpsrs7b9rgb46k6v03azrxz9fq7vkn9zyz6zvnjj614"; }; buildInputs = [ openssl ]; + + postPatch = '' + # Do not require kore to be on PATH when it launches itself as a subprocess. + sed -ie "s+\"kore\"+\"$out/bin/kore\"+" src/cli.c + ''; + makeFlags = [ "PREFIX=$(out)" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "An easy to use web application framework for C"; homepage = https://kore.io; From 2784bd71683f556af9aa47c32db52f1ea8960a0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Oct 2017 21:15:46 +0200 Subject: [PATCH 0565/2806] haskell-json-autotype: jailbreak to fix build within LTS 9.x https://github.com/mgajda/json-autotype/issues/15 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 74291cf70a3..5941209d7a7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -975,4 +975,7 @@ self: super: { # Break "hpack >=0.17.0 && <0.19". stack = doJailbreak super.stack; + # https://github.com/mgajda/json-autotype/issues/15 + json-autotype = doJailbreak super.json-autotype; + } From 1c383265284dcd0d0f00a11719d57b3f26b7319f Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 29 Sep 2017 22:32:33 +0200 Subject: [PATCH 0566/2806] nextcloud: 12.0.2 -> 12.0.3 --- pkgs/servers/nextcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index ffd2ad18796..ec4e78a54ec 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "12.0.2"; + version = "12.0.3"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0z5145xnwmmim5j25ylghhhm74nvijqb8iyq5azq9vjmkz5xcd7b"; + sha256 = "0wgvvpk7h7psy41a32f0ljh6iasjsqbf4pxi8nhybl46m35srg48"; }; installPhase = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Sharing solution for files, calendars, contacts and more"; homepage = https://nextcloud.com; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; + maintainers = with stdenv.lib.maintainers; [ schneefux bachp ]; license = stdenv.lib.licenses.agpl3Plus; platforms = with stdenv.lib.platforms; unix; }; From 71aa48ec078e5a84a86bfa7d1dfeba23edcc8f44 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 27 Sep 2017 11:51:20 +0200 Subject: [PATCH 0567/2806] mopidy-iris: 3.4.1 -> 3.4.9 --- pkgs/applications/audio/mopidy-iris/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 6e2312c3390..05d041380a0 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.4.1"; + version = "3.4.9"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "04fjj2n5v53ykxnjgna1y8bvk7g3x0yiqisvzrdva693lfz9cbgx"; + sha256 = "0acr8ss5d0jgcy1qsjb12h0n6kr6qdp9zrbbk9vv3m3s6kcm8vgb"; }; propagatedBuildInputs = [ @@ -16,6 +16,7 @@ pythonPackages.buildPythonApplication rec { pythonPackages.configobj pythonPackages.pylast pythonPackages.spotipy + pythonPackages.raven ]; meta = with stdenv.lib; { From 7ee1eb4eac5ad7efe209282daf03f7d21af151e0 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Sun, 1 Oct 2017 23:04:22 +0200 Subject: [PATCH 0568/2806] grafana: 4.5.1 -> 4.5.2 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index f2df0e4f9c3..398e75f4fac 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.5.1"; + version = "4.5.2"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0w4ldihs6j508ql7c0v2wsysrlf3n93iikvjwsszj6g5a4bz2f93"; + sha256 = "1sgrnk90hn99c1xq49al5n76j2qqfi7sjc6r2fr00gd7mxzbh1mg"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0l96f03ghvadcba7yi22wsx16chff4ffjgnm2g3mcyigbhp57zk2"; + sha256 = "19l1abq8qklhsqq1z4mi08c9z139b8gfyay7pwp4xmjxfzpsff64"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From 549a454f45740b2e4db6c5951a8f93de241a480b Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 1 Oct 2017 23:14:13 +0200 Subject: [PATCH 0569/2806] gogs: 0.11.19 -> 0.11.29 --- pkgs/applications/version-management/gogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 49243a823ed..d3705758307 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gogs-${version}"; - version = "0.11.19"; + version = "0.11.29"; src = fetchFromGitHub { owner = "gogits"; repo = "gogs"; rev = "v${version}"; - sha256 = "0smzklhpfv3smqgzd0cnjdif3zi5q7b02grrnb5zssmdi1b2dlsd"; + sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0"; }; patchPhase = '' From cd490dc619dd435f0607d8bca3d7ef121d87525f Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Mon, 2 Oct 2017 10:11:13 +1300 Subject: [PATCH 0570/2806] spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 10637fde8c7..249bbe0d8fb 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.64.401.g9d720389-21"; + version = "1.0.64.407.g9bd02c2d-26"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "026khnz7n66mj94yr33690pmjm3pz1nsy38xggsyr5gldf1chsfc"; + sha256 = "0zc8vclf1wx60yllc1jgzhqyv5lkwz95qmmy5f79zkj6vrdak5wc"; }; buildInputs = [ dpkg makeWrapper ]; From cf1795440637b7ac03849909c19096bcedbef690 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Mon, 2 Oct 2017 10:20:19 +1300 Subject: [PATCH 0571/2806] firefox-beta-bin: 56.0b5 -> 57.0b4 --- .../browsers/firefox-bin/beta_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 79f56413f4c..9080ad890bd 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "56.0b5"; + version = "57.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ach/firefox-57.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "01376c4365dc8c5cba1e37708f9a2b2e9408c6a2a06790a433e058dae5d245b35ed1f7e8f573e496442d8657f96db662c540a70c4d6cf8f154ff8cf04b5f06eb"; + sha512 = "5233cd6358d0a87c58799f50a30bd92c36793394b451fa70f8b789810137d2f478dea9f27a15ce7c141c54e6fa62e5c2088021b90f4261c889843ca5dce7c905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/af/firefox-57.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "f502bb10230ee5dba28e7dd84a0d76a9e868c2da99588c00f35492e9c355902cb39d383bf7a8b6440d7e7811e70a7a1945978de0e59a85514eb8c16d939e799c"; + sha512 = "62c17ef12991df223e58e32cd148b7c254ef2d8a415cb923a5a74b363e15902b0272b3f09377dad24193867dff50ba84f0128e5b7c171b70572aed6a47f07aba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/an/firefox-57.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "488e58bde0417b70c7da08ae22c40089f759a5f2919f2a3dad595f880607880e3a4a202944c8d03f71f1d420147fa0e3e896ef88753723d8c4ee92e0c32cdb0d"; + sha512 = "0b141040b179269d567f7d40afafc4816e9316a75c69dab51a23e50b497c8c828b5a0c064a3f79d4804ab35e3c4bef5bb5defb89322e3efbf28ffdd394c7c050"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ar/firefox-57.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "96d1f3dba912702eb6d467ff1be67fae112b82a77620a53125aaa861c241bcaeb441c73339e20fbc5c41eb8883a370c2371b4a3d7b0af04555dc07bff5f1cd78"; + sha512 = "0b74174e2d243a0db86d633e7c82357e138429572c8454df647a87dbf7aca585d00b6ee1ca58681d561f911a32e613a4b1a5b8a3c1c94a0dbcb678f680f30cdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/as/firefox-57.0b4.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "75873538776101e59c5544aa644bf563bd7bc0b3882f43e9d3ada94cdcb39d3ca2d34cd796445fb680f81bdfa1604cf6bc7b79175625b5e56ea12a6790171c2c"; + sha512 = "e829ca5b93fd5e6640e8a45f4299eeb4c8c50716489876eba390327fba292192be4749ef294a58ad2978b1fdb4972ee8fe9a451875398cb7a1b996b887d7fcea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ast/firefox-57.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "84b975021ff95e4d0490d82ce7666539f7806b8563ab42cf9a8139db06f3558a4680d33840405a497e92ed5f2366af979ae0bc8d188be3c3015131f4459c1a1f"; + sha512 = "1ed6b51420daeeeb9fbc81808555a492410f51865968b5e1e8e02c0e740885f32a26187128e1f732a8297400c19d760f43583fc59ff08d1e70c79519e047511e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/az/firefox-57.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3989e10d2884c827a82f8202cd440b9f5867e6af38cfa952848789cb855963e2ed75a13b029d47ca04a93a0bf94d53e7e1dc253e913edef6e45922a0b05bbce7"; + sha512 = "d27affe6ffe5de90a2c640b1475ebd1294fc8d8fd15ad26e34463c9f38c25733e495558dd38f6c8b9425628637e653bb119eb3aa3915476c43955c907f77dcac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/be/firefox-57.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "3fa693d5d909a32bf206e81f69a1bae19560a6e4d281d1c023d956e890089e3bd4f006b3b44b9186f7f50bcb6566dd375386aff634171cc9cc27955a4ac64043"; + sha512 = "ff03e12fb623eaf5f5d2f419bee861b208bbd42072decf6168666e23c332fccf86a75b5b871513fdf2937fb4090010b34ddf5275929bd033f9bd88123f439912"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/bg/firefox-57.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e595c12a4c0e542be9954b3ae633f55d94bd9b402e854dae04c16d9c2c4e28814e31dc48e669ddca2bb76a55191b223f225e01cd6c23010725da0e8c29ce111e"; + sha512 = "86ff0cb3a64e829b3db005baf49f4a156e2c9c3923538384b9ac0a58f659688defd054c889db1623fc04c119a82503eb0a32eca22f7c6853530516de3cfd2bfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/bn-BD/firefox-57.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "af7f0023f5abb0ea9446380165c9c955a0bfe824377a3ebdfefcfc5dee079aabf317c832de459da41d330697c69ba3f4519136ea5922fe26827745f2b8567bb7"; + sha512 = "6a519b62b04aecc4016c8fabb06efc32c2c582f9a385bfe784e7cd81ea746fd955e039a9a851ca4798c41f5b3dfa43d037be8813e9d16e2a27b4360bf2d9c6ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/bn-IN/firefox-57.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "5911b03099379731bde2c904ed11e5eef69e6d53a1492cb07c4d1ee6f3747fd891ef34a168adea716d867b9ab02ce0faaeff2f60a47ab0863abe0578e5829ea6"; + sha512 = "200b35f5caf5a9b146f79de343969ff25f70f72c3021808ac837ccbc797e594109694648b4ed4ff1d11feb04a53c6d2ce23c90521951a0f67c3b84f893915201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/br/firefox-57.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2e8c4776671c29b4d885c8ebd87ae107656117d826081230890c6deabd0106b75d53334a718b36a2cec4ef9060bfc9c1a4f1d3543d13fc17218ad594f4d0f0cd"; + sha512 = "da457ee63b89cb1be3e9a8016ee1c22ee7e31ffd949fa60ada8559a396234f54658cd06da2ff952bad145e23ca5e461977834da3118962322daf601ad3bb02ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/bs/firefox-57.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "e1bc29dfad9794ba95f81f611cd9075550024976651812053b1e976fa7c9e6aafb5d375c30d6164afd93255830a5d336a5c2522199701bd26bedcc6cdab7177f"; + sha512 = "83b88e141125d55c670e307351a21572e284b1911fd5861fcc7786cae06cb150152e80abdad15f65d0c0fc8d1e5440e36181f16656e2275c4f90adce77e4079d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ca/firefox-57.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "4122426fc6b58472f4c57c03618f7b1039958a5e5e66309472279a59df077ef08eabee1237c59fa5ede0ea18b927b60a9ed8319cbb396c5b204d6b55842b4d51"; + sha512 = "8eba16fb06961b3b6c8305f866e1d2168e29c1eb423f97949e980a2b51772453049bc5064c6eb6df6af1aea26efc2fea1edf5baae408c18bd4e750f3c8e4b46f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/cak/firefox-57.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "d1c0dc77a7a06d5fcbe231c5ee3802aae200f578febb77c41c675a5a525675442772e585fc399ff79777ab66516df4ec05c0a22348fbbc29594ca0cfa35b3b7c"; + sha512 = "5eec8675ecff45e359ccbfc36d781514b8afc19119a5e68a1a97a8b1765504ae6c89e41ce370d37eca879f5353d8bf3fc594ea69fa9071ea1ffef06d23e638c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/cs/firefox-57.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "8934f3b7d2644dab828090e8aa6a2edfe1b21efc95d63b1a7821dd9c4cb9367d1a387d97e2a8c54f4815877533e9e20a4a0bf49446d9429f4519f28fd382e128"; + sha512 = "2fef9e66dd10a224e31213d587d7ec574ffa25a09dcdecd3dff449c1b756634de906809b70e4f55b75adc0c853db96f2917658af824f3df15c16017f35c57e2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/cy/firefox-57.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "d072efc296e744273c081b1fa78348c9b48137d0d42ef8aaa26f1607768af3dd62179c693bca567c4fde993f913da856ea36af350fc90df18d8e726f227b44ba"; + sha512 = "d675a1e182c4d186bb599d25ca4ae0ff29cefc70a8bc2ada76ed89ab6c57ea8b92b8ace9e5e5cd0b5baa8166fe8196ac23164dec66955ef4a0c5720a75fa0d1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/da/firefox-57.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "358d83de5408d2cfeef5b8e77054b528ed736a0b2552e93d7cae405d346dcf3a4ebe3470612cdf37170ef9e4ec00c87b23ececbf07bc07f67fbfe013576278dd"; + sha512 = "01087b3ab9273c459c5a665d5662a0223ef5b7e956aad9b469d77d7f61dac2b87f7c1749675a05a79da8f8d04de05617bcceb8d7a2a2b6a445a58d27adb95d52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/de/firefox-57.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "02045240e122fb3f8339c8c09f90ced093d8c92d80f65ed03d922ebd10e454bf9b8d25df36eb8548f1249f43cb8f5d91f50993ec3623e5107115dee9de405b89"; + sha512 = "28742310978f4578153eadace5e965328e431f1d4d4d2146d35bb65aee9771dd8dd35117fd599d514070a0414c7c1c0d28b6ed5fad727b8cf7a45f0949b3009f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/dsb/firefox-57.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "eaa5f2e6f2fd7447f79c9bebf8046ab05ab67f5717c15f01af676c3b384750b7929fea818bf064b2949dfc0cf36cd4e12f17c4c11c5f7a563474666b217b4ed9"; + sha512 = "9a4f8a8a144a5516c87175d0384ec4f6f2895fc1efd7552bc79e373c64b879c34afa82f6f4ecf33e39a9a138e2648f761f5747299bc9f95a46eb742c9089b2ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/el/firefox-57.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "93573cdb8088effd34206a9525bec895aed4920c878ec77fe847871c4e01d70ed35cd00aee4311e3409beb04e2f3aa4504c6bdb9b16f05b4540093db2d0924e5"; + sha512 = "cb84f7a645fb315746566afc3a8c256ad3e04ad801689363de17fe91dc99784170558715e5696ac3c041b4a3a079b18a5efa3c18ec092067f1c0448db10febad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/en-GB/firefox-57.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "765e34242d93d6f53fb59d9400444e8d236b11b5ef9335324e6b0fb57c04036121935e88068fc13dc669e0fcae50d0e84cd4b393b47689d2204aec86d4daf48c"; + sha512 = "2f2c2c56a90926c7070673e5b020f446ac39e4c60ace8a0f9204fe81a004e89f8e29066e51468cf6614001930d3c827687d893df34a3a3fd3baa2a28dc6bde09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/en-US/firefox-57.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "bbcdf507dec439732a4c3c030c876c135d99126c9b35df52b6ad377575b971931eda12b9ec446be768058edc71d7331fbd1635b39baf837fc428887edbc8d5bb"; + sha512 = "a7acf5cb3c82e4fb2ea09a947517b9488ef81d01abbca9c2a1aee48b449be6deb9cd42739f37a198467c3b0c420852bc6238193bb9c1aa462e489d84bf813451"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/en-ZA/firefox-57.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "06d2e4cbf018dbff55d8f91e3ad9754b6a191cf9cf22ba38eb316421f732141e44c3d3b4b475e97e548ac8701652f2e9887be3789d78c9f06bcb9d1fdd4e5156"; + sha512 = "9ca185f4b22424be7372b5d85c9442b37fc277a11b5b864093cda4992a09a390fa3532257c7d3c1ffd156e3a998d99cd7050536420044c5913421d8c9409add4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/eo/firefox-57.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "9612deca064158eb9981a24946ab612b472c48a897aeeb22729677cd86a8209b85e75a3f89a408de4823947ad28fb2b0c66541e27433236aaf337ceef02166cf"; + sha512 = "728c825bb787b0bb87bb7036081e8107b0a8bdaa943f0677e2b3a9685eaa3f1caede0a5683a4913883fe21bedd0d8405b10f695ea2f2b17059a68bf5bfee9748"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/es-AR/firefox-57.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a507fc11e9a528afd89c32fdc1bfc1255edace78cb11db1b238cde52ee113f6ffc2506908ad4d1331c3b80655de193b4c5b3890c979953cc01711fb2a7d9cad1"; + sha512 = "215ec52c40468fbac5d82f7ba7a568a780898eef7c9d3c813036472222b731ad40a83373adfefd0a54642209f1d3d6153bc12dc49b0c4a286f824c2b0895110d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/es-CL/firefox-57.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "028aa444658a288ce5fe84825aad85a340ab36383d04012a8dd93fc057cd3d2ad2084c84db87bbcde4778915eb7eed080d4fdf8baac009c0ad6a00d1ecee2f96"; + sha512 = "aa3c46ed2b7f7794da86956bb10e4ebbbddb1e0dfec295e7893c6082f963c800156da7dc041c902d645902b57cb14de4c4c07ea03057ac84aaf325a9eb889d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/es-ES/firefox-57.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "9ed4b5a1631110ccec6b31ea3d666fec54e9dbe9746552fc02b0eadd09053020abfb6053c763ce9f3877eaa2e1f318003177e9c3cc12e16120a7ba2881795525"; + sha512 = "7ae1c2bfff96f3bc2e4aef293f230226783cd82ecccb0d6f38770876143ade93e12f7ddcb46ecfb7e2655f60d8c09e23cbc87f15a0b0987a5613be765d22da49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/es-MX/firefox-57.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "bb13cb8455d87244a8f5216b765293ba13816ee08a0f73e70d706279d5e322e69b5627ee22aa9ad44ed20ce54730bc2f072d326ec669d509674855f835702a9c"; + sha512 = "2109e865e1e29fb8c216d742e8d34a61d49c464a5c6cac9c4aa5a2d4f6f4b5a89b9433d2ed99ea5d051637b6214c12dedce42b35b10619f09874ef2e84b11b7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/et/firefox-57.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e7e099b80ce94392f53dc1ed3a696cad77ea1a1910ef79dd7160366f6f880857c5d3b867ca3635dde72d22d40000b2acd9495fd3804aa479c5e5adf0a3bb44db"; + sha512 = "42d488173f29b49bc3356d3cd9ed83c7ac63801dd8affc48235d73fa71b2fe9cd7af9a835c89787839b565521406a30cc10bf6df27be9a5b3150253834d98e41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/eu/firefox-57.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "2b6ae7dbec4facca5a00a0c9827ad634b7862ead7c8694bccda7f90cd5183687bf122e29e38515b6457839913b8dd5c6e24a156edd74d3ac4ae9ff6fe8b5688b"; + sha512 = "c6763a44e619d1dc5959dfa307908e39e9f81e11e18b5dd65e2e4c2353c1b7e06b9243c1e726df274cad635b31193ba2cf3461ea87ff5d700cfeeba46aa27d1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/fa/firefox-57.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "07a376c694df8a306fc169c8e0abb311361dcd3ee252654e8821673a69e6de9b3f25a47094091bfae620db152c471c39f7fd895d81acab877ffc471aaefc2439"; + sha512 = "6d2c0e40eddca26513746f80721a951af2348e8cb1dbfd3453bc99423d57e76f9a45a2673d1f29e10c0a338b1919e95b05775937e060f437fa7514108beeb3c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ff/firefox-57.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "745c62ac6f055bc01dfbf8814c54cf823718d472533a3650f3ebb59f4c907109cd15d881ea19d80566cb66121c6ff2ffdd9c551c4eca62ec1cad3976d1b513f0"; + sha512 = "b3381922e4a88568f3d034207e7ccc2ce96e3580dc037feea0b2fb415c0c3511e15e63cbbdfe3f44f61049e10d9d09a81069a0a3b9a4b50def0ea3fe3500a18f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/fi/firefox-57.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "f679b7e843a0626ac2e7f6fb9f85cb6628d162692263eba6506e94f8b22b543268b1de64e4cc9ae5977c7fca0725dee337a120647a5dd73edb56ee678b8088cd"; + sha512 = "7cb21fb4daa9c70ea9cd124c42d94bfb599b6bca3b00821f8482da2e844024ecf4a02bc5250e7cd4d574465ec87c04b41620b4d4cf78a0560bcad184c6c9c656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/fr/firefox-57.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a95c3dd2946bcffaf8a34fea1e11df826e1dddd642cf79677465379e43343711a18fa88d1c74247624b7e7f690ecfd62edc38d9971dd5df81d05be490fa3672e"; + sha512 = "4f702162126708851bb2922dad4530718cb899efd8c31241a66d650e5aa91c8bba30f7247601a21e79c82bbd52e943ad050e801719dca8257ac51d21533db35a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/fy-NL/firefox-57.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "bc6a82e5de1fd2f9c4b9fc4915604443d9102ffd8caa348a42054a1a251e820ccc69db4dcea5b4aa43e04e5c07e904b10db8b25c60986eecf91cbed89fff4f6b"; + sha512 = "765a5714a7270d00faf81c516874acf02b0ec6fa030db8edc6c4e08362542cc80cd044f639ffcc74e1031ef51c75246aed6892b84f101aba7665ce89b3e2a327"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ga-IE/firefox-57.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "271dca766101881c0869a3201f5312790d11befc96c3106f92740b798052434191389f86522b40cecd882d6f85a920556d53ce409ad5f12d1ca68434fc836a0b"; + sha512 = "b95e5ac5cabac758f77828379a3303bb8b62c253ba77f14c3a74f9e9663fef3838f1e221546fa85955e2b16791d1470bd798425e8553170151271587e49cd1fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/gd/firefox-57.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "afc35f1f071fe307df82582a19b817f1cb395c975f047c04a9b64790d87efe4fcb2486d4523b9144cf63f1b2949f3b67d74a7c8005c658b22eb6d363a407533d"; + sha512 = "24ee86e508695f8aa515bbf9d89cac77b48f9bad6d257c2bdb1fbfa0a3183e3344e3a0e2cdda2a05b45141e5959d715db6ae09a32e8d1d01c6ac31f7366fba00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/gl/firefox-57.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "36a054c5d56752ddb8e5af417d53e4811b23ee5ac00b57d12bdad2152ef4a237579001f44ae41c9959a68fb144862e0185b0607df3c9801ddeba7f9a27edabb8"; + sha512 = "810629d39cc027fe9701d54c27edfa916913d857c018f9e5e2da218db2f93b81c16e9225f664eb4db670d3293492d4027a9586376a205fb51efd661ee2f4b307"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/gn/firefox-57.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f29d9f9d793730324399d6edf5d724f1ebd7f25037865af74616ab660bf6f469616fec7a7e2f1c5d8b7427a5b3b610c876100e5f737facc366d7ecc92606baae"; + sha512 = "65712a992ff1edb57642ca1d12e60ec009acbf23f5a4a56b68d3c521bb46aa02d1ea4b03f628e23911032f6f030acfceb6ec2aca0f86f616c57ecc71d578723f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/gu-IN/firefox-57.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "b2e0626abe14e87420528b8e1875c22c5a97717f9d6fd781956fd7858a1a08c5014dbdac5dae6378fc2fee92bfd50ac4bacb29aff738ea8288cbbee68cf58ce0"; + sha512 = "2b78ea305213f7c1200887e77be4f01b47a699ea8f8e55975987912d78142519a3d19b26d82f9060cffb139cf9c560e2935412f602dc93511d786470dfd0e64a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/he/firefox-57.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "3a29a3f008b226c760d488e5673b6ca8d545a309aa8c19bb56df4208143663e92d29b4dfb0ae6606ac5f83826d1c6ec2118adfdf5ffb55e954193407b2249d7d"; + sha512 = "aa9ea68571404c166c4ce70824a2f8ae38e39b43bdf4181cb2d17d1810d2aa49640186b9ebfcadac8826347d9169c0d396f7a3375035ef961e8e8aa36209dd09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/hi-IN/firefox-57.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "cf0894c7b4e954ab39b847ff21a88b68152e3eb1577d6ce6b513c73ad8c26fe184227da022b827b35442a069fcdf3182a843bd4266d29ec525436f7bb9761cb9"; + sha512 = "a2cef484eda6af5979d2d9971d4342ce184a57a383de9c22d4dcbff5ce55ab56e73ed29a03d2a4175b9cecf7ae5d73911ea9be31fde0b8d799b0b1d17357b56d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/hr/firefox-57.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "7f512df549b19e82d054298b1b5284956ea9568793aa0a7c676fd5f52792ff943a1f8bbcaff05996236e4ab19cf4e914d6e1178a493e7077ea97877d14ee8d70"; + sha512 = "c5192160ca2b4fc04692ce48b4c0516a1112caa50313a7a8624497de6bd131413ed09e87a62eeae18ce363c55d617edaf4567c905523ec8296fc6b2ca6219de7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/hsb/firefox-57.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "d7626253732cf868d1f414e297cf4598b1a3bcef10c43641030c599b6d04599139f268a993d4d151bdf08ecc0129dbb638f581de58c1e76f28bea30be0eca68d"; + sha512 = "463caa60951f5a1eabb7c78115b70c88f29697ae56082a76c64dead001344917c00ee6db211f8fc09767a8a684da7500beb69ec42a0515cbf643642501ee24db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/hu/firefox-57.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "f74dd31a8987d35ee1e3c96546d6b180830b174bc03bce12ce83bd52e01f7f1ca9242830f785953ab0ec73cf2dcd19be61cd55981bec6c8926bfadc9045bfbe1"; + sha512 = "304e1b44d648da76e7818dcfab2901c9ec6d4685649aef6bba8fc4883fb2d5da8bb4baf5b7608b4acb2c53891ad2b1c68d48fe18024ac47b373eefa1d680385d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/hy-AM/firefox-57.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "2b1902d366b7de359b8ea0a5fa75897b76293630710d30e17413a1990bc96a8cbc0032e68d73e1ff298cd366ced5f4c51f0a693c665bd3761db3646cdb536666"; + sha512 = "571a1d4780a5c74accf3e5b022923367c23f02cbffac6eb82baf82f4211a0e37fd1ef1d810db01e243fcc0ec2882c00f6e261cbf5f6bd8ebd25ab3ade0a4cd24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/id/firefox-57.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "424d9aa341405c5a6ea5441e0c471debd7d49c4a4df632d796142db9d4c944b49317758e2211b806bbc93904d4341094fe29aa44d6ef936346cc17263c357e89"; + sha512 = "01107f1a301f178b5a1377dda5ef1fef588fbfd09e835247beb3ca6914ee9f7a95e6652ee2f3fd5feed123ed06711a6b255def41488ceedd562b62462f2813ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/is/firefox-57.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "3ad0b286a36467973c4910eb20b09d20ec46d47fb6796078fda35335266f791f7e82d01ae8b7a0fa49361cc79cdf2864240286b6a8a447e6dfa6f49b23f2b1f6"; + sha512 = "69192251968511b76a416315fc1a35af21ed1b5c2cfe19a03f885ef1a2f99cbe65996d6f32ad344219004dd521e692c43fd7f8c85be3efa792899f9d9805b5aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/it/firefox-57.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3c47bec4d903795f522d227d085e0d7ffccadb0e219f7a67159e5bcdcf7f7f2e1543b95ee8acd495982a464095521ec9dc22d9f90599d267eee8d2f6b4a543ea"; + sha512 = "a9b37f11ad4c4bb52d83e8806ca3088ea9c6cd9d12adefa83d63325d6ec7ca7d332fb80d5a084aa97e6c8fd608e0a120eeb2f0c05fbe50f350ad5c5370ad4b09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ja/firefox-57.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "2a1e435e0f74205577c28a6265ac0acaf165b4b891129994f4d42cf78ea66216a04c9f4b7652053281e3717a51135c12324640c5ce285981a1165d9e749a64d6"; + sha512 = "76134087adf8f2167544f4b510c9e98f99b011dd22523345eca8d112457cd6d9d08f23453000783f31386a8cf67e502155ac8739061e59e76492c82b18738605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ka/firefox-57.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "177acdc588044116cd4efb5ff10f178a6af2ebf7b90b80c06b07587e11d89a45a5f0ed4b0a9c7b2b2cd4896f3f4c5003b9dbed33bd7ed01ae6d331e637f2237f"; + sha512 = "22823e464aadfaea952808d0fcf32e79877e63fe784080c23e7fc02753bd6cdc6de9a766847818eee3315df48ea8d08671c49d25f2f9b7b14a2e5be353179dee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/kab/firefox-57.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6e13833052dd32ea168d0e939ea7703c6c5a092848cd45ed8e6b1b0c18bcbe92e1a4c37ff7b1cfdc1c1e618f4efb83dffaf58501ce4f851d845b273fde5ac513"; + sha512 = "d5d4a5ba6a876fb4bf8abb71d89ab7ea5feb1f81c3022fc751afbd5681c3e10d3c51780145b4639e4dac315454884be7a7570bc26482dd5822d5919f227ca6cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/kk/firefox-57.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "1deb2df839e0708f2b8bedebd47a4643e1a3ef2abcf892b14fc4842688918cfac99b8345944a00fcb36495bbce92fe2f76b3bd6f7616220a4a4758396d031d75"; + sha512 = "738a221dadd5c6568fa62881d4e6241e30d9360c8c8da6f1f55af21948133b35fd9e7f79360b91d609cf06ad8f024a3ce425dfe3001f42e43615dfa72f23eb44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/km/firefox-57.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "aed5a7b6e3fb2d4f4260703f83b1092953fb4ee7891ec8dc50250f9b00c4f1ad51d6f9e15ccb8500faf87f723ab891e474b43d4caf4a22620f5660ee8736c9eb"; + sha512 = "b10e116e65d57c2e6a6f22fd10c1783677e7c974775f26a8914808e942953e48b126dbc63710bee8aea2e411b5c56d6d9727f0b5249e553fb3c3f9c0c7227656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/kn/firefox-57.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "d83b0af01fe7f335b3fd3bf89e9162a2c54ce95332de8687e265666b417a3103a508c57f770a4d075d3062cc48f652324fb1c73b1edfb8158b6f5cae597dbb59"; + sha512 = "1c4b4933f04467ba06b86c55d2983e633ff5213f15ad40bc91cd89f399e66e9ff5c4026c5b17c9f743468388c36f75134cb6b78722e4b47e53038dfd14e2fdb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ko/firefox-57.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "74bfe8e9a084348b7f1911c2cbbea89757b72ea8b584fd7bf26c79cc64f3b38ac642558ec3fe059464f252667d2e04dd70cbb34b92ffaa0467f5067636b05311"; + sha512 = "a855a2fab85e2cc85ab60f90790b05d4da8aceb7e4d0d464f2589b2a6ba513fb8ce0a0637c18c49f87d8236c705576b679d258de736bc6591fef4fe1d724f1fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/lij/firefox-57.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "31fbd3b75c1c7d64a9b13c52680c6c3b36e604893a768a572d41481b388e9beb7942f435510b7dcc90e7f9ef42d81e05c7c77f28e5cbca63b51beaa54b09de40"; + sha512 = "e82c6c7008cedf675ed22dd2b3d6d000fa202908f370c0ebca3c3c81ffc95b5da823a68113852c90e8f91ddf1056dae6e5bb97678fc3c98fe34b0e6be7b77104"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/lt/firefox-57.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ce6ebfb5a34f90ea5a8f742a3ac9a6216909c8843fe255f9906c297693a64e2ebd0318ca697cb02a896a122e29d2a8bd055957022a7cb770bad6687e83e9fa24"; + sha512 = "e6d927f0dd8cd5765490515d5d952eb7c94e526fa0af5f18c92c2b880a0c15b58f798bfbb8e8ccd8eb931e18fa1316ab1fb26c18a2870c2c20a3745efae338da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/lv/firefox-57.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "b965eb09bcb9d5e0cbabc1c8ea7fc674aca2b185b2ef83f3c3560fc68fdd2fd428ee6a9d1e72980123816c01b2ab6877add15e706eb2a90b2f9220db3e411a8c"; + sha512 = "28b85eec882060a0c367b94cb8af1d488abffc34c76faa0ada418c92d5c7a343b169ed38e44f0c290e1aa81eaa33c05f54deecda1cbf66fdb76c37aba339210b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/mai/firefox-57.0b4.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "3d6daf9e6e2459a246f9bd4d8e66c01f7acb0a4a63f7413c38c7158134c31b5986ee86233482d80cb33a3d8f0d9946c6cb79ec357f80c3ef22dd0ecd173dfacf"; + sha512 = "256f3b2b27c7eee4feda7f7dea86c1260220677f4691c27c625b00b7d2e9310753e5b81fc4956de2eaddfc3abfa1d8caf36a420d2ab5adf0c00d5a78e2d6448e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/mk/firefox-57.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f8e0208c360cc9b87ce917f51d2302df31f1cc137a16fbd8678aa664d0ae8626dc08f534dcb4f34e1a56cca1d0a3bcdad01eb506b04b0e2054c1db5acaaa8300"; + sha512 = "f441b6d15607f46246a82165c9131023403fd0af05fb54e7a1e717d38c2df56fbf57543c4ede612037584e756038286f125a8b1677bd49c6582a68c022c65498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ml/firefox-57.0b4.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "7c184b7bb8bcd115b4a3d10543a4805291ccc13a3b807d71a862b8d166e324d9f4ff28dbb71f2b36c26731d6d7085dbd45f708f20d6bb20a918c361fc0dec218"; + sha512 = "21e98314efe24409f111679d954bed110d0044a54222a9962891943ed38c3224d135615734c837d345e581f6a7b2cd15a1b965f23c13eb8ca22e8dcd96c9b5a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/mr/firefox-57.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "cf55c41a5ffef1fb41d6c82f5b9492f5cb4cf5aac4e14cd4ae751e81c15acdf30264653b8adee86fc343552c21484c8a1390d3872d30afe113fad94ff68a574a"; + sha512 = "6c91df84d4375838db437776f3773584eff798eb3904f42c1454706db7de2421933a001dc6f69574d7366585b4a6922e1bc163d6f21a0de107665cb127e27147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ms/firefox-57.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a54c9904e67547d2c2c7bcd2c1a5df3b54ceaaed65bf6cdc35466d530797136b38e1f79cab4fa544d122ccb8787039cc3fd2cf3a1f166fcab8c27ddfa820a291"; + sha512 = "5f8b6cdf80d95c8b7702f8f411ec5abeca35b41b2aaf2a3f02ae4e6a033dee9231a853b5d3da144aa13ff62d4052cc55e728dfdc7607d3c763881902cea16024"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/my/firefox-57.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a267f9ce6aced112b488e90b859ebb2d6e02fc73dd208bad34ab5c1dd7a122e4b97b68813769b85f036ccfe8af7e56ea0782914c210b684f863cf2f268f27050"; + sha512 = "1db6cae3d9c86bcb91f116dcd82d95d60c5712be2ec4704bccb76dc8cc6244cbabc665c606bdc47dfc1f89d1bad347213b7fdab383a8997fbdf728575161eac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/nb-NO/firefox-57.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "99b1b97f5c78cbeb67f7ba66c05d04d37bf808e52f98c25dcf2d0c51a400a26499101e4706a20162a805da2493db2919bfc1714940234e94247c2a17e18f7358"; + sha512 = "934eccb15bfa5e99ed9fc74b36d9ace3a2d48aede41182c3f66c0250b88f089ecb4a7c59112d15b142743aee9e617137b3125caa3ef03960b3ee687411df92cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/nl/firefox-57.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b19d2699ffd4bd0e5de12a87f8a5461fe28869cbbfe573098e628ed3936baff9ca582c47104133bbab6199472182c9f71af18756ea750e9f2b256b01314884bd"; + sha512 = "b469b7a60a5119093e9ae7fa357fcaffda96f453ce4fedd409d69ee7891b83f81fb27a58201649c49a47b0a19f79b5a028db13af87f52b979877cfe66754407f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/nn-NO/firefox-57.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "87e3dc181130019499cceb8b3a2f86e0b4ed32defe44eeaeb3df8dc4bae1827eeb90742394c3112cbbddd8960f3aa1a2157dd8903c2eae1cf4c17fa9e3179dc3"; + sha512 = "e4f1715ada847b40a9c516cc565908bd69d21395c81165721d14b01298c2af96c5925659b2c4485e5b2758df579818ab1508d5dd8435d5f36a13a0692ab228c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/or/firefox-57.0b4.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "cd6220bdd6f2ef82b0af214c62ca77b48cfd0f790b9f62316b2a2267aebeee3954935999bd6f1cb2fa4cb64650755ffe208f14b322990704daae742ed126140f"; + sha512 = "f87c4dd9eff7e211fffb8d8c6ae4d7f541bd953f8eaadfa4b6adb41ab587d477e030e6f3b6f04ac56b07ff66b096979aa42939a283f78f68340ba40149a7ae7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/pa-IN/firefox-57.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "cc7c72ec73a7618664f759ae9f96d06174d835ff6779f6bb3b199e4a38651de695db0149041f619ca4fc4c9d2284757cf33683c6c107dfc08e25bc39e3a5f6b0"; + sha512 = "6036cda65bcda4827d4516927280399385a70cbaaba4148c8464b68736eb2c515494b3c38f36588b36851e6ce78a44c4f05314a4c52f915e3475d5d2f489116f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/pl/firefox-57.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "718ec975c1511130799ae59188034dfca681659596755aff6809336be2dd41e0ae744fa2fc245e51f8de86409d5677796efad33c7bdf29873b90dba075c941d0"; + sha512 = "7982e11b9489c92d3794e3beff168e55f8aed19f20e477789d8586256c61c7714bfa7c84fb02a9f7fd3214537acea6227336185fb94fd6ed67936de11276b4cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/pt-BR/firefox-57.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f6063c710d24d74714b2661e7918566904d3ad4e189ceeec662253f7039f5bc8fe9612ebf618c858c15d64e90e2eafbfaafbec78e441a956c7cb9ad21467a547"; + sha512 = "99fd0a93634d8145721671b414817519890d08e286431358d83f7e0af5451f12a152c8162736e1688d51a70db1e6169ab5831dd52f4253e2de63c85540f58acc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/pt-PT/firefox-57.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "450f191ffd823d3a079f486dccd7cc2480f3aef840c1168b38e187a9073f1c8f3ad093ef5c56951440716d6dc6bcf98b5352d4b863308a14bd5b6b7e6a0f8480"; + sha512 = "ad5ee4c2e33698f545c5bb5d300b8d1fa8356757c01b7f5b0647e226bb615698d379f5968967dd91b81e1b3553ef7b30a40be5879bb73c9fd007ede10bf26f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/rm/firefox-57.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "552cdfa2dcd7db775fe9591246c5c96997f0a86a031a2f6cb2a31a00fe05c78667e46cf288e30a3453d26d8e7fd2480d2f94857720488b6a291bc359553cb668"; + sha512 = "d864ca476efb09ae3a0d867db5b2730d0055f4ae1f3743f9daa93d44d01f976a8559efd299c2e268ff96f181785ce24747e758b1da3671e49cbb3e70caedd2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ro/firefox-57.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "be2b95672070d82fc92849832a37ba41caff186c1c9203a2cd113f6b949c4d86ad162a607688d3e3f546cc29553e8acd9b3d94c14593cee10365a580af0b7d1c"; + sha512 = "6066f6be7e0b641c13f9a32056c9a98f0700205d45002a7259cadcbf128e7c2d0e9abcae14521f64678263cf802b7f72f360820d0ce67a0ba2ecc23fa8dac86e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ru/firefox-57.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "2825967493d4a3a39aac644484556a09bc9a63e601539115d8c28bf5f2724b22b3a374a5ea30cf8f312e6c075203014df850cce3436da0c5a0dffefe9452f371"; + sha512 = "654ed8232ff61c0ed20bc04930d38bdba2f95bdc49a6163bf7d40137f3254fbf83bb49156a2f377605228a2d6c2cf9147f24bd22ff4ec8c75b8f946db651f7f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/si/firefox-57.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7407388751b8df127156f5ac4519d459df4b929d79f4d82c0d150b8f327698da435460b911a077e25fe5affd05f692d4a18bbb8f71cf3921179c60d107460103"; + sha512 = "bf9dd06c36c6c7ce701cb7bdac2cd8874701115aaa294953b83ae3ae7556bca397dffac05a481711c15c37d4d8a037f8aa4fb6b862d01b4d12a85d755a7d6b9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/sk/firefox-57.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "2b6ca2922e28b061024c1738fc70fb0b31737b938a8fdee3676504a87c73c29751d22f33241a450941200e7fc1920cf66847dc8188d987d47f4990af00622b31"; + sha512 = "413f0389c5829b5a08f16d8f0836e4a2ecbe6605435c3265f3bb9980b6a17971e00fb5f1d5b6cc0c46d93bd71224dbcd18a8b3afead45d466801749cf12e320f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/sl/firefox-57.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "ec9d090376d17c8ca283870d62b50961c520e1d841e11137d19f6083ded9ef683cc0d14cca37446be0eb2b5a6c9a9fc79e12c5753316bb7ce0f3cd07b1a0fd00"; + sha512 = "5d89c50e68e11965d7f9ecc562020b48df59dfde8d79d97af3e235f8adcb4a55e0def64cc1885acdb1a4c92107c2462eeb2038b27b16d1d7219edf27e437d152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/son/firefox-57.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "0f175c5dfeb93d07cd4008967b4f3e492cdf0fe44e3280b1f761a5d9f552a7bc2df12b3e4e5bc8ec388e93ff4d9f8ceff46b46edbb331e7e92e2648804e80e67"; + sha512 = "884d6c8802c1c6668b559ddd01b3d29401f1189966626b5701ae54913cc2980eaaddc1481dcfd3143e653d2b832f6a04111a3036f28bd23904077bd7736dcc46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/sq/firefox-57.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6ec09ee64afc4cf4e6f710d49f8010dc62394e1a912fa6139994a741c6abbb99a570478ecf94801a1ef8316704614fca5e807b0830f77ac5714a7fa3a53d5007"; + sha512 = "6c427a6ce4adc894f348abe9fd08ee5f257394c93ee7447eaab201fb8d22c0f1da7f5d20e7a3321a81ca2063efd4db9208613d36d13c39905d1b15f68b07f0ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/sr/firefox-57.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "0515e265c0ee0a223af68c6406a04c0264e3e806e5a575afe6c6adaed5bc8030b37c70352f84742a85eb70884cf43484cdbabd8de1980034246bdbd2d46d93a4"; + sha512 = "873da4ffcfeae90e05604adc52144dc6328cad2084bcb022ad028e7c62daa75978c077eac127371180d21fcd81e62db171b46616b5652bf1cc62b335263e522f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/sv-SE/firefox-57.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c2982e666bd96ff6bc4af4af2faecd84235a1e314766414f521e0fac9aaf184635a3b40e118fadd3cfbb0bb50fb91834f26a608128125eee5d023dd2fbd6d87f"; + sha512 = "b285af881b6d76b7d9ff2e840ad80a455f97055b71cef28ab58c5e0b6852dad674a50b8b4e0a72a3093dd5c506c7fd76d60ecc6e954bf276507a04069f7b861b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ta/firefox-57.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "603799faab54ec78905c8b5413357a50723090c5c362f3bfd5eb6ae7f62264c5111c4062766848f6f487c0f107a0a17bae87362bfe05e86c448ec455c4c9bf2a"; + sha512 = "b5efeb840ecead2b84ed9a7e32a84ec469ce25e473ef738d95adad958db6eb1b5da3935e0f1af6155d05b10d341cea7ff48bf9dd06fb8b6527dda87045cfe6f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/te/firefox-57.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "be6afcbd8a3ea34ceb53237eeff1b271a92fc46b2138f3c5df9bd33c8be83c7d22a7d3198b91f540cae542aa3eab28a9184fc6b544de906f89fd4732c1a59ba6"; + sha512 = "f9e284a4e5fd2927cdfdf51e7dc5a12b9b47d1fa9df7cfe3faad694664ef2db939d3722ef80f798c4adfcd08db7360da97b2bdd9d64978f899e679ee19adb305"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/th/firefox-57.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3de3994a01bb3238888754ef27a41d37568d7e9e55b42e24071fb8187129008d06b5b41015d612f9caa5777a2e6ea5cecf772fc76e1b0629191126565751d014"; + sha512 = "ad0d84915ba72bddd55a44d79863aecc9688da70863e4627d1971ab19d0b1f04dd0da24d7e5719bc141cbf8f747a9b714c1267871ab42d2101e707392e2ceab5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/tr/firefox-57.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "34bb2d9358202072ce71b052b4876a2124a4263904a74582fc9973d4c8ee92c00bfdc92a88d663b045bd94945abd8e9d843cd626c16504c2543b0c1bb6a6303e"; + sha512 = "3792e10afe5d04716bd759b694a2c486a02fd47b89069d263075491982367ec0e41c9fc23bc8388af2192ae62220be85bd08739ddea11e78ed39d83354497c3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/uk/firefox-57.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "228f227258a73e9b945c8b6101598fe5a1f963eac7db546bc730dbde6c114630152767e54367939281aa9d97780d1643250140cf94e0f6032efe2a170c88eb40"; + sha512 = "0840194bf1aee9fc5271cd8c63ac864c629e1793551ec1a15f59eee356be2833bc0616e66df18df46a5e2c14eb259bec5062672625325d9d68ac183fc7fd4bc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ur/firefox-57.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "34b3371285df53ed817032cfca1caf0eee92e8b15de741c7c1babeb9bf3671c3bd7ae43d80113d44f6ef5deedbd586ad36721dc6d92b73c6b1a889700e07e99c"; + sha512 = "285c75aa425f6ced8ba5f95b506d9ea0d5ffb50b59f860ca67fbe4dc13d00df44e8de87a815fd29f24851baeb12de0d06f378f43a9e41714d19ffcab7fd76293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/uz/firefox-57.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "8c82d7db9a48bf70658a1d086c94d0071e2b42677ab4b2eb552f6f42bd57e20a7c8580f065448346d810c0d76704bdd8d318bf0489302f8807f695529df8d4f2"; + sha512 = "e84624ec9156dc9546951a7fdd0e4fc440ec47d05e0ae3ae97b7eb66765b154eaff5bfcad59ec3f8d3dfa0f40c110986d0d069896d8cad234a95758c19104111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/vi/firefox-57.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "64d3173fe6514b17025a85119da84178cd72409763ac4b415d3527afb77eddd2c6b344be9ac74f9c9e066b468bb6c7094c579df6a9379f230b44c21c3bc2c215"; + sha512 = "bcdfb25758096b10ff8e24c9052d8cd78a5560657133232f4c99ff7aa7359714ca9a41e83c8ad11ef7c50cb0102f206b5908259ff47f9772f659c36ceb1d195b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/xh/firefox-57.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "9a2aaa10778b8da82077b40e3fe5e295c34e7b75dd1d28329f786729059c7dcdd9a74f8e4a3dd123f3e3246c227173df23a3c5e8235fc8e3e05c64c79d03cdc9"; + sha512 = "0fccb36a38403e24c0e53e8b38be64e7588204e75e5970c6bfe68d50d9572aeafbe9e146070d1d628b6dde151ec2e05cc5226e512022d178e487556ade16f593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/zh-CN/firefox-57.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "8fff898917a7d05c2d808eb272ea5c0e9a8eacea5d62dc3a40f652a12ec9c48594190c4d5c97ea9720a0da86e3322dfdf3760fc275f1bf23f4c6f328a4d6462d"; + sha512 = "28cadf527919cdc85886f0cc232a839942524f72164a15d0d0a272110de474908d50315811988197a07a8cdf542a9fc3ec1a54ad6f390b0cda7f30d0890ddf10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/zh-TW/firefox-57.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c396e60a474d6869ac1023edc957b1b3d06e6b6a79bebe4512450e237c5f5707ce6d0ecdd5c904b0366c95a3edea331a1a6cace5171a3480fa47c08ee41c1ac7"; + sha512 = "01e61bf83819b77ee7190eb2f8da3d9cd6ff17e913fd6e88646f72f44b275ca29b461e4d3f6ec962c77c5a69fc0ca8dcbbdc87454616ebed308b514102f28bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ach/firefox-57.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "90fca234d227c88264494120a5da0433c4efebdf273074acbe073250a5d71a736314859dd9d29e693c8cf5c2056a17b215757fb2e2625c7832673179c2dda632"; + sha512 = "6fd626194215d93e3027d28fef689525f0b6c57173542e1474a7d98f380c3b9824b7fa2191d689d9335b5be4d89920e3caeba36cee1f27dd6a8ea098e500c4aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/af/firefox-57.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a45a503a524c7207c120c9981425278f04454da2762ae024ab0c4df37fe355bafa4344a38c2bec49e232bcef100478f3a722c44056516a06fdcc939bb7f76939"; + sha512 = "a282bc4550e59edbe44ad09c0ad2216d37c3c825102eff41ef44dd804dcb20635b2a02e98ecc27c71c932065ce8d4ced5298494a3792854880a90f64aea1ed93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/an/firefox-57.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f0195a1aa23b895c08b2afe1569e968534e203442d5a5831cabdef49b9e5f335f46a33f26fb58e585f46907fd059ec28a80b8c5d724a998109b635905a504109"; + sha512 = "ce20afe18b8b2c9665a1b34674dec85605ddd351025a9b70e755e979f6fdf64c0882254563dda63dedfb610b8a42784b9ab7bbd4dac876dc9fe3e3144be3dc7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ar/firefox-57.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "2649fb1096d06dcfce03b4a53acf3bda1bdc89cecd1267df8a67551cd1a8b3ca8d56c6e2a8be9f26d477e68d5e91a8538af2d3e76a7a1a8bff969972bec8ed46"; + sha512 = "2afd627a2cfb3d25895c76a898cf025dd95ea212bf935dd46cff493151255ff152107ab967d9caca61e5bdbde784b4cffdba1a703a1d8c0e894ca0642daa38ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/as/firefox-57.0b4.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "204a40f2fb1a55bbb0ca9e6f03764ac3a4e9c24f17a61029f3b6809e54d81ce7d1bf5b87799106956723efb5d9f3cca6db7a32197b7912b079ed786b6325b4c3"; + sha512 = "259765855256a6386804213bf1a948b1bebf382df085cb391fbd05cf31acbcff1ead282abd118ed89de0b8e7772b5327c32a898728270a29195222266f940293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ast/firefox-57.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "68a1c622459ddc75d667ee3dd969788c76524c1d81e45cfa99f846063f264fec6c9fb2bbd12134af9a2e139e0c272b8031cb432df29838d3c08f93bdc8b4a522"; + sha512 = "2cac1679b674f8bdfb8d0adfe0ee23550fb0289d436cfd9d815730515d32d66f61071145244ca11dd0dba5885bf52ad8d548815220b909e62ecc2e866376730d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/az/firefox-57.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "7fe10e5952b1798241f3269d1b98baaff0608d9aa4dd46977c49383732386256aa0c696b59602c65ad386b0132c70cd5188a791474b20a2fc211eb7364437782"; + sha512 = "e709408f276677f6393d2da954744d70cab977172a61e95177203d54c1d590a51fb35cb35aae202159475f78710486c80fb7617ab38bdcbc48c1ad3146f475e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/be/firefox-57.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "4fed1eab9d2c1c1290ab6b0117324ce5cf2913a9d7d39082b11aafea6bd69a8a9178ae1474bc971e64fe63a26aedb6f7af5944ce9f5ec311d6e395997a766ab0"; + sha512 = "ad5ba8e3660db6a452ace1570d653a4405d3d86bce834408f7e2f69931313903aec2c9b1e2867cfb4ddc6a8116535e266d1a8364a210647475f1c11f1a42d2a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/bg/firefox-57.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "0e9b1e31ff2c0684275a9839f67b3b04ff28f4dbee09e07b5ad8b0b29eb63c5c8c37ed693a65c932268681276504eb84ec9abf97627a4d3c6e9b431bada37e2f"; + sha512 = "0361f33cae76818dbbbe6d880b4d9d55393847ba38ca782a32fd8561a2182aac5477bcbe32a84196fca980c1e5b88f3de5f2e37a8d3fbedc3e7192018ae691eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/bn-BD/firefox-57.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "21281a5729c17002152af5ab2e0dc0344ff66b89ba0f1b566fd2a17e71d7515767d3ab1098c746fa8f87be6603dddda2b7d060720b753a07389db82e7f98df22"; + sha512 = "590c6139ed81c04b8aefe1c7047b62418b5f03ca25f895bf61f31065756ae0e7111f500131f59d5bace19c91eec6295d36333ef672b0710dcb3eff7937355901"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/bn-IN/firefox-57.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5dae77a2ef94e01155a547b2d853bc8c78166a37cecffd367e648e4f04fb87333d716c8f65d521710207f3a46a69a405592a2476b95dbf9bbd799b1ef8837145"; + sha512 = "0353cccd7eaff7768578e90aa88f2e83523d48fc0b982018a373df6789713a3b2c794f3cd1585b4a45c21e906f8fd502672bcb66996f7b5db32582d78fe889b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/br/firefox-57.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "73726276e5920205bc9e5d281dac7995133cf2073b69ba4a5996919a68e19c9fd2b6c57f305a4e3f88feeb890f4f006fd2ccd0ae3c5e89e0cc6ff4f3ba657e70"; + sha512 = "5a049250b11925ca0627ead2866aa0b84ebd5f3502c892a0bdc4a5e50e72750618228fda77259711c2fecf0572e1c9052d5239eb97f0960700c7e664c5bac4e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/bs/firefox-57.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4ce3ce74a8f61de0a2334292ab35ce8189cccf240ae9e3f249f6d736f01803460d2c09504de94f23347886369b1af4d29a3a338ddb2879ef6f2d95b253c40eff"; + sha512 = "8b01fb4f35067a9a4bcbe045609ec6c6563401a812361ac3eb6df1ca0aaf0a804f485da7be220dccc01d4b8e4cfed96338120e3b1def1dfe9a0a04c1b44ffe26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ca/firefox-57.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "0b57c6754d47109089aa33edcc12f483bbc81d3027d9f09f3e69c47aa17092477d60447e19c0d1ef991927127307d448772fc5e050e73d4b1c75fc91043c18fc"; + sha512 = "f3f9a9618ccbfd2668c43619b3cf0aa6b3ad42814dcf3e48a828e1555a6d364245f3dbd7721ccea38fa7fbc228067d0fb47be66a21efab22ccc0fb4ec3769204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/cak/firefox-57.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "5315a9c31ef931c69875415245628cb9b11bfdf6a0900be21ae58a67301e4380b479e4426400081ba9e2735418f0eb2c6d071e830c1ff37b3e5ac2a354b0c46d"; + sha512 = "14392133ce23b7231b21e531505f711002c908b58955b2756802c8718241792417a841f6c341722e249d4f0bf129791cd87796df3fb271a13fdd2038b8951090"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/cs/firefox-57.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "82e827a0a23b80783bc0bedd7cd2522a5fabb9cbcd63e6d644b4859a34a7ec8f1b6a80df02a389e6ac92c6116f74d642599726cece33c77612dd37de4a106ed9"; + sha512 = "d2712df5ef00534b853420ea954328e92fd8cee2357357bda7929f174e9cefd6666e2e347dc816c5cea2f54efa075c78ccc6de42c9457e12b8744a89d775d904"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/cy/firefox-57.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "cd5b9e70099f7529561553a12c307f4541de147b7bb7cb45a62c65f8f2eef98b4488458eb3316c6d5102a3f29dc9f9604f7aa9619a179bcc40e28050eb51d0cc"; + sha512 = "bb0e33a04190a6946d3aaf86c68fba9c52b7417cc46ef7310d0d8aec1e79c7ad47f988f1be48213ca27e664da98b35f84bae28629255f9941f056c51109d8b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/da/firefox-57.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "af9a2f686bc68f54b4fab2030933c49ae8218e1de6e538d6e46f9144e338a3b4684b195ba743cd900bb5a8890e72824491d36a94c0e07ce4cd465b40d931e05c"; + sha512 = "1b5cf9c35245be1e9aafcd95e4cd54e5e67fd1e9ecab3eeee19fad050bdbffa9dc972c9cecb8370c5bd09e3e49348e199cba4959d46763cd59fdf74c034b6928"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/de/firefox-57.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5c2c13831b8ee7591cae89ad7fa8bae9f34d20d4b473e4ad755a2396a382115f1665ef5bcc0c58faaf01a112dde04a3df391dc77901d0858d90533ac557cd957"; + sha512 = "07cc00f6c3f2ead40425059eec604b2665bb7bcbd1458f6ca79111d9a903a87de6306fac437d951d70f0b9dea49ec78699cea3beb4fb26eab9eb191fc6d81999"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/dsb/firefox-57.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "75d765e2869ff7ee0487471a5b1c15af22afa9bc8027f13f67de4265277ebc079ff769cae3a051300fc5c682a3d799fe64870e87161dd8e063c9b89cbf6477d2"; + sha512 = "1f4d29c5b8a0ffca63eba1051ac9fa2e24304cb4acc726557490825bdaa9e6967c6c79c80c00b38195ad98f14ca4e789720dcd1ce0e68fdf6d0e89d7330a3563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/el/firefox-57.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "c430ce65539e96de0646307b9618a64f3d0441637798ecc4d0a59f77efee9cc6d269647d22f77e0f50ed01f3bf6f3786d78a4ef95cdb5e92d7765fb142d13d16"; + sha512 = "37b2b81afe8d4b731057c100b454e24e6bf396c6f70020bcb67a2036a987585775d8affbc978606dabd15729d77d024b8cb9217654588376689f6063e5b2cd13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/en-GB/firefox-57.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "f371086cc83b0274133244566720d66120fe086410e768f91bf737870316a9398dc5ebae67b4d5da5dd5df72940d77e93655e94f051cc8b813cc2a40aa7de547"; + sha512 = "d3deff040bbaedaf22dbdbaf594cc594febf3ae7cdc89b5de270aa6534afaa1adb67d7e33f9dc8e48faebd6456bc19bf156e60be027d0566816b31e99c98851c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/en-US/firefox-57.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "59884b1998bcf9a2a9ec0722852b8b29f20d67a32516f00dc28f46ad2c00047e799d8a0a8de3ea5ce28e6e536feaf49ac28c38b5b68e7f304481315ccba71a7a"; + sha512 = "685740c39f481e6484a25f59e544c441bb668f0ec1d66cae625d633a94c756a640f14148571098f26af885a4620990f7ebe81979ad2dad61fce19f1e922b7dd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/en-ZA/firefox-57.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "5119056668a3e539309192dc61ad2bc30d5677c297da4a18d423576bda292218e53b149da825225a016f990fbe5e2538257343dd1fb87a216ea1fa7a37586544"; + sha512 = "3491e2c503bd465c85b080d9b55ee7f41363ce84357d272ac5d12bc7280f2041f24b4ebce162276bd302e8cf10c6014925db60f629881d7483782092c00accb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/eo/firefox-57.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "2eaf2e224cf43d5a5920c690c83e4cdddd8f1c2d2813aff1057d99db77a7a68ac818ae311400efd6cea91ac89151c3b532563a9238b26d022be7c260d6fde28f"; + sha512 = "5f7686a6e33359c8e2465f3fadb9d3fb273be8355fb9aa262df5fe3ad37a0cba6c549191ae23af03cd67156fce49db013a8b92e335dd64483b014c0477abc696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/es-AR/firefox-57.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d74ef9bd620f4d62b79c0cb4c1033b3cc2278375c61f699c3251bbcc0390c657860adfb2c438f5b3eb9ab69413e2767269bdc96000a052b0ed73c0f572ad82a2"; + sha512 = "bb3a8fc248ba0109279147bef3e08908560dfff27e5aa771d4395a5b202810aefd53e58f916295bf4978708351c04cdd5d33efd9b5b19d74f86d60dc56a71224"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/es-CL/firefox-57.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "dab3dfceb1ad8073cbcc02fad1eedd530db1b9092374929c6e5eca55923f30d36f848862fc60aef3b71deebdf5bdf3f7a222951a3b3daffd32a9a60dd6ce5176"; + sha512 = "6aee5d9019a087c07d5c3974dba4883582c2d5e7d0e8432d4d7bc2db211a112cf6153bb5f3da42a77883c34b06b22d5d6f0e7f1d50d62a1161e9cce42ef24486"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/es-ES/firefox-57.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c099fd1756b0e11e05656e08e50c78263f3d75c640322144bee5ced382987461c33327ced61d57cef7119c4b133246b075f443edc0b17ed0fa1e94ac37cfbc70"; + sha512 = "caaaaf61e57257da03d1f2863464fef30b56cc4cadfb1d2ea7706cdb754d81b1a0bf999c860efc674d8fa4a94a48281f831fccd0908b3c2ba539054e2ec80a02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/es-MX/firefox-57.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "2c1f85ddfe21f9fd9cff763fa1760fe74e501cbc01fab33d2f06b089550be8f6c9fbd3d3ced7f57efd33073adc9632c1a0bfebbe45acc8edebc69bf3b36a3a80"; + sha512 = "cb592d991d16756061ea8fce8954a3d0634e1940ca2a063e7f3951ba25405510a95e083cb69f391588e9089c7add02bb0d16f28ebf3d18cf6c260fd117c58545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/et/firefox-57.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "fb1e3c9beb39c79c073181f96e84fe7c840146c8e28480618b8d44d1ca7a4930f34e44b415ae02273661a8f4f3918a39760ebb00962a938c9c3f9a7c1179bb5c"; + sha512 = "33e241c60b202f38fc686ff0fa0749c98beb281fadfd874e69ce6c94f23c90dd59f2cc1cdfdbfd2435a910cd68ff8820929064020b62d4a6e30127efa3025d6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/eu/firefox-57.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f896c5066102e5d5ac16d580e3b70b703c015aea4ced26019824b181cecbd75c8c01d777d36eab6a9cdfd926f722e9351d02b3da8e42e9abe031529b439b1f84"; + sha512 = "0253e4f86464c775e84d79d393cb33977a9cc1be269c1753d6edb39228d9e3ffb6fb11f31759e62b8fabcb2b490e3afaeab02e99aab18ed1035bd349b5c77bed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/fa/firefox-57.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a2d88f92dfbe449504b0d68450f56acb6dcb1051d51f54851eb30968bc762e3208ee7a3005f5ed4371c8a81bb3b21fe41bf88a9d9b1736e3d5d34caeda8422fb"; + sha512 = "bebd048e309816a089fe81e5bbe55c65aea5e1ae5dab509089d12b00f99ec5ef4005965ade424578af21f6d0f8ddd2d9ac9be1499bb050c5b81fe58a6c3e77ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ff/firefox-57.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "ad7fbe231d45c96ec00d5a3c2ae5d6e47d0ba13745f0415539bd2eef40442364cb8417ff1b86e6400179ef571ee90e10348dded1197d0fdef64bb5f83f143d04"; + sha512 = "636114444a5e81b939f8123cf06ac96c3f0f481269172c6ac64480694a307c81fed33c7d9f1531f26a9298eff2134bce93c408d5bb45d4e611adb8a912e9d79c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/fi/firefox-57.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "613c7e26c71e758bde31c294c8a063ab72bc1a9795b4a0206c0629c1d70a0153b03e0a0337f21c91df1f11f9c9228c997300a26978c4af6473c52c45d4eb1740"; + sha512 = "ba0766f65d590fc3ebeba21d9ef43a958928b0748e12e2c5b7d82fe00e74a06cce462cd686d99e41317e4afe65693139dd6673f133ba43816025543f53af355f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/fr/firefox-57.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "fd065d962171f8438738385cc160396f7ca48e3ac89494bb772d9a778826803ac8d08893b9b1327018121020c190a7cd42e01a540a896019b5f9522a4727515a"; + sha512 = "410f03d70413cedf2434ce6cdfeec3611f772059eb46a470b2fbf851d76a58249f4dcce281489f438df799c4a81ddd98410f7d2a5801b53515cb7a13ae555a97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/fy-NL/firefox-57.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0742a8ad845fd5269fca4f75716355de149a78768cd20fc2cc44ab3ecb8704a7e9fe75a376ce5b2419946f03b31d1fa702b7d4792f95a728bbec5a9ebb481205"; + sha512 = "afb638f901404516acaced85175605b43b4592bbd55db7d55c2ed0011a39340565fb6191b7a6642e76ca44ab9c84d3545d903b1282fa7adf71db6080c8619f8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ga-IE/firefox-57.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "9c6ad31ac03fcccab8fb7499c3d9243bebb8307ef3881c45eeccdede5180d3ed7b3ce49d12b403286836aa523020e2c400f10f8b6cc392906a41829e15aac4c0"; + sha512 = "94807b2a6b867dafadff69d99df866541ab442ab97b264e93264bd6130761385e9f7b1235f4668e25783b37eaab7bbfa15bd3edf085a7c563df7050cc52d302d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/gd/firefox-57.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "524e7f7ad6b055f1deb9e6d38632bdb7de2f77fbc67ddf1eb83ca419fcaf056d5a9c697146a252e999f2d4f1595ece70e293dfcb18e9bd6fd6a1d0b1f886deb3"; + sha512 = "19774051018b2b74650ebc6082f92161b7dbc2257d212d592cfc881e7daadf23657dc9d6375168d54d74f9b2ecfd21e1e44a418185cc4dc1bfc360e842ee7fde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/gl/firefox-57.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d8d25e18080b72497ea69962afa364f0cfbd8671ed5ef1e52b2fa2cd8f6dd23d71182544651e9a1508b1d50da8f6beac361b9426ea5be1a819bfc858b3d7cb73"; + sha512 = "9200148aadb1fc1ee3b3481dbc2d2d9a2f7905fd5030aa6c3ca908765150ebfdf8022ac18ee8ff712d46f12d5d9c4f51ee1ab41f80065e8642e4866923757e40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/gn/firefox-57.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "4664536b70c34c35b43ab278874d13c0011890b071d1e3582959315b6edb54b3018135b1fa94ac482860cf6cb15ead63420c1896574348b78265c48f2a016ca6"; + sha512 = "efff686e4c472629fb4f4581bae75f5a41ee14d4e92a6de908663a9e755736e75a67963b38fbcf9d88ebda5a5a7a1704b0ef30f64019e370e638a73039e62372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/gu-IN/firefox-57.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "c6b5374c4bb866314acfd01f1e95713ca50d51fb77a9251e6b228695fb45ae5492d11798369f27bbe1b254b77ce46b67528f1eec72b4b91a68819030f6500c01"; + sha512 = "6c60b30e57999dd04f2b265836719748eb89520f3ab848c19e4f25b85c31a83c52a40b611b0cdc2ea8be8b9df92e75a31e0c9a462676d0ababce51e8f03a897c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/he/firefox-57.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b3a652dbf92a1e2b252d40b6c419c508842c779c3d5fa8458402a129eb773762048abe64cd04f41658b566b3a0add948c998ec6ec1ee32fc96f8152785a7b21d"; + sha512 = "5773b812756d20e7006389c14cd94d2e12fb1934e69d7725ffe9379e9c42a06b2f9f9ca32b72577cab5ad43c08a7ec5519f02bf90365abfbca69241c9b159cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/hi-IN/firefox-57.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7e857cbeaf419a3e1685b778c38f5d8f2b437eda2ac0c67576ed50cabf3abc13d8c95045649a3a68cadf053a7af9b64b8bdf84e614f2e52f35fd50b69b234eff"; + sha512 = "df5bad202fa13774f46c582fdcf7ae588908b1e50194f4ae46af9be2b693c5fc523b7c127ec5905d6185873fd45f3296f59ebbe69cddccd1d9bf48f3cd06db32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/hr/firefox-57.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f71b627e820eb44f7b6a61f6d2a0637712a2a516eecde38c2bd13c37f92b34add41b4b274a616697e96340e44144adb0d9812dabd19aea563f90409d605d6ca6"; + sha512 = "6a4a22b5ee9bb6fd86e016882b3d33f33f2245027a869c10472466e0c0d40bcca2ad5a6b76f92298e5aab174237976f6072f47b85610d5567ebac955b69f3c34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/hsb/firefox-57.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "e5f9eaa358e3f87d78daa8eceea39dcff1ba6854252f3327791ce51ed6a51030cc3fd493a11647142edfb94bdfdaef82893d89f7796c0e3bebb674876fcde554"; + sha512 = "22dc98ee44d6b735f6c56127054ae5be4112a318eb7334b3e4455c1315a4cbce30a90f3f67f2767380a23e9bb2a25f9ece51cdc97376a590f0ea48edcee12015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/hu/firefox-57.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "9d74b920a7ebab561d2a812c33b3abfe73d4e2343f4f6fc903b65b8d2f6dbc7b63fdca3a567966e9ad4dd2bbf9ab50e88d71b95eb5a667aea5bf913ddf635ad6"; + sha512 = "28e3c20123999d2c17ff66533db241e6add3f9c4a3d23c1e9fbee3d2ce8748d8a39a3f1b1ea92fe8231258ecf2dad0687a46b7b00c3095276d79845c7a065156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/hy-AM/firefox-57.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0315f4276f80aa0cb4a3e90dd452d1b65a270e830da91f9464f336f9fb9cad35eb446855ee63bfdc08219065580609a29870d1bfca873a88db0f0dc1ea39e362"; + sha512 = "d6fa2c684613009b2865c1c4f8de8718a41fd5e21cf395de5641251b175c30dde405f421f2c2b453e151ce7208474ce4f9d9647e5477aed4e6ff3e9a9e177921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/id/firefox-57.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a447dafebf5892dcc5e316fa1fb325a926bd6d5b3f8d808dfb1136f5fe83eed57bb065844288d7634d8a61f260f87974b67ecc2efb42f5ac8c6cccec5a198908"; + sha512 = "5d020afa3810b1ed82c61df265c6a6506f5b86de23f71ffabc2b1124e1664a3539e4d8e21a36aada76be854af333cf1bd053c62a5f82488369ff6b9321eccd4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/is/firefox-57.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "84e35402b9f5e7cab69276f2780f89c20361fa463afccf985866861d41775bf5e4efd81c8b7d5233d3851910f0c36420ad78e735995d49acbe48201e3162f99f"; + sha512 = "e5ab0c5f8c52094f41f644318b7b969faf494fda35ab2c29b9c2b45563d6daa0b95b8e2890dd651514d6f4e7789b8d3f439b5b966c3b466dff7b94f07ca88293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/it/firefox-57.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "53e5969577b9fe93e64f7c4e45825290ccfd4ee7f7a18b53229f8040cb15c45ad558f274a072e92ddbec03af8e405216386e07414886193241e1efbc07b9dc72"; + sha512 = "246ffecf1d0eed68fac533123190b1b2a29539cb00f44ae5c8b72a073a829f21daea47f706024e980cc63ee05f510c920b5bba9b7fa11a150818ac741049d862"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ja/firefox-57.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e0b26b41bc58dcb4f2bfa29fc806fedc3547d4e8b6e97c79750d77c3c822ed8f410bd0f1e99c3d261cd7f187468828c0d1eb86b67d7c67a4ed164647c323dd39"; + sha512 = "b2c045c1b559fbc91d20dfb2abc89488503330ede0d66216bef4592e0bab3d469f5b179c485fc0563ee345b204eee770ded9b46abdbe9e4b381af08018a7daee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ka/firefox-57.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "d14fef9f3efa294df9919d25a43233d979ccede7107d502354b2ab62949d6df3325b8b920684d0994a3894f88730f3edc5450d90bca9056fefc58739b60afe48"; + sha512 = "42c4f3f86dd7d8225f1e51a74fddd5222297d2cc1ed546c768fb16a2440e53e679722040677ab22cc1f48744ec301ca639a36832b4d72df527fdf136929f90bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/kab/firefox-57.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "24212c3f06b204a348a6f864c9354d93317098093e84f57d6c8017618f2ceb15098136bc0afb70d315254cdce37ed73f7ede1db18ae1d909ce85deead4fae61a"; + sha512 = "f0817f398bfb1ab4bb4061ae0f010d6b782826fa64191cdc4b907f256593c5f975d9ee19e69119ea7bd1d5eb6c3c91a59d68ea57bef7dc3abc307e676d70b0e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/kk/firefox-57.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "2cb4bfeb2f2d3f0462e776ea82882f3431fc1877f89500aa70933f9a352b2a2fc77a9f2453954459fc6c9a22103476262bf5239e8bd4252ca7bd29a33536390c"; + sha512 = "c10356919c509b3ee0040ab327504c68d3d79d35738cc218e6d2aed448432193a2ca5493d4029bf636d160a945bfcd68789832d99d55240fcc13c5296bb71fc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/km/firefox-57.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "745a5cf7ed4435ebfc1f2bb2dbee3ea76820c1758835c032579ec7e4afdfc9e43e28836a65bb667ffaa9bf1168244ebdc1ea14c14265e2ffb8d1fb7d4321aaa0"; + sha512 = "e8ed8ba59655279495afacbb94b5fa6f5a38046416dd7a3036cd278e26123714746fdc805a35590c94e05ad688af4474af06d0bf2b3730c1b6266576cc832997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/kn/firefox-57.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "95be01ed5085dc900679c23eda769fe0d83f09fa1269dd006cf2f2a4585b3d4e4175472db9e54d9dde45bdabe517149346a15c3eb42a47a935b2ceea7dd31f82"; + sha512 = "0c371ca752cb60168d1527340264906b660bcb7a4910134bd95c8144c21e7c6395b143d491c9ed0ab1904626b3993e7a802e89117ec795784c66f9f7e47cdb44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ko/firefox-57.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "339f3d3353a7d2f739f3796b53f42f8b1aec930a0bc63a2593f3019b5ff246de2ac99753638924138cb9febd5e0359b77108261337166e3018d974a3f88f2714"; + sha512 = "934382f0a1d568c79b380ef0dfd969b68a2cd06b9b9d388830b62039b0232ca058dfa3ba9f17cac7bd45867fe391e50fcc183823377431d82cea1d6df5d7ebad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/lij/firefox-57.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "80de8bbe41e6d5a7076f3300cd90820d75068c0bf08cd8e7d79a63f2118fc3c5f5ddc4316afb884d767dcf95ba4b710e40e78d5b35880779ecb286350c9e834a"; + sha512 = "8612b1599f10fbb4b2161ea64593c2c71604a483d0bdcc2239cab316c63b0bf3acd6cb9a65a652f9a6ff91e47b02682f60718d58580a6c660932550efa71c3ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/lt/firefox-57.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "8bdd86ddd12f39820a639dbeb248c419efb0a7aa11223ee25b98edaa0c1aa514edb29c498932a9d2b5a368811b902e1a875c74704661f4785a38c4ec867bcfc8"; + sha512 = "577da9aa99ff5ba653d036d7c79f743ded7ee5b9bdded8650338eeae72a11d85304c0ef9c035f8477ef460fab5e1e4127b04ca32748f0e73e4e7caeeef52bfe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/lv/firefox-57.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "51692ee445ab31d6443a823017405305af68594242c6a24be59db1ada2f9dfeb479fe595fc0590178b23daef59ce6dd84be3dd1779b4dd9f516a8f59be9d7c7b"; + sha512 = "c34a63194b5f88c59d5b5c1ba9a69fda93d6d6461ba65a6aec8233f573a28b8ac420c5806c98c20a4f4766b58e901a40eda528b7750d058c515abcba293f8d78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/mai/firefox-57.0b4.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "8459e52c6961e5f42f4547e6ea33707584a10a85fcf5b3b83eea4b4f06b2169c7dc39659ea41f3a4f1e554da5af2f9063503d9333d0d5553a521499b1efa24fe"; + sha512 = "01aae7ae050d7bf75a22292785cdb9bb1e6d37ed571118fa8ee4f27b7052d405ab99d3b82308dd4b347eff3d4a1040dc57438c0c76d6d9db7ca8e151a25c3921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/mk/firefox-57.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "666e675faf3747877eeb8e188a68a1c9979a5823a7bcc63c56e53697084d4673363e057c3c73c51dc281c107161867d20adf615bcdda14f2c1dc6f3876630d6a"; + sha512 = "b7ded40b4d9855cb8a0a9854fc69add177e53725d7649c171a803a9245384651962994e050e46c25b734307f2b8df6dbb99c0f7e7085f2a8f380b7453a755948"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ml/firefox-57.0b4.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "db10acd345e98dae88e059df5ab0db7cddbf4243d0fa1fe43d4c1581286d1a625fe0d8808d6b23d6740116cbd99c487562b667e32c42c6749750090b3b0a287c"; + sha512 = "08c891cfe51c47df214d169a767d1f6eb1a229857759cde979b41b7d384d0f033c11b44f5d605ef6dd6fae0e553fbb9457f3869d3719b241d599416091c7ddd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/mr/firefox-57.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "1715b23b260872a8aeabda5476fe6ba6499485566525542968f2cd144e10983b38b7713614a846d06dbfea18f49f08ee7b5eeeb90baf908b5886a09f7d874f46"; + sha512 = "4f7219a2a5448885a5ac8867fe98e3c39467f540c3e937796595480a20fa4daa5b81b6054d0dbeff0a306d920dbdebf6c7fb31d202184bdd9cac2f4c5fe5f705"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ms/firefox-57.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "548616f8d58c140ce0d0d8c181219c8a62702c1d4a11addc54edceec81cb3e98e6743a5999c03f5076466e9bb0fd00345306ab7e91686c4b1815ac6c99755228"; + sha512 = "1c48af4419ad73a7b74dacb789614a020afefbfc06d6129ba54bb96c79f95a403ce1ee64f4bac505afe39bec3d189feecc7aa42f29bdecae44e6b3a930c08c44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/my/firefox-57.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e13dc5258eb2f751ae79b3aef7892aa9ed3c56eb44fc7e32aea240b2d73dfe5cc6b2ab07ab49548023a099f378c98b8245800edbe73d320b45d1607350145990"; + sha512 = "470f46c7c72988daea4648acca7f857cc090e54b7bc1ea2c3053253c8d7f51a2d8b1e5d80b5856f0d1d9ad79072a14630abb62a183df741701e2bfcfe28d37e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/nb-NO/firefox-57.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "75e02e3aac37c840bd6725207ba53beb7cae3bb7a34bcc4c4114b412774114315d17a98457970b3f8ded7911610811bd12b9614826755f99bf6cb3e9018f2909"; + sha512 = "af4dfbae6964f43925fb83585acb7539090acc770f632888ae5c32811635e68b3d97e61126db58d6dc39db1975eb0fabc6ce77a7d848a4574ddace2585d99332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/nl/firefox-57.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "480de8826af835dda939f63fc007b01e88ea1cc2145e80e27ac9abb36bf85d5f0f7441a28623fc6b648b28c81ae02133df654a874942a497682c14a03280c4d2"; + sha512 = "a3bc479da0ba04b5d8dcac09f9679d8895495568b1686def8c2c173c77c95e3d9af5109f9409488e787f2bab2fb425760419dae92f898cba4574a14aacd1fc87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/nn-NO/firefox-57.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "be5c63efa39bc574cd5f41bde6b35d3ccffa43069c61b11c75e0f9039c90e47b56bf41f20b041463cc1638639c581c1682605b24fc1621ef6380396e64d57f71"; + sha512 = "9d184510c4aab71c70256d29b896cee00bbc3014dd42a4d9aca1a9fe44642926b9e6fb074838ac09848939480de15c3a3d4d16acf5fb46bf2f7c2f21e276205f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/or/firefox-57.0b4.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "a448cf44d66e795cf2549b21728ceedca364091224720c1e72524ad55660721fe48b6ab5a3b3824a4de962bcf093a467f2dca34921bf7107495b9592bd87886e"; + sha512 = "c485124e62d34feef8ab41a9ba887cbad236ada2577ac3e433c6b045aacf427b469b438e92f268c083fae2b3f740dd5ebe733c80f62b69d62a1cfd489055909d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/pa-IN/firefox-57.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f3b3f12a19ad1ab45709f1294f21bca08b9d39bc3b1a4bb3d7bca304443de3c5718c4b714a95c3d858dc87b1bbddbe34d7479bbb2890cb5f5dfe5adcc639479d"; + sha512 = "d121f493e206b4c906ec001ebf4943289608b9d247fde4e7cc192651bb5a7fa4b5731670fbd6e1e5894c82db73330f4cdd179e0e8613b6ec9d588c3e4409e45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/pl/firefox-57.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "03be7e535ce2e13d87c19e95711bea4d76e26517b8e877c4dd5885c7917c0079e8642126ad19365325c224e10a419586f109de5b71767777c0488c0213447c09"; + sha512 = "3836babbfd8213820ee62dff188f0d6ac077822719bf72add215612a088055ccfc4c143a638a3b9590f9b347d0a3dc911e9a90847dd5bf2713696e55cf94e837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/pt-BR/firefox-57.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "64be7571a7ec3a89098f309edced9f492cf0c3cd7a1fe0154d7e9cb645548a21f55c1631ae5ef36cb4ef0cc1f9f977ef5beeb8fcaeccae42279c2028339b3825"; + sha512 = "d53501a90c321e4d725f5fdefa9692d28c93625794661f1b89f9405635b8b077ed690a5f285a3c9c1765eec8c3ef195cbb55c6ffbfc8c35f92f91972541bba4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/pt-PT/firefox-57.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0a72d994790d9ff05e799fdac7f74e7033bbab686b0c8ea5a997e01ef1e9c93e59ba760eca254bb177358fc09b7663416972428939189a709599685db543661a"; + sha512 = "6aeac0ff132c6a4b42d577204e2f8b6c4bc77d07db8d4eef8e782189b037112979f8eea78c4f739d81b0fae2f47089bcd3c050b6c0080a15727018e2b31640c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/rm/firefox-57.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d5e1872e7d05b854c04b67eb920950bd66f62d37c747b656f87cf37506a111df222557d8cb8b7968a4123f6e8e490256f91d13d64a0744991c8f9e1e41329aa3"; + sha512 = "83493068d9d94d937b3bebe5f95ed1e57a719fe3620f9a51cae606fc3784d18c1da7c7d429aaa6f6e617f5a984924a199dc6274e90ebe1fdf74c5c9f64bcc1c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ro/firefox-57.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "80f9394ab1d00cc4b933f9460e7ad1ea6092b5caf4dcd72db53536dc46d3f2fbacd83770a1fb5a29713ae11b7f3c0c0fc2b96734169ce45a5addbf03cdf6b2f1"; + sha512 = "15c4ad11cc009a0f1df62af17df17c6ad4b779c19f6236d312b2a071562b95cac3557de2add148a0aee2b2125d18286596a68c0a188088c9b4fcde3335478908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ru/firefox-57.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "f116481b96b8bf426f034b6374c8559b7695946fabe898683035be02d20b7ffee6a2feeb3b16a575e107996b017ef8f4e3f23c887ccbd04ad7b8f687e2af760e"; + sha512 = "a52d3fc83da91bd90809a5d3b7894abc2aeba3547d975a56068ab243df6ed85f0d4f7f865f713084804a65248444a59dd2737f6d5693755ff0ac56e056d372f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/si/firefox-57.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "af93d52c290d07a60120cc0422e44099fdaf0e3c1fd7babc1f4779f77cd8c8848985fd1c7bb558d8eb1252cb4f96d1b65f5ba9e739e91e6008b5f8f2b581f324"; + sha512 = "74fa5a39486317b7351e57e52b588ebef13b3314ebc5991d1b28d2c0d62d1cc47c1e861dd4db8dcc2cbf684e4318f72b48da651a84698d65f629fa07e67e9119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/sk/firefox-57.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "88680ad43f541a8ad9780188b92883aaeb805f47b11346f40d236b8a4ff3ca7e719270c01ae9765e336788d93c54ca8f2a80df3e0316022169702db75fbf5ecf"; + sha512 = "bd4db3ff2385dc873494e3c6e92d5b2428ffb1e06d8befe88ae9c094341f0d81dfde38adbf82563c64357f8ed29bdf12cdfaa062c51facab4b1eb61a44bb77d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/sl/firefox-57.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "45692963e9c6c9122832ca105a19e4a9d6a4ae0c0fa66c5573e0b02ca74e2b72bfc229619a3ea3899ff591f70775949e53fc36a5a6ffad699f3824d8b5723b75"; + sha512 = "7f2f3cb7757526ca36a9f2b7f61fa1fd1f14d979fe1dcafcb8ddb8dc01898bc1b15eaf4e0c0ba426d4b200c5c4b0490d5e0aa908eaac08408d0e888c87bcbe2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/son/firefox-57.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e1a43d8d56105fc7ae69b23f3cc596363d7e0e22b18614cb512a32ecf3f9369be240cbd2d5775537363e40e3de0f0494054331554f093c40dc85d0f1aacde366"; + sha512 = "4688b484acbd58f02a109b18566ece245f99c46c35e40004347075a8185d9c82077bf0c295d377b4055d6090b41a7e9151e25c45199ab3b3756d0f7aa4e1544b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/sq/firefox-57.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "a80d2f2dda50f2977346c51d25eec1f52363282e83eb83dd8d6ac36ce41ae5d8d5f3925db70e2942e38e9cc61b30341c47d1fae7e60c68f8bb1ef28f1978d695"; + sha512 = "8425a72e20bf76ae2435a9c0fd596810a39909060dd908dadc5e77a26a3ae241321621df2196587e35edb527fde2732b7ece479b909bbb18d64c91c195eb54da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/sr/firefox-57.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "e379874f97402001a48954674d84243c8da577533e309fa7f61c832c413519f784fa418d35f00b7af760e55a75f192fd97532ef2b2796130b396782b1c6b9d2c"; + sha512 = "2f13f30bb3bbcf3acdbecc2630451f1c130d32187a6745b394ab7d984aaef20addc12fab79395eb14a0f64300cc91aa4a8acda33e8664837079e63aa8c64339e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/sv-SE/firefox-57.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "272861b15c0476f10482f4ffba5178a7e4cc5a62e52337eb217ab06386d75998bdca7f31f478541cbcf330823b3c187fb5d247cc311c973b41f7cc56f458814d"; + sha512 = "5a18ed2846e7ff05d1990b6e9e073356dd527fe1e24ce5516df562905d3c14a3cf0dfac8684651b734320701618155660352af773f9c5be6c07295abe3457a80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ta/firefox-57.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "bf2d304c978fbbf65aafa5ae01fb7da0cda9d2b133e0a78c21923d9f35c9fdf41d5aba17c863aca79ad021875cdfea934d6ed9db8010f66f6552860ea9cb6bf3"; + sha512 = "44e4c605856e2dda8e492ec02c252998d089d8833bd19f93a010bda164864ee247edc3b5b41fe0da8a3077c2aab5a6dcad275303a340b1df2dc7d4f99d15eb08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/te/firefox-57.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a407d5fcaf5b1cb01d7bdbe3175327d9f985af0ff8b5b27ac93345c1a4266f4cb1753f357603220757202539c5dd7c2c7bc197d18e68585a4118384b729317d3"; + sha512 = "0d6345c10e8d27542e9871c398c553a8378b185ae6c3a4876c4a626475801d9c528bd506fa56d99c6bdb04e4053340b7ec6ca506a289e8ce280abb46905de297"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/th/firefox-57.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "a3ae0aea5eb5b4df9e12c039cb2876fa1bc39c0c6a1d62971a7cef532ddcf6d76dd3c2314efde74b3226cc75213b2e1cb0f80718408f707ef4c986320dbe3c66"; + sha512 = "cc0c6e481e6eca9abf4d02b590afca9f2700111ce648ad7719fdd58751f6d54eee2ebd4b881269ccfefc594c62855dad4d42f9248b65a35d2b5c57e75153815c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/tr/firefox-57.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4dc598410320ef44ad558da2f678791796dbe86c3d4c4891f7c50496984b2afc9f9879488f4f7fc4446ddc237ada5bb9d443b9822ad5dfa9f0c6e46d6afc1ac5"; + sha512 = "f11df9e253cdbf1ab9f03c3a0033d34d120ec1b69cdd12f2b2734648a86d309303d35367349f8d994975e23284bd96699a1cd47e8aa483dddf7baef63fbb35c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/uk/firefox-57.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "989dceca0a7c5a0b091b1ab80d15c140a3b59f950b520a0e2e87436fe4e32a28e9508ba82335e269e5fd562e31a56d7040097e1fe2365330aa257c5ee227aa4a"; + sha512 = "dfd70428cf6b793ac147a5fcffcbe80b33dcadc0669d6fac33b6dcb6355fb4147eb44e08af635b81d58aee3d50e74d41c036e427254e655fa4d72a4c5c56cf07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ur/firefox-57.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "cda7780cf5a9bc6a06c1ae9cd6f9f52911f2ac55aa700f87b3a3021d46dcb31f1ada5550009ed801f7754b7a5a19c3ef25f537e6280014c80672543701658b90"; + sha512 = "f308793aedc14c78d9b2fc092359ac88b9a7b138b1b71720958eb3745fbec3214b75bb5d698093bf12ce0bdbe131765243a959fcd368b0bff13577b767132aa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/uz/firefox-57.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "755d03ebdeede91ac2380d53f4cb130a48331f6e8685eca21f717fc3b8768239a96328086733f768349ed231ad9b2716b58c4912fd8044f644d775489c4030d4"; + sha512 = "571b936f3f27dd42e90bd89bed8cf93a22a97ecb31c0c7cc7cbcb9f2aafa86f1580e6c644963ed82237dd0032cae17df425e0933f23245809e0ec56ad5fa58f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/vi/firefox-57.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "56946ebb5e9746d9cfd9ec14cf72708fa17237915c5fd9d953d7ebf5ded0f3e2778b8777a1ed9da191741baafa47e27cc12eaa2a1de46013104aafce251110cc"; + sha512 = "61f9f22cdaa88bb2ffe1eb64b77957f136fdadc7025eca72f3e91ce30a208fc0ba4f77e66cce069bd2ace6b6c968ff8925d8fc0ba2854a3ed658d50351efbc5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/xh/firefox-57.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "081be12a468f7c8dc79336cbf9e08082d0f79c39baa491a10b9a68cde05de78cea67cb247008d99c241e3c66deb5b92bc3518150138103eb1c75f141f6ed03ed"; + sha512 = "2bcc9bcfbddde2fdca28575249c5fe248d5a254e9fc722597d988378c79f160c50be5d49c77b729eac0a01987c8ee9a705380dbcdfe469a73d59be887c616898"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/zh-CN/firefox-57.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "015d744fa850e529d61e4dcd0fc5459fca47e7a4048dd5b3ddab29c2474cef6e76bf5fdb1e91ff1df843e3dd1834373099372bc36270358a77d42d4e39eff8c9"; + sha512 = "16ca490aae09854a8cc3642d176abe2d9301cb50b19ba40071e6fe62bff5053172beba929de27e3560a1d9cfbb9bf0ab8b7dcf4c880c637189064bfe1ca0b09a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/zh-TW/firefox-57.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "2fe5c828da675b1b1e5b53fe9d292db27ef449eec8f53160fd60893d0bc523a0131209253d9b7c1846e8fcec2145fc760fba29c4e3850f97b2c3cd3a1b13a085"; + sha512 = "6768835f93d4523b2b126b2ff050dbca8ff8bc64828a6eac7441bd2eb2bda37bf53ba74376ae2533accc567090555947c671fdfc7ea6d72af206efafae3a7281"; } ]; } From 8d4b0eefce8801f0a7b63442e63f1fbdc6504796 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 21:31:54 +0000 Subject: [PATCH 0572/2806] go: declare support for aarch64 --- pkgs/development/compilers/go/1.9.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 11d28681abc..49ac9feff80 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -141,6 +141,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 From 1c525fa687e695bd999c69c60a7cc4d9eb9bb3c9 Mon Sep 17 00:00:00 2001 From: koral Date: Sun, 1 Oct 2017 22:56:38 +0200 Subject: [PATCH 0573/2806] googler: init at 3.3 --- pkgs/applications/misc/googler/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/googler/default.nix diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix new file mode 100644 index 00000000000..026457fb857 --- /dev/null +++ b/pkgs/applications/misc/googler/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchFromGitHub, python}: + +stdenv.mkDerivation rec { + version = "3.3"; + name = "googler-${version}"; + + src = fetchFromGitHub { + owner = "jarun"; + repo = "googler"; + rev = "v${version}"; + sha256 = "0gkzgcf0qss7fskgswryk835vivlv1f99ym1pbxy3vv9wcwx6a43"; + }; + + propagatedBuildInputs = [ python ]; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/jarun/googler; + description = "Google Search, Google Site Search, Google News from the terminal"; + license = licenses.gpl3; + maintainers = with maintainers; [ koral ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbd6a59088d..5ca1a9b85f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14401,6 +14401,10 @@ with pkgs; google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; + googler = callPackage ../applications/misc/googler { + python = python3; + }; + gopher = callPackage ../applications/networking/gopher/gopher { }; gopherclient = libsForQt5.callPackage ../applications/networking/gopher/gopherclient { }; From 1fcf8e24a015c0c946c1a59dce201ee30474b1d4 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sun, 1 Oct 2017 15:46:16 -0700 Subject: [PATCH 0574/2806] bazel: 0.5.4 -> 0.6.0 (#29990) --- pkgs/development/tools/build-managers/bazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index f30aed29ba1..e0c027ee632 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - version = "0.5.4"; + version = "0.6.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1jdb8zbgafhz2qi0ajk34845kpmfhxchdimvwkq6lkb1159v0mr1"; + sha256 = "13jr00jb34ibpqvy1qzzmswc7zfcy82ks7w36iwzh7jlm4l3grd0"; }; sourceRoot = "."; From 4b8aa5bd4c3de03e0d0ba76853f80ec341460476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Mon, 2 Oct 2017 01:12:33 +0200 Subject: [PATCH 0575/2806] pythonPackages.MechanicalSoup: 0.4.0 -> 0.7.0 --- .../python-modules/MechanicalSoup/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/MechanicalSoup/default.nix diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix new file mode 100644 index 00000000000..a022fd9fc41 --- /dev/null +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -0,0 +1,23 @@ +{ fetchPypi, buildPythonPackage, lib +, requests, beautifulsoup4, six }: + + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "MechanicalSoup"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wh93rml446ipx603n5z5i5bpan46pzliq6sw76d0ms9w7w2658d"; + }; + + propagatedBuildInputs = [ requests beautifulsoup4 six ]; + + meta = with lib; { + description = "A Python library for automating interaction with websites"; + homepage = https://github.com/hickford/MechanicalSoup; + license = licenses.mit; + maintainers = [ maintainers.jgillich ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c9cffd3d3a..7c161fef656 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11625,25 +11625,7 @@ in { }; }); - MechanicalSoup = buildPythonPackage rec { - name = "MechanicalSoup-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/MechanicalSoup/${name}.zip"; - sha256 = "02jkwly4gw1jqm55l4wwn0j0ggnysx55inw9j96bif5l49z5cacd"; - }; - - propagatedBuildInputs = with self; [ requests beautifulsoup4 six ]; - - meta = { - description = "A Python library for automating interaction with websites"; - homepage = https://github.com/hickford/MechanicalSoup; - license = licenses.mit; - maintainers = with maintainers; [ jgillich ]; - }; - }; - + MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup/default.nix { }; meld3 = buildPythonPackage rec { name = "meld3-1.0.0"; From c1e872d289b69f377252b56414a7ec560c98c27b Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 23:42:08 +0000 Subject: [PATCH 0576/2806] pysmbc: fix license --- pkgs/development/python-modules/pysmbc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index bb3a65ae624..deb9d3dcb82 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "libsmbclient binding for Python"; homepage = https://github.com/hamano/pysmbc; - license = licenses.gplv2; + license = licenses.gpl2; }; } From 6b8806dff7a2cd11e37944af1bbb276ceb870199 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 23:51:23 +0000 Subject: [PATCH 0577/2806] pysmbc: clarify license --- pkgs/development/python-modules/pysmbc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index deb9d3dcb82..b2d204e9b9b 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "libsmbclient binding for Python"; homepage = https://github.com/hamano/pysmbc; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } From fc7eec3663bf595b41f53c32338ac16386fd7e88 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 2 Oct 2017 01:29:14 +0200 Subject: [PATCH 0578/2806] nasm: run checkPhase --- pkgs/development/compilers/nasm/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 8b6c6d94c75..a84c5bbf760 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "nasm-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1ylqs4sqh0paia970v6hpdgq5icxns9zlg21qql232bz1apppy88"; }; + nativeBuildInputs = [ perl ]; + + doCheck = true; + + checkPhase = '' + make golden && make test + ''; + meta = with stdenv.lib; { homepage = http://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; From 3594c358bdc2d968ea48e9c844a1416859164049 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 2 Oct 2017 00:29:40 +0000 Subject: [PATCH 0579/2806] rosegarden: clean up after merge with staging --- pkgs/applications/audio/rosegarden/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 808c1d21044..5966d4253f5 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake makedepend perl pkgconfig qttools ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dssi fftwSinglePrec From 4ffd7b655dbd67124d3ea0fdcaa931205524163a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Mon, 2 Oct 2017 02:43:02 +0200 Subject: [PATCH 0580/2806] all-packages: fix spelling in error message --- 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 2502718b84f..04746592d1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -55,10 +55,10 @@ with pkgs; stringsWithDeps = lib.stringsWithDeps; - ### Evaluating the entire NixPkgs naively will fail, make failure fast + ### Evaluating the entire Nixpkgs naively will fail, make failure fast AAAAAASomeThingsFailToEvaluate = throw '' Please be informed that this pseudo-package is not the only part of - NixPkgs that fails to evaulate. You should not evaluate entire NixPkgs + Nixpkgs that fails to evaluate. You should not evaluate entire Nixpkgs without some special measures to handle failing packages, like those taken by Hydra. ''; From c2842b92f815b9b5d6a69cf593c2e7e6b3cb2d64 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 2 Oct 2017 03:14:15 +0200 Subject: [PATCH 0581/2806] wireguard: 0.0.20170810 -> 0.0.20171001 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 277c6d19f5b..5391a699b92 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20170810"; + version = "0.0.20171001"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7"; + sha256 = "ecff9a184685b7dd2d81576eba5bd96bb59031c9e9b5eeee05d6dc298f30998e"; }; meta = with stdenv.lib; { From be1a223f41df83deeb2b72814db54331e17d24f3 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 2 Oct 2017 10:59:59 +0900 Subject: [PATCH 0582/2806] cmd2: 0.6.8 -> 0.7.7 --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c56fe5f1ab..212bd9bfef1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14186,17 +14186,19 @@ in { cmd2 = buildPythonPackage rec { name = "cmd2-${version}"; - version = "0.6.8"; + version = "0.7.7"; src = pkgs.fetchurl { url = "mirror://pypi/c/cmd2/${name}.tar.gz"; - sha256 = "1a346zcd46c8gwbbp2cxsmvgfkyy26kwxjzdnkv7n47w6660sy5c"; + sha256 = "0widbir8ay1fd4zm8l0rjq78j1cvbammbz8xs32crbanqsgzpqml"; }; # No tests included doCheck = false; propagatedBuildInputs = with self; [ + pyperclip + six pyparsing ]; @@ -16891,7 +16893,7 @@ in { }; disabled = !isPy3k; - + # No tests in archive doCheck = false; From 06e15e59f950590b4005b293081823d2efaec9e5 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Sat, 23 Sep 2017 12:48:44 +0930 Subject: [PATCH 0583/2806] nixos/krb5: complete rewrite The `krb5` service was a bit lacking. Addresses NixOS/nixpkgs#11268, partially addresses NixOS/nixpkgs#29623. --- nixos/modules/config/krb5.nix | 206 -------------- nixos/modules/config/krb5/default.nix | 367 +++++++++++++++++++++++++ nixos/modules/module-list.nix | 2 +- nixos/tests/krb5/default.nix | 5 + nixos/tests/krb5/deprecated-config.nix | 48 ++++ nixos/tests/krb5/example-config.nix | 106 +++++++ 6 files changed, 527 insertions(+), 207 deletions(-) delete mode 100644 nixos/modules/config/krb5.nix create mode 100644 nixos/modules/config/krb5/default.nix create mode 100644 nixos/tests/krb5/default.nix create mode 100644 nixos/tests/krb5/deprecated-config.nix create mode 100644 nixos/tests/krb5/example-config.nix diff --git a/nixos/modules/config/krb5.nix b/nixos/modules/config/krb5.nix deleted file mode 100644 index d318b720742..00000000000 --- a/nixos/modules/config/krb5.nix +++ /dev/null @@ -1,206 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.krb5; - -in - -{ - ###### interface - - options = { - - krb5 = { - - enable = mkOption { - default = false; - description = "Whether to enable Kerberos V."; - }; - - defaultRealm = mkOption { - default = "ATENA.MIT.EDU"; - description = "Default realm."; - }; - - domainRealm = mkOption { - default = "atena.mit.edu"; - description = "Default domain realm."; - }; - - kdc = mkOption { - default = "kerberos.mit.edu"; - description = "Key Distribution Center"; - }; - - kerberosAdminServer = mkOption { - default = "kerberos.mit.edu"; - description = "Kerberos Admin Server."; - }; - - }; - - }; - - ###### implementation - - config = mkIf config.krb5.enable { - - environment.systemPackages = [ pkgs.krb5Full ]; - - environment.etc."krb5.conf".text = - '' - [libdefaults] - default_realm = ${cfg.defaultRealm} - encrypt = true - - # The following krb5.conf variables are only for MIT Kerberos. - krb4_config = /etc/krb.conf - krb4_realms = /etc/krb.realms - kdc_timesync = 1 - ccache_type = 4 - forwardable = true - proxiable = true - - # The following encryption type specification will be used by MIT Kerberos - # if uncommented. In general, the defaults in the MIT Kerberos code are - # correct and overriding these specifications only serves to disable new - # encryption types as they are added, creating interoperability problems. - - # default_tgs_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5 - # default_tkt_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5 - # permitted_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5 - - # The following libdefaults parameters are only for Heimdal Kerberos. - v4_instance_resolve = false - v4_name_convert = { - host = { - rcmd = host - ftp = ftp - } - plain = { - something = something-else - } - } - fcc-mit-ticketflags = true - - [realms] - ${cfg.defaultRealm} = { - kdc = ${cfg.kdc} - admin_server = ${cfg.kerberosAdminServer} - #kpasswd_server = ${cfg.kerberosAdminServer} - } - ATHENA.MIT.EDU = { - kdc = kerberos.mit.edu:88 - kdc = kerberos-1.mit.edu:88 - kdc = kerberos-2.mit.edu:88 - admin_server = kerberos.mit.edu - default_domain = mit.edu - } - MEDIA-LAB.MIT.EDU = { - kdc = kerberos.media.mit.edu - admin_server = kerberos.media.mit.edu - } - ZONE.MIT.EDU = { - kdc = casio.mit.edu - kdc = seiko.mit.edu - admin_server = casio.mit.edu - } - MOOF.MIT.EDU = { - kdc = three-headed-dogcow.mit.edu:88 - kdc = three-headed-dogcow-1.mit.edu:88 - admin_server = three-headed-dogcow.mit.edu - } - CSAIL.MIT.EDU = { - kdc = kerberos-1.csail.mit.edu - kdc = kerberos-2.csail.mit.edu - admin_server = kerberos.csail.mit.edu - default_domain = csail.mit.edu - krb524_server = krb524.csail.mit.edu - } - IHTFP.ORG = { - kdc = kerberos.ihtfp.org - admin_server = kerberos.ihtfp.org - } - GNU.ORG = { - kdc = kerberos.gnu.org - kdc = kerberos-2.gnu.org - kdc = kerberos-3.gnu.org - admin_server = kerberos.gnu.org - } - 1TS.ORG = { - kdc = kerberos.1ts.org - admin_server = kerberos.1ts.org - } - GRATUITOUS.ORG = { - kdc = kerberos.gratuitous.org - admin_server = kerberos.gratuitous.org - } - DOOMCOM.ORG = { - kdc = kerberos.doomcom.org - admin_server = kerberos.doomcom.org - } - ANDREW.CMU.EDU = { - kdc = vice28.fs.andrew.cmu.edu - kdc = vice2.fs.andrew.cmu.edu - kdc = vice11.fs.andrew.cmu.edu - kdc = vice12.fs.andrew.cmu.edu - admin_server = vice28.fs.andrew.cmu.edu - default_domain = andrew.cmu.edu - } - CS.CMU.EDU = { - kdc = kerberos.cs.cmu.edu - kdc = kerberos-2.srv.cs.cmu.edu - admin_server = kerberos.cs.cmu.edu - } - DEMENTIA.ORG = { - kdc = kerberos.dementia.org - kdc = kerberos2.dementia.org - admin_server = kerberos.dementia.org - } - stanford.edu = { - kdc = krb5auth1.stanford.edu - kdc = krb5auth2.stanford.edu - kdc = krb5auth3.stanford.edu - admin_server = krb5-admin.stanford.edu - default_domain = stanford.edu - } - - [domain_realm] - .${cfg.domainRealm} = ${cfg.defaultRealm} - ${cfg.domainRealm} = ${cfg.defaultRealm} - .mit.edu = ATHENA.MIT.EDU - mit.edu = ATHENA.MIT.EDU - .exchange.mit.edu = EXCHANGE.MIT.EDU - exchange.mit.edu = EXCHANGE.MIT.EDU - .media.mit.edu = MEDIA-LAB.MIT.EDU - media.mit.edu = MEDIA-LAB.MIT.EDU - .csail.mit.edu = CSAIL.MIT.EDU - csail.mit.edu = CSAIL.MIT.EDU - .whoi.edu = ATHENA.MIT.EDU - whoi.edu = ATHENA.MIT.EDU - .stanford.edu = stanford.edu - - [logging] - kdc = SYSLOG:INFO:DAEMON - admin_server = SYSLOG:INFO:DAEMON - default = SYSLOG:INFO:DAEMON - krb4_convert = true - krb4_get_tickets = false - - [appdefaults] - pam = { - debug = false - ticket_lifetime = 36000 - renew_lifetime = 36000 - max_timeout = 30 - timeout_shift = 2 - initial_timeout = 1 - } - ''; - - }; - -} diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix new file mode 100644 index 00000000000..bdcc2d48cd1 --- /dev/null +++ b/nixos/modules/config/krb5/default.nix @@ -0,0 +1,367 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.krb5; + + # This is to provide support for old configuration options (as much as is + # reasonable). This can probably be removed after some time. + defaultConfig = { + libdefaults = optionalAttrs (cfg.defaultRealm != null) + { default_realm = cfg.defaultRealm; }; + + realms = optionalAttrs (lib.all (value: value != null) [ + cfg.defaultRealm cfg.kdc cfg.kerberosAdminServer + ]) { + "${cfg.defaultRealm}" = { + kdc = cfg.kdc; + admin_server = cfg.kerberosAdminServer; + }; + }; + + domain_realm = optionalAttrs (lib.all (value: value != null) [ + cfg.domainRealm cfg.defaultRealm + ]) { + ".${cfg.domainRealm}" = cfg.defaultRealm; + "${cfg.domainRealm}" = cfg.defaultRealm; + }; + }; + + mergedConfig = (recursiveUpdate defaultConfig { + inherit (config.krb5) + kerberos libdefaults realms domain_realm capaths appdefaults plugins + extraConfig config; + }); + + filterEmbeddedMetadata = value: if isAttrs value then + (filterAttrs + (attrName: attrValue: attrName != "_module" && attrValue != null) + value) + else value; + + mkIndent = depth: concatStrings (builtins.genList (_: " ") (2 * depth)); + + mkRelation = name: value: "${name} = ${mkVal { inherit value; }}"; + + mkVal = { value, depth ? 0 }: + if (value == true) then "true" + else if (value == false) then "false" + else if (isInt value) then (toString value) + else if (isList value) then + concatMapStringsSep " " mkVal { inherit value depth; } + else if (isAttrs value) then + (concatStringsSep "\n${mkIndent (depth + 1)}" + ([ "{" ] ++ (mapAttrsToList + (attrName: attrValue: let + mappedAttrValue = mkVal { + value = attrValue; + depth = depth + 1; + }; + in "${attrName} = ${mappedAttrValue}") + value))) + "\n${mkIndent depth}}" + else value; + + mkMappedAttrsOrString = value: concatMapStringsSep "\n" + (line: if builtins.stringLength line > 0 + then "${mkIndent 1}${line}" + else line) + (splitString "\n" + (if isAttrs value then + concatStringsSep "\n" + (mapAttrsToList mkRelation value) + else value)); + +in { + + ###### interface + + options = { + krb5 = { + enable = mkEnableOption "Whether to enable Kerberos V."; + + kerberos = mkOption { + type = types.package; + default = pkgs.krb5Full; + defaultText = "pkgs.krb5Full"; + example = literalExample "pkgs.heimdalFull"; + description = '' + The Kerberos implementation that will be present in + environment.systemPackages after enabling this + service. + ''; + }; + + libdefaults = mkOption { + type = with types; either attrs lines; + default = {}; + apply = attrs: filterEmbeddedMetadata attrs; + example = literalExample '' + { + default_realm = "ATHENA.MIT.EDU"; + }; + ''; + description = '' + Settings used by the Kerberos V5 library. + ''; + }; + + realms = mkOption { + type = with types; either attrs lines; + default = {}; + example = literalExample '' + { + "ATHENA.MIT.EDU" = { + admin_server = "athena.mit.edu"; + kdc = "athena.mit.edu"; + }; + }; + ''; + apply = attrs: filterEmbeddedMetadata attrs; + description = "Realm-specific contact information and settings."; + }; + + domain_realm = mkOption { + type = with types; either attrs lines; + default = {}; + example = literalExample '' + { + "example.com" = "EXAMPLE.COM"; + ".example.com" = "EXAMPLE.COM"; + }; + ''; + apply = attrs: filterEmbeddedMetadata attrs; + description = '' + Map of server hostnames to Kerberos realms. + ''; + }; + + capaths = mkOption { + type = with types; either attrs lines; + default = {}; + example = literalExample '' + { + "ATHENA.MIT.EDU" = { + "EXAMPLE.COM" = "."; + }; + "EXAMPLE.COM" = { + "ATHENA.MIT.EDU" = "."; + }; + }; + ''; + apply = attrs: filterEmbeddedMetadata attrs; + description = '' + Authentication paths for non-hierarchical cross-realm authentication. + ''; + }; + + appdefaults = mkOption { + type = with types; either attrs lines; + default = {}; + example = literalExample '' + { + pam = { + debug = false; + ticket_lifetime = 36000; + renew_lifetime = 36000; + max_timeout = 30; + timeout_shift = 2; + initial_timeout = 1; + }; + }; + ''; + apply = attrs: filterEmbeddedMetadata attrs; + description = '' + Settings used by some Kerberos V5 applications. + ''; + }; + + plugins = mkOption { + type = with types; either attrs lines; + default = {}; + example = literalExample '' + { + ccselect = { + disable = "k5identity"; + }; + }; + ''; + apply = attrs: filterEmbeddedMetadata attrs; + description = '' + Controls plugin module registration. + ''; + }; + + extraConfig = mkOption { + type = with types; nullOr lines; + default = null; + example = '' + [logging] + kdc = SYSLOG:NOTICE + admin_server = SYSLOG:NOTICE + default = SYSLOG:NOTICE + ''; + description = '' + These lines go to the end of krb5.conf verbatim. + krb5.conf may include any of the relations that are + valid for kdc.conf (see man + kdc.conf), but it is not a recommended practice. + ''; + }; + + config = mkOption { + type = with types; nullOr lines; + default = null; + example = '' + [libdefaults] + default_realm = EXAMPLE.COM + + [realms] + EXAMPLE.COM = { + admin_server = kerberos.example.com + kdc = kerberos.example.com + default_principal_flags = +preauth + } + + [domain_realm] + example.com = EXAMPLE.COM + .example.com = EXAMPLE.COM + + [logging] + kdc = SYSLOG:NOTICE + admin_server = SYSLOG:NOTICE + default = SYSLOG:NOTICE + ''; + description = '' + Verbatim krb5.conf configuration. Note that this + is mutually exclusive with configuration via + libdefaults, realms, + domain_realm, capaths, + appdefaults, plugins and + extraConfig configuration options. Consult + man krb5.conf for documentation. + ''; + }; + + defaultRealm = mkOption { + type = with types; nullOr str; + default = null; + example = "ATHENA.MIT.EDU"; + description = '' + DEPRECATED, please use + krb5.libdefaults.default_realm. + ''; + }; + + domainRealm = mkOption { + type = with types; nullOr str; + default = null; + example = "athena.mit.edu"; + description = '' + DEPRECATED, please create a map of server hostnames to Kerberos realms + in krb5.domain_realm. + ''; + }; + + kdc = mkOption { + type = with types; nullOr str; + default = null; + example = "kerberos.mit.edu"; + description = '' + DEPRECATED, please pass a kdc attribute to a realm + in krb5.realms. + ''; + }; + + kerberosAdminServer = mkOption { + type = with types; nullOr str; + default = null; + example = "kerberos.mit.edu"; + description = '' + DEPRECATED, please pass an admin_server attribute + to a realm in krb5.realms. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.kerberos ]; + + environment.etc."krb5.conf".text = if isString cfg.config + then cfg.config + else ('' + [libdefaults] + ${mkMappedAttrsOrString mergedConfig.libdefaults} + + [realms] + ${mkMappedAttrsOrString mergedConfig.realms} + + [domain_realm] + ${mkMappedAttrsOrString mergedConfig.domain_realm} + + [capaths] + ${mkMappedAttrsOrString mergedConfig.capaths} + + [appdefaults] + ${mkMappedAttrsOrString mergedConfig.appdefaults} + + [plugins] + ${mkMappedAttrsOrString mergedConfig.plugins} + '' + optionalString (mergedConfig.extraConfig != null) + ("\n" + mergedConfig.extraConfig)); + + warnings = flatten [ + (optional (cfg.defaultRealm != null) '' + The option krb5.defaultRealm is deprecated, please use + krb5.libdefaults.default_realm. + '') + (optional (cfg.domainRealm != null) '' + The option krb5.domainRealm is deprecated, please use krb5.domain_realm. + '') + (optional (cfg.kdc != null) '' + The option krb5.kdc is deprecated, please pass a kdc attribute to a + realm in krb5.realms. + '') + (optional (cfg.kerberosAdminServer != null) '' + The option krb5.kerberosAdminServer is deprecated, please pass an + admin_server attribute to a realm in krb5.realms. + '') + ]; + + assertions = [ + { assertion = !((builtins.any (value: value != null) [ + cfg.defaultRealm cfg.domainRealm cfg.kdc cfg.kerberosAdminServer + ]) && ((builtins.any (value: value != {}) [ + cfg.libdefaults cfg.realms cfg.domain_realm cfg.capaths + cfg.appdefaults cfg.plugins + ]) || (builtins.any (value: value != null) [ + cfg.config cfg.extraConfig + ]))); + message = '' + Configuration of krb5.conf by deprecated options is mutually exclusive + with configuration by section. Please migrate your config using the + attributes suggested in the warnings. + ''; + } + { assertion = !(cfg.config != null + && ((builtins.any (value: value != {}) [ + cfg.libdefaults cfg.realms cfg.domain_realm cfg.capaths + cfg.appdefaults cfg.plugins + ]) || (builtins.any (value: value != null) [ + cfg.extraConfig cfg.defaultRealm cfg.domainRealm cfg.kdc + cfg.kerberosAdminServer + ]))); + message = '' + Configuration of krb5.conf using krb.config is mutually exclusive with + configuration by section. If you want to mix the two, you can pass + lines to any configuration section or lines to krb5.extraConfig. + ''; + } + ]; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e849e634fc9..06dcd70d166 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -9,7 +9,7 @@ ./config/fonts/ghostscript.nix ./config/gnu.nix ./config/i18n.nix - ./config/krb5.nix + ./config/krb5/default.nix ./config/ldap.nix ./config/networking.nix ./config/no-x-libs.nix diff --git a/nixos/tests/krb5/default.nix b/nixos/tests/krb5/default.nix new file mode 100644 index 00000000000..dd5b2f37202 --- /dev/null +++ b/nixos/tests/krb5/default.nix @@ -0,0 +1,5 @@ +{ system ? builtins.currentSystem }: +{ + example-config = import ./example-config.nix { inherit system; }; + deprecated-config = import ./deprecated-config.nix { inherit system; }; +} diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix new file mode 100644 index 00000000000..980b3e762dc --- /dev/null +++ b/nixos/tests/krb5/deprecated-config.nix @@ -0,0 +1,48 @@ +# Verifies that the configuration suggested in deprecated example values +# will result in the expected output. + +import ../make-test.nix ({ pkgs, ...} : { + name = "krb5-with-deprecated-config"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eqyiel ]; + }; + + machine = + { config, pkgs, ... }: { + krb5 = { + enable = true; + defaultRealm = "ATHENA.MIT.EDU"; + domainRealm = "athena.mit.edu"; + kdc = "kerberos.mit.edu"; + kerberosAdminServer = "kerberos.mit.edu"; + }; + }; + + testScript = + let snapshot = pkgs.writeText "krb5-with-deprecated-config.conf" '' + [libdefaults] + default_realm = ATHENA.MIT.EDU + + [realms] + ATHENA.MIT.EDU = { + admin_server = kerberos.mit.edu + kdc = kerberos.mit.edu + } + + [domain_realm] + .athena.mit.edu = ATHENA.MIT.EDU + athena.mit.edu = ATHENA.MIT.EDU + + [capaths] + + + [appdefaults] + + + [plugins] + + ''; + in '' + $machine->succeed("diff /etc/krb5.conf ${snapshot}"); + ''; +}) diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix new file mode 100644 index 00000000000..d5328720931 --- /dev/null +++ b/nixos/tests/krb5/example-config.nix @@ -0,0 +1,106 @@ +# Verifies that the configuration suggested in (non-deprecated) example values +# will result in the expected output. + +import ../make-test.nix ({ pkgs, ...} : { + name = "krb5-with-example-config"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eqyiel ]; + }; + + machine = + { config, pkgs, ... }: { + krb5 = { + enable = true; + kerberos = pkgs.krb5Full; + libdefaults = { + default_realm = "ATHENA.MIT.EDU"; + }; + realms = { + "ATHENA.MIT.EDU" = { + admin_server = "athena.mit.edu"; + kdc = "athena.mit.edu"; + }; + }; + domain_realm = { + "example.com" = "EXAMPLE.COM"; + ".example.com" = "EXAMPLE.COM"; + }; + capaths = { + "ATHENA.MIT.EDU" = { + "EXAMPLE.COM" = "."; + }; + "EXAMPLE.COM" = { + "ATHENA.MIT.EDU" = "."; + }; + }; + appdefaults = { + pam = { + debug = false; + ticket_lifetime = 36000; + renew_lifetime = 36000; + max_timeout = 30; + timeout_shift = 2; + initial_timeout = 1; + }; + }; + plugins = { + ccselect = { + disable = "k5identity"; + }; + }; + extraConfig = '' + [logging] + kdc = SYSLOG:NOTICE + admin_server = SYSLOG:NOTICE + default = SYSLOG:NOTICE + ''; + }; + }; + + testScript = + let snapshot = pkgs.writeText "krb5-with-example-config.conf" '' + [libdefaults] + default_realm = ATHENA.MIT.EDU + + [realms] + ATHENA.MIT.EDU = { + admin_server = athena.mit.edu + kdc = athena.mit.edu + } + + [domain_realm] + .example.com = EXAMPLE.COM + example.com = EXAMPLE.COM + + [capaths] + ATHENA.MIT.EDU = { + EXAMPLE.COM = . + } + EXAMPLE.COM = { + ATHENA.MIT.EDU = . + } + + [appdefaults] + pam = { + debug = false + initial_timeout = 1 + max_timeout = 30 + renew_lifetime = 36000 + ticket_lifetime = 36000 + timeout_shift = 2 + } + + [plugins] + ccselect = { + disable = k5identity + } + + [logging] + kdc = SYSLOG:NOTICE + admin_server = SYSLOG:NOTICE + default = SYSLOG:NOTICE + ''; + in '' + $machine->succeed("diff /etc/krb5.conf ${snapshot}"); + ''; +}) From 8c0a37f8574b2c98f22a302282760b4e9b7023c9 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 29 Sep 2017 14:57:20 +0200 Subject: [PATCH 0584/2806] python.pyserial: 2.7 -> 3.4 in preparation for platformio update --- .../python-modules/pyserial/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +-------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/pyserial/default.nix diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix new file mode 100644 index 00000000000..95ab0f339b0 --- /dev/null +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "pyserial"; + version="3.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "09y68bczw324a4jb9a1cfwrbjhq179vnfkkkrybbksp0vqgl0bbf"; + }; + + checkPhase = "python -m unittest discover -s test"; + + meta = with lib; { + homepage = "https://github.com/pyserial/pyserial"; + license = licenses.psfl; + description = "Python serial port extension"; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 389fd81eb92..6a5ba943b9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17876,22 +17876,7 @@ in { }; }; - pyserial = buildPythonPackage rec { - name = "pyserial-2.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyserial/${name}.tar.gz"; - sha256 = "3542ec0838793e61d6224e27ff05e8ce4ba5a5c5cc4ec5c6a3e8d49247985477"; - }; - - doCheck = false; - - meta = { - homepage = "http://pyserial.sourceforge.net/"; - license = licenses.psfl; - description = "Python serial port extension"; - }; - }; + pyserial = callPackage ../development/python-modules/pyserial {}; pymongo = callPackage ../development/python-modules/pymongo {}; From bc45bc3d634cf01103b0a30b7b1d344a57c71a20 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 29 Sep 2017 15:03:44 +0200 Subject: [PATCH 0585/2806] python.semantic-version: 2.4.2 -> 2.6 --- .../semantic-version/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +-------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/semantic-version/default.nix diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix new file mode 100644 index 00000000000..f9e04691c1c --- /dev/null +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "semantic_version"; + version = "2.6.0"; + name = "${pname}${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra"; + }; + + # ModuleNotFoundError: No module named 'tests' + doCheck = false; + + meta = with lib; { + description = "A library implementing the 'SemVer' scheme"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus makefu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a5ba943b9b..f7998e69f86 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20341,22 +20341,7 @@ in { }; }; - semantic-version = buildPythonPackage rec { - pname = "semantic_version"; - version = "2.4.2"; - name = "${pname}${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "7e8b7fa74a3bc9b6e90b15b83b9bc2377c78eaeae3447516425f475d5d6932d2"; - }; - - meta = { - description = "A library implementing the 'SemVer' scheme"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ layus ]; - }; - }; + semantic-version = callPackage ../development/python-modules/semantic-version { }; sexpdata = buildPythonPackage rec { name = "sexpdata-0.0.2"; From ec03001e18d3d34f948b586026814c6d60761d0e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 29 Sep 2017 15:05:31 +0200 Subject: [PATCH 0586/2806] python.platformio: 2.10.3 -> 3.4.1 add patch for fixing the broken search function for PYTHONPATH --- .../python-modules/platformio/default.nix | 32 +++++++++++++++++++ .../platformio/fix-searchpath.patch | 11 +++++++ pkgs/top-level/python-packages.nix | 22 +------------ 3 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/platformio/default.nix create mode 100644 pkgs/development/python-modules/platformio/fix-searchpath.patch diff --git a/pkgs/development/python-modules/platformio/default.nix b/pkgs/development/python-modules/platformio/default.nix new file mode 100644 index 00000000000..329da89bf72 --- /dev/null +++ b/pkgs/development/python-modules/platformio/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi +, arrow, bottle, click_5, colorama +, lockfile, pyserial, requests +, semantic-version +, isPy3k, isPyPy +}: +buildPythonPackage rec { + disabled = isPy3k || isPyPy; + + pname = "platformio"; + version="3.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b4lba672l851sv1xwc320xbh46x7hx4ms6whc0k37hxkxj0nwm2"; + }; + + propagatedBuildInputs = [ + arrow bottle click_5 colorama + lockfile pyserial requests semantic-version + ]; + + patches = [ ./fix-searchpath.patch ]; + + meta = with stdenv.lib; { + description = "An open source ecosystem for IoT development"; + homepage = http://platformio.org; + maintainers = with maintainers; [ mog makefu ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/platformio/fix-searchpath.patch b/pkgs/development/python-modules/platformio/fix-searchpath.patch new file mode 100644 index 00000000000..a215ffc7d61 --- /dev/null +++ b/pkgs/development/python-modules/platformio/fix-searchpath.patch @@ -0,0 +1,11 @@ +--- ./platformio/util.py-old 2017-09-29 01:20:08.174548250 +0200 ++++ ./platformio/util.py 2017-09-29 01:19:48.410485308 +0200 +@@ -395,7 +395,7 @@ + isdir(join(p, "click")) or isdir(join(p, "platformio"))) + if all(conditions): + _PYTHONPATH.append(p) +- os.environ['PYTHONPATH'] = os.pathsep.join(_PYTHONPATH) ++ os.environ['PYTHONPATH'] = os.pathsep.join(sys.path) + + + def get_serialports(filter_hwid=False): diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7998e69f86..327af2fb330 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15611,27 +15611,7 @@ in { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; - - platformio = buildPythonPackage rec { - name = "platformio-${version}"; - version="2.10.3"; - - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/b7/a3/1d3a9d7bae91df1b607e0f31549ec3e0006f29484cc6a1431b3fe3c5b02e/platformio-2.10.3.tar.gz"; - sha256 = "f3a646871f9baed05f336a32576edaab90abf0737d8adb54f2acb7bcad42a65f"; - }; - - propagatedBuildInputs = with self; [ click_5 requests bottle pyserial lockfile colorama]; - - meta = with stdenv.lib; { - description = "An open source ecosystem for IoT development"; - homepage = http://platformio.org; - maintainers = with maintainers; [ mog ]; - license = licenses.asl20; - }; - }; + platformio = callPackage ../development/python-modules/platformio { }; pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; From 7bc1d331e536b0abe5bc40a517045835bf691e8c Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 29 Sep 2017 09:19:35 +0200 Subject: [PATCH 0587/2806] octoprint: unpin pyserial,semantic_version --- pkgs/applications/misc/octoprint/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 7c8eab9f11e..507b4f2cab9 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -91,6 +91,8 @@ in pythonPackages.buildPythonApplication rec { -e 's,psutil>=[^"]*,psutil,g' \ -e 's,requests>=[^"]*,requests,g' \ -e 's,future>=[^"]*,future,g' \ + -e 's,pyserial>=[^"]*,pyserial,g' \ + -e 's,semantic_version>=[^"]*,semantic_version,g' \ setup.py ''; From 46b71a1637ebdfa6eab04a0e1d312723151ba3a4 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 2 Oct 2017 10:00:20 +0200 Subject: [PATCH 0588/2806] iozone: enable aarch64-linux build add myself to list of maintainers --- pkgs/development/tools/misc/iozone/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix index 7e241680887..4bcf5f1599a 100644 --- a/pkgs/development/tools/misc/iozone/default.nix +++ b/pkgs/development/tools/misc/iozone/default.nix @@ -7,6 +7,8 @@ let "linux-AMD64" else if stdenv.system == "x86_64-darwin" then "macosx" + else if stdenv.system == "aarch64-linux" then + "linux-arm" else abort "Platform ${stdenv.system} not yet supported."; in @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { description = "IOzone Filesystem Benchmark"; homepage = http://www.iozone.org/; license = stdenv.lib.licenses.unfreeRedistributable; - platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; - maintainers = [ stdenv.lib.maintainers.Baughn ]; + platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + maintainers = with stdenv.lib.maintainers; [ Baughn makefu ]; }; } From 9bcd1de373ca5b4401f7c5dee5ca94edb36a1ab3 Mon Sep 17 00:00:00 2001 From: Diego Zamboni Date: Mon, 2 Oct 2017 10:06:03 +0200 Subject: [PATCH 0589/2806] vagrant: 1.9.5 -> 2.0.0 Upgrade to latest version of Vagrant. After installation, the following messages appear whenever vagrant runs. These were already present in previous versions, I'm not sure if/what to do about them: Ignoring ffi-1.9.18 because its extensions are not built. Try: gem pristine ffi --version 1.9.18 Ignoring unf_ext-0.0.7.4 because its extensions are not built. Try: gem pristine unf_ext --version 0.0.7.4 Ignoring wdm-0.1.1 because its extensions are not built. Try: gem pristine wdm --version 0.1.1 --- pkgs/development/tools/vagrant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 8d86c96e4bf..91c0054fe91 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }: let - version = "1.9.5"; + version = "2.0.0"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -17,9 +17,9 @@ let else "system ${stdenv.system} not supported"; sha256 = { - "x86_64-linux" = "16ijzaacfbqrgh561bf51747d2rv8kydgs14dfdr572qi0f88baw"; - "i686-linux" = "0lvkb4k0a34a8hzlsi0apf056rhyprh5w0gn16d0n2ijnaf9j2yk"; - "x86_64-darwin" = "070mrczsx1j0jl9sx6963l3hrk9anqa13r008wk1d22d25xj25mc"; + "x86_64-linux" = "184amybyxqlxqr8fk6lyx2znmci1fazsiby90q7d1xx2ihz3hm5x"; + "i686-linux" = "19r1m5jila40x69m1qz2hslz7v1hdg8wwdhcq8d5qjnzwfmlw2qz"; + "x86_64-darwin" = "154400iqs01235bclr8ic7g9jv01lfs766bmv7p8784r3xsblvsr"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system; From 2354e0f05a1c31f850f533643cd2f52a58aace35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 1 Oct 2017 22:48:20 +0100 Subject: [PATCH 0590/2806] cloud-utils: 0.29 -> 0.30 --- .../modules/virtualisation/grow-partition.nix | 7 +- pkgs/tools/misc/cloud-utils/default.nix | 47 +++++----- .../growpart-util-linux-2.26.patch | 88 ------------------- 3 files changed, 33 insertions(+), 109 deletions(-) delete mode 100644 pkgs/tools/misc/cloud-utils/growpart-util-linux-2.26.patch diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix index 5039118d78e..2cb932d208f 100644 --- a/nixos/modules/virtualisation/grow-partition.nix +++ b/nixos/modules/virtualisation/grow-partition.nix @@ -24,7 +24,12 @@ with lib; copy_bin_and_libs ${pkgs.gnused}/bin/sed copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk - cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart + + substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \ + --replace "${pkgs.bash}/bin/sh" "/bin/sh" \ + --replace "awk" "gawk" \ + --replace "sed" "gnused" + ln -s sed $out/bin/gnused ''; diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index af518e7efa9..9894813d955 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,27 +1,34 @@ -{ stdenv, fetchurl, makeWrapper, gawk, gnused, utillinux }: +{ stdenv, fetchurl, makeWrapper +, gawk, gnused, utillinux, file +, wget, python3, qemu, euca2ools +, e2fsprogs, cdrkit }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops - name = "cloud-utils-0.29"; + # growpart is needed in initrd in nixos/modules/virtualisation/grow-partition.nix + name = "cloud-utils-${version}"; + version = "0.30"; src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/0.29/+download/cloud-utils-0.29.tar.gz"; - sha256 = "0z15gs8gmpy5gqxl7yiyjj7a6s8iw44djj6axvbci627b9pvd8cy"; + url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz"; + sha256 = "19ca9ckwwsvlqrjz19bc93rq4gv3y4ak7551li2qk95caqyxsq3k"; }; - buildInputs = [ makeWrapper ]; - buildPhase = '' - mkdir -p $out/bin - cp bin/growpart $out/bin/growpart - sed -i 's|awk|gawk|' $out/bin/growpart - sed -i 's|sed|gnused|' $out/bin/growpart - ln -s sed $out/bin/gnused - wrapProgram $out/bin/growpart --prefix PATH : "${stdenv.lib.makeBinPath [ gnused gawk utillinux ]}:$out/bin" - ''; - dontInstall = true; - dontPatchShebangs = true; - dontStrip = true; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; + installFlags = [ "LIBDIR=$(out)/lib" "BINDIR=$(out)/bin" "MANDIR=$(out)/man/man1" "DOCDIR=$(out)/doc" ]; - meta = { - platforms = stdenv.lib.platforms.unix; - }; + # according to https://packages.ubuntu.com/source/zesty/cloud-utils + binDeps = [ + wget e2fsprogs file gnused gawk utillinux qemu euca2ools cdrkit + ]; + + postFixup = '' + for i in $out/bin/*; do + wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath binDeps}:$out/bin" + done + ''; + + dontBuild = true; + + meta.platforms = stdenv.lib.platforms.unix; } diff --git a/pkgs/tools/misc/cloud-utils/growpart-util-linux-2.26.patch b/pkgs/tools/misc/cloud-utils/growpart-util-linux-2.26.patch deleted file mode 100644 index c782c2d7e4b..00000000000 --- a/pkgs/tools/misc/cloud-utils/growpart-util-linux-2.26.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 1895d10a7539d055a4e0206af1e7a9e5ea32a4f7 Mon Sep 17 00:00:00 2001 -From: Juerg Haefliger -Date: Wed, 25 Mar 2015 13:59:20 +0100 -Subject: [PATCH] Support new sfdisk version 2.26 - -The sfdisk usage with version 2.26 changed. Specifically, the option ---show-pt-geometry and functionality for CHS have been removed. -Also, restoring a backup MBR now needs to be done using dd. ---- - bin/growpart | 28 ++++++++++------------------ - 1 file changed, 10 insertions(+), 18 deletions(-) - -diff --git a/bin/growpart b/bin/growpart -index 595c40b..d4c995b 100755 ---- a/bin/growpart -+++ b/bin/growpart -@@ -28,7 +28,6 @@ PART="" - PT_UPDATE=false - DRY_RUN=0 - --MBR_CHS="" - MBR_BACKUP="" - GPT_BACKUP="" - _capture="" -@@ -133,7 +132,8 @@ bad_Usage() { - } - - mbr_restore() { -- sfdisk --no-reread "${DISK}" ${MBR_CHS} -I "${MBR_BACKUP}" -+ dd if="${MBR_BACKUP}-${DISK#/dev/}-0x00000000.bak" of="${DISK}" bs=1 \ -+ conv=notrunc - } - - sfdisk_worked_but_blkrrpart_failed() { -@@ -148,34 +148,26 @@ sfdisk_worked_but_blkrrpart_failed() { - - mbr_resize() { - RESTORE_HUMAN="${TEMP_D}/recovery" -- MBR_BACKUP="${TEMP_D}/orig.save" -+ MBR_BACKUP="${TEMP_D}/backup" - - local change_out=${TEMP_D}/change.out - local dump_out=${TEMP_D}/dump.out - local new_out=${TEMP_D}/new.out - local dump_mod=${TEMP_D}/dump.mod -- local tmp="${TEMP_D}/tmp.out" -- local err="${TEMP_D}/err.out" - -- local _devc cyl _w1 heads _w2 sectors _w3 tot dpart -+ local tot dpart - local pt_start pt_size pt_end max_end new_size change_info - -- # --show-pt-geometry outputs something like -- # /dev/sda: 164352 cylinders, 4 heads, 32 sectors/track -- rqe sfd_geom sfdisk "${DISK}" --show-pt-geometry >"${tmp}" && -- read _devc cyl _w1 heads _w2 sectors _w3 <"${tmp}" && -- MBR_CHS="-C ${cyl} -H ${heads} -S ${sectors}" || -- fail "failed to get CHS from ${DISK}" -+ tot=$(sfdisk --list "${DISK}" | awk '{ print $(NF-1) ; exit }') || -+ fail "failed to get total number of sectors from ${DISK}" - -- tot=$((${cyl}*${heads}*${sectors})) -+ debug 1 "total number of sectors of ${DISK} is ${tot}" - -- debug 1 "geometry is ${MBR_CHS}. total size=${tot}" -- rqe sfd_dump sfdisk ${MBR_CHS} --unit=S --dump "${DISK}" \ -+ rqe sfd_dump sfdisk --dump "${DISK}" \ - >"${dump_out}" || - fail "failed to dump sfdisk info for ${DISK}" -- - { -- echo "## sfdisk ${MBR_CHS} --unit=S --dump ${DISK}" -+ echo "## sfdisk --dump ${DISK}" - cat "${dump_out}" - } >"${RESTORE_HUMAN}" - [ $? -eq 0 ] || fail "failed to save sfdisk -d output" -@@ -237,7 +229,7 @@ mbr_resize() { - exit 0 - fi - -- LANG=C sfdisk --no-reread "${DISK}" ${MBR_CHS} --force \ -+ LANG=C sfdisk --no-reread "${DISK}" --force \ - -O "${MBR_BACKUP}" <"${new_out}" >"${change_out}" 2>&1 - ret=$? - [ $ret -eq 0 ] || RESTORE_FUNC="mbr_restore" --- -2.1.4 - From dcd5580909672851bc0c6dfb471b12f965c6f5aa Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 2 Oct 2017 11:45:58 +0200 Subject: [PATCH 0591/2806] tptp: 6.4.0 -> 7.0.0 --- pkgs/applications/science/logic/tptp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index db7e0c0c938..16ef277e930 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "TPTP-${version}"; - version = "6.4.0"; + version = "7.0.0"; src = fetchurl { url = [ "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz" - "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz" + "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}.tgz" ]; - sha256 = "17mnqxnyibmzf5vvbnyhsd010zykqw8ikx4pvyj0x9sfyhpvgfix"; + sha256 = "13rm76lqlgbv15p8as0dpc74z2dfv5xydkhnd0hm3hhi3mn39dk9"; }; buildInputs = [ tcsh yap perl patchelf ]; From eb8e0eb3520e9f8b45726d382d70670b731a130d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 2 Oct 2017 10:50:00 +0100 Subject: [PATCH 0592/2806] vagrant: now requires ruby 2.3 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04746592d1b..bd28e1e435d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7602,7 +7602,7 @@ with pkgs; universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; vagrant = callPackage ../development/tools/vagrant { - ruby = ruby_2_2; + ruby = ruby_2_3; }; bashdb = callPackage ../development/tools/misc/bashdb { }; From 7049172d7280c3df5ba2d5ce3f2fce7ef268a2cb Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 2 Oct 2017 12:18:35 +0200 Subject: [PATCH 0593/2806] ocamlPackages.stdint: init at 0.3.0 --- .../ocaml-modules/stdint/default.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/stdint/default.nix diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix new file mode 100644 index 00000000000..42771d1e35f --- /dev/null +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-stdint-${version}"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "andrenth"; + repo = "ocaml-stdint"; + rev = version; + sha256 = "18nh23yx4ghgq7mjf4mdyq8kj1fdw5d0abw919s8n4mv21cmpwia"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + configurePhase = "ocaml setup.ml -configure --prefix $out"; + + createFindlibDestdir = true; + + meta = { + description = "Various signed and unsigned integers for OCaml"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.gebner ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4af5a810fd0..c14bf350db5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -625,6 +625,8 @@ let sawja = callPackage ../development/ocaml-modules/sawja { }; + stdint = callPackage ../development/ocaml-modules/stdint { }; + uucd = callPackage ../development/ocaml-modules/uucd { }; uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; From e10bb692c4db2a94c3c6e03b269390f011ef3841 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 2 Oct 2017 12:19:41 +0200 Subject: [PATCH 0594/2806] fstar: 0.9.4.0 -> 0.9.5.0 This builds fstar from the included ocaml sources instead of bootstrapping from fsharp. --- pkgs/development/compilers/fstar/default.nix | 65 +++----------------- 1 file changed, 9 insertions(+), 56 deletions(-) diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 0887dd99252..3aef4e3ba89 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,78 +1,30 @@ -{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper, pkgconfig, file }: +{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }: stdenv.mkDerivation rec { name = "fstar-${version}"; - version = "0.9.4.0"; + version = "0.9.5.0"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "130779p5plsgvz0dkcqycns3vwrvyfl138nq2xdhd3rkdsbyyvb7"; + sha256 = "1pi2ny3kpmvm85x8w98anhjf0hp0wccc51m7v697qypn5cl4ydqk"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = with ocamlPackages; [ - mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries - zarith camlp4 yojson pprint openssl pkgconfig file + z3 ocaml findlib ocaml_batteries menhir stdint + zarith camlp4 yojson pprint ]; + makeFlags = [ "PREFIX=$(out)" ]; + preBuild = '' - substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true" \ - --replace Darwin xyz - substituteInPlace src/VS/.nuget/NuGet.targets --replace "mono" "true" - - # Fails with bad interpreter otherwise patchShebangs src/tools patchShebangs bin - - export FSharpTargetsPath="$(dirname $(pkg-config FSharp.Core --variable=Libraries))/Microsoft.FSharp.Targets" - # remove hardcoded windows paths - sed -i '/ Date: Mon, 2 Oct 2017 11:30:23 +0100 Subject: [PATCH 0595/2806] rescuetime: Update to 2.9.11.1300 --- pkgs/applications/misc/rescuetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 03d058783b2..8b93dd51406 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -9,14 +9,14 @@ let } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "161f71kvcrilv9qxldwn8xsqs2g9c2f2g9wb5brbfc0lqbbc8n89"; + sha256 = "1xjwaqz0gs12ndgw7c2f1nkvj0nqcl0bxhd54pwk0dwrx9pn9avz"; }; in stdenv.mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.9.11.1285"; + name = "rescuetime-2.9.11.1300"; inherit src; buildInputs = [ dpkg makeWrapper ]; unpackPhase = '' From f795d78d86b453c7bc34ada886025edc0433e512 Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Mon, 2 Oct 2017 15:25:12 +0200 Subject: [PATCH 0596/2806] git: Properly wrap Git commands that are implemented in Perl. (#30001) Some Git commands are implemented as Perl scripts. Some of these scripts use Perl modules from CPAN. Without wrapping these programs to set `GITPERLLIB`, these programs would not be fully functional because some Perl libraries are found to be missing at runtime. Fixes #29996 --- .../git-and-tools/git/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index fcf35a9ca34..51f523305d1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -145,6 +145,22 @@ stdenv.mkDerivation { # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend + + # wrap perl commands + gitperllib=$out/lib/perl5/site_perl + for i in ${builtins.toString perlLibs}; do + gitperllib=$gitperllib:$i/lib/perl5/site_perl + done + wrapProgram $out/libexec/git-core/git-cvsimport \ + --set GITPERLLIB "$gitperllib" + wrapProgram $out/libexec/git-core/git-add--interactive \ + --set GITPERLLIB "$gitperllib" + wrapProgram $out/libexec/git-core/git-archimport \ + --set GITPERLLIB "$gitperllib" + wrapProgram $out/libexec/git-core/git-instaweb \ + --set GITPERLLIB "$gitperllib" + wrapProgram $out/libexec/git-core/git-cvsexportcommit \ + --set GITPERLLIB "$gitperllib" '' + (if svnSupport then From 1e85d28fdc48bf816aaf74148397bd4e7d269b88 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 2 Oct 2017 09:29:51 -0400 Subject: [PATCH 0597/2806] linux: 4.14-rc2 -> 4.14-rc3 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 7d67bc2ff60..fb51760ec16 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc2"; - modDirVersion = "4.14.0-rc2"; + version = "4.14-rc3"; + modDirVersion = "4.14.0-rc3"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0ahcmr0y9i47lwjn140w436hg68apnh8rl66y56qdvdic8f61mj4"; + sha256 = "049x4fpcj8d6577lhzrns7w36mj21pfr4ijw01r0l6n3w86z28b7"; }; # Should the testing kernels ever be built on Hydra? From 0f2b46cdba7064ba7bb6f24bb0785010a332117c Mon Sep 17 00:00:00 2001 From: The-M1k3y Date: Mon, 2 Oct 2017 15:53:30 +0200 Subject: [PATCH 0598/2806] nixos/gogs: fixed user creation if non-default user --- nixos/modules/services/misc/gogs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index d6e827a53fd..cf1fbc7bcfa 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -240,7 +240,7 @@ in }; }; - users = { + users = mkIf (cfg.user == "gogs") { extraUsers.gogs = { description = "Go Git Service"; uid = config.ids.uids.gogs; From 859a4c30cf96b95949c48c5d6fda63ff5d839898 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Fri, 29 Sep 2017 16:03:39 -0500 Subject: [PATCH 0599/2806] universal-ctags: include libiconv on darwin --- pkgs/development/tools/misc/universal-ctags/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index ceff549f373..2a77fc42602 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: stdenv.mkDerivation rec { name = "universal-ctags-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1kbw9ycl2ddzpfs1v4rbqa4gdhw4inrisf4awyaxb7zxfxmbzk1g"; }; - nativeBuildInputs = [ pythonPackages.docutils ]; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; autoreconfPhase = '' ./autogen.sh --tmpdir From 7ec039bb2b6c0055aed216ca7d06f7f518e1fd7c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 1 Oct 2017 21:33:28 +0200 Subject: [PATCH 0600/2806] libubox: init at 2017-09-29 --- .../development/libraries/libubox/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/libubox/default.nix diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix new file mode 100644 index 00000000000..71ac22e85a8 --- /dev/null +++ b/pkgs/development/libraries/libubox/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchgit, cmake, pkgconfig, json_c }: + +stdenv.mkDerivation { + name = "libubox-2017-09-29"; + + src = fetchgit { + url = "https://git.openwrt.org/project/libubox.git"; + rev = "632688e8d6cde32781e4ec685d59afb0938300ad"; + sha256 = "1rkwn287k7p802hbd9ap13xxrxsghq6827r86ymqbbcmbcrna13c"; + }; + + cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ json_c ]; + + meta = with lib; { + description = "C utility functions for OpenWrt"; + homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d3272d2dd8..eacb132fdd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9541,6 +9541,8 @@ with pkgs; libu2f-server = callPackage ../development/libraries/libu2f-server { }; + libubox = callPackage ../development/libraries/libubox { }; + libuecc = callPackage ../development/libraries/libuecc { }; libui = callPackage ../development/libraries/libui { }; From b2a5c400435168c4f44bd720c287fb38e424e8eb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 1 Oct 2017 21:33:52 +0200 Subject: [PATCH 0601/2806] uqmi: init at 2016-12-19 --- pkgs/tools/networking/uqmi/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/networking/uqmi/default.nix diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix new file mode 100644 index 00000000000..010d6a7f8e8 --- /dev/null +++ b/pkgs/tools/networking/uqmi/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, cmake, perl, libubox, json_c }: + +stdenv.mkDerivation { + name = "uqmi-2016-12-19"; + + src = fetchgit { + url = "https://git.openwrt.org/project/uqmi.git"; + rev = "8ceeab690d8c6f1e3afbd4bcaee7bc2ba3fbe165"; + sha256 = "1fw9r36d024iiq6bq2cikaq5pams5pnbc4z6pcmcny2k4l5cdb6m"; + }; + + postPatch = '' + substituteInPlace data/gen-header.pl --replace /usr/bin/env "" + patchShebangs . + ''; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ libubox json_c ]; + + meta = with lib; { + description = "Tiny QMI command line utility"; + homepage = "https://git.openwrt.org/?p=project/uqmi.git;a=summary"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eacb132fdd8..6cbb7961f3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4761,6 +4761,8 @@ with pkgs; upx = callPackage ../tools/compression/upx { }; + uqmi = callPackage ../tools/networking/uqmi { }; + uriparser = callPackage ../development/libraries/uriparser {}; urlscan = callPackage ../applications/misc/urlscan { }; From 2f188ff37f9a43985e351d6a1edb570031c44518 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 17:04:09 +0200 Subject: [PATCH 0602/2806] dnsmasq: 2.77 -> 2.78 for multiple CVEs Fixes CVE-2017-14491, CVE-2017-14492, CVE-2017-14493, CVE-2017-14494, CVE-2017-14495, CVE-2017-14496. --- pkgs/tools/networking/dnsmasq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 801d41c852b..badf3307446 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -11,11 +11,11 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.77"; + name = "dnsmasq-2.78"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "12lbbwpy1wxi6n5dngv30x8g8v13apdnvjgq7w71f9dfa0f3pb3f"; + sha256 = "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549"; }; preBuild = '' From ad2ae842bb452785247ba3801bd8d33b685205c6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 17:42:54 +0200 Subject: [PATCH 0603/2806] vlc: add patch to fix CVE-2017-9300 --- pkgs/applications/video/vlc/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b806ff65ddb..b465379c50e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -11,6 +11,7 @@ , qt4 ? null , withQt5 ? false, qtbase ? null, qtx11extras ? null , jackSupport ? false +, fetchpatch }: with stdenv.lib; @@ -27,6 +28,14 @@ stdenv.mkDerivation rec { sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-9300.patch"; + url = "https://git.videolan.org/?p=vlc/vlc-2.2.git;a=patch;h=55a82442cfea9dab8b853f3a4610f2880c5fadf3;hp=dbe888f9ca9c3b102478b4a16a3d1d985c267899"; + sha256 = "0l0fwqkn31lggwc5dkhb58gkv8pc6ng51y0izjigqvfqvhwdnzxn"; + }) + ]; + # Comment-out the Qt 5.5 version check, as we do apply the relevant patch. # https://trac.videolan.org/vlc/ticket/16497 postPatch = if (!withQt5) then null else From 9fc7f918eee2c8a145a5cbfab7bda03e6296c659 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 17:43:15 +0200 Subject: [PATCH 0604/2806] chrony: 3.1 -> 3.2 --- pkgs/tools/networking/chrony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index b805a4bfcf3..5ddb663a4ae 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "3.1"; + version = "3.2"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "0xb03dya1zhcn1gch2v2ynifxw95g8m3plr9q4ys0s3pvgf0g4cx"; + sha256 = "05j17i1zlg19v8jkzlp710kbdgnb4541zgkqxqzcwglcvlc6g7rj"; }; buildInputs = [ readline texinfo nss nspr ] From 1ff1c6ac4a4c8bc7f237bc14d5ff2ca336f3f610 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 18:58:53 +0200 Subject: [PATCH 0605/2806] libidn2: 2.0.3 -> 2.0.4 for multiple CVEs Fixes CVE-2017-14061, CVE-2017-14062. --- pkgs/development/libraries/libidn2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index e3e4e000773..521fe00b56d 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; - sha256 = "1k88acdf242a6lbznr0h6f02frsqyqw4smw1nznibim5wyf18da3"; + sha256 = "1w6jycr5bbawimhb72wxf9ic92yrhfadahfj0b70myw5n81nnjv4"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; From 7e4e2667ae95b19ae5982c33c498a100349daccd Mon Sep 17 00:00:00 2001 From: Wei-Ming Yang Date: Tue, 26 Sep 2017 03:03:16 +0800 Subject: [PATCH 0606/2806] softether: 4.18 -> 4.20 --- .../modules/services/networking/softether.nix | 55 +++++++++++-------- pkgs/servers/softether/4.20.nix | 53 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 87 insertions(+), 24 deletions(-) create mode 100644 pkgs/servers/softether/4.20.nix diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix index 16530078b97..9087b75c29c 100644 --- a/nixos/modules/services/networking/softether.nix +++ b/nixos/modules/services/networking/softether.nix @@ -3,7 +3,6 @@ with lib; let - pkg = pkgs.softether; cfg = config.services.softether; in @@ -17,6 +16,15 @@ in enable = mkEnableOption "SoftEther VPN services"; + package = mkOption { + type = types.package; + default = pkgs.softether; + defaultText = "pkgs.softether"; + description = '' + softether derivation to use. + ''; + }; + vpnserver.enable = mkEnableOption "SoftEther VPN Server"; vpnbridge.enable = mkEnableOption "SoftEther VPN Bridge"; @@ -41,7 +49,7 @@ in dataDir = mkOption { type = types.string; - default = "${pkg.dataDir}"; + default = "${cfg.package.dataDir}"; description = '' Data directory for SoftEther VPN. ''; @@ -57,12 +65,13 @@ in mkMerge [{ environment.systemPackages = [ - (pkgs.lib.overrideDerivation pkg (attrs: { + (pkgs.lib.overrideDerivation cfg.package (attrs: { dataDir = cfg.dataDir; })) ]; systemd.services."softether-init" = { description = "SoftEther VPN services initial task"; + wantedBy = [ "network.target" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = false; @@ -71,11 +80,11 @@ in for d in vpnserver vpnbridge vpnclient vpncmd; do if ! test -e ${cfg.dataDir}/$d; then ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d - install -m0600 ${pkg}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 + install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 fi done rm -rf ${cfg.dataDir}/vpncmd/vpncmd - ln -s ${pkg}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd + ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd ''; }; } @@ -83,17 +92,17 @@ in (mkIf (cfg.vpnserver.enable) { systemd.services.vpnserver = { description = "SoftEther VPN Server"; - after = [ "softether-init.service" "network.target" ]; - wants = [ "softether-init.service" ]; - wantedBy = [ "multi-user.target" ]; + after = [ "softether-init.service" ]; + requires = [ "softether-init.service" ]; + wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${pkg}/bin/vpnserver start"; - ExecStop = "${pkg}/bin/vpnserver stop"; + ExecStart = "${cfg.package}/bin/vpnserver start"; + ExecStop = "${cfg.package}/bin/vpnserver stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver - ln -s ${pkg}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver + ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver ''; postStop = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver @@ -104,17 +113,17 @@ in (mkIf (cfg.vpnbridge.enable) { systemd.services.vpnbridge = { description = "SoftEther VPN Bridge"; - after = [ "softether-init.service" "network.target" ]; - wants = [ "softether-init.service" ]; - wantedBy = [ "multi-user.target" ]; + after = [ "softether-init.service" ]; + requires = [ "softether-init.service" ]; + wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${pkg}/bin/vpnbridge start"; - ExecStop = "${pkg}/bin/vpnbridge stop"; + ExecStart = "${cfg.package}/bin/vpnbridge start"; + ExecStop = "${cfg.package}/bin/vpnbridge stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge - ln -s ${pkg}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge + ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge ''; postStop = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge @@ -125,17 +134,17 @@ in (mkIf (cfg.vpnclient.enable) { systemd.services.vpnclient = { description = "SoftEther VPN Client"; - after = [ "softether-init.service" "network.target" ]; - wants = [ "softether-init.service" ]; - wantedBy = [ "multi-user.target" ]; + after = [ "softether-init.service" ]; + requires = [ "softether-init.service" ]; + wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${pkg}/bin/vpnclient start"; - ExecStop = "${pkg}/bin/vpnclient stop"; + ExecStart = "${cfg.package}/bin/vpnclient start"; + ExecStop = "${cfg.package}/bin/vpnclient stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnclient/vpnclient - ln -s ${pkg}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient + ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient ''; postStart = '' sleep 1 diff --git a/pkgs/servers/softether/4.20.nix b/pkgs/servers/softether/4.20.nix new file mode 100644 index 00000000000..c6ef5a3a4df --- /dev/null +++ b/pkgs/servers/softether/4.20.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl +, openssl, readline, ncurses, zlib }: + +let + os = if stdenv.isLinux then "1" + else if stdenv.isFreeBSD then "2" + else if stdenv.isSunOS then "3" + else if stdenv.isDarwin then "4" + else if stdenv.isOpenBSD then "5" + else ""; + cpuBits = if stdenv.is64bit then "2" else "1"; + +in + +stdenv.mkDerivation rec { + name = "softether-${version}"; + version = "4.20"; + build = "9608"; + compiledDate = "2016.04.17"; + dataDir = "/var/lib/softether"; + + src = fetchurl { + url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; + sha256 = "e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e"; + }; + + buildInputs = [ openssl readline ncurses zlib ]; + + preConfigure = '' + echo "${os} + ${cpuBits} + " | ./configure + rm configure + ''; + + buildPhase = '' + mkdir -p $out/bin + sed -i \ + -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ + -e "/_DIR=/s|/usr|${dataDir}|g" \ + -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ + -e "/echo/s|echo $out/|echo |g" \ + Makefile + ''; + + meta = with stdenv.lib; { + description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; + homepage = https://www.softether.org/; + license = licenses.gpl2; + maintainers = [ maintainers.rick68 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cbb7961f3e..fb040034fcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11713,7 +11713,8 @@ with pkgs; oracleXE = callPackage ../servers/sql/oracle-xe { }; softether_4_18 = callPackage ../servers/softether/4.18.nix { }; - softether = softether_4_18; + softether_4_20 = callPackage ../servers/softether/4.20.nix { }; + softether = softether_4_20; qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; From 38cc4f9f339547614b0519c31127ba131b8ef79c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:23:56 +0200 Subject: [PATCH 0607/2806] ncmpc: 0.27 -> 0.28 --- pkgs/applications/audio/ncmpc/default.nix | 31 +++++++++++------------ 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index e43120a715d..ef0bb75b2ec 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,36 +1,35 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses +, mpd_clientlib, gettext }: -stdenv.mkDerivation rec { +let + rpath = stdenv.lib.makeLibraryPath [ + glib ncurses mpd_clientlib + ]; +in stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "0sfal3wadqvy6yas4xzhw35awdylikci8kbdcmgm4l2afpmc1lrr"; + sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n"; }; buildInputs = [ glib ncurses mpd_clientlib ]; - # ++ libintlOrEmpty; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - # without this, po/Makefile.in.in is not being created - preAutoreconf = '' - ./autogen.sh + postFixup = '' + for elf in "$out"/bin/*; do + patchelf --set-rpath '${rpath}':"$out/lib" "$elf" + done ''; - configureFlags = [ - "--enable-colors" - "--enable-lyrics-screen" - ]; - meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://www.musicpd.org/clients/ncmpc/; license = licenses.gpl2Plus; platforms = platforms.all; + maintainers = with maintainers; [ fpletz ]; }; } From 1988f762ff4429ea987056d746b6b3ee079cd8e0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:24:21 +0200 Subject: [PATCH 0608/2806] batman-adv: 2017.2 -> 2017.3 --- pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 9105f635ae9..002e458b24d 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2017.2"; + ver = "2017.3"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "00sagxzkx0gqdkvc84w4bjy833l7n10hqalxdwkfxxwqwammclix"; + sha256 = "0202mxp7hwflkqnkkajx5lv1nxjng45q5gcvvdv68x46p8ikb5n2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 7ea8cf6d1bf..6ff3903c4f2 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2017.2"; + ver = "2017.3"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0v2k9ylmk8i85p69dh6gh134f081gm1clq1vnhn6x4831n8x0q64"; + sha256 = "1a48kc2v8cb1757pxlli96qf3d7x7k3qw04rjadfs0iy09sz1ir9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 4514e18f44f..4f8a85d5d88 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2017.2"; in +let base = "batman-adv-2017.3"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0krr6waxkmms23cacfzngddxy1vq577s54wy2fgx6lyb4579g1yl"; + sha256 = "1m541czjwgi4rfhjr6rg9r9c3cp2ncnif4ln7ri926zigwlxs3l3"; }; hardeningDisable = [ "pic" ]; From 37521cfd545428ddcabf7bfb79d7b9683d126076 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:24:35 +0200 Subject: [PATCH 0609/2806] iproute: 4.12.0 -> 4.13.0 --- pkgs/os-specific/linux/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 1d312be42ec..b64278ae4ba 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.12.0"; + version = "4.13.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0zdxdsxyaazl85xhwskvsmpyzwf5qp21cvjsi1lw3xnrc914q2if"; + sha256 = "0l2w84cwr54gaw3cbxijf614l76hx8mgcz57v81rwl68z3nq3yww"; }; preConfigure = '' From f03462eda86d0f0f250cbbb1485da2cff170c9ea Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:24:48 +0200 Subject: [PATCH 0610/2806] nginxMainline: 1.13.4 -> 1.13.5 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 64d0a9b7952..5ec0c7d4da5 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.4"; - sha256 = "1fpvy6738h951qks7wn6kdqwyprfsxirlxfq549n2p56kg2g68fy"; + version = "1.13.5"; + sha256 = "0blzna6h76xd7ddz37yb7yqg4yx7gpwsz8zbg8vlbxxk552bjx8f"; }) From 15cca009c1f67aa2c9481ba45b975551bf730ecd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:25:02 +0200 Subject: [PATCH 0611/2806] prometheus: 1.7.1 -> 1.7.2 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 8d5450127d6..08ee6b4e88a 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "prometheus-${version}"; - version = "1.7.1"; + version = "1.7.2"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "11acdwn2fw5qnyns5vdbxw18xnd2v4hb1y2cfjjxw478hhza4ni3"; + sha256 = "0a2qlcx4p6mwgff9hc2h3sm1glh6syb38jfxabsx2clmj0gq2dq1"; }; docheck = true; From a69aa46ad8e1fb75cd1b92556508ca91346baba5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:26:09 +0200 Subject: [PATCH 0612/2806] mpd_clientlib: 2.11 -> 2.13 --- pkgs/applications/audio/mpc/default.nix | 5 ----- pkgs/servers/mpd/clientlib.nix | 15 ++++----------- pkgs/tools/misc/mpdscribble/default.nix | 8 ++------ 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 59adb7cde49..73352b65092 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = '' - export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion} - export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} - ''; - meta = with stdenv.lib; { description = "A minimalist command line interface to MPD"; homepage = http://www.musicpd.org/clients/mpc/; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index a48ee83755b..d9adc0f3102 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,24 +1,17 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, doxygen }: +{ stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { - version = "${passthru.majorVersion}.${passthru.minorVersion}"; + version = "2.13"; name = "libmpdclient-${version}"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "libmpdclient"; rev = "v${version}"; - sha256 = "06rv2j8rw9v9l4nwpvbh28nad8bbg368hzd8s58znbr5pgb8dihd"; + sha256 = "1g1n6rk8kn87mbjqxxj0vi7haj8xx21xmqlzbrx2fvyp5357zvsq"; }; - nativeBuildInputs = [ autoreconfHook doxygen ]; - - enableParallelBuilding = true; - - passthru = { - majorVersion = "2"; - minorVersion = "11"; - }; + nativeBuildInputs = [ meson ninja ]; meta = with stdenv.lib; { description = "Client library for MPD (music player daemon)"; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 1acdf6d7ddb..56684848eba 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -10,12 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; }; - buildInputs = [ mpd_clientlib curl glib pkgconfig ]; - - preConfigure = '' - export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion} - export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} - ''; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mpd_clientlib curl glib ]; meta = with stdenv.lib; { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; From 4263f768c54e450b8e18aee267032e3bff2df2b6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:26:28 +0200 Subject: [PATCH 0613/2806] mpd: 0.20.9 -> 0.20.10 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 63a781c5941..a323cd4802c 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -34,7 +34,7 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "9"; + minor = "10"; in stdenv.mkDerivation rec { name = "mpd-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "17ly30syrlw5274washifr0nddll3g1zb4rr4f9sfnlxz9wz73p1"; + sha256 = "0i170kfn68x683fsm5rba0zbpjfr1r7s6a8nvdbva2yl0aizfzhs"; }; patches = [ ./x86.patch ]; From 57efafd6c8895e712c166da91aeb926f14c98452 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:26:39 +0200 Subject: [PATCH 0614/2806] youtubeDL: 2017.09.24 -> 2017.10.01 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index c364935b12c..dc5f6fb03c0 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.09.24"; + version = "2017.10.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0j2m75j0d1n83i7jzpkcj7ir0bkskj024j9b0yi88zipcg740wbx"; + sha256 = "047zinsczn6c96fzkarlb29y7sjwyh84nxlpfpa6mi4rn090wkqb"; }; nativeBuildInputs = [ makeWrapper ]; From 3d020892356be99187783469c0d5e39f0584621f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:35:45 +0200 Subject: [PATCH 0615/2806] ipfs: 0.4.10 -> 0.4.11 --- pkgs/applications/networking/ipfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index ba0f557d0ff..2c38965e100 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.10"; - rev = "4679f806bd00c0a5299c22c82d1fbfdbad928e6d"; + version = "0.4.11"; + rev = "v${version}"; goPackagePath = "github.com/ipfs/go-ipfs"; extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "1khlsahv9vqx3h2smif5wdyb56jrza415hqid7883pqimfi66g3x"; + sha256 = "1n8xr9xg23wm255zjm7nxd761xapmsv11a0giks2gaibh4nps1jl"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1j3az0nhjisb5dxp1a4g8w17y17xjikvcsy4qrg0fm43ybpkhhvw"; + sha256 = "1qi87sq490xpj4mip1d30x4v77gkacnw4idm0mwla92pg44v6wh9"; }; meta = with stdenv.lib; { From cd5275ad0128f8619f19f43e89ef2771090c08e8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:35:56 +0200 Subject: [PATCH 0616/2806] gqrx: 2.7 -> 2.8 --- pkgs/applications/misc/gqrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index a0672f1810f..27bda1e2092 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "1dslb8l8ggj6vf9257c2bj0z8z1wy9c6sr2zksp5jdgf8m4j71im"; + sha256 = "0niy4c05886mhbfmix93j2bnj4kzdh9bvrmymawl6z28glyz5d3c"; }; nativeBuildInputs = [ cmake ]; From 6dc9d21cc8675becf323159d5f3880075550c098 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:36:06 +0200 Subject: [PATCH 0617/2806] prometheus-blackbox-exporter: 0.8.1 -> 0.9.1 --- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 27e6dea01ec..6521408580d 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.8.1"; + version = "0.9.1"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1bnn1xa11593m66ihdnyka0ck8zmg4abvwdyy5fpnyx29g3ym4sd"; + sha256 = "03sc1h8jfxaw7c5d6lkj6x653zhxhh0v29n6db3319nsfx00nrag"; }; meta = with stdenv.lib; { From 66a362daf7d49b1959a3df0b5d94c8570f2bbf72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 2 Oct 2017 16:26:50 -0300 Subject: [PATCH 0618/2806] tint2: 15.1 -> 15.2 --- pkgs/applications/misc/tint2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 6a613b6d5b5..edc643941cb 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "15.1"; + version = "15.2"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "16mpvknibbqy0vjgkwig7g8i6rivm14ipd7ixvqydgcj7wibn0b7"; + sha256 = "1lfk3zcgmmlby353gs70gpi0m28nx2c20wxqgaw7268a69r5cz7a"; }; enableParallelBuilding = true; From 085188ee3eadbdc3e51ecb0e1ba06d8b5e4b8971 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Mon, 2 Oct 2017 21:29:33 +0200 Subject: [PATCH 0619/2806] citrix-receiver: 13.4.0 -> 13.7.0 --- .../networking/remote/citrix-receiver/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index c656ff24df8..0645e9cb606 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -20,9 +20,11 @@ , fontconfig , gtk_engines , alsaLib +, libidn +, zlib }: -let versionRec = { major = "13"; minor = "4"; patch = "0"; }; +let versionRec = { major = "13"; minor = "7"; patch = "0"; }; in stdenv.mkDerivation rec { name = "citrix-receiver-${version}"; version = with versionRec; "${major}.${minor}.${patch}"; @@ -31,11 +33,14 @@ in stdenv.mkDerivation rec { prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; src = with versionRec; requireFile rec { - name = "${prefixWithBitness}-${version}.10109380.tar.gz"; + name = + if stdenv.is64bit + then "${prefixWithBitness}-${version}.10276927.tar.gz" + else "${prefixWithBitness}-${version}.10276925.tar.gz"; sha256 = if stdenv.is64bit - then "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb" - else "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l"; + then "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91" + else "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6"; message = '' In order to use Citrix Receiver, you need to comply with the Citrix EULA and download the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: @@ -79,6 +84,8 @@ in stdenv.mkDerivation rec { xlibs.libXinerama xlibs.libXfixes libpng12 + libidn + zlib gtk_engines freetype fontconfig From b70be53c1504c64e0575384e06c91599d5c61a6a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Sep 2017 12:20:14 -0500 Subject: [PATCH 0620/2806] pyqt: 5.8.1 -> 5.9 --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 5d98544da88..9b3700bcd2a 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -2,7 +2,7 @@ , lndir, makeWrapper, qmake }: let - version = "5.8.1"; + version = "5.9"; inherit (pythonPackages) buildPythonPackage python dbus-python sip; in buildPythonPackage { name = "PyQt-${version}"; @@ -18,7 +18,7 @@ in buildPythonPackage { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy"; + sha256 = "15hh4z5vd45dcswjla58q6rrfr6ic7jfz2n7c8lwfb10rycpj3mb"; }; nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; From 3ef63d67a054c34fce0e26d4e0c52c63eabe2c4e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Sep 2017 16:31:19 -0500 Subject: [PATCH 0621/2806] sip: 4.19.1 -> 4.19.3 --- pkgs/development/python-modules/sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index b6094f37c3a..af885fcf5a2 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,13 +2,13 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { pname = "sip"; - version = "4.19.1"; + version = "4.19.3"; name = "${pname}-${version}"; format = "other"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e"; + sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl"; }; configurePhase = '' From 9d841295f3da4e02d7b7e87fac86b25cd1081f36 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 2 Oct 2017 21:04:32 +0200 Subject: [PATCH 0622/2806] gogs: avoid creating symlinks each run --- nixos/modules/services/misc/gogs.nix | 10 ++++++++++ pkgs/applications/version-management/gogs/default.nix | 5 +---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index cf1fbc7bcfa..f6d326e43d9 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -25,6 +25,7 @@ let HTTP_ADDR = ${cfg.httpAddress} HTTP_PORT = ${toString cfg.httpPort} ROOT_URL = ${cfg.rootUrl} + STATIC_ROOT_PATH = ${cfg.staticRootPath} [session] COOKIE_NAME = session @@ -175,6 +176,13 @@ in ''; }; + staticRootPath = mkOption { + type = types.str; + default = "${pkgs.gogs.data}"; + example = "/var/lib/gogs/data"; + description = "Upper level of template and static files path."; + }; + extraConfig = mkOption { type = types.str; default = ""; @@ -195,6 +203,8 @@ in runConfig = "${cfg.stateDir}/custom/conf/app.ini"; secretKey = "${cfg.stateDir}/custom/conf/secret_key"; in '' + mkdir -p ${cfg.stateDir} + # copy custom configuration and generate a random secret key if needed ${optionalString (cfg.useWizard == false) '' mkdir -p ${cfg.stateDir}/custom/conf diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index d3705758307..5553a759894 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -33,10 +33,7 @@ buildGoPackage rec { cp -R $src/{public,templates} $data wrapProgram $bin/bin/gogs \ - --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} \ - --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \ - --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \ - --run "ln -fs $data/{public,templates} ." + --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; goPackagePath = "github.com/gogits/gogs"; From 7504c75c9cd7920f2d8105e2dfbddbc6049857ca Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Mon, 2 Oct 2017 22:01:34 +0200 Subject: [PATCH 0623/2806] mariadb: 10.1.26 -> 10.1.28 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a2e5fbb6df9..d6731a5b7dc 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.26"; + version = "10.1.28"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "0ggpdcal0if9y6h9hp1yv2q65cbkjfl4p8rqk68a5pk7k75v325s"; + sha256 = "1g9b0c04qhgcgw6xw29bvdjjjacr7kn82crc7apvvi10ykzwhb99"; name = "mariadb-${version}.tar.gz"; }; From 41c2fb3f25c31fa07ca990b35b5a0fa1980652a8 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 2 Oct 2017 23:15:13 +0200 Subject: [PATCH 0624/2806] gogs: patch gogs to include default STATIC_ROOT_PATH --- .../version-management/gogs/default.nix | 7 +++++-- .../version-management/gogs/static-root-path.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/version-management/gogs/static-root-path.patch diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 5553a759894..1522f348ca1 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -16,9 +16,12 @@ buildGoPackage rec { sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0"; }; - patchPhase = '' + patches = [ ./static-root-path.patch ]; + + postPatch = '' patchShebangs . - ''; + substituteInPlace pkg/setting/setting.go --subst-var data + ''; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/gogs/static-root-path.patch b/pkgs/applications/version-management/gogs/static-root-path.patch new file mode 100644 index 00000000000..9eaa72a0c85 --- /dev/null +++ b/pkgs/applications/version-management/gogs/static-root-path.patch @@ -0,0 +1,13 @@ +diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go +index f206592d..796da6ef 100644 +--- a/pkg/setting/setting.go ++++ b/pkg/setting/setting.go +@@ -474,7 +474,7 @@ func NewContext() { + LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HTTPPort + "/") + OfflineMode = sec.Key("OFFLINE_MODE").MustBool() + DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() +- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) ++ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") + AppDataPath = sec.Key("APP_DATA_PATH").MustString("data") + EnableGzip = sec.Key("ENABLE_GZIP").MustBool() + From fff93f5a59696201389f3003f0431934232c176d Mon Sep 17 00:00:00 2001 From: Harmen Date: Mon, 2 Oct 2017 23:08:48 +0200 Subject: [PATCH 0625/2806] phantomjs2: add qtbase's bin to PATH --- pkgs/development/tools/phantomjs2/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 8c03c32655a..ee5de04a782 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch , bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg , libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase -, darwin, writeScriptBin, cups +, darwin, writeScriptBin, cups, makeWrapper }: let @@ -47,6 +47,7 @@ in stdenv.mkDerivation rec { buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite qtwebkit qtbase + makeWrapper ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ApplicationServices AppKit Cocoa OpenGL darwin.libobjc fakeClang cups @@ -98,6 +99,9 @@ in stdenv.mkDerivation rec { ${darwin.configd}/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration \ /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration \ $out/bin/phantomjs + '' + '' + wrapProgram $out/bin/phantomjs \ + --prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]} ''; preFixup = '' From 6c189c9e284b2c66efbf24d2b1ecf35d95eb6974 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 2 Oct 2017 22:18:23 +0200 Subject: [PATCH 0626/2806] oniguruma: fix darwin install_name --- pkgs/development/libraries/oniguruma/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index eccfccbaf04..b82f137ec6d 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + prePatch = stdenv.lib.optional stdenv.isDarwin '' + substituteInPlace cmake/dist.cmake \ + --replace '@executable_path/''${UP_DIR}/''${INSTALL_LIB}' $out'/''${INSTALL_LIB}' + ''; + meta = { homepage = https://github.com/kkos/oniguruma; description = "Regular expressions library"; From 2066cb0b029cc38810ea73cc16918815884c1b31 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 2 Oct 2017 22:01:31 +0200 Subject: [PATCH 0627/2806] jq: don't add rpath on darwin --- pkgs/development/tools/jq/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index d79aa098000..a84b5f42640 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, oniguruma }: +{ stdenv, fetchurl, fetchpatch, oniguruma }: stdenv.mkDerivation rec { name = "jq-${version}"; @@ -26,15 +26,13 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; # `src` subdir was introduced after v1.5 was released # jq is linked to libjq: - configureFlags = [ - "LDFLAGS=-Wl,-rpath,\\\${libdir}" - ]; + configureFlags = stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; - meta = { + meta = with stdenv.lib; { description = ''A lightweight and flexible command-line JSON processor''; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raskin ]; - platforms = with lib.platforms; linux ++ darwin; + license = licenses.mit; + maintainers = with maintainers; [ raskin ]; + platforms = with platforms; linux ++ darwin; downloadPage = "http://stedolan.github.io/jq/download/"; updateWalker = true; inherit version; From dbb8958fefd486a3eb53c8db1af7e2452047a608 Mon Sep 17 00:00:00 2001 From: bricewge Date: Mon, 2 Oct 2017 23:39:08 +0200 Subject: [PATCH 0628/2806] git-crypt: patch don't hard code path to git-crypt Fix #30034 --- .../version-management/git-and-tools/git-crypt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index e5e67605970..98cce617833 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl makeWrapper ]; + patchPhase = '' + substituteInPlace commands.cpp \ + --replace '(escape_shell_arg(our_exe_path()))' '= "git-crypt"' + ''; + installPhase = '' make install PREFIX=$out wrapProgram $out/bin/* --prefix PATH : ${gnupg1compat}/bin From 796b3a230630bc6413ca07fc4d9e17fb2e63352a Mon Sep 17 00:00:00 2001 From: Stuart Moss Date: Sat, 30 Sep 2017 09:31:04 +0100 Subject: [PATCH 0629/2806] eclipse-plugin-vrapper: init at 0.72.0 --- lib/maintainers.nix | 1 + pkgs/applications/editors/eclipse/plugins.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f384b997a86..1d533d0a840 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -574,6 +574,7 @@ sternenseemann = "Lukas Epple "; stesie = "Stefan Siegl "; steveej = "Stefan Junker "; + stumoss = "Stuart Moss "; SuprDewd = "Bjarki Ágúst Guðmundsson "; swarren83 = "Shawn Warren "; swflint = "Samuel W. Flint "; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index a3b4193edc6..b9b0ee61c0b 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -447,6 +447,28 @@ rec { }; }; + vrapper = buildEclipseUpdateSite rec { + name = "vrapper-${version}"; + version = "0.72.0"; + owner = "vrapper"; + repo = "vrapper"; + date = "20170311"; + + src = fetchzip { + stripRoot = false; + url = "https://github.com/${owner}/${repo}/releases/download/${version}/vrapper_${version}_${date}.zip"; + sha256 = "0nyirf6km97q211cxfy01kidxac20m8ba3kk9xj73ykrhsk3cxjp"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/vrapper/vrapper"; + description = "A wrapper to provide a Vim-like input scheme for moving around and editing text"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.stumoss ]; + }; + }; + yedit = buildEclipsePlugin rec { name = "yedit-${version}"; version = "1.0.20.201509041456"; From 0a37d94b4d25928d6fc47e7b48ef4aaab01aae49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 2 Oct 2017 19:58:01 -0300 Subject: [PATCH 0630/2806] tint2: limit platforms to Linux since macOS is not supported and fails the tests --- pkgs/applications/misc/tint2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index edc643941cb..e77acedac08 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = https://gitlab.com/o9000/tint2; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } From 98cb45ece3cfc0af195c5023481385f85fcf46ae Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Mon, 2 Oct 2017 19:06:29 -0400 Subject: [PATCH 0631/2806] Update keepassx-community to 2.2.1 --- pkgs/applications/misc/keepassx/community.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6ae86486b47..5de202f8f73 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassx-community-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc"; + sha256 = "1g9qz81i7rsfywl03bwl3cg7q91vp24519b91y5liiyrqrq0zx94"; }; cmakeFlags = [ From ae4c8e0889178562e0927d39726fd32984ffc388 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 30 Sep 2017 00:26:12 +0200 Subject: [PATCH 0632/2806] tor-browser-bundle: bump https-everywhere to 2017.9.12 --- .../networking/browsers/tor-browser-bundle/extensions.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index 88ec2ad9509..53c278bc065 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -16,15 +16,15 @@ { https-everywhere = stdenv.mkDerivation rec { name = "https-everywhere-${version}"; - version = "5.2.21"; + version = "2017.9.12"; extid = "https-everywhere-eff@eff.org"; src = fetchgit { url = "https://git.torproject.org/https-everywhere.git"; rev = "refs/tags/${version}"; - sha256 = "0z9madihh4b4z4blvfmh6w1hsv8afyi0x7b243nciq9r4w55xgfa"; - fetchSubmodules = true; + sha256 = "179429pngyksp9xkr86nf2m5q6zmg19c7ng1dhqjfb1vsncwgw66"; + fetchSubmodules = true; # for translations, TODO: remove }; nativeBuildInputs = [ From ba689a2740d47636245451a34de50a2f59d890ba Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 30 Sep 2017 15:40:32 +0200 Subject: [PATCH 0633/2806] tor-browser-bundle: support transports obfs2,obfs3 --- .../networking/browsers/tor-browser-bundle/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 10 insertions(+) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 0e9610247c8..ddec26e9833 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -36,6 +36,9 @@ , python27Packages , rsync +# Pluggable transports +, obfsproxy + # Customization , extraPrefs ? "" , extraExtensions ? [ ] @@ -165,8 +168,14 @@ stdenv.mkDerivation rec { >> $TBDATA_PATH/torrc-defaults cat \ $bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \ + $bundleData/PTConfigs/bridge_prefs.js \ >> defaults/pref/extension-overrides.js + # Configure pluggable transports + cat >>$TBDATA_PATH/torrc-defaults <fonts,${fontsDir}," \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cbb7961f3e..d1c930a769f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4658,6 +4658,7 @@ with pkgs; tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { stdenv = stdenvNoCC; tor-browser-unwrapped = firefoxPackages.tor-browser; + inherit (python27Packages) obfsproxy; }; touchegg = callPackage ../tools/inputmethods/touchegg { }; From f4f594e3597b2938fead465025fc1655295a47d6 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 30 Sep 2017 15:57:09 +0200 Subject: [PATCH 0634/2806] tor-browser-bundle: geoip support --- .../browsers/tor-browser-bundle/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index ddec26e9833..508ab6ec432 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -171,6 +171,19 @@ stdenv.mkDerivation rec { $bundleData/PTConfigs/bridge_prefs.js \ >> defaults/pref/extension-overrides.js + # Configure geoip + # + # tor-launcher insists on resolving geoip data relative to torrc-defaults + # (and passes them directly on the tor command-line). + # + # Write the paths into torrc-defaults anyway, otherwise they'll be + # captured in the runtime torrc. + ln -s -t $TBDATA_PATH ${tor.geoip}/share/tor/geoip{,6} + cat >>$TBDATA_PATH/torrc-defaults <>$TBDATA_PATH/torrc-defaults < Date: Tue, 3 Oct 2017 02:22:14 +0200 Subject: [PATCH 0635/2806] libsodium: 1.0.13 -> 1.0.15 --- pkgs/development/libraries/libsodium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 4fc1a5d2789..5d4535676e7 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.13"; + name = "libsodium-1.0.15"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "1z93wfg4k5svg8yck6cgdr6ysj91kbpn03nyzwxanncy3b5sq4ww"; + sha256 = "1x3qw7lsz44vcxpcn1dvwig410phg6gmv31jwj94arrgka3rwspv"; }; outputs = [ "out" "dev" ]; From 05b2f8559033a257811fb7f227fe5ce5124643bc Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 3 Oct 2017 02:23:06 +0200 Subject: [PATCH 0636/2806] tor-browser-bundle-bin: 7.0.5 -> 7.0.6 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 29a73beeec8..c9c67c01599 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.5"; + version = "7.0.6"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1ixa1pmh3fm82gwzkm7r3gbly1lrihpvk1irmpc8b8zsi2s49ghd"; + sha256 = "11z3r0577p78ifi9lk4lrh9wb46k77wy77g5p9l8il02760bgq6m"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1kb0m4xikxcgj03h6l0ch5d53i8hxdacwm7q745a377g44q84nzb"; + sha256 = "1r8v5w66clmm76kzpkf0f5jcxs76whb5xrl20rkirp79fybqn4hx"; }; }; in From a8f2ad6245cf468c8ae89f84078c205e8ff45456 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 2 Oct 2017 18:26:39 -0700 Subject: [PATCH 0637/2806] kubecfg: init at 0.5.0 --- .../networking/cluster/kubecfg/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubecfg/default.nix diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix new file mode 100644 index 00000000000..7f17bd57c19 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub, ... }: + +let version = "0.5.0"; in + +buildGoPackage { + name = "kubecfg-${version}"; + + src = fetchFromGitHub { + owner = "ksonnet"; + repo = "kubecfg"; + rev = "v${version}"; + sha256 = "1s8w133p8qkj3dr73jimajm9ddp678lw9k9symj8rjw5p35igr93"; + }; + + goPackagePath = "github.com/ksonnet/kubecfg"; + + meta = { + description = "A tool for managing Kubernetes resources as code"; + homepage = https://github.com/ksonnet/kubecfg; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benley ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cbb7961f3e..4c14d1acd21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15206,6 +15206,8 @@ with pkgs; ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; + kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; From ec331755d349494b543fcedca01951ac60994bbf Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 3 Oct 2017 10:13:30 +0800 Subject: [PATCH 0638/2806] go-ethereum: Fix libusb segmentation faults on Darwin --- pkgs/applications/altcoins/default.nix | 7 +++++-- pkgs/applications/altcoins/go-ethereum.nix | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index c604a9370a8..395a440690b 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages }: +{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin }: rec { @@ -26,7 +26,10 @@ rec { dogecoind = callPackage ./dogecoin.nix { withGui = false; }; freicoin = callPackage ./freicoin.nix { boost = boost155; }; - go-ethereum = callPackage ./go-ethereum.nix { }; + go-ethereum = callPackage ./go-ethereum.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; + }; go-ethereum-classic = callPackage ./go-ethereum-classic { }; hivemind = callPackage ./hivemind.nix { withGui = true; }; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 4cf68fb76fd..45c990d88a5 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -1,10 +1,14 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: buildGoPackage rec { name = "go-ethereum-${version}"; version = "1.7.0"; goPackagePath = "github.com/ethereum/go-ethereum"; + # Fix for usb-related segmentation faults on darwin + propagatedBuildInputs = + stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; From 8f3461c7fdaacef42ff07c3f5d3047fb334023ef Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 3 Oct 2017 00:22:00 +0200 Subject: [PATCH 0639/2806] wtftfw: 20161001 -> 20170921 - Bump revision - Prefix Exec path with output directory --- pkgs/applications/window-managers/wtftw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index 0ff3367e3ae..7e7c4c66589 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, xlibs, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "wtftw-0.0pre20161001"; + name = "wtftw-0.0pre20170921"; src = fetchFromGitHub { owner = "kintaro"; repo = "wtftw"; - rev = "b72a1bd24430a614d953d6ecf61732805277cc0c"; - sha256 = "1ajxkncqh4azyhmsdyk07r1kbhwv81vl1ix3w4iaz8cyln4gs0kp"; + rev = "13712d4c051938520b90b6639d4ff813f6fe5f48"; + sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl"; }; depsSha256 = "0z7h8ybh2db3xl8qxbzby5lncdaijixzmbn1j8a45lbky1xiix71"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { cp -p target/release/wtftw $out/bin/ echo "[Desktop Entry] Name=wtftw - Exec=/bin/wtftw + Exec=$out/bin/wtftw Type=XSession DesktopName=wtftw" > $out/share/xsessions/wtftw.desktop ''; From 3a86e15461f46a4cf8bdfa02bfc3e16fa6a9d17a Mon Sep 17 00:00:00 2001 From: dywedir Date: Tue, 3 Oct 2017 12:49:11 +0300 Subject: [PATCH 0640/2806] rustRegistry: 2017-09-10 -> 2017-10-03 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 6c39d865ac2..a4fd5ca54ee 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,13 +7,13 @@ { stdenv, fetchFromGitHub, git }: stdenv.mkDerivation { - name = "rustRegistry-2017-09-10"; + name = "rustRegistry-2017-10-03"; src = fetchFromGitHub { owner = "rust-lang"; repo = "crates.io-index"; - rev = "2e573cbbb2db591ff9d46339910f21e35b21339f"; - sha256 = "0sgpc2aygmvyjb3kinzh83bj4j92ny18159alqb1x8w26wqmisfq"; + rev = "f9e21955350caf67db45c4a4a38dbab2f2250bfc"; + sha256 = "1yk0l0r9idn7crnnw44sig69kvvyq3ycv417s88hd16m1fpl5y77"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' From 1406e249b3028f2da017393e2ba4a53e40bc9b9e Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 3 Oct 2017 11:01:05 +0100 Subject: [PATCH 0641/2806] krb5: add deprecation date for old configuration --- nixos/modules/config/krb5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix index bdcc2d48cd1..c22e99a0a2f 100644 --- a/nixos/modules/config/krb5/default.nix +++ b/nixos/modules/config/krb5/default.nix @@ -7,7 +7,7 @@ let cfg = config.krb5; # This is to provide support for old configuration options (as much as is - # reasonable). This can probably be removed after some time. + # reasonable). This can be removed after 18.03 was released. defaultConfig = { libdefaults = optionalAttrs (cfg.defaultRealm != null) { default_realm = cfg.defaultRealm; }; From 61c4ff5c31a4b583924d86be380efef7ef1d132f Mon Sep 17 00:00:00 2001 From: dywedir Date: Tue, 3 Oct 2017 13:17:40 +0300 Subject: [PATCH 0642/2806] exa: 0.7.0 -> 0.8.0 --- pkgs/tools/misc/exa/default.nix | 36 +++++---------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 110125727bf..488f7482b15 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -2,34 +2,17 @@ with rustPlatform; -let - # check for updates - zoneinfo_compiled = fetchFromGitHub { - owner = "rust-datetime"; - repo = "zoneinfo-compiled"; - rev = "f56921ea5e9f7cf065b1480ff270a1757c1f742f"; - sha256 = "1xmw7c5f5n45lkxnyxp4llfv1bnqhc876w98165ccdbbiylfkw26"; - }; - cargoPatch = '' - # use non-git dependencies - patch Cargo.toml < path = "${zoneinfo_compiled}" - EOF - ''; -in buildRustPackage rec { +buildRustPackage rec { name = "exa-${version}"; - version = "0.7.0"; + version = "0.8.0"; - depsSha256 = "0j320hhf2vqaha137pjj4pyiw6d3p5h3nhy3pl9vna1g5mnl1sn7"; + depsSha256 = "0yz41prkjs5rmvdhr9k58a52l7hvwy5mfg8rcpsq4ybgf601lja2"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; rev = "v${version}"; - sha256 = "0i9psgna2wwv9qyw9cif4qznqiyi16vl763hpm2yr195aj700339"; + sha256 = "0jy11a3xfnfnmyw1kjmv4ffavhijs8c940kw24vafklnacx5n88m"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; @@ -38,15 +21,6 @@ in buildRustPackage rec { # Some tests fail, but Travis ensures a proper build doCheck = false; - cargoUpdateHook = '' - ${cargoPatch} - ''; - cargoDepsHook = '' - pushd $sourceRoot - ${cargoPatch} - popd - ''; - meta = with stdenv.lib; { description = "Replacement for 'ls' written in Rust"; longDescription = '' @@ -57,7 +31,7 @@ in buildRustPackage rec { for a directory, or recursing into directories with a tree view. exa is written in Rust, so it’s small, fast, and portable. ''; - homepage = http://the.exa.website; + homepage = https://the.exa.website; license = licenses.mit; maintainer = [ maintainers.ehegnes ]; }; From 88f197fb971127dee1a1581e9f715aa0ba401622 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 3 Oct 2017 12:49:01 +0200 Subject: [PATCH 0643/2806] josm: 12712 -> 12914 --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 8952b7edba4..286be3cefc9 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "12712"; + version = "12914"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf"; + sha256 = "104yih9xfgkpcqg8sqgwkpij2l6pwm12jx6kif45j11sg7hxlh8x"; }; buildInputs = [ jre8 makeWrapper ]; From ccdccf14609877885c33ae46534b519dcb7c16d8 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Tue, 12 Sep 2017 22:47:33 +0800 Subject: [PATCH 0644/2806] opencc: build shared library and programs --- pkgs/tools/text/opencc/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 62206c6c791..b0805b4f768 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -9,10 +9,14 @@ stdenv.mkDerivation { buildInputs = [ cmake python ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=OFF" + makeFlags = [ + # let intermediate tools find intermediate library + "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(CURDIR)/src" ]; + # Parallel building occasionaly fails with: Error copying file "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/libopencc.so.1.0.0" to "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/tools". + enableParallelBuilding = false; + meta = with stdenv.lib; { homepage = https://github.com/BYVoid/OpenCC; license = licenses.asl20; From 2ab2b885c5c0655f41d65362067f89d45bd85e03 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Tue, 12 Sep 2017 23:06:19 +0800 Subject: [PATCH 0645/2806] marisa: init at 0.2.4 --- pkgs/development/libraries/marisa/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/marisa/default.nix diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix new file mode 100644 index 00000000000..5e4de2b4e1c --- /dev/null +++ b/pkgs/development/libraries/marisa/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "marisa-${version}"; + version = "0.2.4"; + + src = fetchurl { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/marisa-trie/marisa-${version}.tar.gz"; + sha256 = "1cwzf8hr348zihkiy0qckx0n6rxg7sy113xhbslb1irw1pvs99v7"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/marisa-trie/; + description = "Static and space-efficient trie data structure library"; + license = licenses.bsd3; + maintainers = with maintainers; [ mingchuan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c930a769f..8c89a23e37d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9748,6 +9748,8 @@ with pkgs; mapnik = callPackage ../development/libraries/mapnik { }; + marisa = callPackage ../development/libraries/marisa {}; + matio = callPackage ../development/libraries/matio { }; mbedtls = callPackage ../development/libraries/mbedtls { }; From 7a23eff831997b049635fe53f611633b577713f3 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Tue, 12 Sep 2017 23:23:09 +0800 Subject: [PATCH 0646/2806] librime: init at 1.2.9 --- .../development/libraries/librime/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/librime/default.nix diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix new file mode 100644 index 00000000000..142c48c12d8 --- /dev/null +++ b/pkgs/development/libraries/librime/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, + libyamlcpp, gmock }: + +stdenv.mkDerivation rec { + name = "librime-${version}"; + version = "1.2.9"; + + src = fetchFromGitHub { + owner = "rime"; + repo = "librime"; + rev = "rime-${version}"; + sha256 = "14jgnfm61ynm086x9v7wfmv2p14h0qp8lq4d2jqm21n821jsraj6"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://rime.im/; + description = "Rime Input Method Engine, the core library"; + license = licenses.bsd3; + maintainers = with maintainers; [ mingchuan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c89a23e37d..2ed68bb63e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9218,6 +9218,8 @@ with pkgs; librevisa = callPackage ../development/libraries/librevisa { }; + librime = callPackage ../development/libraries/librime {}; + libsamplerate = callPackage ../development/libraries/libsamplerate { inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices; }; From 906f73fd0be0df568f86be7c562395ec59ad718b Mon Sep 17 00:00:00 2001 From: mingchuan Date: Wed, 13 Sep 2017 20:37:32 +0800 Subject: [PATCH 0647/2806] brise: init at 2017-09-16 --- pkgs/data/misc/brise/default.nix | 41 ++++++++ pkgs/data/misc/brise/fetchPackages.nix | 130 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 173 insertions(+) create mode 100644 pkgs/data/misc/brise/default.nix create mode 100644 pkgs/data/misc/brise/fetchPackages.nix diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix new file mode 100644 index 00000000000..b62586111d4 --- /dev/null +++ b/pkgs/data/misc/brise/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, librime }: + +stdenv.mkDerivation rec { + name = "brise-unstable-2017-09-16"; + + src = fetchFromGitHub { + owner = "rime"; + repo = "brise"; + rev = "1cfb0fe1d3a4190ce5d034f141941156dd271e80"; + sha256 = "1l13j3cfwida0ycl874fizz2jwjvlxid589a1iciqa9y25k21ql7"; + }; + + buildInputs = [ librime ]; + + postPatch = '' + patchShebangs scripts/* + ''; + + # we need to use fetchFromGitHub to fetch sub-packages before we 'make', + # since nix won't allow networking during 'make' + preBuild = import ./fetchPackages.nix fetchFromGitHub; + + makeFlags = [ "BRISE_BUILD_BINARIES=yes" "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Rime Schema Repository"; + longDescription = '' + This software is a collection of data packages used by Rime + to support various Chinese input methods, including those based on + modern dialects or historical diasystems of the Chinese language. + ''; + homepage = http://rime.im; + # Note that individual packages in this collection + # may be released under different licenses + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.mingchuan ]; + }; +} diff --git a/pkgs/data/misc/brise/fetchPackages.nix b/pkgs/data/misc/brise/fetchPackages.nix new file mode 100644 index 00000000000..92930c67cc9 --- /dev/null +++ b/pkgs/data/misc/brise/fetchPackages.nix @@ -0,0 +1,130 @@ +fetchFromGitHub: +# generated using https://gist.github.com/sifmelcara/895c71f99500b9d56d68e9a866b58821 +'' +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-array"; + rev = "9ca2b725ae52c9b3185213e3555df1f9d4f1c53f"; + sha256 = "0x3sifdpdivr8ssynjhc4g1zfl6h9hm9nh9p9zb9wkh1ky9z7kha"; +}} array +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-bopomofo"; + rev = "7046ffe42b46915947117f80d901fb9a6e19c1a7"; + sha256 = "09w8jl2dlgp72k49x0l2jiaqb359v576kai4xww6cljgr24ng8pl"; +}} bopomofo +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-cangjie"; + rev = "64242be99c1e6793c9f40fef296a81d07a84e976"; + sha256 = "0v5sk8zrm5p5gg8lszqm0imj9jswjlnfq87nw6m9pg5h5al230ja"; +}} cangjie +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-combo-pinyin"; + rev = "97a7dc4670e0f90ad28e7d67c1543f4f0adc531d"; + sha256 = "0y8iyvq7z6xj3lk2ppk4ggz297wn1r2xxbv53f2710jc7gyzf04q"; +}} combo-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-double-pinyin"; + rev = "1b75af4239897fd1e4c99d625b62093e66baff14"; + sha256 = "0p54qx5a6rr55hl997kdcfxjczd9lcddrc5xsy7nhlfyc6108s2v"; +}} double-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-emoji"; + rev = "7e527056fe055237fee59463e0d445f3909aaf0c"; + sha256 = "04d35n254viw29yyjf3ml7xljmi63sqgg870swlbi5bikcx7n9jf"; +}} emoji +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-essay"; + rev = "595e35756d16d57d09405e243302b65b4384b5b4"; + sha256 = "10kqhvrz8x17b2pf6x2x2znz5y6cj05c4rgwi1f0xhxiyrgjw9gm"; +}} essay +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-ipa"; + rev = "9e02f8a02e9febb7b2df25f6906881a1df934811"; + sha256 = "1g4v4j1gnv1qspfz88liwj1aa4gaa3aax0x2cif4vxicsm7w372m"; +}} ipa +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-jyutping"; + rev = "3cc76e6e15cc05f1f94b89e750c21f87ce8fc0e4"; + sha256 = "1yggz0yb84z8810s2gmsxkm9lh57fdzddx5v2rb5mqcwnimsd6ap"; +}} jyutping +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-luna-pinyin"; + rev = "da00c3a6f932f094666e98a09f6ce9c7d74c334c"; + sha256 = "0q3g1hj9bay5865h3pz7gv46d7wfka1jdxnddxcbp4zn7gjpsd48"; +}} luna-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-middle-chinese"; + rev = "6f9731bac8f289f77d35f1090159f1937e38c1f7"; + sha256 = "0xd9iwk4j5043gfmp7rb57hbarfm6sxr32wiasi6p3c5g355zn89"; +}} middle-chinese +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-pinyin-simp"; + rev = "38c08403c22845f7e2965c1d7a1514b41755d7dc"; + sha256 = "1c0cqljx3d93w27y2flxyqcfd3rd9fvixbw6mxgfjzdb3s42bn8h"; +}} pinyin-simp +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-prelude"; + rev = "120c2aa73b1b5e1bce904901bf13f506295004a5"; + sha256 = "1aah9z58gkqrc18zadsq598ybj8ra22bgka3gma2jmi3rls2znq4"; +}} prelude +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-quick"; + rev = "638abf270e121bc2bfc6029a14ee85a3f4c2188b"; + sha256 = "0l1pma0yxrypnb5cq7jiczy0wa42kdqsc1brqkkccdnp08pa1p1m"; +}} quick +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-scj"; + rev = "6b74ce14be0464bf076d7adc40aea4b120f233ec"; + sha256 = "0lr92knr41mlqd1s0g2lh2h2qr8xka1s46x7iv4d6ghjf0id4gz6"; +}} scj +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-soutzoe"; + rev = "3ab93d1b9ca9ca7cf17ff32bb4418b7a095afc3c"; + sha256 = "1glbvgzx4psasq23511k8ymd7mf1pqvm3z18nzszhs00iif66s3m"; +}} soutzoe +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-stenotype"; + rev = "766f22565f83f5c63c0ea195c936779ec6ae824d"; + sha256 = "0jsvfq7xim99zs5imyk7rpknlaimk6nlxy38fmfxa1r843781mfd"; +}} stenotype +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-stroke"; + rev = "e048967a4c1b956575828f1a20e565efed4b1137"; + sha256 = "10asdz5bj12pnji7afzls6jd9dn2v90l2dgdjf0jfp2kfzd6pxnl"; +}} stroke +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-terra-pinyin"; + rev = "e303507e728def38739f5761c50722eae1f06dd5"; + sha256 = "1krbmx2iq3zw4q1x4aa9c72b9xgrnjrhyxa4h5hnq5l29p9qms4d"; +}} terra-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-wubi"; + rev = "97b7d9f93378e98fd11167bd80d54c40e67076aa"; + sha256 = "1cdpbqqkqjbizja0w3f7a826a5bxb39nlf9qf2130x9havmkc89z"; +}} wubi +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-wugniu"; + rev = "de40b29f8218cc852bf82b315c7070f1d50bda02"; + sha256 = "1m7miwsqpy49cgqd1bl7z5lkkirj3lc2bdwd1zqfg5zbgfwn0rp8"; +}} wugniu +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ed68bb63e1..df050753ee6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13082,6 +13082,8 @@ with pkgs; bgnet = callPackage ../data/documentation/bgnet { }; + brise = callPackage ../data/misc/brise { }; + inherit (kdeFrameworks) breeze-icons; cacert = callPackage ../data/misc/cacert { }; From 53c8e23591acc2f43d1f1be35ef2715e8badde75 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Sat, 16 Sep 2017 13:02:10 +0800 Subject: [PATCH 0648/2806] fcitx-engines.rime: init at 0.3.2 --- .../fcitx-engines/fcitx-rime/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix new file mode 100644 index 00000000000..96e575d05bf --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor_icon_theme }: + +stdenv.mkDerivation rec { + name = "fcitx-rime-${version}"; + version = "0.3.2"; + + src = fetchurl { + url = "https://download.fcitx-im.org/fcitx-rime/${name}.tar.xz"; + sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr"; + }; + + buildInputs = [ cmake pkgconfig fcitx librime brise hicolor_icon_theme ]; + + # cmake cannont automatically find our nonstandard brise install location + cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ]; + + preInstall = '' + substituteInPlace src/cmake_install.cmake \ + --replace ${fcitx} $out + substituteInPlace data/cmake_install.cmake \ + --replace ${fcitx} $out + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + isFcitxEngine = true; + homepage = https://github.com/fcitx/fcitx-rime; + downloadPage = https://download.fcitx-im.org/fcitx-rime/; + description = "Rime support for Fcitx"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ mingchuan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df050753ee6..ab28e79c235 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1953,6 +1953,8 @@ with pkgs; unikey = callPackage ../tools/inputmethods/fcitx-engines/fcitx-unikey { }; + rime = callPackage ../tools/inputmethods/fcitx-engines/fcitx-rime { }; + m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { From d6b8ac6ca8558b8ec8d3736f8bc5b17c56d16ea5 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Tue, 3 Oct 2017 20:07:12 +0800 Subject: [PATCH 0649/2806] maintainers.nix: use my GitHub handle as maintainer name --- lib/maintainers.nix | 2 +- pkgs/applications/misc/pcmanx-gtk2/default.nix | 2 +- pkgs/data/misc/brise/default.nix | 2 +- pkgs/development/compilers/crystal/default.nix | 2 +- pkgs/development/libraries/librime/default.nix | 2 +- pkgs/development/libraries/marisa/default.nix | 2 +- pkgs/development/tools/build-managers/shards/default.nix | 2 +- pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix | 2 +- pkgs/tools/text/opencc/default.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 1d533d0a840..437fb074402 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -384,7 +384,6 @@ mikefaille = "Michaël Faille "; miltador = "Vasiliy Solovey "; mimadrid = "Miguel Madrid "; - mingchuan = "Ming Chuan "; mirdhyn = "Merlin Gaillard "; mirrexagon = "Andrew Abbott "; mjanczyk = "Marcin Janczyk "; @@ -550,6 +549,7 @@ shell = "Shell Turner "; shlevy = "Shea Levy "; siddharthist = "Langston Barrett "; + sifmelcara = "Ming Chuan "; sigma = "Yann Hodique "; simonvandel = "Simon Vandel Sillesen "; sivteck = "Sivaram Balakrishnan "; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 65366607c50..0d0ebb658ee 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { homepage = http://pcman.ptt.cc; license = licenses.gpl2; description = "Telnet BBS browser with GTK+ interface"; - maintainers = [ maintainers.mingchuan ]; + maintainers = [ maintainers.sifmelcara ]; platforms = platforms.linux; }; } diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index b62586111d4..8b27f4fbf72 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { # may be released under different licenses license = licenses.gpl3; platforms = platforms.all; - maintainers = [ maintainers.mingchuan ]; + maintainers = [ maintainers.sifmelcara ]; }; } diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 62a504ef966..ae94a76ab23 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { description = "A compiled language with Ruby like syntax and type inference"; homepage = https://crystal-lang.org/; license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ mingchuan ]; + maintainers = with stdenv.lib.maintainers; [ sifmelcara ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 142c48c12d8..a8877bdb2da 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://rime.im/; description = "Rime Input Method Engine, the core library"; license = licenses.bsd3; - maintainers = with maintainers; [ mingchuan ]; + maintainers = with maintainers; [ sifmelcara ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix index 5e4de2b4e1c..5f050c6e7a7 100644 --- a/pkgs/development/libraries/marisa/default.nix +++ b/pkgs/development/libraries/marisa/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/p/marisa-trie/; description = "Static and space-efficient trie data structure library"; license = licenses.bsd3; - maintainers = with maintainers; [ mingchuan ]; + maintainers = with maintainers; [ sifmelcara ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 52c5417456c..b7d75999fdf 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://crystal-lang.org/; license = licenses.asl20; description = "Dependency manager for the Crystal language"; - maintainers = with maintainers; [ mingchuan ]; + maintainers = with maintainers; [ sifmelcara ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 96e575d05bf..e9e2e29f7fa 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Rime support for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ mingchuan ]; + maintainers = with maintainers; [ sifmelcara ]; }; } diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index b0805b4f768..a2a02049d26 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { phrase-level conversion, variant conversion and regional idioms among Mainland China, Taiwan and Hong kong. ''; - maintainers = [ maintainers.mingchuan ]; + maintainers = [ maintainers.sifmelcara ]; platforms = platforms.linux; }; } From 89e451f7137dc61249809d825918a74aa9047120 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 3 Oct 2017 10:53:23 -0400 Subject: [PATCH 0650/2806] gradle: 4.2 -> 4.2.1 --- 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 e5eda9c1956..a5ea6df3c8d 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.2"; + name = "gradle-4.2.1"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1bifb3smmdxkfk94li2l63g2jxcl1bjca2bqcq2rqnp568yxcpai"; + sha256 = "1h7v133rm81jf0bgv9mgvydl7rgh4430dnsfs66wflfay82cqldm"; }; }; From 9b3aa19a88d523f1507663cc4eebca141024e482 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Oct 2017 16:56:18 +0200 Subject: [PATCH 0651/2806] Add NixOS 17.09 AMIs Fixes #29976. --- nixos/modules/virtualisation/ec2-amis.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 745518f8597..14826b6272f 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -223,5 +223,21 @@ let self = { "17.03".us-west-2.hvm-ebs = "ami-a93daac9"; "17.03".us-west-2.hvm-s3 = "ami-5139ae31"; - latest = self."17.03"; + # 17.09.1483.d0f0657ca0 + "17.09".eu-west-1.hvm-ebs = "ami-cf33e7b6"; + "17.09".eu-west-2.hvm-ebs = "ami-7d061419"; + "17.09".eu-central-1.hvm-ebs = "ami-7548fa1a"; + "17.09".us-east-1.hvm-ebs = "ami-6f669d15"; + "17.09".us-east-2.hvm-ebs = "ami-cbe1ccae"; + "17.09".us-west-1.hvm-ebs = "ami-9d95a5fd"; + "17.09".us-west-2.hvm-ebs = "ami-d3956fab"; + "17.09".ca-central-1.hvm-ebs = "ami-ee4ef78a"; + "17.09".ap-southeast-1.hvm-ebs = "ami-1dfc807e"; + "17.09".ap-southeast-2.hvm-ebs = "ami-dcb350be"; + "17.09".ap-northeast-1.hvm-ebs = "ami-00ec3d66"; + "17.09".ap-northeast-2.hvm-ebs = "ami-1107dd7f"; + "17.09".sa-east-1.hvm-ebs = "ami-0377086f"; + "17.09".ap-south-1.hvm-ebs = "ami-4a064625"; + + latest = self."17.09"; }; in self From cc96fb6810c27c489b670974db181bdf82556931 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Tue, 3 Oct 2017 11:59:43 -0400 Subject: [PATCH 0652/2806] goklp: init at 1.6 --- pkgs/tools/networking/goklp/default.nix | 24 +++++++++++ pkgs/tools/networking/goklp/deps.nix | 56 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 82 insertions(+) create mode 100644 pkgs/tools/networking/goklp/default.nix create mode 100644 pkgs/tools/networking/goklp/deps.nix diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix new file mode 100644 index 00000000000..88a6b74686c --- /dev/null +++ b/pkgs/tools/networking/goklp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "goklp-${version}"; + version = "1.6"; + + goPackagePath = "github.com/AppliedTrust/goklp"; + + src = fetchFromGitHub { + owner = "AppliedTrust"; + repo = "goklp"; + rev = "v${version}"; + sha256 = "054qmwfaih8qbvdyy4rqbb1ip3jpnm547n390hgab8yc3bdd840c"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand"; + homepage = https://github.com/AppliedTrust/goklp; + maintainers = with maintainers; [ disassembler ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/tools/networking/goklp/deps.nix b/pkgs/tools/networking/goklp/deps.nix new file mode 100644 index 00000000000..2f6481f237f --- /dev/null +++ b/pkgs/tools/networking/goklp/deps.nix @@ -0,0 +1,56 @@ +[ + { + goPackagePath = "github.com/asaskevich/govalidator"; + fetch = { + type = "git"; + url = "https://github.com/asaskevich/govalidator"; + rev = "ca5f9e638c83bac66bfac70ded5bded1503135a7"; + sha256 = "0lk4irlf4a4q8qharwjxl71y1s2cf5bjpg9cv5jlyp574331pn1w"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = "https://github.com/vaughan0/go-ini"; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/asn1-ber.v1"; + rev = "379148ca0225df7a432012b8df0355c2a2063ac0"; + sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; + }; + } + { + goPackagePath = "gopkg.in/ldap.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/ldap.v2"; + rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f"; + sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04746592d1b..0aa6cde0e63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2297,6 +2297,8 @@ with pkgs; godot = callPackage ../development/tools/godot {}; + goklp = callPackage ../tools/networking/goklp {}; + go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; go-pup = callPackage ../development/tools/pup { }; From dd8a42a224e244a6de5267259f156f7e6ee090ad Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 3 Oct 2017 12:48:30 -0400 Subject: [PATCH 0653/2806] fetchpatch: allow callers to specify postFetch sensibly Before this fix, it seemed to be trying to merge our postFetch with the patch normalization logic, but accidentally clobbering the whole thing with the passed-in value. --- pkgs/build-support/fetchpatch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index a9bfac320fb..e3159d20530 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -27,4 +27,4 @@ fetchurl ({ "$tmpfile" > "$out" ${args.postFetch or ""} ''; -} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes"]) +} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes" "postFetch"]) From 8bc5f04c06044ba6e7a328d5ee654c6fade41293 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 3 Oct 2017 20:25:50 +0200 Subject: [PATCH 0654/2806] brscan4: 0.4.4-2 -> 0.4.4-4 --- .../applications/graphics/sane/backends/brscan4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 7037e944f3f..42d129e5388 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -10,17 +10,17 @@ let udevRules = callPackage ./udev_rules_type1.nix {}; in stdenv.mkDerivation rec { - name = "brscan4-0.4.4-2"; + name = "brscan4-0.4.4-4"; src = if stdenv.system == "i686-linux" then fetchurl { url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; - sha256 = "1rd6qmg49lvack8rg9kkqs3vxfvvqf2x45h93pkrhk8a4aj5c8ll"; + sha256 = "13mhjbzf9nvpdzrc2s98684r7likg76zxs1wlz2h8w59fsqgx4k2"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; - sha256 = "1r3cq1k2a2bghibkckmk00x7y59ic31gv7jcsw7380szf1j3la59"; + sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd"; } else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; From 5bf645cde5ed853b5cef0ef9f612d6508cc58e26 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 3 Oct 2017 15:27:57 -0500 Subject: [PATCH 0655/2806] caneda: git-2012-02-16 -> 0.3.1 cc #15558 Components are now part of the base install (previously it seems no components were included), which I believe mostly removes the need for the srcComponents bit. Debian is only other distro packaging this according to repology, and they don't include additional libraries which further suggests they're at least non-essential :). As for the Caneda/Libraries repository, copying these into the "libraries" directory with similar files does not cause them to be auto-registered anyway, as far as I can tell the application has a static list of components (in the source) and additional components need to be added using the GUI making bundling them a bit useless and misleading. caneda also now requires qt5 and doesn't appear to require either libxml2 or libxslt. --- .../science/electronics/caneda/default.nix | 39 ++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 2d6b12a5bb0..8f81a03044b 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,37 +1,20 @@ -{stdenv, fetchgit, qt4, cmake, libxml2, libxslt}: - -let - - srcComponents = fetchgit { - url = git://caneda.git.sourceforge.net/gitroot/caneda/components; - rev = "34cd36b620e0dfc57ba2d2b6168734ea9a2cfa9a"; - sha256 = "840f07921eecbf10e38e44e5c61c716295a16c98fbb75016d9a44e7dfee40e59"; - }; - -in +{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: stdenv.mkDerivation rec { - name = "caneda-git-2012-02-16"; + name = "caneda-${version}"; + version = "0.3.1"; - src = fetchgit { - url = git://caneda.git.sourceforge.net/gitroot/caneda/caneda; - rev = "fff9e2f7988fe5d062548cafeda1e5cd660769d1"; - sha256 = "dfbcac97f5a1b41ad9a63392394f37fb294cbf78c576673c9bc4a5370957b2c8"; + src = fetchFromGitHub { + owner = "Caneda"; + repo = "Caneda"; + rev = version; + sha256 = "0hx8qid50j9xvg2kpbpqmbdyakgyjn6m373m1cvhp70v2gp1v8l2"; }; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qttools qtsvg qwt ]; - buildInputs = [ cmake qt4 libxml2 libxslt ]; - - patches = [ - ./gcc6.patch - ]; - - postInstall = '' - mkdir $out/share/caneda/components - cp -R ${srcComponents}/* $out/share/caneda/components - chmod u+w -R $out/share/caneda/components - ''; + enableParallelBuilding = true; meta = { description = "Open source EDA software focused on easy of use and portability"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab28e79c235..e9ff87d5e60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18618,7 +18618,7 @@ with pkgs; eagle = callPackage ../applications/science/electronics/eagle { }; - caneda = callPackage ../applications/science/electronics/caneda { }; + caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; geda = callPackage ../applications/science/electronics/geda { guile = guile_2_0; From eb59961855cf2c76aa4016c33323931d1d760445 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 4 Oct 2017 02:15:48 +0200 Subject: [PATCH 0656/2806] Revert "pinentry: make GTK3 the default front-end" This reverts commit 3f7e3db74426f658b4625505d262c1f7b288606d. This broke the gpg-agent user service. See #27468. --- nixos/modules/config/no-x-libs.nix | 2 +- pkgs/top-level/all-packages.nix | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index ec3103b4a40..ae3e17ac27b 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -35,7 +35,7 @@ with lib; networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; }; networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; }; networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; }; - pinentry = pkgs.pinentry.override { gcr = null; gtk2 = null; qt4 = null; }; + pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; }; }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab28e79c235..7d83bcd6535 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3871,16 +3871,14 @@ with pkgs; pinentry = callPackage ../tools/security/pinentry { libcap = if stdenv.isDarwin then null else libcap; qt4 = null; - gtk2 = null; - gcr = gnome3.gcr; }; pinentry_ncurses = pinentry.override { - gcr = null; + gtk2 = null; }; - pinentry_gtk2 = pinentry_ncurses.override { - inherit gtk2; + pinentry_gnome = pinentry_ncurses.override { + gcr = gnome3.gcr; }; pinentry_qt4 = pinentry_ncurses.override { From 9c53b9cff9ca6cb50e5d02ccd05e7453c8f6d08a Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Tue, 3 Oct 2017 14:05:57 -0400 Subject: [PATCH 0657/2806] mupdf: fix library linking Previously, libmupdf.so did not have DT_NEEDED references to its dependencies. Packages which linked against libmupdf would have to also manually link against its dependencies as well. --- pkgs/applications/misc/mupdf/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 9fe275b490c..5651405633f 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig -, freetype, harfbuzz, openjpeg, jbig2dec +, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg , enableX11 ? true, libX11, libXext , enableCurl ? true, curl, openssl }: @@ -26,11 +26,17 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614"; sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc"; }) + + (fetchpatch { + name = "mupdf-1.11-shared_libs-1.patch"; + url = "http://www.linuxfromscratch.org/patches/downloads/mupdf/mupdf-1.11-shared_libs-1.patch"; + sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j"; + }) ]; makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec ] + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ] ++ lib.optionals enableX11 [ libX11 libXext ] ++ lib.optionals enableCurl [ curl openssl ]; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -41,13 +47,6 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for i in $out/lib/*.a; do - so="''${i%.a}.so" - gcc -shared -o $so.${version} -Wl,--whole-archive $i -Wl,--no-whole-archive - ln -s $so.${version} $so - rm $i - done - mkdir -p "$out/lib/pkgconfig" cat >"$out/lib/pkgconfig/mupdf.pc" < Date: Tue, 3 Oct 2017 14:04:56 -0400 Subject: [PATCH 0658/2806] k2pdfopt: fix mupdf linking --- pkgs/applications/misc/k2pdfopt/default.nix | 18 +++++++++++++++--- pkgs/applications/misc/k2pdfopt/k2pdfopt.patch | 6 +++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 587e6a588a7..03ed7554af5 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -2,7 +2,7 @@ , zlib, libpng , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript -, enableMuPDF ? true, jbig2dec, openjpeg, freetype, harfbuzz, mupdf +, enableMuPDF ? true, mupdf , enableJPEG2K ? true, jasper , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes @@ -51,7 +51,19 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27"; sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693"; }) + + (fetchpatch { + name = "mupdf-1.10a-shared_libs-1.patch"; + url = "http://www.linuxfromscratch.org/patches/downloads/mupdf/mupdf-1.10a-shared_libs-1.patch"; + sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab"; + }) ]; + + # Override this since the jpeg directory was renamed libjpeg in mupdf 1.11 + preConfigure = '' + # Don't remove mujs because upstream version is incompatible + rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} + ''; }); leptonica_modded = leptonica.overrideAttrs (attrs: { prePatch = '' @@ -75,8 +87,8 @@ stdenv.mkDerivation rec { [ zlib libpng ] ++ optional enableGSL gsl ++ optional enableGhostScript ghostscript ++ - optionals enableMuPDF [ jbig2dec openjpeg freetype harfbuzz mupdf_modded ] ++ - optionals enableJPEG2K [ jasper ] ++ + optional enableMuPDF mupdf_modded ++ + optional enableJPEG2K jasper ++ optional enableDJVU djvulibre ++ optional enableGOCR gocr ++ optionals enableTesseract [ leptonica_modded tesseract_modded ]; diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch index a393e30fc72..cf7e4896b80 100644 --- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch +++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch @@ -17,11 +17,11 @@ index 4a2378b..502c477 100644 -# willus.h -# HAVE_GSL_LIB +pkg_check_modules(GSL gsl) -+if(MUPDF_FOUND) ++if(GSL_FOUND) + set(HAVE_GSL_LIB 1) + include_directories(SYSTEM ${GSL_INCLUDEDIR}) + set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) -+endif(MUPDF_FOUND) ++endif(GSL_FOUND) # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) @@ -30,7 +30,7 @@ index 4a2378b..502c477 100644 message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} - -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype -+ -lopenjp2 -ljbig2dec -ljpeg -lfreetype -lharfbuzz ++ ) endif(MUPDF_FOUND) From 03a5d729ef38ac4ed8e1500b19d9ebb4d99a266e Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Tue, 3 Oct 2017 16:09:30 +0200 Subject: [PATCH 0659/2806] nixos/gitlab: fix gitlab service Fix GitLab service and update documentation. Fixes #30059. --- nixos/modules/services/misc/gitlab.nix | 3 ++- nixos/modules/services/misc/gitlab.xml | 29 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 280c66d0aaf..0fa9e417785 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -414,7 +414,7 @@ in { Make sure the secret is an RSA private key in PEM format. You can generate one with - openssl genrsa 2048openssl genpkey -algorithm RSA -out - -pkeyopt rsa_keygen_bits:2048 + openssl genrsa 2048 ''; }; @@ -567,6 +567,7 @@ in { mkdir -p ${cfg.statePath}/log mkdir -p ${cfg.statePath}/tmp/pids mkdir -p ${cfg.statePath}/tmp/sockets + mkdir -p ${cfg.statePath}/shell rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks mkdir -p ${cfg.statePath}/config diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index f9636f8e127..4b00f50abd6 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -66,6 +66,35 @@ services.gitlab = { db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; + jws = '' + -----BEGIN RSA PRIVATE KEY----- + MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK + ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm + hnsjuNIXTF7BXrx3RX6BxZpH5Vzzh9nCwWKT/JCFqtwH7afNGGL7aMf+hdaiUg/Q + SD05yRObioiO4iXDolsJOhrnbZvlzVHl1ZYxFJv0H6/Snc0BBA9Fl/3uj6ANpbjP + eXF1SnJCqT87bj46r5NdVauzaRxAsIfqHroHK4UZ98X5LjGQFGvSqTvyjPBS4I1i + s7VJU28ObuutHxIxSlH0ibn4HZqWmKWlTS652wIDAQABAoIBAGtPcUTTw2sJlR3x + 4k2wfAvLexkHNbZhBdKEa5JiO5mWPuLKwUiZEY2CU7Gd6csG3oqNWcm7/IjtC7dz + xV8p4yp8T4yq7vQIJ93B80NqTLtBD2QTvG2RCMJEPMzJUObWxkVmyVpLQyZo7KOd + KE/OM+aj94OUeEYLjRkSCScz1Gvq/qFG/nAy7KPCmN9JDHuhX26WHo2Rr1OnPNT/ + 7diph0bB9F3b8gjjNTqXDrpdAqVOgR/PsjEBz6DMY+bdyMIn87q2yfmMexxRofN6 + LulpzSaa6Yup8N8H6PzVO6KAkQuf1aQRj0sMwGk1IZEnj6I0KbuHIZkw21Nc6sf2 + ESFySDECgYEA1PnCNn5tmLnwe62Ttmrzl20zIS3Me1gUVJ1NTfr6+ai0I9iMYU21 + 5czuAjJPm9JKQF2vY8UAaCj2ZoObtHa/anb3xsCd8NXoM3iJq5JDoXI1ldz3Y+ad + U/bZUg1DLRvAniTuXmw9iOTwTwPxlDIGq5k+wG2Xmi1lk7zH8ezr9BMCgYEA0gfk + EhgcmPH8Z5cU3YYwOdt6HSJOM0OyN4k/5gnkv+HYVoJTj02gkrJmLr+mi1ugKj46 + 7huYO9TVnrKP21tmbaSv1dp5hS3letVRIxSloEtVGXmmdvJvBRzDWos+G+KcvADi + fFCz6w8v9NmO40CB7y/3SxTmSiSxDQeoi9LhDBkCgYEAsPgMWm25sfOnkY2NNUIv + wT8bAlHlHQT2d8zx5H9NttBpR3P0ShJhuF8N0sNthSQ7ULrIN5YGHYcUH+DyLAWU + TuomP3/kfa+xL7vUYb269tdJEYs4AkoppxBySoz8qenqpz422D0G8M6TpIS5Y5Qi + GMrQ6uLl21YnlpiCaFOfSQMCgYEAmZxj1kgEQmhZrnn1LL/D7czz1vMMNrpAUhXz + wg9iWmSXkU3oR1sDIceQrIhHCo2M6thwyU0tXjUft93pEQocM/zLDaGoVxtmRxxV + J08mg8IVD3jFoyFUyWxsBIDqgAKRl38eJsXvkO+ep3mm49Z+Ma3nM+apN3j2dQ0w + 3HLzXaECgYBFLMEAboVFwi5+MZjGvqtpg2PVTisfuJy2eYnPwHs+AXUgi/xRNFjI + YHEa7UBPb5TEPSzWImQpETi2P5ywcUYL1EbN/nqPWmjFnat8wVmJtV4sUpJhubF4 + Vqm9LxIWc1uQ1q1HDCejRIxIN3aSH+wgRS3Kcj8kCTIoXd1aERb04g== + -----END RSA PRIVATE KEY----- + ''; }; extraConfig = { gitlab = { From d9091f8181b74bdc0f491cd16f1e9f23b04d4a9d Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 3 Oct 2017 23:10:10 -0400 Subject: [PATCH 0660/2806] xorriso: fix build on Darwin --- pkgs/tools/cd-dvd/xorriso/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index b91a59006e9..8f2577c4344 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }: +{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }: stdenv.mkDerivation rec { name = "xorriso-1.4.8"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ libcdio zlib bzip2 readline attr ] - ++ stdenv.lib.optional stdenv.isLinux acl; + buildInputs = [ libcdio zlib bzip2 readline libiconv ] + ++ stdenv.lib.optionals stdenv.isLinux [ acl attr ]; meta = with stdenv.lib; { description = "ISO 9660 Rock Ridge file system manipulator"; From a98b96824db90446895c7cbf2c4931ef9ad9cb68 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 4 Oct 2017 08:15:10 +0200 Subject: [PATCH 0661/2806] curl: 7.55.1 -> 7.56.0 for CVE-2017-1000254 https://curl.haxx.se/docs/adv_20171004.html --- 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 4ec79af6651..0627d6042c0 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.55.1"; + name = "curl-7.56.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1yvcn7jbh99gsqhc040nky0h15a1cfh8yic6k0a1zhdhscpakcg5"; + sha256 = "1pvr2bqfhk46bzq2x2hskmnq3wc8qxlps7apm9q1qiixb9ra8q6y"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From d514aa5c6a23f0709ba82a0b047bb66d0cfcf578 Mon Sep 17 00:00:00 2001 From: David Kuo Date: Sun, 1 Oct 2017 02:30:01 +0800 Subject: [PATCH 0662/2806] Add david50407 into maintainers.nix --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 437fb074402..c7dbd3fb0de 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -136,6 +136,7 @@ dancek = "Hannu Hartikainen "; danielfullmer = "Daniel Fullmer "; dasuxullebt = "Christoph-Simon Senjak "; + david50407 = "David Kuo "; davidak = "David Kleuker "; davidrusu = "David Rusu "; davorb = "Davor Babic "; From bc2ac2ae5e90d2ff208bc9275090b6463af99384 Mon Sep 17 00:00:00 2001 From: David Kuo Date: Sun, 1 Oct 2017 02:44:39 +0800 Subject: [PATCH 0663/2806] crystal: 0.23.0 -> 0.23.1 Due to https://github.com/crystal-lang/crystal/issues/4719, when building Crystal with LLVM 4 with debug infos from prebuilt binary (w/ LLVM 3.8) will always be failed. The temporary solution is to build a LLVM 4 version without debug info, then use it to build Crystal with debug info on LLVM 4. This will cause building phrase going longer then normal. We can remove this hack after Crystal fix the issue. --- .../development/compilers/crystal/default.nix | 53 ++++++++++++------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index ae94a76ab23..6b91fafd08d 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_4, makeWrapper }: stdenv.mkDerivation rec { - version = "0.23.0"; - name = "crystal-${version}-1"; + version = "0.23.1"; + patch = "3"; + name = "crystal-${version}-${patch}"; arch = { "x86_64-linux" = "linux-x86_64"; @@ -11,18 +12,18 @@ stdenv.mkDerivation rec { }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); prebuiltBinary = fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz"; + url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${patch}-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0nhs7swbll8hrk15kmmywngkhij80x62axiskb1gjmiwvzhlh0qx"; - "i686-linux" = "03xp8d3lqflzzm26lpdn4yavj87qzgd6xyrqxp2pn9ybwrq8fx8a"; - "x86_64-darwin" = "1prz6c1gs8z7dgpdy2id2mjn1c8f5p2bf9b39985bav448njbyjz"; + "x86_64-linux" = "6a84cc866838ffa5250e28c3ce1a918a93f89c06393fe8cfd4068fcbbc66f3ab"; + "i686-linux" = "268a39b8d37385ff60d113d4d9fc966472160faa1e3bbf7ae58860ab6678aceb"; + "x86_64-darwin" = "d3f964ebfc5cd48fad73ab2484ea2a00268812276293dd0f7e9c7d184c8aad8a"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); }; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "05ymwmjkl1b4m888p725kybpiap5ag2vj8l07d59j02inm5r0rcv"; + sha256 = "8cf1b9a4eab29fca2f779ea186ae18f7ce444ce189c621925fa1a0c61dd5ff55"; }; # crystal on Darwin needs libiconv to build @@ -46,27 +47,43 @@ stdenv.mkDerivation rec { sourceRoot = "."; fixPrebuiltBinary = if stdenv.isDarwin then '' - wrapProgram $(pwd)/crystal-${version}-1/embedded/bin/crystal \ + wrapProgram $(pwd)/crystal-${version}-${patch}/embedded/bin/crystal \ --suffix DYLD_LIBRARY_PATH : $libPath '' else '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - crystal-${version}-1/embedded/bin/crystal + crystal-${version}-${patch}/embedded/bin/crystal patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \ - crystal-${version}-1/embedded/bin/crystal + crystal-${version}-${patch}/embedded/bin/crystal ''; + newline = "\n"; + buildPhase = '' # patch the script which launches the prebuilt compiler - substituteInPlace $(pwd)/crystal-${version}-1/bin/crystal --replace \ - "/usr/bin/env bash" "${stdenv.shell}" - substituteInPlace $(pwd)/crystal-${version}/bin/crystal --replace \ - "/usr/bin/env bash" "${stdenv.shell}" - + patchShebangs $(pwd)/crystal-${version}-${patch}/bin/crystal + patchShebangs $(pwd)/crystal-${version}/bin/crystal + # Due to https://github.com/crystal-lang/crystal/issues/4719, + # when building Crystal with LLVM 4 with debug infos from prebuilt binary (w/ LLVM 3.8) will always be failed. + # So we are going to build a LLVM 4 version without debug info, + # and use it to build Crystal with debug info on LLVM 4. + substituteInPlace $(pwd)/crystal-${version}/Makefile --replace \ + "release ?=" "no_debug ?= ##${newline}force_rebuild ?= ##${newline}release ?=" + substituteInPlace $(pwd)/crystal-${version}/Makefile --replace \ + "FLAGS := " "FLAGS := \$(if \$(no_debug),--no-debug )" + substituteInPlace $(pwd)/crystal-${version}/Makefile --replace \ + "$(O)/crystal:" "\$(O)/crystal: \$(if \$(force_rebuild),../rebuild.tmp)" ${fixPrebuiltBinary} cd crystal-${version} - make release=1 PATH="../crystal-${version}-1/bin:$PATH" + # Build without debug infos on LLVM 4 + make release=1 no_debug=1 PATH="../crystal-${version}-${patch}/bin:$PATH" + + # Rebuild Crystal with debug infos from the binary we just built + touch $(pwd)/../rebuild.tmp + wrapProgram .build/crystal \ + --suffix LIBRARY_PATH : $libPath + make release=1 force_rebuild=1 make doc ''; @@ -75,7 +92,6 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/crystal \ --suffix CRYSTAL_PATH : $out/lib/crystal \ --suffix LIBRARY_PATH : $libPath - install -dm755 $out/lib/crystal cp -r src/* $out/lib/crystal/ @@ -97,8 +113,7 @@ stdenv.mkDerivation rec { description = "A compiled language with Ruby like syntax and type inference"; homepage = https://crystal-lang.org/; license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ sifmelcara ]; + maintainers = with stdenv.lib.maintainers; [ sifmelcara david50407 ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } - From 766ede06da2ceaee22e955ffcc1ef138ae0d4484 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 3 Oct 2017 18:29:47 +0000 Subject: [PATCH 0664/2806] crystal: fix build by using the previous bootstrap --- .../development/compilers/crystal/default.nix | 98 +++++++------------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 40 insertions(+), 62 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 6b91fafd08d..6b817d06553 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,92 +1,66 @@ -{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_4, makeWrapper }: +{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, makeWrapper }: stdenv.mkDerivation rec { + name = "crystal-${version}"; version = "0.23.1"; - patch = "3"; - name = "crystal-${version}-${patch}"; - arch = - { - "x86_64-linux" = "linux-x86_64"; - "i686-linux" = "linux-i686"; - "x86_64-darwin" = "darwin-x86_64"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - - prebuiltBinary = fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${patch}-${arch}.tar.gz"; - sha256 = - { - "x86_64-linux" = "6a84cc866838ffa5250e28c3ce1a918a93f89c06393fe8cfd4068fcbbc66f3ab"; - "i686-linux" = "268a39b8d37385ff60d113d4d9fc966472160faa1e3bbf7ae58860ab6678aceb"; - "x86_64-darwin" = "d3f964ebfc5cd48fad73ab2484ea2a00268812276293dd0f7e9c7d184c8aad8a"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - }; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; sha256 = "8cf1b9a4eab29fca2f779ea186ae18f7ce444ce189c621925fa1a0c61dd5ff55"; }; + prebuiltName = "crystal-0.23.0-1"; + prebuiltSrc = let arch = { + "x86_64-linux" = "linux-x86_64"; + "i686-linux" = "linux-i686"; + "x86_64-darwin" = "darwin-x86_64"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + in fetchurl { + url = "https://github.com/crystal-lang/crystal/releases/download/0.23.0/${prebuiltName}-${arch}.tar.gz"; + sha256 = { + "x86_64-linux" = "0nhs7swbll8hrk15kmmywngkhij80x62axiskb1gjmiwvzhlh0qx"; + "i686-linux" = "03xp8d3lqflzzm26lpdn4yavj87qzgd6xyrqxp2pn9ybwrq8fx8a"; + "x86_64-darwin" = "1prz6c1gs8z7dgpdy2id2mjn1c8f5p2bf9b39985bav448njbyjz"; + }."${stdenv.system}"; + }; + + srcs = [ src prebuiltSrc ]; + # crystal on Darwin needs libiconv to build - buildInputs = [ - boehmgc libatomic_ops pcre libevent llvm_4 makeWrapper + libs = [ + boehmgc libatomic_ops pcre libevent ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; - libPath = stdenv.lib.makeLibraryPath ([ - boehmgc libatomic_ops pcre libevent - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - libiconv - ]); + nativeBuildInputs = [ makeWrapper ]; - unpackPhase = '' - tar zxf ${src} - tar zxf ${prebuiltBinary} - ''; + buildInputs = libs ++ [ llvm ]; - sourceRoot = "."; + libPath = stdenv.lib.makeLibraryPath libs; + + sourceRoot = "${name}"; fixPrebuiltBinary = if stdenv.isDarwin then '' - wrapProgram $(pwd)/crystal-${version}-${patch}/embedded/bin/crystal \ + wrapProgram ../${prebuiltName}/embedded/bin/crystal \ --suffix DYLD_LIBRARY_PATH : $libPath '' else '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - crystal-${version}-${patch}/embedded/bin/crystal + ../${prebuiltName}/embedded/bin/crystal patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \ - crystal-${version}-${patch}/embedded/bin/crystal + ../${prebuiltName}/embedded/bin/crystal ''; - newline = "\n"; - - buildPhase = '' - # patch the script which launches the prebuilt compiler - patchShebangs $(pwd)/crystal-${version}-${patch}/bin/crystal - patchShebangs $(pwd)/crystal-${version}/bin/crystal - # Due to https://github.com/crystal-lang/crystal/issues/4719, - # when building Crystal with LLVM 4 with debug infos from prebuilt binary (w/ LLVM 3.8) will always be failed. - # So we are going to build a LLVM 4 version without debug info, - # and use it to build Crystal with debug info on LLVM 4. - substituteInPlace $(pwd)/crystal-${version}/Makefile --replace \ - "release ?=" "no_debug ?= ##${newline}force_rebuild ?= ##${newline}release ?=" - substituteInPlace $(pwd)/crystal-${version}/Makefile --replace \ - "FLAGS := " "FLAGS := \$(if \$(no_debug),--no-debug )" - substituteInPlace $(pwd)/crystal-${version}/Makefile --replace \ - "$(O)/crystal:" "\$(O)/crystal: \$(if \$(force_rebuild),../rebuild.tmp)" + preBuild = '' + patchShebangs bin/crystal + patchShebangs ../${prebuiltName}/bin/crystal ${fixPrebuiltBinary} - - cd crystal-${version} - # Build without debug infos on LLVM 4 - make release=1 no_debug=1 PATH="../crystal-${version}-${patch}/bin:$PATH" - - # Rebuild Crystal with debug infos from the binary we just built - touch $(pwd)/../rebuild.tmp - wrapProgram .build/crystal \ - --suffix LIBRARY_PATH : $libPath - make release=1 force_rebuild=1 - make doc + export PATH="$(pwd)/../${prebuiltName}/bin:$PATH" ''; + makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" "release=1" "all" "doc" ]; + installPhase = '' install -Dm755 .build/crystal $out/bin/crystal wrapProgram $out/bin/crystal \ @@ -109,6 +83,8 @@ stdenv.mkDerivation rec { dontStrip = true; + enableParallelBuilding = true; + meta = { description = "A compiled language with Ruby like syntax and type inference"; homepage = https://crystal-lang.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8affbe3996a..b68458fb847 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5410,7 +5410,9 @@ with pkgs; ''; }); - crystal = callPackage ../development/compilers/crystal { }; + crystal = callPackage ../development/compilers/crystal { + llvm = llvm_4; + }; devpi-client = callPackage ../development/tools/devpi-client {}; From 5b23d464a510d51d5e0bcbdfc0a3dc7e86ff8145 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 4 Oct 2017 07:10:29 +0000 Subject: [PATCH 0665/2806] ocamlPackages.ocaml-migrate-parsetree: 1.0.4 -> 1.0.5 --- .../ocaml-modules/ocaml-migrate-parsetree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index 3610cded1c9..108a2c30f2d 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "let-def"; repo = "ocaml-migrate-parsetree"; rev = "v${version}"; - sha256 = "0xwjll827anqngnqy746m2pd44mkhsaaqaqbir6z91xcqix2isvy"; + sha256 = "1wj66nb16zijacpfrcm7yi0hlg315v71nxri3ia7r0sa3mlzxl34"; }; buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; From 12f9b43c163fb6ff7372ae29e81c2893bf6e63cb Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 4 Oct 2017 11:21:41 +0200 Subject: [PATCH 0666/2806] unicode: change UnicodeData.txt to stable version latest final release of Unicode is 10.0.0. 11.0.0 is not yet released. --- pkgs/tools/misc/unicode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index 2b1f5da6e2f..d2a4ed39e9a 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -12,8 +12,8 @@ python3Packages.buildPythonApplication rec { }; ucdtxt = fetchurl { - url = http://www.unicode.org/Public/11.0.0/ucd/UnicodeData-11.0.0d1.txt; - sha256 = "0y9l0sap7yq7c7c8d0fivzycqaw0zncbxzh1inggg42308z974rn"; + url = http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt; + sha256 = "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj"; }; postFixup = '' From 11b4512033b011af20fef558f001b9566ebf3aef Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Wed, 27 Sep 2017 01:38:06 +1000 Subject: [PATCH 0667/2806] bonfire: init at 0.0.7 --- pkgs/tools/misc/bonfire/default.nix | 44 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/misc/bonfire/default.nix diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix new file mode 100644 index 00000000000..7937a212951 --- /dev/null +++ b/pkgs/tools/misc/bonfire/default.nix @@ -0,0 +1,44 @@ +{ stdenv, python3Packages, fetchFromGitHub }: + +with python3Packages; + +buildPythonApplication rec { + version = "2017-01-19"; + pname = "bonfire"; + name = "${pname}-unstable-${version}"; + + # use latest git version with --endpoint flag + # https://github.com/blue-yonder/bonfire/pull/18 + src = fetchFromGitHub { + owner = "blue-yonder"; + repo = "${pname}"; + rev = "d0af9ca10394f366cfa3c60f0741f1f0918011c2"; + sha256 = "193zcvzbhxwwkwbgmnlihhhazwkajycxf4r71jz1m12w301sjhq5"; + }; + + 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 "keyring>=9,<10" "keyring>=9,<11" + # pip fails when encountering the git hash for the package version + substituteInPlace setup.py \ + --replace "version=version," "version='${version}'," + # remove extraneous files + substituteInPlace setup.cfg \ + --replace "data_files = *.rst, *.txt" "" + ''; + + buildInputs = [ httpretty pytest pytestcov ]; + + propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/bonfire; + description = "CLI Graylog Client with Follow Mode"; + license = licenses.bsd3; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72ddcb185e0..cd0bcdbfacd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -557,6 +557,8 @@ with pkgs; bonnie = callPackage ../tools/filesystems/bonnie { }; + bonfire = callPackage ../tools/misc/bonfire { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; djmount = callPackage ../tools/filesystems/djmount { }; From 2e5297217de007beb8444092e03cca97bf06e4ef Mon Sep 17 00:00:00 2001 From: Hamish Hutchings Date: Wed, 27 Sep 2017 17:30:49 +0100 Subject: [PATCH 0668/2806] nixos/traefik create service --- nixos/modules/module-list.nix | 1 + .../modules/services/web-servers/traefik.nix | 113 ++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 nixos/modules/services/web-servers/traefik.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e849e634fc9..56d239316aa 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -621,6 +621,7 @@ ./services/web-servers/phpfpm/default.nix ./services/web-servers/shellinabox.nix ./services/web-servers/tomcat.nix + ./services/web-servers/traefik.nix ./services/web-servers/uwsgi.nix ./services/web-servers/varnish/default.nix ./services/web-servers/winstone.nix diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix new file mode 100644 index 00000000000..560f0b2a6f1 --- /dev/null +++ b/nixos/modules/services/web-servers/traefik.nix @@ -0,0 +1,113 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.traefik; +configFile = + if (cfg.configFile == null) then + (pkgs.runCommand "config.toml" { + buildInputs = [ pkgs.remarshal ]; + } '' + remarshal -if json -of toml \ + < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ + > $out + '') + else + cfg.configFile; + +in { + options.services.traefik = { + enable = mkEnableOption "Traefik web server"; + + configFile = mkOption { + default = null; + example = /path/to/config.toml; + type = types.nullOr types.path; + description = "Verbatim traefik.toml to use"; + }; + configOptions = mkOption { + description = '' + Config for Traefik. + ''; + type = types.attrs; + example = { + defaultEntrypoints = [ "http" ]; + web = { + address = ":8080"; + }; + entryPoints = { + http = { + address = ":80"; + }; + }; + file = {}; + frontends = { + frontend1 = { + backend = "backend1"; + routes.test_1 = { + rule = "Host:localhost"; + }; + }; + }; + backends = { + backend1 = { + servers.server1 = { + url = "http://localhost:8000"; + }; + }; + }; + }; + }; + + dataDir = mkOption { + default = "/var/lib/traefik"; + type = types.path; + description = '' + Location for any persistent data traefik creates, ie. acme + ''; + }; + + package = mkOption { + default = pkgs.traefik; + defaultText = "pkgs.traefik"; + type = types.package; + description = "Traefik package to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.traefik = { + description = "Traefik web server"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = ''${cfg.package.bin}/bin/traefik --configfile=${configFile}''; + Type = "simple"; + User = "traefik"; + Group = "traefik"; + Restart = "on-failure"; + StartLimitInterval = 86400; + StartLimitBurst = 5; + AmbientCapabilities = "cap_net_bind_service"; + CapabilityBoundingSet = "cap_net_bind_service"; + NoNewPrivileges = true; + LimitNPROC = 64; + LimitNOFILE = 1048576; + PrivateTmp = true; + PrivateDevices = true; + ProtectHome = true; + ProtectSystem = "full"; + ReadWriteDirectories = cfg.dataDir; + }; + }; + + users.extraUsers.traefik = { + group = "traefik"; + home = cfg.dataDir; + createHome = true; + }; + + users.extraGroups.traefik = {}; + }; +} From 3468c9e5cce9c5fb27b96937b610dc3e02667d6f Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 4 Oct 2017 11:47:34 +0100 Subject: [PATCH 0669/2806] nixos/traefik: create /var/lib/traefik with correct permissions --- .../modules/services/web-servers/traefik.nix | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 560f0b2a6f1..53f5a3c3c2b 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -4,17 +4,16 @@ with lib; let cfg = config.services.traefik; -configFile = - if (cfg.configFile == null) then - (pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; - } '' - remarshal -if json -of toml \ - < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ - > $out - '') - else - cfg.configFile; + configFile = + if cfg.configFile == null then + pkgs.runCommand "config.toml" { + buildInputs = [ pkgs.remarshal ]; + } '' + remarshal -if json -of toml \ + < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ + > $out + '' + else cfg.configFile; in { options.services.traefik = { @@ -24,38 +23,35 @@ in { default = null; example = /path/to/config.toml; type = types.nullOr types.path; - description = "Verbatim traefik.toml to use"; + description = '' + Path to verbatim traefik.toml to use. + (Using that option has precedence over configOptions) + ''; }; + configOptions = mkOption { description = '' Config for Traefik. ''; type = types.attrs; + default = { + defaultEntryPoints = ["http"]; + entryPoints.http.address = ":80"; + }; example = { defaultEntrypoints = [ "http" ]; - web = { - address = ":8080"; - }; - entryPoints = { - http = { - address = ":80"; - }; - }; + web.address = ":8080"; + entryPoints.http.address = ":80"; + file = {}; frontends = { frontend1 = { backend = "backend1"; - routes.test_1 = { - rule = "Host:localhost"; - }; + routes.test_1.rule = "Host:localhost"; }; }; - backends = { - backend1 = { - servers.server1 = { - url = "http://localhost:8000"; - }; - }; + backends.backend1 = { + servers.server1.url = "http://localhost:8000"; }; }; }; @@ -82,7 +78,12 @@ in { after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { + PermissionsStartOnly = true; ExecStart = ''${cfg.package.bin}/bin/traefik --configfile=${configFile}''; + ExecStartPre = [ + ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}"'' + ''${pkgs.coreutils}/bin/install -d -m700 --owner traefik --group traefik "${cfg.dataDir}"'' + ]; Type = "simple"; User = "traefik"; Group = "traefik"; From a8972678bf4d26f1b046335a127cb4311e0f50ae Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 02:21:00 +0200 Subject: [PATCH 0670/2806] vala: add 0.38.0 --- pkgs/development/compilers/vala/default.nix | 18 +++++++++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 42b81a21a67..baf48d7a532 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz +, glib, libiconv, libintlOrEmpty, libtool, expat }: let - generic = { major, minor, sha256 }: + generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }: stdenv.mkDerivation rec { name = "vala-${major}.${minor}"; @@ -12,9 +12,9 @@ let inherit sha256; }; - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; + nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs; - buildInputs = [ glib libiconv ] ++ libintlOrEmpty; + buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs; meta = with stdenv.lib; { description = "Compiler for GObject type system"; @@ -57,5 +57,13 @@ in rec { sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m"; }; + vala_0_38 = generic { + major = "0.38"; + minor = "1"; + sha256 = "112hl3lkcyakrk8c3qgw12gzn3nxjkvx7bn0jhl5f2m57d7k8d8h"; + extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ]; + extraBuildInputs = [ graphviz ]; + }; + vala = vala_0_34; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da57a8eda06..6e54e3f9ee7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6264,6 +6264,7 @@ with pkgs; vala_0_28 vala_0_32 vala_0_34 + vala_0_38 vala; valadoc = callPackage ../development/tools/valadoc { }; From fd8bc05c1dc26d92ba2d422ba336ea873b9df611 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 4 Oct 2017 10:54:47 +0000 Subject: [PATCH 0671/2806] amrwb: 7.1.0.3 -> 11.0.0.0 --- pkgs/development/libraries/amrwb/default.nix | 26 +++++++------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index e1c729050d4..15331c22599 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -1,33 +1,25 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - # The 'src' 7.0.0.3 expects amrwb 700, but there is only 710 available now, - # so I guess in 3gpp they updated to 7.1.0, but amrwb did not update the libraries. - # I guess amrwb uses the first version numbers to match those of 3gpp, - # so I set the name to 7.1.0.3 in this case - name = "amrwb-7.1.0.3"; +stdenv.mkDerivation rec { + name = "amrwb-${version}"; + version = "11.0.0.0"; srcAmr = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-7/26_series/26204-710.zip; - sha256 = "1wnx72m20y8bdlyndyy8rskr0hi4llk1h1hcr34awxfmi9l4922i"; + url = http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip; + sha256 = "1v4zhs6f1mf1xkrzhljh05890in0rpr5d5pcak9h4igxhd2c91f8"; }; src = fetchurl { - url = http://www.penguin.cz/~utx/ftp/amr/amrwb-7.0.0.3.tar.bz2; - sha256 = "0nn94i3gw3d5fgks43wdhshdlhpd4rcrzj46f2vsby0viwkxxp8z"; + url = "http://www.penguin.cz/~utx/ftp/amr/amrwb-${version}.tar.bz2"; + sha256 = "1p6m9nd08mv525w14py9qzs9zwsa5i3vxf5bgcmcvc408jqmkbsw"; }; buildInputs = [ unzip ]; - patchPhase = '' - sed -i s/26204-700/26204-710/g Makefile.am Makefile.in configure configure.ac \ - prepare_sources.sh.in - ''; - configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; postConfigure = '' - cp $srcAmr 26204-710.zip + cp $srcAmr 26204-b00.zip ''; meta = { From a3200348b7e68dbad12bf7056cce75917d3a4184 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 4 Oct 2017 11:57:49 +0100 Subject: [PATCH 0672/2806] nixos/traefik: owner/group should be changed recursivly --- nixos/modules/services/web-servers/traefik.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 53f5a3c3c2b..7ce0603786d 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -82,7 +82,8 @@ in { ExecStart = ''${cfg.package.bin}/bin/traefik --configfile=${configFile}''; ExecStartPre = [ ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}"'' - ''${pkgs.coreutils}/bin/install -d -m700 --owner traefik --group traefik "${cfg.dataDir}"'' + ''${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"'' + ''${pkgs.coreutils}/bin/chown -R traefik:traefik "${cfg.dataDir}"'' ]; Type = "simple"; User = "traefik"; From 2b70f5e251e39a4dfb7150362dcb12f08e0ee6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Oct 2017 11:59:07 +0100 Subject: [PATCH 0673/2806] jq: sanity check with --help --- pkgs/development/tools/jq/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index a84b5f42640..491d65d8882 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { # jq is linked to libjq: configureFlags = stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + installCheckPhase = "$out/bin/jq --help"; + doInstallCheck = true; + meta = with stdenv.lib; { description = ''A lightweight and flexible command-line JSON processor''; license = licenses.mit; From 3539e16cfaefc7c8c71ae0d97d53d91484a4414f Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 4 Oct 2017 13:01:01 +0200 Subject: [PATCH 0674/2806] nixos/tests: clean up pgjwt test - removed unneeded initscript - use default postgres version for the test --- nixos/tests/pgjwt.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix index 5af2f38035e..d186c42a2a9 100644 --- a/nixos/tests/pgjwt.nix +++ b/nixos/tests/pgjwt.nix @@ -17,13 +17,8 @@ with pkgs; { master = { pkgs, config, ... }: { services.postgresql = { - enable = true; - package = postgresql96; - extraPlugins = [ pgjwt pgtap ]; - initialScript = writeText "postgresql-init.sql" - '' - CREATE ROLE postgres WITH superuser login createdb; - ''; + enable = true; + extraPlugins = [ pgjwt pgtap ]; }; }; }; From 5f90e527a415436da01390300065bb140cce9ddc Mon Sep 17 00:00:00 2001 From: Teal Gaure <~@Teal.Gr> Date: Wed, 4 Oct 2017 13:02:36 +0200 Subject: [PATCH 0675/2806] dovecot: 2.2.27 -> 2.2.32, dovecot_pigeonhole: 0.4.10 -> 0.4.20 --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 91b9ed972d8..33da203c502 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.2.27"; + name = "dovecot-2.2.32"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9"; + sha256 = "0bmwyvi1crmrca2knvknsf517x53w7gxrclwyrvrhddgw98j22qn"; }; preConfigure = '' diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 385cf7d35ba..3df0b41c2ca 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.10"; + version = "0.4.20"; src = fetchurl { url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; - sha256 = "0vvjj1yjr189rn8f41z5rj8gfvk24a8j33q6spb6bd6k1wbfgpz9"; + sha256 = "0nxy007wmyamwj01yfiqbqjnbsd98z783b811rcavwi5iw5pvqbg"; }; buildInputs = [ dovecot openssl ]; From 6e889743b4be25b642267e184770df40840e796b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 4 Oct 2017 13:20:16 +0200 Subject: [PATCH 0676/2806] gns3Packages.{server,gui}Preview: 2.1.0rc1 -> 2.1.0rc2 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index bec700367da..5aa1649ff5f 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.0.3"; - previewVersion = "2.1.0rc1"; + previewVersion = "2.1.0rc2"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -16,7 +16,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "0rmvanzc0fjw9giqwnf98yc49cxaz637w8b865dv08lcf1fg9j8l"; + sha256Hash = "1frfhys5s5lnqzk216y3wj2pli5g3b5imfzcmddxdcibksx13i17"; }; serverStable = mkServer { @@ -25,6 +25,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "181689fpjxq4hy2lyxk4zciqhgnhj5srvb4xsxdlbf68n89fj2zf"; + sha256Hash = "0vm4hir8yqj7xhykgg3x5rv1nj1qq6sg19sjj7r5w60brrlsw7v9"; }; } From 5ae175744af57dc5a002fc8902a7fcd0d488f860 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 29 Sep 2017 08:52:16 +0900 Subject: [PATCH 0677/2806] nspr: 4.15 -> 4.16 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index c2aea07d102..8f7bebf649c 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl , CoreServices ? null }: -let version = "4.15"; in +let version = "4.16"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "101dksqm1z0hzd7ap82ccbxjr48s6q3xhshdl81qkj6hqdmy1p97"; + sha256 = "1l9wlnb9y0bzicv448jjl9kssqn044dc2qrkwzp4ll35fvch4ccv"; }; outputs = [ "out" "dev" ]; From 6e2744ab0ff384ed43bcab5bfa564bc4289b4b55 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 29 Sep 2017 08:52:45 +0900 Subject: [PATCH 0678/2806] nss: 3.31 -> 3.32.1 --- pkgs/development/libraries/nss/default.nix | 58 +++++++++++----------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 80975c8ef5d..c88cfb8826e 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.31"; + version = "3.32.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_31_RTM/src/${name}.tar.gz"; - sha256 = "0pd643a8ns7q5az5ai3ascrw666i2kbfiyy1c9hlhw9jd8jn21g9"; + url = "mirror://mozilla/security/nss/releases/NSS_3_32_1_RTM/src/${name}.tar.gz"; + sha256 = "0lj6c94102aa81bnjisnix09zfjly9aa1d6vrzxmcjmzynkrrrad"; }; buildInputs = [ perl zlib sqlite ]; @@ -25,37 +25,13 @@ in stdenv.mkDerivation rec { ''; patches = - [ # Install a nss.pc (pkgconfig) file and nss-config script - # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672 - (fetchurl { - name = "nss-3.28-gentoo-fixups.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/" - + "dev-libs/nss/files/nss-3.28-gentoo-fixups.patch" - + "?id=05c31f8cca591b3ce8219e4def7c26c7b1b130d6"; - sha256 = "0z58axd1n7vq4kdp5mrb3dsg6di39a1g40s3shl6n2dzs14c1y2q"; - }) + [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch ]; patchFlags = "-p0"; - postPatch = '' - # Fix up the patch from Gentoo. - sed -i \ - -e "/^PREFIX =/s|= /usr|= $out|" \ - -e '/@libdir@/s|gentoo/nss|lib|' \ - -e '/ln -sf/d' \ - nss/config/Makefile - - # Note for spacing/tab nazis: The TAB characters are intentional! - cat >> nss/config/Makefile < $out/lib/pkgconfig/nss.pc + chmod 0644 $out/lib/pkgconfig/nss.pc + + sed -e "s,@prefix@,$PREFIX," \ + -e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \ + -e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \ + -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \ + pkg/pkg-config/nss-config.in > $out/bin/nss-config + chmod 0755 $out/bin/nss-config ''; postFixup = '' From a9d2c56df2e99c7d0a848a055b7c608b0ac762ab Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 29 Sep 2017 08:53:04 +0900 Subject: [PATCH 0679/2806] icu4c: 58.2 -> 59.1 --- pkgs/development/libraries/icu/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 173c9bb58ad..5f81ae694cb 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -2,15 +2,7 @@ let pname = "icu4c"; - version = "58.2"; - - # this patch should no longer be needed in 58.3 - # https://bugs.gentoo.org/show_bug.cgi?id=599142#c14 - keywordFix = fetchurl { - url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; - name = "icu-changeset-39484.diff"; - sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; - }; + version = "59.1"; in stdenv.mkDerivation { name = pname + "-" + version; @@ -18,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; + sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki"; }; outputs = [ "out" "dev" ]; @@ -33,10 +25,6 @@ stdenv.mkDerivation { echo Source root reset to ''${sourceRoot} ''; - patchFlags = "-p4"; - - patches = [ keywordFix ]; - preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure '' + stdenv.lib.optionalString stdenv.isArm '' From cd0655c181f066c48811bc09526d6ca9a1ff5919 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 4 Oct 2017 14:15:14 +0200 Subject: [PATCH 0680/2806] android-studio-preview: 3.0.0.14 -> 3.0.0.15 --- pkgs/applications/editors/android-studio/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 6d7ed2e489b..8ee5f0319aa 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio rec { pname = "android-studio-preview"; - version = "3.0.0.14"; # "Android Studio 3.0 Beta 6" - build = "171.4333198"; - sha256Hash = "071a3j0bnsspvhvhh10h9ygay3bi66glriiy8gl8vrwx1dnv55zk"; + version = "3.0.0.15"; # "Android Studio 3.0 Beta 7" + build = "171.4365657"; + sha256Hash = "0am3rq0ag982ik95mpcxvx2zlv0h4l6747b29mlsbqih66868db6"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; From ed0146b237ddc9a69acf941d4dd9e07bf962b7fb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 Oct 2017 00:22:25 +0200 Subject: [PATCH 0681/2806] gcolor3: init at 2.2 --- .../applications/graphics/gcolor3/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/graphics/gcolor3/default.nix diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix new file mode 100644 index 00000000000..afad1e6c3af --- /dev/null +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } : + +let + version = "2.2"; +in stdenv.mkDerivation { + name = "gcolor3-${version}"; + + src = fetchFromGitHub { + owner = "hjdskes"; + repo = "gcolor3"; + rev = "v${version}"; + sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr"; + }; + + nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ]; + + buildInputs = [ gtk3 ]; + + configureScript = "./autogen.sh"; + + # clang-4.0: error: argument unused during compilation: '-pthread' + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=unused-command-line-argument"; + + meta = { + description = "A simple color chooser written in GTK3"; + homepage = https://hjdskes.github.io/projects/gcolor3/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ jtojnar ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da57a8eda06..85d299de8fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14615,6 +14615,8 @@ with pkgs; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; + gcolor3 = callPackage ../applications/graphics/gcolor3 { }; + get_iplayer = callPackage ../applications/misc/get_iplayer {}; getxbook = callPackage ../applications/misc/getxbook {}; From fa35c520d936209294953bbe751b608a689d7fa9 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Wed, 4 Oct 2017 23:23:44 +1100 Subject: [PATCH 0682/2806] xzgv: 0.9.1 -> 0.9.2 --- pkgs/applications/graphics/xzgv/default.nix | 15 +++++------ .../graphics/xzgv/fix-linker-paths.patch | 25 ------------------- 2 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/graphics/xzgv/fix-linker-paths.patch diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index 99931442945..a15ffee3d4a 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }: +{ stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }: stdenv.mkDerivation rec { name = "xzgv-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; - sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph"; + sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5"; }; - buildInputs = [ gtk2 pkgconfig texinfo ]; - patches = [ ./fix-linker-paths.patch ]; + nativeBuildInputs = [ pkgconfig texinfo ]; + buildInputs = [ gtk2 libexif ]; postPatch = '' substituteInPlace config.mk \ --replace /usr/local $out - substituteInPlace config.mk \ - --replace "CFLAGS=-O2 -Wall" "CFLAGS=-Wall" substituteInPlace Makefile \ --replace "all: src man" "all: src man info" ''; + preInstall = '' + mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps} + ''; meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/xzgv/; description = "Picture viewer for X with a thumbnail-based selector"; diff --git a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch deleted file mode 100644 index c5b1ae0879b..00000000000 --- a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -taken from http://sourceforge.net/p/xzgv/code/53/tree//trunk/xzgv/src/Makefile?diff=514dada434309d2ec11f5eff:52 ---- a/src/Makefile -+++ b/src/Makefile -@@ -9,8 +9,10 @@ - # This gets definitions for CC, CFLAGS, BINDIR etc. - include ../config.mk - --CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` --LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` -+CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \ -+ `pkg-config --cflags x11` -+LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` \ -+ `pkg-config --libs x11` -lm - - all: xzgv - -@@ -23,7 +25,7 @@ - backend.o - - xzgv: $(OBJS) -- $(CC) $(LDFLAGS) -o xzgv $(OBJS) -+ $(CC) -o xzgv $(OBJS) $(LDFLAGS) - - installdirs: - /bin/sh ../mkinstalldirs $(BINDIR) From 585a6171199356044a017f0f82be2e4ac844d1cf Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 4 Oct 2017 14:38:44 +0200 Subject: [PATCH 0683/2806] pythonPackages.devpi-common: 3.0.1 -> 3.2.0rc1 --- .../python-modules/devpi-common/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/devpi-common/default.nix diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix new file mode 100644 index 00000000000..ad5f8fef885 --- /dev/null +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -0,0 +1,26 @@ +{ pythonPackages }: + +with pythonPackages;buildPythonPackage rec { + pname = "devpi-common"; + version = "3.2.0rc1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ws35g1r0j2xccsna4r6fc9a08przfi28kf9hciq3rmd6ndbr9c9"; + }; + + propagatedBuildInputs = [ requests py ]; + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + homepage = https://github.com/devpi/devpi; + description = "Utilities jointly used by devpi-server and devpi-client"; + license = licenses.mit; + maintainers = with maintainers; [ lewo makefu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 327af2fb330..a10f4e9830a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2355,25 +2355,7 @@ in { }; }; - devpi-common = buildPythonPackage rec { - name = "devpi-common"; - version = "3.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/devpi-common/devpi-common-${version}.tar.gz"; - sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j"; - }; - - propagatedBuildInputs = [ self.requests self.py ]; - - meta = { - homepage = https://bitbucket.org/hpk42/devpi; - description = "Utilities jointly used by devpi-server and devpi-client"; - license = licenses.mit; - maintainers = with maintainers; [ lewo makefu ]; - }; - }; - + devpi-common = callPackage ../development/python-modules/devpi-common { }; # A patched version of buildout, useful for buildout based development on Nix zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; From 396836356f28f1a3072420dbaab7c831cf668f9f Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 4 Oct 2017 14:40:20 +0200 Subject: [PATCH 0684/2806] devpi-client: 2.7.0 -> 3.1.0rc1 --- .../tools/devpi-client/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index f724b65dd82..9da88f6c63d 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, pythonPackages, glibcLocales} : +{ stdenv, pythonPackages, glibcLocales} : pythonPackages.buildPythonApplication rec { - name = "devpi-client-${version}"; - version = "2.7.0"; + name = "${pname}-${version}"; + pname = "devpi-client"; + version = "3.1.0rc1"; - src = fetchurl { - url = "mirror://pypi/d/devpi-client/${name}.tar.gz"; - sha256 = "0z7vaf0a66n82mz0vx122pbynjvkhp2mjf9lskgyv09y3bxzzpj3"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0kfyva886k9zxmilqb2yviwqzyvs3n36if3s56y4clbvw9hr2lc3"; }; - - doCheck = false; + # requires devpi-server which is currently not packaged + doCheck = true; + checkInputs = with pythonPackages; [ pytest webtest mock ]; + checkPhase = "py.test"; LC_ALL = "en_US.UTF-8"; - buildInputs = with pythonPackages; [ glibcLocales tox check-manifest pkginfo ]; - - propagatedBuildInputs = with pythonPackages; [ py devpi-common ]; + buildInputs = with pythonPackages; [ glibcLocales pkginfo tox check-manifest ]; + propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy ]; meta = { homepage = http://doc.devpi.net; From 5e87504aa0a74832c50fa891cf38ca2597dc1b83 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 4 Oct 2017 21:46:54 +0800 Subject: [PATCH 0685/2806] go-ethereum: 1.7.0 -> 1.7.1 --- pkgs/applications/altcoins/go-ethereum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 45c990d88a5..279e767173a 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.7.0"; + version = "1.7.1"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "0ybjaiyrfb320rab6a5r9iiqvkrcd8b2qvixzx0kjmc4a7l1q5zh"; + sha256 = "1rhqnqp2d951d4084z7dc07q0my4wd5401968a0nqj030a9vgng2"; }; # Fix cyclic referencing on Darwin From c2c843adf7035db50b4edb1b9cada986ff0b3de8 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 4 Oct 2017 14:51:20 +0100 Subject: [PATCH 0686/2806] nixos/traefik: guard example path --- nixos/modules/services/web-servers/traefik.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 7ce0603786d..4ede4fc2096 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -21,7 +21,7 @@ in { configFile = mkOption { default = null; - example = /path/to/config.toml; + example = literalExample "/path/to/config.toml"; type = types.nullOr types.path; description = '' Path to verbatim traefik.toml to use. From fca7a9af0f795695093738c71ccd528e1a8c86ac Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Wed, 4 Oct 2017 22:02:23 +0800 Subject: [PATCH 0687/2806] fastlane: init at 2.60.1 --- lib/maintainers.nix | 1 + pkgs/tools/admin/fastlane/Gemfile | 2 + pkgs/tools/admin/fastlane/Gemfile.lock | 139 ++++++++ pkgs/tools/admin/fastlane/default.nix | 17 + pkgs/tools/admin/fastlane/gemset.nix | 469 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 630 insertions(+) create mode 100644 pkgs/tools/admin/fastlane/Gemfile create mode 100644 pkgs/tools/admin/fastlane/Gemfile.lock create mode 100644 pkgs/tools/admin/fastlane/default.nix create mode 100644 pkgs/tools/admin/fastlane/gemset.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index c7dbd3fb0de..ab729f83a42 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -458,6 +458,7 @@ periklis = "theopompos@gmail.com"; pesterhazy = "Paulus Esterhazy "; peterhoeg = "Peter Hoeg "; + peterromfeldhk = "Peter Romfeld "; peti = "Peter Simons "; philandstuff = "Philip Potter "; phile314 = "Philipp Hausmann "; diff --git a/pkgs/tools/admin/fastlane/Gemfile b/pkgs/tools/admin/fastlane/Gemfile new file mode 100644 index 00000000000..1fa8dbca63b --- /dev/null +++ b/pkgs/tools/admin/fastlane/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'fastlane' diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock new file mode 100644 index 00000000000..5f15a9d0455 --- /dev/null +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -0,0 +1,139 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.5) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + babosa (1.0.2) + claide (1.0.2) + colored (1.2) + colored2 (3.1.2) + commander-fastlane (4.4.5) + highline (~> 1.7.2) + declarative (0.0.10) + declarative-option (0.1.0) + domain_name (0.5.20170404) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.2.1) + excon (0.59.0) + faraday (0.13.1) + multipart-post (>= 1.2, < 3) + faraday-cookie_jar (0.0.6) + faraday (>= 0.7.4) + http-cookie (~> 1.0.0) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) + fastimage (2.1.0) + fastlane (2.60.1) + CFPropertyList (>= 2.3, < 3.0.0) + addressable (>= 2.3, < 3.0.0) + babosa (>= 1.0.2, < 2.0.0) + bundler (>= 1.12.0, < 2.0.0) + colored + commander-fastlane (>= 4.4.5, < 5.0.0) + dotenv (>= 2.1.1, < 3.0.0) + excon (>= 0.45.0, < 1.0.0) + faraday (~> 0.9) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 0.9) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.0.1, < 2.0.0) + google-api-client (>= 0.13.1, < 0.14.0) + highline (>= 1.7.2, < 2.0.0) + json (< 3.0.0) + mini_magick (~> 4.5.1) + multi_json + multi_xml (~> 0.5) + multipart-post (~> 2.0.0) + plist (>= 3.1.0, < 4.0.0) + public_suffix (~> 2.0.0) + rubyzip (>= 1.1.0, < 2.0.0) + security (= 0.1.3) + slack-notifier (>= 1.3, < 2.0.0) + terminal-notifier (>= 1.6.2, < 2.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (~> 0.5.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.5.0, < 2.0.0) + xcpretty (>= 0.2.4, < 1.0.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.0.3) + google-api-client (0.13.6) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.5) + httpclient (>= 2.8.1, < 3.0) + mime-types (~> 3.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + googleauth (0.5.3) + faraday (~> 0.12) + jwt (~> 1.4) + logging (~> 2.0) + memoist (~> 0.12) + multi_json (~> 1.11) + os (~> 0.9) + signet (~> 0.7) + highline (1.7.8) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + json (2.1.0) + jwt (1.5.6) + little-plugger (1.1.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + memoist (0.16.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_magick (4.5.1) + multi_json (1.12.2) + multi_xml (0.6.0) + multipart-post (2.0.0) + nanaimo (0.2.3) + os (0.9.6) + plist (3.3.0) + public_suffix (2.0.5) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.1.1) + rouge (2.0.7) + rubyzip (1.2.1) + security (0.1.3) + signet (0.7.3) + addressable (~> 2.3) + faraday (~> 0.9) + jwt (~> 1.5) + multi_json (~> 1.10) + slack-notifier (1.5.1) + terminal-notifier (1.8.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + tty-screen (0.5.0) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.4) + unicode-display_width (1.3.0) + word_wrap (1.0.0) + xcodeproj (1.5.2) + CFPropertyList (~> 2.3.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.3) + xcpretty (0.2.8) + rouge (~> 2.0.7) + xcpretty-travis-formatter (0.0.4) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + fastlane + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix new file mode 100644 index 00000000000..b9008c919bf --- /dev/null +++ b/pkgs/tools/admin/fastlane/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + inherit ruby; + pname = "fastlane"; + gemdir = ./.; + + meta = with lib; { + description = "A tool to automate building and releasing iOS and Android apps"; + longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application."; + homepage = https://github.com/fastlane/fastlane; + license = licenses.mit; + maintainers = with maintainers; [ + peterromfeldhk + ]; + }; +} diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix new file mode 100644 index 00000000000..0d9c1f55835 --- /dev/null +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -0,0 +1,469 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + babosa = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f"; + type = "gem"; + }; + version = "1.0.2"; + }; + CFPropertyList = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06dddgcai6nay552h8wmnb2m93xx5hni48s16vkbf9vbym4nfw5x"; + type = "gem"; + }; + version = "2.3.5"; + }; + claide = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + type = "gem"; + }; + version = "1.0.2"; + }; + colored = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx"; + type = "gem"; + }; + version = "1.2"; + }; + colored2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + commander-fastlane = { + dependencies = ["highline"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04gpg733wv878acvrzp4kc3k934v10l3v8bcz3fjq5imjsrjdnbp"; + type = "gem"; + }; + version = "4.4.5"; + }; + declarative = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + type = "gem"; + }; + version = "0.0.10"; + }; + declarative-option = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; + type = "gem"; + }; + version = "0.1.0"; + }; + domain_name = { + dependencies = ["unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + type = "gem"; + }; + version = "0.5.20170404"; + }; + dotenv = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv"; + type = "gem"; + }; + version = "2.2.1"; + }; + excon = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mnc9lqlzwqj5ayp0lh7impisqm55mdg3mw5q4gi9yjic5sidc40"; + type = "gem"; + }; + version = "0.59.0"; + }; + faraday = { + dependencies = ["multipart-post"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw"; + type = "gem"; + }; + version = "0.13.1"; + }; + faraday-cookie_jar = { + dependencies = ["faraday" "http-cookie"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1di4gx6446a6zdkrpj679m5k515i53wvb4yxcsqvy8d8zacxiiv6"; + type = "gem"; + }; + version = "0.0.6"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; + type = "gem"; + }; + version = "0.12.2"; + }; + fastimage = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fh80nwjxm63phcdg55haz9q877fxgvnkazjihaqbf8ginn6g00v"; + type = "gem"; + }; + version = "2.1.0"; + }; + fastlane = { + dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sg8xh1rjigiq438knkpdq685kyw34ki3h7baj65qh9mkkc8drxy"; + type = "gem"; + }; + version = "2.60.1"; + }; + gh_inspector = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x"; + type = "gem"; + }; + version = "1.0.3"; + }; + google-api-client = { + dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y"; + type = "gem"; + }; + version = "0.13.6"; + }; + googleauth = { + dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; + type = "gem"; + }; + version = "0.5.3"; + }; + highline = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + type = "gem"; + }; + version = "1.7.8"; + }; + http-cookie = { + dependencies = ["domain_name"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + httpclient = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + jwt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + type = "gem"; + }; + version = "1.5.6"; + }; + little-plugger = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + type = "gem"; + }; + version = "2.2.2"; + }; + memoist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; + type = "gem"; + }; + version = "0.16.0"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + type = "gem"; + }; + version = "3.1"; + }; + mime-types-data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + type = "gem"; + }; + version = "3.2016.0521"; + }; + mini_magick = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a59k5l29vj060yscaqk370rg5vyr132kbw6x3zar7khzjqjqd8p"; + type = "gem"; + }; + version = "4.5.1"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; + type = "gem"; + }; + version = "1.12.2"; + }; + multi_xml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + type = "gem"; + }; + version = "0.6.0"; + }; + multipart-post = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + type = "gem"; + }; + version = "2.0.0"; + }; + nanaimo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd"; + type = "gem"; + }; + version = "0.2.3"; + }; + os = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; + type = "gem"; + }; + version = "0.9.6"; + }; + plist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k0pyqrjcz9kn1b3ahsfs9aqym7s7yzz0vavya0zn0mca3jw2zqc"; + type = "gem"; + }; + version = "3.3.0"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + type = "gem"; + }; + version = "2.0.5"; + }; + representable = { + dependencies = ["declarative" "declarative-option" "uber"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; + type = "gem"; + }; + version = "3.0.4"; + }; + retriable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar"; + type = "gem"; + }; + version = "3.1.1"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + type = "gem"; + }; + version = "2.0.7"; + }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; + type = "gem"; + }; + version = "1.2.1"; + }; + security = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa"; + type = "gem"; + }; + version = "0.1.3"; + }; + signet = { + dependencies = ["addressable" "faraday" "jwt" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + type = "gem"; + }; + version = "0.7.3"; + }; + slack-notifier = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6"; + type = "gem"; + }; + version = "1.5.1"; + }; + terminal-notifier = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vy75sbq236v1p83jj6r3a9d52za5lqj2vj24np9lrszdczm9zcb"; + type = "gem"; + }; + version = "1.8.0"; + }; + terminal-table = { + dependencies = ["unicode-display_width"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; + tty-screen = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "005rpl9l1r9i7wypb4kv057y01fxqvanznx62msx6z451cfjsfn3"; + type = "gem"; + }; + version = "0.5.0"; + }; + uber = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; + type = "gem"; + }; + version = "0.1.0"; + }; + unf = { + dependencies = ["unf_ext"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + type = "gem"; + }; + version = "0.0.7.4"; + }; + unicode-display_width = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8"; + type = "gem"; + }; + version = "1.3.0"; + }; + word_wrap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iyc5bc7dbgsd8j3yk1i99ral39f23l6wapi0083fbl19hid8mpm"; + type = "gem"; + }; + version = "1.0.0"; + }; + xcodeproj = { + dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v40167wxhjfczjqp7axvblivrzgbmqldaj9vb15pw45qh6xly51"; + type = "gem"; + }; + version = "1.5.2"; + }; + xcpretty = { + dependencies = ["rouge"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b8x9m53a1hbw0lamffjm4m1ydigj3azl97jc5w7prv1bm27s2y3"; + type = "gem"; + }; + version = "0.2.8"; + }; + xcpretty-travis-formatter = { + dependencies = ["xcpretty"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn5pcxja1jkc8y5b6s3pks5inc1vmjkq7fqmlbkl39z8l1vdis2"; + type = "gem"; + }; + version = "0.0.4"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a50abf2721..efd7f9be576 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2033,6 +2033,8 @@ with pkgs; lprof = callPackage ../tools/graphics/lprof { }; + fastlane = callPackage ../tools/admin/fastlane { }; + fatresize = callPackage ../tools/filesystems/fatresize {}; fdk_aac = callPackage ../development/libraries/fdk-aac { }; From ef29901d2361f5fadfb460c99bfff0fb155ef463 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 4 Oct 2017 07:01:31 -0700 Subject: [PATCH 0688/2806] melpa-packages: Add new lean packages --- .../editors/emacs-modes/melpa-generated.nix | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index b0449cc7c42..ce9c4b3a46f 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -10171,6 +10171,27 @@ license = lib.licenses.free; }; }) {}; + company-lean = callPackage ({ company, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lean-mode, lib, melpaBuild, s }: + melpaBuild { + pname = "company-lean"; + version = "20170920.708"; + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean-mode"; + rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; + sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean"; + sha256 = "1hqkn7w5dyznf7i3r3132q8x31r74q188jsm5kdrjqgbwak2p91a"; + name = "company-lean"; + }; + packageRequires = [ company dash dash-functional emacs f lean-mode s ]; + meta = { + homepage = "https://melpa.org/#/company-lean"; + license = lib.licenses.free; + }; + }) {}; company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }: melpaBuild { pname = "company-lua"; @@ -32722,6 +32743,27 @@ license = lib.licenses.free; }; }) {}; + helm-lean = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lean-mode, lib, melpaBuild }: + melpaBuild { + pname = "helm-lean"; + version = "20170919.934"; + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean-mode"; + rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; + sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean"; + sha256 = "0j5ax14lhlyd9mpqk1jwh7nfp090kj71r045v2qjfaw2fa23b7si"; + name = "helm-lean"; + }; + packageRequires = [ dash emacs helm lean-mode ]; + meta = { + homepage = "https://melpa.org/#/helm-lean"; + license = lib.licenses.free; + }; + }) {}; helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lobsters"; @@ -41631,6 +41673,27 @@ license = lib.licenses.free; }; }) {}; + lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: + melpaBuild { + pname = "lean-mode"; + version = "20170920.755"; + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean-mode"; + rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; + sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode"; + sha256 = "0rdraxsirkrzbinjwg4qam15iy3qiixqgwsckngzw8d9a4s9l6sj"; + name = "lean-mode"; + }; + packageRequires = [ dash dash-functional emacs f flycheck s ]; + meta = { + homepage = "https://melpa.org/#/lean-mode"; + license = lib.licenses.free; + }; + }) {}; leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: melpaBuild { pname = "leanote"; From ed35c0761fe2433eb1a2187eea3b4ad488f817da Mon Sep 17 00:00:00 2001 From: Teal Gaure <~@Teal.Gr> Date: Wed, 4 Oct 2017 17:11:52 +0200 Subject: [PATCH 0689/2806] axoloti: init at 1.0.12-1 --- lib/maintainers.nix | 1 + pkgs/applications/audio/axoloti/default.nix | 101 +++++++++++++++++++ pkgs/applications/audio/axoloti/dfu-util.nix | 31 ++++++ pkgs/applications/audio/axoloti/libusb1.nix | 38 +++++++ pkgs/top-level/all-packages.nix | 7 ++ 5 files changed, 178 insertions(+) create mode 100644 pkgs/applications/audio/axoloti/default.nix create mode 100644 pkgs/applications/audio/axoloti/dfu-util.nix create mode 100644 pkgs/applications/audio/axoloti/libusb1.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index c7dbd3fb0de..9798ebde24b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -590,6 +590,7 @@ taku0 = "Takuo Yonezawa "; tari = "Peter Marheine "; tavyc = "Octavian Cerna "; + TealG = "Teal Gaure <~@Teal.Gr>"; teh = "Tom Hunger "; telotortium = "Robert Irelan "; teto = "Matthieu Coudron "; diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix new file mode 100644 index 00000000000..b976d31a27f --- /dev/null +++ b/pkgs/applications/audio/axoloti/default.nix @@ -0,0 +1,101 @@ +{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip +, gnumake, gcc-arm-embedded, dfu-util-axoloti, jdk, ant, libfaketime }: + +stdenv.mkDerivation rec { + version = "1.0.12-1"; + name = "axoloti-${version}"; + + src = fetchFromGitHub { + owner = "axoloti"; + repo = "axoloti"; + rev = "${version}"; + sha256 = "13njmv8zac0kaaxgkv4y4zfjcclafn9cw0m8lj2k4926wnwjmf50"; + }; + + chibi_version = "2.6.9"; + chibi_name = "ChibiOS_${chibi_version}"; + + chibios = fetchurl { + url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip"; + sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj"; + }; + + buildInputs = [ makeWrapper unzip gcc-arm-embedded dfu-util-axoloti jdk ant libfaketime ]; + + patchPhase = '' + unzip ${chibios} + mv ${chibi_name} chibios + (cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip) + + # Remove source of non-determinism in ChibiOS + substituteInPlace "chibios/os/various/shell.c" \ + --replace "#ifdef __DATE__" "#if 0" + + # Hardcode full path to compiler tools + for f in "firmware/Makefile.patch" \ + "firmware/Makefile" \ + "firmware/flasher/Makefile" \ + "firmware/mounter/Makefile"; do + substituteInPlace "$f" \ + --replace "arm-none-eabi-" "${gcc-arm-embedded}/bin/arm-none-eabi-" + done + + # Hardcode path to "make" + for f in "firmware/compile_firmware_linux.sh" \ + "firmware/compile_patch_linux.sh"; do + substituteInPlace "$f" \ + --replace "make" "${gnumake}/bin/make" + done + + # Hardcode dfu-util path + substituteInPlace "platform_linux/upload_fw_dfu.sh" \ + --replace "/bin/dfu-util" "" + substituteInPlace "platform_linux/upload_fw_dfu.sh" \ + --replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util" + + # Fix build version + substituteInPlace "build.xml" \ + --replace "(git missing)" "${version}" + + # Remove build time + substituteInPlace "build.xml" \ + --replace "" "" + substituteInPlace "build.xml" \ + --replace \ + '' \ + '' + substituteInPlace "build.xml" \ + --replace "" "" + substituteInPlace "build.xml" \ + --replace \ + '{line.separator}' \ + '{line.separator} ' + ''; + + buildPhase = '' + find . -exec touch -d '1970-01-01 00:00' {} \; + (cd platform_linux; sh compile_firmware.sh) + faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/axoloti + + cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/ + install -vD dist/Axoloti.jar $out/share/axoloti/ + + makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar" + ''; + + meta = with stdenv.lib; { + homepage = http://www.axoloti.com; + description = '' + Sketching embedded digital audio algorithms. + + To fix permissions of the Axoloti USB device node, add a similar udev rule to services.udev.extraRules: + SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup" + ''; + license = licenses.gpl3; + maintainers = with lib.maintainers; [ TealG ]; + }; +} diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix new file mode 100644 index 00000000000..2076e45de54 --- /dev/null +++ b/pkgs/applications/audio/axoloti/dfu-util.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, libusb1-axoloti }: + +stdenv.mkDerivation rec { + name="dfu-util-${version}"; + version = "0.8"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1-axoloti ]; + + src = fetchurl { + url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz"; + sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; + }; + + meta = with stdenv.lib; { + description = "Device firmware update (DFU) USB programmer"; + longDescription = '' + dfu-util is a program that implements the host (PC) side of the USB + DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol. + + DFU is intended to download and upload firmware to devices connected over + USB. It ranges from small devices like micro-controller boards up to mobile + phones. With dfu-util you are able to download firmware to your device or + upload firmware from it. + ''; + homepage = http://dfu-util.gnumonks.org/; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ ]; + }; +} diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix new file mode 100644 index 00000000000..cf71c006046 --- /dev/null +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: + +stdenv.mkDerivation rec { + name = "libusb-1.0.19"; + + src = fetchurl { + url = "mirror://sourceforge/libusb/${name}.tar.bz2"; + sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; + }; + + outputs = [ "out" "dev" ]; # get rid of propagating systemd closure + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = + stdenv.lib.optional stdenv.isLinux systemd ++ + stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + + patches = [ + (fetchpatch { + name = "libusb.stdfu.patch"; + url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch"; + sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d"; + }) + ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la + ''; + + meta = { + homepage = http://www.libusb.info; + description = "User-space USB library"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a50abf2721..f0f13cf3b51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -677,6 +677,13 @@ with pkgs; libssl = openssl; }; + axoloti = callPackage ../applications/audio/axoloti { }; + dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; + libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + azureus = callPackage ../tools/networking/p2p/azureus { }; backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; From fe496eacc8bbf2f00f60ba6a1102cd8f078d1650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 4 Oct 2017 11:15:09 -0500 Subject: [PATCH 0690/2806] axoloti: fix evaluation --- pkgs/applications/audio/axoloti/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index b976d31a27f..986e476779c 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup" ''; license = licenses.gpl3; - maintainers = with lib.maintainers; [ TealG ]; + maintainers = with maintainers; [ TealG ]; }; } From c06c02175cce9047c97688f1a63b32b7febf255f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 4 Oct 2017 19:04:31 +0200 Subject: [PATCH 0691/2806] ardour: 5.11 -> 5.12 --- pkgs/applications/audio/ardour/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index a4debfe3744..850848abcde 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -16,7 +16,7 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "5.11"; + tag = "5.12"; in @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; - rev = "bd40b9132cbac2d2b79ba0ef480bd41d837f8f71"; - sha256 = "0xxxjg90jzj5cj364mlhk8srkgaghxif2jj1015bra25pffk41ay"; + rev = "ae0dcdc0c5d13483271065c360e378202d20170a"; + sha256 = "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr"; }; buildInputs = - [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac + [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 From 4e7b34ac72bfa39a375de12a89447a3af2f04c03 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 4 Oct 2017 20:30:26 +0200 Subject: [PATCH 0692/2806] sbcl: 1.3.21 -> 1.4.0 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 2ee7d2b7e11..85004767e58 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.21"; + version = "1.4.0"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "13hmavfmxsqp2s89aa6kljpgjm6c2063bgrz0maq1ms1y3052k38"; + sha256 = "0s87ax5hg9hz6b8kc9yrjckgz56s9iv96l2dcq216cbqkykrrm88"; }; patchPhase = '' From 4bdcfbc12c63b91373424b45e6ba2aa7d0bde7f3 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Wed, 4 Oct 2017 20:36:54 +0200 Subject: [PATCH 0693/2806] emby: 3.2.32.0 -> 3.2.33.0 --- pkgs/servers/emby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 678fb42acd5..ad4ed0a11ad 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.32.0"; + version = "3.2.33.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0bwcqwh9g8yrkh1schfr30jf5m2w3r2raczq5x94vjfs8i6dmqh0"; + sha256 = "1f8rcpbj6j46d46r6pmxvwz0mzxcjra47zx4ffvk8vi78m8kr56g"; }; buildInputs = with pkgs; [ From 97d9f0b5bba3251f5287037dc31e9c5aaae9cd61 Mon Sep 17 00:00:00 2001 From: Diego Zamboni Date: Wed, 4 Oct 2017 21:50:21 +0200 Subject: [PATCH 0694/2806] vagrant: fix Ruby and libffi libraries on Darwin On Darwin, keep the Ruby and libffi libraries and binaries bundled with Vagrant instead of linking to the Nix ones, to avoid errors about libraries not found. --- pkgs/development/tools/vagrant/default.nix | 32 ++++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 91c0054fe91..c61d521ecab 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -85,6 +85,22 @@ in stdenv.mkDerivation rec { ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin + # libiconv: iconv + rm opt/vagrant/embedded/bin/iconv + ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin + + # libxml: xml2-config, xmlcatalog, xmllint + rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} + ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin + ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin + ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin + + # libxslt: xslt-config, xsltproc + rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} + ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin + ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin + + '' + (stdenv.lib.optionalString (! stdenv.isDarwin) '' # ruby: erb, gem, irb, rake, rdoc, ri, ruby rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby} ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin @@ -101,24 +117,10 @@ in stdenv.mkDerivation rec { ln -s $lib opt/vagrant/embedded/lib/''${lib##*/} done - # libiconv: iconv - rm opt/vagrant/embedded/bin/iconv - ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin - - # libxml: xml2-config, xmlcatalog, xmllint - rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} - ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin - - # libxslt: xslt-config, xsltproc - rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} - ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin - ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin - # libffi ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6 + '') + '' mkdir -p "$out" cp -r opt "$out" cp -r usr/bin "$out" From 9ed21ec54b57d871a163f4a57ea479844bb530d6 Mon Sep 17 00:00:00 2001 From: dupgit Date: Wed, 4 Oct 2017 22:21:54 +0200 Subject: [PATCH 0695/2806] jansson-2.9 -> jansson-2.10 version bump --- pkgs/development/libraries/jansson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 70ed2d00fea..2fbb2e3948c 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.9"; + name = "jansson-2.10"; src = fetchurl { url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; - sha256 = "19fjgfwjfj99rqa3kf96x5rssj88siazggksgrikd6h4r9sd1l0a"; + sha256 = "0iv4rxsnamqm3ldpg7dyhjq0x9cp023nc7ac820jdd3pwb8ml8bq"; }; meta = with stdenv.lib; { From 31a903badada6231b8c3310abc06b4e43c757f75 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 4 Oct 2017 15:31:39 -0500 Subject: [PATCH 0696/2806] snowman: 2017-07-22 -> 2017-08-13 Minor update but notably includes fix for breakage when using cmake 3.9 --- pkgs/development/tools/analysis/snowman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index f21e9bba3f7..2caadfc6266 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -6,13 +6,13 @@ assert qtbase != null -> qt4 == null; stdenv.mkDerivation rec { name = "snowman-${version}"; - version = "2017-07-22"; + version = "2017-08-13"; src = fetchFromGitHub { owner = "yegord"; repo = "snowman"; - rev = "6c4d9cceb56bf2fd0f650313131a2240579d1bea"; - sha256 = "1d0abh0fg637jksk7nl4yl54b4cadinj93qqvsm138zyx7h57xqf"; + rev = "cd9edcddf873fc40d7bcb1bb1eae815faedd3a03"; + sha256 = "10f3kd5m5xw7hqh92ba7dcczwbznxvk1qxg0yycqz7y9mfr2282n"; }; nativeBuildInputs = [ cmake ]; From f61d734bced495621215425b2685fd646fe10d1d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 4 Sep 2017 04:30:25 +0200 Subject: [PATCH 0697/2806] =?UTF-8?q?gnome3.pomodoro:=200.11.2=20=E2=86=92?= =?UTF-8?q?=200.13.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/misc/pomodoro/default.nix | 46 ++++++++----------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 37cdfc730ab..63f59357db5 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,40 +1,34 @@ -{ stdenv, fetchFromGitHub, which, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base, - glib, gobjectIntrospection, telepathy_glib +{ stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, + dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3, + glib, gobjectIntrospection, libpeas }: stdenv.mkDerivation rec { - version = "0.11.2"; + version = "0.13.3"; name = "gnome-shell-pomodoro-${version}"; src = fetchFromGitHub { - owner = "codito"; - repo = "gnome-pomodoro"; - rev = "${version}"; - sha256 = "0x656drq8vnvdj1x6ghnglgpa0z8yd2yj9dh5iqprwjv0z3qkw4l"; + owner = "codito"; + repo = "gnome-pomodoro"; + rev = "${version}"; + sha256 = "1hi4mdzyz2f8k19bkfzrrnavsbkr621w0bfpza8ij2yccpxz81h2"; }; - configureScript = ''./autogen.sh''; + configureScript = "./autogen.sh"; - buildInputs = [ - which intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib - gnome3.defaultIconTheme + nativeBuildInputs = [ + autoconf-archive libtool intltool appstream-glib + wrapGAppsHook pkgconfig ]; - preBuild = '' - sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \ - vapi/Makefile - ''; - - preFixup = '' - wrapProgram $out/bin/gnome-pomodoro \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS" - ''; + buildInputs = [ + glib gobjectIntrospection libpeas + dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gnome3.gsettings_desktop_schemas + gnome3.gnome_common gnome3.gnome_shell gtk3 + gnome3.defaultIconTheme + ]; meta = with stdenv.lib; { homepage = https://github.com/codito/gnome-shell-pomodoro; From 0ae2e5dcbce94392cce6e5f4f7d43b48c4d5f924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 4 Oct 2017 17:48:51 -0300 Subject: [PATCH 0698/2806] jwm: 1621 -> 1651 --- pkgs/applications/window-managers/jwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 83c4e6828e1..fbea1d4e9a4 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1621"; + version = "1651"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "1cxi9yd3wwzhh06f6myk15cav7ayvzxdaxhvqb3570nwj21zlnsm"; + sha256 = "097wqipg1h7h19a5bqdx7iq60fkjrx2niwsgg1f8cfz106yhbp6q"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; From 514593ea31d7e67e8efa2f2ff26c9569d508a5ef Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 4 Oct 2017 23:03:34 +0200 Subject: [PATCH 0699/2806] curl: fix clang build --- 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 0627d6042c0..c01dbbaa3a7 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -68,8 +68,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"; - CXX = "g++"; - CXXCPP = "g++ -E"; + CXX = "c++"; + CXXCPP = "c++ -E"; postInstall = '' moveToOutput bin/curl-config "$dev" From a426b96fcdcb4d93b5fa1aee0a6886fb7be5ecd2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 5 Oct 2017 05:14:13 +0800 Subject: [PATCH 0700/2806] terraform: 0.10.2 -> 0.10.7 (#30055) * terraform: 0.10.2 -> 0.10.7 * terraform: Update all providers --- .../networking/cluster/terraform/default.nix | 4 +- .../cluster/terraform/providers/data.nix | 100 +++++++++--------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index cc7a93bdb53..e6e3585a4d1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -91,8 +91,8 @@ in { }; terraform_0_10 = pluggable (generic { - version = "0.10.2"; - sha256 = "1q7za7jcfqv914a3ynfl7hrqbgwcahgm418kivjrac6p1q26w502"; + version = "0.10.7"; + sha256 = "0gjvrra255m973nzi7rpqp5dn5npnd79cnv8vjcs7wmkdj1hli0l"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index 0778e221c12..d29bd964860 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -11,8 +11,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-archive"; - version = "0.1.0"; - sha256 = "1g7bjak1vgxpnmp4b9cb3mq8gqp1a7738fj0sxzflfk8k35p27ri"; + version = "1.0.0"; + sha256 = "0z85fpd70m2w59vxp82d8ipylaazf6l890rkjca4dm14rkq352zn"; }; arukas = { @@ -32,8 +32,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "0.1.4"; - sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8"; + version = "1.0.0"; + sha256 = "1x3ldlx2iryxwfaws8ng9n0k06p7n8xqc6sjyxw73jdasxbh8wgi"; }; azure = { @@ -46,8 +46,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "0.1.6"; - sha256 = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6"; + version = "0.2.2"; + sha256 = "1jdkj1zylrlcd2qkfkl81i0ybdpmvbvvsk0f4ahafiqp550srf2d"; }; bitbucket = { @@ -102,15 +102,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-consul"; - version = "0.1.0"; - sha256 = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94"; + version = "1.0.0"; + sha256 = "1008lrvdqn3kk8gwvq094nwknh00b429jmwi0hq4brick7vyvbvz"; }; datadog = { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "0.1.0"; - sha256 = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk"; + version = "0.1.1"; + sha256 = "0nyqybi3fl9qlhpx2n0vjz7kn3bqhf4wy93zhq3j3853zxpcjpzc"; }; digitalocean = { @@ -130,8 +130,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-dns"; - version = "0.1.1"; - sha256 = "0ccp02rbvfvrb808mg053q5y7ghvxsl7p1gzw7pkm934i6j90g9n"; + version = "1.0.0"; + sha256 = "05ismwpmpkv9qxn6g5i29y18s1pw4yf2pyvv9ak8hj8idh4z6gz2"; }; dnsimple = { @@ -151,15 +151,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-dyn"; - version = "0.1.0"; - sha256 = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p"; + version = "1.0.0"; + sha256 = "0ph3516syca8f1zxmz66mh6y5kd8sc74kl0n8zixcgd6rvq0dysr"; }; external = { owner = "terraform-providers"; repo = "terraform-provider-external"; - version = "0.1.0"; - sha256 = "160f0avv6wbh11z54wy0qcq0zrcj4s31kn7a9x6zikv7v4hfnbza"; + version = "1.0.0"; + sha256 = "1sh0m8d6wp76h1b89j820yl3caji0f0wlgq3pwa5nk99h73rlndn"; }; fastly = { @@ -186,8 +186,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "0.1.3"; - sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf"; + version = "1.0.1"; + sha256 = "0l0bpcfjnzlgf3g60iyfr3axw0244w99cf04z7y3bcszk5njipri"; }; grafana = { @@ -207,8 +207,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-http"; - version = "0.1.0"; - sha256 = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah"; + version = "1.0.0"; + sha256 = "1lks997sxfydm6a9s6vfyljs3j1r7qpg1k1s5ilpg5ckv77nad6g"; }; icinga2 = { @@ -221,8 +221,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-ignition"; - version = "0.2.0"; - sha256 = "07qsyjzbz34nh7qrmw97sg0zrqbchky9r3ywrdz96pmpr1yjmwr7"; + version = "1.0.0"; + sha256 = "0hr2zshrx4qfb7xdknsxsa4522kkf84rsqqbliz7ac9nsqpaarf4"; }; influxdb = { @@ -249,8 +249,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-local"; - version = "0.1.0"; - sha256 = "02m0wg0jasnzrayamjsc2hzi0ibj83v4d0hmw2xbrxk7vmk71lgq"; + version = "1.0.0"; + sha256 = "1dxdpmai8f0g1gj6khgv769lhg6ssfmgqskg4c5qf1jnv8yn8mkd"; }; logentries = { @@ -284,8 +284,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - version = "0.1.0"; - sha256 = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8"; + version = "1.0.0"; + sha256 = "01fvw7yw8dhjclipnn9h1blagbp2849ahmnqj3ysh13i0x1qbq4r"; }; ns1 = { @@ -298,8 +298,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-null"; - version = "0.1.0"; - sha256 = "069yhsqi4jc14cay1gk7mwwmrg8xv90kj1k5qy3a2ypfbss4fcjp"; + version = "1.0.0"; + sha256 = "12vpa09xrq8z1pjq0bwzq3889c4fl6c5kvynwqy0z1pdx21m60ha"; }; oneandone = { @@ -312,15 +312,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "0.1.2"; - sha256 = "0c4ywav89lln9417zwflrp3qhcs7qf96rgcvm1msmpgglrhzwp2i"; + version = "0.1.3"; + sha256 = "00h531pikjrmra2sr24lnx2z0dvycshd0qpz3wa733mkvvm47p07"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "0.2.1"; - sha256 = "1zsswsgv7lzhfd0v8llbm18gsfg6xji0r3f9rnvpjqkffj4088ca"; + version = "0.2.2"; + sha256 = "1027pqv1cvyvakn4kgivd720g9na38nam5bb5fjyd4d04xpq9v90"; }; opsgenie = { @@ -340,8 +340,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "0.1.0"; - sha256 = "0dk10d4b10pdlhqgm6fqg0cn0ff78ss1x76inj6gfwrnbn2amhp0"; + version = "1.0.0"; + sha256 = "0ibz9k1yfqkfsmqmv1pl2jwzbld0l6f7zd8y80iw0v5wswclswya"; }; pagerduty = { @@ -375,22 +375,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-rabbitmq"; - version = "0.1.0"; - sha256 = "0vn8456f2al1f6rs1gn157c86qz1fxz8sqphbr9lvdhy1jw1q2vp"; + version = "0.2.0"; + sha256 = "1pbib43d1iqy8xl03zqwnz77362cb9cq8awcpid714n1sz7nd4im"; }; rancher = { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - version = "0.2.0"; - sha256 = "05aci6cjrs7rv6hqhvcqy1i0nr8azds8flnrc7vba0nyy6v192qg"; + version = "1.0.0"; + sha256 = "1fs8p0l8f79b1s2g0p5zlq1has9i7w3bmv76vrm79076v7w2v0d6"; }; random = { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "0.1.0"; - sha256 = "1lbv5yiw4qfsqm3gxf37gwadgp7g6ki0n70mj00d8l6v6jd0mdl5"; + version = "1.0.0"; + sha256 = "0im4dsnbpbc9qln92lxcrygm9d705bvlhigpx492172cq1fqnw61"; }; rundeck = { @@ -431,29 +431,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-template"; - version = "0.1.1"; - sha256 = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn"; + version = "1.0.0"; + sha256 = "0jl6bp6gwg96sdk5j6s13vv1j9gxjpy2yva3barmzv9138i665mz"; }; terraform = { owner = "terraform-providers"; repo = "terraform-provider-terraform"; - version = "0.1.0"; - sha256 = "1w465853gwffpydb7idvg7bk8ygadgy08s04fxsqc8i2683jbpiz"; + version = "1.0.0"; + sha256 = "0icyyi4h48yh5235p5svm4p0jzbqqm1f3846dqy37czhjfcrn3gh"; }; tls = { owner = "terraform-providers"; repo = "terraform-provider-tls"; - version = "0.1.0"; - sha256 = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7"; + version = "1.0.0"; + sha256 = "063ai5zipmkwq0nr5c25gqsr970r8aba12ynxg9x8cnay0zn9s95"; }; triton = { owner = "terraform-providers"; repo = "terraform-provider-triton"; - version = "0.1.2"; - sha256 = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw"; + version = "0.2.1"; + sha256 = "0ds2anr65xx9kdjv6x68lcxgl3js6l0m2cbx3kwx5465m01m3gxz"; }; ultradns = { @@ -480,7 +480,7 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "0.2.2"; - sha256 = "0d5d4wip57zmv9kqh4zr9mz8ylffa2qcf1vmx827rwyqdr25xvaz"; + version = "0.4.1"; + sha256 = "0afxvjx9zb9ym0cs8j15s6nfp20rmmifjdc098wcfjmgnw6p7f01"; }; } From 843a75d27daab33e73a0f6883de01dd939a0c290 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 4 Oct 2017 17:19:32 -0400 Subject: [PATCH 0701/2806] keybase-gui: 1.0.25 -> 1.0.33 --- pkgs/tools/security/keybase-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index a45a6ea2a04..ce98740e89b 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -37,10 +37,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "1.0.25-20170714172717.73f9070"; + version = "1.0.33-20171003193427.d9ceb86ac"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "0yrq18rrc30f7ymajvd71r29z1by7h6abyaxx2gmrg648qgc6zv4"; + sha256 = "0sqani2fy5jzqmz35md1bdw2vwpx91l87b6s3x9z53halzq7vfy6"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' From 558db539f5bd67b58a5e6695319fb07f90c473de Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Tue, 3 Oct 2017 19:01:47 +0200 Subject: [PATCH 0702/2806] elixir: Fix locale problem on NixOS It looks like Erlang/OTP requires access to LOCALE_ARCHIVE for locales to correctly work. Elixir depends on this here: https://github.com/elixir-lang/elixir/blob/7a556b8f26f42f6b7510dc1d2351564d91ab746c/lib/elixir/src/elixir.erl#L76 Fixes #30047 --- pkgs/development/interpreters/elixir/generic-builder.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 8f83a338484..78598ce3d81 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -22,6 +22,8 @@ in buildInputs = [ erlang rebar makeWrapper ]; + LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux + "${pkgs.glibcLocales}/lib/locale/locale-archive"; LANG = "en_US.UTF-8"; LC_TYPE = "en_US.UTF-8"; @@ -30,8 +32,8 @@ in inherit debugInfo; buildFlags = if debugInfo - then "ERL_COMPILER_OPTIONS=debug_info" - else ""; + then "ERL_COMPILER_OPTIONS=debug_info" + else ""; preBuild = '' # The build process uses ./rebar. Link it to the nixpkgs rebar From 6581ad85c01b91575d521af64677b13d1e743482 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 4 Oct 2017 17:24:19 -0400 Subject: [PATCH 0703/2806] keybase: 1.0.30 -> 1.0.33 --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 229a45b8731..049867afcd7 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.30"; + version = "1.0.33"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "0vivc71xfi4y3ydd29b17qxzi10r3a1ppmjjws6vrs0gz58bz1j8"; + sha256 = "1zgvriyir2ga0p4ah9ia1sbl9ydnrnw5ggq4c1ya8gcfgn8vzdsf"; }; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' From da9ebb826a020db42f062b8aef400bea869e3a76 Mon Sep 17 00:00:00 2001 From: David Pflug Date: Wed, 4 Oct 2017 17:25:53 -0400 Subject: [PATCH 0704/2806] chirp: 20170311 -> 20170714 --- pkgs/applications/misc/chirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 67d37489feb..673ecdc8549 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20170311"; + version = "20170714"; src = fetchurl { url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj"; + sha256 = "1pglsmc0pf50w7df4vv30z5hmdxy4aqjl3qrv8kfiax7rld21gcy"; }; nativeBuildInputs = [ makeWrapper ]; From 419d33305b58fea19a125e5ece16c88f6a58657a Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Wed, 4 Oct 2017 14:43:05 -0700 Subject: [PATCH 0705/2806] go: 1.8.3 -> 1.8.4 --- pkgs/development/compilers/go/1.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 8a675b1b776..838032c9698 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "0g83xm9gb872rsqzwqr1zw5szq69xhynljj2nglg4yyfi7dm2r1c"; + sha256 = "0p0m63y39pja3fkj43sdq0qv8kqljkz7d58bf9jbw0rjw2c9ml4a"; }; # perl is used for testing go vet From ca685bb9a519eaee78e3c48eab00ef173db56be4 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Wed, 4 Oct 2017 14:44:34 -0700 Subject: [PATCH 0706/2806] go: 1.9 -> 1.9.1 --- pkgs/development/compilers/go/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 49ac9feff80..a90985c2525 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9"; + version = "1.9.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "06k66x387r93m7d3bd5yzwdm8f8xc43cdjfamqldfc1v8ngak0y9"; + sha256 = "1p226lgsmiwgcvmiakac9i08304cq5ick23vmsk1vjcsh6dvz9i3"; }; # perl is used for testing go vet From 05176ba836de4ec2cb14f6e4e2b6b3ac332ff7af Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 4 Oct 2017 19:44:42 +0200 Subject: [PATCH 0707/2806] devtodo: init at 0.1.20 --- pkgs/development/tools/devtodo/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/devtodo/default.nix diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix new file mode 100644 index 00000000000..36c489b1171 --- /dev/null +++ b/pkgs/development/tools/devtodo/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, readline, ncurses }: + +stdenv.mkDerivation rec { + name = "devtodo-${version}"; + version = "0.1.20"; + + src = fetchurl { + url = "http://swapoff.org/files/devtodo/${name}.tar.gz"; + sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p"; + }; + + buildInputs = [ readline ncurses ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://swapoff.org/devtodo1.html; + description = "A hierarchical command-line task manager"; + license = licenses.gpl2; + maintainers = [ maintainers.woffs ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c702e50e678..dfd1bbfb9eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7095,6 +7095,8 @@ with pkgs; dejagnu = callPackage ../development/tools/misc/dejagnu { }; + devtodo = callPackage ../development/tools/devtodo { }; + dfeet = callPackage ../development/tools/misc/d-feet { }; dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; From 50bca782b367b4cd0337a4dd751424b3d2fd4665 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Sep 2017 17:01:54 +0200 Subject: [PATCH 0708/2806] simple-scan: move to gnome3 package set --- .../gnome-3/core}/simple-scan/default.nix | 0 pkgs/desktops/gnome-3/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename pkgs/{applications/graphics => desktops/gnome-3/core}/simple-scan/default.nix (100%) diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix similarity index 100% rename from pkgs/applications/graphics/simple-scan/default.nix rename to pkgs/desktops/gnome-3/core/simple-scan/default.nix diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 7be1f79be4c..fcb36fb8ded 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -30,7 +30,7 @@ let optionalPackages = with gnome3; [ baobab eog epiphany evince gucharmap nautilus totem vino yelp gnome-bluetooth gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot - gnome-system-log gnome-system-monitor + gnome-system-log gnome-system-monitor simple-scan gnome_terminal gnome-user-docs evolution file-roller gedit gnome-clocks gnome-music gnome-tweak-tool gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs @@ -230,6 +230,8 @@ let rest = callPackage ./core/rest { }; + simple-scan = callPackage ./core/simple-scan { }; + sushi = callPackage ./core/sushi { }; totem = callPackage ./core/totem { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da57a8eda06..0beb4886159 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16245,7 +16245,7 @@ with pkgs; shutter = callPackage ../applications/graphics/shutter { }; - simple-scan = callPackage ../applications/graphics/simple-scan { }; + simple-scan = gnome3.simple-scan; siproxd = callPackage ../applications/networking/siproxd { }; From e7b277f3c5d52ff446561de10bb1821309247c68 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 5 Oct 2017 00:06:53 +0200 Subject: [PATCH 0709/2806] gnome3.simple-scan: move src to a separate file --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 9 +-------- pkgs/desktops/gnome-3/core/simple-scan/src.nix | 10 ++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/simple-scan/src.nix diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 0c800ce9859..0b453d5c533 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -3,14 +3,7 @@ , gnome3 }: stdenv.mkDerivation rec { - name = "simple-scan-${version}"; - version = "${major_version}.0.1"; - major_version = "3.22"; - - src = fetchurl { - url = "https://launchpad.net/simple-scan/${major_version}/${version}/+download/${name}.tar.xz"; - sha256 = "0l1b3llkdlqq0bcjx1cadba67l2zb4zfykdaprpjbjbr6gkbc1f5"; - }; + inherit (import ./src.nix fetchurl) name src; buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/src.nix b/pkgs/desktops/gnome-3/core/simple-scan/src.nix new file mode 100644 index 00000000000..cea148891a7 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/simple-scan/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "simple-scan-3.22.0.1"; + + src = fetchurl { + url = mirror://gnome/sources/simple-scan/3.22/simple-scan-3.22.0.1.tar.xz; + sha256 = "c505b6e63379c9256fbeaa4def3e595fd063d46a8a852ed90218d336291d2b50"; + }; +} From c42b878ed376182e0c3db0262388877d1445870b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 5 Oct 2017 01:29:24 +0200 Subject: [PATCH 0710/2806] fscrypt: 0.2.1 -> 0.2.2 --- pkgs/os-specific/linux/fscrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 1564069a0a9..8efef4fac4b 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "fscrypt-${version}"; - version = "0.2.1"; + version = "0.2.2"; goPackagePath = "github.com/google/fscrypt"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "google"; repo = "fscrypt"; rev = version; - sha256 = "0ais6l0dxinnspi6cjnzyk55cdkfsz2bzbaybg6cb4q8a5kzaccq"; + sha256 = "0a85vj1zsybhzvvgdvlw6ywh2a6inmrmc95pfa1js4vkx0ixf1kh"; }; buildInputs = [ libargon2 pam ]; From 6fe67d3124820a3ec976f0454cb89d483a72dbb4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 4 Oct 2017 17:05:27 -0500 Subject: [PATCH 0711/2806] libxdg-basedir: 1.0.2 -> 1.2.0 minor fixes: * upstream patch for overflow bug * license is MIT, at least it is now --- .../libraries/libxdg-basedir/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/development/libraries/libxdg-basedir/default.nix index a8a6200519e..f0e63efc0d1 100644 --- a/pkgs/development/libraries/libxdg-basedir/default.nix +++ b/pkgs/development/libraries/libxdg-basedir/default.nix @@ -1,16 +1,24 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation rec { - name = "libxdg-basedir-1.0.2"; + name = "libxdg-basedir-1.2.0"; src = fetchurl { - url = "http://n.ethz.ch/student/nevillm/download/libxdg-basedir/${name}.tar.gz"; - sha256 = "0fibbzba228gdk05lfi8cgfrsp80a2gnjbwka0pzpkig0fz8pp9i"; + url = "https://nevill.ch/libxdg-basedir/downloads/${name}.tar.gz"; + sha256 = "2757a949618742d80ac59ee2f0d946adc6e71576406cdf798e6ced507708cdf4"; }; - meta = { - homepage = http://n.ethz.ch/student/nevillm/download/libxdg-basedir/; + patches = [ + # Overflow bug + (fetchpatch { + url = "https://github.com/devnev/libxdg-basedir/commit/14e000f696ef8b83264b0ca4407669bdb365fb23.patch"; + sha256 = "0lpy1ijir0x0hhb0fz0w5vxy1wl1cw9kkd6gva0rkp41i6vrp2wq"; + }) + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/devnev/libxdg-basedir; description = "Implementation of the XDG Base Directory specification"; - license = "BSD"; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } From dc8500165ca456df4ea9c4e828ea6dfb85797feb Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Thu, 5 Oct 2017 00:42:50 +0000 Subject: [PATCH 0712/2806] declarative containers: improve example config Container config example code mentions `postgresql` service, but the correct use of that service involves setting `system.stateVersion` option (as discovered in https://github.com/NixOS/nixpkgs/issues/30056). The actual system state version is set randomly to 17.03 because I have no preferences here --- nixos/modules/virtualisation/containers.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 82dfc1c9f1c..2e91a62c74b 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -596,6 +596,8 @@ in { config, pkgs, ... }: { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql96; + + system.stateVersion = "17.03"; }; }; } From d445ccc8335cf1655571531707b40531fae7f4d1 Mon Sep 17 00:00:00 2001 From: Siddhanathan Shanmugam Date: Wed, 4 Oct 2017 21:27:37 -0400 Subject: [PATCH 0713/2806] packer: 1.0.3 -> 1.1.0 --- pkgs/development/tools/packer/default.nix | 10 ++++------ pkgs/development/tools/packer/deps.nix | 11 ----------- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/tools/packer/deps.nix diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 11909ec1a19..f8dc96c2394 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,21 +1,19 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.0.3"; + version = "1.1.0"; - goPackagePath = "github.com/mitchellh/packer"; + goPackagePath = "github.com/hashicorp/packer"; subPackages = [ "." ]; src = fetchFromGitHub { - owner = "mitchellh"; + owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "1bd0rv93pxlv58c0x1d4dsjq4pg5qwrm2p7qw83pca7izlncgvfr"; + sha256 = "09hwq6dxyzhpl97akwbb02bjrisz9rf296avg5zj2p5qdsf4y777"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = https://www.packer.io; diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix deleted file mode 100644 index 544facda015..00000000000 --- a/pkgs/development/tools/packer/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/hashicorp/packer"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/packer"; - rev = "07decf99adc272a386e3a013846248810d9aa690"; - sha256 = "17rrzrlr48spadb9fymn1a0blqggs2mfmqbwfxs0pnw66mhd0fzz"; - }; - } -] From 8c207e9f4611bdfc1733eccfff10742b16fdfe0c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 4 Oct 2017 21:54:57 -0400 Subject: [PATCH 0714/2806] kbfs: 20170922.f76290 -> 20171004.40555d --- pkgs/tools/security/kbfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index 7b3e7d99a43..ba024328ba5 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,18 +2,18 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "20170922.f76290"; + version = "20171004.40555d"; goPackagePath = "github.com/keybase/kbfs"; - subPackages = [ "kbfsfuse" ]; + subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; dontRenameImports = true; src = fetchFromGitHub { owner = "keybase"; repo = "kbfs"; - rev = "f76290f6e1a8cbaa6046980c67c548fbff9e123a"; - sha256 = "1v086wmc0hly4b91y6xndfdhj981n2yr6nnb3rl6f4kwx291ih54"; + rev = "40555dbc9c93a05f3a82053860df30e45c7bd779"; + sha256 = "08wj8fh1ja8kfzvbza5csy9mpfy39lifnzvfrnbj7vyyv88qc3h0"; }; buildFlags = [ "-tags production" ]; From e4fef25d7d11a1b5a7d86a9cf7c09e3f474d0327 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 5 Oct 2017 13:28:26 +0800 Subject: [PATCH 0715/2806] firefox-beta-bin: 57.0b4 -> 57.0b5 --- .../browsers/firefox-bin/beta_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 9080ad890bd..a73eaaea489 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b4"; + version = "57.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ach/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ach/firefox-57.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "5233cd6358d0a87c58799f50a30bd92c36793394b451fa70f8b789810137d2f478dea9f27a15ce7c141c54e6fa62e5c2088021b90f4261c889843ca5dce7c905"; + sha512 = "f3e10268d9a2b5813a2d69fcbf099de3ae9c136b06d4042448c26da7d9c4109719875c7c46bb0e27cd849abbdcabb5d70905e308dc19faa398184d3679700596"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/af/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/af/firefox-57.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "62c17ef12991df223e58e32cd148b7c254ef2d8a415cb923a5a74b363e15902b0272b3f09377dad24193867dff50ba84f0128e5b7c171b70572aed6a47f07aba"; + sha512 = "58b9c13c779fb09def3cc1a83835a21428c41650e8f83d42670bc5c6cabd1b4a87e83ad73f5c2deb8129a8399b624c542682f5a640eb119d512f08f07da0c6dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/an/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/an/firefox-57.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "0b141040b179269d567f7d40afafc4816e9316a75c69dab51a23e50b497c8c828b5a0c064a3f79d4804ab35e3c4bef5bb5defb89322e3efbf28ffdd394c7c050"; + sha512 = "c7616977f35733c98caa748a27bcd75d64a8c992f9bea76de76c69dd7adb2ce248eae2cc2791dec27b743a1dce67db22a546a339f5af3ca160bccdbb34caad66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ar/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ar/firefox-57.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0b74174e2d243a0db86d633e7c82357e138429572c8454df647a87dbf7aca585d00b6ee1ca58681d561f911a32e613a4b1a5b8a3c1c94a0dbcb678f680f30cdf"; + sha512 = "11918be6f23f095b738111441cbf035a67270a45145ce8df01e6c7e5067d3b54a521094c90abaa7715ab1b0ad6b9063d319a53c3f5ea2ed0ef6d8fb124815652"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/as/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/as/firefox-57.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "e829ca5b93fd5e6640e8a45f4299eeb4c8c50716489876eba390327fba292192be4749ef294a58ad2978b1fdb4972ee8fe9a451875398cb7a1b996b887d7fcea"; + sha512 = "b5269a9b178183688d32efa2962c80d1bd448a5c378f3d6453c083b6fb5aa114a130096a40f02bb17a76d05c1ef03afbb814cd7bab2d545b7bba085e9a010794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ast/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ast/firefox-57.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "1ed6b51420daeeeb9fbc81808555a492410f51865968b5e1e8e02c0e740885f32a26187128e1f732a8297400c19d760f43583fc59ff08d1e70c79519e047511e"; + sha512 = "af1ed67fc78944d4480306d9c230bb1a831e093fda6e9ccd357f20ef8b94eb8581230c2eb918719564b427ea741eff9b8eb762059dcc4150dc79e98c4ecc7d3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/az/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/az/firefox-57.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d27affe6ffe5de90a2c640b1475ebd1294fc8d8fd15ad26e34463c9f38c25733e495558dd38f6c8b9425628637e653bb119eb3aa3915476c43955c907f77dcac"; + sha512 = "67d93ab8d23a5c036a34aeed756af9eb021b86167becb2cb42a393802736a296dfa90b363c1dd6cc86aa3f25e514b4de5d7a13bb3de511baaa98874c6a128dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/be/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/be/firefox-57.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ff03e12fb623eaf5f5d2f419bee861b208bbd42072decf6168666e23c332fccf86a75b5b871513fdf2937fb4090010b34ddf5275929bd033f9bd88123f439912"; + sha512 = "ed69789fe7db560a213280bde9ee79944a50bd2b29efaadb864cc2465dc304c39f3c40005da5f35f570dc1cdfdc4abd2d7b7ed6264b351ec8108fd1b67450ce9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/bg/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/bg/firefox-57.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "86ff0cb3a64e829b3db005baf49f4a156e2c9c3923538384b9ac0a58f659688defd054c889db1623fc04c119a82503eb0a32eca22f7c6853530516de3cfd2bfe"; + sha512 = "2484d220a64ea2087a8b68f0502b2a866d405eb8c3ffa98e571053fc6b7fb270e041691f55c6833c4ccc7884abad75432fe9ad87124055075832ba078ad6db1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/bn-BD/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/bn-BD/firefox-57.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "6a519b62b04aecc4016c8fabb06efc32c2c582f9a385bfe784e7cd81ea746fd955e039a9a851ca4798c41f5b3dfa43d037be8813e9d16e2a27b4360bf2d9c6ee"; + sha512 = "4fe4bc4b6d14d93daf49d751de73304098fac6c83172b35d1999bf205a6ca4f0c94f210b70e1cec7a7c24ea0e3bc8d5cabcda58c1e7df33e840a72e9cf9f2722"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/bn-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/bn-IN/firefox-57.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "200b35f5caf5a9b146f79de343969ff25f70f72c3021808ac837ccbc797e594109694648b4ed4ff1d11feb04a53c6d2ce23c90521951a0f67c3b84f893915201"; + sha512 = "211285374dc5dee3e0c2034fa6b2171e837e2d0ce78a3ea459362915cce71ff19ed71259bad4fd44ff82b89d5f675e9cc1ce3f76dbf94fe2985ecff01311ecd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/br/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/br/firefox-57.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "da457ee63b89cb1be3e9a8016ee1c22ee7e31ffd949fa60ada8559a396234f54658cd06da2ff952bad145e23ca5e461977834da3118962322daf601ad3bb02ad"; + sha512 = "800a2653c08bab91916e792e460900fb4099f46042497b3e27a77016f32ae83b9acdd9ac37863fb9d1aaa116ededc6902854762a4f7c280baa817130cfc7b449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/bs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/bs/firefox-57.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "83b88e141125d55c670e307351a21572e284b1911fd5861fcc7786cae06cb150152e80abdad15f65d0c0fc8d1e5440e36181f16656e2275c4f90adce77e4079d"; + sha512 = "919e4e89e8e29837e8a9af0b50422e2ebe114c23aa2f0d36cf63e81b572074ec2887031499f3b22511a6a9ee2842ea69f3587b1c4e71a684989c1cf73fa25dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ca/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ca/firefox-57.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8eba16fb06961b3b6c8305f866e1d2168e29c1eb423f97949e980a2b51772453049bc5064c6eb6df6af1aea26efc2fea1edf5baae408c18bd4e750f3c8e4b46f"; + sha512 = "6044334fae462ce72a8a9b32b392f531733f83d8db0e34f07bfdd5b95b6aa8363a6fc0c99c18274bc277b6e797f99b76e42b7affc1d01f5a83a5a47e2a96cda7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/cak/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/cak/firefox-57.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5eec8675ecff45e359ccbfc36d781514b8afc19119a5e68a1a97a8b1765504ae6c89e41ce370d37eca879f5353d8bf3fc594ea69fa9071ea1ffef06d23e638c8"; + sha512 = "a8ca1f88e997b0edee57c84d9157cbf298e27d26ec82c5aa1de3b73a38e8c9edfe9bd4f05eb32078c2d4d4f300f4561cc7a06e377f847c64052a07036fc9a30d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/cs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/cs/firefox-57.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2fef9e66dd10a224e31213d587d7ec574ffa25a09dcdecd3dff449c1b756634de906809b70e4f55b75adc0c853db96f2917658af824f3df15c16017f35c57e2d"; + sha512 = "8fb7bce6d69a6e57ee7c93013cbe8023334b4252844fe5d47a71868de2c6a30d6d0dda8776a1104b4616afd0c921325c569a6fc98f1c3b86e6fc436837d934ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/cy/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/cy/firefox-57.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "d675a1e182c4d186bb599d25ca4ae0ff29cefc70a8bc2ada76ed89ab6c57ea8b92b8ace9e5e5cd0b5baa8166fe8196ac23164dec66955ef4a0c5720a75fa0d1f"; + sha512 = "9d891997a1d2f09f82198280d2b090360cbec38296548d10ce356cce5f80dd8fd0f607b009cfc8b01d8f82c262ff50aac1dd5a0494785348eca3e43e804d8e44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/da/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/da/firefox-57.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "01087b3ab9273c459c5a665d5662a0223ef5b7e956aad9b469d77d7f61dac2b87f7c1749675a05a79da8f8d04de05617bcceb8d7a2a2b6a445a58d27adb95d52"; + sha512 = "a0a0fe3c7729e8c402ef141476f2a6e482dbd652e084fbfbfd7e10af76164fd00ee6c5f3e8590bed972cca05628676b67601c1e6e38261c4fd688c183d032318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/de/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/de/firefox-57.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "28742310978f4578153eadace5e965328e431f1d4d4d2146d35bb65aee9771dd8dd35117fd599d514070a0414c7c1c0d28b6ed5fad727b8cf7a45f0949b3009f"; + sha512 = "9c234314140c41bf8fe33de55221e5a07a4015f99b713500ac31830831f17f4fd3cfae6aef0358bcf825b11a4b0e47e9f784f0d6eeb98618d9b8ced8a2effb7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/dsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/dsb/firefox-57.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9a4f8a8a144a5516c87175d0384ec4f6f2895fc1efd7552bc79e373c64b879c34afa82f6f4ecf33e39a9a138e2648f761f5747299bc9f95a46eb742c9089b2ab"; + sha512 = "d181b0328507bf4e491e53d41a93b548f2355886f87e3e9951338857c13ea6001d6e376dbeb430dfca8be47a4edc09530c7f64e2141cb12230dea0ed14ec622a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/el/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/el/firefox-57.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "cb84f7a645fb315746566afc3a8c256ad3e04ad801689363de17fe91dc99784170558715e5696ac3c041b4a3a079b18a5efa3c18ec092067f1c0448db10febad"; + sha512 = "3eb8a6b826111249a371af07b38e3ac631fbdf62f467b3620b32a8a4cfa81e80e417ddb396fa48611c8553cd0db1813a9fb620087875a7dd00385d26060b610a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/en-GB/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/en-GB/firefox-57.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "2f2c2c56a90926c7070673e5b020f446ac39e4c60ace8a0f9204fe81a004e89f8e29066e51468cf6614001930d3c827687d893df34a3a3fd3baa2a28dc6bde09"; + sha512 = "45e1e54533828b7657d5ff11d1c6097e4c0fd50b6c603f8d1ffe804cc7ca19488a079f35b84fc81bf1324aefc5b4c82581b467d938586e7dc4b966d91388740a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/en-US/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/en-US/firefox-57.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "a7acf5cb3c82e4fb2ea09a947517b9488ef81d01abbca9c2a1aee48b449be6deb9cd42739f37a198467c3b0c420852bc6238193bb9c1aa462e489d84bf813451"; + sha512 = "dd9ae76565f0b30872de561723a5209a967b2d89131f62155ca1d78b1f34b69bdf30a7ed382c62aa59b9a386ae255fdc423f29f296771ca4bc04b043214ff4ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/en-ZA/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/en-ZA/firefox-57.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "9ca185f4b22424be7372b5d85c9442b37fc277a11b5b864093cda4992a09a390fa3532257c7d3c1ffd156e3a998d99cd7050536420044c5913421d8c9409add4"; + sha512 = "22807d9c11e2caf910b12dea7bdf9b48256d8aff417373b1b89fc98a42cf07b1fcdc33180b71562855895655ce9f46e1ff26b7e1572ad21664aac5fee6f682e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/eo/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/eo/firefox-57.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "728c825bb787b0bb87bb7036081e8107b0a8bdaa943f0677e2b3a9685eaa3f1caede0a5683a4913883fe21bedd0d8405b10f695ea2f2b17059a68bf5bfee9748"; + sha512 = "4194e80f7f4a8a87baec636fd2fba3772e92de20b1776734cbbe0391da69528e3127fed5e5dca0adefeaa82abc40a1b884a215f7ac943b1c39104c90edfda26c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/es-AR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/es-AR/firefox-57.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "215ec52c40468fbac5d82f7ba7a568a780898eef7c9d3c813036472222b731ad40a83373adfefd0a54642209f1d3d6153bc12dc49b0c4a286f824c2b0895110d"; + sha512 = "9444d57d1a1534f826177e8d41a2b86434294d2e8de725d87cf8953603cd1b671075b1f62ae0c6be0736d46e6c3e65c781e88985698aa48da3b68a83801f93f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/es-CL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/es-CL/firefox-57.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "aa3c46ed2b7f7794da86956bb10e4ebbbddb1e0dfec295e7893c6082f963c800156da7dc041c902d645902b57cb14de4c4c07ea03057ac84aaf325a9eb889d7b"; + sha512 = "c98240f2b66b8b460d6634e0ea00f8ab7b5381fd56619fcb32614dc89c2497111103f177bec27a55cde57a5534ba3c46dbb81abafe5f3e4e882603923d9ba2fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/es-ES/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/es-ES/firefox-57.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7ae1c2bfff96f3bc2e4aef293f230226783cd82ecccb0d6f38770876143ade93e12f7ddcb46ecfb7e2655f60d8c09e23cbc87f15a0b0987a5613be765d22da49"; + sha512 = "5b2df0b8031030d9f1e1869cabfc9a6a5581d400c80518386e0c2b836d1b37c29f155c64a1cfdd80d7b9c38294ebacc1955ed5513633807ff234b4ba678b7065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/es-MX/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/es-MX/firefox-57.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "2109e865e1e29fb8c216d742e8d34a61d49c464a5c6cac9c4aa5a2d4f6f4b5a89b9433d2ed99ea5d051637b6214c12dedce42b35b10619f09874ef2e84b11b7e"; + sha512 = "1858f5208a9cc15f87d3a5f368bd460ebba368d079751a59f67b5a13ffedba52530445d920d8e3fd73efe6161101c6cd157c1dc62cf182a087ad978008bdb66d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/et/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/et/firefox-57.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "42d488173f29b49bc3356d3cd9ed83c7ac63801dd8affc48235d73fa71b2fe9cd7af9a835c89787839b565521406a30cc10bf6df27be9a5b3150253834d98e41"; + sha512 = "7cf60f113face3f0c4263ee802ec9716fc85f948292d3316f13a0093ceed03141ef2330b1019297a45a3524b4aba698588cc68a48539a2eeca48845c3609bedb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/eu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/eu/firefox-57.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c6763a44e619d1dc5959dfa307908e39e9f81e11e18b5dd65e2e4c2353c1b7e06b9243c1e726df274cad635b31193ba2cf3461ea87ff5d700cfeeba46aa27d1f"; + sha512 = "b1f7ad50308507729a10d4cb62b2193bc6740fe97d7fec0f4a5ff3b14e72a4814941430d0dfe641fd1c8f7ec333732365b5e779b6b07f90ab20356b741e7560a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/fa/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/fa/firefox-57.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6d2c0e40eddca26513746f80721a951af2348e8cb1dbfd3453bc99423d57e76f9a45a2673d1f29e10c0a338b1919e95b05775937e060f437fa7514108beeb3c6"; + sha512 = "fa9170df228d9d782c92fd2a92ba35e780744234e7c62b635be8cc31c18762916eab0163c17de602052215ec082f212191f97bdf555f35a97eec46fe8df6e6f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ff/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ff/firefox-57.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "b3381922e4a88568f3d034207e7ccc2ce96e3580dc037feea0b2fb415c0c3511e15e63cbbdfe3f44f61049e10d9d09a81069a0a3b9a4b50def0ea3fe3500a18f"; + sha512 = "30aba17f5298ce341db0946f987a99e040e301b4f5b771d8c92a9adbd361b75ced431796c9917ce0dbcda2208075d07ae5b4d7f11085be65d273857222030976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/fi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/fi/firefox-57.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "7cb21fb4daa9c70ea9cd124c42d94bfb599b6bca3b00821f8482da2e844024ecf4a02bc5250e7cd4d574465ec87c04b41620b4d4cf78a0560bcad184c6c9c656"; + sha512 = "59065d98324c77aa30cbeef091316aa055cd95d9e7abb0c5895e168d75252d6d9b205717a4182e97428fccecc4d7703699dce80e0b661353cf8713c6b0af2373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/fr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/fr/firefox-57.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "4f702162126708851bb2922dad4530718cb899efd8c31241a66d650e5aa91c8bba30f7247601a21e79c82bbd52e943ad050e801719dca8257ac51d21533db35a"; + sha512 = "64a9d891781ed74b25d10afe210dfc549f9c0dbef6ac3e92a8eec551c7a97a488808e7f6d76ea70615c5f90af4319aeb92df95eb3d6495fccf53993a7bc6600f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/fy-NL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/fy-NL/firefox-57.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "765a5714a7270d00faf81c516874acf02b0ec6fa030db8edc6c4e08362542cc80cd044f639ffcc74e1031ef51c75246aed6892b84f101aba7665ce89b3e2a327"; + sha512 = "1b8968b66fbe9caaceefd65a06f0cb536f6b8356823fa2fbd0c1a5e7111537311e8aa5376c3fba032afcba515b7a7dc3ae2380e249d8acfb67ed1eade6218d7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ga-IE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ga-IE/firefox-57.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "b95e5ac5cabac758f77828379a3303bb8b62c253ba77f14c3a74f9e9663fef3838f1e221546fa85955e2b16791d1470bd798425e8553170151271587e49cd1fd"; + sha512 = "d4d39834be823db0b188674ae59b157ae0a85abb2b0c4b4772d9185953eb13745c501d7bdbf6eec46fd84dc92585f0e6c862f9acba3662359e16bf68e70d043d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/gd/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/gd/firefox-57.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "24ee86e508695f8aa515bbf9d89cac77b48f9bad6d257c2bdb1fbfa0a3183e3344e3a0e2cdda2a05b45141e5959d715db6ae09a32e8d1d01c6ac31f7366fba00"; + sha512 = "96396e9ca1743edece33274e7d0a14ad3741d146b37b65436e526604f8aac3f28fb31b2e18eafc03461231b0c179ca75157c271b44a85a3c07d8a1a93dcc6777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/gl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/gl/firefox-57.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "810629d39cc027fe9701d54c27edfa916913d857c018f9e5e2da218db2f93b81c16e9225f664eb4db670d3293492d4027a9586376a205fb51efd661ee2f4b307"; + sha512 = "6dda04fbfd701030d58b0ef48bcd348870c34159ad3c552ac284537ba841a44e9eeb627249017ee686cc165772c1e7aa4cdd77c07c80a64397ccffee72ed7815"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/gn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/gn/firefox-57.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "65712a992ff1edb57642ca1d12e60ec009acbf23f5a4a56b68d3c521bb46aa02d1ea4b03f628e23911032f6f030acfceb6ec2aca0f86f616c57ecc71d578723f"; + sha512 = "6704e4e85f7903096d70bd715ea6186e219a114741a5f333343c39ea0327a5731733b14847f1690078d9cedc7b20e3132d71be96a14752772256b5427d4c4cd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/gu-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/gu-IN/firefox-57.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2b78ea305213f7c1200887e77be4f01b47a699ea8f8e55975987912d78142519a3d19b26d82f9060cffb139cf9c560e2935412f602dc93511d786470dfd0e64a"; + sha512 = "2dd643952d8a28cca487a616d9218c9fd50289a294f40d76edbe1b154aac9d9fe886861cec078e126af72182ba5fe6cc1945fdc4c587ff3f614fa880aa9373aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/he/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/he/firefox-57.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "aa9ea68571404c166c4ce70824a2f8ae38e39b43bdf4181cb2d17d1810d2aa49640186b9ebfcadac8826347d9169c0d396f7a3375035ef961e8e8aa36209dd09"; + sha512 = "85fe1aa9c4f63dcfa541cc1a6c54b05644993a3de770031b6bee151306b7663cd481078c20ac2bb8b1e338721b7fc31d060514a782a1cd907e55436b1df3394a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/hi-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/hi-IN/firefox-57.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a2cef484eda6af5979d2d9971d4342ce184a57a383de9c22d4dcbff5ce55ab56e73ed29a03d2a4175b9cecf7ae5d73911ea9be31fde0b8d799b0b1d17357b56d"; + sha512 = "5518977fb66e44b39acc21bb97b8b03dc12f240f8570182e7920897d908473b19646df81720bfa63947276465982b53594e7398858db950c3e6849e7bd522818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/hr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/hr/firefox-57.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c5192160ca2b4fc04692ce48b4c0516a1112caa50313a7a8624497de6bd131413ed09e87a62eeae18ce363c55d617edaf4567c905523ec8296fc6b2ca6219de7"; + sha512 = "904e853143ae4bdb4951c22afa8f61d2199d374b10005cfcda9ba3a2667f8e4bfa81eb07875094e106cfec60c117391500a397ec519ad1d65a00421b2f07dc3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/hsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/hsb/firefox-57.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "463caa60951f5a1eabb7c78115b70c88f29697ae56082a76c64dead001344917c00ee6db211f8fc09767a8a684da7500beb69ec42a0515cbf643642501ee24db"; + sha512 = "7cad8d88f39c4aeaadbba6a9e10a356d2d72d251658b28d1320b31adc09f97233718123264faa2baaa87549e4cee41bf3d60d2b8cbbe20c4b5944b06ce7a1228"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/hu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/hu/firefox-57.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "304e1b44d648da76e7818dcfab2901c9ec6d4685649aef6bba8fc4883fb2d5da8bb4baf5b7608b4acb2c53891ad2b1c68d48fe18024ac47b373eefa1d680385d"; + sha512 = "087df7bc49d7e76018829940adbe0d650715fd38c57927af7c34fc9c29f198ebc3f14eeacfddea2ffbdb60d325de6038cdd29763103295b47f3412f8db9092d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/hy-AM/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/hy-AM/firefox-57.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "571a1d4780a5c74accf3e5b022923367c23f02cbffac6eb82baf82f4211a0e37fd1ef1d810db01e243fcc0ec2882c00f6e261cbf5f6bd8ebd25ab3ade0a4cd24"; + sha512 = "7ad25dd04232b7ecb61914ef6b14261e6e6498acb0ffc5760d6945108665bb97e1bd5e64b1281766434d34a597dfdd460673632dc50238062abd838c25b1a9d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/id/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/id/firefox-57.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "01107f1a301f178b5a1377dda5ef1fef588fbfd09e835247beb3ca6914ee9f7a95e6652ee2f3fd5feed123ed06711a6b255def41488ceedd562b62462f2813ae"; + sha512 = "a9dc65f2160ab88b6adbdd50fd2e501980a97a8f5066bebdb518a5c76e906b6a0acaca3c5e2e8b5dca7968f55381bbd81e6bcc4edf22cf51480a7c6e84f1955d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/is/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/is/firefox-57.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "69192251968511b76a416315fc1a35af21ed1b5c2cfe19a03f885ef1a2f99cbe65996d6f32ad344219004dd521e692c43fd7f8c85be3efa792899f9d9805b5aa"; + sha512 = "a94a576e8f6b6f50ba41ed8c8001ff7595a0a439c742a15c4c468a1e026db147868172ab5c9accd18f2fef9bfb3a152e1e02316453ee621165ab125ba420622f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/it/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/it/firefox-57.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a9b37f11ad4c4bb52d83e8806ca3088ea9c6cd9d12adefa83d63325d6ec7ca7d332fb80d5a084aa97e6c8fd608e0a120eeb2f0c05fbe50f350ad5c5370ad4b09"; + sha512 = "c86a4c41aaf0e07de359e5b7d3a5cb331ea99c9a670707f05de5d27f6354c6c6f8ef5ba3855c3e8448916b852ebbdc594e986dbc325dc31eef421e514d145dc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ja/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ja/firefox-57.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "76134087adf8f2167544f4b510c9e98f99b011dd22523345eca8d112457cd6d9d08f23453000783f31386a8cf67e502155ac8739061e59e76492c82b18738605"; + sha512 = "8628eb65c733856ee719019f38c54fd07ce63a39cdfce66fbd98462c353a81dbad97b5d490d22260505400f1f656af67b3f518fbde2e92843dd9dc66cdfed44b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ka/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ka/firefox-57.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "22823e464aadfaea952808d0fcf32e79877e63fe784080c23e7fc02753bd6cdc6de9a766847818eee3315df48ea8d08671c49d25f2f9b7b14a2e5be353179dee"; + sha512 = "d2ec85b3d71964850c3b06c500f5bf59ede7c8a38e12de70d0033a2da404718ed03f16714f09ce8a340de53845094d8e63d185c9a86a24ea016d8db31aefbe40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/kab/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/kab/firefox-57.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d5d4a5ba6a876fb4bf8abb71d89ab7ea5feb1f81c3022fc751afbd5681c3e10d3c51780145b4639e4dac315454884be7a7570bc26482dd5822d5919f227ca6cd"; + sha512 = "6ebf73f503f0cf491eb3c15e54aaa0b8989cbf21474c681b5b734bb14400c9388cd5848840c7107f02230a4f3bd41e8e52797858ccbce1bce035f29b286c78d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/kk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/kk/firefox-57.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "738a221dadd5c6568fa62881d4e6241e30d9360c8c8da6f1f55af21948133b35fd9e7f79360b91d609cf06ad8f024a3ce425dfe3001f42e43615dfa72f23eb44"; + sha512 = "c5c53aded97db7a6e4f835b459027a8d48b72a88b079f589a618cc14a48a749c41a0e66562a6483c89ef5a7fc016b3b573924c023fd166d12a90038c8d1d76ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/km/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/km/firefox-57.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "b10e116e65d57c2e6a6f22fd10c1783677e7c974775f26a8914808e942953e48b126dbc63710bee8aea2e411b5c56d6d9727f0b5249e553fb3c3f9c0c7227656"; + sha512 = "476189a0774fff34733ca8fa3ef50c4ed20c11a2cd591b41a337d94e649d3d4313c73cfec63be6b5269a40818ae05ebd5d3d4e6e9fed0a34a0f1e0166fb8b8f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/kn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/kn/firefox-57.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "1c4b4933f04467ba06b86c55d2983e633ff5213f15ad40bc91cd89f399e66e9ff5c4026c5b17c9f743468388c36f75134cb6b78722e4b47e53038dfd14e2fdb4"; + sha512 = "154ac09b2c43bde58664f2beefadea0eede18ed827e2fb7b9f66016b957685eae0f6ef203f13e1ee2200f3d0bd998f3043ceabbf64f017f09a1de9a6b8d664d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ko/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ko/firefox-57.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "a855a2fab85e2cc85ab60f90790b05d4da8aceb7e4d0d464f2589b2a6ba513fb8ce0a0637c18c49f87d8236c705576b679d258de736bc6591fef4fe1d724f1fa"; + sha512 = "d2e34a9364e5b0806233114809d36ac6a62da7add5cecdcaf56077d8286de0708bb8fac826bc2b6b237f44c6b828d9a6c44a7d7cdf7f74d12fc561d8d7028c10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/lij/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/lij/firefox-57.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "e82c6c7008cedf675ed22dd2b3d6d000fa202908f370c0ebca3c3c81ffc95b5da823a68113852c90e8f91ddf1056dae6e5bb97678fc3c98fe34b0e6be7b77104"; + sha512 = "1a69326a0636e2f7a9dc7ce1405fc80a02431a798a9ef69950266b6c6e43277eaa42021003d924dff0e82acba98705a21d75d31d6515edf88acbd619dc2b36b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/lt/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/lt/firefox-57.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "e6d927f0dd8cd5765490515d5d952eb7c94e526fa0af5f18c92c2b880a0c15b58f798bfbb8e8ccd8eb931e18fa1316ab1fb26c18a2870c2c20a3745efae338da"; + sha512 = "5c644eda282da9d486aa8755c28e1e3f02f881826d6b2679404bd17185d5731b8b1293b65b52216435ff3a11ce12e589b1f428a71a4ea976e52a5267292abf38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/lv/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/lv/firefox-57.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "28b85eec882060a0c367b94cb8af1d488abffc34c76faa0ada418c92d5c7a343b169ed38e44f0c290e1aa81eaa33c05f54deecda1cbf66fdb76c37aba339210b"; + sha512 = "90abf5dee87397da507d3932565a7e17d6936e94bc47b7f5c629c4cc4c687773dbbba8ad371c4a463c359bd3e81ee8e4222df0edb5c0749d503de52cb15e86f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/mai/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/mai/firefox-57.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "256f3b2b27c7eee4feda7f7dea86c1260220677f4691c27c625b00b7d2e9310753e5b81fc4956de2eaddfc3abfa1d8caf36a420d2ab5adf0c00d5a78e2d6448e"; + sha512 = "a50ed82251d5bf1f77fe5d44e5e16076da7a1081f3ac5ae23254342ba9dc5c70f95d1e4fb0023c5be4b72b97f12dd164e988374a79f5fcf3c90fdc9deaf67580"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/mk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/mk/firefox-57.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f441b6d15607f46246a82165c9131023403fd0af05fb54e7a1e717d38c2df56fbf57543c4ede612037584e756038286f125a8b1677bd49c6582a68c022c65498"; + sha512 = "a9f3830cd8f3e1b0b97c63ffc0ad16b9d3ebf80bd9fb7e416f7001eba84651bb0392d62c802e57f74e6c606f750a1dc278901bf81e20d8579f6046bfd791aaa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ml/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ml/firefox-57.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "21e98314efe24409f111679d954bed110d0044a54222a9962891943ed38c3224d135615734c837d345e581f6a7b2cd15a1b965f23c13eb8ca22e8dcd96c9b5a8"; + sha512 = "a8dcb1996e707d740f4b040b9d86db9a43bca02763c855ce71fc8c3fe6849621cb8ea9d83113e9972f33cbf73bb0bbeff6f730036e71e8d7184efb71467f9804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/mr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/mr/firefox-57.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "6c91df84d4375838db437776f3773584eff798eb3904f42c1454706db7de2421933a001dc6f69574d7366585b4a6922e1bc163d6f21a0de107665cb127e27147"; + sha512 = "8e62ef5dd26384e6d5435e95da28f544eda58f458a48e608dd70ba6766fe45d2c7b5e7ef2cb69b3e9a9bc538905280307d22c037307633afe15949c8e407edc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ms/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ms/firefox-57.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "5f8b6cdf80d95c8b7702f8f411ec5abeca35b41b2aaf2a3f02ae4e6a033dee9231a853b5d3da144aa13ff62d4052cc55e728dfdc7607d3c763881902cea16024"; + sha512 = "cffd43b21d3c9a00d68c4513909864f38c7f23eae36301978d4849988c1b18bd0eddefe7ef176aefe47406e65037041a99153beb649a191e532f0a314b6a1103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/my/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/my/firefox-57.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1db6cae3d9c86bcb91f116dcd82d95d60c5712be2ec4704bccb76dc8cc6244cbabc665c606bdc47dfc1f89d1bad347213b7fdab383a8997fbdf728575161eac6"; + sha512 = "921232def7f322eaf0ea95bb2372ffc653eb81384d1c60d9f40fc25517028929f81110b7c50a2376cfae1810c8b328e71d35030aa712164b79fd6570be198326"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/nb-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/nb-NO/firefox-57.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "934eccb15bfa5e99ed9fc74b36d9ace3a2d48aede41182c3f66c0250b88f089ecb4a7c59112d15b142743aee9e617137b3125caa3ef03960b3ee687411df92cf"; + sha512 = "d564f9010be1a2638474e65e9a9cfee390d7ebfcdf172d87033a9c55b469fed0c61cd1da3df7f3f5b1f5f203dc37c692751d81aecc2edb650402ff3bca9aa6ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/nl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/nl/firefox-57.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b469b7a60a5119093e9ae7fa357fcaffda96f453ce4fedd409d69ee7891b83f81fb27a58201649c49a47b0a19f79b5a028db13af87f52b979877cfe66754407f"; + sha512 = "5a6a454ba3c1d5d902e157e9fb7ad40499ddd3ffe6021eb7a27993f028ca5dcde7ba916c389142e5b0156f65a7cd18d6972b70412aeabff1bc95292d1e88a711"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/nn-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/nn-NO/firefox-57.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e4f1715ada847b40a9c516cc565908bd69d21395c81165721d14b01298c2af96c5925659b2c4485e5b2758df579818ab1508d5dd8435d5f36a13a0692ab228c4"; + sha512 = "0501d60d85d05cc1a66fbfd7bbedb7ffbb672071ddba5c37493db1131e4abf427ee0a2f37eab1e7ec41c663ae9e9a2ba36fb7bfd180c8cc99a2bed60b5d82be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/or/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/or/firefox-57.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f87c4dd9eff7e211fffb8d8c6ae4d7f541bd953f8eaadfa4b6adb41ab587d477e030e6f3b6f04ac56b07ff66b096979aa42939a283f78f68340ba40149a7ae7a"; + sha512 = "b5879d81d0f51c54419fabe5f9ef42f00869ba15fb2ce85d7eb36423127522431dc52ffb2918a77977a940519fe57ab05bc4bb2f3cda9035015cc21d986321f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/pa-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/pa-IN/firefox-57.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6036cda65bcda4827d4516927280399385a70cbaaba4148c8464b68736eb2c515494b3c38f36588b36851e6ce78a44c4f05314a4c52f915e3475d5d2f489116f"; + sha512 = "32018c0e2b50651cbe0d9310da2818f54ee87e148e12d7a195b22d14cb5d9907cdee0771b7fca2ac2e4263a189c1c89fead3aa8ecea340b0b013e8b95f31089f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/pl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/pl/firefox-57.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "7982e11b9489c92d3794e3beff168e55f8aed19f20e477789d8586256c61c7714bfa7c84fb02a9f7fd3214537acea6227336185fb94fd6ed67936de11276b4cb"; + sha512 = "929c67e2d3792fbd76c88758c23aaffd818fe3884b297b19c6609d7fcdcf4432b1920d21039150c880e14e8148ac76b9b4ad4b796599c420b60eb463a6ddc2ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/pt-BR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/pt-BR/firefox-57.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "99fd0a93634d8145721671b414817519890d08e286431358d83f7e0af5451f12a152c8162736e1688d51a70db1e6169ab5831dd52f4253e2de63c85540f58acc"; + sha512 = "dfd3d6ece181ab5be296a017baade85e2dacc4beaf9da94aaab42840bb47400e141e0c45f21ad485e9fb627f5e4d11c388309eb2be4a29b13b3987223768641d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/pt-PT/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/pt-PT/firefox-57.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ad5ee4c2e33698f545c5bb5d300b8d1fa8356757c01b7f5b0647e226bb615698d379f5968967dd91b81e1b3553ef7b30a40be5879bb73c9fd007ede10bf26f12"; + sha512 = "89efd6c0a4a1977857dc61dc7a16f47722ac9f432ecca7876d4b40417ae7559f49f4af4065320ff4a946e9089792a91c13273c7cde8403ac467d221e7ea1657a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/rm/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/rm/firefox-57.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d864ca476efb09ae3a0d867db5b2730d0055f4ae1f3743f9daa93d44d01f976a8559efd299c2e268ff96f181785ce24747e758b1da3671e49cbb3e70caedd2dd"; + sha512 = "651ad7fbf9e1ad3b71172f351712a2415d96705e1ff2e4600d213f15d1faa88f87a79b665668652be991b3fbff5f0608db78d9a3c7b44530620467a8735f99ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ro/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ro/firefox-57.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "6066f6be7e0b641c13f9a32056c9a98f0700205d45002a7259cadcbf128e7c2d0e9abcae14521f64678263cf802b7f72f360820d0ce67a0ba2ecc23fa8dac86e"; + sha512 = "2c92a4379f016cc2b91fbacaa9e212c055c26154e852b1c18b664777276ac59f9a453228bb6f34db5c38a5af8d34250c38616e72971a2ed87f1b9bae66f36cbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ru/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ru/firefox-57.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "654ed8232ff61c0ed20bc04930d38bdba2f95bdc49a6163bf7d40137f3254fbf83bb49156a2f377605228a2d6c2cf9147f24bd22ff4ec8c75b8f946db651f7f4"; + sha512 = "38bb9401094d619a09b3e505873bcb3af956fc14c342ffbb3c03b64e597d3b434cd56985b0e3ff489790e335a3e175f66fb57fc023d0a057226c6a941bf98920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/si/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/si/firefox-57.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "bf9dd06c36c6c7ce701cb7bdac2cd8874701115aaa294953b83ae3ae7556bca397dffac05a481711c15c37d4d8a037f8aa4fb6b862d01b4d12a85d755a7d6b9e"; + sha512 = "8a76bfd5650f2325e83e349b430095ee72cf411f5502418538c725ffd3361ef39c3f9b0bd37f2dc1f90fee0e54de6786c70a8eeb64d3e6d5c0eabd5f37626060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/sk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/sk/firefox-57.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "413f0389c5829b5a08f16d8f0836e4a2ecbe6605435c3265f3bb9980b6a17971e00fb5f1d5b6cc0c46d93bd71224dbcd18a8b3afead45d466801749cf12e320f"; + sha512 = "d244cd574d1f16fc400b3681360655c90b8a40666d82b9824dd113f4b4f1b4a9b058d7e2a99c467294cb1f3fa3ac6849e1c7ea8b06310848b29db03a6d445f31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/sl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/sl/firefox-57.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "5d89c50e68e11965d7f9ecc562020b48df59dfde8d79d97af3e235f8adcb4a55e0def64cc1885acdb1a4c92107c2462eeb2038b27b16d1d7219edf27e437d152"; + sha512 = "661c9b83e69479adbe5551540b650835ed85e65a1be9d805a568568acf427f0225b6cf6d8062125bf73111d36770fa08594ed6680287aef438bd020e90040d79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/son/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/son/firefox-57.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "884d6c8802c1c6668b559ddd01b3d29401f1189966626b5701ae54913cc2980eaaddc1481dcfd3143e653d2b832f6a04111a3036f28bd23904077bd7736dcc46"; + sha512 = "e93d9e6d791c9f2da9e2f57df262c3413321d44b5d73c7d8839d2b502055da734391b048632c2578e85d3014c5f14e66337484e45a0adc8965913c5a6ca0812b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/sq/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/sq/firefox-57.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6c427a6ce4adc894f348abe9fd08ee5f257394c93ee7447eaab201fb8d22c0f1da7f5d20e7a3321a81ca2063efd4db9208613d36d13c39905d1b15f68b07f0ad"; + sha512 = "79a2e9fae68a5ad21432957923a65b2b4416a86b3ef948a4e5d36ff9fd383142ce1f21bbbe86302c4443473264ddc6048506efc880cc8a446e6c11b5c76ccbe8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/sr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/sr/firefox-57.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "873da4ffcfeae90e05604adc52144dc6328cad2084bcb022ad028e7c62daa75978c077eac127371180d21fcd81e62db171b46616b5652bf1cc62b335263e522f"; + sha512 = "03f8ec959ead21c55db5c6d5a86bf36857eac3dd9d480b0ffb8ba262c14148dd94ce1c082b47085d312196baeaface008902b90729cce8af4578e89deff0b4bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/sv-SE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/sv-SE/firefox-57.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "b285af881b6d76b7d9ff2e840ad80a455f97055b71cef28ab58c5e0b6852dad674a50b8b4e0a72a3093dd5c506c7fd76d60ecc6e954bf276507a04069f7b861b"; + sha512 = "558935b691cbb68df102a996766f536e361778dac12bbada54e7b944f8f782bf2a03ee3f9cadce40269efe66cefd2a73bbcbbe64dca95d4826ade237c994e35b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ta/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ta/firefox-57.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "b5efeb840ecead2b84ed9a7e32a84ec469ce25e473ef738d95adad958db6eb1b5da3935e0f1af6155d05b10d341cea7ff48bf9dd06fb8b6527dda87045cfe6f1"; + sha512 = "8289def19004e12739086e383922cecce1983c5084ae9913fdf7a7d7bd3ea66b89de49eda7365cb8bb0634dcdd6fc12052f850b26924859ccb04f26d425967cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/te/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/te/firefox-57.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "f9e284a4e5fd2927cdfdf51e7dc5a12b9b47d1fa9df7cfe3faad694664ef2db939d3722ef80f798c4adfcd08db7360da97b2bdd9d64978f899e679ee19adb305"; + sha512 = "2ae2323bd7cd6752d3841e5a8072f5932063d27d7702dae06d4401273d419c36ef9e4ffa9b3c77ceec7be95e03707cf33711f4f0adb8ffd3b7abd796c5f7aa91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/th/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/th/firefox-57.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ad0d84915ba72bddd55a44d79863aecc9688da70863e4627d1971ab19d0b1f04dd0da24d7e5719bc141cbf8f747a9b714c1267871ab42d2101e707392e2ceab5"; + sha512 = "803fd7e692c85c9f65118216b49119bc05fbae18c04ac80880f334976aad4a42da58b0da10fe31ed577b3fe8c5e46bbba7df6fba99d814a4248729f3c6b09cd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/tr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/tr/firefox-57.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "3792e10afe5d04716bd759b694a2c486a02fd47b89069d263075491982367ec0e41c9fc23bc8388af2192ae62220be85bd08739ddea11e78ed39d83354497c3c"; + sha512 = "db43556af5a05ceda590a22b4042566f2b68e7c22b70fc4896c4c67355629b32096da4d1f71611fae22a6ea081659d57095ed27ad841abb9521f10b09e57f0ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/uk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/uk/firefox-57.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "0840194bf1aee9fc5271cd8c63ac864c629e1793551ec1a15f59eee356be2833bc0616e66df18df46a5e2c14eb259bec5062672625325d9d68ac183fc7fd4bc3"; + sha512 = "ae13aa237a3d531ecc840d8f4b38e4849e97b082d49c46e903875d156c0ff5779ee7653179a78c865699df2f830d868e1074d8e32cde1b3b663296a5dc947afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/ur/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ur/firefox-57.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "285c75aa425f6ced8ba5f95b506d9ea0d5ffb50b59f860ca67fbe4dc13d00df44e8de87a815fd29f24851baeb12de0d06f378f43a9e41714d19ffcab7fd76293"; + sha512 = "32acdc008ae647c5d1f0b9ccc437ccdffa433db790e6f0e2c9de53d908784a21c08ec8aca28e6eb130ce39d57cd2b65b593d1702f0db0d6d47fca052064b832e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/uz/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/uz/firefox-57.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e84624ec9156dc9546951a7fdd0e4fc440ec47d05e0ae3ae97b7eb66765b154eaff5bfcad59ec3f8d3dfa0f40c110986d0d069896d8cad234a95758c19104111"; + sha512 = "21940f34975ea474f4e78c9d60b4c85269b60e68c5200a9a6509c61549bb38e46504ed010f887daaee85c6a36780b8518e3a4cc8de0a2a072104b88347ebab8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/vi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/vi/firefox-57.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "bcdfb25758096b10ff8e24c9052d8cd78a5560657133232f4c99ff7aa7359714ca9a41e83c8ad11ef7c50cb0102f206b5908259ff47f9772f659c36ceb1d195b"; + sha512 = "fedd5827e023861892197dc17ed8d2de39203f7a9ae4213ca99cce6ad1d9ed7f50613838526dc9edaa697438d33150a3987bf5fdb5b347faf0081617c1f7ab18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/xh/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/xh/firefox-57.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "0fccb36a38403e24c0e53e8b38be64e7588204e75e5970c6bfe68d50d9572aeafbe9e146070d1d628b6dde151ec2e05cc5226e512022d178e487556ade16f593"; + sha512 = "3713cbae54066f793187c5d7cfc69c544a54e25b77b4dc52bf653f05585b9ebf1ea0f2d59eeacebf46a346240b4509c40dad5fdf6caf27721c25d3659cf1c768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/zh-CN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/zh-CN/firefox-57.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "28cadf527919cdc85886f0cc232a839942524f72164a15d0d0a272110de474908d50315811988197a07a8cdf542a9fc3ec1a54ad6f390b0cda7f30d0890ddf10"; + sha512 = "543104bf2f065bdcd914186e8ea46407f7286409cd229d9341f639dec9a8108e537f1a8f82e918514fd5fb104136a26b5d6a2f026813b391703047f614718847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-x86_64/zh-TW/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/zh-TW/firefox-57.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "01e61bf83819b77ee7190eb2f8da3d9cd6ff17e913fd6e88646f72f44b275ca29b461e4d3f6ec962c77c5a69fc0ca8dcbbdc87454616ebed308b514102f28bc4"; + sha512 = "5c75f4da2525c076ce270be57ce22aa653b7c3716b971964cd0560fc0069927083de3dc662097eae60901aea28737626c64507c82f76eef24ac350104571e9ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ach/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ach/firefox-57.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "6fd626194215d93e3027d28fef689525f0b6c57173542e1474a7d98f380c3b9824b7fa2191d689d9335b5be4d89920e3caeba36cee1f27dd6a8ea098e500c4aa"; + sha512 = "9de80c393b6ad0c6042ea8867980b97fe41a68713539d7c7b3479ab5b0a7ddc4da3208b24e42c4979003786593d3d1ff73db0035b6566edc1acb2600f8a1caea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/af/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/af/firefox-57.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a282bc4550e59edbe44ad09c0ad2216d37c3c825102eff41ef44dd804dcb20635b2a02e98ecc27c71c932065ce8d4ced5298494a3792854880a90f64aea1ed93"; + sha512 = "0864f0127acc2fed3ecfda420b409884fe892427c4d2e8d9df6a126a69c460a10b302dad78e9c34c6ae73609116e444d7210185302ff072833387ba5e7b74627"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/an/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/an/firefox-57.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ce20afe18b8b2c9665a1b34674dec85605ddd351025a9b70e755e979f6fdf64c0882254563dda63dedfb610b8a42784b9ab7bbd4dac876dc9fe3e3144be3dc7c"; + sha512 = "40d613fcc5b6d23b69bb56fa2f0537ff440df5a6a8ad49f79461817a2eb1fa472cca694042e02716d3b8553d5a26581c0ddef133f3a6b961c8343b416d2aa5be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ar/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ar/firefox-57.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "2afd627a2cfb3d25895c76a898cf025dd95ea212bf935dd46cff493151255ff152107ab967d9caca61e5bdbde784b4cffdba1a703a1d8c0e894ca0642daa38ce"; + sha512 = "3a3fcd70d11d133477852e450e2a5312d52c8d70d6ffe5eecfd906e126e4d1be0413b580349005f732ecfb375998e893e946d520b8190b0c1412bdd6c8fc1cf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/as/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/as/firefox-57.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "259765855256a6386804213bf1a948b1bebf382df085cb391fbd05cf31acbcff1ead282abd118ed89de0b8e7772b5327c32a898728270a29195222266f940293"; + sha512 = "d88e4e0b7f73b0eaa2abaf87562ba9693dd0cb50a8e91ee362e9df8867116af5535acf7907483e9fce0d9b416fadbc07b57d29631898780321c226c2929618e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ast/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ast/firefox-57.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2cac1679b674f8bdfb8d0adfe0ee23550fb0289d436cfd9d815730515d32d66f61071145244ca11dd0dba5885bf52ad8d548815220b909e62ecc2e866376730d"; + sha512 = "fd5adb4a10b2c3a18dfbe1c021870377a1c8c03f9cece3ab4d045acb8b1ae1fb56b311a04176bd925dc5f10d9289fcb3347c593fbe4b61d6c732746fa24a2027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/az/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/az/firefox-57.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e709408f276677f6393d2da954744d70cab977172a61e95177203d54c1d590a51fb35cb35aae202159475f78710486c80fb7617ab38bdcbc48c1ad3146f475e4"; + sha512 = "f94ffbb20fca06b2204ae81f277abcf31011ccc4910e9c3408e34d66796972c063d07c45ea88d9a672265c6ae8af2d230d6dd511bdec51a37abcb5792db31626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/be/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/be/firefox-57.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ad5ba8e3660db6a452ace1570d653a4405d3d86bce834408f7e2f69931313903aec2c9b1e2867cfb4ddc6a8116535e266d1a8364a210647475f1c11f1a42d2a1"; + sha512 = "728ba0c9204b45d722f3d4249cf2b6970e75be540b744178e6a1e4e08692755c344815294a98c6c7d231a44383bd2d606bfb7ffb29ed5d7d077050e34d1dcf37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/bg/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/bg/firefox-57.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "0361f33cae76818dbbbe6d880b4d9d55393847ba38ca782a32fd8561a2182aac5477bcbe32a84196fca980c1e5b88f3de5f2e37a8d3fbedc3e7192018ae691eb"; + sha512 = "396b18d49164808d5199cc2ac53868cb5a4639d96ad49cd33edd446aa3e4e65a347c08b887eb9b0eb4f4765795137d0296d5f37891706bbe9c13d2c19ad956fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/bn-BD/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/bn-BD/firefox-57.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "590c6139ed81c04b8aefe1c7047b62418b5f03ca25f895bf61f31065756ae0e7111f500131f59d5bace19c91eec6295d36333ef672b0710dcb3eff7937355901"; + sha512 = "282f309019a3d45fc2ed339b1e958bfe6e332f679c27d34a6c5e6b3fa5a45412f4aa7b0cbc7f520c1ee5135d95010007cea79fbfe35965c0d7263107c971714a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/bn-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/bn-IN/firefox-57.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "0353cccd7eaff7768578e90aa88f2e83523d48fc0b982018a373df6789713a3b2c794f3cd1585b4a45c21e906f8fd502672bcb66996f7b5db32582d78fe889b8"; + sha512 = "cd8a2fba1a2d5c550bec9287204d2c456e9c3ab8cdafa04455b6b2e706f2906786dde1183d58f7a84a7ccba7a2f4242dc4b13b30fadaf1071fef47f781e7cd39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/br/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/br/firefox-57.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "5a049250b11925ca0627ead2866aa0b84ebd5f3502c892a0bdc4a5e50e72750618228fda77259711c2fecf0572e1c9052d5239eb97f0960700c7e664c5bac4e8"; + sha512 = "aa057d1d35a386d21732a235d558177dd9b2b0cd52d416bbbbb482eb62d181f69e981cc7174ad4805da0b06325bb1cbc7a9abaf050ec713e3c4b49e8a40da9de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/bs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/bs/firefox-57.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "8b01fb4f35067a9a4bcbe045609ec6c6563401a812361ac3eb6df1ca0aaf0a804f485da7be220dccc01d4b8e4cfed96338120e3b1def1dfe9a0a04c1b44ffe26"; + sha512 = "39392bb6e4dbc8d359545ce996193e22187ac14f795221231f0d9e74c3022b4757599e03d1862cfadab10f78d8f944651b73a64c8c16226ba1bb9e559fa1bcc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ca/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ca/firefox-57.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "f3f9a9618ccbfd2668c43619b3cf0aa6b3ad42814dcf3e48a828e1555a6d364245f3dbd7721ccea38fa7fbc228067d0fb47be66a21efab22ccc0fb4ec3769204"; + sha512 = "c046f0dd88b706277781fdd9f88ba2014438b25a99e136ce7f3dd34e2d7df18496398f5bec5aded25a7eaa219c176f874e6bbc4e9ecad80800bfaaae24db2207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/cak/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/cak/firefox-57.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "14392133ce23b7231b21e531505f711002c908b58955b2756802c8718241792417a841f6c341722e249d4f0bf129791cd87796df3fb271a13fdd2038b8951090"; + sha512 = "532fbb953baa06ce5a3a6bf2ec1a4a2e0ee81ef297e4a02b00cb27aa2207143d40efb230f090225157a2a0c47dbc6bd939d819f9e5644ab3b84740ff9eef01a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/cs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/cs/firefox-57.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d2712df5ef00534b853420ea954328e92fd8cee2357357bda7929f174e9cefd6666e2e347dc816c5cea2f54efa075c78ccc6de42c9457e12b8744a89d775d904"; + sha512 = "78d880bd4ba71c8b83949e51d3396e2d192e825fcb61bb2146376605e4924cd10b4757fcdc2e55547300473527612c00327625e4c2a848afef22794d26837b8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/cy/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/cy/firefox-57.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "bb0e33a04190a6946d3aaf86c68fba9c52b7417cc46ef7310d0d8aec1e79c7ad47f988f1be48213ca27e664da98b35f84bae28629255f9941f056c51109d8b37"; + sha512 = "f55d56221c3457f934dc4133a1c9c962e5c270f93edd78b5e815d8b8269f34296107c9eb576ad9eec75f1663fc111324cf4134ff18cf7ca93c0f7e5e7fa5a348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/da/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/da/firefox-57.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "1b5cf9c35245be1e9aafcd95e4cd54e5e67fd1e9ecab3eeee19fad050bdbffa9dc972c9cecb8370c5bd09e3e49348e199cba4959d46763cd59fdf74c034b6928"; + sha512 = "329cf5c3d30ad87f38a47385f94752580fb3a2cab3ab1e01fc6557277df101dc0f73b752fa896b0bc065ede104e7a2906501f3a4c7d52e2b9df952f3cff491e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/de/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/de/firefox-57.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "07cc00f6c3f2ead40425059eec604b2665bb7bcbd1458f6ca79111d9a903a87de6306fac437d951d70f0b9dea49ec78699cea3beb4fb26eab9eb191fc6d81999"; + sha512 = "d5e5854a87894d5f1ad032494da40f9c35177f9743a3106d26aa14fa700539aa5770d99b33a0f9cf9162a0c249929f48b5a78451096d7b22e2f3838033a2cf5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/dsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/dsb/firefox-57.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "1f4d29c5b8a0ffca63eba1051ac9fa2e24304cb4acc726557490825bdaa9e6967c6c79c80c00b38195ad98f14ca4e789720dcd1ce0e68fdf6d0e89d7330a3563"; + sha512 = "03213881f204cf41bbe822160bb14fc309cf75b69efc41e70a589a0512f03ed668a3c73ef0048779405105cacaf1c08bcff222cee6e04ad095c5d082315a858b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/el/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/el/firefox-57.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "37b2b81afe8d4b731057c100b454e24e6bf396c6f70020bcb67a2036a987585775d8affbc978606dabd15729d77d024b8cb9217654588376689f6063e5b2cd13"; + sha512 = "024b78db62a30c9f353451ab01cb88849e900cf9dbd4850537fed1ac55d99fa3f454cef1488c84a5e990fd38227fa62c161dafbe4c6968d733507fdcf4610b10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/en-GB/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/en-GB/firefox-57.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d3deff040bbaedaf22dbdbaf594cc594febf3ae7cdc89b5de270aa6534afaa1adb67d7e33f9dc8e48faebd6456bc19bf156e60be027d0566816b31e99c98851c"; + sha512 = "8433c61dadc56ef837c6ea20820e992fd1b0eddb95ae372dcfd7d27a10b830f83ce7ac84262fde306e07daca94c7d431cf4951b8f043dd673dd5114dcc9bcf7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/en-US/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/en-US/firefox-57.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "685740c39f481e6484a25f59e544c441bb668f0ec1d66cae625d633a94c756a640f14148571098f26af885a4620990f7ebe81979ad2dad61fce19f1e922b7dd7"; + sha512 = "045c2bdcaa471988fb83f979d4ad4beb78002cbb26a40291a2239bb8de1059b07dd648e52f4164b2b2bcee1eb6512573172ec50d0b03aff665fa1a3c5aa67a6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/en-ZA/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/en-ZA/firefox-57.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "3491e2c503bd465c85b080d9b55ee7f41363ce84357d272ac5d12bc7280f2041f24b4ebce162276bd302e8cf10c6014925db60f629881d7483782092c00accb6"; + sha512 = "3d7e0668083a7abcc4fca09e8def3d5e1b9de8d66c6836443f453bb9ab9dc191e2a3fd680d2b68348fa9803958700b070a6865cab93351c9a3bfe655880ad887"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/eo/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/eo/firefox-57.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "5f7686a6e33359c8e2465f3fadb9d3fb273be8355fb9aa262df5fe3ad37a0cba6c549191ae23af03cd67156fce49db013a8b92e335dd64483b014c0477abc696"; + sha512 = "d041ad8f78878f32e52c970ed2b739ad159a36cfed882bf7aee5dbe24e0d7259bd72c2416465a69b65ac78dc77257ccef74a8136796b2b4a8b02333bdd803333"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/es-AR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/es-AR/firefox-57.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "bb3a8fc248ba0109279147bef3e08908560dfff27e5aa771d4395a5b202810aefd53e58f916295bf4978708351c04cdd5d33efd9b5b19d74f86d60dc56a71224"; + sha512 = "34c4653f3d76e079c125c19d0773ce34ac8d0602b178ea23ec46d17ec599f31483ecfdc778a55c33fffd98a6ecde556055ef22ea002c421699d8ee03fbc97b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/es-CL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/es-CL/firefox-57.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "6aee5d9019a087c07d5c3974dba4883582c2d5e7d0e8432d4d7bc2db211a112cf6153bb5f3da42a77883c34b06b22d5d6f0e7f1d50d62a1161e9cce42ef24486"; + sha512 = "5a7acacc43917c20fd3cd15c855afad9bdbed7225f8fa710821ac779fc53f32ce593d176b1d06ebfcb4b16eadcd61a7192efeedc500f387f14936753fc6aa2ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/es-ES/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/es-ES/firefox-57.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "caaaaf61e57257da03d1f2863464fef30b56cc4cadfb1d2ea7706cdb754d81b1a0bf999c860efc674d8fa4a94a48281f831fccd0908b3c2ba539054e2ec80a02"; + sha512 = "07daaf5a0d8b80c83baaab94820931f3490bcfe7ff49e7bd370dae076f9a07f0f723b39a2abac02790e8e8dda6ae1438657e68fa6220b7ff92ee4790fd4d5db8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/es-MX/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/es-MX/firefox-57.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "cb592d991d16756061ea8fce8954a3d0634e1940ca2a063e7f3951ba25405510a95e083cb69f391588e9089c7add02bb0d16f28ebf3d18cf6c260fd117c58545"; + sha512 = "3d3ae9664ad67a04a533d57b587e1f05eeb2d5466ac8e8eb1f54d613c1dbbd85f9a1a261bd79699e3d97f2413c86db4f765e205435081e778213ade6eb453d6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/et/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/et/firefox-57.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "33e241c60b202f38fc686ff0fa0749c98beb281fadfd874e69ce6c94f23c90dd59f2cc1cdfdbfd2435a910cd68ff8820929064020b62d4a6e30127efa3025d6e"; + sha512 = "ab9ec19dd588e8d2875648ed8b53cbc6a26e3f5971dd89133729095b72f320f31e5e215814c6725ccd6a1abfe08c005ba0b23a304aedd3f6300116f756446c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/eu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/eu/firefox-57.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "0253e4f86464c775e84d79d393cb33977a9cc1be269c1753d6edb39228d9e3ffb6fb11f31759e62b8fabcb2b490e3afaeab02e99aab18ed1035bd349b5c77bed"; + sha512 = "41b31072034bf9eadb52e12b78590ff986439d68e5c3b7a5a56fd0a8b1d1cadd7b2fb9dc53ec1245ac99dae359d829af697a542b6fc18511b02ce4a6a96595e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/fa/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/fa/firefox-57.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "bebd048e309816a089fe81e5bbe55c65aea5e1ae5dab509089d12b00f99ec5ef4005965ade424578af21f6d0f8ddd2d9ac9be1499bb050c5b81fe58a6c3e77ec"; + sha512 = "8d53470688b6130c501dc6aa2e500f14512bca8d61a17d60e71e19f2f6326c52a641bb041895c477645776c5b42d4da846e99aa81bb8baffaafd0f57b0c1f57b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ff/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ff/firefox-57.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "636114444a5e81b939f8123cf06ac96c3f0f481269172c6ac64480694a307c81fed33c7d9f1531f26a9298eff2134bce93c408d5bb45d4e611adb8a912e9d79c"; + sha512 = "164f772a9b4e34eed65d22afa4d28c8860c13101da5866612ea981009bbb0ec849f3b5325b0c0ae6de55cdbcc0d09e18c10ff3504f8150a5182927f74376d046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/fi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/fi/firefox-57.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ba0766f65d590fc3ebeba21d9ef43a958928b0748e12e2c5b7d82fe00e74a06cce462cd686d99e41317e4afe65693139dd6673f133ba43816025543f53af355f"; + sha512 = "df43ce6144f4e51ab6933073ea52ef0cba29d882eb1daefab298d1e111ba89b2574357262e8d0fd0d7a61c69c1b350b1e8ff72077c7aa02138fe364d784025d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/fr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/fr/firefox-57.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "410f03d70413cedf2434ce6cdfeec3611f772059eb46a470b2fbf851d76a58249f4dcce281489f438df799c4a81ddd98410f7d2a5801b53515cb7a13ae555a97"; + sha512 = "9631b7e8f058be5fd77e34263fabb6666e6777c518340c53dfcf5b777f7254d91aecd4a27b7202c2020eb7652501b7d7334b1b5320edcbfc343460b93018de0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/fy-NL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/fy-NL/firefox-57.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "afb638f901404516acaced85175605b43b4592bbd55db7d55c2ed0011a39340565fb6191b7a6642e76ca44ab9c84d3545d903b1282fa7adf71db6080c8619f8b"; + sha512 = "6c6e36e93525ab0e486f1ec2b602af62c4b4b63447c5ab2ec963c4fe40ff788dfe8c64b2967c092e4c86ace117c13126de213b3b94ebbb79b20284db02bbc89e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ga-IE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ga-IE/firefox-57.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "94807b2a6b867dafadff69d99df866541ab442ab97b264e93264bd6130761385e9f7b1235f4668e25783b37eaab7bbfa15bd3edf085a7c563df7050cc52d302d"; + sha512 = "eaa680920e3ed60be14053f58dff4745aad29626e37e79bccb62f2e3a2892fb1fa07687581644a9b870b49b7c2e86a02f0a86f22257686fd66097808cbadb96a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/gd/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/gd/firefox-57.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "19774051018b2b74650ebc6082f92161b7dbc2257d212d592cfc881e7daadf23657dc9d6375168d54d74f9b2ecfd21e1e44a418185cc4dc1bfc360e842ee7fde"; + sha512 = "d5adf080364623705822087ff79432ded2c1ff2e7005a4bbcbbb6198f3d02ec072e3a266d72bf7aefeaac5ff208beda38c5976804d396b29315faf9447abd249"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/gl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/gl/firefox-57.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "9200148aadb1fc1ee3b3481dbc2d2d9a2f7905fd5030aa6c3ca908765150ebfdf8022ac18ee8ff712d46f12d5d9c4f51ee1ab41f80065e8642e4866923757e40"; + sha512 = "a4ee4f5c0a8c8f99263e114e49526270235a304176bb75a987509ed4c3a4c0550e6277eedd7418755fa14854ce781c62cb7fc3340a711e2d2499d514a766a9d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/gn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/gn/firefox-57.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "efff686e4c472629fb4f4581bae75f5a41ee14d4e92a6de908663a9e755736e75a67963b38fbcf9d88ebda5a5a7a1704b0ef30f64019e370e638a73039e62372"; + sha512 = "a59541befa9ce1ae2e24a55b9bc80fea54175628db4eeb3557b101f715a84c985afa1c95958882841e76713ab5e237742ee427be1c1151f0abea1394bb486e91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/gu-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/gu-IN/firefox-57.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "6c60b30e57999dd04f2b265836719748eb89520f3ab848c19e4f25b85c31a83c52a40b611b0cdc2ea8be8b9df92e75a31e0c9a462676d0ababce51e8f03a897c"; + sha512 = "252814b7efe0ffc063142fc05741fc3a06ab0416fae0f9e3f0a73b0c320a46ef94732b71af936f11486d1689a9baf12a56bbc0d8a6d23b25a8926fe3a4065ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/he/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/he/firefox-57.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "5773b812756d20e7006389c14cd94d2e12fb1934e69d7725ffe9379e9c42a06b2f9f9ca32b72577cab5ad43c08a7ec5519f02bf90365abfbca69241c9b159cd8"; + sha512 = "3692e92dc7cd18798d3360365b8936228056cc385b2021dd18f84635b9e3975c8767ccc006d5e4d47021c8bf38945141ac4c1bda8c07999339bc4cecf08b6446"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/hi-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/hi-IN/firefox-57.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "df5bad202fa13774f46c582fdcf7ae588908b1e50194f4ae46af9be2b693c5fc523b7c127ec5905d6185873fd45f3296f59ebbe69cddccd1d9bf48f3cd06db32"; + sha512 = "592c242e76d81ff06276c35660fec84705b0bad72afe78732be27aece21b27073966c0dd5d227c29ce33f020cc3eb9520b11e914741cbc5b1c95cf46b0655a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/hr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/hr/firefox-57.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "6a4a22b5ee9bb6fd86e016882b3d33f33f2245027a869c10472466e0c0d40bcca2ad5a6b76f92298e5aab174237976f6072f47b85610d5567ebac955b69f3c34"; + sha512 = "012812399e63eb6628b78f91a8311511d16186d510198cc77bc0b7fa191a636875f9a1bb83fa350a4ee43e2cc23db412548246451a7fcae571d1787ffd557ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/hsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/hsb/firefox-57.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "22dc98ee44d6b735f6c56127054ae5be4112a318eb7334b3e4455c1315a4cbce30a90f3f67f2767380a23e9bb2a25f9ece51cdc97376a590f0ea48edcee12015"; + sha512 = "82617b5ee0e3fa396d72cae69221af535255c602e8c0f220c15b5b88a47bc7b2326dbefb21b13dede02effc0c8731dd2a7739a941fd9d03aa4ca1dd0eeee0336"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/hu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/hu/firefox-57.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "28e3c20123999d2c17ff66533db241e6add3f9c4a3d23c1e9fbee3d2ce8748d8a39a3f1b1ea92fe8231258ecf2dad0687a46b7b00c3095276d79845c7a065156"; + sha512 = "e71308ac39d241bf5a52cde9c0b355c07687ce7e0aec67c8a6c63f01d4ebb26bd877ae7ff3ad1d96f3c823c0ded0a4b4bf454a5de92dd2f88cf9f83051dcc758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/hy-AM/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/hy-AM/firefox-57.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "d6fa2c684613009b2865c1c4f8de8718a41fd5e21cf395de5641251b175c30dde405f421f2c2b453e151ce7208474ce4f9d9647e5477aed4e6ff3e9a9e177921"; + sha512 = "79f56fd662bbb07de614023d2bf8ec4fbd767c4bb537f39aaf2152ff166822cb90ad32c47a6e9a7d90f5563fab7366e2014cf82225c06d6597e6d7ad0e13c31c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/id/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/id/firefox-57.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "5d020afa3810b1ed82c61df265c6a6506f5b86de23f71ffabc2b1124e1664a3539e4d8e21a36aada76be854af333cf1bd053c62a5f82488369ff6b9321eccd4c"; + sha512 = "9c0cc4344081da052aea438682f28e79912b35d687e47865965962b723f07c5cd1ddbb68c11316bb24f0f9f9585eed6add1829e54d7da300791bd5c35dfac0e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/is/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/is/firefox-57.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e5ab0c5f8c52094f41f644318b7b969faf494fda35ab2c29b9c2b45563d6daa0b95b8e2890dd651514d6f4e7789b8d3f439b5b966c3b466dff7b94f07ca88293"; + sha512 = "806d61c3d2366cbd8dba8e5744f00873cd2be08041b24e32ea023dff3dea21041336729e95ee007c0476f15f5617ddaa97462e5fd1d3d119b81619b7d193535c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/it/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/it/firefox-57.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "246ffecf1d0eed68fac533123190b1b2a29539cb00f44ae5c8b72a073a829f21daea47f706024e980cc63ee05f510c920b5bba9b7fa11a150818ac741049d862"; + sha512 = "c04444e7473ad6587e97441e56bc9a4c17755e3a641e5bc9e841d411fdbe64e876d0c17c374e891ab2d30d35d79189ef1e3161d9dec98378aeaa40752abd22b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ja/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ja/firefox-57.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b2c045c1b559fbc91d20dfb2abc89488503330ede0d66216bef4592e0bab3d469f5b179c485fc0563ee345b204eee770ded9b46abdbe9e4b381af08018a7daee"; + sha512 = "c68fbd385f01ce1609d4a5dc0e111bb8b8cc85b4c500acf894750ed630749e5c6061e901d9a08c3f690b429ce1adbbad2b448778a8d746805ef7a47dd35b2a96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ka/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ka/firefox-57.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "42c4f3f86dd7d8225f1e51a74fddd5222297d2cc1ed546c768fb16a2440e53e679722040677ab22cc1f48744ec301ca639a36832b4d72df527fdf136929f90bf"; + sha512 = "64d4a987a2e41b3c3c198786c55dfe0fa092d4e0d79dc081a5b155951d1ca80305c2af8862fa1fffa60529d7f2b3104d9eab6e87260f7883195fdd2d2afb9fac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/kab/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/kab/firefox-57.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "f0817f398bfb1ab4bb4061ae0f010d6b782826fa64191cdc4b907f256593c5f975d9ee19e69119ea7bd1d5eb6c3c91a59d68ea57bef7dc3abc307e676d70b0e8"; + sha512 = "91670abf15f57cace174d2d580135b4747f3de559e09c73671268c398317c069062e68f1be6e022eef12f593eb74eb59dcd47a91ed63aeabd0e0b52b11af0443"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/kk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/kk/firefox-57.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "c10356919c509b3ee0040ab327504c68d3d79d35738cc218e6d2aed448432193a2ca5493d4029bf636d160a945bfcd68789832d99d55240fcc13c5296bb71fc8"; + sha512 = "519cfc6cc264ce83663076db8b0cdcc70c4838b2ebb920160199847e013ccc207cfa25e3e286e80f56fe8a57544b61692c1cd4496681c6115e18b57dc9d4b086"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/km/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/km/firefox-57.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "e8ed8ba59655279495afacbb94b5fa6f5a38046416dd7a3036cd278e26123714746fdc805a35590c94e05ad688af4474af06d0bf2b3730c1b6266576cc832997"; + sha512 = "2bae5050a2c2e5f474fa97c27b75a2b159726f6950dd46a3ea133579f55036aefc4058b577aec477b23185cc17486ca7cad8516d8441743c372c8d30f59956d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/kn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/kn/firefox-57.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0c371ca752cb60168d1527340264906b660bcb7a4910134bd95c8144c21e7c6395b143d491c9ed0ab1904626b3993e7a802e89117ec795784c66f9f7e47cdb44"; + sha512 = "7805f1df1fd0d7bf8f907a9175fa45731a0ff5e7a4a80635580940938e3bcb2deea0b858da2f3a41f1edfeea4b43a5555f309759413d9533992ba38836a6126e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ko/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ko/firefox-57.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "934382f0a1d568c79b380ef0dfd969b68a2cd06b9b9d388830b62039b0232ca058dfa3ba9f17cac7bd45867fe391e50fcc183823377431d82cea1d6df5d7ebad"; + sha512 = "1f4786150f422b77ce36205bb82a36b59fb670c4a7c040c53ab92c9740826af11aa1a7b8fd9884603ffe84968154e1e5a213674ec4b7286ddf74794a767df04a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/lij/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/lij/firefox-57.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "8612b1599f10fbb4b2161ea64593c2c71604a483d0bdcc2239cab316c63b0bf3acd6cb9a65a652f9a6ff91e47b02682f60718d58580a6c660932550efa71c3ef"; + sha512 = "12da11c8d947b7a29d7a3213996c02cd13576b0dc1d906c133f28d4a58d6ed4f06fdcab2552915630dc9c4379d81334985ef4270078e71cee853a0fa6ca18a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/lt/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/lt/firefox-57.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "577da9aa99ff5ba653d036d7c79f743ded7ee5b9bdded8650338eeae72a11d85304c0ef9c035f8477ef460fab5e1e4127b04ca32748f0e73e4e7caeeef52bfe2"; + sha512 = "9e417f4f5a4b983f74764f29f17452218541604a84b171be1e9cf0f2dd9fc9823893724a32505cc539126d85c41dd7df2155be43e260b7d0f7ddaf300a2a9327"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/lv/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/lv/firefox-57.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c34a63194b5f88c59d5b5c1ba9a69fda93d6d6461ba65a6aec8233f573a28b8ac420c5806c98c20a4f4766b58e901a40eda528b7750d058c515abcba293f8d78"; + sha512 = "479e8048db0f5f5adb0daf99ec2f026866d252826ab83bb403f520cec6a26c0bbe6f3b5f53bdabca2e9d84441af692a4183f0e3d84973af54db1ac9a4d32ba22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/mai/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/mai/firefox-57.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "01aae7ae050d7bf75a22292785cdb9bb1e6d37ed571118fa8ee4f27b7052d405ab99d3b82308dd4b347eff3d4a1040dc57438c0c76d6d9db7ca8e151a25c3921"; + sha512 = "6d74a33de4bfba330ab6fc3be8857cd93765955670d416051d1ca6dc8b1dc6ff0cc16e02971739383b0002b2f2a105f6e4e1253214a83a8dab3ea1f253a9b68d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/mk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/mk/firefox-57.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "b7ded40b4d9855cb8a0a9854fc69add177e53725d7649c171a803a9245384651962994e050e46c25b734307f2b8df6dbb99c0f7e7085f2a8f380b7453a755948"; + sha512 = "be1053acc188e7507bc8c4c3dbd775c80d9fd39efa2abede643a087220ffcee2f4bd10e3f3eb24946ac03710adfe9de14faf25cacfaff8d28e0f4317c6a6c826"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ml/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ml/firefox-57.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "08c891cfe51c47df214d169a767d1f6eb1a229857759cde979b41b7d384d0f033c11b44f5d605ef6dd6fae0e553fbb9457f3869d3719b241d599416091c7ddd8"; + sha512 = "8158b89b1daa8ef0c5cf219ff273f9b2867c2ed1149be2d5ccaf9b599909fb1650c8a4209e24ebb93b207a32f3ffcda08cbd898b726ac7ba4a8fafebfb332cc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/mr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/mr/firefox-57.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4f7219a2a5448885a5ac8867fe98e3c39467f540c3e937796595480a20fa4daa5b81b6054d0dbeff0a306d920dbdebf6c7fb31d202184bdd9cac2f4c5fe5f705"; + sha512 = "e6c8d2bccc2ed6a19ca6e088a3d80989f5ef588151c58c84103fe27bc45f5cdbf3d0be04d5543b36be398e509f84b42e81049f48abc45f2ba3b133acb24cd3f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ms/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ms/firefox-57.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "1c48af4419ad73a7b74dacb789614a020afefbfc06d6129ba54bb96c79f95a403ce1ee64f4bac505afe39bec3d189feecc7aa42f29bdecae44e6b3a930c08c44"; + sha512 = "3a420608088a0590ceb5b63365e2281f3abb9838eb925dd0624ed31fc74fd784da437c7fddc4fd0c839a27f54d217d74232d25b7f0f0e763b5ee656f63fed323"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/my/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/my/firefox-57.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "470f46c7c72988daea4648acca7f857cc090e54b7bc1ea2c3053253c8d7f51a2d8b1e5d80b5856f0d1d9ad79072a14630abb62a183df741701e2bfcfe28d37e3"; + sha512 = "6bc734753dbfb769cbd886f8f8a5e284cec8b11081edfb75f52f7ac0f735f1c4fe29e1024354326ab4484b810d1725cf8319a4a0f33385ddbbcef789e53cd362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/nb-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/nb-NO/firefox-57.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "af4dfbae6964f43925fb83585acb7539090acc770f632888ae5c32811635e68b3d97e61126db58d6dc39db1975eb0fabc6ce77a7d848a4574ddace2585d99332"; + sha512 = "b0837d6a815bcd1e2625040ad6f0795ac8739991fdb52d98cb7c0883f2244c4421625e40ac96a121159e06a9533e29c283822f51d13775f4ee2680baad87b8da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/nl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/nl/firefox-57.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a3bc479da0ba04b5d8dcac09f9679d8895495568b1686def8c2c173c77c95e3d9af5109f9409488e787f2bab2fb425760419dae92f898cba4574a14aacd1fc87"; + sha512 = "744112471e0f11b9191ea191e553cdf5d023e20dab705910ce0038c60610755b4264aa6ef2edabf70db827b11267f8c5fa8643314242aef2bc517beaf76dc54d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/nn-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/nn-NO/firefox-57.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "9d184510c4aab71c70256d29b896cee00bbc3014dd42a4d9aca1a9fe44642926b9e6fb074838ac09848939480de15c3a3d4d16acf5fb46bf2f7c2f21e276205f"; + sha512 = "ef0e94a3d93128247354e3a3f3215e5ca27e664a24726dc9b98a064bd5885c7d775f1350ebe2976317ea0eb2db2c166844c1271e39752e10fa1165d214a96f31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/or/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/or/firefox-57.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "c485124e62d34feef8ab41a9ba887cbad236ada2577ac3e433c6b045aacf427b469b438e92f268c083fae2b3f740dd5ebe733c80f62b69d62a1cfd489055909d"; + sha512 = "dc33270b8760552d2c7f0d66aedab9f50ca0d1967978313ed18f9f66dcba4f2c8fd7aacf2b2de91223841ed1d2fdb051e581ade6376bbf65d95968eede0d04c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/pa-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/pa-IN/firefox-57.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "d121f493e206b4c906ec001ebf4943289608b9d247fde4e7cc192651bb5a7fa4b5731670fbd6e1e5894c82db73330f4cdd179e0e8613b6ec9d588c3e4409e45c"; + sha512 = "06106c42f7bdca21a3340fedea95c29adbdad4fb5d3ce22bbb9b3437dcebca9c6a7efd01701164dbbe25119482a386bfe523c3d5cde2d5121c0af3855cb6f963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/pl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/pl/firefox-57.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3836babbfd8213820ee62dff188f0d6ac077822719bf72add215612a088055ccfc4c143a638a3b9590f9b347d0a3dc911e9a90847dd5bf2713696e55cf94e837"; + sha512 = "037947aadb6ab54c07cefe7fe4b5de205c3f490121073b478dc9f211736916a853b47202e865b3160a849afd512a6901d20d1b356684c79be6022f08252bb3c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/pt-BR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/pt-BR/firefox-57.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d53501a90c321e4d725f5fdefa9692d28c93625794661f1b89f9405635b8b077ed690a5f285a3c9c1765eec8c3ef195cbb55c6ffbfc8c35f92f91972541bba4e"; + sha512 = "3b3ba0892942e5cf11dc42c9eff31984c20edbb41ccd838373c18a62300142c66b0bb8184b0f4cfc5ed8805b88dc779f9f470ddaef4a0fb06e61999f6faecc0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/pt-PT/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/pt-PT/firefox-57.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6aeac0ff132c6a4b42d577204e2f8b6c4bc77d07db8d4eef8e782189b037112979f8eea78c4f739d81b0fae2f47089bcd3c050b6c0080a15727018e2b31640c9"; + sha512 = "451e2af4b83b8d3596520d4d9a5ede869afca4794d88493167a87ba8a2ad8835ef1ff57eccf4cd575c78386e262ef7995f43f6f4c2f2edcd98fdac07537d4a61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/rm/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/rm/firefox-57.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "83493068d9d94d937b3bebe5f95ed1e57a719fe3620f9a51cae606fc3784d18c1da7c7d429aaa6f6e617f5a984924a199dc6274e90ebe1fdf74c5c9f64bcc1c1"; + sha512 = "7879a286d2c96cf0d08b308e96a84094cfbc475abc63dc0255749aaaadc372351f2480e71d9aab4d88c909d31c6a68f21d15360627fc16e2a79aada9ddf3ce14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ro/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ro/firefox-57.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "15c4ad11cc009a0f1df62af17df17c6ad4b779c19f6236d312b2a071562b95cac3557de2add148a0aee2b2125d18286596a68c0a188088c9b4fcde3335478908"; + sha512 = "7113b1b7d951eb43ad6722961aad26f83ba5640e18653b527571298cac311bad5a41c87611127d158ecd643090e517941c1e90a5578d9fbe9f7878ece23ce0f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ru/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ru/firefox-57.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a52d3fc83da91bd90809a5d3b7894abc2aeba3547d975a56068ab243df6ed85f0d4f7f865f713084804a65248444a59dd2737f6d5693755ff0ac56e056d372f4"; + sha512 = "4610a0f666f2b20eb35472abcdc450c8c24baa6388d731446d04fba13cbe9c48066860169bc5212abb823ce85c6fe485388dd77d61beaad9942b8b329d2adaba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/si/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/si/firefox-57.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "74fa5a39486317b7351e57e52b588ebef13b3314ebc5991d1b28d2c0d62d1cc47c1e861dd4db8dcc2cbf684e4318f72b48da651a84698d65f629fa07e67e9119"; + sha512 = "2e1024a432300ac42ad00b6b5ffdc5ed53040a29556ca9ee98c64c4ac544b85f3542261519056949649fdd7525b5f83bf16fdb844b956bf2ef3f569029dac8ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/sk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/sk/firefox-57.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "bd4db3ff2385dc873494e3c6e92d5b2428ffb1e06d8befe88ae9c094341f0d81dfde38adbf82563c64357f8ed29bdf12cdfaa062c51facab4b1eb61a44bb77d6"; + sha512 = "c45e1dd1da621d4a5765b448f8836215cb2087f8633d987f269fcc5a67f5ee06fbeb1b08416eaf2e5720c778e272bb83c9e08294f6be0f148c0fe15dd042082d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/sl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/sl/firefox-57.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7f2f3cb7757526ca36a9f2b7f61fa1fd1f14d979fe1dcafcb8ddb8dc01898bc1b15eaf4e0c0ba426d4b200c5c4b0490d5e0aa908eaac08408d0e888c87bcbe2e"; + sha512 = "ba45ef8690f54996e55ec723732f17a4fe846d37c35d96b733d775c7888499cdd7ed73370238746a7911c3e773ba04d3d1ac8dc25959b2172a1940949fab2cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/son/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/son/firefox-57.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "4688b484acbd58f02a109b18566ece245f99c46c35e40004347075a8185d9c82077bf0c295d377b4055d6090b41a7e9151e25c45199ab3b3756d0f7aa4e1544b"; + sha512 = "9ed0e3c645f3c2884b6f9efc10571906cf39ceb295269468a553d5b4b3afe8d92073d7eac285f8b6c66b1b0d885fa1c80ab66ea320ccdecdea28bd0a82862f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/sq/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/sq/firefox-57.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "8425a72e20bf76ae2435a9c0fd596810a39909060dd908dadc5e77a26a3ae241321621df2196587e35edb527fde2732b7ece479b909bbb18d64c91c195eb54da"; + sha512 = "c14c8cb330449c98090ca76dc2d834b3f048dd242414678450aa9abae8597ea23b527d51d5354325395c3321a755088762d32c69a387375ff0e32be807068d11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/sr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/sr/firefox-57.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "2f13f30bb3bbcf3acdbecc2630451f1c130d32187a6745b394ab7d984aaef20addc12fab79395eb14a0f64300cc91aa4a8acda33e8664837079e63aa8c64339e"; + sha512 = "82b25e641b5a072d050c5216624dd62883fa5b4f84d407997598cbe366a04cd869fc54a4b9383a65f78a5e317bb3f4e198f919fdfd56bcb205852a13ad5edee3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/sv-SE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/sv-SE/firefox-57.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "5a18ed2846e7ff05d1990b6e9e073356dd527fe1e24ce5516df562905d3c14a3cf0dfac8684651b734320701618155660352af773f9c5be6c07295abe3457a80"; + sha512 = "de4b5582acbb4ebc82bdf6677f53bcf73784d376fe63df298e1ec599ee0975e91fb9b9d548d2c0213ff7b99c6c123278eac4070e6f85c58c2e91a4b94add1347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ta/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ta/firefox-57.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "44e4c605856e2dda8e492ec02c252998d089d8833bd19f93a010bda164864ee247edc3b5b41fe0da8a3077c2aab5a6dcad275303a340b1df2dc7d4f99d15eb08"; + sha512 = "6e1c1d84b4b3987d31d8cf70fc292a7670b15bccf0c308a1222c72d3fa22fb426313b19c4feef3c9db1cdfb7a1fa267066ff533a3a0ba45594b443f10b8f710b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/te/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/te/firefox-57.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0d6345c10e8d27542e9871c398c553a8378b185ae6c3a4876c4a626475801d9c528bd506fa56d99c6bdb04e4053340b7ec6ca506a289e8ce280abb46905de297"; + sha512 = "2804c3891c386c3342bf464731aa5aa05e34d29bae17d766fa037866cfed2560893af86866db3018d3ecddcbb4fe63928ec95c86cb3a8355c86ecf470a2505e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/th/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/th/firefox-57.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "cc0c6e481e6eca9abf4d02b590afca9f2700111ce648ad7719fdd58751f6d54eee2ebd4b881269ccfefc594c62855dad4d42f9248b65a35d2b5c57e75153815c"; + sha512 = "64e0dc9fb2451dae0ad9d41cce0609a0ff499e049d130f7a867da90fb66d4243282dded80d58e40a41a32769862e9d82e6cf1af3b8fd8849f6b29eed114d3df9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/tr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/tr/firefox-57.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "f11df9e253cdbf1ab9f03c3a0033d34d120ec1b69cdd12f2b2734648a86d309303d35367349f8d994975e23284bd96699a1cd47e8aa483dddf7baef63fbb35c2"; + sha512 = "a81c8e534f9956ec2c5e56f8fc8952d24e5cccc18536243fb1a3585e3c6cf899c7a9cd01a6e8da9f79725d5da602b1e47f37668c7069bc187530625619ecdd94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/uk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/uk/firefox-57.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "dfd70428cf6b793ac147a5fcffcbe80b33dcadc0669d6fac33b6dcb6355fb4147eb44e08af635b81d58aee3d50e74d41c036e427254e655fa4d72a4c5c56cf07"; + sha512 = "75566f095dcada1f87815d25f5233ff93f28c557e8c38cc9a97b7ab066d6560afcf1e9de510f5d8bc924c6b78fb7ca11d68264ef689af06f52e0840985c95f02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/ur/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ur/firefox-57.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "f308793aedc14c78d9b2fc092359ac88b9a7b138b1b71720958eb3745fbec3214b75bb5d698093bf12ce0bdbe131765243a959fcd368b0bff13577b767132aa2"; + sha512 = "ed2ceeed7e3a839e42cec5cf37883e44fc33e4f61ea8d1d044ea78f53b94cd293ef53a886be617292b70ffc96f62056948da4fff66c8483d99aac594961d94dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/uz/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/uz/firefox-57.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "571b936f3f27dd42e90bd89bed8cf93a22a97ecb31c0c7cc7cbcb9f2aafa86f1580e6c644963ed82237dd0032cae17df425e0933f23245809e0ec56ad5fa58f2"; + sha512 = "1b9e9d4bd792cae670ac5a5f4142aa735ad50a36ee055e4dfba2aa7f1e55328b1d178322a71ab4e7ffc98a502c13e9ab2a66f16d6e06d12c8f941c2efb076ce2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/vi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/vi/firefox-57.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "61f9f22cdaa88bb2ffe1eb64b77957f136fdadc7025eca72f3e91ce30a208fc0ba4f77e66cce069bd2ace6b6c968ff8925d8fc0ba2854a3ed658d50351efbc5d"; + sha512 = "0d71e2d690cbceaa228d0ec56ff0773f7e78b5301a12c6599185fb0858f5fd325b9858adf55f3903ef44fa503f0d4b5cb66ac1185e07933620633fc0464f7024"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/xh/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/xh/firefox-57.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "2bcc9bcfbddde2fdca28575249c5fe248d5a254e9fc722597d988378c79f160c50be5d49c77b729eac0a01987c8ee9a705380dbcdfe469a73d59be887c616898"; + sha512 = "9c11daa146e69343cd8c35d00c1c7dd3987bc0fe5e272a9fc33ae5a2b6d7791018649a3eed9a369cb6c810a9d6730039e12e6ae80727bffa4edfe5a7a1982f4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/zh-CN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/zh-CN/firefox-57.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "16ca490aae09854a8cc3642d176abe2d9301cb50b19ba40071e6fe62bff5053172beba929de27e3560a1d9cfbb9bf0ab8b7dcf4c880c637189064bfe1ca0b09a"; + sha512 = "af35074fd3cbd9a0238fc8d37ada63d9b1b107c0859b52a53649f9b53a2ef561215e090127efc01537a5abbe942ed7485b13769ce74545a81ab68f4989697ca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b4/linux-i686/zh-TW/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/zh-TW/firefox-57.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "6768835f93d4523b2b126b2ff050dbca8ff8bc64828a6eac7441bd2eb2bda37bf53ba74376ae2533accc567090555947c671fdfc7ea6d72af206efafae3a7281"; + sha512 = "04f7f76d05b9c4edd61773719353893acef39beeaca96088620a8ca78bb1f13550bd9363148947923769b28e0a1904e2d239e4800ee1a1c4ba8088b5bc3775d4"; } ]; } From 2eeb00441d37b644424a94c04ac8d14d5b099763 Mon Sep 17 00:00:00 2001 From: Guanpeng Xu Date: Thu, 5 Oct 2017 08:14:53 +0800 Subject: [PATCH 0716/2806] Mathematica: 11.0.1 -> 11.2.0 --- .../science/math/mathematica/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 1e23cfea27f..1c86097f2ee 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -3,6 +3,7 @@ , patchelf , requireFile , alsaLib +, dbus , fontconfig , freetype , gcc @@ -12,6 +13,7 @@ , opencv , openssl , unixODBC +, xkeyboard_config , xorg , zlib , libxml2 @@ -26,7 +28,7 @@ let throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { - version = "11.0.1"; + version = "11.2.0"; name = "mathematica-${version}"; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { already part of the store. Find the file on your Mathematica CD and add it to the nix store with nix-store --add-fixed sha256 . ''; - sha256 = "1qqwz8gbw74rnnyirpbdanwx3d25s4x0i4zc7bs6kp959x66cdkw"; + sha256 = "4a1293cc1c404303aa1cab1bd273c7be151d37ac5ed928fbbb18e9c5ab2d8df9"; }; buildInputs = [ @@ -45,6 +47,7 @@ stdenv.mkDerivation rec { patchelf alsaLib coreutils + dbus fontconfig freetype gcc.cc @@ -54,6 +57,7 @@ stdenv.mkDerivation rec { opencv openssl unixODBC + xkeyboard_config libxml2 libuuid zlib @@ -100,6 +104,12 @@ stdenv.mkDerivation rec { for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path done + + # Fix xkeyboard config path for Qt + for path in mathematica Mathematica; do + line=$(grep -n QT_PLUGIN_PATH $path | sed 's/:.*//') + sed -i -e "$line iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"" $path + done ''; preFixup = '' From c06e5a8d64c978e7adf66f6a00e573635b6930e2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Oct 2017 05:57:03 +0000 Subject: [PATCH 0717/2806] ocamlPackages.react: 1.2.0 -> 1.2.1 --- .../ocaml-modules/eliom/default.nix | 4 ++-- .../ocaml-modules/lambda-term/1.6.nix | 4 ++-- .../development/ocaml-modules/lwt/default.nix | 4 ++-- .../ocaml-modules/lwt_react/default.nix | 4 ++-- .../ocaml-modules/ocsigen-server/default.nix | 4 ++-- .../ocaml-modules/ojquery/default.nix | 4 ++-- .../ocaml-modules/react/default.nix | 22 +++++-------------- .../ocaml-modules/reactivedata/default.nix | 4 ++-- .../development/ocaml-modules/zed/default.nix | 4 ++-- pkgs/development/tools/ocaml/utop/default.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 7 +++--- 11 files changed, 27 insertions(+), 36 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 63e256b6095..b981aa548e0 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, - js_of_ocaml, ocaml_react, lwt, calendar, cryptokit, tyxml, + js_of_ocaml, react, lwt, calendar, cryptokit, tyxml, ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, reactivedata, opam, ppx_tools, ppx_deriving, findlib , ocamlbuild @@ -24,7 +24,7 @@ stdenv.mkDerivation rec propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving ocsigen_deriving js_of_ocaml - calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; + calendar cryptokit ocamlnet react ocaml_ssl ocaml_pcre ]; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index f8e79d566d4..c0532ff0325 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, ocaml_react, zed, camlp4 }: +{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, react, zed, camlp4 }: stdenv.mkDerivation rec { version = "1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; }; - buildInputs = [ libev ocaml findlib ocamlbuild lwt ocaml_react ]; + buildInputs = [ libev ocaml findlib ocamlbuild lwt react ]; propagatedBuildInputs = [ camlp4 zed ]; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index fc721dc4c9a..c29f571a63e 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 -, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib +, react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib , ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" @@ -30,7 +30,7 @@ buildOcaml rec { ++ stdenv.lib.optional ppxSupport ppx_tools; propagatedBuildInputs = [ result ] - ++ optionals [ ocaml_react ocaml_ssl ] + ++ optionals [ react ocaml_ssl ] ++ [ libev ]; configureScript = "ocaml setup.ml -configure"; diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix index 022a60dcc66..4d505b23ae0 100644 --- a/pkgs/development/ocaml-modules/lwt_react/default.nix +++ b/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, ocaml_react }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }: stdenv.mkDerivation rec { version = "1.0.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ lwt ocaml_react ]; + propagatedBuildInputs = [ lwt react ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index c8e60015d01..39375bc8ea1 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, +{stdenv, fetchurl, ocaml, findlib, which, react, ocaml_ssl, lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 , camlzip, pgocaml @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; }; - buildInputs = [ocaml which findlib ocaml_react ocaml_ssl lwt + buildInputs = [ocaml which findlib react ocaml_ssl lwt ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]; diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix index 6e9ca15fb38..2d697a285fd 100644 --- a/pkgs/development/ocaml-modules/ojquery/default.nix +++ b/pkgs/development/ocaml-modules/ojquery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, ocaml_react }: +{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, react }: stdenv.mkDerivation rec { version = "0.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ]; - propagatedBuildInputs = [ js_of_ocaml lwt3 ocaml_react ]; + propagatedBuildInputs = [ js_of_ocaml lwt3 react ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 2dffbcf440f..5a720aead80 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -1,29 +1,19 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild, opam }: stdenv.mkDerivation { - name = "ocaml-react-1.2.0"; + name = "ocaml-react-1.2.1"; src = fetchurl { - url = http://erratique.ch/software/react/releases/react-1.2.0.tbz; - sha256 = "0knhgbngphv5sp1yskfd97crf169qhpc0igr6w7vqw0q36lswyl8"; + url = http://erratique.ch/software/react/releases/react-1.2.1.tbz; + sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v"; }; unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib topkg ocamlbuild opam ]; createFindlibDestdir = true; - configurePhase = "ocaml pkg/git.ml"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - - installPhase = - let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; - in - '' - opam-installer --script --prefix=$out react.install > install.sh - sed -i s!lib/react!lib/ocaml/${ocamlVersion}/site-lib/react! install.sh - sh install.sh - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { homepage = http://erratique.ch/software/react; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 828a3fb6068..1f1781f5a65 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opam }: assert stdenv.lib.versionAtLeast ocaml.version "3.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ocaml_react]; + propagatedBuildInputs = [ react ]; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 410d5c0c612..72ff8e4c049 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, ocaml_react }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react }: stdenv.mkDerivation rec { version = "1.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; }; - buildInputs = [ ocaml findlib ocamlbuild ocaml_react ]; + buildInputs = [ ocaml findlib ocamlbuild react ]; propagatedBuildInputs = [ camomile ]; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 0f73f4c54af..404bf08e74e 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4, ocaml_react +{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4 , lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper }: diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c14bf350db5..7e601e88558 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -433,9 +433,6 @@ let pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; - ocaml_react = callPackage ../development/ocaml-modules/react { }; - reactivedata = callPackage ../development/ocaml-modules/reactivedata {}; - ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; @@ -593,6 +590,10 @@ let re = callPackage ../development/ocaml-modules/re { }; + react = callPackage ../development/ocaml-modules/react { }; + + reactivedata = callPackage ../development/ocaml-modules/reactivedata {}; + reason = callPackage ../development/compilers/reason { }; rope = callPackage ../development/ocaml-modules/rope { }; From 0c2b37a75d4e8232f8a20326894f41cb49bed8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Thu, 5 Oct 2017 11:28:35 +0200 Subject: [PATCH 0718/2806] ntk: 2017-04-22 -> 1.3.1000 --- pkgs/development/libraries/audio/ntk/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index 35144862ce9..7df258877d7 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, cairo, libjpeg, libXft, pkgconfig, python2 }: +{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2 }: stdenv.mkDerivation rec { name = "ntk-${version}"; - version = "2017-04-22"; - src = fetchgit { - url = "git://git.tuxfamily.org/gitroot/non/fltk.git"; - rev = "92365eca0f9a6f054abc70489c009aba0fcde0ff"; - sha256 = "0pph7hf07xaa011zr40cs62f3f7hclfbv5kcrl757gcp2s5pi2iq"; + version = "1.3.1000"; + src = fetchFromGitHub { + owner = "original-male"; + repo = "ntk"; + rev = "v${version}"; + sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0"; }; buildInputs = [ @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { version = "${version}"; homepage = http://non.tuxfamily.org/; license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ]; platforms = stdenv.lib.platforms.linux; }; } From 0e2e3afd65ee98c2fdf58b167711794a729a25d5 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 5 Oct 2017 12:17:23 +0200 Subject: [PATCH 0719/2806] llvm: download source over https MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The source distribution contains binaries (probably for testing) that make the Avira virus scanner treat it as malware on account of a “bad ELF header”. Apart from being preferable in general, the HTTPS download makes the file opaque to the overeager AV scanner in transparent proxying setups. Also adapt to the fact that the canonical downloads now point to a URL like this: https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz --- pkgs/development/compilers/llvm/4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index c1d1ce055d7..25bb008567f 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -10,7 +10,7 @@ let version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { - url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz"; + url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; From 583b8c15a3876112cc65e45e49103f7d4ff957ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Oct 2017 12:26:37 +0200 Subject: [PATCH 0720/2806] perlPackages.TAPParserSourceHandlerpgTAP: fix typo in sha256 --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2c721cbc2c5..02afd115f3d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12861,7 +12861,7 @@ let self = _self // overrides; _self = with self; { name = "TAP-Parser-SourceHandler-pgTAP-3.33"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "35q46y2hbp2ij5n9ir76lmspqj3n8gb0z9l5ipb5g7q90l160m4k"; + sha256 = "15q46y2hbp2ij5n9ir76lmspqj3n8gb0z9l5ipb5g7q90l160m4k"; }; meta = { homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/; From 623df97af5a1bf1f5dcbf9075b0ac8cbba036e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Oct 2017 12:30:45 +0200 Subject: [PATCH 0721/2806] pythonPackages.devpi-common: fix meta evaluation The tarball job now seems OK again :-) --- pkgs/development/python-modules/devpi-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index ad5f8fef885..971d53e3ddd 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -1,4 +1,4 @@ -{ pythonPackages }: +{ stdenv, pythonPackages }: with pythonPackages;buildPythonPackage rec { pname = "devpi-common"; @@ -17,7 +17,7 @@ with pythonPackages;buildPythonPackage rec { py.test ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/devpi/devpi; description = "Utilities jointly used by devpi-server and devpi-client"; license = licenses.mit; From ef6130fd78984f703636374226c38531246a8370 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 Oct 2017 12:02:58 +0200 Subject: [PATCH 0722/2806] gnome3.gnome_online_accounts: build with Vala bindings --- pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 29f6ae3e860..f2a23b63ea0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common , telepathy_glib, intltool, dbus_libs, icu, glib_networking , libsoup, docbook_xsl_ns, docbook_xsl, gnome3 @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook - libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup + libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup vala docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; meta = with stdenv.lib; { From 1713479f85e9eb7abcb0efb1be54fc5a44163ad2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 Oct 2017 18:22:22 +0200 Subject: [PATCH 0723/2806] duplicity: Fix gio backend --- pkgs/tools/backup/duplicity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 313167b1ae2..d55783f7f2c 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; propagatedBuildInputs = with python2Packages; [ - boto cffi cryptography ecdsa enum idna + boto cffi cryptography ecdsa enum idna pygobject3 ipaddress lockfile paramiko pyasn1 pycrypto six ]; checkInputs = with python2Packages; [ lockfile mock pexpect ]; From d16b7191c3dd2e5cfe64e41f64674a7190d0ccf3 Mon Sep 17 00:00:00 2001 From: pasqui23 Date: Wed, 4 Oct 2017 12:04:49 +0200 Subject: [PATCH 0724/2806] deja-dup: init at 36.1 --- pkgs/applications/backup/deja-dup/default.nix | 83 +++++++++++++++++++ .../backup/deja-dup/fix-paths.patch | 12 +++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 97 insertions(+) create mode 100644 pkgs/applications/backup/deja-dup/default.nix create mode 100644 pkgs/applications/backup/deja-dup/fix-paths.patch diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix new file mode 100644 index 00000000000..4d3a9a385d6 --- /dev/null +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext +, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 +, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook +, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror +, appstream-glib, desktop_file_utils, atk, pango, duplicity +}: + +stdenv.mkDerivation rec { + name = "deja-dup-${version}"; + version = "36.1"; + + src = fetchurl { + url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz"; + sha256 = "1s48k2sxrpwkzp37s4x7934lyg5194c47nv9ks15rksd5s0alnld"; + }; + + patches = [ + ./fix-paths.patch + ]; + + postPatch = '' + substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \ + "/bin/rm" \ + "${coreutils}/bin/rm" + ''; + + # couldn't find gio/gdesktopappinfo.h + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + nativeBuildInputs = [ + meson ninja pkgconfig vala_0_38 gettext intltool itstool + appstream-glib desktop_file_utils libxml2 wrapGAppsHook + ]; + + buildInputs = [ + libnotify gnome3.libpeas glib gtk3 libsecret + pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus + at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror + ]; + + propagatedUserEnvPkgs = [ duplicity ]; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + # Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed + postFixup = + let + rpath = stdenv.lib.makeLibraryPath [ + glib + gtk3 + gnome3.gnome_online_accounts + gnome3.libpeas + gnome3.nautilus + libgpgerror + libsecret + # Transitive + atk + pango + ]; + in '' + # Unwrap accidentally wrapped library + mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so + + for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do + patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf" + done + ''; + + meta = with stdenv.lib; { + description = "A simple backup tool"; + longDescription = '' + Déjà Dup is a simple backup tool. It hides the complexity \ + of backing up the Right Way (encrypted, off-site, and regular) \ + and uses duplicity as the backend. + ''; + homepage = https://launchpad.net/deja-dup; + license = with licenses; gpl3; + maintainers = with maintainers; [ jtojnar ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch new file mode 100644 index 00000000000..1cc57e6a54a --- /dev/null +++ b/pkgs/applications/backup/deja-dup/fix-paths.patch @@ -0,0 +1,12 @@ +diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build +index 04b136f3..ed8f7cba 100644 +--- a/deja-dup/nautilus/meson.build ++++ b/deja-dup/nautilus/meson.build +@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'], + link_with: [dirhandling], + dependencies: [nautilus_dep], + install: true, +- install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir')) ++ install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0')) + + endif diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1dc8cc11bd..5a557793415 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -951,6 +951,8 @@ with pkgs; deisctl = callPackage ../development/tools/deisctl {}; + deja-dup = callPackage ../applications/backup/deja-dup { }; + devmem2 = callPackage ../os-specific/linux/devmem2 { }; dbus-broker = callPackage ../os-specific/linux/dbus-broker {}; From 0317d5d083a7d58c75bd6df2acb31dde44efcb0c Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Thu, 5 Oct 2017 15:05:37 +0300 Subject: [PATCH 0725/2806] wine: replace samba3 with samba4 Unbreak security assertion via samba3 which no more supported. --- pkgs/misc/emulators/wine/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 9fb90875b97..0f59892cce1 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional cairoSupport pkgs.cairo ++ lib.optional tiffSupport pkgs.libtiff ++ lib.optional odbcSupport pkgs.unixODBC - ++ lib.optional netapiSupport pkgs.samba3_light + ++ lib.optional netapiSupport pkgs.samba4 ++ lib.optional cursesSupport pkgs.ncurses ++ lib.optional vaSupport pkgs.libva-full ++ lib.optional pcapSupport pkgs.libpcap From 8c34112be912605be3a0798021c3b85a97e89ac8 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Thu, 5 Oct 2017 15:06:20 +0300 Subject: [PATCH 0726/2806] wineUnstable: 2.17 -> 2.18 Staging updated as well --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index aaaec67c751..fb384aee746 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -32,15 +32,15 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.17"; + version = "2.18"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "0sgazjn30ki2y3bjrd0xbpf870ii22wkyrmgaxcwbk23j1rrbp3y"; + sha256 = "0l2gmk6g4c5ds29iqcvpmh5g8jdz6g6id7xkgiqps5bqk09322cz"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "11jm39g1kc77fvn02j9g8syyc095b6w2jashyr28v4gi7g0fqv6h"; + sha256 = "02rh2lvx7sd8d6nhgpfq9crjh495k4k7i3wmgigs4m5rlip363s8"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From 63a7be9c9799047050eafd5734d80ebd9e2d7b3e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Oct 2017 09:22:08 -0400 Subject: [PATCH 0727/2806] kubernetes: 1.7.1 -> 1.7.8 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e76d3cf5d08..cff68c5227a 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -18,13 +18,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.7.1"; + version = "1.7.8"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1frf2nxk45lsbkq73fj72gxgr76icqdrsdqh20f5gpwiqn23n7c3"; + sha256 = "1xfvfdn04wn7ldmr5ypnyi99gsrgz1w8l02jnvyalpdnjbj73b89"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From f192ce9730a87bde7c9445bf7df5b0aeba2e04d9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Oct 2017 09:47:30 -0400 Subject: [PATCH 0728/2806] rkt: 1.28.1 -> 1.29.0 --- pkgs/applications/virtualization/rkt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index a23537847a1..452f082e20e 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -4,15 +4,15 @@ let # Always get the information from # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1235.0.0"; - coreosImageSystemdVersion = "231"; + coreosImageRelease = "1478.0.0"; + coreosImageSystemdVersion = "233"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. stage1Flavours = [ "coreos" "fly" ]; stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.28.1"; + version = "1.29.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,12 +20,12 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "1xn2cz30gq0500gmp5aml03hmk066fq9i04jizb5sc0j41fmsgja"; + sha256 = "0wnhii15pr4z190iladfcl4jzj9sgyl1bn5v63a3yy6nkmz9cfda"; }; stage1BaseImage = fetchurl { url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "05gk28a7zzp3j0d1y96cr1xwy9gdl4s0lpnbakzqppa4w3c4m3lq"; + sha256 = "0s4qdkkfp0iirfnm5ds3b3hxq0249kvpygyhflma8z90ivkzk5wq"; }; buildInputs = [ From aee224c8a5dad4e5e5a11b0e6fabc8a90eba984f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Oct 2017 09:49:40 -0400 Subject: [PATCH 0729/2806] linux: 4.9.52 -> 4.9.53 --- 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 6531323c1d5..e9b9fb54bfc 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.52"; + version = "4.9.53"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12h4w6x0zcl8kpia2y7myv7w7i0dihw4g8v638fs8bzk3d7h7pgz"; + sha256 = "095k7kpzic0c2vhwnfm5vcp9j60lyf4qyx2pj9vkp68bpcrmm49j"; }; } // (args.argsOverride or {})) From 6091e2aa3355ac0cab30ef024b9d977111d479d8 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Thu, 5 Oct 2017 15:05:30 +0200 Subject: [PATCH 0730/2806] nixos/network-interfaces: assertion for too long interface names --- nixos/modules/tasks/network-interfaces.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 8ce7b2d2cf3..1741d2c7e1f 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -924,6 +924,14 @@ in (flip map interfaces (i: { assertion = i.subnetMask == null; message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead."; + })) ++ (flip map interfaces (i: { + # With the linux kernel, interface name length is limited by IFNAMSIZ + # to 16 bytes, including the trailing null byte. + # See include/linux/if.h in the kernel sources + assertion = stringLength i.name < 16; + message = '' + The name of networking.interfaces."${i.name}" is too long, it needs to be less than 16 characters. + ''; })) ++ (flip map slaveIfs (i: { assertion = i.ip4 == [ ] && i.ipAddress == null && i.ip6 == [ ] && i.ipv6Address == null; message = "The networking.interfaces.${i.name} must not have any defined ips when it is a slave."; From 0bd1f7a92f2d17501d650967a2a1883238646853 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Oct 2017 09:50:00 -0400 Subject: [PATCH 0731/2806] linux: 4.13.4 -> 4.13.5 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index c45afd1cbeb..043a39ec95a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.4"; + version = "4.13.5"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "087lv2laf4wx28z9zqg9s275nzygica0hc1g8vn5ql6yb7mrb7m0"; + sha256 = "1qi5zxby5qwdv0485gia2jz38dly4ncn10zi3grcckwxc3d5ms59"; }; } // (args.argsOverride or {})) From 69ad8a5d923917c89350f5f32c9000ec926d7c0d Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 28 Sep 2017 09:13:15 +0900 Subject: [PATCH 0732/2806] firefox: 55.0.3 -> 56.0 --- .../networking/browsers/firefox/common.nix | 16 ++++++++++++++-- .../networking/browsers/firefox/packages.nix | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index de19e611851..1b72f9e18c3 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,8 +8,7 @@ , yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , cairo, icu, libpng, jemalloc -, autoconf213, which, gnused, cargo, rustc - +, autoconf213, which, gnused, cargo, rustc, llvmPackages , debugBuild ? false ### optionals @@ -50,6 +49,7 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation (rec { @@ -74,6 +74,8 @@ stdenv.mkDerivation (rec { ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] ++ lib.optional gtk3Support gtk3; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; + nativeBuildInputs = [ autoconf213 which gnused pkgconfig perl python cargo rustc ] ++ lib.optional gtk3Support wrapGAppsHook; @@ -88,6 +90,12 @@ stdenv.mkDerivation (rec { make -f client.mk configure-files configureScript="$(realpath ./configure)" + + cxxLib=$( echo -n ${gcc}/include/c++/* ) + archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) + + 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. @@ -120,6 +128,10 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" ] + ++ lib.optionals (stdenv.lib.versionAtLeast version "56") [ + "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib" + "--with-clang-path=${llvmPackages.clang}/bin/clang" + ] # TorBrowser patches these ++ lib.optionals (!isTorBrowserLike) [ diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e2a8e201fef..5a3d9ee2b99 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 = "55.0.3"; + version = "56.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416"; + sha512 = "3aeb0ff54e10c83894f61734daa4f0801a1bb499d4667adad9c78520e588eae809d0e4d61e9227206466d62c3b453e2ce9ca8198f59f5354cd1b6804c00f0990"; }; patches = From faf8b82482004106673eb25329d1511ccf761bfd Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 28 Sep 2017 09:13:16 +0900 Subject: [PATCH 0733/2806] firefox-esr: 52.3.0esr -> 52.4.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 5a3d9ee2b99..b2e993e35e0 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -32,10 +32,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.3.0esr"; + version = "52.4.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9"; + sha512 = "be3be7f9dbf4bd0344d5d76f26d1a5090bb012154d25833d5cd58e5e707c080515b42ed751e1f7e58b15b96939d7da634cafb6e8aa9bb1627ff420836b802183"; }; meta = firefox.meta // { From 85f0eef69cb29572184c315f575120158b4fb617 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 5 Oct 2017 09:54:09 -0500 Subject: [PATCH 0734/2806] dropbox: 35.4.20 -> 36.4.22 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index b9dae2d4200..0972cc759ab 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,10 +24,10 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "35.4.20"; + version = "36.4.22"; sha256 = { - "x86_64-linux" = "09qxr94bcyjn5ky20yapljxi2n2nbk6ldcpx2h0ysy8jp6zbrn78"; - "i686-linux" = "1rd4b26dbjf779g085si65lac74bk6lcx8k7i3nqk3vrvbva9n40"; + "x86_64-linux" = "0hhnigwxqmr00zmlysc1y1k4bzrdrcabcnw44bniarwa2l4fw0v0"; + "i686-linux" = "15l7m33b0qlz8m6h7kh1fkxs37dq8jqy04b3qf693ns7wb5l0sqm"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = { From 14594db4810306996e143fd3cb28df8a641cea0f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 5 Oct 2017 23:02:01 +0800 Subject: [PATCH 0735/2806] cantata: 2.1.0 -> 2.2.0 --- pkgs/applications/audio/cantata/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index f09791d9aa1..bd87d37041a 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "2.1.0"; + version = "2.2.0"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh"; + sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; }; buildInputs = [ vlc ] @@ -86,17 +86,16 @@ stdenv.mkDerivation rec { # This is already fixed upstream but not released yet. Maybe in version 2. preConfigure = '' - sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake + # sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake ''; meta = with stdenv.lib; { - homepage = https://github.com/cdrummond/cantata; + homepage = https://github.com/cdrummond/cantata; description = "A graphical client for MPD"; - license = licenses.gpl3; - + license = licenses.gpl3; + maintainers = with maintainers; [ fuuzetsu peterhoeg ]; # Technically Cantata can run on Windows so if someone wants to # bother figuring that one out, be my guest. - platforms = platforms.linux; - maintainers = with maintainers; [ fuuzetsu ]; + platforms = platforms.linux; }; } From d04790c9e8c089afd8525d9c63f4ba721058f4c2 Mon Sep 17 00:00:00 2001 From: zraexy Date: Thu, 5 Oct 2017 07:19:11 -0800 Subject: [PATCH 0736/2806] docs: 17.03 -> 17.09 --- README.md | 8 ++++---- maintainers/scripts/hydra-eval-failures.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1a0fb5014de..b3d5347a6f6 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add ``` For stability and maximum binary package support, it is recommended to maintain -custom changes on top of one of the channels, e.g. `nixos-17.03` for the latest +custom changes on top of one of the channels, e.g. `nixos-17.09` for the latest release and `nixos-unstable` for the latest successful build of master: ``` % git remote update channels -% git rebase channels/nixos-17.03 +% git rebase channels/nixos-17.09 ``` For pull-requests, please rebase onto nixpkgs `master`. @@ -32,9 +32,9 @@ For pull-requests, please rebase onto nixpkgs `master`. * [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22)) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03) +* [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/tested#tabs-constituents) +* [Tests for 17.09 release](https://hydra.nixos.org/job/nixos/release-17.09/tested#tabs-constituents) Communication: diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index 5233e062445..ddc3c7c4a96 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -49,8 +49,8 @@ def get_maintainers(attr_name): @click.command() @click.option( '--jobset', - default="nixos/release-17.03", - help='Hydra project like nixos/release-17.03') + default="nixos/release-17.09", + help='Hydra project like nixos/release-17.09') def cli(jobset): """ Given a Hydra project, inspect latest evaluation From a05f1e2ec4ee979aec0d696ff973bdcaef16b8ae Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 5 Oct 2017 23:21:44 +0800 Subject: [PATCH 0737/2806] cantata clean up --- pkgs/applications/audio/cantata/default.nix | 38 +++++++++------------ 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index bd87d37041a..35fe510cbb2 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -38,9 +38,10 @@ let pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); -in -stdenv.mkDerivation rec { + withUdisks = (withTaglib && withDevices); + +in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { @@ -60,35 +61,30 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withLame lame ++ stdenv.lib.optional withMtp libmtp ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 - ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; + ++ stdenv.lib.optional withUdisks udisks2; nativeBuildInputs = [ cmake pkgconfig ]; enableParallelBuilding = true; cmakeFlags = stdenv.lib.flatten [ - (fstat withQt5 "QT5") - (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) - (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) - (fstat withCdda "CDPARANOIA") - (fstat withCddb "CDDB") - (fstat withLame "LAME") - (fstat withMtp "MTP") - (fstat withMusicbrainz "MUSICBRAINZ") + (fstat withQt5 "QT5") + (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) + (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) + (fstat withCdda "CDPARANOIA") + (fstat withCddb "CDDB") + (fstat withLame "LAME") + (fstat withMtp "MTP") + (fstat withMusicbrainz "MUSICBRAINZ") (fstat withOnlineServices "ONLINE_SERVICES") - (fstat withDynamic "DYNAMIC") - (fstat withDevices "DEVICES_SUPPORT") - (fstat withHttpServer "HTTP_SERVER") - (fstat withStreams "STREAMS") + (fstat withDynamic "DYNAMIC") + (fstat withDevices "DEVICES_SUPPORT") + (fstat withHttpServer "HTTP_SERVER") + (fstat withStreams "STREAMS") + (fstat withUdisks "UDISKS2") "-DENABLE_HTTPS_SUPPORT=ON" - "-DENABLE_UDISKS2=ON" ]; - # This is already fixed upstream but not released yet. Maybe in version 2. - preConfigure = '' - # sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake - ''; - meta = with stdenv.lib; { homepage = https://github.com/cdrummond/cantata; description = "A graphical client for MPD"; From 7525a3c89f09ad3f8f314b72d39b23b641f117f8 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Thu, 5 Oct 2017 16:44:59 +0200 Subject: [PATCH 0738/2806] sonic-pi: 2.9.0 -> 3.0.1 --- pkgs/applications/audio/sonic-pi/default.nix | 72 +++++++++++++------ .../audio/sonic-pi/fixed-prefixes.patch | 36 ---------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 52 insertions(+), 58 deletions(-) delete mode 100644 pkgs/applications/audio/sonic-pi/fixed-prefixes.patch diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 3c7be51554d..d1c48ce44ed 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -1,24 +1,33 @@ { stdenv , fetchFromGitHub -, qscintilla -, supercollider +, fftwSinglePrec , ruby +, libffi +, aubio , cmake , pkgconfig -, qt48Full +, qt5 +, libsForQt5 +, boost , bash , makeWrapper +, jack2Full }: -stdenv.mkDerivation rec { - version = "2.9.0"; +let + supercollider = libsForQt5.callPackage ../../../development/interpreters/supercollider { + fftw = fftwSinglePrec; + }; + +in stdenv.mkDerivation rec { + version = "3.0.1"; name = "sonic-pi-${version}"; src = fetchFromGitHub { owner = "samaaron"; repo = "sonic-pi"; rev = "v${version}"; - sha256 = "19db5dxrf6h1v2w3frds5g90nb6izd9ppp7cs2xi6i0m67l6jrwb"; + sha256 = "1l1892hijp1dj2h799sfjr699q6xp660n0siibab5kv238521a81"; }; buildInputs = [ @@ -26,24 +35,18 @@ stdenv.mkDerivation rec { cmake makeWrapper pkgconfig - qscintilla - qt48Full + qt5.qtbase + libsForQt5.qscintilla + libsForQt5.qwt ruby + libffi + aubio supercollider + boost ]; - meta = { - homepage = http://sonic-pi.net/; - description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.Phlogistique ]; - platforms = stdenv.lib.platforms.linux; - }; - dontUseCmakeConfigure = true; - patches = [ ./fixed-prefixes.patch ]; - preConfigure = '' patchShebangs . substituteInPlace app/gui/qt/mainwindow.cpp \ @@ -52,18 +55,45 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + export SONIC_PI_HOME=$TMPDIR + export AUBIO_LIB=${aubio}/lib/libaubio.so + pushd app/server/bin ./compile-extensions.rb + ./i18n-tool.rb -t popd pushd app/gui/qt - ./rp-build-app + cp -f ruby_help.tmpl ruby_help.h + ../../server/bin/qt-doc.rb -o ruby_help.h + + substituteInPlace SonicPi.pro \ + --replace "LIBS += -lrt -lqt5scintilla2" \ + "LIBS += -lrt -lqscintilla2 -lqwt" + + lrelease SonicPi.pro + qmake SonicPi.pro + + make popd ''; installPhase = '' + runHook preInstall + cp -r . $out - wrapProgram $out/bin/sonic-pi --prefix PATH : \ - ${ruby}/bin:${bash}/bin + wrapProgram $out/bin/sonic-pi \ + --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \ + --set AUBIO_LIB "${aubio}/lib/libaubio.so" + + runHook postInstall ''; + + meta = { + homepage = http://sonic-pi.net/; + description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ Phlogistique kamilchm ]; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch b/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch deleted file mode 100644 index 7b045a41cba..00000000000 --- a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp -index 0af6cf7..97c17ad 100644 ---- a/app/gui/qt/mainwindow.cpp -+++ b/app/gui/qt/mainwindow.cpp -@@ -677,28 +677,9 @@ void MainWindow::startServer(){ - - serverProcess = new QProcess(); - -- QString root = rootPath(); -- -- #if defined(Q_OS_WIN) -- QString prg_path = root + "/app/server/native/windows/ruby/bin/ruby.exe"; -- QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb"; -- sample_path = root + "/etc/samples"; -- #elif defined(Q_OS_MAC) -- QString prg_path = root + "/server/native/osx/ruby/bin/ruby"; -- QString prg_arg = root + "/server/bin/sonic-pi-server.rb"; -- sample_path = root + "/etc/samples"; -- #else -- //assuming Raspberry Pi -- QString prg_path = root + "/app/server/native/raspberry/ruby/bin/ruby"; -- QFile file(prg_path); -- if(!file.exists()) { -- // use system ruby if bundled ruby doesn't exist -- prg_path = "/usr/bin/ruby"; -- } -- -- QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb"; -- sample_path = root + "/etc/samples"; -- #endif -+ QString prg_path = "@ruby@"; -+ QString prg_arg = "@out@/app/server/bin/sonic-pi-server.rb"; -+ sample_path = "@out@/etc/samples"; - - prg_path = QDir::toNativeSeparators(prg_path); - prg_arg = QDir::toNativeSeparators(prg_arg); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5e106a014f..97c2bbea888 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16376,7 +16376,7 @@ with pkgs; viber = callPackage ../applications/networking/instant-messengers/viber { }; sonic-pi = callPackage ../applications/audio/sonic-pi { - ruby = ruby_2_2; + ruby = ruby_2_3; }; st = callPackage ../applications/misc/st { From eeda400b300ab1252911820d149ae5dd1bffe9f1 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 5 Oct 2017 18:27:50 +0200 Subject: [PATCH 0739/2806] josm: 12914 -> 12921 --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 286be3cefc9..38eba46138e 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "12914"; + version = "12921"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "104yih9xfgkpcqg8sqgwkpij2l6pwm12jx6kif45j11sg7hxlh8x"; + sha256 = "1fp6mpl8fa91dhdf3hw5hk8xsp1imj7558adjnjkb6n4vmrbszhm"; }; buildInputs = [ jre8 makeWrapper ]; From 9e754a6f86eefe47332031b63eb0088c76f8a985 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Oct 2017 17:09:50 +0000 Subject: [PATCH 0740/2806] ocamlPackages.ssl: 0.5.3 -> 0.5.4 --- pkgs/development/compilers/opa/default.nix | 2 +- pkgs/development/ocaml-modules/eliom/default.nix | 4 ++-- pkgs/development/ocaml-modules/lwt/default.nix | 4 ++-- pkgs/development/ocaml-modules/ocsigen-server/default.nix | 6 +++--- pkgs/development/ocaml-modules/ssl/default.nix | 6 +++--- pkgs/top-level/ocaml-packages.nix | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 9501b5a3a06..7b9e00b105d 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ which perl jdk openssl coreutils zlib ncurses makeWrapper gcc binutils gnumake nodejs ] ++ (with ocamlPackages; [ - ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph camlp4 + ocaml findlib ssl cryptokit camlzip ulex ocamlgraph camlp4 ]); NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index b981aa548e0..42afec7e439 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, js_of_ocaml, react, lwt, calendar, cryptokit, tyxml, - ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, + ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp, reactivedata, opam, ppx_tools, ppx_deriving, findlib , ocamlbuild }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving ocsigen_deriving js_of_ocaml - calendar cryptokit ocamlnet react ocaml_ssl ocaml_pcre ]; + calendar cryptokit ocamlnet react ssl ocaml_pcre ]; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index c29f571a63e..4d751dac476 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 -, react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib +, react, ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib , ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" @@ -30,7 +30,7 @@ buildOcaml rec { ++ stdenv.lib.optional ppxSupport ppx_tools; propagatedBuildInputs = [ result ] - ++ optionals [ react ocaml_ssl ] + ++ optionals [ react ssl ] ++ [ libev ]; configureScript = "ocaml setup.ml -configure"; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 39375bc8ea1..081f9edbecf 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, which, react, ocaml_ssl, +{ stdenv, fetchurl, ocaml, findlib, which, react, ssl, lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 , camlzip, pgocaml @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; }; - buildInputs = [ocaml which findlib react ocaml_ssl lwt + buildInputs = [ocaml which findlib react ssl lwt ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ocaml_ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 81b8c28b452..3886af37512 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ssl-${version}"; - version = "0.5.3"; + version = "0.5.4"; src = fetchzip { - url = "https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-${version}.tar.gz"; - sha256 = "0h2k19zpdvq1gqwrmmgkibw4j48l71vv6ajzxs0wi71y80c1vhwm"; + url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz"; + sha256 = "01sy3f94b463ff7dmkfsv67jh8g8h20wh7npjwqilniif7lgf4l3"; }; buildInputs = [which ocaml findlib]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7e601e88558..e45256bd3dc 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -439,8 +439,6 @@ let ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; - ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; - ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; ocf = callPackage ../development/ocaml-modules/ocf { }; @@ -606,6 +604,8 @@ let sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; + ssl = callPackage ../development/ocaml-modules/ssl { }; + stog = callPackage ../applications/misc/stog { }; stringext = callPackage ../development/ocaml-modules/stringext { }; From 86a6784fcaad8a17e242b2d566ae70277b9ca3c7 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 5 Oct 2017 19:48:28 +0200 Subject: [PATCH 0741/2806] kdeApplication: kill unused file kde-locale-5.nix --- pkgs/applications/kde/kde-locale-5.nix | 24 ------------------------ pkgs/applications/kde/l10n.nix | 1 - 2 files changed, 25 deletions(-) delete mode 100644 pkgs/applications/kde/kde-locale-5.nix diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix deleted file mode 100644 index 76d601cbdc0..00000000000 --- a/pkgs/applications/kde/kde-locale-5.nix +++ /dev/null @@ -1,24 +0,0 @@ -name: args: - -{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }: - -mkDerivation (args // { - sname = "kde-l10n-${name}"; - name = "kde-l10n-${name}-qt5"; - - outputs = [ "out" ]; - - nativeBuildInputs = - [ cmake extra-cmake-modules gettext kdoctools ] - ++ (args.nativeBuildInputs or []); - - preConfigure = '' - sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt - ${args.preConfigure or ""} - ''; - - preFixup = '' - propagatedBuildInputs= - propagatedNativeBuildInputs= - ''; -}) diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix index 403db98c0f3..10a8472d5a9 100644 --- a/pkgs/applications/kde/l10n.nix +++ b/pkgs/applications/kde/l10n.nix @@ -3,7 +3,6 @@ let kdeLocale4 = import ./kde-locale-4.nix; - kdeLocale5 = import ./kde-locale-5.nix; in From bc03222bde69ca16dfd761d9d3031ebca14fee4f Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 5 Oct 2017 21:06:48 +0200 Subject: [PATCH 0742/2806] types: remove loeOf --- lib/types.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 62c6a978af9..c48e3b3000c 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -240,25 +240,6 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; - # List or element of ... - loeOf = elemType: mkOptionType rec { - name = "loeOf"; - description = "element or list of ${elemType.description}s"; - check = x: isList x || elemType.check x; - merge = loc: defs: - let - defs' = filterOverrides defs; - res = (head defs').value; - in - if isList res then concatLists (getValues defs') - else if lessThan 1 (length defs') then - throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}." - else if !isString res then - throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}." - else res; - functor = (defaultFunctor name) // { wrapped = elemType; }; - }; - # Value of given type but with no merging (i.e. `uniq list`s are not concatenated). uniq = elemType: mkOptionType rec { name = "uniq"; From 3aeccdebb48668bdb0ede368a469ab38c89ec125 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 5 Oct 2017 22:11:34 +0300 Subject: [PATCH 0743/2806] libx86: fix illegal instruction error --- pkgs/development/libraries/libx86/non-x86.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/development/libraries/libx86/non-x86.patch index 0d41cd737f0..286057c4ba8 100644 --- a/pkgs/development/libraries/libx86/non-x86.patch +++ b/pkgs/development/libraries/libx86/non-x86.patch @@ -5,7 +5,7 @@ diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile ifeq ($(BACKEND),x86emu) OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \ x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o -+ CFLAGS += -DX86EMU ++ CFLAGS += -DX86EMU -fno-delete-null-pointer-checks else OBJECTS += lrmi.o endif From 4bb1d9f526269fb32c9893ff5e49c54a428d39ed Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 5 Oct 2017 20:07:22 +0200 Subject: [PATCH 0744/2806] gitlab-runner: 10.0.0 -> 10.0.2 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b1607aaaecd..430e46f2303 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.0.0"; + version = "10.0.2"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "13rfpyzrld20pjhkjzx78qfdmi4w86v6nhq3460bcjpi4kwyd24w"; + sha256 = "14lrc9frigym93ppphmdhwnbhk7xz5drpai3d29gyi1z4xsm1jaq"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "19z3rmkmv6z6g27bsjkqkfj8xwpyf9v1fhk2vb81xj5fisjzhmlw"; + sha256 = "013bly0xswzkf2kwi2pr2ryd880h63n8pya2ccv4z77hxs80cfmp"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "11gp6l5kqcz4spxq552hsnw480vdhp70zmqlgjr906px3r31j7h3"; + sha256 = "0hr964r7bcff74sna0b8w3d2ip0hs441ijlhplh2xzqnzpbvx2jq"; }; patches = [ ./fix-shell-path.patch ]; From e455bdcd5198d12cc2c5f3dc7b6a1843b889b108 Mon Sep 17 00:00:00 2001 From: dupgit Date: Thu, 5 Oct 2017 21:43:16 +0200 Subject: [PATCH 0745/2806] tmux 2.5 -> tmux 2.6 Version bump --- pkgs/tools/misc/tmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index a749f250c11..61370ff890b 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "tmux-${version}"; - version = "2.5"; + version = "2.6"; outputs = [ "out" "man" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0zwjngfaqrlwwbzicc5pq5pyws8f1qghcajvj0hwkipj51hqyswf"; + sha256 = "0605y0nwfmf0mnq075vk80897c2cvhxxvxinqq7hvrpjf2ph5mww"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 3e5b594732a8c6642335f537faa95a6fcc3d9ec3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Oct 2017 16:06:19 -0400 Subject: [PATCH 0746/2806] linux-copperhead: 4.13.4.a -> 4.13.5.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 d0d5466ff0f..d141d7f4211 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.13.4"; + version = "4.13.5"; revision = "a"; - sha256 = "0l6xg06w0qicb64h8f6ldic947kn9a68wnad8pjwm89vy8vy4zqm"; + sha256 = "139qa6iyyjwn81v6z66ry1sifdvkbnql45m740djc0gv37il7mzv"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 51b557b2c860d860abc6914c2a618ea3e516d384 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 5 Oct 2017 22:41:37 +0200 Subject: [PATCH 0747/2806] CODEOWNERS: add @rycee for Eclipse IDE --- .github/CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6a1cf6e4ee8..24983cb5287 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -50,3 +50,6 @@ pkgs/development/tools/erlang/* @gleber # Jetbrains pkgs/applications/editors/jetbrains @edwtjo + +# Eclipse +pkgs/applications/editors/eclipse @rycee From 4086a9cf45ef6d098b31262e814aeb58e630e098 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Oct 2017 21:32:47 +0000 Subject: [PATCH 0748/2806] ocamlPackages.pprint: 20140424 -> 20171003 --- .../development/ocaml-modules/pprint/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 83732eb1f75..899806c4dae 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -2,13 +2,23 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" + then { + version = "20171003"; + sha256 = "06zwsskri8kaqjdszj9360nf36zvwh886xwf033aija8c9k4w6cx"; + } else { + version = "20140424"; + sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk"; +}; in + stdenv.mkDerivation { - name = "ocaml-pprint-20140424"; + name = "ocaml${ocaml.version}-pprint-${param.version}"; src = fetchurl { - url = http://gallium.inria.fr/~fpottier/pprint/pprint-20140424.tar.gz; - sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk"; + url = "http://gallium.inria.fr/~fpottier/pprint/pprint-${param.version}.tar.gz"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ocamlbuild ]; From 3200f7a576916add974c17a4d3579cc56b388c47 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Thu, 5 Oct 2017 17:41:29 -0400 Subject: [PATCH 0749/2806] mupdf and k2pdfopt: update mirror --- pkgs/applications/misc/k2pdfopt/default.nix | 2 +- pkgs/applications/misc/mupdf/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 03ed7554af5..015ef876064 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { (fetchpatch { name = "mupdf-1.10a-shared_libs-1.patch"; - url = "http://www.linuxfromscratch.org/patches/downloads/mupdf/mupdf-1.10a-shared_libs-1.patch"; + url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.10a-shared_libs-1.patch"; sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab"; }) ]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 5651405633f..61febf5a7ff 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { (fetchpatch { name = "mupdf-1.11-shared_libs-1.patch"; - url = "http://www.linuxfromscratch.org/patches/downloads/mupdf/mupdf-1.11-shared_libs-1.patch"; + url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch"; sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j"; }) ]; From 7ca1db2123f952ab10f6730bfbc05df7344653b4 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 5 Oct 2017 23:00:04 +0100 Subject: [PATCH 0750/2806] vscode: 1.16.1 -> 1.17.0 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index f72af1908c5..02b8d991eae 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.16.1"; + version = "1.17.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1k06rish1a1hqrkvzy21lg05vmzd345aa65g3d08ikh6508mp100"; - "x86_64-linux" = "1l2xbdvjfmf05cqcjcj3w2450vi7wvkm5zdwkmfhh01fnvbrygnw"; - "x86_64-darwin" = "0bxv3qlhcqn5sb5l5pjhi5560vi1sl844hx3r5x48gmmgd8yziaj"; + "i686-linux" = "1s6nkzdsgfn5x7y91bwb6d7sw4b8s335myc0yhbsfpfks5pgi331"; + "x86_64-linux" = "1av7xcb2sig5p344y2v1zjspg5nl9bds03r1yvgssm7mcy9l1gqk"; + "x86_64-darwin" = "1fn9i5vs4b6xir51zavx7i8m68bwqa1hfr03aagy8byg9v8w5dx8"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From 0ee6f8612ed13a0b1aaf0b703db42785c7baf302 Mon Sep 17 00:00:00 2001 From: michael bishop Date: Thu, 5 Oct 2017 19:33:18 -0300 Subject: [PATCH 0751/2806] dd-agent: fix multiple tags in the config file --- nixos/modules/services/monitoring/dd-agent/dd-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index 8d3d4f2065e..beaa2c01b29 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -23,7 +23,7 @@ let # proxy_password: password # tags: mytag0, mytag1 - ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"} + ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep ", " cfg.tags }"} # collect_ec2_tags: no # recent_point_threshold: 30 From 3780220f3ab0a61c1712820fae371e6b6ee998df Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 6 Oct 2017 00:55:24 +0200 Subject: [PATCH 0752/2806] perl-Server-Starter: 0.32 -> 0.33 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 02afd115f3d..f5742880016 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11976,13 +11976,13 @@ let self = _self // overrides; _self = with self; { }; }; - ServerStarter = buildPerlModule { - name = "Server-Starter-0.32"; + ServerStarter = buildPerlModule rec { + name = "Server-Starter-0.33"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.32.tar.gz; - sha256 = "a8ecc19f05f3c3b079e1c7f2c007a6df2b9a2912b9848a8fb51bd78c7b13ac1a"; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz"; + sha256 = "109cc1ede244f2edb7e020c507d4a1ff7a8074f22a8f7c30253fb00af1aba6f6"; }; - buildInputs = [ TestRequires TestSharedFork TestTCP ]; + buildInputs = [ ModuleBuild TestRequires TestSharedFork TestTCP ]; meta = { homepage = https://github.com/kazuho/p5-Server-Starter; description = "A superdaemon for hot-deploying server programs"; From 9c7a0d2cb6d524c062b067e2cb368b0a7aa696a8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 6 Oct 2017 00:55:54 +0200 Subject: [PATCH 0753/2806] perl-Set-Object: 1.34 -> 1.35 --- pkgs/top-level/perl-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f5742880016..51fb51be688 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12013,11 +12013,15 @@ let self = _self // overrides; _self = with self; { }; }; - SetObject = buildPerlPackage { - name = "Set-Object-1.34"; + SetObject = buildPerlPackage rec { + name = "Set-Object-1.35"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.34.tar.gz; - sha256 = "1dipd6k572pzqjzbj9vagb2k347qcg29lsxzx9y214bhnw7fgvjp"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + sha256 = "189a4d7cc3e583faa8518a63a95cf4aa3a320f79b5c6f5e40970687244080ee7"; + }; + meta = { + description = "Unordered collections (sets) of Perl Objects"; + license = stdenv.lib.licenses.artistic2; }; }; From 53c708379484da5c96887a9426d4796894fcf63f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 6 Oct 2017 00:56:20 +0200 Subject: [PATCH 0754/2806] perl-Variable-Magic: 0.58 -> 0.61 Also add meta section. --- pkgs/top-level/perl-packages.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 51fb51be688..ad9a8f885fd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15460,10 +15460,15 @@ let self = _self // overrides; _self = with self; { }; VariableMagic = buildPerlPackage rec { - name = "Variable-Magic-0.58"; + name = "Variable-Magic-0.61"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Variable/${name}.tar.gz"; - sha256 = "1yhh3zbawx68sw93xrnvfnqq5pb2pmbk20rckqxbwkq1n8c6lv83"; + url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; + sha256 = "b8afe92e54c72a2ed2ca1b08ce90518b855734f7d33c454d0f66f2c1ccf8a6d7"; + }; + meta = { + homepage = http://search.cpan.org/dist/Variable-Magic/; + description = "Associate user-defined magic to variables from Perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; From 4a3ed5d531fb4d52cf88f4281575b223dc316866 Mon Sep 17 00:00:00 2001 From: Carl Sverre Date: Sat, 30 Sep 2017 19:57:18 -0700 Subject: [PATCH 0755/2806] dep: init at 0.3.1 --- pkgs/development/tools/dep/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/dep/default.nix diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix new file mode 100644 index 00000000000..e22be524f02 --- /dev/null +++ b/pkgs/development/tools/dep/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "dep-${version}"; + version = "0.3.1"; + rev = "v${version}"; + + goPackagePath = "github.com/golang/dep"; + subPackages = [ "cmd/dep" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "dep"; + sha256 = "0dsiaqfrp7ihhx10qapkl6zm3dw3rwdgcr9rkvmq8zprcp7njz90"; + }; + + buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); + + meta = with stdenv.lib; { + homepage = https://github.com/golang/dep; + description = "Go dependency management tool"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.carlsverre ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c945bbe4060..02c36c484ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12665,6 +12665,8 @@ with pkgs; delve = callPackage ../development/tools/delve { }; + dep = callPackage ../development/tools/dep { }; + go-bindata = callPackage ../development/tools/go-bindata { }; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; From a6d570dd496c4b9d897b8c8c69844c72bc7d3b66 Mon Sep 17 00:00:00 2001 From: David Pflug Date: Thu, 5 Oct 2017 20:39:25 -0400 Subject: [PATCH 0756/2806] tqsl: init at 2.3.1 --- lib/maintainers.nix | 1 + .../misc/tqsl/cmake_lib_path.patch | 12 ++++++ pkgs/applications/misc/tqsl/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 54 insertions(+) create mode 100644 pkgs/applications/misc/tqsl/cmake_lib_path.patch create mode 100644 pkgs/applications/misc/tqsl/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ccde5c5e25b..9a53cf2f3c6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -164,6 +164,7 @@ dotlambda = "Robert Schütz "; doublec = "Chris Double "; dpaetzel = "David Pätzel "; + dpflug = "David Pflug "; drets = "Dmytro Rets "; drewkett = "Andrew Burkett "; dsferruzza = "David Sferruzza "; diff --git a/pkgs/applications/misc/tqsl/cmake_lib_path.patch b/pkgs/applications/misc/tqsl/cmake_lib_path.patch new file mode 100644 index 00000000000..5eed9383463 --- /dev/null +++ b/pkgs/applications/misc/tqsl/cmake_lib_path.patch @@ -0,0 +1,12 @@ +diff -dur tqsl-2.3.1/src/CMakeLists.txt tqsl-2.3.1b/src/CMakeLists.txt +--- tqsl-2.3.1/src/CMakeLists.txt 2017-04-17 20:53:22.000000000 -0400 ++++ tqsl-2.3.1b/src/CMakeLists.txt 2017-10-05 21:14:39.048329343 -0400 +@@ -54,7 +54,7 @@ + if(NOT APPLE AND NOT WIN32) + set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/") + set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h) +-install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX)) ++install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX}) + install(FILES config.xml DESTINATION share/TrustedQSL) + install(FILES ${HEADERS_TO_INSTALL} DESTINATION include) + endif() diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix new file mode 100644 index 00000000000..829ed258562 --- /dev/null +++ b/pkgs/applications/misc/tqsl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }: + +let + lib_suffix = + if stdenv.system == "x86_64-linux" then + "64" + else + ""; +in +stdenv.mkDerivation rec { + name = "tqsl-${version}"; + version = "2.3.1"; + + src = fetchurl { + url = "http://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; + sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + cmake + expat + openssl + zlib + db + curl + wxGTK + ]; + + patches = [ ./cmake_lib_path.patch ]; + + meta = with stdenv.lib; { + description = "Software for using the ARRL Logbook of the World"; + homepage = https://lotw.arrl.org/; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.dpflug ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f232f8acfcf..ccd8cdb65ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16722,6 +16722,8 @@ with pkgs; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; + tqsl = callPackage ../applications/misc/tqsl { }; + transcode = callPackage ../applications/audio/transcode { }; transcribe = callPackage ../applications/audio/transcribe { }; From 0d7e0b4ec2277cc94bc00efb0df5bb37079b01a2 Mon Sep 17 00:00:00 2001 From: Joel Rivera Date: Tue, 3 Oct 2017 00:07:19 -0500 Subject: [PATCH 0757/2806] enpass: 5.4.0.post4 -> 5.6.0 The file was generated with the update script that is part of the nix expressions for enpass. Also, it seems that 5.4 has some issues with dropbox sync, this was the original rationale to look for a newer version. --- pkgs/tools/security/enpass/data.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index b3625d928b5..28d568d30ae 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,12 +1,12 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_5.4.0-4_amd64.deb", - "sha256": "6b460fed2d7d8473e2b5d069dbe60263195b916c8b79a8fc7c2e8cb953134579", - "version": "5.4.0.post4" + "path": "pool/main/e/enpass/enpass_5.6.0_amd64.deb", + "sha256": "129ae4b4bfb8e0b4fa9acdfb3aebac3dd894364f2f31e9cd3bd5d3567e3a13b7", + "version": "5.6.0" }, "i386": { - "path": "pool/main/e/enpass/enpass_5.4.0-4_i386.deb", - "sha256": "1ec8088d5c3b2906d6820f96e1868c473e78dbe882f04e74a7816d19d43e3692", - "version": "5.4.0.post4" + "path": "pool/main/e/enpass/enpass_5.6.0_i386.deb", + "sha256": "c456002194c0be08a2c0da68ecf224425e35c46de5292098208e4e2b1f6d88ae", + "version": "5.6.0" } } \ No newline at end of file From 48b273ac49499368fe8c9b3d322f784957896377 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Oct 2017 10:12:41 -0400 Subject: [PATCH 0758/2806] atom: 1.20.1 -> 1.21.0 --- pkgs/applications/editors/atom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 8c77687d875..33d78591151 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0mr82m3yv18ljai3r4ncr65bqhjwxyf1si77iza4ijk5zv1llp7i"; + sha256 = "0xnja2jdjjryisxgyxhh8ik861snl9wdpmr3rjlnalfglghqqb5h"; name = "${name}.deb"; }; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { --set-rpath "${atomEnv.libPath}" \ $out/share/atom/resources/app/apm/bin/node - rm -f $out/share/atom/resources/app/node_modules/dugite/git/bin/git - ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app/node_modules/dugite/git/bin/git + rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git + ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \; From 1d74f31a0a618175bc7afeafc53c44677081a40f Mon Sep 17 00:00:00 2001 From: Rommel Martinez Date: Fri, 6 Oct 2017 15:16:39 +0800 Subject: [PATCH 0759/2806] maintainers.nix: update email --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ccde5c5e25b..74972203af0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -170,7 +170,7 @@ dtzWill = "Will Dietz "; dywedir = "Vladyslav M. "; e-user = "Alexander Kahl "; - ebzzry = "Rommel Martinez "; + ebzzry = "Rommel Martinez "; edanaher = "Evan Danaher "; edef = "edef "; ederoyd46 = "Matthew Brown "; From cb593780f3b0d7de4a72346dca208de9df348379 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Fri, 6 Oct 2017 10:55:36 +0200 Subject: [PATCH 0760/2806] trivial-builders.nix: fix writeShellScriptBin The check should be performed on the target shell script, not on the output directory. --- pkgs/build-support/trivial-builders.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 14553c33e03..32214db6584 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -68,7 +68,7 @@ rec { ${text} ''; checkPhase = '' - ${stdenv.shell} -n $out + ${stdenv.shell} -n $out/bin/${name} ''; }; From f432fdfb318af5ea9f8596a31de51654a9229bb5 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 6 Oct 2017 11:05:13 +0100 Subject: [PATCH 0761/2806] direnv: fix homepage URL --- pkgs/tools/misc/direnv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 1606fffe397..13f4e5e0b9c 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -42,7 +42,7 @@ buildGoPackage rec { In short, this little tool allows you to have project-specific environment variables. ''; - homepage = http://direnv.net; + homepage = https://direnv.net; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; From 92852fd193eb5954c9e667e26894819d64423230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 6 Oct 2017 11:56:35 +0200 Subject: [PATCH 0762/2806] ccid: change patchPhase to postPatch This stops the derivation from overriding the default patchPhase, which right now prevents adding a list of patches in the "patches" attribute. --- pkgs/tools/security/ccid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index e450cf5952e..9eb5858b057 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0dyikpmhsph36ndgd61bs4yx437v5y0bmm8ahjacp1k9c1ly4q56"; }; - patchPhase = '' + postPatch = '' patchShebangs . substituteInPlace src/Makefile.in --replace /bin/echo echo ''; From 55f5699d42f92d91ab2c1a155c3ff21b56c8790e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 6 Oct 2017 11:11:01 +0100 Subject: [PATCH 0763/2806] direnv: 2.12.2 -> 2.13.1 --- pkgs/tools/misc/direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 13f4e5e0b9c..cfad499a432 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.12.2"; + version = "2.13.1"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0i8fnxhcl1zin714wxk93x8fi36z4fibapfn4jl3qkwbczkj8c8b"; + sha256 = "1j2jkxzd6rh4ms39izqfm4w8h12dg0ccvqsj0z1z4hb3f1jqcgbz"; }; postConfigure = '' From 53d754da34293f77e9532837d37b67db541c057e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Oct 2017 03:00:44 +0200 Subject: [PATCH 0764/2806] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.6-11-g74d58ee from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/6bc86c2d10432de6fe50cb2835e7d01406380c17. --- .../haskell-modules/hackage-packages.nix | 1078 +++++++++++++---- 1 file changed, 819 insertions(+), 259 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d8c2d47374a..5524dce42d9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5750,7 +5750,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Frames_0_2_1" = callPackage + "Frames_0_2_1_1" = callPackage ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml , HUnit, pipes, pretty, primitive, readable, regex-applicative , template-haskell, temporary, text, transformers @@ -5758,8 +5758,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.2.1"; - sha256 = "1mj2s4afj5wlpg3893j2nd5z98vcxqxi83s1z82lknaq6i7n805q"; + version = "0.2.1.1"; + sha256 = "19sgkra9i5mn8nbys1h17vhl2j1yhd43hhg4bjr35nz9hj1cjfjs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6262,8 +6262,8 @@ self: { }: mkDerivation { pname = "GenI"; - version = "0.25.0"; - sha256 = "1mxx8mcrlq54gb436jyk8g9k2i56ybp3m3gzi7bmjda6qpf7b8l8"; + version = "0.25.0.1"; + sha256 = "0jdalwm1qhr0adlxfbmw7valqiqmfziv4xrlyprw2nycic99p7gm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -6536,6 +6536,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Glob_0_9_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.9.0"; + sha256 = "08q2s8ms5klir1pipbsvb5pwdh6hj784p9dkbph7spk2jcqm67lv"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -9045,8 +9069,8 @@ self: { pname = "HarmTrace"; version = "2.2.1"; sha256 = "1f0m154fqal44i16bq9lxzsxj1810rmjvg7a17q5p80phg3dzarj"; - revision = "1"; - editedCabalFile = "0jnj3srkbwi88v8b7zqmkd5zxrc8vsgibf8a0zs82jra0a9jvg6g"; + revision = "2"; + editedCabalFile = "0n1qh6bn1r7hwa7aafgs7pvjh8c1qavq2s9vc56989p73llwl1qr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -9066,8 +9090,8 @@ self: { }: mkDerivation { pname = "HarmTrace-Base"; - version = "1.5.3.1"; - sha256 = "1plr7rf8658pbys7gw78xsqqjnn0pm84am88hp2iawsi20qfz9mf"; + version = "1.6.0.0"; + sha256 = "03rma29wkrcixvd5whmmlqkhiznxgff3dq8jmw6w7xzr9fn72f9b"; libraryHaskellDepends = [ base binary containers ghc-prim ListLike uu-parsinglib ]; @@ -20083,17 +20107,17 @@ self: { "accelerate-llvm-native" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring , c2hs, Cabal, cereal, containers, directory, dlist, fclabels - , filepath, ghc, ghc-prim, libffi, llvm-hs, llvm-hs-pure, mtl - , template-haskell, time, unix, vector + , filepath, ghc, ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure + , mtl, template-haskell, time, unique, unix, vector }: mkDerivation { pname = "accelerate-llvm-native"; - version = "1.1.0.0"; - sha256 = "0jg46i12vxf4fr5w0s8wwdh701ba088l4ign7yfvmzbhgcpvan5d"; + version = "1.1.0.1"; + sha256 = "0hxws9lsmcsrhj0gxwnl86mcsg8x7wyv13lbb2lrglkychqkkv5l"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring Cabal cereal containers - directory dlist fclabels filepath ghc ghc-prim libffi llvm-hs - llvm-hs-pure mtl template-haskell time unix vector + directory dlist fclabels filepath ghc ghc-prim hashable libffi + llvm-hs llvm-hs-pure mtl template-haskell time unique unix vector ]; libraryToolDepends = [ c2hs ]; description = "Accelerate backend for multicore CPUs"; @@ -21666,6 +21690,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-injector_1_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, containers, deepseq + , hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific + , servant-docs, swagger2, tasty, tasty-hunit, tasty-quickcheck + , text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-injector"; + version = "1.1.0.0"; + sha256 = "1dkl7sgzi9hzc86a27wfch7p33sj1h8zh7xsah3fbqjbz4y8z9wf"; + libraryHaskellDepends = [ + aeson base bifunctors deepseq hashable lens servant-docs swagger2 + text unordered-containers + ]; + testHaskellDepends = [ + aeson base containers HUnit lens QuickCheck quickcheck-text + scientific swagger2 tasty tasty-hunit tasty-quickcheck text vector + ]; + description = "Injecting fields into aeson values"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-iproute" = callPackage ({ mkDerivation, aeson, base, iproute, text }: mkDerivation { @@ -22428,8 +22475,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.7.4"; - sha256 = "0p18s265yf2ficygvgzrngl2ax1zf73h56mz3jv3iigjrsjf4rj2"; + version = "0.7.4.2"; + sha256 = "12igx82kzbsg9zick5r9nai2zdds33pkfgp0zm9kdr4a04qz58z1"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -25698,6 +25745,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ansigraph_0_3_0_4" = callPackage + ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: + mkDerivation { + pname = "ansigraph"; + version = "0.3.0.4"; + sha256 = "0gyim5a4b0gc4z45hsbxwl3gn3xcad3068xwcgwh8gc4ikannki9"; + libraryHaskellDepends = [ ansi-terminal base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/BlackBrane/ansigraph"; + description = "Terminal-based graphing via ANSI and Unicode"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antagonist" = callPackage ({ mkDerivation, antisplice, base, chatty, chatty-utils, ironforge , mtl, shakespeare, text, time, time-locale-compat, yesod @@ -34632,6 +34693,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; + "bitset-word8" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck + , template-haskell, th-lift-instances + }: + mkDerivation { + pname = "bitset-word8"; + version = "0.1.0.1"; + sha256 = "1lsjaxv7858r5xl8a0lffghlmj3w853ndmmfybki7cfwcqr3mhk2"; + libraryHaskellDepends = [ + base bytestring containers template-haskell th-lift-instances + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/nshimaza/bitset-word8#readme"; + description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP"; + license = stdenv.lib.licenses.mit; + }) {}; + "bitspeak" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-glib , bindings-gobject, gtk2, pango @@ -36719,7 +36797,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_25" = callPackage + "brick_0_26_1" = callPackage ({ mkDerivation, base, containers, contravariant, data-clist , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm , template-haskell, text, text-zipper, transformers, vector, vty @@ -36727,8 +36805,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.25"; - sha256 = "0yj1lw8a82xw5kkaqq5dhffzw8gcjb8cb1wjbsyc3hgcscy9vn9m"; + version = "0.26.1"; + sha256 = "05jajgb0k1346gg4jc44d921x1bsjwxsaw0ibrf3icaq7x5m11rk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37482,8 +37560,8 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.1.0.2"; - sha256 = "0pwlmz3ns4fiq1w0c0a9di0q1z9jc009si0imh7j48iswakm0la1"; + version = "1.2.0.0"; + sha256 = "0i18j6pw67bh2bb04zh4x4cbxyy9n7x65yyqfcl3qvl7mz4wzd7k"; libraryHaskellDepends = [ base bifunctors containers deque either extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -38062,13 +38140,13 @@ self: { }) {}; "byteunits" = callPackage - ({ mkDerivation, base, Cabal, QuickCheck, safe }: + ({ mkDerivation, base, Cabal, HUnit, QuickCheck, safe }: mkDerivation { pname = "byteunits"; - version = "0.2.0.2"; - sha256 = "1n0gbjjhxx6rv07sck3bx70bd96pkgl0vx5qyqbby9gdfndil4vl"; + version = "0.3.0.2"; + sha256 = "1nfr56zxzvh0lf2qqmjb2jiaslmsr4a73bflvh9y5zqp1aivchgq"; libraryHaskellDepends = [ base safe ]; - testHaskellDepends = [ base Cabal QuickCheck ]; + testHaskellDepends = [ base Cabal HUnit QuickCheck ]; description = "Human friendly conversion between byte units (KB, MB, GB...)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -38140,8 +38218,8 @@ self: { }: mkDerivation { pname = "c-mosquitto"; - version = "0.1.0.1"; - sha256 = "0scghhz6d9i3rbdl95dvfc03ds99nx0hgmsx29n1d8v8bvvmkpz4"; + version = "0.1.2.0"; + sha256 = "1q2g7wv11d8p5ykbh0m7xd8jx4lvm73i503rz5pvsgmgm39fwy98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45786,19 +45864,19 @@ self: { "colorless" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, errors , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl - , random, scientific, text, unordered-containers, vector + , random, scientific, text, tuple, unordered-containers, vector }: mkDerivation { pname = "colorless"; - version = "2.1.0"; - sha256 = "1dr8isfvwhfh3j59yrvvyjrqq17iw0qi5xapfhgv7xjsq8lw2wpx"; + version = "2.2.4"; + sha256 = "0w9mrdfnj0g1dis88zbpcfjwxl3n3m93k14rwvy4lwxpykafjvr5"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async monad-control monad-logger mtl random scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base containers hspec scientific text vector + aeson base containers hspec scientific text tuple vector ]; description = "Colorless"; license = stdenv.lib.licenses.bsd3; @@ -47256,14 +47334,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_2_0_0" = callPackage + "concurrency_1_2_1_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.2.0.0"; - sha256 = "08mqacgidcqsr633h4msbq2as8q1j5fim0jz9j46lpd1p1ksygn5"; + version = "1.2.1.0"; + sha256 = "1361ywfwbymnw1siaysswl0hfh5hq8zgzkazy226civxcap4pi47"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -47635,8 +47713,8 @@ self: { }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.4.0"; - sha256 = "0d142r0ljcdyd6z92k4nn19a0sain4fdqmfdr1wiibwq4bdcfzqw"; + version = "0.0.5.0"; + sha256 = "0c8r4iydvzlp1q2szqnxpk8g95dn905ymzsa3isxdh9cjjqm5lbi"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators conduit-extra containers deepseq directory filepath mtl resourcet @@ -50585,14 +50663,18 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, containers, QuickCheck, tasty + ({ mkDerivation, base, containers, enummapset, lattices, microlens + , microlens-ghc, microlens-mtl, mtl, QuickCheck, tasty , tasty-quickcheck }: mkDerivation { pname = "crdt"; - version = "0.5"; - sha256 = "11svy9z96964b9cfh2x7cnibq785vnb4v9r6jvhbakda634c61mg"; - libraryHaskellDepends = [ base containers ]; + version = "1.0"; + sha256 = "0s9naq4bakivgs9bqjrp9pli3yfj9ync69pif61q7jsb0gw8w9ny"; + libraryHaskellDepends = [ + base containers enummapset lattices microlens microlens-ghc + microlens-mtl mtl + ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck ]; @@ -57187,8 +57269,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "derive-storable"; - version = "0.1.1.0"; - sha256 = "0yh998p0n89ma3698qiiw42yrchn2jp5h3jfjpsw0vs9jqh144l1"; + version = "0.1.1.1"; + sha256 = "0rb60s5wznlqqq2s8l2wrvbgzalk719x550h321vf1xx6ck6g8g2"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://www.github.com/mkloczko/derive-storable/"; @@ -58847,8 +58929,8 @@ self: { ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }: mkDerivation { pname = "dimensions"; - version = "0.3.0.0"; - sha256 = "00932v3j629ik2n4flq74zcxvvqxgsl88sifyn2ppdwvp535cmhm"; + version = "0.3.1.0"; + sha256 = "1img3byk6jyfjqn1diss2067k88ii6hg5g92yaghkizh1d2vmyi0"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/achirkin/easytensor#readme"; @@ -60044,8 +60126,8 @@ self: { }: mkDerivation { pname = "distributed-process-tests"; - version = "0.4.10"; - sha256 = "08fmyqiwxi0r8v1qndgjnj6gd74982sdailkxv4471kbskhr9dnp"; + version = "0.4.11"; + sha256 = "0rpmmyl3bal61q1gg6kk57i8whvard8r6f6w57pdgspp2sy5bhh7"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process distributed-static HUnit network network-transport random rematch @@ -60617,8 +60699,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.4.0.2"; - sha256 = "1y2bk71zz3m6dm9b1cnkfyvi2x62v1kc08h9pbpxs43r82fz2xa0"; + version = "0.4.1.0"; + sha256 = "1ywqi7mcyb39fir040gfnk8cb57ysa8mnhcss5x2jvhgqfg3vffw"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -61118,28 +61200,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dotenv_0_5_0_2" = callPackage + "dotenv_0_5_1_0" = callPackage ({ mkDerivation, base, base-compat, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text , transformers }: mkDerivation { pname = "dotenv"; - version = "0.5.0.2"; - sha256 = "0jdm8ci2d1iafxiq8r27iclmgrmr9d3md3slc0wv01magsdsl0hb"; + version = "0.5.1.0"; + sha256 = "1cgx9q8gdfvkv3vr10yafa0vls2iil5kr5nqdbn4n9xf8m5p3dn1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base base-compat exceptions megaparsec text transformers + base base-compat exceptions megaparsec process text transformers ]; executableHaskellDepends = [ base base-compat megaparsec optparse-applicative process text transformers ]; testHaskellDepends = [ - base base-compat exceptions hspec hspec-megaparsec megaparsec text - transformers + base base-compat exceptions hspec hspec-megaparsec megaparsec + process text transformers ]; homepage = "https://github.com/stackbuilders/dotenv-hs"; description = "Loads environment variables from dotenv files"; @@ -62362,9 +62444,11 @@ self: { pname = "dyckword"; version = "0.1.0.4"; sha256 = "1904dy0f30jbv3b43vpkfsczr27xsfsnvmh21xhd9y4lvdah0rbr"; + revision = "1"; + editedCabalFile = "0w0az7jkkyfvaldh44b9pmqlwrfvjxmfk07hvrdiwxl62klg4plq"; libraryHaskellDepends = [ base exact-combinatorics text ]; testHaskellDepends = [ ansi-terminal base hspec text ]; - homepage = "https://github.com/johanneshilden/dyckword#readme"; + homepage = "https://github.com/laserpants/dyckword#readme"; description = "A library for working with binary Dyck words"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62817,14 +62901,14 @@ self: { }: mkDerivation { pname = "easytensor"; - version = "0.3.0.0"; - sha256 = "1a6y6lrnc82354jqfrns4bb3pwhiwnidfcgfwzg38wsdmpq5rhg9"; + version = "0.3.1.0"; + sha256 = "07shnpbnh3qq28yhcrhwhhb8m8b9x5ad36cj5f5hxqghfhih7k6b"; libraryHaskellDepends = [ base dimensions ghc-prim ]; testHaskellDepends = [ base Cabal dimensions QuickCheck ]; benchmarkHaskellDepends = [ base dimensions time ]; homepage = "https://github.com/achirkin/easytensor#readme"; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -65700,10 +65784,8 @@ self: { }: mkDerivation { pname = "ersatz-toysat"; - version = "0.2.1.0"; - sha256 = "1dpp4jl5mzc2z07f5670baxn95xvqgl9ynk0r0m83arpyp380fdq"; - revision = "1"; - editedCabalFile = "0xkpi1m3brgf4mkqmzv45a9wfmvj09hp0bzcq0kcv47p7p5qcvql"; + version = "0.2.2.0"; + sha256 = "056yyls1mhl20sbngk43lip9gi092c1da0snx6fcs0vbv8gm0j4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65955,20 +66037,23 @@ self: { }) {}; "ethereum-analyzer" = callPackage - ({ mkDerivation, base, bimap, bytestring, containers - , ethereum-analyzer-deps, extra, fgl, graphviz, hexstring, hoopl - , hspec, text + ({ mkDerivation, aeson, base, bimap, bytestring, containers + , ethereum-analyzer-deps, extra, fgl, GenericPretty, graphviz + , hexstring, hoopl, hspec, pretty, protolude, split, text + , unordered-containers, wl-pprint-text }: mkDerivation { pname = "ethereum-analyzer"; - version = "1.3.0"; - sha256 = "18ri9wdcxh10sz5jlgsybjdvbwpcqbq2jjph15iwl4wwmlnzfqx1"; + version = "2.0.0"; + sha256 = "1nrvlziqhszns4hwbhg53k0jcd3xbc4gfg60snvh4i4x2cj6r3pz"; libraryHaskellDepends = [ - base bimap bytestring containers ethereum-analyzer-deps extra fgl - graphviz hexstring hoopl text + aeson base bimap bytestring containers ethereum-analyzer-deps extra + fgl GenericPretty graphviz hexstring hoopl pretty protolude split + text unordered-containers wl-pprint-text ]; testHaskellDepends = [ - base bytestring ethereum-analyzer-deps extra hoopl hspec text + base bytestring ethereum-analyzer-deps extra GenericPretty hoopl + hspec protolude text wl-pprint-text ]; homepage = "https://github.com/ethereumK/ethereum-analyzer"; description = "A Ethereum contract analyzer"; @@ -65980,12 +66065,13 @@ self: { ({ mkDerivation, aeson, base, bytestring, conduit-combinators , directory, ethereum-analyzer, ethereum-analyzer-deps, exceptions , hexstring, hflags, http-conduit, json-rpc, monad-logger, mtl - , protolude, text, tostring, unordered-containers, vector + , optparse-applicative, optparse-text, protolude, text, tostring + , unordered-containers, vector }: mkDerivation { pname = "ethereum-analyzer-cli"; - version = "1.3.0"; - sha256 = "0bbqvg6kl4dsfyh9gb9n0bys5v6c4clqf7sg91p5k0znap8sj06c"; + version = "2.0.0"; + sha256 = "12n9x7c6cqki96ydkvb0ldbl3nra1lcvr4p47hnnw3dcna99dxhh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65995,7 +66081,8 @@ self: { unordered-containers vector ]; executableHaskellDepends = [ - base ethereum-analyzer-deps hflags monad-logger protolude + base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger + optparse-applicative optparse-text protolude text ]; homepage = "https://github.com/ethereumK/ethereum-analyzer"; description = "A CLI frontend for ethereum-analyzer"; @@ -66010,8 +66097,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-deps"; - version = "1.3.0"; - sha256 = "102i96a150mm68cxy4qm8pfdzjm0m6ip846g08dzvdx8cl9si1iy"; + version = "2.0.0"; + sha256 = "1kjnxg7j8343amy77m96xx6wzqk4gph1gmpb1ffqky2a70n8bngn"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base16-bytestring binary bytestring containers deepseq fast-logger global-lock monad-logger split text @@ -66031,8 +66118,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-webui"; - version = "1.3.0"; - sha256 = "0ffpgb4y25qkbzrarhcnzfq92fal5i1p986cy9ipg3dd7y7dham1"; + version = "2.0.0"; + sha256 = "1b4pc6nfn3cc38n0f8pvgmc32pk1shnm0r9227xxi07093m8az1w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68494,8 +68581,8 @@ self: { }: mkDerivation { pname = "fastparser"; - version = "0.3.0.1"; - sha256 = "05ag040bw5ca05yl9l4nqdmsh9my1b2jnf5qc9kbwk5i8zqkfv15"; + version = "0.3.1"; + sha256 = "0qs3i1cxcdgyi2595qcqalqflpfkqgg6krw7dmjq4kk4pmnm6yw4"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers kan-extensions microlens thyme transformers vector-space @@ -70191,6 +70278,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "find-clumpiness_0_2_3_1" = callPackage + ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness + , containers, hierarchical-clustering, listsafe, mtl + , optparse-applicative, text, text-show, tree-fun + , unordered-containers, vector + }: + mkDerivation { + pname = "find-clumpiness"; + version = "0.2.3.1"; + sha256 = "0aicxjh58cz25kxigz013j07a0vc5jyirs75daqjmlgd3rj5b7h8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base BiobaseNewick bytestring clumpiness containers + hierarchical-clustering listsafe mtl text text-show tree-fun + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base BiobaseNewick bytestring clumpiness containers + optparse-applicative text tree-fun unordered-containers + ]; + homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; + description = "Find the clumpiness of labels in a tree"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "find-conduit" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -70255,6 +70369,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fingertree_0_1_2_1" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "fingertree"; + version = "0.1.2.1"; + sha256 = "03vchlbhx9ipjx1w8y4pfc4awb1gjjgr5f95h977lknzb5ad9fx5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "Generic finger-tree structure, with example instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fingertree-psqueue" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -72174,20 +72306,22 @@ self: { }) {}; "forest-fire" = callPackage - ({ mkDerivation, aeson, base, bytestring, cli, containers - , pretty-tree, process, text + ({ mkDerivation, aeson, base, bytestring, cli, containers, HUnit + , mtl, process, tasty, tasty-hunit, text }: mkDerivation { pname = "forest-fire"; - version = "0.1.1.1"; - sha256 = "1v8lj9bx0hjkhjr4iv672x84016hsn80nhcfqdknl87vz5bk7z9s"; + version = "0.2"; + sha256 = "1y50nlj2k2glzypr3nvwcx7pdf7bwn0n4d4vks5n8balvx6yaniq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers pretty-tree process text + aeson base bytestring containers process text ]; executableHaskellDepends = [ base cli ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit mtl tasty tasty-hunit + ]; homepage = "https://github.com/toothbrush/forest-fire#readme"; description = "Recursively delete CloudFormation stacks and their dependants"; license = stdenv.lib.licenses.bsd3; @@ -74786,29 +74920,32 @@ self: { "gdax" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base , base64-bytestring, byteable, bytestring, containers, cryptohash - , exceptions, http-client, http-client-tls, lens, lens-aeson, mtl - , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th, text - , time, uuid, vector, websockets, wreq, wuss + , exceptions, hashable, http-client, http-client-tls, lens + , lens-aeson, mtl, regex-tdfa, regex-tdfa-text, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text, time + , unordered-containers, uuid, vector, websockets, wreq, wuss }: mkDerivation { pname = "gdax"; - version = "0.5.0.1"; - sha256 = "0bjypc6szmdz0ldbbj3n5a4qf78x00yxvml2n647q5p4laan843a"; + version = "0.6.0.0"; + sha256 = "08b7j5dcs5indpd6gb6pc3aw692jqvm26vfnq12mpssdbv7fzf6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring byteable bytestring - cryptohash exceptions http-client http-client-tls lens lens-aeson - mtl scientific text time uuid vector websockets wreq wuss + containers cryptohash exceptions hashable http-client + http-client-tls lens lens-aeson mtl regex-tdfa regex-tdfa-text + scientific text time unordered-containers uuid vector websockets + wreq wuss ]; executableHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bytestring text + aeson aeson-pretty base base64-bytestring bytestring text vector websockets wuss ]; testHaskellDepends = [ - aeson base base64-bytestring bytestring containers exceptions lens - lens-aeson mtl tasty tasty-hunit tasty-quickcheck tasty-th text - time vector websockets wuss + aeson aeson-pretty base base64-bytestring bytestring containers + exceptions lens lens-aeson mtl tasty tasty-hunit tasty-quickcheck + tasty-th text time unordered-containers vector websockets wuss ]; homepage = "https://github.com/AndrewRademacher/gdax"; description = "API Wrapping for Coinbase's GDAX exchange"; @@ -75651,8 +75788,8 @@ self: { }: mkDerivation { pname = "geni-util"; - version = "0.25.0"; - sha256 = "0jpsiydbamyp3c7q61gw8c4jdcdgj7cvavli5x287krpm74s361z"; + version = "0.25.0.1"; + sha256 = "1p62m885w3wpin8g2lcjzrk8a0gslkrxml6d66m38m6lflgwrm6h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -76599,6 +76736,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-events_0_7_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers, text + , vector + }: + mkDerivation { + pname = "ghc-events"; + version = "0.7.0"; + sha256 = "12vs1vpi969391k1n7apg2sd399dl5xdkjgb8rbn9sj0dmp9l946"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers text vector + ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base bytestring ]; + description = "Library and tool for parsing .eventlog files from GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-events-analyze" = callPackage ({ mkDerivation, base, containers, diagrams-lib, diagrams-svg , filepath, ghc-events, lens, mtl, optparse-applicative, parsec @@ -78757,8 +78914,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20170925"; - sha256 = "0kzqndnazqhm777gaym7lp6rknhll3b6lr19y4cxqpr1baslvcf0"; + version = "6.20171003"; + sha256 = "0fyyad5fbdacwyg8b1m6fp1qqkdhp1hgp5r1isivmxfbk15xgvai"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -83509,8 +83666,8 @@ self: { }: mkDerivation { pname = "graphite"; - version = "0.4.1.0"; - sha256 = "1qk3inkd9lrvhds553z0jvflpalmr02hgx4656x0qp2yqh9nvp96"; + version = "0.4.2.0"; + sha256 = "11pa89d916c5kk08gwwnsrji4d16ccbqw0wrcn4fnp59nfcjs53l"; libraryHaskellDepends = [ base bytestring cassava containers graphviz hashable process QuickCheck random unordered-containers vector @@ -89668,8 +89825,8 @@ self: { pname = "hashids"; version = "1.0.2.3"; sha256 = "0d15h8q4llq7x82g3r3pnyj1lw3ryj5q4nvi2i152agpx0sl5mzc"; - revision = "1"; - editedCabalFile = "0yp2lsk906qibir9r3lvln44y8lpjx34w7kmwkqw1a5irzpnxnyc"; + revision = "2"; + editedCabalFile = "1l4zz47c0kcpwi7l4dsizddi2c1a6k3v6a0b6w4wjylvzd066fz0"; libraryHaskellDepends = [ base bytestring containers split ]; testHaskellDepends = [ base bytestring containers split ]; homepage = "http://hashids.org/"; @@ -96859,6 +97016,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hgrep" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, ghc + , ghc-exactprint, hscolour, lens, optparse-applicative, pcre-heavy + , template-haskell + }: + mkDerivation { + pname = "hgrep"; + version = "0.1"; + sha256 = "1pddn24pw8yv1lp3ihbwnanyvrc1nr974sfba2w91shr8m1kimaf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring ghc ghc-exactprint hscolour lens + pcre-heavy template-haskell + ]; + executableHaskellDepends = [ + ansi-terminal base optparse-applicative + ]; + homepage = "https://github.com/thumphries/hgrep"; + description = "Search Haskell source code from the command line"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hgrev" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , process, template-haskell @@ -98465,6 +98645,8 @@ self: { pname = "hledger"; version = "1.4"; sha256 = "146llzlpijcai3cfqcd4l4dcyjq6j6wd6pinkllja73vpx7wyi75"; + revision = "1"; + editedCabalFile = "16q9ji8qrgpxchxmx0k77qq3hhfz5h09qyc7r3pkav04nx3pv1sg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -98551,8 +98733,8 @@ self: { ({ mkDerivation, base, hledger-lib, text, time }: mkDerivation { pname = "hledger-diff"; - version = "0.2.0.10"; - sha256 = "1sslida2pl8r7lfab6lwkws0fq2a8h14rqq01qnxdg2pmfl6q69y"; + version = "0.2.0.11"; + sha256 = "1y5f7xdw1rriz2d7qxnkywyjsa09bk6712rks3l1zkihi5i3fnr7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hledger-lib text time ]; @@ -98573,8 +98755,8 @@ self: { pname = "hledger-iadd"; version = "1.2.6"; sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36"; - revision = "2"; - editedCabalFile = "0a9ciakp892i0g8kf199lh4x0gzisbjaidihhinkf7gk3f40p3il"; + revision = "3"; + editedCabalFile = "0avx22jx969dzg865rgpcvg5n844fqinhsnxir0cbmilpfj5a33k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98647,6 +98829,8 @@ self: { pname = "hledger-lib"; version = "1.4"; sha256 = "15hyrpn0ifwx4x22hggjdm1xz0jyk8p5wnrynzxy9ali0wci1qxq"; + revision = "1"; + editedCabalFile = "0nyf7cvv5qhz1n48qj3ib1d56q694zj1b1wfqlrzzfj2a7mi2p4c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring @@ -98679,6 +98863,8 @@ self: { pname = "hledger-ui"; version = "1.4"; sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33"; + revision = "2"; + editedCabalFile = "1cm2nbz0wvy05n33km9h69qwch51gc44dk1jzi26ivqqqxy6h6jj"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -98726,6 +98912,8 @@ self: { pname = "hledger-web"; version = "1.4"; sha256 = "1l5mxvhgvn3q1ds9qmqkdmrs82619nvs13gmjsynr0vbbx52zw7h"; + revision = "1"; + editedCabalFile = "14ayvky2pjaj2hnxajpb5h0hi2r6fl2ps401abn4apk36y3w16ab"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -99673,6 +99861,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_4_0" = 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.4.0"; + sha256 = "0wksa14mj7pyd6mjv81m1djqs8s79sri8a1by14l626pgai7p3h0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-conduit http-types microlens + text unordered-containers uri-bytestring uri-bytestring-aeson + ]; + executableHaskellDepends = [ + aeson base bytestring containers http-conduit http-types text + uri-bytestring wai warp + ]; + homepage = "https://github.com/freizl/hoauth2"; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -99939,21 +100152,30 @@ self: { }) {}; "hol" = callPackage - ({ mkDerivation, base, bytestring, containers, pretty, QuickCheck - , text, transformers + ({ mkDerivation, base, bytestring, containers, filepath, parsec + , pretty, process, QuickCheck, text, transformers }: mkDerivation { pname = "hol"; - version = "1.1"; - sha256 = "0d3m343zgnffjk5dnv7i5w5nj3jjbw17fnrrwb10vq177fkbq4gz"; + version = "1.2"; + sha256 = "121nz9v05fj7qph9x1c7vg7zasvcm2bdlqsk8y0apvgx1wh58cdp"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring containers pretty text transformers + base bytestring containers filepath parsec pretty process text + transformers + ]; + executableHaskellDepends = [ + base bytestring containers filepath parsec pretty process + QuickCheck text transformers ]; testHaskellDepends = [ - base bytestring containers pretty QuickCheck text transformers + base bytestring containers filepath parsec pretty process + QuickCheck text transformers ]; benchmarkHaskellDepends = [ - base bytestring containers pretty text transformers + base bytestring containers filepath parsec pretty process text + transformers ]; description = "Higher order logic"; license = stdenv.lib.licenses.mit; @@ -101175,8 +101397,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.19.1"; - sha256 = "0ncq8kpmsz6lhqajap9ql5ln3pva9hxwk69hsi3x0dgjvkivpsaf"; + version = "0.19.2"; + sha256 = "0kwsy3qwhvc55czszddbq16nz2wniwx7m04i9fkywxcrifjkk7n4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101511,6 +101733,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpio_0_9_0_0" = 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 + }: + mkDerivation { + pname = "hpio"; + version = "0.9.0.0"; + sha256 = "1j69y396k08af6pvxj0l1687fdfknsyv3xhy7lhhibglv6nskg48"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory exceptions filepath + monad-control monad-logger mtl protolude QuickCheck text + transformers transformers-base unix unix-bytestring + ]; + executableHaskellDepends = [ + async base exceptions mtl optparse-applicative protolude text + transformers + ]; + testHaskellDepends = [ + base containers directory doctest exceptions filepath hlint hspec + protolude QuickCheck + ]; + homepage = "https://github.com/quixoftic/hpio#readme"; + description = "Monads for GPIO in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hplayground" = callPackage ({ mkDerivation, base, containers, data-default, haste-compiler , haste-perch, monads-tf, transformers @@ -101993,6 +102246,19 @@ self: { license = "GPL"; }) {}; + "hs-bibutils_6_2" = callPackage + ({ mkDerivation, base, syb }: + mkDerivation { + pname = "hs-bibutils"; + version = "6.2"; + sha256 = "0nzw06qn8ff6k2bl92fmd1wwxcy8m0r9lm34mg41ffnm8jm2scfn"; + libraryHaskellDepends = [ base syb ]; + homepage = "https://github.com/wilx/hs-bibutils"; + description = "Haskell bindings to bibutils, the bibliography conversion utilities"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-blake2" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck @@ -104040,15 +104306,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_1;}; - "hslua_0_8_0" = callPackage + "hslua_0_9_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, fail , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "0.8.0"; - sha256 = "0zl7znhbwnqcdvy9v18x3ch8vxk719k5lx55nr65996wb193nwmc"; + version = "0.9.0"; + sha256 = "1ka6vacjrs4y7c83ay7zpvw3kgv19snb50jmfb8j00dprap5wwgq"; configureFlags = [ "-fsystem-lua" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text @@ -104085,15 +104351,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hslua-aeson_0_3_0" = callPackage + "hslua-aeson_0_3_0_1" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit , ieee754, QuickCheck, quickcheck-instances, scientific, text , unordered-containers, vector }: mkDerivation { pname = "hslua-aeson"; - version = "0.3.0"; - sha256 = "1vsgncxxdwachbqp7pbckij94621zccz001hs774asvyc12anp38"; + version = "0.3.0.1"; + sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -108413,8 +108679,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.0.0"; - sha256 = "0l3vyygyan5j52af8g5s24435hxy0pr6j89yqzy5mp3dv12qlr53"; + version = "2.0.1"; + sha256 = "14pgl4q2m0hqz6xnj8gg9n5jlqqvl07xrqw3fn2m4gj9hcf768pq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113614,10 +113880,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "0.9.2"; - sha256 = "0r15mdknz1j85hws9bqfil6l39q88pbbjz0kbky9kl7y675hkzdj"; - revision = "2"; - editedCabalFile = "1l6gj2678rbaryby9gzsqvyjyknyfc2r6xj27kbcb02cz4igga7m"; + version = "0.9.3"; + sha256 = "0r8kxdxh08plmal9q2i098hlgxvii67ylprzwqzrwa1i9qlcv7v6"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -121130,8 +121394,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "language-vhdl"; - version = "0.1.2.8"; - sha256 = "1065j91bzwsn04xgg8sfdpdfvg2630ss6ic37ynibpxm619mq93a"; + version = "0.1.3"; + sha256 = "03n5cnr71zq3fl0ajjiyzjq2x2848lwd9gfp4kjkkjaxw0lb6bka"; libraryHaskellDepends = [ base pretty ]; homepage = "https://github.com/markus-git/language-vhdl"; description = "VHDL AST and pretty printer in Haskell"; @@ -121368,7 +121632,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lattices_1_6_0" = callPackage + "lattices_1_7" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty , tasty-quickcheck, transformers, universe-base @@ -121377,8 +121641,8 @@ self: { }: mkDerivation { pname = "lattices"; - version = "1.6.0"; - sha256 = "0v0nl212cawd2pwbka7w8vl0gmrf1r0yv40dmwl5ffq33v5ihxd0"; + version = "1.7"; + sha256 = "1p5bqr3a8haib4wsdzy08z61jv8cq91n7rzj7wanh1nwp3r2n1nc"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -121413,6 +121677,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lawless-concurrent-machines" = callPackage + ({ mkDerivation, async, base, containers, lifted-async, machines + , monad-control, semigroups, tasty, tasty-hunit, time, transformers + , transformers-base + }: + mkDerivation { + pname = "lawless-concurrent-machines"; + version = "0.3.1"; + sha256 = "17y523yahblrd5zq7f5nvr93fg4bqr9aj0zi915l16ffv8hqvply"; + libraryHaskellDepends = [ + async base containers lifted-async machines monad-control + semigroups time transformers transformers-base + ]; + testHaskellDepends = [ + base machines tasty tasty-hunit time transformers + ]; + benchmarkHaskellDepends = [ base machines time ]; + description = "Concurrent networked stream transducers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lax" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -123134,9 +123419,9 @@ self: { "liblawless" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, binary - , boomerang, bytestring, concurrent-machines, containers - , containers-unicode-symbols, contravariant, data-textual, dns - , exceptions, filepath, hjsonschema, lens, lifted-async + , boomerang, bytestring, containers, containers-unicode-symbols + , contravariant, data-textual, dns, exceptions, filepath + , hjsonschema, lawless-concurrent-machines, lens, lifted-async , lifted-base, machines, managed, monad-control, mtl, network , network-ip, parsers, pathtype, protolude, QuickCheck, random , semigroups, stm, stm-chans, stm-containers, temporary @@ -123146,13 +123431,13 @@ self: { }: mkDerivation { pname = "liblawless"; - version = "0.25.2"; - sha256 = "0s1qahk7yabggjv4zkqxiy4yygzbq8zwbh5nvh46zm0r09q802s1"; + version = "0.26.0"; + sha256 = "0izkk1rfiny4fnjazbpq04wzhcjgfwsr9fs10lpn9ifp4ckahynj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-unicode-symbols binary boomerang bytestring - concurrent-machines containers containers-unicode-symbols - contravariant data-textual dns exceptions hjsonschema lens + containers containers-unicode-symbols contravariant data-textual + dns exceptions hjsonschema lawless-concurrent-machines lens lifted-async lifted-base machines managed monad-control mtl network network-ip parsers pathtype protolude QuickCheck random semigroups stm stm-chans stm-containers temporary text text-printer time @@ -123795,13 +124080,15 @@ self: { }) {}; "light" = callPackage - ({ mkDerivation, base, containers, gjk2d, lens, linear, mtl }: + ({ mkDerivation, base, containers, gjk2d, lens, linear, mtl + , QuickCheck + }: mkDerivation { pname = "light"; - version = "0.2.0.0"; - sha256 = "1nrzh3z2fxkzws80amxw112idwlwb7r07igr0381jryfacip0ryy"; + version = "0.2.0.1"; + sha256 = "1lhwir14di3chnj6xn28cwkzmim5d4cq39da82ils6mhghjgzjbg"; libraryHaskellDepends = [ base containers gjk2d lens linear mtl ]; - testHaskellDepends = [ base containers lens linear ]; + testHaskellDepends = [ base containers lens linear QuickCheck ]; homepage = "https://github.com/suzumiyasmith/light#readme"; description = "a simple physics engine"; license = stdenv.lib.licenses.bsd3; @@ -126321,8 +126608,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.2.2"; - sha256 = "0hxw0j3zp6vs4si1v8ziy0g2a06smny6fmjqhd9v5hvdcfnqnm9b"; + version = "1.2.3"; + sha256 = "0r3f2chnzyizm0kz7crjynycs2kzbvh5aw3a0qwc66gbignjnbkw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127476,6 +127763,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lucid_2_9_9" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph + , mtl, parsec, text, transformers, unordered-containers + }: + mkDerivation { + pname = "lucid"; + version = "2.9.9"; + sha256 = "0cqdlm1kamfn8kv3r3vphz16j2xi9yf15kpb6440rhsyvwddbani"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers hashable mmorph mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq text transformers + ]; + homepage = "https://github.com/chrisdone/lucid"; + description = "Clear to write, read and edit DSL for HTML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-extras" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory, lucid , text @@ -128201,8 +128513,8 @@ self: { }: mkDerivation { pname = "mackerel-client"; - version = "0.0.5"; - sha256 = "17ppg6nzm8q6fz1y630vzda1rgc8fkhxhjabmvis79h2k3q994s5"; + version = "0.1.0"; + sha256 = "0x1i311281pswpcgwgjfhk4x2576h8ycg1i3ira29hyph1q0r7a0"; libraryHaskellDepends = [ aeson base bytestring data-default directory filepath htoml http-client http-client-tls http-types parsec split text @@ -128270,8 +128582,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "2.4.0.2"; - sha256 = "0jc86l0cz9nnp11fdn10qyb78g1klaq6qlipqrzrq5vil419vdss"; + version = "2.4.1.3"; + sha256 = "1766dk570fpakjxbk50ll8a29kl67s4wvkwwifacz1h39iqj8984"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128284,7 +128596,7 @@ self: { base hspec hspec-megaparsec megaparsec mtl text ]; benchmarkHaskellDepends = [ base criterion megaparsec text ]; - homepage = "https://github.com/vmchale/madlang#readme"; + homepage = "https://hub.darcs.net/vmchale/madlang"; description = "Randomized templating language DSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -129446,15 +129758,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "markup_4_0_1" = callPackage + "markup_4_0_3" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad , lucid, mmorph, monad-control, monad-logger, mtl, path-extra , resourcet, text, transformers-base, urlpath }: mkDerivation { pname = "markup"; - version = "4.0.1"; - sha256 = "1g2vdwwk0if46q0gc1gw4zpbxjbq6lpii0yab6yazdk4a2snakmx"; + version = "4.0.3"; + sha256 = "1a4n89j8z3sgyigbxkc10lb3kz6x5bf0kdcs1k0hydcj0vdvwqh3"; libraryHaskellDepends = [ base blaze-html blaze-markup clay comonad lucid mmorph monad-control monad-logger mtl path-extra resourcet text @@ -131284,6 +131596,8 @@ self: { pname = "mercury-api"; version = "0.1.0.1"; sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr"; + revision = "1"; + editedCabalFile = "0k8k9lcvpwkvz4w0ydrxzzmfgch8885h6vdybvqi7ra4kvhf4gzs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135389,8 +135703,8 @@ self: { }: mkDerivation { pname = "morph"; - version = "0.1.1.1"; - sha256 = "1p25jy5ri2jlxsrbw8c12zvhc625bfh0zba9bjy9vx3yg5wmaciv"; + version = "0.1.1.2"; + sha256 = "0imhi6yd7phfgd8mykdcd6p1fs28rzp367pzpznrg41nh7arjv6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140086,6 +140400,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-transport-tests_0_2_4_2" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl + , network-transport, random + }: + mkDerivation { + pname = "network-transport-tests"; + version = "0.2.4.2"; + sha256 = "1iyb4zm2iw805qfnlhnlwm2hh1ajhzgzlghsn8g3hnpdgszw896b"; + libraryHaskellDepends = [ + ansi-terminal base bytestring containers mtl network-transport + random + ]; + homepage = "http://haskell-distributed.github.com"; + description = "Unit tests for Network.Transport implementations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-transport-zeromq" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers , criterion, data-accessor, distributed-process @@ -140510,8 +140842,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.8.0.6"; - sha256 = "12lynhl8kn5vpp9ajaiv0vylbyzf16bykprjvg16nvvw5maww1ll"; + version = "0.8.0.7"; + sha256 = "0k8ncavrwkq6wmn8yb87cb9cz6m47iw94k4nl2b0pc1ziik7klip"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -143133,6 +143465,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, semigroups, text + , time, time-locale-compat, transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.6.0.0"; + sha256 = "0prwlxp96qpnhdm34slwhp3j8hj961xl99xkl6fbrxgxxjngfg1q"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant dotenv hspec hspec-discover + multiset postgresql-simple product-profunctors profunctors + QuickCheck semigroups text time transformers + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -143485,15 +143845,15 @@ self: { "openflow" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers - , deepseq-generics, hashable, network + , deepseq, deepseq-generics, hashable, network }: mkDerivation { pname = "openflow"; - version = "0.3.0"; - sha256 = "0dhg34s4imr1v6wlc567qg5929wa82my7jbhxm9hqq0882vb0sb2"; + version = "0.3.1"; + sha256 = "0gyld73v5jjfd0ddkp62kxx05f5nr7rnald5ci7r4idp0lwndk22"; libraryHaskellDepends = [ - aeson base bimap binary bytestring containers deepseq-generics - hashable network + aeson base bimap binary bytestring containers deepseq + deepseq-generics hashable network ]; homepage = "https://github.com/AndreasVoellmy/openflow"; description = "OpenFlow"; @@ -149666,8 +150026,8 @@ self: { pname = "pgdl"; version = "10.9"; sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; - revision = "4"; - editedCabalFile = "04kg2i0y7yb0577kk8v1v7rgji80agmi0aq350lf0rl77r2ksy85"; + revision = "5"; + editedCabalFile = "1asqw4k0v57ysi7yqlk506vnkb162swfv2230s8q43r6kvj7171k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153593,8 +153953,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.2.0"; - sha256 = "02ga7i1b4nin05lnh0dwr52w7xhz723an0zlypjccka1i7l42pvz"; + version = "3.3.0"; + sha256 = "0ilny7vj5ch77kic1bmpm160phv3yxm1cd3ksj6j8gc2nvaysrr8"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default either exceptions file-embed haskell-src-meta hreader @@ -155208,6 +155568,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primes-type" = callPackage + ({ mkDerivation, base, criterion, deepseq, HTF, primes }: + mkDerivation { + pname = "primes-type"; + version = "0.2.0.2"; + sha256 = "0d2nhb0kbpls4ybipnjf2bf73dz1as5qhb0cjz59nmsipkqcr45s"; + libraryHaskellDepends = [ base deepseq primes ]; + testHaskellDepends = [ base HTF primes ]; + benchmarkHaskellDepends = [ base criterion primes ]; + homepage = "https://github.com/kindaro/primes-type#readme"; + description = "Type-safe prime numbers"; + license = stdenv.lib.licenses.isc; + }) {}; + "primesieve" = callPackage ({ mkDerivation, base, foundation, primesieve }: mkDerivation { @@ -155812,6 +156186,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "producer" = callPackage + ({ mkDerivation, base, checkers, QuickCheck, tasty, tasty-auto + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "producer"; + version = "0.1.0.0"; + sha256 = "0dg0yj5b39ghhh6jx9mp9mya3wwzgv6ldkvqxplr1bv3bvxvjkrr"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base checkers QuickCheck tasty tasty-auto tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/etorreborre/producer-hs#readme"; + description = "Simple streaming datatype"; + license = stdenv.lib.licenses.mit; + }) {}; + "product-isomorphic" = callPackage ({ mkDerivation, base, template-haskell, th-data-compat }: mkDerivation { @@ -156299,6 +156691,30 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "prometheus-effect" = callPackage + ({ mkDerivation, base, bytestring, clock, hashable, http-streams + , http-types, io-streams, mtl, retry, safe-exceptions, streaming + , streaming-bytestring, streaming-utils, streaming-wai, text + , transformers, unordered-containers, vector, vector-algorithms + , wai + }: + mkDerivation { + pname = "prometheus-effect"; + version = "1.0.0"; + sha256 = "132mzsi5g6fmc2141vd1dwix2an0a00xq15ypr74larz7c7v6qk7"; + revision = "1"; + editedCabalFile = "01mkdbif7girjyi3aganp9c8m0di6zv3ddw8brqwlw6r4h3w2imf"; + libraryHaskellDepends = [ + base bytestring clock hashable http-streams http-types io-streams + mtl retry safe-exceptions streaming streaming-bytestring + streaming-utils streaming-wai text transformers + unordered-containers vector vector-algorithms wai + ]; + homepage = "https://github.com/ocharles/prometheus-effect"; + description = "Instrument applications with metrics and publish/push to Prometheus"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prometheus-metrics-ghc" = callPackage ({ mkDerivation, base, doctest, prometheus-client, utf8-string }: mkDerivation { @@ -160900,15 +161316,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rattletrap_2_5_2" = callPackage + "rattletrap_3_0_0" = callPackage ({ mkDerivation, aeson, base, bimap, binary, binary-bits , bytestring, containers, data-binary-ieee754, filepath, hspec , template-haskell, temporary, text, vector }: mkDerivation { pname = "rattletrap"; - version = "2.5.2"; - sha256 = "13l4gx7l0qniyny5llniwmymk8kbi7lak1gq68hyx9wnmjhbw585"; + version = "3.0.0"; + sha256 = "0n24q5vjbrv093n1nchf7pkn0ibkp75zm5mbjrmdwvr6vlb1ih73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162381,8 +162797,8 @@ self: { pname = "reducers"; version = "3.12.1"; sha256 = "0pkddg0s3cn759miq0nfrq7lnp3imk5sx784ihsilsbjh9kvffz4"; - revision = "1"; - editedCabalFile = "1gn2s6r503cmxh8agcbif8q322503ix1igiks4kdz3rn97aliay6"; + revision = "2"; + editedCabalFile = "00zxyyaj0grvr214qdrg68114b93iwp27vmww254s2yq9z701gf8"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids semigroups text transformers unordered-containers @@ -162392,6 +162808,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reducers_3_12_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, fingertree + , hashable, semigroupoids, semigroups, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "reducers"; + version = "3.12.2"; + sha256 = "1gbaa5x4zbvnbklcb0d4q4m8hk6w0gz4s0c4m288czi1nw43dl65"; + libraryHaskellDepends = [ + array base bytestring containers fingertree hashable semigroupoids + semigroups text transformers unordered-containers + ]; + homepage = "http://github.com/ekmett/reducers/"; + description = "Semigroups, specialized containers and a general map/reduce framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reedsolomon" = callPackage ({ mkDerivation, base, bytestring, criterion, exceptions, gitrev , loop, mtl, primitive, profunctors, QuickCheck, random, tasty @@ -167337,9 +167772,9 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "rss-conduit_0_4_1_0" = callPackage - ({ mkDerivation, atom-conduit, base, bytestring, conduit - , conduit-combinators, containers, data-default + "rss-conduit_0_4_2_0" = callPackage + ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring + , conduit, conduit-combinators, containers, data-default , dublincore-xml-conduit, hlint, lens-simple, mono-traversable , QuickCheck, quickcheck-instances, resourcet, safe , safe-exceptions, singletons, tasty, tasty-hunit, tasty-quickcheck @@ -167348,19 +167783,20 @@ self: { }: mkDerivation { pname = "rss-conduit"; - version = "0.4.1.0"; - sha256 = "0lal33vjsdz5k63ljlx4430an1x3hgw6nn1aixf531bwdglxgg5c"; + version = "0.4.2.0"; + sha256 = "1fgaf15i2fbr1v2kd0s80zkbafsl50sv4b48my0nvs8vqhha5n7y"; libraryHaskellDepends = [ atom-conduit base conduit conduit-combinators containers dublincore-xml-conduit lens-simple safe safe-exceptions singletons text time timerep uri-bytestring vinyl xml-conduit xml-types ]; testHaskellDepends = [ - atom-conduit base bytestring conduit conduit-combinators - data-default dublincore-xml-conduit hlint lens-simple - mono-traversable QuickCheck quickcheck-instances resourcet - safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text - time uri-bytestring vinyl xml-conduit xml-types + atom-conduit base blaze-builder bytestring conduit + conduit-combinators data-default dublincore-xml-conduit hlint + lens-simple mono-traversable QuickCheck quickcheck-instances + resourcet safe-exceptions singletons tasty tasty-hunit + tasty-quickcheck text time uri-bytestring vinyl xml-conduit + xml-types ]; description = "Streaming parser/renderer for the RSS standard"; license = stdenv.lib.licenses.publicDomain; @@ -168945,10 +169381,10 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }: mkDerivation { pname = "scalendar"; - version = "1.1.0"; - sha256 = "077v0k745z1hs8k8yb5s6ln1ing8b5fllp7gw2kcrlrw108ijvwb"; - revision = "5"; - editedCabalFile = "02p4iy6vypz6q0zh5wmy3lp1s9zrcvqn9xx8vczl8000wa0asn7p"; + version = "1.1.1"; + sha256 = "1hsj1wa4x4qf6vwnxpfl40cx1ghrkdalz5a0nq0si83ykdq14ylf"; + revision = "1"; + editedCabalFile = "0ivxl975nlrpzz3rpq4hc9zi4rp7b3lvjn6izp4l83fm3crkl15i"; libraryHaskellDepends = [ base containers text time ]; testHaskellDepends = [ base containers hspec QuickCheck text time @@ -169257,26 +169693,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "schematic_0_3_0_0" = callPackage + "schematic_0_3_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens - , mtl, regex-compat, scientific, singletons, smallcheck, tagged - , text, unordered-containers, validationt, vector, vinyl + , mtl, profunctors, regex-tdfa, regex-tdfa-text, scientific + , singletons, smallcheck, tagged, text, unordered-containers + , validationt, vector, vinyl }: mkDerivation { pname = "schematic"; - version = "0.3.0.0"; - sha256 = "0nrq36s646h6lrfqw9hf7ysmc8b2x7dkrj07x1dy2x1ihph5my12"; + version = "0.3.2.0"; + sha256 = "0bzxab3ijnc5qxglcw4kbcznv22r8n11h5qrsgwlyh3r4qa0by72"; libraryHaskellDepends = [ - aeson base bytestring containers hjsonschema mtl regex-compat - scientific singletons smallcheck tagged text unordered-containers - validationt vector vinyl + aeson base bytestring containers hjsonschema mtl profunctors + regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged + text unordered-containers validationt vector vinyl ]; testHaskellDepends = [ aeson base bytestring containers hjsonschema hspec hspec-core - hspec-discover hspec-smallcheck HUnit lens regex-compat singletons - smallcheck tagged text unordered-containers validationt vinyl + hspec-discover hspec-smallcheck HUnit lens regex-tdfa + regex-tdfa-text singletons smallcheck tagged text + unordered-containers validationt vinyl ]; + homepage = "http://github.com/typeable/schematic"; description = "JSON-biased spec and validation tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -170032,6 +170471,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "scuttlebutt-types" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptonite, ed25519, hspec, memory, text + }: + mkDerivation { + pname = "scuttlebutt-types"; + version = "0.2.0"; + sha256 = "0aghmdc16x0i7mzldx7gdq1n6g81kccq8gp24klf0000vbj8xa7h"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptonite ed25519 memory + text + ]; + testHaskellDepends = [ aeson base bytestring hspec text ]; + description = "generic types for Secure Scuttlebutt"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scyther-proof" = callPackage ({ mkDerivation, alex, array, base, cmdargs, containers, directory , filepath, json, mtl, parsec, pretty, process, safe, tagsoup, time @@ -170524,22 +170980,21 @@ self: { }) {}; "secp256k1" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring, Cabal - , cryptohash, entropy, HUnit, largeword, mtl, QuickCheck - , string-conversions, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal + , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions + , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "secp256k1"; - version = "0.4.8"; - sha256 = "0jnvsfmjrac8l07l32xi1vlbbjpvzhmsb1fv5ajvjkw7yrd4byqk"; + version = "0.5.2"; + sha256 = "1havyn28i2044vxgla2j46qsv4wngy8y6wkkh9v3c1vi35sfzimq"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base base16-bytestring binary bytestring entropy largeword mtl - QuickCheck string-conversions + base base16-bytestring bytestring cereal entropy mtl QuickCheck + string-conversions ]; testHaskellDepends = [ - base base16-bytestring binary bytestring cryptohash entropy HUnit + base base16-bytestring bytestring cereal cryptohash entropy HUnit mtl QuickCheck string-conversions test-framework test-framework-hunit test-framework-quickcheck2 ]; @@ -172798,25 +173253,26 @@ self: { }) {}; "servant-rawm" = callPackage - ({ mkDerivation, base, bytestring, filepath, http-client - , http-media, http-types, resourcet, servant, servant-client - , servant-docs, servant-server, text, transformers, wai - , wai-app-static, warp + ({ mkDerivation, base, bytestring, containers, filepath + , http-client, http-media, http-types, lens, resourcet, servant + , servant-client, servant-docs, servant-server, text, transformers + , wai, wai-app-static, warp }: mkDerivation { pname = "servant-rawm"; - version = "0.1.0.0"; - sha256 = "0h3s0sca9x612lr2ndv0vccdyscb93amqiwg511rwh6i5y0jrv7d"; + version = "0.2.0.0"; + sha256 = "029lwzy0r28l1axpmrlcazsqa38q7a6fbq1vzh484dhfy9j2j5wj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring filepath http-client http-media http-types - resourcet servant servant-client servant-docs servant-server wai - wai-app-static + base bytestring containers filepath http-client http-media + http-types lens resourcet servant servant-client servant-docs + servant-server wai wai-app-static ]; executableHaskellDepends = [ base bytestring http-client http-media http-types servant - servant-client servant-server text transformers wai warp + servant-client servant-docs servant-server text transformers wai + warp ]; homepage = "https://github.com/cdepillabout/servant-rawm"; description = "Embed a raw 'Application' in a Servant API"; @@ -176066,8 +176522,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.7.0"; - sha256 = "19c7hvjqcdzwvyyas58zyjs1i8zawmnqc84mm5sk7rp0wf3ic6c7"; + version = "0.7.1"; + sha256 = "1h7acjqis9qrj4i5k4aspjjrd8a86bkhhcn6ib3aa8s384ar0wfv"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -183740,6 +184196,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "storable-tuple_0_0_3_3" = callPackage + ({ mkDerivation, base, base-orphans, storable-record, utility-ht }: + mkDerivation { + pname = "storable-tuple"; + version = "0.0.3.3"; + sha256 = "0dfzhxgkn1l6ls7zh6iifhyvhm8l47n40z0ar23c6ibsa94w1ynw"; + libraryHaskellDepends = [ + base base-orphans storable-record utility-ht + ]; + homepage = "http://code.haskell.org/~thielema/storable-tuple/"; + description = "Storable instance for pairs and triples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "storablevector" = callPackage ({ mkDerivation, base, bytestring, deepseq, non-negative , QuickCheck, random, sample-frame, syb, transformers, unsafe @@ -184645,14 +185116,14 @@ self: { "strict-types" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , foundation, hashable, text, unordered-containers, vector + , hashable, text, unordered-containers, vector }: mkDerivation { pname = "strict-types"; - version = "0.1.0.6"; - sha256 = "0dp0179g20g62vn6c5wv2d7d9kwwix40rxzwfig6f0pi8rm16jxj"; + version = "0.1.2"; + sha256 = "0yapmsia9lmgjgvmcpk9m1z6gc63qic6vvnmnxvmh2k9887n41li"; libraryHaskellDepends = [ - array base bytestring containers deepseq foundation hashable text + array base bytestring containers deepseq hashable text unordered-containers vector ]; homepage = "https://github.com/pepeiborra/strict-types"; @@ -185111,6 +185582,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strive_4_0_0" = 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 = "4.0.0"; + sha256 = "11z7xxq8157pgpp48argcik0l2323lvjf2rxn01rdk7sx5gby9mh"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + testHaskellDepends = [ base bytestring markdown-unlit time ]; + homepage = "https://github.com/tfausak/strive#readme"; + description = "A client for the Strava V3 API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -185408,8 +185899,8 @@ self: { }: mkDerivation { pname = "styx"; - version = "1.3"; - sha256 = "0bqpqixdwdh2j28mdg52a0yvzrjs8gwmyapknqb2mlhf1w3f21cp"; + version = "1.3.1"; + sha256 = "0g2pgczmk647ckyfq6yvb8isjjswjvymz4l065w4m79by9wkjlmb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186215,22 +186706,23 @@ self: { }) {}; "swagger-petstore" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, exceptions, hspec, http-api-data, http-client - , http-client-tls, http-media, http-types, iso8601-time, microlens - , monad-logger, mtl, network, QuickCheck, random, safe-exceptions - , semigroups, text, time, transformers, unordered-containers - , vector + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, deepseq, exceptions, hspec + , http-api-data, http-client, http-client-tls, http-media + , http-types, iso8601-time, katip, microlens, mtl, network + , QuickCheck, random, safe-exceptions, semigroups, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.1"; - sha256 = "1zpxs97lrpv4ailn6mqdx6ihbzilcsjcycrc8qj1v1f1lg00m9k6"; + version = "0.0.1.2"; + sha256 = "1027kj163mjp78gxl1g77jgxg5n6q5xkhvy4zdx3wlcjc2b3mjah"; libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers exceptions - http-api-data http-client http-client-tls http-media http-types - iso8601-time microlens monad-logger mtl network random - safe-exceptions text time transformers unordered-containers vector + aeson base base64-bytestring bytestring case-insensitive containers + deepseq exceptions http-api-data http-client http-client-tls + http-media http-types iso8601-time katip microlens mtl network + random safe-exceptions text time transformers unordered-containers + vector ]; testHaskellDepends = [ aeson base bytestring containers hspec iso8601-time mtl QuickCheck @@ -186830,8 +187322,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.6.3"; - sha256 = "1w7kyk4030zy2p200qwb61qf17iasvrpzhpz0n8a186lvikc7dlk"; + version = "3.7"; + sha256 = "1x6hl048247d3h8bi3b94kqmgsmcc0d751n2mdyxim26cg1vnwzf"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -191236,6 +191728,31 @@ self: { license = "GPL"; }) {}; + "texmath_0_9_4_4" = 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.9.4.4"; + sha256 = "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd"; + 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"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -192383,6 +192900,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-data-compat_0_0_2_5" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-data-compat"; + version = "0.0.2.5"; + sha256 = "1q2gggciz9s9ksn3h0mc5zffawz6j7pg6k1k96pqsx39f1bbrbqs"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for data definition template of TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans @@ -192635,6 +193164,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-reify-compat_0_0_1_3" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-reify-compat"; + version = "0.0.1.3"; + sha256 = "0byl2n0lj55vx2kyka172bwvw8zcyag78cnqs7y9yp4kl8ivwh8z"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "http://github.com/khibino/haskell-th-reify-compat/"; + description = "Compatibility for the result type of TH reify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-reify-many" = callPackage ({ mkDerivation, base, containers, mtl, safe, template-haskell , th-expand-syns @@ -193005,6 +193547,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "thread-hierarchy" = callPackage + ({ mkDerivation, base, containers, hspec, lifted-base + , monad-control, transformers-base + }: + mkDerivation { + pname = "thread-hierarchy"; + version = "0.1.0.1"; + sha256 = "05qpm77711r9viwij5vznrmk8ij89lxhpwxdk8dpk0rq2ll5iyyq"; + libraryHaskellDepends = [ + base containers lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ base containers hspec ]; + homepage = "https://github.com/nshimaza/thread-hierarchy#readme"; + description = "Simple Haskel thread management in hierarchical manner"; + license = stdenv.lib.licenses.mit; + }) {}; + "thread-local-storage" = callPackage ({ mkDerivation, atomic-primops, base, containers, criterion }: mkDerivation { @@ -195894,12 +196453,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers_0_5_4_0" = callPackage + "transformers_0_5_5_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.5.4.0"; - sha256 = "16l8p2yq8v12n1ri4zbv04m0acnfl4y69bddbbsmmn52i8rkyzzq"; + version = "0.5.5.0"; + sha256 = "198ric8gr1y58scckr468d11y2g45mzc5pkaa40shj7xgj1bh7mi"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -196445,12 +197004,13 @@ self: { }: mkDerivation { pname = "treefold"; - version = "0.1.0.0"; - sha256 = "1svpbrvw7j35kp25mcddallfl9miafdyb2dm2wbmj461sh95qd7g"; + version = "0.2.0.0"; + sha256 = "0kzx1p9cznj8v0c7bhjj503qav2c9b4dw67likvzqrdqf348vhs5"; libraryHaskellDepends = [ base parallel ]; testHaskellDepends = [ base doctest hedgehog ]; benchmarkHaskellDepends = [ base containers criterion random ]; homepage = "https://github.com/oisdk/treefold"; + description = "Provides folds which try to combine elements in a balanced way"; license = stdenv.lib.licenses.mit; }) {}; @@ -198816,8 +199376,8 @@ self: { }: mkDerivation { pname = "typed-wire-utils"; - version = "0.1.0.0"; - sha256 = "0c5j3akhbimppfx9vsz5d93jil67ml58pn249sgmczg22ybg5v96"; + version = "0.2.0.0"; + sha256 = "0v5gdydkd2gr3rb2p7js19j3w1v8zzck65mfywmlihp3ngfb8h2d"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring text time ]; @@ -201361,8 +201921,8 @@ self: { }: mkDerivation { pname = "uri-parse"; - version = "0.1.0.0"; - sha256 = "0wkqlnbfnzzqr6pw2f934w2z9x8hgghg4cwf3l5kazbaj25cangx"; + version = "0.1.0.1"; + sha256 = "0dw9wms9x50yf0snk0qv628nmxsdp3ksnmjqz66lhdfzd1s5zv0k"; libraryHaskellDepends = [ attoparsec base bytestring data-default http-types lens text ]; @@ -201557,7 +202117,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "urlpath_6_0_3" = callPackage + "urlpath_7_0_0" = callPackage ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph , monad-control, monad-control-aligned, monad-logger, mtl , path-extra, resourcet, split, strict, text, transformers @@ -201565,8 +202125,8 @@ self: { }: mkDerivation { pname = "urlpath"; - version = "6.0.3"; - sha256 = "0nyh47ra4y8q2pjbd1azkg0khqpq9qw2k8dxnhv4jf8jvjpf9zrk"; + version = "7.0.0"; + sha256 = "0al003vwbr286rj9la5w01zfj1q3jccfia6iy38w3d0hajkmw6qj"; libraryHaskellDepends = [ attoparsec-uri base exceptions mmorph monad-control monad-control-aligned monad-logger mtl path-extra resourcet split @@ -203487,12 +204047,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-space_0_11" = callPackage + "vector-space_0_12" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.11"; - sha256 = "154d09f2a27ph38xgfdwg65bif9rgb9k92avgfjrylk649zpwi4h"; + version = "0.12"; + sha256 = "16nzp2m6pcbqp27dm54v9a009j7jdjkrhw2hm1rgvh5jh4alyzi3"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -208292,8 +208852,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "wiringPi"; - version = "1.0.1"; - sha256 = "1i4sidhhwmvn15996cv4415nylcra204pa51zd133pnckcqxbb5k"; + version = "1.0.1.1"; + sha256 = "12n21ycl977pw848mh26pplckgrdxrndv7igii99ypvrp0n307ak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -212415,8 +212975,8 @@ self: { }: mkDerivation { pname = "yarn-lock"; - version = "0.3.1"; - sha256 = "0plsv7qhl43y85dwzybbik2fx1bm23lz8m5l1fyhd363v9f2df7x"; + version = "0.3.4"; + sha256 = "0w7ss3lpx37bm3cqigjgddjqm6pwi5117mz60jyw1d70xrgw8wbz"; libraryHaskellDepends = [ base containers either megaparsec protolude text ]; From 929eadebb0339ace4b72e7e678ee8108f3c01d62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Oct 2017 10:23:59 +0200 Subject: [PATCH 0765/2806] git-annex: update to version 6.20171003 --- 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 5941209d7a7..10440572597 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -98,7 +98,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "03fa03n4zkpj5z3ma1ahvnxd85dni2aikqayqf838jvfl7bd5b9n"; + sha256 = "0ky3avbda1avccalkh7ifjnll37cjjmdyypw9m1glsrzgzmr5lbr"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From be86af09b4f60ea7c37d5358e5e7b9797702bdd6 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 6 Oct 2017 12:49:42 +0200 Subject: [PATCH 0766/2806] u3-tool: init at 0.3 --- pkgs/tools/filesystems/u3-tool/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/filesystems/u3-tool/default.nix diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix new file mode 100644 index 00000000000..65eafe76710 --- /dev/null +++ b/pkgs/tools/filesystems/u3-tool/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "u3-tool"; + version = "0.3"; + name = "${pname}-${version}"; + + enableParallelBuilding = true; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f"; + }; + + meta = with stdenv.lib; { + description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk"; + homepage = https://sourceforge.net/projects/u3-tool/ ; + license = licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d017f39cb5..e98e74647b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1446,6 +1446,8 @@ with pkgs; cuetools = callPackage ../tools/cd-dvd/cuetools { }; + u3-tool = callPackage ../tools/filesystems/u3-tool { }; + unifdef = callPackage ../development/tools/misc/unifdef { }; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; From ddfcc15bb8a68548c807fbfe7eb80618311d446d Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 6 Oct 2017 21:47:56 +0900 Subject: [PATCH 0767/2806] firefox: 56.0 -> 56.0.1 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index b2e993e35e0..4b332214041 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 = "56.0"; + version = "56.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3aeb0ff54e10c83894f61734daa4f0801a1bb499d4667adad9c78520e588eae809d0e4d61e9227206466d62c3b453e2ce9ca8198f59f5354cd1b6804c00f0990"; + sha512 = "6a07de6bfb71ccdef04b0f2ced720e309d037dd89fe983178ac59ea972147360552e2b8e33d8caa476008cabf53a99003807b0e817150b7a39e0bc143d82b88f"; }; patches = From 78785a06f99d20ae86479c4f6896463f812e2760 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 4 Oct 2017 17:35:45 -0500 Subject: [PATCH 0768/2806] lsb-release: wrap to ensure needed utilities are available --- pkgs/os-specific/linux/lsb-release/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lsb-release/default.nix b/pkgs/os-specific/linux/lsb-release/default.nix index 9715f77f9e4..34dae105a8d 100644 --- a/pkgs/os-specific/linux/lsb-release/default.nix +++ b/pkgs/os-specific/linux/lsb-release/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, getopt }: +{ stdenv, fetchurl, perl, coreutils, getopt, makeWrapper }: stdenv.mkDerivation rec { version = "1.4"; @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; - buildInputs = [ perl getopt ]; + nativeBuildInputs = [ makeWrapper perl ]; + + buildInputs = [ coreutils getopt ]; + + # Ensure utilities used are available + preFixup = '' + wrapProgram $out/bin/lsb_release --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils getopt ]} + ''; meta = { description = "Prints certain LSB (Linux Standard Base) and Distribution information"; From 821e3c294ff20c6a82e93f7c2d30c52386b625f8 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 6 Oct 2017 23:28:28 +0900 Subject: [PATCH 0769/2806] icu: make 58.2 coexists with 59.1 --- pkgs/development/libraries/icu/58.nix | 14 ++++++++++++++ pkgs/development/libraries/icu/59.nix | 4 ++++ .../libraries/icu/{default.nix => base.nix} | 6 ++++-- pkgs/top-level/all-packages.nix | 6 +++++- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/icu/58.nix create mode 100644 pkgs/development/libraries/icu/59.nix rename pkgs/development/libraries/icu/{default.nix => base.nix} (93%) diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix new file mode 100644 index 00000000000..e5b80f4b270 --- /dev/null +++ b/pkgs/development/libraries/icu/58.nix @@ -0,0 +1,14 @@ +args @ { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +let + keywordFix = fetchurl { + url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; + name = "icu-changeset-39484.diff"; + sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; + }; +in +import ./base.nix { + version = "58.2"; + sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; + patches = [ keywordFix ]; + patchFlags = "-p4"; +} args diff --git a/pkgs/development/libraries/icu/59.nix b/pkgs/development/libraries/icu/59.nix new file mode 100644 index 00000000000..9ca66ca525f --- /dev/null +++ b/pkgs/development/libraries/icu/59.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "59.1"; + sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki"; +} diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/base.nix similarity index 93% rename from pkgs/development/libraries/icu/default.nix rename to pkgs/development/libraries/icu/base.nix index 5f81ae694cb..78e0c574044 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,8 +1,8 @@ +{ version, sha256, patches ? [], patchFlags ? "" }: { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let pname = "icu4c"; - version = "59.1"; in stdenv.mkDerivation { name = pname + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki"; + inherit sha256; }; outputs = [ "out" "dev" ]; @@ -25,6 +25,8 @@ stdenv.mkDerivation { echo Source root reset to ''${sourceRoot} ''; + inherit patchFlags patches; + preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure '' + stdenv.lib.optionalString stdenv.isArm '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a50abf2721..c7128d7cc96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8634,7 +8634,10 @@ with pkgs; hyena = callPackage ../development/libraries/hyena { }; - icu = callPackage ../development/libraries/icu { }; + icu58 = callPackage ../development/libraries/icu/58.nix { }; + icu59 = callPackage ../development/libraries/icu/59.nix { }; + + icu = icu59; id3lib = callPackage ../development/libraries/id3lib { }; @@ -14544,6 +14547,7 @@ with pkgs; libpng = libpng_apng; python = python2; gnused = gnused_422; + icu = icu59; }; }); From 3e37e20fa56bfc97a5de7bbd350c8dfad49f01bc Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Fri, 6 Oct 2017 08:33:57 -0700 Subject: [PATCH 0770/2806] bazel: 0.6.0 -> 0.6.1 --- pkgs/development/tools/build-managers/bazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e0c027ee632..8701db8d161 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.6.1"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "13jr00jb34ibpqvy1qzzmswc7zfcy82ks7w36iwzh7jlm4l3grd0"; + sha256 = "19rb1lh6v2gi8xlxhdmhydp16i1bgmvb510i053rfy0jlmh1znns"; }; sourceRoot = "."; From 0071b61a74a29ea7f79b02d52e4567f301cac9e1 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 6 Oct 2017 20:51:14 +0300 Subject: [PATCH 0771/2806] libdrm: enable tests --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index c62d31a1e26..4903d8e66df 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1minzvsyz5hgm6ixpj8ysa6jsv7vm8qc8nx390jxdsk0v9ljd983"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "bin" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; - configureFlags = [ ] + configureFlags = [ "--enable-install-test-programs" ] ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; From 882bceac5d0a898b9d602a221a4fede654c41eb0 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Fri, 6 Oct 2017 12:57:03 +0200 Subject: [PATCH 0772/2806] rawtherapee: 5.2 -> 5.3 --- pkgs/applications/graphics/rawtherapee/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 3edb97e3e20..0e83de135c5 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau , libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook +, lensfun }: stdenv.mkDerivation rec { - version = "5.2"; + version = "5.3"; name = "rawtherapee-" + version; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - sha256 = "0i3cr3335bw8yxxzn6kcdx6ccinlnxzrdbgl3ld1kym1w2n5449k"; + sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7"; }; buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx + lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun ]; nativeBuildInputs = [ wrapGAppsHook ]; From 36b0d24a1aa44c21afffdb5b40b5e458790c2000 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 7 Oct 2017 03:12:16 +0900 Subject: [PATCH 0773/2806] thunderbird-bin: 52.3.0 -> 52.4.0 --- .../thunderbird-bin/release_sources.nix | 474 +++++++++--------- 1 file changed, 237 insertions(+), 237 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index ed811cf82ae..7ac8091e1c1 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,595 @@ { - version = "52.3.0"; + version = "52.4.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ar/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ar/thunderbird-52.4.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "55c80c62ad45ece24f90b99a994d35aa130e2a42be5512e6efcebbcf66a6b26905cd28a42944bddc1b1c0c6ba9c488331c88ff478983c8ff8ab61c3fa7c6d234"; + sha512 = "28a0114c665250f419d77f1f3898af6533e1b8b82b546ecd3ca9baf801751fd189239093eaecdabab9a9318fd47020b647086a31676158a21656ff7c477dbbf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ast/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ast/thunderbird-52.4.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "714006603d091000b777130c45bfb5a0e4e2ed3c782d7bf17c1244d4c860a13dc0be58adaf447307149a2a5da90a1a08c3aac0a598c764d2bd491eef5c161c1e"; + sha512 = "f7b9d53202597ef666ca87eb1f8cbb439af386eb78460558e8bef33502a7eac591d43751beb52319d046d780fb38a78e685fa8cb3baaa6abfef439bed6ab3d1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/be/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/be/thunderbird-52.4.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "be529be10ab41deab394e8a2b18f5247e64dd00fccb16cd3f95924baf0a9f1924a05f1fea97346ea171d416d44b4cdb9e5d38ea678ad1f64912aac0224f4ee63"; + sha512 = "a9a39cf4477e469774f2ce7b7012948911009ff2ab26948a177f3efa9e8ccbcb7d7f3d3ab609742fe1d177253dcdeacb78f7b4a9874f3156f6f54203d0ed42ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bg/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bg/thunderbird-52.4.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4726efa8ca6b72fea6acec1f8c0aec6b208f495b3dfaa68d6e26797f4998c5e3150e4e3b725e0042dc953c7b9d88c97468fa03e382b636b057c8dd451126710c"; + sha512 = "38fc89a687344467f98cb2e31967aa53f3c502a8f288b5d65e6aa91a578b250c17750ea998d32d58511920a0a5a1224e77e2691a381b7526585e341712d82cbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bn-BD/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bn-BD/thunderbird-52.4.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "d0f16014b3dce0b6de06233038a8585ee6a8ec2b7a45ae406dbb71370d931bdd51100d1d68ce29ddd2329efb6eed033d1856ddf29b6515484247e6f11c4f7dd7"; + sha512 = "437d943339c4955b5264f95bdd4aaa2a91d448a393e6561bbb41c078a960100962c1d51bad73172c5f5cd691f713ab34c218ff5c3e3cde3641d8a6ad604f6d75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/br/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/br/thunderbird-52.4.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c52c416dda11dd69e78a7ace3d6309b1cc8327adaac74cf831af42b75bf4da9dabec50771014189128dec79487d224f0ad6e9c335a5343c75bf54f828829058d"; + sha512 = "5c43e3cc4366792b7c7a44ae36fe2bd9e6b459f540868dcee767193826648b03a4e4a447f83f5787036e48c96e75639a305304e050a91f0925d9ee4db97e5b75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ca/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ca/thunderbird-52.4.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d0ab90bd0262476565ac48d597c699529cdfa2d4773397f1a458f7d97989b982bd9dc34c2a689d03a1a0f67c53d67ff86af1010bb0e5db55f61bfc68db96011b"; + sha512 = "c2243ee5f160f786ebced364432b4a3b489699a3f024a8da327cfaa3c5e2d0d58884870311416fcb019723d5bfec8294440c701c6c453c15346f5f765c4449c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cs/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cs/thunderbird-52.4.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "ae3e3c12f0e75b449ea6d6d24858bf6036e9db8b7d6a08156d5a9026cbdb53d736a1b459109cc6dddae3d0d6c08856e829beabc8a53c20ba8741cfc0c18d395f"; + sha512 = "332faf549d1d988defdce1531fb4cc81e5f1565423f3e24ebfe16581275224539ed50857dec04c8aa66cc55372a76b676816831d08842bbafd227ca3058f9b5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cy/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cy/thunderbird-52.4.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c6ff55856517ed5b99ad30e649b1ac31d7d529706eb8154eb235817f4b168331e57e845d6648e2bcea574b3233587cadb63c118614598e0dcfabe3ae3d5370b1"; + sha512 = "bfe220ed1e1d8d156f0c1cf7ea11b0778bc0b23f7335b90c65bf581c9e2cd22db9a7f5d48d7a6a95f1d21693714a216d2a24249f36aed7ce097f205d4d05d6f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/da/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/da/thunderbird-52.4.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c0bff66366fcd9b7c62c352dbd25bec95a444b3bcc513598ec834191e7eef47a07cd0ab6a72dbe7b9f14dd323c085f4b8bb4b31ac0f2536d08b08d1c86693bb6"; + sha512 = "dcff4359821cb6b24ba129671a1716394afd642a5c4b887a1905baf82cf5d2a94512a547780cd42b1478f443f59db5a3363a52d719824af050dd69af54f97a02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/de/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/de/thunderbird-52.4.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "010b56755f7107e32df25481a2febc7d0468bd27a6ec5521af32d80382c96653a2989a70e2dd7350452ebfb25f5691a161ff5fd74228b9b3670475942f7b0f6b"; + sha512 = "f5071c052814eab801f3d2c98751c05486b211f23b511b27a1ad5810634b763ada3bd890288e4934c16a28742ef023ef089de9d84a188f6e19d07f471b289583"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/dsb/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/dsb/thunderbird-52.4.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "735d07ecbbff46b242a103676fb8190e082fe71f8a64f19f82f18a42dae50328cd4e473bd06722a20521cbce50afceb24b61d144b4ebdd1cb83a8ff3b041530a"; + sha512 = "522d365f32b28620a7936cf5a8fb230db6fee8c1ae055a27e6649cff8559811684168eacf019ec16d6268e405607a576d46e1d5ba4759c1e3fd10736d7560370"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/el/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/el/thunderbird-52.4.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "29361a698dab6b4d3f369393ec4c06797c1a37fe4bbce8b48f0f5216225fb26125b4f0c814255c0c964a24fb37c2865dce64197d1584385c01f0e655947d9884"; + sha512 = "ecf3dcadb1a82310494063cc317ee248b91c30594ba89a9c58a71349a423cf9e66c5bd06be4d1488ee6cd5027187bae1364144037b9ac3cd4bc8af7cd4396810"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-GB/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-GB/thunderbird-52.4.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "8d3fc25a21aa2f38089bbfa8013104de0c6c6e95407289ecc82f5c003e732d51bf160106dff07b202d6a6d0fee989a08e75bf616cd98ac1b080605b631c2be69"; + sha512 = "8ddde6cd0270cffc26cdb4c4513213405b71ea4315d69a3b1bef602bbd58eca30bc09d0ddd41996cd77881e2d678dd13a93d07fa833210780dba146a931db383"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-US/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-US/thunderbird-52.4.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ce05330aa7032f0cae542578cb49f7e8bbc7971be455817126bc77212ebd35ec701691ed91758e7c5b663f4731ed19c2864728908816e71023be36d13ba98bfb"; + sha512 = "edf130b3b061f15137e6eb83c9674642f0f475de56b293d4acde60f1e7ebcf0d262085fa2a513787ac201ceec5552c029167cec5ad0556baa7b0dd3b52ae4c3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-AR/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-AR/thunderbird-52.4.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "52058cd4b0eaa68756fd7b7ffa294fe0720a876fe176199cc67892b3d33615a92238c4fc90ce7cf9b70b3a57f3272ca7bdab8499b3d6d864775e97ab2f91c68a"; + sha512 = "931644cbf5e7b4f032f607a52a78f553a7a2ee8fc77fb7d0e73e6d276a6a1ba4a724cc91921c5ef5ac5ad21a3536ffbff264b80eb8d8a658133a24ca0b869456"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-ES/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-ES/thunderbird-52.4.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f447cfcf7c4febbe5244f5004e2b6a19bd03a7dc1cac5b609af8726bf9cd915e1ca2ff81aac65ac62386390b28aa1d3a6f2283d8c479b4d97c6df34e54918544"; + sha512 = "c2673d9f6b347493e3fc807cec86f55300a6e894c9c1edd7f7bec63cb073fdda2e9cf7794269f02f744280788bbcb8e42ee6249c317aabc57f91cbaa3635492f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/et/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/et/thunderbird-52.4.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "46744b2d6cd187ae58967e1be2962ae7cc4e3d4a32d195767777634d4c8b9843979896524ec90a00fe8bb1d367c7ae9d540da5705a9529d0126a165b4b7148d4"; + sha512 = "dd634f76848fb990b4fb1bd28e2cceafca651280ece9ead3aad6b9746d0eaeef76b5ad925163a68367d84f66949e799e2649cf358ad0949ee4f2538c71b8914b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/eu/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/eu/thunderbird-52.4.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c00558d88e6f8d9e89dc5717d677caa2a1bcb319a06b03f20e951b94d8dd79bb6d2d8875dde07f59be344330a8b36db00d0c57c7542877207f344e25dda91488"; + sha512 = "1c9f04cc1b32ffb21bfacb186f327aa945f36f12ae316a9cff8b2a4f8584ff8847ac5be1c8bd898ea1a71fbf3294a2f54b270eb6f0b63abb3da3178c6a125600"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fi/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fi/thunderbird-52.4.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "668d7f4793fa0c700b1abb75f185a26b9734da8f9d9faf327ad08503802017e93726de3124818650099570de58650709f3886dc6d8af24731d83c16486a54acd"; + sha512 = "03880d8334ede087a419443e9fb56bcf6727c652f435a366b4b49fb6116a62225686297ba82f298378e03267dc1aa50e90d75b81ea277a7afeb93331c45c3459"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fr/thunderbird-52.4.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "aabeea2843ac8c126c53d862054b27263b03f65f3ba848445a55615ef7e6f972792b2e634133877cbeeabd74e455a2b47d36ff76e5a4162fb7caeac3856f10d1"; + sha512 = "6f9909df3329a32d6d0c2203b484fdaa8b54a17849283bffcb04298601a284a6fe30eac20ec6b3a97ad2e8e3d4e0360c6145e87baa2af11049ae0d94fe9dcd44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fy-NL/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fy-NL/thunderbird-52.4.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a0e1132009e63654dc5fdde6989f758c88ce02327dc4b2e870c925886fd350867ee78958095743b582bfa77af4f2f80a497980cb3e5308dac47bcdeef88c493e"; + sha512 = "b20f130ad4a9b0f8448707945773cc76198e04854a0114a06379fd33c3d5abd9abb1f14e4f145df9c1c46e5d1e09522af640ded99f4f20543fd444e365d81fb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ga-IE/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ga-IE/thunderbird-52.4.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ff43e823765ec9354edc3c0009ec5a2e004e31c01602b875f538b01957bb4953e15f8a60c4ea5695af6e541566d21e4d4ea7ef4d8d3464f4dd59072269cc2eec"; + sha512 = "3fd6839351470d65f14165e3633c80950270ede2c4c9e658c001424126ffbf29c7bde86a720ca33e50cbe9a5306f0339c5cd491371e3ad03a6ee575c75889d63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gd/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gd/thunderbird-52.4.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d2f1c25cef09c4e3946050af1bfadb3f8ee70bea6c9ac2d8c25e2f422a160c3cabd76373679b4fefdfe838722f69e4ce138c50c03de221c31e71878d66377d22"; + sha512 = "a7aae188c866586606f9adb82d5110bc2b89a6bd757191e798b9b2dc799916ae56cbc82932f4b8da76e88a3c1f5ffc828c58aee0cd8f83ede19bde2be2164b79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gl/thunderbird-52.4.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "3ef058fa97459f41f204ea80393f27a0b572039bec4a49eef80db0402579620e28acda8613adbfe6c2cc267386a5cdb8d95fac4dfff2358a9bf4ba22a1bc24c5"; + sha512 = "3cdab0c553f1d09cdb4dfd1160371eec3d1f878329dcf2f81a177f17647f8dd9b73566a56427d2a593f70f6aecfec951e3dfc2a389c838a4069e5f4db68c10eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/he/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/he/thunderbird-52.4.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b54188bf2ba0e2e6470db0a938c77710c66e1b1d359be2ae3f306a7a2ecf34501f797baf9348609c63fdc68d1374382855509ccfe619c444150a4214ee819bf2"; + sha512 = "b71593a5c7cf8fe3960c701f5bce270366f5717b7ccd2a5f20dcdf402d1435b79db06662629deb4bd28e24b251fd2fa1a71a9e932f132e2df7a25ab5a8849de3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hr/thunderbird-52.4.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "bc5ca4099fa6d5f7884f7fefb1942aecac4aa6cdc338d8608433f3aca9ce14c8838e68aa79e48e88b453498d5d0b992a583daf6abf6f97bb4cda5d7ffdcf8194"; + sha512 = "d55deeebb9605565ae3c062c8617d7e351f2f514c13f00507d75a5da4ef8e8d845247147d2aa111d4e78c57ceb01404ed3ac2bb69883bddab7b59ce0ff5eff35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hsb/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hsb/thunderbird-52.4.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "5b8c7468fd777d9a4f046224ad516a740fd4acabc5dd30578dfc843f772dc1d0f08b4fb257db7d4d39d58eeb6468126ddd9267c1562e8ee7d23f07e02e4babbe"; + sha512 = "c177a0e3c6074eef1abf086fa34e95b09f39a1529ce640927b7be6ee8b7ee8c740ba4e2afbadefe3fa83314cb7c3223499b1a5f08e3b4e381b60bee1ffbdac7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hu/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hu/thunderbird-52.4.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3dfb629b804513e40852d810ce5ed3e0af0cd8c7bb92a44dc6c08f2e3a45de45d2c3ccb75616a9f9d7019a8ce9b4856e27baa283647eb63e953071fd410dd418"; + sha512 = "1442a03fa4367d1f33337d0e88a193de8a6992ab8aa91e28e4a46b8f1860a3cc346d15c00d745b5074b8dec1beca5dba182b5fe2e87827e7ea83b82aba28b721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hy-AM/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hy-AM/thunderbird-52.4.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4dfc61099b3f8502add36f3b215283140b8084504048d95ac31b948cb8e53fca658076fc7164cd2c20742edafb8f7ad5e08f2cdcb8c9cc764573e2e065364b20"; + sha512 = "c01325976516765a14a196ff04eb3296a2dfd81670cbf4d693682e78795b14b54f4d2801566f0ccd52c52f0b7100b6040f4e3540c4f3cb8c8b92038e059df45d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/id/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/id/thunderbird-52.4.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "5525d0507fbf7c7503b9a58c50ec248932e70d899ff88c1b8cdb18484d3cf4ce76fa1121a7cb5adfa3c19e1c83ecc5e888d652275400a2f92dce3e0fdbe51353"; + sha512 = "db56686b1d8713da9584e03633bcb2b14706c0b44d24484d6625de638eddcbdad1b1afacecf7dba52db6d18b2bbaaa15ea5f4d492366c24c5e2e212050f16c12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/is/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/is/thunderbird-52.4.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "1fe92018d666ccfe1bf063dd191d88f3c9fbd452e7820065e45b79de534baad9d8750d4cefbc39902d49d532fd5500f4b3a167ddd7dcec61677f490daad01d9e"; + sha512 = "5423202ebccaddd114393e5a2038b2efbe93fd528dc3d7b659987ab5aa2a4ad82921b3b835249285135be67216eed03de6d58b72800d9c7bf87ec812a37f21ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/it/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/it/thunderbird-52.4.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "80d6036462d74bb180b0f3d4d384be3b644dda9b3fc008a8d63478ec877462defc88b6f3dc2eb2358489956ef20e057975fbff9f7cf5afd0d894926e617d3225"; + sha512 = "b64e31155c73f13cd84bb4488e63df5c95473957c792f63f8cf25308d2b860b084aa6beb519a7666fde83d3db25e28ffb1064ddd0abca73ff631924cfa83d7f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ja/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ja/thunderbird-52.4.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d1185fda652104759bc84a095b289ccf6a3721425d60c8f0781578eaf113349de9fca18dd1138f73dd13081ea5388d0f04fd0cfb47142236c1354a167d0362d9"; + sha512 = "8852c526663f69b038ded6bb1382e02de700eab741cb04ccb8d3e329ee4534477a6ea402134a76fe82a020bad279c66e70bc06b0ed8d0fbaea9aaeaafa051b44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/kab/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/kab/thunderbird-52.4.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4bb2184a4a968f6b33c29fab44b11f06743f88b8ecb8d83e5a892c608a03dbe3f643c2e8b5a5fc9ef844801b8bfc2891c9bbbbb306b94698bac5441051c22783"; + sha512 = "b08dc52afb713142e11805c5b99f73a11bd3c16756dc5bbb6a0c3de13cc801f27438887d8733cf4b97d70d4741abcb0d8782b9e6f6ffc359f38318f1702fcb7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ko/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ko/thunderbird-52.4.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "49dc08f3a98205e433e81c9bdbeab3f6ed7dca5f3df9af1b6a01470dcfb1a3fb72ce3447ead492fd8f0d49dfcf9028194c94a4cc6e20b1b4c28c64a706975615"; + sha512 = "0de39397e4401ad939dbce0c02e35505c593398bc2078ad19d680a797a8cfa3f0950a810c8650634e3d40ea3b5265f9e193b77408f1588b51575d87446a336c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/lt/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/lt/thunderbird-52.4.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "e8b35d834e122dce0b9996060b7582a5b2c0bcd06e1ee7a4b12298bc4aa501ab18bc140fe0f0e2fd63ffad97ec9d287d1614ed76718525c86296ad1167658f9a"; + sha512 = "13842d9f210dd192e2072c138d8d0778e85d028dde92b08e616dff6ba62f84b6aa36363a259dca69bb006850de2fb8c42fd93874a4befa970d817aad34d47b57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nb-NO/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nb-NO/thunderbird-52.4.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "5efba8423c744c61be72d679e4943e901488984415cbdae9533ef5a26010d0ba072f107cf8a53389f831559e8093b35c01f6eddc76b8a361f60af8166c781207"; + sha512 = "ec9c96abe94ac17139e9fa83ac2d7ca8ddc6889e7286a4d31e61625db6daea3969fcbaa0796ae0bea41e3a433ed3e170a73c4be1a177bedcbfcf705e306e28e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nl/thunderbird-52.4.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b4c6c95cf6df97ffc65d03f04af7221d819ec28b464fcb8173beebb9d810af9b78f64b39e0750d11446ff88a209677512f3735d8f38ebe91ab9842abbf183e65"; + sha512 = "52e117078f1871bfc7b549a47617d277c763267f7033136c9715223d8f876184c0b5012b193a5f497e1fdba78b902a3c38651e0115829b0f5ca7f0cbb1c439d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nn-NO/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nn-NO/thunderbird-52.4.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "3bc0ea3e17a1161345d4c1313c774a312e591248f07be7c11d9b6c738aea2d91aeee202f2a67ad38df9fda43f5f853aa162990475dcf9248667fc546370b4083"; + sha512 = "24258bbf5e3643544ba5db26fab9678f7e2a44b390ee993be4a304d148b5a57674158afd308d6ef93a86c8e525b37e1aee55ed07be6953301f164a2da00688d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pa-IN/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pa-IN/thunderbird-52.4.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "2fef099c73db55dd082f4a9e207ff47096870caef6ef4e9346c7faf3e40dab4d3b0e1e68d1a9dd7a427d97ae65aa347976641aef1872a4c7a6764e8a8c2cfe5b"; + sha512 = "e9d8b4e6019d4cf1ce562e6cc9b9aeac0e93d8b9ac9283c7e8f260b4d611fe2bd0bf6d71c9f82c9d2cbfba5770659d21cfb03fc2deb36b80be0a424178a65936"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pl/thunderbird-52.4.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f523fd0d1b1656e80b52dcd8d2f52f7403c22f46eeea850c75c78fb3c1903ba4edc44ae69db755c0a105379855c0c9c33f149fb83d8016a182a32cd5bbea113f"; + sha512 = "81ced2424282fe6dc7ca6f5e043f6c42ae87cddef900b73fddfe6cd8c488a90e3099824b57d0971816a60c3f43ce66e1799195ae21369958b2e8085018017267"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-BR/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-BR/thunderbird-52.4.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "6428f601375bc877def880aef3ff6b8ff4856696a2040381ca22c60df8e1364cef12e1c878db6b7863d10f8cb02143c06cc58d5df6cc83d1c25e90c846be3fc4"; + sha512 = "4120b94c13a9fcf1aa31a2abc3fdde27ef8c0354550ae8511b61641745cdd5eaec16e1ddd1d22193ca6680f070b71c188d94cdc75a40fa1596fa88ed59545b28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-PT/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-PT/thunderbird-52.4.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6dc2fed4b003f4f120c79a0673d9d7455c0b6362dadc06e15ff612a29758c521d87cea073ca0b81018e57872e6262a09c5efc6e9fdf7b494c152ae4e992260de"; + sha512 = "a89dd739da5262713c99aa9aa28544e48710e80b83770810b240681ff0546c3b3faa37b48ae56c018a6d1d625f0411df557ced12eddfb3a1198eea474418eb68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/rm/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/rm/thunderbird-52.4.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b22bcdbe338fec3267f352ec5554b8e5bd732961917496c6d06a6eef188cabe337bf3fcaac1afce49cd16c891fe7604fa77c13b3eedc7706b262957d5d01171f"; + sha512 = "3665bad7a0d1f2d725d0a44ad55918228c2d9cef49112fb19d2c3d885d1ec62af89c15aa0ce96ddebdabf97c8a5e10fdd58d892c085e5b9d17bab6658e7bf444"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ro/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ro/thunderbird-52.4.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "cd2f67456fcd20ed48effa2363f4088e48d91f93df66e803527e83a3f8f2f3a74ba22fc0d5c4ef736bc38ad6a6416830833948210ee900600bc36ebde81a9976"; + sha512 = "07afa28b22705e0e84e17026d04111cb9a5283838fcb94225e2c05da1fa0692770b17052c52d8cfcdb7bd3372fdbba9cd9ed9bc16f6f59f2e3ab6f4308543d91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ru/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ru/thunderbird-52.4.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "1b6b0adb47f3c52230297b86ead0d259acd12fc56353ed5de9afb84042d82d74193785b4cbb4be2caad302283ff54f8630b69fcc9b846009fa7dc6fdcd7e2525"; + sha512 = "189c40a8d950496d62f980180502ad342621caf3a2ddffb0fe4f813c9c2d4a25aa375d8ad70c8b7e8ff85f09607bc2ced3366524346a70eed731bd8d9409e5d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/si/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/si/thunderbird-52.4.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "95c4864692410aa7f9a071f9d4629614b52a05a4a2d8f3d898feb7bbb75e766a8efb8daec9e3badb32c3dc8b4bb1a2b3be80452dbc9bbeb625c9275862396d95"; + sha512 = "0b6ee1e5ca86472a5cc67cdc242a6b62aeea50609661e369c8dd3dfac5a774f50eaf0a68973b1fe5d6d9bdf6a385c52a90b8711c80facbf9fb301981a7aae395"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sk/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sk/thunderbird-52.4.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "04d594a095a4862ac32e8385ad7740afb2033d0601f520206ea504c9b367d685a2c84c43a0279f39105ef56628b66f13f2875c5b6f19f5252a3b63f6d549d876"; + sha512 = "9c1f164a2da43aeb51e8b64115618590ba0e9284f3eca8b16d3792b33e269a0acc253314ab7943cbaee94ffc2ae321247b4982798d9d48608e85a935afcb6faf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sl/thunderbird-52.4.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "fe46ca8960024da81fcef7b2aad12bb58431f0cbb4d4c107fdfa8096764221f07feba468bdd2ef5d99665afd0404ae286b37bf2afe8cb6e6fc2a8ae98f9a0ef6"; + sha512 = "5d4698be05af9f9181af63eb3ca6718feb1c74c81f0a6fbc82217791c911dc5f14ab433d32f6484ced2cd75d5db4b76aff3bbe420d619afcddfcbcaef25873e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sq/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sq/thunderbird-52.4.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f44325e596690d0f383699debeb8450f02b7969232f1291ba0b02f657a80552ea09caa899948506674818159a98b646217d53c386908cfbb926791dc61a36e82"; + sha512 = "32d62e6dfe28c67cc7b0e2cd27c96fd7c7e1079790eb73a8731af44e8a62f8fd1ea2e7298dc772e3014fc8255f022f38bbd5478430629140d0dca9ba0daa401e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sr/thunderbird-52.4.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "67ceca6c23768094799eb266cfc09a7340941fc49ae82c608ae6593a7bb1c9d22cf5525577e7815a1c5c8ee64744d7f6c5b790b3e5b46ceef1fde0001a9209ad"; + sha512 = "6aca04c1b4378489239cef6b5032ef6dfd6d39d84308c335d03e97ea7c48acf021f6cffe35d652e117f71e6ae3f31f54e5ca73a44b4dc51dedcb3f5faf7d016f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sv-SE/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sv-SE/thunderbird-52.4.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7f4ca5dca587ccc3a20c9e962d266ed1f7127d9e0707f585407efc58596e590d6650e8322bd13889afff73eeb7025942d636f3a17c327f9c2dece946ca67e50b"; + sha512 = "099e22013b8d6791857c378c0f94373ca42d35bbc442cf273c9de2360ab8e64d712eccaedd5a13915ee19a195b6c9f04748ba738e7bbf9b8153edc4c66070d31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ta-LK/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ta-LK/thunderbird-52.4.0.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "6a0024f3da37a0ecd2015c9fc574ef3ca3d3f62d75324b006bc32c3be901054549525cef79597489edf22c5de1cd65c1826167132d1e5f7e62a23f12bc966ea3"; + sha512 = "d3c95f37ffbbc5ef78b7c050a4e091bd9f36fa9529ed7c38e25f5495694c1b792d0bfcf53d15b74b52239acb21bd0d235ceb07c7f68f99e1b31e59e6f6282aaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/tr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/tr/thunderbird-52.4.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "fc897cc02261f65d45ce243367f6cec3f08f08d6e6f64083e81a848c3efbc9098228e3b1bb0d4f9914fe5315748cc8b07d662a204ac4ee2e0e1bd075070614d5"; + sha512 = "2f79b9d45d747424a65271033a75a86ff503694d88a30238452fbf817ba153c4638395d3e59f5f6cc662ab3361d2304d5a4c925957d9d6e6d7bddf34947acdf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/uk/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/uk/thunderbird-52.4.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "9c1aa0abdc9d008a40c5681ceac5add498f91fa9454b1b46ac199609e714d01a941705f729f99bc478a37db53cbf0e3c2f2c49e5d4b04a25b629f3fcfa29ad7b"; + sha512 = "e0d891b4cc082e32d3f6af318f9224e996a8ed3c7e1385bb86a5e2f963239999712c444fed00d779320f6b06efb38f3eb97023e353f91eeb7831b44a870c6394"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/vi/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/vi/thunderbird-52.4.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "84441bc6c6a9882e0b90f9942148e70a5fe3a5d353819fed7aaaf38a7ec985d061e89a99c46e6d42c3c057dd07b44c8123f85a3db0f62b630575e51703d138d6"; + sha512 = "5a9e13e126c7bc8ef435b8edde1896b9773ce1dfc39fe3fe1bb31e54fe4f592acdb3db360fe0890eb35b1896aeed0954bbd051fde6116b07cb513b1390ee56e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-CN/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-CN/thunderbird-52.4.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "c1cd1d26ffc425986abdd08b1c3695bb9904087de1f6f192e2bb7ec187f0f433faacd6bc98700b31a11d75e28cb4c9e6f7dd2239d79ef2d0a5b866a58badb9b2"; + sha512 = "b0374f022c2a259076d52bc0dc142098975f9f1d3a886192332fd1c1b2a5c9dabc0d3fc1a7fc0f28f6f17979931b9c78a9682be1226ff751446c5427a5219a51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-TW/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-TW/thunderbird-52.4.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "dae4fff5b67b90db1e1e48ca24d63c294b8628cfc64f90227e2100d5f02459757131c7cf51efeba166273fa25a38d5addc035ebb5e945b31826d152f140eb3cd"; + sha512 = "7e289afc737339be5a3db5869125d891da65fb75a62b7670c3880943ae11bda33122f81cab46bfa95223c45662684b8fb66ec11cfc5f375e024f4d57be098684"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ar/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ar/thunderbird-52.4.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1bc9384d57827d3d42ba4b2ccaf1ee83077301c855cb98c9ebb58453f96c37429387df7cebbf381fd6a711263584c857e5f6f1c52c915584c97f56051cb03df4"; + sha512 = "872ceb5933a562d352cb3bfc6e9cc95a7485625e5256380cae367d38a560f75bd7964fed1becfa5359db3befbe4aa249f114df307cf14e2db75dd047d87e5c53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ast/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ast/thunderbird-52.4.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "11f718f280c3cb0e1b759b721d4133dd76cae85e6e1217f66403956cb08c637de99cecc4954e58f6f1d9e8275dc8607e501e6fbbe3bf71051831336d583042ca"; + sha512 = "9955dde6ae54c096dbc5e5a28729963a72997fda97505657ccec6e0b5f95f35508815fe663f266932c79ef91463ef6c5da79ace4c19149b17dde9655dbe8017f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/be/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/be/thunderbird-52.4.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "fc376bcd502ae98da16e48e72234e1b8c860aa9e42153c7e89d6ad829d9f4b2696aa7dee75bd240fc25cc7aa291a808184236ace14978a6f203997433db24148"; + sha512 = "94106fb12bf932f3a8217f3252b4f76394f13cb19c602d1b4a67e4477c3a0c781c3481ac973e40af7b306fdb32c88d4c70f8302b14e693c7270e2afab0dc2539"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bg/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bg/thunderbird-52.4.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "076184b227fdb364fa8f09f121735a6b6752b11c4f8537b45374db550c2fa9f6e81bb0c2cd145508973df8cbc2901de793d1f4c47696ab2165f5c819db659640"; + sha512 = "194a420d07f952f7d088cb15fd14dce30e352dac13e543321e94fc60b7780678ea1ba51d450aac2d7566a8f23a583cba70e3aed373602ac896e0be13d234f8f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bn-BD/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bn-BD/thunderbird-52.4.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "604fb9985b6a69cf563b86bbaabd890f487ca3e510a93b612949af5759b339e10b67c70c17aab9b35d1fe8ac126e69ea1a6123aae75a0eca6a9b4f133fbe1fd9"; + sha512 = "08a439a7fe40121f318131b035e7a5a1b44a56a6f3434b2854136103b0e11fd720540352ed04bde23f33c7ef75cb57eabbe86425c8f2e440f92c9260ddf1a902"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/br/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/br/thunderbird-52.4.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "f5706905bb9da0c3ec9e841b7694619db321ecedc85ab20e52fe9bd2e2ea2e1ad0cd9e0dbaee4159237881000fd2d3d4eeb1c86911c0c5ca13fb718c7cbf75e3"; + sha512 = "68984b8fb564e24f3e331504a0c8a2e88cc1021319b2a47beeffd145eb42a19bd555aca495ac60612efb191830c273c473e0c3cd5844f109e78a4908834926b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ca/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ca/thunderbird-52.4.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a240c6653153c35f4cf40c7266eda3ebf499cd95cae7a62e0f2025bfb8b0c46538710a9b3b5486e1fea88354d7bd654f50faa06a6d246d2c97c0913e51e62257"; + sha512 = "2202c43a63bb283d9eef16c27e0d6125d43284b9c1acdb8cbbdc71f3a9d6f6d527c4a03363dced911321f28399a86ef25defd294befddb8fae41912e17c2fdef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cs/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cs/thunderbird-52.4.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3f639e7244a32891c2cbe0059456edb241895d7f5f5aeb2636699dccb5b71d4bae855f31352575957c7edbcf4925506e76ddfa0f0b83a81a61d9a8d9b543c564"; + sha512 = "d01c6ba52794d3850656c1538e46b64eb69a7c1e3a17347ab5cfda9fb1e91976a4bfc7096f7d12bdf2f15625387aec7066b0a25879d979687c955058b92ce6c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cy/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cy/thunderbird-52.4.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "26c6ae97d0982d9e91bffe04918b27da55489ec00fbfa1783acfe69cd2136bd139fa9cb434a473b5f63097adb2768e73a929f8f06bec97a13ad6750837f1cf5b"; + sha512 = "3d056c91e1599e91249774cb21d8fbc887b7bab38546aca1815ca9c49fbf4d641bab2427f03ea993a72dc29793feb1cb0cb26217a4f6827e9e0d9d3cb5e3ca0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/da/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/da/thunderbird-52.4.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f516ecbf3124df27cb5c4dcc00505f2a1ab8806c3965755ae28ea3db7e06be173a82e5b171493af977686e31bd623984a0428d5781268cd7ab4094510ee88ec9"; + sha512 = "c940d26284c8ab0a45bc6a55b67b467df7ac160c8774f0e2e2deb9082ea9500142a1d3c8851031a7e7a1763fdf5348c14de57d7168c3f1bb23fed3cf31a1b09e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/de/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/de/thunderbird-52.4.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "053ddf755cdb5b76174b18f674169c1b478b636ac90af21d5c5108a7fb9463e4e247567421abe1fdb6cf1cab1f83b2426e2fad5d0d0a2b259b3526f5dc477bd9"; + sha512 = "b1b63590885f30797ae9825f2286deca69a82a73e7c407be87fa92280b904c0605e7047a402bf6ce1e13936933a27efaa2b35d534b23f745a2ab4a9538d31b47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/dsb/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/dsb/thunderbird-52.4.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0217fa4e1ceb68a9bdd8d99d93bd2d523c2ecc649154eb7c22b970389a285efaaa8b2dd20f590214483cfbabdec5cac8b6120315d9b500d80038e85bf8dda80f"; + sha512 = "fc81fbfcc6533d34fde2e08351dea6d7e2a561a3620a6d0d225dc1081f59d9927ceb0abfca7c2d21b1cc727c0319646a2f386c022524178e90aa6bba344371c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/el/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/el/thunderbird-52.4.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8fea2697ca07a8f0007a5987e59ee2ab56d9f7a4753f3e4656e872e7201f001eb80831eba64167444d0391cf05c8af5f3d44f3aaedcd8b2d8fe48838e5097240"; + sha512 = "baf8d0a52fbb12afdccd003209614ce8d5b4062336744ee783a6c3e7eb5a542c4da233fb680f320226f3681b440ab1d0717616a3664051d231b6638729903b00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-GB/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-GB/thunderbird-52.4.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "269217e4eddac4a29a4c3b045240b63cf623e276d6dfbf7d874ed732fb63748ab82072ca1a482012c8d25d5852ddd0b9bef8fa756723372d4be35ef4b067fca8"; + sha512 = "0f5fac2fd3da05cbdece404fe3d170ef49574b5abff07a17120d189338140fadbc0971c7be05656544819df2b1987fd86c0f9fdfcd312e540035e70877212342"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-US/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-US/thunderbird-52.4.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c436d084accd3b195f9dd0b9c96d9e45ecaec730bf5a35e35db65c7ef6328383fa82ebeb3b143f2c92bfbcb3f7983f451e35e68443f6fe24fc43baf686610207"; + sha512 = "1f3a640d140fa305e115158d98aadf95d180b396aa3935de4505f0f94f510d206ae6e45adf36572cb160175383d0aaad11c3244003e4a99dae613e1a749430cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-AR/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-AR/thunderbird-52.4.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "8d6491206cc1bb41132da43eb812d1f548e7ff8414b7644809d2f42819b94c583793baafc94815b70345b43c2ad3922c5d116379a6fe0c85e1c09c7cf7431067"; + sha512 = "42525a75e154fdf263f276330a998f127de697519a79b447d4860403c40ca2a6caec0a225a978461ae776e56218313a3fa31441817cbb13db34cd47afb9a5eb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-ES/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-ES/thunderbird-52.4.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "21ffc568d5aaf6ff9188846c9b6ab0483831d5c6db84c0504cbe95a5ccc2dee3ae4a8df2ddbf81a9a02c328fbf452d569cfae5f0b85f029bd62836795db41e0c"; + sha512 = "86b47481b760206b49f87d15a917754d875203d83613c0c8b83e181f95986e6252ff26cd6dd6f7c6545f9d4da4801f6f236fa82dcce0d0172f19228b4eb5fe33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/et/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/et/thunderbird-52.4.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "aa73dd4e5cc8ba643584b88fef3accd56b71b030a91035aca342ce4281b79372af8ee9a67a9fdb9eec2b869d0d9815f00a40e1ca6988b71f174b6e0412a31d40"; + sha512 = "4bbfa1fde3a6270b49989747b4b27c284abb89819c46119cc3f2f90f0cad1648e49a2e1e01a35ef193eed4cf504a3e027138ea30a225c3d75347aa062d56afeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/eu/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/eu/thunderbird-52.4.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "53f6223554a11340ff5f435438e31406682bb5364bd4cc69a9909b42293095fb4a040882cc038d95ca8ea3b85dbaef31d6e6a3ce5de58e99fb5a5b7427501052"; + sha512 = "292fd0f2db956e5bc86a84d5edf51e3e36141610c99f75b1dd8af0f086fa8bc4a4e5a4e1c3d085587b6bf2d6e3435bc70ee66d379809886a391d67e2c243d762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fi/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fi/thunderbird-52.4.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "eb143cc250bca4043476764e08ad1d7d8020318db832a4be7577036be2ec933518c5c2c9ceb2cb3c11d5e402aaf9ba41e251b95f505c6eca63cd28d52bec7ebf"; + sha512 = "b8df95d4ca36efdc4370821068590b1d7e3fb9f348afeb18a0a02c977027312457aaa59c38ee02908e944f166d485576522ea0cb087b28fa857963107e43ced7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fr/thunderbird-52.4.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "16bed03812d5a4163a5d52e35ab1b9b8d91be8d772929730cd5dc92bfc62139d0778526e6e9d88d40ddb981020f6b02a19915f5dfd8993f0f477589a873c2435"; + sha512 = "7880654b4133e50ee248b6e287d52ba867361b900fbbdd149c6f06c9d5df1d0b57ce6d9d9bed3e1ab68e90b0ddf874d0b2427553b24ea39f267f576c63357bca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fy-NL/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fy-NL/thunderbird-52.4.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "3c1093eab90febc62ddbd69cdeb559fc95fa6b2e67893b2d9e8ee38e67387825cfd0b50475268b7b489ad69c80f2667abbbc4cc5be3a2b81747b5858d5cf0126"; + sha512 = "4784b06aeb705141d84103bf46635e6ba6a7f7795b40e654f63c783a63ee19d54843c211eac90c4246c5131ecc8808940e560f2fd2a2543522cef13bf3828938"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ga-IE/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ga-IE/thunderbird-52.4.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "153dc5005e913f36dbe1840d46a91d235207fc393a7f8f294518f1095ff590f706ff7015c823dda5da6e200a43b2f278c93f910d97517452eaab972ccedc6bef"; + sha512 = "91b4145d82a4748ef2cfe6d4d46c9e92c3a54a55f72ab1c28135363471d68ee028064ec0c0bb334fb731c6577305177a06d85b2a9d820d9e2a44fb01ac961beb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gd/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gd/thunderbird-52.4.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "253a9cecce89ffdd771c70b06d23216046689a0a8e70dd922328590a4a39137d93919b4052c7e928b180f2c8fe088199583c67f96602e9de150927ea08be65b4"; + sha512 = "4e979ce305a014de612c0f3797b9f8c8d89445f05972a24d8c13cd01160aa2c15007b0e505f9a0cb354f8cf65e286ba52eae8a6bbdcf4c7cf4e89809e0ce530a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gl/thunderbird-52.4.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b77978888a918d297419897f008f0fe05a09903d7a0364c43b20adcad883f926a9c51af3e7132825bf19dd487d7058c83209112d5ebb09f202c49a5c8e126f58"; + sha512 = "b3081eee4473c097b37b9070cdcdd8eb48e1cf69ee63fd76f1eee0d5ed84009b69d0b31fb38c36f7d5137b78d0ab32087a8e668f1ad01e6ef96984ecd973af11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/he/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/he/thunderbird-52.4.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "56f1b9204c0ad5251011abf388cd3ed95b2e6cbddbb7993f967c68c8f8258c3695550025f437ddc3db455c3cbf0efbe146d0612bc40d8ad3a3482648c4bace46"; + sha512 = "2781cc8fcac549ea394629ba1d7c43c683ea25b4d3c5807f7a4da50541e47ba18ed4d4080e7f3c785be8e71e0a8e2ae0cb9a24e348f830b71b7398efd06863e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hr/thunderbird-52.4.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "c225c39f93bd12f822fdb523bdce20ca64266d81f007acba861466d61d155bded183e305bbb829aafdd0b64cc10d6d7054752bc3e99286b90a29864425cdf6b7"; + sha512 = "d42587bb96454e3ee24b964dee1de0f51283b2c3316dd25e798a8809d2289306bf6eba6078f664f87720e7038b14f009640fdb4d3acf211195dc881e6e207c6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hsb/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hsb/thunderbird-52.4.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "b7c85448a5dbc2f820d866d8e307e8221ae58d66187ae259df3d93e761fa484e0c7909c61030682efa5817613104d88813c1fb7e7286d0d7c45f6ee9dc4c5ccc"; + sha512 = "49e3ee2559c124db79e2dbb2fe74291a377ccf1fbd75b450c8d4913000a055cea855fad03369e7420391faf114e160e35b02d432de847e673e352b731986bb84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hu/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hu/thunderbird-52.4.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "6291b35868569e924a3efa54abded62742d7212d4a7dc039e09baa00d77ab3595a22adb042be753b75c1ce50342c20781931e366fe2b73d4b598065fb02a1d0f"; + sha512 = "fad46a1ea3e8a1df49e4ba836c68b1744577fdfec319d9dc0b2bd8756d4dc859cb5af7484791b83f2260bd40d1ae64f19539f8f4b3977252a1f559b7df9fef35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hy-AM/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hy-AM/thunderbird-52.4.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ee0193ec3e1df85c3cfbc9118d479078ae3d61a70b36c582ea222338b49db4c5c2c8b0d10a0663154fdc465b23184e204b509734d2b55862c6075d1b48fd29d2"; + sha512 = "6a34e03e5e272c847f674bd8c48cee66fb659cbf88251debe505c54011b029cea7b7e8a9722c61b3e603d66aaa4313a5971fdbf2035fd06d305cf229cd8b2afa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/id/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/id/thunderbird-52.4.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a882202254e23635dc51c10b332ae8953e61c6ffcdf42f9d5794cf3c2a7c665bb350171bda84da8388d2323b0359b1e0c3fd44a838c0979c35fa80387b312a21"; + sha512 = "1cce3d3653b474219f00f4555990406b661a14c4198f3d246624def4e5a3ad3ea393a74f6c80e0f17b5799784e212778ccb8b56bda31c5e48a55193bef09c417"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/is/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/is/thunderbird-52.4.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "69ad01aa6a7a84630bfaf10f4eda5b8d04af7bf5cba742943fb474ea32e926908db0f94877c1d6f9904063802dd9e219b20fbcf597aa291490726f15f6ca1379"; + sha512 = "f3604e918502d16ba92e65e9def425efbb829a261d2c433ce83ec89d6ebfebbfcddd1b01508f953ec3c26166c6d01112486cdab6d1a0fe1e6a582f0566900b89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/it/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/it/thunderbird-52.4.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "d9a1897dc1665d69868dcf0b5d4998316a76a721ca67c5729d0b5cf2a8de516d7ec1ff92a6db1cf29dabe6544ea10482dc8ec58740fab8ee704a98596c69573b"; + sha512 = "458bc19bd6b08f6834e310f7ec4591ad4e84067ae2373864ca9019c20551abbcbc067467fffada229000dda01369da3c28967df522182d8eda1a147d136b6315"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ja/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ja/thunderbird-52.4.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "c9b7e197cf9fb00292b39a7769dd06be243d3ac46ed90f5db19b612823872bebc06b330eab087295a6d91edc48ed8c40af04ac69a0b5ead05a11ad960dc36aba"; + sha512 = "05faf43b8b0f616bf552988a577891e816fe36b208b7d6292c9896a6946386815e117278feef33063b4f2eb7b5ec89aebc59e1d4432021969bf3b95e750defa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/kab/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/kab/thunderbird-52.4.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "065d73e3cb20593a18a556535aba02ee5b01e5aa07c146a02a76130ab9474962fcbf56ed5f5733638e2c73af1cfcccf9684b6799a30112e8e6da32069bea87ea"; + sha512 = "594669d5518b0be87095527b3013799812c9f45254434523903ad19edb2ebd4bc32409df6f646b1d1e953098e126673427400238a056e0a8c44b672009a12a2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ko/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ko/thunderbird-52.4.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "1260ecda4f82475857ac17c8e4825bb9e8aae458797a8fb92ce6fd90220dc2eafdc03447116f2063e5a66661a8869b10a4280bb481f3278b08e135466a0ab74b"; + sha512 = "db3e6c9efbeeed833384256814a713a5bf3d2a220a74c88fd28f91ec0dd6c7600d77e18ce66c9dc9f1929f5da7452c5904f012fa8f5e4fa04084892e17b2647f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/lt/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/lt/thunderbird-52.4.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "3437bdfcd7ff3ed1f628558dfe34b82319fefb4f133062ffe8a04ddf1bb554b1d5ab881cc2a288cfe494c7e4520147bbf4c23fe38b7c0b0ddaae8a061d7ba839"; + sha512 = "2b8e8b74bbba2a72dc88a8dba457189cad1c902c0bf2cbc54bf989c6444c8b164238f1d9e21c2c8e470df5198d8586cd613b40292b737c04f4c2d834d298dc13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nb-NO/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nb-NO/thunderbird-52.4.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e321b1ce86913287ad239f235f97e481c1f1a26931da1f17ac4827767735208a31ac0c418301476551ad1c73781dbae890da15ebd8113a59d11e45359d592537"; + sha512 = "bf99756bb7bc5fa699cae5ef3da5a3614e57483b2892e2f6f769699ef3478e22847ddeaf63fc0c521cd1fbcccbdf9bc5054430a5cdbb50e26e371818cae404fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nl/thunderbird-52.4.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "656e6bec81d40f1dee9bd51d5313f6625485458f47c45a4f77b8f114df9463257765870982bf704f108f84df064d51a7c5c5500440e3b66a690b15d248977070"; + sha512 = "80170d51276bb77de4af8d45d5869069c7d9c6db7ad6d5786fd4c2c5cfb0a20ceb1cdce7b5dbf99a79dca329efa5d9a53d4ed738cbe7f77bdcb65a8b6e2e7511"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nn-NO/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nn-NO/thunderbird-52.4.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "d7a460705e2debb51423612059425094e88a0ee552ce8b75097845763d4c65039fffabcba2f0d95bc655a84f3d1d1c7e1290905f56c5c8c461e14a9eaf87efc7"; + sha512 = "f223dd33108a750563a498e92b53cd3e68e3d50fdb1a08e295a9c3e893c20908ea56c9c5312874469b2f96d1046f754df55bc38d1595d5b811b7ed659e267d98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pa-IN/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pa-IN/thunderbird-52.4.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ab12d8a23b649b5fd7cc71caa71dc0cf15f4a5baab69be44ec71daa4f643a2f5dd83974d88e6d5deb06c9e89bb7f39af3940edd551588c28d42d1304bc092f53"; + sha512 = "a418fea2521ff6971d68d975823bd0917580450a7ff38975455b891c8e3cbcfdf51c40502fa072ebc1f43ce93a3b07ce93db369edfbd511beee5dfc5041a0a84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pl/thunderbird-52.4.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f85deb706d0ae38c53965951c09991bac85a05486b23e6c364871d9d68dab057b4ad963d4287bab4f1d6c3ba60841827ad6b1861c3dda15dbd29f42c9442dbf1"; + sha512 = "05adc7298c91853b373756944d360589caeef6a999f6c5ea9babe3b12ff9409909040b69b641b69b78bd17bddda59f9828e294f5cd5f7d7061cc3f51eb3c48b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-BR/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-BR/thunderbird-52.4.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "a3e955d25fc48b8e2051a131c437b1075a773b69fbc17f4cbb8ff60548d47449be70e3aab97d569802c925ffb57462bd144f3eeb0cdde7b2508ecff536a9193f"; + sha512 = "4a2503e3a1daf5b9cb26acf25720c4d0fdc7a170bd454a185e4cf2cd9c9429dcbdee4c13e59e11a2a275d88513b1ae31dffae8bdf70c3196249e432360fbe705"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-PT/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-PT/thunderbird-52.4.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "051f55a3530c7d90a0f7791d6bf2ed1af015eb6813ffe3f1b43d7fd4da992c079bc6836e38eb027f7246aef7245f480e9300dfca9c512f55e62c3d851c7d9b16"; + sha512 = "cb02054a64a74c2e1f936594f001dd721e3016cc68cf705c0413a732153bbe45aaa14736d38b22358bda5f3d059f7306087c27faf040d91bd7f92066403e65c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/rm/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/rm/thunderbird-52.4.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "f42c1f0cbd76b7425d986b26a1e2d0342c4c99c7d283bd2d6719179c5b14912853b7af20de214dcf06ef1f89bfa9d5a9eb0052effecab505738c80abf168b67b"; + sha512 = "8e745e5d1e5a4d3f432bf8c5f90906a22c8d2fe4c6d77ec032cb7eccae1f2f9e7cf0620dd3ef378414d6f34cc25346ff44b7fbee05016f34c49a0c8c5959184c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ro/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ro/thunderbird-52.4.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "30cd95effe6597aeb0e686511a3b59f064269562337c924af06198600a9c19dee54931255cb9e5400e034de8d9c08f2e99943084ad9360eeedbd0615339df3fd"; + sha512 = "20d9b9666704c87f73f4c8cbe8d09cf79349e811f4c4da93f2754886cc89fabf7c2388430f9f072a3918b38984742adab48ada320dd75761a7443f3be1198a8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ru/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ru/thunderbird-52.4.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "3e8a7501295ad1a41f3b79efaff4c76c25e5201f2ddfb02749ce950b66d81b8cfd870da2570eddf4381e8928a6a355dae06906043bc6912da23feda3706ac12d"; + sha512 = "ff7c64ed9a4403e24b7f0f9fb06bc4b96153fbe7d30b94ea7e145d33dc24bb1b2807db8d6e3398dc84e13f68d9c5c4fbaacc3027cd46ee58fecaa8b7b17b27a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/si/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/si/thunderbird-52.4.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ddaf492f1d6c219ff503fa50ae1f415c7d24dd6431cd55d02a222e5eec7265b80e96fcfb0ca38092e06aeea78f698ed5b229d8527785e90b49fed6ca69acb9a2"; + sha512 = "b2358e6df5f5cda477c530dddd9d27e35a8919aa346b66521336fb0cddd2821bb7dd867f4ad005c135ce040a1eb64ad9f1feef81a268a299ca2170312f7c89ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sk/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sk/thunderbird-52.4.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "dec6bfebf69c1db120ebee8b61cec49eb3c27209f9bbc0fd914c4f22956829cd9759f0671cd7b6ca24dda6598dd45791d566a55db5395cc089ea15696d791a3a"; + sha512 = "fc3eae35914d2a2ec6d44bf6348f71872f7ccb09d25ed974843b8010526f219437e6530c4d86825d027f1593da0943e0b9a5557bf41d4095e4e9d37108a94c3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sl/thunderbird-52.4.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "3fd4b5dcc631b65f0509272156be238d4c9f99835fb7d23730d99267351f9ac58d370cc95f3a4839bf0b1a45fc0fd34b1b6cdb9efa88b75f991aa5fedf74521f"; + sha512 = "532b87d22bd05194470801cccf242ffbae57685e69a836c8179e2fc562bdf2aba196f214b7a66006ef90d7fb1781d66e1ea62c2cf95820402deb9a73122ad143"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sq/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sq/thunderbird-52.4.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "a72d7db408855d53eda896280a114dbe667a914a5c5d17da7a242697a44b974f54f0b02d0884150c1f27602296df17cadc96f4b27057ae094df9680d3b48f6bb"; + sha512 = "b621973b1f76f2d789afa854917e20b7b48e3381344da29e07b8c5bfd469162c47d51e9552ab2428895c45dab9662d8fdc2704e65c96faa4afbddc4649a77dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sr/thunderbird-52.4.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "dbd9862ca22f038defb83b8df9cde748eaab1a4d68afbbbe6dfe45c73334616bf7f64536d6ab2d42166d1196e548acf697fa29a5d37184e9ccb198bc713ecae8"; + sha512 = "d26812c232168c30c6a76dad5f3f7e20fe88cd75fc63f863bca255fa353928b8d3988c56abbb649266e52b8d31d70182c59ded496607aae17d7d2d0409ecc53a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sv-SE/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sv-SE/thunderbird-52.4.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7c3804d7681cffc6e979975a898b1cc2b1bac0d2e6a17058025629b8ad308cade808401f99e43cf0c1662a9597f2f6848d12839c3e1fe7606fca5926e6b484cf"; + sha512 = "294e141cabec4edab0695e7c8e29149543e4cf4d451cfe9ba038a6997a822e02f223045ac3a8ac25b99a1e847740fac4d9d5c0b5ce0c5d69d331d823bf8e4899"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ta-LK/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ta-LK/thunderbird-52.4.0.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "38e8a0370c8ea7c7b7936da47dea583dbd282eb0cbe504337ac9e35efaf67cb1e6e9d7220efec243581d7a04a19e4f6f78892fd1a84461b30035d01ab225920a"; + sha512 = "9c9b79cf21e64461b8a78dd0f7816346ada2cce0ef4bce4da291497c9fd1aa414c199d57265390e5b885828b1efa38f9883882870b84a5b3a64ffffb47da79e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/tr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/tr/thunderbird-52.4.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "053e0e6e88c92c6c8d398cb8c38d8ce9b1340c4ff4455a7c4b1225090d5d10387b8b14e6f71dfee2a159329478cada995f05b75986c6a57d01ae7c1e1a65772b"; + sha512 = "61a671ae2804b06143e636c9e8ae0badb460bf9cbb3555213bf43aa2d56b2a9f13ca3a13362f2a9b7ecafb4b03451093ea2f817a104cc7d4555e11b1ffb18103"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/uk/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/uk/thunderbird-52.4.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "98cabbbd8314ba80d74a0f3a9b17ee49aced8b5832f13e5b6060896dd9dee4abff8a15e1b509387254416f6e49652fcf797a1cb6934b7ae6f65909ba85a8e01d"; + sha512 = "629ede67d8bbfd6b1233d2030234fed7f99915045131caa11edce99b6e9c314b7cfd6ef457d26a0e628b525bb78c05426e8c078364ade5e606dfaba90200feee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/vi/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/vi/thunderbird-52.4.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "2937330459ec576ba9678c465bd5aea7cb536002574a23e3043363d562bee2d1c58de1a6a73870ee27e363b9a64b82ae2a483dd21e3b6fc3b28bdda5d8c349f5"; + sha512 = "728644651b7eff73be44bceccf8038bca79e020fbaad87d74fb1ff4856554766e6494e1e16a0d93187615f5f8cb663fc3233855d66e8cf0996fe597c9645273c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-CN/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-CN/thunderbird-52.4.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "80e640c07514c215f170606353a97b058fe2b6b8f03adeb1526d3f5e237cfe71123b945b82b00726b00101a11a3207930af622775e4a0b5c5f9c464aca34aad0"; + sha512 = "ef5a81e04ed973fd2ed576d1654f1ada7d9cefb6943bf604bee53053fedc4b2127c780ac2ff3c9b568813699f29f744950e899bc71733cd8d385368e1d0c07c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-TW/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-TW/thunderbird-52.4.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9ea9bb1121f3f1731d3e1748af70ebce153a7cdf8bc44034928f618e21f2c1c1ac50f13f2e42d42e3105fbabe7cbb919bf785de032b615b2a1e732700c436ad9"; + sha512 = "ddf5a00621d6916c6033f81589c9376a8aaba3bf12810a2fd41358af323d9f6354384a5b938f299855d27a1272d36e99ca3f45a8ab8299aa7afc118d942ae624"; } ]; } From 74406eb48f6c754f511905ce6772e2f50e4bc94c Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 7 Oct 2017 03:12:17 +0900 Subject: [PATCH 0774/2806] thunderbird: 52.3.0 -> 52.4.0 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 51d90d11707..2e1f8ed5070 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.3.0"; + version = "52.4.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "10e6495d207328aae325a797be1de5e535b5d967df929b0af9d7554d0473b5a7931c8f9cb1793e843b1913f441f790169dd4ac1ad9e0e53e66bc8e1c1dd60e66"; + sha512 = "6ac39cecca9e53b51754d7a8bd7cae228d197eb234b03a2386c16fd665f4f7a67f10bbdf981c20b3f7a21a5ef67e2771154a3dd9f249c6a884c48a9e59bcfc78"; }; # New sed no longer tolerates this mistake. From f77fb64c1eca88ba77ddedec73a7bf5a24a577eb Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Fri, 6 Oct 2017 14:32:31 -0400 Subject: [PATCH 0775/2806] lnav: add platforms metadata so hydra builds on darwin --- pkgs/tools/misc/lnav/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 136951cb7bc..5ab05c92135 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { license = licenses.bsd2; version = "0.8.2"; maintainers = [ maintainers.dochang ]; + platforms = platforms.unix; }; } From ee6d469ee96ff1e5dc930f4cabd8c49e602d39f0 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Fri, 6 Oct 2017 12:05:30 -0700 Subject: [PATCH 0776/2806] plantuml: 8047 -> 1.2017.16 --- pkgs/tools/misc/plantuml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index f15c452c955..1b690c04172 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "8047"; + version = "1.2017.16"; name = "plantuml-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar"; - sha256 = "11a1qchalymvc7qn9kqxamp8qm8fljpnxmfi4zs8sg75nzddjnlm"; + url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; + sha256 = "a3d319ed54ed78ce3cf7bfcfe76ffc5aa6ed28a72b5aa575fe9125e0c6bd985c"; }; # It's only a .jar file and a shell wrapper From 6118ace4d570e08d16a2c9c4a34d957ae53ce963 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 6 Oct 2017 21:25:22 +0200 Subject: [PATCH 0777/2806] postgresql: enable all platforms on hydra --- pkgs/servers/sql/postgresql/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 8a3097ae9de..9d62228dd37 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -85,7 +85,6 @@ let license = licenses.postgresql; maintainers = [ maintainers.ocharles ]; platforms = platforms.unix; - hydraPlatforms = platforms.linux; }; }); From b82fbeef683a9d8c3b52bf7eed3dd1db99e55ba9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 4 Oct 2017 16:33:21 -0500 Subject: [PATCH 0778/2806] radiotray-ng: init at 0.1.7 Use patch from upstream to fix menu separators. Tested execution using 'nix-shell --pure -p radiotray-ng' and added dependencies until that didn't crash. Seems to work outside as well, but hopefully fixes problems for others. --- .../audio/radiotray-ng/default.nix | 96 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 98 insertions(+) create mode 100644 pkgs/applications/audio/radiotray-ng/default.nix diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix new file mode 100644 index 00000000000..4bc9371dd17 --- /dev/null +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -0,0 +1,96 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, cmake, pkgconfig +# Transport +, curl +# Libraries +, boost +, jsoncpp +, libbsd +, pcre +# GUI/Desktop +, dbus +, glibmm +, gnome3 +, hicolor_icon_theme +, libappindicator-gtk3 +, libnotify +, libxdg_basedir +# GStreamer +, gst_all_1 +# User-agent info +, lsb-release +# rt2rtng +, python2 +# Testing +, gmock +# Fixup +, wrapGAppsHook +, makeWrapper +}: + +let + gstInputs = with gst_all_1; [ + gstreamer gst-plugins-base + gst-plugins-good gst-plugins-bad gst-plugins-ugly + gst-libav + ]; + # For the rt2rtng utility for converting bookmark file to -ng format + pythonInputs = with python2.pkgs; [ python2 lxml ]; +in +stdenv.mkDerivation rec { + name = "radiotray-ng-${version}"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "ebruck"; + repo = "radiotray-ng"; + rev = "v${version}"; + sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv"; + }; + + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; + + buildInputs = [ + curl + boost jsoncpp libbsd pcre + glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify + libxdg_basedir + lsb-release + ] ++ stdenv.lib.optional doCheck gmock + ++ gstInputs + ++ pythonInputs; + + prePatch = '' + substituteInPlace debian/CMakeLists.txt \ + --replace /usr $out + substituteInPlace include/radiotray-ng/common.hpp \ + --replace /usr $out + ''; + + patches = [ + (fetchpatch { + # Fix menu separators and minor touchup to 'version' + url = "https://github.com/ebruck/radiotray-ng/commit/827e9f1baaa03ab4d8a5fb3aab043e72950eb965.patch"; + sha256 = "1aykl6lq4pga34xg5r9mc616gxnd63q6gr8qzg57w6874cj3csrr"; + }) + ]; + + enableParallelBuilding = true; + + doCheck = true; + + checkPhase = "ctest"; + + preFixup = '' + gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]}) + wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH + ''; + + meta = with stdenv.lib; { + description = "An internet radio player for linux"; + homepage = https://github.com/ebruck/radiotray-ng; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8582966e81d..f1875016dba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16187,6 +16187,8 @@ with pkgs; renoise = callPackage ../applications/audio/renoise {}; + radiotray-ng = callPackage ../applications/audio/radiotray-ng { }; + rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; From d473ef2ed2aa00e7c358ba4b64822057c4b6573f Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Thu, 5 Oct 2017 15:45:38 -0400 Subject: [PATCH 0779/2806] openssh: 7.5p1 -> 7.6p1 Release notes are available at https://www.openssh.com/txt/release-7.6. Mostly a bugfix release, no major backwards-incompatible changes. --- pkgs/tools/networking/openssh/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8343f23a1a0..037bb07922b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -13,11 +13,11 @@ assert withGssapiPatches -> withKerberos; let # **please** update this patch when you update to a new openssh release. - gssapiSrc = fetchpatch { + gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" - + "/patches/gssapi.patch?id=db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92"; - sha256 = "1rw10pmvjw55521ys59x1kabvbvmla506znakwwjijggdsakvsjm"; + + "/patches/gssapi.patch?id=1e0d55f9163793742d20eaadd4784db16fd3459d"; + sha256 = "130phj87q87p9crigd6852nnaqsqkfg09h45a32lk4524h9kkxgb"; }; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # Please ensure that openssh_with_kerberos still builds when # bumping the version here! name = "openssh-${version}"; - version = "7.5p1"; + version = if hpnSupport then "7.5p1" else "7.6p1"; src = if hpnSupport then fetchurl { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { else fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"; + sha256 = "08qpsb8mrzcx8wgvz9insiyvq7sbg26yj5nvl2m5n57yvppcl8x3"; }; patches = @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] - ++ optional withGssapiPatches gssapiSrc; + ++ optional withGssapiPatches gssapiPatch; postPatch = # On Hydra this makes installation fail (sometimes?), From 7637cb884c3f38ca61c38741a52d002321ba91f8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Jul 2017 06:45:28 -0500 Subject: [PATCH 0780/2806] bloaty: 2016-12-28 -> 2017-10-05 * use fetchFromGitHub now that it supports submodules * change version style to dashes per guidelines (https://nixos.org/nixpkgs/manual/#sec-package-naming) * cmake * prefer substituteInPlace * run tests --- pkgs/development/tools/bloaty/default.nix | 25 +++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 8970f7a86d1..e61b7f78302 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,22 +1,31 @@ -{ stdenv, binutils, fetchgit }: +{ stdenv, binutils, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2016.12.28"; + version = "2017-10-05"; name = "bloaty-${version}"; - src = fetchgit { - url = "https://github.com/google/bloaty.git"; - rev = "2234386bcee7297dfa1b6d8a5d20f95ea4ed9bb0"; - sha256 = "0cfsjgbp9r16d6qi8v4k609bbhjff4vhdiapfkhr34z1cik1md4l"; + src = fetchFromGitHub { + owner = "google"; + repo = "bloaty"; + rev = "e47b21b01ceecf001e1965e9da249d48d86a1749"; + sha256 = "1il3z49hi0b07agjwr5fg1wzysfxsamfv1snvlp33vrlyl1m7cbm"; fetchSubmodules = true; }; + nativeBuildInputs = [ cmake ]; + enableParallelBuilding = true; - configurePhase = '' - sed -i 's,c++filt,${binutils}/bin/c++filt,' src/bloaty.cc + preConfigure = '' + substituteInPlace src/bloaty.cc \ + --replace "c++filt" \ + "${stdenv.lib.getBin binutils}/bin/c++filt" ''; + doCheck = true; + + checkPhase = "ctest"; + installPhase = '' install -Dm755 {.,$out/bin}/bloaty ''; From 96874c6e719dbe8c53cc1dea832f7e1866297a24 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 6 Oct 2017 13:55:44 -0700 Subject: [PATCH 0781/2806] Resurrect pandas 0.17.1 --- .../python-modules/scipy/0.17.1.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 55 ++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 pkgs/development/python-modules/scipy/0.17.1.nix diff --git a/pkgs/development/python-modules/scipy/0.17.1.nix b/pkgs/development/python-modules/scipy/0.17.1.nix new file mode 100644 index 00000000000..fea8a05bca1 --- /dev/null +++ b/pkgs/development/python-modules/scipy/0.17.1.nix @@ -0,0 +1,56 @@ +{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, numpy}: + +buildPythonPackage rec { + pname = "scipy"; + version = "0.17.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; + sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w"; + }; + + buildInputs = [ gfortran nose numpy.blas ]; + propagatedBuildInputs = [ numpy ]; + + # Remove tests because of broken wrapper + prePatch = '' + rm scipy/linalg/tests/test_lapack.py + ''; + + preConfigure = '' + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES + ''; + + preBuild = '' + echo "Creating site.cfg file..." + cat << EOF > site.cfg + [openblas] + include_dirs = ${numpy.blas}/include + library_dirs = ${numpy.blas}/lib + EOF + ''; + + enableParallelBuilding = true; + + checkPhase = '' + runHook preCheck + pushd dist + ${python.interpreter} -c 'import scipy; scipy.test("fast", verbose=10)' + popd + runHook postCheck + ''; + + passthru = { + blas = numpy.blas; + }; + + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + + meta = { + description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; + homepage = http://www.scipy.org/; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a10f4e9830a..4a34b22482e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14990,6 +14990,59 @@ in { pandas = callPackage ../development/python-modules/pandas { }; + pandas_17 = let + inherit (pkgs.stdenv.lib) optional optionalString; + inherit (pkgs.stdenv) isDarwin; + in buildPythonPackage rec { + name = "pandas-${version}"; + version = "0.17.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; + sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; + }; + + buildInputs = with self; [ nose ] ++ optional isDarwin pkgs.libcxx; + propagatedBuildInputs = with self; [ + dateutil + scipy_0_17 + numexpr + pytz + xlrd + bottleneck + sqlalchemy + lxml + html5lib +# modules.sqlite3 + beautifulsoup4 + ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command + + # For OSX, we need to add a dependency on libcxx, which provides + # `complex.h` and other libraries that pandas depends on to build. + patchPhase = optionalString isDarwin '' + cpp_sdk="${pkgs.libcxx}/include/c++/v1"; + echo "Adding $cpp_sdk to the setup.py common_include variable" + substituteInPlace setup.py \ + --replace "['pandas/src/klib', 'pandas/src']" \ + "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" + + # disable clipboard tests since pbcopy/pbpaste are not open source + substituteInPlace pandas/io/tests/test_clipboard.py \ + --replace pandas.util.clipboard no_such_module \ + --replace OSError ImportError + ''; + + doCheck = false; + + meta = { + homepage = "http://pandas.pydata.org/"; + description = "Python Data Analysis Library"; + license = licenses.bsd3; + maintainers = with maintainers; [ raskin fridh ]; + platforms = platforms.unix; + }; + }; + xlrd = buildPythonPackage rec { name = "xlrd-${version}"; @@ -19348,6 +19401,8 @@ in { scipy = callPackage ../development/python-modules/scipy { }; + scipy_0_17 = callPackage ../development/python-modules/scipy/0.17.1.nix { }; + scikitimage = buildPythonPackage rec { name = "scikit-image-${version}"; version = "0.12.3"; From cbf5307020b4a0a473e3ca4232ebb66ce0d60bec Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 6 Oct 2017 20:23:12 +0000 Subject: [PATCH 0782/2806] ocamlPackages.biniou: 1.0.9 -> 1.2.0 --- pkgs/development/ocaml-modules/biniou/1.0.nix | 36 ++++++++++++++ .../ocaml-modules/biniou/default.nix | 48 ++++++++----------- pkgs/top-level/ocaml-packages.nix | 5 +- 3 files changed, 59 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/ocaml-modules/biniou/1.0.nix diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix new file mode 100644 index 00000000000..d2d3159cde1 --- /dev/null +++ b/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, ocaml, findlib, easy-format}: +let + pname = "biniou"; + version = "1.0.9"; + webpage = "http://mjambon.com/${pname}.html"; +in + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; + +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb"; + }; + + buildInputs = [ ocaml findlib easy-format ]; + + createFindlibDestdir = true; + + makeFlags = "PREFIX=$(out)"; + + preBuild = '' + mkdir $out/bin + ''; + + meta = with stdenv.lib; { + description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + homepage = "${webpage}"; + license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + platforms = ocaml.meta.platforms or []; + }; +} diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index d2d3159cde1..7047edf24b3 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,36 +1,26 @@ -{stdenv, fetchurl, ocaml, findlib, easy-format}: -let - pname = "biniou"; - version = "1.0.9"; - webpage = "http://mjambon.com/${pname}.html"; -in - -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }: stdenv.mkDerivation rec { + version = "1.2.0"; + name = "ocaml${ocaml.version}-biniou-${version}"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "biniou"; + rev = "v${version}"; + sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; + }; - name = "${pname}-${version}"; + buildInputs = [ ocaml findlib jbuilder ]; - src = fetchurl { - url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; - sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb"; - }; + propagatedBuildInputs = [ easy-format ]; - buildInputs = [ ocaml findlib easy-format ]; + inherit (jbuilder) installPhase; - createFindlibDestdir = true; - - makeFlags = "PREFIX=$(out)"; - - preBuild = '' - mkdir $out/bin - ''; - - meta = with stdenv.lib; { - description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - homepage = "${webpage}"; - license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; - }; + meta = { + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.bsd3; + }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e45256bd3dc..275c0739ce6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -114,7 +114,10 @@ let benchmark = callPackage ../development/ocaml-modules/benchmark { }; - biniou = callPackage ../development/ocaml-modules/biniou { }; + biniou = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/biniou { } + else callPackage ../development/ocaml-modules/biniou/1.0.nix { }; bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; From 5728b8d4e6f9d0ec2c2f5f843781b4626fe948c8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 6 Oct 2017 20:24:49 +0000 Subject: [PATCH 0783/2806] coqPackages.coquelicot: 2.1.2 -> 3.0.1 coqPackages.interval: 3.1.1 -> 3.3.0 --- .../coq-modules/coquelicot/default.nix | 12 ++++++------ .../coq-modules/interval/default.nix | 18 +++++++++++++++--- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index a81b76849bc..6f58c387586 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,15 +7,15 @@ let param = url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz; sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km"; }; - v2_1_2 = { - version = "2.1.2"; - url = https://gforge.inria.fr/frs/download.php/file/36320/coquelicot-2.1.2.tar.gz; - sha256 = "09q9xbzyndx8i68hn3ir4pmzgqd1q33qpk3xghf2l849g8w3q5an"; + v3_0_1 = { + version = "3.0.1"; + url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz"; + sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r"; }; in { "8.4" = v2_1_1; - "8.5" = v2_1_2; - "8.6" = v2_1_2; + "8.5" = v3_0_1; + "8.6" = v3_0_1; }."${coq.coq-version}"; in stdenv.mkDerivation { diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index c3169970ad2..a8d3f9ad144 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,11 +1,23 @@ { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }: +let param = + if stdenv.lib.versionAtLeast coq.coq-version "8.5" + then { + version = "3.3.0"; + url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; + sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; + } else { + version = "3.1.1"; + url = "https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz"; + sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; + }; +in + stdenv.mkDerivation { - name = "coq${coq.coq-version}-interval-3.1.1"; + name = "coq${coq.coq-version}-interval-${param.version}"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz; - sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; + inherit (param) url sha256; }; nativeBuildInputs = [ which ]; From 662f82aee834e7ee97148ec159fc9ab9c1033372 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 7 Oct 2017 00:48:51 +0200 Subject: [PATCH 0784/2806] zfs, spl: 0.7.1 -> 0.7.2 --- pkgs/os-specific/linux/spl/default.nix | 4 ++-- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index cd0c283edbb..75fbacfb90e 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -63,8 +63,8 @@ in assert buildKernel -> kernel != null; { splStable = common { - version = "0.7.1"; - sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n"; + version = "0.7.2"; + sha256 = "10rq0npjlp09xjdgn9lc3wm310dqc71j0wgxwj92ncf9r61zf445"; }; splUnstable = common { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6ab9063d719..1fcb1720230 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -138,9 +138,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.1"; + version = "0.7.2"; - sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n"; + sha256 = "1dl6i4sg7z0k4p1dmfcm9arx62x30lqsr9hycvhhs3pf58ks8z2v"; extraPatches = [ (fetchpatch { From 8840eaf223e41339b3d36d960f44ba8443c839c0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 6 Oct 2017 18:49:58 -0400 Subject: [PATCH 0785/2806] keybase: Fix modules --- nixos/modules/services/network-filesystems/kbfs.nix | 1 + nixos/modules/services/networking/keybase.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixos/modules/services/network-filesystems/kbfs.nix index cf1d7617cca..8b972ba971e 100644 --- a/nixos/modules/services/network-filesystems/kbfs.nix +++ b/nixos/modules/services/network-filesystems/kbfs.nix @@ -55,6 +55,7 @@ in { Restart = "on-failure"; PrivateTmp = true; }; + wantedBy = [ "default.target" ]; }; services.keybase.enable = true; diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix index ca5c279ac6f..7c7982ee8ea 100644 --- a/nixos/modules/services/networking/keybase.nix +++ b/nixos/modules/services/networking/keybase.nix @@ -28,11 +28,12 @@ in { description = "Keybase service"; serviceConfig = { ExecStart = '' - ${pkgs.keybase}/bin/keybase service + ${pkgs.keybase}/bin/keybase -d service --auto-forked ''; Restart = "on-failure"; PrivateTmp = true; }; + wantedBy = [ "default.target" ]; }; environment.systemPackages = [ pkgs.keybase ]; From b02b224027320d6e33483647538af9f4bd96dea5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 7 Oct 2017 00:50:44 +0200 Subject: [PATCH 0786/2806] postgresql100: init at 10.0 --- pkgs/servers/sql/postgresql/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 9d62228dd37..cf3349dc166 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -114,4 +114,10 @@ in { sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6"; }; + postgresql100 = common { + version = "10.0"; + psqlSchema = "10.0"; + sha256 = "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi"; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a6037f67a9..a9efda62713 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11778,7 +11778,8 @@ with pkgs; postgresql93 postgresql94 postgresql95 - postgresql96; + postgresql96 + postgresql100; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; From 3df126dbf742f984b226f974ecfa649c70eb634e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 7 Oct 2017 01:39:25 +0200 Subject: [PATCH 0787/2806] nixos/modules: clean up wireless firmware options All available options were just enabling hardware.enableRedistributableFirmware. There were nix files without modules which weren't referenced anywhere. --- nixos/modules/hardware/network/intel-2030.nix | 3 -- .../modules/hardware/network/intel-2100bg.nix | 30 ------------------- .../hardware/network/intel-3945abg.nix | 29 ------------------ .../hardware/network/intel-4965agn.nix | 3 -- nixos/modules/hardware/network/intel-5000.nix | 3 -- nixos/modules/hardware/network/intel-5150.nix | 3 -- nixos/modules/hardware/network/intel-6000.nix | 3 -- .../hardware/network/intel-6000g2a.nix | 3 -- .../hardware/network/intel-6000g2b.nix | 3 -- nixos/modules/hardware/network/ralink.nix | 26 ---------------- nixos/modules/hardware/network/rtl8192c.nix | 26 ---------------- nixos/modules/installer/scan/detected.nix | 5 ++-- nixos/modules/module-list.nix | 5 ---- nixos/modules/rename.nix | 6 +++- 14 files changed, 7 insertions(+), 141 deletions(-) delete mode 100644 nixos/modules/hardware/network/intel-2030.nix delete mode 100644 nixos/modules/hardware/network/intel-2100bg.nix delete mode 100644 nixos/modules/hardware/network/intel-3945abg.nix delete mode 100644 nixos/modules/hardware/network/intel-4965agn.nix delete mode 100644 nixos/modules/hardware/network/intel-5000.nix delete mode 100644 nixos/modules/hardware/network/intel-5150.nix delete mode 100644 nixos/modules/hardware/network/intel-6000.nix delete mode 100644 nixos/modules/hardware/network/intel-6000g2a.nix delete mode 100644 nixos/modules/hardware/network/intel-6000g2b.nix delete mode 100644 nixos/modules/hardware/network/ralink.nix delete mode 100644 nixos/modules/hardware/network/rtl8192c.nix diff --git a/nixos/modules/hardware/network/intel-2030.nix b/nixos/modules/hardware/network/intel-2030.nix deleted file mode 100644 index c92b7a0509d..00000000000 --- a/nixos/modules/hardware/network/intel-2030.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-2100bg.nix b/nixos/modules/hardware/network/intel-2100bg.nix deleted file mode 100644 index 0ec81474ad3..00000000000 --- a/nixos/modules/hardware/network/intel-2100bg.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - networking.enableIntel2100BGFirmware = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - Turn on this option if you want firmware for the Intel - PRO/Wireless 2100BG to be loaded automatically. This is - required if you want to use this device. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.networking.enableIntel2100BGFirmware { - - hardware.enableRedistributableFirmware = true; - - }; - -} diff --git a/nixos/modules/hardware/network/intel-3945abg.nix b/nixos/modules/hardware/network/intel-3945abg.nix deleted file mode 100644 index 27a3f228b7d..00000000000 --- a/nixos/modules/hardware/network/intel-3945abg.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - networking.enableIntel3945ABGFirmware = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - This option enables automatic loading of the firmware for the Intel - PRO/Wireless 3945ABG. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.networking.enableIntel3945ABGFirmware { - - hardware.enableRedistributableFirmware = true; - - }; - -} diff --git a/nixos/modules/hardware/network/intel-4965agn.nix b/nixos/modules/hardware/network/intel-4965agn.nix deleted file mode 100644 index c92b7a0509d..00000000000 --- a/nixos/modules/hardware/network/intel-4965agn.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-5000.nix b/nixos/modules/hardware/network/intel-5000.nix deleted file mode 100644 index c92b7a0509d..00000000000 --- a/nixos/modules/hardware/network/intel-5000.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-5150.nix b/nixos/modules/hardware/network/intel-5150.nix deleted file mode 100644 index c92b7a0509d..00000000000 --- a/nixos/modules/hardware/network/intel-5150.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-6000.nix b/nixos/modules/hardware/network/intel-6000.nix deleted file mode 100644 index c92b7a0509d..00000000000 --- a/nixos/modules/hardware/network/intel-6000.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-6000g2a.nix b/nixos/modules/hardware/network/intel-6000g2a.nix deleted file mode 100644 index c92b7a0509d..00000000000 --- a/nixos/modules/hardware/network/intel-6000g2a.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-6000g2b.nix b/nixos/modules/hardware/network/intel-6000g2b.nix deleted file mode 100644 index c92b7a0509d..00000000000 --- a/nixos/modules/hardware/network/intel-6000g2b.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/ralink.nix b/nixos/modules/hardware/network/ralink.nix deleted file mode 100644 index 36182e2cb99..00000000000 --- a/nixos/modules/hardware/network/ralink.nix +++ /dev/null @@ -1,26 +0,0 @@ -{pkgs, config, lib, ...}: - -{ - - ###### interface - - options = { - - networking.enableRalinkFirmware = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - Turn on this option if you want firmware for the RT73 NIC. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.networking.enableRalinkFirmware { - hardware.enableRedistributableFirmware = true; - }; - -} diff --git a/nixos/modules/hardware/network/rtl8192c.nix b/nixos/modules/hardware/network/rtl8192c.nix deleted file mode 100644 index bf328c2d322..00000000000 --- a/nixos/modules/hardware/network/rtl8192c.nix +++ /dev/null @@ -1,26 +0,0 @@ -{pkgs, config, lib, ...}: - -{ - - ###### interface - - options = { - - networking.enableRTL8192cFirmware = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - Turn on this option if you want firmware for the RTL8192c (and related) NICs. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.networking.enableRTL8192cFirmware { - hardware.enableRedistributableFirmware = true; - }; - -} diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix index e72c7853294..7e181acb93b 100644 --- a/nixos/modules/installer/scan/detected.nix +++ b/nixos/modules/installer/scan/detected.nix @@ -6,8 +6,7 @@ with lib; { config = mkDefault { - # Wireless card firmware - networking.enableIntel2200BGFirmware = true; - networking.enableIntel3945ABGFirmware = true; + # Common firmware, i.e. for wifi cards + hardware.enableRedistributableFirmware = true; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ac7e5b52d6..30d35af9e44 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -35,11 +35,6 @@ ./hardware/ksm.nix ./hardware/mcelog.nix ./hardware/network/b43.nix - ./hardware/network/intel-2100bg.nix - ./hardware/network/intel-2200bg.nix - ./hardware/network/intel-3945abg.nix - ./hardware/network/ralink.nix - ./hardware/network/rtl8192c.nix ./hardware/nitrokey.nix ./hardware/opengl.nix ./hardware/pcmcia.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index deff4067957..b1b3f67a41d 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -11,7 +11,11 @@ with lib; (mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]) (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]) - (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] From 3855b7977c3f987d6c09bc809e33073d64956f72 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 7 Oct 2017 01:42:52 +0200 Subject: [PATCH 0788/2806] nixos: clean up kernel modules * the keyboard modules in all-hardware.nix are already defaults of boot.initrd.availableKernelModules * ide modules, hid_lenovo_tpkbd and scsi_wait_scan have been removed because they're not available anymore * i8042 was a duplicate (see few lines abowe) --- nixos/modules/profiles/all-hardware.nix | 5 +---- nixos/modules/system/boot/kernel.nix | 17 +---------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 6e6ae98e19f..3c7e516c497 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -41,15 +41,12 @@ # Virtio (QEMU, KVM etc.) support. "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console" - + # VMware support. "mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock" # Hyper-V support. "hv_storvsc" - - # Keyboards - "usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" ]; # Include lots of firmware. diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index cf70a891c0c..4db9631743e 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -193,11 +193,6 @@ in "sd_mod" "sr_mod" - # Standard IDE stuff. - "ide_cd" - "ide_disk" - "ide_generic" - # SD cards and internal eMMC drives. "mmc_block" @@ -211,21 +206,11 @@ in "xhci_hcd" "xhci_pci" "usbhid" - "hid_generic" "hid_lenovo" - "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" + "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" # Misc. keyboard stuff. "pcips2" "atkbd" "i8042" - # Temporary fix for https://github.com/NixOS/nixpkgs/issues/18451 - # Remove as soon as upstream gets fixed - marking it: - # TODO - # FIXME - "i8042" - - # To wait for SCSI devices to appear. - "scsi_wait_scan" - # Needed by the stage 2 init script. "rtc_cmos" ]; From 5b530d4568158d9ac99ad70cd9684d7f263a6e13 Mon Sep 17 00:00:00 2001 From: David Johnson Date: Fri, 6 Oct 2017 16:52:22 -0700 Subject: [PATCH 0789/2806] oauth2_proxy: default address updated Go will fail to parse this otherwise. https://github.com/golang/go/issues/19297 --- nixos/modules/services/security/oauth2_proxy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 3e5087766b1..ef48d52e7a9 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -385,7 +385,7 @@ in httpAddress = mkOption { type = types.str; - default = "127.0.0.1:4180"; + default = "http://127.0.0.1:4180"; description = '' HTTPS listening address. This module does not expose the port by default. If you want this URL to be accessible to other machines, please From 68d811cede1475a9dafb19c4ae229d6199dfba56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 6 Oct 2017 21:25:14 -0300 Subject: [PATCH 0790/2806] numix-gtk-theme: 2017-07-26 -> 2.6.7 --- pkgs/misc/themes/numix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index 4e1963536a8..233a73df868 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2017-07-26"; + version = "2.6.7"; name = "numix-gtk-theme-${version}"; src = fetchFromGitHub { repo = "numix-gtk-theme"; owner = "numixproject"; - rev = "858e6292c4336302be4d499c9b085a891b4c3b40"; - sha256 = "1z9l13px79yk42874dlh8z6p7chlngwarfnki89win3g2xvclz8q"; + rev = version; + sha256 = "1fmlc6vi8prvwsq0nxxcd00lp04bwmapzjqf727wb1czqf2lf0dv"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; From 121919d363afb6f28c314f249d4bbe78d9739bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 6 Oct 2017 21:59:00 -0300 Subject: [PATCH 0791/2806] elementary-icon-theme: 4.2.0 -> 4.3.0 --- pkgs/data/icons/elementary-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 0a0ff4263ec..75ea3360919 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.3.0"; package-name = "elementary-icon-theme"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; - sha256 = "0w1l9hlih4ddkdjpha5lsyf6iagv436nhm4aphak8w8jyycg81bm"; + sha256 = "1gg7znfgyj4zxsa741psc67nyixi27q9ghjklz0337r4cwmcwn1g"; }; dontBuild = true; From 241cb4ed03cb4daee940bc7d26bd7bf73f18b8c6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 7 Oct 2017 01:03:03 +0200 Subject: [PATCH 0792/2806] aespipe: 2.4d -> 2.5e --- pkgs/tools/security/aespipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index aefd6b7500c..c67c758b933 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "aespipe-${version}"; - version = "2.4d"; + version = "2.4e"; src = fetchurl { url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2"; - sha256 = "03z5i41xv6p3m79lm04d7msda8878lsppv3324zbjjfy19p6bkn5"; + sha256 = "0fmr0vk408bf13jydhdmcdhqw31yc9qk329bs9i60alccywapmds"; }; meta = { From 0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 7 Oct 2017 01:06:34 +0200 Subject: [PATCH 0793/2806] apacheHttpd: 2.4.27 -> 2.4.28 --- pkgs/servers/http/apache-httpd/2.4.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index ecf9ee9d84a..93fe205a8f9 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -5,7 +5,6 @@ , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 , luaSupport ? false, lua5 -, fetchpatch }: let optional = stdenv.lib.optional; @@ -17,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.27"; + version = "2.4.28"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc"; + sha256 = "c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666"; }; # FIXME: -dev depends on -doc @@ -40,15 +39,6 @@ stdenv.mkDerivation rec { sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" ''; - patches = [ - (fetchpatch { - name = "CVE-2017-9798.patch"; - url = "https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch"; - sha256 = "00hbq5szgav91kwsc30jdjvgd3vbgm8n198yna8bcs33p434v25k"; - stripLen = 3; - }) - ]; - # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; From c559e96445412e25db8d9b26e4c7237da15fb9e6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 7 Oct 2017 03:31:25 +0200 Subject: [PATCH 0794/2806] btrfs-progs_4_4_1: remove, snapper works with latest --- pkgs/tools/filesystems/btrfs-progs/4.4.1.nix | 31 -------------------- pkgs/top-level/all-packages.nix | 6 +--- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/tools/filesystems/btrfs-progs/4.4.1.nix diff --git a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix deleted file mode 100644 index afafa4ec174..00000000000 --- a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt -}: - -let version = "4.4.1"; in - -stdenv.mkDerivation rec { - name = "btrfs-progs-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"; - }; - - buildInputs = [ - pkgconfig attr acl zlib libuuid e2fsprogs lzo - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt - ]; - - # gcc bug with -O1 on ARM with gcc 4.8 - # This should be fine on all platforms so apply universally - patchPhase = "sed -i s/-O1/-O2/ configure"; - - meta = with stdenv.lib; { - description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ nckx raskin wkennington ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9efda62713..c34d03f3269 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -781,7 +781,6 @@ with pkgs; bsod = callPackage ../misc/emulators/bsod { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; - btrfs-progs_4_4_1 = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { }; btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; @@ -16472,10 +16471,7 @@ with pkgs; smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - snapper = callPackage ../tools/misc/snapper { - btrfs-progs = btrfs-progs_4_4_1; - stdenv = overrideCC stdenv gcc5; - }; + snapper = callPackage ../tools/misc/snapper { }; snd = callPackage ../applications/audio/snd { }; From 801c920e95642ec663d4aa486c81e5443e25b182 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 7 Oct 2017 03:31:59 +0200 Subject: [PATCH 0795/2806] btrfs-progs: 4.8.2 -> 4.13.1 --- .../modules/installer/tools/nixos-generate-config.pl | 12 ++++-------- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 4ec48b77335..97a30634dc7 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -398,19 +398,15 @@ EOF # Is this a btrfs filesystem? if ($fsType eq "btrfs") { - my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint"); - if ($status != 0 || join("", @id_info) =~ /ERROR:/) { + my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); + if ($status != 0 || join("", @info) =~ /ERROR:/) { die "Failed to retrieve subvolume info for $mountPoint\n"; } - my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/; + my @ids = join("", @info) =~ m/Subvolume ID:[ \t\n]*([0-9]*)/; if ($#ids > 0) { die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" } elsif ($#ids == 0) { - my ($status, @path_info) = runCommand("btrfs subvol list $rootDir$mountPoint"); - if ($status != 0) { - die "Failed to find $mountPoint subvolume id from btrfs\n"; - } - my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/; + my @paths = join("", @info) =~ m/^([^\n]*)/; if ($#paths > 0) { die "Btrfs returned multiple paths for a single subvolume id, mountpoint $mountPoint\n"; } elsif ($#paths != 0) { diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index d9b01eb5239..7e575812609 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.8.2"; in +let version = "4.13.1"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; + sha256 = "1clavvrlkswgicqsm2yfsxqw04lsn8dra0db84jqm6j2apz80kz0"; }; buildInputs = [ From 7d9ee29f2445ef9e1e89f3bf33c739c4d3537674 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 7 Oct 2017 03:32:23 +0200 Subject: [PATCH 0796/2806] btrbk: 0.24.0 -> 0.25.1 --- pkgs/tools/backup/btrbk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ff542e781a6..f9feaf40ec2 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "btrbk-${version}"; - version = "0.24.0"; + version = "0.25.1"; src = fetchurl { url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "01jrlswly28h4q4r3qfrzadz0pf0ms6wynmqhwddj1ahj31729h3"; + sha256 = "02qc9vbd5l0ywnv01p60v9q3dcx2z92dfaf95qf7ccxqaa9zxfr5"; }; patches = [ From 4fdd225002789d870a4f43e532eccb4592eaaa08 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 7 Oct 2017 04:48:29 +0200 Subject: [PATCH 0797/2806] twolame: fix evaluation, platforms list must be flattened --- pkgs/development/libraries/twolame/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index 54ba8470fc5..a65254fea24 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.twolame.org/; license = with licenses; [ lgpl2Plus ]; - platforms = with platforms; [ unix ]; + platforms = with platforms; unix; maintainers = with maintainers; [ AndersonTorres ]; }; } From 916f6583a9f7952230737b7ef29b3e4b05f148f1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 7 Oct 2017 11:47:36 +0800 Subject: [PATCH 0798/2806] firefox-bin: 56.0 -> 56.0.1 --- .../browsers/firefox-bin/release_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 20033e18240..095d4fbd946 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,955 +1,955 @@ { - version = "56.0"; + version = "56.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ach/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ach/firefox-56.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "5e91b737751e62f34d2d138956c115120993cd6e8f4f86b7e59dbbcd38f6dc30f7550cac45d3a8ed866cf24c566d042c4ca43bf1e14c8f8452db428a78d167a0"; + sha512 = "8c6f9261a614b353e20b2b4a07f21eae8aa86cde092544ca924c5501bed8b4c26d8a1dcc2abd91c57704ba3c99b43014483c8f58a0aba2e0d515d8de2df93682"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/af/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/af/firefox-56.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7e523a24713b84e182ac060562827778d99d9c6125410ba9dffc151e53fa87774943a4dd3ce2c4afc9d17340ab08fd951832af35d5715d143303dbc94bf95d87"; + sha512 = "826b056547856e7a18b7e352123462491850d10699cd33b9dac696cbe3112aea3fc445db77f1f10392ac56f400967f9b4de6433d9d24f3e756b1edffa72259cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/an/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/an/firefox-56.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "410b11e1bf797a5bbde80fdca6ec0b223e5fb4404441636b633379d42c1bf337faf00f70ac71da2b44c71ef9a1e7fe9aaea0e71184640d5e5f20335d46b9ae03"; + sha512 = "7bc420dbea0fd02c1ba03b6e4f8b17a9bf053dbebc2a9a91a07a725299f0b976eaeff55f3918a7dfd30828d47d02e266e3eebdbd4a431a5fbff9e066d6065604"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ar/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ar/firefox-56.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "82b390cb188629f0942c8c23db1c84a377ee6e6046add935faa036c93d7d0e9da50ffdb6f7bd0cee540781fd05fd28e9f5799c6970607e412659a625f850d262"; + sha512 = "2dd2226eb5318e42d54a03eb51c0929b18431661e567ad8524a1229445ac399e2dabd63e4abde3af5eeeca6ffbccae37c38b31f5a35c6828de297538216310b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/as/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/as/firefox-56.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "d321a7b25d3b06ae356ce875b10d42082ada5673ed73edea419a1b021853fc7079c356d8e7a352b248d470bff90adc0ccfdbcfbd886945c219106bfb00b47931"; + sha512 = "5616393b8a26383b24113f6b14c95dc96a9d1ec5778995325e48284e1299a4eceb4715e2488570c1ccbac3f38c286efb65afeb128d3489320dfebb86d32fd6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ast/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ast/firefox-56.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "9ea303a429ce7e3c33e306c5c3cf9e8ba30e9c1441b8beddf3480a488fc99fc95f996f3b38763c04539f9438bdecafb77fa019d4b3a81edbcafd024d4afbe32c"; + sha512 = "84105f28470ca3b173ef7d569942243f206e8d438e76166ed0ddd9b4d08e3d725447d44a846132a9fdefcfb35a869f0d765732e9662b4513f3da0aee8fdc93ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/az/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/az/firefox-56.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "6fd4196be196b6770635499c1f4eac4b3b1f67073c8a4c2d78fa89bb50ddf64248e8722bcf2367987bd8eddac93663f7f75790985afd39e1399b71121e73f26f"; + sha512 = "05c402cd86b8b133487e012f1abb4ccab4a90756415fa9f7421e8a50482bf2fa853034d4f779120b6d8fb9c124df2f16b9a4ef65d3eb38698db90d612da58f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/be/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/be/firefox-56.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "3be882b52db840e9d16976a8596877b1266e83bf1523e32467ba914a1295dccd5b578368bd19eb6a2c864a34e0deb06d75ac798b65e8d4216923c9e60826f0ee"; + sha512 = "fa1135d28c23475a0184336067bbcfcdf7b707b5424896b9a0766fefc92a8f5fafd4e50ed0064f8e4acf698738672b089c284fb427ab6db2ffce63baadbce3d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bg/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bg/firefox-56.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f5e04004f3ae5944e3b2cfd8922a670bf41c962135a6e65fcee7feef70b4e8de9c159bdb823f9819065b4225de621347066a9dc863aab6bec2bebd05b8fc74eb"; + sha512 = "d470db1e995fa104b7504cd9f4b3f86851b130f5743235848a12725b294e4bf5a66327b93a0e6ebaeb8273711033a8b69f9493ed48b3c09c3dfa4899e8f09148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bn-BD/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bn-BD/firefox-56.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "6383795dbc65a2d63485bb9014b6119259bf07cdd9e0240fbbf3101b9c955d2008739dc8a7cea4e98ae17212ffb867cfc88ec781935a27d2a8e009e3f2bdb66b"; + sha512 = "4c2c612bafd1cc5db227d98e215e261546368391b2d3a5f13992f0704790a3bc0768b664fcb913418a31c97ff3f04019057634becbe62e357a8ceea48d31c28e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bn-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bn-IN/firefox-56.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "0233366e72f24498be112a584180181401b3bd5dd9dbfdd5b5a320ae2fb7e96c283e0b142c8e3a46e8f3a1ad9958833f7ce3f4a85add5f5b70a3b0e7ca29d996"; + sha512 = "776dc919081b9ba8de3613614654371b34ae1e31134bce63afe8fb05eea9133cc27e8214ff41046708bc5d812e9046605ffbbbfe8740ab795d908dd714c93cc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/br/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/br/firefox-56.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "667ade9dae138550defba527024f0900ae78a84d98f427ab5d767140d3bb0636677390ca0365dde4b526e2b0b318ab87aaf6c39f85818fc9f2dc671fb7a4a39b"; + sha512 = "17d0fd5524a52ce8a81acc3799235e2e6cda905df6b40f70dbc837353fba96a4304a46078f887825f381adc6f5b0c519c71d2ac2fc848a7a5e96bf55d37e2cbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bs/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bs/firefox-56.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "0addc663903145e6a95350ee23c734e7fc42156c07d27e60efc0228da0e4b20f230f76e7802edc795b95c8ba7c1db3133896f4bc3e56221a782eeb78ca57409f"; + sha512 = "667a7384d89e1ef3b1dede6a6c362104957937352e49406852e6be76e615b1d093e6a8db700e9658cad7e56297d56e46baa0cf0fdb2188ef9d744e44683ee30b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ca/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ca/firefox-56.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "3a9b9622324528b7c7196269cd76ef6e15063ffd1944277ff4ec7cec8f972001718368154a5edbe7af8247262218aed697db46296a13e5861432848d3a29475a"; + sha512 = "32f87cd6f5bfc8b9dbf10ab1339bc525b80ba50e24881797cb244b7b7079fe25a28ba6934cd7534802baa3e672b9b78ba36b973b264c1d00988669491b23b5e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/cak/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/cak/firefox-56.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "b691c0828637e13cb73ff281a939030effd78c7760cdd5826f723ea7b13f4c7b63bfddcfb27b61aab414f1621291756f5b98ca966efeac368e21e780147affeb"; + sha512 = "ec9cc56a2cd7b4a9f9849124df9179184facccab1abe062b0e5f05410704562bef4dde4bfef5ed10187b5f1edf86033b5f94b077d8d48169e037c3b17514f038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/cs/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/cs/firefox-56.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d99ac651fb417674cbc0750e5e1250d2e622275eead4d9709107f05359d1f62b248295e9120cc0ef1d5de61d22c0f3a889470b1b7fd4c04440d0f1a4730071d9"; + sha512 = "cdf3b7123c4b69d22f2aee8dcc816833ed876fbca1e0c0995180a170d7859fc10344384ca4c8150e6d0334978e5123371df2da3ef2d726eb39792307d76150ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/cy/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/cy/firefox-56.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "68bab0e265332111a09f04d651bbfca5b462cfd0c4ecc81f7f09f5722f52bd9a089ac28303879681d9ddc7c0da7456f71cc1a67094d2165d3f722c25ccd8115f"; + sha512 = "2d9e04aa36cfb0c05359a9d51706cd759dde52901d80f68601d3f7beaa06419432a3026c1c4b4a098d31253ec871df227d69ba9c79ddbd282a229376d2789774"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/da/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/da/firefox-56.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "694e988e88b8b111f4c47e75dd439b03edf5e6d3476a0aaf6ff6a64f3732f2b47bb5639a017e026b49d5cad28ff2d9beaa1fdf39571400cf64753a2830a162a5"; + sha512 = "1e8dc3f4deb5d87d8c2b89c32311062c5c5fd2e374af249e84c247d438f0a3fae53f97e0134ab9a778a84a7f49ee3f44cbbb5057212cce95bc4e977fbf205095"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/de/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/de/firefox-56.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "9647ad2fb13dbbd3bf83c43acfd835fcabcfc27480f31798939065ddd6fa4559fd22d11b656a735f88f30895842059c34f6860b61945e96608756306c3447957"; + sha512 = "0acba4c4c7905eba03d6752e4de2b901716e0050d896359cf7821ebb4dd197f80d5b261b1c7c6838ac6da663063b134990a7cd785fc13ac1928f78e9de926d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/dsb/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/dsb/firefox-56.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "0faa30e572a216576ea8ef60d0d23847fe731634cbe87873a4e7fbd74dbfef85f7ea1c46175d5519ee0265a36603a97c0641c564f72a89de623320137dffbdd5"; + sha512 = "de51364f0b3fa5f9075ffb50613cd274685a6a9ffd9f665a658da352caab4268e6e1e1458b8c6158c6f511184f6546c0c7fb8f78eac36de6b514104e6bb543c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/el/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/el/firefox-56.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "754f1dd8cc5e229af2f66205054c60d6c5c78f92e8434a2c079a2e4f0ef28a4b29e1b5ffa0e1828c613b749fa0105874dea03bceb6b2e3a01fb910f1a91005f9"; + sha512 = "0c5292a67bf838f975eddfddf27da2cf54905479a2a88ea8e558161a491cd681f137d2f147f875e449e06ee99685b96aaf73214813cd7c9dacfe425340a8a850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/en-GB/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/en-GB/firefox-56.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "c16a44f0b057075193bcdad11220ab8e2a4f342980b5b04912bf00a4dd7c6f92d8367319422e27f96413f2aefbbd60b012d62909658a42cf62b5d12abc09ea19"; + sha512 = "83fbd797a7a798985b8413228f99cf18ee7904295070fd46e00dc960e72a7a59106cbc1e1f92d613070a7ebc91912f41dcdcf1c36a537b26612d11110ee05db3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/en-US/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/en-US/firefox-56.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "8b92bd537c2f962855e7ee4b259c99f3ecdb9939c56da118f38063588de222fddd66ea72fe95ceca5895229804fcb946ece9fd5beb476be771be430804d06be1"; + sha512 = "45f14c5c4d707b10b3e1803950389486a59543ab408d449f19f04718f50e17c29c00d51a48edf7cdaf05dc5b7037dd221e3902c3c4c64fa2ffaa97346ecfd87c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/en-ZA/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/en-ZA/firefox-56.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "bbe364ece5f1da652530684fa36d2e13051fc85f90c147046110acaf4266ae187067a7b1c59dd48cdbfc5e10ca8df478579e20d19ed1e00b839f4fa1e99c2608"; + sha512 = "c863347c33335f480cceef6d3461cb44940f87816c7c0d9ddfcc2f1f0722333100acf766105eb97210796e0389df4374b8b0f99c0e4da021e8ecc605ea64b914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/eo/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/eo/firefox-56.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "2098fcc0e8405a3ac148ab4aa6ea3fd686b4ca839a3102886de515234b06a246bf4c588e6e0b3ecb0ce5c053b4f42e1d01cce79249ca22e041ec35e151b58ffb"; + sha512 = "e0f322497f5b5dbb274926ba65106437a054e524b7819b5adb134a4af7b67eec58ea5c5d0e098569c96cf842fd91e06901e31240459a309c62cb87f9d1f7ecb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-AR/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-AR/firefox-56.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "868e89a57c7ec69ff936dfc3dc3042ababa7c703bbabf5c12044668de922f22f0fe395f792891c839739e859a570676605d17c3c86c362b78155089e9ebc2437"; + sha512 = "a11866faa165e7c14f0a932681b1cbb4139b733225eb7e3fee7eb952a7c7fc8eb20ea2ce06e1201ce4a6e26835587bad025fec89366ec013de7a5e5c417df498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-CL/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-CL/firefox-56.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "cab2543a4d0d2201f4d956a5a35593c0f52df8ebf03ab4872450c409b11ea9c13b794897d8f4bfab6d362d50e72823c57405f8d78d3204d5f621592e188e69dd"; + sha512 = "07cef4339fcba4a24f9fe8023f78809f7d7d2fc5bad3ded7ee7d54776ec9aee0b4409664ac342cb75a309f3426111e9c0278e61feeacdaf9779647bac2fe7bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-ES/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-ES/firefox-56.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "4f48a78207b5bfafccd8c76f5d5e06a38e79fda36739ef3f2f6359cd392c02a79367eaf8c136ed56c8ead59dd176388de3bbab6146898939fa93db01cfbf53a8"; + sha512 = "e3416bc824c1d342f50bb275f94c5a70b91877fda49d8efab2691e739e6cc8dc69d6c8b7da42227b28942e8fe235fb9cf56de52e1f2b3d34a3bf6e6cd37e74ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-MX/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-MX/firefox-56.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "deaf33a4da6e9caf88668d6ca1f634f581c258f8d2ae47d1631735e5311a2818ff951c5a95c6c555dcdc3a182872bd64efceaeea3350ec6229c5207366f8a928"; + sha512 = "647dcdd35334f37ba558ba5b31ac984f0a48181387704932445a216ad4bb9e1941f93424d36be4dba6ceb4d42a2dcbff15b011f07eb342c413003fb91be00a8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/et/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/et/firefox-56.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "9ccdebf0492d629be1e6514cbb9422bbb224bd7894e05d6343fcec32dad2e6817727c9becc1df487b402a5e61880d073f3315f4fbe221905c60d5c8324bbd57d"; + sha512 = "09bfbbdc62edc88417211067f4a73772605eb650d689be07df028dac9366dd268891f4ee8cf8f122fd109339739caa6be1a6eca1d35b1240bb89a763427316ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/eu/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/eu/firefox-56.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "2acea950147b6ccc824a42a0256730a6fa1e7226a4bb3ad093a555af5d8323c1a4cbf8affa20ffdedbb3a0c1e2629082dcd01a8c4a18490c1cec579f6546e371"; + sha512 = "41c99bc9d6047b5a05ad564aac31e217cee3db42e66f6f5bc442034e3210b0732c8bb3d64600eacd16719360242c1991957d81cd0d24218535dfefee0b1397d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fa/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fa/firefox-56.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e4694064bfc8e00b3afb3c83c5286e93010c2d9a90daf781bf141787190aa6314bcfec9ba542fa136efa653b7527ba7c264ff4cd8cf1e529f1402ec2abe90f3e"; + sha512 = "16c8a8cfb2d87d6ad84180074d78790fe1edd59cf443638606b17178a453a810e78a3f8a393ce730ab65d31688ad0e0ded0b25012f0b74baade3bf6d2fe34788"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ff/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ff/firefox-56.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "93d864d355ebea2d8add77031f490edb13f1e1faaa65e4207a4013c5bab1b473f6fd8d7f5867cd5a3bc30aa23263911f4dab2552adf570675427bbd3e3e93268"; + sha512 = "b56c8672b0004958277471e1fd7b97fe0fbf180ca4f272a90cabf7b5aeeb534845bf6d0086cb7ccf0ee61170a310f0db9a782cbf4e660034cc978179f7d0d343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fi/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fi/firefox-56.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "2bbdbe8798e2050432bc53f655d533fde999c8081a8a7d494e48d482afb572a08b3c63840124dd50374cca813aae7e87629cfcd68ef9596eb749b5bcef0270d7"; + sha512 = "206429b73399333fbb9e787132157a51096989e3cfc9cfcf2573ab5dc12de2d0d8b73fcbeeec6c08535ef4fa179899677a7beadaf698f661e3960a1e05edd617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fr/firefox-56.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c3903b640f674f5da1a7097543e917ea7c56c2c8749a30776fdaeb518d7b0ac874533cca0aae643d24175fa6307ec5cf00ab457ce3dbcad52a02e4269c12550f"; + sha512 = "837bbb752d18c6697c8fb357d228b9cb24eacd2b4f9d7ee58959639d165d06de585602ef30391a5110a4711a0c2ab8e104395cbe20a5671da67d3cf90947f73a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fy-NL/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fy-NL/firefox-56.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "246cc7102dd43351a6751f71b30e347a67db6997744fd6b94d2179706304a370a36bf31b00aec32a41cda37ec0b734cb93b759bc30369ebfecd20ab3680b0c74"; + sha512 = "1d4fc9621b08e34c6dbc19c016a4ebfc503aba17d9f69d6d281a2937eeaef8dce4b6cc0ca7d5d39392f487c9d19556bc175bbfed798e946bc81325f111f45dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ga-IE/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ga-IE/firefox-56.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "cf825c5e47045afdad04cce7622ff91e82c2ab10c14d6c7f0338f37221fffd1df86b79a6dd606a333c83e029a21421220616af6bf417c1a12dab8504ede297ac"; + sha512 = "41f88d1026df2521498c5f78c5bb12cd4e91620c87966429bf26b23cbaf872c2aa3e0ba5fedff05458b8e885901e5978c260537a865964672f0bc558e615b769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gd/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gd/firefox-56.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "82f09b004babae82f2e84ebc3d7aff0f556eddfc3be0ecc1abe90a18ac67e846304ce478fdb6c3a757ffefbef50fe733666796c4820c701f249c09cc246eb396"; + sha512 = "67ec86420e978b7f30e3ceeab403e3901c50c5ed3baa4958e2e36cbd4db95645198c2df81ac9f68160342a09b882b21c397210a82eeb6c1243264e404e9b9fb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gl/firefox-56.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f5b6513b4dac92b02a4961febf7c734b5b9e1f9e235bda4749fb139c9c050116d1f1f222daa50c0bd6209b7958f8610800d4504d9a9d7ea255bc70ae7149f211"; + sha512 = "81d2149fa9f1ba4f1b69c8f2973ba1f127f64f4bfeeea0dcb5451dc88f3b681f7ccee5fcae9bc8b7c1d36f85f000cd4210b54c360694d909f0cb66728553a0fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gn/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gn/firefox-56.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "de42e872ce6ce31c020a539c3c85c0ad568c720a2667964fcfc6adbc5725fb84c4d559902cd36f7daa42864c8c276d18bce57c994bb0a996727291ab29f43362"; + sha512 = "93b576f861273b96bba97eea33598d421f0251a847e853f1506fca08d094922ff445ebc36468fa457181359afcf4a7e1f185057c2cad6826376e03a6b996c8d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gu-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gu-IN/firefox-56.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "a894ee96d15bbfcd81a596d0e1c3fe72b01c02250c54e85e7f66321db735c157a8cc971c0aa04fbfaba367817b360ee5b9acdd000d46f85ff035c5ab3762aed5"; + sha512 = "c377fc5936257a8cbce11206b0668bae64c32693161472a2e568da00c662739873b2b409cdedf041efc7bc47956219c746c05c0e95654c2e4b553b384e40ca24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/he/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/he/firefox-56.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "fa3eeb6926593e77505583f5321d7fa21928642c900c9ea3147cd8967b36478e30a15069ebcf23212f82a32030713144fac0cb836808e7e3ddad4184f03629a6"; + sha512 = "9d82c000a8a09f69c9daf8f04cacec5a9c333da22f42600259d75aee7e8ebb57f76854921b34f5de078caf03edccacb59831ccf9f8b3a885842fdd1e42761b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hi-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hi-IN/firefox-56.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "1749903bceca3b06fede93fe4a3cc531cdfc65d9bd1ceec7cfba0fb0c1c6cf74118de4e5f8b59125f429ab0797fd308b511bb50087237a2b470ed164281fa143"; + sha512 = "1bf8c4f4252ccae9bdeb6201e631ee178c9c33c17661f680a5688138ce875f05b17618935247dd614a99c8b4c59355300160efe3dce3ed4dc672ec1ebe301a21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hr/firefox-56.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "244a2895a30d6f6cadb7de82c5b1fa193a41d7c255d27ad525f30e057a2571531999992f3b8735b5cc549ec4e0340d0027b59c4518992cedc4fc2ed89be4c73e"; + sha512 = "67db04beb477b841f50125957f1354c597a4e02adfe3a95e0e177bbe436fb103ff99a68a384e8431894669cca72eb27f3250f7547696771eb9dbacfc6ea9d39d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hsb/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hsb/firefox-56.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "274ebe64c5e0395d26443ababf3c998f583024d979d498bdb6de65defe330bb862abb8b29202bf17c8c6f5d938623936dc9336d13e99c214027d9cfc261f2b74"; + sha512 = "1e3420c4003335e238df8b2d1f1e8116f4aa6f134140f0c4201bc1641c854a716d5845b1cde494e9d7fa8842bbf8a6075e5cf0e06fa7c6e5730429e4543df2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hu/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hu/firefox-56.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "4aeb33a804b88312fb68e1429627328accb82db368b017214c9dc9a8023dd2a702e787c03020a5047bccad9fbfa82b5f44a9079ba9235dc03393e1b766b88f7b"; + sha512 = "81935ef98b9b92db81f2ee3cb32bc081890c6e72c5fad4fbf601e9fbdddf85983f4c2d39d4b3a75f01137e3864bce1deb029bc6d7e1c2fb3927f40c7e06e6232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hy-AM/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hy-AM/firefox-56.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "92202f50142c2e0dd0384d5d65ed1d059f55ecdf583e37777017ca3fa428225e1ced4206140f268fa5eaca301414b217f5e46f435ada4ce1a70be87d5dc30cb6"; + sha512 = "2505aa2f68de27a09a24bf1323a6bfb30eb35a60d4abb97451f5fe749d4a47a199a5f8ff8071beff19c9074627d68f5a3ad014694b6799c2a318b9547996b6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/id/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/id/firefox-56.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "b2b109fda6ac076c933765698026d278da662bf026a4e38b351676d2c73fee10969f39650217ad225bab1ad387fce1f42b7c5152385f1779d98264e0403ed04d"; + sha512 = "ae6d762a66edca161f9e4a547b3ca99b34f727961fc5ab7a57885d3b9ab78a0c0d1ef6b80fbf15451ad06b9f59d7bde4dbaffebadfa51bd8f89c7107da7296f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/is/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/is/firefox-56.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "b5d753de5f044b693345c0dbb112555baa0f84a385338780c99bf465fdc09410b920083ad160f4eb56db5e2b73e3571aed8f8ae3b3d57142b9e5e452c39836a9"; + sha512 = "91cdf41d9433d20cb737833a006f7b0e3408de9dc80d689f14d4c8c2cb1ee1cfbdb37196ec8cfc68e6ebf56d53b437917ecd9d18f935aaae5f4cddb7ab277d94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/it/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/it/firefox-56.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3c6017bcbaa10da0d8fae0c37713cd06c010b9940791f6f9f9aac3f8393d18406759c6ea0c12fec02c50d52e436d401d67839859d96322d7ef3c664063d380cc"; + sha512 = "5d051cc24c2cd5811b0a6738902a232718d3a6458b372fe9ed7923a15b18329607e93f062b4ec08fff4eb270adefaf9e39498e22522c102ea23b1d0a50bf3f7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ja/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ja/firefox-56.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ba0f3bc654e0a6cf96ac555733cba556c3725474df71be52af06741a6690c8213c604f1f04b2df048b756addb86b85593e8b91b0bac714925e53469c7701c067"; + sha512 = "796535836414b3f676c0e037f03cda49feabcee5bda2bda64130d569881fc5da7eb6040ea5a534a7f8685720801fc0cc9196f7d7d4225315929198598995e239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ka/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ka/firefox-56.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2bce012298b2b80e4567923b99c96dc49a6d2282cdd24b464c98dd36c2a66915f8486aca673abf34df63cfdba2bd2bf6999397610ef64a55804fd589cb581517"; + sha512 = "d597a777779ecda47c588208ff350512282af7b933a599014f65b8c7777f68baec93eebbce982e3d77fb42d77b26d533d63c67d2a96a5d4024b1f595a28c2204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/kab/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/kab/firefox-56.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "b2e2c667d4551724cf9fddbcd8ed4029c4d91a6f7363804b9f1382d6f4463ba65887174cb44cd4f7a5be525db8699ef4f517dcc3f87018d65e9fa136219278ee"; + sha512 = "2c60fbaaef100c38d4d95f986289d9cfdf4abb739aa3320a882d218b949d7e293d2b8cb52380cc4991a7115d12eddc9439d6894d862a631c6e3b274680cdc1bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/kk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/kk/firefox-56.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "3e3dda19c1f03c144cdabbb4f968eec57df764053655d0a5cb69476d6bbb312cac0f06555422c1d95985871f37525f1675bdd4575008fbed99cdba2f0e80a3e3"; + sha512 = "aa8e9255072a1154dfb4230effc9ad6649b02931c24ef4ce8e979fe4bfd9c350aa9dba39a7d0b866e11e96be29e0fd7a15f8f7ff9708ce26e430491453b49c23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/km/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/km/firefox-56.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "ed50a3fe8f72d0391a3facaf08bfa34bf8227689fd74e2372bb78a2cd76a99f150669a0a30c01879096a6fb4e6b1bdbd15b41756cf41000a1f10f3e5b7038cac"; + sha512 = "e5c38d3ce0adc014510f5557577a2bdeca238f9675f2cad90e42b4ee15bbc2315cd869ec4d3a6fa380203491699d1402f5aa59c1c8cd8cdb15caeedfbb7b7590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/kn/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/kn/firefox-56.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "fc3d3adb8a3e92e2da7e3970ab3f45a1c8750acdc11d5f7c062249a6f025070ee631dec1f8ccc9237f00442b4c9c782f51d8f2ba420ef5a8c3c4e3601e292d27"; + sha512 = "ec5bd88e09660e6b3e02fa34bd3f8f5b81be7a6dbadf55e56256535ddfeb5734aab85ac47d16a14c41ca8b0b66b697c50250178ed341347a6763ee2009173610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ko/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ko/firefox-56.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "05e6a136e711d1b13adf78037dcbcc21a6af7aa8eebcfca0c839810d8df4e87fd951a12c705504a585e729af72b6f6bed8189d3c5f8919f68f2aea72cca2f1b5"; + sha512 = "33f6b9850a1f2d5f6d363b5830305c498c50eb705b552301d34988e9a446d2b438e83ab29cac45fd1be3c7be016a0eaa631aeeedf4742de4f27957c02a804491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/lij/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/lij/firefox-56.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d0ad5add37962d986b6faf324a4e9faab8c0366c6c04b34bbc5829159ed7364d108c5b324cd6ee42de279bc58c414d347054218dad268132a2543913841b2846"; + sha512 = "77d2cfa449fc522f314749aa3a0850591efe4862bbb9a8e9dc1abb9d99c2b16439f7845aff9686d201bd23c88725212d28b1837fe1f2b20aea3c78525a8e1ef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/lt/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/lt/firefox-56.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "efb74c5479867061c9a8ae525893114d85d253322a4411a7d67f5d1bfd17843b371ff58167d8c9f199cdfe7f3b13592072ccfb5eb88ad62a511272ff6419b620"; + sha512 = "6a7c041f241fb6302e7c67b0a920ff613170b716e02258def0c87fe9332a69318f962797ffed9ead3a60b8a951f517f07f201053ff4ff4dace188d737bcdbd0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/lv/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/lv/firefox-56.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "030e445cbb156c12d77c1858262b6261e73fecf3091478cc9de47c4867c53b7ef807ed8a15caf2d217ca00e2d90a05f8a86e4a1f836abc99731c9384d74a1c98"; + sha512 = "ef9166f0826ebcbac5352e48a1ecd23a0d88b6dd1ce2d5ec24b0b71326e03a7b4b175eee299aa620862aca9000a00e98472e1a605d214616933512e73a439808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/mai/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/mai/firefox-56.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "abe8c9eb6fc36fa2eeaac29f7d53c9ced228383d24cff0c43520aba9975c6b400aa6ba44584c05395c9a4fe156ad1ec2e348cb8ab813933f514729bc4eb3569b"; + sha512 = "291aafdbc820b39b7473192a3781b96ec2fa3ddfd378c27674e18a24eda51b6aa112df86a68b6cde6c922c9567449d75942d470b09399424517cc818418b7219"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/mk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/mk/firefox-56.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "a8c268b53e392f147aa371a7c5e623352fe80689e5d65b325540a478e9b2015ed91bbb7cae309117b16677dff1cab99e64de171dba3936a01101579b49efcd3c"; + sha512 = "9224e087bbd6b49630023dc92ae752e62cf0a9e4169dac65b07acc8dfe143b333f8840875da4b5f3ce119ee31987721c0cb8088c202cf42d6d24c773c1406415"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ml/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ml/firefox-56.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "655369ea9047c3715e7e46065fadc255516e170f1892f0e0a02aa6c77ab94927b43f0d125be3b886dc7295a43cec304baf3268d701bb9aa6cf263eeed2f95974"; + sha512 = "e8fe9fda9253b20f898314839e8f70e3011fd3bc6d1a08c762c38363066452f854c530ada25bd5417a3f6eb0ea4ffac525bc5b0bd67b6e6eddca35c8eac9a6d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/mr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/mr/firefox-56.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "f944bc416068446084e9fddcbcfc44ff096e29c2feeb2b1a40530317f7fbabc1c3f31419d749fc859789be9188c875e7d769d3aa09e286eaef305623f5a49d70"; + sha512 = "07ee71ab15cea520c5c1403be55a7f09eede71787f9a404bdd18882935112a7cf423850df7b5c5afd3e595b2bd3af053858a9bbc6f152583ecd03adb0cb56dd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ms/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ms/firefox-56.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "25d47aa89a88da6932cced36e2d5ea5de7fa9e1d7dbfece462842daa65ff018d7af81c26659267f5a40bf621e79ca0df30f1ecc5abc5d5b159673c73d10b0e69"; + sha512 = "ef839f697bb37a81f988d28d6195b33f7aa92b1f0c67cb40b04ef3820a2f86f024a34e964f4f2ce8bfd81cb2695e6875d8d72aa426db447c6e65c1a277eb1379"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/my/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/my/firefox-56.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3611e75b8d4c838ce81320e4f72d8b3425959e1962bf1b147da081f23a6536ff4e28204d01154f7e2f4eef3dd48796180d42ad7a4467d66cfbb56089784b3fe7"; + sha512 = "06e24ae1c4d86ed2677d776037378e5f50b3481f7e96cb0e32369574fb2a04c5d572c7478ba2054f3929a0714aa960c8d9ebc8d7b9559d7f294c31c775e9b70d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/nb-NO/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/nb-NO/firefox-56.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "1a1ebe6b9b118c89a3642504c5d1175e64aa37d652741255ab93e7ed8770a21e2208434d19f95bc01deaffab7e33a011352bac5783401add797ee4c9535055e1"; + sha512 = "c2384749c1121cf7b184e49fb7ce535a2387ea32285ad52f63afa6a02746c556459f61d7f19a60552e63958aa9541c81bffe13c6a96f71c598bc4501bfa4024d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/nl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/nl/firefox-56.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "e5348a13c66e3b6f5dcd1765bdaee0adffd0dad195be0c52dadd99fe1dbe5e381e5aea7b9e48d4c77059d1fbb0b214c25d3b51f83de79c5dc33089e2629f7298"; + sha512 = "b207a5f091f556dae81fe4d35a14e39ddb1eba9fe9ac4440d7335eaef561466f14d843d91fb8a312379a0c7ff039a763fd041088031cb48761aec6f58f681fbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/nn-NO/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/nn-NO/firefox-56.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "fc7ebfebccd5c3be0a06a02b98da1d18eb6402e2b97a44a8a483845df0365a073260930eb7651ee481c5f788bd0b158e5b97017818427b9143772601ed7b1af0"; + sha512 = "e5a6e1ecef59fae002c4605e7c838e00ccf6fa232427c42a29cf27f1bb4db7c84d4c4aa70eae84b5ad40eed109de11270d02574101eaf690a212b219448cf273"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/or/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/or/firefox-56.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "2e450311632a130b4fdeb1aca3be2073e22acc1016315663037b0ce5daece961a2ea276b96da06219f6a6259ced97d819e2feed745c38148e766d2a08896835a"; + sha512 = "f259f88c0e4669c4d174fd011493883811042ecb4b4752c7c69dce61d7c6c28267428327f891c2eede911667807b6554373e8f2dcb8ba9e2f3d90472aa2ec960"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pa-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pa-IN/firefox-56.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "ab2ce9dca08d20bd9f389f04ef1b2049ef60cf98c0423a59202b623419714fc1a1a40210e11a73a804adbfec1d6bf142747b7a80e7c83e35d905b9c48d7bcf12"; + sha512 = "cdc2cdd6902c86eab3098514b2b676db6d8a323d3b78b2da6104fe1be17cc15b3d38d5fdd1692a87521d6afce8c8bb8e0f78bb7d291145ebc05b5a76d47e34b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pl/firefox-56.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "d9b75c4777f029eb9645a076de83b634f8ce003dc3bc2276c94f7e6434fb5d4b06eac0a2998b2e4abedeabfadbcd9410c9c6bbe58cdf5bb257601f3dc0dbf0db"; + sha512 = "edc50ffc298fc92100faf0b529716e14dfed8e41965e3b4a8d040bb90a526309bbf52c60d8d8cb816e0db99bf09401b27602cbf0e7e947e3ecbdf61f5c53be59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pt-BR/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pt-BR/firefox-56.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "bfbbbf7c2f94fdb5a15b3170f7ee6489a4cedaca07385643f659e553923c0ac06b7e7d38f80ffff082a56c1f2f08fa883067d1a3fce1531f1e4160d9c8f7dd70"; + sha512 = "9da419264035792c3e9f601bd9198e77e0fae17a7ff2e34b6322667cd95bb79ba064a59b6336ef33571f6cb5f721a7f4f35e1f9ccc94e68196c310a683410846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pt-PT/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pt-PT/firefox-56.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "5033151554eff19cbd1b9c66cf5338a20a8855e677761f89cbee022b8a2cef962161a91a7e67b85c34ab3b44ec4f4a1a638e5f7955e998bc29dc55ba072b905f"; + sha512 = "b151504acc244ad3b80c2dd7ec87fc04682e06bb53338bc39aae164ba1a279c316eb84e33d1b41f4261135c39f0a0830a7f74f5ad7d0d3b9ea0bb458d628a9a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/rm/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/rm/firefox-56.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "12426599187b70240624401aed139c9c61ca58d3bc721bcad01d253942b30ef3beee77cd8d76c17c9204ed8a6b919cfa9709e775c520654c7570f26a1e5234f0"; + sha512 = "480b46a34d36fc03107af64caa5c6f0cff95021cdd094e7c0641f28938f5f21aab8e50b8985e0b42c3cec2650dd4c9538df93570afbffa399241ca8b757c2ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ro/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ro/firefox-56.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "3eb917db04503d692883d621d783d6df623ece55da12769fed51634457ab9dcc4c879b79c232054e504d266cfd167a208e728c0b9bdfb2b9a80e0edc60ed0524"; + sha512 = "3d257170a028575739fea107cdd55a39bce7c534244b4701716e0ae8930e79f04a9fad14c5123c1799fc7ff0d1e98b563e338621408c7e9fed1fd1b84c72a930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ru/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ru/firefox-56.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a839398c7afcbcc7e4902106a980675ef46123c7c8466da61586db623bf559e4238448003c722594d8b0a39b1da1efceb93d923d5160ae20e5d3bb6230005d4b"; + sha512 = "954853d2f0adf078eb840b02be69500b0abe8d76947d1e71dc48492473492e3c3162b1dacfb1089397e2a4985af4ec71b57a01d86fa7cc3f22515aa5f772dd04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/si/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/si/firefox-56.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "c37aabe213ba6eb7bf12d56cdb65ce8b95fe95c40fdb0edb58e9abac064e4ef232fc75787d2b44647cd1887f117d6144d00d495dc196fade8bcc96ef06c6af82"; + sha512 = "3cadc96524cb58a02aea721a7ae54fd81e660faddebeaa7f2a1b498fc5fc4341ea04093743270121af5757bbe9f6e80c9dead96c03a3e576b530ed3ad4edf7df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sk/firefox-56.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b79303551562b52e1fcec89819ea2ab04e1c5dcf41b9dde067da2d2e0a51307ceb45e0417c94c1f446bb80ee2c7f0e1f61479d33088c843423d5b195a6df4ebd"; + sha512 = "b800b287c876bc0512295ea2f797e0c330604a9bb9ea5d8ba37b23f79d78701721bf98a329bd58c157d7e8866352fbf9a9508e0959ebbec2f05eef6534eb9c72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sl/firefox-56.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c51c1a2a81e6644c144840ae3a671e74165add9244975f2671a17ba6beba9096219e630b4475b9a576cf0d0c2fe8001692903a984bfa1adf92b7c34bed46cd9c"; + sha512 = "3a672e005fea767d6af13691c2799d95ec7ea6004e889119624d01d02643bd73a2ae7c6a2b7c96b80572366ea54b77a4d83aa02370a884f18e86e6633f774a9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/son/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/son/firefox-56.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "f40f28d3774c528e0b8043e30e9b4f88b46b1e3a296934d155c9b340e099937804f7d5b80c845df251f70401099dd089a09169c55b9f39f7b22a02261381ab73"; + sha512 = "01a506d12757586c61a100755d2610686f2623c9ec7c60bcd1908fa02b16ac129ad0be7d38a43de1cb7fb402860a55595f87ff6b16e80360f26832dbf2c897bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sq/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sq/firefox-56.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "728941b8eafc179e5100add0d2489a418b28973e2427586cb662c34e7ff080bf528ae7037835b7c8965b68c6cab3fa5883cd6bc8f1b849937a5d37cf069765c0"; + sha512 = "e5ea656718a965bb86d826a1989bae6c20f3722f3d7a2b2937fdca06422133b94fc0845c7dcf7577527399b8ef6e78c13e4f37c3109061dfe62ae12f4338c27e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sr/firefox-56.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3108a89eedd792e44334b232a127c7c8896d1a9fe389acb206118f341a747f65924798e99c36bc1be19c215988785fbd1cecd20f2707afe63a9b0664e23051a8"; + sha512 = "c436c4df233230f0cc848bb29e36c2715d7d6bef09bcf3fee60e35277b2dfbaf5d0556507c5853daffd823c7ac3af47e9733746302e98cd55c5a45eb68477fa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sv-SE/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sv-SE/firefox-56.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a59983dae6d6814e45564dfd7b199412b7d7ea76afa0b0fcdad9019ea047b3c45d49317af4624d99a2375a525dcf72b92af0f34a51d955543fcaff8f407c6f23"; + sha512 = "62f2e7154161ab18902e107d83d437fbab65de3195e49ed009eafbfe2a4f82bc1960f4343c52121edd8c36a57200fd5a6468706bbdbeac9b60416988964e548b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ta/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ta/firefox-56.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "458033fe202c3191cf6c8930ea8697aca2c534bb4c86c7f0a85925ca830086120d4bc3a8148530b8f04c621c5da6d2674321ad6b4f9af7fff0b7c02770550ed2"; + sha512 = "3c125c9c03646ab80a65a5f84b14c5a2cdd0419cfa0356fc1f28a77b3df463653d369e9aafafeb90a4281333f9ce270097a6aef6b25ad4408312360fc751f5ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/te/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/te/firefox-56.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ce7dd880adf34db123f85dd1e8d28dd3219e9db59177ae8f4e978efddec67b82025d4a2a2d90b7e8acd4f093b3d019e4b4e8203c70e1e8a41756bbd1c8eb95ab"; + sha512 = "4642cd96dc68b059b6790ad1313f499126d0b68fad49fdc369f7c70b3ecdaceec3fb4572dcac0f75a415566b6de04ac6086dba1c57e8d5db4f5c360ff5b8bdb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/th/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/th/firefox-56.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "7c23001e41e8e09f7468c74c79dcfbdaf655894f1c9a20bd87357e39f970faefdc1601b4d0ac2e442d4ee490362f17a4817269509280e180a2cfc31f8ebb1e64"; + sha512 = "593768af7dc80b1a5850c493f80f2c538fa76e1b5d3b288d74c6be2bb3736cab29a6a1f68902074b0a3c3813eb29f0b461dcf0130ad7fa4f620917a8c1e2b738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/tr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/tr/firefox-56.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "27bfd7c5d3cc45be0d29d4ffd4d449a0c564bf5eb7d7f86b808429bfc4cd54cffa9b7dab213122930b2b666ccdc99d09f8641670f79a1d1250988a1db4079a2d"; + sha512 = "8314f255717a1dd56949075a8ac915e816d7647c39027ac636f79bbc2f6d7b9d1bb593a1ce03a9feb1ba41d4cf2a9613a9e64a42db448813b874fd0906267b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/uk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/uk/firefox-56.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4073153ae727ba314dcb77ef8d8fadebb5e397a4c379d028ab381194a0c9a325ee2573ee22ce407c7d774758d74644f033f5e17f1ec402026bbb1b1c4b806520"; + sha512 = "bf6ab16560f18a8e2eecc010f6838839561c0255beb6fcdd9a13767a34edffbce58fa2911ef13f5d6767cf19c96e0df520d6682d3441bf860d0654357bdc8f83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ur/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ur/firefox-56.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e0ab4125e4d46529eb27a5d1e2039f36463b88b87370151955fe33d602bd1c72ee4fbe79cf669beea81444f340df3da1a3ac4acc73ef47162acc7240fe230841"; + sha512 = "0a6f44415b465597fc58bda25f371da6cf7f31718a310c96ce1f1096c75f627391e62d10086d6816d64e4199ab0d971f1fb8759f6509967f0a7f79d8b6b08f16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/uz/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/uz/firefox-56.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "628af5328deb486ebac3c3e631a3314c39e3a3cd4d76610c640ae60b5a827b62a4364898c895aa2f7bb300146451b3d21a1eadd484ec77665828591b111b40f5"; + sha512 = "57b40355881e13373f3d122585c6e7fbe48ebcf86bbaaa78756e75c669d359b1948a5a42715d32ad4cb9569008be271e15ea2f8a998dfd15f7db36ef92453386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/vi/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/vi/firefox-56.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "2e4117e805227dbbd96f2b5af658971018000e7dd89859f5f68369e45885125b60810a19f5d62affb98290b0846fe18ac7e96552fc8500369ae10ad1a2ee245c"; + sha512 = "3f16a785a361dad4e395882cd2a72bb8dacd5c58c47b75d18d9406602a0b23ef227788652656398de09278f9fbb52dc61b7a9c649d5382a1fac663510f228a71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/xh/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/xh/firefox-56.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b915c86aa00d09bb02424f93b6135e3f407daf73d8cead602682e13e78d6eefbdafa5116f8ed8683f3d42a2eaeaf3bc63660acbf9c4104fe99a8d80ca1ebe695"; + sha512 = "e2792d9bc89033739104f8c14111dd07c28dc49be4ffa820ccdf88023d93ab7598f1b954183ee3abbb47b78ba05e596dbc7f458cc7c77cda91bae64ce561e5cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/zh-CN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/zh-CN/firefox-56.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "27491f5c075c2a9ab48cadbea211be12d4cd1a4b110d7e0f211a7255cc5109f9b1bdeadca1606afb0fccbf70351aef6ad7fcb251a49280e46fca546e28df9e04"; + sha512 = "6ed90f1a4b157484c4f1fd0a171d948afbf2af06ec8141ce34285c521861f2bd3c3ca231feb4b8b69146c84bfcc83a675b4b69f1889476844d3cfb4626dcea6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/zh-TW/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/zh-TW/firefox-56.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "46c370fb51c1691b06ff026b9ae5a9682713c3c564b077bee4e3fed9ea80c796787a37dfb79babb095c05ae49db364ab552913a43e48ce43a628b3747a15f68a"; + sha512 = "e953cbc61b8b30de35dcb73407f817651fad295633ae52d299d6205668c49ed4e432ca2e5c8bdf411317c3dda1c4d71a3472cbccba94489573f96c42c09e6345"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ach/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ach/firefox-56.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "d8524970684dde392a393ecdff1897af03835ac07a529a643050e49a53e12dee472f33697bd66cccfb1f2ed78a261dd479d4aa25f3a56ac953579f6c6d5621d2"; + sha512 = "386e84934aad44376173c7ce27e732e81612d231a4e527f4765cc7cfc1843badffc8caa1526cecfc546507f2e370fe55a85c6cf55b9b750d98a70514301c4da8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/af/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/af/firefox-56.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "3624bad2947f43d9aa89a4a5867d7a406fb34dba9aa06bfbfbb44405fef3b3f78e4ba64789cb02cae561c8112b65d81ec291460522602798ede3408b7127e1d7"; + sha512 = "708c0012276f2473853efda705cb982d809edcdd300a08c105eb848be95efda784720bd2042f7d352c3b6ad96f5a63f53a70b98c9db29dbd93f14ce40f44390c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/an/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/an/firefox-56.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ad7ee2ba36ac9a84ee44a16ffaf39cffaa10325c54fb573565780ebf3d176b7f7652349bcd02f0d7d1d4f51b8fd6e010f081f770bd0393e10225ac8ef4262f5a"; + sha512 = "630d51145d27671fc739bf8ed45286bcd3884a0afc15f39c837fa213f0fe9bfd0213e6d8269fdd1887844bf07302ccf2bd8cce38e7f7d4f2f706486487736561"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ar/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ar/firefox-56.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "4796be96acf7b5a52844e52cf86f0bd90c8b6f3b4c8cc116578529371a77a44fe4a1176a1b4832aa4046a3e9a6291b13bd57c63b0df31cc6b2ba7f4fc58905e5"; + sha512 = "07a668a25ab4faac23a4a2adfef2b6482261b22cbaccd4121a510af96958443e4ae35d6e83bac15ee0e64aafdf5a5d4e4c21cded777ec65f0c333f9474cab397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/as/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/as/firefox-56.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "26c69f994389ebc7a0ed737c5f925f812e0ce0a1d2222406a17801891cc6ba8150c99aed0636f6585415d8ec6e7b4e51d39b39dbdfce1e0326af89faa8ab6179"; + sha512 = "46263df53558751c587f1e6f6c4a9f3fe5c4833d3c984fb507f7bece693da7d85298a85a21eff38527a81cb1f24f6cd1c8292ebd280238f70e076a4da7748e95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ast/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ast/firefox-56.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "511f7e3cb28b888c45fbe31e398d3b66192f8e6498021e34c10298096bdd16c839a0aac8db6a103efab12978f099ee3c414028ac4966bd7626556c8eb6f2ac99"; + sha512 = "92daf3ec9160505501af044b1122a544f6a6e744ed262b5e7e9fa7d1d303e68dcfe7333970b97df9add69d8dcd4b29f8bbe1dfa47301ee16da677486c73d8e77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/az/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/az/firefox-56.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2694b535a2bce0c5049a143b2a8c9d62bf1dd29e4ce18d7e686df43e87aa745b284c6272a6b1fc5bab58b023427120bd694f7e8e681320aaf0f9bb41bde0e7ec"; + sha512 = "d8bfe731b8d80ccdd85f3f389fadd76fae2691ef2b02527cb96f2bead142e35fc74f7a904d62e25672eeabc51ba746e18fae70876c8c86efb22b05fe9137593f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/be/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/be/firefox-56.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "77d586ba3244e6fbedf354ad3b71edfdc20b7ec35ae520769aec4037bc45dd9d1a4ae858121c869a9e0f888f0d94d43ed0e0b4a25703d8cd0f0d8537b9631bd7"; + sha512 = "8a27be65f3e5c586411534990cb948e995e69dc0d6f7cb52afc13c47b42e42507771e3665da57ad86ee5ae532130fd176b10cd17770cab7b2ea50b0121b35ab4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bg/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bg/firefox-56.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "eddb4223b62e2bc1e54f27ffd1df85696b9bd169f65b75dbc8f96cccbfd59d110b262f0a149a88b584d4a02c9cda81ced7ea4884be8edd4888d50fb26a850eb5"; + sha512 = "2c2136346ca821f96300c59705ff077d9b3fccc097bb0da9732554b07278064d92a9238ee0a99cbbed354dcd13422b65334b03ec4a0bd0656b61e5bc8a1ed51d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bn-BD/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bn-BD/firefox-56.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "d5ac79231ef0f559059b62cc2b7b438fad544ebc4f44f8a88a1e2503c36547de70a485c4aa0ec575835be54657ff102d2f8d5ea5b009a5f4ee3ab9bc1c8553cf"; + sha512 = "8c53e006d3d7cec66d5fba1eeb1ff8c0beda661f1033b2e648ff84f6a41e9496d08d90763c0356e5cf9139c699851b878bc1ee3f1f40aabd3d26a42d17554395"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bn-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bn-IN/firefox-56.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "ff104d3271479d8df7c5d63ecaa03ce67bcfce839e155bb8b7f12b0f4ce7eb950f0b36f542e6c87402b070ba23d7154124bfe51a10c560bb7d756cef9ba0db85"; + sha512 = "696a769b55ed6beac2d7f61248deecdad88b85b048c6fea3bd8da1a7cadc792eaeef816ab83b184b0c65b3bae315bc7acc96e8415c69b4d92e50f40f96621471"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/br/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/br/firefox-56.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "5c25ffd7d5a7cc974c924e04103fa81f3d4bae58b2d00a9fe57b6c849de91e29be73533e2dfa49b07ccd45f1bfa7f80861fb6736beb5deeaa55460192ca3c231"; + sha512 = "3eff8fe64026f8d337ac279193aed4f79320c35d4f5269900517c21bde2075595ad1b4afc68e05f64c8993517e832d1c34e39fc60d5eb6d1b1b6184fa912c416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bs/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bs/firefox-56.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "63ad8bf0161537029da342ed24784c08daa7934c40231402ba867d9812ec0d01d93db251f5c253592de53b69300f669754fbe530ae4cc5f4a7043031a7dcaa32"; + sha512 = "b964f5d6540f4d70f50cf0ac3858539f58ac50b691758568a5dceb3045b7acef99af65f9d1873f01a7e633b101ee37cdfd8382ea35c8719d35e5a89006883570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ca/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ca/firefox-56.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "09ba0756946a02bbaf697f452275d3ae908e7fdb5af166e7586b84d1ae0983db0ca9008c48be93f409a56485a189da957f5ea9c18f9fb68c2c09621e16a1faff"; + sha512 = "309ad23f3b042434c3c0779d59838c920063e64734d42075581ed3aab88de947e5fe2d74dab5ee17feb1462fa7125dee6b114087cae68fdd6c402207f248d1ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/cak/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/cak/firefox-56.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "eeab51af57e52689003339d3f02e60da8bbc13ead89343330328eeab34cbd55c4cdab4706075aced5b440378b83e84be7d9a62182fc76f47d7945a1b1f0fa337"; + sha512 = "9454a093f4fbb2466fa63a565461f209783f24919c970e95ccb25d8c9b56260fcabbdd9bcb6ca5fa4a1e1098fef4fe50882e923954363c83cc3536f98f95e078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/cs/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/cs/firefox-56.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "938cef9e5f0e7bbb6b3fc87bc71ddf5b71e97c89a53aa959b940f48345876ca0c8d368f4b630776fef51a1cd64496c96c1f75f32cb7d6ad0d92bb0a3c01cffe7"; + sha512 = "b487d98f8f060d34164d78ca77d7e3f28cad212c2c9a8788a6f8f13939a8fba5bd6501765e0bcfeb3c57ce82076187cd158cead63f06b27657018e9b1c63ec6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/cy/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/cy/firefox-56.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "f70dc0dd9c92b9789d8de307a7151836729fb98c55666d13beb66958f3824493adec8a409109be6ee076a26a723e5b9da1c4e6363a881f1546a739978e78e7be"; + sha512 = "3a3fe1ceb21e39bc5ae1f7a33afbdaef00a3fa2e713a8bb094c7ccdb4d724ea3a09907d427f55cefad987482f91db48e8e988b6847132ef2083c65851a95eb88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/da/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/da/firefox-56.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4b9d83ec54935a6249111ef8605c184e3226223038b65cd709b7207d46d5342665fac40bd2672c40f8207a0436fe38be96bc762573d0a6453cd6dec15683df3f"; + sha512 = "c9a9073ba8fe937853feddb194c1168e188aa22fc8cecfce619c0eebc6168feea1b18201bb5cc5bd0ae758b2468dc99444a6c2bd3f248814218af5777e848853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/de/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/de/firefox-56.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "ba2d976917ab0559f4c70140231c2df3c372d7363f897ba92bfecb67f7c58ac6ae4dfbd43724b3404dc8aaf8c72828ea89108c8fd11792a30e34ce9969a3b3af"; + sha512 = "12f5dd9ba04c6986e2764663648e34dbb21f8008919d6834acada2d6c6d409de4d12df026612ad6945be11836ef7db325e6e39e75fef38bd4eba95655e4f3c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/dsb/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/dsb/firefox-56.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "706d77a27896c711fb5660203fee10f22fc902ee5b0dc8d26c95e61c49b8fcd39049fde234143af86b0be562ae162894a9a97613b326ae7011cae9f583a8b08f"; + sha512 = "7e77a0af3a68facd2147d315f8fb0af7ba3defb712b15b1e21591ae2574d7881ceb8fce934b7ad4fe7ed341e5db6697cfcf5b901069771c8475359b4551a24b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/el/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/el/firefox-56.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "da683e296a10a6e548a6838c62d3ffeb26e1ae3e89c5aaad76b10cecdf5712421f2a2cda90105ea1da815c883d5c52da805eb31dc241bd93aa9199201efc9b8e"; + sha512 = "7e577a58a549b67c2c9d1d85750d2f371b1b280555efcf48d16a4ec931f51474a14a424887abbb2de09bc182553d394777496b7abcf34226e63cf43cc4c874cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/en-GB/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/en-GB/firefox-56.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "61f6f0646daa9c530d098b3dd5679fda75161cb26e3b39b69616629ff1674b0cceaa4aa2d6b56826e54f6f4dfe2038b9186637980facfc63abf247765cdf1bd4"; + sha512 = "b7c892f50bdc51e9fde38cef564edc44190adce6b8b36a1d5a301b5677b8ca46b68a31b5caef490e691320e76e8f712ecd7e9d963effca203464a2396345f380"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/en-US/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/en-US/firefox-56.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c6c0573e967681e19667060f239aba9910648213f77d9c7b38b0d9318944ce89062235cbda54e55e0901a23f2a9aa7fdf1a7f02ae94217f6ad554f3ee9010f23"; + sha512 = "52eb7a5344c457535c263c68a6e3b4714a513bf0c3fd5f8796e8bcd0ef9d86346a7757afaf8193a8de41635b88dcb8d5b666dba86e92f75ce267f14c8adcd356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/en-ZA/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/en-ZA/firefox-56.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "7e288b18a6c85549c4239972a2d162ea1288fc5939494f612a9fe2a4ee7f39954506618e354dd3965cbbe221467cf1f74227a42c43f8cef96045defe958fd6d2"; + sha512 = "4a086746611b98886a83759f546738c814577698f92b4d443bc4f0da0f1a8f5956461839bb7c3cf662d9c7386ce8d0828572abe96d17d490ced06257b311bc14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/eo/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/eo/firefox-56.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "9f3074cbcc973fd5bed0ce0b6f6090da9a7ebd05c543a065466a3b0968e58afff473d1637242fadee31840d5cc0504f6001e7cd2849dace0eff4edfd4411349e"; + sha512 = "b65e271afc2cc1da1c9f3b9a6cfc00f6b1dd5e63043ab9c1f17eab024603869269d55efc4bcd713cd8a860f0b79fd77dc21e165e7d8690a720e7faf1c804cded"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-AR/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-AR/firefox-56.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ef56e3dbd4f13b49b05db59e5f89ba3e3188dc7df4d2f340401510cd59620363a3294ef2b95c01e7c3cbb511f2ece013130a09445c314390679401d369067d6f"; + sha512 = "bce196c4e86e0d2dbdcf42f4ef7d876c5afa1b407513a294c98e052ba9c320a4155ef1d41d67fc6ae089e3a57e5402c1fa7092b1efe47f95765d44ee519163d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-CL/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-CL/firefox-56.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "85b0284aa6ce08609ae6e7c874c02a8332ab723debff8bb6d1b500b8da791090b44742908683ca64405dcd85dbfc474b4157f873daedfdb9e678e0bc908e2a63"; + sha512 = "9de7fb8363a8f4c632694de52b86ddf467427e64f4e92fb00c7001b8fa6df8b23ff43d77b74a4277cc1ebede986fbe4d387cf694ba82e35db0f4578382cfe77c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-ES/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-ES/firefox-56.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "36519bebb0e79a405610bac938c8a0183ba857fd733b71bb50f82f9fb16883a52818596f9bd776a56798829cf9d4761658d498069bae228ccb123da266459642"; + sha512 = "9516ec93d60e4b5c6067148d9b9da6b40defba7cd1fe72d4a1b44bd59bc4f0d503dd6a29151aa14404b32d3cd3a95daf05660853ebb3d484845452c852362140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-MX/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-MX/firefox-56.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "93d40e3df17392b4268e4efa1cd9c23d3da1f702b0e0a2305a05a31f80af0ed26738dc4eb6a4db60a7f43e7de13662ddbcae8ceaad972aaeae40a21856d9fb42"; + sha512 = "8d4e0b0f9ad6b3875317e3e7fc0f249b239e1816a4dc335d444433b521460ad16a0374851caee132e58eba3b46005c5a294fb84774ca56084df108d861dbc335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/et/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/et/firefox-56.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "bbbc7dac5d3a122a9a77790d570a8943bacf4bdf1595e1297d26a23cc99efc88de088aae9533b86d573bd10f81fa741ab765177bbf86f2920232ea3a832509a1"; + sha512 = "ef60fa3a4c2933dff4fba6d8bf3f8f79faca16768802fccb4e1ce161bad315acd78abc09f998fc516683fd72fe9187b6a523961210d8629a2efa4f1102469322"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/eu/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/eu/firefox-56.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "a36172e47a17109d2790961f3317dc0a23404856224411393d4bc0a238ff3ea8ef9af46098f215beef85c35a20bc7d515e764ed3a5c4a1cf0da31c019788933f"; + sha512 = "3bf28fe5886583c920da5ba845899674ed06586ac0b36ca353bd40cac4de2ff76d833da55b5d96c45d87e9ae66c33017a20817d4f2761a152750767b6957ae11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fa/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fa/firefox-56.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "c735cf60f7726485fd10d7da09bbd75f0ecb47c84f03fd4b2ed75efa32e906867cd5c99945cb4354792bd7a978c48f61fccb7634e931c370db8c28479023354d"; + sha512 = "c56e142399445b45322a68cef53cecb063a37d24a697509da1333de4817ce1870a18e76745c113b6c3689fae28ec66f60806f478d2e88d2e213e31115558403b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ff/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ff/firefox-56.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "bf54987c9cc48218793e68580fba1f906d9168afa4adaf340c50c21d36859ed01cfc0b0485ba7aa835b1de78afaadee8c137e767589186090308316a4c0aefd8"; + sha512 = "7f868d56a29ef7d03be1fbce98ae4bf7af96db7f7bc4f1729e7d5f0758bdb2e0d0471c3f46046fd21937dd410bf0ae822dc035ebdd27b1f8df3b92032ac5ffff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fi/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fi/firefox-56.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "597cd931f7a639e4e1c0cee220968269a03cb54bf72da2c658803c5ff2707523c6d1cfd9cd301b2b5df7db63f1d6d78b873b709003b67add35108d02a7011596"; + sha512 = "449a103aedbb4596afc4a8b2ddfba5d9885756c7fa6983c25fb609ff3e280a83af4e28b04279b8f5243b46f366b8808b3e6d43286eeb60415d662ebe487e1c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fr/firefox-56.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "54dd3162f6783703b7ebbff0a15d4d733cee206feb59e131cc974cd431f9a83e8fd703c2ea03149dfd2d06289ca0db18e91a95c53a757b6b04abca506240c1f6"; + sha512 = "c171d03ca2b067236087978b86c4e69f6253f1b73b34b198607c4f501893d0fe9baddbcdb28ce033fa796982a8a08885cad361dea673dc572594edfa49c906ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fy-NL/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fy-NL/firefox-56.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "cb9dd1f14d61068f74d7cb1d5368bdffadedc7f53059a66ea845cc7a0118ad01041b4d1b23f038b388fce9df91f962e2db8dc7ae13d35c472d9a2f19ef7f39b9"; + sha512 = "8592c501f694fcbc478670f892bc239e0a7ec152ff386d418d8852cd7489b94665f7bbaccce6bb43ecc376525f23417c6ff7899ab1c30d4276d9b4495612f930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ga-IE/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ga-IE/firefox-56.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "d54a01a07aa3d4c5b66f8fa2653ad06715ebe473756d56e685ccf23596854c1190b871cab8827507b2da0f42b0843d2d696633cdd173a155596ffacf2b8e9a08"; + sha512 = "5e9b9fc017bda23d0a0336054fd5f8e04abc7fcd4c2bd165d27e01e76053ef19e074b83cb547949212c49c3efbfc2c620b0df3841fe46efcd4e269da4bdeff09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gd/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gd/firefox-56.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "bf8e248055b68eb8b04a37aca7711aaeb30401c126e911fd36658ae4fb140bf006f818291fad4dd1d82951ffed74f94d1174420254ef6ea19925276dbe660062"; + sha512 = "500d0360a5b6310f6616343fbfa4ffc5d6dab8e16f99ce1963d7818d9b4fa99c5d93e6d062b9a27ce6b495c0cb6152bf9bd10c677a4a15c912a563ac20066283"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gl/firefox-56.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "527d0febe7c58b7205cfbb21cf2e054bc8f390c28fb6a8e2f317c6bc8d58092b92f9f285dad6da1e01722da5cb198d9cb2f60ec36aef9f03cb87b48674f67b27"; + sha512 = "8cf6391df871e5d8eba58ffdccb4bcc40f97310b880603fb6633053d5b6332b347bc0819b281fed6c0370c15cab63aa78cad92a0791fc7b694ea327c5d265ca5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gn/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gn/firefox-56.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "1599e5a6a242884d9fc13568d4ee48ba925c0d3f9ea6ca4ca1254ed39cd8187813efa86d1f65b8d7aa570f4d35420edf9a6412fe66bac34b748bde4ca9973022"; + sha512 = "23d7ea2d103190f5b6052d06e92fbd56b410301bd2546d55b56d797e02f2d3591d6d9009b8d9b6527219e0ea118811b01b9b97dc85ce9ee6cfd4952e0d442197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gu-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gu-IN/firefox-56.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "f6f1cc145a65c1ecce6e5e5b3293af37e731a24d1d15fb1c8e8c87d37745f823f8156f934931db0542106365a960cc81000cce8df37c863f6db47a48ce2dc382"; + sha512 = "14234d0cab5c8e90385616d7d97b9e9107e4681469cf85fb21b8e4dea052d66fdd99b71b2da3e948cff4a5419f2c609c7b92b03883cb8eb86524f84a137d4c10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/he/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/he/firefox-56.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "fa56346e138b1981a125a5815b880ebdc192e9eba2af5348dbbab3cd601c35e61bb22bfaede27647705c7bfbf11fcec5e0773838dfe50e14cefa716d7f843304"; + sha512 = "d2bd55a5ce635e0355a9639d9f4299b078f30a7a3111df5904c45f7c2751075adf9ae6096fed8e5344d96468f1e3f7eb0a40077609a26636d8071dd2d75cc910"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hi-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hi-IN/firefox-56.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "9176dfa4d5207108217fc9df663797bfb97ddccdb43762db85247f42f3d2c6f2ef309f68cd157f9f4972c80546d131d81c5780dd6ed92d267d8567a7d9420aee"; + sha512 = "634fb324bb4df03e5ecdff8c01ac0cc108b42269652ec76606ba47a5b90d3f9a6ff7cc28c1d1fe0995ab5e36c6124ab10351059f369a0b4e91627aaedb49080c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hr/firefox-56.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "0c1b1845e6aff8cd81dac114b2654ecfdf3176b7b9995c839fabb07fa52cf1ab5ed0cd93cafa969e98ce7fdc7883b7d40fa19e688c7b2e0850db69f71e13e146"; + sha512 = "dfb13315937377347bb8d8804bbbbd1402525739be2b21f01536c04c210d9e4cf6bfb6e1e9a64b4b04bc8001066d0bdbf74873e55cafb2e5008c0e6302c7d967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hsb/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hsb/firefox-56.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "88a6e49f8346f566db7a6807a5999a01ae3b843a2cb16051a7d82b250e8bb7169818ca4fd34893cc8c111ab00d62d7fedba651ba813b3bcdf639e1dc196cac3d"; + sha512 = "4a5df6642eb981bdc27dc3473dd6e267d605e3ac9df350aa13d82350d2e58be6f0bae314371532922fcc9c8d4086678cb744c2502b38305d99c0c6cb010e8146"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hu/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hu/firefox-56.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "0fc08455d35212d8beb1097f7ce7c1ddc5519cc6faa62c9fc6294abe4cc3a020d13d514fb2b4e1b27eebbd351aabda70a1de68bcc3865f85c782bae7a19b0fb8"; + sha512 = "39d9c881d9ff91cb5458a307d04a21e74ab57d653b08b81303f5a0cf72002b128894e6be4f4d1101df4004f2481fad4c6f63d3fe771d5e7dff31a9428f840522"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hy-AM/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hy-AM/firefox-56.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "89c3f56d2f6b4efbdc44e3fcadebbff7ac77b845eaa2f6220e1855f547c6aa14a727a493736f7e913602c6c354f259085bdc66eaa0ba3bdae9ce53a37de991ae"; + sha512 = "0d4e2486577213e7a390d2f4b2d48b54e693748c19fb01c021e356ccf186db25e976324bb589da5040f394a4c5463f4c6f71c691ffcc900644e9996d01ff7cc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/id/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/id/firefox-56.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "6ac431518cdaf8e2bbad23f44793b46c87e205513a3df8c092bdc4b25729ed7355779edd2bf154f9d49fae48747518aa12acb6ef55a3206e0f52ffa53dd2aa5e"; + sha512 = "4c60276f146358a9de2b6c98cd54e0a10c9ae19ca20c2f4e5a6f86b0ca7f9b180604b58e085fda97be9e9457b3f7a1d36ce05ae2010e8a9b5a782679152cc4ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/is/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/is/firefox-56.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b4fde08b7dfb09bedb2fd9fb7e3a1876dbe07ad2eaf7a706bbcda18728d997dac192f736ebcec4c0f3cf0ca2b49804f49030222ce25612987b73539acd98bbf1"; + sha512 = "0c0ad6ed37d5ba059cda0fdf8c8cfbbdb3cb671a81c434d76feda7572d5f71ed4e05884d583d6ffc9a168f8176fabcf1de030d19f018a28e24a341bfe6ac5dd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/it/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/it/firefox-56.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "ab91f86b0f8458e00fad441799056c396600d714316c0a1bf332253ad476c8a00a8b3c5634396fd70d60ff0ba32d6adb1a8ae3b2a01f42d1458b7796b0f09d84"; + sha512 = "80f9a72be17b90f7e81650246c6338bba58ddfeaf911e1f9b3b81137751b32ff90e2945cf700850a72951c582f2a6b1c2e20b024fc5589d0316f583e1c3040d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ja/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ja/firefox-56.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0b7e8d83b677ff51e8ab1c335d9befe05f3cee0444b0dce063b99516381697a985e5ce3d3b80b45ef563766166c65e7ff7d503c04240c44798a8a847ff66e05a"; + sha512 = "f4af35418ef0e77dd7deff58041775097ffdbffd98c0b6b8da5da672535db33caf30648aad020e3be360232105020fbdaa254bbb141166fbc4065446c828a915"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ka/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ka/firefox-56.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c09b1b11629f242918d231a27a3dba59fc8198c0c0a4c5ac2e648be6caf08c0644e89c9452c47b5ab4690f967a67054c4637cc83db6bf64eb6d9d796d5927cd8"; + sha512 = "11f32a5b7a6b0e96728154769a71cc47741f7791610c327acf6e3e9929b09dc0d37feffa00d95d220e0fbed6c7daf4cc040bca86e3368523583f3b15affba9f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/kab/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/kab/firefox-56.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "b78db07da52542eb646c484c567f36c3d56b8613c6ee183ab02735a45397e28dc8cf1da3d42bd5ed0326554c93a4e53f85993f27193df05ea383873ca9767252"; + sha512 = "80ed0a4fa480e89c8925c810bb80f1e43b8f26ed5fef4a8f641081ca59437b6069cca82f27d4437016c1767df00c307d48325a76dccf77d1cb434eecbdb41184"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/kk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/kk/firefox-56.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "dcb8a95db799748531fec235d1c348a5feb04b5a6ae86b93e3adb23b7f1142c4ce12f19c0007b34a9c0a7ecbf8760c476cf99398fb001810fb852c67883cec75"; + sha512 = "639eac112c2a1471d4178304371996314c4eef6567fb205b586bb3e1eb94f87e30e7b10e81027a620a4def25c5e71412f6ba6fa00414d38843873df80745811b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/km/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/km/firefox-56.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "23565ee1f7f0ba89821efdffae8bf2a615e11d8ff74b56425097ee4cdc6abe2795d81513cb7066165c445cbb44f4f8b0bbc1add77f23b797a372cd9068f8794a"; + sha512 = "f6c535a31dda743fa54985b5eeb97e3091243434923ebb75ed75ffb62350133f068251a17e1b2172ddc92dd3520e7d29af7276bfdc711760df855e850d6bcb5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/kn/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/kn/firefox-56.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "4646c1431dbcd96f943268a1a80e87ecb94db9c9d71eca80383c26f02ff8e117b22aba03f4d829b0a381ec04e249b2533fb104a2609437bca7f6b78e143a5d41"; + sha512 = "07b371373494feca79ccba78df2706a9442a6d7ed743e8bdd94619ae1f0c814f66776d4d7f37fdc98a1d157d71a2d22450b5c3d6a39a84a15b63fd9911639f15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ko/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ko/firefox-56.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "efd5b303fec5ab0be91dc457f383fd9cd14ba7f877d2be5b0133d9a8e7fc03b67cc0ebe9414c4ffa3859fa022656185cb78be955483bd749ffce258197b2ba64"; + sha512 = "a39ef1b093a707f1e6e1bd7bfd9affe4684b19bfba33a88e81f51040bb7bde29e9c4ed12a7d49c30959f9a0201a5504fbb3e8300cf738767739d93d92553651c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/lij/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/lij/firefox-56.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "611d457dee0be03eace5e51160466748770e82b4d71617f7cd4aa0e48935c73fbe4334a786d1055be869b32c61cc1c189138650062408e66a382dab12bf9afa9"; + sha512 = "9b4636d1520d94b5955e3f3feeb2aa91463f4e7bfae4cd63e102ff29a6ddbca091e7c27a45b31e14db00b3c2e3b49fff32abd7edbe5cbe6447a4544aadef9f20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/lt/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/lt/firefox-56.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c8760630354790f3c4d9964b594f4813d690ff30d62234c748c7c38758e4428873d55f7b54e5ba7f3c6008b0d5d14ff0b3e4de51d564d9c52b056eaf31753bc3"; + sha512 = "8196df53989aae3ad1ad326ae85b9e24d717e2668b28958e7478a40408aa12dfdebc0df77bee73b7d7bb60ff593d45e650b772b71c17446d38875c2157b61918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/lv/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/lv/firefox-56.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6b074f3f4ef5e1c349db0ddb5e9bdb275af226d10768eb40322c14ec8b4c8d0c6f300d89b20911350ed1bbf84d9e7c28d3d4ed74f7f5944a2a60e13460c1eb3c"; + sha512 = "288f37186f690c21e858cd89c0cffd0dacf1ae8a93b0c3edc9ef9a6438733dbd03f0418c14d9a779723acbbbe4c37a8f587d6ee64375de8d5b1a966df7962b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/mai/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/mai/firefox-56.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "4e9e84e48187535075a0a424c99c5a7d2b5ef1a30e5b86662e295b8116d64a5448588bb9e262edeaa03138ecad46ccaf388ef9d3b053315b3dc77efd08ab2c9f"; + sha512 = "5eee203c914db080e4809df94156f2d431f68c9bab5664c854cb66306e566ca6a45c4b6d683e7e543ceddc91d60964959b661d0a2da9b26f9b461a2e099a37f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/mk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/mk/firefox-56.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "adf41bac2ede4a91ffb3f107ecbfd40e945ad1fe23b44cfd0907400c12e526b8181ade5155ffb669a5f9a3c2ce08d06a5feb49d7faddb51494b6c404372ed083"; + sha512 = "a5ad175c42bf938100b75012732053724edc1940e8ee759e2c248f8c394f5a23f3ec7964ffa282702a6d2eb5831c618457f823490b01c21723e4101b53a29024"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ml/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ml/firefox-56.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "b7d2c89c066cb142ad45098c7580268c4ef6e53588a1cdda100d195047efb33b62ad0ae0c6092810b69799647201526bca3654f3256f82692a678ad357dbd950"; + sha512 = "dd45c351fc34dfc331c4ef9b475ed119dad87ea97be0d33dcafd013a3dfcc6b3975b4305fb4e3734a54b5378ebb8b354b7e91a4d89673f12c5b13ea4adab3287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/mr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/mr/firefox-56.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "932431c5cccbccf0bea43ba18e4463721c78a2d0b87bb53f89b2e3ce7d1d98ff0c22af78e1643010f7ad3a1c74c1ecfc302841b522d24000960711aa469835e5"; + sha512 = "19e6fb31009faed74fde46a969af17090629e5d32963cfc3e041ca0e77fcda09987b96fc109e8a399127794aec531d13a3406309bf84c29c27d8f8f3423de194"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ms/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ms/firefox-56.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "594ea2dcf622aff32d66a8d7336ccfc96abf50429214ae0503c05377c9fc79ba35bad70e05f713b44127e6aba2ef09ae29c7187ec17470645d413b1d1a30924f"; + sha512 = "f34afc4cdfe9fe3d9c2836bbf0588fb39fa11c5b07a4acaddcd3ae44fb9c427f97b49b5579fe84b71b5f64ac3449fa8da9aff89de7395cf65c55b860d1148109"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/my/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/my/firefox-56.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f7135ab56d292beeec62f075eb8e2a958adc95af848408b6d051992ca4def002ed6bbebd6f3733577ee9853bee99d346e6e749ef455aac4646bac3de9812c33d"; + sha512 = "f10f83c008ae871a53598232c6e1a524a21efd9eb669639d16229e340713a6959c0fedd01179c40cb91dccf33af2dc0e21c58ae901aea63d9c334e0a96d9f7a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/nb-NO/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/nb-NO/firefox-56.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "82d1317e251b5c93b8c913a7a0a54b8582ad8a80fa242cf0d4e997f5d09615779a5b1a544a55a68feec2a49144f3a8e13be37a3f32caacfd7ffaae150ab8a4a6"; + sha512 = "0d09dbc8d16648108560f4a45d93b5ebf0ab008e920d060e5cf031cb3c734ac4e0bc0510daca96f016dd729f759a66b6c0ba856256110a47c015511bb203f732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/nl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/nl/firefox-56.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d3ee1e58a46266688aab03a55846bd5cbc9ef96188cbc0c6a723088a71637390d14feb62dc5b1af48659b4bf41466ead9504d8c086eaf1a775d50f30d23982f4"; + sha512 = "4413018700d0040be812f9082e9502fdb56db522a06df336b9a070189c7ef0938a5d830a9072db3bb5e721d25a9a63d3b5105222ff6a808d3dc6fccb1ef193f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/nn-NO/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/nn-NO/firefox-56.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0a07cec43e602baa4fba8ba23c76d820c3fb0a7698968d6324d49b3a2cd88541f9c54998a090be173bcb5b31f0de85c0e5700e83cfc91ca9e448a4886503a346"; + sha512 = "07a6fa48cee70d0cc97b6f6928e70b37be4e9de05e800a95aa1bcb733239129791568a11d75e1e2a647c6e08cb3ecec02979bf75b487ffc54fd11b46fc4d8a3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/or/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/or/firefox-56.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "5fbc52e53d63561249da9c3c33b28504fe7278bf91b218bb683d9d35fbd20ec94ffbb359e9d8ee2c3afa00f1f9bda0f13b07bcf266ccf1f19f647747b5b40b1b"; + sha512 = "4dd3449deedca5a13a26e05a6d13a3d4e2e414f9997f4873668daa03d09873e674ea98f79c98c48fbab86c9a3f32820f8e17eb1fc6111e5bc1ce73da5584eaed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pa-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pa-IN/firefox-56.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "a91a0569b9dd8f5cbbfa66b67f7d737a4cc5cd2178eaee9d5b243230672813caaa17483f10d831c0aba89a2dc97945588a7b06d016aed7c4f6ca5e4ba80cd0c1"; + sha512 = "b09bcd351a39c9c9cae213f18cd3ec49af8dd7d203a37f0ece99b54d7ad81aa711fc54b1b772502bcc071fa18a0a7f6af8d99b62bdc00437a0ef667d459426b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pl/firefox-56.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "fd2dd21020116fc81e91c2ad92827e58803d06ecb63069953f7a6d49321152dbbee83d84aee280f9a2306220986a4e56dca36f0df771e61e950389b0981b6058"; + sha512 = "910f5f8b9b34b20b4ed86f444c905171d23f459cc4a37f6fc700d5386a22758b51ffd8a9b3f747fe339f4be3a4967318c0bfb6f618c0602e8daf2369b6f95f07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pt-BR/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pt-BR/firefox-56.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e1eacb5b8da228b881503b0e1e43de40b7dd6808690011fbef6c5b367ec7d9edf1ae7df8d2e65ce6239a00a5b20296739dccc8086fbbd3634ae7153f2704a847"; + sha512 = "ea5b6fcde8864aad6a3e005e5cd46e9e4c26b6de1b1bca8490e10ed2f7c7bbf44d93105c64c280327485b3537ca1354e8ea2749328a536a06fd0e34b70990ee9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pt-PT/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pt-PT/firefox-56.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "240094ce50b49a3537cb5b6e80dd2381309ea7684eacd5b7fa207f097b75728d48041ed0ce7eced5ae6da20ab769d4d8730eef0dacf534d5b1dc701730937503"; + sha512 = "4bf071edcbd35a2b556d3593a70df66024f871a49abf32812c2e25cf3a9fb466ae87e6a958a5299c54972c68807b8154995eb7bc268bdb8cfffe32cd80f96b88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/rm/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/rm/firefox-56.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "78191dbb18f1cd6ab2425ad6ba38402fe98e20888fea662b3b6c347751de512439bb3cf349ffb2daaba93011cd33a2cecd6e383a45800224ccf9443ca4c2075b"; + sha512 = "7dfe47e52cc71504cd1f4682bfed645a1fa1b622cf75f07cb650f8c42863cc9b5cb0d4b10c74e1e075c95155df8a52a08ddd4b13da45fc99e4c453a0c46845f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ro/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ro/firefox-56.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "b62b8c628864e176eddf410a402dcb5e39bec295ce97891b054b13727591cdf4ccd2973825e513929808c67a7519cd3aa550040eb359dea18b97bb4f01ea3dd8"; + sha512 = "25fc42b92545f9219bd4d1502bd05b3ab848b590118fbc9d44dde00cd64e033016aba7eb2918de1d5a80e307b9743cd508567f076bc3de1eec2af966b126f574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ru/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ru/firefox-56.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "51e61b637de95df9a400416546003fa5105390acd48aa1f8a3511b39fab76c83a6ba3d41cd5b15148837ea2df295dff06ef7baabaf44994130f0be73af4e13d7"; + sha512 = "fdb9d2c7fd6708231b2b5b617a7d89698d77167a53e21cea7bd0da47b32bdfb5858e8c74c616e7265cac7095652829eb26e73d91c0949c3a11f238637bba56d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/si/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/si/firefox-56.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "3ff9503a991fc935cc7f0afbf69f76b1cb0ad68c21348bb9034c6af6e262fc87f49ffc0025702846b0c85d72b371cd573ad3147fa9dadf04ba846b22033aac62"; + sha512 = "60663c3a8e66d416015dcb80b01eb991b28f7e0715a24d1fa3f1725bacd7d02360eaec1b7e75257a06cfc8bb9a7a960d654e52a9a128490df5c1821514388d94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sk/firefox-56.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4d574e1381c689f847b1d2be8f8f8e5d31d9e3e7765da00ae44d801716bfad56c1cdf18824bc203b6ca8124e9ab598b938c9082b57482146cbb7dfd6607bdb3c"; + sha512 = "c0774271d098dc55be6154d2f687b4dc0018b359a4fab9a073818f0333c9a513a4f5934aa33948d40f59f10f79812741206eca43804ef3e1c9bba5a386355db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sl/firefox-56.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "a960a47cd5349e6c7073052672273c8a889e3d8650453f99ff118313ad692e9a0ae5ff8777ac52fc69a40e24665064d03e4cff4942796d554b75a1e4168f5790"; + sha512 = "8a87e18213b70b0e25ba89fded209d2d0782f844f492fdf8f0d3beaa35d3c67ed3a537418c14c2e68ee3b20fd829475bfa763ccadad0b4ff06046dd0127927ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/son/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/son/firefox-56.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "c2a18b625ca95c4e4070409bf7a4bf42d0338c6b4c8065938297b4c0834c7018271e8d6001b8fde382719ca313d5ebae9dd811499e84e1ee917c8b3a512f8534"; + sha512 = "bd84d6da25363521111b7dbe1153cfdc1b17a5eced2ade76a841c60cbe11a00d274b9a556f5320698a1ee846faaad5ceb42bd79e0164e14efadcf31796244bf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sq/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sq/firefox-56.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "588076f33cab37b746ef25362a55c1cd8455a1c4ebf55dcf079b16b19cd7dd77a9c1cd57496117b5c3fb3907b1b047649f4e6f6eb0ed2e0e034ffa291e6f9b91"; + sha512 = "955f7b8b8bc497325dfdfea24264c6784907f86340cdec78ffa01a79a10bd58154341960f0e6fcdc1504d9b5cd7d44b7b3ef9be348695b47089701a7e1c832b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sr/firefox-56.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "995b5a57fdb617f1b8ceecbdd22ee408e4d83b73ed5b2cc49abda0a4de5d6ca0d5bd54346efcbb2d181b5a77d978e4611e7235bf66b3c501dc25785a4afb737b"; + sha512 = "85562676547412364aa8043b9e4cada72b46e078628686fddab5444c7a8d5fd8d363d0429efa67478d290cc1671b52948095a75566e98993f49c04cda3f20881"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sv-SE/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sv-SE/firefox-56.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "050c87742013c5de08d072171a10ff365ac50f2900c65039f3ed699b206a684323bd08c7941027eb6f6f7862ba8bd7011054e83f92fb0a9e9a3f208bd1e4617a"; + sha512 = "4a7aae7ae216e3db74f2f77bb747e06f69abbda483e2cb59bf7906e23b18b612461e08b5360abadec61ccb5ad39d536453376db35dd130df5d5173807a9ecc06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ta/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ta/firefox-56.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "8ba9e5eceb691c34c067a620167de35a130c3cbf67f0dd5417c27915b507891939d9080c9b7b3616ce939a17c153c8204639b7e3b431d564d43f79783a61b857"; + sha512 = "510eec52d5d41e3ac7e7759d78e572ce2b7d7235d39e3cd01925dbc43c71f46d6b90493db27a45f6a36a50089173f70a301591b00ade07372ee08a2fcdeba2f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/te/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/te/firefox-56.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "c57380183538fd0a54a98f6fc9a9ad2a37c8a26f7beea65967b18ace44b88d2231a3509e643204322bd2c8111b8e9edd176a0712a32b34e4078c686a3b138bb9"; + sha512 = "8c0936ccc1a92126573495e5747f6739c0995fb7280e686b31fa62e6c2c7a6527aba36c9ec1043cb5a3244fac368c899b9ac5afa30b0d121fbe97d1a9a41d7ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/th/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/th/firefox-56.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "bb9c8c108ba03016bffbcdc66dd5972df779c55349db431acc289ce2e8d299b930e9f17c8e3eac04b17a50e3e226eb73df91b8de0ee690915de8b3dccd7ddb2d"; + sha512 = "ca7f55274ff6171f297904d9be0451294cfdf9fef93bccf51f8880e3b69237daa9058de6f8e272b754d85fedbd69144cb1337b653f47029a212fbc938bcca9b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/tr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/tr/firefox-56.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2bb15f16c35021a319ea79b653185fc87e81fb55764eda65f78d049dfc876c3b95828fab69bbf7521738cb2107e8cf16c2bae40332d2ce891aefc086ec582b30"; + sha512 = "b82558a077b562b485984d3864966135d5be8fd27a1b266d59beb4e2f1cc556b40d29133c63f3666eaf22f7eeb174fdf4f16e0e0804ae73a68e57f16f5d900aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/uk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/uk/firefox-56.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bcb377c223a8f969b78832ce581dd4f21c4ef08409445faf3409651ec28f66361d8fda763104a6e39590e2e02ced75d7d0554d643e96a33784d471e9f1aba06a"; + sha512 = "7f291c45f4b5569b3cac12f91538073a1c4e52be473c2e6b9c7974dfddaf85696c78f3b08849d960f1fbbac7d6f750d1e1cfd22993daeca1ebb2cbe3c98b0002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ur/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ur/firefox-56.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "dfe75ccf52fa8a9d96309162e6499074446c609664a2d0971b9a7a0d64ccd4923494975af8d9b1710d7d5093b259d4ec56f43faeca331fbaf2c435f3cd5ed406"; + sha512 = "733a8362e3abe0b7cd6fa94bec4dec3f317ccb08cece1c495ef712f0764f732878880a3cb5b90c54fa67bbf9531b1e4ceb8cf888e3b505f955252ee7f9e46390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/uz/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/uz/firefox-56.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "81618bda3809d1c489fdd03be8aeb440a7963464efc381664d6ebeae5d106cc36008977592a16ad629711a00a731f25cd651f789f84260add8f272cb7f6d39e0"; + sha512 = "d5e35145dc54462297e48fe8f4ef1e743ee9b164c9cf45604f293cd2d1433908ef26b3460d961669472c061a2572c655beee9d9c44ecadb153e1ad5bcc161e97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/vi/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/vi/firefox-56.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "08d962b2ba18586e8bfc32d55ff800ce86125d59a7bdf6e6cb554b76d069aca86835cbe3985ff23c0462ab9f65758a12a0bcece39ce192d37d2eb2b66db8eaa6"; + sha512 = "428950b7fb6152de6fe8beb1b1e8f42a5d0d112b20be1a502fed6534441c4fb3fdf2e30b45e71f2d463aa622657ef3784730204af8e853de0847a68332450144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/xh/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/xh/firefox-56.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fdf12790a573445cd48c5313579cb3d4016cde9ff8283c5adb63c7e51b6e2b42aa855f331842ecaf62c99c30641ed7b8531e9b2fefa3de1ee03530bafb12ee30"; + sha512 = "6127dac54537eb2fcc689acb20ce1ecfa8c8ace6f9c62b6f096b2bb4d9c7d47a70fedb9891afc1f5e0ec286ae8d04e677ab833e6fa534a8f8d4a728977624694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/zh-CN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/zh-CN/firefox-56.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "e828b745ee8526a2acea5a701982240172050342e0df0efc15dd87dfaea0271d42f7bc06435d4bc4af657f725462de49df8232d985debe15514d19d50b184663"; + sha512 = "648ba81769c529476ef7a5875a518ce5aeb49466af86b5d07e411adf7abbab4f90134ae994e3009dd62767aee0376973b08247c8222bfc6359e4cff6b8a19918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/zh-TW/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/zh-TW/firefox-56.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c1b058d91c7b8d242238bd8411bfb339e2712b6c550329bd06fac837faf453320310cf0d11597e9ca6d5d9abf084ad761a6701deeb6673547fcd60a094c6452f"; + sha512 = "230ea83c02b46c856f35ff15c6e9ece08e55b4407dc9e65411e92e1f6a8db15fadc3da44ae8a610b9ab96bf29a052c1d42a8b75d7346d242e8a9135b62e5ab09"; } ]; } From 3192244f8af83369bb562e2df6c41ab5ed45f5bc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 7 Oct 2017 11:48:13 +0800 Subject: [PATCH 0799/2806] firefox-devedition-bin: 57.0b4 -> 57.0b6 --- .../firefox-bin/devedition_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 2ce8dd8190e..6834a57c015 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b4"; + version = "57.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ach/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ach/firefox-57.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "89c24fdc8c2f6890239c9cf907a52ff18a20d46286aef8397ca0ea70ad3ef213286728e80c1bdc288f9f3f5ddde6177c0573f3e25e18cd88169bf4509ce1f647"; + sha512 = "32572bd7029c8123909c35c36d8790efec84b57ffe1607cdbe4b7f9ebf3d09d5b4e750d1c347094790647eddfc3ec20f083576033b2fe5ee147787247d316a1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/af/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/af/firefox-57.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "d262ac9e5f477afdcec1244d2e70684e308cf9783f94da76d2401a0dc24223d19f1ed7e9deb51dd682292213f1cbcf70439275387aab509205b5f618414d9563"; + sha512 = "edfda6b78cc45d7f78f59f23e074abc605a7776b27b89b7bd8d0c171eab9843716af28bdc81b53c993ea16d0e057611fdbc4c3fad7c2d6781ee1847e759057c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/an/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/an/firefox-57.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "bc8ba4a5732591680a8a7cfe6bf56f23fb40782ec439a1a8eadd822b11d6ffd830b82a67e4b99b60a607907597abeebb35ea838695f75c48fd6e3b9341d577ab"; + sha512 = "0a6b80080457500b2b0757491d74696eca3132123f146c17b75ceeb5478bf8ff6a4fbc6e397bd08424ca1df36b82f3b9903bd5f7d5b57d52cb82d9e19ecb8d78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ar/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ar/firefox-57.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "23093e975a8401e306a876f47aa5c1afd93e1d17e5d9f915e967397f1c920456fc63fec2312aff23d076105cc4f567050317f3d48a1d32a016313a51df7e7f4b"; + sha512 = "07001d159fb27773b16a8b8a38d9f6585b2304dfd9f02c9210b0dfabaebc8437ff7ecbe6d86d4f9065ebf67a89206ca870c339e0dcb70c1ee265660bfa060f08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/as/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/as/firefox-57.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "8c179446514b3ff29e708064418c035c5a138776c8dfd957562302e192829994813ebf27fb491e0cd204399dc1ccc04f6eb5598c87dcca53e507db7656557f8c"; + sha512 = "caf3f545e2bccf5566d2b5913ace96ebd304951a1428790219b74d8fa4461fe8fcae97af30c60c6fddd4cea88f5ad65251db656774acb8bad730ccb75b2ee425"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ast/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ast/firefox-57.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "4a2bb2543e66936dbe1bb5d80c3478ebeb00eb11fb8a83c8aab18440b93e4cb59c24fb7b14687f940d19cff4c9a36e255766ae712c224a02635e41e5e2e84a18"; + sha512 = "b1660d8c853fa8a322d112241c926f48f63e244baa8fde8e7fe5f703a65656c1c33ef33c6ffe77c9f9f2147f8d27f2cf24782c794670034719fbd5b78a9bcc04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/az/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/az/firefox-57.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "cb2cfa9956725d58eacb6b5d9317cb050ef959cd92b64fe2de5c3390855e0976d5a79805c134f36d80bad1c2aa71204bc04163c0a1bebf6977a96449f603d0fd"; + sha512 = "2d299a7a9aa0e8eadb47cbe2651f4fddb09c21984396d3f41d3d65faa05324768c4a7d88c273dbb3c937aa65086124919f77b0f4a1541d48534a70a01d7077dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/be/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/be/firefox-57.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "33555541b57d1e056bd2706834ca47f9b93ca70a1a81535189a49e50633f164372ffa5b36a0d47607edadc93b0e1b502ccec22aa6956764e0461cd5ffad133de"; + sha512 = "75a7456d7e7b43118363d0ca7ce24ae6e2727c23542808731a3351c97e2d7fcf2aae44aeb9fdc460dce7ab582d4c8e1a59abbef51284f4fc85e8402307510dc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bg/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bg/firefox-57.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "6a829c951817812dc021f76267dfe86c2e1ab81640f1538754b894ce8ffa4d0bafbe19cab81bb96d1b3177ee2c65312f7ec70fc68effe06f9a5a79884b69a951"; + sha512 = "ca4be119b8cad3fc84eef3eaa0dc86ce9f6322ad39fa815449866ea13c343ca421c0d2de47de91e5f6ffba0be3d3e04af4442e55b8ef44b4b6ef48fd6ec8bfbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bn-BD/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bn-BD/firefox-57.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f1e96e42d57ecde22ebf14534a96b7253dee92cfae55fa6d9c5570060abb9f25a871ff73357f84f1b015d31b792b77568d5aee434f74576ddf15f9e62110fb74"; + sha512 = "4b423a596cdf870b17c2744ba440e0cd7cba5218f76c1a1c9d088c4f1743f5d6f34dd7b0798221b26796afc5e888bdcd2246a84c446d543753c6bb80a9fce701"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bn-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bn-IN/firefox-57.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ade99a45c062478797b570e5887e8702544f6bf47cee57df6b6493d05c099fa274c335ed84723df8a699aed58996bef3379ea76b7d6290212cd5a532c2158c35"; + sha512 = "ef308ca2bc4eae44d95bf791b42e1950fc969b750e5945b1fd2b1241d1768d0262065ef5f2a5afd8eb422291977e797c7f6fc65a2e81c88bf9f8c6b092be02bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/br/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/br/firefox-57.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "cd7cfec9f80673147b07118e71608f3486b8f53b3d9b0fdf4052c9afd2d93e6dbe87f6d10d68a658e7d958a832961d47aa663d2d08e1e2c217f5dacc446f9221"; + sha512 = "37660bc33778bbbb6831710fe34e28d07a52fd1f2a5a3f003d32e89f7f3506bd69f97c45546816f2737ff21a280274f1e3b68ede955820a127941b293aaf5f71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bs/firefox-57.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "01bd5f3a28f24441f41f06becd22e4f5c409b2c7f4eaa19685ce49606e26f598874268adf7a579aafdd17159ec4ede03cedaba37a3168bdd19162f10af7ccbfd"; + sha512 = "fb60c35fd1782d5553f8d479613bd037c6014f7bc15797835bd63537df86146e075879cbe5a144b7f2aa9c2a171f6fd13abe7ea6376cb431f6733305aae79594"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ca/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ca/firefox-57.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "dffb22850e7ec4b98484de8c1e92faf62dfad8c8a221ac96d393e11e53c2bdc638fc1d3d1bff2987e483f6a7784eb812d9a1aed79278b1c371bca27d23904551"; + sha512 = "abc66fc5ab47aaf90325df0f699df3db0161fea9ea72d19437e9345b0d3740e80c8e435455941c3eb60aada521c1690dc05f22f833e2ef340677aa85960b46a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/cak/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cak/firefox-57.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "52906187bc01333ff67bc6ce4f493412ed77bf85b6bb18d06520acac5fed6790db9fe23c2c4bbc751706a6232e42ca62a566523ef4d074410b96a54651023315"; + sha512 = "7df49494bc2bb59c42f025e89081a3825ec27cf17a27deca9c7aa2757ff8c2e6b5598bed06af0699fbd3d15d0e15aa88c38908ca0a96008a8382a5b4fb058c4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/cs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cs/firefox-57.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "749d3d5781f266324aaa8c7d3bab777ac23518fc69bd3f1e1f4b3dbeb28cab17372327ca5622aad3841a56c52458c7cb4cff1d43b4fcc47a0e071f4c83f07fbe"; + sha512 = "316884a24ba4aab3f65df9703ec7b4f201f9536e8b3f8648addc274fd99bb4d5a930e4499be319e040a90097c6b0450a3434a2b1f264625baea5f27b87271233"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/cy/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cy/firefox-57.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ed5cdd72190aaa2a7cb762bf5ed3c5e1fa7f6b2e0b168810b4f229421965520ad796ed27ca6c0c4e221d63c43c8034ee1bdecf46caa913d48c6e5eec1c132613"; + sha512 = "929f32656a4c0ced25edc962d43d4baf4119ae75601cb8b5babc88cff953721edda2ac3e300762a8201a161db0d28abf2823de01b96dee4b36721a986d1cfded"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/da/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/da/firefox-57.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "84194c9496c0f74a4880a4d1d18c9c1c9b82a684cc9b1316d8f31980e8bed40125b68eea826063a6c12e04f7d55128fd34a954dfaaa37182f56eeb485867c3e2"; + sha512 = "a8591c86d85a02c146b4695ccd9839eb311e371db420d05301359c833dbc462bbf33886926c602dcf21f8dd69d76fadb5aba875307b24e5553005fcdd47e0cf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/de/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/de/firefox-57.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "57e129dac6eea631934e1c0be296fa8cbb54dfef73d5a2233655a5a08589dfdb4794eaff22515f000f6fdfa761b9c24e6d72dbdd406153047eaccc57328cea42"; + sha512 = "8156fa17843960aa2913a1f12a59e6f3827dad26d4547cc5758888c7586e1a04360a5f41087356002c110f9ac60fade703291b7fd462cdf11cf00858dd45edb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/dsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/dsb/firefox-57.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "b3c00e1aef9f55d75a93d7c5c48b6e02bad615c893394055d82a1aefab32e1a5edd82d48f8e0c0c9b550c390b543ffd91a5ef104ab39562025c3fb3992ba1802"; + sha512 = "8d79d413a486073329f40caacffda50f8dc0675dc7d99d48fec9b79b7463cda180e6717fb15cdcb6c4f5aa89984a17c77f3703feb6865d802fbccefc66eb4452"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/el/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/el/firefox-57.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "1031ec1f99f03fbb52da4dcf7022bd056fb4a59e15211eb90465cb7a38b42733621bccabbef26d582e9c9fbef20b5d8df4d2c1b96892653220abb02a2e026758"; + sha512 = "17619db107b1a35c0fb8cd0130517529e9cae38730aed31fc92340379228df3435b45b88038bfe421bf4833eb78ed995997456529e15fbf3ef9c823738dfda5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/en-GB/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-GB/firefox-57.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "92ddb6e3253d09be9869bf43f46cc438a179a8548011c28f034100aacd4c7c713b3235beca9aca6c8cd3374fe30924b47706f848f9db4ff48faa1b40b83f96b0"; + sha512 = "5d699c809ea1dac35a73fdfcc3c7c7be5e7f35a34dff1c8e1c5a7e536d72b445c3bc3197ec53cfdcf22a9d9ae43326c958b5d0820218356beafc95690d702860"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/en-US/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-US/firefox-57.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "039bbed397137d411448f4090ee7df8b32e119e844547d209105e3d30782c68ef4fc6ebff5d4747efb897dddf3d07d21201d42a6084821ccc82b98b3d6588cf1"; + sha512 = "521728456d45ceba010ba8c8dcdcb581d08d64aad0f40294a0f1ecb1fef702e669cca37e35d35a89ef1b9e5bf891d72853aacf225a866c0e0e26ee9d61841efd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/en-ZA/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-ZA/firefox-57.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "3cddea06dbfd115013f3c29d7dbbab73fbb4546b6aa16db708c88dd1a042e885e262e1eafcce76091b881cf74a4e55479d0362acc8b0fcb06fdbbee3ff4c2b97"; + sha512 = "f86a0034a310fe26d276fcf867c85647bda35f07bca2cfbac289523a618493e7200668bccf2928f0e56f6f789be4db76f2e344cb3a92c63b6af15a3b682f0cbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/eo/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/eo/firefox-57.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "0ba19868f136b4a621df3990a784993f78ccdff291ba61aff85e1db692d090e9e5bf1721cf71dd61714d8ebb78c8b6f9bf1ea423075a69ae21415bae93f4b7e4"; + sha512 = "89ea9fff345bcb88bd67eb1c10afb08efb68988c95aa2e489ed706acef083dfb9a1d0c91f00247f7a0afa92592208f356f8539ead8286b4f722014792bfac2a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-AR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-AR/firefox-57.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d4bfe8cc057abfe1ad51ce4e2aa76bfab5db4fe9fc256d7d4fe6810f434ec7c5068f9c9f07dba7b358978d733176c3eff7986a96856b0bc662a92a73727d1578"; + sha512 = "89c07f845771e87e434b36fcf5e9dae459d6b47dfe74715581972ba65cf78418c354eaeb28547de532ae7e53869bff6e94feb9fcf37c7eaead54282e883b0a16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-CL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-CL/firefox-57.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "7a17c0314dab8e29163a18d7e14d5963d908b8b290d5f8fc3f34c4b2b4eecb036d5f41d9f2d1ac4334c4a9c082831ecf01f8d0540573caf4c611b2da3658f4ce"; + sha512 = "c03d76db5d9f8f312077fab403712eebe364ac0f25aa57c754f2c2ef42082a475c0fa8e7447f1bd3bbb72aa0849d1604371c63bd28444db568d42c9f2829ccc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-ES/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-ES/firefox-57.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "27c859d93a32cbc1501243b975eccbcef0e7b0b41d3149ed941197e61b1d48d85247a8c5bd22e3cfa445d42ca2f8d44e7b95ddc165e703d3afaf41a499b158ad"; + sha512 = "570b824ca0671c8444e5dff3a837c1726f47b2cb033099d051a1853215c80b928c2a54b129e0d75fa888fff3115e1a51383444737f739f98076b53c44ce6a2a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-MX/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-MX/firefox-57.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "6f570232aaaa41332f69b7df59ec3822870e53e8f8c012dddefb36bcd2c6252677e63d8be837d0f6007a72ced19b88b5e9b1f837a72a97ba271e086e1f7c43b4"; + sha512 = "1c40abca0e01db35a53afd628e7eb15a9448c6fcf1ad1655f2c201373ee8526c2ebd749715f068254757218be91d25d00c3016132841612c9d5b1fe0ded792f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/et/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/et/firefox-57.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7c5b92e5801824f3e3174dc5d9bd4604689520d7c466658d0c987eb0351bb0c24ae4fbed019aa71e57309d2458cee38bfa4aaf6a6f122e8ae73493c44f177156"; + sha512 = "4df4f29036d1f536b88a95fe78936beff16f0b7ff1c2394b0c10af6f12b0b6594866816d162d700d8ba28307b52cdec46090dfe77dcf161716bfc1266173b05e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/eu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/eu/firefox-57.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "9717f966ef2d75666258ea45c100645c2a078b4ca2ce0e9090058b65e4eb605f1715ef834251032bec627ee66e63ff11c85af6e7cdb97ee74285a0853bcf6d85"; + sha512 = "6474ed745f607d8b989ae1bc72c47717fadb63875a706349269d26ed1aae990e4784e2c5147dc93b6e2339562c568f5539d74522b66f94843dc9373b41e1b7b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fa/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fa/firefox-57.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "44e20e83215619ff639ec12c5e60d5435d617438a7934d7e6d5cc6e865c3b6caba184fa8a786576c127eead4d87cc37cb6ba9cae72d59ee822d746d5790d2381"; + sha512 = "6f9c61132f2310c4c0b08ab7356712acae16cca16e66d82cbd77cb9c45e90868b1f901b68334d9e462dd2598e95c3c05b74c5026ede1f01e69ea8090d7fa6e26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ff/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ff/firefox-57.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c2fc1b3b865652b90c8ac44322369b2278cbf4d95531111d4bc29735878660d8c4bdc58d8a2217454ec3880222a3d695b874d06173536217a5391314f087dcf6"; + sha512 = "9551db4c78847a6f8a0431ee47522a7923f9029fcabfdcdf05bad26b238af9926a6b6a1c21bda2b38e87b67ae90b0a33a09c2477504b865c41854b38acef1a1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fi/firefox-57.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8253a890bb6db0eb278d828c51cbeae4331c55b2b4e36ce089249567ae74570008feb72929534750bc47b8ccacd64802e63faf00c354622a548a5fd1377b49e8"; + sha512 = "8d86d0feff634ffdae2be5c691a0da072e86a255addaccc93d9e6ab849fc58b43c2b0bf5b01ecdb28711e88721ef87b772118f096d2da5c893d95acc804ac4fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fr/firefox-57.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "df0483afb1bc2b2981290fe6a0789ad153ca529700b86a7f995303b22331b5faf17ca3bcc916f2bfe5efadf66d0b08d315c6c8cfea0073e1a31e35769cd00761"; + sha512 = "7784d578af3cc764409f52f72a8de78866088485037512f2d0ed6d7abe6c2881fb14474e4a17e9829d6185a185df9519e7449170af4223c93a0277a2b6264783"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fy-NL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fy-NL/firefox-57.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "38ea18ffd76eb89f317696c9bdd2bdf3061579b277680d86a85f655f915c75d9b0452bd320f8818a890e1b6332c22eca98c5c0fa2180d25586ccb278019df67b"; + sha512 = "3d986bc10f2a4ae11319e08db71cd50cf8aed27550831a399a99709a73abda01bc2bb85857bdffe5cbea06470c8e78d5ceec94bd93b5c5e714620b975260b53a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ga-IE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ga-IE/firefox-57.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "86c90f9f4dacd8111337341dfce981edf919c176c9ce08747619380de2ee1ed1ebd8b1f15d18e7d96f7db3b89fec6012421dd8d6c4f84707ddf98d30bd019db6"; + sha512 = "8b6728c64452d533f59a899fff367ad03b5b0309fd908086125ddf9c924bb6acbc3a48b35c9787b69e598ef1046a179c0ddc0dc7735fed3fb2176e4c875a054f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gd/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gd/firefox-57.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "eafb289aa4e7f6979a9578794c6f119eff119ed606b576ef732a2f6838455b0358f4c7acc6103ffee35a0dd5cda6e5438ae83b73dfc9ba0d65dba95e38e274d7"; + sha512 = "d511fca44339a41bb9c1e9d72ac333793ebd3b0dbc3a1331b1d230246aa6bd109905aa3fca44212328c3c710868b1de3dba3a2ed4d1f98f2916c14841eba9c6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gl/firefox-57.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "bc52599558f41f399ce45449ecfff16f8a053f56808c85714a8c9e58187e440411a80b8047e46ee4cbf364e4e32eab16a13e31276b1d6d4380f3da5ebaee6fc0"; + sha512 = "a817aa07f4ecb4d20a14ac7a69a8163c16a9916cc3315c27240356fcad2ee9ae1fd284d6c28b7f6cf587f45959788c2354e3625e83fbf6ea1051d932473ff8d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gn/firefox-57.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c4e521fa548e7fa0e5210f419fe5d76d357eff83e64b2755a708a3126d2404e31e929858eb216ef7891dc39870e8599f9f18b2743678f392275f589f90af8cd4"; + sha512 = "fda261cf0d175e9304dee206f2aa9874dea15422098e2701a269e66a72191167bc56c18c80399a5b703337ab2171925b7ef0410f54bbb265e3245fe4683a42a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gu-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gu-IN/firefox-57.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "5981274b6889b5e21ecd80a37f14b1c41ea217a7fe59d68e8d545fd6ab0aa8b3af0b3caf242f9aac9cc67eeae4f6b989050a17f180ec5594558fdf10cab21825"; + sha512 = "90c0219912fbed11ef6ecd620fbc1ebbb3324bbb36f049c97fa18402e1a71667c74e5aeab81efbad6093a477fbc0f1a8a96b9d43efc514cc3a8fc657dda063da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/he/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/he/firefox-57.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7f321af8d6c3dabd58afdfdb30f2f8bc77b8bd6c1824016464d1713e570d90ddc3e07c77b46972aff603ce804e0181090ba0a2993a838cf82244bcace82734ad"; + sha512 = "bc8e3a2ce6c6cde3193469247f666159a9f5581a739e20f89d0c9f05d83eda48a6e4211b057df0e201797c7d235ca5b48b56b27a3d7ff9e5b3a80e3f120b4848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hi-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hi-IN/firefox-57.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "79764ad66fb22cd375b121ccc2f5ef4673a9a589fb2c4a1f58185b80f84d1dfa33e960475faebbcdecef95d7aed16bd6cc9f064a48e0db81d1732d31ee7e6aea"; + sha512 = "f69208237376f4a4f129c15f4f05fd7f2bdceddf0a78cb5498f7bd3db9a466cea6a25429e7a164716cf42bcc4b7c2030ecd452a2dcde4763f2eaa9f1a698d991"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hr/firefox-57.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "77dd03a3c6328c38e022cee9e101ab8114dc8632067737c937313cd45e9fb669ac7bc88d5dde2733a0461c7e4bdf8dba65524cee4e5ba3cfec704e3b205406ea"; + sha512 = "a7cf9db82a924d3a7579fbeccc93b31bbeffe9d044bb71813b3e493d0de40e646860f7fbacca8424d6977cb750c1bd3766ab0ef032113908bf4f4d010c91494e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hsb/firefox-57.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "0b916b5b97acba7674e1fd6dca9c437cb5feb352cd6e98f31fd9f9e24b532d5309b9dba2e2936b2c2775488f0e0262f849ac08d4878d6a8329115e781f46ce4f"; + sha512 = "3c6f7fc20aa02c3701d8155dcbab0df13e6692760613ad87f27df2ca0ff5615b927bca9b7359914f07f976354d697b54d5ae306644a7e7aa312500df28353204"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hu/firefox-57.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "48564c044d224ab4a02d0b33479a824b1e3d801a0d9e310b1ef2b8d2fe27dc392553af688b213be013c2b12bf22bec6cd69482682c9290dfb301187d0af03db8"; + sha512 = "4f581f0f917fefffd6b7df0c570e3107d36232a9feaf5f5bb9b63bdcb51a0b8f8ec27a6d54a7a73ab17ca579fa95d3be601beca35eca2765ce019f3fda8d9f1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hy-AM/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hy-AM/firefox-57.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "93b53ce5a08bfc9bcb7e9c59ae9a50891778625e6b716d317097ab2af5cc972df270e205b37b41801eb315f2a73d469b5922a753e838e7fff4e6cc827ce682c4"; + sha512 = "1a088aa909fe0feef415698a03665567665f37e1dcf3fe033c45cd7d591a4708f392439b11ec7b96922139575d4edc8442ba08a8974c36255c7a7c349d4ed059"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/id/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/id/firefox-57.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "dba243ba98ee8674bb9a252e88c6970efbe68e27ab363eea8d69769925139d2f71dc34816ae6738992b5bb07b715d6ad82be19fe7db886b366558051e7b25cdb"; + sha512 = "d185592907cda25a41dc8003b2bad9389dc1b56f5d6bf584e3f248abe0bde5ab548c055a039127b18960635338ccf28eea0fd8fd9c1c60f394a8df44f1644fc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/is/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/is/firefox-57.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9f997a155617259f13117e5be74c286e66ef8c0440869ccb6e2c531185a26c6c64c6c4c4d6a0adb49a589d85ac3a7e90ed1df602dcee594e6a84f1c9f245ed40"; + sha512 = "ab1fce5528ef7ca3b08eb21d1a653a91403952165a2a16ab0c270a0e799a616858017e2fa8015952556bb8bc132971453e799b01861e078e8774d3db0686b1cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/it/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/it/firefox-57.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "185fa90e5dc1a755e2bc109b8867433b8dceb4caa00451d4358f694b6e3be4778cc1fde187e092a0bb37051eb65f0b8209dad709d87233c604d53124650e94ab"; + sha512 = "3b0bb483fdbdae0895ab60032ec09ddc40cd5db4b414fe440e8a449cf06c1b28eafee0aba0f8b05bd7fe278dbef8039ad5d44f9c627198ab1d7aedb483f6e2dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ja/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ja/firefox-57.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a3ea11ce5fac0039b08b14f7b83ca00265c6f26e0504b5a0d74d234f9c214e44394253165a01e82fce416a998034b2bc121cf79e9cf28d7795dc2cd9ab48b0af"; + sha512 = "4acec36fe9193d742dac566677526eb0fbf028aaa3f3ba7226667d1ed6e74dd372f7493f01fe0a289aa0ed8ff3ddb27e6fe069777f6412cca6043d66a284e9b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ka/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ka/firefox-57.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "aa1eb7803bb9aa61629ed349100e5912311802eb0e1b55ca4691e3411ba2dd5b583a6b6b7a027de26ed9753d1498086c0ff2c7f831a21cf0d7f0e8f8a5a9557e"; + sha512 = "c2a7dd888e9ab06d2e3da86473a91ca12d25e496d58f5899de51aec2e6e8e8087fb65673af7990931c71439f8445ec040c514729d6d5dc45724130dab5056b45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/kab/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kab/firefox-57.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a9f6086b6d0eb2c5e9d7d78821f1d1ff6f8139c63d31828bfb42a0946011235f4748688cdd1142428439d34d106dd746cf34fc393aeab8ac34e84ce0516b427c"; + sha512 = "dfa0132593d19f2a68c15a3d7a7f9fc42aaf297c4fb8ff7eb6d88df0a569b10da6d52e5a3eaa8e51e48e890f946bf3015df053f4474466a3207768f0a9f28117"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/kk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kk/firefox-57.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d0a7a3c4e9f71f3c9741f2f3ef68effec78551559a7c836d6b87c6dd52aab5f2b49db07f7528cb4e7de53b3d505bf82cb961cdaf517ed14cb322fb09e20fbea8"; + sha512 = "9ca2aa99f561812ea2420a86b28858d62da2f9f91867c93f5605a9a46354c02b2cee873f828225e5c9f78a5bf147d071b9b6fe9307eed42ea950f0a16cc4047b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/km/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/km/firefox-57.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c9086ca7ffb62ddeda314a5bc48819391cafb891b8e674383199893741ed9bbf03ae283e2c9b3d391c6184be4a2ec779517ccbd000926d964513f6aaa9db02e9"; + sha512 = "2152dacb572481fe9ed51e45799bd6f723a80a4efb79d1b351cf1cbccc0674874091add0321630fc3f354707e91c042bba43bf9cd6538c3d18743bd887dfaf01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/kn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kn/firefox-57.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "c530a3dcbf4f75239ef7c7b63736b9cdb2f2014c284e8d920552cc7ee4bc0dbb623f84c98d24dd169a5ed3683c816fdeb151c7d383f800682b5ff5e55af90ade"; + sha512 = "046895dc39db3e2f373de35dee990700d30d47fc0e0e9cf4287fad6b55c23dbda107b95b0a1675c897f09d2ec4249cc16fefeec33b1a8e655d334b19e7786320"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ko/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ko/firefox-57.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d57ec107d152b081bf112e7576d3b205f50f802b26b9723b8906dea4c5222a5c84a81185a64332ea1552e6db30bf5a1b4e5826ccd490e4eca79892ad879068c4"; + sha512 = "c87597a98b2c8c46fac817939128353bf9d1b270f5e467c013b7181aed4210527338994c4913d1b902280e6c3a042a3414f518a2e0a716d25db0a12c0b605af3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/lij/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lij/firefox-57.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "8bf173b76a2a63ff7201ee31a7738f928ac9809fc27c650d16c755808f7c3c00d60abb2733b40da993a6b3a02908c788ebd73b99ba4ae68c626101060e2dc311"; + sha512 = "3edf7e1e21ff356fc20be6bc82253535caa76696b9672ea3f4f29b4880b4ac9c1e6747f2953d6e9526abb4e5262b14f7b931bf9845a3b59bb1ab21facfc858e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/lt/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lt/firefox-57.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "07306c0631bb5bcdc188b68c458c85cc02caef0544014acd1238a06bd5efb92e78fd6c3de7e15ec38b186861277160f65673fba3f7f7ea0a825f7e13cc514b21"; + sha512 = "7139a914d655ccf53a0cab44fbc3c3ea46e3dac9d1834e6acea59c74329143cdcac5365b828bd21b907e3d3c143a7345ea660c6c4d469418674626c971d9c9ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/lv/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lv/firefox-57.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "d11cadcaaaffc61d62f4dbee9991c0a4f11fcf7ac279223d33bbc2ddfca0243bbbe136e5e19736f206dca5b4da2b71e31700f2b1dc9b15339163c68ea3ea128b"; + sha512 = "05e98b288b71b2260b9bd8fa2aca1851c3131849b9868c1cbf42bf6b5ed622f4ef2f851db39977d77b3135cfe7cf282d7058d96e68fb5e39d95cdd12cc3deb84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/mai/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mai/firefox-57.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "f29cad32380d7c11627a8f839c882feb8a9af9d6bac0a0270b3a660f7d216474dd4a54b9a06a6f84c8b94b0d01fccbb8e2cd298a66e3a1af1af5abefe9afaff4"; + sha512 = "0a84fcead91325eae96026f9a3439806bef6f589205f42859b3f9515c7fdbb29f37903c93f6e9e86b972eaa3e9b1e682b441753afbf529063dde307c2987ea91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/mk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mk/firefox-57.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "47835be1baaff9a1943d5171e6a6c9d44279760348af1ff172fbf8c3ba27d50236883acc92a69a8df0764064f186a401895fd38ff0f73b6b19dfbc5fed85b14f"; + sha512 = "c6d3dd3a1123d7094796466fafc9cb7e994824c95204728f7e255abd12004ba9db79ce69c50a3648659217d0c38863010c556bb4075a11883548bd47a51d2212"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ml/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ml/firefox-57.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "864d4cf9f2bcb40d2c178620e621df1450750bd305eb0386e7471c57396f5453607664c177790ef2177042a269c034e5f2a3c0789a761d83152bf8d1b9407846"; + sha512 = "778885c609688d163fbbba87227ce79e7df0c9e7db0553f4754e23ab87f0cff0f64f7013b861bf8d96f7f6bf715786ac763e5104c983a46b1a3c23a57178a3fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/mr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mr/firefox-57.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "040bfd4ac501aae9bc8e05cc58563eb8804590c286fab7e30614de0df0aad6f7f09ad87e5b808fb5211fc97bb64eb9046e6f3daec96a38e952bd83011d09b17f"; + sha512 = "929c6fe735b94f52a26559525f3b846c7a9a1cd95c67ace534f19fa78246ed7faeaa817c004c23ff3ecd78352f9dda7a315e9f8ca1f895bde56b1f53ba8ce005"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ms/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ms/firefox-57.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ef093c216bb6d7c7a9b6bc200739d678ad042f19bb98ae734fab9f7592405b80c1a8111ad76722615850781f97355a5788a089bef4d088bc76ad592212aeac95"; + sha512 = "3e5f73d7934edc570b9a617075ed8deef45dfea01dcf057c712c121302a95cd6e19b0dd5de0529ba38e4b7e08edcae06e4652f462c1c2fdbf423d7c5c8c75c79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/my/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/my/firefox-57.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a1e6a303c084df5bfc74e7951de8bd59ea3ab58e25fa880afe7cb12be6399bd6f65db0f517e0656b165ed3083354943dc751d7f77e4dbe4abfea329553b4e28d"; + sha512 = "98debb77674a17ce8d918e5db0171436dfe62a1633f3a7ddd7df79f1e7e5d1252826ce02f86a231a94158d21f672b40e1714db443f6eecc218e910ffdd3880e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/nb-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nb-NO/firefox-57.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "848b504eadb4db1597a5722a42cc163af2fde27796644d4a3595883d7d5a86d19ca341b651a2825d8cac442a14688c3e1bf6b9da947f747ed20f9e9f269fdb41"; + sha512 = "06ee63a1f1a87c50b8960962a987cd1b91052815bf8b3acd495c9cab6a8f2c7ca70d1aa551269df3a53708e8e2ac48fe3324fb333a11330072b5c0fd3ee9fe7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/nl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nl/firefox-57.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "26c55fc46b96087acb71a7750cf6105afc07050f3779c53618d537e7dd009863add11d6ed8ca021f5a56eb3d3ba08a2928228f2b5b72e2d49af76e00c465e40a"; + sha512 = "978085f2e33c3adf8d540b5ba144e2f1090795758ee3b97367f1392e4a4c96dafd6f76f62d7daae9341b1637a9d6dd52c02fd43e204dac0bdc7fb0db40fef182"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/nn-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nn-NO/firefox-57.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "28fd2fd88780cbcc8ae4a0d6a6958ce0b90ee33338061d6626419be50753f69816d9eab758279566472fccdb7ca5abc8ff257e32e93c3d7cbdd37c4f2f5f14c5"; + sha512 = "c62f38b2855a3ee3fd53461dfd9988ed3be866cea6351dc08f2cdf579313aaf238b3cae066b52d823f5c42f7628ff2158fc8e4d914f9372b804b475b5a2803ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/or/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/or/firefox-57.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "cbdf442439fb2c6c2c673cfc7def6262961bee951cd07259a4a39ff453dfc2323dd7653208bb1fa6e72c768935079e71d11afc22779f9eacd529feb6e03ce125"; + sha512 = "2094a90bba5a6795dcdd2c56324a8b517460f690194e0f7c1fb0f278dcdc108d6e2b9ed3f50810e86ade74cd5267367874d32011fbad1a52874454fb965882d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pa-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pa-IN/firefox-57.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "5df8c198c9a9e2a3acc8bcf19587b0ac40adad2cdda6a2b4ba040eb1e7e7274ab9753a28d07059b1d3d30c6b9f2efd35419bac560b856dd8afe45aecd1650ec2"; + sha512 = "01e4fecff221daf211b9ec2b28ff40c6f8077c1bc06509bb78618ae866e26fafb23d060b3a92e397edb47e5fa291ea0a624ea7b51f3a17255ef56c9969dd74e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pl/firefox-57.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "9406068dabf1382437a42db3da95e16909c768841294b5582091222bc3c81c62775c27865bbf8e0966edf0dad915693fc7b8250aec9a5f1218966564149c18ec"; + sha512 = "c216423e6c6739e2f557b0542f5823e356ca4e494c257a138780f07a27c7173173f3e3a93f5c7e11076ad013d12aad5e4a67dee4845e351a00333e48b34f1edd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pt-BR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pt-BR/firefox-57.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d4eb83f228582cb2bafdce1427940fe86b3f2de3d66be9df269ac7211f203b19d09ac93be085420883ef89b196ba560627f929a5ad898ddac59a6260fc97dc5f"; + sha512 = "b949fad120650718d99450a5c5a09b0badc7bf142c5c2a37fdbc97039dacacac2f384e3168ad23811356da1c4768bf23c0a3be5bce50a12dd9915b5777c45369"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pt-PT/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pt-PT/firefox-57.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "acb5a7f161fe869084e1ac75c6939b3f9d6ed60512aeb4677646d6dec08b6875092ae7ae403bbcb928fe7377d0c2a94b1cbe701e02dbddbd895bbe44aff5db31"; + sha512 = "aa6ab4f994e4d6049c5d658cbe2b9bf8523fe862c7be632a261caba1a651b12db4e11f160bb18b368234ed8b3c480af7cee1ec7e468551308f4bfdeb6b0a22e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/rm/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/rm/firefox-57.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "ff2b2d89336b08eee804ac057cddb5e0891328cb1ef9809357de670fb2d0bee84106f2030afe78972a4343de5f1cecba8e3db1cd7ace38a96a41527b410abdc2"; + sha512 = "cb3fbc1954157236c92f884539b38d369ad718ea9004f3b05c4b70cc4588e25ffed97ad68391ad37713740fdf87966c039ecbae97984d89f01555a492c2debec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ro/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ro/firefox-57.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "610685ebc89753f4f23b46f84a916c7ecc2e541eaddc41161d34ba04d30a9d896a090f3bf1a1ea192b7c2bee59c3acd552af62ef46e6d79db135cb2cd23bb073"; + sha512 = "9ff1f5706e058f72b8fa57c35cda62e14809bb502e648df00bdb37f899a7e3b46ec34fe4fd556343ff11139cfac1e658076cb3c3132acd6bc447044e04adcccf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ru/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ru/firefox-57.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "46b57a8e73f14ac0ab75c578f948765b672e0f1aaa8c26b299864bf675f636e5e41b0cd62bcc56d67adccef2bced28da29bc3d45d5d78bfe1edbb91ed10bdaec"; + sha512 = "4ab5bf3f84aa8223e24fa3996148ae9fed8fb98b2ba2e7a1e9c035db7521f9590a437e1861cd6e248c63c790163a04fdd87a3eca5a76b9450317ae7c315c9ba0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/si/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/si/firefox-57.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "1e07f52ad4ced6963287f873eadbbabf901bfa55910dbf768e32d2887786471ac34322ba12529182e9258d1565b07746393f4b472d4e67f031d59ff40c699143"; + sha512 = "a54194765e1169219f050ff4d3404a45197029b4a7201125764a52c18de109b252c05321e18c2ef33b7478168c36cb3025629c0deef24fd297a4bc8937c51b6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sk/firefox-57.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "45af02b4c15440f7d036e3f76c3335629041235511bc6b10eff4d1c1e65e98db3d94ab76724145a45bafc7662fe74efce0b2f192d17bfaccc76d725b89163011"; + sha512 = "10551c3d57167b66b3a5a9368cb8b6c298471a43a8a9b144c5ea82f2dcc111b840e273821a42194bde0c793e1c217f7d39f54ffe907a706823b411c307ea0f5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sl/firefox-57.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b578a153dedb4a2c522a1b03c8cf6a2b0666c0302977bbe32522bc1967c786ce61280ac5c7e9db74aadae60820faf71047119656450f36ed83a2abf184c18aad"; + sha512 = "cfebbc1438c649a543b5aaecd377a20153917c3f1a07771a3f246c60fe2139f5e3529e26ca507648ffcf062eab301cc3a95f1251df2b586f2f112f9b04aea20f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/son/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/son/firefox-57.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c01bdcb4fb0c3d492011cafd64e44f5becede34a71168d3b774e6732fdc7cb615a42ccd7710a76e728a1cd874cfe56fcddd57dd7c4d538b05f30e1acc8294d85"; + sha512 = "d2f71c72c5c1aadaa76ed17adbb81c3c72f59407279fb2b4670fc2e21604d8c7eafa0b247b30df3ddf2923f023d6ee3d9d1c36b7033d77b3b7b9f4a37a6656b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sq/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sq/firefox-57.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c589f7b55591fa412e643c7a3cd51067051302711ecae0a1d9a288e86cb5fa62a06b792a7a0b632e11f937c2bd0ba16738e14783fb2dfa54ea3a8eeeda4697d6"; + sha512 = "03833bb8e39665ddee4cf0163123b52fb7184fc6210622597e7fe2084388a662d380a760bb381609b70679217461fa1c6bf69ea4cdbd872528f7bb0ca2e4500d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sr/firefox-57.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "cb10eeda85968b9454a45850bdb99c25f96baab18f8b797c5bc5fca959126cf61d6ac21017d65169668e1884bb0bb9ec8b6e49c6b3a5cbc8ab917c001dad9573"; + sha512 = "3150fc381b81b4903837fb0b076cee1f425dff20dd449899ccc3b540095d80317727600db4b9abe7607ce7e3d280a86bb730ec665525b2efaa4d72d31ef0ec1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sv-SE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sv-SE/firefox-57.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "2df553437b2eb792fbbeaed55282c97e56bb613431aaa832dc11748c5e4797e8666cdd9d2e2ad58c95d284c8bf7ae09504ee99b38673b9cbfa99eeb0a1aa6cd8"; + sha512 = "0d144a98d41dd6372d97c8720cb5a7a28d002f26355379bbd1778446a6ff73670d95d5420940634006dc860e585f26118c20a571ec52bce361a2278ab107b495"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ta/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ta/firefox-57.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "50c923efb24cdd29cec576b60d24d6796ae2ba5c747de80228c5eb462e2dabf38b8ff652d2300e82205e1f455a5204e5637a859224c21b6c2235b5249aba399e"; + sha512 = "c609df57bfc5c637c0da9ac1a7418278ba8856bc7b9a283133d6570a3fb99cb9c517a131406dcf01b111a9d69a8624dce34db6e5db73f6bce715b28ecaf2b6b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/te/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/te/firefox-57.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "21c35afee798548eeb4d0cd6d06c304b642bb023e2a17684d689dbba131301030aefaa66c875f4be80626b628de7235d240c24cb84d171ff6c87368668f85758"; + sha512 = "8e1eeb91b97f93c9ef8ac1ca7020dd05ae89ff4a42849654411f991e483bf64bdd4b8305d2b1de01b5ed2da53ae3136a2cfd3393be1d27cb64c87f6bc52dd840"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/th/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/th/firefox-57.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0c8e1493da42c336a5b10ac353d82d052c8229a61b60b9cdfa234bee50eb3a48fb4f987caf9f66097d9b41a4bd68e8f301d2176c74466cf2cda8e92c63aabb90"; + sha512 = "68deab0e83db3fc69526c0ea86a97fcafc2a87c9ef116c7f8ff54bc78a647dcaae8ac164017d46cfb63248cf0bdc531898dec4d8db883d78fb0ce897fed7614d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/tr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/tr/firefox-57.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "df48a1bb19a27ca16b3e3a5c1193073467fc543a2f9e05ebefeebbc8c9de98b34c0616b5a5b2366bd768d6f8898c42b20427a3582d8d6fdbd5647d58f50af620"; + sha512 = "d48dc92b7bfa0dc0cba2ca5013acc2a5ff4c58eec365b5f80b70b2174624dd94eb199008720c799d5a0a6229e3c2b67a9ba4f93363310de3bb52b62136f3cc3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/uk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/uk/firefox-57.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d85e2dc562e6f47bd169d61716798cece411853f57e777b2ad9349a822680c763a12fb130c851283e4dc9a838cde3c20165124f5d1d3672f897b2da4059ee98e"; + sha512 = "a726dd6c12914e95c7a2707e050fff8e671e2c01e31ca964aa6f32eb89768b7ddd1039d20986baee54a746d67615fa4e4a327219816ae52356b1c6224a149690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ur/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ur/firefox-57.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "8ac48e7f20342d7d662b163c0bc4452ff8b3d826f12d8fddc3356518c6f4d8bc7eb21935dba982023089823df67956a2eac0a18609c7f455fd91667727c8ad5e"; + sha512 = "f8a0dc9e7e831e72a570bebfefba136e014a27d224537e7eb752a197261b0334cddb28661018c94d41b5c870642288b99d2fca2af3ad64679c7fc41367e8f090"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/uz/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/uz/firefox-57.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6f25afef779901e9c61c0c0d8d7596174a0c98e9bef33e78d6f22d20da4e5c0d05196f9d8fa46e71d2f2c049c517a37fa46af2fa52302ac0b67ccc64ff89d820"; + sha512 = "644ccd2c71a2409e840d87a4e9451b454e6223c83f49f398871acbbd3da9f8e1065ba7ff40aa6c81dc7aaee921c4247e462d49649a042e1fb5f79a6fe786782a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/vi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/vi/firefox-57.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "74a2fe96d21c7963333209f4907d542165eb6db0e764e66b9b9854b0417cc7b308dcb7b05445d2ea53259e6dd71348439badc210bbb3977f9cab860e337827bb"; + sha512 = "0a439df7d97e4e6dfead990da08f5a62aefb8e8938ae717b64fbe0d0fc83e9e0aede01060a30016a406af6eb91de1c05e10f71fbc4883fe679a9988858b8d488"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/xh/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/xh/firefox-57.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "1b060fef0a070434a94abc728993e2c1203b98886d7ae288b15d32eda082d647c321cd29e38cdbd160fa8123e3661b702d280807761fd46e5666f44861001993"; + sha512 = "8a777c355641cdd14f9b23ed16f139853a7b338dd6d1f66e8c3971cb1a20745ba49aa12bd68ef26e3900b68112333a86988514f91b196127ae7d6e5bc5533770"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/zh-CN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/zh-CN/firefox-57.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2f12263c8fd4cedf9969eb25f24e6c211d95a764022eb0c793f25a5e071dcc7faa5c91c91441750ce0ab3f8e76cd317732ff661ea16c1d31e683eab30238b9ae"; + sha512 = "17103974a976021fe921600d8a5fd697d65a8e90a595779be256e2d0350f4f5fcf51f8f16906b3b355b990ba12dab8cc1684a4268a0425e68d3421699618f480"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/zh-TW/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/zh-TW/firefox-57.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "25ac9e23f8f82b6baf9e8dc50361732ac18edb286e6ac673f82c0bd592fe26a61b2a1db012a904f48599fdf62d877f76b10262c0a293f0dc32de148a7417633b"; + sha512 = "904aa9865d7f235cc60176e6dff01fa2842178ba812017cc23011f57baf23089da8feb74cfab15968bddd029ee5f161f10bdd2efead5bea33edc53ee27838052"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ach/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ach/firefox-57.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a0d4648b606e7862db1bd144a68d6bdbd8e926675e58d431ab6dd444eb73b2d5d4bdf7ec83dc3604377166f6ffd2f5ab8e009ac2b64649194f5d3474d101d153"; + sha512 = "6e0076d906a20021a3a161c685404efe584927d39b7e72ea6645a61571c14469b9de07cda7921c24123790fe8f7bfe7b1cf1f644a09f72b86161c3d57be49b7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/af/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/af/firefox-57.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "c745a2b46f5eb4da7cf10400186913dc69b18284402f491334ab9f335296f60a6781cc09491cab174eb92c6eb6c65f8ab2fc556eaec7dd13be37ef4328084c47"; + sha512 = "a36ba7a0838b00beba5f598281631bc2de5a6cef7399c48c32091cd901abe12356eca4e509e964ba8eb6db011bedce802d060502dcb948de00a57eb754182466"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/an/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/an/firefox-57.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7aeb7e50e14ac323d68f0ac48fd702be8b3f30b56619b5213498701b4868d90e7ccbe46343cdd0cf950b67f9d51da6413d89445d4ab77f4ec465fb74a1623831"; + sha512 = "262f3a4a7d7007ba22f155e994bd7fc6b69f92efb6932b96e1d07d4a7923b0eb1ca1b4ca60c93e9e1c9feef5c8aba282b4d9af6ad4dc21e8c83cfdc6f4854238"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ar/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ar/firefox-57.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "177da0fb662a99226889d4ad063b5af18f1cf8816a685d60c767b90dc2db0c460bd62c239d3045bae92bd1f4df129337e278bf95d5db103cbb6028ccf869c070"; + sha512 = "6fc5c1e07b4d31e8f5cb21f325e282875ed481de67168b43506c5083741c117d690cf681400778d96b291dc925aa6fd866645bbbe5cd477c1c7254cecc940bb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/as/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/as/firefox-57.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "dcfd4127df6b3f0d0ceef142c209223e7ef74e5fdc971072d6d43d5db1545b7d9f155185752688168bc1e461fb201d3d01246dd3c18ae006304144771f555483"; + sha512 = "381032696886a2839d927c81abf0bfb48452ab2da37a57290e2f50daeba947fc17fa8bc8e95461f981980bf67cdbd022c7fbbf17cf631f27555fc92174c1c4f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ast/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ast/firefox-57.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "ec31d580e6b8e5ae6e06e1a713a42f3712fc3253d64cff1a1c957211cd01ee09929643e0a8637bd11d51283cd99ad46e26568ae6cbcc4812720ec1ddb48832d5"; + sha512 = "5eecf58f91ad77de3f9c4afe211138c79aed460d35f0b4f1a7297b27f72400355e0c1ade4fb2c457ae26d8da114ad711c3c0b2a374e5ba6bc33d107c28b3c3aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/az/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/az/firefox-57.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e053d3b208023d799beb3be82944e9fe6b3ab8bee83e6e0a39f2e0739c77aa267d80096557e191d9b0dadad385ccdd55256ba875fa3bcca4cc3a850a1acf6908"; + sha512 = "de90f1e9d1950d1f194d0c5da3bc25bba00da5dd4094c6944b035aa660cd56827183714d9dcc8bb9e7ea4c115792bfb969a218034fc743fe85b65921838db610"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/be/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/be/firefox-57.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1e6f1e36a0b48994026da658cefa8cfde0f1f2c0eee66fb14c7f7beb18a485eaf14c47d22c4586659399dde7c6e352d8ecf4d3ebb3393ea3dd2c3796a4b69b2f"; + sha512 = "f043a6e2c6499aac4c9b2df0ac0c2d62207a79a34eb727668a42942a4a4027ff545484212c88c0fcd9ab91c66921daa3846c294bc3260db3a0f8f35dc9a8c2cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bg/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bg/firefox-57.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "68ba57eece50ece15eb6856593dc09496e2e120c76dc21d7dd0b00eddb8a15308cbee2e42995b530024fb0934323a7a0437c2bf5b5a6a9de22105abd023b04bc"; + sha512 = "cdad058ee575bf2b4acfd3882769b067959ab8215b351add7558d8a6b6898fdce951db35e23e18c7e7d3fec170a78cf71bf61d20c4ef3c42c23a96e66686f59d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bn-BD/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bn-BD/firefox-57.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "96f300f3ce1920260426bae867f53a2bdca2fab085bd6f47e39f804ab298df1301ec58666a849e3c2d718c57ebd0c3bd5dc5da3e80884958dd4b4ec2287ce86a"; + sha512 = "ac4e823c753a7b765f1bee0cfc8cc0fb216b5b9e70e147866100d4b90fab0b413850ed15f02585170c3a6dc39b4fd5e7906547626379a70d5d5abe67eac0956c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bn-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bn-IN/firefox-57.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "887638fdcd191d2c073a4a5b7c3989b47af586a912864d0adac7b00c062ce6699a579e7362862c2f98d29c088db2e85e41f724939d04c1e496f1e48bacb76efb"; + sha512 = "15b12cb32ea9be780dcc68ce75d54afbd16c011fee06a15130e2d1844746ac2cc66dd61397facb083c478f4a754385afc62fe4355442aad31e8ca87dd5270fc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/br/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/br/firefox-57.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c8b1391f54fb128a59ce1b0d4e506b27510e1c117d0f0044b67cea248ab82014e8f64d937f4c703a39d3603d8341f34d36e650ecc3a8dc10002943187545b77b"; + sha512 = "493c260aca10b349b860492b5756814868520f79dc9853745af8e1989f645f2eb17446af9bb5309d21fc79d9139c7e7560dc5a5a1753bfc32ab3df07e5fe729e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bs/firefox-57.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "b7d89d6ff57f44c61693991eb67f0ee30a8e8daf0935be51a3ef5953e38ad3706bf16ca13e344038016a77fdae7566796f60a285304ab14638264449c25780d2"; + sha512 = "ea865333358b245703fbbaaf621ebab603aa9db3a7c579e244f229696ed1c7176ed44158de6a01817cd410576e69c354d2091704af8dc30b4eed2b2f2f3a0629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ca/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ca/firefox-57.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ee829172889a002199f07ac806d512f9753b565fa992931039cffce764ae53495446cc55b3a1b3c68a805cee09db1249e06296b847928cda9773bc0d670d4445"; + sha512 = "0961c13ae053299c8f0e0c1d704c0825215c1e77b43abd83ba86709448f22e6ee40c6a1b8d858e4f2d801d7c024b293631ab28ae9fa30553790187896a96da1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/cak/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cak/firefox-57.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "8bfd9a39d151410dac0e2479e3918d74604cf9773db63d077281aa94d29db102c14ec86fe24d00187a0a790e4bc2beb8af467fda205d69c5b3c918c22b7327a5"; + sha512 = "3a8dc71fc212a35f83d10ecfc8c8f97381699431964d34fa7a278259b1cdd15b4e92fef33cc9c1f37868baff0f6ff1064599ba632ad718ae2d39dd3b044f758f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/cs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cs/firefox-57.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "c6fcbbaeeb39f1a842045b9a919fced5dfc5e13aa760504599a376692c7b84254365d50e4cc02af5d5bae378c8503dc02f755a8594eeff0e78c79726b44422d6"; + sha512 = "eecb76deb0c420790a37ef24c0956574a4a881cc429f8f78d6ee207b4b9f6c12b8c890e6ebd4f69e9cf4ba120728a319ffba6f90a3eb42affac86fd27dc015d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/cy/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cy/firefox-57.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e404cd8e0f699ff3a09f398ca29800739afd23e5a0ef6299ec47c65771de295d2f071454111fc3596eb77656ff92cba088620084f41e21e4e2a44706957a23c0"; + sha512 = "7ca940188627a439f3a3e401075e3dfec2c4082eaa8aa65fc7a58bc669f4e4a4835095225bcba541c3cc8562dc611fefc4a7e1f7089a8d291b4986d557901cb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/da/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/da/firefox-57.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e9902fbad8c46b156f3331c7578a8223ed8b167db7e83333bb57fcd292fc2010fc1be16cdffb611238e0d2a310c6cb25f11317c100ecd5ba140d86890ba563b3"; + sha512 = "366f786e96bbd5c4eb1ae247e2cbe567a7e94b76124a2a78062528daf1aa72236c91aeb2213f623a8214fadb920d10f1ec49a8bdad4a5a855ca23f06665d68dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/de/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/de/firefox-57.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "0ed09f934f6d9b862ccf8dad186d510d380f9fa9afcdaf3093badee786c17db3d7baa1061370f4c505af10b4541af2fe368e9fe5a274778e54128999bd88c585"; + sha512 = "43d46c88a8d58f36ebc832afd6b03eea5afaa58bd3eacde85eed36725f248529169f6d396a3580b2d9483d36bdcae3dd9ad53cc1aa69264231b53285915e3d3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/dsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/dsb/firefox-57.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c126ae75872980e5172b5b47813643ad9ea7d1d9e78e15aeea6bf0e4701ec21c83715a5313d570d121dd184751b8c7a0bee708f628ec2bd470c781719707f1e6"; + sha512 = "16006a1e4ac7662e9d343cf31dae5d3032948a90a7eab1bf1122ea2f45b4f3477c53d8f0fbfb860e4725cb3a58678890c5de186ecc0cb76106153edefb011eff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/el/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/el/firefox-57.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "5560e090a6c9a1d0b48fc16d983fc9c5321137202826cc14cdd6dccffbcaf202724eb2629162fa7ed8acb0537c8839a904df69778a0dd77b2caf78976fb9de80"; + sha512 = "d5f74e30fc7da9c9765bbdff4f946ef5de3c64ae4626833d31161e62de106485f9246efe0b1866d47c52ba7d236880c648a438e1602f0552774573c76e2c79bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/en-GB/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-GB/firefox-57.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "85ad619fa280092dd6674a35e95e07d6f590be9d26dfb48249092d5687c06770854d83c09e36ba22a4c8d1dd8bfdef104276c6a761ca3d26d5b1acc104c8e5ac"; + sha512 = "4a6ebf46697c02c9a3953cfee25d761254cc79b12a88a049b8477806b3d1cd978e46295124e7afb3770b7d4c01bd2e002e1e8a092ddf252f6c22f6f9afb4c9c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/en-US/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-US/firefox-57.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "db935918745a225db24499444723443437d1c68f17a83c7e524620328872f58d702ce6e16f7f0e641e7f67a53846804f5d49ba324ed66905ae4f019256225053"; + sha512 = "f5f1af68ea08cc95b449595d9f15f346a8562e4c27529bba6453b0fb713d65d1b4cfb66c9054f25d8a8b6aa2d7029592a7d00a2a68ee5c2fa8cb7d06174f9f41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/en-ZA/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-ZA/firefox-57.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "0dd3ef914cd5ff9ed64e475f8881bc6b0897193771f9faf0429105c21d5dface47f643c298dea8d539ed1f362b59a4f15d3097e623063f49968dd5aadaef35eb"; + sha512 = "554221102e16a5ed426afc41b75be680a6d28012bb66a12c094a719c7d7ea61d0ea378a3eab758b907ad407de78063888b687cab8ef5dabe19f3a54d2bc722ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/eo/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/eo/firefox-57.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "0d85aec2cbce71e7dd30808df937bcae92f806dcb41e6e22283add504333538561deb7377454946e61ee9ce8e2366cc0be926f5d6f032f3f09fb6183eeaa7d3d"; + sha512 = "bb31a3422a0d86970649485bad7f78588653ee91551fda7babc9214e9855e7a363eb010ddcfe6d353e292410421bf99c2fcde0aef4113b688dfd3843d1f0377d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-AR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-AR/firefox-57.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6b0d3bfbb399d444b18d42c8dede4c9f8adea846fe89931112eca0196fc2bf924e767d849d37a1ab599e27a39c02403d5df15bfd814fae91d2aa4094723ddbb2"; + sha512 = "a47626bef5d9cc8df045d0a38350f0470f5426f4de8ef45bbcb6a60922532656f60f4fa41c4ef4706af82e5c099af5d5020e6d51ee1d61f8275eced5935ec2d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-CL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-CL/firefox-57.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "accee76187bd35e36b282f6187ab6ef93399e1d703b29c3c60deea9572c28c00f2430b26a5b94d9d894b9ade20e547a1330a68f0e5f05c433b20a0e969f3bff4"; + sha512 = "cd93d2b921c3fbadd2862f0fd8d1cc628bf5da469d86bcf619c35940560024bf9b461b2fb405a2fde39e7910b6c0367e31e44c8217971f9a82391dfa5a869094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-ES/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-ES/firefox-57.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "471326ae89d980943c8a2f110c57352c0e1498f131454d019ef1a3ff63414649a9a2d894a114a802c508db1117b95b7f09a0e5296633f6be8c3fe5bc140aadaa"; + sha512 = "1c911d2898749ab249ddbf7747b7cabda4a33a2b4e426c88aef71055b8483e0e9b408511a14b400ee332358f2e92d3a83817cdb73d8edb9b85ada94538f1bffb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-MX/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-MX/firefox-57.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "c6af789d6db42cbab5b1524d35cdfc781ae4e836c81aa98eaba72c43b8aaee2e8eea1383c1be71e6816cca1278bc7d6809bbbb2503625e682d4a2ca00f509c71"; + sha512 = "bc7aebfaefba4a4df95d1c60a85b6f961e0bf0a31249caedfd0653f1c1bcdc3f7c27c6f52f45b7cdcca54562a556bf99581e79ecfee9488094327af69b909c47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/et/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/et/firefox-57.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "c72c23482222ee411f0781d5a3c93561d2b8234e7797570dfda0b69e92f7593b1ce7083676be8d8fa720f2b05d6cd052be2202782a7fb72fc30b85fd742df45b"; + sha512 = "b1871f409cb4a9b1b85215e49ab4620fdd7eeb3db11e5a0145dd40a923ee4192ab6ddd8aaac82c1d28153722973a15c1fe80c822075dfa4baf50204228ea3db6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/eu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/eu/firefox-57.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "2a6718e8f2d3803e61169813fcef9d016b672f7f8358ece119ae71b2535f3933d032bf133e1c36305cf7e02bc94c53d1ab8998f53aeb775c3056b8449ad971d7"; + sha512 = "f3bf362364479ea07a0c681d79987f9c80c9e3c06a54eb82a0c0308ad195aef257845e73f72f86dfb45ec36551c9a6afa9b32958c28066e626ca33e2c3c8d628"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fa/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fa/firefox-57.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "c0980b33767e2bc99a42741b9d35d2b7841a637975759731bc9c8be6a34932a01006453e19e487fa06f37ad9dd97d4b3fcc9563f4a6dcf8998576db5262df999"; + sha512 = "f7976eeb893f7fa4cf51b2ebb3c6442e731f4a96a2d833d532dbda87412789f044491b3239a7302972664c17dc08606648b011263d63e01e7a51e430ca1f243a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ff/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ff/firefox-57.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "5e6aafab13381f2c5c4f26dbd3bdb56296b3d92e9f9b9989f09adf1163edb587eacac2a63a9fc1283dc0ce9620fde08af50ac4558faace09675f6256523329ef"; + sha512 = "6381ad86b9ccb65b4aae7359554a49cf630e8f898cca26479b327e9bb14695f87f566da9bd8a31af05c9781fee65dfaa8e23cd0588e4441ce6fb8fb25f7d7fa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fi/firefox-57.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "94b3734bff09df66782f2cda93015be2d8f7ba90cadc272560ff232b8c01612cc733476ab3f6b3e27f52625102684ac11ecf58571a11f06806abadcf1c1e95f3"; + sha512 = "1a80fef046318667a0306cd8870e697ab246df3f1ff7fba30ef3a24c25551b2e265e6b52a13514fe216dc5bbf237df7f04106bca87e0506a53caad9856c1c426"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fr/firefox-57.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "f4f9202c458171026c5770b3b471882df609dc029313b0914856e445dbed38da598bd96291a44dfeafb0dda82adb4ead3b9e5443e1493b8d861b11b1cdd92480"; + sha512 = "26b25a2fdb514cca9638748ec8481f7c36e38f1d3953cd5a45025861145d7851a4441b2a2a472f07620c170864a278dffad3e2d625a31cefc0c348cdfb3ff4ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fy-NL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fy-NL/firefox-57.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "72c71addde606c99df99f0b405f61e0b1cbebb10cc1a9467a3dce9092d3c17fc76fa8a737f8140db00fb03da513751b7518e7521fbff2ff36b4df36a8fbf1ee9"; + sha512 = "d0a322d815f08e4cb1b7f49de22dd21401e1871b13272ef33f4e311f52436e97f863943511190b0dd2bb3c99ddc0a0b8acf95740e367a34bd78be3425af6e3bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ga-IE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ga-IE/firefox-57.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "1b23e5ccb911a0a683e356c413fb1c2b853e9e14c3415c0c11da72939107d4294f9f3abc579e2da7de613c32c65a4e8d6e05e6d7d65076619d18dcb38056ec86"; + sha512 = "a736609a8a10782273b79a83cee0929bd2d82958edf6e266245c1a4631c4d4656b128789779806d6c9500f914c749beeac52df3c6c85e149f5357f182603f878"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gd/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gd/firefox-57.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "59b0ab5d6a04f2d9cc818b7184ec727d95cdf061095111878af58448739481f94e98d7818647d03a302815ea77e0832471ff072c6caa106227849eba56de75ab"; + sha512 = "66e110faabe9a6ee1cc3aad8e471301aa636e00f3c7cd01d49b3aac5dc96ff117aca8c4b0dc2a7d23a8122bbcb152d82200a505a9e534c9a9dc93da8237afa13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gl/firefox-57.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "36c45ed8de93cda743a5d054f3273db4878ce2ecc9d78cdabba4be93f2e466e111a344a05977cfa52b52ee905b0d053b5f509bde6e2e26f14a3391b37eb054af"; + sha512 = "5b115d289497efd2c706bdd2f6337b6f3afb57f4fd95178b7a5953b92a5191dbdbdda54fa3324dab23661c49bd5c8992bb1e2bf6afd12dd6e61ccb2900e53d98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gn/firefox-57.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d658ab947e261a3eac0ffcd9f4d56eba634bb964799202e3717f5c41936e64de5523ab16b8b35daba1de7c625c8eb31101596fc73056065e4f8bcc8af8de1197"; + sha512 = "357bb746ad1f10118e13f439ae58052fb93bf89562eab0f78510c027f24276849df4a69789db6b274a66b5232c4a6794f2d3daf3a3ff35644b8ce1f137febd2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gu-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gu-IN/firefox-57.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "9faf44b19f5730dd09fd32b3109249cade91fe4c464dada869e11211bf7d3c2039c65bfe4729c488ed53159a08cec5250e7c2fb55139a8af3a40b1cba40413e0"; + sha512 = "ee4af8b2880c16c55f09d9c2385502ef4b099854c123cb6d148df1d2024e267d7ef9b0ebd8f1b70449698dd3b25be8479c932dc27cccd38d8086d4ffb7c3bdb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/he/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/he/firefox-57.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "0cc925fd0f9d2d89c49a195e4f568f5c9f570175f31f86154cff6875860bc11db0103508f5985d073dc7c37c9ab5fffc6f50b94e47a3f47f7fa02678f4afc33b"; + sha512 = "d937ec20e10ce471f658717310b6d361df800eecf54b81156e412c0af1d98efffc33534492c46fbd600f9e5a4d85e0bcd80fc7f711b22b7eebf7182e78e05abf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hi-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hi-IN/firefox-57.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "934c1a6d4f148fc2d87b2ff2be5a4a31ed463caaba84b9330f0cf8e7bc56630665ef4566f03bd8f7da5111400ede564ce8d4cf14a4a34c48877aa710962f3798"; + sha512 = "39d55bfe0d78884fc6f27ddbabc3f80e3075ffb027e656ad07cc56fe39cf097f3c3cc501d123abd172c1d4116bd8fb8bb620a2af8a8ac5c48bba5225cdba58dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hr/firefox-57.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "65c92cbe069e7b67be5b092c070741490a5fc409fd3d0e8a03e7346702398ce717f45e80c909851a4699cbea218a5e7a49049429fc54d850ccb28b23382681ca"; + sha512 = "aef7a38ccc9ca3a98249bd4d325ec01dd8e12e7b95b9bddd5183bf8b4795f283f8cfc6c87f22e38647fe58c00d40e95e65e1994a21910f3661937042732f0c14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hsb/firefox-57.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "27df62d51e97a63beecf1d842280ada91619f18372679b25580f9248dcff5a45c19d64b2c2912f0daaf9c5169cc3c8f58ca5e7dfd360b292dd88d8dfe1b428dd"; + sha512 = "daffc6eadeb9376b42fba1c96b759b3dfef0bbace76472df11b56fd3bcf47d05f85f58affcba193aad39bd58d194b72da32ed5ab7a7d9376adcd17c50d19836e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hu/firefox-57.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "1b84d77cf561041ce0b0213111b5830cd95e40dbd447e16b23bf93d241f0dd9cb5510c29ecaad63dd3818f6a8f6070eb8314af28311deb012d3e8f4ca2390da9"; + sha512 = "bdeef0f11f48cff94a0a80033e2e6f63c12130729ab0af7e0ce7133871282a911936b7c1365319495235ee4336cf2683a84995dc05d424ab70f89553ac8d39d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hy-AM/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hy-AM/firefox-57.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "691d45d0ac7c8db9da1f73fb466eabe56d1a70e7fe08293fc6ad95e5df1da461593e89bb06122fe4a29395f75f2cb6a1abb568ca798130f9b4d03795eb8b165f"; + sha512 = "2d20876ba70cbbaf66f0f6653ca284f3472511377e9b4cbfc087b763fc96e1343fb4da014523b24731fee709d1d407596b01cf531b390d1c2f3ff5e47c3d3347"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/id/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/id/firefox-57.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1592365d75275ed597342602625a591b2fd31d204c39a68dc216fd353d317d811e17549b73486de9a001015fe415c918b1057a7f85093906a9fc612b8eaddc34"; + sha512 = "09305a81fcd0400239192fcfce0369ed49dd5eb2e014ea1bc12c1470b732e6aea3580d1d34285848e7c12f5017d321e29ea27705cb298fc147abb82d089ad6e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/is/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/is/firefox-57.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b7f33d0d15e2c6b53d0f43feb767967e49288e5b108f18de9a74acf289dc56f0c4b477594de02eed7402150f8df77d1194f140ed64c99a6ce7749b32dbf91ca5"; + sha512 = "4151a950e6a4fe8a4c9c143ac47714e35d45639a00a3c03c21c7cb974aab46b56b69b4357ce2294abaa84df6b3c561708b74f5d8fc4139221a89d744689d531e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/it/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/it/firefox-57.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "d96117f473e639863766280a59ea5c944cf916ab7c796eb59d0701ff5096d0efd93ec49c1d790eb3e16db139e3ad482fc7be2a6c214104874030a16eeb882629"; + sha512 = "3d776b488104b99992e718b2a41c8de09438140143de61625f01ce51cc8461fcc564da883510dd29c854bb181e906b095347c5b34d5b1964ed51c268469842dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ja/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ja/firefox-57.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "a535bc29f4f97e223716dc7d3eca6dc3cb8e04fa79c0a3880d116275ef6eec41a9458007a33fbe527c664aec9fdac24d56db04c8547c93fcbcbf33fd461ce217"; + sha512 = "2b0adf6bb4f4729ffa7a4e20e5c5b4973032a4416076cfbd5d1c9d0ca551a8a1ccb0fcbe1998bfa390373ecbb7d74faf163fef47c20d1f2b4d179a9a0f802957"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ka/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ka/firefox-57.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "3bfc8c1b414bf8f38caf7f29342024a09d56c34fb66ff2bde2ea953ea2f22891d85a014e6ff767dc895d692b45927ff45b63277dfaa72c8f90e78ca172daf4c5"; + sha512 = "50b718fea376c16b586f1c54012e6215eea03391d2bdbf1227629d5aafdbd864cdcb3e9527fd2e4fe1486bf928392d7cd70ac147f1b35d626ba7072066cb8737"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/kab/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kab/firefox-57.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ec3672acb496fa5e19f148ceab4950f05286f73dc1a00ed41388f14ac8945ca23b9c2d64f50826a49e2874b51b7b9fa61f8c345e968f77461d9daf9e8f616c8d"; + sha512 = "ac3490642bfe48817d992706d441009ace6866ddcf38ee71b172eeacc3e7b3fe44d433b15fa9bfe238690078950514f7d5aa5c2ae7239e3698c04c71f725508b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/kk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kk/firefox-57.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "659663a9d889f31384e8734728de5ac7b0902587360a8da0ca596034d0f2f4a886d5c46a99a0103a9899f30078e384c1389886db8db5a657659d512fff8763a9"; + sha512 = "62a6f73528c26264525fa2fb4e1c0a8e1f029c74eb5333c5912ef208146d24e2ce2e037e904bf83fb3f7c10fc81f969586a09c5cc3746213454f206fd6c1286d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/km/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/km/firefox-57.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "7c0e9cc3644bf38d042da7ce5ecc4d2c533c6215919def5be6a993daf7eba0f10a70f571361d0ccaa989e6a2abe3a273ea56099cff5bd47e0a6536066f23c824"; + sha512 = "4dee68ffd5f306edc3e49321bb29edf435e7924371c37a2e1e239a1377e0f9be5cd6ee680aeba46465ebde9f8b090d467e93b0c65e75c9627413c5ff7c720589"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/kn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kn/firefox-57.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "150fcc5ba1aa0d9afb4ecb0ce9dda85a404c5aebabef5f0e3c00ea2fadfde52593a466c3582fe7545dcdd28fade62dd5947b7aff473b3d6e7060be67a78ecae6"; + sha512 = "b0fc37707804ca6cad153528275076ad64b64685c2c34bebe27ce652c7385cef455da75420f0e8c543aaf20bc1358e080cce48b747a23c08b9c72b1f7640d0c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ko/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ko/firefox-57.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2e48ab21047dc311ab8db94ebe60c04b7bd61da5b56f39d56d6c7745efbe4d64f1ea54c370d197ca4c0bfada9a94afb96a33132b81148c18d8e69b31f0440108"; + sha512 = "26534fd7779e1c29e2937399a4a79690fdafd8fe7aa735d4386fbb03d9e7be09ae83a3fb3d9c2691bbebe40f8f73ee18db24133ac4250b787a8e13263bc1ea2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/lij/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lij/firefox-57.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6410f7bc134698e71dd8785885c470987afdb2d75ca5c0f49ea70c2cb0f4d1b1f93397b6974000082609b8d7007f304f917f9a3dc8d713f13968190b43a0f4e5"; + sha512 = "2b42d3afa649bb48d3bef4d67f01fcae216f28d3d912ba096258ad1992914d99c8389abba60128e0198a8ea54ccd87239d857e29b44b297eecc288a08553a6ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/lt/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lt/firefox-57.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "78e6f46015aeb56575c0c508f572fce65d1caa8af288d1db0dd157c54ecefcb821338f39e2c47021a4ec3be7c2bae0ebaa08c035d3755bc32e074a7ea87d7f9e"; + sha512 = "ab7194527b65667938ba7e4dabce6ef67c075284b1795fa064a81e1970ff71e1d4e60687e202fb82ea4663f46dd4ebdfb0c7ae30734dbd5662c28499484618a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/lv/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lv/firefox-57.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "1972a6030332a571ae67b7856cff277101614b8e7d8f82dc204bf45a3a4838a214d00e23972cda731931f4dc202388896da6ffbb8c508cd4be45694ef1d934c8"; + sha512 = "33d3fc939a464389fdb0345cd92c29a1c38e4418fa293d131f7bafd2f39444068ae7c168881076b9392019d77c5260ee670bf7131d9501127095441e43e7353b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/mai/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mai/firefox-57.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "269841cbfa1b70b070cc619beeca5c4cb9c03a9d0643f5d1d95661e12153c66cdbd8f92807352ea9ddfd438cac8fc7da170c467a8f6712e1e00b152dfcaf15c9"; + sha512 = "69816c5d46e84d0dd4b5fb1473e49875725ff4dce7d08c9a892f4119f6aabed29e30789a77a56585e2399918aea16a84dc94d3d9e04d3e29b85e1ecfd4289a52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/mk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mk/firefox-57.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "948135fd1a957eb5b1f4731d684f37b0e7fb78d2861e5be55ee23fb03484cf59f2e66543aed1764fb66b69d4779e39dc0c5104f52feeceb602285bf4b6e46d09"; + sha512 = "93e41429afa3095ec8cd903f7c942ac46b65a39566c7bffaea937b2ad72d219d755fec27d58e351cd70cd697149433b43f26753b389f8f70ddcac9ba9fab78f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ml/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ml/firefox-57.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "db7eb47a5d357a67b5522361cabd690455eb17d25a9de290c79885fb3a0334a5149eac03e92af9e0dbb25fafb18dab73dc49ad0f0ef7451e7f1ec360bfd6ca4d"; + sha512 = "911e36c834c35664b38c14748f146499bc74217ab7ab6dc3c318df8dc115bf8a5f09ab24f3c650f01d664b85e9edb90b2515f4f4d413fe2c0663a3ec4714df1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/mr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mr/firefox-57.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "a416334034eb327d9affb8eef3331fb9627d4eed9b680c312bb4adb1ea64438f95b89117ad1db8ba1e8e8f2d5408668bc7ff6e1cd2b241641221cf591eb847ad"; + sha512 = "8ea055ece43abe41c21b726df13587f86987b6a836055fc3bc525adc04e5d360db2e3b5104587546f3192868cc10b02fdf08540644e1d5ccc03e963920220286"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ms/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ms/firefox-57.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2c486e99e052065705c3f49f743e703a1cd49083b08df6170c58eb1155a1a30c56418263adef4acd4677a0a812c9682a87d470ef0e0907057bb14ec10447f36a"; + sha512 = "b3da22c39ba71e28fe6c5f36cf5b99d63014e68f5a1cae4dfe94846393321a15188358e4cda263f4fab2c2c578c78739e3338345d2e7b761286836db435df868"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/my/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/my/firefox-57.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "31718e334380c9937aa8003d3586931de21bf0ced0b28db57baab82d2e0328e64c1b390676ae4949c622544918aae727e925ddba04abb97b756f601ad22c13fe"; + sha512 = "4ad4201d56fcacd6c238a3b60a36238cf5c635f7fa601ab4342516e7860e2966b449113632c9b1047f1721d31e211a67987bc2ef5a439db9cc09ab437afff2ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/nb-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nb-NO/firefox-57.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "051209a5d65615732d7353e24a500dabd3cfa4a3f5f8dd4ef61c1d4a11236cbf59915fe3ae14cd7c524898f01bfc40f1565ecbe6998b9061657db4a330eb6a28"; + sha512 = "f167d00296e36ea498df7b331a48161d613cc395c16cd63b83580933a776829cf492213158c22eec1e6df9f2dd1a811ced289046ba404e40230bef5ca28bd4b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/nl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nl/firefox-57.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "ea61e410ce32be3bb5c9bcc2463ca1eb6855b18c1b6511cda81b4203d86e1cce6d01329d60ee60b96340f9d6abe17e2ed567c5a7cb96797ba88525404b5dcb5a"; + sha512 = "b53257382aa247d4b6745b0abfbc25c1c015f2c770f5ff2bb619e208ccbc4b499d2a60c9b9ce5d345dd65517a41f6cc4041d948ec8af5a43ebef417efeb91505"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/nn-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nn-NO/firefox-57.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "db9c3a1ee0630afded4ec215880050973dbeb2bb98995743497f01c79f90c1609846f4dc03f6f1da4b1274b23f95ce69f4ad6de0f2f94acf10df21615d00532e"; + sha512 = "b7b50ef1127a07a4bf7aaf3c5e3eb2621c502e660528841dc92c4a937b78aea003fd6eba763374990563a63774e0041893ef952f02a387b4c2916b5a3c18fcc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/or/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/or/firefox-57.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "9d8408c76a2dd72273827f0fce70b3346a910ee73df52b1c5129bcd6e79d7b768d311f5ce4b4867af5a32d6491b75f816793ccbc3da6e0d7ba2f06a7e2386d30"; + sha512 = "ba55767451edc408b92d21fc74133a13151c5f1faa532dba0bb27d8ed79f73aebbd76c3acddd2b689023b649665f4b70f72a9495805ffa8de888bb35c1898e78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pa-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pa-IN/firefox-57.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "fabf259bb80a312ab1ed6997f7c2b605e5c19fc87adff388fa8188181038d1ba719075a23cc4195efca5c8ed4f8066277b2db0b581d10f64f1d6d206b29a624f"; + sha512 = "97babdc8ea4541d2a2fe07b0c258d636329a03643ff411c1ed752ec949946b6459f7fd21ddd2a688653f788e30fc166c381dbfef238c0437ce276a0fca80323e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pl/firefox-57.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "35b31f5c5979ff0e30f52d3012db119abac393fb6948ae930e8efc17047235b06bc6bb0a2546677c943933a600e04d037e443b6c225893082802d5d876f900ee"; + sha512 = "733b22d43c15bc0eba1918a3177654b0742d480bb8891f3ed817c7dcc70e084feb505b6b1c12fed103b73136a74138771fb3a23a0018786cd4cf16f9b745c281"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pt-BR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pt-BR/firefox-57.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "cb118f08e74101373a3d1f586b5b7ed47d9f4bdd89e922ca430a92797e3cb141bc847b827b579412487ef5d8bd1ad933656db9929a14a91512af61d23b897a2d"; + sha512 = "fff3d62b5d85448f8ae5ad30deff720912a5d8efa5838d908a68d97b3bce84164df57f387068b0e10b51469c5bbec9cbb1602279d0937f6cd211072a1222c8a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pt-PT/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pt-PT/firefox-57.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b561940da41b9d88819d7a86402d0b5973950f2d90789540c2be6a0b1981e80f2e2d163dc1b2d0a1e1e0fdbcef9927223b2d85b364126ec894e6f715d054956e"; + sha512 = "c49d00cf50d5e6cc8c46e43aa2ef7879c7cdd92783a6834fce58450c8c93553062af060995a2fa8d3e9b5c288fed3522704213d482b60014091569bf12815f81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/rm/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/rm/firefox-57.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "41ed27048f63ff77be3ec90144e94ef5a7ec846e88c1d90729cb00518eb1f9de5fd3e94975ab49954aab98850e8930b97f59bc6c1bff8b69520e81d94bed46ba"; + sha512 = "5a5e383a1e8f95f938b12ae6509076c595709c737a02f8ca40838e638ecc79112aa25c9277086d13c6d7a00d6bc316c809273c8157cf7970c8b4481c5fd7ca4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ro/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ro/firefox-57.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "c5c2359a7f183ddd7275b64ccd3a7f8fa48435d8595db1b7f388e557f02669c12aaa746756fe77ebbd83496d36cec3cfeaa8baf6dc8eeb731af1ad970ff0e325"; + sha512 = "48392338e19fe9bd0b0094b0247e9d9272fc6ca518e1fadfe628e9607d2e1aa2db9e11895fc835dd4cc1bb6e196960afe601354a24885a3ddeef211f2632af04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ru/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ru/firefox-57.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "1711a76df67b6ba5bfcac6015d92cdd5fa51643e3955487fc6df6176840ab910aec593b6bb041e2ad0259bd45d8aa0da7a6ef75bbdd38b0821b2524ea7de9452"; + sha512 = "6543a2002291a87f91d224d223a8f292da4f8137b5916db7bb6d2182fbc23b3047133d3cce311275938317bc85ca992d3158d845797509ebdb765c4db76a5324"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/si/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/si/firefox-57.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "57c49bab469d7b17c6f9d79003b52a778c40d5dfb27cc238168809041aff849c843cc6442b1dba1503a6e89f1f2168ed191e0256aceb38fe990f9806bd4f2870"; + sha512 = "1aa8bb875f28bbb99c8ba228485e612f8eb2d449d6518cb88268ae8cf31b572762353a210ad532ac9328bc5266b2710946aebbc39070ed98df633ad5b15ee589"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sk/firefox-57.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "be5dce90f29f97c0670531b58d3199e22e2638169d2deb62e9ac2c294d7ee768445e47661e7b4bef40b0e9dd6d526581b072f808c005722f9640d980a5a1da1f"; + sha512 = "ef926b5a984d0f2027cebb405fd48486f1a79595f16f26f74a2f13083453ce5b94e5b123c959101e8b63a9af558f816a2af806cc9f2c87b9f2c3278369e52411"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sl/firefox-57.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7dd6e621e4ca75d22d97ffb7649223eb31785d140058ac9d245f76e45d8c0fb85c7cc3da0b47fbf678e014e5a81c162df80a9e2d9c9700f9121cd9bfd49c7be3"; + sha512 = "1447deb0e0d97e1a06d795cf66c604301b0c88fb248e96dcee23ffe6954effe11c12bb41706728c4b69f0f807b9f8e7aba6c9535b779a701ce41fbf26cd6a3c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/son/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/son/firefox-57.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "00963fcbfd0fe449387c4b2bd7106df566641454b1988eed3f5a9ff285793c6fe9777b23836b2fb7b5ed6db2cfd4219b8cdcbd67339b453e6ed0fc7534547f29"; + sha512 = "94c4c28b782268f37601188013957d95fda818d56b242bcd9d4575a787f4aca057c5970bafeebd31a6f31dfc72dd48c07b50fcc20d70ed9926e280b23661ec84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sq/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sq/firefox-57.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5a5e2531c75c4f120babe6ef575939b29e5b49363cf2788a14440e628009f7a2d32911b1ba16f88b55e85af8eb754aed0790471efdd834c1ab0bfff827b86b99"; + sha512 = "7fb22a303bb016c37322bbbc3d4170b96d54cdac6e1ce61e48dabd868800b01009263ad69052d919823eb2c104ca41ebadebd00808c581c7eebbd3e82e2ff810"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sr/firefox-57.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "5b35e346cb017076a5ddde6a9a4a3a8de572e6799e194fa6ea358ce50a8df22f8ca5bbb316b4f17a8ea5260fd3e025af00f7c362263f84efe64254f1977c8d78"; + sha512 = "991f3c6aeb48db23a4a569a5f51f22aebaa60b5ed6da149818c2a01dd40256eaebecc738e8623d3662ee9633e04581c4c4033461ac23694f81360e980b2ab406"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sv-SE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sv-SE/firefox-57.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6f52f537acd049e0602028fc1a852bb4a5adaa0649cb85a4361011e544f08ba5e1ad5917abc9a405a30f4fbf9eaf0acab1aaaabfddb4d5e1b4d030a600052bc6"; + sha512 = "381667c64722d04fb102d3d1deee0c13805d4271adb801b5176b9fe842c3916a4ae926dc56256552cc309729e5a0a16d82188b79210c4901e8c4f6d4e2930260"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ta/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ta/firefox-57.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a24286bccc8408833d689549e59792d12e16d985a0eb0eab386a2c220f5d01f9bcbef6862d7115154586fbf711df08fca0383978793d5d672c196e17a82830a3"; + sha512 = "099d94a7f35bb7a6c59e34c0ea500ca4f98a473ee52b3e33e10a085693d09ad0904c4dff4097b0d80cfd43f31cf9e05e300c40482aaecb83ee59d6fdb21d20fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/te/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/te/firefox-57.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0e16d70eeb4f89ae7d02326053f1be58768213f4c50e60b4160e54b79b2b80beef8c2d161190b3276350b7b47dbfe44bc59e63bc95e9b0ad08491a0876574f06"; + sha512 = "506c2538ed1a421631f9492894941ecd022ac3f085673c1447bac8f7c52c7dbe91854ff76efc7964f875444fdb83b54bbabf5c96f217cac6f61107af3ec65545"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/th/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/th/firefox-57.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1145d91d10339ec6fe757f366d59568f76b1ade1be456547dc80719a85dc8bdf4e5f1be943335496c489891c3f18cefd9bf83ce2239a25890ba7de8981400319"; + sha512 = "61ee3a8271478647e2d957e5a8304d88a68438043f6ffdb006c5935700856f7fb16d9ffe65785fde03926743c4c5713bde934383887d81d7e684ae6da14e8776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/tr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/tr/firefox-57.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "60031ede41569676d339df3abdc391c581ab01d4feed901346e77b33fc8d441bf501c521344caabc3dc59b6b537f8ef3f3edc0ec32f94b1c5386730b4b17b29d"; + sha512 = "2204991ea8ff6f06bf9a4aa9de2f395fc7cb88fcbb837476c5dbe2556cfcbcf361934f840b293e09d11e33427d22cd8fec44821779ee671a19e0aa577d9bb2cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/uk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/uk/firefox-57.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7c0554464057c27ac32ed1fea09a7bb05e5008b84ff5c1db0029a32fa7df0d4b5a47df7928bd138c8a8285c4a3146b8eb77b349c4352ca6b87ee8e804aba36f5"; + sha512 = "d550a3637e8a135b750e0932be53b40adcd2b17073a08dee6d02357b679a088d04f8ca1ddee41cd6370da2d611fe4981a70b2f38caf7e8a5bf1145ce94923307"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ur/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ur/firefox-57.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "7f504ebcd65f30b2aa5fec962498457abb48a77fcbe5e9b50290500f7a78cc2cd8ede0395529d2edc081124fc980c85d37628529f10ab011f70eb40c9533385d"; + sha512 = "606f376a7fbfce145cc911fa126b3c4bf7d67d5eda3ad6b82b846e6580b2bdaeed7b2ef4a72d5175a1fb7f5f3327b24d028186ce409d82d5b33f2bdc6bbff336"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/uz/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/uz/firefox-57.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "84f281673ed51f8c36ac72bd2a8a6d5109023a30110e70c1afc1befa0553f3a06c0718a45ba878e0d0609585e9041eb22ca0c67b8b9754be2fd4300b2c4ef1b3"; + sha512 = "aa13daf900c1f1557c3c481bf3bfd0eaed7af46b6a1e9c42da6c1c2be160882a02be9eaf62ada680a1f1124e4afff032c4d50057564cc5b2a5b8985039cbb260"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/vi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/vi/firefox-57.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "c9ba75084be67969c6eaed06cd33565f61bf86a2adee935b63ffe85a3ec225fd2a5188d7e29a4dc8a42c2fabaca574c1e3024bd06be758786aead5d27ed51d0e"; + sha512 = "faa306348b89a9434a3a9068a3a128a9583ebbe647a9d22e5ef9d9b581efee8520f6f76b7590d27d0347c2db34f3d35770f2bdea5c1b6ba73f2c849f228212bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/xh/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/xh/firefox-57.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "cb8adfe92c17479f9d99d8d96ec4f67020f302256f0971efc710fcaa83acf6340dc5a4ae9bc687abf875b38809fd201a1be0e6b1b88504b26b9086941e6a92d9"; + sha512 = "b15a5f62c4dab9e44c620b18d23879886f13807ce8d0008fec028d40f652ba11c75c13cf6f86dbe044afc855d24694872d1ff5502cc82dbc31b75454321a755b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/zh-CN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/zh-CN/firefox-57.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "765196a4790be391b11e58402127138041c3911d19c4f6f8d6fd06ce7f281724c321c031b190732f9e3e0ed966bf1e447627228f67847ef7144124c82018c04a"; + sha512 = "92deabe9058262a81c465b370b128b08872dabd87b527dc524ff3035d2b5068d40f15705449f5fac8df2e1ca291b91af795844154cb7ee37d5d620f952b7d4a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/zh-TW/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/zh-TW/firefox-57.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c1e0fa2fe1e2929b3f1eff68f1960743cd149f2dd023c830fe9585302f7eb8f8ca4e4d33657ac08a144cd4171154d5d78a106d1d921970df541dd994e534db6e"; + sha512 = "dd7266ba6bda17fd0194edd2855f1e1484758182a1c5c4ce14cabb046af31b277b2b385b47f6b368c6ba9840a3138416a0a787494cf7382827ff9bcb39b23655"; } ]; } From 426740205c62bb901d70209f2f0ce1a83864afdd Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 7 Oct 2017 11:48:45 +0800 Subject: [PATCH 0800/2806] firefox-beta-bin: 57.0b5 -> 57.0b6 --- .../browsers/firefox-bin/beta_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index a73eaaea489..e8b84c7ee9d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b5"; + version = "57.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ach/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ach/firefox-57.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "f3e10268d9a2b5813a2d69fcbf099de3ae9c136b06d4042448c26da7d9c4109719875c7c46bb0e27cd849abbdcabb5d70905e308dc19faa398184d3679700596"; + sha512 = "3c6a528013d0fd7f002990a095e1b1c3e1e01f82444d2a53f73544c4ad4e0aad62e49af561f90b8d0fd983e7f3e515e57f14e8b9c01ed625eb90db348d5f6b50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/af/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/af/firefox-57.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "58b9c13c779fb09def3cc1a83835a21428c41650e8f83d42670bc5c6cabd1b4a87e83ad73f5c2deb8129a8399b624c542682f5a640eb119d512f08f07da0c6dd"; + sha512 = "f8ef0a994e3ad04a02f86f381020be2087674f56ca747be529bbf6bcfab03da221305767a1b056240524e473a986ac7987485bd3a94a21d2030e561eb16fd1ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/an/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/an/firefox-57.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "c7616977f35733c98caa748a27bcd75d64a8c992f9bea76de76c69dd7adb2ce248eae2cc2791dec27b743a1dce67db22a546a339f5af3ca160bccdbb34caad66"; + sha512 = "4df60570c8c7352fa1e9a0520c795947db6f03a7c757a8a554b2072fefb36bc2636c15ae58fc7bb28ec5e8aa471fda26c91c7e8aec06013407419e9522144c9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ar/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ar/firefox-57.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "11918be6f23f095b738111441cbf035a67270a45145ce8df01e6c7e5067d3b54a521094c90abaa7715ab1b0ad6b9063d319a53c3f5ea2ed0ef6d8fb124815652"; + sha512 = "8908830c2bf333d6d008cb900b97132abe26d84c4cbd4e0d281ce2d4cb211eab4241139836e5b39bcb8f48012254d8d5a06b227b1ecbdadc6539899bce1326f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/as/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/as/firefox-57.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "b5269a9b178183688d32efa2962c80d1bd448a5c378f3d6453c083b6fb5aa114a130096a40f02bb17a76d05c1ef03afbb814cd7bab2d545b7bba085e9a010794"; + sha512 = "28773583524bb22de708ddd9341192b631674b644ec639122661c25feaba70ccacdcbd77efed9997e490ccf59882fa9f5f5f3010a62f361fda2808ca73061276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ast/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ast/firefox-57.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "af1ed67fc78944d4480306d9c230bb1a831e093fda6e9ccd357f20ef8b94eb8581230c2eb918719564b427ea741eff9b8eb762059dcc4150dc79e98c4ecc7d3f"; + sha512 = "7510a259f3ef4bcc38163b7ccf2f090cd4a4cad1133bd2d961470116d0f0bb34d41087a40d744cd31207afab1f5299049558657d02f4f0f23a3c99a98d752624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/az/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/az/firefox-57.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "67d93ab8d23a5c036a34aeed756af9eb021b86167becb2cb42a393802736a296dfa90b363c1dd6cc86aa3f25e514b4de5d7a13bb3de511baaa98874c6a128dec"; + sha512 = "8282183bc02bd7d4bad0cd9d74956634dc0db8988245caf1eb89f16d596d78a6ec00739065b38cb399dc93b113d35eef5cf1188a2a9c78256d002cfeb87114d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/be/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/be/firefox-57.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ed69789fe7db560a213280bde9ee79944a50bd2b29efaadb864cc2465dc304c39f3c40005da5f35f570dc1cdfdc4abd2d7b7ed6264b351ec8108fd1b67450ce9"; + sha512 = "6440aa65e05ddbddf4629051be4b05bbb030317c241fe51de08d8d11c003fc094808a532192651d874b6ad7e6d8f89aab66485442839b34df22189fa89ee8efe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/bg/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bg/firefox-57.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "2484d220a64ea2087a8b68f0502b2a866d405eb8c3ffa98e571053fc6b7fb270e041691f55c6833c4ccc7884abad75432fe9ad87124055075832ba078ad6db1c"; + sha512 = "9489b8125e992f213c06583e6b4205d9195091824ff39b5b171896be2766c834261f648c34edc992da72bf1c4609e92224a119402913b4e8298edbe94159a860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/bn-BD/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bn-BD/firefox-57.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "4fe4bc4b6d14d93daf49d751de73304098fac6c83172b35d1999bf205a6ca4f0c94f210b70e1cec7a7c24ea0e3bc8d5cabcda58c1e7df33e840a72e9cf9f2722"; + sha512 = "22db87e53116fc8db9b2c917dcd2416f0a14e19eef5834ce58cc141a4123b51e97e9d29f222c341f30180905e9e261d1f634579d8efde4db221ea78fa82cae32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/bn-IN/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bn-IN/firefox-57.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "211285374dc5dee3e0c2034fa6b2171e837e2d0ce78a3ea459362915cce71ff19ed71259bad4fd44ff82b89d5f675e9cc1ce3f76dbf94fe2985ecff01311ecd5"; + sha512 = "91800665d44a074cdd56333722ce3d1da54c4df40a9a964f63ff6153bd077e452008097f6bd678635d2ea16e30491ed960f60a473d7f95fa2ad35c9e717e6bc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/br/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/br/firefox-57.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "800a2653c08bab91916e792e460900fb4099f46042497b3e27a77016f32ae83b9acdd9ac37863fb9d1aaa116ededc6902854762a4f7c280baa817130cfc7b449"; + sha512 = "b95dba3b94b48d63b1954ac4983bb6d736777630899c60a84dce07d3f55843c23bb7af7215eee081cb3432c705700dc4e4df3665b329d0e5cd9e691e7da9bfe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/bs/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bs/firefox-57.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "919e4e89e8e29837e8a9af0b50422e2ebe114c23aa2f0d36cf63e81b572074ec2887031499f3b22511a6a9ee2842ea69f3587b1c4e71a684989c1cf73fa25dd3"; + sha512 = "cc656b07f6cd1a2783fae5e09e9ba4e0abd3ba3b29649e8d496511564075a8dc442206b8f2955aa0f5ddf36329c6b184278204e9398eda210b51774091341be8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ca/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ca/firefox-57.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "6044334fae462ce72a8a9b32b392f531733f83d8db0e34f07bfdd5b95b6aa8363a6fc0c99c18274bc277b6e797f99b76e42b7affc1d01f5a83a5a47e2a96cda7"; + sha512 = "c61f7f062989d10372bb79664ee94d5ae59e89ddd69d5eebaa3da7c3c639ba7c50a3f9608144e76a40befdda32c87ba5d32e14eaa0b98130fbf7d6b8ffdecad9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/cak/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cak/firefox-57.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "a8ca1f88e997b0edee57c84d9157cbf298e27d26ec82c5aa1de3b73a38e8c9edfe9bd4f05eb32078c2d4d4f300f4561cc7a06e377f847c64052a07036fc9a30d"; + sha512 = "f2b5db704e668fe3e8e97aacea1663a2849eec0ea527b5107927c5710d95bc8a8d89f73a23f53b430fd24cd19b5c7c0e4a6ae34d71aabfa87b5a743e760dc0a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/cs/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cs/firefox-57.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "8fb7bce6d69a6e57ee7c93013cbe8023334b4252844fe5d47a71868de2c6a30d6d0dda8776a1104b4616afd0c921325c569a6fc98f1c3b86e6fc436837d934ea"; + sha512 = "104f7498bcde823ea1f28e79e2be25acfefc5f9cd4755ef5332f160e15a63ba54ccb713a69c694027f2e99ce0e1b7ab07134c6bcc8a4d3caf8b10241ae27d3b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/cy/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cy/firefox-57.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "9d891997a1d2f09f82198280d2b090360cbec38296548d10ce356cce5f80dd8fd0f607b009cfc8b01d8f82c262ff50aac1dd5a0494785348eca3e43e804d8e44"; + sha512 = "dbf802eaca0fb11a5453cbbea4f050ae7fcc5081712cd9fcf3ce9b04a1e042dd4bc1ca721d82abafe26b9d6cb5bbea41ff6b58252bd52651ea5fbca580cad479"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/da/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/da/firefox-57.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "a0a0fe3c7729e8c402ef141476f2a6e482dbd652e084fbfbfd7e10af76164fd00ee6c5f3e8590bed972cca05628676b67601c1e6e38261c4fd688c183d032318"; + sha512 = "4dad1125de1f8010b3b30fd1ec84e26317046d5579c7841bf3bde480c059f088ca3dcf6e2b4a7843f1cd086798e28dcc95a6dfbf533919f456e2d6af062279e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/de/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/de/firefox-57.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "9c234314140c41bf8fe33de55221e5a07a4015f99b713500ac31830831f17f4fd3cfae6aef0358bcf825b11a4b0e47e9f784f0d6eeb98618d9b8ced8a2effb7d"; + sha512 = "dcba94836bc0f0409992e33d65814cca86811bb6ba6695a082a8b109ff153a0d12e36b6d2ad2d62ee9b588a68315f40420efa7c2b70ee667900fba470f01cdba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/dsb/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/dsb/firefox-57.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "d181b0328507bf4e491e53d41a93b548f2355886f87e3e9951338857c13ea6001d6e376dbeb430dfca8be47a4edc09530c7f64e2141cb12230dea0ed14ec622a"; + sha512 = "4bcc69f67901776a153f7b2bdd22d3dc7c23246a616095579008d4c2c2798ec09985488ae0c870e2c794aa553b687e95a56f262f9a5568b1712e04ef3dc884b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/el/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/el/firefox-57.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "3eb8a6b826111249a371af07b38e3ac631fbdf62f467b3620b32a8a4cfa81e80e417ddb396fa48611c8553cd0db1813a9fb620087875a7dd00385d26060b610a"; + sha512 = "2cd4d4ebc3099761a4f3aac6edebd662b4e4397e276e2fa1afa8b0acf6ff2d9367ff7f27909350b5ad8bda3a309a73d46375d46fe8c986b35c209859b79da4fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/en-GB/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-GB/firefox-57.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "45e1e54533828b7657d5ff11d1c6097e4c0fd50b6c603f8d1ffe804cc7ca19488a079f35b84fc81bf1324aefc5b4c82581b467d938586e7dc4b966d91388740a"; + sha512 = "86812a5b80bbe2845f628e9b02cfa037077f9a9bd39e292dbe8857437498ef48dd5576ff98f70765ce342faa55459c0df7ec57810c4491c5fcf1f874c02f6382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/en-US/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-US/firefox-57.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "dd9ae76565f0b30872de561723a5209a967b2d89131f62155ca1d78b1f34b69bdf30a7ed382c62aa59b9a386ae255fdc423f29f296771ca4bc04b043214ff4ea"; + sha512 = "27d107999a86f31451ef4086d62a6449088619625b46c599869564cf0bd4484ba13c92c8a368afa1111039a81c01f8f49cc3a270680822638f8c73c3d088683b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/en-ZA/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-ZA/firefox-57.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "22807d9c11e2caf910b12dea7bdf9b48256d8aff417373b1b89fc98a42cf07b1fcdc33180b71562855895655ce9f46e1ff26b7e1572ad21664aac5fee6f682e5"; + sha512 = "0fa620dfc562e187fe799251d98c7caaec3021f5317f4bb31a78ffd9fd9501461d17cd66e0d47080e91cc2fa7247c1a1de8731896ad0daa8f891585d894a294c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/eo/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/eo/firefox-57.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "4194e80f7f4a8a87baec636fd2fba3772e92de20b1776734cbbe0391da69528e3127fed5e5dca0adefeaa82abc40a1b884a215f7ac943b1c39104c90edfda26c"; + sha512 = "3a07022582140f4a25992c5e0e93ae2d0f695c5a258a98c6f2b1d3edee41248b9eee3e655084d61b21a7c32b29dc03f4bbf5e605365a2d077d9b5ca069cbc2a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/es-AR/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-AR/firefox-57.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "9444d57d1a1534f826177e8d41a2b86434294d2e8de725d87cf8953603cd1b671075b1f62ae0c6be0736d46e6c3e65c781e88985698aa48da3b68a83801f93f3"; + sha512 = "bb5f9b65b6d92654761d99911afa9d10dd1adb2a80140f6c1beaf5e014cf46929512af716c1fc8c01bc7f13baa5b924252a11a71b916d3945c1d28ce52686019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/es-CL/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-CL/firefox-57.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "c98240f2b66b8b460d6634e0ea00f8ab7b5381fd56619fcb32614dc89c2497111103f177bec27a55cde57a5534ba3c46dbb81abafe5f3e4e882603923d9ba2fb"; + sha512 = "6f7df550a90d2d8fa9b8417ae4bcad8158b544c3a49f240a0be4b0bdd350b92ba1c7cf99edddfda85d4d702693f52dce2ef053ef985001b5cd0899302087b21b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/es-ES/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-ES/firefox-57.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "5b2df0b8031030d9f1e1869cabfc9a6a5581d400c80518386e0c2b836d1b37c29f155c64a1cfdd80d7b9c38294ebacc1955ed5513633807ff234b4ba678b7065"; + sha512 = "d472091717f237a163db30be066589bcc1c0b2b72aee751dbad0e47557fc92075c29b2c65336961fbd91e3292307be0366a89220888f3ddf966a29ec1f2c765a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/es-MX/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-MX/firefox-57.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "1858f5208a9cc15f87d3a5f368bd460ebba368d079751a59f67b5a13ffedba52530445d920d8e3fd73efe6161101c6cd157c1dc62cf182a087ad978008bdb66d"; + sha512 = "ebf9eebe47cdec6ec2beae0d6edf48295089c7ee5aa1ead26e0ddb45fef583aa5be3941c4bf4c27b4fd7504f141a34342f674c6e15beb086f6994e8e3fe45ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/et/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/et/firefox-57.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7cf60f113face3f0c4263ee802ec9716fc85f948292d3316f13a0093ceed03141ef2330b1019297a45a3524b4aba698588cc68a48539a2eeca48845c3609bedb"; + sha512 = "818c7c4cd486988496f50d5c5a4a56a12ac8538113549433f11aeeb33242d7337f144413e27920cdf2029fcdbc9a2b9a47a9dc7d92fd67f2066ec5b742b6c625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/eu/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/eu/firefox-57.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "b1f7ad50308507729a10d4cb62b2193bc6740fe97d7fec0f4a5ff3b14e72a4814941430d0dfe641fd1c8f7ec333732365b5e779b6b07f90ab20356b741e7560a"; + sha512 = "781df02d0977a9e50ff01e214e2ba3bda27fc9052119d0b03989304d2db13009583e7d6fe32a9d502eaff1abbfb81c55658c3682e4f59c6da78ab16b59e3bcbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/fa/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fa/firefox-57.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "fa9170df228d9d782c92fd2a92ba35e780744234e7c62b635be8cc31c18762916eab0163c17de602052215ec082f212191f97bdf555f35a97eec46fe8df6e6f0"; + sha512 = "8e10c6d61d145a1dce790dc55691091b514749fd7565c41d1f5aec6a863814fa5a7b4d012068682dead8f87e4c1813787bc724438018393f5989f9dc49a1275c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ff/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ff/firefox-57.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "30aba17f5298ce341db0946f987a99e040e301b4f5b771d8c92a9adbd361b75ced431796c9917ce0dbcda2208075d07ae5b4d7f11085be65d273857222030976"; + sha512 = "1429a4d627e655edc245c375cff00e39b4cc42176e1141e49e9bf5eb2a9564de88a0915795bb94dc842d44e0de1aea28601c30fbe14bee0b210e15384c958c34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/fi/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fi/firefox-57.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "59065d98324c77aa30cbeef091316aa055cd95d9e7abb0c5895e168d75252d6d9b205717a4182e97428fccecc4d7703699dce80e0b661353cf8713c6b0af2373"; + sha512 = "65e1034b856a51dd6e21a7c21436a7f2ebd6794d6eea8f0631161feed5c06c34725e99473bfe9d169ef963632cd4aae72ceba24b658369f3da6f1f34017baf1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/fr/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fr/firefox-57.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "64a9d891781ed74b25d10afe210dfc549f9c0dbef6ac3e92a8eec551c7a97a488808e7f6d76ea70615c5f90af4319aeb92df95eb3d6495fccf53993a7bc6600f"; + sha512 = "9369f1ada09541a46745d66722884b3eae920f79673763cdce587a56d36515d6a9c799775791d587dbe5cb33d683b87194996134cf530d20bd3509d09f62546f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/fy-NL/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fy-NL/firefox-57.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "1b8968b66fbe9caaceefd65a06f0cb536f6b8356823fa2fbd0c1a5e7111537311e8aa5376c3fba032afcba515b7a7dc3ae2380e249d8acfb67ed1eade6218d7d"; + sha512 = "e765ec0dee9ae728274c594906dc57124582006f0d2c1bcb671d2d85812a5656ee99955f00d262095664b9bfce9e664c62f2b8dd61cf08fa4e460f68b8b6da69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ga-IE/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ga-IE/firefox-57.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d4d39834be823db0b188674ae59b157ae0a85abb2b0c4b4772d9185953eb13745c501d7bdbf6eec46fd84dc92585f0e6c862f9acba3662359e16bf68e70d043d"; + sha512 = "32e409050d2d45cf2d8eefc7c55c62c89c4e510b7d69806ccd3b8dcd7b68f58abc75eaeecc7c899fce832daaa3954acafb1d7e35d1e70f62a10f78dd4dfb7712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/gd/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gd/firefox-57.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "96396e9ca1743edece33274e7d0a14ad3741d146b37b65436e526604f8aac3f28fb31b2e18eafc03461231b0c179ca75157c271b44a85a3c07d8a1a93dcc6777"; + sha512 = "5b2418a12844bbf5943e57891a31ac7f95bc214a4708fdaccde772890bab94be88251cdb4a13b031623c396767e6386b5741f9bb46a6878ea28c380f91a28963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/gl/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gl/firefox-57.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "6dda04fbfd701030d58b0ef48bcd348870c34159ad3c552ac284537ba841a44e9eeb627249017ee686cc165772c1e7aa4cdd77c07c80a64397ccffee72ed7815"; + sha512 = "e45193079948904b1900bcde30128aa8e1aa29d7ca70269dd1ad73e55d9dc7a1f6b18d9c31a6b93fd13c84ecc7d8f6c474e41831434cf3455783597857f4cb34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/gn/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gn/firefox-57.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "6704e4e85f7903096d70bd715ea6186e219a114741a5f333343c39ea0327a5731733b14847f1690078d9cedc7b20e3132d71be96a14752772256b5427d4c4cd1"; + sha512 = "e062ae0ce3458bf95cfa37ba439d7da7f19d612240f9a23363cfe0724d264c48ec50826e4ef959fa22d7a211e964a9dca8eb23281fddc8069af267b015c9ad20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/gu-IN/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gu-IN/firefox-57.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2dd643952d8a28cca487a616d9218c9fd50289a294f40d76edbe1b154aac9d9fe886861cec078e126af72182ba5fe6cc1945fdc4c587ff3f614fa880aa9373aa"; + sha512 = "42e641fa032601903d34652996c08c6e74b1bb44bb2b579a20edcd064dc668739b4e4b8b973d571cd3ee5818bc99667e5f8114d8744de0043141c205c6ad320f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/he/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/he/firefox-57.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "85fe1aa9c4f63dcfa541cc1a6c54b05644993a3de770031b6bee151306b7663cd481078c20ac2bb8b1e338721b7fc31d060514a782a1cd907e55436b1df3394a"; + sha512 = "1303b9dea95512a85112097a2b1871d6415acb2134bc538e27fdbf5af005f3ea5da58c813aa2d02242636bb1211943dcb8c62f47593b9cd2846c26d0f8f93d3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/hi-IN/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hi-IN/firefox-57.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "5518977fb66e44b39acc21bb97b8b03dc12f240f8570182e7920897d908473b19646df81720bfa63947276465982b53594e7398858db950c3e6849e7bd522818"; + sha512 = "d8300d7678b5989884bce54fd7969c758eae4c7503aa25855279a3a24c3fe3c95097e4aee2a4e29c86e53c833be973571fa496290754d7da001cc6712fa11d2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/hr/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hr/firefox-57.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "904e853143ae4bdb4951c22afa8f61d2199d374b10005cfcda9ba3a2667f8e4bfa81eb07875094e106cfec60c117391500a397ec519ad1d65a00421b2f07dc3a"; + sha512 = "f6b7ef155300dd782ff5acd35202e42c64eac06d1eb623e3fddcfe60bdddd098649e477c7260d22f787591a54486ccae54d915ecb20ab114f05f88305bd4e099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/hsb/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hsb/firefox-57.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7cad8d88f39c4aeaadbba6a9e10a356d2d72d251658b28d1320b31adc09f97233718123264faa2baaa87549e4cee41bf3d60d2b8cbbe20c4b5944b06ce7a1228"; + sha512 = "00e30546e596c8d2c06f57de0125e7f366356e4ecd4ec4c499120e459492b45965fe95ee9698e98bcb1272249b0c99240765f5b2cc98099403585b644add4a04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/hu/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hu/firefox-57.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "087df7bc49d7e76018829940adbe0d650715fd38c57927af7c34fc9c29f198ebc3f14eeacfddea2ffbdb60d325de6038cdd29763103295b47f3412f8db9092d8"; + sha512 = "6fa2b613d550edc2ce3328b020d868474e1a523b6aefdbe94a84b7d38800a81abea2ce177217aef88703672293ae2083ed7b0f278265b83430f8f2bc6c3aeacb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/hy-AM/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hy-AM/firefox-57.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "7ad25dd04232b7ecb61914ef6b14261e6e6498acb0ffc5760d6945108665bb97e1bd5e64b1281766434d34a597dfdd460673632dc50238062abd838c25b1a9d1"; + sha512 = "14d31727a1ad12438ea4883c15c073bd76a4158a5eba874530068afef9e1f2ce017ff0733eaaaa27f1296b00276aab3875129ce01aaf98a148df6677875f3954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/id/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/id/firefox-57.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a9dc65f2160ab88b6adbdd50fd2e501980a97a8f5066bebdb518a5c76e906b6a0acaca3c5e2e8b5dca7968f55381bbd81e6bcc4edf22cf51480a7c6e84f1955d"; + sha512 = "aa8d47e406e391111958419b45bf88150dcb945d2f3dbcad901a641e1c2008eb25538c987ca3c8ea3b55c8c62c3adba7987c0cedd997cefd8ccd74e77c3e9a55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/is/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/is/firefox-57.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "a94a576e8f6b6f50ba41ed8c8001ff7595a0a439c742a15c4c468a1e026db147868172ab5c9accd18f2fef9bfb3a152e1e02316453ee621165ab125ba420622f"; + sha512 = "18c714e424abb23d48e449a58ff883414e5426c1c8a0f1e54f3f0f0eb4759e94f33facc6d919299c2fe5f4db62bf6daba166576debdfea6be1456b5749494e89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/it/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/it/firefox-57.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "c86a4c41aaf0e07de359e5b7d3a5cb331ea99c9a670707f05de5d27f6354c6c6f8ef5ba3855c3e8448916b852ebbdc594e986dbc325dc31eef421e514d145dc0"; + sha512 = "2da3a75200238e35a69622585da79cf31379e9a3386388c087a7706b6deae76db56ca0eb6f63d02689c79fa8cb8ec9a08dd3c304c203c5de64a8da3401f25a3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ja/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ja/firefox-57.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8628eb65c733856ee719019f38c54fd07ce63a39cdfce66fbd98462c353a81dbad97b5d490d22260505400f1f656af67b3f518fbde2e92843dd9dc66cdfed44b"; + sha512 = "5656c13478d3bdfc8fa0d1e01335f1d6c49bcd3ddd85a5a786b97418adaaa1a64632b7b8c1e5a6cc72431dbf128e4e3d81508fbc5fa6cb0d79f2f79b58778bb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ka/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ka/firefox-57.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "d2ec85b3d71964850c3b06c500f5bf59ede7c8a38e12de70d0033a2da404718ed03f16714f09ce8a340de53845094d8e63d185c9a86a24ea016d8db31aefbe40"; + sha512 = "1a8b488bfa87ef950453c9479943e41fdbe8c26051d68af06d341c0a555e84abf390b50d16b8a99b0d3799182a5781c4808bfece4e055e0b3a834f9b81a4c416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/kab/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kab/firefox-57.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6ebf73f503f0cf491eb3c15e54aaa0b8989cbf21474c681b5b734bb14400c9388cd5848840c7107f02230a4f3bd41e8e52797858ccbce1bce035f29b286c78d6"; + sha512 = "23ef286dcb57f552268aeb5ca01368bb6f5541812a0cfae1e88161b522b3097e86be3ad93a26f51618dd818f6a6014eb96352f75a952de5aa76f7a94d9a466e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/kk/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kk/firefox-57.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c5c53aded97db7a6e4f835b459027a8d48b72a88b079f589a618cc14a48a749c41a0e66562a6483c89ef5a7fc016b3b573924c023fd166d12a90038c8d1d76ef"; + sha512 = "f2324279d127b6a626114edb1f947e45073ee99751c960bba06cb02dc71ef2e32554be8d85756c7f76947dbab0af00969222b0bf25d896562e4e0d8ee832b959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/km/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/km/firefox-57.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "476189a0774fff34733ca8fa3ef50c4ed20c11a2cd591b41a337d94e649d3d4313c73cfec63be6b5269a40818ae05ebd5d3d4e6e9fed0a34a0f1e0166fb8b8f3"; + sha512 = "2a4a1b22e6d3aeb61e1a3e7446feff92fb85873862f02d4b201952c99dddf67fcab219e69681df29429d6603468c83ded93af90fee938b5eefe8fc2cc58d17bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/kn/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kn/firefox-57.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "154ac09b2c43bde58664f2beefadea0eede18ed827e2fb7b9f66016b957685eae0f6ef203f13e1ee2200f3d0bd998f3043ceabbf64f017f09a1de9a6b8d664d3"; + sha512 = "ab1a4fd00b09dc73c971be1cca674408f5474ea7da77b4da8fb692c046a0ecb69743912ad47313efdd6ea9338e338f4093904e42cda125f67be13f281e7841f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ko/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ko/firefox-57.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d2e34a9364e5b0806233114809d36ac6a62da7add5cecdcaf56077d8286de0708bb8fac826bc2b6b237f44c6b828d9a6c44a7d7cdf7f74d12fc561d8d7028c10"; + sha512 = "76482e0199dfde34f0fbd5a32ea79875285331a65f1270246bf8b413dc72f07b8bfea7b6a721005189107c8f2baf54f5b4c2aa5e9008e7ab70ca5c5f3bf2656a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/lij/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lij/firefox-57.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "1a69326a0636e2f7a9dc7ce1405fc80a02431a798a9ef69950266b6c6e43277eaa42021003d924dff0e82acba98705a21d75d31d6515edf88acbd619dc2b36b0"; + sha512 = "bdc30b4a4ce2fb4a4f0a761066ea17cd30fe0d4c682f7b5ae4a4a9d6f220e9aca7a918f69a2fbca85adec8eb95d4c5c664e8958caa73d57d79152549f03e4bff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/lt/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lt/firefox-57.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "5c644eda282da9d486aa8755c28e1e3f02f881826d6b2679404bd17185d5731b8b1293b65b52216435ff3a11ce12e589b1f428a71a4ea976e52a5267292abf38"; + sha512 = "afcb9b001e0751530d179dd3f797240d72a31a51263ff91b8ba055a90b474958b62cf7a7142ff43a84e2d7c3388feefc13232f818a96d82bf58d6d2a39c52db1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/lv/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lv/firefox-57.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "90abf5dee87397da507d3932565a7e17d6936e94bc47b7f5c629c4cc4c687773dbbba8ad371c4a463c359bd3e81ee8e4222df0edb5c0749d503de52cb15e86f9"; + sha512 = "75c712b5df622308e113ec2dc04d513b911f15d180ceff0439b2bef9304c9ff359ecb895945b5328579906eb5d0e2fff6f1fa2698a085d104ecdb19d06727341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/mai/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mai/firefox-57.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "a50ed82251d5bf1f77fe5d44e5e16076da7a1081f3ac5ae23254342ba9dc5c70f95d1e4fb0023c5be4b72b97f12dd164e988374a79f5fcf3c90fdc9deaf67580"; + sha512 = "e2e0654d8f43062fb173dc4782b83641c2e9a5d5aeff4e0bfa38293956f321d7410eb9c5e2a5e17992d6895575fe5f1c94956cb67ad6a4571673a093b44b84bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/mk/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mk/firefox-57.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "a9f3830cd8f3e1b0b97c63ffc0ad16b9d3ebf80bd9fb7e416f7001eba84651bb0392d62c802e57f74e6c606f750a1dc278901bf81e20d8579f6046bfd791aaa2"; + sha512 = "7eb2cec4b09a6204986c6a71333d5b08802617a0ee29f1bbca52c8a268c27456904e518128d15f74fcec0cdb040f5696c365669d0a8f1653740cfb2a25815161"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ml/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ml/firefox-57.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "a8dcb1996e707d740f4b040b9d86db9a43bca02763c855ce71fc8c3fe6849621cb8ea9d83113e9972f33cbf73bb0bbeff6f730036e71e8d7184efb71467f9804"; + sha512 = "cb7f5fa2d2b1650ec24969c25fb2d42dcf2f478b2f7a4ff48aa2afd2a08b07ca2fde842c830bee2c3f6de588fd83c3970ca965dc62677400c43beca6472fdfa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/mr/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mr/firefox-57.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "8e62ef5dd26384e6d5435e95da28f544eda58f458a48e608dd70ba6766fe45d2c7b5e7ef2cb69b3e9a9bc538905280307d22c037307633afe15949c8e407edc3"; + sha512 = "b67631b0ac97123053b5e941df3b833ae3881b8a37d1c25e18ca962a04f2a600ee23257561a5a7b69bd37948b480cbe75b610313d67f1a3ea0c64b36ccb1b0d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ms/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ms/firefox-57.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "cffd43b21d3c9a00d68c4513909864f38c7f23eae36301978d4849988c1b18bd0eddefe7ef176aefe47406e65037041a99153beb649a191e532f0a314b6a1103"; + sha512 = "614fb7f03b2fca659575600c2d7bceee35e4066f0c16cd3d88364b2b4c36fc6261161d5ece691ae8230767d5af4302d84d6e24ecc2786ef7f500547c8d039850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/my/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/my/firefox-57.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "921232def7f322eaf0ea95bb2372ffc653eb81384d1c60d9f40fc25517028929f81110b7c50a2376cfae1810c8b328e71d35030aa712164b79fd6570be198326"; + sha512 = "e568525fa0151e5188a325d695fad47af3e2f59b15ce4075d27c6e6b16b387e86cd94d03dd5207c675cb0f7a4fa95d3f7e67248876391259d858277cb5ab339e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/nb-NO/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nb-NO/firefox-57.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d564f9010be1a2638474e65e9a9cfee390d7ebfcdf172d87033a9c55b469fed0c61cd1da3df7f3f5b1f5f203dc37c692751d81aecc2edb650402ff3bca9aa6ad"; + sha512 = "a7008a0e2da4d0a273d0fa9b9a7fb1c873570227536600820df353deab63b7fd3eca438e0647e73a9e93207fdd66513c051e91949f83f6af4a064f50392eef27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/nl/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nl/firefox-57.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "5a6a454ba3c1d5d902e157e9fb7ad40499ddd3ffe6021eb7a27993f028ca5dcde7ba916c389142e5b0156f65a7cd18d6972b70412aeabff1bc95292d1e88a711"; + sha512 = "380d4d0381cbcd9eeab57a1eb0d7b90a73d0c163c825033d3f7c65412ac418a7dcdc07ec0a10131035f4d02a9ce37133b4514ef953dc5bdac3f0d415149b4364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/nn-NO/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nn-NO/firefox-57.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "0501d60d85d05cc1a66fbfd7bbedb7ffbb672071ddba5c37493db1131e4abf427ee0a2f37eab1e7ec41c663ae9e9a2ba36fb7bfd180c8cc99a2bed60b5d82be3"; + sha512 = "60d9157c1add1064b9f5d3d0873a36fa7a29f9f19da6b0da83385db86798ea645ca98162a63a43f4eaafa8b79a8c19cc2e547e08b3c06da8c36c077993fa8faf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/or/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/or/firefox-57.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "b5879d81d0f51c54419fabe5f9ef42f00869ba15fb2ce85d7eb36423127522431dc52ffb2918a77977a940519fe57ab05bc4bb2f3cda9035015cc21d986321f8"; + sha512 = "0ab3abff83d0d992c929ead73e2a2de174475b386559395a2256d40e7ce8c4c6bd48d59bd2f3e343b12c2c31c2fe2febe5c4baf658fb38a9dc4bce2106c8d159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/pa-IN/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pa-IN/firefox-57.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "32018c0e2b50651cbe0d9310da2818f54ee87e148e12d7a195b22d14cb5d9907cdee0771b7fca2ac2e4263a189c1c89fead3aa8ecea340b0b013e8b95f31089f"; + sha512 = "29d743e8f90568a1f4f4a1e0988c9f5f598dceb589ea4a6366d9793c4e78e650c0c5f8caf0a30c5839d5226c0788c40e5e128c027554b33e33f883a65504ac6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/pl/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pl/firefox-57.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "929c67e2d3792fbd76c88758c23aaffd818fe3884b297b19c6609d7fcdcf4432b1920d21039150c880e14e8148ac76b9b4ad4b796599c420b60eb463a6ddc2ef"; + sha512 = "7738550ad840a14871da75c913816f9c7d27dd5037c3a8a6ade0415094c28e2f1a00c6b92dace368284ffb0f859131f1894da3b0ba720442dfecd6ed67bd3b3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/pt-BR/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pt-BR/firefox-57.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "dfd3d6ece181ab5be296a017baade85e2dacc4beaf9da94aaab42840bb47400e141e0c45f21ad485e9fb627f5e4d11c388309eb2be4a29b13b3987223768641d"; + sha512 = "0a738deb89fed9c4faecde5412bba4bba9c83829f31ad79253265fbcb7d5e479160729ba537935c2f88d29b987cb984f338dc6232489938d22333da49aedbec5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/pt-PT/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pt-PT/firefox-57.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "89efd6c0a4a1977857dc61dc7a16f47722ac9f432ecca7876d4b40417ae7559f49f4af4065320ff4a946e9089792a91c13273c7cde8403ac467d221e7ea1657a"; + sha512 = "d51ce8adfb710e8061abae49b47a580278936b819be2d438833ebdd81bfc1d7cf631acf13c4837ef3134be6b9dc31b5f08714d7f37271faa5116d3fd2d4c7937"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/rm/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/rm/firefox-57.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "651ad7fbf9e1ad3b71172f351712a2415d96705e1ff2e4600d213f15d1faa88f87a79b665668652be991b3fbff5f0608db78d9a3c7b44530620467a8735f99ac"; + sha512 = "bc2f9d3cb33474c330c637a8e5001d3fe427172ac9ecee4a9ed2f612cdf0f4e6e8213f5a4f01d964e8326b6ed713de5a6d4470fa87685487800f29485727ce8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ro/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ro/firefox-57.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2c92a4379f016cc2b91fbacaa9e212c055c26154e852b1c18b664777276ac59f9a453228bb6f34db5c38a5af8d34250c38616e72971a2ed87f1b9bae66f36cbf"; + sha512 = "66e25774ab24a48988bd8963d089c375f8bc48d73ca104bc83df36c1ee8da7d1c46831dce2539fd447e956a2378060999b53e60a9cd7dcf5dc780ae3aef21648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ru/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ru/firefox-57.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "38bb9401094d619a09b3e505873bcb3af956fc14c342ffbb3c03b64e597d3b434cd56985b0e3ff489790e335a3e175f66fb57fc023d0a057226c6a941bf98920"; + sha512 = "0b3548eaeadceb0f15dc0d9ff198feb2fe94be579be3ebb77026894a3dd6aef6c4be36b32cc0876795fece91ce96fd6233ab12bb85aac415e5368c8f00dd97fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/si/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/si/firefox-57.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "8a76bfd5650f2325e83e349b430095ee72cf411f5502418538c725ffd3361ef39c3f9b0bd37f2dc1f90fee0e54de6786c70a8eeb64d3e6d5c0eabd5f37626060"; + sha512 = "a77772ce7197a9878cdd1f9fdfe9bedd21984bac5846a81ef9e1d08fa64da6bb8dbc80b758b0aceff58e3a97f0aa4446e9f82126430c56690a87363fb65b02f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/sk/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sk/firefox-57.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d244cd574d1f16fc400b3681360655c90b8a40666d82b9824dd113f4b4f1b4a9b058d7e2a99c467294cb1f3fa3ac6849e1c7ea8b06310848b29db03a6d445f31"; + sha512 = "a9ae3d06e954d07da9cb3312e0f567593952e9b8cd8597a42f5fbfa80009f8ff79f3bb502e2032402c62ba3dfd10887a7314406d25301e5c00ff653af5fa3046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/sl/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sl/firefox-57.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "661c9b83e69479adbe5551540b650835ed85e65a1be9d805a568568acf427f0225b6cf6d8062125bf73111d36770fa08594ed6680287aef438bd020e90040d79"; + sha512 = "6b63b681bffdfe6942ed11a1483c7072f5d8322a513a2a6a8caf45cafa3e8f1bd750ef9db3a48ceccc49ba281dcd57655805a483a52325d542607511afb1c6bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/son/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/son/firefox-57.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e93d9e6d791c9f2da9e2f57df262c3413321d44b5d73c7d8839d2b502055da734391b048632c2578e85d3014c5f14e66337484e45a0adc8965913c5a6ca0812b"; + sha512 = "121e67c39bbc546aa06f409cc62699a3c7f43307a11140c0ed57f5daa009be92e527fc5a8eccba7311fefe650baede394c0e0ecd01e2adecf783439536caec72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/sq/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sq/firefox-57.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "79a2e9fae68a5ad21432957923a65b2b4416a86b3ef948a4e5d36ff9fd383142ce1f21bbbe86302c4443473264ddc6048506efc880cc8a446e6c11b5c76ccbe8"; + sha512 = "6e4db28b27bb6991faa10703b07dd251a53d9f30b27a9bb6f640c491a05059c6706f13363557d455d5529281d8797620272eda189da74c0f449d03bac8973b96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/sr/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sr/firefox-57.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "03f8ec959ead21c55db5c6d5a86bf36857eac3dd9d480b0ffb8ba262c14148dd94ce1c082b47085d312196baeaface008902b90729cce8af4578e89deff0b4bd"; + sha512 = "eb2d92f3470e97f54b70fb12b87e2b0653664ea0f7a59e93f85a907564dc9619a639d6ce418e1ab90e8c40676e37463d9e4ecc29c07d810500186bc1c234e6e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/sv-SE/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sv-SE/firefox-57.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "558935b691cbb68df102a996766f536e361778dac12bbada54e7b944f8f782bf2a03ee3f9cadce40269efe66cefd2a73bbcbbe64dca95d4826ade237c994e35b"; + sha512 = "faad39482bc2ee50ab66ab8172097860cbdf7d5d81270bce700af8300896b4d30d1b9ff4737ca0841015058ff42fd1ff16db68672109e64edd67d6f0592add7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ta/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ta/firefox-57.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8289def19004e12739086e383922cecce1983c5084ae9913fdf7a7d7bd3ea66b89de49eda7365cb8bb0634dcdd6fc12052f850b26924859ccb04f26d425967cf"; + sha512 = "ac0cd929bfd9dd5e112077194601e1d70d40b86b0c8fb347be8edcd30b4d622974ea7580709f6502627f0cfb99eee465a615b9899e38d427181a567e47593e20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/te/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/te/firefox-57.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "2ae2323bd7cd6752d3841e5a8072f5932063d27d7702dae06d4401273d419c36ef9e4ffa9b3c77ceec7be95e03707cf33711f4f0adb8ffd3b7abd796c5f7aa91"; + sha512 = "7c45aa88117399629b0985d4f64e503c63e116e05acffcdad18c05cde84556d359834ea1c478a0585bcbd8838d23c1ca9ee117cb3fddd2957a10acfc243f5e70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/th/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/th/firefox-57.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "803fd7e692c85c9f65118216b49119bc05fbae18c04ac80880f334976aad4a42da58b0da10fe31ed577b3fe8c5e46bbba7df6fba99d814a4248729f3c6b09cd6"; + sha512 = "fae97f4b0dad5a0e474be35ebb9ff2195a94e5d11512697a41fa45cfe1f131816283107110f723de319f2d4e9bdb7a311e7d72cf02eb4eed325b10e7067f95e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/tr/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/tr/firefox-57.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "db43556af5a05ceda590a22b4042566f2b68e7c22b70fc4896c4c67355629b32096da4d1f71611fae22a6ea081659d57095ed27ad841abb9521f10b09e57f0ab"; + sha512 = "a54215a44aec2972d55ec698b44144bed15174aceb445c0710b3e3e5cfb8539784e1ad6c98317a1f1a585f7601d33d28a4d65936ab9bae219ccf42c3d0e98a33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/uk/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/uk/firefox-57.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "ae13aa237a3d531ecc840d8f4b38e4849e97b082d49c46e903875d156c0ff5779ee7653179a78c865699df2f830d868e1074d8e32cde1b3b663296a5dc947afa"; + sha512 = "10098291464cbd4e48caebdf9b95bb30f4df61a0cd5e617c6fb09b22cd0aa46eb214e3f2b19bce14c9bb703deedcd7b22fc2d25f780759c955a65d1bdacb2603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/ur/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ur/firefox-57.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "32acdc008ae647c5d1f0b9ccc437ccdffa433db790e6f0e2c9de53d908784a21c08ec8aca28e6eb130ce39d57cd2b65b593d1702f0db0d6d47fca052064b832e"; + sha512 = "5d40e66225e097eac31889c1f5ffe8389ba3a3f159956cf6f0083ae40decd1141d306805cb51e79b69de84c73b84858121d40b0244b645efcae1b791cbc788ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/uz/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/uz/firefox-57.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "21940f34975ea474f4e78c9d60b4c85269b60e68c5200a9a6509c61549bb38e46504ed010f887daaee85c6a36780b8518e3a4cc8de0a2a072104b88347ebab8b"; + sha512 = "d3a6e6310dfba8182cb529ef96c650a5344065be61569a56f310e23bc443c500af99d0e61092867c0ea94fbc65d63af2e94bb077dd8a5d0dbe1dca1aff1f6183"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/vi/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/vi/firefox-57.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fedd5827e023861892197dc17ed8d2de39203f7a9ae4213ca99cce6ad1d9ed7f50613838526dc9edaa697438d33150a3987bf5fdb5b347faf0081617c1f7ab18"; + sha512 = "fc4a085b72e31a92d9ed708eb02b42d3bba1d2d747b50891e4fce5e1b24578ac0637eb46c6a99cae7d81911cb2d6987659465e1168beb4fb27a0e128cdc06d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/xh/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/xh/firefox-57.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "3713cbae54066f793187c5d7cfc69c544a54e25b77b4dc52bf653f05585b9ebf1ea0f2d59eeacebf46a346240b4509c40dad5fdf6caf27721c25d3659cf1c768"; + sha512 = "57f6cf74ca703f00d29a5c1f11223728c6f9e06bd25696effa69b155820d839680f29033dee1294ee71a2a658f35482fa05c4840a812a8aec8c9b052882b8fbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/zh-CN/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/zh-CN/firefox-57.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "543104bf2f065bdcd914186e8ea46407f7286409cd229d9341f639dec9a8108e537f1a8f82e918514fd5fb104136a26b5d6a2f026813b391703047f614718847"; + sha512 = "52f2c50c3d65a2edaf033d313a4e2221c074cd76f1d89ccfd1101b9deb363fadf15acb9a795604c343e55ec11fa61705559d7f71134c71726b92801df348f677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-x86_64/zh-TW/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/zh-TW/firefox-57.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "5c75f4da2525c076ce270be57ce22aa653b7c3716b971964cd0560fc0069927083de3dc662097eae60901aea28737626c64507c82f76eef24ac350104571e9ce"; + sha512 = "0f22ee573b8ca0a041373c33588496d1717eeab134210dc9cc23c951fecdfd319a10ccca18329543f969445bf261bbecb1b6de6a1223101bd50af8a1244a9475"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ach/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ach/firefox-57.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9de80c393b6ad0c6042ea8867980b97fe41a68713539d7c7b3479ab5b0a7ddc4da3208b24e42c4979003786593d3d1ff73db0035b6566edc1acb2600f8a1caea"; + sha512 = "0c474ecba92d8c6132a1bb484702db6f9cb34c9503babcc9f339cfbd97f03cbf6f9e51a4b7b7a69efa6cc9acffc648a0912d2ab92753d6e00ff9bc92667f263c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/af/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/af/firefox-57.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "0864f0127acc2fed3ecfda420b409884fe892427c4d2e8d9df6a126a69c460a10b302dad78e9c34c6ae73609116e444d7210185302ff072833387ba5e7b74627"; + sha512 = "68e0875f2aa221d639067c2479cc949a6bec5a8097efdb20452b9c6c9ca1c781570405356775c05c02939f04ce4a4ff23a84ffc1eefd5c213a37d6ed7da64fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/an/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/an/firefox-57.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "40d613fcc5b6d23b69bb56fa2f0537ff440df5a6a8ad49f79461817a2eb1fa472cca694042e02716d3b8553d5a26581c0ddef133f3a6b961c8343b416d2aa5be"; + sha512 = "c5c95b2bb6822d80dbb83277d9efcc7e750581a7d46295257802c760dec6016dbd79c9d90767c2bc75842775ddb489b6cacdf3e7e66d63dc19f6c310fcbf0b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ar/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ar/firefox-57.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "3a3fcd70d11d133477852e450e2a5312d52c8d70d6ffe5eecfd906e126e4d1be0413b580349005f732ecfb375998e893e946d520b8190b0c1412bdd6c8fc1cf0"; + sha512 = "7a86badfad03dbb4198d2cdc287c502c54df2a8eab6be487211b3c4372b0d8d82104fdd136f84a3f6b265225f639b12f3b23f3378ac0fe185919cde202a9e542"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/as/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/as/firefox-57.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d88e4e0b7f73b0eaa2abaf87562ba9693dd0cb50a8e91ee362e9df8867116af5535acf7907483e9fce0d9b416fadbc07b57d29631898780321c226c2929618e0"; + sha512 = "1fde68d53458c0916f49be591c5bd744b7a3e3b4dcdbc0118ccfad103c357d5317e8d1fa7419cc1ffd48deee4ba196a2a41d9f8429c53be444fbcc5a8385bcf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ast/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ast/firefox-57.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "fd5adb4a10b2c3a18dfbe1c021870377a1c8c03f9cece3ab4d045acb8b1ae1fb56b311a04176bd925dc5f10d9289fcb3347c593fbe4b61d6c732746fa24a2027"; + sha512 = "721e9822c9638299ffdb39eafc1f2b485d862acfc6bb0ecb02563433fefa4a081845d31b75586984b1b7db768815dd5823a8ee8c0d22b655be13c15f3c840e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/az/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/az/firefox-57.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "f94ffbb20fca06b2204ae81f277abcf31011ccc4910e9c3408e34d66796972c063d07c45ea88d9a672265c6ae8af2d230d6dd511bdec51a37abcb5792db31626"; + sha512 = "99afed4563ad52bb2573c66a974cd47688a5f951635cd28c85ce745d8b846473adf488ededc22d0737b6406e98c6f2de6c828434b9637e57f0b9973997241691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/be/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/be/firefox-57.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "728ba0c9204b45d722f3d4249cf2b6970e75be540b744178e6a1e4e08692755c344815294a98c6c7d231a44383bd2d606bfb7ffb29ed5d7d077050e34d1dcf37"; + sha512 = "6e7e0306dfff0bdcc4af40a63c8003b7e06bf8e555129cccd88ee0a1d726f5e914a30980548d69db28b2df16fcaca3e9e88f4b7b1bf672e0048fb1c27d00da44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/bg/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bg/firefox-57.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "396b18d49164808d5199cc2ac53868cb5a4639d96ad49cd33edd446aa3e4e65a347c08b887eb9b0eb4f4765795137d0296d5f37891706bbe9c13d2c19ad956fa"; + sha512 = "5772a034ba84844656c8d93286a514e49608e5fc1a2546d9b70631562e0c3da79f57cc36be1a4aec72f9ddfd187017db588bfc63af3142afc92ca331b23f32e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/bn-BD/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bn-BD/firefox-57.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "282f309019a3d45fc2ed339b1e958bfe6e332f679c27d34a6c5e6b3fa5a45412f4aa7b0cbc7f520c1ee5135d95010007cea79fbfe35965c0d7263107c971714a"; + sha512 = "6334057dd3661daa8434c1e3069b7a4e143fb148db821900b9f7c71f152777f77741c7dc720ef6f1513e4402abe83d51bb580354fc3355393b75488aa8969d64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/bn-IN/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bn-IN/firefox-57.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "cd8a2fba1a2d5c550bec9287204d2c456e9c3ab8cdafa04455b6b2e706f2906786dde1183d58f7a84a7ccba7a2f4242dc4b13b30fadaf1071fef47f781e7cd39"; + sha512 = "e73a7fa1b76cf4fc112319fa09685edb2a64a3048afcf4ca4f6fb278a9a10a7571fd8566968d7e9b1a86fbe4e262d9be5c8052a6a2a31097e2aa16a3657848f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/br/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/br/firefox-57.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "aa057d1d35a386d21732a235d558177dd9b2b0cd52d416bbbbb482eb62d181f69e981cc7174ad4805da0b06325bb1cbc7a9abaf050ec713e3c4b49e8a40da9de"; + sha512 = "6f52057beeb18dbaa99e2762ffbdef7f3da69cc1ec4801fbfbae4c3f8fa12619faa0086dc21abd92c656d7117022f241a70be18798e93bd33eb8ef9625070ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/bs/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bs/firefox-57.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "39392bb6e4dbc8d359545ce996193e22187ac14f795221231f0d9e74c3022b4757599e03d1862cfadab10f78d8f944651b73a64c8c16226ba1bb9e559fa1bcc1"; + sha512 = "0069bf5b9c5499d3e5424b9043ac5f61ce6d9cb34ddb329a40d30482bdb79d1a0db4f00b14409690af4f0b9afca9f87cf65daee313da6343bae5e8684c1de266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ca/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ca/firefox-57.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "c046f0dd88b706277781fdd9f88ba2014438b25a99e136ce7f3dd34e2d7df18496398f5bec5aded25a7eaa219c176f874e6bbc4e9ecad80800bfaaae24db2207"; + sha512 = "0cb95a2b288f7042c1f6767feb1cab88d345e0f0298f3fbe3385e58c5466bdfb59a2c28683deb3a8fc3f4936dc991486295b1a920d1bc09df96cb77f58ecc4ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/cak/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cak/firefox-57.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "532fbb953baa06ce5a3a6bf2ec1a4a2e0ee81ef297e4a02b00cb27aa2207143d40efb230f090225157a2a0c47dbc6bd939d819f9e5644ab3b84740ff9eef01a6"; + sha512 = "4b9ad14926a3c952ce3dc5aafc1a04036c6ec45a7a68835f512221ddef13d67c6473d40fc0993cdafa6d8ba6927910c20c089b331233b1b6f493c048770d7e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/cs/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cs/firefox-57.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "78d880bd4ba71c8b83949e51d3396e2d192e825fcb61bb2146376605e4924cd10b4757fcdc2e55547300473527612c00327625e4c2a848afef22794d26837b8f"; + sha512 = "e7e748aaecb30b7ada664474f8b2f2f9a3632d58b195f895094de2d4ecc5952948cb688dce1a151cb2e3832bdae335ef74017241d29400d237c828369bb9c392"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/cy/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cy/firefox-57.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "f55d56221c3457f934dc4133a1c9c962e5c270f93edd78b5e815d8b8269f34296107c9eb576ad9eec75f1663fc111324cf4134ff18cf7ca93c0f7e5e7fa5a348"; + sha512 = "4799a27cb22216e9ab2f8b2c18b18edb6eeb101995e804d78e86a1c79738f8c9a6cae0a3ae2caa1b1b104d4eed2218560c80d0be53b3e453419e576ea3eb5312"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/da/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/da/firefox-57.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "329cf5c3d30ad87f38a47385f94752580fb3a2cab3ab1e01fc6557277df101dc0f73b752fa896b0bc065ede104e7a2906501f3a4c7d52e2b9df952f3cff491e8"; + sha512 = "fd26938de7e4df391edfbaca4b7d536bd3ef96ff53d85bb26b62fc8e9e1ebdaa344d69856a217f004ccb0a2a9f5aa18eded9f62f5ca4196ac07d845a80f74043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/de/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/de/firefox-57.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d5e5854a87894d5f1ad032494da40f9c35177f9743a3106d26aa14fa700539aa5770d99b33a0f9cf9162a0c249929f48b5a78451096d7b22e2f3838033a2cf5e"; + sha512 = "bd753ea3bbfc389028316f76784bb0e4216777e34606b415bbcb6efe45095536bc5e45d6bce6bdb632cd59a3d99df18abb4579219d6fb1745ab81ad32c9d3939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/dsb/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/dsb/firefox-57.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "03213881f204cf41bbe822160bb14fc309cf75b69efc41e70a589a0512f03ed668a3c73ef0048779405105cacaf1c08bcff222cee6e04ad095c5d082315a858b"; + sha512 = "c5f8ee1bb7de2db1a6310b49c951749a0779f14fb3dba73fa4e925b69c7c6740330578e7762a796bb313c43ef3cd9175441e7494ccea719d1e904a7d06aa4947"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/el/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/el/firefox-57.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "024b78db62a30c9f353451ab01cb88849e900cf9dbd4850537fed1ac55d99fa3f454cef1488c84a5e990fd38227fa62c161dafbe4c6968d733507fdcf4610b10"; + sha512 = "20d34d89e99653649766cd6f7ca49c0cecda2b0af76654fd077fc8287c730c49fc1050f7e30095a0d83e16a4f64e1c78e9a9119048d57f531968044d9ae50295"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/en-GB/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-GB/firefox-57.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "8433c61dadc56ef837c6ea20820e992fd1b0eddb95ae372dcfd7d27a10b830f83ce7ac84262fde306e07daca94c7d431cf4951b8f043dd673dd5114dcc9bcf7b"; + sha512 = "543c4cc7ae137bccd1e4f765ae9c4422605a584d939ab919d481e761d29cefebfa664e63ae1c40b78b12da9cc185a887480c93b5af64449a4b321ebedc81abf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/en-US/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-US/firefox-57.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "045c2bdcaa471988fb83f979d4ad4beb78002cbb26a40291a2239bb8de1059b07dd648e52f4164b2b2bcee1eb6512573172ec50d0b03aff665fa1a3c5aa67a6e"; + sha512 = "e678f84ff6b82c989217f1c911a0d3c1e923785a8f0f65afaa4689bfe44a591d3b20066c93b5ab3c594e3330056435c5df86e1bec47c5d9ce6de0dfc68c65192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/en-ZA/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-ZA/firefox-57.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "3d7e0668083a7abcc4fca09e8def3d5e1b9de8d66c6836443f453bb9ab9dc191e2a3fd680d2b68348fa9803958700b070a6865cab93351c9a3bfe655880ad887"; + sha512 = "117868c399d9f41bea55441fadae9f6b7af7dcba2f6063a05ca7f2bf8f9197814f9314fec06cd63f3976cf389ef2f3c6425fb0890fd08cb036e8612c68f02ca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/eo/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/eo/firefox-57.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "d041ad8f78878f32e52c970ed2b739ad159a36cfed882bf7aee5dbe24e0d7259bd72c2416465a69b65ac78dc77257ccef74a8136796b2b4a8b02333bdd803333"; + sha512 = "e2f496ccc935fe978d05675e1152e518bb1c7a4b3cd393dd8d30a2f93cd586953df027d06c108f3531e9228c25844e7fd83d81a7caadfdec11f1bb5fb7dfa3de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/es-AR/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-AR/firefox-57.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "34c4653f3d76e079c125c19d0773ce34ac8d0602b178ea23ec46d17ec599f31483ecfdc778a55c33fffd98a6ecde556055ef22ea002c421699d8ee03fbc97b2b"; + sha512 = "d56dd6fc221ec085864c50fefb57a8b4a5c11d6dad5bc5a3a24ed2b968eda816ec1fff83b00bf89e5fec2272467147ab5a6e14b5e6f5f0be25b5550aba908870"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/es-CL/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-CL/firefox-57.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5a7acacc43917c20fd3cd15c855afad9bdbed7225f8fa710821ac779fc53f32ce593d176b1d06ebfcb4b16eadcd61a7192efeedc500f387f14936753fc6aa2ad"; + sha512 = "ecbb9f624aaca6a02762ad0c0c15b9b6e4732efea4bdfe90f3557e4b242cdfece657d4bd71a369901b4866a36e6a95534d237f661c897c5375cb627d371ad3b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/es-ES/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-ES/firefox-57.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "07daaf5a0d8b80c83baaab94820931f3490bcfe7ff49e7bd370dae076f9a07f0f723b39a2abac02790e8e8dda6ae1438657e68fa6220b7ff92ee4790fd4d5db8"; + sha512 = "2112e809b6109d9367f9257a24b0c4b66add2c63ca456647712e9ef4ff04ea0c38990e334381c4b822789b86b4bd9949e68ea323b95d626f1a5deebace4286d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/es-MX/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-MX/firefox-57.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "3d3ae9664ad67a04a533d57b587e1f05eeb2d5466ac8e8eb1f54d613c1dbbd85f9a1a261bd79699e3d97f2413c86db4f765e205435081e778213ade6eb453d6d"; + sha512 = "4291992b179e7d2c07d38b7bb0c41b6b78007929a535f6689e3cee287cbb11662c6e94e9e1d64dd20efa5e8b5f3d5df5f554d196d1e6a8606ea53dad2157093e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/et/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/et/firefox-57.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "ab9ec19dd588e8d2875648ed8b53cbc6a26e3f5971dd89133729095b72f320f31e5e215814c6725ccd6a1abfe08c005ba0b23a304aedd3f6300116f756446c6c"; + sha512 = "bc2cfa0b6729b1bba629db9bfaddeaf1e15ba6820ccf694ba2b468700b047e22ec8d8aad47a032af514e602023bbc45a9c94e80ca251b6f70fb5aa832491637c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/eu/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/eu/firefox-57.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "41b31072034bf9eadb52e12b78590ff986439d68e5c3b7a5a56fd0a8b1d1cadd7b2fb9dc53ec1245ac99dae359d829af697a542b6fc18511b02ce4a6a96595e0"; + sha512 = "f0021641ac2079869d698650bba26f3c3d9a265defbe17fbf27f7cbaa7be2ca76f37ba4e03f3adad453d093ddf768155df5ee53774dcc47cc4fa79eca3cbf613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/fa/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fa/firefox-57.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8d53470688b6130c501dc6aa2e500f14512bca8d61a17d60e71e19f2f6326c52a641bb041895c477645776c5b42d4da846e99aa81bb8baffaafd0f57b0c1f57b"; + sha512 = "169d6be0a9e344353976f16c860e8fdd68b75ab94800926ba63e6efb108c6af9116d18f48485d462ce441f2bb1d484a934756ca16d5f365c9280ff0f1894f832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ff/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ff/firefox-57.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "164f772a9b4e34eed65d22afa4d28c8860c13101da5866612ea981009bbb0ec849f3b5325b0c0ae6de55cdbcc0d09e18c10ff3504f8150a5182927f74376d046"; + sha512 = "798be99da60a0ca0582b98dc3dd4e3f9c152e0f85f82a0f14adb7029905a206a801339d2565bac19c4acccdbb4617cc7d9f5b36df0497c3f33ca3f76c9fbb520"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/fi/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fi/firefox-57.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "df43ce6144f4e51ab6933073ea52ef0cba29d882eb1daefab298d1e111ba89b2574357262e8d0fd0d7a61c69c1b350b1e8ff72077c7aa02138fe364d784025d6"; + sha512 = "8659e136e27aea77acc9c73b679dfe0ed8c93176b70b69783b46828806ba41c3fb2f9e5b4679dcc554d7896c74589a86d8c9b35fa521ca84f051062f884fd501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/fr/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fr/firefox-57.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "9631b7e8f058be5fd77e34263fabb6666e6777c518340c53dfcf5b777f7254d91aecd4a27b7202c2020eb7652501b7d7334b1b5320edcbfc343460b93018de0f"; + sha512 = "effc8f5ff352e6690ed32fe5ccf0c47d136c43a083fe8223687e6c0526a772b9120a15d3418cda8a061d1964260a9d203c552dd0f5a030f0431e62dc8304f8a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/fy-NL/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fy-NL/firefox-57.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "6c6e36e93525ab0e486f1ec2b602af62c4b4b63447c5ab2ec963c4fe40ff788dfe8c64b2967c092e4c86ace117c13126de213b3b94ebbb79b20284db02bbc89e"; + sha512 = "bff1f5d37a33d863fba0dab07d29fdf963c7be207cae27ad15c08657627896597c96bb6311aaedb8ce797e7d5adb3a7918512ef611836bdb0c083005d534a1c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ga-IE/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ga-IE/firefox-57.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "eaa680920e3ed60be14053f58dff4745aad29626e37e79bccb62f2e3a2892fb1fa07687581644a9b870b49b7c2e86a02f0a86f22257686fd66097808cbadb96a"; + sha512 = "a27f0f158d2384207448016e0f9a3a9752388303772b5765707b6dfe936f66890705849b490e00c8330254f872813da064639e666e4122cd1b6d8978ddaf87fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/gd/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gd/firefox-57.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "d5adf080364623705822087ff79432ded2c1ff2e7005a4bbcbbb6198f3d02ec072e3a266d72bf7aefeaac5ff208beda38c5976804d396b29315faf9447abd249"; + sha512 = "d1ba5363a6629dbc62cbc9671ad8920a1c29ac9f23ac22c42af085ad862aa924d650a6349f5ae8ea1ecfd8a285205e48d7701a0ee72b16fb7c64aad4d30d497f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/gl/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gl/firefox-57.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "a4ee4f5c0a8c8f99263e114e49526270235a304176bb75a987509ed4c3a4c0550e6277eedd7418755fa14854ce781c62cb7fc3340a711e2d2499d514a766a9d4"; + sha512 = "f6c5c318369dad3651d0e65c79ccf7f3dffada3b6ba93455069aefd6b2346e3fdb630821146d1067ef64199e6ce737101caed5e474344a1e62780304c12dfe3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/gn/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gn/firefox-57.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "a59541befa9ce1ae2e24a55b9bc80fea54175628db4eeb3557b101f715a84c985afa1c95958882841e76713ab5e237742ee427be1c1151f0abea1394bb486e91"; + sha512 = "bd40bd6294cecaf72be721def4e26a0a5b6056e561a0980f2945202f77bb44dfbfad339f246f73159a83a4abd46732fd59916408c922dcd7232318147f321ee4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/gu-IN/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gu-IN/firefox-57.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "252814b7efe0ffc063142fc05741fc3a06ab0416fae0f9e3f0a73b0c320a46ef94732b71af936f11486d1689a9baf12a56bbc0d8a6d23b25a8926fe3a4065ae7"; + sha512 = "6d679736a588fd52af304764277c50466e296dab724654f928888d615b7a11254a96ac60b5350d2d35d4d6d534a4d94b684afc90c52fc1942a3521907c009eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/he/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/he/firefox-57.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "3692e92dc7cd18798d3360365b8936228056cc385b2021dd18f84635b9e3975c8767ccc006d5e4d47021c8bf38945141ac4c1bda8c07999339bc4cecf08b6446"; + sha512 = "0c45ac0a18279e10ac6864f917ebb98fb1e199cf14ef5cab1cccf333c0f7daa29ef8784bf55faae82fb7b9ea2d53384415e84a166ffc13c0ed0928834372cdb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/hi-IN/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hi-IN/firefox-57.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "592c242e76d81ff06276c35660fec84705b0bad72afe78732be27aece21b27073966c0dd5d227c29ce33f020cc3eb9520b11e914741cbc5b1c95cf46b0655a28"; + sha512 = "d021986f8d7cd98910a1ba7f1b057f5dd20b3c3ae652876be69e948f29c03515e417953a4c091511beca1a06d7fcf1df8dcacba4f32653601b0fdc1fc619d5f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/hr/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hr/firefox-57.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "012812399e63eb6628b78f91a8311511d16186d510198cc77bc0b7fa191a636875f9a1bb83fa350a4ee43e2cc23db412548246451a7fcae571d1787ffd557ee5"; + sha512 = "e112cf30bb21c7c30dcacd6fc214863070b4a3395fd02701e3914a4a2bfed59d82234b5f1f1e22fee9824e8a731f0afba52be71c468f2323982fbd6408d558c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/hsb/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hsb/firefox-57.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "82617b5ee0e3fa396d72cae69221af535255c602e8c0f220c15b5b88a47bc7b2326dbefb21b13dede02effc0c8731dd2a7739a941fd9d03aa4ca1dd0eeee0336"; + sha512 = "f648acd408ceb7637851ddf05b3174dd7a1a201dd07856138025a22a181e17904d15f357cfc2d3bca0a027c7f43baa0891d347a65d0b80f1869ff1c951021400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/hu/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hu/firefox-57.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "e71308ac39d241bf5a52cde9c0b355c07687ce7e0aec67c8a6c63f01d4ebb26bd877ae7ff3ad1d96f3c823c0ded0a4b4bf454a5de92dd2f88cf9f83051dcc758"; + sha512 = "3b8418ee8dfd195db7826a476613b47dd4ddb6e8b2b372f85e68a588ee13de89e89c3fc2e233f144c2199b75f7d18b245c4402f111f301b44be5c75f1eec262c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/hy-AM/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hy-AM/firefox-57.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "79f56fd662bbb07de614023d2bf8ec4fbd767c4bb537f39aaf2152ff166822cb90ad32c47a6e9a7d90f5563fab7366e2014cf82225c06d6597e6d7ad0e13c31c"; + sha512 = "a7be85d807202a0abf9704b43707a1bba75bd45f60e0d5e1cdeecfd1c2a0e932dfa0e16142e411ae2cbd8c3446a14c04766e50cc3ce8586a641c3f897172671d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/id/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/id/firefox-57.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "9c0cc4344081da052aea438682f28e79912b35d687e47865965962b723f07c5cd1ddbb68c11316bb24f0f9f9585eed6add1829e54d7da300791bd5c35dfac0e9"; + sha512 = "eb1dd05c6c09998b020e21e344c0ac3303bf7fccfc65a0d73b6bdd3d7d371507a6b3fbf0814d621944d5b9ce57cb4e19379ef317e6151416a9f6cd1286825be8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/is/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/is/firefox-57.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "806d61c3d2366cbd8dba8e5744f00873cd2be08041b24e32ea023dff3dea21041336729e95ee007c0476f15f5617ddaa97462e5fd1d3d119b81619b7d193535c"; + sha512 = "bdbb17aa801fea8a3e70ae75d197872a35114ef7a49c7ee56cf95763e26e2bb44a815563b2fe9e630843543599812015224c6634646915864ecfcadfed9ac978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/it/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/it/firefox-57.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c04444e7473ad6587e97441e56bc9a4c17755e3a641e5bc9e841d411fdbe64e876d0c17c374e891ab2d30d35d79189ef1e3161d9dec98378aeaa40752abd22b3"; + sha512 = "915552b680051884db4a177ff17e19515352ef90ef4ae88b39abdda5db955bfc34cb92c65ac8ec4ff4a5ab69baccc42a91b3b079c0a58a93587468277d620da3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ja/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ja/firefox-57.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "c68fbd385f01ce1609d4a5dc0e111bb8b8cc85b4c500acf894750ed630749e5c6061e901d9a08c3f690b429ce1adbbad2b448778a8d746805ef7a47dd35b2a96"; + sha512 = "1b3ab8420f3f18731385942f1e8012096708c49d7dd1614ee1439b80f5a742ec0fc481a55295d6f6989da4346940c58503fb67d13eb71dabfd332f84fb99c524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ka/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ka/firefox-57.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "64d4a987a2e41b3c3c198786c55dfe0fa092d4e0d79dc081a5b155951d1ca80305c2af8862fa1fffa60529d7f2b3104d9eab6e87260f7883195fdd2d2afb9fac"; + sha512 = "7d20045d38c471aa368401f0e65f31c08744953c96d15aedbcf306ee3d0b7e01a80ed0a6e207115565ab2bf1400312e9e7a8da1048af299f9b74c9e99ca5dffa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/kab/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kab/firefox-57.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "91670abf15f57cace174d2d580135b4747f3de559e09c73671268c398317c069062e68f1be6e022eef12f593eb74eb59dcd47a91ed63aeabd0e0b52b11af0443"; + sha512 = "7364dcdabe219ba4f72355e74d9e8be9bd5a08990910190753df3a6de346964558e17840367780e61b1647d507ebb204ea11beea703586aeca2145bb8a9cf9f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/kk/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kk/firefox-57.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "519cfc6cc264ce83663076db8b0cdcc70c4838b2ebb920160199847e013ccc207cfa25e3e286e80f56fe8a57544b61692c1cd4496681c6115e18b57dc9d4b086"; + sha512 = "12c3c49f0f9d80cd03a32fbc20f329fa7c34cbadc1ae625946a567b1b17b53fe1149ff92e6b5be22c5949a65024f9b24693a865a38bd8b458203329025fbeba9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/km/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/km/firefox-57.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "2bae5050a2c2e5f474fa97c27b75a2b159726f6950dd46a3ea133579f55036aefc4058b577aec477b23185cc17486ca7cad8516d8441743c372c8d30f59956d4"; + sha512 = "808673a5345e56c6206f116fa3b9319de2fd3bb4560884236dbdd133de03e4b065059066ba6d6490a16bd6d2dfc5007f5ec00149b2cdade6fe91034fe4b2f9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/kn/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kn/firefox-57.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7805f1df1fd0d7bf8f907a9175fa45731a0ff5e7a4a80635580940938e3bcb2deea0b858da2f3a41f1edfeea4b43a5555f309759413d9533992ba38836a6126e"; + sha512 = "15f0103356a44255c523db8c5dd6703997b18ff0a965beac32324180c631bcc3c57de1ce65f1ba98820af1c4c2c0db293333eef71b33e3806dafd654223cbf0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ko/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ko/firefox-57.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "1f4786150f422b77ce36205bb82a36b59fb670c4a7c040c53ab92c9740826af11aa1a7b8fd9884603ffe84968154e1e5a213674ec4b7286ddf74794a767df04a"; + sha512 = "fb8803093663addd2137bb336277bea3ff021dbfee15ec29da92ec92eea62c714f7a23248bf3804b276b58f82985eb34e28da64be6eea516aed32842ed621406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/lij/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lij/firefox-57.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "12da11c8d947b7a29d7a3213996c02cd13576b0dc1d906c133f28d4a58d6ed4f06fdcab2552915630dc9c4379d81334985ef4270078e71cee853a0fa6ca18a7d"; + sha512 = "161085ad5441331f70de49afac1d4d22ba7de31259d8675a828b36eadd36a0cfa97a800881a99fd3f8fe8a11e03b57d0aa7e4dbd15948457760f25cce0b76278"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/lt/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lt/firefox-57.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "9e417f4f5a4b983f74764f29f17452218541604a84b171be1e9cf0f2dd9fc9823893724a32505cc539126d85c41dd7df2155be43e260b7d0f7ddaf300a2a9327"; + sha512 = "f5cc1ca615966721bad7e1c440621d9a09c1589ca0aca4b755aa8818c958b0e9f5e2b496aade5927dc0e7061c566794022a1ca38dd07a79683e38902afe124d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/lv/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lv/firefox-57.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "479e8048db0f5f5adb0daf99ec2f026866d252826ab83bb403f520cec6a26c0bbe6f3b5f53bdabca2e9d84441af692a4183f0e3d84973af54db1ac9a4d32ba22"; + sha512 = "f1ebc2d348dd8dd908b84351f51403b069c3b531134289c03240746927a46830dd47a54b15235ae86dc2cd5aa01d2c3bc94bc9b3efe45d35e8c4bc7123839852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/mai/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mai/firefox-57.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "6d74a33de4bfba330ab6fc3be8857cd93765955670d416051d1ca6dc8b1dc6ff0cc16e02971739383b0002b2f2a105f6e4e1253214a83a8dab3ea1f253a9b68d"; + sha512 = "b6facd8e1d5ec870468ff024f4e6d454dd45e35561d5c4f3cd1c58e025c2868922d1b44a2f7520c82eb5911b7a887c98a614e7785f6ed052ecffb0039720b649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/mk/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mk/firefox-57.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "be1053acc188e7507bc8c4c3dbd775c80d9fd39efa2abede643a087220ffcee2f4bd10e3f3eb24946ac03710adfe9de14faf25cacfaff8d28e0f4317c6a6c826"; + sha512 = "dd08da071d273041c6e442938d0957a0eed3b19b228c8e83ed4f38cbd481aec8759fd65639cedb2de8f698a79ac6b803dad3e9939fc30a327222a651034dbbe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ml/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ml/firefox-57.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "8158b89b1daa8ef0c5cf219ff273f9b2867c2ed1149be2d5ccaf9b599909fb1650c8a4209e24ebb93b207a32f3ffcda08cbd898b726ac7ba4a8fafebfb332cc3"; + sha512 = "be151a11954741b6fabf0c083f708f2063aaef2ca6ed3c63eb887c48e3e1d7599dcca4de4af946251a01bfd5e4c9d32f85fad749c1d345879ed54b829eac3f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/mr/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mr/firefox-57.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e6c8d2bccc2ed6a19ca6e088a3d80989f5ef588151c58c84103fe27bc45f5cdbf3d0be04d5543b36be398e509f84b42e81049f48abc45f2ba3b133acb24cd3f3"; + sha512 = "75b069efe46f4d47434cb1f0c12fa19d51138e383ac1aebf83d4e2261942b7eee769b1a1a29a9b4e28450382d47206a8649b12fbb470c9a594141062f5e2528c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ms/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ms/firefox-57.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3a420608088a0590ceb5b63365e2281f3abb9838eb925dd0624ed31fc74fd784da437c7fddc4fd0c839a27f54d217d74232d25b7f0f0e763b5ee656f63fed323"; + sha512 = "77858037401e6a92662f488cce07849f4074c084c9b2b3b30652d3555efd11c20beb2ad1ea927ecdc8daa368f89b02aeae4db7579b7dbd89b5fcf91a82197aa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/my/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/my/firefox-57.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "6bc734753dbfb769cbd886f8f8a5e284cec8b11081edfb75f52f7ac0f735f1c4fe29e1024354326ab4484b810d1725cf8319a4a0f33385ddbbcef789e53cd362"; + sha512 = "3ce9fd601346a4552d9ea7da3a3c8048ff72e1f18577b8eab156adb1b8e174e686866f52369108d1351520354fc6bf6af2ed9e3f1fa6e64255948cae9bcbe068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/nb-NO/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nb-NO/firefox-57.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b0837d6a815bcd1e2625040ad6f0795ac8739991fdb52d98cb7c0883f2244c4421625e40ac96a121159e06a9533e29c283822f51d13775f4ee2680baad87b8da"; + sha512 = "24a72fda7378ab7a6ddbc4cc1a0cc8a37af81cd75516858cd5a8f659e14b2528937c846252d44f379a08f7d041509b829c29857dce37f247d5bf810208cda144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/nl/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nl/firefox-57.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "744112471e0f11b9191ea191e553cdf5d023e20dab705910ce0038c60610755b4264aa6ef2edabf70db827b11267f8c5fa8643314242aef2bc517beaf76dc54d"; + sha512 = "0d826036fd6dd68b787b748e34e7bf304b4233fc5203bde7581b771725ac3144c6aaa2d50fe854d01999b44a5e064c63247ddd02dba351cc6c89fd4facf70720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/nn-NO/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nn-NO/firefox-57.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "ef0e94a3d93128247354e3a3f3215e5ca27e664a24726dc9b98a064bd5885c7d775f1350ebe2976317ea0eb2db2c166844c1271e39752e10fa1165d214a96f31"; + sha512 = "606aff032cc8fcb7d1739e1d6adfe3d2b05f1a0de6b5613269c5a3c2410976542bf2faa9105f122abc5d8891aba51f69b2fcd4d8dbd88b43112e37bb532131b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/or/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/or/firefox-57.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "dc33270b8760552d2c7f0d66aedab9f50ca0d1967978313ed18f9f66dcba4f2c8fd7aacf2b2de91223841ed1d2fdb051e581ade6376bbf65d95968eede0d04c7"; + sha512 = "974eb2e7fd4ef1e93dd96a36199afa518a421fb3fbc59780bbd815014a84533cde3a76908af3f051f3be7eda8dbaf6041750faa44d264385f33169130b5a4174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/pa-IN/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pa-IN/firefox-57.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "06106c42f7bdca21a3340fedea95c29adbdad4fb5d3ce22bbb9b3437dcebca9c6a7efd01701164dbbe25119482a386bfe523c3d5cde2d5121c0af3855cb6f963"; + sha512 = "d6136d9049d9d19025c7c47c9268f1a93a5ee96bfa993078b3488ad23a9e29fc00c9450ba97e25608b7ae27d84cc3b40dfe50016db83658be6bc300b3be7cf04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/pl/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pl/firefox-57.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "037947aadb6ab54c07cefe7fe4b5de205c3f490121073b478dc9f211736916a853b47202e865b3160a849afd512a6901d20d1b356684c79be6022f08252bb3c8"; + sha512 = "5aec655cce588bde2465b5d827a3d8966e588ca083bbbb452a2a6f3c3366478ae565a4f9162fd0d5045beed76f3aebfd3f44233e46275eb0a53e33efb079d1a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/pt-BR/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pt-BR/firefox-57.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "3b3ba0892942e5cf11dc42c9eff31984c20edbb41ccd838373c18a62300142c66b0bb8184b0f4cfc5ed8805b88dc779f9f470ddaef4a0fb06e61999f6faecc0a"; + sha512 = "40663403f97dd5a89d1853c7cd5ac0f48c761c23c6823314cdb7e821f83e1ff48f7eb3cb123784d55b7771dcbc6a2c2c4ce3e691642d25685817eede03947bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/pt-PT/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pt-PT/firefox-57.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "451e2af4b83b8d3596520d4d9a5ede869afca4794d88493167a87ba8a2ad8835ef1ff57eccf4cd575c78386e262ef7995f43f6f4c2f2edcd98fdac07537d4a61"; + sha512 = "46600e098ee503aaecf43e161a54ba0b60c79bbbd61de65f391937de3659af2520c013ad7360b9ab1e3aaada63ad371667bbb5633e46f8942410ecbb22cf4f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/rm/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/rm/firefox-57.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "7879a286d2c96cf0d08b308e96a84094cfbc475abc63dc0255749aaaadc372351f2480e71d9aab4d88c909d31c6a68f21d15360627fc16e2a79aada9ddf3ce14"; + sha512 = "23e08b80859f6482fd8fad3d2a43961fb12a44827b5fa149c006508d3778ca0a3e307522e777535ec693ef365b0e2957344ac26a18bf05381c69f9dca509a9f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ro/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ro/firefox-57.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "7113b1b7d951eb43ad6722961aad26f83ba5640e18653b527571298cac311bad5a41c87611127d158ecd643090e517941c1e90a5578d9fbe9f7878ece23ce0f0"; + sha512 = "54433c53212ad816d27fcc176f45242d275cca2e84fe68f985404471929c2907e95002a85f9c6141f8cf494bf6844940081e44e8046ede30ed6dee0b72a9eb68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ru/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ru/firefox-57.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "4610a0f666f2b20eb35472abcdc450c8c24baa6388d731446d04fba13cbe9c48066860169bc5212abb823ce85c6fe485388dd77d61beaad9942b8b329d2adaba"; + sha512 = "ee04e06bcf36056a876e9c4eb2e1d130b6b882653aa7ff1a313e4a21054741a7fe46a8f74ef179abd52b03d02fb4af94e4b7cdbaa885a4c1f019636c2b4cc02f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/si/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/si/firefox-57.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2e1024a432300ac42ad00b6b5ffdc5ed53040a29556ca9ee98c64c4ac544b85f3542261519056949649fdd7525b5f83bf16fdb844b956bf2ef3f569029dac8ee"; + sha512 = "0cb344cb274b27088af5d7ed41c76db40bec19c11abbbc421bf9efc7acd303156efdc5cdf8140bb022bd9607932fb636e678bdad16e8ea0b8f9a929be68ee081"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/sk/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sk/firefox-57.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "c45e1dd1da621d4a5765b448f8836215cb2087f8633d987f269fcc5a67f5ee06fbeb1b08416eaf2e5720c778e272bb83c9e08294f6be0f148c0fe15dd042082d"; + sha512 = "23a5f4c49993cc8727583028b1bd982845482261b793d50b8ce8779d3a4351549eb046ca35cac2d7edb6f3b40deddf077f6964d3e4a56837649fe86670452988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/sl/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sl/firefox-57.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "ba45ef8690f54996e55ec723732f17a4fe846d37c35d96b733d775c7888499cdd7ed73370238746a7911c3e773ba04d3d1ac8dc25959b2172a1940949fab2cd0"; + sha512 = "7052a71800b2a5a3f9ed89db3638f30207da4f55887f4ce65c722dc326ad42663051384f195611cab20f86855a5b2289bf9c5fe2fc3c78c740afdc5a435f4b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/son/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/son/firefox-57.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "9ed0e3c645f3c2884b6f9efc10571906cf39ceb295269468a553d5b4b3afe8d92073d7eac285f8b6c66b1b0d885fa1c80ab66ea320ccdecdea28bd0a82862f42"; + sha512 = "6eea9ccac2c6100d7d7c9f80af4cca596cc4e3a0f3128beb22c7414ce0ef8a8e9f5aeb9e22c9fc8cf30db93eebe065e80d835d2927325fdc7af9b359e7b55b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/sq/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sq/firefox-57.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c14c8cb330449c98090ca76dc2d834b3f048dd242414678450aa9abae8597ea23b527d51d5354325395c3321a755088762d32c69a387375ff0e32be807068d11"; + sha512 = "049cb4f60f812673bf912b7ac06e440e40bbcc90f42fbd3e12f5d7ac08bd5e4a4897a435a1481201762d9fd4b99db954e838385953d9f458b80f86ce66b02ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/sr/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sr/firefox-57.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "82b25e641b5a072d050c5216624dd62883fa5b4f84d407997598cbe366a04cd869fc54a4b9383a65f78a5e317bb3f4e198f919fdfd56bcb205852a13ad5edee3"; + sha512 = "fb7db4165ff21463fd798246f18f7b9337b167c67e54d521d3d7e5bb5433b5cfaeeddf57619cea4079e852573bf109c57554cf574615232de86cb5ca922263ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/sv-SE/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sv-SE/firefox-57.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "de4b5582acbb4ebc82bdf6677f53bcf73784d376fe63df298e1ec599ee0975e91fb9b9d548d2c0213ff7b99c6c123278eac4070e6f85c58c2e91a4b94add1347"; + sha512 = "c8dbf8652a5a4be2325ef28a43e5cb8b464fcd552d62ca5241b072b9450ceb54d70bf5ac30e1136d03dca58410107c7d70f11539a7b712e3e2cf0da43c33eb75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ta/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ta/firefox-57.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "6e1c1d84b4b3987d31d8cf70fc292a7670b15bccf0c308a1222c72d3fa22fb426313b19c4feef3c9db1cdfb7a1fa267066ff533a3a0ba45594b443f10b8f710b"; + sha512 = "66f1d6cd06e96d8835404446becc6f38516f43562d56a66991f1a73ff9915e0dff9ec31611e89c5596154a2c4b582d84bed30186691353ddaed914244575a27e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/te/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/te/firefox-57.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "2804c3891c386c3342bf464731aa5aa05e34d29bae17d766fa037866cfed2560893af86866db3018d3ecddcbb4fe63928ec95c86cb3a8355c86ecf470a2505e2"; + sha512 = "aebf87f18e27e8acaa0c8956e7f90bd88da408aa266aa96285ef0d3fd85d3f25751eeeaae58e86948d4ff8abf295babc23e3d3a021e50d7c1329b2712306f64e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/th/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/th/firefox-57.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "64e0dc9fb2451dae0ad9d41cce0609a0ff499e049d130f7a867da90fb66d4243282dded80d58e40a41a32769862e9d82e6cf1af3b8fd8849f6b29eed114d3df9"; + sha512 = "ff444997ab3a90cd5c4afd83a95d25c0d4d04d9dc82451bb8d33209433287cc4c31dd9f7887635ef4553776fe1be7407bac4a1fe7e5603679d209afa6717e2b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/tr/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/tr/firefox-57.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a81c8e534f9956ec2c5e56f8fc8952d24e5cccc18536243fb1a3585e3c6cf899c7a9cd01a6e8da9f79725d5da602b1e47f37668c7069bc187530625619ecdd94"; + sha512 = "8d5c1cb8ec1123cbf79cf156b54c86c28101078bed678b41dc996f42cad0b9d1fbbd83b02970a90f265e3839c2aecc9641d7231375146917b671411b02c913ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/uk/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/uk/firefox-57.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "75566f095dcada1f87815d25f5233ff93f28c557e8c38cc9a97b7ab066d6560afcf1e9de510f5d8bc924c6b78fb7ca11d68264ef689af06f52e0840985c95f02"; + sha512 = "452eb08a1fbd0c27a382707c8417717c3728aadf5eec774fc3a020d46f4bc598ada9ace6ce49661f14398ae5b618491c070b52cd4d5fb3cd304ad2946a870757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/ur/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ur/firefox-57.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ed2ceeed7e3a839e42cec5cf37883e44fc33e4f61ea8d1d044ea78f53b94cd293ef53a886be617292b70ffc96f62056948da4fff66c8483d99aac594961d94dd"; + sha512 = "379362f6fa4162fbed19994490183200ad4af8603ae0f8809637953332b811cd754027636f9cb49b5e5b851057320b5f936d09d1193930c6b400098dbf5440f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/uz/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/uz/firefox-57.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "1b9e9d4bd792cae670ac5a5f4142aa735ad50a36ee055e4dfba2aa7f1e55328b1d178322a71ab4e7ffc98a502c13e9ab2a66f16d6e06d12c8f941c2efb076ce2"; + sha512 = "ff457ccd5f435de9b03208a285d1c0e6ea942ff61592e26fa61e4946df1efec988f9f1d94091618c7b5d0b223c45ccf67773e4513445ee96bd1cf1e354034986"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/vi/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/vi/firefox-57.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "0d71e2d690cbceaa228d0ec56ff0773f7e78b5301a12c6599185fb0858f5fd325b9858adf55f3903ef44fa503f0d4b5cb66ac1185e07933620633fc0464f7024"; + sha512 = "848ec90aa86f0761587082720b607c4b3c463300dbe2b97d7a59eb4eecae3263016a3dbcae2e92baff971ab2c4180f6a68abad52f3f74f72c0dc99d9865a0e25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/xh/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/xh/firefox-57.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "9c11daa146e69343cd8c35d00c1c7dd3987bc0fe5e272a9fc33ae5a2b6d7791018649a3eed9a369cb6c810a9d6730039e12e6ae80727bffa4edfe5a7a1982f4f"; + sha512 = "f0b0d4f81021010cefbb2734859eb771d0943d8bee301064d11e222c625bda65f12a322e066a363a1215514cf6ef7eb601bc22959a6e1fa9f29ef8da0c02bc89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/zh-CN/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/zh-CN/firefox-57.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "af35074fd3cbd9a0238fc8d37ada63d9b1b107c0859b52a53649f9b53a2ef561215e090127efc01537a5abbe942ed7485b13769ce74545a81ab68f4989697ca0"; + sha512 = "0ca9911452654086037a09bb49aa7b5b200f42c40af7b94ecb55ba527518587cd5f345c88295cb43d9df8391a0f975cd35945416dd48057dbe8d4138cc3ef37e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b5/linux-i686/zh-TW/firefox-57.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/zh-TW/firefox-57.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "04f7f76d05b9c4edd61773719353893acef39beeaca96088620a8ca78bb1f13550bd9363148947923769b28e0a1904e2d239e4800ee1a1c4ba8088b5bc3775d4"; + sha512 = "c643582dbc92145a9ade0d8763c8f30e1fc0fe3b9cb55dc6e1b88dae3001a3dc4b05eeabbe9b0fc040fd37f30f2d8cb07dbb7fa801d55a8e273bbd61eab69261"; } ]; } From 134c1a6ac0c055753497a3559e0422575086c647 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Fri, 6 Oct 2017 23:38:21 -0700 Subject: [PATCH 0801/2806] urbit: 0.4 -> 0.4.5 --- pkgs/misc/urbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index e3d6d40bdac..125df39ae8a 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "urbit-${version}"; - version = "0.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "urbit"; repo = "urbit"; rev = "v${version}"; - sha256 = "1ndy58ypilabf9pfkqzzl7wf6x1vr4gpvsbn30sygp2ip908q0xz"; + sha256 = "1zgxgqbz74nsgfyrvsnjj6xxpb64mrnby7bb5qy733sy04gmzgik"; }; buildInputs = with stdenv.lib; [ From 35b4c8be511d6fac45e93fd5e65a24e126e736a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Oct 2017 09:38:42 +0200 Subject: [PATCH 0802/2806] xorg-server: fixup build after #29039 The expression uncarefully overrode whole nativeBuildInputs, so after the pkgconfig move it got removed and the build failed. 1.19.3 doesn't need these lines anyway... --- pkgs/servers/x11/xorg/overrides.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 20b75867948..45df7244176 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -398,11 +398,6 @@ in let attrs = with args; if (args.abiCompat == null) then attrs_passed - # All this just for 1.19.2, as the tarball is incorrectly autotoolized. - // { - nativeBuildInputs = [ utilmacros fontutil ]; - preConfigure = "libtoolize --force; aclocal; autoheader; automake -afi"; - } else if (args.abiCompat == "1.17") then { name = "xorg-server-1.17.4"; builder = ./builder.sh; From e86b78363d0fa153e5d5ba8db04aff9466132de2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 7 Oct 2017 04:52:52 +0300 Subject: [PATCH 0803/2806] nixos/filesystems/ext: Don't try to load ext3 module This module doesn't exist since v4.3, where the ext3 driver was removed as ext4.ko can mount ext3 filesystems as well. --- nixos/modules/tasks/filesystems/ext.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix index cc9d0ef37d5..3a8999c242b 100644 --- a/nixos/modules/tasks/filesystems/ext.nix +++ b/nixos/modules/tasks/filesystems/ext.nix @@ -5,7 +5,8 @@ system.fsPackages = [ pkgs.e2fsprogs ]; - boot.initrd.availableKernelModules = [ "ext2" "ext3" "ext4" ]; + # As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko) + boot.initrd.availableKernelModules = [ "ext2" "ext4" ]; boot.initrd.extraUtilsCommands = '' From a06d64ea6989797978757142e5a1c1750b95d5ba Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 7 Oct 2017 10:58:30 +0300 Subject: [PATCH 0804/2806] kernel config: Explicitly enable device mapper A no-op change on x86 but enables it on ARM. --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 6d04340ab46..a528df26964 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -245,6 +245,9 @@ with stdenv.lib; USB_SERIAL_KEYSPAN_USA49W y USB_SERIAL_KEYSPAN_USA49WLC y + # Device mapper (RAID, LVM, etc.) + MD y + # Filesystem options - in particular, enable extended attributes and # ACLs for all filesystems that support them. FANOTIFY y From 656a0089f68495cd42d3164ed85d22ceec630d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Oct 2017 10:12:49 +0200 Subject: [PATCH 0805/2806] texlive.bin.core-big: fixup build after #29039 --- pkgs/tools/typesetting/tex/texlive/bin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index f1aa861b9c1..34a689ee9bd 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -156,6 +156,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex hardeningDisable = [ "format" ]; + inherit (core) nativeBuildInputs; buildInputs = core.buildInputs ++ [ core cairo harfbuzz icu graphite2 ]; configureFlags = common.configureFlags From 58906f359fc4f30ba2eaa9a2367e467273fec98b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 Oct 2017 05:29:59 +0000 Subject: [PATCH 0806/2806] ocamlPackages.lablgtk-extras: 1.5 -> 1.6 --- .../ocaml-modules/lablgtk-extras/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 68019113f38..9e6013b9083 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: +{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02"; -stdenv.mkDerivation { - name = "ocaml-lablgtk-extras-1.5"; - src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1453/lablgtkextras-1.5.tar.gz; - sha256 = "1bgflgadmy2nqnqjf34zja0jy6f9wpqq8x22qcfilj9g8c9wkrmi"; +stdenv.mkDerivation rec { + version = "1.6"; + name = "ocaml${ocaml.version}-lablgtk-extras-${version}"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "lablgtk-extras"; + rev = "release-${version}"; + sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda"; }; buildInputs = [ ocaml findlib camlp4 ]; From aa3535cee57479a8f0721c3e05c4e91966ecdcd6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 Oct 2017 05:15:50 +0000 Subject: [PATCH 0807/2806] ocamlPackages.xmlm: 1.2.0 -> 1.3.0 --- .../ocaml-modules/xmlm/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index d94a3eac873..7f5bcb03ad6 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }: let pname = "xmlm"; webpage = "http://erratique.ch/software/${pname}"; @@ -6,22 +6,37 @@ in assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" + then { + version = "1.3.0"; + sha256 = "1rrdxg5kh9zaqmgapy9bhdqyxbbvxxib3bdfg1vhw4rrkp1z0x8n"; + buildInputs = [ topkg ]; + inherit (topkg) buildPhase; + } else { + version = "1.2.0"; + sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh"; + buildInputs = []; + buildPhase = "./pkg/build true"; + }; +in + stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "1.2.0"; + inherit (param) version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ] ++ param.buildInputs; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "./pkg/build true"; + inherit (param) buildPhase; installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh From b174f42d36ff5eebeccc2104275c7d7b2f8867c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Oct 2017 11:09:10 +0200 Subject: [PATCH 0808/2806] dmtx: fixup build after #29039 --- pkgs/tools/graphics/dmtx-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index 4cf4f8c791c..bb816e48940 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; From 912ec467dbf94ec0b62a6894e0d044a877a6724d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sat, 7 Oct 2017 10:06:34 +0100 Subject: [PATCH 0809/2806] openafs-client: don't remove kernel module on stop Otherwise it cannot re-insert the kernel module after a kernel upgrade when boot kernel != running kernel. --- .../services/network-filesystems/openafs-client/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 94f93162cfe..0946e379e79 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -93,7 +93,6 @@ in preStop = '' ${pkgs.utillinux}/bin/umount /afs ${openafsPkgs}/sbin/afsd -shutdown - ${pkgs.kmod}/sbin/rmmod libafs ''; }; }; From 55ed948a550c46d1f5b77dcaaa3a4272bf34eb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Oct 2017 11:14:22 +0200 Subject: [PATCH 0810/2806] gnome3.vte-ng: fixup build after #29039 --- pkgs/desktops/gnome-3/core/vte/ng.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix index ad0188b0053..69f61eb7697 100644 --- a/pkgs/desktops/gnome-3/core/vte/ng.nix +++ b/pkgs/desktops/gnome-3/core/vte/ng.nix @@ -20,5 +20,6 @@ gnome3.vte.overrideAttrs (oldAttrs: rec { preConfigure = oldAttrs.preConfigure + "; ./autogen.sh"; - nativeBuildInputs = [ gtk_doc autoconf automake gettext libtool gperf ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs or [] + ++ [ gtk_doc autoconf automake gettext libtool gperf ]; }) From 360a5efd93e2a638c8b83b61225cded4c3ac249e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 7 Oct 2017 11:15:07 +0200 Subject: [PATCH 0811/2806] python.pkgs.pyopenssl: use fetchPypi --- 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 4a34b22482e..fab921e0053 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17792,11 +17792,12 @@ in { }; pyopenssl = buildPythonPackage rec { - name = "pyopenssl-${version}"; + pname = "pyOpenSSL"; + name = "${pname}-${version}"; version = "17.2.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; + src = self.fetchPypi { + inherit pname version; sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; }; From ef52c95b8a49a9e877f83d02387359b1db9335a9 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Wed, 4 Oct 2017 14:03:13 +0200 Subject: [PATCH 0812/2806] mitmproxy: fix transitive cryptography dependency pyopenssl-17.0.2 uses cyrptography-2.0.2 which collide with the one used in mitmproxy --- pkgs/tools/networking/mitmproxy/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 583100e0f37..7348cd7f116 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, python3, glibcLocales }: +{ stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }: let p = python3.override { @@ -19,6 +19,19 @@ let sha256 = "00daa04c9870345f56605d91d7d4897bc1b16f6fff7c74cb602b08ef16c0fb43"; }; }); + pyopenssl = super.pyopenssl.overridePythonAttrs (oldAttrs: rec { + version = "17.0.0"; + name = "${oldAttrs.pname}-${version}"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1pdg1gpmkzj8yasg6cmkhcivxcdp4c12nif88y4qvsxq5ffzxas8"; + }; + patches = fetchpatch { + url = "https://github.com/pyca/pyopenssl/commit/" + + "a40898b5f1d472f9449a344f703fa7f90cddc21d.patch"; + sha256 = "0bdfrhfvdfxhfknn46s4db23i3hww6ami2r1l5rfrri0pn8b8mh7"; + }; + }); }; }; in p.pkgs.buildPythonPackage rec { @@ -70,6 +83,6 @@ in p.pkgs.buildPythonPackage rec { description = "Man-in-the-middle proxy"; homepage = http://mitmproxy.org/; license = licenses.mit; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz kamilchm ]; }; } From a0aeb376a992d1e2f9b0223506bc49e49da94e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 7 Oct 2017 09:23:30 +0200 Subject: [PATCH 0813/2806] plantuml: 1.2017.16 -> 1.2017.18 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 1b690c04172..447ef9dd5ec 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2017.16"; + version = "1.2017.18"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "a3d319ed54ed78ce3cf7bfcfe76ffc5aa6ed28a72b5aa575fe9125e0c6bd985c"; + sha256 = "0ssfg6lpk41ydhxhi6y6c9ca3hpql6gg3bxjws8vrx9s3s6r5rb0"; }; # It's only a .jar file and a shell wrapper From 84a8f253d497cfa7e49e735e540813d421b6d7d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 6 Oct 2017 23:21:49 -0300 Subject: [PATCH 0814/2806] qtcreator: 4.4.0 -> 4.4.1 --- pkgs/development/qtcreator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 51667bef143..494b5ec30e6 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let baseVersion = "4.4"; - revision = "0"; + revision = "1"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "00k2bb2pamqlq0i619wz8chii8yp884qnrjngzzxrdffk05d95wc"; + sha256 = "0kn1k2zvc93xin4kdp2fpiz21i5j0qymyx6jjzkqp7r3x8yxwr06"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; From 6f1f1a514f09af7e36925c1072411ab2eb30e77b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 7 Oct 2017 11:51:24 +0200 Subject: [PATCH 0815/2806] Revert "Resurrect pandas 0.17.1" This reverts commit 96874c6e719dbe8c53cc1dea832f7e1866297a24. - No package depends on this version. - As a guideline we only keep one version of each package. Exceptions exist but only with a good reason. - Expressions shouldn't be in `python-packages.nix` but in `python-modules`, as explained in the docs and the header of the file. - I won't maintain these versions. --- .../python-modules/scipy/0.17.1.nix | 56 ------------------- pkgs/top-level/python-packages.nix | 55 ------------------ 2 files changed, 111 deletions(-) delete mode 100644 pkgs/development/python-modules/scipy/0.17.1.nix diff --git a/pkgs/development/python-modules/scipy/0.17.1.nix b/pkgs/development/python-modules/scipy/0.17.1.nix deleted file mode 100644 index fea8a05bca1..00000000000 --- a/pkgs/development/python-modules/scipy/0.17.1.nix +++ /dev/null @@ -1,56 +0,0 @@ -{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, numpy}: - -buildPythonPackage rec { - pname = "scipy"; - version = "0.17.1"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w"; - }; - - buildInputs = [ gfortran nose numpy.blas ]; - propagatedBuildInputs = [ numpy ]; - - # Remove tests because of broken wrapper - prePatch = '' - rm scipy/linalg/tests/test_lapack.py - ''; - - preConfigure = '' - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; - - preBuild = '' - echo "Creating site.cfg file..." - cat << EOF > site.cfg - [openblas] - include_dirs = ${numpy.blas}/include - library_dirs = ${numpy.blas}/lib - EOF - ''; - - enableParallelBuilding = true; - - checkPhase = '' - runHook preCheck - pushd dist - ${python.interpreter} -c 'import scipy; scipy.test("fast", verbose=10)' - popd - runHook postCheck - ''; - - passthru = { - blas = numpy.blas; - }; - - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - - meta = { - description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; - homepage = http://www.scipy.org/; - maintainers = with lib.maintainers; [ fridh ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fab921e0053..ee3dd417400 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14990,59 +14990,6 @@ in { pandas = callPackage ../development/python-modules/pandas { }; - pandas_17 = let - inherit (pkgs.stdenv.lib) optional optionalString; - inherit (pkgs.stdenv) isDarwin; - in buildPythonPackage rec { - name = "pandas-${version}"; - version = "0.17.1"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; - sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; - }; - - buildInputs = with self; [ nose ] ++ optional isDarwin pkgs.libcxx; - propagatedBuildInputs = with self; [ - dateutil - scipy_0_17 - numexpr - pytz - xlrd - bottleneck - sqlalchemy - lxml - html5lib -# modules.sqlite3 - beautifulsoup4 - ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command - - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - patchPhase = optionalString isDarwin '' - cpp_sdk="${pkgs.libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - - # disable clipboard tests since pbcopy/pbpaste are not open source - substituteInPlace pandas/io/tests/test_clipboard.py \ - --replace pandas.util.clipboard no_such_module \ - --replace OSError ImportError - ''; - - doCheck = false; - - meta = { - homepage = "http://pandas.pydata.org/"; - description = "Python Data Analysis Library"; - license = licenses.bsd3; - maintainers = with maintainers; [ raskin fridh ]; - platforms = platforms.unix; - }; - }; - xlrd = buildPythonPackage rec { name = "xlrd-${version}"; @@ -19402,8 +19349,6 @@ in { scipy = callPackage ../development/python-modules/scipy { }; - scipy_0_17 = callPackage ../development/python-modules/scipy/0.17.1.nix { }; - scikitimage = buildPythonPackage rec { name = "scikit-image-${version}"; version = "0.12.3"; From 6db9b65f65292d745a98086ff6f232f86a91f879 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Thu, 14 Sep 2017 14:32:43 +0000 Subject: [PATCH 0816/2806] maintainers: add catern --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0076d9740ab..a4bb997b2e3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -98,6 +98,7 @@ canndrew = "Andrew Cann "; carlsverre = "Carl Sverre "; casey = "Casey Rodarmor "; + catern = "Spencer Baugh "; caugner = "Claas Augner "; cdepillabout = "Dennis Gosnell "; cfouche = "Chaddaï Fouché "; From 8f362a1eff79ad979186181604af9ea812ecdb6e Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Thu, 7 Sep 2017 20:22:28 +0000 Subject: [PATCH 0817/2806] tools/system/supervise: init at 1.0.0 --- pkgs/tools/system/supervise/default.nix | 27 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/system/supervise/default.nix diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix new file mode 100644 index 00000000000..838663c3072 --- /dev/null +++ b/pkgs/tools/system/supervise/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + + name = "supervise-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "catern"; + repo = "supervise"; + rev = "v${version}"; + sha256 = "1cjdxgns3gh2ir4kcmjdmc480w8sm49inws0ihhjmnisjy4100lg"; + }; + + installPhase = '' + mkdir -p $out/bin + cp supervise unlinkwait -t $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/catern/supervise; + description = "A minimal unprivileged process supervisor making use of modern Linux features"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ catern ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c34d03f3269..88e859130e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11848,6 +11848,8 @@ with pkgs; s6-rc = callPackage ../tools/system/s6-rc { }; + supervise = callPackage ../tools/system/supervise { }; + spamassassin = callPackage ../servers/mail/spamassassin { inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP IOSocketSSL; From a9e090f74966afd25054f9429a9832da21ff712a Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Fri, 8 Sep 2017 02:01:41 +0000 Subject: [PATCH 0818/2806] pythonPackages.supervise_api: init at 0.1.5 --- .../python-modules/supervise_api/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/supervise_api/default.nix diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix new file mode 100644 index 00000000000..5b98aa3415b --- /dev/null +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, supervise +}: + +buildPythonPackage rec { + pname = "supervise_api"; + version = "0.1.5"; + + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pqqlw80cjdgrlpvdmydkyhsrr4s531mn6bfkshm68j9gk4kq6px"; + }; + + propagatedBuildInputs = [ supervise ]; + + # no tests + doCheck = false; + + meta = { + description = "An API for running processes safely and securely"; + homepage = https://github.com/catern/supervise; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ catern ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee3dd417400..63b9414d14e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -291,6 +291,8 @@ in { sip = callPackage ../development/python-modules/sip { }; + supervise_api = callPackage ../development/python-modules/supervise_api { }; + tables = callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; From deba67f2b3cae8f15197b7b14c1b1580758464d7 Mon Sep 17 00:00:00 2001 From: xd1le Date: Sat, 7 Oct 2017 21:26:25 +1100 Subject: [PATCH 0819/2806] sxhkd: 0.5.6 -> 0.5.8 (#30184) * sxhkd: code style nitpicks * sxhkd: add vyp as maintainer * sxhkd: use list instead of string for makeFlags * sxhkd: use fetchFromGitHub instead of fetchurl * sxhkd: 0.5.6 -> 0.5.8 --- .../window-managers/sxhkd/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 41a50668f19..cca9f1c6ac5 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }: +{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms +, xcbutilwm +}: stdenv.mkDerivation rec { name = "sxhkd-${version}"; - version = "0.5.6"; + version = "0.5.8"; - src = fetchurl { - url = "https://github.com/baskerville/sxhkd/archive/${version}.tar.gz"; - sha256 = "15grmzpxz5fqlbfg2slj7gb7r6nzkvjmflmbkqx7mlby9pm6wdkj"; + src = fetchFromGitHub { + owner = "baskerville"; + repo = "sxhkd"; + rev = version; + sha256 = "0vnm0d2ckijsp8kc2v8jz4raamb487vg62v58v01a3rb9gzzgl06"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; - makeFlags = ''PREFIX=$(out)''; + makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "Simple X hotkey daemon"; - homepage = https://github.com/baskerville/sxhkd/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/baskerville/sxhkd"; + license = licenses.bsd2; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; } From 23ad2b2e7abfef7a0efbba684750fe1039dedcf2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 7 Oct 2017 12:56:36 +0200 Subject: [PATCH 0820/2806] python.pkgs.bootstrapped-pip: fix hash Hash was forgotten in https://github.com/NixOS/nixpkgs/commit/a26ae760e2ebacc5780ebb2906a4c3cc467747c2. The newer version of pkg_resources, 36.4.0, is actually incomplete. Therefore, let's stick with the older version which didn't cause any issues. --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 1d41e3fbafd..0cb817844c7 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -18,7 +18,7 @@ let # https://github.com/NixOS/nixpkgs/issues/26392 # https://github.com/pypa/setuptools/issues/885 pkg_resources = fetchurl { - url = "https://raw.githubusercontent.com/pypa/setuptools/v36.4.0/pkg_resources/__init__.py"; + url = "https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py"; sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv"; }; From 7837cfe3a12789de126d161a86f2bc614b467588 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 9 Sep 2017 18:31:46 +0200 Subject: [PATCH 0821/2806] jackline: 2017-05-24 -> 2017-08-17 --- .../networking/instant-messengers/jackline/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index bc6e7a5f7de..6545b90980e 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -3,14 +3,14 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { - version = "2017-05-24"; + version = "2017-08-17"; name = "jackline-${version}"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "49a326d5696aa24f3ac18534c8860e03d0d58548"; - sha256 = "0p741mzq4kkqyly8njga1f5dxdnfz31wy2lpvs5542pq0iwvdj7k"; + rev = "26688f07c3edc3b83e7aa0b9136cd1e9dcb58ed5"; + sha256 = "0yspgjhp7zy9rzvwl4pxppf5wkpa07y0122s7n09kvr0fzsh6aqf"; }; buildInputs = with ocamlPackages; [ From 4afb28a89295d896077b5a8560d2c56527dda168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 6 Oct 2017 21:49:05 -0300 Subject: [PATCH 0822/2806] flat-plat: 20170917 -> 20171005 and renamed to materia-theme --- .../themes/{flat-plat => materia-theme}/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) rename pkgs/misc/themes/{flat-plat => materia-theme}/default.nix (68%) diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/materia-theme/default.nix similarity index 68% rename from pkgs/misc/themes/flat-plat/default.nix rename to pkgs/misc/themes/materia-theme/default.nix index cd652440efa..755a0b737ca 100644 --- a/pkgs/misc/themes/flat-plat/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { - name = "flat-plat-gtk-theme-${version}"; - version = "20170917"; + name = "materia-theme-${version}"; + version = "20171005"; src = fetchFromGitHub { owner = "nana-4"; - repo = "Flat-Plat"; + repo = "materia-theme"; rev = "v${version}"; - sha256 = "17r4wl27yx49xg0l3s5d67174r63p4cw6cbdmzl81if7iab69hv0"; + sha256 = "0znm7mx2nv2sgvy8fyams1ckp1ly3nbbs0k09d24w1zzd90xhzqp"; }; nativeBuildInputs = [ gnome3.glib libxml2 ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Material Design-like theme for GTK+ based desktop environments"; - homepage = https://github.com/nana-4/Flat-Plat; + description = "A Material Design-like theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)"; + homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.mounium ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9efda62713..1cef7b8b6f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18994,8 +18994,6 @@ with pkgs; fceux = callPackage ../misc/emulators/fceux { }; - flat-plat = callPackage ../misc/themes/flat-plat { }; - flockit = callPackage ../tools/backup/flockit { }; foldingathome = callPackage ../misc/foldingathome { }; @@ -19078,6 +19076,9 @@ with pkgs; martyr = callPackage ../development/libraries/martyr { }; + # previously known as flat-plat + materia-theme = callPackage ../misc/themes/materia-theme { }; + mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome2) GConf; }; From e16d95b6867bed6768602427f58837113c8cefd6 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 7 Oct 2017 15:19:13 +0200 Subject: [PATCH 0823/2806] mesa: 17.1.10 -> 17.2.2 --- pkgs/development/libraries/mesa/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2d253f7cd45..2db684397da 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, intltool, autoreconfHook, substituteAll -, file, expat, libdrm, xorg, wayland, openssl +, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva -, libelf, libvdpau, valgrind-light +, libelf, libvdpau, valgrind-light, python2 , grsecEnabled ? false -, enableRadv ? false +, enableRadv ? true # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. # It's overridden for mesa_drivers. , enableTextureFloats ? false @@ -67,7 +67,7 @@ let in let - version = "17.1.10"; + version = "17.2.2"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -82,7 +82,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb"; + sha256 = "10jplvxg7rlbp7569w08z0igwlsjjfb7q3n07zgfr8d5sr224lng"; }; prePatch = "patchShebangs ."; @@ -150,9 +150,9 @@ stdenv.mkDerivation { autoreconfHook intltool expat llvmPackages.llvm glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence - libffi wayland libvdpau libelf libXvMC + libffi wayland wayland-protocols libvdpau libelf libXvMC libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ - valgrind-light + valgrind-light python2 ]; From 9c5ef048c42a8b9de16d076e98589681f80d9c15 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 4 Oct 2017 00:48:58 +0200 Subject: [PATCH 0824/2806] bitcoin-classic: build with qt5 fixes #30075 --- pkgs/applications/altcoins/bitcoin-abc.nix | 4 ++-- pkgs/applications/altcoins/bitcoin-classic.nix | 8 +++++--- pkgs/applications/altcoins/default.nix | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index d3800062b11..665b88bfd32 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt5, utillinux, protobuf, qrencode, libevent +, zlib, miniupnpc, qtbase, qttools, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt5.qtbase qt5.qttools qrencode ]; + ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt5" ]; diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index d2878a17fb3..471e5a687af 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, zlib, miniupnpc, qtbase, qttools, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07"; }; + patches = [ ./fix-bitcoin-qt-build.patch ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; + ++ optionals withGui [ "--with-gui=qt5" ]; meta = { description = "Peer-to-peer electronic cash system (Classic client)"; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 395a440690b..0264ce39776 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,17 +1,17 @@ -{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin }: +{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }: rec { bitcoin = callPackage ./bitcoin.nix { withGui = true; }; bitcoind = callPackage ./bitcoin.nix { withGui = false; }; - bitcoin-abc = callPackage ./bitcoin-abc.nix { withGui = true; }; + bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; - bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; }; + bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; }; bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; From 7067d30812eacc9bed5a8b9d53546a4c865d240c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 7 Oct 2017 16:56:36 +0200 Subject: [PATCH 0825/2806] quaternion: 2017-06-29 -> 2017-10-07 --- .../networking/instant-messengers/quaternion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index a2510c77738..08625d32123 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,7 +2,7 @@ mkDerivation rec { name = "quaternion-git-${version}"; - version = "2017-06-29"; + version = "2017-10-07"; # quaternion and tensor share the same libqmatrixclient library as a git submodule # @@ -13,8 +13,8 @@ mkDerivation rec { src = fetchgit { url = "https://github.com/QMatrixClient/Quaternion.git"; - rev = "1febc0178fd3d02b7426f58981b54924ad60c84d"; - sha256 = "1whjhlphdhk7kgw2zqc0wj3k2i9gkp79qq2bnrh4mbcp3qmcqngr"; + rev = "1007f2ca4ad5e8cc5dba437d6a0cdea07d1f1332"; + sha256 = "0hvc81ld7fcwyrxsr2q3yvzh0rzhgmflby4nmyzcbjds7b7pv0xq"; fetchSubmodules = true; }; From 4db70fe8c823feea8a8275040f678a4c6e0c10d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 7 Oct 2017 10:06:28 -0500 Subject: [PATCH 0826/2806] bitcoind-abc/bitcoind-classic: fix evaluation --- pkgs/applications/altcoins/bitcoin-abc.nix | 2 +- pkgs/applications/altcoins/bitcoin-classic.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index 665b88bfd32..a113aadcd62 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qtbase, qttools, utillinux, protobuf, qrencode, libevent +, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index 471e5a687af..9a2145d91cf 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qtbase, qttools, utillinux, protobuf, qrencode, libevent +, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; From 15b7e102b673ddef5068af14f0b2272f32f20880 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sat, 7 Oct 2017 17:38:14 +0200 Subject: [PATCH 0827/2806] Safer defaults for immutable znc config (#30155) * Safer defaults for immutable znc config I just lost all the options I configured in ZNC, because the mutable config was overwritten. I accept any suggestions on the way to implement this, but overwriting a mutable config by default seems weird. If we want to do this, we should ensure that ZNC does not allow to edit the config via the webmin when cfg.mutable is false. * Do not backup old config files. There seems to be little need for backups if mutable becomes a voluntary opt-out. * fixup --- nixos/modules/services/networking/znc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 3d9cec46a58..72313ab2ee1 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -329,7 +329,7 @@ in }; mutable = mkOption { - default = false; + default = true; type = types.bool; description = '' Indicates whether to allow the contents of the `dataDir` directory to be changed From a7159d3cdae0fc8a38b2a3a24b0fc240ebf85d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Oct 2017 17:45:04 +0200 Subject: [PATCH 0828/2806] icu: keep default version on 58 ... to avoid mass rebuilds for now. (Bumped in parent merge.) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5febf560d2a..833becfccf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8648,7 +8648,7 @@ with pkgs; icu58 = callPackage ../development/libraries/icu/58.nix { }; icu59 = callPackage ../development/libraries/icu/59.nix { }; - icu = icu59; + icu = icu58; id3lib = callPackage ../development/libraries/id3lib { }; From 351b1ad8e25f97abc68257f5d993467e901f4f68 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sat, 7 Oct 2017 18:41:30 +0100 Subject: [PATCH 0829/2806] subversion18: 1.8.18 -> 1.8.19 For CVE-2017-9800, see https://subversion.apache.org/security/CVE-2017-9800-advisory.txt --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 0a5a3fbd0c6..e069c39f059 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -104,8 +104,8 @@ let in { subversion18 = common { - version = "1.8.18"; - sha256 = "19lpqdrl86mjfdpayhn3f9rkmpb6zs2iny38cnxq6wcj7snh0sz5"; + version = "1.8.19"; + sha256 = "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n"; }; subversion19 = common { From bd387654f572a42bd02642e33e37ac7f0416cdfc Mon Sep 17 00:00:00 2001 From: Carter Charbonneau Date: Sat, 7 Oct 2017 12:55:00 -0600 Subject: [PATCH 0830/2806] ffmpegthumbnailer: build with jpeg support --- pkgs/development/libraries/ffmpegthumbnailer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index c6167252866..9e76c1e6400 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig +{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ ffmpeg libpng ]; + buildInputs = [ ffmpeg libpng libjpeg ]; meta = with stdenv.lib; { homepage = https://github.com/dirkvdb/ffmpegthumbnailer; From 3ca090d2b45e797bfa15d17640c94c3af663af80 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sat, 7 Oct 2017 19:37:09 +0100 Subject: [PATCH 0831/2806] gramps: 4.1.1 -> 4.2.6 Motivation for change: GRAMPS was a long way out of date. Additional information: BSDDB3 unmasked as this is supported by the current Python3 version (commited separately). --- pkgs/applications/misc/gramps/default.nix | 24 +++++++++++++++-------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 4dcb5be8a21..8b66b23df01 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,23 +1,31 @@ -{ stdenv, fetchurl, gtk3, pythonPackages, intltool, - pango, gsettings_desktop_schemas }: +{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, + pango, gsettings_desktop_schemas, +# Optional packages: + enableOSM ? true, osm-gps-map + }: let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { - version = "4.1.1"; + version = "4.2.6"; name = "gramps-${version}"; - buildInputs = [ intltool gtk3 ]; + buildInputs = [ intltool gtk3 ] + # Map support + ++ stdenv.lib.optional enableOSM osm-gps-map + ; # Currently broken doCheck = false; - src = fetchurl { - url = "mirror://sourceforge/gramps/Stable/${version}/${name}.tar.gz"; - sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060"; + src = fetchFromGitHub { + owner = "gramps-project"; + repo = "gramps"; + rev = "v${version}"; + sha256 = "0k0bx6msc2kvkg0nwa9v2mp3qy7lmnxjd97n6a1zdzlq8yzw29f1"; }; - pythonPath = with pythonPackages; [ pygobject3 pycairo ] ++ [ pango ]; + pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71c0f127b37..932e48352d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14837,7 +14837,9 @@ with pkgs; gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { }; - gramps = callPackage ../applications/misc/gramps { }; + gramps = callPackage ../applications/misc/gramps { + pythonPackages = python3Packages; + }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; From f0667f81f5682f0e2a81e57906cf04ca8b877968 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sat, 7 Oct 2017 19:47:31 +0100 Subject: [PATCH 0832/2806] bsddb3 Refactored to disable tests. Motivation for change: Tests disabled as BSDDB3 works with Python3 but the tests do not. --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a1dfc970cc..312ddabe7f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2093,7 +2093,8 @@ in { buildInputs = [ pkgs.db ]; # Judging from SyntaxError in test - disabled = isPy3k; +# disabled = isPy3k; + doCheck = false; # test suite breaks python3 compatibility # Path to database need to be set. # Somehow the setup.py flag is not propagated. From 547fba51407afed4c3885cd935cf23702e386be8 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sat, 7 Oct 2017 20:10:32 +0100 Subject: [PATCH 0833/2806] ruby_2_2: 2.2.7 -> 2.2.8 For multiple CVE's: - CVE-2017-0898 - CVE-2017-10784 - CVE-2017-14033 - CVE-2017-14064 See https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-2-8-released/ --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 2e7d7f97819..bef890ad373 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -196,11 +196,11 @@ in { }; }; - ruby_2_2_7 = generic { - version = rubyVersion "2" "2" "7" ""; + ruby_2_2_8 = generic { + version = rubyVersion "2" "2" "8" ""; sha256 = { - src = "199xz5bvmp26c7vyzw47cpxkd8jk826kc8nlpavqzj5vqp388h9p"; - git = "0i0nsm9ldjp39m9xq47v8w6wlg821ikczz530493cs150qkqa0a1"; + src = "12i6v5i0djl4xx3x7fq12snqb5d4drqjmnwqs05fby4bagcbjdwg"; + git = "16nw0795nhrj13crp5x4jis8hmi3gsyjl96pwk698wlrb89lf9bw"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 5bc1b858425..3d3b17cd2f7 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -24,7 +24,7 @@ rec { "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; - "2.2.7" = ops useRailsExpress [ + "2.2.8" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8582966e81d..a9bd1b6da36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6700,7 +6700,7 @@ with pkgs; inherit (callPackage ../development/interpreters/ruby {}) ruby_2_0_0 ruby_2_1_10 - ruby_2_2_7 + ruby_2_2_8 ruby_2_3_5 ruby_2_4_2; @@ -6708,7 +6708,7 @@ with pkgs; ruby = ruby_2_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; - ruby_2_2 = ruby_2_2_7; + ruby_2_2 = ruby_2_2_8; ruby_2_3 = ruby_2_3_5; ruby_2_4 = ruby_2_4_2; From 5dc3b2fdc6739c371e9235ddeb42b1ecaf14c2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Oct 2017 20:02:19 +0200 Subject: [PATCH 0834/2806] xf86-video-amdgpu: 1.3.0 -> 1.4.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b7d779f8812..12ba110acbf 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1820,11 +1820,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.3.0"; + name = "xf86-video-amdgpu-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2; - sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2; + sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8d9b66f21ae..362ca3f2e7e 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -127,7 +127,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2 From 56ca2a5347ec73698ffecce57eb7b9ee2ea325fc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 7 Oct 2017 15:33:40 -0400 Subject: [PATCH 0835/2806] atom-beta: 1.21.0-beta0 -> 1.22.0-beta0 --- pkgs/applications/editors/atom/beta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix index 41a68656d00..61f927ef76b 100644 --- a/pkgs/applications/editors/atom/beta.nix +++ b/pkgs/applications/editors/atom/beta.nix @@ -1,12 +1,12 @@ { stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: stdenv.mkDerivation rec { - name = "atom-${version}"; - version = "1.21.0-beta0"; + name = "atom-beta-${version}"; + version = "1.22.0-beta0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1syxlyb62vp9hmjdiazhmvq8w52b90l8mvf502xkdav4vi3yxzfz"; + sha256 = "0xsj0vvaxjw60gg6niaws2lf9lkrh1sz7ypk41g6l4hdgmqyg6fi"; name = "${name}.deb"; }; From 20b48cbd97bdcfd2a84ce71d5217874f8eb05926 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 7 Oct 2017 12:30:41 -0800 Subject: [PATCH 0836/2806] kmplayer: 0.11.3d -> 0.12.0b --- pkgs/applications/video/kmplayer/default.nix | 41 ++++++++++++------- .../kmplayer_part-plugin_metadata.patch | 11 +++++ .../applications/video/kmplayer/no-docs.patch | 12 ++++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 50 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch create mode 100644 pkgs/applications/video/kmplayer/no-docs.patch diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 59b9893ded1..f0d7fa35370 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,30 +1,41 @@ -{ stdenv, fetchurl -, automoc4, cmake, gettext, makeWrapper, perl, pkgconfig -, kdelibs4, cairo, dbus_glib, mplayer +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, makeWrapper, + qtsvg, qtx11extras, ki18n, kdelibs4support, kio, kmediaplayer, kwidgetsaddons, + phonon, cairo, mplayer }: -stdenv.mkDerivation { - name = "kmplayer-0.11.3d"; +mkDerivation rec { + majorMinorVersion = "0.12"; + patchVersion = "0b"; + version = "${majorMinorVersion}.${patchVersion}"; + name = "kmplayer-${version}"; src = fetchurl { - #url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; - url = "mirror://gentoo/distfiles/kmplayer-0.11.3d.tar.bz2"; - sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; + url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2"; + sha256 = "0wzdxym4fc83wvqyhcwid65yv59a2wvp1lq303cn124mpnlwx62y"; }; - buildInputs = [ kdelibs4 cairo dbus_glib ]; + patches = [ + ./kmplayer_part-plugin_metadata.patch # Qt 5.9 doesn't like an empty string for the optional "FILE" argument of "Q_PLUGIN_METADATA" + ./no-docs.patch # Don't build docs due to errors (kdelibs4support propagates kdoctools) + ]; - nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ]; + nativeBuildInputs = [ extra-cmake-modules makeWrapper ]; + + buildInputs = [ + qtsvg qtx11extras ki18n kdelibs4support kio kmediaplayer kwidgetsaddons + phonon cairo + ]; postInstall = '' wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin ''; - meta = { + meta = with lib; { description = "MPlayer front-end for KDE"; - license = "GPL"; - homepage = http://kmplayer.kde.org; - broken = true; # Also unavailable on this mirror - maintainers = [ stdenv.lib.maintainers.sander ]; + license = with licenses; [ gpl2 lgpl2 fdl12 ]; + homepage = https://kmplayer.kde.org/; + maintainers = with maintainers; [ sander zraexy ]; }; } diff --git a/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch new file mode 100644 index 00000000000..9b6652b0be5 --- /dev/null +++ b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch @@ -0,0 +1,11 @@ +--- a/src/kmplayer_part.h ++++ b/src/kmplayer_part.h +@@ -36,7 +36,7 @@ + + class KMPlayerFactory : public KPluginFactory { + Q_OBJECT +- Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "") ++ Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory") + Q_INTERFACES(KPluginFactory) + public: + KMPlayerFactory(); diff --git a/pkgs/applications/video/kmplayer/no-docs.patch b/pkgs/applications/video/kmplayer/no-docs.patch new file mode 100644 index 00000000000..c93453f908c --- /dev/null +++ b/pkgs/applications/video/kmplayer/no-docs.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,9 +79,6 @@ + + add_subdirectory(src) + add_subdirectory(icons) +-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION) +- add_subdirectory(doc) +-endif(KF5DocTools_VERSION) + add_subdirectory(data) + + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 833becfccf9..d51dfb6d57e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15240,7 +15240,7 @@ with pkgs; kiwix = callPackage ../applications/misc/kiwix { }; - kmplayer = kde4.callPackage ../applications/video/kmplayer { }; + kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; kodestudio = callPackage ../applications/editors/kodestudio { }; From c1135606c0c1056e25847b2ffe80d2161d5aadc2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 7 Oct 2017 22:33:00 +0200 Subject: [PATCH 0837/2806] maintainers: add andir --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0076d9740ab..e84714236f6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -41,6 +41,7 @@ amorsillo = "Andrew Morsillo "; AndersonTorres = "Anderson Torres "; anderspapitto = "Anders Papitto "; + andir = "Andreas Rammhold "; andres = "Andres Loeh "; andrewrk = "Andrew Kelley "; andsild = "Anders Sildnes "; From 8e9acc83437665d01bec0c53234cf068a962f9b0 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 7 Oct 2017 21:05:25 +0200 Subject: [PATCH 0838/2806] dnstracer: init at 1.9 --- pkgs/tools/networking/dnstracer/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/networking/dnstracer/default.nix diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix new file mode 100644 index 00000000000..bb7c688480f --- /dev/null +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "1.9"; + name = "dnstracer"; + + src = fetchurl { + url = "http://www.mavetju.org/download/dnstracer-${version}.tar.gz"; + sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f"; + }; + + outputs = [ "out" "man" ]; + + setOutputFlags = false; + + meta = with stdenv.lib; { + description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data."; + homepage = http://www.mavetju.org/unix/general.php; + license = licenses.bsd2; + maintainers = with maintainers; [ andir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8582966e81d..82a9161e855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19672,4 +19672,6 @@ with pkgs; }; duti = callPackage ../os-specific/darwin/duti {}; + + dnstracer = callPackage ../tools/networking/dnstracer {}; } From fadb906b2f7091a9b973a6b1d79a4858e975b785 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 7 Oct 2017 21:45:43 +0100 Subject: [PATCH 0839/2806] powertop module: add kmod to path powertop attempt to load some kernel modules like msr by calling modprobe. This is the counterpart to 88e43eb39bcda5f8fdf41d566bc6799596177cd0 which has the powertop executable search PATH for modprobe rather than hardcoding /sbin, and actually adds the directory containing modprobe to its PATH for the systemd service. --- nixos/modules/tasks/powertop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/tasks/powertop.nix b/nixos/modules/tasks/powertop.nix index 0ec4974789b..609831506e1 100644 --- a/nixos/modules/tasks/powertop.nix +++ b/nixos/modules/tasks/powertop.nix @@ -16,6 +16,7 @@ in { powertop = { wantedBy = [ "multi-user.target" ]; description = "Powertop tunings"; + path = [ pkgs.kmod ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = "yes"; From 4e36cce39ba3b0b7f38db7352946cf162e518d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 7 Oct 2017 18:12:00 -0300 Subject: [PATCH 0840/2806] libmatroska: 1.4.7 -> 1.4.8 --- pkgs/development/libraries/libmatroska/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 9ad959ae22e..764f4442e6c 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.4.7"; + name = "libmatroska-1.4.8"; src = fetchurl { - url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2"; - sha256 = "1yi5cnv13nhl27xyqayd5l3sf0j3swfj3apzibv71yg9pariwi26"; + url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; + sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq"; }; nativeBuildInputs = [ pkgconfig ]; From d49181676b90cd9a1b3302436c0c2a6b8504680c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 7 Oct 2017 18:12:29 -0300 Subject: [PATCH 0841/2806] mkvtoolnix: 15.0.0 -> 16.0.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 442e9d8eeb3..2d7f7144f5f 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "15.0.0"; + version = "16.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "06n0hbp484zpsjvnzp6p0nzzssym3illxdicn3y1jf8gy971rxi0"; + sha256 = "0zdmjp0f7sh0bkaj0ls4sy4sg9qdq9ycrl18hlkafnj9xnbijgnn"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; From 58b6d3fdcbf57f3be543c1fc0e04948b46944291 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sat, 7 Oct 2017 22:25:21 +0100 Subject: [PATCH 0842/2806] python.pkgs.spambayes: 1.1b1 -> 1.1b2 --- .../python-modules/spambayes/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/spambayes/default.nix diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix new file mode 100644 index 00000000000..3386fdd1e2a --- /dev/null +++ b/pkgs/development/python-modules/spambayes/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, isPy3k, fetchPypi, bsddb3, pydns, lockfile }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "spambayes"; + version = "1.1b2"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1542dwdsmkav38cfjlbgf3bzz3z8nk7wzq173ya8ipk7g8g6s64d"; + }; + + propagatedBuildInputs = [ bsddb3 pydns lockfile ]; + + meta = { + description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; + homepage = http://spambayes.sourceforge.net/; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a1dfc970cc..6ca543f1fef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19829,21 +19829,7 @@ in { }; }; - spambayes = buildPythonPackage rec { - name = "spambayes-1.1b1"; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/spambayes/${name}.tar.gz"; - sha256 = "0kqvjb89b02wp41p650ydfspi1s8d7akx1igcrw62diidqbxp04n"; - }; - - propagatedBuildInputs = with self; [ bsddb3 pydns lockfile ]; - - meta = { - description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; - homepage = http://spambayes.sourceforge.net/; - }; - }; + spambayes = callPackage ../development/python-modules/spambayes { }; shapely = callPackage ../development/python-modules/shapely { }; From 99af040ee10c762a1f413b32c0961f7389feb25f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Oct 2017 00:05:38 +0200 Subject: [PATCH 0843/2806] docbook_{xml,xsl}*: propagate findXMLCatalogs --- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix | 4 ++-- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix | 4 ++-- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix | 4 ++-- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix | 4 ++-- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix | 4 ++-- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix | 3 ++- pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 4 +++- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index 7ff79488a89..d4cb7bc889d 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: let @@ -12,7 +12,7 @@ let in import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.1.2"; src = fetchurl { url = http://www.docbook.org/xml/4.1.2/docbkx412.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index 3875362dcb3..d2cc69559b8 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.2"; src = fetchurl { url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 19ad49aa928..e1f9337df94 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.3"; src = fetchurl { url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index 98a1853e494..1a9d622affc 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.4"; src = fetchurl { url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 669536962a1..301b400ac7e 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.5"; src = fetchurl { url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index fc3c4c3c841..373778d43de 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {} }: +{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: assert unzip != null; @@ -6,6 +6,7 @@ stdenv.mkDerivation { inherit src name postInstall; builder = ./builder.sh; buildInputs = [unzip]; + propagatedBuildInputs = [ findXMLCatalogs ]; meta = meta // { platforms = stdenv.lib.platforms.unix; 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 a955f5cf8a4..7bae913ed5e 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 }: +{ lib, stdenv, fetchurl, findXMLCatalogs }: let @@ -10,6 +10,8 @@ let inherit sha256; }; + propagatedBuildInputs = [ findXMLCatalogs ]; + dontBuild = true; installPhase = '' From 407db7b0196417296677f2a4ef929bb092ec382b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Oct 2017 00:07:40 +0200 Subject: [PATCH 0844/2806] gtk_doc: replace catalog lookup hack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the previous commit, we added a setup hook to docbook dtd and xsl packages, that adds derivation’s catalog file to an environment variable. That should, in theory, remove the need for declaring their catalogs manually. Unfortunately, xmlcatalog utility expects exactly one catalog file, completely disregarding the environment variable in non-interactive context. In the same spirit, the design of gtk-doc m4 files only admits a single catalog file, resulting in another ugly hack. --- .../tools/documentation/gtk-doc/default.nix | 25 ++++++----------- .../respect-xml-catalog-files-var.patch | 28 +++++++++++++++++++ 2 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 50668408834..5f31a2dfb7c 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, python, libxml2Python, libxslt, which +{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which , docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext, itstool }: stdenv.mkDerivation rec { @@ -10,29 +10,20 @@ stdenv.mkDerivation rec { sha256 = "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y"; }; + patches = [ + ./respect-xml-catalog-files-var.patch + ]; + outputDevdoc = "out"; - # maybe there is a better way to pass the needed dtd and xsl files - # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" - preConfigure = '' - mkdir -p $out/nix-support - cat > $out/nix-support/catalog.xml << EOF - - - - - - - EOF - - configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper"; - ''; - + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl gnome_doc_utils dblatex gettext which itstool ]; + configureFlags = "--disable-scrollkeeper"; + meta = with stdenv.lib; { homepage = https://www.gtk.org/gtk-doc; description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; diff --git a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch new file mode 100644 index 00000000000..78c57306b79 --- /dev/null +++ b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch @@ -0,0 +1,28 @@ +diff --git a/m4/gtkdoc_jh_check_xml_catalog.m4 b/m4/gtkdoc_jh_check_xml_catalog.m4 +index 618c1c9..1842a0d 100644 +--- a/m4/gtkdoc_jh_check_xml_catalog.m4 ++++ b/m4/gtkdoc_jh_check_xml_catalog.m4 +@@ -10,7 +10,21 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3]) + else +- AC_MSG_RESULT([not found]) +- ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) ++ jh_check_xml_catalog_saved_ifs="$IFS" ++ IFS=' ' ++ for f in $XML_CATALOG_FILES; do ++ if [[ -f "$f" ]] && \ ++ AC_RUN_LOG([$XMLCATALOG --noout "$f" "$1" >&2]); then ++ jh_found_xmlcatalog=true ++ AC_MSG_RESULT([found]) ++ ifelse([$3],,,[$3]) ++ break ++ fi ++ done ++ IFS="$jh_check_xml_catalog_saved_ifs" ++ if ! $jh_found_xmlcatalog; then ++ AC_MSG_RESULT([not found]) ++ ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) ++ fi + fi + ]) From 7c690aec1619fe85ef5c8bfbf05374597aceff1d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Oct 2017 13:07:52 +0200 Subject: [PATCH 0845/2806] conky: Rely on XML_CATALOG_FILES variable --- pkgs/os-specific/linux/conky/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index c09fc0f7dc4..8aa1cec9e12 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -80,10 +80,6 @@ stdenv.mkDerivation rec { # Drop examples, since they contain non-ASCII characters that break docbook2x :( sed -i 's/ Example: .*$//' doc/config_settings.xml - substituteInPlace cmake/Docbook.cmake \ - --replace "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl" - substituteInPlace doc/docs.xml \ - --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)" ''; @@ -91,7 +87,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib cmake libXinerama ] - ++ optionals docsSupport [ docbook2x libxslt man less ] + ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] ++ optional ncursesSupport ncurses ++ optional x11Support xlibsWrapper ++ optional xdamageSupport libXdamage From 08b283b37e02a02ab5767de9be3ddd41db923cf1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Oct 2017 13:24:29 +0200 Subject: [PATCH 0846/2806] criu: Rely on XML_CATALOG_FILES variable --- pkgs/os-specific/linux/criu/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 20b64907c22..6f14e713139 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -12,14 +12,13 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig docbook_xsl ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ]; patchPhase = '' 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 "--skip-validation" "--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 "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" "" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto From 757c43fd990d3d03afeacbb6523daf9dcb108cd9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Oct 2017 14:25:06 +0200 Subject: [PATCH 0847/2806] neomutt: Rely on XML_CATALOG_FILES variable --- .../networking/mailreaders/neomutt/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index e18d95dc122..5161443cd1a 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl -, cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }: +, cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { version = "20170912"; @@ -12,19 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0qndszmaihly3pp2wqiqm31nxbv9ys3j05kzffaqhzngfilmar9g"; }; - nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ]; buildInputs = [ cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb ]; - postPatch = '' - for f in doc/*.xsl ; do - substituteInPlace $f \ - --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl - done - ''; - configureFlags = [ "--enable-debug" "--enable-gpgme" From c3c844a0f54cb2ae6b95de7719e203de34ea3961 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Oct 2017 14:25:27 +0200 Subject: [PATCH 0848/2806] apt: Rely on XML_CATALOG_FILES variable --- pkgs/tools/package-management/apt/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index fe7327e7d85..8077fb1d93d 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin ] ++ lib.optionals withDocs [ - doxygen Po4a w3m + doxygen Po4a w3m docbook_xml_dtd_45 ] ++ lib.optionals withNLS [ gettext ]; @@ -44,15 +44,6 @@ stdenv.mkDerivation rec { -DWITH_DOC=${if withDocs then "ON" else "OFF"} -DUSE_NLS=${if withNLS then "ON" else "OFF"} ) - - for f in doc/*; do - if [[ -f "$f" ]]; then - substituteInPlace "$f" \ - --replace \ - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ - "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" - fi - done ''; enableParallelBuilding = true; From 2cc8173c74a7c67986761c09ae128d8a258251f6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Oct 2017 14:51:12 +0200 Subject: [PATCH 0849/2806] drumstick: Rely on XML_CATALOG_FILES variable --- pkgs/development/libraries/drumstick/default.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 7ec72afc2bf..a46c6bab647 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -15,25 +15,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Prevent the manpage builds from attempting to access the Internet. - prePatch = '' - substituteInPlace cmake_admin/CreateManpages.cmake --replace \ - http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ - ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl - - for xml in doc/*.xml.in; do - substituteInPlace "$xml" --replace \ - http://www.docbook.org/xml/4.5/docbookx.dtd \ - ${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd - done - ''; - #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket postInstall = '' rm $out/bin/drumstick-vpiano ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ]; buildInputs = [ alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg ]; From 40d9ebd969f9dceb32375e88f17c1c2cb161d49a Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 7 Oct 2017 15:06:13 -0800 Subject: [PATCH 0850/2806] massif-visualizer: 0.4.0 -> 0.7.0 --- .../analysis/massif-visualizer/default.nix | 26 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index f3195a23f88..99958a416c3 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs4, kgraphviewer }: +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, shared_mime_info, + qtsvg, qtxmlpatterns, karchive, kconfig, kcoreaddons, kparts, kio, ki18n, + kdiagram, kgraphviewer +}: -stdenv.mkDerivation rec { +mkDerivation rec { name = "massif-visualizer-${version}"; - version = "0.4.0"; + version = "0.7.0"; src = fetchurl { url = "mirror://kde/stable/massif-visualizer/${version}/src/${name}.tar.xz"; - sha256 = "0yawzp5lw7ryjcpqkhz70q4hc5hwq5imq5lgqnwgss057zcln7z8"; + sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; }; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - buildInputs = [ kdelibs4 kgraphviewer ]; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; - meta = with stdenv.lib; { + buildInputs = [ + qtsvg qtxmlpatterns karchive kconfig kcoreaddons kparts kio ki18n + kdiagram kgraphviewer + ]; + + meta = with lib; { description = "Tool that visualizes massif data generated by valgrind"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = with maintainers; [ lethalman zraexy ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 833becfccf9..70ac51d3467 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7347,7 +7347,7 @@ with pkgs; lttv = callPackage ../development/tools/misc/lttv { }; - massif-visualizer = kde4.callPackage ../development/tools/analysis/massif-visualizer { }; + massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; From 10dcf5897c6f39c4a266055e66addd6bc0c754a1 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sun, 8 Oct 2017 01:43:40 +0200 Subject: [PATCH 0851/2806] 18.03 release notes: mention ZNC mutability change --- nixos/doc/manual/release-notes/rl-1803.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 830e7cdd269..47522fe3cc9 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -71,6 +71,8 @@ following incompatible changes: + ZNC option now defaults to true. + That means that old configuration is not overwritten by default when update to the znc options are made. From 5b8ff5ed4914642027422dd1956f2068cfbe95fd Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 30 Sep 2017 21:12:24 +0200 Subject: [PATCH 0852/2806] graphite: 0.9.15 -> 1.0.2 Fixes: #29961 Also added the option: services.graphite.web.extraConfig for configuring graphite_web. --- nixos/lib/test-driver/Machine.pm | 11 ++++ .../modules/services/monitoring/graphite.nix | 54 ++++++++++++++----- nixos/release.nix | 1 + nixos/tests/graphite.nix | 26 +++++++++ .../waitress-django/default.nix | 8 +++ .../python-modules/waitress-django/setup.py | 12 +++++ .../waitress-django/src/waitress-serve-django | 14 +++++ pkgs/top-level/python-packages.nix | 45 ++++++++++------ 8 files changed, 144 insertions(+), 27 deletions(-) create mode 100644 nixos/tests/graphite.nix create mode 100644 pkgs/development/python-modules/waitress-django/default.nix create mode 100644 pkgs/development/python-modules/waitress-django/setup.py create mode 100755 pkgs/development/python-modules/waitress-django/src/waitress-serve-django diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index cd375352c4c..a7ed5d1faa3 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -372,6 +372,17 @@ sub getUnitInfo { return $info; } +# Fail if the given systemd unit is not in the "active" state. +sub requireActiveUnit { + my ($self, $unit) = @_; + $self->nest("checking if unit ‘$unit’ has reached state 'active'", sub { + my $info = $self->getUnitInfo($unit); + my $state = $info->{ActiveState}; + if ($state ne "active") { + die "Expected unit ‘$unit’ to to be in state 'active' but it is in state ‘$state’\n"; + }; + }); +} # Wait for a systemd unit to reach the "active" state. sub waitForUnit { diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 332a04634d0..01b4aca9173 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -7,6 +7,19 @@ let writeTextOrNull = f: t: mapNullable (pkgs.writeTextDir f) t; dataDir = cfg.dataDir; + staticDir = cfg.dataDir + "/static"; + + graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings" + {inherit graphiteLocalSettings;} '' + mkdir -p $out + ln -s $graphiteLocalSettings $out/graphite_local_settings.py + ''; + + graphiteLocalSettings = pkgs.writeText "graphite_local_settings.py" ( + "STATIC_ROOT = '${staticDir}'\n" + + optionalString (! isNull config.time.timeZone) "TIME_ZONE = '${config.time.timeZone}'\n" + + cfg.web.extraConfig + ); graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' time_zone: ${config.time.timeZone} @@ -94,6 +107,15 @@ in { default = 8080; type = types.int; }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Graphite webapp settings. See: + + ''; + }; }; api = { @@ -460,9 +482,13 @@ in { ]; }; penvPack = "${penv}/${pkgs.python.sitePackages}"; - # opt/graphite/webapp contains graphite/settings.py - # explicitly adding pycairo in path because it cannot be imported via buildEnv - in "${penvPack}/opt/graphite/webapp:${penvPack}:${pkgs.pythonPackages.pycairo}/${pkgs.python.sitePackages}"; + in concatStringsSep ":" [ + "${graphiteLocalSettingsDir}" + "${penvPack}/opt/graphite/webapp" + "${penvPack}" + # explicitly adding pycairo in path because it cannot be imported via buildEnv + "${pkgs.pythonPackages.pycairo}/${pkgs.python.sitePackages}" + ]; DJANGO_SETTINGS_MODULE = "graphite.settings"; GRAPHITE_CONF_DIR = configDir; GRAPHITE_STORAGE_DIR = dataDir; @@ -470,9 +496,9 @@ in { }; serviceConfig = { ExecStart = '' - ${pkgs.python27Packages.waitress}/bin/waitress-serve \ - --host=${cfg.web.listenAddress} --port=${toString cfg.web.port} \ - --call django.core.handlers.wsgi:WSGIHandler''; + ${pkgs.python27Packages.waitress-django}/bin/waitress-serve-django \ + --host=${cfg.web.listenAddress} --port=${toString cfg.web.port} + ''; User = "graphite"; Group = "graphite"; PermissionsStartOnly = true; @@ -482,16 +508,20 @@ in { mkdir -p ${dataDir}/{whisper/,log/webapp/} chmod 0700 ${dataDir}/{whisper/,log/webapp/} - # populate database - ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput + ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py migrate --noinput - # create index - ${pkgs.python27Packages.graphite_web}/bin/build-index.sh - - chown -R graphite:graphite ${cfg.dataDir} + chown -R graphite:graphite ${dataDir} touch ${dataDir}/db-created fi + + # Only collect static files when graphite_web changes. + if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python27Packages.graphite_web}" ]; then + mkdir -p ${staticDir} + ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic --noinput --clear + chown -R graphite:graphite ${staticDir} + ln -sfT "${pkgs.python27Packages.graphite_web}" "${dataDir}/current_graphite_web" + fi ''; }; diff --git a/nixos/release.nix b/nixos/release.nix index ee706ff986d..3c87a87e470 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -255,6 +255,7 @@ in rec { tests.gnome3 = callTest tests/gnome3.nix {}; tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {}; tests.grafama = callTest tests/grafana.nix {}; + tests.graphite = callTest tests/graphite.nix {}; tests.hardened = callTest tests/hardened.nix { }; tests.hibernate = callTest tests/hibernate.nix {}; tests.hound = callTest tests/hound.nix {}; diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix new file mode 100644 index 00000000000..4fd7de192d5 --- /dev/null +++ b/nixos/tests/graphite.nix @@ -0,0 +1,26 @@ +import ./make-test.nix ({ pkgs, ...} : +{ + name = "graphite"; + nodes = { + one = + { config, pkgs, ... }: { + services.graphite = { + web = { + enable = true; + }; + carbon = { + enableCache = true; + }; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("default.target"); + $one->requireActiveUnit("graphiteWeb.service"); + $one->requireActiveUnit("carbonCache.service"); + $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003"); + $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo") + ''; +}) diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix new file mode 100644 index 00000000000..6efaf800b3c --- /dev/null +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -0,0 +1,8 @@ +{ buildPythonPackage, django_1_8, waitress }: +buildPythonPackage { + name = "waitress-django"; + src = ./.; + pythonPath = [ django_1_8 waitress ]; + doCheck = false; + meta.description = "A waitress WSGI server serving django"; +} diff --git a/pkgs/development/python-modules/waitress-django/setup.py b/pkgs/development/python-modules/waitress-django/setup.py new file mode 100644 index 00000000000..07f7b326fda --- /dev/null +++ b/pkgs/development/python-modules/waitress-django/setup.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python + +from distutils.core import setup + +setup( name = "waitress-django" + , version = "0.0.0" + , description = "A waitress WSGI server serving django" + , author = "Bas van Dijk" + , author_email = "v.dijk.bas@gmail.com" + , package_dir = {"" : "src"} + , scripts = ["src/waitress-serve-django"] + ) diff --git a/pkgs/development/python-modules/waitress-django/src/waitress-serve-django b/pkgs/development/python-modules/waitress-django/src/waitress-serve-django new file mode 100755 index 00000000000..b710086c22b --- /dev/null +++ b/pkgs/development/python-modules/waitress-django/src/waitress-serve-django @@ -0,0 +1,14 @@ +#!/usr/bin/env python +import sys +from waitress import serve +from waitress.adjustments import Adjustments +import django +from django.core.handlers.wsgi import WSGIHandler +from django.contrib.staticfiles.handlers import StaticFilesHandler + +if __name__ == "__main__": + kw, args = Adjustments.parse_args(sys.argv[1:]) + django.setup() + # These arguments are specific to the runner, not waitress itself. + del kw['call'], kw['help'] + serve(StaticFilesHandler(WSGIHandler()), **kw) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a10f4e9830a..4b82f96918c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -60,7 +60,7 @@ let buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args ); - graphiteVersion = "0.9.15"; + graphiteVersion = "1.0.2"; fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs: let @@ -8299,14 +8299,14 @@ in { django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_tagging_0_3 = self.django_tagging.overrideAttrs (attrs: rec { - name = "django-tagging-0.3.6"; + django_tagging_0_4_3 = self.django_tagging.overrideAttrs (attrs: rec { + name = "django-tagging-0.4.3"; src = pkgs.fetchurl { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; - sha256 = "03zlbq13rydfh28wh0jk3x3cjk9x6jjmqnx1i3ngjmfwbxf8x6j1"; + sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs"; }; - propagatedBuildInputs = with self; [ django ]; + propagatedBuildInputs = with self; [ django_1_8 ]; }); django_classytags = buildPythonPackage rec { @@ -22278,11 +22278,11 @@ EOF }; waitress = buildPythonPackage rec { - name = "waitress-0.8.9"; + name = "waitress-1.0.2"; src = pkgs.fetchurl { url = "mirror://pypi/w/waitress/${name}.tar.gz"; - sha256 = "826527dc9d334ed4ed76cdae672fdcbbccf614186657db71679ab58df869458a"; + sha256 = "0pw6yyxi348r2xpq3ykqnf7gwi881azv2422d2ixb0xi5jws2ky7"; }; doCheck = false; @@ -22293,6 +22293,8 @@ EOF }; }; + waitress-django = callPackage ../development/python-modules/waitress-django { }; + webassets = buildPythonPackage rec { name = "webassets-${version}"; version = "0.12.1"; @@ -23485,7 +23487,7 @@ EOF src = pkgs.fetchurl { url = "mirror://pypi/w/whisper/${name}.tar.gz"; - sha256 = "1chkphxwnwvy2cs7jc2h2i0lqqvi9jx6vqj3ly88lwk7m35r4ss2"; + sha256 = "1v1bi3fl1i6p4z4ki692bykrkw6907dn3mfq0151f70lvi3zpns3"; }; # error: invalid command 'test' @@ -23552,7 +23554,7 @@ EOF src = pkgs.fetchurl { url = "mirror://pypi/c/carbon/${name}.tar.gz"; - sha256 = "f01db6d37726c6fc0a8aaa66a7bf14436b0dd0d62ef3c20ecb31605a4d365d2e"; + sha256 = "142smpmgbnjinvfb6s4ijazish4vfgzyd8zcmdkh55y051fkixkn"; }; propagatedBuildInputs = with self; [ whisper txamqp zope_interface twisted ]; @@ -23767,10 +23769,13 @@ EOF src = pkgs.fetchurl rec { url = "mirror://pypi/g/graphite-web/${name}.tar.gz"; - sha256 = "1c0kclbv8shv9nvjx19wqm4asia58s3qmd9fapchc6y9fjpjax6q"; + sha256 = "0q8bwlj75jqyzmazfsi5sa26xl58ssa8wdxm2l4j0jqyn8xpfnmc"; }; - propagatedBuildInputs = with self; [ django django_tagging_0_3 whisper pycairo ldap memcached pytz ]; + propagatedBuildInputs = with self; [ + django_1_8 django_tagging_0_4_3 whisper pycairo cairocffi + ldap memcached pytz urllib3 scandir + ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ @@ -23778,10 +23783,20 @@ EOF ''; preConfigure = '' - substituteInPlace webapp/graphite/thirdparty/pytz/__init__.py --replace '/usr/share/zoneinfo' '/etc/zoneinfo' - substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" - cp webapp/graphite/manage.py bin/manage-graphite.py - substituteInPlace bin/manage-graphite.py --replace 'settings' 'graphite.settings' + # graphite is configured by storing a local_settings.py file inside the + # graphite python package. Since that package is stored in the immutable + # Nix store we can't modify it. So how do we configure graphite? + # + # First of all we rename "graphite.local_settings" to + # "graphite_local_settings" so that the settings are not looked up in the + # graphite package anymore. Secondly we place a directory containing a + # graphite_local_settings.py on the PYTHONPATH in the graphite module + # . + substituteInPlace webapp/graphite/settings.py \ + --replace "graphite.local_settings" " graphite_local_settings" + + substituteInPlace webapp/graphite/settings.py \ + --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" ''; # error: invalid command 'test' From c45c4a711aa758f8853d3002c5f103de77cb093d Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sun, 8 Oct 2017 12:24:46 +0800 Subject: [PATCH 0853/2806] hackage: update snapshot of 'all-cabal-hashes' repo for callHackage --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 48b8e989e40..eddc833da9d 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -6,6 +6,6 @@ fetchFromGitHub { owner = "commercialhaskell"; repo = "all-cabal-hashes"; - rev = "b490d26340638934d13c0c0cd4089dec0fb6b85e"; - sha256 = "0cz76wcdlh5512g1aviv0ac9qwj1mmy9ncp6q4yywylxrlqgcbj5"; + rev = "901c2522e6797270f5ded4495b1a529e6c16ef45"; + sha256 = "0wng314y3yn6bbwa5ar254l7p8y99gsvm8ll4z7f3wg77v5fzish"; } From 977c8e673c4938fff42b24d80f724e67c6202f4e Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 8 Oct 2017 09:03:54 +0300 Subject: [PATCH 0854/2806] hotpatch: init at 0.2 --- .../libraries/hotpatch/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/hotpatch/default.nix diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix new file mode 100644 index 00000000000..df3581cc809 --- /dev/null +++ b/pkgs/development/libraries/hotpatch/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "hotpatch-0.2"; + + src = fetchFromGitHub { + owner = "vikasnkumar"; + repo = "hotpatch"; + rev = "4b65e3f275739ea5aa798d4ad083c4cb10e29149"; + sha256 = "169vdh55wsbn6fl58lpzqx64v6ifzh7krykav33x1d9hsk98qjqh"; + }; + + enableParallelBuilding = true; + doCheck = true; + + nativeBuildInputs = [ cmake ]; + + preConfigure = '' + substituteInPlace test/loader.c \ + --replace \"/lib64/ld-linux-x86-64.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace \"/lib/ld-linux-x86-64.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace \"/lib/ld-linux.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace \"/lib32/ld-linux.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" + ''; + + checkPhase = '' + LD_LIBRARY_PATH=$(pwd)/src make test + ''; + + meta = with stdenv.lib; { + description = "Hot patching executables on Linux using .so file injection"; + homepage = src.meta.homepage; + license = licenses.bsd3; + maintainers = [ maintainers.gnidorah ]; + platforms = ["i686-linux" "x86_64-linux"]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d017f39cb5..43a1acd7685 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2593,6 +2593,8 @@ with pkgs; host = bind.host; + hotpatch = callPackage ../development/libraries/hotpatch { }; + hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { }; hping = callPackage ../tools/networking/hping { }; From 35f894860d7d2b59b76ced134e4155b39ea6c651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 10:55:34 +0200 Subject: [PATCH 0855/2806] xf86-video-intel: fixup after #29039 This was one package in pkgs/servers/x11/xorg/default.nix that was *not* generated, and that was missed in the PR and overwritten (understandably). Now the change is properly in overrides.nix to prevent that... --- pkgs/servers/x11/xorg/overrides.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 45df7244176..c3665667107 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -562,6 +562,13 @@ in }; xf86videointel = attrs: attrs // { + # the update script only works with released tarballs :-/ + name = "xf86-video-intel-2017-04-18"; + src = args.fetchurl { + url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/" + + "c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz"; + sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8"; + }; buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros]; configureFlags = "--with-default-dri=3 --enable-tools"; From 9b4f74e38fa6fbccc8e3d7843d8035c1fd2a072c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:16:44 +0200 Subject: [PATCH 0856/2806] yabause: fix meta eval --- pkgs/misc/emulators/yabause/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 2fc60b543e6..fb99421a61a 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "An open-source Sega Saturn emulator"; homepage = https://yabause.org/; license = licenses.gpl2Plus; - maintainers = with maintaines; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } From 78aa7f2338a4c1b9700b561cb123c6dc9ef053b6 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Sun, 8 Oct 2017 11:26:25 +0200 Subject: [PATCH 0857/2806] ghcjs/ghcjsHEAD: Use separate patch files to fix build of ghcjs --- .../compilers/ghcjs/ghcjs-head.patch | 86 +++++++++++++++++++ pkgs/development/compilers/ghcjs/ghcjs.patch | 18 ++++ pkgs/development/compilers/ghcjs/head.nix | 2 + 3 files changed, 106 insertions(+) create mode 100644 pkgs/development/compilers/ghcjs/ghcjs-head.patch diff --git a/pkgs/development/compilers/ghcjs/ghcjs-head.patch b/pkgs/development/compilers/ghcjs/ghcjs-head.patch new file mode 100644 index 00000000000..bbb5b30468c --- /dev/null +++ b/pkgs/development/compilers/ghcjs/ghcjs-head.patch @@ -0,0 +1,86 @@ +diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs +index db8b12e..7b815c5 100644 +--- a/src-bin/Boot.hs ++++ b/src-bin/Boot.hs +@@ -540,9 +540,7 @@ initPackageDB :: B () + initPackageDB = do + msg info "creating package databases" + initDB "--global" <^> beLocations . blGlobalDB +- traverseOf_ _Just initUser <^> beLocations . blUserDBDir + where +- initUser dir = rm_f (dir "package.conf") >> initDB "--user" (dir "package.conf.d") + initDB dbName db = do + rm_rf db >> mkdir_p db + ghcjs_pkg_ ["init", toTextI db] `catchAny_` return () +@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do + msgD info $ "preparing development boot tree" + checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do + testGit "ghcjs-boot" >>= \case +- Just False -> failWith "ghcjs-boot already exists and is not a git repository" +- Just True -> do +- msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning" +- rm_rf "ghcjs-boot" ++ Just _ -> do ++ msg info "ghcjs-boot repository already exists; initializing ghcjs-boot" + initGhcjsBoot + Nothing -> do + msgD info "cloning ghcjs-boot git repository" + initGhcjsBoot + checkpoint' "shims-git" "shims repository already cloned" $ do + testGit "shims" >>= \case +- Just False -> failWith "shims already exists and is not a git repository" +- Just True -> do +- msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning" +- rm_rf "shims" +- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev ++ Just _ -> do ++ msgD info "shims repository already exists; moving on" + Nothing -> do + msgD info "cloning shims git repository" + cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev + where + initGhcjsBoot = sub $ do +- cloneGit bootDescr "ghcjs-boot" bsrcBootDevBranch bsrcBootDev + cd "ghcjs-boot" +- git_ ["submodule", "update", "--init", "--recursive"] + mapM_ patchPackage =<< allPackages + preparePrimops + buildGenPrim +@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do + , "--avoid-reinstalls" + , "--builddir", "dist" + , "--with-compiler", ghcjs ^. pgmLocText ++ , "--with-gcc", "@CC@" + , "--with-hc-pkg", ghcjsPkg ^. pgmLocText +- , "--prefix", toTextI instDir ++ , "--prefix", "@PREFIX@" ++ , "--libdir", "$prefix/lib/$compiler" ++ , "--libsubdir", "$pkgid" + , bool haddock "--enable-documentation" "--disable-documentation" + , "--haddock-html" +--- workaround for hoogle support being broken in haddock for GHC 7.10RC1 +-#if !(__GLASGOW_HASKELL__ >= 709) + , "--haddock-hoogle" +-#endif + , "--haddock-hyperlink-source" + -- don't slow down Windows builds too much, on other platforms we get this more + -- or less for free, thanks to dynamic-too +diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs +index 33a401f..e2405a7 100644 +--- a/src/Compiler/Info.hs ++++ b/src/Compiler/Info.hs +@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do + + -- | the directory to use if started without -B flag + getDefaultTopDir :: IO FilePath +-getDefaultTopDir = do +- appdir <- getAppUserDataDirectory "ghcjs" +- return (appdir subdir "ghcjs") +- where +- targetARCH = arch +- targetOS = os +- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion ++getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@" + + getDefaultLibDir :: IO FilePath + getDefaultLibDir = getDefaultTopDir diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch index bbb5b30468c..9f4fa3a8b7a 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs.patch +++ b/pkgs/development/compilers/ghcjs/ghcjs.patch @@ -46,6 +46,24 @@ index db8b12e..7b815c5 100644 mapM_ patchPackage =<< allPackages preparePrimops buildGenPrim +@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do + globalFlags <- cabalGlobalFlags + flags <- cabalInstallFlags (length pkgs == 1) + let args = globalFlags ++ ("install" : pkgs) ++ +- [ "--solver=topdown" -- the modular solver refuses to install stage1 packages ++ [ "--allow-boot-library-installs" + ] ++ map ("--configure-option="<>) configureOpts ++ flags + checkInstallPlan pkgs args + cabal_ args +@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do + -- uses somewhat fragile parsing of --dry-run output, find a better way + checkInstallPlan :: [Package] -> [Text] -> B () + checkInstallPlan pkgs opts = do +- plan <- cabal (opts ++ ["-v2", "--dry-run"]) ++ plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"]) + when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan) + where + hasReinstalls = T.isInfixOf "(reinstall)" -- reject reinstalls @@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do , "--avoid-reinstalls" , "--builddir", "dist" diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 7f725a3a9ad..2cf6c8b39c2 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -45,4 +45,6 @@ bootPkgs.callPackage ./base.nix { "unix" ]; stage2 = import ./head_stage2.nix; + + patches = [ ./ghcjs-head.patch ]; } From dc5734e0634c01b2d61fa20101b0923e7362516b Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sun, 8 Oct 2017 12:05:16 +0200 Subject: [PATCH 0858/2806] rustRegistry: 2017-10-03 -> 2017-10-08 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index a4fd5ca54ee..92230993d58 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,13 +7,13 @@ { stdenv, fetchFromGitHub, git }: stdenv.mkDerivation { - name = "rustRegistry-2017-10-03"; + name = "rustRegistry-2017-10-08"; src = fetchFromGitHub { owner = "rust-lang"; repo = "crates.io-index"; - rev = "f9e21955350caf67db45c4a4a38dbab2f2250bfc"; - sha256 = "1yk0l0r9idn7crnnw44sig69kvvyq3ycv417s88hd16m1fpl5y77"; + rev = "78ab44cf22c2ce5d40e562ffc7df7ab10ac12b86"; + sha256 = "0fa3l3px6b89ap63h40bhn2x50zf5j65jrgbb7j103j0cdayk2l0"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' From 7f502cf6d7947cf3ef245d033a649d436d77c29d Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sun, 8 Oct 2017 12:06:04 +0200 Subject: [PATCH 0859/2806] fd: 3.1.0 -> 4.0.0 --- pkgs/tools/misc/fd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index c46566aeabe..07d8a661d7b 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "3.1.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "0sv7iwl44a86n92i3mib2vlzd44q9ncif34yh1s0vqffai5s1rr6"; + sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv"; }; - depsSha256 = "1irfx78k899qphzj8i8vr34pb6zaf9p5nx5c4zpgsrbknvn0ag5l"; + depsSha256 = "17fjlmdwp8582dvv68b5h3zzvmd71yd9sw9xalyrrww46h7fd84g"; meta = { description = "A simple, fast and user-friendly alternative to find"; From 9e4be636bacd0bd181c83280af1a0a6625fb9ed3 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 29 Sep 2017 22:51:32 +0200 Subject: [PATCH 0860/2806] prometheus-minio-exporter: init at 0.1.0 --- .../prometheus/minio-exporter/default.nix | 26 +++ .../prometheus/minio-exporter/deps.nix | 156 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 183 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/minio-exporter/default.nix create mode 100644 pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix new file mode 100644 index 00000000000..c89574e3fff --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "minio-exporter-${version}"; + version = "0.1.0"; + rev = "v${version}"; + + goPackagePath = "github.com/joe-pll/minio-exporter"; + + src= fetchFromGitHub { + inherit rev; + owner = "joe-pll"; + repo = "minio-exporter"; + sha256 = "14lz4dg0n213b6xy12fh4r20k1rcnflnfg6gjskk5zr8h7978hjx"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "A Prometheus exporter for Minio cloud storage server"; + homepage = https://github.com/joe-pll/minio-exporter; + license = licenses.asl20; + maintainers = with maintainers; [ bachp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix new file mode 100644 index 00000000000..562d77f3a2f --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix @@ -0,0 +1,156 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "c787282c39ac1fc618827141a1f762240def08a3"; + sha256 = "0c784qichlpqdk1zwafislskchr7f4dl7fy3g3w7xg2w63xpd7r0"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "130e6b02ab059e7b717a096f397c5b60111cae74"; + sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/minio/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/minio/go-homedir"; + rev = "21304a94172ae3a09dee2cd86a12fb6f842138c7"; + sha256 = "1kvz91gvdrpzddlpcbf0a2kf75bfqzd40kwzq29jwhf1y5ii6cq4"; + }; + } + { + goPackagePath = "github.com/minio/minio-go"; + fetch = { + type = "git"; + url = "https://github.com/minio/minio-go"; + rev = "cb3571b7d8d904c4714033deb984d0a0b66955be"; + sha256 = "165filzwslnqdgsp8wf5k1zm8wcpnsffsaffw25igy0ik8swr06w"; + }; + } + { + goPackagePath = "github.com/minio/minio"; + fetch = { + type = "git"; + url = "https://github.com/minio/minio"; + rev = "60cc6184d253efee4a3120683517028342229e21"; + sha256 = "0n2l163v45jraylv43jwqm0cxin68vw8cw7k21qniahhr46y4dqf"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "353b8c3f3776541879f9abfd8fa8b1ae162ab394"; + sha256 = "068fk3bdfsaij37973c66065w2cn46ahwjs44pw9v1mqk8bsrn3a"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; + sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "2f17f4a9d485bf34b4bfaccc273805040e4f86c8"; + sha256 = "0r1dyipnd7n9vp4p6gs1y4v7ggq4avj06pr90l4qrjll55h281js"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"; + sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "89742aefa4b206dcf400792f3bd35b542998eb3b"; + sha256 = "0hk7fabx59msg2y0iik6xvfp80s73ybrwlcshbm9ds91iqbkcxi6"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "76eec36fa14229c4b25bb894c2d0e591527af429"; + sha256 = "1c57fdg70vhf7pigiwb2xdap6ak0c0s2pzaj9pq000aqfw54i4s8"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "314a259e304ff91bd6985da2a7149bbf91237993"; + sha256 = "0vya62c3kmhmqx6awlxx8hc84987xkym9rhs0q28vlhwk9kczdaa"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; + sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3316e80ec7..a565dab9d50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11787,6 +11787,7 @@ with pkgs; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; + prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; From 1983e6c8ccdd631e3bbf325b9c5b58b61fd7f63e Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 1 Oct 2017 20:58:28 +0200 Subject: [PATCH 0861/2806] minio: 20170613 -> 2017-09-29T19-16-56Z The test was updated as minio now needs at least 1 GiB of free disk, otherwise it won't start. --- nixos/tests/minio.nix | 4 +++- pkgs/servers/minio/default.nix | 13 ++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index a349265b2f5..07a292a9baa 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -12,6 +12,9 @@ import ./make-test.nix ({ pkgs, ...} : { secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; }; environment.systemPackages = [ pkgs.minio-client ]; + + # Minio requires at least 1GiB of free disk space to run. + virtualisation.diskSize = 4 * 1024; }; }; @@ -20,7 +23,6 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $machine->waitForUnit("minio.service"); $machine->waitForOpenPort(9000); - $machine->succeed("curl --fail http://localhost:9000/minio/index.html"); # Create a test bucket on the server $machine->succeed("mc config host add minio http://localhost:9000 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4"); diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 48b5279772a..c9dfe9136df 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,14 +1,13 @@ { lib, stdenv, fetchurl, go }: stdenv.mkDerivation rec { - name = "minio-${shortVersion}"; + name = "minio-${version}"; - shortVersion = "20170613"; - longVersion = "2017-06-13T19-01-01Z"; + version = "2017-09-29T19-16-56Z"; src = fetchurl { - url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "1rrlgn0nsvfn0lr9ffihjdb96n4znsvjlz1h7bwvz8nwhbn0lfsf"; + url = "https://github.com/minio/minio/archive/RELEASE.${version}.tar.gz"; + sha256 = "1h028gyfvyh5x6k4fsj4s64sgzqy7jgln6kvs27bnxzigj6dp2wx"; }; buildInputs = [ go ]; @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p $out/bin go build -o $out/bin/minio \ - --ldflags "-X github.com/minio/minio/cmd.Version=${longVersion}" + --ldflags "-X github.com/minio/minio/cmd.Version=${version}" ''; installPhase = "true"; @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://www.minio.io/; description = "An S3-compatible object storage server"; - maintainers = [ lib.maintainers.eelco ]; + maintainers = with lib.maintainers; [ eelco bachp ]; platforms = lib.platforms.x86_64; license = lib.licenses.asl20; }; From 8079e52bc158b11db1dfadefbd0f48da3a10ecd4 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sat, 7 Oct 2017 16:08:52 -0700 Subject: [PATCH 0862/2806] zile: 2.4.13 -> 2.4.14 fixes #30209 --- pkgs/applications/editors/zile/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 9274eb6889d..0f79ca33c72 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,14 +1,15 @@ { fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }: stdenv.mkDerivation rec { - name = "zile-2.4.13"; + name = "zile-2.4.14"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7"; + sha256 = "0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s"; }; - nativeBuildInputs = [ pkgconfig perl ] + buildInputs = [ ncurses boehmgc ]; + nativeBuildInputs = [ perl pkgconfig ] # `help2man' wants to run Zile, which won't work when the # newly-produced binary can't be run at build-time. ++ stdenv.lib.optional @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = false; # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. - preConfigure = "export gl_cv_func_fstatat_zero_flag=yes"; + gl_cv_func_fstatat_zero_flag="yes"; meta = with stdenv.lib; { description = "Lightweight Emacs clone"; From aad88ddf5bdeb25e586d4de3ef1a639d4c95f3cf Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 8 Oct 2017 12:07:05 +0200 Subject: [PATCH 0863/2806] prometheus-minio-exporter service: init version --- nixos/modules/module-list.nix | 1 + .../monitoring/prometheus/minio-exporter.nix | 107 ++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/minio-exporter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ac7e5b52d6..ee796242c1a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -375,6 +375,7 @@ ./services/monitoring/prometheus/collectd-exporter.nix ./services/monitoring/prometheus/fritzbox-exporter.nix ./services/monitoring/prometheus/json-exporter.nix + ./services/monitoring/prometheus/minio-exporter.nix ./services/monitoring/prometheus/nginx-exporter.nix ./services/monitoring/prometheus/node-exporter.nix ./services/monitoring/prometheus/snmp-exporter.nix diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix new file mode 100644 index 00000000000..4b6c96d9673 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix @@ -0,0 +1,107 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.minioExporter; +in { + options = { + services.prometheus.minioExporter = { + enable = mkEnableOption "prometheus minio exporter"; + + port = mkOption { + type = types.int; + default = 9290; + description = '' + Port to listen on. + ''; + }; + + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "0.0.0.0"; + description = '' + Address to listen on for web interface and telemetry. + ''; + }; + + minioAddress = mkOption { + type = types.str; + example = "https://10.0.0.1:9000"; + description = '' + The URL of the minio server. + Use HTTPS if Minio accepts secure connections only. + ''; + }; + + minioAccessKey = mkOption { + type = types.str; + example = "BKIKJAA5BMMU2RHO6IBB"; + description = '' + The value of the Minio access key. + It is required in order to connect to the server. + ''; + }; + + minioAccessSecret = mkOption { + type = types.str; + description = '' + The calue of the Minio access secret. + It is required in order to connect to the server. + ''; + }; + + minioBucketStats = mkOption { + type = types.bool; + default = false; + description = '' + Collect statistics about the buckets and files in buckets. + It requires more computation, use it carefully in case of large buckets.. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the minio exporter. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.prometheus-minio-exporter = { + description = "Prometheus exporter for Minio server metrics"; + unitConfig.Documentation = "https://github.com/joe-pll/minio-exporter"; + wantedBy = [ "multi-user.target" ]; + after = optional config.services.minio.enable "minio.service"; + serviceConfig = { + DynamicUser = true; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \ + -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \ + -minio.server ${cfg.minioAddress} \ + -minio.access-key ${cfg.minioAccessKey} \ + -minio.access-secret ${cfg.minioAccessSecret} \ + ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; + }; +} From 3144832556629dcad7c6b1b4f8044039e81bd27f Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 8 Oct 2017 11:53:20 +0100 Subject: [PATCH 0864/2806] zile: fix evaluation --- pkgs/applications/editors/zile/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 0f79ca33c72..7213b22c949 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { (stdenv.hostPlatform == stdenv.buildPlatform) help2man; - buildInputs = [ ncurses boehmgc ]; - # Tests can't be run because most of them rely on the ability to # fiddle with the terminal. doCheck = false; From dfd9a2bbd012e235dd3b5a5290aac0b32d82d08b Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Sun, 8 Oct 2017 14:18:45 +0300 Subject: [PATCH 0865/2806] escrotum: Init at 2017-01-28 --- pkgs/tools/graphics/escrotum/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/graphics/escrotum/default.nix diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix new file mode 100644 index 00000000000..2a4f3c9cbff --- /dev/null +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildPythonApplication +, pygtk +, numpy ? null +}: + +buildPythonApplication { + name = "escrotum-2017-01-28"; + + src = fetchFromGitHub { + owner = "Roger"; + repo = "escrotum"; + rev = "a51e330f976c1c9e1ac6932c04c41381722d2171"; + sha256 = "0vbpyihqgm0fyh22ashy4lhsrk67n31nw3bs14d1wr7ky0l3rdnj"; + }; + + propagatedBuildInputs = [ pygtk numpy ]; + + meta = with lib; { + homepage = https://github.com/Roger/escrotum; + description = "Linux screen capture using pygtk, inspired by scrot"; + platforms = platforms.linux; + maintainers = with maintainers; [ rasendubi ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e8fc79710a..6cb3fc221c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1902,6 +1902,10 @@ with pkgs; epsxe = callPackage ../misc/emulators/epsxe { }; + escrotum = callPackage ../tools/graphics/escrotum { + inherit (pythonPackages) buildPythonApplication pygtk numpy; + }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; From 8e10a4d86267f7b59e2ab1d614243334459678df Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 8 Oct 2017 15:09:25 +0200 Subject: [PATCH 0866/2806] prometheus-minio-exporter service: default to local minio server if enabled --- .../services/monitoring/prometheus/minio-exporter.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix index 4b6c96d9673..bc3967f8612 100644 --- a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix @@ -29,26 +29,32 @@ in { minioAddress = mkOption { type = types.str; example = "https://10.0.0.1:9000"; + default = if config.services.minio.enable then "http://localhost:9000" else null; description = '' The URL of the minio server. Use HTTPS if Minio accepts secure connections only. + By default this connects to the local minio server if enabled. ''; }; minioAccessKey = mkOption { type = types.str; example = "BKIKJAA5BMMU2RHO6IBB"; + default = if config.services.minio.enable then config.services.minio.accessKey else null; description = '' The value of the Minio access key. It is required in order to connect to the server. + By default this uses the one from the local minio server if enabled. ''; }; minioAccessSecret = mkOption { type = types.str; + default = if config.services.minio.enable then config.services.minio.secretKey else null; description = '' The calue of the Minio access secret. It is required in order to connect to the server. + By default this uses the one from the local minio server if enabled. ''; }; From 2ab99df2af45d6b694b8e9bd2f8eddac5ca6d357 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 8 Oct 2017 15:56:28 +0200 Subject: [PATCH 0867/2806] lambda-mod-zsh-theme: 2017-07-05 -> 2017-10-08 --- pkgs/shells/lambda-mod-zsh-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix index 8f50448b714..bef8915dd64 100644 --- a/pkgs/shells/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "lambda-mod-zsh-theme-unstable-2017-07-05"; + name = "lambda-mod-zsh-theme-unstable-2017-10-08"; src = fetchFromGitHub { owner = "halfo"; repo = "lambda-mod-zsh-theme"; - sha256 = "03kdhifxsnfbly6hqpr1h6kf52kyhdbh82nvwkkyrz1lw2cxl89n"; - rev = "ba7d5fea16db91fc8de887e69250f4e501b1e36d"; + sha256 = "13yis07zyr192s0x2h04k5bm1yzbk5m3js83aa17xh5573w4b786"; + rev = "61c373c8aa5556d51522290b82ad44e7166bced1"; }; buildPhases = [ "unpackPhase" "installPhase" ]; From e7e4e0c3b6b01e905f7411b793d5909720a93cf9 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 8 Oct 2017 15:05:25 +0100 Subject: [PATCH 0868/2806] nixos/prometheus-minio-exporter: only inherit keys from minio if set --- .../monitoring/prometheus/minio-exporter.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix index bc3967f8612..4314671523c 100644 --- a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix @@ -37,26 +37,30 @@ in { ''; }; - minioAccessKey = mkOption { + minioAccessKey = mkOption ({ type = types.str; example = "BKIKJAA5BMMU2RHO6IBB"; - default = if config.services.minio.enable then config.services.minio.accessKey else null; description = '' The value of the Minio access key. It is required in order to connect to the server. - By default this uses the one from the local minio server if enabled. + By default this uses the one from the local minio server if enabled + and config.services.minio.accessKey. ''; - }; + } // optionalAttrs (config.services.minio.enable && config.services.minio.accessKey != "") { + default = config.services.minio.accessKey; + }); - minioAccessSecret = mkOption { + minioAccessSecret = mkOption ({ type = types.str; - default = if config.services.minio.enable then config.services.minio.secretKey else null; description = '' The calue of the Minio access secret. It is required in order to connect to the server. - By default this uses the one from the local minio server if enabled. + By default this uses the one from the local minio server if enabled + and config.services.minio.secretKey. ''; - }; + } // optionalAttrs (config.services.minio.enable && config.services.minio.secretKey != "") { + default = config.services.minio.secretKey; + }); minioBucketStats = mkOption { type = types.bool; From d149c21e2e089ee73bdca9fa1b59b65a813044e5 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 8 Oct 2017 16:08:44 +0100 Subject: [PATCH 0869/2806] purple-hangouts: 2016-12-22 -> 2017-10-08 --- .../pidgin-plugins/purple-hangouts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index c4ec4b2614c..07cf66e572a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "purple-hangouts-hg-${version}"; - version = "2016-12-22"; + version = "2017-10-08"; src = fetchhg { url = "https://bitbucket.org/EionRobb/purple-hangouts/"; - rev = "754e3bb971cfe913b90c7fd028fe47a42f9e83cb"; - sha256 = "0b826hj5jgfdckzh9wyycxxhpyxhrhxm3n0mhaf3f57gqarriics"; + rev = "5e769791d282a6e5ae4d94dc66a1ff9d6904ec9c"; + sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1"; }; buildInputs = [ pidgin glib json_glib protobuf protobufc ]; From 07efaaa722a8bf288a89e7a2047a4df643927c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:20:26 +0200 Subject: [PATCH 0870/2806] xorg-server: security 1.19.3 -> 1.19.4 CVE-2017-{13721,13723} https://lists.x.org/archives/xorg-announce/2017-October/002808.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 12ba110acbf..786192f6a0a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2576,11 +2576,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.3"; + name = "xorg-server-1.19.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2; - sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2; + sha256 = "1a690fzv5l5ks45g9zhlzdskdq8q73mcbpb9a3wz3shxm778lxda"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 362ca3f2e7e..6cd4e082e8d 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 From 9f1b54b31b11ac97d2cfc960b772354f13601481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 17:54:49 +0200 Subject: [PATCH 0871/2806] tigervnc: fixup build after xorgserver changes The server itself doesn't need those build inputs anymore, but tigervnc does, apparently. --- pkgs/tools/admin/tigervnc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index bb585f6eb64..5ba53c75371 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -87,7 +87,8 @@ stdenv.mkDerivation rec { glproto mesa_glu ] ++ xorgserver.buildInputs; - nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs; + nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil ] + ++ xorg.xorgserver.nativeBuildInputs; propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; From 58efdfd50c9093d30d8d7b979123f730144c991c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:22:03 +0200 Subject: [PATCH 0872/2806] xorg.xkeyboard-config: 2.21 -> 2.22 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 12ba110acbf..7260ae01ba7 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2456,11 +2456,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.21"; + name = "xkeyboard-config-2.22"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2; - sha256 = "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2; + sha256 = "1garmbyfjp0han04l2l90zzwlfbdgdxl6r1qnic36i5wkycckbny"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 362ca3f2e7e..b5067ec1d81 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -177,7 +177,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 From 63a06627b866a56e2d6c12989cf82b872520c4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:26:07 +0200 Subject: [PATCH 0873/2806] libuv: 1.14.1 -> 1.15.0 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 50d588dad79..8dea502a4ff 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.14.1"; + version = "1.15.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1121qvnvpcabq1bl2k41jq8r2hn2x123csiaf7s9vrq66bbxgfdx"; + sha256 = "092hxqjvbb6d03h3msc38359w2kixba1ansyrsbyqq8iqiqwnkw0"; }; postPatch = let From 2aca029ed2341575d3eb8258cb301784c07aa7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:28:23 +0200 Subject: [PATCH 0874/2806] cmake: maintenance 3.9.2 -> 3.9.4 --- pkgs/development/tools/build-managers/cmake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 0cb9078aede..94428ecc174 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "3.9"; - minorVersion = "2"; + minorVersion = "4"; 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.2-SHA-256.txt - sha256 = "954a5801a456ee48e76f01107c9a4961677dd0f3e115275bbd18410dc22ba3c1"; + # from https://cmake.org/files/v3.9/cmake-3.9.4-SHA-256.txt + sha256 = "b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1"; }; prePatch = optionalString (!useSharedLibraries) '' From 6162149532bec65d617e85705bd2f681d357de54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:41:29 +0200 Subject: [PATCH 0875/2806] libpng: 1.6.31 -> 1.6.34 --- pkgs/development/libraries/libpng/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 94a9aa37ad9..c4a6a246b90 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -5,12 +5,12 @@ assert zlib != null; let - version = "1.6.31"; - patchVersion = "1.6.31"; - sha256 = "0hcbxv9qf4f9q7brrk0ndag526glr8lii43grssv45j9w0nn0ai3"; + version = "1.6.34"; + patchVersion = "1.6.34"; + sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - sha256 = "0f10ih658j514vpvsli0pk378vcmjn78g52cssyg92r4k1r19rla"; + sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6"; }; whenPatched = stdenv.lib.optionalString apngSupport; From 714a168052fe8db893818c5073417114429f9fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:45:24 +0200 Subject: [PATCH 0876/2806] glib: maintenance 2.54.0 -> 2.54.1 --- 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 39140eaf519..b82fd5f1e29 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 = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a"; + sha256 = "50c01b1419324f10fbf9b9709ec2164b18586968bdce7540583bf32302cf47a3"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch From 15a12f7edb8ba75932bd3b029904e94ab18d5481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:49:11 +0200 Subject: [PATCH 0877/2806] gkt3: maintenance 3.22.21 -> 3.22.24 --- pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index f5d75177963..1d0930d8d03 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.22"; - ver_min = "21"; + ver_min = "24"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "1bd3c1a85cfb4db112cabb5379abb05a1a94fe43052d309d573493fca00e6b87"; + sha256 = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b"; }; outputs = [ "out" "dev" ]; From 4b66f2f753203ce57c6f9e2e1eaaa5d394d87c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:54:46 +0200 Subject: [PATCH 0878/2806] dbus: 1.10.22 -> 1.10.24 --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 17a5c65376b..aa2af9a2ebc 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.10.22"; - sha256 = "15vv9gz5i4f5l7h0d045qz5iyvl89hjk2k83lb4vbizd7qg41cg2"; + version = "1.10.24"; + sha256 = "06ydmrg76l1kwl3190d72zpiy3qxy248x6gskxbj9qiqfsr4w63i"; self = stdenv.mkDerivation { name = "dbus-${version}"; From 85b77d946e69bd5cedcedc4935e336f4cbc4e556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 12:09:11 +0200 Subject: [PATCH 0879/2806] mesa: use llvm_5 by default --- 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 9e8fc79710a..734552a93ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9805,8 +9805,8 @@ with pkgs; # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM - # llvm-4.0.0 won't pass tests on aarch64 - llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_4; + # llvm-4.0.0 and 5.0.0 won't pass tests on aarch64 + llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_5; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); From d32f7f4bb3b6a80fa79f097881b92bcebf702478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 12:56:59 +0200 Subject: [PATCH 0880/2806] icu: switch default 58 -> 59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 734552a93ff..f9183ad14a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8648,7 +8648,7 @@ with pkgs; icu58 = callPackage ../development/libraries/icu/58.nix { }; icu59 = callPackage ../development/libraries/icu/59.nix { }; - icu = icu58; + icu = icu59; id3lib = callPackage ../development/libraries/id3lib { }; From c643759d414b7ca3f33f25eeb34c986c3ec8c6c7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 8 Oct 2017 12:49:58 -0400 Subject: [PATCH 0881/2806] kbfs: Add package in module --- nixos/modules/services/network-filesystems/kbfs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixos/modules/services/network-filesystems/kbfs.nix index 8b972ba971e..7b2eea3b585 100644 --- a/nixos/modules/services/network-filesystems/kbfs.nix +++ b/nixos/modules/services/network-filesystems/kbfs.nix @@ -59,5 +59,7 @@ in { }; services.keybase.enable = true; + + environment.systemPackages = [ pkgs.kbfs ]; }; } From e50fdb1c038e4f86504e6a3bb08f646653cdeefe Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sun, 8 Oct 2017 18:53:28 +0200 Subject: [PATCH 0882/2806] devtodo: adjust platforms devtodo: adjust platforms unicode: adjust platforms --- pkgs/development/tools/devtodo/default.nix | 2 +- pkgs/tools/misc/unicode/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix index 36c489b1171..a0b0ee571d9 100644 --- a/pkgs/development/tools/devtodo/default.nix +++ b/pkgs/development/tools/devtodo/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "A hierarchical command-line task manager"; license = licenses.gpl2; maintainers = [ maintainers.woffs ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index d2a4ed39e9a..58f5e54fc3a 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -26,5 +26,6 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/garabik/unicode; license = licenses.gpl3; maintainers = [ maintainers.woffs ]; + platforms = platforms.all; }; } From d49df8e7957af52a897486a0f60b9fdfe958f34f Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 8 Oct 2017 19:10:56 +0200 Subject: [PATCH 0883/2806] kanif: remove unused attribute `propagateBuildInputs` (missing d) --- pkgs/applications/networking/cluster/kanif/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix index bac0cc37af3..5b543854473 100644 --- a/pkgs/applications/networking/cluster/kanif/default.nix +++ b/pkgs/applications/networking/cluster/kanif/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { version = "1.2.2"; name = "kanif-${version}"; - propagateBuildInputs = [ perl taktuk ]; - src = fetchurl { url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz"; sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879"; From a5d820beb16369313da264b8441014a297735e1d Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 8 Oct 2017 19:12:32 +0200 Subject: [PATCH 0884/2806] irods: remove unused attribute `propagateBuildInputs` (missing d) --- pkgs/tools/filesystems/irods/common.nix | 2 -- pkgs/tools/filesystems/irods/default.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 9c5412ddef7..c7267aca107 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -9,8 +9,6 @@ with stdenv; buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which ]; - propagateBuildInputs = [ boost ]; - cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" "-DIRODS_EXTERNALS_FULLPATH_CLANG_RUNTIME=${stdenv.cc}" diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 0714f290104..523028f5fb2 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -62,8 +62,6 @@ in rec { buildInputs = common.buildInputs ++ [ irods ]; - propagateBuildInputs = [ boost ]; - preConfigure = common.preConfigure + '' patchShebangs ./bin ''; From 76cec2dfa62a29193abf36a3d623b19ef5a22b61 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Oct 2017 20:53:13 +0200 Subject: [PATCH 0885/2806] fbterm: fix build --- pkgs/os-specific/linux/fbterm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index e7a540b6671..918527aa318 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -9,7 +9,6 @@ let url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [gpm freetype fontconfig ncurses libx86]; in stdenv.mkDerivation { @@ -17,7 +16,10 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + + nativeBuildInputs = [ pkgconfig ]; inherit buildInputs; + preConfigure = '' sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\ From 680d344185a9a0f2d584fbc85c48cb060782abda Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 8 Oct 2017 19:58:11 +0100 Subject: [PATCH 0886/2806] newsbeuter-dev: remove --- .../networking/feedreaders/newsbeuter/dev.nix | 45 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 47 deletions(-) delete mode 100644 pkgs/applications/networking/feedreaders/newsbeuter/dev.nix diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix deleted file mode 100644 index 93865eb1875..00000000000 --- a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchgit, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses -, gettext, libiconv, makeWrapper, perl }: - -stdenv.mkDerivation rec { - name = "newsbeuter-dev-20140309"; - - src = fetchgit { - url = "https://github.com/akrennmair/newsbeuter.git"; - rev = "1427bdb0705806368db39576a9b803df82fa0415"; - sha256 = "1g47b8pxkz84r5m3avkjb7p2i88crcrp9gxwhq7xdfywrgg9pgnd"; - }; - - buildInputs - # use gettext instead of libintlOrEmpty so we have access to the msgfmt - # command - = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl libiconv ] - ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; - - preBuild = '' - sed -i -e 110,114d config.sh - sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl - export LDFLAGS=-lncursesw - ''; - - NIX_CFLAGS_COMPILE = - "-I${libxml2.dev}/include/libxml2 -I${json-c-0-11}/include/json-c"; - - NIX_LDFLAGS = "-lsqlite3 -lcurl -lxml2 -lstfl -ljson"; - - installPhase = '' - DESTDIR=$out prefix=\"\" make install - '' + stdenv.lib.optionalString stdenv.isDarwin '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" - done - ''; - - meta = with stdenv.lib; { - homepage = http://www.newsbeuter.org; - description = "An open-source RSS/Atom feed reader for text terminals"; - maintainers = with maintainers; [ lovek323 ]; - license = licenses.mit; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8582966e81d..877272ab584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3513,8 +3513,6 @@ with pkgs; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; - newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { }; - nextcloud = callPackage ../servers/nextcloud { }; nextcloud-client = libsForQt56.callPackage ../applications/networking/nextcloud-client { }; From b426c85ce2f12b81b923bf8d0539d15a41b3a341 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 6 Oct 2017 01:26:19 -0400 Subject: [PATCH 0887/2806] Get rid of most @rpath nonsense on Darwin This requires some small changes in the stdenv, then working around the weird choice LLVM made to hardcode @rpath in its install name, and then lets us remove a ton of annoying workaround hacks in many of our Go packages. With any luck this will mean less hackery going forward. --- pkgs/applications/altcoins/go-ethereum.nix | 8 -------- .../applications/networking/syncthing/inotify.nix | 2 -- .../version-management/gogs/default.nix | 4 +--- pkgs/build-support/cc-wrapper/ld-wrapper.sh | 8 +++++--- pkgs/development/compilers/llvm/3.5/llvm.nix | 6 ++++++ pkgs/development/compilers/llvm/3.8/llvm.nix | 7 +++++-- pkgs/development/compilers/llvm/3.9/llvm.nix | 6 ++++-- pkgs/development/compilers/llvm/4/llvm.nix | 6 ++++-- pkgs/development/compilers/llvm/5/llvm.nix | 6 ++++-- .../continuous-integration/drone/default.nix | 4 ---- pkgs/development/tools/textql/default.nix | 4 ---- .../apple-source-releases/Libsystem/default.nix | 1 - pkgs/servers/consul/default.nix | 4 ---- pkgs/servers/dgraph/default.nix | 8 -------- .../monitoring/prometheus/node-exporter.nix | 4 ---- pkgs/shells/elvish/default.nix | 4 ---- pkgs/stdenv/generic/default.nix | 15 ++++++++++++++- pkgs/tools/filesystems/go-mtpfs/default.nix | 4 ---- pkgs/tools/misc/direnv/default.nix | 2 -- pkgs/tools/networking/assh/default.nix | 4 +--- pkgs/tools/security/keybase/default.nix | 4 ---- pkgs/tools/security/sudolikeaboss/default.nix | 4 ---- pkgs/tools/text/sift/default.nix | 4 ---- 23 files changed, 44 insertions(+), 75 deletions(-) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 279e767173a..0fe04d7b32a 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -19,14 +19,6 @@ buildGoPackage rec { sha256 = "1rhqnqp2d951d4084z7dc07q0my4wd5401968a0nqj030a9vgng2"; }; - # Fix cyclic referencing on Darwin - postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' - for file in $bin/bin/*; do - # Not all files are referencing $out/lib so consider this step non-critical - install_name_tool -delete_rpath $out/lib $file || true - done - ''; - meta = with stdenv.lib; { homepage = https://ethereum.github.io/go-ethereum/; description = "Official golang implementation of the Ethereum protocol"; diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index c83d9a2fcd0..e33501a1715 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -25,8 +25,6 @@ buildGoPackage rec { substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ $bin/lib/systemd/user/syncthing-inotify.service \ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify - '' + stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 1522f348ca1..a86a7f96e09 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -29,9 +29,7 @@ buildGoPackage rec { outputs = [ "bin" "out" "data" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/gogs - '' + '' + postInstall = '' mkdir $data cp -R $src/{public,templates} $data diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index bbab3c43d6f..232e1245af0 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -171,11 +171,13 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then done done - if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then - extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH) - fi fi +# This is outside the DONT_SET_RPATH branch because it's more targeted and we +# usually want it (on Darwin) even if DONT_SET_RPATH is set. +if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then + extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH) +fi # Only add --build-id if this is a final link. FIXME: should build gcc # with --enable-linker-build-id instead? diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 0be3af192b4..94f39183345 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -33,6 +33,12 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses zlib ]; + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \ + --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 558bdcc5ce6..f8b8948e749 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -44,7 +44,11 @@ in stdenv.mkDerivation rec { # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + + substituteInPlace CMakeLists.txt \ + --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \ + --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" ''; # hacky fix: created binaries need to be run before installation @@ -75,7 +79,6 @@ in stdenv.mkDerivation rec { ''; postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' - install_name_tool -id $out/lib/libLLVM.dylib $out/lib/libLLVM.dylib ln -s $out/lib/libLLVM.dylib $out/lib/libLLVM-${version}.dylib ''; diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 5f90e508c5e..809c49ac24a 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -82,6 +82,10 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + + substituteInPlace CMakeLists.txt \ + --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$lib/lib")" \ + --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + stdenv.lib.optionalString (enableSharedLibraries) '' @@ -130,8 +134,6 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" - install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib - install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${version}.dylib ''; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 20ab9b44b65..e90603ffefa 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -58,6 +58,10 @@ in stdenv.mkDerivation rec { postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \ + --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + stdenv.lib.optionalString (enableSharedLibraries) '' @@ -121,8 +125,6 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" - install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib - install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 946c04a2ab4..011eab5678c 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -58,6 +58,10 @@ in stdenv.mkDerivation rec { postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \ + --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + stdenv.lib.optionalString (enableSharedLibraries) '' @@ -129,8 +133,6 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" - install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib - install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 0d9d19c8b93..ed6c7f4fefb 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -53,10 +53,6 @@ buildGoPackage rec { go generate github.com/drone/drone/store/datastore/ddl ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/drone - ''; - src = fetchFromGitHub { owner = "drone"; repo = "drone"; diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index bd1dbb3f90a..eb626d0aa58 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -16,10 +16,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/textql - ''; - meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; homepage = https://github.com/dinedal/textql; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index caef875ac13..3d7e59f1554 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -113,7 +113,6 @@ appleDerivation rec { install_name_tool \ -id $out/lib/libresolv.9.dylib \ -change "$resolv_libSystem" $out/lib/libSystem.dylib \ - -delete_rpath ${libresolv}/lib \ $out/lib/libresolv.9.dylib ln -s libresolv.9.dylib $out/lib/libresolv.dylib ''; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 728e7034a19..d2ad5d0bd8e 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -21,10 +21,6 @@ buildGoPackage rec { buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") ''; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/consul - ''; - meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; homepage = https://www.consul.io/; diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 06aef0babd3..5056df06e59 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -31,14 +31,6 @@ buildGoPackage rec { -X github.com/dgraph-io/dgraph/cmd/dgraph/main.uiDir=$dashboard/src/assets/" ''; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - # Somehow on Darwin, $out/lib (which doesn't exist) ends up in RPATH. - # Removing it fixes cycle between $out and $bin - install_name_tool -delete_rpath $out/lib $bin/bin/dgraph - install_name_tool -delete_rpath $out/lib $bin/bin/dgraphloader - install_name_tool -delete_rpath $out/lib $bin/bin/bulkloader - ''; - meta = { homepage = "https://dgraph.io/"; description = "Fast, Distributed Graph DB"; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 611543ee87e..2d2fb26324c 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -14,10 +14,6 @@ buildGoPackage rec { sha256 = "0rm43jjqv7crfahl973swi4warqmqnmv740cg800yvzvnlp37kl4"; }; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/node_exporter - ''; - # FIXME: megacli test fails doCheck = false; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 8a7d4971012..a598d57808c 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -4,10 +4,6 @@ buildGoPackage rec { name = "elvish-${version}"; version = "0.10"; - postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' - install_name_tool -delete_rpath $out/lib $bin/bin/elvish - ''; - goPackagePath = "github.com/elves/elvish"; src = fetchFromGitHub { diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 31de28fdc0c..d5885193b9b 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -81,7 +81,20 @@ let setup = setupScript; - inherit preHook initialPath shell + # We pretty much never need rpaths on Darwin, since all library path references + # are absolute unless we go out of our way to make them relative (like with CF) + # TODO: This really wants to be in stdenv/darwin but we don't have hostPlatform + # there (yet?) so it goes here until then. + preHook = preHook+ lib.optionalString buildPlatform.isDarwin '' + export NIX_BUILD_DONT_SET_RPATH=1 + '' + lib.optionalString hostPlatform.isDarwin '' + export NIX_DONT_SET_RPATH=1 + export NIX_NO_SELF_RPATH=1 + '' + lib.optionalString targetPlatform.isDarwin '' + export NIX_TARGET_DONT_SET_RPATH=1 + ''; + + inherit initialPath shell defaultNativeBuildInputs defaultBuildInputs; } // lib.optionalAttrs buildPlatform.isDarwin { diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index f46dd74b266..028aef6024b 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -16,9 +16,5 @@ buildGoPackage rec { sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm"; }; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath "$out/lib" $bin/bin/go-mtpfs - ''; - goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 1606fffe397..c5ea14459e2 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -25,8 +25,6 @@ buildGoPackage rec { make install DESTDIR=$bin mkdir -p $bin/share/fish/vendor_conf.d echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish - '' + stdenv.lib.optionalString (stdenv.isDarwin) '' - install_name_tool -delete_rpath $out/lib $bin/bin/direnv ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 1de87e07e04..e3a147b20b1 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -9,9 +9,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; - postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' - install_name_tool -delete_rpath $out/lib $bin/bin/assh - '' + '' + postInstall = '' wrapProgram "$bin/bin/assh" \ --prefix PATH : ${openssh}/bin ''; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 049867afcd7..7f095a3225b 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -16,10 +16,6 @@ buildGoPackage rec { sha256 = "1zgvriyir2ga0p4ah9ia1sbl9ydnrnw5ggq4c1ya8gcfgn8vzdsf"; }; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/keybase - ''; - buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index 066fef39a82..15f76741589 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -22,10 +22,6 @@ buildGoPackage rec { fixDarwinDylibNames ]; - postInstall = '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/sudolikeaboss - ''; - meta = with stdenv.lib; { inherit version; inherit (src.meta) homepage; diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index 1e688942a49..fd4cef27ba1 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -16,10 +16,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/sift - ''; - meta = with lib; { description = "sift is a fast and powerful alternative to grep"; homepage = https://sift-tool.org; From 2d903b8da2f2a316fb71eec5b24dfce83880a665 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Wed, 27 Sep 2017 13:30:29 +0000 Subject: [PATCH 0888/2806] firefox: add Kerberos support --- .../networking/browsers/firefox-bin/default.nix | 3 +++ pkgs/applications/networking/browsers/firefox/common.nix | 6 +++++- pkgs/applications/networking/browsers/firefox/packages.nix | 1 + pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index f59cb402720..31bc01ea14a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -16,6 +16,7 @@ , gstreamer , gtk2 , gtk3 +, kerberos , libX11 , libXScrnSaver , libxcb @@ -100,6 +101,7 @@ stdenv.mkDerivation { gstreamer gtk2 gtk3 + kerberos libX11 libXScrnSaver libXcomposite @@ -168,6 +170,7 @@ stdenv.mkDerivation { ''; passthru.ffmpegSupport = true; + passthru.gssSupport = true; passthru.updateScript = import ./update.nix { inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; baseUrl = diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1b72f9e18c3..cc7927fdc54 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -19,6 +19,7 @@ , pulseaudioSupport ? true, libpulseaudio , ffmpegSupport ? true, gstreamer, gst-plugins-base , gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook +, gssSupport ? true, kerberos ## privacy-related options @@ -72,7 +73,8 @@ stdenv.mkDerivation (rec { ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] - ++ lib.optional gtk3Support gtk3; + ++ lib.optional gtk3Support gtk3 + ++ lib.optional gssSupport kerberos; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; @@ -155,6 +157,7 @@ stdenv.mkDerivation (rec { ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" ++ flag ffmpegSupport "ffmpeg" + ++ flag gssSupport "negotiateauth" ++ lib.optional (!ffmpegSupport) "--disable-gstreamer" ++ flag webrtcSupport "webrtc" ++ flag geolocationSupport "mozril-geoloc" @@ -219,6 +222,7 @@ stdenv.mkDerivation (rec { gtk = gtk2; inherit nspr; inherit ffmpegSupport; + inherit gssSupport; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; } // overrides) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4b332214041..d9c55bb8768 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -113,6 +113,7 @@ in rec { } // commonAttrs) { stdenv = overrideCC stdenv gcc5; ffmpegSupport = false; + gssSupport = false; }; tor-browser-7-0 = common (rec { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 2413f1cfdca..7a7d1368cb2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -9,6 +9,7 @@ , esteidfirefoxplugin , vlc_npapi , libudev +, kerberos }: ## configurability of the wrapper itself @@ -25,6 +26,7 @@ let cfg = stdenv.lib.attrByPath [ browserName ] {} config; enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; + gssSupport = browser.gssSupport or false; jre = cfg.jre or false; icedtea = cfg.icedtea or false; @@ -46,6 +48,7 @@ let ++ lib.optional (cfg.enableVLC or false) vlc_npapi ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) + ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash From d66a3404a62629f91cd25fd696ea92b18328fc95 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Oct 2017 23:31:01 +0200 Subject: [PATCH 0889/2806] xmlsec: fix build (re: nss update) --- pkgs/development/libraries/xmlsec/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 32ce856eddd..264a377cb25 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909 NIX_LDFLAGS = [ "-lgcrypt" ]; + NIX_CFLAGS_COMPILE = [ "-I${nss.dev}/include/nss" ]; postInstall = '' moveToOutput "bin/xmlsec1-config" "$dev" From 4817454366dac6894106d81f832bcd6c24de1d98 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 9 Oct 2017 11:46:32 +0800 Subject: [PATCH 0890/2806] wireguard: wg-quick systemd unit was referencing /usr/bin --- pkgs/os-specific/linux/wireguard/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 5391a699b92..c8500d89d04 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -47,6 +47,8 @@ let buildInputs = [ libmnl ]; + enableParallelBuilding = true; + makeFlags = [ "WITH_BASHCOMPLETION=yes" "WITH_WGQUICK=yes" @@ -57,6 +59,11 @@ let ]; buildPhase = "make tools"; + + postInstall = '' + substituteInPlace $out/lib/systemd/system/wg-quick@.service \ + --replace /usr/bin $out/bin + ''; }; in if kernel == null From 2870979a5340060dab29db0d2a3ee7a3524f1fb1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 8 Oct 2017 17:29:41 +0000 Subject: [PATCH 0891/2806] ocamlPackages.ounit: fix for OCaml 4.06 --- pkgs/development/ocaml-modules/ounit/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 7179b8408a0..533a41cc435 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ounit-2.0.0"; @@ -8,7 +8,13 @@ stdenv.mkDerivation { sha256 = "118xsadrx84pif9vaq13hv4yh22w9kmr0ypvhrs0viir1jr0ajjd"; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + patches = with stdenv.lib; + optional (versionAtLeast ocaml.version "4.02") (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ounit/ounit.2.0.0/files/safe-string.patch"; + sha256 = "0hbd2sqdz75lv5ax82yhsfdk1dlcvq12xpys6n85ysmrl0c3d3lk"; + }); + + buildInputs = [ ocaml findlib ocamlbuild ]; dontAddPrefix = true; From 701316450cc044d5294add2ed25f876b7a891420 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 8 Oct 2017 19:14:49 +0000 Subject: [PATCH 0892/2806] ocamlPackages.oasis: remove unneeded dependencies --- pkgs/development/tools/ocaml/oasis/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 6ff5ee72666..2364058729e 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 -, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect -}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: stdenv.mkDerivation rec { version = "0.4.10"; @@ -17,11 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ - ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4 + ocaml findlib ocamlbuild ocamlmod ocamlify ]; - propagatedBuildInputs = [ ocaml_data_notation ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; From 28cd0f240a0fc73e579899adb9a6296adf3bd761 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Oct 2017 07:09:09 +0000 Subject: [PATCH 0893/2806] ocamlPackages.ppx_ast: 0.9.0 -> 0.9.{1,2} --- .../ocaml-modules/janestreet/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 8fc1ddf9063..4aabb976ee1 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -27,12 +27,19 @@ rec { meta.description = "OCaml compiler libraries repackaged"; }; - ppx_ast = janePackage { + ppx_ast = janePackage ({ name = "ppx_ast"; - hash = "0p9v4q3cjz8wwdrh6bjidani2npzvhdy8isnqwigqkl6n326dba9"; propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ]; meta.description = "OCaml AST used by Jane Street ppx rewriters"; - }; + } // (if lib.versionAtLeast ocaml.version "4.06" + then { + version = "0.9.2"; + hash = "1h4qf26rg23z21rrw83fakiavw9km7174p3830pg0gg4bwakvba0"; + } else { + version = "0.9.1"; + hash = "0a9rxwavy2748k0yd4db3hg1ypq7mpqnwq9si5a5qdiclgkhcggw"; + } + )); ppx_traverse_builtins = janePackage { name = "ppx_traverse_builtins"; From 173d8db077ad150564de33a2f9576bbe0599316d Mon Sep 17 00:00:00 2001 From: Stefan Lau Date: Sat, 7 Oct 2017 11:54:23 +0200 Subject: [PATCH 0894/2806] selenium-server-standalone: 2.53.0 -> 3.6.0 --- .../tools/selenium/htmlunit-driver/default.nix | 6 +++--- .../tools/selenium/selendroid/default.nix | 2 +- pkgs/development/tools/selenium/server/default.nix | 12 +++++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index 2fc38db1bb0..03c3c23c755 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "htmlunit-driver-standalone-${version}"; - version = "2.21"; + version = "2.27"; src = fetchurl { - url = "https://github.com/SeleniumHQ/htmlunit-driver/releases/download/${version}/htmlunit-driver-standalone-${version}.jar"; - sha256 = "1wrbam0hb036717z3y73lsw4pwp5sdiw2i1818kg9pvc7i3fb3yn"; + url = "https://github.com/SeleniumHQ/htmlunit-driver/releases/download/${version}/htmlunit-driver-${version}-with-dependencies.jar"; + sha256 = "1sd3cwpamcbq9pv0mvcm8x6minqrlb4i0r12q3jg91girqswm2dp"; }; unpackPhase = "true"; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index 6604bc5648d..c2277214951 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ --add-flags "-Dfile.encoding=UTF-8" \ --add-flags "-cp \"$out/share/lib/selendroid/${name}.jar:${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar\"" \ - --add-flags "org.openqa.grid.selenium.GridLauncher" + --add-flags "org.openqa.grid.selenium.GridLauncherV3" ''; meta = { diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index ca225adab6d..4d506c900ec 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -4,17 +4,19 @@ with stdenv.lib; let + minorVersion = "3.6"; + patchVersion = "0"; arch = if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.system == "i686-linux" then "i386" else ""; in stdenv.mkDerivation rec { name = "selenium-server-standalone-${version}"; - version = "2.53.0"; + version = "${minorVersion}.${patchVersion}"; src = fetchurl { - url = "http://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-${version}.jar"; - sha256 = "0dp0n5chl1frjy9pcyjvpcdgv1f4dkslh2bpydpxwc5isfzqrf37"; + url = "http://selenium-release.storage.googleapis.com/${minorVersion}/selenium-server-standalone-${version}.jar"; + sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772"; }; unpackPhase = "true"; @@ -25,9 +27,9 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/lib/${name} cp $src $out/share/lib/${name}/${name}.jar makeWrapper ${jre}/bin/java $out/bin/selenium-server \ - --add-flags "-cp ${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar:$out/share/lib/${name}/${name}.jar" \ + --add-flags "-cp $out/share/lib/${name}/${name}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ - --add-flags "org.openqa.grid.selenium.GridLauncher" + --add-flags "org.openqa.grid.selenium.GridLauncherV3" ''; meta = { From 4b25ecc7b8142155728422cbab4a68592e63f35d Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 9 Oct 2017 20:37:02 +1100 Subject: [PATCH 0895/2806] CONTRIBUTING.md: license should default to unfree if there is no upstream license --- .github/CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 99c5e0e429b..41e85bd5ac4 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -36,6 +36,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. * Not start with the package name. * Not have a period at the end. * `meta.license` must be set and fit the upstream license. + * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`. * `meta.maintainers` must be set. See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). From 2ef1a6c17cb95065f9ca21d33c8ec01fa8793f13 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 9 Oct 2017 10:55:55 +0100 Subject: [PATCH 0896/2806] zoom-us: 2.0.98253.0707 -> 2.0.106600.0904 --- .../networking/instant-messengers/zoom-us/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 91c77fc9d7c..b6a4e7944d3 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -4,11 +4,11 @@ let - version = "2.0.98253.0707"; + version = "2.0.106600.0904"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1znw7459pzfl2jzmj9akfwq3z10sndfb1swdr1p3rrjpiwqh3p7r"; + sha256 = "1dcr0rqgjingjqbqv37hqjhhwy8axnjyirrnmjk44b5xnh239w9s"; }; }; @@ -53,6 +53,7 @@ in stdenv.mkDerivation { xorg.libXrender xorg.libXcomposite xorg.libXScrnSaver + xorg.libXrandr stdenv.cc.cc ]; From 2c4b6e6e9a31332716f6a707721c10c7ce468e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 9 Oct 2017 12:07:11 +0200 Subject: [PATCH 0897/2806] ttwatch: 2017-04-20 -> 2017-09-26 --- pkgs/tools/misc/ttwatch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index 855baa83060..2924da5f89a 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ttwatch-${version}"; - version = "2017-04-20"; + version = "2017-09-26"; src = fetchFromGitHub { owner = "ryanbinns"; repo = "ttwatch"; - rev = "f07a12712ed331f1530db3846828641eb0e2f5c5"; - sha256 = "0y27bldmp6w02pjhr2cmy9g6n23vi0q26pil3rd7vbg4qjahxz27"; + rev = "31fb7ca6ac992d131a3f5ea6acf49f0c52a128c5"; + sha256 = "1sxjx593jqbq45jn2dkjz07zq9kkgsbcj971phimlm6dj6g75wxq"; }; nativeBuildInputs = [ cmake perl ]; From e34e28e573568a0cad99d3e6aec3f78408d9cdbc Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 9 Oct 2017 11:35:06 +0100 Subject: [PATCH 0898/2806] nixos/fcron: service needs fcron in PATH otherwise fcronsighup is not found. Set PATH to /run/current-system/sw/bin does not seems to be used by service file anyway. --- nixos/modules/services/scheduling/fcron.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index af4f9f41fd0..8b87f72811a 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -137,10 +137,7 @@ in after = [ "local-fs.target" ]; wantedBy = [ "multi-user.target" ]; - # FIXME use specific path - environment = { - PATH = "/run/current-system/sw/bin"; - }; + path = [ pkgs.fcron ]; preStart = '' install \ From 9ca1b5668357a26ca297f2cb8179adc183ae6e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= Date: Mon, 9 Oct 2017 12:47:59 +0200 Subject: [PATCH 0899/2806] pr template: make values of platform field less ambiguous --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 280c9807e58..75db8e1377c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,7 +9,7 @@ - Built on platform(s) - [ ] NixOS - [ ] macOS - - [ ] Linux + - [ ] other Linux distributions - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"` - [ ] Tested execution of all binary files (usually in `./result/bin/`) From f6858e55c2e9fd4e7dfb127bf3595ab7cfe79d15 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 9 Oct 2017 07:44:32 -0400 Subject: [PATCH 0900/2806] Reserve uid/gids for kanboard --- nixos/modules/misc/ids.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 508a76d3cab..cb75845baaf 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -296,6 +296,7 @@ clickhouse = 278; rslsync = 279; minio = 280; + kanboard = 281; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -561,6 +562,7 @@ clickhouse = 278; rslsync = 279; minio = 280; + kanboard = 281; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal From a1dfb1916a3aa022b89ab8974f0d322cfa0e2314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 9 Oct 2017 14:42:29 +0200 Subject: [PATCH 0901/2806] haskellPackages.double-conversion: remove upstreamed patch https://github.com/bos/double-conversion/commit/81d53e299f8569249387ecfc949a69ff55ecfe48 --- pkgs/development/haskell-modules/configuration-common.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 10440572597..7e8e152b21d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -212,12 +212,7 @@ self: super: { double-conversion = if !pkgs.stdenv.isDarwin then super.double-conversion - else addExtraLibrary (overrideCabal super.double-conversion (drv: - { - postPatch = '' - substituteInPlace double-conversion.cabal --replace stdc++ c++ - ''; - })) pkgs.libcxx; + else addExtraLibrary super.double-conversion pkgs.libcxx; inline-c-cpp = if !pkgs.stdenv.isDarwin then super.inline-c-cpp From 89c15a04c17db3356f73cd0c76f3bfa962e48451 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Mon, 9 Oct 2017 15:08:47 +0200 Subject: [PATCH 0902/2806] ponyc: 0.19.2 -> 0.19.3 https://github.com/ponylang/ponyc/issues/2265 --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 19ebd522a4f..63c1d97006f 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "04vbhkkgpjh19pv2bq4b60lgnk5ck8axqs6fgw4l44j3lvxwlwrh"; + sha256 = "0aishczaasp877z1a17iq0vk6pp369bv7yz5mvinr7wm44930qr3"; }; buildInputs = [ llvm makeWrapper which ]; From 1439972bfb120ad7d9f2661f12b9e6675dcab123 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 9 Oct 2017 14:42:50 +0100 Subject: [PATCH 0903/2806] wireguard: 0.0.20171001 -> 0.0.20171005 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index c8500d89d04..3c35bb372a2 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20171001"; + version = "0.0.20171005"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "ecff9a184685b7dd2d81576eba5bd96bb59031c9e9b5eeee05d6dc298f30998e"; + sha256 = "026n0a7fln5w8s7lsxdn4fgzqxdwhqnnnfhczn36j3sipdy3nal3"; }; meta = with stdenv.lib; { From f9672ea36d68aac03d4b9b37f98d11536a410b13 Mon Sep 17 00:00:00 2001 From: Stefan Lau Date: Mon, 9 Oct 2017 15:47:38 +0200 Subject: [PATCH 0904/2806] chromedriver: 2.31 -> 2.33 --- pkgs/development/tools/selenium/chromedriver/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 8912f52ba60..61f5f93ebfa 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,17 +6,17 @@ let allSpecs = { "i686-linux" = { system = "linux32"; - sha256 = "1qi49rcm7r4b8yqx4akmirilp4ifip89n7inji0pihdqzaw604d4"; + sha256 = "13fngjg2v0l3vhlmjnffy785ckgk2kbpm7307li75vinkcly91cj"; }; "x86_64-linux" = { system = "linux64"; - sha256 = "1845nh7kj8scgn85yqwp4nsx7fabcb09w23jp8xa1cxyfvv2wdry"; + sha256 = "0x5vnmnw6mws6iw9s0kcm4crx9gfgy0vjjpk1v0wk7jpn6d0bl47"; }; "x86_64-darwin" = { system = "mac64"; - sha256 = "0zyv8i4dbzyk58g4hr5143akgsfaaq9659bwj1m41jwi965grcxa"; + sha256 = "09y8ijj75q5a7snzchxinxfq2ad2sw0f30zi0p3hqf1n88y28jq6"; }; }; @@ -33,7 +33,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.31"; + version = "2.33"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; From d9b9e157aa1a54dae27dac4062c0dd3e14e3ad0d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 9 Oct 2017 23:01:23 +0800 Subject: [PATCH 0905/2806] calibre: 3.7.0 -> 3.9.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 cd9a7172921..6569c892057 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.7.0"; + version = "3.9.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1wb0ixx11q0p5dzcszq1n2lx9bcl5dynr87d7anfiz73mxdq20za"; + sha256 = "0zsf1czw8bz41nk9f55vxwncf0chxdflyhjj2khw9da67ph6yknx"; }; patches = [ From a02e53a63ed3fe24d9fe249e050ea86be79d8391 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Oct 2017 14:04:42 +0200 Subject: [PATCH 0906/2806] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.6-11-g74d58ee from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/07a0b181b629cd3f985cf564cb3bf98865266c6d. --- .../haskell-modules/hackage-packages.nix | 755 +++++++++++++----- 1 file changed, 575 insertions(+), 180 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5524dce42d9..0d8e4ebd375 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1437,6 +1437,7 @@ self: { homepage = "https://github.com/choener/BiobaseBlast"; description = "BLAST-related tools"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseDotP" = callPackage @@ -2633,6 +2634,7 @@ self: { homepage = "https://github.com/hvr/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Catana" = callPackage @@ -14761,14 +14763,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "QuickCheck_2_10_0_1" = callPackage + "QuickCheck_2_10_1" = callPackage ({ mkDerivation, base, containers, deepseq, random , template-haskell, tf-random, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.10.0.1"; - sha256 = "0bml00g26vyky6mhfhkzh0rsafcxfkrdvk1imvlb2l4mrli0bm80"; + version = "2.10.1"; + sha256 = "1rfmns3lj3hl93k1jws85ajkkw7z9ll8cw292n9m7zald1w5dfqx"; libraryHaskellDepends = [ base containers deepseq random template-haskell tf-random transformers @@ -25253,6 +25255,7 @@ self: { ]; description = "Generic Haskell AMQP Consumer"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-worker" = callPackage @@ -25439,6 +25442,7 @@ self: { homepage = "https://github.com/obsidiansystems/android-activity"; description = "Turn regular Haskell programs into Android Activities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "android-lint-summary" = callPackage @@ -26013,8 +26017,8 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.2.4.0"; - sha256 = "0jfwg96hkymzh3xqzk8hw0zwszxb4l159wl4kdqpf25wbqpz4qr2"; + version = "0.2.4.1"; + sha256 = "0dwa02n7s6gpywv8xcnf1mrzks6f1sd2bk5kafwnsm80lixcnzrn"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -28938,6 +28942,7 @@ self: { homepage = "https://github.com/athanclark/attoparsec-ip#readme"; description = "Parse IP data types with attoparsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-iso8601" = callPackage @@ -29098,6 +29103,7 @@ self: { homepage = "https://github.com/athanclark/attoparsec-uri#readme"; description = "URI parser / printer using attoparsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attosplit" = callPackage @@ -36797,7 +36803,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_26_1" = callPackage + "brick_0_27" = callPackage ({ mkDerivation, base, containers, contravariant, data-clist , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm , template-haskell, text, text-zipper, transformers, vector, vty @@ -36805,8 +36811,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.26.1"; - sha256 = "05jajgb0k1346gg4jc44d921x1bsjwxsaw0ibrf3icaq7x5m11rk"; + version = "0.27"; + sha256 = "0flpvs9rdkicwvd0pg5y8cf4grcq91xzrji9ygknms96fm3nhq4k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36962,9 +36968,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "bsd-sysctl"; - version = "1.0.7"; - sha256 = "18qs5s6sq6696w7y23fq6pd303j5bfh94lw86dz4z9hgdlmrx36y"; + version = "1.0.8.0"; + sha256 = "0wflh3ncd47j2v70m6lbdmaif974fimv3dd4wyj6krb03vq6lvpd"; libraryHaskellDepends = [ base ]; + homepage = "https://github.com:p-alik/bsd-sysctl"; description = "Access to the BSD sysctl(3) interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -43174,6 +43181,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cisco-spark-api" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bitset-word8, bytestring + , conduit-combinators, data-default, hspec, http-conduit + , http-types, network-uri, optparse-applicative, text + , thread-hierarchy, utf8-string, wai, warp + }: + mkDerivation { + pname = "cisco-spark-api"; + version = "0.1.0.0"; + sha256 = "0wiz580v04acjnc05mpx7nwgdz5gk6gsg84lv26p7qlij17038ds"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bitset-word8 bytestring conduit-combinators + data-default http-conduit network-uri text + ]; + executableHaskellDepends = [ + aeson base bytestring conduit-combinators data-default http-conduit + optparse-applicative text utf8-string + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring conduit-combinators data-default + hspec http-conduit http-types network-uri text thread-hierarchy wai + warp + ]; + homepage = "https://github.com/nshimaza/cisco-spark-api#readme"; + description = "A Haskell bindings for Cisco Spark API"; + license = stdenv.lib.licenses.mit; + }) {}; + "citation-resolve" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers , curl, data-default, directory, doctest, download-curl, either @@ -44639,14 +44676,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) glib; inherit (pkgs) mono;}; - "clr-host_0_2_0" = callPackage + "clr-host_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory , file-embed, filepath, glib, mono, text, transformers }: mkDerivation { pname = "clr-host"; - version = "0.2.0"; - sha256 = "0x40zbdzj6zkb3k41z1ncdphnny4wyxlbw9n734h4qdqw093vcvv"; + version = "0.2.0.1"; + sha256 = "15hfdwddqij5dhl8qbq89rsbjvxpymvph8wz2naxa8mrd09yl1jk"; setupHaskellDepends = [ base Cabal directory filepath transformers ]; @@ -44685,30 +44722,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clr-inline_0_2_0" = callPackage + "clr-inline_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive , clr-host, clr-marshal, containers, criterion, directory, extra - , filepath, here, hspec, lens, parsec, process, split + , filepath, here, hspec, lens, parsec, pipes, process, split , template-haskell, temporary, text, transformers }: mkDerivation { pname = "clr-inline"; - version = "0.2.0"; - sha256 = "0s9f2y5ykfsq3sw52mxmvwih946ah9gv48pqma8nql9k0xx905ww"; + version = "0.2.0.1"; + sha256 = "0zalf8mxdyak8kvannafyv4ckbqbnyrwnbz9z6v4qys1jqggiphh"; libraryHaskellDepends = [ base bytestring Cabal case-insensitive clr-host clr-marshal - containers directory extra filepath here lens parsec process split - template-haskell temporary text transformers + containers directory extra filepath here lens parsec pipes process + split template-haskell temporary text transformers ]; testHaskellDepends = [ base bytestring Cabal case-insensitive clr-host clr-marshal - containers directory extra filepath here hspec lens parsec process - split template-haskell temporary text transformers + containers directory extra filepath here hspec lens parsec pipes + process split template-haskell temporary text transformers ]; benchmarkHaskellDepends = [ base bytestring Cabal case-insensitive clr-host clr-marshal containers criterion directory extra filepath here lens parsec - process split template-haskell temporary text transformers + pipes process split template-haskell temporary text transformers ]; homepage = "https://gitlab.com/tim-m89/clr-haskell"; description = "Quasiquoters for inline C# and F#"; @@ -45864,16 +45901,17 @@ self: { "colorless" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, errors , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl - , random, scientific, text, tuple, unordered-containers, vector + , random, scientific, text, text-conversions, tuple + , unordered-containers, vector }: mkDerivation { pname = "colorless"; - version = "2.2.4"; - sha256 = "0w9mrdfnj0g1dis88zbpcfjwxl3n3m93k14rwvy4lwxpykafjvr5"; + version = "2.2.9"; + sha256 = "0xja34s5g14rqpn26sy8ijlxzlvwnjriz8c07ajqz82hpc8a1kh4"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async monad-control monad-logger mtl random scientific text - unordered-containers vector + text-conversions unordered-containers vector ]; testHaskellDepends = [ aeson base containers hspec scientific text tuple vector @@ -45882,6 +45920,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "colorless-http-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, colorless, http-client + , http-types, text-conversions + }: + mkDerivation { + pname = "colorless-http-client"; + version = "0.0.1"; + sha256 = "0ciwb559wr55d5vnllqm29dmfgqam1yg6l8zx1s858yy23zi5xl4"; + libraryHaskellDepends = [ + aeson base bytestring colorless http-client http-types + text-conversions + ]; + description = "Http Client addon for Colorless"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "colorless-scotty" = callPackage + ({ mkDerivation, aeson, base, colorless, mtl, scotty, text, wai }: + mkDerivation { + pname = "colorless-scotty"; + version = "0.0.1"; + sha256 = "0drw92gv8gr3927yg2siwnbz91s8gk3v244nydxy4y2bbwih8i2c"; + libraryHaskellDepends = [ + aeson base colorless mtl scotty text wai + ]; + description = "Scotty server add-on for Colorless"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "colors" = callPackage ({ mkDerivation, base, lens, linear, profunctors }: mkDerivation { @@ -46927,8 +46994,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "0.1.0.4"; - sha256 = "1246cp3b8rg923qd9nvar5h9ph2zlbgsxn08xl408fj0cp1l2l3p"; + version = "0.1.1.0"; + sha256 = "12lx5cy1bh6girs1cf88pbazwadwhnadvg5b6b8v4kx2h3yqbsa1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; description = "Higher-order function combinators"; @@ -50663,21 +50730,13 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, containers, enummapset, lattices, microlens - , microlens-ghc, microlens-mtl, mtl, QuickCheck, tasty - , tasty-quickcheck - }: + ({ mkDerivation, base, containers, mtl, tasty, tasty-quickcheck }: mkDerivation { pname = "crdt"; - version = "1.0"; - sha256 = "0s9naq4bakivgs9bqjrp9pli3yfj9ync69pif61q7jsb0gw8w9ny"; - libraryHaskellDepends = [ - base containers enummapset lattices microlens microlens-ghc - microlens-mtl mtl - ]; - testHaskellDepends = [ - base containers QuickCheck tasty tasty-quickcheck - ]; + version = "2.1"; + sha256 = "05dc1whgn7wr0p32i3j8346s09rs80kagfdc7gmc30jb29nsdn9s"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ base containers tasty tasty-quickcheck ]; homepage = "https://github.com/cblp/crdt#readme"; description = "Conflict-free replicated data types"; license = stdenv.lib.licenses.bsd3; @@ -50913,19 +50972,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_2_2_0" = callPackage + "criterion_1_2_3_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary , bytestring, cassava, code-page, containers, deepseq, directory , exceptions, filepath, Glob, HUnit, js-flot, js-jquery , microstache, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck - , text, time, transformers, transformers-compat, vector - , vector-algorithms + , QuickCheck, semigroups, statistics, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, transformers-compat + , vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.2.2.0"; - sha256 = "0cc95hp5l7srjs5471lpdvx9hihvvi5rabrqqpy6blnrhpf9jwfz"; + version = "1.2.3.0"; + sha256 = "0539rjhsvwnp8gnyv411vdgbrkddc4kqv3nwgsan9z2bkw0dk47h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -50933,8 +50992,8 @@ self: { aeson ansi-wl-pprint base base-compat binary bytestring cassava code-page containers deepseq directory exceptions filepath Glob js-flot js-jquery microstache mtl mwc-random optparse-applicative - parsec statistics text time transformers transformers-compat vector - vector-algorithms + parsec semigroups statistics text time transformers + transformers-compat vector vector-algorithms ]; executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ @@ -54042,14 +54101,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_0_9_0_1" = callPackage + "data-diverse_0_10_0_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "0.9.0.1"; - sha256 = "155zq4pn68wxw096i7w6k68rpaxhcyjqjhhc89yvky22nvv67yq4"; + version = "0.10.0.0"; + sha256 = "0y56xncg73w550wg6r6a1njm9ivx37h3jfzkjbzjkr5v6lv6gn1v"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54074,6 +54133,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-diverse-lens_0_3_0_0" = callPackage + ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: + mkDerivation { + pname = "data-diverse-lens"; + version = "0.3.0.0"; + sha256 = "0mkys1msxbphlf8814c5bkg8s82zl5a36vzyrqbfbv74668lq4q1"; + libraryHaskellDepends = [ base data-diverse lens tagged ]; + testHaskellDepends = [ base data-diverse hspec lens tagged ]; + homepage = "https://github.com/louispan/data-diverse-lens#readme"; + description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-dword" = callPackage ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty , tasty-quickcheck, template-haskell @@ -60931,6 +61004,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "doctest-driver-gen" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "doctest-driver-gen"; + version = "0.1.0.1"; + sha256 = "0drv2zp8mr4sisd27y0bcjamip8vs26a09k65x6zm5ric4psmhqs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base doctest ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/Hexirp/doctest-driver-gen#readme"; + description = "Generate doctest-driver.hs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -61083,6 +61172,7 @@ self: { testHaskellDepends = [ base doctest pretty-simple ]; description = "Domain authentication library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dominion" = callPackage @@ -62098,8 +62188,8 @@ self: { }: mkDerivation { pname = "dublincore-xml-conduit"; - version = "0.1.0.0"; - sha256 = "1z09bpywiyv39mm2y4kfvqasg5492f655mbwlh8nn1nv12w9x9il"; + version = "0.1.0.1"; + sha256 = "1irrn82jk0l026l98pajvbbhsgxh6lybjxggyipxijibg7fbkx08"; libraryHaskellDepends = [ base conduit conduit-combinators safe-exceptions text time timerep uri-bytestring xml-conduit xml-types @@ -66044,8 +66134,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer"; - version = "2.0.0"; - sha256 = "1nrvlziqhszns4hwbhg53k0jcd3xbc4gfg60snvh4i4x2cj6r3pz"; + version = "2.0.2"; + sha256 = "05pmgkm2cy60b6lx39ly03i7h3yjh4zy2zzxbk5i68w9xkjcvbxq"; libraryHaskellDepends = [ aeson base bimap bytestring containers ethereum-analyzer-deps extra fgl GenericPretty graphviz hexstring hoopl pretty protolude split @@ -66070,8 +66160,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-cli"; - version = "2.0.0"; - sha256 = "12n9x7c6cqki96ydkvb0ldbl3nra1lcvr4p47hnnw3dcna99dxhh"; + version = "2.0.2"; + sha256 = "03kbdddp1kk48a64mq5xzhiqwkznmf58qyyqwlk7fv4614awlvx6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66097,8 +66187,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-deps"; - version = "2.0.0"; - sha256 = "1kjnxg7j8343amy77m96xx6wzqk4gph1gmpb1ffqky2a70n8bngn"; + version = "2.0.2"; + sha256 = "1fpr6jl2qd1amdfrabzhyyvd8izmm1dcjg7rvpzc5l3j4sw5hxc8"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base16-bytestring binary bytestring containers deepseq fast-logger global-lock monad-logger split text @@ -66118,8 +66208,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-webui"; - version = "2.0.0"; - sha256 = "1b4pc6nfn3cc38n0f8pvgmc32pk1shnm0r9227xxi07093m8az1w"; + version = "2.0.2"; + sha256 = "04l1f7ijjbb5czcfz0n8v8v7w6zf6rrw8ds8ayjfxzw4yr4d2zvc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74283,6 +74373,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "functor-friends" = callPackage + ({ mkDerivation, base, recursion-schemes }: + mkDerivation { + pname = "functor-friends"; + version = "0.1.0.0"; + sha256 = "1apbdfhmhw1f30w62wwq6nr98pqhqbadp9c05vc424jm82v0169d"; + libraryHaskellDepends = [ base recursion-schemes ]; + homepage = "https://github.com/matt-noonan/functor-friends#readme"; + description = "Friendly helpers for your recursion schemes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "functor-infix" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -74950,6 +75052,7 @@ self: { homepage = "https://github.com/AndrewRademacher/gdax"; description = "API Wrapping for Coinbase's GDAX exchange"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gdiff" = callPackage @@ -80231,6 +80334,8 @@ self: { pname = "glirc"; version = "2.24"; sha256 = "1fhpwr7v2ad49j9699f5za1ww2m1ln39cvnm82z57cngjghpnngs"; + revision = "1"; + editedCabalFile = "11z35bs1zz6fw61m41cwbns4flwhjgmfk3hnghfga77x8s36nc08"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -83660,19 +83765,20 @@ self: { }) {}; "graphite" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers, graphviz - , hashable, hspec, process, QuickCheck, random - , unordered-containers, vector + ({ mkDerivation, base, bytestring, cassava, containers, criterion + , deepseq, dequeue, graphviz, hashable, hspec, process, QuickCheck + , random, unordered-containers, vector }: mkDerivation { pname = "graphite"; - version = "0.4.2.0"; - sha256 = "11pa89d916c5kk08gwwnsrji4d16ccbqw0wrcn4fnp59nfcjs53l"; + version = "0.5.0.0"; + sha256 = "1942cy8gcx7jwxcfyh605kljzil91g0zw9673l93mjz7ipqhcxz4"; libraryHaskellDepends = [ - base bytestring cassava containers graphviz hashable process - QuickCheck random unordered-containers vector + base bytestring cassava containers deepseq dequeue graphviz + hashable process QuickCheck random unordered-containers vector ]; testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; homepage = "https://github.com/alx741/graphite#readme"; description = "Graphs and networks library"; license = stdenv.lib.licenses.bsd3; @@ -89513,6 +89619,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasbolt_0_1_3_0" = callPackage + ({ mkDerivation, base, binary, bytestring, connection, containers + , data-binary-ieee754, data-default, hex, network, text + , transformers + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.3.0"; + sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default hex network text transformers + ]; + homepage = "https://github.com/zmactep/hasbolt#readme"; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hascal" = callPackage ({ mkDerivation, base, data-default, split }: mkDerivation { @@ -98755,8 +98880,8 @@ self: { pname = "hledger-iadd"; version = "1.2.6"; sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36"; - revision = "3"; - editedCabalFile = "0avx22jx969dzg865rgpcvg5n844fqinhsnxir0cbmilpfj5a33k"; + revision = "4"; + editedCabalFile = "0sb4rs0qh126xbwnza1gq1xlq3vds9rgypd1j02s59p5l725j9l8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98814,6 +98939,7 @@ self: { ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-lib" = callPackage @@ -98863,8 +98989,8 @@ self: { pname = "hledger-ui"; version = "1.4"; sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33"; - revision = "2"; - editedCabalFile = "1cm2nbz0wvy05n33km9h69qwch51gc44dk1jzi26ivqqqxy6h6jj"; + revision = "3"; + editedCabalFile = "19b2l4xdk504gy5fvwhcklk2ljl4m4kqsyaifn7shnxyb5vc46dw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -99505,6 +99631,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmep" = callPackage + ({ mkDerivation, base, HUnit, mwc-random, primitive, probable + , statistics, vector + }: + mkDerivation { + pname = "hmep"; + version = "0.1.0"; + sha256 = "1106lkaac4z33r0q17dpxyk5zajg0xnycszgvijmsr2bym0qzb8k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base mwc-random primitive probable statistics vector + ]; + executableHaskellDepends = [ base probable statistics vector ]; + testHaskellDepends = [ base HUnit vector ]; + homepage = "https://github.com/masterdezign/hmep#readme"; + description = "HMEP Multi Expression Programming – a genetic programming variant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hmidi" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -100797,6 +100943,8 @@ self: { pname = "hopenpgp-tools"; version = "0.19.5"; sha256 = "1yb6slxphz7lghclv1cjs2kwig1ll1dxzcaf4js26nanq280lqz0"; + revision = "1"; + editedCabalFile = "0lid8ck44b5ybb8wq81bh8wianr4r4rigqzq49cfr1g4kxmhqcq8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102246,12 +102394,12 @@ self: { license = "GPL"; }) {}; - "hs-bibutils_6_2" = callPackage + "hs-bibutils_6_2_0_1" = callPackage ({ mkDerivation, base, syb }: mkDerivation { pname = "hs-bibutils"; - version = "6.2"; - sha256 = "0nzw06qn8ff6k2bl92fmd1wwxcy8m0r9lm34mg41ffnm8jm2scfn"; + version = "6.2.0.1"; + sha256 = "0c56sjgg82kjcg5rrplnyn7vf02ccsj3kkcbgc87zxlv0j880rjb"; libraryHaskellDepends = [ base syb ]; homepage = "https://github.com/wilx/hs-bibutils"; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; @@ -108679,8 +108827,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.0.1"; - sha256 = "14pgl4q2m0hqz6xnj8gg9n5jlqqvl07xrqw3fn2m4gj9hcf768pq"; + version = "2.0.3"; + sha256 = "0xdkkasjql0la376kmb8zljndfbcxyizf9rqj02nlb1np8gs6apq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108826,6 +108974,7 @@ self: { homepage = "https://github.com/githubuser/hw-prim-bits#readme"; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect" = callPackage @@ -115226,6 +115375,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ixshader" = callPackage + ({ mkDerivation, base, ghc-prim, indexed, language-glsl, parsec + , prettyclass, singletons, template-haskell, text + }: + mkDerivation { + pname = "ixshader"; + version = "0.0.1.0"; + sha256 = "02ql4yl80jb1fz4j35hvkd47wrpkq2zzpcbws2hsr4njcxsi31wp"; + libraryHaskellDepends = [ + base ghc-prim indexed language-glsl parsec prettyclass singletons + template-haskell text + ]; + homepage = "https://github.com/schell/ixshader#readme"; + description = "A shallow embedding of the OpenGL Shading Language in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "iyql" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, haskeline, haskell98, hoauth, mtl, old-locale, parsec @@ -121155,7 +121321,7 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "language-puppet_1_3_10" = callPackage + "language-puppet_1_3_11" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, exceptions, filecache, formatting, Glob @@ -121169,8 +121335,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.10"; - sha256 = "10z7573594ba4ldb5bnr1biwbqs0km14y18lkcr65d99qh7pqc2i"; + version = "1.3.11"; + sha256 = "03zvd5xwjdbarfvfy9y8rn2wabzw5ic3vr5f0li0r9cgdg1p66p2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -121184,10 +121350,10 @@ self: { time transformers unix unordered-containers vector yaml ]; executableHaskellDepends = [ - aeson base bytestring containers Glob hslogger http-client lens - megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin - servant-client strict-base-types text transformers - unordered-containers vector yaml + aeson ansi-wl-pprint base bytestring containers Glob hslogger + http-client lens megaparsec mtl optparse-applicative parallel-io + regex-pcre-builtin servant-client strict-base-types text + transformers unordered-containers vector yaml ]; testHaskellDepends = [ ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens @@ -122581,6 +122747,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-family_1_2_2" = callPackage + ({ mkDerivation, base, containers, lens-family-core, mtl + , transformers + }: + mkDerivation { + pname = "lens-family"; + version = "1.2.2"; + sha256 = "0fs34wdhmfln06dnmgnbzgjiib6yb6z4ybcxqibal3amg7jlv8nx"; + libraryHaskellDepends = [ + base containers lens-family-core mtl transformers + ]; + description = "Lens Families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-family-core" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { @@ -122592,6 +122774,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-family-core_1_2_2" = callPackage + ({ mkDerivation, base, containers, transformers }: + mkDerivation { + pname = "lens-family-core"; + version = "1.2.2"; + sha256 = "0a26rbgwq9z7lp52zkvwz13sjd35hr06xxc6zz4sglpjc4dqkzlm"; + libraryHaskellDepends = [ base containers transformers ]; + description = "Haskell 98 Lens Families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-family-th" = callPackage ({ mkDerivation, base, hspec, lens-family, template-haskell }: mkDerivation { @@ -122724,16 +122918,16 @@ self: { }) {}; "lens-toml-parser" = callPackage - ({ mkDerivation, base, containers, dwergaz, hlint, lens-simple + ({ mkDerivation, base, containers, dwergaz, hlint, lens-family , profunctors, text, time, toml-parser }: mkDerivation { pname = "lens-toml-parser"; - version = "0.1.0.0"; - sha256 = "17i3da42gahf9ni29mk369jq2pgbgdimvwszgj6dzywxv1yflldb"; + version = "0.1.0.1"; + sha256 = "1mcbba5ff2jfr91jlzi5s5jf09p92jbpg37gf525bhv23hhid7xy"; libraryHaskellDepends = [ base profunctors text time toml-parser ]; testHaskellDepends = [ - base containers dwergaz hlint lens-simple text toml-parser + base containers dwergaz hlint lens-family text toml-parser ]; homepage = "https://github.com/xngns/lens-toml-parser"; description = "Lenses for toml-parser"; @@ -125079,8 +125273,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.7.0.2"; - sha256 = "0m60vp0kwikb3wbc9vddlr0csm8sa7jqclywga5d8m7r5wkc7iha"; + version = "0.7.0.5"; + sha256 = "081z90vcqrmfjc3jna419a8ziif2rcrag4ba4h902lrjh5hpvpaj"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -125118,8 +125312,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.0.1"; - sha256 = "1rj6c46laylds149d11yyw79vn0nls9gmxnc9fakyl4qg0d97d75"; + version = "0.8.0.3"; + sha256 = "0w24iib5938wlm8c73j04fqz5aqya7bnaqi3psk3yl6q1fl7i57l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125132,13 +125326,14 @@ self: { transformers unordered-containers vector ]; executableHaskellDepends = [ - base cmdargs deepseq ghc ghc-boot hint liquid-fixpoint located-base - pretty process time + base cmdargs deepseq ghc ghc-boot hint hpc liquid-fixpoint + located-base pretty process time ]; testHaskellDepends = [ - base containers directory filepath liquid-fixpoint mtl - optparse-applicative parsec process stm syb tagged tasty - tasty-ant-xml tasty-hunit tasty-rerun text transformers + array base bytestring containers directory filepath ghc ghc-boot + hpc liquid-fixpoint mtl optparse-applicative parsec process stm syb + tagged tasty tasty-ant-xml tasty-hunit tasty-rerun template-haskell + text time transformers ]; testSystemDepends = [ z3 ]; homepage = "https://github.com/ucsd-progsys/liquidhaskell"; @@ -126600,21 +126795,21 @@ self: { "log-warper" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, containers - , data-default, directory, dlist, errors, exceptions, extra - , filepath, formatting, hashable, hspec, HUnit, lens, mmorph - , monad-control, monad-loops, mtl, network, QuickCheck, safecopy - , text, text-format, time, transformers, transformers-base - , universum, unix, unordered-containers, yaml + , data-default, deepseq, directory, dlist, errors, exceptions + , extra, filepath, fmt, formatting, hashable, hspec, HUnit, lens + , mmorph, monad-control, monad-loops, mtl, network, QuickCheck + , safecopy, text, text-format, time, transformers + , transformers-base, universum, unix, unordered-containers, yaml }: mkDerivation { pname = "log-warper"; - version = "1.2.3"; - sha256 = "0r3f2chnzyizm0kz7crjynycs2kzbvh5aw3a0qwc66gbignjnbkw"; + version = "1.3.0"; + sha256 = "0y5bwva06nl1gs1h0m5csg1sly7v8a4w0q2k1424w3zrm11in79q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base containers directory dlist errors - exceptions extra filepath formatting hashable lens mmorph + aeson ansi-terminal base containers deepseq directory dlist errors + exceptions extra filepath fmt formatting hashable lens mmorph monad-control monad-loops mtl network safecopy text text-format time transformers transformers-base universum unix unordered-containers yaml @@ -128089,6 +128284,7 @@ self: { homepage = "https://github.com/hverr/haskell-lxd-client#readme"; description = "LXD client written in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lye" = callPackage @@ -128575,21 +128771,24 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, composition - , composition-extra, containers, criterion, directory, file-embed - , hspec, hspec-megaparsec, megaparsec, microlens, MonadRandom, mtl - , optparse-applicative, random-shuffle, template-haskell, text + ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal + , composition-prelude, containers, criterion, directory, file-embed + , hspec, hspec-megaparsec, http-client, megaparsec, MonadRandom + , mtl, optparse-applicative, process, random-shuffle + , recursion-schemes, tar, template-haskell, text, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "2.4.1.3"; - sha256 = "1766dk570fpakjxbk50ll8a29kl67s4wvkwwifacz1h39iqj8984"; + version = "2.4.2.10"; + sha256 = "0s6y309prwz148jaa7yiivv17jq4zsvcrkvpgkcs0gah98i601a8"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal directory file-embed process ]; libraryHaskellDepends = [ - ansi-wl-pprint base composition composition-extra containers - directory file-embed megaparsec microlens MonadRandom mtl - optparse-applicative random-shuffle template-haskell text + ansi-wl-pprint base bytestring composition-prelude containers + directory file-embed http-client megaparsec MonadRandom mtl + optparse-applicative random-shuffle recursion-schemes tar + template-haskell text zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -131898,16 +132097,16 @@ self: { }) {}; "mezzo" = callPackage - ({ mkDerivation, base, boxes, deepseq, ghc-prim + ({ mkDerivation, base, boxes, deepseq, Euterpea, ghc-prim , ghc-typelits-natnormalise, HCodecs, hspec, HUnit, QuickCheck , should-not-typecheck, template-haskell }: mkDerivation { pname = "mezzo"; - version = "0.3.0.0"; - sha256 = "10i0n03wmrds8gg0p14nvqi00ziqh2lhynbq6gynizgqs5nfh481"; + version = "0.3.1.0"; + sha256 = "1hpsv1k9gnlwwzwg10infipw4dnlcaw86jiismwpynlxrgdrcd36"; libraryHaskellDepends = [ - base boxes ghc-prim ghc-typelits-natnormalise HCodecs + base boxes Euterpea ghc-prim ghc-typelits-natnormalise HCodecs template-haskell ]; testHaskellDepends = [ @@ -132681,14 +132880,15 @@ self: { "mime-string" = callPackage ({ mkDerivation, base, base64-string, bytestring, iconv, mtl - , network, old-time + , network, old-locale, old-time, random }: mkDerivation { pname = "mime-string"; - version = "0.4"; - sha256 = "0v028cgqll918zdaa95myazlg7dnvb2cvvvm1iyyqw81grza3r61"; + version = "0.5"; + sha256 = "1k62vxl85ysax8a312xa9dw6wyh41nxr9pn8id8z62bbin3wpk33"; libraryHaskellDepends = [ - base base64-string bytestring iconv mtl network old-time + base base64-string bytestring iconv mtl network old-locale old-time + random ]; description = "MIME implementation for String's"; license = "unknown"; @@ -133146,19 +133346,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_8_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, lucid - , servant, servant-lucid, text, transformers, vector + "miso_0_9_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-api-data + , http-types, lucid, network-uri, servant, servant-lucid, text + , transformers, vector }: mkDerivation { pname = "miso"; - version = "0.8.0.0"; - sha256 = "1z49dd3g30fhk6kvm5lfrzapsbf3381bmgyzsp34f67fdjxmdj8w"; + version = "0.9.0.0"; + sha256 = "09m34q1d65j2rhnnb66z6hmbj3vma8dgj7dbakx9w2w6z9y7bz1z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers lucid servant servant-lucid text - transformers vector + aeson base bytestring containers http-api-data http-types lucid + network-uri servant servant-lucid text transformers vector ]; homepage = "http://github.com/dmjio/miso"; description = "A tasty Haskell front-end framework"; @@ -138916,6 +139117,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "neko-lib" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, directory + , optparse-applicative, process, random, tagged, tasty, tasty-hunit + , tasty-smallcheck, temporary + }: + mkDerivation { + pname = "neko-lib"; + version = "0.0.1.0"; + sha256 = "0ai0c5kx30wsq15bmz7a27x8s2jd0x0scdrjs15bniyc0881l2vv"; + libraryHaskellDepends = [ + base binary bytestring containers optparse-applicative tagged + ]; + testHaskellDepends = [ + base binary bytestring containers directory optparse-applicative + process random tagged tasty tasty-hunit tasty-smallcheck temporary + ]; + homepage = "http://github.com/ppenzin/neko-lib-hs/"; + description = "Neko VM code generation and disassembly library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "neko-obfs" = callPackage ({ mkDerivation, async, attoparsec, base, binary, bytestring, lens , network, network-simple, optparse-generic, pipes @@ -140842,8 +141064,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.8.0.7"; - sha256 = "0k8ncavrwkq6wmn8yb87cb9cz6m47iw94k4nl2b0pc1ziik7klip"; + version = "0.8.1.0"; + sha256 = "0ab8hh8dh8rk65zghwhhfpvlkvj5i1652cv5vw9a0pd5mqqygh2z"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -143653,6 +143875,7 @@ self: { homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-union" = callPackage @@ -145527,6 +145750,7 @@ self: { homepage = "https://github.com/leftaroundabout/packed-multikey-map"; description = "Efficient “spreadsheet table” like maps with multiple marginals"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "packedstring" = callPackage @@ -150224,8 +150448,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.16.0"; - sha256 = "02ma54ffjijazyfnag2z9gq2l86yiqzvlrdc1y3mw8b8yjgzvidd"; + version = "0.0.17.0"; + sha256 = "1bwgxw4mknz9k94y8lk2j62i72czvfjb1szddix4mp4bi17kcxnl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151027,6 +151251,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-category_0_3_0_0" = callPackage + ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-extras + , transformers + }: + mkDerivation { + pname = "pipes-category"; + version = "0.3.0.0"; + sha256 = "008733qffml0cqgalacrl1r8sdz08rbsz4n2pd5j9xrbxn4xh4a7"; + libraryHaskellDepends = [ base lens mtl pipes pipes-extras ]; + testHaskellDepends = [ base hspec pipes transformers ]; + homepage = "https://github.com/louispan/pipes-category#readme"; + description = "Allows instances for Category, Arrow and ArrowChoice for Pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-cellular" = callPackage ({ mkDerivation, base, bytestring, data-cell, pipes }: mkDerivation { @@ -151308,6 +151548,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-fluid_0_6_0_0" = callPackage + ({ mkDerivation, async, base, constraints, hspec, lens + , lifted-async, mmorph, monad-control, mtl, pipes + , pipes-concurrency, pipes-misc, semigroups, stm, these + , transformers, transformers-base + }: + mkDerivation { + pname = "pipes-fluid"; + version = "0.6.0.0"; + sha256 = "11bmp27ya9kz3gvp3p6qmnm38969xwnpkgxcc9v6zbxz1di9fh4a"; + libraryHaskellDepends = [ + base constraints lens lifted-async monad-control pipes semigroups + stm these transformers transformers-base + ]; + testHaskellDepends = [ + async base constraints hspec lens lifted-async mmorph monad-control + mtl pipes pipes-concurrency pipes-misc stm transformers + ]; + homepage = "https://github.com/louispan/pipes-fluid#readme"; + description = "Reactively combines Producers so that a value is yielded as soon as possible"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-group" = callPackage ({ mkDerivation, base, doctest, free, lens-family-core, pipes , pipes-parse, transformers @@ -151485,6 +151749,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-misc_0_4_0_1" = callPackage + ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl + , pipes, pipes-category, pipes-concurrency, semigroups, stm + , transformers + }: + mkDerivation { + pname = "pipes-misc"; + version = "0.4.0.1"; + sha256 = "0rzn4vb2h3l6crggfsz0sf85csi5994ickclr2lv2q9s396ch0dr"; + libraryHaskellDepends = [ + base clock Decimal lens mmorph mtl pipes pipes-category + pipes-concurrency semigroups stm transformers + ]; + testHaskellDepends = [ + base hspec lens mmorph pipes pipes-concurrency stm transformers + ]; + homepage = "https://github.com/louispan/pipes-misc#readme"; + description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-mongodb" = callPackage ({ mkDerivation, base, monad-control, mongoDB, pipes, text }: mkDerivation { @@ -153769,6 +154055,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postgres-embedded" = callPackage + ({ mkDerivation, base, directory, filepath, HDBC, HDBC-postgresql + , shell-conduit + }: + mkDerivation { + pname = "postgres-embedded"; + version = "0.1.0"; + sha256 = "0014lwv8p71krm42dd5nydvfll04hzkfhzfm93csvgbg9s9wiywy"; + libraryHaskellDepends = [ + base directory filepath HDBC HDBC-postgresql shell-conduit + ]; + testHaskellDepends = [ base filepath ]; + homepage = "https://github.com/ilya-murzinov/postgres-embedded"; + license = stdenv.lib.licenses.mit; + }) {}; + "postgres-tmp" = callPackage ({ mkDerivation, base, bytestring, postgresql-simple, text }: mkDerivation { @@ -155863,6 +156165,8 @@ self: { pname = "probable"; version = "0.1.2"; sha256 = "0lypxz3lz4gj5x98k7mwg3xagjld0qhzrxdk8l4gjxj77m00hkfz"; + revision = "1"; + editedCabalFile = "1iwv4ygfm53q3jyiiniqhsixps549h9c2apif10pjg5jib04yv85"; libraryHaskellDepends = [ base mtl mwc-random primitive statistics transformers vector ]; @@ -156202,6 +156506,7 @@ self: { homepage = "https://github.com/etorreborre/producer-hs#readme"; description = "Simple streaming datatype"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "product-isomorphic" = callPackage @@ -166550,17 +166855,15 @@ self: { }) {}; "ring-buffer" = callPackage - ({ mkDerivation, base, exceptions, mtl, primitive, QuickCheck - , vector + ({ mkDerivation, base, exceptions, HUnit, mtl, primitive + , QuickCheck, vector }: mkDerivation { pname = "ring-buffer"; - version = "0.3"; - sha256 = "10jvn9kj1y0w4r1kvxz4xi7vc1myq35isgd6x0c3mnxfngs45lgp"; - revision = "1"; - editedCabalFile = "0lmznwcy3iyxsgpj2q2l243rzz25ccdsjwazwixidv776137lz42"; + version = "0.4"; + sha256 = "14h1rzxzk9qzr6bimxng8nhxydngx92x75p1mrjfwbwi17bbwgby"; libraryHaskellDepends = [ base exceptions mtl primitive vector ]; - testHaskellDepends = [ base QuickCheck vector ]; + testHaskellDepends = [ base HUnit QuickCheck vector ]; homepage = "http://github.com/bgamari/ring-buffer"; description = "A concurrent, mutable ring-buffer"; license = stdenv.lib.licenses.bsd3; @@ -167631,6 +167934,7 @@ self: { homepage = "http://www.mew.org/~kazu/proj/rpf/"; description = "Receiver Policy Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rpm" = callPackage @@ -170473,15 +170777,15 @@ self: { "scuttlebutt-types" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , cryptonite, ed25519, hspec, memory, text + , cryptonite, ed25519, hspec, memory, text, vector }: mkDerivation { pname = "scuttlebutt-types"; - version = "0.2.0"; - sha256 = "0aghmdc16x0i7mzldx7gdq1n6g81kccq8gp24klf0000vbj8xa7h"; + version = "0.3.0"; + sha256 = "015pg2y2k0s88wgjjv3h1h8gl3f07lbj2v8s9i1cqk5qzrs7jhrm"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptonite ed25519 memory - text + text vector ]; testHaskellDepends = [ aeson base bytestring hspec text ]; description = "generic types for Secure Scuttlebutt"; @@ -171437,17 +171741,24 @@ self: { }) {}; "semiring-num" = callPackage - ({ mkDerivation, base, containers, doctest, nat-sized-numbers - , QuickCheck, smallcheck, template-haskell + ({ mkDerivation, base, containers, criterion, doctest, hashable + , log-domain, nat-sized-numbers, QuickCheck, random, scientific + , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck + , template-haskell, time, unordered-containers, vector }: mkDerivation { pname = "semiring-num"; - version = "1.1.0.1"; - sha256 = "0y1nmk730rlg9mvzn3q4gkmzwd13grcqzfvfn0jm0zi017wjlw29"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ - base containers doctest nat-sized-numbers QuickCheck smallcheck + version = "1.4.0.0"; + sha256 = "0p2ipnxj5kpjplspzllxm97y3xfnwvdndb4cllpa9glk21qx03p4"; + libraryHaskellDepends = [ + base containers hashable log-domain scientific template-haskell + time unordered-containers vector ]; + testHaskellDepends = [ + base containers doctest log-domain nat-sized-numbers QuickCheck + smallcheck tasty tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ base containers criterion random ]; homepage = "https://github.com/oisdk/semiring-num"; description = "Basic semiring class and instances"; license = stdenv.lib.licenses.mit; @@ -173151,7 +173462,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-purescript_0_9_0_0" = callPackage + "servant-purescript_0_9_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, http-types, lens, mainland-pretty, purescript-bridge , servant, servant-foreign, servant-server, servant-subscriber @@ -173159,8 +173470,8 @@ self: { }: mkDerivation { pname = "servant-purescript"; - version = "0.9.0.0"; - sha256 = "06r43f36r5y3vzzw5b9ij0pprjdyabr33h6w4h47kg6cdkwmy2sh"; + version = "0.9.0.1"; + sha256 = "11jpgqk1nmwjihghxbfv05fsb6n351822ryh6w08wdz3alsv4zk6"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign @@ -173956,8 +174267,8 @@ self: { }: mkDerivation { pname = "ses-html"; - version = "0.3.0.1"; - sha256 = "1kxwr34p87yip54nw14sfr3mlqjn5kknsm5j1h2sr7vxfz4hrkh7"; + version = "0.4.0.0"; + sha256 = "13x0m3i8gs0rapshniwxhzwz0311fzan7k87s6ink3jk7gh6xxyg"; libraryHaskellDepends = [ base base64-bytestring blaze-html byteable bytestring cryptohash HsOpenSSL http-streams tagsoup time @@ -180693,6 +181004,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "sparse-linear-algebra_0_2_9_8" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec + , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck + , scientific, transformers, vector, vector-algorithms + }: + mkDerivation { + pname = "sparse-linear-algebra"; + version = "0.2.9.8"; + sha256 = "19rhcnrlx6nf4yidb119wd3mm4xb5ls99wqk7vdif0cxlpnsycch"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers exceptions hspec mtl primitive QuickCheck + transformers vector vector-algorithms + ]; + testHaskellDepends = [ + base containers exceptions hspec matrix-market-attoparsec mtl + mwc-random primitive QuickCheck scientific + ]; + homepage = "https://github.com/ocramz/sparse-linear-algebra"; + description = "Numerical computation in native Haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sparsebit" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { @@ -183855,6 +184190,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stm-extras_0_1_0_3" = callPackage + ({ mkDerivation, base, stm }: + mkDerivation { + pname = "stm-extras"; + version = "0.1.0.3"; + sha256 = "0pmpf1r8q1favrbgvrnggvs93vwvml79yfqbs4xjqnjsglahl8c8"; + libraryHaskellDepends = [ base stm ]; + homepage = "https://github.com/louispan/stm-extras#readme"; + description = "Extra STM functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stm-firehose" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, http-types , HUnit, resourcet, stm, stm-chans, stm-conduit, transformers, wai @@ -185485,8 +185833,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.2.2"; - sha256 = "1w2f5ynilzdzszga468lcy4fzl8cm2i9mcvb7hzzpg2gjykbi55s"; + version = "2.2.3"; + sha256 = "0vyqmz0q2davlqj2673pzj5qxawvrxypm2jd839igb5y0wnj9idv"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -185500,8 +185848,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { pname = "stripe-haskell"; - version = "2.2.2"; - sha256 = "08jksi6swwb15sib5y5ms0m4k6m24v7xg4zany34x2zbas30qlp4"; + version = "2.2.3"; + sha256 = "086baq9f9pzacf5vqvi2ikx47sijyb8r6ndnqph9r8qvjgc2xy2x"; libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; @@ -185515,8 +185863,8 @@ self: { }: mkDerivation { pname = "stripe-http-streams"; - version = "2.2.2"; - sha256 = "1s6rj46m2pmcvagwm02z2qf4z4b44y14kjdi397b6s4cva7sdf84"; + version = "2.2.3"; + sha256 = "0bdl85xwm7ym1kf2d0vjn4652z3bgvzj2l7z5lgsxzr5acn6q02p"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text @@ -185537,8 +185885,8 @@ self: { }: mkDerivation { pname = "stripe-tests"; - version = "2.2.2"; - sha256 = "1jccj0ic1v1vpdp3s8vb0a5w2rzr1zcqm6xqkjf1012ljxkvdq3f"; + version = "2.2.3"; + sha256 = "1yks2wabqirq4hi1a52k9302pyp1w4q7b6chg6a7r28wsjlv27hs"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers @@ -187336,6 +187684,7 @@ self: { homepage = "https://github.com/emilaxelsson/syntactic"; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntactical" = callPackage @@ -191517,6 +191866,7 @@ self: { testHaskellDepends = [ base haskell-src-meta template-haskell ]; description = "Write your tests in comments"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testPkg" = callPackage @@ -191702,6 +192052,7 @@ self: { homepage = "https://gitlab.com/xaverdh/tex-builder#texbuilder"; description = "View your latex output while editing"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texmath" = callPackage @@ -192864,6 +193215,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "th-constraint-compat" = callPackage + ({ mkDerivation, base, containers, template-haskell }: + mkDerivation { + pname = "th-constraint-compat"; + version = "0.0.1.0"; + sha256 = "1wx35f24gryal0h0gadq351gws82qvficcq23pyd1ajrxhgnv3zc"; + libraryHaskellDepends = [ base containers template-haskell ]; + description = "Compatibility for type constraint template"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-context" = callPackage ({ mkDerivation, array, atp-haskell, base, bytestring, containers , data-default, deepseq, ghc-prim, haskell-src-exts, hspec @@ -198617,6 +198979,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tyfam-witnesses" = callPackage + ({ mkDerivation, base, containers, template-haskell }: + mkDerivation { + pname = "tyfam-witnesses"; + version = "0.0.0.1"; + sha256 = "0h79wsdljd5l34rshmx4r809xfr7szcvgap97zfyr5gzp8p24nh0"; + libraryHaskellDepends = [ base containers template-haskell ]; + description = "Provide proof witnesses for closed type family evaluation"; + license = stdenv.lib.licenses.mit; + }) {}; + "typalyze" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, ghc , process @@ -199524,16 +199897,18 @@ self: { }) {}; "typesafe-precure" = callPackage - ({ mkDerivation, autoexporter, base, dlist, hspec, monad-skeleton - , template-haskell, th-data-compat + ({ mkDerivation, aeson, aeson-pretty, autoexporter, base + , bytestring, dlist, hspec, monad-skeleton, template-haskell, text + , th-data-compat, th-strict-compat, th-utilities }: mkDerivation { pname = "typesafe-precure"; - version = "0.3.1.1"; - sha256 = "1pf5ha4r015yc359c5f7jy2qwx1j9i9w62xjlfhm9amx81cw42if"; + version = "0.4.0.0"; + sha256 = "0lwsa7zfja6sqvrd4ihqc8x6k2bbrj2qayxrgkxd0p4qvxfdzp7y"; libraryHaskellDepends = [ - autoexporter base dlist monad-skeleton template-haskell - th-data-compat + aeson aeson-pretty autoexporter base bytestring dlist + monad-skeleton template-haskell text th-data-compat + th-strict-compat th-utilities ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/igrep/typesafe-precure#readme"; @@ -201782,7 +202157,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "uri-bytestring_0_3_0_0" = callPackage + "uri-bytestring_0_3_0_1" = callPackage ({ mkDerivation, attoparsec, base, base-compat, blaze-builder , bytestring, containers, criterion, deepseq, deepseq-generics , fail, generics-sop, HUnit, network-uri, QuickCheck @@ -201792,8 +202167,8 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.3.0.0"; - sha256 = "0slbwh138y3j0mb50g39ylr18l80vn6hsszm83d9797nlh0nb5rn"; + version = "0.3.0.1"; + sha256 = "10bg6ia6l2blfb5068ppbnkk46linnda0c79yq99ls4j1x91wwgw"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers fail template-haskell th-lift-instances @@ -204401,6 +204776,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_9" = callPackage + ({ mkDerivation, base, brick, containers, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.9"; + sha256 = "15mvbgf5apb9ysiynv5xc8zynkz8shwbfq16rdfac5bbnl07m97p"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -205040,7 +205435,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_17_1" = callPackage + "vty_5_18_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , deepseq, directory, filepath, hashable, HUnit, microlens , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck @@ -205051,8 +205446,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.17.1"; - sha256 = "02h5nf8lchkbaijgk3kwx5kl9kh5v3gsah40q5sw2w0xf5nl0gl7"; + version = "5.18.1"; + sha256 = "1sv04sirif4faj0zb2x2ls22xlrh6d2pca9bzhs27y0x4gf759qw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212975,8 +213370,8 @@ self: { }: mkDerivation { pname = "yarn-lock"; - version = "0.3.4"; - sha256 = "0w7ss3lpx37bm3cqigjgddjqm6pwi5117mz60jyw1d70xrgw8wbz"; + version = "0.4.0"; + sha256 = "1s95xdwshsvplv1406a4bn1v8xjhppfmhzf4302s9h41ai7b6wni"; libraryHaskellDepends = [ base containers either megaparsec protolude text ]; From d0e8806494932f687e44d629843672842661ecf5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Oct 2017 13:40:38 +0200 Subject: [PATCH 0907/2806] haskell-tinc: mark build as broken https://hydra.nixos.org/build/62246306 --- pkgs/development/tools/haskell/tinc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index db779ecbb0f..5a69b887588 100644 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -38,4 +38,5 @@ mkDerivation { license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.robbinch ]; + broken = true; } From d98909e0f342e69b589d6bd0df278ca06590976c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Oct 2017 13:42:03 +0200 Subject: [PATCH 0908/2806] hackage2nix: disable broken builds on Hydra --- .../configuration-hackage2nix.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fad70337e94..e696cba3fe2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2853,9 +2853,11 @@ dont-distribute-packages: AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + amqp-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] analyze-client: [ i686-linux, x86_64-linux, x86_64-darwin ] anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ] + android-activity: [ i686-linux, x86_64-linux, x86_64-darwin ] android-lint-summary: [ i686-linux, x86_64-linux, x86_64-darwin ] android: [ i686-linux, x86_64-linux, x86_64-darwin ] AndroidViewHierarchyImporter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2954,11 +2956,13 @@ dont-distribute-packages: AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-time: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ] Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ] atuin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3121,6 +3125,7 @@ dont-distribute-packages: binembed: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseDotP: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseFasta: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseFR3D: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3318,6 +3323,7 @@ dont-distribute-packages: cassandra-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] cassava-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] cassava-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + Cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] cassy: [ i686-linux, x86_64-linux, x86_64-darwin ] castle: [ i686-linux, x86_64-linux, x86_64-darwin ] casui: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3940,6 +3946,7 @@ dont-distribute-packages: DOH: [ i686-linux, x86_64-linux, x86_64-darwin ] doi: [ i686-linux, x86_64-linux, x86_64-darwin ] DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] + domain-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] domplate: [ i686-linux, x86_64-linux, x86_64-darwin ] dot-linker: [ i686-linux, x86_64-linux, x86_64-darwin ] dotfs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4384,6 +4391,7 @@ dont-distribute-packages: gbu: [ i686-linux, x86_64-linux, x86_64-darwin ] gc-monitoring-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gcodehs: [ i686-linux, x86_64-linux, x86_64-darwin ] + gdax: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] GeBoP: [ "x86_64-darwin" ] @@ -5129,6 +5137,7 @@ dont-distribute-packages: hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-iadd: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5460,6 +5469,7 @@ dont-distribute-packages: hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-kafka-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-prim-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6065,6 +6075,7 @@ dont-distribute-packages: lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] + lxd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ] lz4-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6569,6 +6580,7 @@ dont-distribute-packages: opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAL: [ "x86_64-darwin" ] opench-meteo: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6626,6 +6638,7 @@ dont-distribute-packages: pack: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] packed-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] + packed-multikey-map: [ i686-linux, x86_64-linux, x86_64-darwin ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] packman: [ i686-linux, x86_64-linux, x86_64-darwin ] pacman-memcache: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6899,6 +6912,7 @@ dont-distribute-packages: procrastinating-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] procstat: [ i686-linux, x86_64-linux, x86_64-darwin ] + producer: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] progress: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7259,6 +7273,7 @@ dont-distribute-packages: rowrecord: [ i686-linux, x86_64-linux, x86_64-darwin ] rpc-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rpf: [ i686-linux, x86_64-linux, x86_64-darwin ] rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7811,6 +7826,7 @@ dont-distribute-packages: sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] sync: [ i686-linux, x86_64-linux, x86_64-darwin ] syncthing-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntactic: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-example-json: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-example: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7933,6 +7949,7 @@ dont-distribute-packages: test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] testbench: [ i686-linux, x86_64-linux, x86_64-darwin ] + testCom: [ i686-linux, x86_64-linux, x86_64-darwin ] testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] testpack: [ i686-linux, x86_64-linux, x86_64-darwin ] testpattern: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7940,6 +7957,7 @@ dont-distribute-packages: testrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] TeX-my-math: [ i686-linux, x86_64-linux, x86_64-darwin ] tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] + texbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ] text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] From 6a84b39950bd874617c0a52f9d2a2021d0e810f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Oct 2017 13:45:12 +0200 Subject: [PATCH 0909/2806] ghcjs: mark build as broken --- pkgs/development/compilers/ghcjs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index f23da1149c5..aff9cd9711b 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -2,5 +2,5 @@ bootPkgs.callPackage ./base.nix { inherit bootPkgs; - broken = false; + broken = true; # https://hydra.nixos.org/build/62184741 } From 2c21f3deeb15f409cb65da4c2bb1f47c03e4d38e Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Mon, 9 Oct 2017 18:32:30 +0300 Subject: [PATCH 0910/2806] readme.md: reincarnate wiki (#30243) * readme.md: reincarnate wiki It is kinda strange to announce that wiki is deprecated, while it is in fact growing. I'd say, the "Move-the-wiki" milestone is stalled instead. * Readme.md: rename to community maintained wiki --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b3d5347a6f6..64cfb25eac3 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ For pull-requests, please rebase onto nixpkgs `master`. * [Documentation (Nix Expression Language chapter)](https://nixos.org/nix/manual/#ch-expression-language) * [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/) * [Manual (NixOS)](https://nixos.org/nixos/manual/) -* [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22)) +* [Community maintained wiki](https://nixos.wiki/) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) * [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) From df5691d6770e2a8b2955ed0da2d48a01b00e4eaa Mon Sep 17 00:00:00 2001 From: xd1le Date: Sun, 1 Oct 2017 00:36:10 +1000 Subject: [PATCH 0911/2806] buildLuaPackage: set makeFlags directly instead of through preBuild So that lua packages can override it without having to resort to setting makeFlagsArray in preBuild. --- pkgs/development/lua-modules/generic/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 2a44cdfca0b..7152d0b9e36 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -5,14 +5,13 @@ lua: if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" else - lua.stdenv.mkDerivation ({ - - preBuild = '' - makeFlagsArray=( - PREFIX=$out - LUA_LIBDIR="$out/lib/lua/${lua.luaversion}" - LUA_INC="-I${lua}/include"); - ''; + lua.stdenv.mkDerivation ( + { + makeFlags = [ + "PREFIX=$(out)" + "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}" + "LUA_INC=-I${lua}/include" + ]; } // attrs From b83c89b6b488653d935e038a4d1763e0f814caa5 Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 9 Oct 2017 23:21:48 +1100 Subject: [PATCH 0912/2806] luajitPackages.mpack: disable with new isLuaJIT function insead of marking it as broken --- pkgs/top-level/lua-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ff1108471bd..bea78a4c7df 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -14,6 +14,7 @@ let isLua51 = lua.luaversion == "5.1"; isLua52 = lua.luaversion == "5.2"; + isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit"; platformString = if stdenv.isDarwin then "macosx" @@ -534,13 +535,13 @@ let "LUA_VERSION_MAJ_MIN=" "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}" ]; + # gcc -llua fails with luajit. + disabled = isLuaJIT; meta = { description = "Simple implementation of msgpack in C Lua 5.1"; homepage = "https://github.com/tarruda/libmpack"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.mit; - # gcc -llua fails with luajit - broken = (builtins.parseDrvName lua.name).name != "lua"; }; }; From 152d294479a5fa7ddfb6c59d58719777ea2cb11c Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 9 Oct 2017 23:27:42 +1100 Subject: [PATCH 0913/2806] luajitPackages: disable luaexpat, luazip and cjson as their builds fail --- pkgs/top-level/lua-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index bea78a4c7df..164b8258162 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -151,6 +151,8 @@ let EXPAT_INC="-I${expat.dev}/include"); ''; + disabled = isLuaJIT; + meta = { homepage = "http://matthewwild.co.uk/projects/luaexpat"; platforms = stdenv.lib.platforms.unix; @@ -333,7 +335,7 @@ let buildInputs = [ unzip zziplib ]; patches = [ ../development/lua-modules/zip.patch ]; # does not currently work under lua 5.2 - disabled = isLua52; + disabled = isLua52 || isLuaJIT; meta = { homepage = "https://github.com/luaforge/luazip"; platforms = stdenv.lib.platforms.linux; @@ -484,6 +486,7 @@ let rm -rf $out/share/lua/${lua.luaversion}/cjson/tests ''; installTargets = "install install-extra"; + disabled = isLuaJIT; meta = { description = "Lua C extension module for JSON support"; license = stdenv.lib.licenses.mit; From b584c46623eba3985686ae41b9318694a6cb59ac Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 9 Oct 2017 23:29:56 +1100 Subject: [PATCH 0914/2806] luaPackages.luacheck: skip buildPhase --- pkgs/top-level/lua-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 164b8258162..9bbb5a7c0c0 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -86,6 +86,9 @@ let propagatedBuildInputs = [ lua ]; + # No Makefile. + dontBuild = true; + installPhase = '' ${lua}/bin/lua install.lua $out ''; From 8a928f39161688c88600a59feaf3a99fd1f060e7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 9 Oct 2017 14:27:52 +0200 Subject: [PATCH 0915/2806] qt59.qtwebengine: fix build (re: nss update) --- pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix index c0b9aa83e19..f001f64db3f 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix @@ -101,6 +101,9 @@ qtSubmodule { ]; patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + # NSS header layout change + NIX_CFLAGS_COMPILE = [ "-I${nss.dev}/include/nss" ]; + dontUseNinjaBuild = true; dontUseNinjaInstall = true; From 75ecaa1b524a20d39762538112eb774bb34e4fa0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 9 Oct 2017 16:59:06 +0200 Subject: [PATCH 0916/2806] libreoffice-still: fix build (re: nss update) --- pkgs/applications/office/libreoffice/still.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index dfe6e947080..4aaa54bfc97 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -65,7 +65,9 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; + # NSS update changed header layout + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" + "-I${nss.dev}/include/nss"]; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. From f3c798dd7487cf7aa16facb2f6b397ec4de561e0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 9 Oct 2017 18:14:59 +0200 Subject: [PATCH 0917/2806] libreoffice-fresh: take into account new nss header layout --- pkgs/applications/office/libreoffice/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 830692f08eb..63357861b38 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -65,8 +65,10 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h + # NSS update changed header layout # And LO refers to gpgme++ by no-path name - NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++"; + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" + "-I${nss.dev}/include/nss" "-I${gpgme.dev}/include/gpgme++" ]; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. From df41edfe1c85d76c00f90c688f4f9552b0e61225 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 9 Oct 2017 18:15:11 +0200 Subject: [PATCH 0918/2806] chromium: take into account new nss header layout --- pkgs/applications/networking/browsers/chromium/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f6f9a829c2d..cecaf751315 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -124,6 +124,9 @@ let ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; + # NSS header layout change + NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss"]; + patches = [ ./patches/nix_plugin_paths_52.patch # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled From 549188c293cf522e1701438e9975c826a7f781d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 9 Oct 2017 18:14:15 +0200 Subject: [PATCH 0919/2806] python.pkgs.django: fix gdal support on darwin --- .../python-modules/django/1.10-gis-libs.template.patch | 4 ++-- pkgs/development/python-modules/django/1_11.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch index be196d000bc..da154554d1b 100644 --- a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch +++ b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch @@ -6,7 +6,7 @@ diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgda except (AttributeError, EnvironmentError, ImportError, ImproperlyConfigured): - lib_path = None -+ lib_path = "@gdal@/lib/libgdal.so" ++ lib_path = "@gdal@/lib/libgdal@extension@" if lib_path: lib_names = None @@ -18,7 +18,7 @@ diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeo except (AttributeError, EnvironmentError, ImportError, ImproperlyConfigured): - lib_path = None -+ lib_path = "@geos@/lib/libgeos_c.so" ++ lib_path = "@geos@/lib/libgeos_c@extension@" # Setting the appropriate names for the GEOS-C library. if lib_path: diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index f727751eda5..483a8eb23d0 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -2,6 +2,7 @@ pythonOlder, geos, gdal, pytz }: + buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; @@ -19,6 +20,7 @@ buildPythonPackage rec { src = ./1.10-gis-libs.template.patch; geos = geos; gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; }) ]; From b244e57c9cb26bacc7186fd47efc93fb9a4f2cac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 9 Oct 2017 18:21:41 +0200 Subject: [PATCH 0920/2806] python.pkgs.django: make gdal support optional --- pkgs/development/python-modules/django/1_11.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 483a8eb23d0..8bb4c4cae69 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchurl, substituteAll, pythonOlder, - geos, gdal, pytz + geos, gdal, pytz, + withGdal ? false }: buildPythonPackage rec { @@ -15,7 +16,7 @@ buildPythonPackage rec { sha256 = "0a9bk1a0n0264lcr67fmwzqyhkhy6bqdzkxsj9a8dpyzca0qfdhq"; }; - patches = [ + patches = stdenv.lib.optionals withGdal [ (substituteAll { src = ./1.10-gis-libs.template.patch; geos = geos; From 9304ae04d7d6e24630943ee5312099c6568e1d32 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 9 Oct 2017 18:41:45 +0200 Subject: [PATCH 0921/2806] python.pkgs.pelican: only patch shebangs in /bin, fixes #30116 --- pkgs/development/python-modules/pelican/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index ea582afd96f..e48623ef5b3 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -45,6 +45,16 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; + + # We only want to patch shebangs in /bin, and not those + # of the project scripts that are created by Pelican. + # See https://github.com/NixOS/nixpkgs/issues/30116 + dontPatchShebangs = true; + + postFixup = '' + patchShebangs $out/bin + ''; + meta = with stdenv.lib; { description = "A tool to generate a static blog from reStructuredText or Markdown input files"; homepage = http://getpelican.com/; From 71ee4751e447ae9010b6784718683041503ca1df Mon Sep 17 00:00:00 2001 From: geistesk Date: Sun, 8 Oct 2017 19:13:36 +0200 Subject: [PATCH 0922/2806] pypcap: init at 1.1.6 --- .../python-modules/pypcap/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/pypcap/default.nix diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix new file mode 100644 index 00000000000..ab4c5f6034f --- /dev/null +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, writeText, buildPythonPackage, fetchPypi, isPy3k, libpcap, dpkt }: + +buildPythonPackage rec { + pname = "pypcap"; + version = "1.1.6"; + name = "${pname}-${version}"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1cx7qm0w2a91g5z8k3kmlwz0b8dkr0h8dlb64rwgyhp2laa33syi"; + }; + + patches = [ + # The default setup.py searchs for pcap.h in a static list of default + # folders. So we have to add the path to libpcap in the nix-store. + (writeText "libpcap-path.patch" + '' + --- a/setup.py + +++ b/setup.py + @@ -27,7 +27,8 @@ def recursive_search(path, target_files): + + def get_extension(): + # A list of all the possible search directories + - dirs = ['/usr', sys.prefix] + glob.glob('/opt/libpcap*') + \ + + dirs = ['${libpcap}', '/usr', sys.prefix] + \ + + glob.glob('/opt/libpcap*') + \ + glob.glob('../libpcap*') + glob.glob('../wpdpack*') + \ + glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/' + + 'MacOSX.platform/Developer/SDKs/*') + '') + ]; + + buildInputs = [ libpcap dpkt ]; + + meta = { + homepage = https://github.com/pynetwork/pypcap; + description = "Simplified object-oriented Python wrapper for libpcap"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f35991eeaed..bef07dec37f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17594,6 +17594,8 @@ in { }; }; + pypcap = callPackage ../development/python-modules/pypcap {}; + pyplatec = buildPythonPackage rec { name = "PyPlatec-${version}"; version = "1.4.0"; From 4bba6650a6a5a2009e25bdeed8c1e871601a9bfb Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Oct 2017 19:24:20 +0200 Subject: [PATCH 0923/2806] liboauth: fix for new nss header layout --- pkgs/development/libraries/liboauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 855d921206e..ddea4eb61f7 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -10,11 +10,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ nss nspr ]; configureFlags = [ "--enable-nss" ]; + NIX_CFLAGS_COMPILE = [ "-I${nss.dev}/include/nss" ]; + postInstall = '' substituteInPlace $out/lib/liboauth.la \ --replace "-lnss3" "-L${nss.out}/lib -lnss3" @@ -26,5 +27,4 @@ stdenv.mkDerivation rec { homepage = http://liboauth.sourceforge.net/; repositories.git = https://github.com/x42/liboauth.git; }; - } From c8bac0092129d6479ae47c9f6486193a6b153e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sun, 8 Oct 2017 22:06:12 +0200 Subject: [PATCH 0924/2806] qt5: 5.9.1 -> 5.9.2 --- pkgs/development/libraries/qt-5/5.9/fetch.sh | 2 +- .../libraries/qt-5/5.9/qtbase/default.nix | 4 +- pkgs/development/libraries/qt-5/5.9/srcs.nix | 320 +++++++++--------- 3 files changed, 163 insertions(+), 163 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index 2ae85bba391..d026d2a922a 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \ +WGET_ARGS=( https://download.qt.io/archive/qt/5.9/5.9.2/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index 23dab52b80c..612753db415 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -3,7 +3,7 @@ src, version, qtCompatVersion, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, + ruby, which, # darwin support darwin, libiconv, libcxx, @@ -73,7 +73,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig python2 ] + [ bison flex gperf lndir perl pkgconfig python2 which ] ++ lib.optional (!stdenv.isDarwin) patchelf; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix index 247800b7578..f30802472fb 100644 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix @@ -3,275 +3,283 @@ { qt3d = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz"; - sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg"; - name = "qt3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qt3d-opensource-src-5.9.2.tar.xz"; + sha256 = "10q7npsl087sja0g2n3v0cg4n75y7sbrs3mfjcsg1wpkw8psjmf9"; + name = "qt3d-opensource-src-5.9.2.tar.xz"; }; }; qtactiveqt = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz"; - sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg"; - name = "qtactiveqt-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtactiveqt-opensource-src-5.9.2.tar.xz"; + sha256 = "1kz59ns6afnd8s73ys7hqffg9ki9g7px009b2ab72nq7f8cqsib0"; + name = "qtactiveqt-opensource-src-5.9.2.tar.xz"; }; }; qtandroidextras = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz"; - sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj"; - name = "qtandroidextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtandroidextras-opensource-src-5.9.2.tar.xz"; + sha256 = "1hsx16v17iqjhs20xn7an2ad7g8djwrmxachscjhji1dvk4682nl"; + name = "qtandroidextras-opensource-src-5.9.2.tar.xz"; }; }; qtbase = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz"; - sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw"; - name = "qtbase-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz"; + sha256 = "16v0dny4rcyd5p8qsnsfg89w98k8kqk3rp9x3g3k7xjmi53bpqkz"; + name = "qtbase-opensource-src-5.9.2.tar.xz"; }; }; qtcanvas3d = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz"; - sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb"; - name = "qtcanvas3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtcanvas3d-opensource-src-5.9.2.tar.xz"; + sha256 = "1siyzgm1mjx90rwyzzq9vw2s2xzyf6n7q0vn8gw7mdim5indda44"; + name = "qtcanvas3d-opensource-src-5.9.2.tar.xz"; }; }; qtcharts = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz"; - sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k"; - name = "qtcharts-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtcharts-opensource-src-5.9.2.tar.xz"; + sha256 = "193a3imkgryw42s0gbwaj9gpqd673h3jrg86jvmy33l2fc5gfyjf"; + name = "qtcharts-opensource-src-5.9.2.tar.xz"; }; }; qtconnectivity = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz"; - sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0"; - name = "qtconnectivity-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtconnectivity-opensource-src-5.9.2.tar.xz"; + sha256 = "1k7kjmlny0ykm40qx796wbsg3310v6b8hqizkbr597cmxjbrax9c"; + name = "qtconnectivity-opensource-src-5.9.2.tar.xz"; }; }; qtdatavis3d = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz"; - sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13"; - name = "qtdatavis3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdatavis3d-opensource-src-5.9.2.tar.xz"; + sha256 = "1cmjjbbmdqdix1f8b7qyc2vwhj9pvchc8r4lp65qw11dhycmdbh6"; + name = "qtdatavis3d-opensource-src-5.9.2.tar.xz"; }; }; qtdeclarative = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz"; - sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj"; - name = "qtdeclarative-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdeclarative-opensource-src-5.9.2.tar.xz"; + sha256 = "020bha6q8byxc8cj5zw7gms5rgsjg71hv31hv1rr2fy7x56zsh0d"; + name = "qtdeclarative-opensource-src-5.9.2.tar.xz"; }; }; qtdoc = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz"; - sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x"; - name = "qtdoc-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdoc-opensource-src-5.9.2.tar.xz"; + sha256 = "0dfva8h8f9wpszih285qcxlfcijy52qcbfy1zy20gxh72nfi86c9"; + name = "qtdoc-opensource-src-5.9.2.tar.xz"; }; }; qtgamepad = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz"; - sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi"; - name = "qtgamepad-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtgamepad-opensource-src-5.9.2.tar.xz"; + sha256 = "0lm5v43psf7r8zc79dcjdmmdnz4jm30ylgkvsyv8k88mj06yklbn"; + name = "qtgamepad-opensource-src-5.9.2.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; - sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz"; - name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtgraphicaleffects-opensource-src-5.9.2.tar.xz"; + sha256 = "0xpvigfiqfqvf05ywj8x69y57rp8dwq2hs1kpxlxs15pniz4wn8l"; + name = "qtgraphicaleffects-opensource-src-5.9.2.tar.xz"; }; }; qtimageformats = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz"; - sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr"; - name = "qtimageformats-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtimageformats-opensource-src-5.9.2.tar.xz"; + sha256 = "1wwxxcl24mk1p4w6knyfai09axmwqsm6cgsbkjsmdz3zmjh6qqis"; + name = "qtimageformats-opensource-src-5.9.2.tar.xz"; }; }; qtlocation = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz"; - sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b"; - name = "qtlocation-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtlocation-opensource-src-5.9.2.tar.xz"; + sha256 = "033b6l6jbvmc0k5qvbgh5vkzvfga7npqcphrywrrqkmx9vj446n8"; + name = "qtlocation-opensource-src-5.9.2.tar.xz"; }; }; qtmacextras = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz"; - sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11"; - name = "qtmacextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtmacextras-opensource-src-5.9.2.tar.xz"; + sha256 = "0f14xkardmidvwljccrv6adcs4nyn8rzry9k74mwqn0ikvycs3my"; + name = "qtmacextras-opensource-src-5.9.2.tar.xz"; }; }; qtmultimedia = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz"; - sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4"; - name = "qtmultimedia-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtmultimedia-opensource-src-5.9.2.tar.xz"; + sha256 = "0815hi3cxy5zy6yc5fkdpx2xd6rk7968j1ziwl2g4wa80802g9n9"; + name = "qtmultimedia-opensource-src-5.9.2.tar.xz"; }; }; qtnetworkauth = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz"; - sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra"; - name = "qtnetworkauth-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtnetworkauth-opensource-src-5.9.2.tar.xz"; + sha256 = "16i33m8x5yii22ciq97bpfmnw0lwhvgv84i2az30a1ikm9dg00x0"; + name = "qtnetworkauth-opensource-src-5.9.2.tar.xz"; }; }; qtpurchasing = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz"; - sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss"; - name = "qtpurchasing-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtpurchasing-opensource-src-5.9.2.tar.xz"; + sha256 = "04f28y7qcr4kd0pw26mm515qj7haxr0i8lijn1q47wkikxyhawca"; + name = "qtpurchasing-opensource-src-5.9.2.tar.xz"; }; }; qtquickcontrols = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz"; - sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj"; - name = "qtquickcontrols-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtquickcontrols-opensource-src-5.9.2.tar.xz"; + sha256 = "07xxhkfsljwdwlp9jfp88pwkrig02y2pnwhdsaz8mkcackwfq2az"; + name = "qtquickcontrols-opensource-src-5.9.2.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz"; - sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0"; - name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtquickcontrols2-opensource-src-5.9.2.tar.xz"; + sha256 = "1ln83afxyp5dmvdnq6n7as82xrd5k3xvfx7b1jxnljivslyxsm9b"; + name = "qtquickcontrols2-opensource-src-5.9.2.tar.xz"; }; }; qtremoteobjects = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz"; - sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0"; - name = "qtremoteobjects-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtremoteobjects-opensource-src-5.9.2.tar.xz"; + sha256 = "1ylphdwis34y4pm9xiwh2xqfd0hh2gp8kkawlps2q5mh2bm11376"; + name = "qtremoteobjects-opensource-src-5.9.2.tar.xz"; }; }; qtscript = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz"; - sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp"; - name = "qtscript-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtscript-opensource-src-5.9.2.tar.xz"; + sha256 = "1wa0rnbphkhgydnwkf5bjwn0llskl6hgs0964nh0jik8qaspv027"; + name = "qtscript-opensource-src-5.9.2.tar.xz"; }; }; qtscxml = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz"; - sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0"; - name = "qtscxml-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtscxml-opensource-src-5.9.2.tar.xz"; + sha256 = "0pdimqwdrj8hckm81lwy1z58ji4bdv0bzgv336m0a8v3pj914awx"; + name = "qtscxml-opensource-src-5.9.2.tar.xz"; }; }; qtsensors = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz"; - sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was"; - name = "qtsensors-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtsensors-opensource-src-5.9.2.tar.xz"; + sha256 = "1lxmhi19dbb8vjhpjph0l0ss6zh72hb4908lp4s1pgf8r641ai3r"; + name = "qtsensors-opensource-src-5.9.2.tar.xz"; }; }; qtserialbus = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz"; - sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa"; - name = "qtserialbus-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtserialbus-opensource-src-5.9.2.tar.xz"; + sha256 = "025yv7zajz5scrmkjkmgkyvxpgkliqvrzc88is0gr481zpd4phmv"; + name = "qtserialbus-opensource-src-5.9.2.tar.xz"; }; }; qtserialport = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz"; - sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1"; - name = "qtserialport-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtserialport-opensource-src-5.9.2.tar.xz"; + sha256 = "0hndc9z7qzxazzjvc6k5yd58afw13444plk70b05nqdi5p19rvah"; + name = "qtserialport-opensource-src-5.9.2.tar.xz"; }; }; qtspeech = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz"; - sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c"; - name = "qtspeech-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtspeech-opensource-src-5.9.2.tar.xz"; + sha256 = "0cq33dffi7q7dnvzhdivky5prakb8xnwap0b76fwgirhbbn88ypg"; + name = "qtspeech-opensource-src-5.9.2.tar.xz"; }; }; qtsvg = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz"; - sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr"; - name = "qtsvg-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtsvg-opensource-src-5.9.2.tar.xz"; + sha256 = "020icrl9vi8jh8ygsssqrx2bl8bx28m15dwmf9a969qdnvxyp5ms"; + name = "qtsvg-opensource-src-5.9.2.tar.xz"; }; }; qttools = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz"; - sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4"; - name = "qttools-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz"; + sha256 = "06nqsa5mj0mc9w9xbm7mgdkb66x4wlvkhnas32f97sb8ic8rdf9b"; + name = "qttools-opensource-src-5.9.2.tar.xz"; }; }; qttranslations = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz"; - sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja"; - name = "qttranslations-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qttranslations-opensource-src-5.9.2.tar.xz"; + sha256 = "0byi4s07lfnzzlr2c4sc5qg3hrysswmakwmf80q2mx50kpgnvwax"; + name = "qttranslations-opensource-src-5.9.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; - sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b"; - name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtvirtualkeyboard-opensource-src-5.9.2.tar.xz"; + sha256 = "1z66chp5746cb0rwy2isnpbvwjj44qvp2hg56n3g47dj901wldp8"; + name = "qtvirtualkeyboard-opensource-src-5.9.2.tar.xz"; }; }; qtwayland = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz"; - sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g"; - name = "qtwayland-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwayland-opensource-src-5.9.2.tar.xz"; + sha256 = "1ipn4xh0dj1kjg5i4vfl4gpx3hg2377w5gls47xpv1ikz41lshzn"; + name = "qtwayland-opensource-src-5.9.2.tar.xz"; }; }; qtwebchannel = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz"; - sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0"; - name = "qtwebchannel-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebchannel-opensource-src-5.9.2.tar.xz"; + sha256 = "09iss70c1iqgf8qpik35qlgrdw5y9935v0fm2ppgkmxdxkpls6ww"; + name = "qtwebchannel-opensource-src-5.9.2.tar.xz"; }; }; qtwebengine = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz"; - sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn"; - name = "qtwebengine-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebengine-opensource-src-5.9.2.tar.xz"; + sha256 = "0251qk04yif4lsn8qvkc2kmzzmaw1v3pfh5ypr06d04zb3j6kc6a"; + name = "qtwebengine-opensource-src-5.9.2.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.9.2"; + src = fetchurl { + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebsockets-opensource-src-5.9.2.tar.xz"; + sha256 = "0x0nx1ampqsgj9qlc3l32z3ham1a5vq7m2lnxk5pr92yj6yw3pdg"; + name = "qtwebsockets-opensource-src-5.9.2.tar.xz"; }; }; qtwebkit = { @@ -290,44 +298,36 @@ name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz"; }; }; - qtwebsockets = { - version = "5.9.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz"; - sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1"; - name = "qtwebsockets-opensource-src-5.9.1.tar.xz"; - }; - }; qtwebview = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz"; - sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn"; - name = "qtwebview-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebview-opensource-src-5.9.2.tar.xz"; + sha256 = "1cdqw6pjfqagnwxrha0s18zadjnm65dsildxj07h2qiwqxwyrjpw"; + name = "qtwebview-opensource-src-5.9.2.tar.xz"; }; }; qtwinextras = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz"; - sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s"; - name = "qtwinextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwinextras-opensource-src-5.9.2.tar.xz"; + sha256 = "07qq9rxl6hhl300w7qxsjjbdd5fwpszfk3rbinxklg20f6c6ixml"; + name = "qtwinextras-opensource-src-5.9.2.tar.xz"; }; }; qtx11extras = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz"; - sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6"; - name = "qtx11extras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtx11extras-opensource-src-5.9.2.tar.xz"; + sha256 = "1ias745j5lfnrfkgyk0pr8n8zlkqs08gq7yyzaj1c645sh54b1fv"; + name = "qtx11extras-opensource-src-5.9.2.tar.xz"; }; }; qtxmlpatterns = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz"; - sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m"; - name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtxmlpatterns-opensource-src-5.9.2.tar.xz"; + sha256 = "0knk4bplqhvsxar1wv16bzfw57q0aja12gdaxz7m8mvx121sm9ha"; + name = "qtxmlpatterns-opensource-src-5.9.2.tar.xz"; }; }; } From 034c168aa29fa95c323125d970d4018d25ac7eee Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Oct 2017 20:49:11 +0200 Subject: [PATCH 0925/2806] nss: fix includedir for pkgconfig --- pkgs/development/libraries/nss/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index c88cfb8826e..5f0918d6451 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { sed -e "s,%prefix%,$PREFIX," \ -e "s,%exec_prefix%,$PREFIX," \ -e "s,%libdir%,$PREFIX/lib64," \ - -e "s,%includedir%,$PREFIX/include/nss," \ + -e "s,%includedir%,$dev/include/nss," \ -e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \ -e "s,%NSPR_VERSION%,4.16,g" \ pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc From 6dc6cb1d1883d32949743c1ff4908d6d1f6fe254 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Oct 2017 20:44:04 +0200 Subject: [PATCH 0926/2806] Revert "liboauth: fix for new nss header layout" This reverts commit 4bba6650a6a5a2009e25bdeed8c1e871601a9bfb. --- pkgs/development/libraries/liboauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index ddea4eb61f7..855d921206e 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -10,12 +10,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ nss nspr ]; configureFlags = [ "--enable-nss" ]; - NIX_CFLAGS_COMPILE = [ "-I${nss.dev}/include/nss" ]; - postInstall = '' substituteInPlace $out/lib/liboauth.la \ --replace "-lnss3" "-L${nss.out}/lib -lnss3" @@ -27,4 +26,5 @@ stdenv.mkDerivation rec { homepage = http://liboauth.sourceforge.net/; repositories.git = https://github.com/x42/liboauth.git; }; + } From c8a2265513eb39741633ad7ca5552be18102e0fa Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Oct 2017 20:50:02 +0200 Subject: [PATCH 0927/2806] Revert "chromium: take into account new nss header layout" This reverts commit df41edfe1c85d76c00f90c688f4f9552b0e61225. --- pkgs/applications/networking/browsers/chromium/common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index cecaf751315..f6f9a829c2d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -124,9 +124,6 @@ let ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; - # NSS header layout change - NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss"]; - patches = [ ./patches/nix_plugin_paths_52.patch # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled From 6c870f5e86453fa5aa12674ad95e0f1cd6704ae0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Oct 2017 20:50:14 +0200 Subject: [PATCH 0928/2806] Revert "libreoffice-fresh: take into account new nss header layout" This reverts commit f3c798dd7487cf7aa16facb2f6b397ec4de561e0. --- pkgs/applications/office/libreoffice/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 63357861b38..830692f08eb 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -65,10 +65,8 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - # NSS update changed header layout # And LO refers to gpgme++ by no-path name - NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" - "-I${nss.dev}/include/nss" "-I${gpgme.dev}/include/gpgme++" ]; + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. From db0ec924fd8c8c50c38fdc4214d63470b5173a7f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Oct 2017 20:50:27 +0200 Subject: [PATCH 0929/2806] Revert "libreoffice-still: fix build (re: nss update)" This reverts commit 75ecaa1b524a20d39762538112eb774bb34e4fa0. --- pkgs/applications/office/libreoffice/still.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 4aaa54bfc97..dfe6e947080 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -65,9 +65,7 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - # NSS update changed header layout - NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" - "-I${nss.dev}/include/nss"]; + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. From 1fbf00f0ae01d3234864208ecba934f11d185b7f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Oct 2017 20:50:38 +0200 Subject: [PATCH 0930/2806] Revert "qt59.qtwebengine: fix build (re: nss update)" This reverts commit 8a928f39161688c88600a59feaf3a99fd1f060e7. --- pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix index f001f64db3f..c0b9aa83e19 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix @@ -101,9 +101,6 @@ qtSubmodule { ]; patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; - # NSS header layout change - NIX_CFLAGS_COMPILE = [ "-I${nss.dev}/include/nss" ]; - dontUseNinjaBuild = true; dontUseNinjaInstall = true; From f2ce15be9d4a943e745856cc197b906466b36f6e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Oct 2017 20:51:30 +0200 Subject: [PATCH 0931/2806] Revert "xmlsec: fix build (re: nss update)" This reverts commit d66a3404a62629f91cd25fd696ea92b18328fc95. --- pkgs/development/libraries/xmlsec/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 264a377cb25..32ce856eddd 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909 NIX_LDFLAGS = [ "-lgcrypt" ]; - NIX_CFLAGS_COMPILE = [ "-I${nss.dev}/include/nss" ]; postInstall = '' moveToOutput "bin/xmlsec1-config" "$dev" From 7b818893947747485c14a1c5bf663b1560e7284e Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Mon, 9 Oct 2017 20:52:25 +0200 Subject: [PATCH 0932/2806] nixos/config/timezone: Disallow spaces --- nixos/modules/config/timezone.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index aa030a816d0..b15948f6e2e 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -5,6 +5,9 @@ with lib; let tzdir = "${pkgs.tzdata}/share/zoneinfo"; + nospace = str: filter (c: c == " ") (stringToCharacters str) == []; + timezone = types.nullOr (types.addCheck types.str nospace) + // { description = "null or string without spaces"; }; in @@ -15,7 +18,7 @@ in timeZone = mkOption { default = null; - type = types.nullOr types.str; + type = timezone; example = "America/New_York"; description = '' The time zone used when displaying times and dates. See Date: Mon, 9 Oct 2017 16:02:19 -0300 Subject: [PATCH 0933/2806] cbatticon: 1.6.6 -> 1.6.7 --- pkgs/applications/misc/cbatticon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 1aeb45f1e20..0c71b3ffb0a 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cbatticon-${version}"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "valr"; repo = "cbatticon"; rev = version; - sha256 = "0gphijkjmg5q349ffhnx12dppg6hajkr90n0x5b6s9cad5b4q0kq"; + sha256 = "0rm1rpq81cxjwd4f11c3ivg5hwsd08qm47vdn16yr1cmm2cw4r2d"; }; makeFlags = "PREFIX=$(out)"; From b3df084c706c4206c07d151cb4375f594fe6a7ac Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 9 Oct 2017 12:07:19 -0700 Subject: [PATCH 0934/2806] nixos: minor X11 option description improvements (#30035) --- nixos/modules/services/x11/hardware/libinput.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index d75c785270b..44555cb6e2a 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -75,12 +75,13 @@ in { default = null; description = '' - Enables a click method. Permitted values are none, buttonareas, clickfinger. + Enables a click method. Permitted values are none, + buttonareas, clickfinger. Not all devices support all methods, if an option is unsupported, - the default click method for this device is used. + the default click method for this device is used. ''; }; - + leftHanded = mkOption { type = types.bool; default = false; @@ -96,7 +97,7 @@ in { simultaneously produces a middle mouse button click. ''; }; - + naturalScrolling = mkOption { type = types.bool; default = false; @@ -120,7 +121,8 @@ in { example = "edge"; description = '' - Specify the scrolling method. + Specify the scrolling method: twofinger, edge, + or none ''; }; @@ -141,7 +143,8 @@ in { example = "disabled"; description = '' - Sets the send events mode to disabled, enabled, or "disable when an external mouse is connected". + Sets the send events mode to disabled, enabled, + or disabled-on-external-mouse ''; }; From e9609f25b3adf9b86c9b3b910c79188e9691e3b9 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Mon, 9 Oct 2017 21:31:16 +0200 Subject: [PATCH 0935/2806] v8_6_x: 6.2.414.15 -> 6.2.414.27 --- pkgs/development/libraries/v8/6_x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix index dc6a559d287..4095ff20c2b 100644 --- a/pkgs/development/libraries/v8/6_x.nix +++ b/pkgs/development/libraries/v8/6_x.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "6.2.414.15"; + version = "6.2.414.27"; inherit doCheck; @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { owner = "v8"; repo = "v8"; rev = version; - sha256 = "1c1pjj72mj097rak2zsmm2iqn00iw93dc6gvxd89p4lbfaiilsn8"; + sha256 = "15zrb9bcpnhljhrilqnjaak3a4xnhj8li6ra12g3gkrw3fzir9a2"; }; postUnpack = '' From 953ce94826632f0cc171daf6d9fa0da47062fc9d Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 9 Oct 2017 22:15:17 +0200 Subject: [PATCH 0936/2806] pythonPackages.shapely: fix patchPhase --- pkgs/development/python-modules/shapely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 48d4fa68f65..8f81a810cfa 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { libc = if stdenv.isDarwin then "libc.dylib" else "libc.so.6"; in '' sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}'])|" shapely/geos.py - sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${stdenv.cc.libc}']).free|" shapely/geos.py + sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${libc}']).free|" shapely/geos.py ''; # tests/test_voctorized fails because the vectorized extension is not From 1392d2a74b9e93924ef309899a3253d920621547 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 9 Oct 2017 22:16:43 +0200 Subject: [PATCH 0937/2806] pythonPackages.shapely. 1.5.15 -> 1.6.1 --- pkgs/development/python-modules/shapely/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 8f81a810cfa..85052a34a56 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Shapely"; - version = "1.5.15"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0lfqxb3kpdn0g9zzlhzg79yc8iyy4fpsk0p5nd80gar1mmhr8pg7"; + sha256 = "1iyhrkm6g233gwbd20sf4aq4by0kg52cz1d2k7imnqgzjpmkgqas"; }; buildInputs = [ geos glibcLocales cython ]; From 7002ca7e1ca74ad2ba07a7dcfc68a92b7ea9546c Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 9 Oct 2017 17:04:21 +0200 Subject: [PATCH 0938/2806] nixos/zsh-syntax-highlighting: refactor --- .../programs/zsh/zsh-syntax-highlighting.nix | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix index 9452489e2fb..e7cf17c2c00 100644 --- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix +++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -5,74 +5,74 @@ with lib; let cfg = config.programs.zsh.syntaxHighlighting; in - { - options = { - programs.zsh.syntaxHighlighting = { - enable = mkEnableOption "zsh-syntax-highlighting"; +{ + options = { + programs.zsh.syntaxHighlighting = { + enable = mkEnableOption "zsh-syntax-highlighting"; - highlighters = mkOption { - default = [ "main" ]; + highlighters = mkOption { + default = [ "main" ]; - # https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md - type = types.listOf(types.enum([ - "main" - "brackets" - "pattern" - "cursor" - "root" - "line" - ])); + # https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md + type = types.listOf(types.enum([ + "main" + "brackets" + "pattern" + "cursor" + "root" + "line" + ])); - description = '' - Specifies the highlighters to be used by zsh-syntax-highlighting. + description = '' + Specifies the highlighters to be used by zsh-syntax-highlighting. - The following defined options can be found here: - https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md - ''; - }; + The following defined options can be found here: + https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md + ''; + }; - patterns = mkOption { - default = {}; - type = types.attrsOf types.string; + patterns = mkOption { + default = {}; + type = types.attrsOf types.string; - example = literalExample '' - { - "rm -rf *" = "fg=white,bold,bg=red"; - } - ''; + example = literalExample '' + { + "rm -rf *" = "fg=white,bold,bg=red"; + } + ''; - description = '' - Specifies custom patterns to be highlighted by zsh-syntax-highlighting. + description = '' + Specifies custom patterns to be highlighted by zsh-syntax-highlighting. - Please refer to the docs for more information about the usage: - https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md - ''; - }; + Please refer to the docs for more information about the usage: + https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md + ''; }; }; + }; - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ zsh-syntax-highlighting ]; + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ zsh-syntax-highlighting ]; - programs.zsh.interactiveShellInit = with pkgs; with builtins; '' - source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + assertions = [ + { + assertion = length(attrNames cfg.patterns) > 0 -> elem "pattern" cfg.highlighters; + message = '' + When highlighting patterns, "pattern" needs to be included in the list of highlighters. + ''; + } + ]; - ${optionalString (length(cfg.highlighters) > 0) - "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})" - } - - ${let - n = attrNames cfg.patterns; - in - optionalString (length(n) > 0) - (assert(elem "pattern" cfg.highlighters); (foldl ( - a: b: - '' - ${a} - ZSH_HIGHLIGHT_PATTERNS+=('${b}' '${attrByPath [b] "" cfg.patterns}') - '' - ) "") n) - } - ''; - }; - } + programs.zsh.interactiveShellInit = with pkgs; + lib.concatStringsSep "\n" ([ + "source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" + ] ++ optional (length(cfg.highlighters) > 0) + "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})" + ++ optionals (length(attrNames cfg.patterns) > 0) + (mapAttrsToList ( + pattern: design: + "ZSH_HIGHLIGHT_PATTERNS+=('${pattern}' '${design}')" + ) cfg.patterns) + ); + }; +} From 7dd87bd0c43ce3435c31ef237dc91cf670e0672d Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Mon, 9 Oct 2017 23:32:12 +0200 Subject: [PATCH 0939/2806] eventstore: 3.5.0 -> 4.0.3 ... and use recent V8 version. --- pkgs/servers/nosql/eventstore/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 572cfe1f17d..e6bf634b554 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, fetchpatch, mono, v8 }: +{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8 }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. stdenv.mkDerivation rec { name = "EventStore-${version}"; - version = "3.5.0"; + version = "4.0.3"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "0dp5914hxwdzw62q49wavqfqkw3jy0dvml09y7gh8frnbiajcxq9"; + sha256 = "1905bnqyyiqprva67cp49rgib324iipw2l71jzj0ynzi7kxr4mgg"; }; buildPhase = '' @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/clusternode ''; + nativeBuildInputs = [ git ]; buildInputs = [ v8 mono ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ada3c6169e..f9d0142c137 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11339,7 +11339,8 @@ with pkgs; elasticmq = callPackage ../servers/elasticmq { }; eventstore = callPackage ../servers/nosql/eventstore { - v8 = v8_3_24_10; + mono = mono46; + v8 = v8_6_x; }; etcdctl = etcd; From 8ca237e69888f795a3dd9668771b274b760ba6b2 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Mon, 9 Oct 2017 23:40:12 +0200 Subject: [PATCH 0940/2806] v8_3_24_10: remove --- pkgs/development/libraries/v8/3.24.10.nix | 6 -- pkgs/development/libraries/v8/generic.nix | 79 ----------------------- pkgs/top-level/all-packages.nix | 5 -- 3 files changed, 90 deletions(-) delete mode 100644 pkgs/development/libraries/v8/3.24.10.nix delete mode 100644 pkgs/development/libraries/v8/generic.nix diff --git a/pkgs/development/libraries/v8/3.24.10.nix b/pkgs/development/libraries/v8/3.24.10.nix deleted file mode 100644 index e7b10f23ac8..00000000000 --- a/pkgs/development/libraries/v8/3.24.10.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "3.24.10"; - sha256 = "1blz5h9syk93bb4x3shcai3s2jhh6ai4bpymr9rz0f1ysvg60x75"; -}) diff --git a/pkgs/development/libraries/v8/generic.nix b/pkgs/development/libraries/v8/generic.nix deleted file mode 100644 index d603fda3225..00000000000 --- a/pkgs/development/libraries/v8/generic.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl, gyp, readline, python, which, icu -, version -, sha256 -, ... -}: - -assert readline != null; - -let - arch = if stdenv.is64bit then "x64" else "ia32"; -in - -stdenv.mkDerivation rec { - name = "v8-${version}"; - inherit version; - - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromium-browser-official/" - + "${name}.tar.bz2"; - inherit sha256; - }; - - patchPhase = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 - ''; - - configurePhase = '' - PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ - build/gyp_v8 \ - -f make \ - --generator-output="out" \ - -Dflock_index=0 \ - -Dv8_enable_i18n_support=1 \ - -Duse_system_icu=1 \ - -Dconsole=readline \ - -Dcomponent=shared_library \ - -Dv8_target_arch=${arch} - ''; - - nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - - buildFlags = [ - "LINK=g++" - "-C out" - "builddir=$(CURDIR)/Release" - "BUILDTYPE=Release" - ]; - - postPatch = stdenv.lib.optionalString (!stdenv.cc.isClang) '' - sed -i build/standalone.gyp -e 's,-Wno-format-pedantic,,g' - ''; - - enableParallelBuilding = true; - - installPhase = '' - install -vD out/Release/d8 "$out/bin/d8" - ${if stdenv.system == "x86_64-darwin" then '' - install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" - '' else '' - install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" - ''} - cp -vr include "$out/" - ''; - - postFixup = if stdenv.isDarwin then '' - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib - '' else null; - - meta = with stdenv.lib; { - description = "Google's open source JavaScript engine"; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9d0142c137..0dc2f449196 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10721,11 +10721,6 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; - v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix { - inherit (python2Packages) python gyp; - stdenv = overrideCC stdenv gcc5; - }; - v8_6_x = callPackage ../development/libraries/v8/6_x.nix { inherit (python2Packages) python; }; From 1afd97aa8f5893b92be5861d11b31c3ba9581f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 9 Oct 2017 23:44:28 +0200 Subject: [PATCH 0941/2806] fcron module: fix use with hardlink-optimized store --- nixos/modules/services/scheduling/fcron.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 8b87f72811a..ac589be5773 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -146,7 +146,7 @@ in --group fcron \ --directory /var/spool/fcron # load system crontab file - /run/wrappers/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab} + /run/wrappers/bin/fcrontab -u systab - < ${pkgs.writeText "systab" cfg.systab} ''; serviceConfig = { From 3541b9a72ec155e0a36c8c924e04aebc0a2a6875 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 9 Oct 2017 23:46:40 +0100 Subject: [PATCH 0942/2806] autorandr: put xrandr into PATH --- pkgs/tools/misc/autorandr/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index dc67c96ca1a..405eb29f6bf 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -1,7 +1,9 @@ { stdenv , python3Packages , fetchFromGitHub -, systemd }: +, systemd +, xrandr +, makeWrapper }: let python = python3Packages.python; @@ -12,6 +14,7 @@ in name = "autorandr-${version}"; buildInputs = [ python ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -33,9 +36,15 @@ in make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ UDEV_RULES_DIR=/etc/udev/rules.d ''} + runHook postInstall ''; + postFixup = '' + wrapProgram $out/bin/autorandr \ + --prefix PATH : ${xrandr}/bin + ''; + src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; From d89b68ed87363fee546ad65dbedd3b4409c73dbd Mon Sep 17 00:00:00 2001 From: bugworm Date: Tue, 10 Oct 2017 03:39:04 +0300 Subject: [PATCH 0943/2806] antigen: init at 2.2.1 (#27266) * Added antigen * Repaced link to releases --- pkgs/shells/antigen/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/shells/antigen/default.nix diff --git a/pkgs/shells/antigen/default.nix b/pkgs/shells/antigen/default.nix new file mode 100644 index 00000000000..b43f2d30570 --- /dev/null +++ b/pkgs/shells/antigen/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "2.2.1"; + name = "antigen-${version}"; + + src = fetchurl { + url = "https://github.com/zsh-users/antigen/releases/download/v${version}/antigen.zsh"; + sha256 = "0s32280ak0gd0rr66g5dj6r5px0si8w47bcxlqfpaijg7i8xk1i7"; + }; + phases = "installPhase"; + + installPhase = '' + outdir=$out/share/antigen + + mkdir -p $outdir + cp $src $outdir/antigen.zsh + ''; + + meta = { + description = "The plugin manager for zsh."; + homepage = http://antigen.sharats.me; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb9a85de6e1..299aaf8863d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1227,6 +1227,8 @@ with pkgs; utillinux = utillinuxMinimal; }; + antigen = callPackage ../shells/antigen { }; + apparix = callPackage ../tools/misc/apparix { }; appdata-tools = callPackage ../tools/misc/appdata-tools { }; From f5c129d70749c38d779a4cd68495b84608947c4a Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 9 Oct 2017 14:09:06 -0400 Subject: [PATCH 0944/2806] easyloggingpp: init at 9.95.0 --- .../libraries/easyloggingpp/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/easyloggingpp/default.nix diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix new file mode 100644 index 00000000000..fe14a1b2b77 --- /dev/null +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, gtest }: +stdenv.mkDerivation rec { + name = "easyloggingpp-${version}"; + version = "9.95.0"; + src = fetchFromGitHub { + owner = "muflihun"; + repo = "easyloggingpp"; + rev = "v${version}"; + sha256 = "0gzmznw6ffag9x55lixxffy6x7mvb7691x0md4q9rbh88zkws7kq"; + }; + nativeBuildInputs = [cmake]; + buildInputs = [gtest]; + cmakeFlags = [ "-Dtest=ON" "-Dbuild_static_lib=ON"]; + NIX_CFLAGS_COMPILE = "-std=c++11" + + stdenv.lib.optionalString stdenv.isLinux " -pthread"; + meta = { + description = "C++ logging library"; + homepage = https://muflihun.github.io/easyloggingpp/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [acowley]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9efda62713..cfee2cbb4b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8027,6 +8027,8 @@ with pkgs; dxflib = callPackage ../development/libraries/dxflib {}; + easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; + eccodes = callPackage ../development/libraries/eccodes { }; eclib = callPackage ../development/libraries/eclib {}; From 44e3607ccf2901b6b5916ae4b7f5d051e21362ef Mon Sep 17 00:00:00 2001 From: James Cook Date: Sun, 8 Oct 2017 19:43:35 +0000 Subject: [PATCH 0945/2806] libgnurl: Use recommended configure flags. See https://github.com/NixOS/nixpkgs/issues/30219#issue-263714526 --- .../development/libraries/libgnurl/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index e46da4dc9fb..33276b424e7 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl -, libssh2, libidn, libpsl, openldap }: +, libidn }: stdenv.mkDerivation rec { version = "7.54.1"; @@ -12,20 +12,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ perl gnutls gss openssl zlib libidn libssh2 libpsl openldap ]; + buildInputs = [ perl gnutls gss openssl zlib libidn ]; preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; configureFlags = [ - "--with-zlib" - "--with-gssapi" - "--with-libssh2" - "--with-libidn" - "--with-libpsl" - "--enable-ldap" - "--enable-ldaps" + "--enable-ipv6" "--with-gnutls" "--without-libmetalink" "--without-winidn" + "--without-librtmp" "--without-nghttp2" "--without-nss" "--without-cyassl" + "--without-polarssl" "--without-ssl" "--without-winssl" + "--without-darwinssl" "--disable-sspi" "--disable-ntlm-wb" "--disable-ldap" + "--disable-rtsp" "--disable-dict" "--disable-telnet" "--disable-tftp" + "--disable-pop3" "--disable-imap" "--disable-smtp" "--disable-gopher" + "--disable-file" "--disable-ftp" "--disable-smb" ]; meta = with stdenv.lib; { From e72146b90aaadbe0c8665ecf451dfee872cf1ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 9 Oct 2017 15:50:27 -0300 Subject: [PATCH 0946/2806] enlightenment: 0.21.9 -> 0.21.10 --- pkgs/desktops/enlightenment/enlightenment.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index b16b84acf14..44cb6809ea4 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -4,11 +4,11 @@ mesa_glu, xkeyboard_config, pcre }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.21.9"; + version = "0.21.10"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0w5f3707hyfc20i6xqh4jlr5p2yhy1z794061mjsz2rp4w00qmpb"; + sha256 = "053zmlpjx45xg2rbbxyjh0phhgbsnmsnypzz2bib545klp51bfcv"; }; nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) ]; From 6affc42fed31cd17055184578948f36c3d946a23 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 10 Oct 2017 12:54:17 +0800 Subject: [PATCH 0947/2806] vivaldi: 1.12.995.36 -> 1.12.995.38 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 5fc4ca8bd53..5310a9acb69 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.12.955.36-1"; + version = "1.12.955.38-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "0fh6v4byqvyywlf9xsxn78kfypcqsmf4vypv5mwxh5nrpwim4xqj"; + sha256 = "1bq1ss6vkpr6rw5n0sw9zipxx19vficvxys1lra9symcxk1b4gqw"; }; unpackPhase = '' From a130b56c7728bbe7b21af303319145b54c5a4c5d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 10 Oct 2017 12:54:38 +0800 Subject: [PATCH 0948/2806] vivaldi: do not build broken proprietary codecs by default --- pkgs/applications/networking/browsers/vivaldi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 5310a9acb69..410e8866360 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -7,7 +7,7 @@ , glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3 , nss, nspr , patchelf, makeWrapper -, proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null +, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null }: stdenv.mkDerivation rec { From 0b5fc7fa64c3f90a83621f8add6aca5786abe1ee Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 8 Oct 2017 21:23:36 +0000 Subject: [PATCH 0949/2806] haxe: 3.4.3 -> 3.4.4 --- pkgs/development/compilers/haxe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index a937b42c4b5..c6b4913c623 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -72,8 +72,8 @@ in { ''; }; haxe_3_4 = generic { - version = "3.4.3"; - sha256 = "1rrbrc81pilq0d691kp22yjwvvg0kw7q9b9npdghga2ks0hzpr02"; + version = "3.4.4"; + sha256 = "057psarsmz8q2y9pqv5221vpdya241gcy8xnl2wg9wyscn6z1lx6"; prePatch = '' sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/haxelib/client/Main.hx From b9d276bf4c9169481aefa9335cdd9e2ac6668aa0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 10 Oct 2017 07:21:24 +0000 Subject: [PATCH 0950/2806] antlr4: enable more platforms --- pkgs/development/tools/parsing/antlr/4.7.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index acf7edf0145..41b079bbd23 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = http://www.antlr.org/; - platforms = platforms.linux; + platforms = platforms.unix; }; } From ef1cb94d78735040308a32934382938b9280b5bb Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 10 Oct 2017 17:18:33 +0800 Subject: [PATCH 0951/2806] netalyzr: use makeWrapper i/o custom script --- pkgs/tools/networking/netalyzr/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix index abc6b785c9c..8f8cf929e9d 100644 --- a/pkgs/tools/networking/netalyzr/default.nix +++ b/pkgs/tools/networking/netalyzr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { name = "netalyzr-${version}"; @@ -12,17 +12,13 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p $out/{bin,share/netalyzr} install -m644 $src $out/share/netalyzr/NetalyzrCLI.jar - cat <<_EOF >> $out/bin/netalyzr - #!${stdenv.shell} - - set -euo pipefail - - exec ${stdenv.lib.getBin jre}/bin/java -jar $out/share/netalyzr/NetalyzrCLI.jar "\$@" - _EOF - chmod 755 $out/bin/netalyzr + makeWrapper ${stdenv.lib.getBin jre}/bin/java $out/bin/netalyzr \ + --add-flags "-jar $out/share/netalyzr/NetalyzrCLI.jar" ''; meta = with stdenv.lib; { From a936d9d6dc31659dbf8115612a0e7efffacb892c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 10 Oct 2017 11:18:22 +0200 Subject: [PATCH 0952/2806] isabelle: 2016-1 -> 2017 --- pkgs/applications/science/logic/isabelle/default.nix | 12 ++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 2409936ab69..af2bb3ed0c4 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -2,21 +2,21 @@ # nettools needed for hostname let - dirname = "Isabelle2016-1"; + dirname = "Isabelle2017"; in stdenv.mkDerivation { - name = "isabelle-2016-1"; + name = "isabelle-2017"; inherit dirname; src = if stdenv.isDarwin then fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg"; - sha256 = "0553l7m2z32ajmiv6sgg11rh16n490w8i4q9hr7vx4zzggr9nrlr"; + sha256 = "1awgg39i72pivwfijdwffvil3glnpimjz2x04qbl5la2j6la48nb"; } else fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "1w1cgfmmi1sr43z6hczyc29lxlnlz7dd8fa88ai44wkc13y05b5r"; + sha256 = "01v1zrajyfamjq5b8v18qr3ffivjckifsvvx2vs13di6wsnmm9gw"; }; buildInputs = [ perl polyml z3 ] @@ -43,6 +43,10 @@ stdenv.mkDerivation { --replace '$ML_HOME/poly' ${polyml}/bin/poly substituteInPlace contrib/z3*/etc/settings \ --replace '$Z3_HOME/z3' '${z3}/bin/z3' + + for comp in contrib/jdk contrib/polyml*; do + rm -rf $comp/x86* + done '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} for f in contrib/*/$arch/{bash_process,epclextract,eprover,nunchaku,SPASS}; do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f53551e4d2d..2ceb1c7fa2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14844,7 +14844,7 @@ with pkgs; gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { }; - gramps = callPackage ../applications/misc/gramps { + gramps = callPackage ../applications/misc/gramps { pythonPackages = python3Packages; }; From 2314ed72f14a478c0e9dfb8eb3d3e815361630b4 Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 10 Oct 2017 12:00:36 +0200 Subject: [PATCH 0953/2806] solvespace: remove stray newline escape --- pkgs/applications/graphics/solvespace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 7b30c467b19..43d6229ab2b 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/share/applications/solvespace.desktop \ - --replace /usr/bin/ $out/bin/ \ + --replace /usr/bin/ $out/bin/ ''; meta = { From ee9a15b32362d28b20704cb2e176dbe5f4421ffb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Oct 2017 12:03:17 +0200 Subject: [PATCH 0954/2806] Set $NIX_DEBUG_INFO_DIRS when environment.enableDebugInfo is enabled This allows it to co-exist with other debug info directories, such as the one used by dwarffs (https://github.com/edolstra/dwarffs/blob/master/module.nix). --- nixos/modules/config/debug-info.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix index 49991d22a93..2942ae5905d 100644 --- a/nixos/modules/config/debug-info.nix +++ b/nixos/modules/config/debug-info.nix @@ -30,14 +30,15 @@ with lib; }; - config = { + config = mkIf config.environment.enableDebugInfo { # FIXME: currently disabled because /lib is already in # environment.pathsToLink, and we can't have both. #environment.pathsToLink = [ "/lib/debug/.build-id" ]; - environment.extraOutputsToInstall = - optional config.environment.enableDebugInfo "debug"; + environment.extraOutputsToInstall = [ "debug" ]; + + environment.variables.NIX_DEBUG_INFO_DIRS = [ "/run/current-system/sw/lib/debug" ]; }; From 30a1b9492683d9b56325f723856ac81b7362cd82 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Oct 2017 12:05:00 +0200 Subject: [PATCH 0955/2806] gdb: Remove --with-separate-debug-dir We don't need this anymore since NixOS now sets $NIX_DEBUG_INFO_DIRS. --- pkgs/development/tools/misc/gdb/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 1ee2a270b49..6ecc6bc0e52 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -60,10 +60,7 @@ stdenv.mkDerivation rec { configureFlags = with stdenv.lib; [ "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline" "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}" - ] ++ stdenv.lib.optional hostPlatform.isLinux - # TODO(@Ericson2314): make this conditional on whether host platform is NixOS - "--with-separate-debug-dir=/run/current-system/sw/lib/debug" - ++ stdenv.lib.optional (!pythonSupport) "--without-python" + ] ++ stdenv.lib.optional (!pythonSupport) "--without-python" ++ stdenv.lib.optional multitarget "--enable-targets=all"; postInstall = From 9df79de1a115920bd96a7d4e66bc3782865c8146 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Oct 2017 12:25:02 +0200 Subject: [PATCH 0956/2806] Enable command-not-found 5a5db609e5bd83bc589f36eef394f3ad172d6648 disabled it by default, which may have been unintentional. mkEnableOption considered harmful. --- .../programs/command-not-found/command-not-found.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix index 55529d73cb6..bbe7165c62f 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.nix +++ b/nixos/modules/programs/command-not-found/command-not-found.nix @@ -25,7 +25,14 @@ in { options.programs.command-not-found = { - enable = mkEnableOption "command-not-found hook for interactive shell"; + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether interactive shells should show which Nix package (if + any) provides a missing command. + ''; + }; dbPath = mkOption { default = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite" ; From 67c3eab34820379beee14dfa784a8230d6fda006 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Oct 2017 12:41:50 +0200 Subject: [PATCH 0957/2806] linux: 4.9.53 -> 4.9.54 --- 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 e9b9fb54bfc..d897e609783 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.53"; + version = "4.9.54"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "095k7kpzic0c2vhwnfm5vcp9j60lyf4qyx2pj9vkp68bpcrmm49j"; + sha256 = "1i8g44d3mq7c24mn6b5w59d2z3fxjzbfn5blc36lzkpvdvdha435"; }; } // (args.argsOverride or {})) From 79ae9be2206569dd50baa400c6aba63f71651b81 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 10 Oct 2017 13:28:38 +0200 Subject: [PATCH 0958/2806] libqalculate, qalculate-gtk: 2.0.0 -> 2.1.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 6b5cb452f59..278194d57fa 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.0.0a"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz"; - sha256 = "0bif79wl2hi0sf4pk2b4s2xz33lj7401pygsdmxrnr5gqqq0s696"; + sha256 = "14q89l6laa7v7d9qx7v71a0r2m65saxqgr9r871fasm400a9x8pw"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index f16f51105d4..0e67f970b76 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "1ziw48djccsgfcjd1h3834sihr89pyb3mna096cpm47bc71saqvh"; + sha256 = "036f284bssvavyz6pgpcdafvxa59h2wdrh8xl7nmxxnw9v7n2n7l"; }; outputs = [ "out" "dev" "doc" ]; From 244f34785e86376f46a70937773944a57e445122 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Tue, 3 Oct 2017 15:50:39 +0200 Subject: [PATCH 0959/2806] pythonPackages.tensorflow: repair cuda-dependent variant merge the outputs of cudatoolkit locally in the tensorflow derivation, using symlinkJoin Fixes #29798 --- .../python-modules/tensorflow/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index ab604c17300..00a5df843c5 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,4 +1,5 @@ { stdenv +, symlinkJoin , lib , fetchurl , buildPythonPackage @@ -35,6 +36,13 @@ buildPythonPackage rec { format = "wheel"; disabled = ! (isPy35 || isPy36 || isPy27); + # cudatoolkit is split (see https://github.com/NixOS/nixpkgs/commit/bb1c9b027d343f2ce263496582d6b56af8af92e6) + # However this means that libcusolver is not loadable by tensor flow. So we undo the split here. + cudatoolkit_joined = symlinkJoin { + name = "unsplit_cudatoolkit"; + paths = [ cudatoolkit.out + cudatoolkit.lib ];}; + src = let tfurl = sys: proc: pykind: let @@ -112,7 +120,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy six protobuf mock backports_weakref ] ++ lib.optional (!isPy36) tensorflow-tensorboard - ++ lib.optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ]; + ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn stdenv.cc ]; # tensorflow-gpu depends on tensorflow_tensorboard, which cannot be # built at the moment (some of its dependencies do not build @@ -126,7 +134,7 @@ buildPythonPackage rec { postFixup = let rpath = stdenv.lib.makeLibraryPath (if cudaSupport then - [ stdenv.cc.cc.lib zlib cudatoolkit cudnn + [ stdenv.cc.cc.lib zlib cudatoolkit_joined cudnn linuxPackages.nvidia_x11 ] else [ stdenv.cc.cc.lib zlib ] From df4bed423f9ef235143eca6881dd4ad0af00f301 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 10 Oct 2017 08:33:02 -0400 Subject: [PATCH 0960/2806] minikube: 0.22.2 -> 0.22.3 --- pkgs/applications/networking/cluster/minikube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index b601bb00c20..32c697ea83a 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -23,7 +23,7 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.22.2"; + version = "0.22.3"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "04h0hp0mkps3ilcig6xnmp41rlgaxhhpxakc86lsknvkk9kmrx89"; + sha256 = "0jcfw0yrd4vqyiyhg15cy2knn2fjw91das8id4famz5gl6dnlm28"; }; # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly From cd2f6220bc95ee56906bce322f3dd213a7f8cb74 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Sep 2017 23:51:11 +0200 Subject: [PATCH 0961/2806] =?UTF-8?q?gnome3.libgee:=200.18=20=E2=86=92=200?= =?UTF-8?q?.20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/libgee/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index 4d59a3f2013..04d9098764f 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }: +{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: let - ver_maj = "0.18"; + ver_maj = "0.20"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "16a34js81w9m2bw4qd8csm4pcgr3zq5z87867j4b8wfh6zwrxnaa"; + sha256 = "1fy24dr8imrjlmsqj1syn0gi139gba6hwk3j5vd6sr3pxniqnc11"; }; doCheck = true; patches = [ ./fix_introspection_paths.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf vala_0_32 glib gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig autoconf vala pkgconfig gobjectIntrospection ]; + buildInputs = [ glib ]; meta = with stdenv.lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; From ef9b59c26f4260c04f22ff5b7046ca86d9ee937a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 8 Oct 2017 18:10:57 +0200 Subject: [PATCH 0962/2806] =?UTF-8?q?gnome3.geary:=200.11.3=20=E2=86=92=20?= =?UTF-8?q?0.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #30024 --- pkgs/desktops/gnome-3/default.nix | 5 +--- pkgs/desktops/gnome-3/misc/geary/default.nix | 27 ++++++++------------ 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index fcb36fb8ded..10e5f97c38f 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -366,10 +366,7 @@ let california = callPackage ./misc/california { }; - geary = callPackage ./misc/geary { - # https://bugzilla.gnome.org/show_bug.cgi?id=728002 - webkitgtk = pkgs.webkitgtk24x-gtk3; - }; + geary = callPackage ./misc/geary { }; gfbgraph = callPackage ./misc/gfbgraph { }; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 498ced47a08..6243d1b1d5f 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,41 +1,34 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32 -, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant +, wrapGAppsHook, gdk_pixbuf, cmake, desktop_file_utils , libnotify, libcanberra_gtk3, libsecret, gmime , libpthreadstubs, sqlite , gnome3, librsvg, gnome_doc_utils, webkitgtk }: let - majorVersion = "0.11"; + majorVersion = "0.12"; in stdenv.mkDerivation rec { - name = "geary-${majorVersion}.3"; + name = "geary-${majorVersion}.0"; src = fetchurl { url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; - sha256 = "1r42ijxafach5lv8ibs6y0l5k4nacjg427dnma8fj00xr1sri7j1"; + sha256 = "0ii4qaqfqx90kvqwg0g9jahygkir4mb03ja55fa55yyx6cq0kwff"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils - vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite + nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop_file_utils gnome_doc_utils ]; + buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' - ''; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/${name}/ - mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} + substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' ''; preFixup = '' - wrapProgram "$out/bin/geary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + # Add geary to path for geary-attach + gappsWrapperArgs+=(--prefix PATH : "$out/bin") ''; enableParallelBuilding = true; From 2227d3586e1f0ed38b14bbd946738551a9d88329 Mon Sep 17 00:00:00 2001 From: Tom Saeger Date: Mon, 9 Oct 2017 21:22:16 -0500 Subject: [PATCH 0963/2806] pythonPackages.ofxclient: 1.3.8 -> 2.0.3 --- .../python-modules/ofxclient/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------- 2 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/ofxclient/default.nix diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix new file mode 100644 index 00000000000..c7877675530 --- /dev/null +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, + ofxhome, ofxparse, beautifulsoup, lxml, keyring +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "2.0.3"; + pname = "ofxclient"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jdhqsbl34yn3n0x6mwsnl58c25v5lp6vr910c2hk7l74l5y7538"; + }; + + patchPhase = '' + substituteInPlace setup.py --replace '"argparse",' "" + ''; + + # ImportError: No module named tests + doCheck = false; + + propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup lxml keyring ]; + + meta = with stdenv.lib; { + homepage = https://github.com/captin411/ofxclient; + description = "OFX client for dowloading transactions from banks"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a34b22482e..75a2c8d077d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24776,22 +24776,7 @@ EOF }; }; - ofxclient = buildPythonPackage rec { - name = "ofxclient-1.3.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxclient/${name}.tar.gz"; - sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233"; - }; - - patchPhase = '' - substituteInPlace setup.py --replace '"argparse",' "" - ''; - - # ImportError: No module named tests - doCheck = false; - - propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring ]; - }; + ofxclient = callPackage ../development/python-modules/ofxclient {}; ofxhome = buildPythonPackage rec { name = "ofxhome-0.3.1"; From 08bf000fe2e385f2253428eef77f952e3dc187c5 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Tue, 10 Oct 2017 15:07:35 +0200 Subject: [PATCH 0964/2806] nix-daemon: mention speedFactor in example --- nixos/modules/services/misc/nix-daemon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index efa3b5b6bd7..beca820d2d6 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -189,6 +189,7 @@ in sshKey = "/root/.ssh/id_buildfarm"; system = "x86_64-linux"; maxJobs = 2; + speedFactor = 2; supportedFeatures = [ "kvm" ]; mandatoryFeatures = [ "perf" ]; } From e3a389c67059c2f73465891e23c5cf1208cc0332 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 10 Oct 2017 09:23:51 -0400 Subject: [PATCH 0965/2806] Add pandas 0.17 --- .../python-modules/pandas/0.17.1.nix | 79 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/development/python-modules/pandas/0.17.1.nix diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix new file mode 100644 index 00000000000..02b8211a256 --- /dev/null +++ b/pkgs/development/python-modules/pandas/0.17.1.nix @@ -0,0 +1,79 @@ +{ buildPythonPackage +, fetchPypi +, python +, stdenv +, fetchurl +, pytest +, glibcLocales +, cython +, dateutil +, scipy +, numexpr +, pytz +, xlrd +, bottleneck +, sqlalchemy +, lxml +, html5lib +, beautifulsoup4 +, openpyxl +, tables +, xlwt +, libcxx ? null +}: + +let + inherit (stdenv.lib) optional optionalString concatStringsSep; + inherit (stdenv) isDarwin; +in buildPythonPackage rec { + pname = "pandas"; + version = "0.17.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; + }; + + LC_ALL = "en_US.UTF-8"; + buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx; + propagatedBuildInputs = [ + cython + dateutil + scipy + numexpr + pytz + xlrd + bottleneck + sqlalchemy + lxml + html5lib + beautifulsoup4 + openpyxl + tables + xlwt + ]; + + doCheck = false; + + # For OSX, we need to add a dependency on libcxx, which provides + # `complex.h` and other libraries that pandas depends on to build. + postPatch = optionalString isDarwin '' + cpp_sdk="${libcxx}/include/c++/v1"; + echo "Adding $cpp_sdk to the setup.py common_include variable" + substituteInPlace setup.py \ + --replace "['pandas/src/klib', 'pandas/src']" \ + "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" + ''; + + meta = { + # https://github.com/pandas-dev/pandas/issues/14866 + # pandas devs are no longer testing i686 so safer to assume it's broken + broken = stdenv.isi686; + homepage = http://pandas.pydata.org/; + description = "Python Data Analysis Library"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ shlevy ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f35991eeaed..ddd851d3719 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14997,6 +14997,8 @@ in { pandas = callPackage ../development/python-modules/pandas { }; + pandas_0_17_1 = callPackage ../development/python-modules/pandas/0.17.1.nix { }; + xlrd = buildPythonPackage rec { name = "xlrd-${version}"; From 9dc085078f62906284f771c07feb193dc064dcd4 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 8 Oct 2017 18:34:33 +0100 Subject: [PATCH 0966/2806] newsbeuter: fix CVE-2017-12904 --- .../networking/feedreaders/newsbeuter/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix index cf7e4fdcb14..b681f74ed22 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { url = "https://github.com/akrennmair/newsbeuter/commit/26f5a4350f3ab5507bb8727051c87bb04660f333.patch"; sha256 = "1jjxj4z3s4f1n8rfpwyd42a40gjnziykqas6a26s1lsdkklnbp6q"; }) + # https://github.com/akrennmair/newsbeuter/issues/591 / CVE-2017-12904 + (fetchpatch { + url = "https://github.com/akrennmair/newsbeuter/commit/d1460189f6f810ca9a3687af7bc43feb7f2af2d9.patch"; + sha256 = "1a8k73ckziszsbdwdhcmkfvlmgy955gssg9v4sqvg20v91l5rmai"; + }) ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ]; From 628c039326bd1f8e8a8009c0ea74cb99c3d82e3a Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 10 Oct 2017 20:23:32 +0900 Subject: [PATCH 0967/2806] flashplayer: 27.0.0.130 -> 27.0.0.159 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 2bc81869530..24ab054e0a6 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "27.0.0.130"; + version = "27.0.0.159"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "005sxx3ll18c6idy1db2gb47chd9c5mf83qac0vyvljsrlc7430c"; + sha256 = "00nbn8nv6irsak05cwlx9x8q0n91kbjxnkdg4c66ilx2gq5wrz05"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 559c08ad4f3..f26e815764f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "27.0.0.130"; + version = "27.0.0.159"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1sj06x4kfwxi9cnc8adjkxk6p81acl39l2idnyqb429l2s84d1d9" + "0fgz1aszihjrxpzyrs29wr11imfgnyfb2ca9c1i3n6k9wpwv926p" else - "0f9vzdn523m408sw76r32zqf7d86l2mhcfsszbfh2bixg8p2cxzz" + "052dx764b6cfbc7mkxckcr3hbwd5b7l98cp3jqmddkllv4w4h6dp" else if arch == "x86_64" then - "0qkdabcnqfpbfsbs8ssms9xk2pqvps6fbasvcyvhnywclra25ggc" + "1p136zn059hp59j0llk7rfsybjx51qjz2h5sd4xl8zqbs0szynid" else - "0qkwkc6s4ganja4b2jsz4yff0bziirvbzxg0wyf648hqlb3bw5a6"; + "06l8rjnhpqip6ikc97rf3zsgmy381q4wgzyl9rsjwlvhpgqdlhrl"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 7c0125ea123..4d52047f16c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "27.0.0.130"; + version = "27.0.0.159"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0gqm90j8czjnzar3ia65msd18kydjhgq5l9iv1difgm8lqji5ii0" + "0h9jpkdkf4kvr2sg61r6pkwcdyf4z3qdj0nlnm27whac9w56jjpj" else - "1agplangzlrp326dhz3xcvi6i325a644ggrh8g0cmgq9nfcpssnb"; + "013a0ar5afm62bk7f4s89235bx36n75z65b3afv941jajijiacc9"; }; nativeBuildInputs = [ unzip ]; From 94bea7400456c6492f42f589e5524d318efb36a4 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 10 Oct 2017 07:07:13 -0400 Subject: [PATCH 0968/2806] Fix pkgconfig reference --- pkgs/top-level/emacs-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 3e447aa653c..e7c98cc3869 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -94,7 +94,7 @@ let rev = "v${version}"; sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; fileSpecs = [ "lisp/pdf-*.el" "server/epdfinfo" ]; From e71a6aabf8b4ef0e6575f225ac7e1a1013a328c7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 10 Oct 2017 17:08:00 +0200 Subject: [PATCH 0969/2806] badvpn: fix build --- pkgs/tools/networking/badvpn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index 632b52fd156..c9ebc12b0db 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -10,7 +10,6 @@ let sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z"; }; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake openssl nss nspr ]; @@ -18,6 +17,7 @@ let in stdenv.mkDerivation { inherit (s) name version; + nativeBuildInputs = [ pkgconfig ]; inherit buildInputs; src = fetchurl { inherit (s) url sha256; From ef291b52f3c4efa4da8b7c12c6d96e4ae0bcef41 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 10 Oct 2017 17:22:48 +0200 Subject: [PATCH 0970/2806] pingus, quirc: fix pkgconfig passing --- pkgs/games/pingus/default.nix | 5 ++--- pkgs/tools/graphics/quirc/default.nix | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 8b8a6fed841..9704cb93e6b 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,8 +1,6 @@ {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig , mesa}: let - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; s = # Generated upstream information rec { baseName="pingus"; @@ -15,7 +13,8 @@ let in stdenv.mkDerivation rec { inherit (s) name version; - inherit buildInputs; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index caff97f0e32..9891ea5e52b 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -10,14 +10,13 @@ let rev = "5b262480091d5f84a67a4a56c728fc8b39844339"; sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy"; }; +in +stdenv.mkDerivation { + inherit (s) name version; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL SDL_gfx libjpeg libpng ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; src = fetchgit { inherit (s) url sha256 rev; }; From f9415cb6219de00903f62a1f0facc4852225118c Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 10 Oct 2017 15:46:33 +0000 Subject: [PATCH 0971/2806] desktop-managers: do not leak feh to PATH feh is used to set background image for desktop managers that do not support it directly, however there is no need to include it in PATH. Fixes #17450. --- nixos/modules/services/x11/desktop-managers/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 13f339e3fbf..6509a8a16c9 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -109,9 +109,5 @@ in }; - config = { - services.xserver.displayManager.session = cfg.session.list; - environment.systemPackages = - mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable - }; + xcfg.displayManager.session = cfg.session.list; } From f78aca5064c119d8463a43eb79e7e0d7c0453a18 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 10 Oct 2017 15:51:05 +0000 Subject: [PATCH 0972/2806] ibus-table: add pygobject3 Analogous to #29376. --- pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 8c842dbc841..8c552799432 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - dconf gtk3 gobjectIntrospection ibus python3 + dconf gtk3 gobjectIntrospection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 ])) ]; nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ]; From f4c9d517db06cefb8f53ca1fd6f5fa1cf1e236b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Oct 2017 18:10:42 +0200 Subject: [PATCH 0973/2806] tiptop: bugfix 2.3 -> 2.3.1 --- pkgs/os-specific/linux/tiptop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index b1b230b8ba7..6155f9ed4bf 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tiptop-${version}"; - version = "2.3"; + version = "2.3.1"; src = fetchurl { url = "${meta.homepage}/releases/${name}.tar.gz"; - sha256 = "1jhqmcgx664ygayw471cg05bxc4ikxn35ccyiswymjhanicfj1rz"; + sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i"; }; patches = [(fetchpatch { From 7a946f0ae698632013e3dc30356acb5221d6a4eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Oct 2017 18:18:45 +0200 Subject: [PATCH 0974/2806] libav_12: maintenance 12.1 -> 12.2 --- pkgs/development/libraries/libav/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 1f2349835d5..90d7583673a 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -29,7 +29,7 @@ let result = { libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00"; - libav_12 = libavFun "12.1" "df048240318b888e3938f649422b967f62e43e3c"; + libav_12 = libavFun "12.2" "3784b15f88076ca0ab8fb6b0377e975b83a5c9f5"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { From 5e8d1757ef38629e240e4c5262def2ba9418c35b Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 5 Oct 2017 15:49:12 +0200 Subject: [PATCH 0975/2806] nixos/xautolock: rewrite and add some options --- nixos/modules/services/x11/xautolock.nix | 92 ++++++++++++++++++++---- 1 file changed, 78 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix index 60ce9e6ed5c..28fc92024bc 100644 --- a/nixos/modules/services/x11/xautolock.nix +++ b/nixos/modules/services/x11/xautolock.nix @@ -31,7 +31,17 @@ in type = types.string; description = '' - The script to use when locking the computer. + The script to use when automatically locking the computer. + ''; + }; + + nowlocker = mkOption { + default = null; + example = "i3lock -i /path/to/img"; + type = types.nullOr types.string; + + description = '' + The script to use when manually locking the computer with xautolock -locknow. ''; }; @@ -45,28 +55,82 @@ in }; notifier = mkOption { - default = "notify-send 'Locking in 10 seconds'"; - type = types.string; + default = null; + example = literalExample '' + "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\"" + ''; + type = types.nullOr types.string; description = '' Notification script to be used to warn about the pending autolock. ''; }; + + killer = mkOption { + default = null; # default according to `man xautolock` is none + example = "systemctl suspend"; + type = types.nullOr types.string; + + description = '' + The script to use when nothing has happend for as long as + ''; + }; + + killtime = mkOption { + default = 20; # default according to `man xautolock` + type = types.int; + + description = '' + Minutes xautolock waits until it executes the script specified in + (Has to be at least 10 minutes) + ''; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "-detectsleep" ]; + description = '' + Additional command-line arguments to pass to + xautolock. + ''; + }; }; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ xautolock ]; - - services.xserver.displayManager.sessionCommands = with builtins; with pkgs; '' - ${xautolock}/bin/xautolock \ - ${concatStringsSep " \\\n" ([ - "-time ${toString(cfg.time)}" - "-locker ${cfg.locker}" - ] ++ optional cfg.enableNotifier (concatStringsSep " " [ - "-notify ${toString(cfg.notify)}" - "-notifier \"${cfg.notifier}\"" - ]))} & - ''; + systemd.user.services.xautolock = { + description = "xautolock service"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + serviceConfig = with lib; { + ExecStart = strings.concatStringsSep " " ([ + "${pkgs.xautolock}/bin/xautolock" + "-noclose" + "-time ${toString cfg.time}" + "-locker '${cfg.locker}'" + ] ++ optionals cfg.enableNotifier [ + "-notify ${toString cfg.notify}" + "-notifier '${cfg.notifier}'" + ] ++ optionals (cfg.nowlocker != null) [ + "-nowlocker '${cfg.nowlocker}'" + ] ++ optionals (cfg.killer != null) [ + "-killer '${cfg.killer}'" + "-killtime ${toString cfg.killtime}" + ] ++ cfg.extraOptions); + Restart = "always"; + }; + }; + assertions = [ + { + assertion = cfg.enableNotifier -> cfg.notifier != null; + message = "When enabling the notifier for xautolock, you also need to specify the notify script"; + } + { + assertion = cfg.killer != null -> cfg.killtime >= 10; + message = "killtime has to be at least 10 minutes according to `man xautolock`"; + } + ]; }; } From 2262b2332d9f500d6f8c08e874b227f94e5c3116 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 10 Oct 2017 13:07:42 -0400 Subject: [PATCH 0976/2806] linux: 4.14-rc3 -> 4.14-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index fb51760ec16..30445500376 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc3"; - modDirVersion = "4.14.0-rc3"; + version = "4.14-rc4"; + modDirVersion = "4.14.0-rc4"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "049x4fpcj8d6577lhzrns7w36mj21pfr4ijw01r0l6n3w86z28b7"; + sha256 = "1n9jni7sdawhjnlpl1g3rw89ggfi8d6s088wv1h21cnmsav911ik"; }; # Should the testing kernels ever be built on Hydra? From da93e6e6789dc52e24571179726813ca9d4eed61 Mon Sep 17 00:00:00 2001 From: jaltek Date: Tue, 10 Oct 2017 14:01:49 +0200 Subject: [PATCH 0977/2806] shutter: 0.93.1 -> 0.94 --- pkgs/applications/graphics/shutter/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 3d4e8c592ab..a8b4973203d 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -11,21 +11,13 @@ let ]; in stdenv.mkDerivation rec { - name = "shutter-0.93.1"; + name = "shutter-0.94"; src = fetchurl { - url = "http://shutter-project.org/wp-content/uploads/releases/tars/${name}.tar.gz"; - sha256 = "09cn3scwy98wqxkrjhnmxhpfnnynlbb41856yn5m3zwzqrxiyvak"; + url = "https://launchpad.net/shutter/0.9x/0.94/+download/shutter-0.94.tar.gz"; + sha256 = "943152cdf9e1b2096d38e3da9622d8bf97956a08eda747c3e7fcc564a3f0f40d"; }; - patches = [ - (fetchpatch { - url = "http://svnweb.mageia.org/packages/cauldron/shutter/current/SOURCES/CVE-2015-0854.patch?revision=880308&view=co"; - name = "CVE-2015-0854.patch"; - sha256 = "14r18sxz3ylf39cn9b85snjhjxdk6ngq4vnpljwghw2q5430nb12"; - }) - ]; - buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules; installPhase = '' From aeeac71231f5ca103eb484815130a864fc571d64 Mon Sep 17 00:00:00 2001 From: elseym Date: Mon, 9 Oct 2017 20:23:48 +0200 Subject: [PATCH 0978/2806] mattermost: create role and db with postgres superuser Recently, the postgres superuser name has changed. Using the configured and correct username here fixes database initialisation. --- nixos/modules/services/web-apps/mattermost.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index bc88a808abc..0b637e3991b 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -184,10 +184,12 @@ in fi '' + lib.optionalString cfg.localDatabaseCreate '' if ! test -e "${cfg.statePath}/.db-created"; then - ${config.services.postgresql.package}/bin/psql postgres -c \ - "CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'" - ${config.services.postgresql.package}/bin/createdb \ - --owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName} + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \ + ${config.services.postgresql.package}/bin/psql postgres -c \ + "CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'" + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \ + ${config.services.postgresql.package}/bin/createdb \ + --owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName} touch ${cfg.statePath}/.db-created fi '' + '' From 62381a6c75b016efc92afc746952ede35933277a Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Tue, 10 Oct 2017 19:10:37 +0100 Subject: [PATCH 0979/2806] tnef: 1.4.14 -> 1.4.15 --- pkgs/applications/misc/tnef/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index 63d68bbbea4..eebab6643a6 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.4.14"; + version = "1.4.15"; name = "tnef-${version}"; src = fetchFromGitHub { owner = "verdammelt"; repo = "tnef"; rev = version; - sha256 = "0p7yji5hqq7k4pcba1cnv4jkl0fkg7jd77c1q164wk0vwinpmsc2"; + sha256 = "0wm5ylppkjg518ldb9kzlx58a9l8z66gpz9ljalmyq6a77khd7pj"; }; doCheck = true; From d26f8b5e00b4a436ec8f9b7fb1b55a0dbda440c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 10 Oct 2017 20:04:56 +0200 Subject: [PATCH 0980/2806] nixos/lighttpd: add missing modules to allKnownModules The output of ./configure shows all modules/plugins, both enabled and disabled. With this info we can finally build the _complete_ list of modules. We were missing these: mod_authn_gssapi mod_authn_ldap mod_geoip (I hit this as I was building lighttpd with ldap support and the NixOS module said ldap was unsupported, due to these missing entries in allKnownModules.) --- nixos/modules/services/web-servers/lighttpd/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 45a65965112..700b4469c56 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -15,7 +15,8 @@ let # Some modules are always imported and should not appear in the config: # disallowedModules = [ "mod_indexfile" "mod_dirlisting" "mod_staticfile" ]; # - # Get full module list: "ls -1 $lighttpd/lib/*.so" + # For full module list, see the output of running ./configure in the lighttpd + # source. allKnownModules = [ "mod_rewrite" "mod_redirect" @@ -38,12 +39,15 @@ let "mod_accesslog" # Remaining list of modules, order assumed to be unimportant. "mod_authn_file" + "mod_authn_gssapi" + "mod_authn_ldap" "mod_authn_mysql" "mod_cml" "mod_deflate" "mod_evasive" "mod_extforward" "mod_flv_streaming" + "mod_geoip" "mod_magnet" "mod_mysql_vhost" "mod_scgi" From e9a1663f8c5684614110e972fc110d262fb969be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Oct 2017 20:34:38 +0200 Subject: [PATCH 0981/2806] mesa: don't build "svga" gallium driver on ARM https://bugs.freedesktop.org/show_bug.cgi?id=102232#c1 Don't cause a rebuild on non-ARM. --- pkgs/development/libraries/mesa/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 16a03652d83..0fde0192726 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -36,7 +36,7 @@ let then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] else if stdenv.isAarch64 then ["nouveau" "vc4" ] - else ["i915" "r300" "r600" "radeonsi" "nouveau"]; + else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = if (stdenv.isArm || stdenv.isAarch64) then ["nouveau"] @@ -51,8 +51,7 @@ let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in let galliumDrivers = - ["svga"] - ++ (if gallium_ == null + (if gallium_ == null then defaultGalliumDrivers else gallium_) ++ ["swrast"]; From 274c9b7587c98497f3b2ce062b8fad47841eba5a Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 10 Oct 2017 20:08:36 +0000 Subject: [PATCH 0982/2806] unbound: fix typo in systemd Before --- nixos/modules/services/networking/unbound.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index f3a04d97c98..bcce4accdd6 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -105,7 +105,7 @@ in description = "Unbound recursive Domain Name Server"; after = [ "network.target" ]; before = [ "nss-lookup.target" ]; - wants = [" nss-lookup.target" ]; + wants = [ "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' From f92e097cd4cfdba43f38a25f858ac15c5d9da44d Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 10 Oct 2017 16:41:44 -0400 Subject: [PATCH 0983/2806] xcbuild: add SDKROOT by default to the wrappers This fixes #30269 and lets us do things like `xcrun -find cc`, for example. --- pkgs/development/tools/xcbuild/wrapper.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index ab6605e91b1..2f6b42e7a00 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -58,11 +58,14 @@ stdenv.mkDerivation { wrapProgram $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ --add-flags "DERIVED_DATA_DIR=." \ - --set DEVELOPER_DIR "$out" + --set DEVELOPER_DIR "$out" \ + --set SDKROOT ${sdkName} wrapProgram $out/bin/xcrun \ - --set DEVELOPER_DIR "$out" + --set DEVELOPER_DIR "$out" \ + --set SDKROOT ${sdkName} wrapProgram $out/bin/xcode-select \ - --set DEVELOPER_DIR "$out" + --set DEVELOPER_DIR "$out" \ + --set SDKROOT ${sdkName} ''; inherit (xcbuild) meta; From 15c34cf1d823d6bf93f5a20c58470253cd250cb4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 10 Oct 2017 23:11:38 +0200 Subject: [PATCH 0984/2806] =?UTF-8?q?meson:=200.42.1=20=E2=86=92=200.43.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/build-managers/meson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 11491340357..77ff46d9472 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.42.1"; + version = "0.43.0"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1phf1xpwm8m85qiiirkqhrf5aigx7ajaw0l59d6lzadf1fmgfx5v"; + sha256 = "0qn5hyzvam3rimn7g3671s1igj7fbkwdnf5nc8jr4d5swy25mq61"; }; postFixup = '' From bd559dcea73da293868e46c18b553a6ea88318ae Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Tue, 10 Oct 2017 23:47:24 +0200 Subject: [PATCH 0985/2806] git-lfs: 2.2.1 -> 2.3.3 --- pkgs/applications/version-management/git-lfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index bf089a03fa0..0463081fa4b 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.2.1"; - rev = "621d1f821f73efcedc829dda43fd9c1fcf07c6ab"; + version = "2.3.3"; + rev = "c9d3beb098254f067680a5ccbb8742387f81d82e"; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "00wc4gjs4yy2qld1m4yar37jkw9fdi2h8xp25hy2y80cnyiafn7s"; + sha256 = "1hzpzbm46f45vh5liijpyppfcmr7wycnsa09vmilq0wm341ivnsf"; }; preBuild = '' From 0aa6d90845a4d8e157bb8193958333e308f71a51 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Sun, 8 Oct 2017 18:53:49 -0500 Subject: [PATCH 0986/2806] qt4: Override broken installPhase on Darwin --- .../libraries/qt-4.x/4.8/default.nix | 34 +++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 2be2f501518..c9679d227d8 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -183,10 +183,38 @@ stdenv.mkDerivation rec { sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release ''; - postInstall = - '' + installPhase = optionalString stdenv.isDarwin '' + runHook preInstall + cp -r lib $out + + mkdir -p $out/Applications + mv bin/*.app $out/Applications + rm -rf bin/*.app + + cp -r bin $out + + mkdir -p $out/share/doc/${name} + mkdir -p $out/lib + mkdir -p $out/lib/qt4/plugins + mkdir -p $out/lib/qt4/imports + mkdir -p $out/bin + mkdir -p $out/include + mkdir -p $out/share/${name} + + cp -r mkspecs $out/share/${name} + cp -r translations $out/share/${name} + cp -r tools/linguist/phrasebooks $out/share/${name} + cp tools/porting/src/q3porting.xml $out/share/${name} + + cp -r plugins $out/lib/qt4 + cp -r imports $out/lib/qt4 + cp -r doc/* $out/share/doc/${name} + runHook postInstall + ''; + + postInstall = optionalString (!stdenv.isDarwin) '' rm -rf $out/tests - ''; + ''; crossAttrs = { # I've not tried any case other than i686-pc-mingw32. From e509f6ffdf609fcf7754097fbbba9514517329e5 Mon Sep 17 00:00:00 2001 From: dywedir Date: Wed, 11 Oct 2017 00:49:04 +0300 Subject: [PATCH 0987/2806] feh: 2.20 -> 2.21 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index f1b992bea1a..f68162de4e3 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.20"; + version = "2.21"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "02vhdv16nf4kjna4inpbfy4k3p40bhl7xpc4kh4xvily14146l2b"; + sha256 = "0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j"; }; outputs = [ "out" "man" "doc" ]; From 48a49fc12e0b6e28c46fcb0a7c52bac26f8bc05d Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Thu, 21 Sep 2017 23:08:34 +0000 Subject: [PATCH 0988/2806] coqPackages.HoTT: init at 20170921 --- pkgs/development/coq-modules/HoTT/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/coq-modules/HoTT/default.nix diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix new file mode 100644 index 00000000000..cb77ac3deac --- /dev/null +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, coq }: + +if !stdenv.lib.versionAtLeast coq.coq-version "8.6" +then throw "This version of HoTT requires Coq 8.6" +else stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-HoTT-${version}"; + version = "20170921"; + + src = fetchFromGitHub { + owner = "HoTT"; + repo = "HoTT"; + rev = "e3557740a699167e6adb1a65855509d55a392fa1"; + sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v"; + }; + + buildInputs = [ autoconf automake coq ]; + enableParallelBuilding = true; + + preConfigure = '' + patchShebangs ./autogen.sh + ./autogen.sh + + mkdir -p "$out/bin" + ''; + + configureFlags = [ + "--bindir=$(out)/bin" + ]; + + patchPhase = '' + patchShebangs etc + patchShebangs hoqc hoqchk hoqdep hoqide hoqtop + ''; + + postBuild = '' + patchShebangs hoq-config + ''; + + # Currently, all the scripts like hoqc and hoqtop assume that the *.vo files are + # either (1) in the same directory as the scripts, or (2) in /usr/share/hott. + # We fulfill (1), which means that these files are only accessible via hoqtop, + # hoqc, etc and not via coqtop, coqc, etc. + postInstall = '' + mv $out/share/hott/* "$out/bin" + rmdir $out/share/hott + rmdir $out/share + ''; + + installFlags = [ + "COQBIN=${coq}/bin" + ]; + + meta = with stdenv.lib; { + homepage = http://homotopytypetheory.org/; + description = "Homotopy type theory"; + maintainers = with maintainers; [ siddharthist ]; + platforms = coq.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0662629f1d..e5bce94d2ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18526,6 +18526,7 @@ with pkgs; dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; flocq = callPackage ../development/coq-modules/flocq {}; heq = callPackage ../development/coq-modules/heq {}; + HoTT = callPackage ../development/coq-modules/HoTT {}; interval = callPackage ../development/coq-modules/interval {}; mathcomp = callPackage ../development/coq-modules/mathcomp { }; paco = callPackage ../development/coq-modules/paco {}; From d1e1ee7b0962f3ac8fc0e4ff4f881c331c39919a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= Date: Mon, 9 Oct 2017 12:39:35 +0200 Subject: [PATCH 0989/2806] coq: 8.7+beta1 -> 8.7+beta2 --- pkgs/applications/science/logic/coq/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index bf1623e28cf..ded8749f10d 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -19,7 +19,7 @@ let "8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw"; "8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4"; "8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l"; - "8.7+beta1" = "006rn5896pf39p4z9c6d4xj4zm80j4b67v5gwcixd63msrjqkmxp"; + "8.7+beta2" = "1r274m44z774xigvj43g211ms9z9bwgyp1g43rvq4fswb3gzxc4b"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5bce94d2ab..18bb248c33c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18480,7 +18480,7 @@ with pkgs; }; coq_8_6 = callPackage ../applications/science/logic/coq {}; coq_8_7 = callPackage ../applications/science/logic/coq { - version = "8.7+beta1"; + version = "8.7+beta2"; }; coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; From f4e742594d9c33481e9902706787e0bdb093f19d Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 11 Oct 2017 02:22:57 +0200 Subject: [PATCH 0990/2806] nixos: Fix detection of btrfs root volume Regression introduced by 801c920e95642ec663d4aa486c81e5443e25b182. Since then, the btrfsSimple subtest of the installer VM test fails with: Btrfs did not return a path for the subvolume at / The reason for this is that the output for "btrfs subvol show" has changed between version 4.8.2 and 4.13.1. For example the output of "btrfs subvol show /" in version 4.8.2 was: / is toplevel subvolume In version 4.13.1, the output now is the following and thus the regular expressions used in nixos-generate-config.pl and install-grub.pl now match (which results in the error mentioned above): / Name: UUID: - Parent UUID: - Received UUID: - Creation time: - Subvolume ID: 5 Generation: 287270 Gen at creation: 0 Parent ID: 0 Top level ID: 0 Flags: - Snapshot(s): In order to fix this I've changed nixos-generate-config.pl and install-grub.pl, because both use "btrfs subvol show" in a similar vein, so the regex for parsing the output now doesn't match anymore whenever the volume path is "/", which should result in the same behaviour as we had with btrfs-progs version 4.8.2. Tested against the btrfsSimple, btrfsSubvols and btrfsSubvolDefault subtests of the installer VM test and they all succeed now. Signed-off-by: aszlig --- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 97a30634dc7..926d1e3133f 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -402,7 +402,7 @@ EOF if ($status != 0 || join("", @info) =~ /ERROR:/) { die "Failed to retrieve subvolume info for $mountPoint\n"; } - my @ids = join("", @info) =~ m/Subvolume ID:[ \t\n]*([0-9]*)/; + my @ids = join("\n", @info) =~ m/^(?!\/\n).*Subvolume ID:[ \t\n]*([0-9]+)/s; if ($#ids > 0) { die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" } elsif ($#ids == 0) { diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 82b5bcda921..cc03e54ead6 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -197,7 +197,7 @@ sub GrubFs { if ($status != 0) { die "Failed to retrieve subvolume info for @{[$fs->mount]}\n"; } - my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/; + my @ids = join("\n", @id_info) =~ m/^(?!\/\n).*Subvolume ID:[ \t\n]*([0-9]+)/s; if ($#ids > 0) { die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" } elsif ($#ids == 0) { From 5de4d19392a990f0960835edc560bfbbd59a3d49 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 11 Oct 2017 01:17:15 -0400 Subject: [PATCH 0991/2806] xcbuild: 0.1.1 -> 0.1.2-pre Also, add some static library stuff to the platform spec --- pkgs/development/tools/xcbuild/default.nix | 12 +++---- pkgs/development/tools/xcbuild/platform.nix | 36 +++++++++++++++++++ .../tools/xcbuild/return-false.patch | 13 ------- 3 files changed, 42 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/tools/xcbuild/return-false.patch diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index d38c85a5d83..b7b14128048 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -16,13 +16,16 @@ let }; in stdenv.mkDerivation rec { name = "xcbuild-${version}"; - version = "0.1.1"; + + # Once a version is released that includes https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, + # we can stop doing this -pre thing. + version = "0.1.2-pre"; src = fetchFromGitHub { owner = "facebook"; repo = "xcbuild"; - rev = version; - sha256 = "0i98c6lii8r3bgs5gj7div12pxyzjvm4qqzmmzgr7dyhj00qa8r5"; + rev = "32b9fbeb69bfa2682bd0351ec2f14548aaedd554"; + sha256 = "1xxwg2849jizxv0g1hy0b1m3i7iivp9bmc4f5pi76swsn423d41m"; }; prePatch = '' @@ -31,9 +34,6 @@ in stdenv.mkDerivation rec { cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise ''; - # See https://github.com/facebook/xcbuild/issues/238 and remove once that's in - patches = [ ./return-false.patch ]; - # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed 1i'#include ' \ diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index df1e38fb4de..2705d703b71 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -101,6 +101,22 @@ let Name = "$(EXECUTABLE_NAME)"; }; } + { + Identifier = "com.apple.package-type.static-library"; + Type = "PackageType"; + Name = "Mach-O Static Library"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = "lib"; + EXECUTABLE_SUFFIX = ".a"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "archive.ar"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } { Identifier = "com.apple.package-type.wrapper"; Type = "PackageType"; @@ -173,6 +189,26 @@ let Name = "Dynamic Library"; PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; } + { + Identifier = "com.apple.product-type.library.static"; + Type = "ProductType"; + Name = "Static Library"; + PackageTypes = [ "com.apple.package-type.static-library" ]; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "staticlib"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_PREFIX = "lib"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "a"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "debugging"; + SEPARATE_STRIP = "YES"; + CLANG_ENABLE_MODULE_DEBUGGING = "NO"; + }; + } { Type = "ProductType"; Identifier = "com.apple.product-type.bundle"; diff --git a/pkgs/development/tools/xcbuild/return-false.patch b/pkgs/development/tools/xcbuild/return-false.patch deleted file mode 100644 index 8ec81b5e97c..00000000000 --- a/pkgs/development/tools/xcbuild/return-false.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Libraries/dependency/Tools/dependency-info-tool.cpp b/Libraries/dependency/Tools/dependency-info-tool.cpp -index 006f53c7..d469f068 100644 ---- a/Libraries/dependency/Tools/dependency-info-tool.cpp -+++ b/Libraries/dependency/Tools/dependency-info-tool.cpp -@@ -271,7 +271,7 @@ main(int argc, char **argv) - */ - std::vector makefileContents = std::vector(contents.begin(), contents.end()); - if (!filesystem.write(makefileContents, *options.output())) { -- return false; -+ return -1; - } - - return 0; From 9dd335e2bb1383f4344a3c3013ec4fdbeef39c32 Mon Sep 17 00:00:00 2001 From: Jun Hao Date: Sat, 23 Sep 2017 12:45:25 +0800 Subject: [PATCH 0992/2806] qt59.qtbase: fix darwin build so qt full can build --- .../libraries/qt-5/5.9/qtbase/darwin-series | 3 + .../libraries/qt-5/5.9/qtbase/default.nix | 16 +- .../qt-5/5.9/qtbase/mkspecs-common-mac.patch | 11 + .../5.9/qtbase/mkspecs-features-mac.patch | 278 ++++++++++++++++++ .../qt-5/qtbase-setup-hook-darwin.sh | 6 + 5 files changed, 306 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.9/qtbase/darwin-series create mode 100644 pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-common-mac.patch create mode 100644 pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-series b/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-series new file mode 100644 index 00000000000..1111ff65f44 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-series @@ -0,0 +1,3 @@ +mkspecs-common-mac.patch +mkspecs-features-mac.patch +darwin-cf.patch diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index 23dab52b80c..eaee8614df3 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { libjpeg libpng libtiff ] - ++ lib.optional mesaSupported mesa + ++ lib.optional (mesaSupported && !stdenv.isDarwin) mesa ++ lib.optionals (!stdenv.isDarwin) [ dbus glib udev @@ -80,7 +80,7 @@ stdenv.mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ stdenv.lib.optional stdenv.isDarwin ./darwin-cf.patch; + ++ stdenv.lib.optional stdenv.isDarwin (copyPathsToStore (lib.readPathsFromFile ./. ./darwin-series)); postPatch = '' @@ -94,7 +94,7 @@ stdenv.mkDerivation { sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in '' - + lib.optionalString mesaSupported '' + + lib.optionalString (mesaSupported && !stdenv.isDarwin) '' sed -i mkspecs/common/linux.conf \ -e "/^QMAKE_INCDIR_OPENGL/ s|$|${mesa.dev or mesa}/include|" \ -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${mesa.out}/lib|" @@ -110,10 +110,10 @@ stdenv.mkDerivation { -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ ./configure - sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf - sed -i '27,$d' ./mkspecs/features/mac/default_post.prf - sed -i '1,$d' ./mkspecs/features/mac/sdk.prf - sed -i 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' ./mkspecs/common/mac.conf + substituteInPlace ./mkspecs/common/mac.conf \ + --replace "/System/Library/Frameworks/OpenGL.framework/" "${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework/" + substituteInPlace ./mkspecs/common/mac.conf \ + --replace "/System/Library/Frameworks/AGL.framework/" "${darwin.apple_sdk.frameworks.AGL}/Library/Frameworks/AGL.framework/" ''; # Note on the above: \x27 is a way if including a single-quote # character in the sed string arguments. @@ -144,7 +144,7 @@ stdenv.mkDerivation { ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] - ++ lib.optional mesaSupported + ++ lib.optional (mesaSupported && !stdenv.isDarwin) ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"'' ++ lib.optionals (!stdenv.isDarwin) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-common-mac.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-common-mac.patch new file mode 100644 index 00000000000..b77f8778122 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-common-mac.patch @@ -0,0 +1,11 @@ +--- qtbase-opensource-src-5.9.1.orig/mkspecs/common/mac.conf 2017-09-16 16:40:30.000000000 +0800 ++++ qtbase-opensource-src-5.9.1/mkspecs/common/mac.conf 2017-09-16 16:41:27.000000000 +0800 +@@ -23,7 +23,7 @@ + + QMAKE_FIX_RPATH = install_name_tool -id + +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip + + QMAKE_LFLAGS_REL_RPATH = diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch new file mode 100644 index 00000000000..6f7baa558db --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch @@ -0,0 +1,278 @@ +diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf +--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf 2017-09-16 16:40:30.000000000 +0800 ++++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf 2017-09-16 16:41:03.000000000 +0800 +@@ -24,165 +24,3 @@ + } + } + } +- +-# Add the same default rpaths as Xcode does for new projects. +-# This is especially important for iOS/tvOS/watchOS where no other option is possible. +-!no_default_rpath { +- QMAKE_RPATHDIR += @executable_path/Frameworks +- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks +-} +- +-# Don't pass -headerpad_max_install_names when using Bitcode. +-# In that case the linker emits a warning stating that the flag is ignored when +-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). +-# Using this flag is also unnecessary in practice on UIKit platforms since they +-# are sandboxed, and only UIKit platforms support bitcode to begin with. +-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD +- +-app_extension_api_only { +- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +-} +- +-macx-xcode { +- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { +- debug_information_format.name = DEBUG_INFORMATION_FORMAT +- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT +- debug_information_format.build = debug +- QMAKE_MAC_XCODE_SETTINGS += debug_information_format +- } +- +- QMAKE_XCODE_ARCHS = +- +- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" +- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_device +- +- simulator { +- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" +- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_simulator +- } +- +- only_active_arch.name = ONLY_ACTIVE_ARCH +- only_active_arch.value = YES +- only_active_arch.build = debug +- QMAKE_MAC_XCODE_SETTINGS += only_active_arch +-} else { +- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS +- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS +- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS +- +- isEmpty(VALID_ARCHS): \ +- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") +- +- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) +- +- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- +- arch_flags = $(EXPORT_ARCH_ARGS) +- +- QMAKE_CFLAGS += $$arch_flags +- QMAKE_CXXFLAGS += $$arch_flags +- QMAKE_LFLAGS += $$arch_flags +- +- QMAKE_PCH_ARCHS = $$VALID_ARCHS +- +- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET +- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET +- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET +- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET +- +- # If we're doing a simulator and device build, device and simulator +- # architectures use different paths and flags for the sysroot and +- # deployment target switch, so we must multiplex them across multiple +- # architectures using -Xarch. Otherwise we fall back to the simple path. +- # This is not strictly necessary, but results in cleaner command lines +- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit +- # individual rules to a different set of architecture(s) from the overall +- # build (such as machtest in QtCore). +- simulator:device { +- QMAKE_XARCH_CFLAGS = +- QMAKE_XARCH_LFLAGS = +- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS +- +- for (arch, VALID_ARCHS) { +- contains(VALID_SIMULATOR_ARCHS, $$arch) { +- sdk = $$simulator.sdk +- version_identifier = $$simulator.deployment_identifier +- } else { +- sdk = $$device.sdk +- version_identifier = $$device.deployment_identifier +- } +- +- version_min_flags = \ +- -Xarch_$${arch} \ +- -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -isysroot$$xcodeSDKInfo(Path, $$sdk) +- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) +- +- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) +- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) +- +- QMAKE_EXTRA_VARIABLES += \ +- QMAKE_XARCH_CFLAGS_$${arch} \ +- QMAKE_XARCH_LFLAGS_$${arch} +- } +- +- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) +- } else { +- simulator: \ +- version_identifier = $$simulator.deployment_identifier +- else: \ +- version_identifier = $$device.deployment_identifier +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag +- } +- +- # Enable precompiled headers for multiple architectures +- QMAKE_CFLAGS_USE_PRECOMPILE = +- for (arch, VALID_ARCHS) { +- icc_pch_style: \ +- use_flag = "-pch-use " +- else: \ +- use_flag = -include +- +- # Only use Xarch with multi-arch, as the option confuses ccache +- count(VALID_ARCHS, 1, greaterThan): \ +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- -Xarch_$${arch} +- +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} +- } +- icc_pch_style { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} +- QMAKE_CFLAGS_USE_PRECOMPILE = +- } else { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- } +- +- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} +-} +- +-cache(QMAKE_XCODE_DEVELOPER_PATH, stash) +-cache(QMAKE_XCODE_VERSION, stash) +- +-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() +diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf +--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:30.000000000 +0800 ++++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:45.000000000 +0800 +@@ -1,51 +1,2 @@ + CONFIG = asset_catalogs rez $$CONFIG + load(default_pre) +- +-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { +- # Get path of Xcode's Developer directory +- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") +- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode path is valid +- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode is set up properly +- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ +- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") +-} +- +-isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +-} +- +-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { +- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist +- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ +- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") +- +- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ +- cache(QMAKE_TARGET_BUNDLE_PREFIX) +-} +- +-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon +- +-# Make the default debug info format for static debug builds +-# DWARF instead of DWARF with dSYM. This cuts down build times +-# for application debug builds significantly, as Xcode doesn't +-# have to pull out all the DWARF info from the Qt static libs +-# and put it into a dSYM file. We don't need that dSYM file in +-# the first place, since the information is available in the +-# object files inside the archives (static libraries). +-macx-xcode:qtConfig(static): \ +- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf +- +-# This variable is used by the xcode_dynamic_library_suffix +-# feature, which allows Xcode to choose the Qt libraries to link to +-# at build time, depending on the current Xcode SDK and configuration. +-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf +--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf 2017-09-16 16:40:30.000000000 +0800 ++++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf 2017-09-16 16:41:16.000000000 +0800 +@@ -1,49 +0,0 @@ +- +-isEmpty(QMAKE_MAC_SDK): \ +- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") +- +-contains(QMAKE_MAC_SDK, .*/.*): \ +- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") +- +-defineReplace(xcodeSDKInfo) { +- info = $$1 +- sdk = $$2 +- isEmpty(sdk): \ +- sdk = $$QMAKE_MAC_SDK +- +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'") +- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) +- } +- +- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) +-} +- +-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) +-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- +-sysrootified = +-for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val +-QMAKE_INCDIR_OPENGL = $$sysrootified +- +-QMAKESPEC_NAME = $$basename(QMAKESPEC) +- +-# Resolve SDK version of various tools +-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) { +- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} +- !isEmpty($$tool_variable) { +- $$tool = $$eval($$tool_variable) +- next() +- } +- +- value = $$eval($$tool) +- isEmpty(value): next() +- +- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") +- isEmpty(sysrooted): next() +- +- $$tool = $$sysrooted $$member(value, 1, -1) +- cache($$tool_variable, set stash, $$tool) +-} +Common subdirectories: qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/unsupported and qtbase-opensource-src-5.9.1/mkspecs/features/mac/unsupported diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh index 81fcf5fc3d3..4458e18a454 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh @@ -2,6 +2,12 @@ qtPluginPrefix=@qtPluginPrefix@ qtQmlPrefix=@qtQmlPrefix@ qtDocPrefix=@qtDocPrefix@ +_qtRmCMakeLink() { + find "${!outputLib}" -name "*.cmake" -type l | xargs rm +} + +postInstallHooks+=(_qtRmCMakeLink) + addToSearchPathOnceWithCustomDelimiter() { local delim="$1" local search="$2" From 1529938fc327f8af7b145a78f3b7a0e2f8addb6f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 11 Oct 2017 07:28:32 +0000 Subject: [PATCH 0993/2806] cubicle: 1.0.2 -> 1.1.1 --- .../applications/science/logic/cubicle/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index 65a0f72da5e..c7108d74906 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, ocaml, ocamlPackages }: +{ stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { name = "cubicle-${version}"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz"; - sha256 = "1fg39vlr2d5067512df32hkw6g8vglxj1m47md5mw3pn3ij6dpsx"; + sha256 = "1sny9c4fm14k014pk62ibpwbrjjirkx8xmhs9jg7q1hk7y7x3q2h"; }; - buildInputs = [ ocaml ocamlPackages.functory ]; + postPatch = '' + substituteInPlace Makefile.in --replace "\\n" "" + ''; + + buildInputs = with ocamlPackages; [ ocaml findlib functory ]; meta = with stdenv.lib; { description = "An open source model checker for verifying safety properties of array-based systems"; homepage = http://cubicle.lri.fr/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ lucas8 ]; }; } From f0b7ee37ef33c6864d259420aa2f360d80cb5de5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 11 Oct 2017 07:29:09 +0000 Subject: [PATCH 0994/2806] hevea: make explicit the dependency to ocamlbuild --- pkgs/tools/typesetting/hevea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index 0e87ef5dacc..ed6e741b3f9 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml }: +{ stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { name = "hevea-2.29"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1i7qkar6gjpsxqgdm90xxgp15z7gfyja0rn62n23a9aahc0hpgq6"; }; - buildInputs = [ ocaml ]; + buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; makeFlags = "PREFIX=$(out)"; @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://pauillac.inria.fr/~maranget/hevea/; license = licenses.qpl; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } From ad5a67cf16a4919434324b8f3b3d85370c2cc3af Mon Sep 17 00:00:00 2001 From: dywedir Date: Wed, 11 Oct 2017 11:13:00 +0300 Subject: [PATCH 0995/2806] libmediainfo, mediainfo, mediainfo-gui: 0.7.97 -> 0.7.99 --- pkgs/applications/misc/mediainfo-gui/default.nix | 8 ++++---- pkgs/applications/misc/mediainfo/default.nix | 8 ++++---- pkgs/development/libraries/libmediainfo/default.nix | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 787f97ac1b1..fc702f249de 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.97"; + version = "0.7.99"; name = "mediainfo-gui-${version}"; src = fetchurl { - url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n"; + url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; + sha256 = "127d6wsrq3wg3ibbb28m26wrm54qbkv8h8xycanvml6ys4zqsc6a"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. ''; - homepage = http://mediaarea.net/; + homepage = https://mediaarea.net/; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 38888b0ebdc..84fef1b3983 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.97"; + version = "0.7.99"; name = "mediainfo-${version}"; src = fetchurl { - url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n"; + url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; + sha256 = "127d6wsrq3wg3ibbb28m26wrm54qbkv8h8xycanvml6ys4zqsc6a"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. ''; - homepage = http://mediaarea.net/; + homepage = https://mediaarea.net/; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index cc6f5205d92..9e4b23a0919 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.97"; + version = "0.7.99"; name = "libmediainfo-${version}"; src = fetchurl { - url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0rpxxbszi7i4hspdzdif9inhlwxdkf0iggaim6682clqb6pv7sld"; + url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; + sha256 = "126nkxrzs6dxzm3hzx6smvw6xgrqr3zs6hdqvl2xmvqy10p8z6pc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library for mediainfo"; - homepage = http://mediaarea.net/; + homepage = https://mediaarea.net/; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; From 818b161e0acea3a578d2eb06ae1a13d5aaad9c42 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Wed, 11 Oct 2017 11:15:29 +0200 Subject: [PATCH 0996/2806] nixos/locatedb: path restriction options were renamed in systemd 231. --- nixos/modules/misc/locate.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 0fe91435ce8..9b8a54719e4 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -147,8 +147,8 @@ in { serviceConfig.PrivateTmp = "yes"; serviceConfig.PrivateNetwork = "yes"; serviceConfig.NoNewPrivileges = "yes"; - serviceConfig.ReadOnlyDirectories = "/"; - serviceConfig.ReadWriteDirectories = dirOf cfg.output; + serviceConfig.ReadOnlyPaths = "/"; + serviceConfig.ReadWritePaths = dirOf cfg.output; }; systemd.timers.update-locatedb = From 97ec559b008a5275854379c609faa4b88b0ff5b8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 11 Oct 2017 17:20:41 +0800 Subject: [PATCH 0997/2806] syncthing: 0.14.38 -> 0.14.39 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 4e3f0a68423..f2ffcac452e 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.38"; + version = "0.14.39"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0afid083azvrihv1v2cas09dprr2fflmj9gi7iy18gvwy2pg0jj8"; + sha256 = "0bq2vdfnl77qldg1zvfhdbmhsj80qz8pds4slqlwjmmjmk19sqnh"; }; buildInputs = [ go removeReferencesTo ]; From 581b7755edd1c679b4b16c1ef685e1560d9f2652 Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 10 Oct 2017 18:34:16 +0300 Subject: [PATCH 0998/2806] borgbackup: 1.0.11 -> 1.1.0 --- pkgs/tools/backup/borg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 19495b6e1df..a460adc1b75 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.0.11"; + version = "1.1.0"; namePrefix = ""; src = fetchurl { From 9fa341c98995c58eb2c178373df6fb50fd64e81f Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 11 Oct 2017 12:48:46 +0300 Subject: [PATCH 0999/2806] Rebase on nixos-unstable, fix hash. --- pkgs/tools/backup/borg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index a460adc1b75..4368218ae7b 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "14fjk5dfwmjkn7nmkbhhbrk3g1wfrn8arvqd5r9jaij534nzsvpw"; + sha256 = "0vwyg0b4kxb0rspqwhvgi5c78dzimgkydf03wif27a40qhh1235l"; }; nativeBuildInputs = with python3Packages; [ From 629570fa085016f3bf1cf5bfd2999f0cd3d46ec5 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 11 Oct 2017 09:56:29 +0200 Subject: [PATCH 1000/2806] chromium pepper flash: 27.0.0.130 -> 27.0.0.159 --- pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 2bc81869530..24ab054e0a6 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "27.0.0.130"; + version = "27.0.0.159"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "005sxx3ll18c6idy1db2gb47chd9c5mf83qac0vyvljsrlc7430c"; + sha256 = "00nbn8nv6irsak05cwlx9x8q0n91kbjxnkdg4c66ilx2gq5wrz05"; stripRoot = false; }; From 5a43eec0704503f4b415814557ad22490a6165c1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 10 Oct 2017 23:06:45 -0400 Subject: [PATCH 1001/2806] nixpkgs: expose .git-revision in the nixexprs like NixOS nixos/lib/make-channel.nix:16: echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision This means the .git-revision exists in nixos channels, but not Nixpkgs channels. Adding it to the nixpkgs channel makes it a common API for any Nixpkgs use cases. --- pkgs/top-level/make-tarball.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index c7e5f21910b..16940761e6d 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -24,7 +24,9 @@ releaseTools.sourceTarball rec { eval "$preConfigure" releaseName=nixpkgs-$VERSION$VERSION_SUFFIX echo -n $VERSION_SUFFIX > .version-suffix + echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision echo "release name is $releaseName" + echo "git-revision is $(cat .git-revision)" ''; dontBuild = false; From 8315c406a4817160abacbbd4d3960a07cd65fbc7 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Wed, 11 Oct 2017 13:21:21 +0200 Subject: [PATCH 1002/2806] radare2: 1.6.0 -> 2.0.0 (#30274) * radare2: 1.6.0 -> 2.0.0 * radare2: remove hotpatch for upstream --- pkgs/development/tools/analysis/radare2/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a4cf3bcd649..1754727bb36 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -13,14 +13,14 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "1.6.0"; + version = "2.0.0"; name = "radare2-${version}"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "0kb7y0b5kw2p1kxpzjgc8pnwdkqyzkijzp5d2a9zs2ira96668zd"; + sha256 = "1ahai9x6jc15wjzdbdkri3rc88ark2i5s8nv2pxcp0wwldvawlzi"; }; postPatch = let @@ -34,10 +34,6 @@ stdenv.mkDerivation rec { substituteInPlace shlr/Makefile --replace CS_RELEASE=0 CS_RELEASE=1 cp ${capstone} shlr/capstone-${cs_ver}.tar.gz - # make compiler happy (fixed in upstream 2017-08-11) - substituteInPlace libr/asm/arch/hexagon/gnu/hexagon-dis.c --replace \ - '(*info->fprintf_func) (info->stream, errmsg);' \ - '(*info->fprintf_func) (info->stream, "%s", errmsg);' ''; nativeBuildInputs = [ pkgconfig ]; From ed6c85c04c0f0cc4f5eebf6459c4db6efc86bcf0 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 5 Oct 2017 12:55:39 -0400 Subject: [PATCH 1003/2806] elpa-packages: 2017-10-09 --- .../editors/emacs-modes/elpa-generated.nix | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 7cd57642aad..cf49b8d2ea7 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -28,10 +28,10 @@ ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }: elpaBuild { pname = "ada-mode"; - version = "5.2.2"; + version = "5.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-5.2.2.tar"; - sha256 = "0c0lrj4vgsbawyshqbfb7gvndf0yb97wybqb0b34z7kan7q0xgvd"; + url = "https://elpa.gnu.org/packages/ada-mode-5.3.1.tar"; + sha256 = "0srna7w3y2nq0y80a01bcx8mg6gvind7nzvsbk9bd7rrr05njrd9"; }; packageRequires = [ cl-lib emacs wisi ]; meta = { @@ -95,10 +95,10 @@ ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ahungry-theme"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.4.0.tar"; - sha256 = "1n8k12mfn01f20j0pyd7ycj77x0y3a008xc94frklaaqjc0v26s4"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.5.0.tar"; + sha256 = "0xxzmqawd7cwafzb9z6c7hjlh6adc5sj7hfcqxf30b7b7ragqn19"; }; packageRequires = [ emacs ]; meta = { @@ -149,10 +149,10 @@ ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ascii-art-to-unicode"; - version = "1.9"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.9.el"; - sha256 = "0lfgfkx81s4dd318xcxsl7hdgpi0dc1fv3d00m3xg8smyxcf3adv"; + url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.11.el"; + sha256 = "1z1vjpskvhynja41cv5z6xrz3rmpdzz51avv2gzrpxxa4k6iaz8s"; }; packageRequires = []; meta = { @@ -281,10 +281,10 @@ }) {}; captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "captain"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/captain-1.0.1.el"; - sha256 = "1jqbgzcgq4kxpcsma9ia6w6rjy9sdn51lz2f4rfjjy3qgy4fqjx5"; + url = "https://elpa.gnu.org/packages/captain-1.0.2.el"; + sha256 = "0rslksfwzf5bngmbfgv2mwmls5dpwmz7rs9av9p60y7k848haqf1"; }; packageRequires = []; meta = { @@ -700,10 +700,10 @@ ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "ebdb"; - version = "0.3.1"; + version = "0.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.3.1.tar"; - sha256 = "1g8chkw302nhjj8n6v7j3xfcw24wpn43pcp8f3bh4s4haw1l75q3"; + url = "https://elpa.gnu.org/packages/ebdb-0.3.4.tar"; + sha256 = "1jj7s0646wqg9ykmpi52cc6m6m0gk2inqc2h6h7cr7gr4v7n2l00"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -728,10 +728,10 @@ ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }: elpaBuild { pname = "ebdb-i18n-chn"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.1.el"; - sha256 = "0pf7qp15z9wp41dazvi4bhdz7y13h9k5nnghhsb0nvknn6if0k4m"; + url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.2.el"; + sha256 = "1qgrlk625mhfd6n1mc0kqfzbisnb61kx3vrrl3bzlz4viq3kcc10"; }; packageRequires = [ ebdb pyim ]; meta = { @@ -1556,10 +1556,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170911"; + version = "20171009"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170911.tar"; - sha256 = "0w91f5lx64klwbpym0b73z919dagzakykkmx6g13iscsh7fflx06"; + url = "https://elpa.gnu.org/packages/org-20171009.tar"; + sha256 = "03j7vcj5rihhdh1mmy667s1jy39wfs0kf4gc0gmqxldml062gcpm"; }; packageRequires = []; meta = { @@ -2068,10 +2068,10 @@ }) {}; tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp-theme"; - version = "0.1.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-theme-0.1.1.el"; - sha256 = "0l8i625h9sc6h59qfj847blmfwfhf9bvfsbmwfb56qzs535fby3y"; + url = "https://elpa.gnu.org/packages/tramp-theme-0.2.el"; + sha256 = "1q1j0vcdyv5gnfbnfl08rnwd5j4ayc1gi1vpinr99ny70wsv7gbf"; }; packageRequires = [ emacs ]; meta = { @@ -2293,10 +2293,10 @@ wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wisi"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-1.1.5.tar"; - sha256 = "1q0dbykh9gvh0355vc1lwpriwlqq07jaydqx8zdrs6s0zyffx3a4"; + url = "https://elpa.gnu.org/packages/wisi-1.1.6.tar"; + sha256 = "0p7hm9l4gbp50rmpqna6jnc1pss2axdd6m6hk9ik4afbz0knzwnk"; }; packageRequires = [ cl-lib emacs ]; meta = { From 2ad1754290b158946a18cadbe11323e499e3685b Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 5 Oct 2017 12:55:56 -0400 Subject: [PATCH 1004/2806] org-packages: 2017-10-09 --- .../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 a1cb0b7d4ed..1dd0f37b468 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 = "20170911"; + version = "20171009"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170911.tar"; - sha256 = "16d69g1qnfcj7d2q9ni5dz5wh9pid9mzhwyfg4z93s9xizzlnw64"; + url = "http://orgmode.org/elpa/org-20171009.tar"; + sha256 = "1v8y4gmfrnzsdy9mspqzn157da7lb7z2wvp95r1iywf64325gv5s"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170911"; + version = "20171009"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170911.tar"; - sha256 = "0bgrsccar4v9viq99w2h4rjavql14zgdwkwaa1bprga3af78jr82"; + url = "http://orgmode.org/elpa/org-plus-contrib-20171009.tar"; + sha256 = "0iv1f7hbqh46mymk097x69q00pqpbkcyzjfd9a9slf5xkw1g1lk1"; }; packageRequires = []; meta = { From 5e1c5b8b61e753420a53e4155fa0d71b68b3c0a3 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 5 Oct 2017 12:59:11 -0400 Subject: [PATCH 1005/2806] melpa-stable-packages: 2017-10-09 Removals: - forecast: tags no longer present in repo - org-mac-iCal: removed from melpa - paper-theme: tags no longer present in repo --- .../emacs-modes/melpa-stable-generated.nix | 1063 +++++++++++------ 1 file changed, 725 insertions(+), 338 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 0eeeb5f97fd..c97402c0f65 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -926,12 +926,12 @@ add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-node-modules-path"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "codesuki"; repo = "add-node-modules-path"; - rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998"; - sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q"; + rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3"; + sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; @@ -1073,12 +1073,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf"; - sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s"; + rev = "85a1af27541f6a73a63120fac2cfbb7ba39531c9"; + sha256 = "0z1kh8xj16lp7ydzw1fxypw37vlrcxcb8bpx96w6aj6zcd7pzwmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1292,12 +1292,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "95fdfab07600171daccb0e9e98fb91c11237fd48"; - sha256 = "0l5h6apjshr6drfak6j66m3rv26hkr2namj85k8isvalmn4dlrj2"; + rev = "89fc16d50b889a17521084347b28f3011b84e113"; + sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2809,12 +2809,12 @@ bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bifocal"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "riscy"; repo = "bifocal-mode"; - rev = "5e89ad1a9a47e890ce080a79fd32c71eb128d1c4"; - sha256 = "1rwxw1wniws31gbmpxgglxbc2g4jag19dvsjrym0f43yy4w2mbpw"; + rev = "a8b222b069a6bd64531b4780905989797bad8abe"; + sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; @@ -3166,12 +3166,12 @@ buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "1c63a3267bc7b790cebcea6308b64ca7ae08ef98"; - sha256 = "1g4qchgf7gcy8mhynxklz3bh2nlrhshczpq6yzh7gpvgcaf2zg32"; + rev = "44b26d5c17a4ecea3484727fa46c3d734569a018"; + sha256 = "0c9hz2532vcbn69am7pd2zyraqgw0q139qsck9hs1vfxnsj4v8dc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -3376,12 +3376,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "e6f97d0ee4da1d061c2ff5f3e3984a30956a9fbc"; - sha256 = "1qizbnychsjv42h9r33l1jm0rylvkgddcwgwxxcckfkj6r75k9p5"; + rev = "18a887957b0e22d3cc8873796bd27f06b2493a03"; + sha256 = "0y0wg0yqmvqjyhjs4dx8yw44hl19k227krd9mds220w0dx8wmhay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -3646,6 +3646,27 @@ license = lib.licenses.free; }; }) {}; + caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "caml"; + version = "4.6.0beta1"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "ocaml"; + rev = "185bf236abb2bf10abfd3bff45c723ba10551c80"; + sha256 = "0057iik539jfcw287vcacb8hfxdnyfk17cc0ymxxy3sk5y1mfjik"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; + sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c"; + name = "caml"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/caml"; + license = lib.licenses.free; + }; + }) {}; cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; @@ -3733,12 +3754,12 @@ cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "cask-package-toolset"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "cask-package-toolset.el"; - rev = "1e972739dbdf3af5b60a250c99414e76db238f78"; - sha256 = "0padb1zfjkmx9kbqnqh744qvpd3ln0khwxifxld9cpcpdp5k04vc"; + rev = "2c74cd827e88c7f8360581a841e45f0b794510e7"; + sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset"; @@ -3938,6 +3959,27 @@ license = lib.licenses.free; }; }) {}; + cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cframe"; + version = "0.1"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "cframe"; + rev = "bb99672502046e87c8f029ce98c637f762a4fc54"; + sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe"; + sha256 = "0pngdaflk1pk2xmwbij4b520b3mlacnjab4r3jby0phah44ziv4l"; + name = "cframe"; + }; + packageRequires = [ buffer-manage dash emacs ]; + meta = { + homepage = "https://melpa.org/#/cframe"; + license = lib.licenses.free; + }; + }) {}; chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chapel-mode"; @@ -4088,12 +4130,12 @@ choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "choice-program"; - version = "0.2"; + version = "0.4"; src = fetchFromGitHub { owner = "plandes"; repo = "choice-program"; - rev = "5a803216d1d7a7ac6fd0f89f04ba4c126182a852"; - sha256 = "0iah71kcrzi22mi1jvyyaiflsx0ry24hqb0wd2w0nbgzc8s5ycqb"; + rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15"; + sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program"; @@ -4169,15 +4211,36 @@ license = lib.licenses.free; }; }) {}; + circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "circadian"; + version = "0.2.3"; + src = fetchFromGitHub { + owner = "GuidoSchmidt"; + repo = "circadian.el"; + rev = "0034de1551de9f420f42267f3ec081351c2b5d7f"; + sha256 = "1khczk5lsiicyjra7g5m3dcl1rc6g43zbypigkj3izx2dsa47n5d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; + sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id"; + name = "circadian"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/circadian"; + license = lib.licenses.free; + }; + }) {}; circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; - sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; + rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6"; + sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -4499,12 +4562,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3"; - sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5"; + rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362"; + sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -4583,12 +4646,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.9.2"; + version = "3.10.0pre1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "ffa164736ec78f27583ca4515ff3dfc7a82fc702"; - sha256 = "09m6hwlzdrd884h8wcq8pfac098smk1xqjpqm3003bqs4aynm49p"; + rev = "ecaddda2fea374089d867ad17b8b4700b189f397"; + sha256 = "0j6zzirbx1pcb0hyih77w6dbjmz2axknib7aryrcm7pjwd9d0q23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4622,6 +4685,27 @@ license = lib.licenses.free; }; }) {}; + cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cnfonts"; + version = "0.9.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "cnfonts"; + rev = "cbe1ddd49e33b790a568c55351146aa5b909f173"; + sha256 = "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts"; + sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w"; + name = "cnfonts"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cnfonts"; + license = lib.licenses.free; + }; + }) {}; codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "codic"; @@ -4748,6 +4832,27 @@ license = lib.licenses.free; }; }) {}; + colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "colormaps"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "lepisma"; + repo = "colormaps.el"; + rev = "3a88961ba66b09a49ea5aa92b2b8776b2c92d68c"; + sha256 = "083hks2zzalizdsgabiwc1kd114r748v5i3w3kfk8pv37i2gay35"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps"; + sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2"; + name = "colormaps"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/colormaps"; + license = lib.licenses.free; + }; + }) {}; commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "commander"; @@ -4790,6 +4895,27 @@ license = lib.licenses.free; }; }) {}; + comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + melpaBuild { + pname = "comment-tags"; + version = "0.1"; + src = fetchFromGitHub { + owner = "vincekd"; + repo = "comment-tags"; + rev = "293a30026d7750f6657d6c2e6d6428abf1d7db5a"; + sha256 = "06s0phgqpzkkv81gl0cm6x8rjs53lhs8b2j56xamflqiydq0fz7n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags"; + sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i"; + name = "comment-tags"; + }; + packageRequires = [ emacs pkg-info ]; + meta = { + homepage = "https://melpa.org/#/comment-tags"; + license = lib.licenses.free; + }; + }) {}; commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "commenter"; @@ -4898,12 +5024,12 @@ company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-cabal"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-cabal"; - rev = "a570559ff92522598b5ed40e21c4539fffb3e976"; - sha256 = "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw"; + rev = "f458de88cad16ed48a605e8347e56433e73dcef8"; + sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal"; @@ -6206,12 +6332,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.26.1"; + version = "0.27.1"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "39c71d912af541229d24da17987d65e65731d2bf"; - sha256 = "02alpsgmm0csp9yfa4bhsf8yyhf0q9rc44yrss0020qg8n92xs06"; + rev = "32538fc162be830bf01ff96e43a020bc4924a1ee"; + sha256 = "03v4ig9zlh8dz9s0c31f5hz2wfpvjydiidb0zgghnrshlqacpyj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -6248,12 +6374,12 @@ dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dad-joke"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "davep"; repo = "dad-joke.el"; - rev = "92641503c7e93309db12380d5228f99dbe64a53c"; - sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc"; + rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba"; + sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; @@ -6395,12 +6521,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58"; - sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw"; + rev = "8594c4f55448148b720eda5b72d51667fb7a8a39"; + sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -6458,12 +6584,12 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "0.2.1"; + version = "0.3"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "3ecf9985250ecd441e91614b44cf12323af907c0"; - sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv"; + rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71"; + sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; @@ -7085,6 +7211,27 @@ license = lib.licenses.free; }; }) {}; + diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "diredfl"; + version = "0.3"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "diredfl"; + rev = "2393653a1518b118180ff90ef2b66cfb7d0b555c"; + sha256 = "04yykal90pc4nsdlk08z6svsnddjzaz1drwvs3bqfjw01fr50xcs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; + sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn"; + name = "diredfl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/diredfl"; + license = lib.licenses.free; + }; + }) {}; diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredful"; @@ -7172,12 +7319,12 @@ disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disable-mouse"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "purcell"; repo = "disable-mouse"; - rev = "d1c52d80ed2149d0751afd948ffc2d9f80f589ac"; - sha256 = "1v1y5hf6k6ng7xsvgb27nh740d14m6l4krr0paccda8zgm4mw357"; + rev = "81639930bcaeedadbcc19728e91719afcac84613"; + sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse"; @@ -7347,12 +7494,12 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "0.3.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "372df2f0de34a4bd44d4a7274b9ab85117ac7392"; - sha256 = "14vgjhy2j60xhf38zm5nlkr4d3r455kw6paw0wff4mqmdjcg3pds"; + rev = "ae25b0e01394f94995f4b0ceaab1e04eb4b9acbd"; + sha256 = "14xri92dcj52vw1vhrnicibrn9y010zv8w7jw6j3q9lrpmr073lr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; @@ -7578,12 +7725,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "1e6f973ed5dfdbbfda96c4ab266bd8ef3d6436d7"; - sha256 = "1c3krir3l04rwlyadnhra6kmbnmvdm95aj7iwspa6dssnry4vflj"; + rev = "49ce63c659aa0af7a2daf0c9e74e58fbce6deb71"; + sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -7662,12 +7809,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "c96467b3079495353350a6b00fd2e6052b3a3fd0"; - sha256 = "04jhbapf84if54d648mx1fk7b9vwrnd0apyarwjv7p1azasm6vwl"; + rev = "64c0759432334465ccea115d83600b468f86e3be"; + sha256 = "00vhxd7z7fw2cwdzgvfbdzfp668dfaw83c95kkicmmdzlabiz50i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -7686,8 +7833,8 @@ version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "56fa34ea25d4"; - sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00"; + rev = "023d2edde61d"; + sha256 = "1izhlafsbxfav4jvl7bqg188d71895r1sqacxsblvcld8c0brsqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -7871,12 +8018,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "1.7.7"; + version = "1.9.11"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2"; - sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac"; + rev = "8f16fb1f510a147e7ab846030057d4c74127ffb2"; + sha256 = "15axmg6z1nlaz7xsf70arxazkkskkga2fa71iswpnhwqsrr90w8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -8165,12 +8312,12 @@ edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-indirect"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "Fanael"; repo = "edit-indirect"; - rev = "1d1dae842505e5ff09644529deec87c056e1b14e"; - sha256 = "145knahvvxbm8qmcdb69ilrg14w7130vav2pqjd7anr1l8n2i6gz"; + rev = "032ac0ec690d4999d564fd882588c7a197efe8dd"; + sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect"; @@ -8614,12 +8761,12 @@ el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2org"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "tumashu"; repo = "el2org"; - rev = "c85837d56ed8fe1b31927755294db49ac46f443e"; - sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6"; + rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e"; + sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; @@ -8950,12 +9097,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "c33794ae03fa787c7f93b93cc9427d864b63e25f"; - sha256 = "1q8zjsl9zbgwqcbvzkdlqy28z4h1qr0kkhhrq037vab0w0l0zi6l"; + rev = "1e65cb6e988df088c299572464335b6f149addcd"; + sha256 = "01mfrn6mn8h9fkpkqg2shp21864ffjr7q5h3rpbnk6wpa3pmjc1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -9574,12 +9721,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "1.0.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "2b4d4cd764b9fa4757738a6dae87f4d1e99686d6"; - sha256 = "0j7zd3qxh4m5gv5s8pvfacad2mkzwwz1xdrvg1sa035xaxahqsyx"; + rev = "34c7719c9739d1e5d55c3f776e8f32a417b4eea6"; + sha256 = "1dpj31krw0vwrb1pimpbpdm3k2ivqmr6kbgaw8p2dwwwqk1s6nbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -9645,12 +9792,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "2.3.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "deb9affaadce11c356df53b6b62ab376ef652d16"; - sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0"; + rev = "1768e91e02a2d6441c2d82a711912a9498d2316e"; + sha256 = "02fknkqxqxzqdqa2vj7ql6swrl83v1xs5iym5r6yr6mpj69di8bd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -9875,12 +10022,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.0.4"; + version = "20.1.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "a230f26086b3db9097f06d4bb91fb3b2e9379c77"; - sha256 = "1g26vf7ab18r9knxa2ykn3j6vrhhiyqbg6jf3gfjxw2c94z51a9m"; + rev = "69292a11cd4b31fd3ff73b44f28d527f2d16f555"; + sha256 = "1v5hna4gf2i9lmiyykbs4w2r1yym2p6jb21nxfa5vlhwq85mldfb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10081,6 +10228,27 @@ license = lib.licenses.free; }; }) {}; + eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eshell-bookmark"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "eshell-bookmark"; + rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed"; + sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark"; + sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s"; + name = "eshell-bookmark"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eshell-bookmark"; + license = lib.licenses.free; + }; + }) {}; eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-did-you-mean"; @@ -10123,6 +10291,27 @@ license = lib.licenses.free; }; }) {}; + eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eshell-prompt-extras"; + version = "0.96"; + src = fetchFromGitHub { + owner = "hiddenlotus"; + repo = "eshell-prompt-extras"; + rev = "7581c109673c40aceff278cd524273f50ffe170d"; + sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; + sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5"; + name = "eshell-prompt-extras"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/eshell-prompt-extras"; + license = lib.licenses.free; + }; + }) {}; eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-up"; @@ -10417,22 +10606,22 @@ license = lib.licenses.free; }; }) {}; - evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: + evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "1.2.12"; + version = "1.2.13"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "0ad4c2dae1249558f7b59a78a685e4f8092009c9"; - sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn"; + rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a"; + sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39"; name = "evil"; }; - packageRequires = [ goto-chg undo-tree ]; + packageRequires = [ cl-lib emacs goto-chg undo-tree ]; meta = { homepage = "https://melpa.org/#/evil"; license = lib.licenses.free; @@ -10963,6 +11152,27 @@ license = lib.licenses.free; }; }) {}; + evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-test-helpers"; + version = "1.2.13"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "evil"; + rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a"; + sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; + sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs"; + name = "evil-test-helpers"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://melpa.org/#/evil-test-helpers"; + license = lib.licenses.free; + }; + }) {}; evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-text-object-python"; @@ -11301,12 +11511,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "63395a2367d1d48983a9363d2d0bf518177297bd"; - sha256 = "15vgv0z4vzdnc3vb98j2hy4bv5x83f4c1dzgx49r61vka7p5is0q"; + rev = "4a79230739cfaa607f39fbfe53339692b83c3933"; + sha256 = "0cdaayp2ca6wcqh11snmc50p4gl6sika58jxvn5dklsipzxv75v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -11871,6 +12081,27 @@ license = lib.licenses.free; }; }) {}; + flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flex-compile"; + version = "0.1"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "flex-compile"; + rev = "4ca317883404a14c1b4920d7b3e6f0bffb04a8f2"; + sha256 = "08ax91bdf4dwky8zp0cwmk53wqyqs893j7q1jah5cimnhgi82ksz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile"; + sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38"; + name = "flex-compile"; + }; + packageRequires = [ buffer-manage dash emacs ]; + meta = { + homepage = "https://melpa.org/#/flex-compile"; + license = lib.licenses.free; + }; + }) {}; floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; @@ -11958,12 +12189,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "30"; + version = "31"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "9c063965e893f0cc7c97fabb810ac41ec22f82fb"; - sha256 = "1vyncqicafmy9av2nsawywn56ay50zdyjba9r55vv11baklabg8w"; + rev = "401b115d10e202a1b31f57340438420081af21ce"; + sha256 = "141i6wzqlb0dslmca6930cal7q4y5wbwzmxrpjk3hgm6nxz483p8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -12210,12 +12441,12 @@ flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-joker"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "candid82"; repo = "flycheck-joker"; - rev = "e7964140cbb0ee7badfc3d67c6412f5c3a461f76"; - sha256 = "0mqnhcpkf86dxqj0y7g5mnn91m81jdvrsbwikyqvx46z1jpi0y37"; + rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456"; + sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker"; @@ -12441,12 +12672,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "0.2"; + version = "0.4"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "220c551df591792d08fc9d149ab3329171743cb9"; - sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i"; + rev = "a3d39139dbe5cdaa64dda90907bb8653f196c71e"; + sha256 = "1i1kliy0n9b7b0rby419030n35f59xb8952widaszz4z8qb7xw9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -12546,12 +12777,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5"; - sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q"; + rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; + sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -13299,27 +13530,6 @@ license = lib.licenses.free; }; }) {}; - forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "forecast"; - version = "0.6.2"; - src = fetchFromGitHub { - owner = "cadadr"; - repo = "forecast.el"; - rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94"; - sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; - sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc"; - name = "forecast"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/forecast"; - license = lib.licenses.free; - }; - }) {}; foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "foreman-mode"; @@ -13491,12 +13701,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "1.9.8"; + version = "1.9.10"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "9766952bd7830cb0d319736961af8e42e67d42fe"; - sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi"; + rev = "71435fdd100712d6894d8d72a5667b250a0d8eb7"; + sha256 = "1c718gfms4zhzj06zmzdw71q6vhbf7mh3cgvq9vf8bnlv910p832"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -13601,6 +13811,27 @@ license = lib.licenses.free; }; }) {}; + futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "futhark-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "HIPERFIT"; + repo = "futhark"; + rev = "2a7d824f7265a35bb928bf4de8e46d02e0a56a12"; + sha256 = "0dkx9xl39k0bcspyx37410rb5ngphw9svinwjw1kgq0pqhc2qxdf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; + sha256 = "1k22xkg6vd60hk58zkxhmsw2gs6ikzmidvxcdglnr46m6x7r7pnq"; + name = "futhark-mode"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/futhark-mode"; + license = lib.licenses.free; + }; + }) {}; fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuzzy"; @@ -15218,6 +15449,27 @@ license = lib.licenses.free; }; }) {}; + goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "goto-chg"; + version = "1.7"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "goto-chg"; + rev = "171b1331022caf12d8c3593e9b5075f87ee958d4"; + sha256 = "1jcnrin4j1x8p63fd9r37dq1vr5a7a1nvzk6kp0bdsgn9vbjmapc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; + sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy"; + name = "goto-chg"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/goto-chg"; + license = lib.licenses.free; + }; + }) {}; goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "goto-gem"; @@ -15547,12 +15799,12 @@ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "0.0.1"; + version = "0.0.3"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "2b1011836fc04940d542e9a783b99670a08b308b"; - sha256 = "16v7l4ynj4p1hq243rqckfgppmj8cvm0lyybjjqaqblqjd1ki90d"; + rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122"; + sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -15734,12 +15986,12 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b"; - sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522"; + rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c"; + sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -15881,12 +16133,12 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "452e939211ebc0af7256a2f0e8cdad5c426694e6"; - sha256 = "1c49lfm5saafxks591qyy2nilymxz3aqlxpsmnad5d0kfhvjr47z"; + rev = "22a15dc57dd6aab7793c0f9c2b72e161e0bee00c"; + sha256 = "0bpbiadv4bf3lllsm0w1jcw8nc7c9zl97m972hbxb1dgv90gvs5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -16174,12 +16426,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "38a33e2ed02d57afb6b38bf36741f5bf7e38e45b"; - sha256 = "03zg58hrka2q7sqm3f14xgcs2mjxhlyybkf9w6pp8icr4wdsih4z"; + rev = "a3f890fb8570369898ee9718b128d4e7123a6585"; + sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -16237,12 +16489,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "0fc89c212b8a90ea8de0401f8d1b446ef9a24d93"; - sha256 = "0yava3cn0g382mgnczgqmc1fhd2nbdr16n48vjlvk8bsb3n4va1m"; + rev = "2385b81edc706f7efc74f2aff4854399254cde17"; + sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -16573,12 +16825,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "0fc89c212b8a90ea8de0401f8d1b446ef9a24d93"; - sha256 = "0yava3cn0g382mgnczgqmc1fhd2nbdr16n48vjlvk8bsb3n4va1m"; + rev = "2385b81edc706f7efc74f2aff4854399254cde17"; + sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -17623,12 +17875,12 @@ helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: melpaBuild { pname = "helm-smex"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "ptrv"; repo = "helm-smex"; - rev = "7af4e4b44671f739b39584fc50c20084700701ac"; - sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni"; + rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413"; + sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex"; @@ -17812,12 +18064,12 @@ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "a5d8bc41e43177953d8ba3972a83755ddd4e1073"; - sha256 = "0sr31df42cbrhzqxjvx1fcbafwq30jslqf715scrzyiziddf83zq"; + rev = "b9a06978b6ffcd7f0ea213a6f534fa39318f0050"; + sha256 = "1czqvmlca3w7n28c04dl3ljn8gbvfc565lysxlrhvgmv08iagnxm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -20452,6 +20704,27 @@ license = lib.licenses.free; }; }) {}; + jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jsonnet-mode"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "mgyucht"; + repo = "jsonnet-mode"; + rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1"; + sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode"; + sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia"; + name = "jsonnet-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/jsonnet-mode"; + license = lib.licenses.free; + }; + }) {}; jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jsx-mode"; @@ -20623,16 +20896,16 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "0.6"; + version = "0.9"; src = fetchFromGitHub { - owner = "0rdy"; + owner = "ogdenwebb"; repo = "kaolin-theme"; - rev = "041cc6637a58a3a24086d1c2b8c3eb113434127e"; - sha256 = "1qx6568s8wj6ha8wfy8hih1qwwcdiybdb83w3fr9lqwh0lyhjp0f"; + rev = "d43ba0e8e6b13b08e4d74de20c6e594ebb225501"; + sha256 = "0gg19rh5q1gl6ylwrmjq0dqh6p5fkms1av6bbgry6fqv8220xf8n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; - sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; + sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c"; name = "kaolin-theme"; }; packageRequires = [ emacs ]; @@ -21617,12 +21890,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674"; - sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa"; + rev = "0da66c7c01e8fea952faa3e21a34664b37918400"; + sha256 = "0xzqg5nrrsapxsnyk919w5nb6pad7w06f0c266x9cs4m9wih82wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -21784,12 +22057,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "134b41557ab539219d9e3a1b3c8939df93676726"; - sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; + rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f"; + sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -22001,12 +22274,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40"; - sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq"; + rev = "895c229c2b0d822a4debb302d8638105ecb4ee20"; + sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -22106,12 +22379,12 @@ magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: melpaBuild { pname = "magit-gitflow"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "jtatarik"; repo = "magit-gitflow"; - rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b"; - sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9"; + rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b"; + sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow"; @@ -22890,12 +23163,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6"; - sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax"; + rev = "a5dbf8e321ff162476555e62264468dd6f55c279"; + sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -23831,6 +24104,27 @@ license = lib.licenses.free; }; }) {}; + mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: + melpaBuild { + pname = "mustache"; + version = "0.23"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "mustache.el"; + rev = "b0ea352813592424164520a49e86c04600242752"; + sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache"; + sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g"; + name = "mustache"; + }; + packageRequires = [ dash ht s ]; + meta = { + homepage = "https://melpa.org/#/mustache"; + license = lib.licenses.free; + }; + }) {}; mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mustache-mode"; @@ -24338,12 +24632,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "227c2d175e95dbed6a5c6e37b12bb9a3fcf2de94"; - sha256 = "1wgfcghzhsa0siz1vf3rq69h1ilyblj5rsmijnyymp9fhxgyyll6"; + rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2"; + sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -24481,12 +24775,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "0.1.7"; + version = "0.2.1"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "91c4329f64ddc9a598fa6c58e1d9264aee073e72"; - sha256 = "0x3ijjhjg2q8gdqf4hgr2d8wy32qhxy48kbz0slibkn9yik3pvlz"; + rev = "19ab463864f137b43704b4f34173349c88e84d8e"; + sha256 = "00f5hhw157nwdwy26yn6l3z2hgk6xxvx5xl0hasskj1l9rg0zgh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -24712,12 +25006,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "9155a413e41d918042e9839399e3940aa0f8499c"; - sha256 = "1b39g0nifw0000s0x8ir0cfr716jypq6b5n2l1i4mrby6aw3bw1k"; + rev = "20393dd8130d21a3f06d8514da14c5ffdd88ae44"; + sha256 = "0xa7rgsb0d1d96h5bb0n0sy1hgmd2fg6r6g2aqp1c29ld4hpi7r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -24985,12 +25279,12 @@ omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-kill"; - version = "0.2.3"; + version = "0.5.1"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-kill.el"; - rev = "8a1145b58b4736c9163bcd5b28c8fea80b2ea97b"; - sha256 = "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady"; + rev = "192d51d843c6581d593a4eb01f1b49ad59d206cf"; + sha256 = "0n24rhzl1zhlkdkjigsczyc0z3yrihz9qnn1icrk6nkms107qbnn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; @@ -25006,12 +25300,12 @@ omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "omni-log"; - version = "0.3.3"; + version = "0.3.6"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-log.el"; - rev = "e86c80065030306645e28badcb0c25c549560106"; - sha256 = "10nsl45z3a1mvagffcsqj501x8wk3avmsncyn9laq3k4z1hjgdz5"; + rev = "20021eb788cbeec0371145468430b259686f519d"; + sha256 = "1sf2zbhjaz5b9xmz6632338cga7d326ibgw8b8c6c6b4vk16yhqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log"; @@ -25048,12 +25342,12 @@ omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "0da549c1386f93ed4de201bf8779ba64ddc91347"; - sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1"; + rev = "e73d4c3f9e0d4774261496d018cf944a254e06f5"; + sha256 = "0rmpnqb16v0hxfhw4lq2d27vhfhqv1mh8whq2l718l8c280yfn6k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -25094,8 +25388,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "b425270bed93b427ff519d6f51ad1d97531a0a92"; - sha256 = "0l9dk9idfsr21q0icx9fpgqyi4qlhnqal6sypak5zh8dgchrqif9"; + rev = "40b6251a96057c80a958362a0886c06eea5bfd62"; + sha256 = "176qfjd0qfgypj7pyi2p7v6zn7sic86gcgxz056k4y2akm6aa2p6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -25290,12 +25584,12 @@ org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-autolist"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "calvinwyoung"; repo = "org-autolist"; - rev = "da332fadcd9be4c5eb21c5e98c392b89743750b2"; - sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani"; + rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1"; + sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist"; @@ -25647,12 +25941,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d"; - sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr"; + rev = "cda1980b013afabd299e7a2294517897f6442d98"; + sha256 = "1y6idbp74vrr3g0r10n09znky8ih94kzf5fyil47sjkqyzzmpk3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -25707,35 +26001,15 @@ license = lib.licenses.free; }; }) {}; - org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-mac-iCal"; - version = "7.9.3.5"; - src = fetchgit { - url = "git://orgmode.org/org-mode.git"; - rev = "592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1"; - sha256 = "0rvsn085r1sgvv0gwvjlfgn7371bjd254hdzamc97m122pqr7cxr"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; - sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw"; - name = "org-mac-iCal"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-mac-iCal"; - license = lib.licenses.free; - }; - }) {}; org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "dd1b9881af705b9e78f79791c9f933cabe59c125"; - sha256 = "0ndyqz2hpvnx6kykjz4d8nmngdjfavlwchl2dasi6m98b585liqa"; + rev = "62791db188fa6a9a6b4e53c5c29fb4fa46582b98"; + sha256 = "1l1fyyyyyi8nj4vpkyhpvz1yyqa2vn7042kp9443kqcswdfc9660"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -26139,12 +26413,12 @@ org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-tfl"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitHub { owner = "storax"; repo = "org-tfl"; - rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3"; - sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk"; + rev = "f0d7d39106a1de5457f5160cddd98ab892b61066"; + sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl"; @@ -26307,12 +26581,12 @@ org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-vcard"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "flexibeast"; repo = "org-vcard"; - rev = "5c4e17c166fb0406d5dfdc8876b0e182ba7af8fd"; - sha256 = "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4"; + rev = "a6ab82ab28fa78f7c985d3ea9c9fafdd17f7ea8b"; + sha256 = "14l3xqahqmnfl3sskqcr33xpcsic8dm9cr9wmbv5la3xv14n10k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard"; @@ -26367,6 +26641,36 @@ license = lib.licenses.free; }; }) {}; + org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: + melpaBuild { + pname = "org2web"; + version = "0.9.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "org2web"; + rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7"; + sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web"; + sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf"; + name = "org2web"; + }; + packageRequires = [ + cl-lib + dash + el2org + ht + htmlize + mustache + org + simple-httpd + ]; + meta = { + homepage = "https://melpa.org/#/org2web"; + license = lib.licenses.free; + }; + }) {}; orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orgbox"; @@ -26706,12 +27010,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a"; - sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw"; + rev = "022406066891d7a0f1fe8e2f1ddd7741dcf0accb"; + sha256 = "1yybx9psjydbrrbdp7fpp4pih8jxflvl3wz9k489hvp6p0nffapp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -26724,15 +27028,36 @@ license = lib.licenses.free; }; }) {}; + ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ox-gfm"; + version = "1.0"; + src = fetchFromGitHub { + owner = "larstvei"; + repo = "ox-gfm"; + rev = "99f93011b069e02b37c9660b8fcb45dab086a07f"; + sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; + sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q"; + name = "ox-gfm"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ox-gfm"; + license = lib.licenses.free; + }; + }) {}; ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "0.1.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "a486141e4e2c3f9f67e799e20af150611d77f850"; - sha256 = "1srrkc0bajmhp614avk4yr51zsp0gnmn47r1wi7qxkr6ybxwx8k1"; + rev = "a0a1bb95d12fd45e3e111d29fd49b8171db1109b"; + sha256 = "00pn5adk6qw4lpfsw1lxhp0466q3sndgqgrh4y821lbxssx89lh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -27060,27 +27385,6 @@ license = lib.licenses.free; }; }) {}; - paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }: - melpaBuild { - pname = "paper-theme"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "cadadr"; - repo = "paper-theme"; - rev = "15af5e31492f79dc0d47787150ef39d6318a2608"; - sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a35a0888a7a27174b5de58d99b01554769041f46/recipes/paper-theme"; - sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50"; - name = "paper-theme"; - }; - packageRequires = [ emacs hexrgb ]; - meta = { - homepage = "https://melpa.org/#/paper-theme"; - license = lib.licenses.free; - }; - }) {}; paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; @@ -27310,18 +27614,19 @@ license = lib.licenses.free; }; }) {}; - password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }: + password-store = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "password-store"; version = "1.7.1"; - src = fetchgit { - url = "https://git.zx2c4.com/password-store"; + src = fetchFromGitHub { + owner = "zx2c4"; + repo = "password-store"; rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf"; sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store"; - sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; + sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6"; name = "password-store"; }; packageRequires = [ f s ]; @@ -27333,12 +27638,12 @@ password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }: melpaBuild { pname = "password-store-otp"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "volrath"; repo = "password-store-otp.el"; - rev = "2965da7d8edd32bd4ef62f487ea6bcd08c599c89"; - sha256 = "1svm6rlh4f0rjcl0fjy3x4bfakdn9npi8w7ak217ad2k08j44bzd"; + rev = "a39a64a91de36e87b852339635bd3c5fb0e32441"; + sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp"; @@ -27772,12 +28077,12 @@ pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pfuture"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5"; - sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j"; + rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb"; + sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; @@ -28945,12 +29250,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "80a37e0782d2d702d52234b62dd4b9ec74fd2c95"; - sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx"; + rev = "b04e5cba356212e4e8c66c61bbe0c3a20537c5b9"; + sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -29323,12 +29628,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "1.6.1"; + version = "1.6.4"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6"; - sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l"; + rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a"; + sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -29344,7 +29649,7 @@ pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyim-basedict"; - version = "0.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim-basedict"; @@ -29911,12 +30216,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "35129521d5b6035e5dd75d5b3481ce4971f46034"; - sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k"; + rev = "25cc3c8902f16191496b549705b00ffc7dff51f1"; + sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -30625,12 +30930,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "4a24c86a1873289538134fe431e544fa3e12e788"; - sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j"; + rev = "79bedb1d188e209be5cfef3bea8906df9c509ab8"; + sha256 = "1dh76r9hy1d1f9xhdywslgv0w3c9nhsbwvpd8icgp300x5c6a3zh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -31066,12 +31371,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "a56f0d0fedf9754e1728067ac868100f2499357d"; - sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl"; + rev = "12f116d58ac03706496bd682c6449b452681874e"; + sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; @@ -31231,22 +31536,22 @@ license = lib.licenses.free; }; }) {}; - sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "217d56bc2ec93a77a9e644233f4fb1815e437c61"; - sha256 = "1lvf7y1n63p8jvnp6ppwmxq2s6h9sk45319576f3s28ixsfa6cp2"; + rev = "bdf31a1ffe637d1445b149804d5f5cc29333a1bd"; + sha256 = "0ygp0c2hy4zp5x0ghplxf2fhrf16cn37sk2zf6i43zqz6gydzq8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8"; name = "sbt-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/sbt-mode"; license = lib.licenses.free; @@ -31255,7 +31560,7 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "0.23"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; @@ -31946,12 +32251,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487"; - sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp"; + rev = "e53d798ba4a4c07a3ee1c194840c937b18c02087"; + sha256 = "0sig9gpa2wn23skwny9jpvwxax0gbwp143anvgkc5gm87iw2jgrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -32699,22 +33004,22 @@ license = lib.licenses.free; }; }) {}; - snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "snoopy"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "anmonteiro"; repo = "snoopy-mode"; - rev = "8d2b7b1354414f261b237f2fed0d472803ba3909"; - sha256 = "05q407dg6jppmqdxpp1ba8xs6yjilsa74hga46dbhcc9nzj9850a"; + rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386"; + sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy"; sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi"; name = "snoopy"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/snoopy"; license = lib.licenses.free; @@ -32807,12 +33112,12 @@ sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }: melpaBuild { pname = "sotclojure"; - version = "1.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-clojure"; - rev = "8d879ef41c004726cca3c27a81b7543cc273c19b"; - sha256 = "13yn2yadkpmykaly3l3xsq1bhm4sxyk8k1px555y11qi0mfdcjhh"; + rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32"; + sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure"; @@ -33562,12 +33867,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "5cb70e500df430cb9ffc8ae0ab67976c1d7d226f"; - sha256 = "1001z5zaj4ln05js08cz13lgc11dqxc6sgp1s35g19sfhip4xyim"; + rev = "05beef9ecf94107d72d0070fa092a8392505b012"; + sha256 = "008d9kk8vb90n8j5dvw1rslfny66q012022na03dzbnmq3f73k7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -33706,22 +34011,22 @@ license = lib.licenses.free; }; }) {}; - swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "2.4.0"; + version = "3.0"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "50394e4ffa80cb395ddd3c3128f995644820e2bc"; - sha256 = "1dwrfbdfgndvv2rv4vl4vr82lzbkvk46z5fxbngd66yrx21rav24"; + rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0"; + sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d"; name = "swift-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs seq ]; meta = { homepage = "https://melpa.org/#/swift-mode"; license = lib.licenses.free; @@ -34002,12 +34307,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254"; - sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l"; + rev = "1e7567a9973bf80cab0d7e0355656a84bee7ca96"; + sha256 = "0ylgnvpfindg4cxccbqy02ic7p0i9rygf1w16dm1filwhbqvjplq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -34653,12 +34958,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "f1daf10e931858ac8d6ff676cf02ca73d3c62558"; - sha256 = "1hj5mfpkfczy09ghmivkkzwmn6nawwv0ydm4ckz4mggps42hn0j1"; + rev = "e5d1d3852aaf63cbfb0abaec1792a62bed024a72"; + sha256 = "1kwssyzbjwl2vyll0p49l57z41yv6k1jnzbsdnh0d1h81nixg5wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -34799,12 +35104,12 @@ tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tracking"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; - sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; + rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6"; + sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -34820,12 +35125,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.11.1"; + version = "0.12"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "d465378a59e2eb91372564a56e60a9ab00e48f9c"; - sha256 = "0al0xz59lrqj97fxmyxiphblg1bvbzahc6srd8klg7s0378ybblw"; + rev = "0de5a5fa2438890ae9c2ca61999042ab175df3e9"; + sha256 = "1wqlbbm71s1hvglsdp1qs7nvj6gnkjkai4rr8hhp1lliiyd5vmia"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -34859,22 +35164,22 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.10"; + version = "1.11.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "19723297eefdc9d3afef546f1839c88acfbeef9c"; - sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw"; + rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; + sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a"; name = "treemacs"; }; - packageRequires = [ ace-window cl-lib dash emacs f pfuture s ]; + packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ]; meta = { homepage = "https://melpa.org/#/treemacs"; license = lib.licenses.free; @@ -34883,12 +35188,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.10"; + version = "1.11.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "19723297eefdc9d3afef546f1839c88acfbeef9c"; - sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw"; + rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; + sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -34904,12 +35209,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.10"; + version = "1.11.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "19723297eefdc9d3afef546f1839c88acfbeef9c"; - sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw"; + rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; + sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -35771,12 +36076,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "5.6"; + version = "5.7"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; - sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; + rev = "40d5e1020b1a2b6e8ff04cbd8c84bf7959e4e7af"; + sha256 = "1ndrvwjgfjnmaw71y4452ck9aqlwnpxa7379ldsn7gfl0r67qhsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -35999,6 +36304,27 @@ license = lib.licenses.free; }; }) {}; + vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: + melpaBuild { + pname = "vue-mode"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "CodeFalling"; + repo = "vue-mode"; + rev = "fe501dba780025066dcdcd2055e772d06c2abdbc"; + sha256 = "0k67kzrh2fjhjiqcy1yq5cmcwjpx85yd2xxvkqvv4791q58f7c4z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; + sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0"; + name = "vue-mode"; + }; + packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ]; + meta = { + homepage = "https://melpa.org/#/vue-mode"; + license = lib.licenses.free; + }; + }) {}; w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w32-browser"; @@ -36737,11 +37063,11 @@ wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wisp-mode"; - version = "0.9.2"; + version = "0.9.6"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "7ce954278aef"; - sha256 = "116cspnc4lhf6gk73yr9sy7013jp88vq5zayghzgnkbdlaw6zmz3"; + rev = "4d41c0814bbc"; + sha256 = "1xy9a27qdl7hm7x2gbhxql63paxi16441rczl2i8ps032l4ffdnj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -36778,12 +37104,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "241726118dee067a8d9880d53c6a781d580ba8a1"; - sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x"; + rev = "99d3278b1c79718de16dd4f57dcc8c4aa31a4051"; + sha256 = "1mcfinr1wv87hqn2787dcyn7lkgfni4xfgsji50pwj3zfgg0yqyr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -37090,6 +37416,27 @@ license = lib.licenses.free; }; }) {}; + xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "xcode-project"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "nhojb"; + repo = "xcode-project"; + rev = "f5548a26a1afc0b0d873556c25f6d8b6b9c2aa8c"; + sha256 = "0xb1cvjaw7zjnw6c5aq315vvlc3cncris62jis44jb8s5r8gxcrv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project"; + sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi"; + name = "xcode-project"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/xcode-project"; + license = lib.licenses.free; + }; + }) {}; xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xcscope"; @@ -37468,6 +37815,25 @@ license = lib.licenses.free; }; }) {}; + yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "yatex"; + version = "1.80"; + src = fetchhg { + url = "https://www.yatex.org/hgrepos/yatex/"; + rev = "ca7cf34e959c"; + sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; + sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + name = "yatex"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yatex"; + license = lib.licenses.free; + }; + }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -37709,6 +38075,27 @@ license = lib.licenses.free; }; }) {}; + zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zoom"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "cyrus-and"; + repo = "zoom"; + rev = "ed8aca43820678ff6e7b8ed697cba8dbb3a6136e"; + sha256 = "1na1syvbayqwbsvd1d0ajyzjvhg8q3s3mqrx82ffcbxr0ijyzzj8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; + sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls"; + name = "zoom"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/zoom"; + license = lib.licenses.free; + }; + }) {}; zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom-window"; From 1c9a15bfdcc756ae0115ca9701d28969c9d8fd33 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 5 Oct 2017 13:08:34 -0400 Subject: [PATCH 1006/2806] melpa-packages: 2017-10-09 Removals: - baidu-life: Removed from melpa - any packages not available in git or hg --- .../editors/emacs-modes/melpa-generated.nix | 6460 +++++------------ 1 file changed, 2001 insertions(+), 4459 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index ce9c4b3a46f..d28cf3a3edf 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -127,12 +127,12 @@ abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abc-mode"; - version = "20140225.944"; + version = "20171001.403"; src = fetchFromGitHub { owner = "mkjunker"; repo = "abc-mode"; - rev = "1dd6e1217136a6f986917a3e5f41c1007bac908d"; - sha256 = "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs"; + rev = "161de34bc9e13bb094da0e99233b496a16f890fd"; + sha256 = "0dqn2y6afn36jry2lb96v8w6hwlzcln3d314j5n4sl4lh5ba2s5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaee9dc5de06747374f311d86a550d3cc15beed1/recipes/abc-mode"; @@ -355,25 +355,6 @@ license = lib.licenses.free; }; }) {}; - ac-dabbrev = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ac-dabbrev"; - version = "20130905.2218"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ac-dabbrev.el?revision=9"; - sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh"; - name = "ac-dabbrev.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/ac-dabbrev"; - sha256 = "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh"; - name = "ac-dabbrev"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ac-dabbrev"; - license = lib.licenses.free; - }; - }) {}; ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }: melpaBuild { pname = "ac-dcd"; @@ -398,12 +379,12 @@ ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-emacs-eclim"; - version = "20170104.743"; + version = "20170924.1339"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57"; - sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd"; + rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; + sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -759,8 +740,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3"; - sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd"; + rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; + sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -776,12 +757,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20170831.802"; + version = "20170925.821"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3"; - sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd"; + rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; + sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -822,8 +803,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1028,12 +1009,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20170904.340"; + version = "20170925.723"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "34eefe3c94042a20abf4d340fdae71955a087926"; - sha256 = "02lh4kmjwf8d67b33ha4shwkkfvy9igvg88v5xq7282wxp6y3lx7"; + rev = "eee81e6f75b078a207a547e0e8cff8c3d4f0b07c"; + sha256 = "03p8cdakbx5pz9f8s01chd0bzmgsz50zi433k6gh0vw553y8vcmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1216,12 +1197,12 @@ add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-node-modules-path"; - version = "20170501.151"; + version = "20170914.1912"; src = fetchFromGitHub { owner = "codesuki"; repo = "add-node-modules-path"; - rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998"; - sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q"; + rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3"; + sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; @@ -1321,12 +1302,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20170712.1549"; + version = "20170915.1249"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "74d00c48a98211001c844ab4386d00420ccc850a"; - sha256 = "1mjgl1pwaf0wl8hmzcwxq1g58mbi63ajbvhxljlysyfdkw15lvlq"; + rev = "3b567902ccbec4ed9b8c5f5cd369be833e485e79"; + sha256 = "1ihhmz4ww6iqbjbv1cvssixn01bkd2cl8pij7p32dxyyd8jdwlkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1346,8 +1327,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "aggressive-fill-paragraph-mode"; - rev = "c5185ad673c01e5103ab4a078095c3e2ce7ab039"; - sha256 = "11dppmpdv26m9l5cnnnylihiss2a09zyyb7kqdrk3djdqvqplqb4"; + rev = "bcbc63d1c93cd8dc5bf2fc6eb4988fa76375c631"; + sha256 = "042xvhfc7h571rdriixdf2s2aai8qz4w1wddbbbsq3ir0n814zp3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/982f5936f2d83222263df2886ca0b629076366bb/recipes/aggressive-fill-paragraph"; @@ -1383,11 +1364,11 @@ }) {}; ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahg"; - version = "20161110.455"; + version = "20171003.39"; src = fetchhg { url = "https://bitbucket.com/agriggio/ahg"; - rev = "0e1d1b4142e7"; - sha256 = "09606q8b9qhz1szshv8aapc7450j085rjf2fv769vbivr3kshqvh"; + rev = "6a4cc7a7eee6"; + sha256 = "09c3rawxqxxbl648bq1akawmgwiwppzd9g2sspza0k52adsb3rps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg"; @@ -1424,12 +1405,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20170702.2226"; + version = "20170926.1903"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf"; - sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s"; + rev = "85a1af27541f6a73a63120fac2cfbb7ba39531c9"; + sha256 = "0z1kh8xj16lp7ydzw1fxypw37vlrcxcb8bpx96w6aj6zcd7pzwmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1508,12 +1489,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170803.1852"; + version = "20170913.926"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "08556b3050c0bfc2d8f0a6d918610dbb2b85958f"; - sha256 = "1f2m7pz3l62gk5ndfh49hm87ihz0lfk28izps9j3i68h4zclk3ls"; + rev = "0e800594796ae283f5c0a6a374b9c2f8ebdfef56"; + sha256 = "06j1imqknya3kglnmhsz2jg18mcbcycrjlgjzb9c1n68z43xglyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1613,12 +1594,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170817.642"; + version = "20170914.129"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "d3550f8e0f8df6509e7f29a1ffbffc0f17144704"; - sha256 = "09y1g4dphkhzrxym1bwxgx5f3hzvh1v4shbrr59bvdqymv93dagl"; + rev = "8f269ae0ddec217db4ec643f8e167eb431091b72"; + sha256 = "1wprrwv099w61blam6x8wfxym1dfx802ra7cddbkmh07vfi1w6bx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1790,12 +1771,12 @@ amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "amx"; - version = "20170810.1842"; + version = "20170923.835"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "amx"; - rev = "ba09f5ecf451d278a6cf5721b6942ad8d81ab911"; - sha256 = "0xilab0v5qzvz6g8n10jdb9vz2pmlhgz6pc9cc3qsgg54r3igsv2"; + rev = "88ab7ccb2a88b5cd3ecc4d703ae9373df3e4971c"; + sha256 = "1n1zsrlj272scl4xcbys86d6gxnaq08vp5frd96i47c1an75p0xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx"; @@ -1811,12 +1792,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20170405.301"; + version = "20170924.704"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "0f9576791b86e0b315447e6823b3a7db131cd826"; - sha256 = "1qqh1gg4sanh0vi624gys9wdncmvc92kly4zlwl6a9jhi3sr7w3s"; + rev = "89fc16d50b889a17521084347b28f3011b84e113"; + sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1850,26 +1831,6 @@ license = lib.licenses.free; }; }) {}; - anchored-transpose = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anchored-transpose"; - version = "20080904.2254"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/anchored-transpose.el?revision=8"; - sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651"; - name = "anchored-transpose.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/993271c9931170c3352daa3c1c0a8bcfa6915d9a/recipes/anchored-transpose"; - sha256 = "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w"; - name = "anchored-transpose"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/anchored-transpose"; - license = lib.licenses.free; - }; - }) {}; android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "android-mode"; @@ -2041,12 +2002,12 @@ ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ansible"; - version = "20161218.1707"; + version = "20170926.1951"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-ansible"; - rev = "a712d9b48809c975525cb059ea278cbe8a839f5a"; - sha256 = "1jfksnk5fvr4h8mqb0mr2czyxnjmcdlrqdylvj0k0ks6xnskza91"; + rev = "9da54a2a426dca259ec9c2a8a60fb58e954be5bc"; + sha256 = "16z286gqy18s6bff1njkjpy0swrkfyarvb5xvik49pigd8hzh495"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible"; @@ -2415,25 +2376,6 @@ license = lib.licenses.free; }; }) {}; - aok = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "aok"; - version = "20130824.427"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/aok.el?revision=13"; - sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g"; - name = "aok.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38eee4f0f7ad25d9b1de9011e63b82400177cdd5/recipes/aok"; - sha256 = "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46"; - name = "aok"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/aok"; - license = lib.licenses.free; - }; - }) {}; aozora-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aozora-view"; @@ -2602,26 +2544,6 @@ license = lib.licenses.free; }; }) {}; - apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "apropos-fn-plus-var"; - version = "20170221.748"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el"; - sha256 = "0aa8d92ibbi1ix60j73nhvy16l8dkb3njn9d9z256jixmvzab7gr"; - name = "apropos-fn+var.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var"; - sha256 = "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x"; - name = "apropos-fn-plus-var"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/apropos-fn+var"; - license = lib.licenses.free; - }; - }) {}; apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; @@ -2643,25 +2565,6 @@ license = lib.licenses.free; }; }) {}; - apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "apu"; - version = "20170221.750"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/apu.el?revision=27"; - sha256 = "15mq2b0df4hx53hqvgl3hcrbf9ww370byg90cail6rm50wamyik6"; - name = "apu.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu"; - sha256 = "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2"; - name = "apu"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/apu"; - license = lib.licenses.free; - }; - }) {}; arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "arch-packer"; @@ -2704,6 +2607,27 @@ license = lib.licenses.free; }; }) {}; + archive-rpm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "archive-rpm"; + version = "20171005.1548"; + src = fetchFromGitHub { + owner = "legoscia"; + repo = "archive-rpm"; + rev = "830158cfb3b43c85cfcb4bd5b92d4457d015c80a"; + sha256 = "18vmwffvxxg9clddmrkyv9lkjxiczaig69yyxzghigmzmg8wk557"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5f5653e62afdc022eac30bda3d21bd2d2625d2e/recipes/archive-rpm"; + sha256 = "0s53zbn71lb008gw3f0b5w4q0pw0vgiqbffgnyib24sh03ijl7z7"; + name = "archive-rpm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/archive-rpm"; + license = lib.licenses.free; + }; + }) {}; arduino-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "arduino-mode"; @@ -2830,25 +2754,6 @@ license = lib.licenses.free; }; }) {}; - ascii = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ascii"; - version = "20130824.500"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ascii.el?revision=10"; - sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75"; - name = "ascii.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ascii"; - sha256 = "0f90anxrpnb8k1lqmz0iim4yp20riy19palwmdyl840hz69m98cd"; - name = "ascii"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ascii"; - license = lib.licenses.free; - }; - }) {}; asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "asilea"; @@ -2915,12 +2820,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20170823.2116"; + version = "20170916.2256"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "5863eefbcd445f0fe917646f1326a9c86f067865"; - sha256 = "16m1ykbjawia3nh6qkmp38yrdg58pc7k3vpfq364gf31qpsq6rwg"; + rev = "87853ae35f19646f83f653b798e9f6d646de7113"; + sha256 = "17q1x9nddjy14nbm3h343s8kv9y8p6kj7yvixa7vbf71396dwsxm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -3185,25 +3090,6 @@ license = lib.licenses.free; }; }) {}; - auto-capitalize = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "auto-capitalize"; - version = "20160415.1403"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/auto-capitalize.el?revision=19"; - sha256 = "0xywyfpsi64g9lihm5ncmjrj06iq9s6pp9fmsgj1hdf9y0z65lg0"; - name = "auto-capitalize.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d4edbba637a27a641f53f8a51861b176cabaa286/recipes/auto-capitalize"; - sha256 = "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0"; - name = "auto-capitalize"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/auto-capitalize"; - license = lib.licenses.free; - }; - }) {}; auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; @@ -3501,12 +3387,12 @@ auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-dim-other-buffers"; - version = "20170911.307"; + version = "20170925.1208"; src = fetchFromGitHub { owner = "mina86"; repo = "auto-dim-other-buffers.el"; - rev = "90f6a6f0fba8dac1cfd5e4140638eceebc88bfab"; - sha256 = "1z1d7gzfv573rw1kr3bb6viybj63zbfwad15gvgha9fld2jhmakz"; + rev = "d1ee176652d7f5a77608e54175b7e67c31d41381"; + sha256 = "1qqb051b16z2ay1xqx2ncy2p07cs29dv6wdy1x3n3w85yw9kh0mx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers"; @@ -3561,34 +3447,15 @@ license = lib.licenses.free; }; }) {}; - auto-install = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "auto-install"; - version = "20150418.1702"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/auto-install.el?revision=82"; - sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d"; - name = "auto-install.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad02a591b981518abd147475195f9484e4012fc/recipes/auto-install"; - sha256 = "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk"; - name = "auto-install"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/auto-install"; - license = lib.licenses.free; - }; - }) {}; auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-minor-mode"; - version = "20170716.717"; + version = "20170917.1437"; src = fetchFromGitHub { owner = "joewreschnig"; repo = "auto-minor-mode"; - rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2"; - sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd"; + rev = "07ea9df59c5364d1938beef3dfbba24afd46c230"; + sha256 = "007w6j6zhjv2647njh80vfbrhjzhmb8rx9yi9rf94fhf17z8pmk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; @@ -3751,12 +3618,12 @@ auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }: melpaBuild { pname = "auto-virtualenvwrapper"; - version = "20170618.52"; + version = "20170916.1304"; src = fetchFromGitHub { owner = "robert-zaremba"; repo = "auto-virtualenvwrapper.el"; - rev = "516cb0406a98fd5a41d389f37544f11b28b1d027"; - sha256 = "0y82n8354nri2qpz7bn58rbhpjkqiaf82q9izhl6jy12g63g416l"; + rev = "0f2cc8ea8f211c7b88f852ae6ffe677914652b92"; + sha256 = "1vm2nf7i9v56v57r7ckz8i1y3fk5s302bcfglywqysm4b8k36mp8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; @@ -3853,26 +3720,6 @@ license = lib.licenses.free; }; }) {}; - autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }: - melpaBuild { - pname = "autofit-frame"; - version = "20170221.752"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/autofit-frame.el?revision=48"; - sha256 = "0c2b0d743w1c58iicg9r194zq2l5xxa08zyxj0nljw2dz9lhacwm"; - name = "autofit-frame.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame"; - sha256 = "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw"; - name = "autofit-frame"; - }; - packageRequires = [ fit-frame ]; - meta = { - homepage = "https://melpa.org/#/autofit-frame"; - license = lib.licenses.free; - }; - }) {}; automargin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "automargin"; @@ -4020,6 +3867,27 @@ license = lib.licenses.free; }; }) {}; + avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "avk-emacs-themes"; + version = "20171001.235"; + src = fetchFromGitHub { + owner = "avkoval"; + repo = "avk-emacs-themes"; + rev = "bf781eec7d46cce829ac5bdb114e728a110366e7"; + sha256 = "0bj51ii8vsd2gwyykxp1hvkp4r9kbc0b7ajskf8i5vb8qvpvkali"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes"; + sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144"; + name = "avk-emacs-themes"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/avk-emacs-themes"; + license = lib.licenses.free; + }; + }) {}; avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; @@ -4086,12 +3954,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20170907.955"; + version = "20171004.925"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "0074b70fda731169888571013b4b618a6f0914e7"; - sha256 = "153xv2k0v86k8c2w7cm68d6vs3xbrbhc660ka1dywprr7q1l3jrk"; + rev = "dfb7d8eb4cb1e037e5a460b514b907306f8b845b"; + sha256 = "157jbkzh0g7mmx94mj36lx137gzhzb9sqxjnjaissqn571p9ykay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4125,25 +3993,6 @@ license = lib.licenses.free; }; }) {}; - awk-it = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "awk-it"; - version = "20130917.1148"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/awk-it.el?revision=10"; - sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw"; - name = "awk-it.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/awk-it"; - sha256 = "0qic9m7c31sq4xgx7hnkhj0j0mfy26smghg266lrp5jii833qlz3"; - name = "awk-it"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/awk-it"; - license = lib.licenses.free; - }; - }) {}; aws-ec2 = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tblui }: melpaBuild { pname = "aws-ec2"; @@ -4255,25 +4104,6 @@ license = lib.licenses.free; }; }) {}; - backup-each-save = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "backup-each-save"; - version = "20130704.732"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/backup-each-save.el?revision=2"; - sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7"; - name = "backup-each-save.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/88fd979eb479701303e65e68c581f8f847887842/recipes/backup-each-save"; - sha256 = "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337"; - name = "backup-each-save"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/backup-each-save"; - license = lib.licenses.free; - }; - }) {}; backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "backup-walker"; @@ -4358,27 +4188,6 @@ license = lib.licenses.free; }; }) {}; - baidu-life = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "baidu-life"; - version = "20160426.519"; - src = fetchFromGitHub { - owner = "lujun9972"; - repo = "el-baidu-life"; - rev = "5c4b3dbc016a2656cc2febaa2ac2268c05725b5c"; - sha256 = "024gpdjr1lbqjg6md526g4wz2shpgfpdrrd2m1bn4fissbzj70i1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/101ae6ea151df8d423f00cb6ac391374d0f7f3c8/recipes/baidu-life"; - sha256 = "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19"; - name = "baidu-life"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://melpa.org/#/baidu-life"; - license = lib.licenses.free; - }; - }) {}; bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bar-cursor"; @@ -4403,12 +4212,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170824.1656"; + version = "20171005.1058"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "bb4f204f51439fcf8ae45429d150861523d1f1d0"; - sha256 = "1vkv5kqs9crbk2j4jynyrx2fzijhimnhm2fvgwcxsb6hx3g257id"; + rev = "e7e646b79b5e3cebdf34f0ed775bceb8a5f3645a"; + sha256 = "1lgg54cxl1zhv1gh7y5z99dwfb15w64gn05g8iwha2f37kmk22r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4424,12 +4233,12 @@ bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bash-completion"; - version = "20170909.650"; + version = "20170924.1021"; src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "a789093cd32b2007cb64943de30aca51d5b3106b"; - sha256 = "1fqkslxjdfqcwq1dj4fhw80naq58gpz3d50xar4wrxn76z7vkbcz"; + rev = "31bc1c1c21691668c6cc16a46361490d5bec303a"; + sha256 = "0iq9q0isaynrjhzgkm5hvw26162m52vbzwf12vic5nr9frxbxkv5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; @@ -4449,8 +4258,8 @@ src = fetchFromGitHub { owner = "nick96"; repo = "basic-c-compile"; - rev = "335e96e19647ad7245fb68cf7e68cf86c5023d23"; - sha256 = "1sq6mmg5361z30psn6x2ylpr8yxsbg3d47qai9px7p889p63384l"; + rev = "0129786aeee50d7bb0020d9fc2b7508875d403e8"; + sha256 = "0q6scyva1psyam7jzygqcr1wayf70vrp237hm01q5i9cin8j4j1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/basic-c-compile"; @@ -4463,6 +4272,27 @@ license = lib.licenses.free; }; }) {}; + basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "basic-mode"; + version = "20171004.1218"; + src = fetchFromGitHub { + owner = "dykstrom"; + repo = "basic-mode"; + rev = "d5f480fce6b25de4857e0f04c419cab5268185e3"; + sha256 = "1kkqqi5ipbf5pyqdx1kzwxkn6gzgsmayg0dbyjzkdgc8zqihw4w3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode"; + sha256 = "1l0ylzww7jg6l804fdrklhay4is0wx1drfi9l9wn7gcdjh76mr6g"; + name = "basic-mode"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/basic-mode"; + license = lib.licenses.free; + }; + }) {}; basic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "basic-theme"; @@ -4484,25 +4314,6 @@ license = lib.licenses.free; }; }) {}; - batch-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "batch-mode"; - version = "20140807.1350"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/batch-mode.el?revision=14"; - sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p"; - name = "batch-mode.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fb675b865b8fa1497cdd33764bad051b2fd4d7e/recipes/batch-mode"; - sha256 = "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x"; - name = "batch-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/batch-mode"; - license = lib.licenses.free; - }; - }) {}; bats-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bats-mode"; @@ -4672,12 +4483,12 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20170815.28"; + version = "20171007.722"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "e748e07bd77ef93f3c3110b5cde4e68f50b04efb"; - sha256 = "1030gs02hb6kjd4w5iw0li8k7lcpklya37ybl62mkqhrzfri61bh"; + rev = "584af0efa4809252bb37cf165df029410198327e"; + sha256 = "17cmlc49y26j2salkmcsck9618s1p7y49phiy7hvzkipa13qmj9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac"; @@ -4756,12 +4567,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20170810.624"; + version = "20171003.548"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "bc608ef0735e5b7e34b320b899fd2b3ce2156d1b"; - sha256 = "1vb9505lkzkl9ipczs3q0vmf70mzf9l1wk703g9b5aiss81r5w4i"; + rev = "2762796b54c7fd8613b02c041b2b9afeb13eb9fa"; + sha256 = "1g1mml0npypfk0vhicy4s7fa5df76xqpb80llxcfbnl2si9fzyfb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -4837,25 +4648,6 @@ license = lib.licenses.free; }; }) {}; - better-registers = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "better-registers"; - version = "20140813.119"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/better-registers.el?revision=23"; - sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh"; - name = "better-registers.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2667829dfc72e848ab939be0602cbec1105671b0/recipes/better-registers"; - sha256 = "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx"; - name = "better-registers"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/better-registers"; - license = lib.licenses.free; - }; - }) {}; better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-shell"; @@ -5027,12 +4819,12 @@ bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bifocal"; - version = "20170906.1948"; + version = "20171004.1124"; src = fetchFromGitHub { owner = "riscy"; repo = "bifocal-mode"; - rev = "5e89ad1a9a47e890ce080a79fd32c71eb128d1c4"; - sha256 = "1rwxw1wniws31gbmpxgglxbc2g4jag19dvsjrym0f43yy4w2mbpw"; + rev = "a8b222b069a6bd64531b4780905989797bad8abe"; + sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; @@ -5094,8 +4886,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "360df30683a711c443f87e495ba14cdd125a505d"; - sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc"; + rev = "16abb66246170fe06325ff32a4889e4b51bfd979"; + sha256 = "1fav32ax7qykclvrimlf00pyp534yfngizm697mbr9346va1zqm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5297,25 +5089,6 @@ license = lib.licenses.free; }; }) {}; - blank-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "blank-mode"; - version = "20130824.459"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/blank-mode.el?revision=40"; - sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv"; - name = "blank-mode.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7e687f3d3945bdff0e8e36bcff1f629d8ad921fc/recipes/blank-mode"; - sha256 = "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87"; - name = "blank-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/blank-mode"; - license = lib.licenses.free; - }; - }) {}; blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "blgrep"; @@ -5403,12 +5176,12 @@ blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: melpaBuild { pname = "blog-admin"; - version = "20170430.721"; + version = "20170923.709"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "98e397c4014f7c81c42722028778726cbf9baf8c"; - sha256 = "0fj0yri8hayqb6fwgj5i6bw7yx4jsdq7jh9aqd5zdpmyfc6lshzr"; + rev = "b5f2e1dad7d68ec903619f7280bb0bcb7e398a1e"; + sha256 = "0fgzmmjxhl8i9yqx1bvb7hgkk9w4ylx73xy990qf1bl7fg21v636"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; @@ -5529,12 +5302,12 @@ bonjourmadame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bonjourmadame"; - version = "20160112.156"; + version = "20170919.434"; src = fetchFromGitHub { owner = "pierre-lecocq"; repo = "bonjourmadame"; - rev = "4b4baaec19d8893268a2c93b3c35ac2581d02ba4"; - sha256 = "06cpbjbv8ysz81szwgglgy5r1aay8rrzw5k86wyqg9jdzwpmilpn"; + rev = "d3df185fce78aefa689fded8e56a654f0fde4ac0"; + sha256 = "1acn63hd7s2z8viy52hmhncdic7m86rcqczxnz9aivikqy4hfnsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34c4cfd7bbf5b442a9304598ba0a23ba9b8dfae4/recipes/bonjourmadame"; @@ -5568,25 +5341,6 @@ license = lib.licenses.free; }; }) {}; - bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "bookmark-plus"; - version = "20170731.1658"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; - sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37"; - name = "bookmark+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+"; - sha256 = "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni"; - name = "bookmark-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/bookmark+"; - license = lib.licenses.free; - }; - }) {}; bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bool-flip"; @@ -5716,12 +5470,12 @@ bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bpr"; - version = "20170823.1636"; + version = "20170930.642"; src = fetchFromGitHub { owner = "ilya-babanov"; repo = "emacs-bpr"; - rev = "392de473664fbf319e3585a15f7f8abd34b3dbb6"; - sha256 = "1ngz76j9mf9a1gvmwdy1r1jqxl8g4d3md95lqxq5dqbwz9076im2"; + rev = "314b0d6f69ff5a9c2d25a1ce5a2109d67d4d9bb3"; + sha256 = "02qj8gnhxv39y8kvlw491cbiaknll3hg03pk4xx15rffl7dyrbds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr"; @@ -5839,26 +5593,6 @@ license = lib.licenses.free; }; }) {}; - browse-kill-ring-plus = callPackage ({ browse-kill-ring, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "browse-kill-ring-plus"; - version = "20170221.757"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el"; - sha256 = "01cnh9i09b7i97aqjh8m7s18js85wm7cs25dxlkcrhy112pjb1nq"; - name = "browse-kill-ring+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e700f4066e67991dd67f6476c783e0a5134723db/recipes/browse-kill-ring+"; - sha256 = "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w"; - name = "browse-kill-ring-plus"; - }; - packageRequires = [ browse-kill-ring ]; - meta = { - homepage = "https://melpa.org/#/browse-kill-ring+"; - license = lib.licenses.free; - }; - }) {}; browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: melpaBuild { pname = "browse-url-dwim"; @@ -5880,25 +5614,6 @@ license = lib.licenses.free; }; }) {}; - bs-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "bs-ext"; - version = "20130824.459"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/bs-ext.el?revision=8"; - sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw"; - name = "bs-ext.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/74c4861e76bb806ec4c4fd3482162bf0d95530a8/recipes/bs-ext"; - sha256 = "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6"; - name = "bs-ext"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/bs-ext"; - license = lib.licenses.free; - }; - }) {}; bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bshell"; @@ -6049,12 +5764,12 @@ buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "20170912.1621"; + version = "20170916.957"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "7a37c2ffa3d8ff446fe9cb5adc693095696b8341"; - sha256 = "0shxy0apdmyajlhssxkgpzcch02c1ffbpgajddbr68m8npilq6p5"; + rev = "4a0d526ca45264971796efe67c6e41d8aa659e4c"; + sha256 = "15p089qfz8ra6f2lhny492hiricgs39w7w5iak2zlqm6k88cl1j8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -6108,25 +5823,6 @@ license = lib.licenses.free; }; }) {}; - buffer-stack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "buffer-stack"; - version = "20101223.220"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/buffer-stack.el?revision=2"; - sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r"; - name = "buffer-stack.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buffer-stack"; - sha256 = "0lnd5mh20b4isa6m930dzibw3v4jyzp1ryvmz8irca28xfn0hjln"; - name = "buffer-stack"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/buffer-stack"; - license = lib.licenses.free; - }; - }) {}; buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-utils"; @@ -6403,12 +6099,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20170901.422"; + version = "20170929.512"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "11d7fdce9f46eec62ed86f4f9617e04d2c204b3a"; - sha256 = "0vaq5dgajilysn720sgd294rhzvxbr7q2nyf71m74gf42pxf791d"; + rev = "c1187b34c11cdf4030c57427261f3af4d6374b15"; + sha256 = "0sk9s29521kh4qhi4px917vql6ba07ijvp7vrc0dzr1gdpm0b3w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6466,12 +6162,12 @@ c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "c-eldoc"; - version = "20170618.845"; + version = "20170917.1502"; src = fetchFromGitHub { owner = "nflath"; repo = "c-eldoc"; - rev = "0899f497e98e285d7d2e9cf897e305587b4b0790"; - sha256 = "0yw59pm25a5xrcdl6mv30i08wnhljy6gndvnlpi09vp2dln37kbq"; + rev = "79d09769362228058246f5e6fa183d121f7fb322"; + sha256 = "1398lfd18zn2xym36p71yavgggqbb15xz9m7gah4w4k2bk15aczk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc"; @@ -6841,17 +6537,19 @@ license = lib.licenses.free; }; }) {}; - caml = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { + caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "caml"; - version = "20151009.845"; - src = fetchsvn { - url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/"; - rev = "16561"; - sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; + version = "20170930.722"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "ocaml"; + rev = "8eef73ea8d0a4994cb1c7210b83ba58e00d80144"; + sha256 = "03c5cc0xh1azqqj7119g5yiy7w1jr3qddinqc30m7db1jrjsg3nq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/caml"; - sha256 = "1s05s3dqxlz2qhvjr3j9akb56finpmpbnsjb5pmjnzflhc4y01cf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; + sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c"; name = "caml"; }; packageRequires = []; @@ -6947,12 +6645,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20161024.1205"; + version = "20170917.1107"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "07d8c963a4d349d856c51a471c60689734ebeda0"; - sha256 = "15fyfzd0ssjyq8n77s8h8n0by33j5q0m4hs0v5k7m8zb3ca0w7mc"; + rev = "bf52c3ecb1356657cae12fe3229c0827181c1ed9"; + sha256 = "0g4vnvbfvr9c2rjf0fbbvzw1ipvwgsp11sn0rjrpx5cwszghvy0w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6989,12 +6687,12 @@ cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "cask-package-toolset"; - version = "20170411.1430"; + version = "20170921.1556"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "cask-package-toolset.el"; - rev = "aed1f12b6072a2467e0efa23c3265aaa9f414425"; - sha256 = "1as3fxs1h4gq6mv7gdsjqa59prrgzzs22c9qky8q47dr20sc9q6s"; + rev = "2c74cd827e88c7f8360581a841e45f0b794510e7"; + sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset"; @@ -7216,26 +6914,6 @@ license = lib.licenses.free; }; }) {}; - centered-cursor-mode = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "centered-cursor-mode"; - version = "20151001.634"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/centered-cursor-mode.el?revision=30"; - sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl"; - name = "centered-cursor-mode.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/centered-cursor-mode"; - sha256 = "1sq0hfvnm8sbqyxzr0znq0lwrhbqm961wi13yywjcwxd3x0ar3z0"; - name = "centered-cursor-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/centered-cursor-mode"; - license = lib.licenses.free; - }; - }) {}; centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "centered-window-mode"; @@ -7327,8 +7005,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "83fd2b5014d2eb5d685941bed1ee64bf750e4f94"; - sha256 = "1ffdscvp624gh8vgb01nsdbafynw7b2r83mr1nqf356jpn43ah7a"; + rev = "4097e6453093b7aa8cb96e47d23847cc65b3fbe0"; + sha256 = "01irq5g2n55s5arj7b3clnq50ym38qwghg20mdwhij1zljp42zb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7386,12 +7064,12 @@ cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cframe"; - version = "20170828.919"; + version = "20170917.1509"; src = fetchFromGitHub { owner = "plandes"; repo = "cframe"; - rev = "8b60c482a5888464caf6d05b2a0079340bdd7be8"; - sha256 = "0skms8cwniddpns1fmpqjnhyrn1fjvv6zknzjfganpv0h10gypgk"; + rev = "bb99672502046e87c8f029ce98c637f762a4fc54"; + sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe"; @@ -7425,17 +7103,19 @@ license = lib.licenses.free; }; }) {}; - cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { + cg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "cg"; version = "20170911.610"; - src = fetchsvn { - url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12362"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "cg"; + rev = "f5d74973d2cf19fd31db485ee6bfaaebcf96af2d"; sha256 = "0bmydpv3slv5fvy1admgsm1qlkfp4sdsd0caik48dn7bnghifggz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/cg"; - sha256 = "0xj4yqjg0r9m9cvwgs60lsid6qm1fi8lmb068dj6xaga11n70si5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/cg"; + sha256 = "0yl2w48953vym4gxcxvjfaq3jgsv5jlya9vq3iwlfxqpapd3r3k9"; name = "cg"; }; packageRequires = []; @@ -7447,12 +7127,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20170623.311"; + version = "20171007.300"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "22022667437e94c2309c7c77a14268970de16146"; - sha256 = "1prvdrc8wjb7dy8dqj5gvjzzdiz6hqv252inlwcyjrqiq4apipxz"; + rev = "b4cd8550dd6a26c4efd226156dff33e261e7a8cc"; + sha256 = "1m0ackx5wvwff0qpy9204rmpq7yr6hd3bfkwahjy6kwfrjavkfbv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7843,34 +7523,15 @@ license = lib.licenses.free; }; }) {}; - chm-view = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "chm-view"; - version = "20110616.1019"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/chm-view.el?revision=5"; - sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8"; - name = "chm-view.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8688cd57fca1974403c0e36d6289845059adac5c/recipes/chm-view"; - sha256 = "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz"; - name = "chm-view"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chm-view"; - license = lib.licenses.free; - }; - }) {}; choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "choice-program"; - version = "20170828.616"; + version = "20171004.931"; src = fetchFromGitHub { owner = "plandes"; repo = "choice-program"; - rev = "5a803216d1d7a7ac6fd0f89f04ba4c126182a852"; - sha256 = "0iah71kcrzi22mi1jvyyaiflsx0ry24hqb0wd2w0nbgzc8s5ycqb"; + rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15"; + sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program"; @@ -7928,12 +7589,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170913.434"; + version = "20171001.112"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1"; - sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h"; + rev = "c60d1ae5802ec1dba90f5e4b51579488bbda55c6"; + sha256 = "15r4lbb2wraadi27300gw9yarfpgwnclhjfvgr8vgiy1pqg1y5bi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8114,15 +7775,36 @@ license = lib.licenses.free; }; }) {}; + circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "circadian"; + version = "20170924.1440"; + src = fetchFromGitHub { + owner = "GuidoSchmidt"; + repo = "circadian.el"; + rev = "6412eca0dfd5030ccd18f949066f1352ed89b44d"; + sha256 = "0y62c3cfsz439x7pp7s4zzfhavyasv07y4gkn37383p38k56xqdf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; + sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id"; + name = "circadian"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/circadian"; + license = lib.licenses.free; + }; + }) {}; circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20170728.638"; + version = "20170929.1635"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "452dfb407b640ba6eb288ff25a9de27446a409c4"; - sha256 = "1yqnpvk5ib754bkb8gcd8skf0d3rqxkqwcsbibr052ilrp5ampcl"; + rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2"; + sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -8138,12 +7820,12 @@ circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe-notifications"; - version = "20160902.42"; + version = "20171001.2258"; src = fetchFromGitHub { owner = "eqyiel"; repo = "circe-notifications"; - rev = "80c44441ecd3ae04ae63760aa20afa837c1ed05b"; - sha256 = "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w"; + rev = "4b93112b715714fc7b0ac2637df93adb90f35b40"; + sha256 = "1hfic3qrlskcf0zmd3w76sl1qgrd6myf6mwg06mnc9jy76backqk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications"; @@ -8198,18 +7880,19 @@ license = lib.licenses.free; }; }) {}; - clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }: + clang-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clang-format"; version = "20170120.137"; - src = fetchsvn { - url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "313143"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "clang-format"; + rev = "1fc9ffb08a71d8747c26037a133fbd811673adc0"; sha256 = "0zldh5nk5i3y41q70kwlhf576xmv0baim3q4jam01d41p4p040mq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format"; - sha256 = "1s7xbq1xczzz24gi6wlv9ihzs7cbsn3g16rrhdpxwaadagbasgk7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format"; + sha256 = "1w2w8hhyxp73s1ziyd0n7f1yi0x46v93630xxpjnf9bgr1psfk5f"; name = "clang-format"; }; packageRequires = [ cl-lib ]; @@ -8225,8 +7908,8 @@ src = fetchFromGitHub { owner = "pmarinov"; repo = "clean-aindent-mode"; - rev = "9ae15997cd75c5625a4f759a3aff39bf202fc36f"; - sha256 = "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0"; + rev = "78d917761b7f47f41dd1452e5a6fd783115913c9"; + sha256 = "01jh561gpicw3wf8nvmw0ggc08gjg8zfzvqhjidpjn6sk4za9fhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee9dac7c10e652f026643620418dfea9237a0d23/recipes/clean-aindent-mode"; @@ -8590,12 +8273,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170819.2159"; + version = "20171008.743"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "a6f0592e9cabeb4e039e654bd30890a20208950e"; - sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93"; + rev = "35f5d71b196b1a4b147a56a82b723d0383cb7282"; + sha256 = "11im686bjh97vm67325zkm7q8mzd575s0rl7r8kd0kz837gywbh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8615,8 +8298,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "a6f0592e9cabeb4e039e654bd30890a20208950e"; - sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93"; + rev = "35f5d71b196b1a4b147a56a82b723d0383cb7282"; + sha256 = "11im686bjh97vm67325zkm7q8mzd575s0rl7r8kd0kz837gywbh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8695,12 +8378,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20170629.921"; + version = "20170919.455"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "73e68bcfbe076e152beed1b8e5f894ca438f9770"; - sha256 = "0vj18784x6cdl39sbfpsksmxln5yj31ah250q5n7ivh54vk2hvjl"; + rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362"; + sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -8821,12 +8504,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170818.907"; + version = "20170922.231"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "6489aabba8d124445ba72f55db9ef3bb2212b1b0"; - sha256 = "0wh0z28nfb5kpm3jlkkgkxbhzyc8akyc6hs1fm8i7bxrslrj6ll0"; + rev = "37950c45f6a61383c70286bbecea305e6f1daf51"; + sha256 = "1si544nsjzwbikv3m17x2k4l0cnjrshpld28fzfhjv336p9jw25q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8846,8 +8529,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "a763cffd6b65bbe5572527e39969981bf31d5aca"; - sha256 = "1jrvsqcb123z1r84c074qz1z6ljz6psc7ysabzsxkrkcs3f66v58"; + rev = "cb8f26f199e18be231f40f523bfe64375e749e35"; + sha256 = "13zywybi3r9pzwlqvailgafqc68v62adkrkca1lm7mjrr33jdsfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8902,25 +8585,6 @@ license = lib.licenses.free; }; }) {}; - cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "cmds-menu"; - version = "20170221.1557"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cmds-menu.el?revision=10"; - sha256 = "0ladkkydypf08mn3j749fv46blpzyvh45kx52qdzhwxjiz7nlmfs"; - name = "cmds-menu.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu"; - sha256 = "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks"; - name = "cmds-menu"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cmds-menu"; - license = lib.licenses.free; - }; - }) {}; cmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmm-mode"; @@ -8942,27 +8606,6 @@ license = lib.licenses.free; }; }) {}; - cn-outline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "cn-outline"; - version = "20100321.914"; - src = fetchFromGitHub { - owner = "mori-dev"; - repo = "cn-outline"; - rev = "47d33a99b7ae26b1cd456441970b4bab2173d981"; - sha256 = "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bf843cbcfc5806d9089000f08c72433dc8c12e17/recipes/cn-outline"; - sha256 = "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz"; - name = "cn-outline"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cn-outline"; - license = lib.licenses.free; - }; - }) {}; cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cnfonts"; @@ -9152,26 +8795,6 @@ license = lib.licenses.free; }; }) {}; - col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }: - melpaBuild { - pname = "col-highlight"; - version = "20170510.1541"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/col-highlight.el?revision=31"; - sha256 = "0wi4xz8n5ib65spyrgqsp8l6zafnvxdiw3hy918fs0xjj7ziy6qc"; - name = "col-highlight.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2a16dca0068d9d4f25ad6b699ec8cb8da6ba17e5/recipes/col-highlight"; - sha256 = "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i"; - name = "col-highlight"; - }; - packageRequires = [ vline ]; - meta = { - homepage = "https://melpa.org/#/col-highlight"; - license = lib.licenses.free; - }; - }) {}; colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colemak-evil"; @@ -9256,18 +8879,19 @@ license = lib.licenses.free; }; }) {}; - color-theme = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }: + color-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme"; - version = "20080305.34"; - src = fetchbzr { - url = "https://bzr.savannah.gnu.org/r/color-theme/trunk"; - rev = "57"; + version = "20070910.1007"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "color-theme"; + rev = "eeb07560b30aaf7934dfd21f5c2518a479905cd9"; sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/color-theme"; - sha256 = "1ds098v50p4g6ji0zy7m5nyj2kadm3l3v0pnb01wkjjx6anh3qsy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/color-theme"; + sha256 = "1c1n0m4hhj2sxi08vjvayypf9g5i2hyng53ry950yfdqgzq7nk8i"; name = "color-theme"; }; packageRequires = []; @@ -9363,12 +8987,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170908.216"; + version = "20171003.235"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "6c9b01bb5268f00d0e65fb8351a7ad87abbfb127"; - sha256 = "1gr1iab6dyyx47v2fbx7g1lf8x1hm9vppra9ypf8957fxzi99l2n"; + rev = "c5855d0906c672150dc2b00486dda633823d9477"; + sha256 = "1p2qjgwxj969hffawc8h1zikl5zgqj91qii7fv31n2h4sqxxybks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9423,6 +9047,27 @@ license = lib.licenses.free; }; }) {}; + colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "colormaps"; + version = "20171008.1524"; + src = fetchFromGitHub { + owner = "lepisma"; + repo = "colormaps.el"; + rev = "19fbb64a6288d505b9cf45c9b5a3eed0bfb135e2"; + sha256 = "0kbhy8bpxqdr1kjczz2vm7chfpjprx2frpbh1gh9i1gwwx5k4myp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps"; + sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2"; + name = "colormaps"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/colormaps"; + license = lib.licenses.free; + }; + }) {}; column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "column-enforce-mode"; @@ -9444,25 +9089,6 @@ license = lib.licenses.free; }; }) {}; - column-marker = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "column-marker"; - version = "20121128.43"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/column-marker.el?revision=13"; - sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9"; - name = "column-marker.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5f629b6b44fae3191f58e007c39b75bbb880d517/recipes/column-marker"; - sha256 = "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq"; - name = "column-marker"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/column-marker"; - license = lib.licenses.free; - }; - }) {}; comint-intercept = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "comint-intercept"; @@ -9568,6 +9194,27 @@ license = lib.licenses.free; }; }) {}; + comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "comment-tags"; + version = "20170910.1035"; + src = fetchFromGitHub { + owner = "vincekd"; + repo = "comment-tags"; + rev = "7d914097f0a03484af71e621db533737fc692f58"; + sha256 = "0s86a7078arck9z4gzkp2hnxyklprl0zh5hsw7nkyyscjydly80i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags"; + sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i"; + name = "comment-tags"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/comment-tags"; + license = lib.licenses.free; + }; + }) {}; commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "commenter"; @@ -9613,12 +9260,12 @@ common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "common-lisp-snippets"; - version = "20170522.2147"; + version = "20170918.356"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "common-lisp-snippets"; - rev = "46f1de08c8d86b72b474c2f8e1c1b313ac70f23d"; - sha256 = "148ach1p3iqch3a6r1y8wkr1avyprg47jjz3a31vjvqgcwgs3ynw"; + rev = "cd46223fbc6ee99372a25ba455ffec4354895e45"; + sha256 = "0xii63fw3gx1hhx57yh8gr9mhkgb2vjkfs2sl5z9010myi9504is"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets"; @@ -9634,12 +9281,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20170828.414"; + version = "20171006.1442"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "c0098afab0719c633ea9984e62a240f542ab8c49"; - sha256 = "0vm4rl7xkqpbi1dh2ds45smbyk25x16w0x99ri1nzvfbana5w7j5"; + rev = "d033112748440e772f0173b28356e956ce57d8a0"; + sha256 = "0qabdz95wa4gqag212gcfys4kpnvdcv0kmq2kiwc6znyp6xicnd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9789,12 +9436,12 @@ company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-cabal"; - version = "20151216.720"; + version = "20170917.617"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-cabal"; - rev = "05886d6f2621b019fafb40cff4d2567e5d8045b4"; - sha256 = "1yxp6l8a16d6g2sfwrpfx97ds7nfrgk2akwydal1dzr2bjq02pc6"; + rev = "62112a7259e24bd6c08885629a185afe512b7d3d"; + sha256 = "1gf45xwjzdm8i4q6c6khk4dbg1mmp2r0awz2sjr4dcr2dbd1n7mg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal"; @@ -9926,8 +9573,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57"; - sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd"; + rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; + sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -10027,12 +9674,12 @@ company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }: melpaBuild { pname = "company-ghc"; - version = "20160315.710"; + version = "20170918.133"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-ghc"; - rev = "ff2205c0b309467eea763521d30220e7849c75b0"; - sha256 = "1a93q5q91xjyvfxbf5q57ndjarqdm9av11bb3dmc72v9bmwgpi7s"; + rev = "dab111cb5067c545ccdc6b2d0ba70c1c4bbce060"; + sha256 = "0ygw3dhlz247qzmcsbnkkdry2w2ni60j1rbyqprnzp8sd5yk97r1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc"; @@ -10073,8 +9720,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1"; - sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb"; + rev = "1a78dd6c36d7f37cbb60073523c2e9ca3f6519fa"; + sha256 = "1bcd62rggq3sk96n3dlpidrv4pbx6x385x17knfnp35avgrhsv4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -10283,8 +9930,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; - sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; + rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; + sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options"; @@ -10304,8 +9951,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3"; - sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd"; + rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; + sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10318,6 +9965,27 @@ license = lib.licenses.free; }; }) {}; + company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "company-plsense"; + version = "20171001.1200"; + src = fetchFromGitHub { + owner = "CeleritasCelery"; + repo = "company-plsense"; + rev = "8a72677fcd7f8abef4fb1f046b6b424d5482aadd"; + sha256 = "02b7pfrz5k31bfq23m71hq8pzxsl2w43wjxaqx154g2bb8wkfdkr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense"; + sha256 = "0k8k2vpkknd4nyxzwdj7698lgm5d85byxd49x7w5nrxmh2h1w3c7"; + name = "company-plsense"; + }; + packageRequires = [ cl-lib company dash emacs s ]; + meta = { + homepage = "https://melpa.org/#/company-plsense"; + license = lib.licenses.free; + }; + }) {}; company-pollen = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, pollen-mode }: melpaBuild { pname = "company-pollen"; @@ -10409,8 +10077,8 @@ src = fetchFromGitHub { owner = "iquiw"; repo = "company-restclient"; - rev = "7b41cd58ffdf965480f1cf52d58d718009ba6fe7"; - sha256 = "0j6b9jqs4i05rxx6fs7rvim1snf33fi1l6dkm9lskchbykzz4adq"; + rev = "ef67ba2f613ce3d61b70011c9d0a303a754ffc5b"; + sha256 = "0af1h6n1rgyni686hrrakmmbgymjg8dc1i9g2jc27dxkxz0nk454"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient"; @@ -10432,12 +10100,12 @@ company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "company-rtags"; - version = "20170829.2022"; + version = "20170924.2244"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10621,12 +10289,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20170622.146"; + version = "20170926.2252"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; - sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; + rev = "393724d0d36a8269e57a0e4c2b3723071caf0a3c"; + sha256 = "02pm3x9frscgz5szddvbir0i7amnkzfj7pl4lgiah57bhcg1lhd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10765,18 +10433,19 @@ license = lib.licenses.free; }; }) {}; - confluence = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, xml-rpc }: + confluence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "confluence"; version = "20151020.1828"; - src = fetchsvn { - url = "https://svn.code.sf.net/p/confluence-el/code/trunk/"; - rev = "173"; - sha256 = "18859zi60s2y79add998vxh084znbdxxq31m12flg7makxlamyh7"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "confluence"; + rev = "4518d270a07760644c4204985c83d234ece4738b"; + sha256 = "1lrq23cxlp2vkyv7g56r06bp7chhw10kii3ymkydf24y4pyn1zpg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9110cd142ece0a8d63815bf00a89574b947bb4/recipes/confluence"; - sha256 = "0hplpqaxjg34pf75p9sf97wlbq4rz9f8qvn4cfpjxf16if078ls3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/confluence"; + sha256 = "0xa2g168mm31kh5h7smhx35cjsk1js88nzs19yakjljf56b1khlf"; name = "confluence"; }; packageRequires = [ xml-rpc ]; @@ -11037,15 +10706,36 @@ license = lib.licenses.free; }; }) {}; + cosmo = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cosmo"; + version = "20170922.44"; + src = fetchFromGitLab { + owner = "montanari"; + repo = "cosmo-el"; + rev = "dd83b09a49a2843606b28279b674b2207040b36b"; + sha256 = "0phcg81g3dy67s1hfymvj0lkcpwygwql8iixf940nv31qllgzvd7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3ab914dfefcddf6ecd65261bc11bd3eb12929c79/recipes/cosmo"; + sha256 = "1pk34d0kv1jm2fq72qa5lj0y39x1yf2nbkjjg8jcj8ari28h9vfk"; + name = "cosmo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cosmo"; + license = lib.licenses.free; + }; + }) {}; counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170911.1121"; + version = "20171007.231"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "0a1d361b926291874124f8c63a653d83ead64a36"; - sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; + rev = "6827edffb70890f2e94c3d146ed129bde581992d"; + sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11145,12 +10835,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20170911.1304"; + version = "20171001.641"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "20557b47a963cc5304ac2bc3ea4800c3a7da7feb"; - sha256 = "0cszbczgpsm6l2pwh8pci3md0aranilqw6j0519vr6aaj5j6g15p"; + rev = "88a16cb75301ae95f21a71e8838a49590d011e73"; + sha256 = "155yvmyyg99znxnb3viagmd3hmii44fww68g857l7msw4q9ki1gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11478,26 +11168,6 @@ license = lib.licenses.free; }; }) {}; - crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }: - melpaBuild { - pname = "crosshairs"; - version = "20170626.1548"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/crosshairs.el?revision=40"; - sha256 = "1dcynm83a3ixdccw3cqy533d9xwzswyi67cydaqmv35q88dg2nqw"; - name = "crosshairs.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crosshairs"; - sha256 = "0s7gh5zrb46hzybmpydb0pad7jinvcwds7i03ndhzwx89rxg3019"; - name = "crosshairs"; - }; - packageRequires = [ col-highlight hl-line-plus vline ]; - meta = { - homepage = "https://melpa.org/#/crosshairs"; - license = lib.licenses.free; - }; - }) {}; crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; @@ -11585,12 +11255,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20170502.158"; + version = "20170927.816"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "628a4e2afa0e9c4672e8654c86240cb7f7bdf444"; - sha256 = "0gnl7nddgy7b83p70ybr41s3f6ybs383hdbzhp9jvxb21g665hn6"; + rev = "331b45df9c6e84601cea323638f82ce5e4a68b03"; + sha256 = "00i53c5a85n1i48jyxg78ab2yicx8maybfc6mzxw8s12j9hbw75i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11606,12 +11276,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20170911.1412"; + version = "20170923.807"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "c5243852d20e54e43a4a7fc19c58bbd10fa8570b"; - sha256 = "1wa4356xykkfmfp8pkk72r2s18l9vhv9mdhrq827fh6cgz64p4s8"; + rev = "b5abcb68cedf1231c2e419bf87e875bfdb8fbc42"; + sha256 = "0r5c8g3jjb4p3a21mjdi9xcmify0c2r61d5y7ycbia7rjv9xpgdh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -11708,34 +11378,15 @@ license = lib.licenses.free; }; }) {}; - csv-nav = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "csv-nav"; - version = "20130407.1120"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/csv-nav.el?revision=7"; - sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva"; - name = "csv-nav.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/csv-nav"; - sha256 = "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj"; - name = "csv-nav"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/csv-nav"; - license = lib.licenses.free; - }; - }) {}; ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctable"; - version = "20140304.1659"; + version = "20171005.1711"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-ctable"; - rev = "cd673a09a80ce4e9e102ffe2e3d7e6bfb9d652b0"; - sha256 = "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb"; + rev = "b8830d1ca95abb100a81bc32011bd17d5ecba000"; + sha256 = "0pg303pnqscrsbx9579hc815angszsgf9vpd2z2f8p4f4ka6a00h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/ctable"; @@ -11818,8 +11469,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "c920475b9f9b50559d81d39ad177dbe22b258a35"; - sha256 = "0s7az1j0dpi306j01wzw5ldy6cvpz56fk0x4jhb7bsnq01lkm7jy"; + rev = "747f5bafad712b90da9eb7e6b893fff16683fe17"; + sha256 = "1px9pycw44jvkl8gz1zz577hw61l7xvpmdl1bf1bl5wy72x13v42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11874,25 +11525,6 @@ license = lib.licenses.free; }; }) {}; - cursor-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "cursor-chg"; - version = "20170221.1610"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cursor-chg.el?revision=21"; - sha256 = "026x1mbjrf68xrv970jbf131d26rj0nmzi1x0c8r6qdr02pw2jy1"; - name = "cursor-chg.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cursor-chg"; - sha256 = "1yam5hz1v16g2v19j3dmgbj7n2rj8dsqyr5hwfyc031s6q7f649x"; - name = "cursor-chg"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cursor-chg"; - license = lib.licenses.free; - }; - }) {}; cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cursor-test"; @@ -11914,25 +11546,6 @@ license = lib.licenses.free; }; }) {}; - cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "cus-edit-plus"; - version = "20170604.1000"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cus-edit+.el"; - sha256 = "0awn3m16cyamb4h9i4iq9fzbwzl6qrkpbcr4v3dr7iwlcz7lw7jl"; - name = "cus-edit+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+"; - sha256 = "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz"; - name = "cus-edit-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cus-edit+"; - license = lib.licenses.free; - }; - }) {}; cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; @@ -12017,25 +11630,6 @@ license = lib.licenses.free; }; }) {}; - cygwin-mount = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "cygwin-mount"; - version = "20131111.1346"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cygwin-mount.el?revision=17"; - sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw"; - name = "cygwin-mount.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f94fb69a954275ee4098c96495b8566d6ce7cbb9/recipes/cygwin-mount"; - sha256 = "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb"; - name = "cygwin-mount"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cygwin-mount"; - license = lib.licenses.free; - }; - }) {}; cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyphejor"; @@ -12085,8 +11679,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "e6315294395ad44e667a804710938ee799575296"; - sha256 = "07lgc3g66w8ggmnhqn7vrck3vl9jcvwmg67mlb772kz9d5v4kn5x"; + rev = "14b085980903fa5a172a118929aecbae2d1975c4"; + sha256 = "0rpilj79a1kpd7z5pmq04pqc7gxaxlfj7br6gfsx2bs07mc0j6b8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12165,12 +11759,12 @@ dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dad-joke"; - version = "20170814.824"; + version = "20170927.2358"; src = fetchFromGitHub { owner = "davep"; repo = "dad-joke.el"; - rev = "92641503c7e93309db12380d5228f99dbe64a53c"; - sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc"; + rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba"; + sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; @@ -12228,12 +11822,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170702.1007"; + version = "20170928.1211"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "f4de0fa84bec756ea31419f8db0b900fd1603c83"; - sha256 = "1wzwiahab6r8y772mg6268sh7l3b1fw4hxl10d38qv2khy641vlv"; + rev = "b516cf4556bb2a1a898701d953374b96079678b3"; + sha256 = "0ilzd6qwjjj5lfimv3b5him54yh7lpxhlm0hnsmk6zcrr6884vsl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12249,12 +11843,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20170901.525"; + version = "20171004.1231"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "203dcd8b748d485d1c78d04d81db22fd00cb71d7"; - sha256 = "1ywx46mm1zrj0hnx2zwyxlxlq7ysg46hsy5vi6hmfppwbrfmkyzv"; + rev = "17961ec04dbe924a4c43ff0fe94bd72d044d9703"; + sha256 = "14r1jhrrq4d5l0fsjacf619f4nhc86aq4jab8qzfkszi348r5g7j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12267,6 +11861,27 @@ license = lib.licenses.free; }; }) {}; + darcsum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "darcsum"; + version = "20140315.2110"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "darcsum"; + rev = "00c252b51cb24c25fb74f529960ebd631514a4c1"; + sha256 = "1vbfdmc56ma2ycxhza681ninhdxgvxm9j5xb9374xiqmb6g0vykq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/darcsum"; + sha256 = "0p3hwmwjjqwgkjws5b7gkad4yxh0gs2hr03ar18y43yahwgihvnv"; + name = "darcsum"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/darcsum"; + license = lib.licenses.free; + }; + }) {}; darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; @@ -12459,12 +12074,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20170810.137"; + version = "20171009.105"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "dcb0ec1623517e54551b801846a272dd07fd55b2"; - sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc"; + rev = "8ef32875da21ea278002da823c05b7206cc1a81e"; + sha256 = "1zci5bbc5s9m6dvgiypsxwkqiqd67la5wxrqny1qnsii5c4id1kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12505,8 +12120,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "dcb0ec1623517e54551b801846a272dd07fd55b2"; - sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc"; + rev = "8ef32875da21ea278002da823c05b7206cc1a81e"; + sha256 = "1zci5bbc5s9m6dvgiypsxwkqiqd67la5wxrqny1qnsii5c4id1kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12522,12 +12137,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20170901.2"; + version = "20170923.719"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "8a555de891a83a9cd080c940dde183a8806479a9"; - sha256 = "1w7f2fvnhqzcr6az4fkgb11k8qjzg81vwzx96qhym8d70sabahzh"; + rev = "8594c4f55448148b720eda5b72d51667fb7a8a39"; + sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12585,12 +12200,12 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "20170318.254"; + version = "20170928.815"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "3ecf9985250ecd441e91614b44cf12323af907c0"; - sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv"; + rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71"; + sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; @@ -12900,12 +12515,12 @@ define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "define-word"; - version = "20150709.1223"; + version = "20171001.1616"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "64d98b7748686c51261fe6e8d42078c6284feb13"; - sha256 = "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd"; + rev = "a425ffe44d62622b86477a622c6188a56bc2bd9a"; + sha256 = "02v9yzvinapr6m7pjxr4kcgqnlm7j21ygh1dhkabarz83v43awh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; @@ -12984,12 +12599,12 @@ demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demangle-mode"; - version = "20170526.1508"; + version = "20170923.1501"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "d3fce31974b1c9f659da427f3c69c2e6168df508"; - sha256 = "0k4pacjjgxagsa8kgzvynvmvczhbb73waq3l6gld7v3h38js163a"; + rev = "79231b05f97da147d66120f947656f856a3a64fb"; + sha256 = "0whr18qwi5bmz39n8x836sjgky20qhw59qha59c11dvly1qs5nnq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -13128,18 +12743,40 @@ license = lib.licenses.free; }; }) {}; - dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }: + dhall-mode = callPackage ({ ansi-color ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dhall-mode"; + version = "20171006.1233"; + src = fetchFromGitHub { + owner = "psibi"; + repo = "dhall-mode"; + rev = "181e5b0df73ce729cf4b711fa76bb43c2581d29d"; + sha256 = "1jw4is9jxx60hsaqjkmravrkxdfn7ni6zl9wx9i7r2y2r5mmwx88"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode"; + sha256 = "1zkspjwllcw9k4nlnif6jdwzl08ki39vmx90apw029n87xhvx7mp"; + name = "dhall-mode"; + }; + packageRequires = [ ansi-color emacs ]; + meta = { + homepage = "https://melpa.org/#/dhall-mode"; + license = lib.licenses.free; + }; + }) {}; + dic-lookup-w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stem, w3m }: melpaBuild { pname = "dic-lookup-w3m"; version = "20170803.354"; - src = fetchsvn { - url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/"; - rev = "99"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "dic-lookup-w3m"; + rev = "79aca5eb9c78e67cb85a386060d48113caad5ec3"; sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m"; - sha256 = "1siqrarpyqjh1h350dsyca993fy6qin4apgyjm4vpp6awip8xfp0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dic-lookup-w3m"; + sha256 = "1kwbmzzf8sj4bn5kicmlp2hzv8ydcikwmdy7s40ggkgf1mk9zvqr"; name = "dic-lookup-w3m"; }; packageRequires = [ stem w3m ]; @@ -13343,8 +12980,8 @@ src = fetchFromGitHub { owner = "myrjola"; repo = "diminish.el"; - rev = "d5c61a14e1a5590a65f83c099a5bd42fcadff24d"; - sha256 = "0c0p4b3nfnczmkjx64qz2w9dk0b7srfnhrnd902qn9z55k4n0wg8"; + rev = "565a983a39d2e2cffab5df13b34f3b6116723208"; + sha256 = "173lzj9l7a4wcfvdq6akvfyyyriy5c30b4vhhv51hs051dmn02d0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish"; @@ -13427,8 +13064,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13448,8 +13085,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13462,45 +13099,6 @@ license = lib.licenses.free; }; }) {}; - dired-details = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dired-details"; - version = "20130824.458"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-details.el?revision=15"; - sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza"; - name = "dired-details.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details"; - sha256 = "0kmcnx9zvfdwvq100nazgypkfwlgxgrbimprc5pysid8rrxyzws7"; - name = "dired-details"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dired-details"; - license = lib.licenses.free; - }; - }) {}; - dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "dired-details-plus"; - version = "20170903.1237"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-details+.el"; - sha256 = "03r7afjp376d0c34r1nj5hz914lbrk9y5ripar1w697bqk8kaxy3"; - name = "dired-details+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details+"; - sha256 = "0b4y01hk839z6m7fx5bwa80gwylvkp15niri8vrjak4vgj5g5cg9"; - name = "dired-details-plus"; - }; - packageRequires = [ dired-details ]; - meta = { - homepage = "https://melpa.org/#/dired-details+"; - license = lib.licenses.free; - }; - }) {}; dired-dups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-dups"; @@ -13609,12 +13207,12 @@ dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-filter"; - version = "20170718.1145"; + version = "20171006.711"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13634,8 +13232,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13735,12 +13333,12 @@ dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-launch"; - version = "20170409.1923"; + version = "20171004.1027"; src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "75745f2e40d060cae909f9e6f6ca2e5f725180b8"; - sha256 = "1amsqbbjzjw07s40v8c63iw59qf5r1x7rqq2iq1jiybwsrp9s7v0"; + rev = "f71826804221bafc4f9f2f75a800400a72c24b8b"; + sha256 = "1cyg1bbn2jj101wz2jjzk832mfk5yhnc4a9m817lnalf73j0nkrs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -13760,8 +13358,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13781,8 +13379,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13795,25 +13393,6 @@ license = lib.licenses.free; }; }) {}; - dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dired-plus"; - version = "20170818.1411"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "04yr4gwg5y6qjbjx2klharzf7s9n1akx2n14yddjrv7hr6rkxlrs"; - name = "dired+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; - sha256 = "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5"; - name = "dired-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dired+"; - license = lib.licenses.free; - }; - }) {}; dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "dired-quick-sort"; @@ -13838,12 +13417,12 @@ dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-rainbow"; - version = "20170531.816"; + version = "20170922.817"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13863,8 +13442,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13884,8 +13463,8 @@ src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "9ac42bb6663e6c0c5e4e3dd2258b63e24cf33c90"; - sha256 = "0x6gmpjm1rv38h6w5zv98vk86d7s0qvsa3pl5sab268dbhw0l9w2"; + rev = "35e43797f037fc298b6478817d51be3ceff5b568"; + sha256 = "1rizajqh96im8ygbfzrhn0ysh3r9qlk7njgn2rayk6a5krj6gn16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; @@ -13919,64 +13498,6 @@ license = lib.licenses.free; }; }) {}; - dired-sort = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dired-sort"; - version = "20090208.2038"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-sort.el?revision=1"; - sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z"; - name = "dired-sort.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e4cd8274cdec74a9867060f72ec2025ed0150d/recipes/dired-sort"; - sha256 = "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x"; - name = "dired-sort"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dired-sort"; - license = lib.licenses.free; - }; - }) {}; - dired-sort-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dired-sort-menu"; - version = "20130824.507"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-sort-menu.el?revision=9"; - sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi"; - name = "dired-sort-menu.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu"; - sha256 = "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb"; - name = "dired-sort-menu"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dired-sort-menu"; - license = lib.licenses.free; - }; - }) {}; - dired-sort-menu-plus = callPackage ({ dired-sort-menu, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "dired-sort-menu-plus"; - version = "20170221.1630"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el"; - sha256 = "0f2z0nj51i27qqj0ws644k61dj9bp3hagi9phj9d41fcsqzzja4h"; - name = "dired-sort-menu+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu+"; - sha256 = "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq"; - name = "dired-sort-menu-plus"; - }; - packageRequires = [ dired-sort-menu ]; - meta = { - homepage = "https://melpa.org/#/dired-sort-menu+"; - license = lib.licenses.free; - }; - }) {}; dired-subtree = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-subtree"; @@ -13984,8 +13505,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14040,6 +13561,27 @@ license = lib.licenses.free; }; }) {}; + diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "diredfl"; + version = "20171005.39"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "diredfl"; + rev = "2393653a1518b118180ff90ef2b66cfb7d0b555c"; + sha256 = "04yykal90pc4nsdlk08z6svsnddjzaz1drwvs3bqfjw01fr50xcs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; + sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn"; + name = "diredfl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/diredfl"; + license = lib.licenses.free; + }; + }) {}; diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredful"; @@ -14169,12 +13711,12 @@ disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disable-mouse"; - version = "20160630.1903"; + version = "20170929.1353"; src = fetchFromGitHub { owner = "purcell"; repo = "disable-mouse"; - rev = "f7d6f70a3c0a751a946613f997330fbc95a38c3e"; - sha256 = "0d2hmaiz8v8kzkbdi281hyf3yfjwr03ngxr2qphgm7xk9298351v"; + rev = "81639930bcaeedadbcc19728e91719afcac84613"; + sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse"; @@ -14313,25 +13855,6 @@ license = lib.licenses.free; }; }) {}; - disk = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "disk"; - version = "20081128.706"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/disk.el?revision=9"; - sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv"; - name = "disk.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/edcafb4c459cf51fecc7c43a3e4dcbe377d68b46/recipes/disk"; - sha256 = "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n"; - name = "disk"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/disk"; - license = lib.licenses.free; - }; - }) {}; dispass = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dispass"; @@ -14804,12 +14327,12 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "20170910.1034"; + version = "20170916.1438"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "372df2f0de34a4bd44d4a7274b9ab85117ac7392"; - sha256 = "14vgjhy2j60xhf38zm5nlkr4d3r455kw6paw0wff4mqmdjcg3pds"; + rev = "f3c06a43d69dfe80041a82a9365281bd5c65a105"; + sha256 = "1fzz950wb95lp15ak8q4vzls21w9fc3qxqs5hlf50najdw36w52h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; @@ -14951,12 +14474,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170912.726"; + version = "20170927.1705"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "f7185cf7536e1f96e7cede2ce81c2b51205df850"; - sha256 = "1wqa5b9ni8rci4h8m78h7cb3387gi45v1w6z5dbya4zvaw1gwx8p"; + rev = "99a4c8691436b80ffb242512f026a8cc32b9539a"; + sha256 = "0ww95dr3djxdwba0kark0d1j1q4vkjhnpiv5s5gc5zhgbc0421rb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -14969,84 +14492,6 @@ license = lib.licenses.free; }; }) {}; - doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "doremi"; - version = "20170221.1634"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi.el?revision=42"; - sha256 = "03alkj4mxajsgmghw935hm3c95a12222zq1ig6kwmfrla5kg3b7q"; - name = "doremi.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi"; - sha256 = "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb"; - name = "doremi"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/doremi"; - license = lib.licenses.free; - }; - }) {}; - doremi-cmd = callPackage ({ doremi, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "doremi-cmd"; - version = "20170221.1631"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el?revision=47"; - sha256 = "09iizx079y43qk3jd66n8i8ifm2s7jnc9g7831nv5f3c26rgl0w6"; - name = "doremi-cmd.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-cmd"; - sha256 = "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05"; - name = "doremi-cmd"; - }; - packageRequires = [ doremi ]; - meta = { - homepage = "https://melpa.org/#/doremi-cmd"; - license = lib.licenses.free; - }; - }) {}; - doremi-frm = callPackage ({ doremi, faces-plus, fetchurl, frame-fns, hexrgb, lib, melpaBuild }: - melpaBuild { - pname = "doremi-frm"; - version = "20170221.1632"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi-frm.el?revision=74"; - sha256 = "0f9vwajgdm37krz55sv5c8ijfqhy5gsxj1zyxg8zbs6l33giynxd"; - name = "doremi-frm.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-frm"; - sha256 = "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz"; - name = "doremi-frm"; - }; - packageRequires = [ doremi faces-plus frame-fns hexrgb ]; - meta = { - homepage = "https://melpa.org/#/doremi-frm"; - license = lib.licenses.free; - }; - }) {}; - doremi-mac = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "doremi-mac"; - version = "20170221.1633"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi-mac.el?revision=30"; - sha256 = "002jhqk26ywiyci1r91aqbq0zhbxy6rsyw3h74ck04rxjfc49rxl"; - name = "doremi-mac.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-mac"; - sha256 = "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls"; - name = "doremi-mac"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/doremi-mac"; - license = lib.licenses.free; - }; - }) {}; dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dot-mode"; @@ -15341,34 +14786,15 @@ license = lib.licenses.free; }; }) {}; - dropdown-list = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dropdown-list"; - version = "20120329.936"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dropdown-list.el?revision=5"; - sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a"; - name = "dropdown-list.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropdown-list"; - sha256 = "1zqqa4872r96fp377bcz6pd1djz59ami5k09abb62dw854sc5xfj"; - name = "dropdown-list"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dropdown-list"; - license = lib.licenses.free; - }; - }) {}; drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20170112.1136"; + version = "20170926.38"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "9d5808972f344a09dcf665d5113ae81e39ac1051"; - sha256 = "0vz41jfkfir7ymyl5y0v836zclqfihrjdiyz3vnb081x0gara8l0"; + rev = "b0ca2c39650136f7e5672461e64397b9add30b92"; + sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -15402,17 +14828,19 @@ license = lib.licenses.free; }; }) {}; - dsvn = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { + dsvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "dsvn"; version = "20130120.1257"; - src = fetchsvn { - url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1808231"; - sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "dsvn"; + rev = "17bce692e9bd5a43373d5cb1d66da50e1acb903b"; + sha256 = "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dsvn"; - sha256 = "1y55s187q2xiab31vs95jjjp1a3qzwkdwn7p5man666scbjrdyl5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dsvn"; + sha256 = "1kgc0b8as7w1h9dsknv2h7dzr6jcrs0j0p376050pshgzcm79nm6"; name = "dsvn"; }; packageRequires = []; @@ -15445,12 +14873,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "20170825.847"; + version = "20171001.1233"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c"; - sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq"; + rev = "7fd55af3b0311ea24b68397054e705c835fa5ef1"; + sha256 = "1sgmd1zqdwa1f6y8d6vaacyipkqn2ivvaim1xndbkihgmhyn4kf0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -15505,15 +14933,36 @@ license = lib.licenses.free; }; }) {}; + dumb-diff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dumb-diff"; + version = "20170924.2036"; + src = fetchFromGitHub { + owner = "jacktasia"; + repo = "dumb-diff"; + rev = "205ea5fda371f296fd876e362c12a5b64c4724d9"; + sha256 = "0gxrrhlhp1g679c1ygj8m0jy4pag55b957vyxm9845z4vx93wj1x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf7fa0b4235247d82569ed078f92774f10afa45c/recipes/dumb-diff"; + sha256 = "1h1dvxbj85kgi04lxh0bpx81f6sl1fd56lhjmq1cw9biwqw0sm0c"; + name = "dumb-diff"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dumb-diff"; + license = lib.licenses.free; + }; + }) {}; dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170911.1951"; + version = "20170918.2024"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "67928ef6449318a8653812167540aa5919301260"; - sha256 = "0i7jyh0zzk4ifkqwi89bnnwgvaaphnf4n5z299mg0fj4walzx3rz"; + rev = "0d39c148abd5c76e5b39847a794ab3a240a7e018"; + sha256 = "0ksddljicrjx4cbx8ws31bskcirjvbsxz60f4xh8j8ywi3s7wj4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15592,11 +15041,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20170519.704"; + version = "20170926.500"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "56fa34ea25d4"; - sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00"; + rev = "023d2edde61d"; + sha256 = "1izhlafsbxfav4jvl7bqg188d71895r1sqacxsblvcld8c0brsqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -15906,12 +15355,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20170819.347"; + version = "20171008.9"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2"; - sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac"; + rev = "8f16fb1f510a147e7ab846030057d4c74127ffb2"; + sha256 = "15axmg6z1nlaz7xsf70arxazkkskkga2fa71iswpnhwqsrr90w8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16071,34 +15520,15 @@ license = lib.licenses.free; }; }) {}; - echo-bell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "echo-bell"; - version = "20170221.1635"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/echo-bell.el?revision=8"; - sha256 = "0000ya8y6v5xvl5qkrsamzwh1iikc3clhpdpdr2da6c4b9cznydh"; - name = "echo-bell.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a81e339e9c7cf1ae5fe91ab4442164336a6fbf13/recipes/echo-bell"; - sha256 = "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws"; - name = "echo-bell"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/echo-bell"; - license = lib.licenses.free; - }; - }) {}; eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20170522.1354"; + version = "20170921.1440"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57"; - sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd"; + rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; + sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -16135,12 +15565,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "20170810.305"; + version = "20170922.656"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "65f29ff764c3742cc1190371b1ac91f0812535f3"; - sha256 = "16dypiczds89kpwqj7p29n5qcqpc1d7faci2f4glw1m60gnkgvqq"; + rev = "e16dcb430cf05a28065ad26eab2b32e2f7af8705"; + sha256 = "1x085idsgcfzagqm6jqqhgqzy1xqjkq40zl2q7a20v013n3rkbd8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -16408,12 +15838,12 @@ edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-indirect"; - version = "20170310.1002"; + version = "20170928.430"; src = fetchFromGitHub { owner = "Fanael"; repo = "edit-indirect"; - rev = "2fc8f382ee12fc8f7202288534258186bdf6068a"; - sha256 = "1m40zi6dkq7m9386adrys5n7w8h9973svfmxl1c3n9vk9kjibb9k"; + rev = "032ac0ec690d4999d564fd882588c7a197efe8dd"; + sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect"; @@ -16513,12 +15943,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170912.2223"; + version = "20171005.2129"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "f527731c0d24a094f6fc784366558e2bf3d0e201"; - sha256 = "0im24f2h2n4ijdmkjkkphngk2sgj1g2rg0ygppq03rbzmqg0r6sm"; + rev = "99bb6882d8ac708a066a9977cc4fa23f86c6b8f6"; + sha256 = "0372s9xp8gjz6y0ix095r9gy8718jw1vkjszd12kz6vnxn4z4rmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16792,12 +16222,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20170903.829"; + version = "20171003.817"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd"; - sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za"; + rev = "e0e3fac0c41e8cf4efa2fea6dbb49d3ad80d6153"; + sha256 = "11zw1gqzxzim6y6yrbbbsmmyadpagqk5f79vmx8ly0x1ivk87ldn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -17017,6 +16447,27 @@ license = lib.licenses.free; }; }) {}; + el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }: + melpaBuild { + pname = "el-pocket"; + version = "20170922.549"; + src = fetchFromGitHub { + owner = "pterygota"; + repo = "el-pocket"; + rev = "a80abfb67efe68ada1d7d0a73aecee57e763baaa"; + sha256 = "0q4nsgqpjmmxml5pcb6im1askk6q7c3ykzv6fgf1w8jgkvdifa6f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/el-pocket"; + sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw"; + name = "el-pocket"; + }; + packageRequires = [ emacs web ]; + meta = { + homepage = "https://melpa.org/#/el-pocket"; + license = lib.licenses.free; + }; + }) {}; el-spec = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-spec"; @@ -17101,25 +16552,6 @@ license = lib.licenses.free; }; }) {}; - el-swank-fuzzy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "el-swank-fuzzy"; - version = "20130824.457"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/el-swank-fuzzy.el?revision=3"; - sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn"; - name = "el-swank-fuzzy.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2aecf6d476c7898478e6e5dcfc77d91935f07039/recipes/el-swank-fuzzy"; - sha256 = "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1"; - name = "el-swank-fuzzy"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/el-swank-fuzzy"; - license = lib.licenses.free; - }; - }) {}; el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-x"; @@ -17204,25 +16636,6 @@ license = lib.licenses.free; }; }) {}; - eldoc-extension = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "eldoc-extension"; - version = "20140306.645"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/eldoc-extension.el?revision=10"; - sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch"; - name = "eldoc-extension.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2c59866b554def3f6cef997cc23254a560f3eb33/recipes/eldoc-extension"; - sha256 = "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24"; - name = "eldoc-extension"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/eldoc-extension"; - license = lib.licenses.free; - }; - }) {}; eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }: melpaBuild { pname = "eldoc-overlay-mode"; @@ -17272,8 +16685,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "9aa71d7b6b780242e4659fedfdb186d4ee422366"; - sha256 = "03py67msf3cshg60zs6bdk71ksswi3vjf0nl88jhlgnzb3kjg4wm"; + rev = "5800e90f5ce23663fe370e4ad8fb40f59a4f93f5"; + sha256 = "0d3fakycfg7rfblp6wqxyynvnqnpnz4hvi812fp5v4wqz4slfjxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17352,12 +16765,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170910.1453"; + version = "20171001.1900"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "b62a2d0040f1a8ad0a23a48e3843d2ed5cbc2a8c"; - sha256 = "1fxxcdrm7138pb06wxk9k519kag03jllkwf2fyxh755x6fnxlgin"; + rev = "f343cfa93b7d91024496b8b7f46280762fe86659"; + sha256 = "0bysjh9626r2651n6vvq6mbbw36jrp41nmd45an6y9cl0z0wj58w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17426,8 +16839,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "b62a2d0040f1a8ad0a23a48e3843d2ed5cbc2a8c"; - sha256 = "1fxxcdrm7138pb06wxk9k519kag03jllkwf2fyxh755x6fnxlgin"; + rev = "f343cfa93b7d91024496b8b7f46280762fe86659"; + sha256 = "0bysjh9626r2651n6vvq6mbbw36jrp41nmd45an6y9cl0z0wj58w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17611,12 +17024,12 @@ elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "elixir-mode"; - version = "20170102.942"; + version = "20170918.2231"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "emacs-elixir"; - rev = "384d8daf8ad563ebf2cb3437c71d30241adbe099"; - sha256 = "0idgfjwd6116zaag0lmq2i9by2mr054nrqmpnsvyhk26hw71k3vn"; + rev = "861788186f4dbd500209656dcf38a15b3efe74dd"; + sha256 = "1py8slpda3vsw88v1wp1imnn3r17hz54621c6ks8xm75lnhn60ra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode"; @@ -17653,12 +17066,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20170903.221"; + version = "20171001.26"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "ece63376b2a7a8f5e6d708bdb2061e13d6afb731"; - sha256 = "1109si17ph8w90jcmzz72i0ha5va8ylh2y5jinabvsc3qs667bgy"; + rev = "a0339b196760823a0f3bb0bcaf26daa62c356535"; + sha256 = "0vsyibph08xcxinjri4lzy44ji3albwpcpb469q0h43jjd2jw2v4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17881,15 +17294,15 @@ license = lib.licenses.free; }; }) {}; - elpy = callPackage ({ cl-generic, company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: + elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20170903.143"; + version = "20171005.1105"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "d1cfe9c87031a9fd4c9754afdc4c4d0b3b3128a6"; - sha256 = "1zy24fp888i7xaplfnxznlw8hldfpcgh9ni0053m9sq8z28nld6j"; + rev = "2d6dc9f31de8805f2b7630c874942fb7e8fb5bd3"; + sha256 = "1mrda1kvwv0mzgxi8z28a9qynlkfzpw0wgvwc86pkq94fzr6l2pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17897,7 +17310,6 @@ name = "elpy"; }; packageRequires = [ - cl-generic company find-file-in-project highlight-indentation @@ -18060,12 +17472,12 @@ elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elvish-mode"; - version = "20170815.625"; + version = "20170913.1939"; src = fetchFromGitHub { owner = "ALSchwalm"; repo = "elvish-mode"; - rev = "d78a560b0aeba76ae09fb0885ca0cff2ee5b0d0d"; - sha256 = "0fxmy0qfcapskbakin6p1hv9763yh4bxanlnak7p6dfmmw7mvz33"; + rev = "9cf31b453ac79b011b84e83ca11c964c4e647649"; + sha256 = "0ryg9c8pjw98a9l4hyjqwan7kcv492vzy0xxcrcfm69zn8vnw9k0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode"; @@ -18480,11 +17892,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20170901.1328"; + version = "20170929.1427"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "79793c0bb32620ad5b4db490c6e80ff8e5a20233"; - sha256 = "13mk66vbrnzsy8bcz2wahn4hcqyiia6j0srpfffxsg49x9bssvff"; + rev = "b1ea89a08da3f5953d55072fffed8f781b461315"; + sha256 = "0kih2hvwrzjsw8k271hciwx4p2bxn4hgm4bsk9zdrsw9lxy0qqnm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18584,12 +17996,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20170506.1024"; + version = "20171002.723"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "43ef07db6e724847fdcff5f66d1806b3e8d315e4"; - sha256 = "15wfr6qs4k6anm16zing0rgawpbrnk9589vr06fc6qvkald7ib3v"; + rev = "dcf79a7570ff4031373991f9fc838ddc5f598006"; + sha256 = "0mq6k6qgqv08k421wjk69ma8m7m29yfmwh2bsphxj1pa2h1y6h2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -18605,12 +18017,12 @@ emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-simple-mpv"; - version = "20160924.825"; + version = "20170930.2216"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-simple-mpv"; - rev = "bcc056364df5f405716006a8b7bb90102a57f62f"; - sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5"; + rev = "1af7838037c86872e897bea872d279ff080c28c6"; + sha256 = "1xgkpw89pyn4p37l5rz9dw8yg065slzq8l5z69n6nam9hndcnjsh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv"; @@ -18974,12 +18386,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170817.2325"; + version = "20171005.347"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "fe816d36bce96151f90b76887a69f44100bd12da"; - sha256 = "19id9s3wvwlqvcfngw32rd9fnq74nwyl5zlmyvr6i268rk4gm4lq"; + rev = "82de811bde723e78a702e98592e46514ac700f9d"; + sha256 = "15n01ni833y9viccdcvhjj80yyavm1131njxwp0q13gqgbzj3n5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19087,12 +18499,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20170905.1210"; + version = "20171006.353"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "42528f4f1d3310361d84bb557c4b7270adb5fd5b"; - sha256 = "1d14160l1w65a3klhd71972a726kzhcn07bljp5q57y1qxbq648m"; + rev = "4258ca3457e9a7ac46d1f0bd7a80f1da51b360cb"; + sha256 = "00v5ipcz642rrg4yicwmg1nam5n0yasqgrak13b3wqmzqx1qzf6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19569,12 +18981,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20170723.1921"; + version = "20170915.1902"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "7b0600620fc64cdb92bb9a69144c68eaa088db5b"; - sha256 = "05ihafhhjlq7b4zs58jaqssgqdha5kqv65hvk7946ba7l845fi83"; + rev = "6231ee0ae7014bd8f8ef2a3adc13b4d3d403bf71"; + sha256 = "1c3ryazy796zcxp550ic7a7qsgs4528sfqqywmwqpf8vl7p0p7xp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -19611,12 +19023,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20170912.58"; + version = "20170913.604"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "b36f0b6d381746a16c8d8c2bb3767d9ffb44c3f8"; - sha256 = "1i0aqq3vwy10jbky6ahka2vqk55iqanq1liqj81r76l5v55flcz6"; + rev = "e38c688d3961bedcd85f842fd052836cb345a902"; + sha256 = "1izh0zblnyklhya72cz8rf8pwq8q5smm4yp520vrkplspcspwbva"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19698,8 +19110,8 @@ version = "20161018.1217"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "b8e23617bbd5228dfa37fdc00e7b5227fd6382df"; - sha256 = "1f5r1ns2h53q5qmrr31xbwrsinnk4ialh4a7siz2n513znq6dq8w"; + rev = "c4cd27b60f9e7ccd05fd8a2097cde947eb250599"; + sha256 = "0zm71kv4wxs6yf70qwrfavxc1845bg4aqqk36zypy17g1x40bms7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; @@ -19778,12 +19190,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170823.957"; + version = "20170915.801"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "82c9d0e47f7f224d1248e3455ee10c0adea327bf"; - sha256 = "1jb4b2cww6y3y0j3gf9n5v2hcmb9zsf1cz9rhr0x6vh169yvhjvr"; + rev = "511eaf59123c2dc4f900cd31d3c30c5bf98599ea"; + sha256 = "1ldyf39z7faizbg2nzh2myd5yld9iwxi9r5260sp1dv0ab2im4gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -19922,6 +19334,27 @@ license = lib.licenses.free; }; }) {}; + eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eshell-bookmark"; + version = "20170922.814"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "eshell-bookmark"; + rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed"; + sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark"; + sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s"; + name = "eshell-bookmark"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eshell-bookmark"; + license = lib.licenses.free; + }; + }) {}; eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-did-you-mean"; @@ -20009,12 +19442,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20170713.11"; + version = "20170914.1955"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "52a8ce66da2c5f419efd41f2a6b6d4af03f78acd"; - sha256 = "1biandbijdngalbjvbfv894qjzmj0fndypa31rmd75c0r5mg2mnf"; + rev = "7581c109673c40aceff278cd524273f50ffe170d"; + sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -20139,8 +19572,8 @@ src = fetchFromGitHub { owner = "ecukes"; repo = "espuds"; - rev = "31ffd83f6deccddfb8378fa2298d90d3fc5fdda1"; - sha256 = "1l8c8g050av0hi5snini7igfrjaq8q0nb3g114ai1i8frzsrxgzn"; + rev = "444285cde99860b50b4c9a2e1c6a25e4db8d9adf"; + sha256 = "0nwgh9nrr85n6ix60r6z58rw2078wkzkqqfszq2sr7wmad6kxspx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds"; @@ -20198,12 +19631,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170911.149"; + version = "20171007.516"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "23e6d3ef5b314223043c9f03301b3e7018141385"; - sha256 = "1fih6rphz5bsd2kvwblygaymp1mvz710xjvcqg52l9awlawgvbwb"; + rev = "d559b3d0e7db97a74823c20fda4095d1a14d9209"; + sha256 = "1cxq8k9m2m36zz3x04dranzg40k61qprhy4w91chl3384jf1rb39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20303,12 +19736,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20170729.1742"; + version = "20170923.1328"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "94e0d2bef2bcdbd9477e702f63148cc2de75ecb3"; - sha256 = "0rz2a8ydr7jrsgz1mxgjk4wyf7rkz0w3qvx6jy8mygzhzhmniy24"; + rev = "a589005a9a888537deef94d6fe38a9b8790c97c7"; + sha256 = "04lxmd0h7mfjjl0qghrycgff0vcv950j1wqv0dbkr61jxp64n5fv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -20328,8 +19761,8 @@ src = fetchFromGitHub { owner = "tali713"; repo = "esxml"; - rev = "08fcc5d76abb90c194e181f267cf1d2a149b7a7c"; - sha256 = "034lxfqn5yh78hz7i568vw8kyv3hlb699z2d1dffjiigc1lblgip"; + rev = "6d58e047b7c1e3e8cab87cf7ee15e039e8a22510"; + sha256 = "0bkbp3bycb4vrk0y5n7013yqqzz7rjvfwkr9lppa6sixilhc8h66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml"; @@ -20363,44 +19796,6 @@ license = lib.licenses.free; }; }) {}; - etags-select = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "etags-select"; - version = "20130824.500"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/etags-select.el?revision=21"; - sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb"; - name = "etags-select.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5875d00419666388acbcb8a4f392308e7576da0b/recipes/etags-select"; - sha256 = "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h"; - name = "etags-select"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/etags-select"; - license = lib.licenses.free; - }; - }) {}; - etags-table = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "etags-table"; - version = "20130824.457"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/etags-table.el?revision=4"; - sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf"; - name = "etags-table.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c3efc1791df5658ca5bba4907f2a22c2cabfd3c8/recipes/etags-table"; - sha256 = "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84"; - name = "etags-table"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/etags-table"; - license = lib.licenses.free; - }; - }) {}; ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ethan-wspace"; @@ -20572,12 +19967,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170904.1346"; + version = "20171006.2359"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "485bf5399bbad17ff0cbb3787de67b9a5a5665dd"; - sha256 = "02zd9pk2x44lz9cb8cqy0apvdbb8vwlxgvrgfkfswvx34ww4rqmc"; + rev = "b6ed94c9a531ba905b729e0c3dc89fc32d888f46"; + sha256 = "0idp7wl22vzpy440jcrxspb47snk098h7gi7vn5fq5awc9pknwpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20698,12 +20093,12 @@ evil-colemak-minimal = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-colemak-minimal"; - version = "20160922.226"; + version = "20171006.617"; src = fetchFromGitHub { owner = "bmallred"; repo = "evil-colemak-minimal"; - rev = "5f1db93959359d3efd57abb5a0d06e94dec92556"; - sha256 = "08dfmny7z03h6hbj21f344jv9kpzlzk31j5sd78w1c68mgx9hj6b"; + rev = "6d98b6da60f414524a0d718f76024c26dce742b3"; + sha256 = "0pd05jq4qkw5xx7xqzxzx62fsm77vjz0ry9ayaqgqw5831rbp553"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/828c744062069027f19fe5f2f233179f9149dc16/recipes/evil-colemak-minimal"; @@ -20824,12 +20219,12 @@ evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; - version = "20170115.1343"; + version = "20170913.618"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-escape"; - rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec"; - sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; + rev = "25920fb2f4ef48998eecea433c04096f8d124cfe"; + sha256 = "1nbk0mlfrg8hbw119dpp2a1k2irgz811kcsrwmxv256gkx4pwmfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape"; @@ -20929,12 +20324,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20170913.59"; + version = "20171002.2303"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "221a5ed8ea0455e4274ef9ba14fe852cc512112d"; - sha256 = "0qjzkg1cms6ska213n1ldm511ivdawxwpvn8qzl8l75yf3whzw05"; + rev = "92d614e731d1f2b8cafa4bf211e560294e378c14"; + sha256 = "006ny911qmxl7p1azdcf4d6daswglc06jh295glhn963sqkc2mgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -21328,12 +20723,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20170911.1135"; + version = "20170917.1447"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "1b0cb009fcc593ba851d243d2e3291a8cfeb2fb0"; - sha256 = "0qnb5vbsrwxsn2zjl6dy6gvc1y77ac9c8nqrhpzyvjbkby2gkwzh"; + rev = "52bbb105a6a7fa9ead68c56746740b4343ecd6e9"; + sha256 = "1k0akcqbr67lsrj5gkpr9b3nhrf53zd3ksv4sfrapn9xhv13brbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21538,12 +20933,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20170910.1952"; + version = "20171004.600"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "7839abe0e04740e2928a6b799557d1b16460fa5f"; - sha256 = "03lfn8clcbcmax5nzn6awzfd895inavzrn45n07hrq6abw98yjrd"; + rev = "822a0f61c3fd7c55cda4e04c8590ae5144401c26"; + sha256 = "0xd87whrznwk1hggb0jrx6n1m5sbj0014qv26qvvc3f11vrrda2x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -21622,12 +21017,12 @@ evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-test-helpers"; - version = "20170719.1445"; + version = "20171002.135"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "485bf5399bbad17ff0cbb3787de67b9a5a5665dd"; - sha256 = "02zd9pk2x44lz9cb8cqy0apvdbb8vwlxgvrgfkfswvx34ww4rqmc"; + rev = "b6ed94c9a531ba905b729e0c3dc89fc32d888f46"; + sha256 = "0idp7wl22vzpy440jcrxspb47snk098h7gi7vn5fq5awc9pknwpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21853,12 +21248,12 @@ ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ewmctrl"; - version = "20161104.1833"; + version = "20170921.1917"; src = fetchFromGitHub { owner = "flexibeast"; repo = "ewmctrl"; - rev = "ba1879cc803a63d5a4047ec6f2990e369ae5af3a"; - sha256 = "12h2fgabfmaq1cpr7y7ckyyfgy53ww3v25p2kk5fq77rn40zbniy"; + rev = "3d0217c4d6cdb5c308b6cb4293574f470d4faacf"; + sha256 = "0ilwvx0qryv3v6xf0gxqwnfm6pf96gxap8h9g3f6z6lk9ff4n1wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2a7679f0961b171bf23080e628ae80f50c446e4/recipes/ewmctrl"; @@ -21936,12 +21331,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20170828.357"; + version = "20171009.445"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "0fcb6f3e5ef7d97a4ec049867a8d703ec60a89f5"; - sha256 = "0i7pgdxrx2ijf67sy4x2xab416s458mgac261ng2522z87szddah"; + rev = "086d1539e681e38829e3861cffdf62e49213ed58"; + sha256 = "17prr6b5za43mahdfz355k1p1b2jkwd1csb6wlph5g4nmplh5c61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -22083,12 +21478,12 @@ exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170903.2138"; + version = "20170916.2015"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "cee7cc0e6dd6d1c481480f1978b6487287b4f637"; - sha256 = "0kwrm2bz09i8dj0zz7pznpv0hy08pxl4kzl46c470abvs2dzrp67"; + rev = "abb210ff56134cc6a285d91b875f3115bc951ad0"; + sha256 = "1l7578jfn3va6bpkjfbazygsn8asxhc7cpss32mnsrzkm1ix6sz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -22175,12 +21570,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20170906.821"; + version = "20171007.939"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "63395a2367d1d48983a9363d2d0bf518177297bd"; - sha256 = "15vgv0z4vzdnc3vb98j2hy4bv5x83f4c1dzgx49r61vka7p5is0q"; + rev = "909a84dc5959aac982d1c296e82d687d172d3ecd"; + sha256 = "0mw9h55f708mv0ngixmdn7976yrhqjcnzac80f6mzddpwavgrhd6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -22277,72 +21672,15 @@ license = lib.licenses.free; }; }) {}; - face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "face-remap-plus"; - version = "20170222.1742"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/face-remap+.el"; - sha256 = "1p42wjzl2brbqv3vh3g1rcgh5m9a7bix5q80pg7r6515as8kykad"; - name = "face-remap+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/face-remap+"; - sha256 = "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y"; - name = "face-remap-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/face-remap+"; - license = lib.licenses.free; - }; - }) {}; - facemenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "facemenu-plus"; - version = "20170222.1744"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/facemenu+.el"; - sha256 = "0nnaqmdsf6ksk6663924bpw3mrldybj6jjkgj0525nhpfjx7x4yq"; - name = "facemenu+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/facemenu+"; - sha256 = "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv"; - name = "facemenu-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/facemenu+"; - license = lib.licenses.free; - }; - }) {}; - faces-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "faces-plus"; - version = "20170222.1745"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/faces+.el"; - sha256 = "0a80027a78zad0nxlkmv69b2zzbz4b29rsn4ivgb313r4c24igzx"; - name = "faces+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/faces+"; - sha256 = "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92"; - name = "faces-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/faces+"; - license = lib.licenses.free; - }; - }) {}; faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faceup"; - version = "20170126.1305"; + version = "20170925.1246"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "faceup"; - rev = "688b487ad0a78c8707c5aded50e1d85551270034"; - sha256 = "1wmmj69wgzgac5y7gnrz84dvwjzd45h3rr434vv4dxnam0j0lj40"; + rev = "6c92dad56a133e14e7b27831e1bcf9b3a71ff154"; + sha256 = "1yzmy7flrhrh0i10bdszx8idx6r8h6czm4vm4q0z6fp5fw94zwrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a10bf2928b93c3908e89ca8ad9649bb468ebca05/recipes/faceup"; @@ -22592,8 +21930,8 @@ version = "20170908.658"; src = fetchgit { url = "https://bitbucket.org/yassinphilip/faustine"; - rev = "feb938af3a5363e0e0210aa98a447e1896ceca47"; - sha256 = "1c0xc1nk9djjk39ksysszliphibnpm7c472p4lvgkmrsmg28i23k"; + rev = "ae67cd9d1a2625d80726dace9dd83539e71d1b36"; + sha256 = "1wvf37g2bb9xbxi0qxn1sfq0ygaqxfzsnzdbnail6f29qyl541al"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine"; @@ -22609,12 +21947,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20170812.1131"; + version = "20170913.1900"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f"; - sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j"; + rev = "095332fbeb994c908c533fe2ad068c0728211c3d"; + sha256 = "01sm50rqajylah2hx6n5ig0xmrrhxbamzs4bg97qzxzr4nlnjcaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -22751,44 +22089,6 @@ license = lib.licenses.free; }; }) {}; - files-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "files-plus"; - version = "20170222.1746"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/files+.el"; - sha256 = "1ch7k4gpfcb5k6z656rprdcvxp75wsfjhw5l6x8f05qbmm0cbimv"; - name = "files+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/files+"; - sha256 = "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8"; - name = "files-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/files+"; - license = lib.licenses.free; - }; - }) {}; - filesets-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "filesets-plus"; - version = "20170222.1748"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/filesets+.el"; - sha256 = "0i9nc9zhpj208as9pynnh6xvr0qk53y7bpg2gw4gak9xr9xywbpg"; - name = "filesets+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets+"; - sha256 = "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn"; - name = "filesets-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/filesets+"; - license = lib.licenses.free; - }; - }) {}; fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; @@ -22873,25 +22173,6 @@ license = lib.licenses.free; }; }) {}; - find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "find-dired-plus"; - version = "20170409.1832"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; - sha256 = "0zfqkw9vghbzvdh3iyqkkdq777bb1yhfgqk7p28dxz861z13cmfs"; - name = "find-dired+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/find-dired+"; - sha256 = "190cj41b6s1l6gk1m0rbwfsdciw4my39ncppdxf9pi7gzhcjpznr"; - name = "find-dired-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/find-dired+"; - license = lib.licenses.free; - }; - }) {}; find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; @@ -22976,25 +22257,6 @@ license = lib.licenses.free; }; }) {}; - finder-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "finder-plus"; - version = "20170222.1752"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/finder+.el"; - sha256 = "0h1jsgb7vivmbay35s9bx8dpl7l88zdh1f6ymdm16b0alpiv4p14"; - name = "finder+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/finder+"; - sha256 = "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh"; - name = "finder-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/finder+"; - license = lib.licenses.free; - }; - }) {}; findr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "findr"; @@ -23163,25 +22425,6 @@ license = lib.licenses.free; }; }) {}; - fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fit-frame"; - version = "20170222.1754"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fit-frame.el?revision=63"; - sha256 = "1wm2jc7h5zhv695wf21l3n9gjn31ddgd0vybx8brj1nbvavifs0x"; - name = "fit-frame.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame"; - sha256 = "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb"; - name = "fit-frame"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fit-frame"; - license = lib.licenses.free; - }; - }) {}; fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-input"; @@ -23420,6 +22663,27 @@ license = lib.licenses.free; }; }) {}; + flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flex-compile"; + version = "20171006.905"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "flex-compile"; + rev = "e2a2820282458cad5bcac4037baa6c2e76b1bdce"; + sha256 = "15dlfayyrcy54davrha8vm87vbip01sbqxgdjfbri4y134fljrk8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile"; + sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38"; + name = "flex-compile"; + }; + packageRequires = [ buffer-manage dash emacs ]; + meta = { + homepage = "https://melpa.org/#/flex-compile"; + license = lib.licenses.free; + }; + }) {}; flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-isearch"; @@ -23482,25 +22746,6 @@ license = lib.licenses.free; }; }) {}; - fliptext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fliptext"; - version = "20131113.1818"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fliptext.el?revision=4"; - sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw"; - name = "fliptext.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/093046dfb39148d56681e9c8be8cccff23dd19cb/recipes/fliptext"; - sha256 = "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji"; - name = "fliptext"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fliptext"; - license = lib.licenses.free; - }; - }) {}; floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; @@ -23525,12 +22770,12 @@ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "20170729.1008"; + version = "20170916.312"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "75067baceed7d699dda43944da49dc58d22baeff"; - sha256 = "0r1xs3vff3ng0h2w8nn7mxssdnipnrzwk9dh5f5v7prwk2q60byb"; + rev = "93184633933b5aa62e6e92b7fe1311261012e591"; + sha256 = "1laainsc5l4l4r5j17hblv7b1ppxrgfak73ama1qn7kb14y1jfrf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; @@ -23630,12 +22875,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170911.127"; + version = "20171007.33"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "eeb915b51f2fe9f7afe125b1028737b8c2b44712"; - sha256 = "13dsjngb5lbhzrlcw3skk7v6j7c2k3vn596msin9f6ssjwmgc94k"; + rev = "b339f0efd72db0fea00964c224c20c6ee8ef92c8"; + sha256 = "0vyp9l8190xgy27jil0pfvc9j0hjwfiq0w0ia69flid0jxgirslz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23861,12 +23106,12 @@ flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-color-mode-line"; - version = "20170512.1607"; + version = "20170929.1513"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-color-mode-line"; - rev = "b2b20727d133c05fd31eac7b9b5c0886bbca8f98"; - sha256 = "1dgm9i2b9irp454ag9pv96hbacz1j3gsapk96xr45wjh4hblgwa3"; + rev = "19947b81ddce6df4f10d3facb7c047538036a9df"; + sha256 = "197knp91qx5y3kqbmnm4mcx61w73yr9xkvidvp96mfjzlldbjaz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line"; @@ -24344,12 +23589,12 @@ flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-joker"; - version = "20170415.2009"; + version = "20171003.2222"; src = fetchFromGitHub { owner = "candid82"; repo = "flycheck-joker"; - rev = "43a25fe17ba6ade96fc865bd8ec3fb3c131aa419"; - sha256 = "0m2msyyshbr6pgnjqybv8b1fj0axja3la0drbbbk0va1cn556wfs"; + rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456"; + sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker"; @@ -24428,12 +23673,12 @@ flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-liquidhs"; - version = "20150618.1922"; + version = "20170412.1626"; src = fetchFromGitHub { owner = "ucsd-progsys"; repo = "flycheck-liquidhs.el"; - rev = "ee0d3bd0d5e07a872e541d02c112f1cc204db922"; - sha256 = "1wwn9dnzn4vrh747dgbcm944bp3z02gzxd32afjc9k2dsn32qvz2"; + rev = "c27252ac24d77f4b6eec76a4ba9cd61761a3fba9"; + sha256 = "1v5s252w2ai0rrci0rkq6wsx110pw8hp60n67990jg6l6lpvir2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5921fde4068ff1bb288f6f9e2fe03f4a7fdbbda/recipes/flycheck-liquidhs"; @@ -24743,12 +23988,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "20170810.1143"; + version = "20170928.1808"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "220c551df591792d08fc9d149ab3329171743cb9"; - sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i"; + rev = "fedb4094976349da1449f821fd79cacd7537e80b"; + sha256 = "0cxpcmx810zkrnqbzj064kgbsyj4qkr7dpps16xdk4ckbiih55rj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -24810,8 +24055,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24869,12 +24114,12 @@ flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "20170405.1600"; + version = "20170923.1439"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "c4e891ad287c12b83b754ada27b4550fb763c07f"; - sha256 = "12nlzs4fha1bmq1xbfgf5j4wg9llacl2m3jr8fbk8144pyss3kg5"; + rev = "e85072a04f4277a48d90364b8e48fcb26a650d38"; + sha256 = "12k0nakwv7z90fprpzfrsnmha0w5zsvpq7qiv0md3k3h41b5mgfv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; @@ -24911,12 +24156,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20170409.25"; + version = "20170926.317"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5"; - sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q"; + rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; + sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -25013,6 +24258,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-yang = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yang-mode }: + melpaBuild { + pname = "flycheck-yang"; + version = "20170915.1308"; + src = fetchFromGitHub { + owner = "andaru"; + repo = "flycheck-yang"; + rev = "c5f65fe3f710f73d56e04d077868719afc1ebfaf"; + sha256 = "00w91mif3wnxgj93qag51yyadnfcsyxik96vf91qlfvwh4wi6ii7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e58b4f4294d11424918b399898c0044f5b76ab14/recipes/flycheck-yang"; + sha256 = "0agfmirjwlz13aq1jh94agav0y1rxkyhj7mngdgys7mwjxy0ac9h"; + name = "flycheck-yang"; + }; + packageRequires = [ flycheck yang-mode ]; + meta = { + homepage = "https://melpa.org/#/flycheck-yang"; + license = lib.licenses.free; + }; + }) {}; flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; @@ -25020,8 +24286,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; - sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; + rev = "393724d0d36a8269e57a0e4c2b3723071caf0a3c"; + sha256 = "02pm3x9frscgz5szddvbir0i7amnkzfj7pl4lgiah57bhcg1lhd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -26003,12 +25269,12 @@ folding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "folding"; - version = "20140401.3"; + version = "20170925.838"; src = fetchFromGitHub { owner = "jaalto"; repo = "project-emacs--folding-mode"; - rev = "f738e28cd90d794aff698bcd44bf4f5027c92839"; - sha256 = "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny"; + rev = "3bf134fd1ecfa8767ab7020c25281ea5ce9968a2"; + sha256 = "0kcm4k71syz778cbwqf68a63k4vmhygaib3ylwxbm5dq1dmr7iry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1912296b7879019bea5ba8353d511496e3a9ca2d/recipes/folding"; @@ -26021,25 +25287,6 @@ license = lib.licenses.free; }; }) {}; - font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "font-lock-plus"; - version = "20170222.1755"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/font-lock+.el"; - sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30"; - name = "font-lock+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+"; - sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g"; - name = "font-lock-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/font-lock+"; - license = lib.licenses.free; - }; - }) {}; font-lock-profiler = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-profiler"; @@ -26127,16 +25374,16 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20170618.1048"; + version = "20170924.1440"; src = fetchFromGitHub { owner = "cadadr"; - repo = "forecast.el"; - rev = "96e37ca81a42061f0e837cc3c4dec1844f682e91"; - sha256 = "0hbz2q9sm70r7sxk56dlnzwh71ckrww7w43xxy3ys1r3p7b3j3aq"; + repo = "elisp"; + rev = "b3d8b45c76134e2248448d719c840776e41b747a"; + sha256 = "0fy0b04mf3brx86xjnidkwg4zs4nh123nc6pgrl4mp6d6552vv98"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; - sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; + sha256 = "0zng8xdficpfccq484pghzg8yylihcy8aq0vpxd1w6l40m2qf6zn"; name = "forecast"; }; packageRequires = [ emacs ]; @@ -26355,45 +25602,6 @@ license = lib.licenses.free; }; }) {}; - frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }: - melpaBuild { - pname = "frame-cmds"; - version = "20170819.1358"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=95"; - sha256 = "169g11vs3d5gr8y1lwg7lgl21dpfca33m1c6w24mfmga4xr9042w"; - name = "frame-cmds.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds"; - sha256 = "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0"; - name = "frame-cmds"; - }; - packageRequires = [ frame-fns ]; - meta = { - homepage = "https://melpa.org/#/frame-cmds"; - license = lib.licenses.free; - }; - }) {}; - frame-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "frame-fns"; - version = "20170222.1759"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/frame-fns.el?revision=31"; - sha256 = "1yl51wnmlmbirrhcf07rnqix62q7ijymwfbahwjsz2s18g2zyj6n"; - name = "frame-fns.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-fns"; - sha256 = "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p"; - name = "frame-fns"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/frame-fns"; - license = lib.licenses.free; - }; - }) {}; frame-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frame-mode"; @@ -26436,25 +25644,6 @@ license = lib.licenses.free; }; }) {}; - framemove = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "framemove"; - version = "20130328.433"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/framemove.el?revision=4"; - sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7"; - name = "framemove.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f075338369dbf0694205c1b2c35dc16821f6dc92/recipes/framemove"; - sha256 = "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar"; - name = "framemove"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/framemove"; - license = lib.licenses.free; - }; - }) {}; frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frames-only-mode"; @@ -26462,8 +25651,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "dbe2725846ab9d90b309fe0f5e303e600a7d1661"; - sha256 = "0c6xq2l9hzw2gavnwzwp5gg7nzvf7dl1x8qh7aabchd4a8c050rb"; + rev = "d2e6a825e2079adb58012e9677c494d317494724"; + sha256 = "1x8w2788yaqfi5ys541kp4wi3rcfa2lvbhnxgd8dwr9h0da332xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; @@ -26605,12 +25794,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20170617.1330"; + version = "20170918.842"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "9766952bd7830cb0d319736961af8e42e67d42fe"; - sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi"; + rev = "71435fdd100712d6894d8d72a5667b250a0d8eb7"; + sha256 = "1c718gfms4zhzj06zmzdw71q6vhbf7mh3cgvq9vf8bnlv910p832"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -26634,12 +25823,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20170824.31"; + version = "20171004.806"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "9ffad30f11e97aeec4c8dcd353da8e14f1d3a9f3"; - sha256 = "15ij1i4a0g7vmb312cdsq70i76accijrjha6lr8bq9a4r167axcr"; + rev = "0e438c206059d268d085bb94d64782d4e2ae46b7"; + sha256 = "02wpp9q4aijv81vspvzgw9pjdmagflfnrd7w1m21xgw56hrg0mj5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -26667,8 +25856,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "705e7018c824e8160ecd8f0e81117dbebf6e90a0"; - sha256 = "16j855qg046q8p8dbsry1nr4ljfn90wk36yqrbcklb93m1g0f9ny"; + rev = "b8a0feea5cc28136d053888b45c50a6e0d3d07fd"; + sha256 = "1rmfvvxgjdng1wybri8a2lqcimf4ywpl1wx9q04zzl8zmm5f2diq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26747,12 +25936,12 @@ function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "function-args"; - version = "20170822.1002"; + version = "20171006.1056"; src = fetchFromGitHub { owner = "abo-abo"; repo = "function-args"; - rev = "f4d2d1692f38f5acf6d209610371e008856357b5"; - sha256 = "1s5ajgig4na5mvymbxk4ncs6nfa8qirzgkp15x8rjx5kj1m22rxa"; + rev = "bb0f76412de0f791d82685b4131195e3127e2ccf"; + sha256 = "137fdy398f6fwp96pi7zqm3fmjlvdwh4h1kiivf8xasgp235f92z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; @@ -26793,8 +25982,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "d4a741d1e87123c1691c3fcf9842895ba7d692f6"; - sha256 = "1zvk5mp1hk6lq0bmisl3nzmqclm00qjr74j3zl66q56sxn4sgxwf"; + rev = "a0ab1dc5d3f8e84e505d97041b3ce28a4cac94ce"; + sha256 = "0fka2dpv2gib19czg2p4x69h1d7s3hdg8j102qgc3da8d9vvhng8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26828,44 +26017,6 @@ license = lib.licenses.free; }; }) {}; - fuzzy-format = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fuzzy-format"; - version = "20130824.500"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fuzzy-format.el?revision=6"; - sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7"; - name = "fuzzy-format.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/154cb0a10c81ce4907029f0eddc51108961c65ae/recipes/fuzzy-format"; - sha256 = "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb"; - name = "fuzzy-format"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fuzzy-format"; - license = lib.licenses.free; - }; - }) {}; - fuzzy-match = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fuzzy-match"; - version = "20170222.1800"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el?revision=23"; - sha256 = "1wxl900wikkzykzp95v84kcyw3m1d16hklhyqqhsmg58ph4i6r94"; - name = "fuzzy-match.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fuzzy-match"; - sha256 = "0c1f4q985ag5qhv15iw2jhmpsyy09fbj87srp4k58lspjf40acdj"; - name = "fuzzy-match"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fuzzy-match"; - license = lib.licenses.free; - }; - }) {}; fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fvwm-mode"; @@ -27119,12 +26270,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170827.1755"; + version = "20170928.2221"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "9581e61f9d8839281fe42344dd5fe885ea7359ea"; - sha256 = "0nx86pzncab0b7700m8sc7k3nzml4v9frrq77lljjcjhw71gnvnn"; + rev = "839dc555861dbb77ea2632b8dd4d58904f33a396"; + sha256 = "1hykxw6a14d6xivin44bfbgr8dy4l5pr50cg0fk4n18a7dym7pjj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -27245,12 +26396,12 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "20170827.510"; + version = "20170918.1838"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "9d1ecf961dd964cbe8ea183eac23572bb4f8f4ee"; - sha256 = "1iy7n39kjl8n5qhs2vc9vszq3ff8h883zd380d3g7zs9nw0xx7jf"; + rev = "6293c438a4a7aae08b8f5dd5fc0082d3da0aa530"; + sha256 = "0rb293wjnc36gjy1vvvqsy605nn0vli1b1w210vvcjbg7zgcsak1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -27434,12 +26585,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20170819.1806"; + version = "20171007.1056"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "d6ee1158676f6fb62601fc20f02f4cbb7f090085"; - sha256 = "1r4zm1frbm2dwsnrfnsghfplxj81grwhhyjc421kjnfavkkflxnq"; + rev = "ac973a806e79ec883a3d041e91d06745084a622e"; + sha256 = "1063wh3h5vv17mmppwbpsi8l8qnph0203h1lr6lz5001xv9rih91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27623,12 +26774,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170913.343"; + version = "20171007.346"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ae72710292a94d9af92799d3ddeb86f365f34a56"; - sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf"; + rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; + sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28274,12 +27425,12 @@ glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glab"; - version = "20160808.539"; + version = "20170924.359"; src = fetchFromGitLab { owner = "tarsius"; repo = "glab"; - rev = "5ced0214622450930bcea105b9aac785c594609d"; - sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn"; + rev = "9848182275e0448390ccdd8dcd8e1e3a1853950c"; + sha256 = "1fw1ck85y9r6z331g1wj7rix29fwy6gwbm7vqj3wff0lszy208ba"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; @@ -28295,12 +27446,12 @@ glsl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glsl-mode"; - version = "20160209.833"; + version = "20170927.736"; src = fetchFromGitHub { owner = "jimhourihan"; repo = "glsl-mode"; - rev = "b4709644bb01b522ba9c8afe16ed2394783c481f"; - sha256 = "14ziljq34k585scwn606hqbkcvy8h1iylsc4h2n1grfmm8ilf0ws"; + rev = "384968506cf25c5c2df61b32fdfdbd041e3bf651"; + sha256 = "0729s4w010vw4ajvh1zpni7szxv9rpm6jk2y9hp7qyi67zbgjjgc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c416822d54df436f29dcf9a5f26398685fdc17a2/recipes/glsl-mode"; @@ -28526,12 +27677,12 @@ gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "gnus-desktop-notify"; - version = "20170305.1215"; + version = "20171007.1235"; src = fetchFromGitHub { owner = "wavexx"; repo = "gnus-desktop-notify.el"; - rev = "7d80d5e1894859e963584c55f570508fdf9c2ee0"; - sha256 = "1slj86f8c4pkl30xkv43vqwijd49nxya1bmhb8mqadncp3wapwr0"; + rev = "52e5de0961ce0f6890d5e7f26bc05152b99d9979"; + sha256 = "0r28hrlkji8z62nra71p0q6gvh21w90pyvmgskzjldmj78yjqbdj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify"; @@ -28565,25 +27716,6 @@ license = lib.licenses.free; }; }) {}; - gnus-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "gnus-spotlight"; - version = "20130901.735"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/gnus-spotlight.el?revision=2"; - sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4"; - name = "gnus-spotlight.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/004d48a59063163bfe5fbc5311330893d1b3b41c/recipes/gnus-spotlight"; - sha256 = "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx"; - name = "gnus-spotlight"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gnus-spotlight"; - license = lib.licenses.free; - }; - }) {}; gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-summary-ext"; @@ -28675,8 +27807,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1"; - sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb"; + rev = "1a78dd6c36d7f37cbb60073523c2e9ca3f6519fa"; + sha256 = "1bcd62rggq3sk96n3dlpidrv4pbx6x385x17knfnp35avgrhsv4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28822,8 +27954,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; - sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; + rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; + sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -28864,8 +27996,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; - sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; + rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; + sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -28948,8 +28080,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; - sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; + rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; + sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -29158,8 +28290,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "c5fb716d6688a859aae56d26d3e6070808df29f7"; - sha256 = "0bp9aarkinjr6m358qw9x4qxi3v9h06jvipyx1pg3pwsqh61vb12"; + rev = "6aaf7c34af0f4c36a57e0c429bace4d706d8e931"; + sha256 = "1z1j2l0j5175xvin5v56nsq7byg5nfpfvl9xgjszparchkyr8ndz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -29221,8 +28353,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "520cd9f88cc4bb6fa47345d566fffd8dd95c7450"; - sha256 = "1xghwnjl2wi78bcn4nhjdxhann18r1nczq47yia2rxl0yg61wwxk"; + rev = "911d9f4a7e3020578f4609860d7e5ede422a8f28"; + sha256 = "0x2wx34gvz4dab7gyzs1992pf1f8zl5s5n1q1b4ps1d4ralglq1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -29259,12 +28391,12 @@ google-maps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-maps"; - version = "20161210.458"; + version = "20171002.734"; src = fetchFromGitHub { owner = "jd"; repo = "google-maps.el"; - rev = "956e6ad42bc3819bcaf4cc66a640f5079b385ed7"; - sha256 = "0dqcs9dl3170zddh4npsqm1ql0n0a0378gyqxk0vi0ibzch537vk"; + rev = "c0e5dccfdc9f7f77ff8f29177547be47833d7156"; + sha256 = "1agsfmbd2zbn1xs05kxlb32hhkmrri3hdmcrvf0w1fcsgc5a9085"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps"; @@ -29406,12 +28538,12 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20170822.1030"; + version = "20171007.0"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; - rev = "417d61978d139cb5d089c5365fc8d3166d76d3ac"; - sha256 = "0rc40cfj2mby1q7bk1pp1fxdi72nh9ip80spjdm1csvjjc4dbkwr"; + rev = "393da2aa55054b3ad06d24bf6f09a90554b6d37c"; + sha256 = "134cw4g0hj6msyxyni71hkhf8wa2v2fxr41zyamg8xf76j75jr5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; @@ -29424,17 +28556,19 @@ license = lib.licenses.free; }; }) {}; - goto-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "goto-chg"; - version = "20131228.659"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/goto-chg.el?revision=9"; - sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij"; - name = "goto-chg.el"; + version = "20170917.1200"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "goto-chg"; + rev = "81fca94d2592cf32bab451c39a9cd2d9b03fbd6b"; + sha256 = "033msplvpahkva9ha09gsg9232fyz2bjihrdxaa2z9g4yzql8jkq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/529897b0c076d9031e7ecd13c945d2104ce8c735/recipes/goto-chg"; - sha256 = "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; + sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy"; name = "goto-chg"; }; packageRequires = []; @@ -29488,12 +28622,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170801.942"; + version = "20170919.645"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "17b8c9ccb7f8c7b015d44c4ea39305c970a7bf31"; - sha256 = "0g1vd8g6kbmz5ni0hdqg4yjlisf1lcxnfhrzcnwim5pw8zj549k2"; + rev = "456200c5d4982d6938b7ed14fc9bb72cc12b1576"; + sha256 = "0i10i311fr7lc2mf7na1jwxfj2lmi3l4f1bx22f01q4yy32kv3ap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29618,8 +28752,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "36cd834c9fb1e438dfae4ad15a3580c963dba29f"; - sha256 = "0rkxchxjgpgbhng15knwxfv0bcysdbc6nlh61x8z793aj2m0whi9"; + rev = "167311c6c270f1bbcf51d2181e4af578a34c1ce7"; + sha256 = "17bvizl9m1wdv3k6b289la5q56iy6b0bd96axlhb0ff10n48y29h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29811,15 +28945,36 @@ license = lib.licenses.free; }; }) {}; + grayscale-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "grayscale-theme"; + version = "20171005.102"; + src = fetchFromGitHub { + owner = "belak"; + repo = "emacs-grayscale-theme"; + rev = "53ad50e10e68f2f076ebfc96e10ecef7a932d38d"; + sha256 = "034pa35cjl07bhqdyw3xrcl97xcdg7jg0jvgn034fs3hssmsyxgv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2993881c7285cfbfc590b4118db46bfd435817bc/recipes/grayscale-theme"; + sha256 = "0jbzb1zxv5mg3pivii31d4kz75igm339nw4cmx9kgzia9zal5f1r"; + name = "grayscale-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/grayscale-theme"; + license = lib.licenses.free; + }; + }) {}; green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "20170828.1056"; + version = "20171005.1641"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "2b1011836fc04940d542e9a783b99670a08b308b"; - sha256 = "16v7l4ynj4p1hq243rqckfgppmj8cvm0lyybjjqaqblqjd1ki90d"; + rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122"; + sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -29895,25 +29050,6 @@ license = lib.licenses.free; }; }) {}; - grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "grep-plus"; - version = "20170223.728"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/grep+.el"; - sha256 = "0jx2r21x8ndikvn8zvdnmwg8al56yi9gb0fcmplc3lnq4my6xcjr"; - name = "grep+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+"; - sha256 = "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx"; - name = "grep-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/grep+"; - license = lib.licenses.free; - }; - }) {}; greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "greymatters-theme"; @@ -29999,12 +29135,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170828.1026"; + version = "20170928.728"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "36cd834c9fb1e438dfae4ad15a3580c963dba29f"; - sha256 = "0rkxchxjgpgbhng15knwxfv0bcysdbc6nlh61x8z793aj2m0whi9"; + rev = "167311c6c270f1bbcf51d2181e4af578a34c1ce7"; + sha256 = "17bvizl9m1wdv3k6b289la5q56iy6b0bd96axlhb0ff10n48y29h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -30062,12 +29198,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20170828.144"; + version = "20170923.2008"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "4e1c2616a31f33191daf20c0f9f744af5dd14468"; - sha256 = "1cgc8amxbj1839zx6vhpk96r1iag8mwnkdzd4wj6xabb59lvbjld"; + rev = "4241935d9cc786d0b4a3a445830c395f2a9eeb90"; + sha256 = "1x624xc2756pmb4h5ayls8r16zy33d9vxr0as4jm6q682h2swir6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -30104,12 +29240,12 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "20170713.1934"; + version = "20170913.1457"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b"; - sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522"; + rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c"; + sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -30209,12 +29345,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170902.1128"; + version = "20171005.137"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "54bd174b514c5de11e82c4263ac2723addb0fe87"; - sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2"; + rev = "6927d5afd2c4543bc97785d3f35e06a8b0fe86f3"; + sha256 = "1hyghwnnkl7fsq3wm7acp4ia7a7zp396wbmmyk3zw93lnpjhwkpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30314,12 +29450,12 @@ habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "habitica"; - version = "20170203.2122"; + version = "20170924.857"; src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "f3e326b7342953ffd5d3ced9266b46387b2bf9ce"; - sha256 = "0aixxlfp04vmipki7r7aqid2lsrzy7d38g09qc1hrjjdba7jrjlp"; + rev = "752bd376bcf1db563d503d554802aa0ff6e2c054"; + sha256 = "01g9kkfddn7lggbqw6s1vk3igbdjh0v6qslnlbp1llih8wa2vdlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -30377,12 +29513,12 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "20170829.1044"; + version = "20170930.1313"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "62442f76a0936047b5f66457298811c4f724a4f5"; - sha256 = "0pz3w726485yqww674ydrc3ffd0wrm9w0dgan0qyg3ggjj1fvjvs"; + rev = "520e8dca91b8c2bc1de852f577af46ed1b7cabcd"; + sha256 = "0951vb08sjpxx28cpaa8njirjw6fml60m91wa146cnxpngd68w6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -30482,12 +29618,12 @@ haml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haml-mode"; - version = "20170624.2148"; + version = "20170923.2153"; src = fetchFromGitHub { owner = "nex3"; repo = "haml-mode"; - rev = "c7c96a269f9b1a0302ff81360e1b5e693d784774"; - sha256 = "0lh9m0598rmwx9qacb6wjd12hf6njx7r1srl25bw60fs1l5bnvqd"; + rev = "1cbb2de8f0fc25f35448c5cad04642f28078f3bb"; + sha256 = "1045bf7bq914d3577kg9xakm4yciwwsvlh5qwfk4wnsraf7rld0r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode"; @@ -30796,12 +29932,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "20170901.154"; + version = "20170928.359"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "38a33e2ed02d57afb6b38bf36741f5bf7e38e45b"; - sha256 = "03zg58hrka2q7sqm3f14xgcs2mjxhlyybkf9w6pp8icr4wdsih4z"; + rev = "a3f890fb8570369898ee9718b128d4e7123a6585"; + sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -30960,25 +30096,6 @@ license = lib.licenses.free; }; }) {}; - header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "header2"; - version = "20170223.729"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/header2.el?revision=69"; - sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k"; - name = "header2.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/header2"; - sha256 = "1vvxb850njn921djvnf76q1p045sqr5hqk6v0p0amvjvih48v0zx"; - name = "header2"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/header2"; - license = lib.licenses.free; - }; - }) {}; headlong = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "headlong"; @@ -31003,12 +30120,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170912.523"; + version = "20171009.221"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "20fd1fdc80c05b1b2c03a9dd02f4a8358d2ed883"; - sha256 = "08rli1i3k1kvv7bavdb9s1y333cldxla9v0k3g7x72lyqncl25pr"; + rev = "8529bbd8a850bc0c212c38120621f2b2cc8a7656"; + sha256 = "1rav46bbw807cbv93ash7ah3azsxbrnnpcsfm14mmc9x3mmjygrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31234,12 +30351,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170808.1124"; + version = "20171003.131"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463"; - sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"; + rev = "299090ecb376ba269f2ffe547a672d210ddaceb3"; + sha256 = "07jym5zh07zksrn1f7x2j8m3agjzq06f9xchmiv7cic6x7b3shcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -31633,12 +30750,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170906.141"; + version = "20170929.2213"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "20fd1fdc80c05b1b2c03a9dd02f4a8358d2ed883"; - sha256 = "08rli1i3k1kvv7bavdb9s1y333cldxla9v0k3g7x72lyqncl25pr"; + rev = "8529bbd8a850bc0c212c38120621f2b2cc8a7656"; + sha256 = "1rav46bbw807cbv93ash7ah3azsxbrnnpcsfm14mmc9x3mmjygrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31948,12 +31065,12 @@ helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ext"; - version = "20170411.1049"; + version = "20170914.1348"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "helm-ext"; - rev = "fe50af14eebc9be72b026e823facfd0a80593248"; - sha256 = "1pz7i1byscfq2j73cfgcjqdx8s14h9qxnfmvs5g00m0y3g25hhc0"; + rev = "c2de41c4694ed606b321bcf83493dee93ad5635a"; + sha256 = "0bnnzf7pwg0qyx8hafgx6ckcc7n3pvf5j1qbipkzgnqmfqfli0n7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext"; @@ -32725,12 +31842,12 @@ helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-lastpass"; - version = "20170808.511"; + version = "20170914.142"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-lastpass"; - rev = "3d07a1d68586980ae33dd7f84be00eaace31f7d2"; - sha256 = "1rn19hql62fgz1kiyxyw11h3h9m38nnhba9sghlrxj3wk11fm8gs"; + rev = "ae5d1252d60450082a5c26af3ad2be43994201ec"; + sha256 = "0qlcy8g9m3mfnr6p7kax6i1bq0dsxpz22vy5zjp24farx96mj5mi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass"; @@ -32827,18 +31944,19 @@ license = lib.licenses.free; }; }) {}; - helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchsvn, fetchurl, helm, lib, melpaBuild }: + helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-svn"; version = "20150717.39"; - src = fetchsvn { - url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el"; - rev = "154482"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "helm-ls-svn"; + rev = "4d4dc1a272f27fba5fdd7cc47e5d309b53c63ae3"; sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/99cc183c09b97264d243b4fe036574ce9c6b9687/recipes/helm-ls-svn"; - sha256 = "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/helm-ls-svn"; + sha256 = "0rqsy6gk114khqr28bp2fi0ixaa8wbqd952yxph517p1pbfwxy66"; name = "helm-ls-svn"; }; packageRequires = [ cl-lib emacs helm ]; @@ -32850,12 +31968,12 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20170430.1053"; + version = "20171004.1018"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "8bb531fa77fe1259cccdc2fa7629d65989684f16"; - sha256 = "1vvdk2f41aqhcb8hawk0x17ix1fyanvx3m2zd398lhv3r6mll0r4"; + rev = "786104ac0c3cf4fe5b53f841eb9fe10bda2e4031"; + sha256 = "0qdfk0p2j8jah7m0ngy2mm7775cn779m3a84yll86wqc74g331qs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -32980,8 +32098,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; - sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; + rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; + sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options"; @@ -33249,12 +32367,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20170613.14"; + version = "20170926.1123"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "0e9ba276b3fbc420b8cbdc1b99262ccd5c750db7"; - sha256 = "155df7jyhjgqdks3ba1ca1k8w8aqka9vv3nhzpkvgz7wj84c95pq"; + rev = "4466adbcada8be19ec97b9dba52e12b8da3da849"; + sha256 = "1a4s3vs2vh2dz31an7jjrbyli1dsqwl7qcd1r63ak87klzpqn98b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -33547,8 +32665,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33669,12 +32787,12 @@ helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: melpaBuild { pname = "helm-smex"; - version = "20161202.1252"; + version = "20171004.1308"; src = fetchFromGitHub { owner = "ptrv"; repo = "helm-smex"; - rev = "7af4e4b44671f739b39584fc50c20084700701ac"; - sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni"; + rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413"; + sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex"; @@ -33774,12 +32892,12 @@ helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; - version = "20160619.953"; + version = "20170923.2127"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-swoop"; - rev = "6d3fdcfb6dea06242efc8ff4cafff9917e558bfc"; - sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72"; + rev = "66a951700e0ef0621cc705791bdd6699488ab121"; + sha256 = "1j1qmbj4g5z891i1xyz8p34mk63ckpl1j80pznbhvb9ffl9aw976"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; @@ -33900,12 +33018,12 @@ helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }: melpaBuild { pname = "helm-w3m"; - version = "20170904.711"; + version = "20170918.1017"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-w3m"; - rev = "57b8b0d3cad39abd02fab569ddd1c96336bbbad5"; - sha256 = "059jlyljlp5g7jh6bjdjd157l35apnwvxal1r18pipwfk1fcscxq"; + rev = "158f52abaa216cd64fc2c85f07722eceef508cec"; + sha256 = "1kvvgrfjpifrph1fgn4jvrhsrq8qq9z3w0ag9wjx5lb595svn4vh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m"; @@ -33939,27 +33057,6 @@ license = lib.licenses.free; }; }) {}; - helm-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "helm-words"; - version = "20150413.1318"; - src = fetchFromGitHub { - owner = "pronobis"; - repo = "helm-words"; - rev = "637aa3a7e9cfd34e0127472c5b1f993a4da26185"; - sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c5b91762d47a4d3024f1ed7f19666c6f2d5ce5/recipes/helm-words"; - sha256 = "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76"; - name = "helm-words"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/helm-words"; - license = lib.licenses.free; - }; - }) {}; helm-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-xcdoc"; @@ -34044,72 +33141,15 @@ license = lib.licenses.free; }; }) {}; - help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "help-fns-plus"; - version = "20170223.733"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/help-fns+.el"; - sha256 = "0n7sdzvplcb0zivpjq9x75kaid59yxr7sl85w7z99irx3kgpy9y4"; - name = "help-fns+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+"; - sha256 = "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia"; - name = "help-fns-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/help-fns+"; - license = lib.licenses.free; - }; - }) {}; - help-mode-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "help-mode-plus"; - version = "20170223.737"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/help-mode+.el"; - sha256 = "00yx1rhp7akap63c3nqh766zkjvfarmvm0xvza40i167wc7xmydg"; - name = "help-mode+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-mode+"; - sha256 = "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra"; - name = "help-mode-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/help-mode+"; - license = lib.licenses.free; - }; - }) {}; - help-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "help-plus"; - version = "20170223.731"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/help+.el"; - sha256 = "0zypqsj940cmb8szbk5acv47kaj3czg6yplx1lg5dynhvab3p29f"; - name = "help+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help+"; - sha256 = "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi"; - name = "help-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/help+"; - license = lib.licenses.free; - }; - }) {}; helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "20170910.1046"; + version = "20171008.1448"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "62ede4c121c0a0a9917682f28adf746e21bbfa45"; - sha256 = "1kp61f18l0ll9k1r72id2xgfdc857d5qhhh5pamp5ps6kjfpz6h6"; + rev = "aec98ee3c44c911936a309b56510384b8e835ff2"; + sha256 = "1x2f34bpzlckiyn2ndknm5gmra8xginsnavjqs4dn6n0knbcrq32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -34122,6 +33162,27 @@ license = lib.licenses.free; }; }) {}; + hemera-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hemera-theme"; + version = "20170910.603"; + src = fetchFromGitHub { + owner = "GuidoSchmidt"; + repo = "emacs-hemera-theme"; + rev = "354ae3b788c11ac08e6e2fe7c86adc621e2b16fd"; + sha256 = "00cfi9gsn9fvjpgxkz931p02gs8dcgwwsaqz3anss9qadxxmi9xv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/hemera-theme"; + sha256 = "0lxm06gv5f75s86320m8wh3dirdcspb6zd5n1a6l0pnn585xqkrn"; + name = "hemera-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hemera-theme"; + license = lib.licenses.free; + }; + }) {}; hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hemisu-theme"; @@ -34206,25 +33267,6 @@ license = lib.licenses.free; }; }) {}; - hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hexrgb"; - version = "20170304.1213"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hexrgb.el?revision=75"; - sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy"; - name = "hexrgb.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hexrgb"; - sha256 = "0b8lzmyv91f5bg7n2wj50p1pv6hpd2wygjcrffg4wwa52lp24dzk"; - name = "hexrgb"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hexrgb"; - license = lib.licenses.free; - }; - }) {}; hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hfst-mode"; @@ -34309,25 +33351,6 @@ license = lib.licenses.free; }; }) {}; - hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hide-comnt"; - version = "20170223.739"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hide-comnt.el?revision=25"; - sha256 = "1shkq45vm60nh2kkvf284nck8jwxh7f7m4c5d53k66mxn214h53m"; - name = "hide-comnt.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hide-comnt"; - sha256 = "0l3qvklyyc6hfinlzif7vfspl8b91ql0qdiwhixcilglyvad8r80"; - name = "hide-comnt"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hide-comnt"; - license = lib.licenses.free; - }; - }) {}; hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hide-lines"; @@ -34349,25 +33372,6 @@ license = lib.licenses.free; }; }) {}; - hide-region = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hide-region"; - version = "20140201.314"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hide-region.el?revision=6"; - sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval"; - name = "hide-region.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fc294a4d0cfa74530c98d81149fd0501ea7efe/recipes/hide-region"; - sha256 = "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm"; - name = "hide-region"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hide-region"; - license = lib.licenses.free; - }; - }) {}; hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hideshow-org"; @@ -34389,25 +33393,6 @@ license = lib.licenses.free; }; }) {}; - hideshowvis = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hideshowvis"; - version = "20170227.1250"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hideshowvis.el?revision=10"; - sha256 = "02a6v2m54r5nfbi54h1502aqh7gnz827pfi1sq266qyzj3p6yz12"; - name = "hideshowvis.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/881fd07512c417c0b98021af2a2c26eac4268a5f/recipes/hideshowvis"; - sha256 = "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f"; - name = "hideshowvis"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hideshowvis"; - license = lib.licenses.free; - }; - }) {}; hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; @@ -34429,25 +33414,6 @@ license = lib.licenses.free; }; }) {}; - highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "highlight"; - version = "20170702.732"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=149"; - sha256 = "0kh72fmqsha25rz0g3ff983badh20clsig7blrhvl8c4bv3sqs56"; - name = "highlight.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight"; - sha256 = "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0"; - 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"; @@ -34469,44 +33435,6 @@ license = lib.licenses.free; }; }) {}; - highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "highlight-chars"; - version = "20170223.740"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-chars.el?revision=18"; - sha256 = "00rna5bs0ilgsdi5168djjpb3hg89yq20pp17sx5r3jcksm2fm4f"; - name = "highlight-chars.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars"; - sha256 = "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0"; - name = "highlight-chars"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/highlight-chars"; - license = lib.licenses.free; - }; - }) {}; - highlight-cl = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "highlight-cl"; - version = "20091012.1030"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-cl.el?revision=3"; - sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw"; - name = "highlight-cl.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc85d7fd8e4d7381850f4a379140c64506f86e8/recipes/highlight-cl"; - sha256 = "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w"; - name = "highlight-cl"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/highlight-cl"; - license = lib.licenses.free; - }; - }) {}; highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-context-line"; @@ -34528,26 +33456,6 @@ license = lib.licenses.free; }; }) {}; - highlight-current-line = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "highlight-current-line"; - version = "20051013.1056"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-current-line.el?revision=4"; - sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c"; - name = "highlight-current-line.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2768ed5917ec2e2339412d8fbd146ca5a8a5042/recipes/highlight-current-line"; - sha256 = "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973"; - name = "highlight-current-line"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/highlight-current-line"; - license = lib.licenses.free; - }; - }) {}; highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-defined"; @@ -34820,34 +33728,15 @@ license = lib.licenses.free; }; }) {}; - highlight-tail = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "highlight-tail"; - version = "20140415.1841"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-tail.el?revision=5"; - sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg"; - name = "highlight-tail.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d033ff8cceb7e6d1e5a9f0ec7b706eb28bfe30f3/recipes/highlight-tail"; - sha256 = "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws"; - name = "highlight-tail"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/highlight-tail"; - license = lib.licenses.free; - }; - }) {}; highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-thing"; - version = "20170207.2239"; + version = "20170919.704"; src = fetchFromGitHub { owner = "fgeller"; repo = "highlight-thing.el"; - rev = "c998172704ac4b96147d862a0eb4a0f97deb5e0a"; - sha256 = "0s441ya0fcw7sv1ah13dh0b0m2rcvf68a442knvnf06a07hpr5sr"; + rev = "4eadd178175772fb04ae50e1199d797a6375ad4d"; + sha256 = "1h2ka1fi0pdh0mx3z8sh4fvwyiyc18d56nl9wd4c96h3n93f7py0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84b6cb403ff9a588771d051e472596f4e3cc974d/recipes/highlight-thing"; @@ -34930,8 +33819,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "dde17a134ae99bd3c6e9b98ed04ad1740c2cd00b"; - sha256 = "1piyzinjz0khfpl96rgxg0f5yy4han16zqj7lcjd9xfzdx9rg4yg"; + rev = "4556ff94e6ed35eabdd28a061a07aadf436f0daf"; + sha256 = "1w5hwy1lszwcgqz43hw2mq95v6qm6ghxrzgrrw9p3cj2c4cz0kis"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -35133,25 +34022,6 @@ license = lib.licenses.free; }; }) {}; - hl-defined = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hl-defined"; - version = "20170223.744"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hl-defined.el?revision=9"; - sha256 = "0sj1ypfawb1pxblm11zbfyy96f2mbpnmif972yqfrxzf5h20ra1y"; - name = "hl-defined.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hl-defined"; - sha256 = "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx"; - name = "hl-defined"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-defined"; - license = lib.licenses.free; - }; - }) {}; hl-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-indent"; @@ -35173,34 +34043,15 @@ license = lib.licenses.free; }; }) {}; - hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hl-line-plus"; - version = "20170621.734"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hl-line+.el"; - sha256 = "03bgx651nrnwqbclbfaabkw4h2iaiswnndqgms0w6lp3jjfc10wc"; - name = "hl-line+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-line+"; - sha256 = "16wlvi97wfkj36rnkbhzsky7sib3b76r2ng0lizp7ncr8d0vvhfv"; - name = "hl-line-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-line+"; - license = lib.licenses.free; - }; - }) {}; hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-sentence"; - version = "20170812.646"; + version = "20171007.755"; src = fetchFromGitHub { owner = "milkypostman"; repo = "hl-sentence"; - rev = "1235ec94af083c3e43559ce0cac6db485aa938e0"; - sha256 = "1b58d79pkakfz2l31lg8nfkb1dfzrnbw4p5cs8mlxpfa5j4z13af"; + rev = "10cead52cb4da5dccfe30ba6756c11973d8ea094"; + sha256 = "1kl38jzgws5mw67yzg4055988sza36sdd8bq1dw68p9wi6kqpdqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence"; @@ -35234,25 +34085,6 @@ license = lib.licenses.free; }; }) {}; - hl-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hl-spotlight"; - version = "20170223.746"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el?revision=15"; - sha256 = "02x7p6hy1mkhbish55mzsdp6a1pnsdcfl4qi9cq48syg6cfm8fw3"; - name = "hl-spotlight.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/adb008d2da35dbd3fca63555f04dd8a0009380c6/recipes/hl-spotlight"; - sha256 = "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3"; - name = "hl-spotlight"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-spotlight"; - license = lib.licenses.free; - }; - }) {}; hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; @@ -35277,12 +34109,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170807.1130"; + version = "20171003.647"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "fb314edbb193a1c640ae8f13c0373c7de26e2c8e"; - sha256 = "1gq6f1dhfwsm1xk5952nxv8j67bz230pnswf9s1zp21drxwgdk20"; + rev = "588c6a2df2ff4b8f77df49894808cf4ad3de6cad"; + sha256 = "18hjnha1imqiygydbbwwfldp0wvfhf02ffzhzd967nq6gvl0vzdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -35657,8 +34489,8 @@ src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "88e2cb6588827893d7bc619529393887c264d15a"; - sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n"; + rev = "1f7bd7290e4698ac0b26b911fde7727fcb609bc7"; + sha256 = "1cy1100qzdpkk7kcr54262jgc4zl9jqn66v51g72kmhc90ayj8bh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -35842,12 +34674,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20170908.922"; + version = "20171008.1642"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "d44dce8475cd1e8d14a533c604c3c32fcdcd4a9f"; - sha256 = "19zv3xj4lzwv9vvlqsnn4nqxjhnq1hvl81qin1kr7z6bmhmidhns"; + rev = "6d45ce89f26efe7ed0652415d2e999e5afcc5802"; + sha256 = "0ycn3gn442ap6gc1z9snbmmlrwd97rsf10cr3agf1z3xhzz2jycn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35926,12 +34758,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20170903.218"; + version = "20170924.2259"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "b12d37ac00d4f677b7684ed1af7d04d996167dbb"; - sha256 = "1aw0zca0xrqig7pj5gqfsrz8cblplb4ljh7k3k1hqsl1wpxav9kg"; + rev = "df3025f7e3cf3899168ae8ced1e9b734df2b32a0"; + sha256 = "1sbj699956vxbzbdagw5hbx168sx9cfrc5vx6m6s89v2rkq8fw8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -36110,44 +34942,6 @@ license = lib.licenses.free; }; }) {}; - icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "icicles"; - version = "20170910.1711"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1089"; - sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; - name = "icicles.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles"; - sha256 = "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92"; - name = "icicles"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/icicles"; - license = lib.licenses.free; - }; - }) {}; - icomplete-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "icomplete-plus"; - version = "20170303.1456"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/icomplete+.el"; - sha256 = "00wy0jqk6jdfh9izdpqq4y6x2x8q1m38sy6nb4ygfg3055lbhkam"; - name = "icomplete+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+"; - sha256 = "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx"; - name = "icomplete-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/icomplete+"; - license = lib.licenses.free; - }; - }) {}; id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "id-manager"; @@ -36319,12 +35113,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20170819.1045"; + version = "20170820.3"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1"; - sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3"; + rev = "e2ea358725f03ae623ae03ed90715efb92a61030"; + sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -36631,22 +35425,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 = "20170819.1045"; + version = "20170923.842"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1"; - sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3"; + rev = "e2ea358725f03ae623ae03ed90715efb92a61030"; + sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn"; }; 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; @@ -36760,12 +35554,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20170909.423"; + version = "20170916.1024"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "796ee5298dd3f4b7c51fbbcd9510a8631c5cbb4b"; - sha256 = "0k70i4k8rrgcj3cl6k4nki3k55fsd4yz8fnwaazhckjr6pvrwz8w"; + rev = "5b14cc9fcaef509c50f25cff872fba5d70b2c799"; + sha256 = "1vlfqh616id2kh35diwig6jswq5q5z22zwrpbdxkginag3sq8732"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; @@ -36841,25 +35635,6 @@ license = lib.licenses.free; }; }) {}; - igrep = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "igrep"; - version = "20130824.507"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/igrep.el?revision=10"; - sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29"; - name = "igrep.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/83c05578974289527082bb67338c35e70bbff8f2/recipes/igrep"; - sha256 = "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3"; - name = "igrep"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/igrep"; - license = lib.licenses.free; - }; - }) {}; igv = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "igv"; version = "20141210.427"; @@ -36963,6 +35738,27 @@ license = lib.licenses.free; }; }) {}; + imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "imake"; + version = "20171006.450"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "imake"; + rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca"; + sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake"; + sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34"; + name = "imake"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/imake"; + license = lib.licenses.free; + }; + }) {}; imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; @@ -37026,25 +35822,6 @@ license = lib.licenses.free; }; }) {}; - imenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "imenu-plus"; - version = "20170303.1457"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/imenu+.el"; - sha256 = "0dga9a61ckvd8w4nnz9z8z0iakaxminwn0lgmf8vfj2nwkd0m6hb"; - name = "imenu+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/imenu+"; - sha256 = "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d"; - name = "imenu-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/imenu+"; - license = lib.licenses.free; - }; - }) {}; imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenus"; @@ -37275,30 +36052,22 @@ license = lib.licenses.free; }; }) {}; - indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }: + indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, sourcemap, websocket }: melpaBuild { pname = "indium"; - version = "20170829.637"; + version = "20171009.444"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "d98a9e0cd11d8230c4c3d0b59c4ac60520e34ebb"; - sha256 = "1q3yf45fmbjppv3ahb1gdb95pa3kyn18x5m23ihpxz1pziz3a074"; + rev = "261f3a8f4ce7edb8fb04457896fe747013a926b5"; + sha256 = "1yikx5b6yy138aplzpdxda5pssnchbkpp1xr9lsl869vi4q25igi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; name = "indium"; }; - packageRequires = [ - company - emacs - js2-mode - memoize - seq - sourcemap - websocket - ]; + packageRequires = [ company emacs js2-mode seq sourcemap websocket ]; meta = { homepage = "https://melpa.org/#/indium"; license = lib.licenses.free; @@ -37328,12 +36097,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170910.30"; + version = "20171005.1130"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "864356a543cac50b24c67901d1d04c4e6160070a"; - sha256 = "07z131rxmwz3gwdy40qczz4is20jqdjylky7rsrxij5da3g017si"; + rev = "b048358406c24f5f22a3fc51c0a1348236bcfde1"; + sha256 = "0hw8981pi5xkcvs5023nj91vjq3agdlqabinmrrl0mj4wfh2q32q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -37451,25 +36220,6 @@ license = lib.licenses.free; }; }) {}; - info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "info-plus"; - version = "20170830.1104"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0zxcqcd53fr0rf1s2fhax2a8kymk2mvg7vf7k92g8afvm888jnzj"; - name = "info+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; - sha256 = "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr"; - name = "info-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/info+"; - license = lib.licenses.free; - }; - }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -37787,12 +36537,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20170630.22"; + version = "20171003.2324"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "2c0458038bf0440f271f6e000039027be411eba7"; - sha256 = "0rpw1ms80hr01s76av8cvid4gvkd3sapx0c3g3a05za0bq1jqacw"; + rev = "87549df30cbc681baf86b238bd14c7cf7ec11fc4"; + sha256 = "07430hsyq9q90rjzxq7ifq4mlfc8k8b7l6b31s7xk1xm2snbky6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -37808,12 +36558,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170912.648"; + version = "20170926.911"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "7176857391c064e1f16a4f9fd0a51775cfedd42b"; - sha256 = "10w2jgr4nq2iff9jlk2kjbjf3hpbhlwgjvnnpvxnrkz4y4ap0bdi"; + rev = "2d3c04ce523674e79f9339189a79e6841e1fa587"; + sha256 = "1dgdbfxhhcda7hn9njvsjygn59rdx9wv9cgpj3aysll52zri8lh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37976,12 +36726,12 @@ ipcalc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ipcalc"; - version = "20160927.220"; + version = "20170926.105"; src = fetchFromGitHub { owner = "dotemacs"; repo = "ipcalc.el"; - rev = "e92afd8b96592b6e2d65ba073bf87c9dd2408e91"; - sha256 = "1s17wpdbrbkbmkndbwm0byy11cmymhs6yn7w0v5lvw5l2cgicxjg"; + rev = "2720f7e3e662e04e195f8338b81a499cf321296a"; + sha256 = "1kmqbb9ca3sca59462ha21grbgxkl4wynz2lr4yqb4qk7cijgd6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ipcalc"; @@ -38099,34 +36849,15 @@ license = lib.licenses.free; }; }) {}; - irfc = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "irfc"; - version = "20130824.507"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/irfc.el?revision=45"; - sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca"; - name = "irfc.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0b4f2dc79231b165bd3b03a728e2b872ed6c50c1/recipes/irfc"; - sha256 = "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i"; - name = "irfc"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/irfc"; - license = lib.licenses.free; - }; - }) {}; irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20170905.1316"; + version = "20171002.1130"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "72e1e73f3c9da2ad04286e13bfc8fc401626b7a9"; - sha256 = "155wvzsmhb8vz30jcd3xj91z74268pq7szax7jwd725ndx6x7ny8"; + rev = "a571167eca2533343f523f0c9ee3886de2d7b917"; + sha256 = "1jh2w800dgadmc1xgxrhmbs8i7bz4xh0h5bdrambnwl173ca23pf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -38181,44 +36912,6 @@ license = lib.licenses.free; }; }) {}; - isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "isearch-plus"; - version = "20170723.1826"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "0d7xsr71iadqzg81mv17dqyd0bdzkmljxlrpdlpycjyaf3z59aqr"; - name = "isearch+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/isearch+"; - sha256 = "0n9jh3bx2h6k4mvbwss16m34fxzlq6sb057rj16hgrlmbqknynhw"; - name = "isearch-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/isearch+"; - license = lib.licenses.free; - }; - }) {}; - isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "isearch-prop"; - version = "20170303.1504"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/isearch-prop.el?revision=79"; - sha256 = "0q18i76gq2pfnkqlbxlx2hndpy9mhbag302dvr8irk1kjwgngz5r"; - name = "isearch-prop.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop"; - sha256 = "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9"; - name = "isearch-prop"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/isearch-prop"; - license = lib.licenses.free; - }; - }) {}; isearch-symbol-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-symbol-at-point"; @@ -38432,12 +37125,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170911.1034"; + version = "20171007.224"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "0a1d361b926291874124f8c63a653d83ead64a36"; - sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; + rev = "6827edffb70890f2e94c3d146ed129bde581992d"; + sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38453,12 +37146,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170808.1124"; + version = "20171003.131"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463"; - sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"; + rev = "299090ecb376ba269f2ffe547a672d210ddaceb3"; + sha256 = "07jym5zh07zksrn1f7x2j8m3agjzq06f9xchmiv7cic6x7b3shcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -38562,8 +37255,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "0a1d361b926291874124f8c63a653d83ead64a36"; - sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; + rev = "6827edffb70890f2e94c3d146ed129bde581992d"; + sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38688,8 +37381,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39060,12 +37753,12 @@ java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: melpaBuild { pname = "java-imports"; - version = "20160311.1515"; + version = "20170913.710"; src = fetchFromGitHub { owner = "dakrone"; repo = "emacs-java-imports"; - rev = "f1631adacdd9fcb7a92ee4fdfb9e592a1a9c3b0b"; - sha256 = "1wk9i43b147bjcvhq27vcqxi6y1yl6w3n4i2sw3krk4vxcm1mwnm"; + rev = "e96ff44ed48b362ab6227b8b802b84d84f78bcaa"; + sha256 = "0nryawj8v6gj6hnb81yf6966kjnydcz49zsg2k355gldryqf4v5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f6f4e4c14c422c2066f2200bb9b8f35e2ecc896/recipes/java-imports"; @@ -39225,22 +37918,22 @@ license = lib.licenses.free; }; }) {}; - jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: + jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }: melpaBuild { pname = "jdee"; - version = "20170506.1514"; + version = "20171007.835"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "e572d4889604c0b4e1d9180b8a68f9c0f99b99d2"; - sha256 = "1vhwza7xak2im2xp7qzs8b6bmnf9yw2di86rav8wh5xapqr8x7mn"; + rev = "ebe5d2e36a6a367376ed6cde590d5f805830ec9e"; + sha256 = "0rq8vp3pmnyabqzzplc91dk2ka48k809is9v4q486xv7y43013jh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4"; name = "jdee"; }; - packageRequires = [ dash emacs flycheck memoize ]; + packageRequires = [ dash emacs flycheck memoize s ]; meta = { homepage = "https://melpa.org/#/jdee"; license = lib.licenses.free; @@ -39435,25 +38128,6 @@ license = lib.licenses.free; }; }) {}; - jira = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "jira"; - version = "20131210.1022"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/jira.el?revision=11"; - sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz"; - name = "jira.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jira"; - sha256 = "1zrywkwzqn5ffzzk3rmy01vj6afm2p9gm81rpc7s86cj3ywfy4wx"; - name = "jira"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/jira"; - license = lib.licenses.free; - }; - }) {}; jira-markup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jira-markup-mode"; @@ -39751,12 +38425,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170815.1415"; + version = "20170930.820"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "df51992a648c7fb3e441106defdbffa2ef2f020d"; - sha256 = "08k0szwbwsgx2q1qm356f88jif36yqz8lnpylib24jy2plx24j5s"; + rev = "5cb52a7de8218bb2d50f67ba422fa7b2d51d1dc6"; + sha256 = "1b4kq8qix2lqhcqabbyhl3rzm99dzjspqqs6srgsgwvb9726q25f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -39958,6 +38632,27 @@ license = lib.licenses.free; }; }) {}; + jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jsonnet-mode"; + version = "20171005.24"; + src = fetchFromGitHub { + owner = "mgyucht"; + repo = "jsonnet-mode"; + rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1"; + sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode"; + sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia"; + name = "jsonnet-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/jsonnet-mode"; + license = lib.licenses.free; + }; + }) {}; jss = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, websocket }: melpaBuild { pname = "jss"; @@ -40043,12 +38738,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20170710.538"; + version = "20170916.628"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "edaaff2e971a527460f838bebc0ef679f9a571b0"; - sha256 = "1sm57dq58fjbjjprl1bf7vibrvp6v5m4ipiq7r73c2bdg8rmaapm"; + rev = "115d4dc8a07445301772da8376b232fa8c7168f4"; + sha256 = "1is4dcv6blslpzbjcg8l2jpxi8xj96q4cm0nxjxsyswpm8bw8ki0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -40064,12 +38759,12 @@ julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-repl"; - version = "20170708.2324"; + version = "20171005.123"; src = fetchFromGitHub { owner = "tpapp"; repo = "julia-repl"; - rev = "93b9d515e6f5fbacd42069a2ae6da3bd80b7c4d0"; - sha256 = "1xpdr343b5qa1pb92d5nz0m9lswq2s8nzg46msjnb1dvihqyb27w"; + rev = "2c5d681ddd3bc6018c394f797cb01add805ed573"; + sha256 = "0l8asipch5pfk90jzifw0jxwhsfq9kam8msxlxscvhfj7wphc038"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; @@ -40316,12 +39011,12 @@ kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kakapo-mode"; - version = "20160727.2136"; + version = "20171003.2151"; src = fetchFromGitHub { owner = "listx"; repo = "kakapo-mode"; - rev = "bb6de027fb578df31652e58daa92522884ecc274"; - sha256 = "1y6ihk52jza07krz24l9axkwhi46fwi4h6bcjdck9q1qvdrcxw40"; + rev = "67d516138172fd60782df94454b3d0bd247e84f3"; + sha256 = "0r2n410arr48skcwm39c6mjhzsia117lb8xd7pc4854y0rbrvrvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode"; @@ -40419,16 +39114,16 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170905.1243"; + version = "20171008.451"; src = fetchFromGitHub { - owner = "0rdy"; + owner = "ogdenwebb"; repo = "kaolin-theme"; - rev = "7bf265de58fe412d7f445ee84c460e6b90d7e0cf"; - sha256 = "1zd8vgg54hj8jycixh3vr34pf8grb02hhk10y1xh0ddpxw3mpb1s"; + rev = "bd105da4115d3685f14b511dbc975b22a1c94483"; + sha256 = "1iz288qygwcsz2gmnbcp9l92hbqvn27vkk07ik4bxgziksxyf2l4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; - sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; + sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c"; name = "kaolin-theme"; }; packageRequires = [ emacs ]; @@ -40927,8 +39622,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "f32bb16e5b477f5b54f3dc23ff048b490e906590"; - sha256 = "05lr10wnwghzsi59y7spy8a2jps11dmpm7wndzaj62nkx0d09a73"; + rev = "fed61946603baf381404ae74009f742ab277d848"; + sha256 = "1gxav0a4934z53sdkfa4wllzcfc5cnz66xcjayrzb17g1dxr3yzj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40944,12 +39639,12 @@ kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kiwix"; - version = "20170508.1802"; + version = "20170927.120"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "a62f9e7c17ab34b183b36ae63408123a75689a5b"; - sha256 = "0v86haw2nfd7q4yylzd0ls6916l95960c15khjnv1cfyshhri5q7"; + rev = "86dbead6c0017beefd92a0b64a0bb5f5d12c5b16"; + sha256 = "142mm1wy8zvlkzairnc1rjdi1lsq1asfk4zdbs1aria1nxz1sx6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix"; @@ -41007,12 +39702,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20170818.2206"; + version = "20171008.2226"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "a032d13a3f39f260d7d00d62f32dce0f8a5927ab"; - sha256 = "0c883yprblda22jq3jjdz9nd6ha6dbwfn6n8y448qln8dzj9sd7p"; + rev = "479075d96857696cf029cd1f482b9f2f31d82452"; + sha256 = "0kvx43ny49j115kj6zpy1i5g87bjgiimfgj9xp2fn9830adymc24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -41133,12 +39828,12 @@ kpm-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kpm-list"; - version = "20160310.1050"; + version = "20170924.652"; src = fetchFromGitHub { owner = "KMahoney"; repo = "kpm-list"; - rev = "6fb7db35f7dac7fb8f956c67ee2eea9d3fa54034"; - sha256 = "0hbzr5x9ykzrbwzfsf6rc4pbiw9m59ny3cgcx26nbi6ijbjl2fxj"; + rev = "e0f5112e5ce8ec1b603f4428fa51681c68bb28f5"; + sha256 = "1achcr3v0d85narnxqpbfxy9qfk537kl83wiq5lyfy3lwqqf7dmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b7065d016e2da49277b165edf565bef5819d483/recipes/kpm-list"; @@ -41319,25 +40014,6 @@ license = lib.licenses.free; }; }) {}; - lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "lacarte"; - version = "20170307.837"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lacarte.el?revision=41"; - sha256 = "0m3swrvxz0cy01pd4kag626fxqp4l2zzwpgr26yp5wpsfxl9avv8"; - name = "lacarte.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lacarte"; - sha256 = "07rxgjax6ms0knjj5qplfy0hxzfhs6iqk4ny43566zzqv86n0bhi"; - name = "lacarte"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/lacarte"; - license = lib.licenses.free; - }; - }) {}; lang-refactor-perl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lang-refactor-perl"; @@ -41383,12 +40059,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "20170606.432"; + version = "20170917.2154"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "d976e4f0cadb2309b798540429558936f8f45889"; - sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh"; + rev = "bae4bdd240583b2253b4ff03af5295146e285103"; + sha256 = "0zwaddpmvkq7v5nnyzacmx0ql5zjlisvkqwa2knw3pihngr160cd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -41928,12 +40604,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20170907.413"; + version = "20170919.252"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "b6889c336fc4f046138334ed700c5c9a13e39992"; - sha256 = "0j8d6h61nvz2gpkbf73v246srjg6wm93giijc7f0rks9g0nlp1rc"; + rev = "9d31a9d4ed763d6309e9d44985cd8b4a5a2fb500"; + sha256 = "0vr535a32cgkna0h1z8ac9cb4al3jb01bybn956rz51qdbzm2d1h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -41995,8 +40671,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "71d8e5bafc59424bacd23c8af4b368d5a6db686c"; - sha256 = "1wdxi1fbhw6k4dyq91vg7j33hcxjbhb1ydb5qaq292iach525wrq"; + rev = "2880c8a2a7fe998238b6490fe3e3c484b5c5985e"; + sha256 = "1xcnh1hk815wizhp7h1mik3npm7zpbvg4554nwbj072gnbb9j1nx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -42009,25 +40685,6 @@ license = lib.licenses.free; }; }) {}; - lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "lib-requires"; - version = "20170307.855"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lib-requires.el?revision=53"; - sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv"; - name = "lib-requires.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lib-requires"; - sha256 = "1a69qf9dlsq5r7nm32hd0srzka7crd08gl82w8hjfvdhn43n2h0c"; - name = "lib-requires"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/lib-requires"; - license = lib.licenses.free; - }; - }) {}; libmpdee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "libmpdee"; @@ -42136,12 +40793,12 @@ link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link-hint"; - version = "20170904.1442"; + version = "20170923.855"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "366bce32f8cb1aa5f0f1ce4eceb4d60cc802abd6"; - sha256 = "09k1cz3l2ql2fdn3kx43q3bjlwqcz67fw2as6m59951lyd8fnmxp"; + rev = "0294df85aee10b47fcf6c2c9bfe7e1038660fa21"; + sha256 = "0ixfrp6pfljgy5ja79cka0fa6a9ganwhh5myz6czqj4ykjzlyi2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; @@ -42288,34 +40945,15 @@ license = lib.licenses.free; }; }) {}; - lispxmp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "lispxmp"; - version = "20170110.1508"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lispxmp.el?revision=17"; - sha256 = "120wgxvckrgryfg2lvyx60rkcayii0g4ny2cdk3aiwsrpqcyhlyr"; - name = "lispxmp.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc8f86533402e4be8bac87ad66bc8d51c8d40f8/recipes/lispxmp"; - sha256 = "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4"; - 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 = "20170911.1138"; + version = "20171007.209"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "134d815c843813950cbffc4516cabafd8ae75ed4"; - sha256 = "1xw8j3hjahp6vl3qnfab0kyl20zxclnbfpy9x1zp344zic61n02m"; + rev = "7de90475f922ea1ec757c16bc96d704b2d876198"; + sha256 = "13rx0ywbcplnh6swkmzq5ypd8a9ymd4w198pkl97cw5s6vzskh62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -42412,26 +41050,6 @@ license = lib.licenses.free; }; }) {}; - list-processes-plus = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "list-processes-plus"; - version = "20131117.1135"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/list-processes+.el"; - sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a"; - name = "list-processes+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d508d50d89c914c53211197afc758fc0e1154081/recipes/list-processes+"; - sha256 = "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky"; - name = "list-processes-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/list-processes+"; - license = lib.licenses.free; - }; - }) {}; list-register = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "list-register"; @@ -42523,8 +41141,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "litable"; - rev = "4a57d7aeddca76448e4df2a46b42d49253e5e625"; - sha256 = "1zryrc0d2avb27w6a6yzqcc73rsr2rp795vi10qhb04ixda4a8w4"; + rev = "90a2dca14a6da9b24fe332a65cff899ab4a90810"; + sha256 = "1xaixgjfpnqnsdkhfia107fq5xaq2l0gdb0zp730z97958136mm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74f2190b653907985e49a96ded986ab11b4946d7/recipes/litable"; @@ -42645,12 +41263,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170906.2104"; + version = "20170928.2107"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "4d972a859e6a56d969b075688b425ac246b40962"; - sha256 = "0qzg5i9x9f5skp2bk5avxw30nhs44z4didk69prli6p6sfd4bgqg"; + rev = "619a1b35b9a8151703421e2716ea0409162a4b84"; + sha256 = "0dakcsdn6pax0q6wdvg23fg327nk35z3lzk2vlvc76780d0fi85h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -42666,12 +41284,12 @@ lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lively"; - version = "20170820.407"; + version = "20171005.54"; src = fetchFromGitHub { owner = "purcell"; repo = "lively"; - rev = "49cf43815c04f0b84d20b527f5d712544a13a4db"; - sha256 = "02in5dj50c82h2bb7l47b00w3hpn3c2788aiyq2bln06vpj1qq4n"; + rev = "348675828c6a81bfa1ac311ca465aad813542c1b"; + sha256 = "1j8w63hhk1wcxcfqz0wimqijp7p1m8a2n947gwqv8nk1wm40aqg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively"; @@ -42753,8 +41371,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "ae7945dc893db824632135ea16929e14ca185595"; - sha256 = "0vsj8i29qkfl2a6fsdplzdh2kb9vrc2rkbbh7hak81ngn19q41l8"; + rev = "f7ceddc7e61d486863a6bf9ddcf74bb87fd1b977"; + sha256 = "1v0wwdg57l613s5zd47wri75pgbwh6n401q64mnyj8frfb2670j0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -43020,12 +41638,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170705.1217"; + version = "20170928.820"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "134b41557ab539219d9e3a1b3c8939df93676726"; - sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; + rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f"; + sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -43188,12 +41806,12 @@ lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-haskell"; - version = "20170814.1358"; + version = "20170919.626"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "7c4caf7f87392146203ecd0616a059280deecd15"; - sha256 = "1i5rpmz8kzcjgxwvy1g3mlxd4y1bnnjzlk6j2sz4i7c75g2aprn4"; + rev = "a749bd017c293a7231639f75f024ee922f44818a"; + sha256 = "1yynwf0m0mkm0xxbj3sgy0zhkxzfw1qhwyvfq5fcgpqw59xfps6w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -43227,15 +41845,36 @@ license = lib.licenses.free; }; }) {}; + lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-javacomp"; + version = "20171005.659"; + src = fetchFromGitHub { + owner = "tigersoldier"; + repo = "lsp-javacomp"; + rev = "e45ac9ac18375d63fc068cbb466ed580ccd9476a"; + sha256 = "0hpidswz1rfy8fmjw3m6jxhl4p9134521nj7fana5x3dl3v5c9kh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; + sha256 = "1gp8dlcpik2lmpicccq2kya498pmw9m8vz9m1fbd725p7wk58fhi"; + name = "lsp-javacomp"; + }; + packageRequires = [ emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-javacomp"; + license = lib.licenses.free; + }; + }) {}; lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170905.1130"; + version = "20171005.946"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "d69692651742b65398b4c1f9ee06d1670d9443d0"; - sha256 = "1f09shdirq81c37sg2hdgj1wqqvwmg5m7bkprz28fych76xi8jgr"; + rev = "252396b8631c5f6d5fc4725e9430feebe408568b"; + sha256 = "0hbhv6ch23z2wyigsq3270x07kqr7j2kxz254ps6ym67dr3kka4x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -43500,25 +42139,6 @@ license = lib.licenses.free; }; }) {}; - macros-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "macros-plus"; - version = "20170307.842"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/macros+.el"; - sha256 = "0x9fycqw234s1i0ndy7v0d7vn654id245pi0kwphbqgnga7w3l6p"; - name = "macros+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/macros+"; - sha256 = "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi"; - name = "macros-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/macros+"; - license = lib.licenses.free; - }; - }) {}; macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "macrostep"; @@ -43627,12 +42247,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170913.343"; + version = "20171009.314"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ae72710292a94d9af92799d3ddeb86f365f34a56"; - sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf"; + rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; + sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -43655,12 +42275,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20170702.832"; + version = "20170913.659"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "2aa23cd169166e92be3e874c723ff224a9d42c15"; - sha256 = "1bjv8a38y75cpbxhzxsnvzpq2cvs80x8ai7pspsqf4pp3w1dj45n"; + rev = "895c229c2b0d822a4debb302d8638105ecb4ee20"; + sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -43760,12 +42380,12 @@ magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: melpaBuild { pname = "magit-gitflow"; - version = "20170425.128"; + version = "20170929.124"; src = fetchFromGitHub { owner = "jtatarik"; repo = "magit-gitflow"; - rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b"; - sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9"; + rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b"; + sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow"; @@ -43844,12 +42464,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170913.343"; + version = "20171009.258"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ae72710292a94d9af92799d3ddeb86f365f34a56"; - sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf"; + rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; + sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43970,12 +42590,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20170901.1234"; + version = "20171008.917"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "7051c1bf8e316b116430be63c55b3010578c3eb4"; - sha256 = "0jga49kwp47m39nsp2a12vwaj5n54zgcjnfq214fjjdcdrqcl3n7"; + rev = "50bb82d310d5720db82ad5b437ca47c0ff0d83a3"; + sha256 = "10ri2kqzcq48xvdyz9pm9d5j5vlh6f7nx4095s4wwxf22swkpnr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -44156,27 +42776,6 @@ license = lib.licenses.free; }; }) {}; - maker-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { - pname = "maker-mode"; - version = "20150116.354"; - src = fetchFromGitHub { - owner = "fommil"; - repo = "maker-mode"; - rev = "335c43b08eff589040129dae1ea13c88793b069e"; - sha256 = "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ba7edfa6ab6b93c346f92859db706acb3fd5fc6e/recipes/maker-mode"; - sha256 = "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a"; - name = "maker-mode"; - }; - packageRequires = [ dash s ]; - meta = { - homepage = "https://melpa.org/#/maker-mode"; - license = lib.licenses.free; - }; - }) {}; makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "makey"; @@ -44327,12 +42926,12 @@ mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mandm-theme"; - version = "20170903.306"; + version = "20170925.321"; src = fetchFromGitHub { owner = "choppsv1"; repo = "emacs-mandm-theme"; - rev = "889cdcb8ea7234d2e6d9dad663e39bd5f872c28d"; - sha256 = "0x7fhzsx7pcbyy5dkx9aa2qvpnn7psc3nf8mqv96mvnzr5q1xg53"; + rev = "078d6d6f11bd48193c5de590cfb0e3d0d687ffc9"; + sha256 = "070280438388q57lpzvd5wdk16abmxixiq01n68hdskfcipdkn2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme"; @@ -44348,12 +42947,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170908.247"; + version = "20171002.12"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "14e2d3f7586001ae4b44582ef03728eaf8326643"; - sha256 = "0c1n5lnllm9mqar68jxm9sr5kyzl4v4ckrdmms68a9rvcfrbn6lg"; + rev = "77647573331c602847b06b9e21de69f72cd7bad5"; + sha256 = "0yqxsls9phvd4dgzb908xds4x437rqpm3ddy07pq3qq7ghri1cnv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -44524,12 +43123,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170830.2131"; + version = "20171001.730"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "2d790a7c72546b96b3fdf57e7b7d6af1663fb721"; - sha256 = "0jfldbw7wpy05rq7xzxm5w49pwcnsz97l1ajh3g526lbj76p2rnl"; + rev = "bc79248c605a5ebd01d96b26e5d5dba39bddcdc7"; + sha256 = "1d0c5l4g3miwzn51a3fsjqnv9shm8kw4inn2hwg2ff40jfrgfy1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44926,25 +43525,6 @@ license = lib.licenses.free; }; }) {}; - mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "mb-depth-plus"; - version = "20170307.844"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/mb-depth+.el"; - sha256 = "1vqminlfc146c8wr00ck7drs5kf92fvdmhyqyh2hj6394cvqs7w9"; - name = "mb-depth+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mb-depth+"; - sha256 = "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w"; - name = "mb-depth-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mb-depth+"; - license = lib.licenses.free; - }; - }) {}; mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mb-url"; @@ -45239,34 +43819,15 @@ license = lib.licenses.free; }; }) {}; - menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "menu-bar-plus"; - version = "20170720.710"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "0yq995jyfw3a1dj49a4wnavfb29amw575dajps6nbv0g1q0rnwkf"; - name = "menu-bar+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+"; - sha256 = "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90"; - name = "menu-bar-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/menu-bar+"; - license = lib.licenses.free; - }; - }) {}; merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "20170731.907"; + version = "20170917.430"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6"; - sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax"; + rev = "a5dbf8e321ff162476555e62264468dd6f55c279"; + sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -45300,25 +43861,6 @@ license = lib.licenses.free; }; }) {}; - message-x = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "message-x"; - version = "20151029.718"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/message-x.el?revision=9"; - sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf"; - name = "message-x.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bf124ec30fa5551b31c0e0d39be234f19e2e81/recipes/message-x"; - sha256 = "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj"; - name = "message-x"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/message-x"; - license = lib.licenses.free; - }; - }) {}; messages-are-flowing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "messages-are-flowing"; @@ -45326,8 +43868,8 @@ src = fetchFromGitHub { owner = "legoscia"; repo = "messages-are-flowing"; - rev = "17a0d91658390ba8d38f325b3ece380e07e3cb49"; - sha256 = "0600is9cynvppdy9vrnr1c0m3cyxim0ha4gq4wbhw9h0cvkz8i1b"; + rev = "ef879726957c850c3a5afd7f1118604991e37e32"; + sha256 = "1mryk48z92r4j8f3qg0j0q5iygv7vnk1k0wgza5pq6bhrl5w13hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/messages-are-flowing"; @@ -45822,25 +44364,6 @@ license = lib.licenses.free; }; }) {}; - minor-mode-hack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "minor-mode-hack"; - version = "20141226.1220"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/minor-mode-hack.el?revision=10"; - sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0"; - name = "minor-mode-hack.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/df182bfd8272f3ded761c90826c8cfe6bfd1a48b/recipes/minor-mode-hack"; - sha256 = "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj"; - 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"; @@ -45883,44 +44406,6 @@ license = lib.licenses.free; }; }) {}; - misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "misc-cmds"; - version = "20170823.842"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/misc-cmds.el?revision=104"; - sha256 = "1spds0fkbvk1br3lpaq3ifyvq0vk5rvyyx5x3cmrvpd0m5s01h87"; - name = "misc-cmds.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; - sha256 = "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl"; - name = "misc-cmds"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/misc-cmds"; - license = lib.licenses.free; - }; - }) {}; - misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "misc-fns"; - version = "20170307.848"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/misc-fns.el?revision=50"; - sha256 = "0jjmd33z36dikkbskskgbdv8pflkwaxn4ifajq4ghrdprdhm6gbm"; - name = "misc-fns.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns"; - sha256 = "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam"; - name = "misc-fns"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/misc-fns"; - license = lib.licenses.free; - }; - }) {}; mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mixed-pitch"; @@ -46007,12 +44492,12 @@ mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmm-mode"; - version = "20170808.1814"; + version = "20171004.336"; src = fetchFromGitHub { owner = "purcell"; repo = "mmm-mode"; - rev = "c68cee0beaeb99c5bd178fab6fec995bce4e501f"; - sha256 = "1k13q5hwb2p2bq5j84pln9kx18bs2x9zfnzgqm4acrxjp9hnknlc"; + rev = "7661968fa6974996e58dfa28da33bca0cbde777d"; + sha256 = "066qp884qw0bqcglncxvag89i1z5rmqjc73y7ksr7ll3309y1969"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; @@ -46235,44 +44720,6 @@ license = lib.licenses.free; }; }) {}; - modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "modeline-char"; - version = "20170307.854"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/modeline-char.el?revision=8"; - sha256 = "1c6ij1c0d6r9chzwqcpgdjq1rb2h0m09fpck9rc9rg5jy7fgdc0d"; - name = "modeline-char.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/modeline-char"; - sha256 = "0ksi5vfcwbyhgpp59qdl7l536zw2rd33xf4r2gihcx2g2k52h2w9"; - name = "modeline-char"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/modeline-char"; - license = lib.licenses.free; - }; - }) {}; - modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "modeline-posn"; - version = "20170307.856"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/modeline-posn.el?revision=43"; - sha256 = "1cpab6k0p65nmw78y5v4lbpxw6pczkzk46zmkc76pi55yjpw6pbm"; - name = "modeline-posn.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn"; - sha256 = "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk"; - name = "modeline-posn"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/modeline-posn"; - license = lib.licenses.free; - }; - }) {}; modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modern-cpp-font-lock"; @@ -46318,12 +44765,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20170111.1838"; + version = "20170914.2111"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "70e71ef7404cc5c38254771695eee221090d5110"; - sha256 = "1dpcffb6pyggg2lj7n9lnxyg2clwm4q7hnxvgc87r6b61vjr3a20"; + rev = "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e"; + sha256 = "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -46630,25 +45077,6 @@ license = lib.licenses.free; }; }) {}; - mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "mouse-plus"; - version = "20170307.859"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/mouse+.el"; - sha256 = "1f49b10i1iqh0q2s2fa309dc617dzavah7fw0k1rpjk84kb001bd"; - name = "mouse+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+"; - sha256 = "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8"; - name = "mouse-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mouse+"; - license = lib.licenses.free; - }; - }) {}; mouse-slider-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse-slider-mode"; @@ -46670,25 +45098,6 @@ license = lib.licenses.free; }; }) {}; - mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "mouse3"; - version = "20170324.1050"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/mouse3.el?revision=39"; - sha256 = "0rnpfz0d4spxkyssgf3j5kfajm54i1vism2q0giikd0savrh0a1c"; - name = "mouse3.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3"; - sha256 = "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777"; - name = "mouse3"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mouse3"; - license = lib.licenses.free; - }; - }) {}; move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-dup"; @@ -46944,12 +45353,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20170904.2002"; + version = "20170925.1338"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "c1ab6dbfbe83d0c90f2c9ba4dfeb31b09f1fb875"; - sha256 = "1xyd827b6wfdbhzj2ba4mywikfjwjs9xspn2aksbsl2bcby0n6zn"; + rev = "546a62ada70aa89d325cc3941c8c9379a4c21553"; + sha256 = "1gbgsfd04jdw6jrsp13h13jkkac5ndrn684pl18q0wjgx9kk11b6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -47025,6 +45434,27 @@ license = lib.licenses.free; }; }) {}; + mu4e-query-fragments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mu4e-query-fragments"; + version = "20170923.622"; + src = fetchFromGitHub { + owner = "wavexx"; + repo = "mu4e-query-fragments.el"; + rev = "34ddad4e6785f575333efcc66153d892daa1c884"; + sha256 = "0l5i3a88j9il2y0jq2sfzwi9q3czc1wi8n9nvgdysj5db5m4xsw6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/21277a79a211b4d101809314bdb9963130a3d533/recipes/mu4e-query-fragments"; + sha256 = "0h8rapfz9snvr722vr65gqa0xhgig81b2gvswjlzljwd2m98yzzn"; + name = "mu4e-query-fragments"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mu4e-query-fragments"; + license = lib.licenses.free; + }; + }) {}; multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi"; @@ -47067,25 +45497,6 @@ license = lib.licenses.free; }; }) {}; - multi-eshell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "multi-eshell"; - version = "20120608.1135"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/multi-eshell.el?revision=9"; - sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl"; - name = "multi-eshell.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a9069a6eb1e57bccb06d26577cac70765de8e52f/recipes/multi-eshell"; - sha256 = "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d"; - name = "multi-eshell"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/multi-eshell"; - license = lib.licenses.free; - }; - }) {}; multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "multi-line"; @@ -47256,12 +45667,12 @@ mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mustache"; - version = "20131117.1407"; + version = "20170923.533"; src = fetchFromGitHub { owner = "Wilfred"; repo = "mustache.el"; - rev = "b0ea352813592424164520a49e86c04600242752"; - sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q"; + rev = "5e39654b933a18131146a0f3b3e3dc55c5058124"; + sha256 = "0ilsdrvqy9zn0yb1c8zh1zidag32rfb9xhm43qpfcg6n5w6c7r82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache"; @@ -47358,25 +45769,6 @@ license = lib.licenses.free; }; }) {}; - muttrc-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "muttrc-mode"; - version = "20090804.1552"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/muttrc-mode.el?revision=7"; - sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis"; - name = "muttrc-mode.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3fd45af3345742cff7be99ad8210d7f8fd2a2f/recipes/muttrc-mode"; - sha256 = "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn"; - name = "muttrc-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/muttrc-mode"; - license = lib.licenses.free; - }; - }) {}; mvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mvn"; @@ -47566,25 +45958,6 @@ license = lib.licenses.free; }; }) {}; - naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "naked"; - version = "20170418.1822"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/naked.el?revision=23"; - sha256 = "1k3j6dyp8p47q43i4ba53krl06yx32rkjnh2f5x1zqk6nxnb1wf8"; - name = "naked.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked"; - sha256 = "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq"; - name = "naked"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/naked"; - license = lib.licenses.free; - }; - }) {}; name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "name-this-color"; @@ -47815,25 +46188,6 @@ license = lib.licenses.free; }; }) {}; - narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "narrow-indirect"; - version = "20170820.1748"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=14"; - sha256 = "16knfw5h15f7al6sn1n40bcw2ahqsy9ipkvfk0h7r1vlpb92w2fq"; - name = "narrow-indirect.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/narrow-indirect"; - sha256 = "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj"; - name = "narrow-indirect"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/narrow-indirect"; - license = lib.licenses.free; - }; - }) {}; narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "narrow-reindent"; @@ -48362,12 +46716,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20170909.1336"; + version = "20171003.1044"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "71b3a560e6d017907f43f7dd074d300653c1588b"; - sha256 = "0ip330ylvy6rwgvqravm58qh8ssbrd8nw2rbd3gbhcwiqakawsjl"; + rev = "f62edeb70cc19bc4c8de9b815c4e9d257acff35d"; + sha256 = "04y10x36bfgcg22cazza13ildkcsc3vmrd0z8qcsc74yd05n09zf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -48387,8 +46741,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "87111bff382655075f2577c591745a335f0103c7"; - sha256 = "1rmh2a2q3lw3wmnlh5y7g06nzhcgnhz5libgsjfl3jvpxzdlck76"; + rev = "b26168be150bd1cbdd6daca59f53755a56fe7939"; + sha256 = "1g10scd55asi5mfkbj0mdi098nkhy0phvnllwbv52vy6p0amppq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -48446,12 +46800,12 @@ nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nix-sandbox"; - version = "20170131.241"; + version = "20171004.1006"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; - sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; + rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; + sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox"; @@ -48471,8 +46825,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; - sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; + rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; + sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options"; @@ -48576,8 +46930,8 @@ src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "d1d649711c4ba63e458b229afdc64ed4639cf988"; - sha256 = "0416i7gv89r46x30swvqhqf7na9rkpm0w9lw1v49kxqdrqqdci67"; + rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2"; + sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -48740,12 +47094,12 @@ nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nord-theme"; - version = "20170506.2351"; + version = "20171005.1039"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-emacs"; - rev = "eb7929e41606776a45817946b5d6f79426767a93"; - sha256 = "1cb7la2al8124i4xfmripfzhabpnzh929qi1266p4c7jchyz2gxw"; + rev = "be32879416bbed1d6524f7c30ac53fbfa5a0e024"; + sha256 = "0q347f9bjayfl8y8vz83kjamf1lp58386nhy0iacjxsq4riwpric"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; @@ -48779,11 +47133,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170912.1817"; + version = "20170927.415"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "f2ed177e6260d835b8a13d2a53e1c8d5fa76edf2"; - sha256 = "0d4110cai0z2h2gggx93wfm8fj2av4dwk57gf835crsmv8y3wkj7"; + rev = "54aef071590cb23f61da943daa29080cf7446696"; + sha256 = "0hh7276br857a5s5wms2wxf24jz3vvdpqm2d3zrzdfgz54ix6cp7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48820,12 +47174,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "20170910.1145"; + version = "20170924.512"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "91c4329f64ddc9a598fa6c58e1d9264aee073e72"; - sha256 = "0x3ijjhjg2q8gdqf4hgr2d8wy32qhxy48kbz0slibkn9yik3pvlz"; + rev = "19ab463864f137b43704b4f34173349c88e84d8e"; + sha256 = "00f5hhw157nwdwy26yn6l3z2hgk6xxvx5xl0hasskj1l9rg0zgh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -48838,25 +47192,6 @@ license = lib.licenses.free; }; }) {}; - novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "novice-plus"; - version = "20170307.925"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/novice+.el"; - sha256 = "1f49c0wv1zsi720g3a8ka3h17n7r81pzz7zfwalz0zxwxmh6jghb"; - name = "novice+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/novice+"; - sha256 = "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf"; - name = "novice-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/novice+"; - license = lib.licenses.free; - }; - }) {}; noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noxml-fold"; @@ -48962,22 +47297,28 @@ license = lib.licenses.free; }; }) {}; - nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree }: + nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree }: melpaBuild { pname = "nu-mode"; - version = "20170825.1300"; + version = "20171007.1521"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "711b5bd53c77ba66987fe9807a4442084f67789e"; - sha256 = "11iymqm51ky7k8ylwvcq770y8anaqn8giki63kf2a96f4rdglb1x"; + rev = "4a3fe40585031a1c2b323e28f536a3840f0776bd"; + sha256 = "01pl34cn6z1hky7gwh832vrkpyjsbc62ihbnqxj9rma5w9dfwarx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; sha256 = "0nzv3p62k8yyyww6idlxyi94q4d07nis7ydypar8d01jfqlrybkn"; name = "nu-mode"; }; - packageRequires = [ helm help-fns-plus transpose-frame undo-tree ]; + packageRequires = [ + ace-window + avy + help-fns-plus + transpose-frame + undo-tree + ]; meta = { homepage = "https://melpa.org/#/nu-mode"; license = lib.licenses.free; @@ -49151,6 +47492,27 @@ license = lib.licenses.free; }; }) {}; + nyx-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nyx-theme"; + version = "20170910.607"; + src = fetchFromGitHub { + owner = "GuidoSchmidt"; + repo = "emacs-nyx-theme"; + rev = "afe2b8c3b5421b4c292d182dcf77079b278e93d8"; + sha256 = "1qamw4x3yrygy8qkicy6smxksnsfkkp76hlnivswh7dm3fr23v6m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/nyx-theme"; + sha256 = "17ajpsbwbal1rwgd38kckh1kvnd412h6fkvj2x4j5rqvjr9nhgr6"; + name = "nyx-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nyx-theme"; + license = lib.licenses.free; + }; + }) {}; o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "o-blog"; @@ -49297,6 +47659,27 @@ license = lib.licenses.free; }; }) {}; + ob-cfengine3 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-cfengine3"; + version = "20170915.634"; + src = fetchFromGitHub { + owner = "nickanderson"; + repo = "ob-cfengine3"; + rev = "f38f87256efcb2b02f5c7042900087be941c1ddc"; + sha256 = "09xn84d2vy3kxk2xihjml8zzrhv2cz2jy20dg7w6ll9wn38gs33h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3"; + sha256 = "1pp3mykc5k629qlqixpl2900m1j604xpp6agrngwagsvf7qkhnvl"; + name = "ob-cfengine3"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-cfengine3"; + license = lib.licenses.free; + }; + }) {}; ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-coffee"; @@ -49510,12 +47893,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "20170411.1842"; + version = "20170920.2251"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "5fd0e99630e07c5e64f2483c6d46aefdd37677d2"; - sha256 = "1i5la27m36xfc8jwmz5i0yiim9ddmfaqjpahxgpbf63zks555vpk"; + rev = "c4da6d47b3f96c31c00f9eaaf712b59afe00daef"; + sha256 = "0rhxp7gw4d5yp6yvjcp80in22wckj4zl9siykalj0jm97hkwqmzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -49531,12 +47914,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20170902.1253"; + version = "20171008.1733"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "ed1c2d580037c0592066e1f33c0581890dd09e2e"; - sha256 = "0ciacp8llx0njkrcbzgs13srhjm2nxx0pr7v8ladlx0sfdsxj078"; + rev = "4a181127000e43dd520e600880b49607747d8f08"; + sha256 = "01gfj11pd97xp02bdal3c9wy77ha1dcym1ddrbpzkvck2ja1s6ib"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -49867,12 +48250,12 @@ ob-swift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-swift"; - version = "20151204.2311"; + version = "20170921.625"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-swift"; - rev = "f376af0d86fb410e41289df59a0c2625954c9067"; - sha256 = "071rl0bvhwh5vqbl7n84shvzgqgwg2f5l9vb8wfs4y24hsqfgxmz"; + rev = "ed478ddbbe41ce5373efde06b4dd0c3663c9055f"; + sha256 = "1vwg10d33mwb32bpdbpghfihy3ryiqbc4yydpb5hfv3v5k83vs0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b401383966398d3223032c59baa920ce594e5fef/recipes/ob-swift"; @@ -50329,12 +48712,12 @@ omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-kill"; - version = "20150526.2349"; + version = "20171005.955"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-kill.el"; - rev = "4c8dbb6b2c9f1afc0f82077c04eab022e5387e85"; - sha256 = "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c"; + rev = "192d51d843c6581d593a4eb01f1b49ad59d206cf"; + sha256 = "0n24rhzl1zhlkdkjigsczyc0z3yrihz9qnn1icrk6nkms107qbnn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; @@ -50350,12 +48733,12 @@ omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "omni-log"; - version = "20170420.407"; + version = "20170930.535"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-log.el"; - rev = "60fd1b7ba77bd82787e43ce1aee2832f53981c68"; - sha256 = "1s81qj4g8nhw6k4b7wi4ya9g51xbsqzyi659zs4zdxjxj7acdq8s"; + rev = "11e959473c1bd9415d0cda785940c36ba6ad44ab"; + sha256 = "081vq3wzl8w9yz1356np6h27d7yi5j8i3va9sc2flfwylmw1y9gr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log"; @@ -50392,12 +48775,12 @@ omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "20170416.329"; + version = "20171008.1207"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "0da549c1386f93ed4de201bf8779ba64ddc91347"; - sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1"; + rev = "98cdc402c3663e30a2bd260911b2ac0c93f93129"; + sha256 = "19pwhbg4db5g4nq3j7axdh81k6ikm2jirwdkl38nqyr0sb0s2w33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -50455,12 +48838,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20170909.319"; + version = "20171007.416"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "b425270bed93b427ff519d6f51ad1d97531a0a92"; - sha256 = "0l9dk9idfsr21q0icx9fpgqyi4qlhnqal6sypak5zh8dgchrqif9"; + rev = "40b6251a96057c80a958362a0886c06eea5bfd62"; + sha256 = "176qfjd0qfgypj7pyi2p7v6zn7sic86gcgxz056k4y2akm6aa2p6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -50568,25 +48951,6 @@ license = lib.licenses.free; }; }) {}; - oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { - pname = "oneonone"; - version = "20170416.858"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/oneonone.el?revision=129"; - sha256 = "0ag62z31mb5n50m9qph2ww945pr71j95c5xv7krna1iq01qr8ji1"; - name = "oneonone.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone"; - sha256 = "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9"; - name = "oneonone"; - }; - packageRequires = [ hexrgb ]; - meta = { - homepage = "https://melpa.org/#/oneonone"; - license = lib.licenses.free; - }; - }) {}; opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "opam"; @@ -50882,12 +49246,12 @@ org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-autolist"; - version = "20150922.705"; + version = "20170924.1201"; src = fetchFromGitHub { owner = "calvinwyoung"; repo = "org-autolist"; - rev = "da332fadcd9be4c5eb21c5e98c392b89743750b2"; - sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani"; + rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1"; + sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist"; @@ -50987,12 +49351,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20170908.634"; + version = "20171004.1305"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "9a84111f759c264bd6ab435995803d0f6234b78a"; - sha256 = "00a92064bjlrjrmy7xcfc5ajajxviar82pjisdm4pxd3jcab8qcw"; + rev = "35d46695ceffff4069e66fa2a4f039509f1a3c7e"; + sha256 = "0c0jps0gxsk3m8s78yp8141wh7g2nx8acd1jc0v4ffmlr8qi2csj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -51075,8 +49439,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "48f621b595e748c5e03431f237facf258ffc9443"; - sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; + sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; @@ -51323,12 +49687,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20170605.23"; + version = "20170924.2309"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "131d2409b3639798ebac6d77c98eae446ea915dc"; - sha256 = "1l04vs47pl63daz9n0d2xby43kr2ynbykvdr7hjbyizcg9l9fzp7"; + rev = "14261c2619be224fc4c499624abc2cba3663e7f5"; + sha256 = "0d8lcg9gnzf5bpn1z83i5nni444mzy6mlqggadsrdav9bdf8cfy2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -51491,12 +49855,12 @@ org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: melpaBuild { pname = "org-evil"; - version = "20170529.741"; + version = "20171004.255"; src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "org-evil"; - rev = "aff7bf3885e318287abf7d542916d21372496bdd"; - sha256 = "1z6rj7nrjdmkc7skx2si7s462228bpka96p0zzmkg7wa82j7ywv9"; + rev = "aae5688c15cef9f2f6105d395dab36b163d5af34"; + sha256 = "01ablfw0prcb4bwsaa6fbqc80xz539a48psvnmddz98c8yjhb9g7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; @@ -51616,12 +49980,12 @@ org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }: melpaBuild { pname = "org-iv"; - version = "20160609.1854"; + version = "20171001.322"; src = fetchFromGitHub { owner = "kuangdash"; repo = "org-iv"; - rev = "40fa39ae680794cd493dfa8624e5eff4d04c2363"; - sha256 = "1zn1bvk2kgd6a969m1d63v8ax52lanvb1h2w62ffpxlkap3kl6m8"; + rev = "7f2bb1b32647655fd9d6684f6f09dcc66b61b0cd"; + sha256 = "0s3fi8sk7jm5vr0fz20fbygm4alhpirv0j20jfi1pab14yhhf34h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7db0c34f0f6fb9c3b9e581a74304cc9a26ed342/recipes/org-iv"; @@ -51658,12 +50022,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20170712.657"; + version = "20170928.231"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "69b237d1b3c5cc0eb81fb5918df25d01e999b0f1"; - sha256 = "1ss1lxxilbr177mlp4iygg8q74qfw68v8iap9fpj6lvlm7vawins"; + rev = "cda1980b013afabd299e7a2294517897f6442d98"; + sha256 = "1y6idbp74vrr3g0r10n09znky8ih94kzf5fyil47sjkqyzzmpk3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -51739,55 +50103,15 @@ license = lib.licenses.free; }; }) {}; - org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-mac-iCal"; - version = "20140107.519"; - src = fetchgit { - url = "git://orgmode.org/org-mode.git"; - rev = "657302b97e222abb262070586c56fe5d64355035"; - sha256 = "0myi67sdr62q0qxjijkxbpmyhxvnrxwjwpq2al1cds0bk8q7nzq4"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; - sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw"; - name = "org-mac-iCal"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-mac-iCal"; - license = lib.licenses.free; - }; - }) {}; - org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-mac-link"; - version = "20170105.1723"; - src = fetchgit { - url = "git://orgmode.org/org-mode.git"; - rev = "657302b97e222abb262070586c56fe5d64355035"; - sha256 = "0myi67sdr62q0qxjijkxbpmyhxvnrxwjwpq2al1cds0bk8q7nzq4"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; - sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw"; - name = "org-mac-link"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-mac-link"; - license = lib.licenses.free; - }; - }) {}; org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20170807.549"; + version = "20171008.644"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "8067e76eb1fb6a9c15229cc93015aba923120a19"; - sha256 = "0r33y6l74i8n2fbqcazq4r2659lqva855mf5lm5yf7spjga2f9vw"; + rev = "0a0aa9b11005ff620b447c75e15122f6c0f9d81b"; + sha256 = "1m5qih09zyi8awwf2badis9czy0biwnpxrhd26an3ssb07i7ajgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -51977,21 +50301,21 @@ license = lib.licenses.free; }; }) {}; - org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }: + org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, ht, lib, melpaBuild }: melpaBuild { pname = "org-parser"; - version = "20170814.2016"; + version = "20171002.2136"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; - rev = "f568dd98a8b2"; - sha256 = "15lbanb14ip0xwcd3ddq5a0099f299blvf6j3g03hmnzfa4pm7cy"; + rev = "105050acee08"; + sha256 = "1y1ikk950awxhvx4d930ymqa8ds6a0wlywzx09jvrnkvbisd4l63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h"; name = "org-parser"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ dash emacs ht ]; meta = { homepage = "https://melpa.org/#/org-parser"; license = lib.licenses.free; @@ -52104,12 +50428,12 @@ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: melpaBuild { pname = "org-projectile"; - version = "20170819.1047"; + version = "20171006.1230"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "48f621b595e748c5e03431f237facf258ffc9443"; - sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; + sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -52129,8 +50453,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "48f621b595e748c5e03431f237facf258ffc9443"; - sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; + sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; @@ -52257,12 +50581,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 = "20170808.625"; + version = "20170927.2056"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "0af19a6ed3ccde878c27c27f1413409fdc0de9f8"; - sha256 = "0prwvc3yywivhap6rrji25afcxc553nginzxgrr7fbkxy5vfprzg"; + rev = "5fcbd975523281e5bacaf0284af21b4387147a98"; + sha256 = "0fc5kcz1xy819m960qn28hz9c13qpc542kzihmzkc3ykm5d96x3c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -52520,12 +50844,12 @@ org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-tfl"; - version = "20161120.932"; + version = "20170923.518"; src = fetchFromGitHub { owner = "storax"; repo = "org-tfl"; - rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3"; - sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk"; + rev = "f0d7d39106a1de5457f5160cddd98ab892b61066"; + sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl"; @@ -52688,12 +51012,12 @@ org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-vcard"; - version = "20161001.2202"; + version = "20170929.410"; src = fetchFromGitHub { owner = "flexibeast"; repo = "org-vcard"; - rev = "58f83784c580da893c214bd729aae3ab5d285f33"; - sha256 = "122qxg0ji9c7zj52vqlf9d6276w7rdlxg4ippy6dayqs8bhkimbg"; + rev = "dbe266b79df4fb31f1766010322bf4e383ce1c03"; + sha256 = "1rcqcgxvjshbz3n1p376h618xapj03n6m7b3cxgv9gnryviyr6ax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard"; @@ -52730,12 +51054,12 @@ org-web-tools = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-web-tools"; - version = "20170906.102"; + version = "20171008.2128"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-web-tools"; - rev = "9ae976aedacefdbe4a827bd66a4642f40bc878d4"; - sha256 = "18hbcjg30fd342mvab3h7v8y5mja90g54823mnvmffhrp657z7qc"; + rev = "dac686b18cddbf3af4632054b15ff53c1ae8d564"; + sha256 = "1bw543dc0lbzf4s3sjwg6y8pszfpkby5dyj0pykg98pcii51agkj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools"; @@ -52856,12 +51180,12 @@ org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org2web"; - version = "20170809.411"; + version = "20171005.1617"; src = fetchFromGitHub { owner = "tumashu"; repo = "org2web"; - rev = "b14aaecd9e51b3cc4fa4530bfc6f07dd47c80616"; - sha256 = "04f85kw7d5s8yszbm0270yyb49i3k5a9q35a6zdfhpmpfap48h90"; + rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7"; + sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web"; @@ -53079,8 +51403,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "orgtbl-show-header"; - rev = "0b63ab4425b6e2af8ffb1f0b94839918d1720d09"; - sha256 = "161bsmgrbdhb73k36gqb5b96mf0y0sl8q9sjg81vx86bs9sbkddw"; + rev = "112d54a44682f065318ed0c9c89a8f5b8907342a"; + sha256 = "1s2bgsm4s33w5275qghw1axdpmz6bbyhki53jr2giyk4f90822gi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c5ea906b1d642405ca532d89dbb32cf79f53582/recipes/orgtbl-show-header"; @@ -53432,12 +51756,12 @@ outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }: melpaBuild { pname = "outshine"; - version = "20170904.1524"; + version = "20171005.955"; src = fetchFromGitHub { owner = "alphapapa"; repo = "outshine"; - rev = "a695215b47ca4a950c47a69a5c6e4c695892b1b3"; - sha256 = "18c1iqfw2q9if6yhvgspcw5arhd549gcvwyphnsl9cl6q40q2vly"; + rev = "75389b7104692f4f6a97dc72020d145f03affd25"; + sha256 = "0j99wx48xq5vpla69yj5w255n3acbgc4bbig4kmbvayr2871ls7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; @@ -53478,8 +51802,8 @@ src = fetchFromGitHub { owner = "tonini"; repo = "overseer.el"; - rev = "3269801dc5145d41c11599430229340e6dfa6cc6"; - sha256 = "1zjp1bw7ipg4ibabrc0wzzsvd4jydjq571768v2hdpzcdw36d8f7"; + rev = "6be1f2a4df1b7a20298865b85502ee89e327898d"; + sha256 = "0ipq5gflymvznb8xzfl524l09sj90787bzga9ymjjpc4rn9zmqlb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer"; @@ -53579,12 +51903,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "20170414.0"; + version = "20171003.327"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a"; - sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw"; + rev = "c12467d1c6a2a3f89e1e271c44e29eb5409ed9df"; + sha256 = "0qlnxqzc3xw12w62kgjmmkvm2l25z4rjz77dnl4y15pqrjl4ljak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -53642,12 +51966,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20170912.1322"; + version = "20170930.1905"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "a486141e4e2c3f9f67e799e20af150611d77f850"; - sha256 = "1srrkc0bajmhp614avk4yr51zsp0gnmn47r1wi7qxkr6ybxwx8k1"; + rev = "98346caff78f5e8740505bcade85e00914bc54a6"; + sha256 = "0c1ajqybpcv0nc5fklq01lkz1f0320wnn43i0r22d4m8dflqfhy0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -53705,12 +52029,12 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20170607.1513"; + version = "20171001.216"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "a5e7c7166f5d4baf4b6487f44865f2636cda4698"; - sha256 = "14qybj34wvpn91m9hvfmcrsj5d9zzq5pyzjc61gd0zn482bklxz4"; + rev = "db2ec528f46c9e611624ba28611c440a99bff255"; + sha256 = "04zz6359xkn4w7jmmadxyvjd8pw21gw12mqwch1l9yxc4m9q474l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; @@ -53894,12 +52218,12 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20170418.758"; + version = "20171004.1553"; src = fetchFromGitHub { owner = "masayuko"; repo = "ox-rst"; - rev = "70f15591715796b1d96af660481739f019c295cb"; - sha256 = "1q6qfgfajl103hsf5zp4zxpf4svypv0n1kiqkhjp12b0hy45n2l0"; + rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928"; + sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst"; @@ -54083,12 +52407,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20170910.124"; + version = "20171008.2352"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "46055de8792a1c7c01d06f74148dae6d700b00d6"; - sha256 = "1x1kln1bdqxxgan1pkjs98a9d3737j4qfpza4r70va7wvsy3ndhj"; + rev = "6c288fd22eef6332adc5680aa0843d1c678c4832"; + sha256 = "1s2p5c1c8fyiwi6idjl4bw2cxikdim0maw6w5pf12k2j1bwm98qy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -54125,12 +52449,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170907.201"; + version = "20171006.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "2fc3bc9530caea437a55e23c13d31d8803193107"; - sha256 = "076da92vc86kdc7gdh8id7w8qadh0fbiz068qzk8kr8w5bw6zkr6"; + rev = "ff64e1171e8330972c26bf547042429927aed7c7"; + sha256 = "11hsxvla2vq944zfd8kr0wynvkr7n90jv714ll6f7yhn10nrraks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -54332,25 +52656,6 @@ license = lib.licenses.free; }; }) {}; - palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { - pname = "palette"; - version = "20170307.936"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/palette.el?revision=84"; - sha256 = "112b91z1f4p0j4kzrn8110w9pk2fyndjqiiyh0vkwah2ihpsw3pj"; - name = "palette.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2cdf2d07307007a95d1fe8dc8d2f105c34a26416/recipes/palette"; - sha256 = "1s9lklvr1b0a496q0ljbhkl8zdx80d7bqvkdjnfp35z2s37f1zz3"; - name = "palette"; - }; - packageRequires = [ hexrgb ]; - meta = { - homepage = "https://melpa.org/#/palette"; - license = lib.licenses.free; - }; - }) {}; palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "palimpsest"; @@ -54396,12 +52701,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20170910.537"; + version = "20170927.1048"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "d452c3baa19d51fb04c5a52f550b560fe695eb0a"; - sha256 = "02qrc3qxajzxm9lfrd33i9sbawh9nf4gz9i3drzhv11ca549paaq"; + rev = "c840a8f941940bb8e694c635995566faee995c7b"; + sha256 = "0wqnzgkcwhrgxdkrlk6i469gcas9477pbkv878cqq9ifsjwvf42n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -54480,16 +52785,16 @@ paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "paper-theme"; - version = "20151231.932"; + version = "20170924.1231"; src = fetchFromGitHub { owner = "cadadr"; - repo = "paper-theme"; - rev = "15af5e31492f79dc0d47787150ef39d6318a2608"; - sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i"; + repo = "elisp"; + rev = "b3d8b45c76134e2248448d719c840776e41b747a"; + sha256 = "0fy0b04mf3brx86xjnidkwg4zs4nh123nc6pgrl4mp6d6552vv98"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a35a0888a7a27174b5de58d99b01554769041f46/recipes/paper-theme"; - sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; + sha256 = "1ph6c6g907cnxzl74byc754119qia8rs8y7wvaj8i6q3fz2658zr"; name = "paper-theme"; }; packageRequires = [ emacs hexrgb ]; @@ -54526,8 +52831,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "c508a52aee7f10f5e9b750b4724e264a3e694757"; - sha256 = "1xbys48368a6vcyjqxn71lg6yf7zvb2k9dlf07dl6hvh0a7qlpqa"; + rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245"; + sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -54769,22 +53074,22 @@ license = lib.licenses.free; }; }) {}; - pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: + pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: melpaBuild { pname = "pass"; - version = "20170911.456"; + version = "20170928.1118"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "f811120c33279fb6881c0a70ae26862adefcd659"; - sha256 = "07m80mscxfi5wmf0cvymlnpcp4aprzn8ynaxs6vxgpr11gwr8zvm"; + rev = "adcafc25e1bbd43b70251305a07252cc46d20308"; + sha256 = "0hbbqgj0vi5xlb48fjdy7yh8qx43hi6rw3jqrcmvlh3gnm47yhky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr"; name = "pass"; }; - packageRequires = [ emacs f password-store ]; + packageRequires = [ emacs f password-store password-store-otp ]; meta = { homepage = "https://melpa.org/#/pass"; license = lib.licenses.free; @@ -54874,18 +53179,19 @@ license = lib.licenses.free; }; }) {}; - password-store = callPackage ({ emacs, f, fetchgit, fetchurl, lib, melpaBuild, s, with-editor }: + password-store = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, with-editor }: melpaBuild { pname = "password-store"; version = "20170829.1633"; - src = fetchgit { - url = "https://git.zx2c4.com/password-store"; - rev = "65cead8c0fdb07ce3821f6b97bdcb32684d0c3f7"; - sha256 = "0rm364l9mg2gl16ng5zd02gkfq8592mhrp81sk1v0wwh8wlyrzrh"; + src = fetchFromGitHub { + owner = "zx2c4"; + repo = "password-store"; + rev = "c1b3ff04425844ed88fac2a634232bdb8e2662bc"; + sha256 = "07hfca1r09m5p5i8y62b54xmhw1ymcq68ys0gk579d7lvvy6s5qf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store"; - sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; + sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6"; name = "password-store"; }; packageRequires = [ emacs f s with-editor ]; @@ -54897,12 +53203,12 @@ password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }: melpaBuild { pname = "password-store-otp"; - version = "20170912.349"; + version = "20170928.18"; src = fetchFromGitHub { owner = "volrath"; repo = "password-store-otp.el"; - rev = "2965da7d8edd32bd4ef62f487ea6bcd08c599c89"; - sha256 = "1svm6rlh4f0rjcl0fjy3x4bfakdn9npi8w7ak217ad2k08j44bzd"; + rev = "a39a64a91de36e87b852339635bd3c5fb0e32441"; + sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp"; @@ -55359,12 +53665,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170912.711"; + version = "20170918.934"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "c1b183f71e618693ac6ec20f051ca41270be3bce"; - sha256 = "059fmrakfzwq4xqf246ksi9h7gfm37f29565w9mvlq4z7hhbf5z3"; + rev = "52acd65c0db97a83e3f86ca97f9a3bf27135e8f3"; + sha256 = "19d5nmy7kdlysxzig2akbxvg9h1vnjagp4xh1qpyw8iqgm3kpxxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -55464,11 +53770,11 @@ pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pelican-mode"; - version = "20170818.1352"; + version = "20171001.503"; src = fetchgit { url = "https://git.korewanetadesu.com/pelican-mode.git"; - rev = "9b2a64b9d57ee4eb95e40a309fbab4bcfa5b5fef"; - sha256 = "19gqg2p56r0iz5l3p5y421c107f3jggwi60xk2wamx5jv9rbrn2d"; + rev = "64d41f0ee5970b2d875880994eb287b97cad24a1"; + sha256 = "0xivc8sdp6h3fajyj7g73xnyfqlkhfpm2cs9x3mpyr42502lmn2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; @@ -55501,48 +53807,6 @@ license = lib.licenses.free; }; }) {}; - perl-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "perl-completion"; - version = "20090527.2336"; - src = fetchFromGitHub { - owner = "imakado"; - repo = "perl-completion"; - rev = "f2ec91b88a8b7d97d40d6c90a89eaf8e595c2b89"; - sha256 = "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/987c14a2c4a31e27382d05cdbca18a3d2661d2e1/recipes/perl-completion"; - sha256 = "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b"; - name = "perl-completion"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/perl-completion"; - license = lib.licenses.free; - }; - }) {}; - perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { - pname = "perl6-mode"; - version = "20160730.1455"; - src = fetchFromGitHub { - owner = "hinrik"; - repo = "perl6-mode"; - rev = "14073feeb0f8ad2225616d550133f8f473a51b33"; - sha256 = "1j6zgr9vfyqpdya8975sjh2ny70rqqyj9zbl63kldkirppnw995i"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d4bbb2171c70958d5ab3730f974db3b07561a81b/recipes/perl6-mode"; - sha256 = "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv"; - 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"; @@ -55735,12 +53999,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170813.1754"; + version = "20170916.404"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "6b3a3b0468199a8db10a73d119dfcd8833d181b6"; - sha256 = "13rivw5rafl4pb68l500ksbzpz00yp7lx9wi9vy8nz0hwr80jd0p"; + rev = "525f2f25358f17c7269c3750d56bfb8a6d59b5e6"; + sha256 = "17nv33nl60jdn6cz6abbj6jxnvjcshaq4a22lkssxczp968k1qn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen"; @@ -55756,12 +54020,12 @@ pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pfuture"; - version = "20170531.805"; + version = "20170726.1502"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5"; - sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j"; + rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb"; + sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; @@ -56908,25 +55172,6 @@ license = lib.licenses.free; }; }) {}; - plsql = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "plsql"; - version = "20121115.243"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/plsql.el?revision=5"; - sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1"; - name = "plsql.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/eb457144c112a7a9de2fc4c634dfd6c2dda2e486/recipes/plsql"; - sha256 = "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1"; - name = "plsql"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/plsql"; - license = lib.licenses.free; - }; - }) {}; plur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plur"; @@ -56972,8 +55217,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "5ad8c92742daaf4434fded196ff23638cdaa621b"; - sha256 = "1z3cy6n727lrsm8smksb48hbj2ckh4wri44c0423hdf84qp5ifg8"; + rev = "b05d13f04990f6ed74637ee8bdb42fd1500974ac"; + sha256 = "03bcknd6y6rhg6185bjga2idswq4p0d87jmyhkx2x56gdybpa9mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -57007,6 +55252,27 @@ license = lib.licenses.free; }; }) {}; + pocket-lib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, request }: + melpaBuild { + pname = "pocket-lib"; + version = "20171008.2135"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "pocket-lib.el"; + rev = "9f2a5dad867ef11d6629073ae4c8a43df1c03470"; + sha256 = "1y97zlnxp0lxh21x51bdkvd8yxg59sxbq94s06vkvkbq2pjz86pp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib"; + sha256 = "0v619blifmvm36dr773wjf35fjji4dj3pyck9nkz0m8zmpz0fg78"; + name = "pocket-lib"; + }; + packageRequires = [ dash emacs kv request ]; + meta = { + homepage = "https://melpa.org/#/pocket-lib"; + license = lib.licenses.free; + }; + }) {}; pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }: melpaBuild { pname = "pocket-mode"; @@ -57028,6 +55294,36 @@ license = lib.licenses.free; }; }) {}; + pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: + melpaBuild { + pname = "pocket-reader"; + version = "20171008.1411"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "pocket-reader.el"; + rev = "410add35782f037e4c42d3f740fb5623901ebf39"; + sha256 = "1lchwlv32b5gfgkp2i3li3rk3w1xyz8axamz5mqs1imb6mkc1dws"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; + sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf"; + name = "pocket-reader"; + }; + packageRequires = [ + dash + emacs + kv + org-web-tools + ov + pocket-lib + rainbow-identifiers + s + ]; + meta = { + homepage = "https://melpa.org/#/pocket-reader"; + license = lib.licenses.free; + }; + }) {}; podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "podcaster"; @@ -57091,25 +55387,6 @@ license = lib.licenses.free; }; }) {}; - point-undo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "point-undo"; - version = "20100504.129"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/point-undo.el?revision=6"; - sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz"; - name = "point-undo.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ce31bd8f9a1ad4f3252f8cd4ef15984495df18bd/recipes/point-undo"; - sha256 = "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k"; - name = "point-undo"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/point-undo"; - license = lib.licenses.free; - }; - }) {}; pointback = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pointback"; @@ -57197,12 +55474,12 @@ pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomidor"; - version = "20170817.2253"; + version = "20170925.2301"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "58a4368d91d472aa47a83f498be82db8929cf41a"; - sha256 = "1g6mwx6gq6zlzn06izic81qf2ppqprfmap5hgsksx1xbickkmwdx"; + rev = "16bed77ff933cb5f8430b6eacf27509631d22072"; + sha256 = "1w2ql67arjzzjakqm34gbs3vf6w9yzkw5kzi5vrvkcwajqq8qq56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -57302,12 +55579,12 @@ pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "pophint"; - version = "20170403.701"; + version = "20170917.1948"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-pophint"; - rev = "5d1db7c0b92862ba2cc5f3566b25840b8ce3ba59"; - sha256 = "09av2krrmm8g3f3f31kl4j4agmmf8hx9irzrqyvgshljflk0nq1q"; + rev = "909025c5a871ca4b9ec7aed7f1a27c819a94dba1"; + sha256 = "0qbb36qijkzbzxlmqsvvddm7x2gk9rkafnyjbkxsl76rz1ajy6nz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint"; @@ -57596,12 +55873,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20170708.1442"; + version = "20171008.2002"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "8a246902e86a0c59015bb897a9c59be9729ef5c4"; - sha256 = "1q90y0l0vdach8irb9cigw8w5nllvzv5hg8hd8ljpb4j9jhc5y5n"; + rev = "b51217d52ea0b8b91b15783d364562b6668ac0d0"; + sha256 = "0afhs8dpvlc29xpdgwm0jp1syyyraqipscxx89x1yi0idkgvxj29"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -57656,44 +55933,6 @@ license = lib.licenses.free; }; }) {}; - pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "pp-c-l"; - version = "20170307.939"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/pp-c-l.el?revision=25"; - sha256 = "0q36bq82lp381jnzf8kapiiglqgibzkhsxlhpgfdg3ynbmw5i1cc"; - name = "pp-c-l.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp-c-l"; - sha256 = "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v"; - name = "pp-c-l"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/pp-c-l"; - license = lib.licenses.free; - }; - }) {}; - pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "pp-plus"; - version = "20170307.938"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/pp+.el"; - sha256 = "0a1dj9n3n81xal17djj15hqa71cqphjnf9k9z03vnpw8zq0m93lh"; - name = "pp+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+"; - sha256 = "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq"; - name = "pp-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/pp+"; - license = lib.licenses.free; - }; - }) {}; ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }: melpaBuild { pname = "ppd-sr-speedbar"; @@ -57820,25 +56059,6 @@ license = lib.licenses.free; }; }) {}; - pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "pretty-lambdada"; - version = "20170307.940"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el?revision=15"; - sha256 = "0b8m96hbqmgyqmv5f890fnyl9vl2wcsaz8w4b11wdprh82ravp4r"; - name = "pretty-lambdada.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pretty-lambdada"; - sha256 = "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6"; - name = "pretty-lambdada"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/pretty-lambdada"; - license = lib.licenses.free; - }; - }) {}; pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pretty-mode"; @@ -58112,26 +56332,6 @@ license = lib.licenses.free; }; }) {}; - project-local-variables = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "project-local-variables"; - version = "20080502.952"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/project-local-variables.el?revision=1"; - sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw"; - name = "project-local-variables.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/project-local-variables"; - sha256 = "1jys9nac2912jdv40fly1q4i30xa8b1v2ndbc50rk4ysarhbhdd9"; - name = "project-local-variables"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/project-local-variables"; - license = lib.licenses.free; - }; - }) {}; project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "project-persist"; @@ -58218,12 +56418,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20170827.2053"; + version = "20171008.135"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "adf6ae2dbfbdca96aec49115ca35867006f326b1"; - sha256 = "1x39v7lb63k2nfa4xyvkgvgxbd88jcqnwdmd78a86p5zc3m42zk9"; + rev = "933fcbd849781ea5e0ace32b9dc655d00de7df06"; + sha256 = "020j7cpa5ljblanf4y7xsr7gvz12b8cdgpy75k0hb4igc62qzkym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -58369,8 +56569,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; - rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de"; - sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc"; + rev = "4ce8878a0fc396ded7521ce38852d93e1d863065"; + sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/projectile-sift"; @@ -58428,12 +56628,12 @@ projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projector"; - version = "20170717.1151"; + version = "20171006.1258"; src = fetchFromGitHub { owner = "waymondo"; repo = "projector.el"; - rev = "ec63167ee21d537f410c0971f82e2ffdfd6fa008"; - sha256 = "155wnks7i73c3kvgysnfy0379d1fp78qv2b8lhsaxwx7jh356dbm"; + rev = "03751fca880c95cf47e560c78cfc2aaa056cd455"; + sha256 = "1yg9pcs6pbwd7a35q0jqjwnqwjqz4v5jd24msr51xh0v8kbs2v61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector"; @@ -58642,8 +56842,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "06aa8dc9e730cc39c67d0ff9c0c95e645ccf03c9"; - sha256 = "0na3apgapd78z57jfdwns35mflqgwjwbcj2lmspg9ipg0x191378"; + rev = "77f64bb7779ec2195f9bc4dc82497d12c18fc6b7"; + sha256 = "0176y1ikr6pi3paz4q588ka3c02al25fnbn0y09z10mi7nplrx85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -58680,12 +56880,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20170817.1206"; + version = "20170923.250"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "fb3040a1204c4a6f7a54abc499fb88074627cb3e"; - sha256 = "0fh2xv0rz5mkhqvcaj55wpx39f953qalz5v46v35nzmhc0fpmzab"; + rev = "e577f84b938a1fb461a016540b06f5d5e399526a"; + sha256 = "14q4bj7cfny1jwsvdjfsl88nhwh5al8hyvf4rxki9k2wim8lx2bv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; @@ -58711,12 +56911,12 @@ psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: melpaBuild { pname = "psci"; - version = "20170818.1301"; + version = "20170914.1048"; src = fetchFromGitHub { owner = "purescript-emacs"; repo = "emacs-psci"; - rev = "875ea3231e4aceadf7718daef75a1426ff8e87e5"; - sha256 = "11yihnlm7cawyhgava70xja8rf0gi6j1jf3z4x8ylf5wjj6fbbfc"; + rev = "47a0ba79e7284c71bebd8abe753246badeb1251d"; + sha256 = "1j2zbxk2d7yjpwhhv48j6qlsnmapk0858zrdiqpcicapddbsv66w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci"; @@ -58813,27 +57013,48 @@ license = lib.licenses.free; }; }) {}; - pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20170913.348"; + version = "20171007.1642"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "3a3bdf96e64dc6f5d031bf0ed2b6002a600187ad"; - sha256 = "02mx4gs8hlinrxm8jas9jy83kvglaqjz3sxn4m4hrrj07gz0si96"; + rev = "971ccf8d380965a5268e499a8c8785f2fcdef6f4"; + sha256 = "1zrs94vcp7yjz929x51243jf0lifb8kbxdzr3slkc5wbni5c5jk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85"; name = "pug-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/pug-mode"; license = lib.licenses.free; }; }) {}; + pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pulseaudio-control"; + version = "20171004.428"; + src = fetchFromGitHub { + owner = "flexibeast"; + repo = "pulseaudio-control"; + rev = "f542adc0585e7890c11e478bf193ef6f3b1f6eac"; + sha256 = "1h0li679pz683bsnbv08g8sr2q8slh12lad0v7qhyig1if3yh63w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control"; + sha256 = "1vdhg85lbdx7sj1xg2vhhfmhrrp5q2x560agnsb0gxi2akp6z9r0"; + name = "pulseaudio-control"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/pulseaudio-control"; + license = lib.licenses.free; + }; + }) {}; punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "punctuality-logger"; @@ -58900,12 +57121,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20170719.752"; + version = "20170928.1007"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "fb1b683191d767eab312ea424de3517062d86420"; - sha256 = "12kxxgm61myna4wf3hgai8dgrssc9dnv75fh2mbcgwqggbfv8wlv"; + rev = "e04f041386ebfe29fc67c3407e85b577b820df4f"; + sha256 = "0hcp7hmxri62qcx80zqphlhwrhzapzi0c07kk4l2cm75xfy20a2l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -58921,12 +57142,12 @@ purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "purescript-mode"; - version = "20161216.133"; + version = "20170926.242"; src = fetchFromGitHub { owner = "dysinger"; repo = "purescript-mode"; - rev = "c88126070c052d636f4dad5525846a1b200fce43"; - sha256 = "1ndclsywvh5x06gmvk44zjlgfamdn55lygdgxf3x1vrznvr0jawy"; + rev = "e2d6519a9669a1443db1040cf098bc3ea30ec861"; + sha256 = "1k8q32ipa684hvk7iwpdzqwikimw8g3j6gkmz9yi5fxflq6z1swr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode"; @@ -59360,12 +57581,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20170901.2053"; + version = "20170916.2024"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "54c05392e5a9523e34c7d54f8999632358f0ed89"; - sha256 = "0cxyz8b1djsdd0pxy15aamxx8j4vxvakinmrrwm3k6saqx8frmr9"; + rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a"; + sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -59490,8 +57711,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "e231a409a83a23c24c8b7dbbaca79314eee6d4c6"; - sha256 = "0xkbhd2cgsmqkbkscaa758ngfg01cdym7qgh809wsa0j6xf058lp"; + rev = "0b1b25a63f6d68a4dc21dbc47a0af79d3eed973e"; + sha256 = "0n3ihw3p61y46a8njq1ah5gxb26m13aawqsciy944l203s305845"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -59633,12 +57854,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170825.20"; + version = "20171005.1620"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "e0fab065042a7e35b73928e94f32f649eac6a3af"; - sha256 = "0vpzzfdr85zp2gsh148yp1b1aynwcgvva69r3qjj0cwm13f28492"; + rev = "93345f0531b03c5bb2bf34417e9c25fc6fcda6d9"; + sha256 = "016igycxn7h3gjklr24a7yhp49y4h55f4hpd05haq9raj7vaa6qf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -59696,12 +57917,12 @@ python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; - version = "20161029.531"; + version = "20171006.336"; src = fetchFromGitHub { owner = "wavexx"; repo = "python-x.el"; - rev = "ef749fe2d3e58d5f6d7f32453d06964786c085d5"; - sha256 = "1nncinrwh0nqy8wn1q8yzi15nf15gj576ccsp5l28951gjgkc6s9"; + rev = "9bf0d16cfe7b5f24b98d6b33cbc8763edaceb174"; + sha256 = "0x255lnfyv2i7yz6ipx5adazqmvgmf4mdcixzs1wv85gazmbgfc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x"; @@ -59738,12 +57959,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20170826.812"; + version = "20171005.1106"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "fc1e9c1fbac00460a32435390b94a8ce4f5542ce"; - sha256 = "0ckam3mkx44hrdykrhvm147xvw09rn328byl6dcpd3ygdqamwpdk"; + rev = "9f528449dfc35516647118689a2104603f23b49c"; + sha256 = "11yznfndkbyl6cmi7blxrr5yw9b32qw01abhvsj8jz1g1wnxhn45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -60095,12 +58316,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170913.509"; + version = "20170913.534"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "d57b3a6c64835fe334501bb2b1f8e370be777d90"; - sha256 = "11mh94lcmwh0qb68lyqmdkannq9p9y3j32mmwc23q88z1z7vvbf6"; + rev = "33877b1bb24faea68842e0396bd5718b84e47451"; + sha256 = "0681mzwx08zwbh8qg3s26jw1jn4fw2ljp1akxqkhy08sxhafqvb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -60200,12 +58421,12 @@ rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rainbow-delimiters"; - version = "20160430.2358"; + version = "20170929.432"; src = fetchFromGitHub { owner = "Fanael"; repo = "rainbow-delimiters"; - rev = "93cd2dc873e7fedca7abc599cd97d46db4376ac7"; - sha256 = "0vs9pf8lqq5p5qz1770pxgw47ym4xj8axxmwamn66br59mykdhv0"; + rev = "19b93892afa0494ba749c2ca9c154e04447ad778"; + sha256 = "0c2a8pbhzzy0bxx8gxz320r106k69hvwkn43j06i6sidbgjwh786"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2cf11dbff76f0e3581b865f48bb44a307aa7f23/recipes/rainbow-delimiters"; @@ -60242,12 +58463,12 @@ rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rake"; - version = "20161114.605"; + version = "20170921.801"; src = fetchFromGitHub { owner = "asok"; repo = "rake"; - rev = "e680f1a8f2591af7c80cad188340601b101b5ddc"; - sha256 = "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n"; + rev = "a27322262ebcce7765574b577000f6f939400206"; + sha256 = "1fzlll8s5vri5hmqsx5ilbrms73b0rsn3k6m5dgq6rhgn5z5k6r1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake"; @@ -60557,12 +58778,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "20170514.859"; + version = "20170915.1200"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "35129521d5b6035e5dd75d5b3481ce4971f46034"; - sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k"; + rev = "25cc3c8902f16191496b549705b00ffc7dff51f1"; + sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -60704,12 +58925,12 @@ real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "real-auto-save"; - version = "20150701.815"; + version = "20170918.730"; src = fetchFromGitHub { owner = "chillaranand"; repo = "real-auto-save"; - rev = "81bf61742ea553ccdee0e22d3abb43fcf07f82cf"; - sha256 = "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2"; + rev = "780d6c1c219e1f1efde1159a99af97b1c54c005d"; + sha256 = "1wcyvyc3nwr9a89v8i4wmqvy2fwf7x7f3kcj7a8kdnp2albkvwsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save"; @@ -60725,12 +58946,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170907.916"; + version = "20171006.1840"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "f41b7a7f8eac0be5c4d8780af1d461f9e51e9cad"; - sha256 = "1k3xsidc05dls9scsi7vvrrqlfgqk343crgh89amg066s5p55s6y"; + rev = "081f7edc79a8e510d47e10c6ce4306b2f850df1f"; + sha256 = "0nj95w5jfck0lhnrrnrl6h31cvgnpizbhnr52k7mf360vwrsjil6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -60875,25 +59096,6 @@ license = lib.licenses.free; }; }) {}; - recentf-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "recentf-ext"; - version = "20161210.840"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/recentf-ext.el?revision=5"; - sha256 = "0pzimhqkrdg2s9zw7ysir740cmaycf6fjs08bmlfjads7vdbjfpg"; - name = "recentf-ext.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5a36ac5e0fc3599d50d7926cacf16b7a315f0e76/recipes/recentf-ext"; - sha256 = "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq"; - 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"; @@ -60918,12 +59120,12 @@ recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recover-buffers"; - version = "20150812.5"; + version = "20171008.2137"; src = fetchFromGitHub { owner = "tripleee"; repo = "recover-buffers"; - rev = "a1db7f084977697081da3497628e3514e032b966"; - sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q"; + rev = "81a5cb53099955ebc2a411a44cba5a394ee3f2d1"; + sha256 = "07dfdvz5rn5l13xdycd7h75zaq0pw2afb9n1yiq01fqk6gvrhc5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/43b33cfb794c35de78fde6eabb71ffe01049d23d/recipes/recover-buffers"; @@ -61020,25 +59222,6 @@ license = lib.licenses.free; }; }) {}; - redo-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "redo-plus"; - version = "20131117.351"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/redo+.el"; - sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3"; - name = "redo+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/redo+"; - sha256 = "0v7nrn6fbjx4mb0xsnkvqxk2hp35wfy83si5bavwwym4jcb5pl2r"; - name = "redo-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/redo+"; - license = lib.licenses.free; - }; - }) {}; redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "redpen-paragraph"; @@ -61063,12 +59246,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20170903.911"; + version = "20171008.409"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "f96a5a50354cdc8a83b8fe347fafc49ad6c303a0"; - sha256 = "0pq0730b8nxm4xhb3dilnmp7lhv8vb83q7860dc64mds3fl12fg0"; + rev = "887d32fa14ec6e9e024e50077c119b95b22d91d3"; + sha256 = "1ibrqnnnsqplgx2hdj3jf8jcg3dwc01d50pkfb75wwi1w2xvsjmk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -61081,26 +59264,6 @@ license = lib.licenses.free; }; }) {}; - redshank = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "redshank"; - version = "20120510.1230"; - src = fetchgit { - url = "http://www.foldr.org/~michaelw/projects/redshank.git"; - rev = "f98e68f532e622bcd464292ca4a9cf5fbea14ebb"; - sha256 = "1jdkgvd5xy9hl5q611jwah2n05abjp7qcy9sj4k1z11x0ii62b6p"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f2cf21b79d47a4bc154ac15f8111794ca9eeac16/recipes/redshank"; - sha256 = "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b"; - name = "redshank"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/redshank"; - license = lib.licenses.free; - }; - }) {}; redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; @@ -61457,25 +59620,6 @@ license = lib.licenses.free; }; }) {}; - replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "replace-plus"; - version = "20170801.1947"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/replace+.el"; - sha256 = "0vlk2sjszzzkf94vfgb52ck4qbqp9ll1kdlxnmxixjxxl8iciwzj"; - name = "replace+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+"; - sha256 = "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn"; - name = "replace-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/replace+"; - license = lib.licenses.free; - }; - }) {}; replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-symbol"; @@ -61770,25 +59914,6 @@ license = lib.licenses.free; }; }) {}; - reveal-next = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "reveal-next"; - version = "20170101.1120"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/reveal-next.el?revision=7"; - sha256 = "0vqacr3q9n772qmyyj35dxkqp79yqrpfhlf8zj70jzg04xzy6f0m"; - name = "reveal-next.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/reveal-next"; - sha256 = "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2"; - name = "reveal-next"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/reveal-next"; - license = lib.licenses.free; - }; - }) {}; reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; @@ -61873,41 +59998,22 @@ license = lib.licenses.free; }; }) {}; - rfringe = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "rfringe"; - version = "20110405.820"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/rfringe.el?revision=1"; - sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh"; - name = "rfringe.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rfringe"; - sha256 = "16a647gvvn5nzgng7a8pam4ay6aifvhldaxg2xfz9fcafzkvw967"; - name = "rfringe"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/rfringe"; - license = lib.licenses.free; - }; - }) {}; - rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: + rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20170908.2359"; + version = "20170930.653"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "adfdf6230f02f469a1b508922b6837f95f6434d2"; - sha256 = "0bk0caadn3wq2ck2acyvdssllw45l455binpm5i3i63nzs73v8r2"; + rev = "1a4ebe8bf2e1052a1a8dde3dcbfedb802ca070fb"; + sha256 = "1lpb22ggw17d8bx2gjmaxqk5rbf64gh8llvf9shl18r813d3srrb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; name = "rg"; }; - packageRequires = [ cl-lib emacs s seq ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/rg"; license = lib.licenses.free; @@ -61983,8 +60089,8 @@ src = fetchFromGitHub { owner = "wavexx"; repo = "rigid-tabs.el"; - rev = "d48ba58acbe8934700cd23db2acb574b09306238"; - sha256 = "03dmyn5lnw0mj4ymgyxz6gksl2byw31plxn61qcggkj6gk8g500d"; + rev = "eba84ceaba2e57e76ad2dfbb7a7154238a25d956"; + sha256 = "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/689b0060ee5db505fc0ed4603aca204b2d3c63a2/recipes/rigid-tabs"; @@ -62000,12 +60106,12 @@ rimero-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rimero-theme"; - version = "20170819.648"; + version = "20171001.821"; src = fetchFromGitHub { owner = "yveszoundi"; repo = "emacs-rimero-theme"; - rev = "451b9d30f7ef711ee8c9c304677c7dcac6c57cfb"; - sha256 = "0442s4pj8v4ympf8nk1zgrvk3d16djgdhknlvkwi296db3zixbc4"; + rev = "2c15da5a4d56f1b29db2fc178d387eb86e7abd39"; + sha256 = "0pvykjz0a2jgq2dghhshc4w7852jrlk0vy35ppbn956yp7rq9sx3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme"; @@ -62105,12 +60211,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20170808.634"; + version = "20171009.608"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "39474fe464d76112e278445996cfd4ff84c39af8"; - sha256 = "11wz3gqdyb4ffsy9qdria0515ry643g3yjzidvaqccx6g59g4d5x"; + rev = "487ce00922571f84918e99ade678fe83d55bd6e0"; + sha256 = "1q396gzpqba7a4knnnx5pjwgbdh7r4q8ac7f81z9mp624w2zlgam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -62189,12 +60295,12 @@ rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rope-read-mode"; - version = "20170620.237"; + version = "20171003.719"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "bbb67d54a31ce238e4a8b1aae677ef055aea27ba"; - sha256 = "1l00km1rrnybskv0rv0kqxdrqimmfwz4mmil64m2d6vl0nqickb0"; + rev = "77b183a6f5450138388509f54a6a2ce442766e50"; + sha256 = "0ddm7gwr51ip8mc79jxkvp52sxhlvs0kyy59v7r7pf5mbadbpsbz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -62336,12 +60442,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170903.1710"; + version = "20171006.1343"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -62396,18 +60502,19 @@ license = lib.licenses.free; }; }) {}; - ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }: + ruby-additional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "ruby-additional"; - version = "20161115.2259"; - src = fetchsvn { - url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59866"; - sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr"; + version = "20171001.2106"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "ruby-additional"; + rev = "14f380893cb7c1d9ddbb4ed1a2fc280999c82fde"; + sha256 = "07mbjnph72l52f0bgz6qn5pbnfiyjx5p1ranq5g4csbfpx9jcc3s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional"; - sha256 = "1x5574swmch89jz2jiq6g34igp94bivzld0lb1nhyb1i3v1msq6i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/ruby-additional"; + sha256 = "1ivxn787k64q5jl0dxmxbj240ykcyvfhfam5fdvrwvc3yysk2dx7"; name = "ruby-additional"; }; packageRequires = [ emacs ruby-mode ]; @@ -62416,25 +60523,6 @@ license = lib.licenses.free; }; }) {}; - ruby-block = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ruby-block"; - version = "20131210.1931"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ruby-block.el?revision=12"; - sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq"; - name = "ruby-block.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2149ce3baef9ac01d5b2e8b1a933a3e1206015f/recipes/ruby-block"; - sha256 = "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm"; - name = "ruby-block"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ruby-block"; - license = lib.licenses.free; - }; - }) {}; ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "ruby-compilation"; @@ -62585,12 +60673,12 @@ ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }: melpaBuild { pname = "ruby-test-mode"; - version = "20170515.1008"; + version = "20171006.944"; src = fetchFromGitHub { owner = "r0man"; repo = "ruby-test-mode"; - rev = "740ff1a7c81eb8380fd0f0cdb7c32238acf13dd1"; - sha256 = "1a7lhx7ibh9rrxdamxwd107npnmsf9sxbksvy9rm8l3rnm8yjnvy"; + rev = "9a686e6e18ac2d56be41020ed9d0814cdfe86330"; + sha256 = "02m0kaw86p6qmn6jxcq6vqbbp2v57b2dnj75fqai1dz2f521dh0g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode"; @@ -62645,6 +60733,27 @@ license = lib.licenses.free; }; }) {}; + run-stuff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "run-stuff"; + version = "20170813.1957"; + src = fetchFromGitHub { + owner = "ideasman42"; + repo = "emacs-run-stuff"; + rev = "2e23a78c26f62141142c743febd57ec54c78c0e3"; + sha256 = "04m7hpda5hbmr0dni4cnpdjxwzk3sygpr5m158gswhbwh2p4r0j4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6e9ce2acd859b887f7e161f4b9969be1a0b8ef/recipes/run-stuff"; + sha256 = "0zx96m6cval5g4p0lhy9kpyycp2jygaq3y2njhkpij9gl4nb2ll2"; + name = "run-stuff"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/run-stuff"; + license = lib.licenses.free; + }; + }) {}; runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "runner"; @@ -62711,12 +60820,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170827.1300"; + version = "20170920.1919"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "c8280aea1d02ae84bff2a6f02f8dc7701309c8b6"; - sha256 = "105ayzqkcd8q2zhny1x84gdry6mfp92zfa8ihfqlfvva6ax6v1vp"; + rev = "eae291ab7b3e1a52e158261d1192ea1ca2b332f4"; + sha256 = "0g68yy281v232f3f8k9r16nqxlirkb52yca1wknng57addma4cjv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -62795,12 +60904,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20170906.1304"; + version = "20170922.900"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "3a95064647d1f39b90e65a56f1fdfceb7c329f75"; - sha256 = "0n2c6islny418pfmaz1bjij1j2s1qailga0vha32qanx4fx7yf3v"; + rev = "12f116d58ac03706496bd682c6449b452681874e"; + sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; @@ -62834,6 +60943,27 @@ license = lib.licenses.free; }; }) {}; + s12cpuv2-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "s12cpuv2-mode"; + version = "20170828.1901"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "s12cpuv2-mode"; + rev = "446696222fec364442fa7a52f523be10bb5cff68"; + sha256 = "1l8950p4bakgxwd61n9agiyi15s1l09r1rnrijl4dnyv6vxmwghl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6c1b9bbdc4deb17636270c7f2be0b43b647c695a/recipes/s12cpuv2-mode"; + sha256 = "0mrcf5s7vmkyrsdka7qd2vfcmdy8hzf6a6g14la88rxrv4chv29s"; + name = "s12cpuv2-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/s12cpuv2-mode"; + license = lib.licenses.free; + }; + }) {}; sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sackspace"; @@ -62904,8 +61034,8 @@ src = fetchFromGitHub { owner = "glynnforrest"; repo = "salt-mode"; - rev = "ea4980b9c9e8e7570086a2558fe7f66c62a528ad"; - sha256 = "0ygi9kzkfqzizygaqwqpymn8s7kr8ci38v61qmy4n58n9c19fdwx"; + rev = "a41c07660199cfad3f9dd928d5674d2727508035"; + sha256 = "0y7z4lfvhd1aiyhy0yhrx9jdjsy2k1di6y747rjmf0rlwcq2gb2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; @@ -63484,25 +61614,6 @@ license = lib.licenses.free; }; }) {}; - screenshot = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "screenshot"; - version = "20120509.405"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/screenshot.el?revision=8"; - sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw"; - name = "screenshot.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/24f113097db4cc27a2e9c7b9086af6d263e6fcb7/recipes/screenshot"; - sha256 = "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs"; - name = "screenshot"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/screenshot"; - license = lib.licenses.free; - }; - }) {}; scribble-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scribble-mode"; @@ -63569,12 +61680,12 @@ sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: melpaBuild { pname = "sdcv"; - version = "20170801.2216"; + version = "20171002.210"; src = fetchFromGitHub { owner = "stardiviner"; repo = "sdcv.el"; - rev = "ebe45a5fb1e465cb4150e4dbe38a069b2a218219"; - sha256 = "0pcbrzii9x7v3qqygr29yi6pg1gvzjbsgcfziispsf24n01lrrly"; + rev = "1aad9defb871dc07e27f603092bb81413be54cf2"; + sha256 = "1ij7inm1f59hmn9s1iqnywk1acfm0pqiim2s36vwrljy9lnb4ls8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; @@ -63671,25 +61782,6 @@ license = lib.licenses.free; }; }) {}; - second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "second-sel"; - version = "20170702.729"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=29"; - sha256 = "1yq06a04j44r019cjv2jb3kfpfqhnxdf3b4hhz4d3fz7v1hsicwg"; - name = "second-sel.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel"; - sha256 = "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr"; - name = "second-sel"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/second-sel"; - license = lib.licenses.free; - }; - }) {}; secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "secretaria"; @@ -63962,26 +62054,6 @@ license = lib.licenses.free; }; }) {}; - sequential-command = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "sequential-command"; - version = "20151207.1403"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sequential-command.el?revision=3"; - sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk"; - name = "sequential-command.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/31db031dc8712e89042d4ce80438a4267a241739/recipes/sequential-command"; - sha256 = "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1"; - 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"; @@ -64507,17 +62579,19 @@ license = lib.licenses.free; }; }) {}; - shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { + shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "shimbun"; - version = "20170503.1327"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; - module = "emacs-w3m"; - sha256 = "6ef1dd834a16cf3b8a0ec7a7412ae7410f0392d616eb3329f78011039384fc6d"; + version = "20171003.2158"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "w3m"; + rev = "284a4cdd394d2d52220c62c24ddbce00ea100471"; + sha256 = "1fnxb3fn6a25sn41isf3frja5iwxi98cbs7rvp9mkzb4jq3bhb89"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun"; - sha256 = "05dxdyh8xvbpjmc19q733jmjd6kgv8rdahjd3bw5wwsb3smqig4x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; + sha256 = "1rjykr0y5jfd6r3shm8x23yyra6qjsb55jrfc45rhpb89klyg1nk"; name = "shimbun"; }; packageRequires = []; @@ -64610,25 +62684,6 @@ license = lib.licenses.free; }; }) {}; - showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "showkey"; - version = "20170307.1528"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/showkey.el?revision=11"; - sha256 = "143889knvy6ifvq759869gbjfg10k10mi2by2hajcgzqhby72h61"; - name = "showkey.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/showkey"; - sha256 = "04lw32k1imvpfc4dr5pz11sx74982xr13hcyblvrz1zxhgixb1z1"; - name = "showkey"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/showkey"; - license = lib.licenses.free; - }; - }) {}; showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "showtip"; @@ -64758,12 +62813,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20170805.1619"; + version = "20171004.1113"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487"; - sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp"; + rev = "e53d798ba4a4c07a3ee1c194840c937b18c02087"; + sha256 = "0sig9gpa2wn23skwny9jpvwxax0gbwp143anvgkc5gm87iw2jgrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -64804,8 +62859,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; - rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de"; - sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc"; + rev = "4ce8878a0fc396ded7521ce38852d93e1d863065"; + sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift"; @@ -64947,12 +63002,12 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20170125.1910"; + version = "20171004.938"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "348483efea6ec2752bc5aa4028a16087d19b2809"; - sha256 = "191aq4zhg5a8g6ypkbh20rnqyk76lhxfhnq5ww0g5hzpig8srxaa"; + rev = "e7775d3bc5c6b73255814d0a62dc954e23a12c15"; + sha256 = "0pjhxhzzxrpcczwvd7b6a6q1nfmsr6m6mnlxn13nwf3r270grz87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -64986,26 +63041,6 @@ license = lib.licenses.free; }; }) {}; - simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }: - melpaBuild { - pname = "simple-plus"; - version = "20170307.1529"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/simple+.el"; - sha256 = "061vw3w8gl1lcjy67ina4w496i91addsl5s3xbffk2q6k1qhjsdi"; - name = "simple+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/simple+"; - sha256 = "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra"; - name = "simple-plus"; - }; - packageRequires = [ strings ]; - meta = { - homepage = "https://melpa.org/#/simple+"; - license = lib.licenses.free; - }; - }) {}; simple-rtm = callPackage ({ dash, fetchFromGitLab, fetchurl, lib, melpaBuild, rtm }: melpaBuild { pname = "simple-rtm"; @@ -65261,12 +63296,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170903.2004"; + version = "20170927.2004"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "5df0ea55257b2c1f3a4e4352af4854fb81dee5cc"; - sha256 = "0xrmsfi1nzm5yhmsxhn7xq87z70jkb68c3il4xf8r4lz6a0d8m4p"; + rev = "5fabc901a316569ab84edaf7ea3aa7143ab91796"; + sha256 = "076yk65wyqgcqd9w8d4pgada0hsdlb58gvcldhvirlqsbmvjp9wl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -65324,12 +63359,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170828.451"; + version = "20170929.1441"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "f223388c78ea51ce7717e9bbae14c50ad2386c2c"; - sha256 = "07jks9fnqjv2i9sjfpgj7r3a7g5aha4aipsffjbnw1qd930ygw83"; + rev = "c5fa94f86b61f3a14a7348b4fa001a0e1c62cef2"; + sha256 = "0y9n40knm1r3z0kx0xd5yda5191m5s2ibsxb2sa23qp1yj2qs6xm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -65366,12 +63401,12 @@ slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-docker"; - version = "20170718.1157"; + version = "20171004.1151"; src = fetchFromGitHub { owner = "daewok"; repo = "slime-docker"; - rev = "dc41f7c33de497bc622f037f33ea2a1ecfa1069f"; - sha256 = "169vy9wjkf0vzqgdbm30rssl82xl2n73hipnaidncbw9sd8cpx1y"; + rev = "13fa8be2fca516f3ff5fb70fa79dd8404bf86439"; + sha256 = "005zkypg2hkyzpkcv1rzfrmg8amg1bp0534y13xjqq3rz1p602bx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker"; @@ -65492,12 +63527,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20170912.445"; + version = "20170928.1829"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "ac50082050df5274a5d71e182abca0d0b0fe71d1"; - sha256 = "14cknfz1nnk82svdp92sq6cdpndd5d25l7fgd5zi2l4j5i57rj0b"; + rev = "6f7d1c5e5d51100c573f3e5b6d3eb1eabe3dfaa2"; + sha256 = "1684agg19nxc9mirpkr062z9ycri2d78nr9hg8y7kgkq814vbbsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -65953,12 +63988,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170913.130"; + version = "20171005.541"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "7d368051dec40e8e129d84bca5070bb7e83ad72a"; - sha256 = "1rbwjmp71wh234qrjss00xgcnh8jcha19lmz15nwrrwvpmmspg0c"; + rev = "456b78c5b7af52f84701aea0ad51a9d6d7de23d5"; + sha256 = "1b5mp87qjyjs0d2mn9rz0iy6qmdmhkb8699ddlbjxrmid2s8g73h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -66289,12 +64324,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20170430.1436"; + version = "20170920.1454"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "8a4da1125dd284e55139084d62fb29af5bcbcc20"; - sha256 = "1c85ycaqyrncp7pbax6mdnz1v91hpi1pc9jspd6irwhhs8b9jxfk"; + rev = "9a29ca3f5c7302a67f969b10defeb75e2fda688a"; + sha256 = "1hskg4llb0wfdmzgnanbvppbjj55zkifh2yan5rvzkkwma1vb2ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -66391,22 +64426,22 @@ license = lib.licenses.free; }; }) {}; - snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "snoopy"; - version = "20170730.1951"; + version = "20171008.1304"; src = fetchFromGitHub { owner = "anmonteiro"; repo = "snoopy-mode"; - rev = "8adce636376812df99bd79f3fbb3d9ec19a02351"; - sha256 = "04sq37bpvg6lqsqmjvdm9jzwrq4xhbakfzl5b2rcm3mlhzwnhs88"; + rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386"; + sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy"; sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi"; name = "snoopy"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/snoopy"; license = lib.licenses.free; @@ -66520,12 +64555,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20170831.1159"; + version = "20170924.1440"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "ae7bc3f102cff597092dad7fc0bfd49e1865b0cf"; - sha256 = "0d4cs7s2k5plf2ya0df72pvpf30xdhdbfybm0179dma4fw9fx0is"; + rev = "a2595627a793c57fa904ac210a6ca07fe1fef656"; + sha256 = "1q65mrarmqxsvc27flr6wy6v3yrmpw5i6hax95hh6y50zx3hfsd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -66541,12 +64576,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20170712.1442"; + version = "20171001.926"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "e4aa0190145d5cfad7d3f052ba44c88a1ebb6c7f"; - sha256 = "1dh2av9grij2v179vfr2pric6bxibxbg34ij3488ki9crc2zpv4y"; + rev = "d0a09c68912fcd03e384b0b2a9746f4e002d0df8"; + sha256 = "0zs16af2j6l0vypgikvs78x82cq8m5yfdfpi550cymkv7mjydj4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -66562,12 +64597,12 @@ sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }: melpaBuild { pname = "sonic-pi"; - version = "20170313.810"; + version = "20171002.343"; src = fetchFromGitHub { owner = "repl-electric"; repo = "sonic-pi.el"; - rev = "494981aa8f7828392a930ef8533698944738090e"; - sha256 = "1x9qn6b4nbld9v0r7vi3mg6w7nsa76pzyn1fl118n14a8kkc0is7"; + rev = "f4bb7abafea564c97d3b9a28b1b2c3858191674f"; + sha256 = "1xdv94k830a70hi8cmvv2gxzybk16cfsf5my8c1b2kw7041a074q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi"; @@ -66646,12 +64681,12 @@ sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }: melpaBuild { pname = "sotclojure"; - version = "20170512.612"; + version = "20170921.1708"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-clojure"; - rev = "84e2be5939c33d44f9518aea60cfccff4d6c9707"; - sha256 = "1jz3lscjq8xfkrx464a1s8vyggnh5sjl8jvq8dvx0w7blny2jvz8"; + rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32"; + sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure"; @@ -66905,12 +64940,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170823.1658"; + version = "20170918.1246"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "30b198ce87a92777f74e34ddee775b99d05b46c3"; - sha256 = "0a77y9njks44xx1c5j0cxpgkqwlz6lrzkbph3qwnbzkydnbyxgiy"; + rev = "7900aca87f9d96bd6ebaa62886e4ab135bf449b3"; + sha256 = "0kai39mqx0i2b46vcf5g2la8q65sp1pb8vnzfjwzv0qip4p9fd62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -67007,25 +65042,6 @@ license = lib.licenses.free; }; }) {}; - speck = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "speck"; - version = "20160717.951"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/speck.el?revision=12"; - sha256 = "0zn7gjrga1ly1za04jd4s61m1dwkyy960x7g3x9hn4szqvpcsvfa"; - name = "speck.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/speck"; - sha256 = "06x5543pwqazs4airj43208caw3sxw7zb148njbn33qgl09r1iv6"; - name = "speck"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/speck"; - license = lib.licenses.free; - }; - }) {}; speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speech-tagger"; @@ -67074,8 +65090,8 @@ src = fetchFromGitHub { owner = "parkouss"; repo = "speed-type"; - rev = "5d691f57743304db63b6afdc5bd79dabd282d390"; - sha256 = "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf"; + rev = "9940383d94688e7f130b01f9872182ab59edf00f"; + sha256 = "0gfiw3rmqyargc1prkrglmzvzxm03nszqqba1q9zd7cs0m315pmm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; @@ -67466,25 +65482,6 @@ license = lib.licenses.free; }; }) {}; - sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "sqlplus"; - version = "20170710.150"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=26"; - sha256 = "19lrk1a9d9ljdnsiar5cgmp68c26b6aihi3rbgf3d5bcg9iqbp7q"; - name = "sqlplus.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/41b1fc299cf8eeba1916a58ad8f50eb4560f0252/recipes/sqlplus"; - sha256 = "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz"; - name = "sqlplus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/sqlplus"; - license = lib.licenses.free; - }; - }) {}; sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; @@ -67635,12 +65632,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170907.305"; + version = "20170926.315"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "72a503394ee43023100a6f2624ad40a4325f5938"; - sha256 = "0ss1q3ywznkj180rndpi3zrcxz3bgm3a87wx194xyq5dzijaydw5"; + rev = "af7f33c85fe7d8e6c597fe5c674b1c7bf8ce2bfd"; + sha256 = "0n1h510v1bkq4yrmfyhih2721yagfb2slm97b0vpjfp3f94m2nvz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -67845,12 +65842,12 @@ steam = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "steam"; - version = "20160427.231"; + version = "20171008.1327"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "steam.el"; - rev = "a0547487ccf40aa582af3dd0d433a1b153d25246"; - sha256 = "142jamr8mi1nkjvivvkh2qgh5fch89xpg5wwi8q0b6hcqcsy8nqn"; + rev = "476da75cce7def2f3323e4a112a500728178e71e"; + sha256 = "1d23m611p001i846ypv9mz78hqn4wmjnh6cwa2yif9h6m44g1dsf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/steam"; @@ -67905,25 +65902,6 @@ license = lib.licenses.free; }; }) {}; - sticky = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "sticky"; - version = "20101129.1852"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sticky.el?revision=4"; - sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy"; - name = "sticky.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1c3a9689703b8c8edbffdc966cded9ea98fc8762/recipes/sticky"; - sha256 = "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w"; - 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"; @@ -68071,25 +66049,6 @@ license = lib.licenses.free; }; }) {}; - strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "strings"; - version = "20170307.1533"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/strings.el?revision=49"; - sha256 = "08sq20ys4xkkg11jyrnlzibl5v73i7zlnj28ygivy3sqvp07z7iz"; - name = "strings.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings"; - sha256 = "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk"; - name = "strings"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/strings"; - license = lib.licenses.free; - }; - }) {}; stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stripe-buffer"; @@ -68298,25 +66257,6 @@ license = lib.licenses.free; }; }) {}; - subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "subr-plus"; - version = "20170501.916"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/subr+.el"; - sha256 = "1vrs390vqcsjwzf6pzcvqjc3mliac66g7g5kifvz9zp0v3bq6x7d"; - name = "subr+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subr+"; - sha256 = "17i5sgsv8clh3pzpkv5zvhmm584m1rvsypd6nh6ks2jpidwgs8x1"; - name = "subr-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/subr+"; - license = lib.licenses.free; - }; - }) {}; sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; @@ -68383,12 +66323,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20170806.1414"; + version = "20171007.930"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "6ae090cab9bc16650c1788e83ccd2fe95a959de2"; - sha256 = "1rnp7zwr5j345l569zhpskf7g6bkg0jmplzjwy79rlv3h3d6rv4d"; + rev = "f9cd0db1c62073b5dacefad20483f181c2d8d019"; + sha256 = "0xhj6x1c9r69sw6xw9kdvdhkvmr000mnmw7ihqmy6fkar945046f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -68422,25 +66362,6 @@ license = lib.licenses.free; }; }) {}; - summarye = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "summarye"; - version = "20130328.327"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/summarye.el?revision=4"; - sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py"; - name = "summarye.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/85e28911e6b8173188f45331c6540681691223f2/recipes/summarye"; - sha256 = "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65"; - name = "summarye"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/summarye"; - license = lib.licenses.free; - }; - }) {}; sunny-day-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunny-day-theme"; @@ -68507,12 +66428,12 @@ super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "super-save"; - version = "20160426.729"; + version = "20171008.3"; src = fetchFromGitHub { owner = "bbatsov"; repo = "super-save"; - rev = "701c98eef4b9b21cd6cfd31f190f9988d32353aa"; - sha256 = "1frm90kssrp4s6x0g4vq4jkssh8rnrfjbgwa05igsjnsbnnfxxd1"; + rev = "1c8fbd5e18277e4af0ada2678a854b1c9072db38"; + sha256 = "0mh7xp71l9xybbv17b1rsbpa60bwjw79ql9krj1kzy2c2pv9hmff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9730b65787b26d3909952cf246a01bd349e5fbab/recipes/super-save"; @@ -68553,8 +66474,8 @@ src = fetchFromGitHub { owner = "TheSuspiciousWombat"; repo = "SusColors-emacs"; - rev = "8f5cdf8de5e58db838ef0e803b60b7d74fc2a889"; - sha256 = "1wc4l7zvb8zmh48cgrl7bkbyfj0sflzq28sc8jssghkcl2735cbg"; + rev = "b946e7924aa02fa7441c970026898f17fe97601f"; + sha256 = "0553fgiyjy2n3wa2agwzvadf6il85waf2vjpsy75ljj6lw8glhka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/suscolors-theme"; @@ -68672,25 +66593,6 @@ license = lib.licenses.free; }; }) {}; - swbuff-x = callPackage ({ fetchurl, lib, melpaBuild, swbuff }: melpaBuild { - pname = "swbuff-x"; - version = "20130607.314"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/swbuff-x.el?revision=9"; - sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5"; - name = "swbuff-x.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/42bac16fa83eb3df693835326444f4bd4255cf1d/recipes/swbuff-x"; - sha256 = "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y"; - name = "swbuff-x"; - }; - packageRequires = [ swbuff ]; - meta = { - homepage = "https://melpa.org/#/swbuff-x"; - license = lib.licenses.free; - }; - }) {}; sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; @@ -68715,12 +66617,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "20170909.430"; + version = "20170918.51"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "59dcd603848656c691f76cc5095ea354c307dbcf"; - sha256 = "127xx6qmxlh81pylrvx60d280ginms09qv24xv5g8lg08bi9zmkx"; + rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0"; + sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -68757,12 +66659,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170911.1036"; + version = "20170926.937"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "0a1d361b926291874124f8c63a653d83ead64a36"; - sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; + rev = "6827edffb70890f2e94c3d146ed129bde581992d"; + sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -68799,12 +66701,12 @@ switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-buffer-functions"; - version = "20160702.2157"; + version = "20171004.2056"; src = fetchFromGitHub { owner = "10sr"; repo = "switch-buffer-functions-el"; - rev = "4778a2bc9ecfb71bb2b6a65c7108260ec8f30a37"; - sha256 = "0xv57imh6w6kbh1i1ib9k9x2h01l4vdxs2i667a76ym6dmsjbx2x"; + rev = "ce61a74a88bf64afa699d20ed27b8be4cc63f80a"; + sha256 = "1bdcsgbnyabkrri296dgb5q42vjb1v0yji2la5ir6sfxmhw0mrb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d37ebd28f4a2f770958bd9a2669cce86cc76cbe7/recipes/switch-buffer-functions"; @@ -69027,25 +66929,6 @@ license = lib.licenses.free; }; }) {}; - synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "synonyms"; - version = "20170307.1537"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/synonyms.el?revision=63"; - sha256 = "0456mmp3niljpghqcngknqkrxmpkba3n95ab4pf0b0021z2zjyxk"; - name = "synonyms.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/synonyms"; - sha256 = "1b000scgba310i7w27c8wj0iflqqgwik524ql084wpqvikwqnlzm"; - name = "synonyms"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/synonyms"; - license = lib.licenses.free; - }; - }) {}; synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "synosaurus"; @@ -69088,22 +66971,22 @@ license = lib.licenses.free; }; }) {}; - syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20170907.6"; + version = "20171004.1037"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "143faf5ecd6388f4ea76d668b4814415befcf883"; - sha256 = "0dwanswsyxhi7izah9qm6jzl5yvfany62f5m80r9kfkhcq68hyx9"; + rev = "e2cd1f332d111b0e90d9a72f35bc969c7638b7cf"; + sha256 = "18fq9v1kb6bx0xxd1cic2f3gfwv82y4mjs5qg7q2ra1cz5d502w9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; sha256 = "19lrzxxyzdj1nrzdgzandjz3b8b4pw7akbv86yf0mdf023d9as1f"; name = "syntactic-close"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/syntactic-close"; license = lib.licenses.free; @@ -69195,12 +67078,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20170911.625"; + version = "20171006.1352"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "a3d39214b70c3dde0be12a53260e3fa470530ad6"; - sha256 = "1wvf7m6j73y0aavz14f0xjmqs7hxbw0ifzxw5hdvhsw8bsvagbmi"; + rev = "22f024fe8f433af7b6a6b99520cea1e766894fe5"; + sha256 = "11h1nr9gz0mw2gwlplv00i06s9ziw77a7zfcrrzd01rmanz1m4fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -69467,12 +67350,12 @@ tangotango-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tangotango-theme"; - version = "20150702.104"; + version = "20170924.809"; src = fetchFromGitHub { owner = "juba"; repo = "color-theme-tangotango"; - rev = "08c3b9270547970dbce2cb1e35e66f6ae380c8b2"; - sha256 = "11xb7xpmxvgv7mrjd2vlbjz3h5fa541aydv6bdxngjq6y3qn6wsp"; + rev = "e2f2ea9c35f06dfc43a29c91c14cf0cdb19f2144"; + sha256 = "01gvsvha8z7pyr8c33gh3xmz47lh6b8g0nwf1gzdiw1gd0sfhs4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebfcfa3ba4ca77443667a9478d59214810cd8cc2/recipes/tangotango-theme"; @@ -69513,8 +67396,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "f103ace956d5e7039cf0785d93c2956bd7bea4f4"; - sha256 = "0w82lzig3fy4p59rjj5dgi15mlmx6v4s6vm3z58rj65ql7qfzf88"; + rev = "a8fc8300481a1e033a3811ccda54e552392d1689"; + sha256 = "1lkldr6rr21f97vp6kms2ha8hsszhmba4sn07is4k55lpvlnxd49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -69933,8 +67816,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "terminal-here"; - rev = "5e440c33a1d24762477863af5c9b7a896df4be1b"; - sha256 = "0kqn3gzm5q37d2iz0wk2xcl7qlmqkblwy8zdc7plc6syldnh91aj"; + rev = "b17f82e894d5b0f77cea04a64c4f398124eb3290"; + sha256 = "0aawmlzy1w76lajz5lxaix793j3bni3fyb4sws3v765m1rxhnc5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; @@ -69950,12 +67833,12 @@ tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "tern"; - version = "20161222.850"; + version = "20170925.1333"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "cbbc2167cabc185c151fcfb32b2094b93b387422"; - sha256 = "02vwq91ra4yrx0davi6sri0hh7p3fbwwz8flqrk5kaxz1rwqgq20"; + rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd"; + sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -69975,8 +67858,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "cbbc2167cabc185c151fcfb32b2094b93b387422"; - sha256 = "02vwq91ra4yrx0davi6sri0hh7p3fbwwz8flqrk5kaxz1rwqgq20"; + rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd"; + sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -70136,6 +68019,27 @@ license = lib.licenses.free; }; }) {}; + tex-smart-umlauts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "tex-smart-umlauts"; + version = "20160427.58"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "tex-smart-umlauts"; + rev = "5261b931443558f4252489a1e6616034848aff02"; + sha256 = "1rq1l52mgbasgwvjwpivjrfjf8l8r85wdkfpbw8213449qh9c9zh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/tex-smart-umlauts"; + sha256 = "05q5mzl0pya682hdmjyp09hh121dc5y4d5vgqjffx3yfd5kgsy5w"; + name = "tex-smart-umlauts"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/tex-smart-umlauts"; + license = lib.licenses.free; + }; + }) {}; textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textile-mode"; @@ -70241,25 +68145,6 @@ license = lib.licenses.free; }; }) {}; - tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "tfs"; - version = "20120508.1120"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/tfs.el?revision=9"; - sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v"; - name = "tfs.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tfs"; - sha256 = "0h38qd1xhfd0my26i6w5j1jr91r5qal8x4bp7ij1cym72yxspna6"; - name = "tfs"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/tfs"; - license = lib.licenses.free; - }; - }) {}; theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-changer"; @@ -70323,64 +68208,6 @@ license = lib.licenses.free; }; }) {}; - thesaurus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "thesaurus"; - version = "20121125.1137"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thesaurus.el?revision=6"; - sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq"; - name = "thesaurus.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/thesaurus"; - sha256 = "1cnna27dlragk4w3f59xbrwppp49r010qdn7n3n7wvhibv3cfyd7"; - name = "thesaurus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/thesaurus"; - license = lib.licenses.free; - }; - }) {}; - thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }: - melpaBuild { - pname = "thing-cmds"; - version = "20170726.1355"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=58"; - sha256 = "07z49csdlrf08h8d8p9n8j492r22s7wgpzjwafppbsm4mvgshmq9"; - name = "thing-cmds.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds"; - sha256 = "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw"; - name = "thing-cmds"; - }; - packageRequires = [ hide-comnt ]; - meta = { - homepage = "https://melpa.org/#/thing-cmds"; - license = lib.licenses.free; - }; - }) {}; - thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "thingatpt-plus"; - version = "20170307.1539"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a"; - name = "thingatpt+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; - sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa"; - name = "thingatpt-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/thingatpt+"; - license = lib.licenses.free; - }; - }) {}; thingopt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingopt"; @@ -70472,8 +68299,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "1744cdcb674a20c554ae9f23cb95c0c8eff63b90"; - sha256 = "12zclwdqr1v2pbp0i4d5m2bgr7s20bm5yyjpakg61sx5nld2j9sg"; + rev = "9f9e30b51e3912c0b63258badf5501d3cb2550be"; + sha256 = "1pxjsql4d02igqzz4qk5mc1l8as9myfml28bg9q2bqcjsl6rh0s9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -70486,26 +68313,6 @@ license = lib.licenses.free; }; }) {}; - thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: - melpaBuild { - pname = "thumb-frm"; - version = "20170307.1540"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thumb-frm.el?revision=62"; - sha256 = "1mfz4gkq71sp9q7pa8q0md36g7x0dpsqz0np507dx2kypzqhklpd"; - name = "thumb-frm.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thumb-frm"; - sha256 = "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c"; - name = "thumb-frm"; - }; - packageRequires = [ frame-cmds frame-fns ]; - meta = { - homepage = "https://melpa.org/#/thumb-frm"; - license = lib.licenses.free; - }; - }) {}; thumb-through = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thumb-through"; @@ -70530,12 +68337,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170911.521"; + version = "20171008.2022"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "af6adf6170e23a44ba773e07899ec602ae659663"; - sha256 = "0y8kfibip9saa9mh1bhgnqjzkx0yyss1z1ssxq1qvndnq8sp4rpz"; + rev = "e5d1d3852aaf63cbfb0abaec1792a62bed024a72"; + sha256 = "1kwssyzbjwl2vyll0p49l57z41yv6k1jnzbsdnh0d1h81nixg5wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -70548,25 +68355,6 @@ license = lib.licenses.free; }; }) {}; - tidy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "tidy"; - version = "20111222.956"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/tidy.el?revision=9"; - sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa"; - name = "tidy.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bf079dbd04675ecd5f511b940d7cc5f80ccc94c4/recipes/tidy"; - sha256 = "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m"; - name = "tidy"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/tidy"; - license = lib.licenses.free; - }; - }) {}; tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }: melpaBuild { pname = "tile"; @@ -70852,12 +68640,12 @@ toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; - version = "20170518.451"; + version = "20171009.156"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "5a8a3f9b3a1440eb207a031685b7f4d77ef05b76"; - sha256 = "0cwc7l8vf6x62s7727a6zr099zxgbbgnqkb2y60js6bys2mxqv99"; + rev = "4d259c9cea3f575e5210974c025ebe3d51cc317f"; + sha256 = "04y7zib1wpxswkh7srxgh4bq25cpsybpi2aaynrwjms695ggh346"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -70873,12 +68661,12 @@ todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "todotxt"; - version = "20160919.2238"; + version = "20170919.1141"; src = fetchFromGitHub { owner = "rpdillon"; repo = "todotxt.el"; - rev = "c0d0e8320ba9284710d46941eaf6847f909b589e"; - sha256 = "08fd5lk1gq9clxhz5i81qm5f0a20yrx49iy13bx1p59gj20f1z41"; + rev = "afa4079f15f705a4fa34ea8e14b122e73028f285"; + sha256 = "07rhjxl8kvsjf23kxyl6xj51a2z1r66h4bsdsfj7nncavvybzqn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/todotxt"; @@ -71101,44 +68889,6 @@ license = lib.licenses.free; }; }) {}; - tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "tool-bar-plus"; - version = "20170307.1542"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/tool-bar+.el"; - sha256 = "09myj10ifjjc43invxbiinskv5xllkqvqfnzmc7893k2hp2miczm"; - name = "tool-bar+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/tool-bar+"; - sha256 = "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d"; - name = "tool-bar-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/tool-bar+"; - license = lib.licenses.free; - }; - }) {}; - top-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "top-mode"; - version = "20130605.1039"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/top-mode.el?revision=3"; - sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn"; - name = "top-mode.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/top-mode"; - sha256 = "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx"; - name = "top-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/top-mode"; - license = lib.licenses.free; - }; - }) {}; tornado-template-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tornado-template-mode"; @@ -71246,12 +68996,12 @@ traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; - version = "20170713.2320"; + version = "20170916.252"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "7a443ad17643060f9b4c2897abe185bb9221e304"; - sha256 = "1n91a8bdrji0kca38bh6jzwjfsg90jqqa47vvazsqk072fjjbnkr"; + rev = "bb9e86958a92cb5b6ca107f90d05c1890a47cf63"; + sha256 = "0vjql7z5wda701s63x1h5m6m02342dw1pylngbbxxs29d70mzybn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -71277,8 +69027,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "452dfb407b640ba6eb288ff25a9de27446a409c4"; - sha256 = "1yqnpvk5ib754bkb8gcd8skf0d3rqxkqwcsbibr052ilrp5ampcl"; + rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2"; + sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -71378,12 +69128,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170906.1911"; + version = "20171005.1043"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "de23122e2c1d0c184e2439dd142ddedb0eb043b3"; - sha256 = "0wa89zppxvr6cbaxn8qjdcqvnfsgq3bdzb45rbab8hwc4p8fv76f"; + rev = "c8be91596420ca8d79de44602d836aa6d1cbe2fc"; + sha256 = "1nbm3m00s5ayicqhymw1y2y7qck5m4sajw467cp4gnsq8qw6ri53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -71480,22 +69230,22 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170911.819"; + version = "20171004.631"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "b967e5ac38625992a19e42eb680892f4fa18e88f"; - sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3"; + rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; + sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a"; name = "treemacs"; }; - packageRequires = [ ace-window cl-lib dash emacs f pfuture s ]; + packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ]; meta = { homepage = "https://melpa.org/#/treemacs"; license = lib.licenses.free; @@ -71504,12 +69254,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20170625.1401"; + version = "20170925.2232"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "b967e5ac38625992a19e42eb680892f4fa18e88f"; - sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3"; + rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; + sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -71529,8 +69279,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "b967e5ac38625992a19e42eb680892f4fa18e88f"; - sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3"; + rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; + sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -71733,12 +69483,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170912.206"; + version = "20171008.1240"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "928ed2a5153094d772ad5a0831f4bd84e819755d"; - sha256 = "1844cqykzik3cn9wqas56h2mfh0wlxq53srdl6inx7j27mm1v7ga"; + rev = "3ef5d4c4cad10b63fac200ece4604bf7370994b7"; + sha256 = "09v32d9diky72hrixjqd5k5358wsvyyiwwawf99rziaa33qvyns9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -72024,25 +69774,6 @@ license = lib.licenses.free; }; }) {}; - typing = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "typing"; - version = "20121026.1418"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/typing.el?revision=13"; - sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31"; - name = "typing.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1bc0c7b53431a9d2bc41c9a7a755bdad0fa0f5cf/recipes/typing"; - sha256 = "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3"; - name = "typing"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/typing"; - license = lib.licenses.free; - }; - }) {}; typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typing-game"; @@ -72088,12 +69819,12 @@ typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typo"; - version = "20160121.330"; + version = "20171005.1045"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "typoel"; - rev = "f7d07cedf90ce65f226a66c428c0788d2bd7b912"; - sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk"; + rev = "73c8d960e9dcbb77a4ad6166b4685122a0f208ee"; + sha256 = "1zlnfjav11842am9n043j3hk23134hp92k1pg86jvnsj5mwmp9ij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo"; @@ -72148,25 +69879,6 @@ license = lib.licenses.free; }; }) {}; - ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ucs-cmds"; - version = "20170308.1512"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el?revision=23"; - sha256 = "072swg5iyx9n4xpdm65ydh2z7g11jqi3jjwkhcd7a389lavfqnbw"; - name = "ucs-cmds.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds"; - sha256 = "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1"; - name = "ucs-cmds"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ucs-cmds"; - license = lib.licenses.free; - }; - }) {}; ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }: melpaBuild { pname = "ucs-utils"; @@ -72251,25 +69963,6 @@ license = lib.licenses.free; }; }) {}; - unbound = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "unbound"; - version = "20160505.2355"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/unbound.el?revision=11"; - sha256 = "0awmzz9cfr17ggpzsgxqqhz5946l7705vvkfaiz7qx9wg0pbch18"; - name = "unbound.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/118e8df30e4caf2a5ef668af8970cfbfc2327004/recipes/unbound"; - sha256 = "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x"; - name = "unbound"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/unbound"; - license = lib.licenses.free; - }; - }) {}; uncrustify-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uncrustify-mode"; @@ -72805,25 +70498,6 @@ license = lib.licenses.free; }; }) {}; - usage-memo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "usage-memo"; - version = "20110722.851"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/usage-memo.el?revision=12"; - sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i"; - name = "usage-memo.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ae8f3adf42300fc0d8f0c5474edf839614d84978/recipes/usage-memo"; - sha256 = "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95"; - name = "usage-memo"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/usage-memo"; - license = lib.licenses.free; - }; - }) {}; use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; @@ -72831,8 +70505,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "360df30683a711c443f87e495ba14cdd125a505d"; - sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc"; + rev = "16abb66246170fe06325ff32a4889e4b51bfd979"; + sha256 = "1fav32ax7qykclvrimlf00pyp534yfngizm697mbr9346va1zqm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -73121,16 +70795,16 @@ vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-fossil"; - version = "20170811.1453"; + version = "20171008.1303"; src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "vc-fossil"; - rev = "0aceef306726815a84e304253711bb6d3bdf497b"; - sha256 = "1i50nyhb3qc404xilm5j31ifyrlh98mjxk98fl0gz1cpbygvklds"; + owner = "venks1"; + repo = "emacs-fossil"; + rev = "7bb3121ccd89f1533c6b91d5f952755b358eb0eb"; + sha256 = "1x2x59k3qxna32a8fjqb0vs6bykynii3i8qnlj770dn6drmnzlfd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/91f2e615c887f353a82deee75990609d0dc66bbe/recipes/vc-fossil"; - sha256 = "09pslw9gamjn1hly4l3bfci6rf4xw2xq42cr7na2rj0k8c1lvxcx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil"; + sha256 = "11ps2wrkjrjm1d984mf80wwj1hzskw5qrn0nv7md21lp75kxsvxb"; name = "vc-fossil"; }; packageRequires = []; @@ -73394,12 +71068,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20170701.1603"; + version = "20170928.822"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; - sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; + rev = "d4178edf27cfd54a473d10d5adfa819c748dc801"; + sha256 = "1cxfgb068sdlyr8i8r6hi0jm5capbsc58zrh5g7jyknya7z02ajp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -73587,8 +71261,8 @@ src = fetchFromGitHub { owner = "porterjamesj"; repo = "virtualenvwrapper.el"; - rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb"; - sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws"; + rev = "15af07004dba640df8202e76bea0b5dc82567f72"; + sha256 = "0ahlp3yfh1yxrlyyhjf9k4qssg2z3192dw4ab8lk62xnxq99bjln"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; @@ -73748,25 +71422,6 @@ license = lib.licenses.free; }; }) {}; - vline = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "vline"; - version = "20120108.445"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/vline.el?revision=17"; - sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj"; - name = "vline.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/aa860c2ccbaeb19d8b866919cdc45549d9cf9537/recipes/vline"; - sha256 = "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp"; - name = "vline"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/vline"; - license = lib.licenses.free; - }; - }) {}; vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vmd-mode"; @@ -73854,12 +71509,12 @@ vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vue-html-mode"; - version = "20170904.1017"; + version = "20170928.1057"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-html-mode"; - rev = "7358de66280435531dda4dd29dfbcef397edb628"; - sha256 = "0pqjlszacpwrkr41l27d8zlyjm25b38l94plqjy4qk4p5r2zivvg"; + rev = "9218c61ff1ab2bdc6a6711d21ad760198d3511a8"; + sha256 = "1xpbr2fajn0nk53abb2x9m0qs0ygxfl62gdxd2iqfcwj56fswj9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; @@ -73872,22 +71527,22 @@ license = lib.licenses.free; }; }) {}; - vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: + vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20170712.930"; + version = "20171004.744"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "a680998d5e597e91be2e7e15e88bd83856a13c84"; - sha256 = "1hmqwv4xdjmly1l4s1hkx1n28navnqy5nplas39pwywik2dlh2cs"; + rev = "3b3cbbf6cb89380a721584dd62528cf3568ad9c7"; + sha256 = "1nfxvfpiwqjyn6h53gwpifmrsv0l4az9fsv7mrvnvf67pk3jawg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0"; name = "vue-mode"; }; - packageRequires = [ mmm-mode ssass-mode vue-html-mode ]; + packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ]; meta = { homepage = "https://melpa.org/#/vue-mode"; license = lib.licenses.free; @@ -73914,37 +71569,19 @@ license = lib.licenses.free; }; }) {}; - w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }: + w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "w32browser-dlgopen"; - version = "20170309.1433"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el?revision=25"; - sha256 = "1fkkrqwhkg58jjjsjf0fzwabaaxarjylp22zng1id6hqfsm7r1cd"; - name = "w32browser-dlgopen.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32browser-dlgopen"; - sha256 = "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39"; - name = "w32browser-dlgopen"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/w32browser-dlgopen"; - license = lib.licenses.free; - }; - }) {}; - w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20170503.1331"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; - module = "emacs-w3m"; - sha256 = "6ef1dd834a16cf3b8a0ec7a7412ae7410f0392d616eb3329f78011039384fc6d"; + version = "20171003.2122"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "w3m"; + rev = "284a4cdd394d2d52220c62c24ddbce00ea100471"; + sha256 = "1fnxb3fn6a25sn41isf3frja5iwxi98cbs7rvp9mkzb4jq3bhb89"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m"; - sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; + sha256 = "0a4jql7ky62ickccbr2xnyggix5wf726d4pfz7mi3yxlw6i8m79s"; name = "w3m"; }; packageRequires = []; @@ -74081,12 +71718,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20170627.2306"; + version = "20170916.37"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "770d54fafb1a0a140b449e6132db22e70b4d6aa9"; - sha256 = "1f6h5n42fwwby880wikh8fdlk2zqimkl7wdb8wvr5kq1nqfqpz3f"; + rev = "0249c9b12dcd13df709441edff3c7fcc4efcb198"; + sha256 = "1xcxg24jwazkvc5afnqnmqisql6cr1brsmbb754a70a0r374965r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -74312,12 +71949,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170906.214"; + version = "20171002.1316"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "80e6de3b249c565506e29b2f1eca4104867f989d"; - sha256 = "127z1968znc6m1c5b819wjhiaxq6l6wkdhra5cwxfic4wzghdvbi"; + rev = "c15743454d0de944e5872a2ac4c9111d8cd61940"; + sha256 = "13hndf7ldw6nb2jkr3x1yxj374j2m116q0xl74ihk32vf8kb8j2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -74834,34 +72471,15 @@ license = lib.licenses.free; }; }) {}; - wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "wid-edit-plus"; - version = "20170309.1434"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/wid-edit+.el"; - sha256 = "0w2hjahcq68inabjbdyh3a0wcxd6pdgsp81iqcikxzfvwpzm35a9"; - name = "wid-edit+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wid-edit+"; - sha256 = "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv"; - name = "wid-edit-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/wid-edit+"; - license = lib.licenses.free; - }; - }) {}; wide-column = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wide-column"; - version = "20120814.112"; + version = "20170925.913"; src = fetchFromGitHub { owner = "phillord"; repo = "wide-column"; - rev = "0b382e7a3ceecafcea6c9e7e742fb6d11641b04b"; - sha256 = "0bq39sfipad16skh5q26gp7z24kk93hgnaxb378dzfq1306kmn8q"; + rev = "ce9ef4675485a7bea381077866368ef875226b10"; + sha256 = "0qh8hy4jl59bfg4323a8h4q4a78gn4hsglfk2h23hqssbv4mhsp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d29def44ae42dc4b60c1d254a57572bd09faf51/recipes/wide-column"; @@ -74902,8 +72520,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "7bc9ba691c838650bd74848c7ebf0bc1ed6c3f2b"; - sha256 = "18wwp5pp6s18f253xy9z2dhkxv7z3fxkgc8ayr3ypp8fskv78l34"; + rev = "597b3e1cab9f32591561a299670999260112afbe"; + sha256 = "1ndxd5s3raw4630zfxp5iz0mmnc6rrim6lgpzp4wjipb4zryjlnk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -74979,25 +72597,6 @@ license = lib.licenses.free; }; }) {}; - wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "wimpy-del"; - version = "20170309.1436"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/wimpy-del.el?revision=26"; - sha256 = "0impy9kp1xnhs0834azzndx93p8q53dxdqd9hz0n1mg0h8331c13"; - name = "wimpy-del.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del"; - sha256 = "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x"; - name = "wimpy-del"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/wimpy-del"; - license = lib.licenses.free; - }; - }) {}; win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "win-switch"; @@ -75145,34 +72744,15 @@ license = lib.licenses.free; }; }) {}; - window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "window-plus"; - version = "20170309.1437"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/window+.el"; - sha256 = "1l6fwrd2f58xpf7cprp354bq2fz0hvl9bz73hrbrzyqvnd9kix61"; - name = "window+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/window+"; - sha256 = "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j"; - name = "window-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/window+"; - license = lib.licenses.free; - }; - }) {}; window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: melpaBuild { pname = "window-purpose"; - version = "20170722.655"; + version = "20170920.15"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "00ddafcf4802e7430ca709769b888656a6eb421b"; - sha256 = "1c3jf1cxfvja1v323wkxkd67n9nwzb57c79x4m010h2700xim8vs"; + rev = "44d31e373ce95d133c560169eb225d2c16a32b7b"; + sha256 = "0wpndc2p4pcq1z07r659pxv0db1g6hqkgdivjs5dxc75sb3mrrmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; @@ -75234,8 +72814,8 @@ src = fetchFromGitHub { owner = "dgtized"; repo = "winnow.el"; - rev = "cbc06fb51883212a5169d33a689d14cd7b0a7c34"; - sha256 = "1hprii3da7y758ihlv308hg9sbcn42jn2f6g4dzb30ql5g2vxcnr"; + rev = "18cb6b94338f3b7b4f2cd0331dad22f82dd9e0d3"; + sha256 = "1wp00zxxcibvl6vjwmvhkgcbi76dyb2g8c30wy4kp7876cpc8hgv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58891c2057ec834f999e3bf82af15e0617a4d4cf/recipes/winnow"; @@ -75317,8 +72897,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "7ce954278aef"; - sha256 = "116cspnc4lhf6gk73yr9sy7013jp88vq5zayghzgnkbdlaw6zmz3"; + rev = "4d41c0814bbc"; + sha256 = "1xy9a27qdl7hm7x2gbhxql63paxi16441rczl2i8ps032l4ffdnj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -75355,12 +72935,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20170817.1240"; + version = "20171006.352"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "241726118dee067a8d9880d53c6a781d580ba8a1"; - sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x"; + rev = "ee39f232f2daf997498a4030d104c35ae397f457"; + sha256 = "17m5b7g5sdh0iy6lpj2inv9akscyw83nyx9hl71disdk7diq15hn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -75401,8 +72981,8 @@ src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "with-simulated-input"; - rev = "d0f779594243fe85e330fd3f47caeb80068f7134"; - sha256 = "1iadgd99n1ilrdvybbrxj0f8n50sz76j3bji2nfpn3w32krj90w4"; + rev = "af9a38ce28a741e6d8742750bef5d7b5afa13796"; + sha256 = "0iann7zi9bgd3vmvxvg2n6x24hkyzbchbli1ymsmfrn8rif9byf7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; @@ -75457,27 +73037,6 @@ license = lib.licenses.free; }; }) {}; - wolfram-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "wolfram-mode"; - version = "20170221.120"; - src = fetchFromGitHub { - owner = "kawabata"; - repo = "wolfram-mode"; - rev = "d27a0f23791abde2bdda22e50108b99f11c13ed7"; - sha256 = "0r82h3x1ggirgd0a03qr71pdcxgkc4s3307ggwy86j4asd308m79"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/299fe35d0a5a11d20f0b917bc8f406bd0f011c93/recipes/wolfram-mode"; - sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf"; - name = "wolfram-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/wolfram-mode"; - license = lib.licenses.free; - }; - }) {}; wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }: melpaBuild { pname = "wonderland"; @@ -75544,12 +73103,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20170818.1105"; + version = "20171002.1118"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "bf812a47e44dfbf4e166dbdbed7a97197bc1fc1d"; - sha256 = "11miqpdg0v27fi6ksrqkqfyi2qrsgsv8jsqfw15nyhqmi3sgxzqh"; + rev = "cf2f382b368bcb3c8ba4785a7fac8ee9300e80b5"; + sha256 = "0rnvmwdks8m4f6dwnyinv9rli58mlvlnrg7swpdjfh0g3bqgr7w5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -75670,12 +73229,12 @@ writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "writegood-mode"; - version = "20160802.1405"; + version = "20170925.647"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "writegood-mode"; - rev = "a99896531a260db11acb931b68dbdc45030832d7"; - sha256 = "15g133ql8mgjchm6h255q77b6rks843lzva44kgjmfgwmgbfmc1b"; + rev = "416453af5a44da52646052fa2ee3a63acfd7bf8a"; + sha256 = "08z35gc3j25h02jmlkzsis4n7a6sy6zy2qykcnp8b3s8y51d0dg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode"; @@ -75863,8 +73422,8 @@ src = fetchFromGitHub { owner = "jobbflykt"; repo = "x509-mode"; - rev = "a34584f310f3d8afe57dc1950db52b2d079242b8"; - sha256 = "07z0iyz7zgypqjv6izpdccllwrp7jgc86279rk0blf0vazj2927h"; + rev = "240b5045dcce18190bdabd91d74f48d3610a6fe2"; + sha256 = "0pi5hi0n6f2hif5hz1g04rk509rb4jlw6nrlhc8fg5k6x4n7ci3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode"; @@ -75964,12 +73523,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170905.840"; + version = "20171009.422"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "0d0b3b96401af0d1e4ddea2713218bee08ab6a04"; - sha256 = "09iyf2xrp3scxr67jm3gl067kb8vsrnrqdwz2sv6la41n04s9lm3"; + rev = "15dc0360011eb8ec542db5e8e5bdfa1147366557"; + sha256 = "0n8j36q16njkcyr23qc8zx19wn4qx7pjiankimgjp96bcxsfa9df"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -76150,6 +73709,27 @@ license = lib.licenses.free; }; }) {}; + xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "xcode-project"; + version = "20170922.612"; + src = fetchFromGitHub { + owner = "nhojb"; + repo = "xcode-project"; + rev = "ec5d503a51430205daa6f5f382d921b6412b4b55"; + sha256 = "0m3262mqqhjcpzw8m4n403kr75m561kxvwf8clzwmv0fvkf8aazk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project"; + sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi"; + name = "xcode-project"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/xcode-project"; + license = lib.licenses.free; + }; + }) {}; xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xcscope"; @@ -76619,8 +74199,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "09b18f248c957f74d219a6d1127923e9c786d650"; - sha256 = "05hg6andy8wxrsxf939g77v6ml4rac239vkkfk0fh6723wgiz144"; + rev = "18ee56bd687238be2bb6834062be3f04d9e9a283"; + sha256 = "13a6qy22jwyxrlcxw2xmqw3dckzlkxa84babdwrgpdx7kx4hqa5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -76759,25 +74339,6 @@ license = lib.licenses.free; }; }) {}; - yaoddmuse = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "yaoddmuse"; - version = "20170325.1752"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el?revision=104"; - sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6"; - name = "yaoddmuse.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaoddmuse"; - sha256 = "1p68f3xjv55m8lnq5x27b8y87mq685hpm3n9kiga9qq8wxdf2rnf"; - name = "yaoddmuse"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/yaoddmuse"; - license = lib.licenses.free; - }; - }) {}; yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yapfify"; @@ -76907,12 +74468,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170828.1908"; + version = "20170923.1646"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "89eb7ab64d67e96646576dc0d551e8c23d50438a"; - sha256 = "1wr0d14yl3440hkdr436zxl9pk7nqhl76n9m3b3ia4lp6z5aj4jc"; + rev = "35a4df769cbdebd10d043f16d680bdb16ee858ed"; + sha256 = "0rkk39bm12d3d4gf8r99a2ipjaf1yb0b57rpg44bsqz5jada4a86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -76928,12 +74489,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20170908.435"; + version = "20171006.918"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "5c3bb7ad8f659cb6651cc9c90709528672dd2ad0"; - sha256 = "1nbkgmqgrih99jgpzvmy0h8vdjgkrml9ck9wi19vw80d62b8m9p8"; + rev = "29ce99b8412ef919b7f03f259a877c4111362410"; + sha256 = "0xq3vjlsm4fvk809r69bln8i7fkqx49xi1gk1nff0v8y5b26vnxp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -76967,6 +74528,25 @@ license = lib.licenses.free; }; }) {}; + yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "yatex"; + version = "20170916.1826"; + src = fetchhg { + url = "https://www.yatex.org/hgrepos/yatex/"; + rev = "ca7cf34e959c"; + sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; + sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + name = "yatex"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yatex"; + license = lib.licenses.free; + }; + }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -77012,12 +74592,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20170723.1458"; + version = "20171009.702"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; - sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; + rev = "dfb0b02d0e19a05c8712d1877834a3eaafe453d4"; + sha256 = "10w5194lj6s5bvwl9r9zgw479f2a1i4lx87954xymcbridbcih6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -77166,26 +74746,6 @@ license = lib.licenses.free; }; }) {}; - zeitgeist = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "zeitgeist"; - version = "20131228.1009"; - src = fetchgit { - url = "https://anongit.freedesktop.org/git/zeitgeist/zeitgeist-datasources.git"; - rev = "cdd1c219ed3afa9500403c3c499f49583d599034"; - sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/zeitgeist"; - sha256 = "0zbpmdf7fq3qph70m13giir58y1n5z6q6kqixjll5j4fk98k6bkz"; - name = "zeitgeist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/zeitgeist"; - license = lib.licenses.free; - }; - }) {}; zen-and-art-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zen-and-art-theme"; @@ -77272,12 +74832,12 @@ zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "zephir-mode"; - version = "20170906.320"; + version = "20170917.2125"; src = fetchFromGitHub { owner = "sergeyklay"; repo = "zephir-mode"; - rev = "6b54967c76244ba18040deffd52c03caa8fff49d"; - sha256 = "0a48p08m1kdz1wxmwdcvv8lbph0by3lmxz4ccr6jrfsw3gxnixff"; + rev = "c2c6b7451667e68e29c353616f54ef9195c3fffd"; + sha256 = "1h5iv0ggh4jzv180mg8lz72d91b6kcqwy6ypgy3rn50bk6pz06kg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; @@ -77293,12 +74853,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20170830.57"; + version = "20170928.827"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "37ec068e6a744274daf1ecd1a64b75db6a7b8a0c"; - sha256 = "1yh1n6647a3fppjhhbs6ir7vgqn6nqhpghwnhlrl3amp74h6di78"; + rev = "248e95616304e4eb1adde458bbb59442c11d1cb9"; + sha256 = "1bckvqfid2acmn5xcxzflid7hqhflsjw51r9gws3vxb9hpj5qqyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -77311,6 +74871,27 @@ license = lib.licenses.free; }; }) {}; + zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zig-mode"; + version = "20170920.802"; + src = fetchFromGitHub { + owner = "AndreaOrru"; + repo = "zig-mode"; + rev = "814657c5b6b0600ace78a7bbd216c3e90d611cfd"; + sha256 = "0nhx2wsk3qpdplvwxmdzwlka9255x46ca9vcjb58zbpb5wbfckzx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/33895b0ff559ffd18a62c04736597188f55419ee/recipes/zig-mode"; + sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09"; + name = "zig-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/zig-mode"; + license = lib.licenses.free; + }; + }) {}; zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zlc"; @@ -77479,63 +75060,24 @@ license = lib.licenses.free; }; }) {}; - zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "zones"; - version = "20170802.1406"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/zones.el?revision=32"; - sha256 = "02vvkj2nx5ha1ad1zn5jd91jakxwx1pkrysj07a8y2sg657d7nkk"; - name = "zones.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zones"; - sha256 = "1l4qilawlgvanrz4ny4aaqzg011dlqh65g06d44pf6ha586rvzp2"; - name = "zones"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/zones"; - license = lib.licenses.free; - }; - }) {}; - zonokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "zonokai-theme"; - version = "20160321.1925"; + pname = "zoom"; + version = "20171008.1325"; src = fetchFromGitHub { - owner = "ZehCnaS34"; - repo = "zonokai-emacs"; - rev = "38ee819b711e848437ba6d563594129a0ecac598"; - sha256 = "16ni0va1adpqdnrkiwmpxwrhyanxp5jwbknii2wnbhgq62s7gv43"; + owner = "cyrus-and"; + repo = "zoom"; + rev = "a78361f6db1753ad749f5b865f2076579a276971"; + sha256 = "1c2ww8a6q64w486hb0gp18hcxvxyjjw3qpkwqkx7rfj5smy12zim"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/80c7b1e01eb23f2f9b71fbeeea7d54ac36bae992/recipes/zonokai-theme"; - sha256 = "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29"; - name = "zonokai-theme"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; + sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls"; + name = "zoom"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/zonokai-theme"; - license = lib.licenses.free; - }; - }) {}; - zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: - melpaBuild { - pname = "zoom-frm"; - version = "20170309.1439"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/zoom-frm.el?revision=44"; - sha256 = "03f3clivm7nfgg16k9pcshdwbwmjaqk0lcdm9d0180dl1c1z2wvs"; - name = "zoom-frm.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm"; - sha256 = "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk"; - name = "zoom-frm"; - }; - packageRequires = [ frame-cmds frame-fns ]; - meta = { - homepage = "https://melpa.org/#/zoom-frm"; + homepage = "https://melpa.org/#/zoom"; license = lib.licenses.free; }; }) {}; @@ -77668,11 +75210,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: melpaBuild { pname = "zpresent"; - version = "20170730.2055"; + version = "20171008.2152"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "33b840f663b7"; - sha256 = "1g9x257bg9mgg1impyk5s8lfhr4qmqf1fzc7iwfdzizvzmgdlas1"; + rev = "eb6f5bf71b00"; + sha256 = "1q3xz4gwqb7ac49w0nq7zvl4n790wk6r97by1kldv54y2fj0ja9g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; From 4f6ce0d07780f05bd17c34c726565a804804362a Mon Sep 17 00:00:00 2001 From: Arda Xi Date: Wed, 11 Oct 2017 13:51:12 +0200 Subject: [PATCH 1007/2806] geoclue2: 2.4.3 -> 2.4.7 --- pkgs/development/libraries/geoclue/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 34da3c1f372..b6e74a49cec 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "geoclue-2.4.3"; + name = "geoclue-2.4.7"; src = fetchurl { url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; - sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd"; + sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi"; }; nativeBuildInputs = [ From db8a4a4ef5644652bba98243805323eb7bf10404 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Oct 2017 14:18:05 +0200 Subject: [PATCH 1008/2806] nixUnstable: 1.12pre5619_346aeee1 -> 1.12pre5639_fda7b95c --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e90f71780eb..21dffd539cd 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5619_346aeee1"; + suffix = "pre5639_fda7b95c"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "346aeee1cb21b5cab5ddc3e8658c88321f513761"; - sha256 = "0lyrs0mqnh89w1nzrqpxvnh7bdjpg8j22xaidql47f1nwbblmn3f"; + rev = "fda7b95cb08c447a7ee4ec18ea3574d76e6264df"; + sha256 = "1ynrhxc21s7i9hl13bb6ajzf8ypr10j2kzq5vmcamncf5aq0s9q8"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; From 70c3f56bdd37b58f6dfd1a61403835233339819b Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Wed, 11 Oct 2017 11:18:28 +0200 Subject: [PATCH 1009/2806] nixos/locatedb: fix first run when /var/cache doesn't exist by using systemd-tmpfiles. Also document what's happening there. --- nixos/modules/misc/locate.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 9b8a54719e4..51953d1110c 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -125,13 +125,16 @@ in { warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support searching as user other than root" ++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component" ++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts"; - + + # directory creation needs to be separated from main service + # because ReadWritePaths fails when the directory doesn't already exist + systemd.tmpfiles.rules = [ "d ${dirOf cfg.output} 0755 root root -" ]; + systemd.services.update-locatedb = { description = "Update Locate Database"; path = mkIf (!isMLocate) [ pkgs.su ]; script = '' - mkdir -m 0755 -p ${dirOf cfg.output} exec ${cfg.locate}/bin/updatedb \ ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} @@ -148,6 +151,11 @@ in { serviceConfig.PrivateNetwork = "yes"; serviceConfig.NoNewPrivileges = "yes"; serviceConfig.ReadOnlyPaths = "/"; + # Use dirOf cfg.output because mlocate creates temporary files next to + # the actual database. We could specify and create them as well, + # but that would make this quite brittle when they change something. + # NOTE: If /var/cache does not exist, this leads to the misleading error message: + # update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory serviceConfig.ReadWritePaths = dirOf cfg.output; }; From e1b74291bd218a0e943a7f13d4ae9dc7f36b2200 Mon Sep 17 00:00:00 2001 From: Arda Xi Date: Wed, 11 Oct 2017 13:51:31 +0200 Subject: [PATCH 1010/2806] geoclue2: Add glib_networking and wrapGAppsHook geoclue2 without GNOME requires glib_networking in order to make HTTPS connections to location providers. Additionally, geoclue2 crashes if an NMEA provider is found on the network without GSettings support. Also moved intltool to nativeBuildInputs as per good practices. --- pkgs/development/libraries/geoclue/2.0.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index b6e74a49cec..64d61d64bb6 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip -, dbus, dbus_glib, modemmanager, avahi +, dbus, dbus_glib, modemmanager, avahi, glib_networking, wrapGAppsHook }: with stdenv.lib; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkgconfig intltool wrapGAppsHook ]; buildInputs = libintlOrEmpty ++ - [ intltool glib json_glib libsoup geoip + [ glib json_glib libsoup geoip dbus dbus_glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - propagatedBuildInputs = [ dbus dbus_glib glib ]; + propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; From 5dda1324be421c1a2afd5a559a87f97691287003 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 11 Oct 2017 13:50:20 -0400 Subject: [PATCH 1011/2806] linux-hardened: Disable GCC_PLUGIN_RANDSTRUCT --- pkgs/os-specific/linux/kernel/hardened-config.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 75c06390f75..3744c28e204 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -97,11 +97,6 @@ ${optionalString (versionAtLeast version "4.11") '' GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin ''} -${optionalString (versionAtLeast version "4.13") '' - GCC_PLUGIN_RANDSTRUCT y # A port of the PaX randstruct plugin - GCC_PLUGIN_RANDSTRUCT_PERFORMANCE y -''} - # Disable various dangerous settings ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory PROC_KCORE n # Exposes kernel text image layout From 20487112ed9cbc3fe0d5b92e0b861a7c09a33735 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 11 Oct 2017 20:01:45 +0200 Subject: [PATCH 1012/2806] nixos: Fix output path generation of runInMachine Regression introduced by a02bb00156086b45e68c1112008db506734f8649. The fix is done by disabling writableStore, because the latter will set up an overlayfs on the Nix store within the VM, which in turn will discard all the outputs of the resulting output path. However in runInMachine we actually *want* the contents of the generated path and also don't want a writable store within the VM (except of course for $out, which is writable anyway). I've added a small regression test to verifify the output in nixos/tests/run-in-machine.nix to make sure this won't break again in the future. Signed-off-by: aszlig --- nixos/lib/testing.nix | 1 + nixos/tests/run-in-machine.nix | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 58c447c76db..9339ba78ff0 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -149,6 +149,7 @@ rec { { key = "run-in-machine"; networking.hostName = "client"; nix.readOnlyStore = false; + virtualisation.writableStore = false; } ]; diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix index d1102f8d407..a6dfece44a9 100644 --- a/nixos/tests/run-in-machine.nix +++ b/nixos/tests/run-in-machine.nix @@ -2,7 +2,16 @@ with import ../lib/testing.nix { inherit system; }; -runInMachine { - drv = pkgs.hello; - machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ }; -} +let + output = runInMachine { + drv = pkgs.hello; + machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ }; + }; +in pkgs.runCommand "verify-output" { inherit output; } '' + if [ ! -e "$output/bin/hello" ]; then + echo "Derivation built using runInMachine produced incorrect output:" >&2 + ls -laR "$output" >&2 + exit 1 + fi + "$output/bin/hello" > "$out" +'' From 847beb558f858d7270a8e9e87db074bc0978aa9b Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Wed, 11 Oct 2017 20:12:58 +0200 Subject: [PATCH 1013/2806] nixos/firewall: Rename misleading rejected to refused in logging as that's used as general term for rejected or dropped packets in the rest of the config. --- nixos/modules/services/networking/firewall.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 68a814b2305..9bd88ca1707 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -95,18 +95,18 @@ let ip46tables -N nixos-fw-log-refuse ${optionalString cfg.logRefusedConnections '' - ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: " + ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "refused connection: " ''} ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \ - -j LOG --log-level info --log-prefix "rejected broadcast: " + -j LOG --log-level info --log-prefix "refused broadcast: " ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \ - -j LOG --log-level info --log-prefix "rejected multicast: " + -j LOG --log-level info --log-prefix "refused multicast: " ''} ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse ${optionalString cfg.logRefusedPackets '' ip46tables -A nixos-fw-log-refuse \ - -j LOG --log-level info --log-prefix "rejected packet: " + -j LOG --log-level info --log-prefix "refused packet: " ''} ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse From 6a046500e67d78bec7209c458f5a9927d3345fd8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 11 Oct 2017 14:39:54 -0400 Subject: [PATCH 1014/2806] vscode: 1.17.0 -> 1.17.1 --- 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 02b8d991eae..b5b2a49c42b 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.17.0"; + version = "1.17.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1s6nkzdsgfn5x7y91bwb6d7sw4b8s335myc0yhbsfpfks5pgi331"; - "x86_64-linux" = "1av7xcb2sig5p344y2v1zjspg5nl9bds03r1yvgssm7mcy9l1gqk"; - "x86_64-darwin" = "1fn9i5vs4b6xir51zavx7i8m68bwqa1hfr03aagy8byg9v8w5dx8"; + "i686-linux" = "09nvibfn2z5cxjcdxqa2xy63jqwpvfgk7hdy1pc0mnpszz6kn4v7"; + "x86_64-linux" = "1fb3hil7dggnz7hks1i806ckd3wl5g0a2syjdbh9dx5iqarp2782"; + "x86_64-darwin" = "1vgbsmbcsdxc0h0ny61a3rhbwxzrfzkxl47sy3w410xcqlv8ad2v"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From 5b53ebd0a94cf7d6e3cf1dafcd9e3b3f1d0c05ae Mon Sep 17 00:00:00 2001 From: dupgit Date: Wed, 11 Oct 2017 20:51:01 +0200 Subject: [PATCH 1015/2806] Adds dupgit to the maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cf1c9786534..669abee6d59 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -171,6 +171,7 @@ drewkett = "Andrew Burkett "; dsferruzza = "David Sferruzza "; dtzWill = "Will Dietz "; + dupgit = "Olivier Delhomme "; dywedir = "Vladyslav M. "; e-user = "Alexander Kahl "; ebzzry = "Rommel Martinez "; From 67ae0fa051580e01508e6953624865a42abf8a53 Mon Sep 17 00:00:00 2001 From: James Edington Date: Wed, 11 Oct 2017 14:19:37 -0500 Subject: [PATCH 1016/2806] palemoon: 27.4.2 -> 27.5.0 27.5.1 is "out", but there is no GitHub Release (Although, this shouldn't be an issue since it was mostly Win10-only changes anyway) --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 4f179c29996..d5e6e47e928 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.4.2"; + version = "27.5.0"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "155c1a76kkx9p8cnz9d33xx30asjr32x10cccx0gyq1lm1b9ffbl"; + sha256 = "0m4fgwxn6hs8r240i6acaajx76cvqy1b7cqmdsxd33qpjrrj1h9d"; }; desktopItem = makeDesktopItem { From ed09240fccf0f06149c45e67ba443b53a99f1ba0 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Wed, 11 Oct 2017 20:22:30 +0100 Subject: [PATCH 1017/2806] babl: 1.2.8 -> 1.3.4 Motivation for change: GIMP 2.9.6 requires at least BABL v1.3.0 --- 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 54a84487671..133b39d0797 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.28"; + name = "babl-0.1.34"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "00w6xfcv960c98qvxv81gcbj8l1jiab9sggmdl77m19awwiyvwv3"; + sha256 = "0nwakj313l2dh5npx18avkg4z17i2prkxbl6vj547a08n6ry1gsy"; }; meta = with stdenv.lib; { From a0da5f3bcf3a1277d5148cfebb7b181c0019a38e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 11 Oct 2017 22:46:38 +0000 Subject: [PATCH 1018/2806] hhvm: make explicit the dependency to ocamlbuild --- pkgs/development/compilers/hhvm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index a4b67425fdb..fa76596248e 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -2,8 +2,8 @@ , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit -, libvpx, imagemagick, fribidi, gperf, which +, libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit +, libvpx, imagemagick, fribidi, gperf, which, ocamlPackages }: stdenv.mkDerivation rec { @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { [ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline - libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5 + libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5 gmp libyaml libedit libvpx imagemagick fribidi gperf which + ocamlPackages.ocaml ocamlPackages.ocamlbuild ]; patches = [ From bf37ecac6aae2caa657ad8f8ded1935b7d2c160c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 11 Oct 2017 18:28:07 -0500 Subject: [PATCH 1019/2806] phonon: set paths for multiple outputs phonon was not set up for multiple outputs; in fact, some of the single-output paths were incorrect, such as the path to install Qt 5 plugins. --- pkgs/development/libraries/phonon/default.nix | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 171acea90b3..2cb2dde33f7 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -7,6 +7,9 @@ with lib; let v = "4.9.1"; + + soname = if withQt5 then "phonon4qt5" else "phonon"; + buildsystemdir = "share/cmake/${soname}"; in assert withQt5 -> qtbase != null; @@ -36,17 +39,41 @@ stdenv.mkDerivation rec { [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + outputs = [ "out" "dev" ]; + NIX_CFLAGS_COMPILE = "-fPIC"; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; + preConfigure = '' + cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs" + cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix" + cmakeFlags+=" -DPHONON_QT_PLUGIN_INSTALL_DIR=''${!outputBin}/$qtPluginPrefix/designer" + ''; + postPatch = '' sed -i PhononConfig.cmake.in \ -e "/get_filename_component(rootDir/ s/^.*$//" \ - -e "/^set(PHONON_INCLUDE_DIR/ s,\''${rootDir},''${!outputDev}," \ - -e "/^set(PHONON_LIBRARY_DIR/ s,\''${rootDir}/,," \ - -e "/^set(PHONON_BUILDSYSTEM_DIR/ s,\''${rootDir},''${!outputDev}," + -e "/^set(PHONON_INCLUDE_DIR/ s|\''${rootDir}/||" \ + -e "/^set(PHONON_LIBRARY_DIR/ s|\''${rootDir}/||" \ + -e "/^set(PHONON_BUILDSYSTEM_DIR/ s|\''${rootDir}|''${!outputDev}|" + + sed -i cmake/FindPhononInternal.cmake \ + -e "/set(INCLUDE_INSTALL_DIR/ c set(INCLUDE_INSTALL_DIR \"''${!outputDev}/include\")" + + ${optionalString withQt5 '' + sed -i cmake/FindPhononInternal.cmake \ + -e "/set(PLUGIN_INSTALL_DIR/ c set(PLUGIN_INSTALL_DIR \"$qtPluginPrefix/..\")" + ''} + + sed -i CMakeLists.txt \ + -e "/set(BUILDSYSTEM_INSTALL_DIR/ c set(BUILDSYSTEM_INSTALL_DIR \"''${!outputDev}/${buildsystemdir}\")" + ''; + + postFixup = '' + sed -i "''${!outputDev}/lib/pkgconfig/${soname}.pc" \ + -e "/^exec_prefix=/ c exec_prefix=''${!outputBin}/bin" ''; } From b25deccd1a75c3ab8e3cb4d085b62895e8e3c253 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 11 Oct 2017 18:29:23 -0500 Subject: [PATCH 1020/2806] nixos/plasma5: install phonon backends for each current Qt version Fixes #27050, where the phonon backend was not found. --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index f099117f477..d7e72c4a7ae 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -142,7 +142,8 @@ in kde-gtk-config breeze-gtk - phonon-backend-gstreamer + libsForQt56.phonon-backend-gstreamer + libsForQt5.phonon-backend-gstreamer ] ++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ] From 829566a23dfbe8ef7fe1b3d2949f0f984c71fc98 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 12 Oct 2017 02:02:19 +0200 Subject: [PATCH 1021/2806] nixos/docker-containers: Fix submodule usage The submodule of the "docker-containers" option isn't recognized as a proper submodule and thus neither properly type-checks nor are its options included in the manual. Signed-off-by: aszlig --- nixos/modules/service-managers/docker.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/service-managers/docker.nix b/nixos/modules/service-managers/docker.nix index 8e9c763b18a..7effe0e85d4 100644 --- a/nixos/modules/service-managers/docker.nix +++ b/nixos/modules/service-managers/docker.nix @@ -6,7 +6,7 @@ let cfg = config.docker-containers; containerModule = { - script = mkOption { + options.script = mkOption { type = types.lines; description = "Shell commands executed as the service's main process."; }; From 62e73a75f120d1c4b28d9e32e539db1bc99d1f28 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 25 Jul 2017 15:04:28 +0800 Subject: [PATCH 1022/2806] pykms: init at 20170719 --- pkgs/tools/networking/pykms/default.nix | 82 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/tools/networking/pykms/default.nix diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix new file mode 100644 index 00000000000..ba9bd762124 --- /dev/null +++ b/pkgs/tools/networking/pykms/default.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchFromGitHub, python2Packages, writeText, writeScript +, coreutils, sqlite }: + +let + dbSql = writeText "create_pykms_db.sql" '' + CREATE TABLE clients( + clientMachineId TEXT, + machineName TEXT, + applicationId TEXT, + skuId TEXT, + licenseStatus TEXT, + lastRequestTime INTEGER, + kmsEpid TEXT, + requestCount INTEGER + ); + ''; + + dbScript = writeScript "create_pykms_db.sh" (with stdenv.lib; '' + #!${stdenv.shell} -eu + + db=$1 + + ${getBin coreutils}/bin/install -d $(dirname $db) + + if [ ! -e $db ] ; then + ${getBin sqlite}/bin/sqlite3 $db < ${dbSql} + fi + ''); + +in python2Packages.buildPythonApplication rec { + name = "pykms-${version}"; + version = "20170719"; + + src = fetchFromGitHub { + owner = "ThunderEX"; + repo = "py-kms"; + rev = "27355d88affd740330174a7c2bae9f50b9efce56"; + sha256 = "0cpywj73jmyijjc5hs3b00argjsdwpqzmhawbxkx3mc2l4sgzc88"; + }; + + propagatedBuildInputs = with python2Packages; [ argparse pytz ]; + + prePatch = '' + siteDir=$out/${python2Packages.python.sitePackages} + + substituteInPlace kmsBase.py \ + --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'" + ''; + + dontBuild = true; + + # there are no tests + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/doc/pykms} $siteDir + + mv * $siteDir + for b in client server ; do + chmod 0755 $siteDir/$b.py + makeWrapper ${python2Packages.python.interpreter} $out/bin/$b.py \ + --add-flags $siteDir/$b.py + done + + install -m755 ${dbScript} $out/bin/create_pykms_db.sh + + mv $siteDir/README.md $out/share/doc/pykms/ + + ${python2Packages.python.interpreter} -m compileall $siteDir + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Windows KMS (Key Management Service) server written in Python"; + homepage = "https://forums.mydigitallife.info/threads/50234-Emulated-KMS-Servers-on-non-Windows-platforms/page2?p=840410&viewfull=1#post840410"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d87a483bee..dd3eef00f03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19216,6 +19216,8 @@ with pkgs; pt = callPackage ../applications/misc/pt { }; + pykms = callPackage ../tools/networking/pykms { }; + pyload = callPackage ../applications/networking/pyload {}; uae = callPackage ../misc/emulators/uae { }; From c640e790d5d4a1c31718e7c2643486db05dcaf07 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 25 Jul 2017 15:20:24 +0800 Subject: [PATCH 1023/2806] pykms: nixos module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/pykms.nix | 90 +++++++++++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 nixos/modules/services/misc/pykms.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index cb75845baaf..d9ca4a35e27 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -297,6 +297,7 @@ rslsync = 279; minio = 280; kanboard = 281; + pykms = 282; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -563,6 +564,7 @@ rslsync = 279; minio = 280; kanboard = 281; + pykms = 282; # 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 ee796242c1a..121883b80b1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -333,6 +333,7 @@ ./services/misc/parsoid.nix ./services/misc/phd.nix ./services/misc/plex.nix + ./services/misc/pykms.nix ./services/misc/radarr.nix ./services/misc/redmine.nix ./services/misc/rippled.nix diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix new file mode 100644 index 00000000000..897e856e2a2 --- /dev/null +++ b/nixos/modules/services/misc/pykms.nix @@ -0,0 +1,90 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.pykms; + + home = "/var/lib/pykms"; + + services = { + serviceConfig = { + Restart = "on-failure"; + RestartSec = "10s"; + StartLimitInterval = "1min"; + PrivateTmp = true; + ProtectSystem = "full"; + ProtectHome = true; + }; + }; + +in { + + options = { + services.pykms = rec { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the PyKMS service."; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "The IP address on which to listen."; + }; + + port = mkOption { + type = types.int; + default = 1688; + description = "The port on which to listen."; + }; + + verbose = mkOption { + type = types.bool; + default = false; + description = "Show verbose output."; + }; + + openFirewallPort = mkOption { + type = types.bool; + default = false; + description = "Whether the listening port should be opened automatically."; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewallPort [ cfg.port ]; + + systemd.services = { + pykms = services // { + description = "Python KMS"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = with pkgs; { + User = "pykms"; + Group = "pykms"; + ExecStartPre = "${getBin pykms}/bin/create_pykms_db.sh ${home}/clients.db"; + ExecStart = "${getBin pykms}/bin/server.py ${optionalString cfg.verbose "--verbose"} ${cfg.listenAddress} ${toString cfg.port}"; + WorkingDirectory = home; + MemoryLimit = "64M"; + }; + }; + }; + + users = { + extraUsers.pykms = { + name = "pykms"; + group = "pykms"; + home = home; + createHome = true; + uid = config.ids.uids.pykms; + description = "PyKMS daemon user"; + }; + + extraGroups.pykms = { + gid = config.ids.gids.pykms; + }; + }; + }; +} From e3f97e514d2c293145c99a2438bf31754dcccc06 Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Thu, 12 Oct 2017 09:35:31 +0700 Subject: [PATCH 1024/2806] filesystems: use non-interactive formatOptions by default When autoFormat is enabled, in order to successfully create a filesystem, certain filesystems require specific options to be passed to mkfs to prevent it from asking questions. This commit sets default formatOptions to "-q" for "jfs" and "reiserfs" filesystems for this purpose. Resolves #29140. --- nixos/modules/tasks/filesystems.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 6ceb36714b2..b3690fad1a6 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -115,11 +115,18 @@ let }; - config = { + config = let + defaultFormatOptions = + # -F needed to allow bare block device without partitions + if (builtins.substring 0 3 config.fsType) == "ext" then "-F" + # -q needed for non-interactive operations + else if config.fsType == "jfs" then "-q" + # (same here) + else if config.fsType == "reiserfs" then "-q" + else null; + in { options = mkIf config.autoResize [ "x-nixos.autoresize" ]; - - # -F needed to allow bare block device without partitions - formatOptions = mkIf ((builtins.substring 0 3 config.fsType) == "ext") (mkDefault "-F"); + formatOptions = mkIf (defaultFormatOptions != null) (mkDefault defaultFormatOptions); }; }; From 6fb19832120709edeea5a4450dff2406c4d3ad41 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 11 Oct 2017 02:30:34 +0800 Subject: [PATCH 1025/2806] kdeconnect: 1.0.3 -> 1.2 --- pkgs/applications/misc/kdeconnect/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 0d8db33bc17..e8235642cb2 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -15,12 +15,13 @@ }: stdenv.mkDerivation rec { - name = "kdeconnect-${version}"; - version = "1.0.3"; + pname = "kdeconnect"; + version = "1.2"; + name = "${pname}-${version}"; src = fetchurl { - url = "http://download.kde.org/stable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz"; - sha256 = "0b40402adw7cqz19fh8zw70f6l7b5p400mw668n3wic4favn27r2"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz"; + sha256 = "0w3rdldnr6md70r4ch255vk712d37vy63ml7ly2fhr4cfnk2i1ay"; }; buildInputs = [ From d256057b2c76ff92b248e924e826b4c1ffacfe65 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 12 Oct 2017 12:40:12 +0800 Subject: [PATCH 1026/2806] spdlog: 0.13.0 -> 0.14.0 --- pkgs/development/libraries/spdlog/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index a47eabe5d8d..c047e9913c9 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "spdlog-${version}"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { - owner = "gabime"; - repo = "spdlog"; - rev = "v${version}"; - sha256 = "0pfagrkq6afpkl269vbi1fd6ckakzpr5b5cbapb8rr7hgsrilxza"; + owner = "gabime"; + repo = "spdlog"; + rev = "v${version}"; + sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ]; From 0381d60e714c9353a23c198301e581205cddcb6e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 12 Oct 2017 12:40:35 +0800 Subject: [PATCH 1027/2806] spdlog: build on hydra to make life easier for everyone --- pkgs/development/libraries/spdlog/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index c047e9913c9..1c9e67f8767 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -28,8 +28,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; - - # This is a header-only library, no point in hydra building it: - hydraPlatforms = []; }; } From b5510549171b3a37364f19ac0bcbe26a5d9cba1c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 12 Oct 2017 12:40:56 +0800 Subject: [PATCH 1028/2806] scrypt: 1.2.0 -> 1.2.1 --- pkgs/tools/security/scrypt/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index 1835dbdb620..352a81b2727 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -2,27 +2,26 @@ stdenv.mkDerivation rec { name = "scrypt-${version}"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://www.tarsnap.com/scrypt/${name}.tgz"; - sha256 = "1m39hpfby0fdjam842773i5w7pa0qaj7f0r22jnchxsj824vqm0p"; + sha256 = "0xy5yhrwwv13skv9im9vm76rybh9f29j2dh4hlh2x01gvbkza8a6"; }; buildInputs = [ openssl ]; patchPhase = '' - substituteInPlace Makefile.in \ - --replace "command -p mv" "mv" - substituteInPlace autocrap/Makefile.am \ - --replace "command -p mv" "mv" + for f in Makefile.in autotools/Makefile.am libcperciva/cpusupport/Build/cpusupport.sh ; do + substituteInPlace $f --replace "command -p " "" + done ''; - meta = { + meta = with stdenv.lib; { description = "Encryption utility"; homepage = https://www.tarsnap.com/scrypt.html; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice ]; }; } From 515ea69f098432e20d07f9b72c530b22344dfe61 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 12 Oct 2017 12:41:05 +0800 Subject: [PATCH 1029/2806] cryfs: init at 0.9.7 --- pkgs/tools/filesystems/cryfs/default.nix | 58 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/tools/filesystems/cryfs/default.nix diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix new file mode 100644 index 00000000000..07b077b9289 --- /dev/null +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub +, cmake, pkgconfig, coreutils +, boost, cryptopp, curl, fuse, openssl, python, spdlog +}: + +stdenv.mkDerivation rec { + name = "cryfs-${version}"; + version = "0.9.7"; + + src = fetchFromGitHub { + owner = "cryfs"; + repo = "cryfs"; + rev = "${version}"; + sha256 = "1wsv4cyjkyg3cyr6vipw1mj41bln2m69123l3miav8r4mvmkfq8w"; + }; + + prePatch = '' + patchShebangs src + + substituteInPlace vendor/scrypt/CMakeLists.txt \ + --replace /usr/bin/ "" + + # scrypt in nixpkgs only produces a binary so we lift the patching from that so allow + # building the vendored version. This is very much NOT DRY. + # The proper solution is to have scrypt generate a dev output with the required files and just symlink + # into vendor/scrypt + for f in Makefile.in autocrap/Makefile.am libcperciva/cpusupport/Build/cpusupport.sh ; do + substituteInPlace vendor/scrypt/scrypt-*/scrypt/$f --replace "command -p " "" + done + + # cryfs is vendoring an old version of spdlog + rm -rf vendor/spdlog/spdlog + ln -s ${spdlog} vendor/spdlog/spdlog + ''; + + buildInputs = [ boost cryptopp curl fuse openssl python spdlog ]; + + # coreutils is needed for the vendored scrypt + nativeBuildInputs = [ cmake coreutils pkgconfig ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DCRYFS_UPDATE_CHECKS=OFF" + "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive + "-DBUILD_TESTING=ON" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Cryptographic filesystem for the cloud"; + homepage = https://www.cryfs.org; + license = licenses.lgpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8582966e81d..8525b7b2c74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1881,6 +1881,8 @@ with pkgs; enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; + cryfs = callPackage ../tools/filesystems/cryfs { }; + encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; }; From 0034f9e52c581e2f3dc924c3ff73630fae555024 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 11 Oct 2017 23:13:37 +0800 Subject: [PATCH 1030/2806] dnsmasq nixos: make sure it always runs By default we only restart if the dnsmasq daemon fails but we introduce an option to always keep it running. --- nixos/modules/services/networking/dnsmasq.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index fcf5aa5f175..91a3e54474a 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -55,6 +55,14 @@ in ''; }; + alwaysKeepRunning = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, systemd will always respawn dnsmasq even if shut down manually. The default, disabled, will only restart it on error. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -101,10 +109,12 @@ in BusName = "uk.org.thekelleys.dnsmasq"; ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + PrivateTmp = true; + ProtectSystem = true; + ProtectHome = true; + Restart = if cfg.alwaysKeepRunning then "always" else "on-failure"; }; restartTriggers = [ config.environment.etc.hosts.source ]; }; - }; - } From 00e27a285436fcf059d67c9c1a8091b30f950d67 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 12 Oct 2017 05:35:26 +0000 Subject: [PATCH 1031/2806] ocaml-gettext: dont strip --- pkgs/development/ocaml-modules/ocaml-gettext/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index d8a874a7e2f..e1b66741215 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + dontStrip = true; + meta = with stdenv.lib; { description = "OCaml Bindings to gettext"; homepage = https://forge.ocamlcore.org/projects/ocaml-gettext; From b28bd2a81ff15421e726b070c8ec0079169bba21 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 12 Oct 2017 00:38:18 -0500 Subject: [PATCH 1032/2806] Update CODEOWNERS to use darwin-maintainers team This sets up the Darwin-maintainers team as CODEOWNERS for Darwin paths. So anyone in that team will get notified (instead of just listing individuals). /cc @org/darwin-maintainers --- .github/CODEOWNERS | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 24983cb5287..124a1d19ecb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -35,9 +35,8 @@ pkgs/applications/science/math/R @peti pkgs/development/r-modules @peti # Darwin-related -pkgs/stdenv/darwin/* @copumpkin @LnL7 -pkgs/os-specific/darwin/* @LnL7 -pkgs/os-specific/darwin/apple-source-releases/* @copumpkin +/pkgs/stdenv/darwin/ @org/darwin-maintainers +/pkgs/os-specific/darwin/ @org/darwin-maintainers # Beam-related (Erlang, Elixir, LFE, etc) pkgs/development/beam-modules/* @gleber From 42541c438713bd3606de50b256170097351da327 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 12 Oct 2017 06:01:24 +0000 Subject: [PATCH 1033/2806] obliv-c: make explicit the ocamlbuild dependency --- pkgs/development/compilers/obliv-c/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 1d9d973572c..f5bc00118a6 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,8 +1,9 @@ -{stdenv, fetchurl, ocaml, libgcrypt, fetchFromGitHub, ocamlPackages, perl}: +{ stdenv, fetchurl, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { name = "obliv-c-${version}"; version = "0.0pre20170827"; - buildInputs = [ ocaml ocamlPackages.findlib perl ]; + buildInputs = [ perl ] + ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); propagatedBuildInputs = [ libgcrypt ]; src = fetchFromGitHub { owner = "samee"; From ab2cc75f786c0c29d20a277d2830be36be602424 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 12 Oct 2017 08:14:37 +0200 Subject: [PATCH 1034/2806] guzzle_sphinx_theme: init at 0.7.11 * maintainers: add flokli * sphinx_guzzle_theme: init at 0.7.11 This adds sphinx_guzzle_theme, which is used for sphinx documentation in various projects, including BorgBackup. --- lib/maintainers.nix | 1 + .../guzzle_sphinx_theme/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/guzzle_sphinx_theme/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 669abee6d59..5793b7db980 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -206,6 +206,7 @@ falsifian = "James Cook "; fare = "Francois-Rene Rideau "; fgaz = "Francesco Gazzetta "; + flokli = "Florian Klink "; florianjacob = "Florian Jacob "; flosse = "Markus Kohlhase "; fluffynukeit = "Daniel Austin "; diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix new file mode 100644 index 00000000000..e0b36de5672 --- /dev/null +++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, sphinx, fetchPypi }: + + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "guzzle_sphinx_theme"; + version = "0.7.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v"; + }; + + doCheck = false; # no tests + + propagatedBuildInputs = [ sphinx ]; + + meta = with stdenv.lib; { + description = "Sphinx theme used by Guzzle: http://guzzlephp.org"; + homepage = https://github.com/guzzle/guzzle_sphinx_theme/; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ddd851d3719..4fbf5333917 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20554,6 +20554,8 @@ in { }; }); + guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; + sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; sphinxcontrib-blockdiag = buildPythonPackage (rec { From e3675fedc7a20c9b47b696c501ed91870469df8a Mon Sep 17 00:00:00 2001 From: Patrick Chilton Date: Wed, 4 Oct 2017 13:23:46 +0200 Subject: [PATCH 1035/2806] mate-power-manager: init at 1.18.0 --- lib/maintainers.nix | 1 + .../services/x11/desktop-managers/mate.nix | 1 + pkgs/desktops/mate/default.nix | 2 + .../mate/mate-power-manager/default.nix | 44 +++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 pkgs/desktops/mate/mate-power-manager/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 669abee6d59..c150697e6f9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -107,6 +107,7 @@ chaoflow = "Florian Friesdorf "; chattered = "Phil Scott "; choochootrain = "Hurshal Patel "; + chpatrick = "Patrick Chilton "; chris-martin = "Chris Martin "; chrisjefferson = "Christopher Jefferson "; chrisrosset = "Christopher Rosset "; diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 7a95ac6549d..ab8a0a48b48 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -72,6 +72,7 @@ in ]; services.gnome3.gnome-keyring.enable = true; + services.upower.enable = config.powerManagement.enable; environment.pathsToLink = [ "/share" ]; }; diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 0db1d3f74c0..dd7d8c5dbb2 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -25,6 +25,7 @@ let mate-menus = callPackage ./mate-menus { }; mate-notification-daemon = callPackage ./mate-notification-daemon { }; mate-panel = callPackage ./mate-panel { }; + mate-power-manager = callPackage ./mate-power-manager { }; mate-session-manager = callPackage ./mate-session-manager { }; mate-settings-daemon = callPackage ./mate-settings-daemon { }; mate-terminal = callPackage ./mate-terminal { }; @@ -55,6 +56,7 @@ let engrampa eom mate-icon-theme-faenza + mate-power-manager mate-terminal pluma ]; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix new file mode 100644 index 00000000000..62b99163284 --- /dev/null +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra_gtk3, dbus_glib, upower, gnome3, libtool, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-power-manager-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1gmka9ybxvkrdjaga1md6pbw6q1cx5yxb58ai5315a0f5p45y36x"; + }; + + buildInputs = [ + glib + itstool + libxml2 + libcanberra_gtk3 + gnome3.gtk + gnome3.libgnome_keyring + libnotify + dbus_glib + upower + + mate.mate-panel + ]; + + nativeBuildInputs = [ + pkgconfig + intltool + libtool + wrapGAppsHook + ]; + + configureFlags = [ "--enable-applets" ]; + + meta = with stdenv.lib; { + description = "The MATE Power Manager"; + homepage = http://mate-desktop.org; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo maintainers.chpatrick ]; + }; +} From b23b545942dcd70c12449f2f4bc106bf78e9d2ec Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Oct 2017 09:08:08 +0200 Subject: [PATCH 1036/2806] yabar-unstable: 2017-09-09 -> 2017-10-12 --- pkgs/applications/window-managers/yabar/build.nix | 4 +++- pkgs/applications/window-managers/yabar/unstable.nix | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index a5d02093e3f..5e92c52e521 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -2,6 +2,7 @@ , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version +, playerctl }: stdenv.mkDerivation { @@ -20,6 +21,7 @@ stdenv.mkDerivation { buildInputs = [ cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl alsaLib wirelesstools asciidoc libxslt makeWrapper + playerctl ]; postPatch = '' @@ -28,7 +30,7 @@ stdenv.mkDerivation { --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint" ''; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "PLAYERCTL=1" ]; postInstall = '' mkdir -p $out/share/yabar/examples diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix index 6baa7ae5c03..b704c480d66 100644 --- a/pkgs/applications/window-managers/yabar/unstable.nix +++ b/pkgs/applications/window-managers/yabar/unstable.nix @@ -2,9 +2,9 @@ let overrides = { - version = "unstable-2017-09-09"; + version = "unstable-2017-10-12"; - rev = "d3934344ba27f5bdf122bf74daacee6d49284dab"; - sha256 = "14zrlzva8i83ffg426mrf6yli8afwq6chvc7yi78ngixyik5gzhx"; + rev = "cbecc7766e37f29d50705da0a82dc76ce7c3b86e"; + sha256 = "1wprjas3k14rxfl06mgr0xq2ra735w1c7dq4xrdvii887wnl37xb"; } // attrs; in callPackage ./build.nix overrides From a63ebf6a77eca738e9f4ec89ce4a01d9d586dfb2 Mon Sep 17 00:00:00 2001 From: Kirill Date: Thu, 12 Oct 2017 11:17:24 +0300 Subject: [PATCH 1037/2806] Change required documentation theme to sphinx_guzzle_theme from #30334 --- pkgs/tools/backup/borg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4368218ae7b..4ff61d1ac95 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ # For building documentation: - sphinx sphinx_rtd_theme + sphinx guzzle_sphinx_theme ]; buildInputs = [ acl lz4 openssl python3Packages.setuptools_scm From 6c087b94611a7628d5b1794be85c718900397c82 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 11:26:32 +0300 Subject: [PATCH 1038/2806] jetbrains-jdk: 970.2 -> 1036.1 --- pkgs/development/compilers/jetbrains-jdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index e0aa815e4dc..aa3f49ca4d9 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,13 +7,13 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "152b970.2"; + version = "152b1036.1"; name = pname + "-" + version; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz"; - sha256 = "0i2cqjfab91kr618z88nb5g9yg60j5z08wjl0nlvcmpvg2z6va0m"; + sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; } else abort "unsupported system: ${stdenv.system}"; From 2935f6f853eddbc100643e07c82585c0f50e4e2e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 12 Oct 2017 17:02:23 +0800 Subject: [PATCH 1039/2806] pykms: previous homepage requires registration --- pkgs/tools/networking/pykms/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index ba9bd762124..97780d546e4 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -75,7 +75,7 @@ in python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Windows KMS (Key Management Service) server written in Python"; - homepage = "https://forums.mydigitallife.info/threads/50234-Emulated-KMS-Servers-on-non-Windows-platforms/page2?p=840410&viewfull=1#post840410"; + homepage = https://github.com/ThunderEX/py-kms; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; From e86991e1e81f882d79abc32dcd8c797fceec5548 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 11 Oct 2017 21:31:59 -0400 Subject: [PATCH 1040/2806] darwin: fix assorted xcbuild builds This includes adding a new xcbuild-based libutil build to test the waters a bit there. We'll need to get xcbuild into the stdenv bootstrap before we can make the main build, but it's nice to see that it can work. --- pkgs/development/tools/xcbuild/platform.nix | 20 +++++++++-- pkgs/development/tools/xcbuild/sdk.nix | 2 +- .../apple-source-releases/adv_cmds/xcode.nix | 23 +++++++++---- .../darwin/apple-source-releases/default.nix | 1 + .../file_cmds/default.nix | 9 ++--- .../apple-source-releases/libutil/new.nix | 33 +++++++++++++++++++ 6 files changed, 75 insertions(+), 13 deletions(-) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 2705d703b71..d0836daf613 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -188,6 +188,22 @@ let Type = "ProductType"; Name = "Dynamic Library"; PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "mh_dylib"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "dylib"; + DYLIB_COMPATIBILITY_VERSION = "1"; + DYLIB_CURRENT_VERSION = "1"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "debugging"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + CODE_SIGNING_ALLOWED = "YES"; + CODE_SIGNING_REQUIRED = "NO"; + }; } { Identifier = "com.apple.product-type.library.static"; @@ -247,7 +263,7 @@ let in stdenv.mkDerivation { - name = "nixpkgs.platform"; + name = "MacOSX.platform"; buildInputs = [ xcbuild ]; buildCommand = '' mkdir -p $out/ @@ -264,6 +280,6 @@ stdenv.mkDerivation { mkdir -p $out/Developer/SDKs/ cd $out/Developer/SDKs/ - cp -r ${sdk} nix.nixpkgs.sdk + cp -r ${sdk} ${sdk.name} ''; } diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 7d587249bf8..169fd5f6ec6 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -19,7 +19,7 @@ let in stdenv.mkDerivation { - name = "nix.nixpkgs.sdk"; + name = "MacOSX.sdk"; buildInputs = [ xcbuild ]; buildCommand = '' mkdir -p $out/ diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 254b4a231c2..a3d4099399b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,6 +1,8 @@ -{ stdenv, appleDerivation, fetchurl, xcbuild, libcxx }: +{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, libutil-new }: appleDerivation { + # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 + dontUseXcbuild = true; # pkill requires special private headers that are unavailable in # NixPkgs. These ones are needed: @@ -14,7 +16,19 @@ appleDerivation { patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \ - --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" + --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" \ + --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib' + ''; + + buildPhase = '' + targets=$(xcodebuild -list \ + | awk '/Targets:/{p=1;print;next} p&&/^\s*$/{p=0};p' \ + | tail -n +2 | sed 's/^[ \t]*//' \ + | grep -v -e Desktop -e Embedded -e mklocale -e colldef) + + for i in $targets; do + xcodebuild -target $i + done ''; # temporary install phase until xcodebuild has "install" support @@ -35,10 +49,7 @@ appleDerivation { # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1 ''; - buildInputs = [ xcbuild libcxx ]; - - # temporary fix for iostream issue - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + buildInputs = [ xcbuild ncurses libutil-new ]; meta = { platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index a8509d1f009..0e838994887 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -221,6 +221,7 @@ let libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {}; Libsystem = applePackage "Libsystem" "osx-10.11.6" "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {}; libutil = applePackage "libutil" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; + libutil-new = applePackage "libutil/new.nix" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; libunwind = applePackage "libunwind" "osx-10.11.6" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; mDNSResponder = applePackage "mDNSResponder" "osx-10.11.6" "069incq28a78yh1bnr17h9cd5if5mwqpq8ahnkyxxx25fkaxgzcf" {}; objc4 = applePackage "objc4" "osx-10.11.6" "00b7vbgxni8frrqyi69b4njjihlwydzjd9zj9x4z5dbx8jabkvrj" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 2618b4974f9..8346ca7a9a7 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,7 +1,7 @@ -{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma }: +{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma, ncurses, libutil-new }: appleDerivation rec { - buildInputs = [ xcbuild zlib bzip2 lzma ]; + buildInputs = [ xcbuild zlib bzip2 lzma ncurses libutil-new ]; # some commands not working: # mtree: _simple.h not found @@ -11,14 +11,15 @@ appleDerivation rec { substituteInPlace file_cmds.xcodeproj/project.pbxproj \ --replace "FC8A8CAA14B655FD001B97AD /* PBXTargetDependency */," "" \ --replace "FC8A8C9C14B655FD001B97AD /* PBXTargetDependency */," "" \ - --replace "productName = file_cmds;" "" + --replace "productName = file_cmds;" "" \ + --replace '/usr/lib/libcurses.dylib' 'libncurses.dylib' sed -i -re "s/name = ([a-zA-Z]+);/name = \1; productName = \1;/" file_cmds.xcodeproj/project.pbxproj ''; # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install file_cmds-*/Build/Products/Release/* $out/bin/ + install file_cmds-*/Build/Products/Release/* $out/bin for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix new file mode 100644 index 00000000000..860a74f61f7 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix @@ -0,0 +1,33 @@ +{ stdenv, appleDerivation, xcbuild }: + +# TODO: make this the official libutil expression once we've integrated xcbuild in the bootstrap +appleDerivation { + buildInputs = [ xcbuild ]; + + dontUseXcbuild = true; + + prePatch = '' + substituteInPlace tzlink.c \ + --replace '#include ' "" + ''; + + buildPhase = '' + xcodebuild -target util + ''; + + installPhase = '' + mkdir -p $out/lib $out/include + + cp libutil-*/Build/Products/Release/*.dylib $out/lib + cp libutil-*/Build/Products/Release/*.h $out/include + + # TODO: figure out how to get this to be right the first time around + install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.darwin; + license = licenses.apsl20; + }; +} From 8940265231cfde4e31ac557a5982f7caaace4d81 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 12 Oct 2017 07:58:33 -0400 Subject: [PATCH 1041/2806] linux: 4.9.54 -> 4.9.55 --- 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 d897e609783..4624e70acad 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.54"; + version = "4.9.55"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i8g44d3mq7c24mn6b5w59d2z3fxjzbfn5blc36lzkpvdvdha435"; + sha256 = "0a9rjlf7h1rn71kll1ckxa440rxwsikh1yjh37zbsj5i4895gz5i"; }; } // (args.argsOverride or {})) From 5a8f9a8b6cb173251d5dc067378e7b53117472eb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 12 Oct 2017 07:58:46 -0400 Subject: [PATCH 1042/2806] linux: 4.13.5 -> 4.13.6 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 043a39ec95a..233c0130983 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.5"; + version = "4.13.6"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qi5zxby5qwdv0485gia2jz38dly4ncn10zi3grcckwxc3d5ms59"; + sha256 = "0l30vlxmp49mm743cydkvr3wfw4nmh0q71avasnksd8xmv71km27"; }; } // (args.argsOverride or {})) From 90594b8f52dc89ae6cc0bb5552f646941e2decfc Mon Sep 17 00:00:00 2001 From: Eli Flanagan Date: Thu, 12 Oct 2017 08:37:50 -0400 Subject: [PATCH 1043/2806] modsecurity: 2.9.0 -> 2.9.2 * Enable building on macOS * also fixes an issue where a system Lua install fooled the configure script into thinking it was enabled. --- .../security/modsecurity/Makefile.in.patch | 17 +++++++ pkgs/tools/security/modsecurity/default.nix | 46 +++++++++++-------- 2 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 pkgs/tools/security/modsecurity/Makefile.in.patch diff --git a/pkgs/tools/security/modsecurity/Makefile.in.patch b/pkgs/tools/security/modsecurity/Makefile.in.patch new file mode 100644 index 00000000000..98384c754ce --- /dev/null +++ b/pkgs/tools/security/modsecurity/Makefile.in.patch @@ -0,0 +1,17 @@ +--- a/apache2/Makefile.in 2017-10-10 09:45:51.000000000 -0400 ++++ b/apache2/Makefile.in 2017-10-10 09:46:04.000000000 -0400 +@@ -1208,14 +1208,12 @@ + @LINUX_TRUE@ for m in $(pkglib_LTLIBRARIES); do \ + @LINUX_TRUE@ base=`echo $$m | sed 's/\..*//'`; \ + @LINUX_TRUE@ rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ +-@LINUX_TRUE@ install -D -m444 $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES)/$$base.so; \ + @LINUX_TRUE@ done + @LINUX_FALSE@install-exec-hook: $(pkglib_LTLIBRARIES) + @LINUX_FALSE@ @echo "Removing unused static libraries..."; \ + @LINUX_FALSE@ for m in $(pkglib_LTLIBRARIES); do \ + @LINUX_FALSE@ base=`echo $$m | sed 's/\..*//'`; \ + @LINUX_FALSE@ rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ +-@LINUX_FALSE@ cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES); \ + @LINUX_FALSE@ done + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index a5e03eb3fe1..2c02a5dd473 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -1,35 +1,43 @@ { stdenv, lib, fetchurl, pkgconfig -, curl, apacheHttpd, pcre, apr, aprutil, libxml2 }: +, curl, apacheHttpd, pcre, apr, aprutil, libxml2 +, luaSupport ? false, lua5 +}: with lib; +let luaValue = if luaSupport then lua5 else "no"; + optional = stdenv.lib.optional; +in + stdenv.mkDerivation rec { name = "modsecurity-${version}"; - version = "2.9.0"; + version = "2.9.2"; src = fetchurl { url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz"; - sha256 = "e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434"; + sha256 = "41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ]; - configureFlags = [ - "--enable-standalone-module" - "--enable-static" - "--with-curl=${curl.dev}" - "--with-apxs=${apacheHttpd.dev}/bin/apxs" - "--with-pcre=${pcre.dev}" - "--with-apr=${apr.dev}" - "--with-apu=${aprutil.dev}/bin/apu-1-config" - "--with-libxml=${libxml2.dev}" - ]; + buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ] ++ + optional luaSupport lua5; + + configureFlags = '' + --enable-standalone-module + --enable-static + --with-curl=${curl.dev} + --with-apxs=${apacheHttpd.dev}/bin/apxs + --with-pcre=${pcre.dev} + --with-apr=${apr.dev} + --with-apu=${aprutil.dev}/bin/apu-1-config + --with-libxml=${libxml2.dev} + --with-lua=${luaValue} + ''; outputs = ["out" "nginx"]; - - preBuild = '' - substituteInPlace apache2/Makefile.in --replace "install -D " "# install -D" - ''; + # by default modsecurity's install script copies compiled output to httpd's modules folder + # this patch removes those lines + patches = [ ./Makefile.in.patch ]; postInstall = '' mkdir -p $nginx @@ -41,6 +49,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = https://www.modsecurity.org/; maintainers = with maintainers; [offline]; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } From cbdc72b6f112267662265c83895c5b42c5fa7da7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 15:47:13 +0300 Subject: [PATCH 1044/2806] jetbrains.clion: 2017.2.2 -> 2017.2.3 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 65721361cd6..f39aef5e1d6 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -219,12 +219,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.2.2"; /* updated by script */ + version = "2017.2.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1rnncii7z44186jv9xl3ax179ws9wfwd6yndyf9pvnpcd4jcs6d0"; /* updated by script */ + sha256 = "02hyndyfcrvfbi4q8vmmj0xh2bggwc2azggm24g3m03iffa7j6fx"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml From b9ce5b3f082ef3ab06fbbf6e458c22ba82f3187d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 15:47:51 +0300 Subject: [PATCH 1045/2806] jetbrains.gogland: 172.3968.45-> 173.2696.28 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f39aef5e1d6..07492192343 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -245,12 +245,12 @@ in gogland = buildGogland rec { name = "gogland-${version}"; - version = "172.3968.45"; /* updated by script */ + version = "173.2696.28"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0nk9g28l414yp5ldyx1yl38qpp9s1pxkfxfwmw9yvlff3bi0kkyw"; /* updated by script */ + sha256 = "07nz2pf7fnjxsvc82vihk2i880cji349czxzshr1dk50ixlydq7n"; /* updated by script */ }; wmClass = "jetbrains-gogland"; update-channel = "gogland_1.0_EAP"; From 7155b8c27d27a6846b69a8ac02179b8bdb7d9797 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 15:48:29 +0300 Subject: [PATCH 1046/2806] jetbrains.idea-community: 2017.2.4 -> 2017.2.5 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 07492192343..14a7d55b036 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -258,12 +258,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.2.4"; /* updated by script */ + version = "2017.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "179nqzgbb76pyr48faca6k69v32m5kvx66i2apih95g54sd1xgva"; /* updated by script */ + sha256 = "01p63wsy60icy4673ci435rmzpjfkyz7a8w413vw45i2bm76skhr"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; From f8103e7226b180c3599a16df95675284b173a370 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 15:48:56 +0300 Subject: [PATCH 1047/2806] jetbrains.idea-ultimate: 2017.2.4 -> 2017.2.5 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 14a7d55b036..49377620729 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -271,12 +271,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.2.4"; /* updated by script */ + version = "2017.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1qwqk1r42llh8py0w2iq4w1ks3ipzsxkbdz0zkrd1572zngpk90m"; /* updated by script */ + sha256 = "0pp49nck1cad6pz81bd95v4v55vmnvj7cbdzybmldglka1afqjb6"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; From c0ec6d9d21f9bc8c6281bd5d41650adb30902fae Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 15:49:16 +0300 Subject: [PATCH 1048/2806] jetbrains.rider: 2017.1.1 -> 2017.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 49377620729..b18b27d9c2c 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -323,12 +323,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2017.1.1"; /* updated by script */ + version = "2017.1.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1h6p847izddard3227ifg3q5klwvdfixir63i6adkd2fvsqn5935"; /* updated by script */ + sha256 = "0kphjxibrs4ss6hpxbssvs3n35xh9zzw7a1q09x79ibvvk73gwqh"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "rider_2017_1"; From 6cae9e71273fa95304a72e10e9a4ae64a50191a2 Mon Sep 17 00:00:00 2001 From: Harmen Date: Thu, 12 Oct 2017 15:46:08 +0200 Subject: [PATCH 1049/2806] go: use absolute dir in getGoDirs() --- pkgs/development/go-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 5a1a0eb52eb..500fb8f76cb 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -140,7 +140,7 @@ go.stdenv.mkDerivation ( if [ -n "$subPackages" ]; then echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" else - pushd go/src >/dev/null + pushd "$NIX_BUILD_TOP/go/src" >/dev/null find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq popd >/dev/null fi From 86ebd2e6841eb3bbe26bb7b51a85d4ba162ae254 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 6 Oct 2017 23:17:14 +0300 Subject: [PATCH 1050/2806] kmsxx and pykms: init at 2017-10-03 --- pkgs/development/libraries/kmsxx/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 4 +++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/kmsxx/default.nix diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix new file mode 100644 index 00000000000..7dbe6084dc4 --- /dev/null +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, cmake, pkgconfig, libdrm, pythonBindings ? null }: + +stdenv.mkDerivation rec { + name = "kmsxx-2017-10-03"; + + src = fetchgit { + url = "https://github.com/tomba/kmsxx"; + fetchSubmodules = true; + rev = "35d54fdddd6d7add49efbb0d9dec30816de96c90"; + sha256 = "144gjqz6bxsn4j7k8q8309ph9czmr8rd4vzwfayw3airplnz5zka"; + }; + + enableParallelBuilding = true; + + cmakeFlags = stdenv.lib.optionalString (pythonBindings == null) [ "-DKMSXX_ENABLE_PYTHON=OFF" ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libdrm ] ++ stdenv.lib.optional (pythonBindings != null) pythonBindings; + + meta = with stdenv.lib; { + description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; + homepage = https://github.com/tomba/kmsxx; + license = licenses.mpl20; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd3eef00f03..9b783f08de4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12310,6 +12310,8 @@ with pkgs; kmscube = callPackage ../os-specific/linux/kmscube { }; + kmsxx = callPackage ../development/libraries/kmsxx { }; + latencytop = callPackage ../os-specific/linux/latencytop { }; ldm = callPackage ../os-specific/linux/ldm { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fbf5333917..b575bb59b62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15604,6 +15604,10 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; platformio = callPackage ../development/python-modules/platformio { }; + pykms = callPackage ../development/libraries/kmsxx { + pythonBindings = python; + }; + pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; version = "0.2.4"; From cf4a2bb111d4e3b414a3e42befef11b51b5944a1 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 8 Oct 2017 14:47:25 +0300 Subject: [PATCH 1051/2806] kmsxx, pykms: suggestions by @FRidh --- pkgs/development/libraries/kmsxx/default.nix | 9 +++++---- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 7dbe6084dc4..06a288ec4de 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libdrm, pythonBindings ? null }: +{ stdenv, fetchgit, cmake, pkgconfig, libdrm, python }: stdenv.mkDerivation rec { name = "kmsxx-2017-10-03"; @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optionalString (pythonBindings == null) [ "-DKMSXX_ENABLE_PYTHON=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libdrm ] ++ stdenv.lib.optional (pythonBindings != null) pythonBindings; + buildInputs = [ libdrm python ]; + + pythonPath = [ ]; + passthru.python = python; meta = with stdenv.lib; { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b575bb59b62..b990ca52b97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15604,9 +15604,7 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; platformio = callPackage ../development/python-modules/platformio { }; - pykms = callPackage ../development/libraries/kmsxx { - pythonBindings = python; - }; + pykms = callPackage ../development/libraries/kmsxx { }; pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; From 9087f56b32662a98e55adb796c4ade0d02f92736 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 12 Oct 2017 18:01:37 +0300 Subject: [PATCH 1052/2806] ksmxx: 2017-10-03 -> 2017-10-10 --- pkgs/development/libraries/kmsxx/default.nix | 15 ++++++++------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 06a288ec4de..490732c3802 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libdrm, python }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }: stdenv.mkDerivation rec { - name = "kmsxx-2017-10-03"; + name = "kmsxx-2017-10-10"; - src = fetchgit { - url = "https://github.com/tomba/kmsxx"; + src = fetchFromGitHub { + owner = "tomba"; + repo = "kmsxx"; fetchSubmodules = true; - rev = "35d54fdddd6d7add49efbb0d9dec30816de96c90"; - sha256 = "144gjqz6bxsn4j7k8q8309ph9czmr8rd4vzwfayw3airplnz5zka"; + rev = "f32b82c17cd357ae1c8ed2636266113955293feb"; + sha256 = "14panqdqq83wh6wym5afdiyrr78mb12ga63pgrppj27kgv398yjj"; }; enableParallelBuilding = true; @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; homepage = https://github.com/tomba/kmsxx; license = licenses.mpl20; - maintainers = [ maintainers.gnidorah ]; + maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b990ca52b97..a8a06bef1e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15604,7 +15604,7 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; platformio = callPackage ../development/python-modules/platformio { }; - pykms = callPackage ../development/libraries/kmsxx { }; + kmsxx = callPackage ../development/libraries/kmsxx { }; pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; From 37172d2b74a1fe9f42fbcea3c5088a6309008bbd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 12 Oct 2017 23:01:49 +0800 Subject: [PATCH 1053/2806] sddm-kcm: init at 5.10.5 --- pkgs/desktops/plasma-5/default.nix | 1 + pkgs/desktops/plasma-5/sddm-kcm.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/plasma-5/sddm-kcm.nix diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index a962d3054f8..2bb4b7decef 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -137,6 +137,7 @@ let plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; powerdevil = callPackage ./powerdevil.nix {}; + sddm-kcm = callPackage ./sddm-kcm.nix {}; startkde = callPackage ./startkde {}; systemsettings = callPackage ./systemsettings.nix {}; }; diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix new file mode 100644 index 00000000000..65912083a4c --- /dev/null +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, extra-cmake-modules, shared_mime_info, + libpthreadstubs, libXcursor, libXdmcp, + qtquickcontrols2, qtx11extras, + karchive, ki18n, kio, knewstuff +}: + +mkDerivation { + name = "sddm-kcm"; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + buildInputs = [ + libpthreadstubs libXcursor libXdmcp + qtquickcontrols2 qtx11extras + karchive ki18n kio knewstuff + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8582966e81d..c381cfe130f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18217,7 +18217,7 @@ with pkgs; kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop plasma-integration plasma-nm plasma-pa plasma-workspace - plasma-workspace-wallpapers polkit-kde-agent powerdevil startkde + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm startkde systemsettings; ### SCIENCE From ce7fd937c150b415cf6092051e6e3e503261ae7c Mon Sep 17 00:00:00 2001 From: Shaun Sharples Date: Thu, 12 Oct 2017 18:55:57 +0200 Subject: [PATCH 1054/2806] plex: 1.9.2 -> 1.9.5 --- pkgs/servers/plex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 31746689719..fa944f5fd26 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.9.2.4285"; - vsnHash = "9f65b88ae"; - sha256 = "0rz53kb4r32s734jhb3n65dcmb0mylhb6wcqinp0dg8w39ncv571"; + version = "1.9.5.4339"; + vsnHash = "46276db8d"; + sha256 = "09zc2wfpvan2j9h88x1f57lpfiqvml2m5m2azhphi4hb31sd3hch"; }; in stdenv.mkDerivation rec { From 64a727b160ad2c98514c1834909ce5e7c94ecb04 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 12 Oct 2017 13:09:36 -0400 Subject: [PATCH 1055/2806] linux-copperhead: 4.13.5.a -> 4.13.6.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 d141d7f4211..f02a65b90a1 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.13.5"; + version = "4.13.6"; revision = "a"; - sha256 = "139qa6iyyjwn81v6z66ry1sifdvkbnql45m740djc0gv37il7mzv"; + sha256 = "1xmnnwwlnc7s5zf08rzb4zqd52iysz81y9iqdn7rdqr3c8j7pdv9"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 08b2c82ecabf0a551b724ed5b23cf63009f06686 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 12 Oct 2017 13:12:27 -0400 Subject: [PATCH 1056/2806] atom: 1.21.0 -> 1.21.1 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 33d78591151..f0af3b88c72 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0xnja2jdjjryisxgyxhh8ik861snl9wdpmr3rjlnalfglghqqb5h"; + sha256 = "13mpj3wvcgsxz9q6lai36lkfgd7rabcjrrih1j5309kd1dqaswnn"; name = "${name}.deb"; }; From 8a957be3370dddacc2e0f6c88a45a05daf3ba866 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 12 Oct 2017 13:17:49 -0400 Subject: [PATCH 1057/2806] atom-beta: 1.22.0-beta0 -> 1.22.0-beta1 --- pkgs/applications/editors/atom/beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix index 61f927ef76b..391d098625c 100644 --- a/pkgs/applications/editors/atom/beta.nix +++ b/pkgs/applications/editors/atom/beta.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-beta-${version}"; - version = "1.22.0-beta0"; + version = "1.22.0-beta1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0xsj0vvaxjw60gg6niaws2lf9lkrh1sz7ypk41g6l4hdgmqyg6fi"; + sha256 = "0qggj0j0cnkzqwgvzw2fb1z10rvvx9jh0ymhdy1aca18hms44p3d"; name = "${name}.deb"; }; From 00078afb1f6c383405fa4bef9646d575f70b092f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 12 Oct 2017 20:35:33 +0300 Subject: [PATCH 1058/2806] f2fs-tools: 1.8.0 -> 1.9.0 --- pkgs/tools/filesystems/f2fs-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index fdad877d34c..53b17f45f9f 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.8.0"; + version = "1.9.0"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; - sha256 = "0mbpg6mng6jcm5vxq0ivhklgpkwvjbhjwgkhzxr50ln46h5kbd2f"; + sha256 = "0aj9dbhv7vv19pyb2rhcg99v5v0s66sb9yzrdmi46bmvzz124pal"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From caee93f3d40f8cd2e5db537fb9082649c6cf655e Mon Sep 17 00:00:00 2001 From: Shaun Sharples Date: Thu, 12 Oct 2017 19:44:58 +0200 Subject: [PATCH 1059/2806] Fix warning about unknown escape sequences systemd warns about: Ignoring unknown escape sequences: "/nix/store/8f0l1w9g7iv2gz63xzsxfl66ri1cfbkl-plex-1.9.5.4339/usr/lib/plexmediaserver/Plex\ Media\ Server From a discussion on the forums it seems the 'sh -c' is not needed: https://forums.plex.tv/discussion/216757/ubuntu-16-04-executable-path-contains-special-characters-error-with-systemd --- nixos/modules/services/misc/plex.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index e37b486375b..46221ace308 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -137,7 +137,7 @@ in User = cfg.user; Group = cfg.group; PermissionsStartOnly = "true"; - ExecStart = "/bin/sh -c ${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server"; + ExecStart = "\"${cfg.package}/usr/lib/plexmediaserver/Plex Media Server\""; KillSignal = "SIGQUIT"; Restart = "on-failure"; }; From fa6ed82e5ecf2688c4bcd3bc61e67723321a9217 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Oct 2017 08:49:53 +0100 Subject: [PATCH 1060/2806] LTS Haskell 9.8 --- .../configuration-hackage2nix.yaml | 97 +++++++++---------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e696cba3fe2..ff941a39052 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.6 + # LTS Haskell 9.8 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -167,7 +167,7 @@ default-package-overrides: - amqp ==0.15.1 - annotated-wl-pprint ==0.7.0 - anonymous-sums ==0.6.0.0 - - ansigraph ==0.3.0.3 + - ansigraph ==0.3.0.4 - ansi-terminal ==0.6.3.1 - ansi-wl-pprint ==0.6.7.3 - api-field-json-th ==0.1.0.2 @@ -271,7 +271,7 @@ default-package-overrides: - bits ==0.5.1 - bitx-bitcoin ==0.11.0.1 - blake2 ==0.2.0 - - blank-canvas ==0.6 + - blank-canvas ==0.6.1 - BlastHTTP ==1.2.1 - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 @@ -333,7 +333,7 @@ default-package-overrides: - cabal-rpm ==0.11.2 - cache ==0.1.0.0 - cacophony ==0.10.0 - - cairo ==0.13.3.1 + - cairo ==0.13.4.1 - calendar-recycling ==0.0 - call-stack ==0.1.0 - carray ==0.1.6.8 @@ -421,7 +421,7 @@ default-package-overrides: - concurrent-output ==1.9.2 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - - conduit ==1.2.12 + - conduit ==1.2.12.1 - conduit-combinators ==1.1.1 - conduit-connection ==0.1.0.3 - conduit-extra ==1.1.17 @@ -526,7 +526,7 @@ default-package-overrides: - Decimal ==0.4.2 - declarative ==0.5.1 - deepseq-generics ==0.2.0.0 - - dejafu ==0.7.2.0 + - dejafu ==0.7.3.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - derive ==2.6.3 @@ -552,7 +552,7 @@ default-package-overrides: - digits ==0.3.1 - dimensional ==1.0.1.3 - directory-tree ==0.12.1 - - direct-sqlite ==2.3.20 + - direct-sqlite ==2.3.21 - discord-gateway ==0.2.2 - discord-hs ==0.4.2 - discord-rest ==0.2.2 @@ -612,9 +612,9 @@ default-package-overrides: - either ==4.4.1.1 - either-unwrap ==1.1 - ekg ==0.4.0.14 - - ekg-core ==0.1.1.2 + - ekg-core ==0.1.1.3 - ekg-json ==0.1.0.6 - - ekg-statsd ==0.2.1.1 + - ekg-statsd ==0.2.2.0 - ekg-wai ==0.1.0.2 - elerea ==2.9.0 - elm-bridge ==0.4.1 @@ -627,7 +627,7 @@ default-package-overrides: - encoding-io ==0.0.1 - engine-io ==1.2.17 - engine-io-wai ==1.0.6 - - EntrezHTTP ==1.0.4 + - EntrezHTTP ==1.0.3 - entropy ==0.3.8 - enummapset ==0.5.2.1 - enummapset-th ==0.6.1.1 @@ -669,7 +669,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - exp-pairs ==0.1.5.2 - - extensible ==0.4.4 + - extensible ==0.4.5 - extensible-effects ==1.11.1.0 - extensible-exceptions ==0.1.1.4 - extra ==1.5.3 @@ -689,7 +689,7 @@ default-package-overrides: - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - - fgl ==5.5.4.0 + - fgl ==5.5.3.1 - fgl-arbitrary ==0.2.0.3 - filecache ==0.2.9 - file-embed ==0.0.10 @@ -698,8 +698,8 @@ default-package-overrides: - file-modules ==0.1.2.4 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - - find-clumpiness ==0.2.3.0 - - fingertree ==0.1.1.0 + - find-clumpiness ==0.2.3.1 + - fingertree ==0.1.2.1 - fingertree-psqueue ==0.3 - finite-typelits ==0.1.2.0 - fixed ==0.2.1.1 @@ -739,7 +739,7 @@ default-package-overrides: - freetype2 ==0.1.2 - free-vl ==0.1.4 - friendly-time ==0.4.1 - - frisby ==0.2 + - frisby ==0.2.1 - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - fsnotify ==0.2.1.1 @@ -808,7 +808,7 @@ default-package-overrides: - glazier-react ==0.6.0.0 - glazier-react-widget ==0.6.0.0 - GLFW-b ==1.4.8.1 - - glib ==0.13.4.1 + - glib ==0.13.5.0 - Glob ==0.8.0 - glob-posix ==0.1.0.1 - gloss ==1.11.1.1 @@ -936,10 +936,9 @@ default-package-overrides: - grouped-list ==0.2.1.3 - groupoids ==4.0 - groups ==0.4.0.0 - - gtk ==0.14.6 - - gtk2hs-buildtools ==0.13.2.2 - - gtk3 ==0.14.6 - - gtksourceview3 ==0.13.3.1 + - gtk ==0.14.7 + - gtk2hs-buildtools ==0.13.3.0 + - gtk3 ==0.14.7 - H ==0.9.0.1 - h2c ==1.0.0 - hackage-db ==1.22 @@ -965,11 +964,11 @@ default-package-overrides: - happstack-server-tls ==7.1.6.4 - happy ==1.19.7 - harp ==0.4.3 - - hasbolt ==0.1.2.1 + - hasbolt ==0.1.3.0 - hashable ==1.2.6.1 - hashable-time ==0.2.0.1 - hashmap ==1.3.2 - - hashtables ==1.2.2.0 + - hashtables ==1.2.2.1 - haskeline ==0.7.4.0 - haskell-gi ==0.20.3 - haskell-gi-base ==0.20.4 @@ -1134,7 +1133,7 @@ default-package-overrides: - htaglib ==1.1.1 - HTF ==0.13.2.2 - html ==1.0.1.2 - - html-conduit ==1.2.1.1 + - html-conduit ==1.2.1.2 - html-email-validate ==0.2.0.0 - htoml ==1.0.0.3 - HTTP ==4000.3.7 @@ -1210,7 +1209,7 @@ default-package-overrides: - inline-java ==0.6.5 - inline-r ==0.9.0.1 - insert-ordered-containers ==0.2.1.0 - - instance-control ==0.1.1.1 + - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2 - integration ==0.2.1 - intero ==0.1.23 @@ -1272,7 +1271,7 @@ default-package-overrides: - jwt ==0.7.2 - kan-extensions ==5.0.2 - kansas-comet ==0.4 - - katip ==0.5.0.2 + - katip ==0.5.0.3 - kawhi ==0.3.0 - kdt ==0.2.4 - keter ==1.4.3.2 @@ -1304,7 +1303,7 @@ default-package-overrides: - lattices ==1.5.0 - lazyio ==0.1.0.4 - lca ==0.3 - - leancheck ==0.6.5 + - leancheck ==0.6.7 - leapseconds-announced ==2017 - lens ==4.15.4 - lens-action ==0.2.2 @@ -1339,7 +1338,7 @@ default-package-overrides: - linked-list-with-iterator ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.2.0 - - List ==0.6.1 + - List ==0.6.2 - list-fusion-probe ==0.1.0.6 - ListLike ==4.5.1 - list-prompt ==0.1.1.0 @@ -1350,7 +1349,7 @@ default-package-overrides: - lmdb ==0.2.5 - loch-th ==0.2.1 - log ==0.9.0.1 - - log-base ==0.7.2.0 + - log-base ==0.7.3.0 - log-domain ==0.11.2 - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 @@ -1363,7 +1362,7 @@ default-package-overrides: - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.2 - - lucid ==2.9.8.1 + - lucid ==2.9.9 - lucid-svg ==0.7.0.0 - lzma-conduit ==1.1.3.3 - machines ==0.6.3 @@ -1483,7 +1482,7 @@ default-package-overrides: - multistate ==0.7.1.2 - murmur-hash ==0.1.0.9 - mushu ==0.1.1 - - MusicBrainz ==0.3 + - MusicBrainz ==0.3.1 - mustache ==2.2.3 - mutable-containers ==0.3.3 - mwc-probability ==1.3.0 @@ -1523,7 +1522,7 @@ default-package-overrides: - network-transport-composed ==0.2.0.1 - network-transport-inmemory ==0.5.2 - network-transport-tcp ==0.5.1 - - network-transport-tests ==0.2.4.1 + - network-transport-tests ==0.2.4.2 - network-uri ==2.6.1.0 - newtype ==0.2 - newtype-generics ==0.5.1 @@ -1598,7 +1597,7 @@ default-package-overrides: - pandoc ==1.19.2.4 - pandoc-citeproc ==0.10.5.1 - pandoc-types ==1.17.0.5 - - pango ==0.13.3.1 + - pango ==0.13.4.0 - papillon ==0.1.0.4 - parallel ==3.2.1.1 - parallel-io ==0.3.3 @@ -1656,7 +1655,7 @@ default-package-overrides: - pipes-cacophony ==0.5.0 - pipes-category ==0.2.0.1 - pipes-concurrency ==2.0.8 - - pipes-extras ==1.0.10 + - pipes-extras ==1.0.11 - pipes-fluid ==0.5.0.3 - pipes-group ==1.0.8 - pipes-misc ==0.3.0.0 @@ -1749,7 +1748,7 @@ default-package-overrides: - proxied ==0.3 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - - psqueues ==0.2.3.0 + - psqueues ==0.2.4.0 - publicsuffix ==0.20170508 - pure-io ==0.2.1 - pureMD5 ==2.1.3 @@ -1802,9 +1801,9 @@ default-package-overrides: - recursion-schemes ==5.0.2 - redis-io ==0.7.0 - redis-resp ==0.4.0 - - reducers ==3.12.1 + - reducers ==3.12.2 - refact ==0.3.0.2 - - references ==0.3.2.2 + - references ==0.3.3.0 - ref-fd ==0.4.0.1 - refined ==0.1.2.1 - reflection ==2.1.2 @@ -1894,7 +1893,7 @@ default-package-overrides: - search-algorithms ==0.2.0 - securemem ==0.1.9 - SegmentTree ==0.3 - - selda ==0.1.11.0 + - selda ==0.1.11.1 - selda-postgresql ==0.1.7.0 - selda-sqlite ==0.1.6.0 - semigroupoid-extras ==5 @@ -1923,7 +1922,7 @@ default-package-overrides: - servant-purescript ==0.8.0.1 - servant-ruby ==0.2.1.0 - servant-server ==0.11 - - servant-static-th ==0.1.0.5 + - servant-static-th ==0.1.0.6 - servant-subscriber ==0.6.0.0 - servant-swagger ==1.1.3.1 - servant-swagger-ui ==0.2.4.3.0.20 @@ -1990,7 +1989,7 @@ default-package-overrides: - sox ==0.2.2.7 - soxlib ==0.0.3 - sparkle ==0.5.0.1 - - sparse-linear-algebra ==0.2.9.7 + - sparse-linear-algebra ==0.2.9.8 - spdx ==0.2.2.0 - speculation ==1.5.0.3 - speedy-slice ==0.3.0 @@ -2030,7 +2029,7 @@ default-package-overrides: - stm-conduit ==3.0.0 - stm-containers ==0.2.16 - stm-delay ==0.1.1.1 - - stm-extras ==0.1.0.2 + - stm-extras ==0.1.0.3 - STMonadTrans ==0.4.3 - stm-split ==0.0.2 - stm-stats ==0.2.0.0 @@ -2039,7 +2038,7 @@ default-package-overrides: - storable-complex ==0.2.2 - storable-endian ==0.2.6 - storable-record ==0.0.3.1 - - storable-tuple ==0.0.3.2 + - storable-tuple ==0.0.3.3 - storablevector ==0.2.12.1 - storablevector-carray ==0.0 - store ==0.4.3.2 @@ -2071,7 +2070,7 @@ default-package-overrides: - superbuffer ==0.3.1.1 - superrecord ==0.3.0.0 - svg-builder ==0.1.0.2 - - SVGFonts ==1.6.0.2 + - SVGFonts ==1.6.0.3 - svg-tree ==0.6.2 - swagger ==0.3.0 - swagger2 ==2.1.6 @@ -2117,7 +2116,7 @@ default-package-overrides: - tasty-stats ==0.2.0.3 - tasty-tap ==0.0.4 - tasty-th ==0.1.7 - - Taxonomy ==1.0.3 + - Taxonomy ==1.0.2 - TCache ==0.12.1 - tce-conf ==1.3 - tcp-streams ==0.6.0.0 @@ -2145,7 +2144,7 @@ default-package-overrides: - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - testing-feat ==0.4.0.3 - - texmath ==0.9.4.2 + - texmath ==0.9.4.4 - text ==1.2.2.2 - text-all ==0.4.1.1 - text-binary ==0.2.1.1 @@ -2180,7 +2179,7 @@ default-package-overrides: - threepenny-editors ==0.4.1 - threepenny-gui ==0.8.2.0 - threepenny-gui-flexbox ==0.4.2 - - th-reify-compat ==0.0.1.2 + - th-reify-compat ==0.0.1.3 - th-reify-many ==0.1.8 - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 @@ -2290,7 +2289,7 @@ default-package-overrides: - unordered-containers ==0.2.8.0 - unsafe ==0.0 - uri-bytestring ==0.2.3.3 - - uri-bytestring-aeson ==0.1.0.2 + - uri-bytestring-aeson ==0.1.0.4 - uri-encode ==1.5.0.5 - uri-templater ==0.2.2.0 - url ==2.1.3 @@ -2327,7 +2326,7 @@ default-package-overrides: - versions ==3.1.1 - vhd ==0.2.2 - ViennaRNAParser ==1.3.2 - - viewprof ==0.0.0.8 + - viewprof ==0.0.0.9 - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - void ==0.7.2 @@ -2437,9 +2436,9 @@ default-package-overrides: - xml-basic ==0.1.2 - xml-conduit ==1.5.1 - xml-conduit-parse ==0.3.1.1 - - xml-conduit-writer ==0.1.1.1 + - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.1 - - xml-hamlet ==0.4.1 + - xml-hamlet ==0.4.1.1 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - xml-lens ==0.1.6.3 From 6e32a54239b7a5f32f86f5ce163576d2bbcae02e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Oct 2017 11:06:10 +0100 Subject: [PATCH 1061/2806] liquidhaskell: re-enable Hydra builds --- 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 ff941a39052..482d7579615 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5980,7 +5980,6 @@ dont-distribute-packages: liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] From 57594bcf0a53aff823e9b2043f8999edc8cf1c37 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Oct 2017 03:00:37 +0200 Subject: [PATCH 1062/2806] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.6-11-g74d58ee from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/635afca45dbf3b54fced44bbbd9bb1630c74d587. --- .../haskell-modules/hackage-packages.nix | 1920 +++++++---------- 1 file changed, 741 insertions(+), 1179 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0d8e4ebd375..f0fcff013a2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -849,8 +849,8 @@ self: { }: mkDerivation { pname = "Allure"; - version = "0.6.1.0"; - sha256 = "1358gafgm91vqsdn9wxpd9qzar1via9fl5xcg2pn30bcg7dsqahh"; + version = "0.6.2.0"; + sha256 = "1va5xpyw2plq1f82q2zk64xyrdvkprjzv5p6zycircgc2ficz5a1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -4795,6 +4795,23 @@ self: { }) {}; "EntrezHTTP" = callPackage + ({ mkDerivation, base, biocore, bytestring, conduit, HTTP + , http-conduit, hxt, mtl, network, Taxonomy, text, transformers + }: + mkDerivation { + pname = "EntrezHTTP"; + version = "1.0.3"; + sha256 = "16x8z6s17wgf53wmp8lib9nr7a2jsa1n95714q4gqs2vif646p1r"; + libraryHaskellDepends = [ + base biocore bytestring conduit HTTP http-conduit hxt mtl network + Taxonomy text transformers + ]; + homepage = "https://github.com/eggzilla/EntrezHTTP"; + description = "Libary to interface with the NCBI Entrez REST service"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "EntrezHTTP_1_0_4" = callPackage ({ mkDerivation, base, biocore, bytestring, conduit, HTTP , http-conduit, hxt, mtl, network, Taxonomy, text, transformers }: @@ -4809,6 +4826,7 @@ self: { homepage = "https://github.com/eggzilla/EntrezHTTP"; description = "Libary to interface with the NCBI Entrez REST service"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "EnumContainers" = callPackage @@ -11095,8 +11113,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.6.1.0"; - sha256 = "0h9b67x9mnn3nyz0a8lhh9amd511cgvmwlzaj7lkh8vqqxy2syhz"; + version = "0.6.2.0"; + sha256 = "15fa4kwaa7dzdrppjzkpm8dhazsb5cw372ksfl3smsfxiz8z4af9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -11453,18 +11471,6 @@ self: { }) {}; "List" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "List"; - version = "0.6.1"; - sha256 = "0ar4bpfv9nqc3bdwg6rlcnwr5si2df38ch8m2wnnl0346yzvmjni"; - libraryHaskellDepends = [ base transformers ]; - homepage = "http://github.com/yairchu/generator"; - description = "List monad transformer and class"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "List_0_6_2" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "List"; @@ -11474,7 +11480,6 @@ self: { homepage = "http://github.com/yairchu/generator"; description = "List monad transformer and class"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListLike" = callPackage @@ -12595,28 +12600,6 @@ self: { }) {}; "MusicBrainz" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra - , HTTP, http-conduit, http-types, monad-control, resourcet, text - , time, time-locale-compat, transformers, vector, xml-conduit - , xml-types - }: - mkDerivation { - pname = "MusicBrainz"; - version = "0.3"; - sha256 = "1c0vl5zkb8628k5222fg6z806byjqnsxr0h3yw86fzwhgkxqywd4"; - revision = "1"; - editedCabalFile = "1bv1nwl4pijgiw4zpnw6b15d7phj6b8chiqvv42s8vrq51crdvm6"; - libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra HTTP http-conduit - http-types monad-control resourcet text time time-locale-compat - transformers vector xml-conduit xml-types - ]; - homepage = "http://floss.scru.org/hMusicBrainz"; - description = "interface to MusicBrainz XML2 web service"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "MusicBrainz_0_3_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra , HTTP, http-conduit, http-types, monad-control, resourcet, text , time, time-locale-compat, transformers, vector, xml-conduit @@ -12634,7 +12617,6 @@ self: { homepage = "http://floss.scru.org/hMusicBrainz"; description = "interface to MusicBrainz XML2 and JSON web services"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MusicBrainz-libdiscid" = callPackage @@ -14291,8 +14273,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.12.0.0"; - sha256 = "0dmsgmw1gqx3bsdvw4y0gc02pc4shf97kq3hv757gqi1rsg4fsdy"; + version = "0.12.1.0"; + sha256 = "08210lfmbzaazk5d0j9gw81m7416hk0ldiyahp7g9kpj49nhpmrg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15894,26 +15876,6 @@ self: { }) {}; "SVGFonts" = callPackage - ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg - , bytestring, cereal, cereal-vector, containers, data-default-class - , diagrams-core, diagrams-lib, directory, parsec, split, text - , tuple, vector, xml - }: - mkDerivation { - pname = "SVGFonts"; - version = "1.6.0.2"; - sha256 = "07rimlhsvb5j77rkp1zw9567lbc0bq6172mzsm3yb4zw6x9aplaa"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base blaze-markup blaze-svg bytestring cereal - cereal-vector containers data-default-class diagrams-core - diagrams-lib directory parsec split text tuple vector xml - ]; - description = "Fonts from the SVG-Font format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "SVGFonts_1_6_0_3" = callPackage ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg , bytestring, cereal, cereal-vector, containers, data-default-class , diagrams-core, diagrams-lib, directory, parsec, split, text @@ -15931,7 +15893,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SVGPath" = callPackage @@ -17430,6 +17391,21 @@ self: { }) {}; "Taxonomy" = callPackage + ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl + , graphviz, parsec, text, vector + }: + mkDerivation { + pname = "Taxonomy"; + version = "1.0.2"; + sha256 = "076j2jj45insbj9v98iygm7ighk210xja3dm8ar9jnjmrpar8gil"; + libraryHaskellDepends = [ + aeson base bytestring either-unwrap fgl graphviz parsec text vector + ]; + description = "Libary for parsing, processing and vizualization of taxonomy data"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "Taxonomy_1_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl , graphviz, parsec, text, vector }: @@ -17442,6 +17418,7 @@ self: { ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TaxonomyTools" = callPackage @@ -23352,6 +23329,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "alternative-vector" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "alternative-vector"; + version = "0.0.0"; + sha256 = "1cf7akvr9nac1483chh7rd3xp5i5zk78f245lw9ixj6v133lnis2"; + libraryHaskellDepends = [ base vector ]; + homepage = "https://github.com/athanclark/alternative-vector#readme"; + description = "Use vectors instead of lists for many and some"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alternators" = callPackage ({ mkDerivation, base, mmorph, transformers }: mkDerivation { @@ -25737,19 +25726,6 @@ self: { }) {}; "ansigraph" = callPackage - ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: - mkDerivation { - pname = "ansigraph"; - version = "0.3.0.3"; - sha256 = "1f03lh9zf6kbimg2fsi8hgnz3kvhqls67j5y13f4j2rb7lynxvd3"; - libraryHaskellDepends = [ ansi-terminal base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/BlackBrane/ansigraph"; - description = "Terminal-based graphing via ANSI and Unicode"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ansigraph_0_3_0_4" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; @@ -25760,7 +25736,6 @@ self: { homepage = "https://github.com/BlackBrane/ansigraph"; description = "Terminal-based graphing via ANSI and Unicode"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antagonist" = callPackage @@ -26017,8 +25992,8 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.2.4.1"; - sha256 = "0dwa02n7s6gpywv8xcnf1mrzks6f1sd2bk5kafwnsm80lixcnzrn"; + version = "0.2.4.2"; + sha256 = "1llbwhws24k8ca22v3zfpz8jzbr1wj92vvwqypqv1iig03bgbbvh"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -28314,6 +28289,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-refresh-tokens_0_3_0_1" = callPackage + ({ mkDerivation, async-refresh, base, bytestring, criterion + , formatting, HUnit, lifted-async, microlens, microlens-th + , monad-control, monad-logger, safe-exceptions, stm, test-framework + , test-framework-hunit, text + }: + mkDerivation { + pname = "async-refresh-tokens"; + version = "0.3.0.1"; + sha256 = "15m7zrdnla5rjrm33zp1054virx9v58sz8zi89ja7iza8hfwdvdx"; + libraryHaskellDepends = [ + async-refresh base bytestring formatting lifted-async microlens + microlens-th monad-control monad-logger safe-exceptions stm text + ]; + testHaskellDepends = [ + base criterion HUnit monad-logger stm test-framework + test-framework-hunit + ]; + homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; + description = "Package implementing core logic for refreshing of expiring access tokens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-timer" = callPackage ({ mkDerivation, base, containers, criterion, HUnit, lifted-async , lifted-base, monad-control, safe-exceptions, test-framework @@ -35030,34 +35029,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"; - sha256 = "1cs81ykw1y2q1kwkdni5w9jxa8bc31b118diaqzf870bqm7mq3ia"; - revision = "12"; - editedCabalFile = "011gssnsg4svv0mz58cvkmy2nr994d4v6ch29yilgh6rna0qfkd9"; - 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_1" = 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 @@ -36803,7 +36774,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_27" = callPackage + "brick_0_28" = callPackage ({ mkDerivation, base, containers, contravariant, data-clist , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm , template-haskell, text, text-zipper, transformers, vector, vty @@ -36811,8 +36782,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.27"; - sha256 = "0flpvs9rdkicwvd0pg5y8cf4grcq91xzrji9ygknms96fm3nhq4k"; + version = "0.28"; + sha256 = "03rm4pq65i49hh2nyz9njabsjh7cbv889g5rscpy42mrhdlppqhk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39584,25 +39555,6 @@ self: { }) {}; "cairo" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo - , gtk2hs-buildtools, mtl, text, utf8-string - }: - mkDerivation { - pname = "cairo"; - version = "0.13.3.1"; - sha256 = "0nk77lixlf6j3a2870mbakcznigrf43m6ac1xn35d1v3dmy1kjm3"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring mtl text utf8-string - ]; - libraryPkgconfigDepends = [ cairo ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Cairo library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) cairo;}; - - "cairo_0_13_4_1" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo , gtk2hs-buildtools, mtl, text, utf8-string }: @@ -39619,7 +39571,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Cairo library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "cairo-appbase" = callPackage @@ -43768,6 +43719,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude_1_3_0" = callPackage + ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring + , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim + , hashable, hspec, lifted-async, lifted-base, monad-unlift + , mono-traversable, mono-traversable-instances, mtl + , mutable-containers, primitive, QuickCheck, safe-exceptions, say + , semigroups, stm, stm-chans, text, time, time-locale-compat + , transformers, transformers-base, unordered-containers, vector + , vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "1.3.0"; + sha256 = "048h2pcp0i2xzd92f6w48hhk5zpic040prmddcf4jp725l1ziid5"; + libraryHaskellDepends = [ + async base basic-prelude bifunctors bytestring chunked-data + containers deepseq dlist exceptions ghc-prim hashable lifted-async + lifted-base monad-unlift mono-traversable + mono-traversable-instances mtl mutable-containers primitive + safe-exceptions say semigroups stm stm-chans text time + time-locale-compat transformers transformers-base + unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck transformers unordered-containers + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + 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 @@ -43789,6 +43772,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude-conduit_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit + , conduit-combinators, hspec, monad-control, QuickCheck, resourcet + , transformers, void + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "1.3.0"; + sha256 = "09ibih4k72j0k9bv8yhs7lwdg1ic3gbwqfml0wnvmykpqcl2ff0g"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit conduit-combinators + monad-control resourcet transformers void + ]; + testHaskellDepends = [ + base bytestring conduit hspec QuickCheck transformers + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + 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 @@ -43808,6 +43813,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude-yesod_1_3_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.3.0"; + sha256 = "1hnb0kfjly8l08v1krmcxgk6pc1xh1lg85mbkbz34pkhjx0rf7s6"; + 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"; + description = "Provide a classy prelude including common Yesod functionality"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classyplate" = callPackage ({ mkDerivation, base, template-haskell, type-list }: mkDerivation { @@ -45901,22 +45926,22 @@ self: { "colorless" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, errors , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl - , random, scientific, text, text-conversions, tuple - , unordered-containers, vector + , random, safe-exceptions, scientific, text, text-conversions + , tuple, unordered-containers, vector }: mkDerivation { pname = "colorless"; - version = "2.2.9"; - sha256 = "0xja34s5g14rqpn26sy8ijlxzlvwnjriz8c07ajqz82hpc8a1kh4"; + version = "2.2.17"; + sha256 = "1l771glmnbgnwkjg0ijg70i0apj66b4n19v1glx6jzdp98z4kgl3"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async - monad-control monad-logger mtl random scientific text - text-conversions unordered-containers vector + monad-control monad-logger mtl random safe-exceptions scientific + text text-conversions unordered-containers vector ]; testHaskellDepends = [ aeson base containers hspec scientific text tuple vector ]; - description = "Colorless"; + description = "Colorless | The Programmatic IDL"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45926,8 +45951,8 @@ self: { }: mkDerivation { pname = "colorless-http-client"; - version = "0.0.1"; - sha256 = "0ciwb559wr55d5vnllqm29dmfgqam1yg6l8zx1s858yy23zi5xl4"; + version = "0.0.4"; + sha256 = "1mncp7qsb99s4kwyd3z3xrmypb7wjdkkr8jpxaip2892z4n52l22"; libraryHaskellDepends = [ aeson base bytestring colorless http-client http-types text-conversions @@ -45940,8 +45965,8 @@ self: { ({ mkDerivation, aeson, base, colorless, mtl, scotty, text, wai }: mkDerivation { pname = "colorless-scotty"; - version = "0.0.1"; - sha256 = "0drw92gv8gr3927yg2siwnbz91s8gk3v244nydxy4y2bbwih8i2c"; + version = "0.0.2"; + sha256 = "1jbdysm2ya5h5hw0s8149vi6wcnr98wh53iwyhmygdg0hz25nslk"; libraryHaskellDepends = [ aeson base colorless mtl scotty text wai ]; @@ -47401,14 +47426,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_2_1_0" = callPackage + "concurrency_1_2_1_1" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.2.1.0"; - sha256 = "1361ywfwbymnw1siaysswl0hfh5hq8zgzkazy226civxcap4pi47"; + version = "1.2.1.1"; + sha256 = "1zr59s73a0iy27qh1m41lizjy55bgrnkb8zh8s3xp15sqhq9yvgv"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -47561,6 +47586,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concurrent-st" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "concurrent-st"; + version = "0.1"; + sha256 = "08zjpyf1jrsn161z9dngag63s47vrvz4m8aani9lvmlacbzpjfwd"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/andrewthad/concurrent-st#readme"; + description = "Concurrent Haskell in ST"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "concurrent-state" = callPackage ({ mkDerivation, base, exceptions, mtl, stm, transformers }: mkDerivation { @@ -47717,33 +47754,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"; - sha256 = "05k6kn83mw72xfqhrlsapnbsscyw1dqf1g335mxfifs2a32s1ad4"; - 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_12_1" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, exceptions , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl , mwc-random, primitive, QuickCheck, resourcet, safe, split @@ -47768,7 +47778,6 @@ 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 @@ -47780,8 +47789,8 @@ self: { }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.5.0"; - sha256 = "0c8r4iydvzlp1q2szqnxpk8g95dn905ymzsa3isxdh9cjjqm5lbi"; + version = "0.0.6.0"; + sha256 = "0b3wpmx35bl85mzy9v0hiz48flzv2vjdimkgdv58si24l3drg6g6"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators conduit-extra containers deepseq directory filepath mtl resourcet @@ -51811,6 +51820,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptoids" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptoids-types + , cryptonite, directory, exceptions, filepath, memory + }: + mkDerivation { + pname = "cryptoids"; + version = "0.3.0.0"; + sha256 = "1n8mr80n1hmld02n1a97nsxh3x8fmnqmbpnnvjawkq1mj768nbc4"; + libraryHaskellDepends = [ + base binary bytestring cryptoids-types cryptonite directory + exceptions filepath memory + ]; + description = "Reversable and secure encoding of object ids as a bytestring"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cryptoids-types" = callPackage + ({ mkDerivation, base, binary, http-api-data, path-pieces }: + mkDerivation { + pname = "cryptoids-types"; + version = "0.0.0"; + sha256 = "0qp6lx1k2mqay1i4wgkwgaqamp33gijw0wb13rh71i0qwyvnr51b"; + libraryHaskellDepends = [ base binary http-api-data path-pieces ]; + description = "Shared types for encrypting internal object identifiers before exposure"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptol" = callPackage ({ mkDerivation, alex, ansi-terminal, array, async, base , base-compat, bytestring, containers, criterion, deepseq @@ -54101,14 +54137,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_0_10_0_0" = callPackage + "data-diverse_0_11_0_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "0.10.0.0"; - sha256 = "0y56xncg73w550wg6r6a1njm9ivx37h3jfzkjbzjkr5v6lv6gn1v"; + version = "0.11.0.0"; + sha256 = "0vbhp2gnmg6nlha4jly6yjpvky2dhk2x099r58r7gdrr5prh1lpi"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54133,12 +54169,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_0_3_0_0" = callPackage + "data-diverse-lens_0_4_0_0" = callPackage ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "0.3.0.0"; - sha256 = "0mkys1msxbphlf8814c5bkg8s82zl5a36vzyrqbfbv74668lq4q1"; + version = "0.4.0.0"; + sha256 = "0jwq45b9s2v539lkav84vrjcqznlb2yvprhaflshaz5gsw04dfyc"; libraryHaskellDepends = [ base data-diverse lens tagged ]; testHaskellDepends = [ base data-diverse hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse-lens#readme"; @@ -56847,8 +56883,8 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "0.7.2.0"; - sha256 = "1jr5k7ky13vvak4jdvfaksil9li1wis0gc1jbaann4pa18y9d358"; + version = "0.7.3.0"; + sha256 = "163aw8qw18lqw0q8pr88d3i3m1r1v5ny73xy5ryxlls5wiyn2ds8"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck mtl random ref-fd semigroups transformers transformers-base @@ -56859,15 +56895,15 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "dejafu_0_8_0_0" = callPackage + "dejafu_0_9_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, mtl, random, ref-fd, semigroups, transformers , transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.8.0.0"; - sha256 = "0im33v22m0b9lkq2430g9q5b21qz26sr7zrg4sfr4yn8rr0bgzfa"; + version = "0.9.0.0"; + sha256 = "0n2qj6kaldg006pjz5aj0wjigr3dd7vgbl35fgsz3fx9j64ydi72"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck mtl random ref-fd semigroups transformers transformers-base @@ -57366,19 +57402,19 @@ self: { }) {}; "derive-topdown" = callPackage - ({ mkDerivation, base, derive, mtl, template-haskell - , template-haskell-util + ({ mkDerivation, base, mtl, primitive, syb, template-haskell + , th-expand-syns, transformers }: mkDerivation { pname = "derive-topdown"; - version = "0.0.0.2"; - sha256 = "0gdalqq1ks9jjp34kzavlx2ncpdad2pf6vdhx64yii5l2nl04r8p"; + version = "0.0.0.7"; + sha256 = "1r566bcp0qqwwbndwbbfnczxwmlyl9dfnsysnija7v8fn46z30ni"; libraryHaskellDepends = [ - base derive mtl template-haskell template-haskell-util + base mtl primitive syb template-haskell th-expand-syns transformers ]; homepage = "https://github.com/HaskellZhangSong/derive-topdown"; - description = "This library will help you generate Haskell empty Generic instances and deriving type instances from the top automatically to the bottom for composited data types"; - license = stdenv.lib.licenses.mit; + description = "Help Haskellers derive class instances for composited data types"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -57661,23 +57697,25 @@ self: { "dhall" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive , charset, containers, contravariant, exceptions, http-client - , http-client-tls, lens, optparse-generic, parsers, system-fileio - , system-filepath, tasty, tasty-hunit, text, text-format - , transformers, trifecta, unordered-containers, vector + , 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.6.0"; - sha256 = "1q48sw96qlvnvqih32fgzdkpabzh13rcgyp8nq917gibmwjrnw85"; + version = "1.7.0"; + sha256 = "1177px9xlvby3wbhwgrvx23wxgmcqhl3qllbry6k42rbgf7rw900"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base bytestring case-insensitive charset containers contravariant exceptions http-client http-client-tls lens parsers - system-fileio system-filepath text text-format transformers - trifecta unordered-containers vector + prettyprinter system-fileio system-filepath text text-format + transformers trifecta unordered-containers vector + ]; + executableHaskellDepends = [ + base optparse-generic prettyprinter system-filepath text trifecta ]; - executableHaskellDepends = [ base optparse-generic text trifecta ]; testHaskellDepends = [ base containers tasty tasty-hunit text vector ]; @@ -57692,8 +57730,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.4"; - sha256 = "0xraqhdpbb6f1ng9545lz6b29k3w0flfrk410l7j8inl6i9zpia5"; + version = "1.0.5"; + sha256 = "1cicl18sz969ws64jybxsibcbk1686mfia9avw8asy1fmr2w6ryv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57728,20 +57766,22 @@ self: { }) {}; "dhall-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, dhall, neat-interpolation - , optparse-generic, text, trifecta, vector, yaml + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall + , neat-interpolation, optparse-generic, text, trifecta, vector + , yaml }: mkDerivation { pname = "dhall-json"; - version = "1.0.6"; - sha256 = "0fs6nnkcqwh2m9gws5r3q7z7d7ly9bxgfrgha0f5vsxi66kcfr12"; + version = "1.0.7"; + sha256 = "1wgzj9gfvxs2yvh0hnncfck2qbf4fhqpnibl6n10d0hllmvdbq1b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base dhall neat-interpolation text vector ]; executableHaskellDepends = [ - aeson base bytestring dhall optparse-generic text trifecta yaml + aeson aeson-pretty base bytestring dhall optparse-generic text + trifecta yaml ]; description = "Compile Dhall to JSON or YAML"; license = stdenv.lib.licenses.bsd3; @@ -57754,8 +57794,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.0.7"; - sha256 = "1ivckxwxcdnvp9cdrq02hr3xr2n6p0lpj43pfi8lznx908jbbb2k"; + version = "1.0.8"; + sha256 = "1z6jgcfk1zi0alhpp6ycskb6yd40j2l7bl9bxfkb79443383r2mm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57773,8 +57813,8 @@ self: { ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.2"; - sha256 = "1482bp3gn36m3ddbka8xa2cb5bg9v095j1bv39d8q2qjz143hdsh"; + version = "1.0.3"; + sha256 = "1kic5mwndqmxqrg9f2a7panawns5j43pik42hl2dds5fvj3cmvr9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dhall optparse-generic text ]; @@ -58887,19 +58927,20 @@ self: { }) {}; "digit" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens, papa - , parsec, parsers, QuickCheck, semigroupoids, semigroups - , template-haskell + ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, papa, parsec + , parsers, pretty, semigroupoids, semigroups, tasty, tasty-hedgehog + , tasty-hspec, tasty-hunit, template-haskell, text }: mkDerivation { pname = "digit"; - version = "0.5.0"; - sha256 = "084im8gn0h4l3vwckza7x7s5ax61g6vwcgnn21jgf4ipbbccss4w"; + version = "0.5.1"; + sha256 = "141w8x7r4b3pkalqvgc71p9rdqsfg9nmhyijcg7vr5336qv52p2a"; libraryHaskellDepends = [ base lens papa parsers semigroupoids semigroups template-haskell ]; testHaskellDepends = [ - base directory doctest filepath parsec QuickCheck template-haskell + ansi-wl-pprint base hedgehog lens papa parsec parsers pretty tasty + tasty-hedgehog tasty-hspec tasty-hunit text ]; homepage = "https://github.com/qfpl/digit"; description = "A data-type representing digits 0-9 and other combinations"; @@ -59219,23 +59260,6 @@ self: { }) {}; "direct-sqlite" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, directory - , HUnit, temporary, text - }: - mkDerivation { - pname = "direct-sqlite"; - version = "2.3.20"; - sha256 = "0wdjmqfs968319nl6ikmrrjqajfcb48k11hmmljwg81n1sbdydbf"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base base16-bytestring bytestring directory HUnit temporary text - ]; - homepage = "https://github.com/IreneKnapp/direct-sqlite"; - description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "direct-sqlite_2_3_21" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, directory , HUnit, temporary, text }: @@ -59250,7 +59274,6 @@ self: { homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "directed-cubical" = callPackage @@ -59270,12 +59293,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_1_4" = callPackage + "directory_1_3_1_5" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.1.4"; - sha256 = "05366w53m2g38ywgbnxs89iivxg738xhyhsszm63xq1pyy90nz4f"; + version = "1.3.1.5"; + sha256 = "0zkqihmdfz7bzv3sxh1p9ijl4vra880kfy3qy9h96flq7d2if0f2"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -61010,6 +61033,8 @@ self: { pname = "doctest-driver-gen"; version = "0.1.0.1"; sha256 = "0drv2zp8mr4sisd27y0bcjamip8vs26a09k65x6zm5ric4psmhqs"; + revision = "1"; + editedCabalFile = "0005s8byp2ww8y2xnmxvdh24fw5qwly4f6sbmzwbs0yi10zsbfkg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base doctest ]; @@ -63854,8 +63879,8 @@ self: { }: mkDerivation { pname = "ekg-core"; - version = "0.1.1.2"; - sha256 = "01gqg5lpn67gc2rsvil4k54c1w9cz9avyxzlvmi2baxbrpj7isrm"; + version = "0.1.1.3"; + sha256 = "1qw9zd4q107c4jy7k8wq3jcyh488gnxxvgk97fm7c2xzyv8f4mmc"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; @@ -64010,22 +64035,6 @@ self: { }) {}; "ekg-statsd" = callPackage - ({ mkDerivation, base, bytestring, ekg-core, network, text, time - , unordered-containers - }: - mkDerivation { - pname = "ekg-statsd"; - version = "0.2.1.1"; - sha256 = "1r0x26aqj0nbdl9nrj26xsb5np20bg6mihams394a0c41pv85j6k"; - libraryHaskellDepends = [ - base bytestring ekg-core network text time unordered-containers - ]; - homepage = "https://github.com/tibbe/ekg-statsd"; - description = "Push metrics to statsd"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ekg-statsd_0_2_2_0" = callPackage ({ mkDerivation, base, bytestring, ekg-core, network, text, time , unordered-containers }: @@ -64039,7 +64048,6 @@ self: { homepage = "https://github.com/tibbe/ekg-statsd"; description = "Push metrics to statsd"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-wai" = callPackage @@ -67874,26 +67882,6 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim - , monad-skeleton, mtl, primitive, profunctors, semigroups, StateVar - , tagged, template-haskell, transformers - }: - mkDerivation { - pname = "extensible"; - version = "0.4.4"; - sha256 = "17ggw3znbx0mh29nqg1g1jp571vsbndswgs28zql32s6nkcd1rby"; - libraryHaskellDepends = [ - base comonad constraints deepseq ghc-prim monad-skeleton mtl - primitive profunctors semigroups StateVar tagged template-haskell - transformers - ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/fumieval/extensible"; - description = "Extensible, efficient, optics-friendly data types and effects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extensible_0_4_5" = callPackage ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim , lens, monad-skeleton, mtl, primitive, profunctors, QuickCheck , semigroups, StateVar, tagged, template-haskell, transformers @@ -67911,7 +67899,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 @@ -69712,8 +69699,10 @@ self: { }: mkDerivation { pname = "fgl"; - version = "5.5.4.0"; - sha256 = "04bjm44qr63cl0g5lh07hbq78x5sbvdjf6ryymysi658q0fqjxji"; + version = "5.5.3.1"; + sha256 = "0k1frj6hpiij287sn91qvf1vms1b4zzs3xdq71xbam9cs80p5afy"; + revision = "1"; + editedCabalFile = "00bw87y97ym844ir4mdq0vx5kfb0brzlqmrbqa0iq35lkwsd4k3g"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -70343,32 +70332,6 @@ self: { }) {}; "find-clumpiness" = callPackage - ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness - , containers, hierarchical-clustering, listsafe, mtl - , optparse-applicative, text, text-show, tree-fun - , unordered-containers, vector - }: - mkDerivation { - pname = "find-clumpiness"; - version = "0.2.3.0"; - sha256 = "08aby19vx6mvv606f66yi89bbg7x487drzzbax8437xm7k2fpg73"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base BiobaseNewick bytestring clumpiness containers - hierarchical-clustering listsafe mtl text text-show tree-fun - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base BiobaseNewick bytestring clumpiness containers - optparse-applicative text tree-fun unordered-containers - ]; - homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; - description = "Find the clumpiness of labels in a tree"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "find-clumpiness_0_2_3_1" = callPackage ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness , containers, hierarchical-clustering, listsafe, mtl , optparse-applicative, text, text-show, tree-fun @@ -70392,7 +70355,6 @@ self: { homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; description = "Find the clumpiness of labels in a tree"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "find-conduit" = callPackage @@ -70443,23 +70405,6 @@ self: { }) {}; "fingertree" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "fingertree"; - version = "0.1.1.0"; - sha256 = "1w6x3kp3by5yjmam6wlrf9vap5l5rrqaip0djbrdp0fpf2imn30n"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - description = "Generic finger-tree structure, with example instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fingertree_0_1_2_1" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 }: @@ -70474,7 +70419,6 @@ self: { ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fingertree-psqueue" = callPackage @@ -73121,6 +73065,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "free-er" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "free-er"; + version = "0.1.0.0"; + sha256 = "0r6kc117jylp0y88iv8b51glx9nnywfvbcmxsfhd2cps5nkgw030"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/osa1/free-er"; + description = "An extensible effects library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "free-functors" = callPackage ({ mkDerivation, algebraic-classes, base, bifunctors, comonad , constraints, contravariant, profunctors, template-haskell @@ -73623,20 +73582,6 @@ self: { }) {}; "frisby" = callPackage - ({ mkDerivation, array, base, containers, mtl }: - mkDerivation { - pname = "frisby"; - version = "0.2"; - sha256 = "0isj9p7j33va1a4q78vnq32j9jdbjww596rxja235z4whicraf53"; - revision = "1"; - editedCabalFile = "1ip1bykcrnqzfjbsi4gfj59lc24k3kvyn949ryczpqshlpgnbnqj"; - libraryHaskellDepends = [ array base containers mtl ]; - homepage = "http://repetae.net/computer/frisby/"; - description = "Linear time composable parser for PEG grammars"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "frisby_0_2_1" = callPackage ({ mkDerivation, array, base, containers, mtl, semigroups }: mkDerivation { pname = "frisby"; @@ -73646,7 +73591,6 @@ self: { homepage = "http://repetae.net/computer/frisby/"; description = "Linear time composable parser for PEG grammars"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "from-sum" = callPackage @@ -80243,24 +80187,6 @@ self: { }) {}; "glib" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, glib - , gtk2hs-buildtools, text, utf8-string - }: - mkDerivation { - pname = "glib"; - version = "0.13.4.1"; - sha256 = "0c16wddkq3ysbcgdngli7g2b680niavwi45km3551k4l83nh4wpm"; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - base bytestring containers text utf8-string - ]; - libraryPkgconfigDepends = [ glib ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the GLIB library for Gtk2Hs"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "glib_0_13_5_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , gtk2hs-buildtools, text, utf8-string }: @@ -80276,7 +80202,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GLIB library for Gtk2Hs"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "glicko" = callPackage @@ -83771,8 +83696,8 @@ self: { }: mkDerivation { pname = "graphite"; - version = "0.5.0.0"; - sha256 = "1942cy8gcx7jwxcfyh605kljzil91g0zw9673l93mjz7ipqhcxz4"; + version = "0.7.0.0"; + sha256 = "0bapl5hvv3dqfrpx9jx70s6akas11xpvfm1zzdkp02w3i106dchj"; libraryHaskellDepends = [ base bytestring cassava containers deepseq dequeue graphviz hashable process QuickCheck random unordered-containers vector @@ -84773,25 +84698,6 @@ self: { }) {}; "gtk" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers - , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text - }: - mkDerivation { - pname = "gtk"; - version = "0.14.6"; - sha256 = "09w3f2n2n9n44yf2li3ldlb3cxhbc0rml15j9xqamw5q1h90cybh"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk2 ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - }) {gtk2 = pkgs.gnome2.gtk;}; - - "gtk_0_14_7" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text }: @@ -84808,7 +84714,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "gtk-helpers" = callPackage @@ -84944,28 +84849,6 @@ self: { }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;}; "gtk2hs-buildtools" = callPackage - ({ mkDerivation, alex, array, base, Cabal, containers, directory - , filepath, happy, hashtables, pretty, process, random - }: - mkDerivation { - pname = "gtk2hs-buildtools"; - version = "0.13.2.2"; - sha256 = "0jzvxlssqmd2dpnm35qpaq5xv5jk7hhy87594m74xv0ihygvbr65"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base Cabal containers directory filepath hashtables pretty - process random - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "gtk2hs-buildtools_0_13_3_0" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory , filepath, happy, hashtables, pretty, process, random }: @@ -84987,7 +84870,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Tools to build the Gtk2Hs suite of User Interface libraries"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk2hs-cast-glade" = callPackage @@ -85122,32 +85004,6 @@ self: { }) {}; "gtk3" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers - , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time - , transformers - }: - mkDerivation { - pname = "gtk3"; - version = "0.14.6"; - sha256 = "0n223zgfjfv0p70wd7rh881fv8z00c9jmz7wm3vfa1jy3b2x7h7l"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk3 ]; - executableHaskellDepends = [ - array base cairo text time transformers - ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ 3 graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) gtk3;}; - - "gtk3_0_14_7" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time , transformers @@ -85170,7 +85026,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage @@ -87877,6 +87733,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hakyll-shortcode" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, MissingH + , network-uri, parsec, QuickCheck, regex-posix, split, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "hakyll-shortcode"; + version = "0.0.2"; + sha256 = "13z24pg5043s5fr2ak4v3n6vv80xv3c96bibxgrcfcrqfcibvqfx"; + libraryHaskellDepends = [ + base blaze-html blaze-markup MissingH network-uri parsec + regex-posix split + ]; + testHaskellDepends = [ + base blaze-html blaze-markup MissingH network-uri parsec QuickCheck + regex-posix split tasty tasty-hunit tasty-quickcheck + ]; + description = "A shortcode extension module for Hakyll"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "halberd" = callPackage ({ mkDerivation, base, Cabal, containers, haskell-names , haskell-packages, haskell-src-exts, HUnit, mtl, safe, split, syb @@ -89280,6 +89157,25 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "happy_1_19_8" = callPackage + ({ mkDerivation, array, base, Cabal, containers, directory + , filepath, mtl, process + }: + mkDerivation { + pname = "happy"; + version = "1.19.8"; + sha256 = "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ array base containers mtl ]; + testHaskellDepends = [ base process ]; + homepage = "https://www.haskell.org/happy/"; + description = "Happy is a parser generator for Haskell"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happy-meta" = callPackage ({ mkDerivation, array, base, containers, happy, haskell-src-meta , mtl, template-haskell @@ -89599,27 +89495,6 @@ self: { }) {}; "hasbolt" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, data-default, hex, hspec, network - , QuickCheck, text, transformers - }: - mkDerivation { - pname = "hasbolt"; - version = "0.1.2.1"; - sha256 = "08pa4df4klijdxpbfkqiqfjrcwl3ip3gwg84kx1zg9wpnvdbjn4l"; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 data-default - hex network text transformers - ]; - testHaskellDepends = [ - base bytestring containers hex hspec QuickCheck text - ]; - homepage = "https://github.com/zmactep/hasbolt#readme"; - description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hasbolt_0_1_3_0" = callPackage ({ mkDerivation, base, binary, bytestring, connection, containers , data-binary-ieee754, data-default, hex, network, text , transformers @@ -89635,7 +89510,6 @@ self: { homepage = "https://github.com/zmactep/hasbolt#readme"; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascal" = callPackage @@ -90033,20 +89907,6 @@ self: { }) {}; "hashtables" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: - mkDerivation { - pname = "hashtables"; - version = "1.2.2.0"; - sha256 = "0v7kfm04pynj66rkzyzvygxqv3xr3dj3h2aw0qj3h2zzjp33ybbf"; - libraryHaskellDepends = [ - base ghc-prim hashable primitive vector - ]; - homepage = "http://github.com/gregorycollins/hashtables"; - description = "Mutable hash tables in the ST monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hashtables_1_2_2_1" = callPackage ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { pname = "hashtables"; @@ -90058,7 +89918,6 @@ self: { homepage = "http://github.com/gregorycollins/hashtables"; description = "Mutable hash tables in the ST monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashtables-plus" = callPackage @@ -96473,8 +96332,8 @@ self: { }: mkDerivation { pname = "hexpat-lens"; - version = "0.1.5"; - sha256 = "13965xm8anbhq8xpg0y5a5aw9xy2gzn5zm1w64p96sdzklw5xrna"; + version = "0.1.6"; + sha256 = "0d395r8rc1s3q1gldynb47g20l4585w18div21jm397gga4cgkmx"; libraryHaskellDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; @@ -98880,8 +98739,8 @@ self: { pname = "hledger-iadd"; version = "1.2.6"; sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36"; - revision = "4"; - editedCabalFile = "0sb4rs0qh126xbwnza1gq1xlq3vds9rgypd1j02s59p5l725j9l8"; + revision = "5"; + editedCabalFile = "0sv6lqnsi5s28f001xi72bjlaykwl1l7ygf9kqpj01i8km7l5xpr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98989,8 +98848,8 @@ self: { pname = "hledger-ui"; version = "1.4"; sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33"; - revision = "3"; - editedCabalFile = "19b2l4xdk504gy5fvwhcklk2ljl4m4kqsyaifn7shnxyb5vc46dw"; + revision = "4"; + editedCabalFile = "0gffnqaf35yscg080p1p50f4w4l5rcvf5q5y19fbwmgwvp9nm687"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -106507,29 +106366,6 @@ self: { }) {}; "html-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , containers, hspec, HUnit, resourcet, tagstream-conduit, text - , transformers, xml-conduit, xml-types - }: - mkDerivation { - pname = "html-conduit"; - version = "1.2.1.1"; - sha256 = "1a5878axl1w65rv3g76d8fwgzbwazikna885jz5156zrrdq79hlq"; - revision = "2"; - editedCabalFile = "1fhna6ck1v05zpf4c715phz102v8vz0p7lsjk3fljmxblamc8kn6"; - libraryHaskellDepends = [ - base bytestring conduit conduit-extra 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; - }) {}; - - "html-conduit_1_2_1_2" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , containers, hspec, HUnit, resourcet, tagstream-conduit, text , transformers, xml-conduit, xml-types @@ -106548,7 +106384,6 @@ self: { 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 @@ -106774,6 +106609,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htoml-megaparsec" = callPackage + ({ mkDerivation, aeson, base, bytestring, composition-prelude + , containers, criterion, deepseq, file-embed, megaparsec, mtl + , old-locale, tasty, tasty-hspec, tasty-hunit, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "htoml-megaparsec"; + version = "1.0.1.1"; + sha256 = "02zrqdpry6hggd1q71dh85j9g3chzcln904ag507rihilxv90s45"; + libraryHaskellDepends = [ + base composition-prelude containers deepseq megaparsec mtl + old-locale text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed megaparsec tasty + tasty-hspec tasty-hunit text time unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson base containers criterion text time unordered-containers + vector + ]; + homepage = "https://github.com/vmchale/htoml-megaparsec"; + description = "Parser for TOML files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "htrace" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -108150,12 +108012,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "hunit-dejafu_0_7_0_1" = callPackage + "hunit-dejafu_0_7_0_2" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.7.0.1"; - sha256 = "01qa52j5xkksq0z24c8shm04q1gxnqm1m3sqpm1s27ywbivl9n6i"; + version = "0.7.0.2"; + sha256 = "1n3vq17rl18kaill8ig30qvmaw60dq8w0phss5v8hhgfij64gmm6"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -112926,18 +112788,6 @@ self: { }) {}; "instance-control" = callPackage - ({ mkDerivation, base, mtl, transformers }: - mkDerivation { - pname = "instance-control"; - version = "0.1.1.1"; - sha256 = "0cgvqd52la1f1r7a8cdjg1j3hx1f7y8s3z2ghddmc8s8sxihhkb6"; - libraryHaskellDepends = [ base mtl transformers ]; - homepage = "https://github.com/lazac/instance-control"; - description = "Controls how the compiler searches for instances using type families"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "instance-control_0_1_2_0" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "instance-control"; @@ -112947,7 +112797,6 @@ self: { homepage = "https://github.com/lazac/instance-control"; description = "Controls how the compiler searches for instances using type families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "instant-aeson" = callPackage @@ -118110,42 +117959,6 @@ self: { }) {}; "katip" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.5.0.2"; - sha256 = "1kiangj6l29ddchfzfp4xjnpnddyc9jzrg08b70z3jxbdv2vgvyg"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - homepage = "https://github.com/Soostone/katip"; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "katip_0_5_0_3" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , filepath, hostname, microlens, microlens-th, monad-control, mtl @@ -118179,7 +117992,6 @@ self: { homepage = "https://github.com/Soostone/katip"; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-elasticsearch" = callPackage @@ -121321,7 +121133,7 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "language-puppet_1_3_11" = callPackage + "language-puppet_1_3_12_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, exceptions, filecache, formatting, Glob @@ -121335,8 +121147,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.11"; - sha256 = "03zvd5xwjdbarfvfy9y8rn2wabzw5ic3vr5f0li0r9cgdg1p66p2"; + version = "1.3.12.1"; + sha256 = "1nznlw81qnnrvfpwrliyz88f1i6wmsg8kksjnwk5zv69q9nxg3z1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -122267,20 +122079,6 @@ self: { }) {}; "leancheck" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "leancheck"; - version = "0.6.5"; - sha256 = "05mda73v91y951fc8lph2fq8nhq3q12d30xjwj5h7xqwi2c8sdiy"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/rudymatela/leancheck#readme"; - description = "Cholesterol-free property-based testing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; - - "leancheck_0_6_7" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; @@ -122291,7 +122089,7 @@ self: { homepage = "https://github.com/rudymatela/leancheck#readme"; description = "Cholesterol-free property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "leankit-api" = callPackage @@ -125312,8 +125110,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.0.3"; - sha256 = "0w24iib5938wlm8c73j04fqz5aqya7bnaqi3psk3yl6q1fl7i57l"; + version = "0.8.0.5"; + sha256 = "02iixi1ika6rjdf8qzf404prvjl2l0qhq7rgyzbkrfvk7k4x1mbv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125339,7 +125137,6 @@ self: { homepage = "https://github.com/ucsd-progsys/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -126099,27 +125896,25 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {llvm-config = null;}; - "llvm-hs_5_0_0" = callPackage + "llvm-hs_5_1_0" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , containers, exceptions, llvm-config, llvm-hs-pure, mtl , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, transformers, transformers-compat - , utf8-string + , template-haskell, temporary, transformers, utf8-string }: mkDerivation { pname = "llvm-hs"; - version = "5.0.0"; - sha256 = "1lngf77ir1ffmqmwjpvax3rwmkapqrap66nc5lms3zxkpd3sh31x"; + version = "5.1.0"; + sha256 = "1l6r409zviis70qd3w8ysycy479q0sqjd85kd6z8b0ngjvq1y5ik"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure - mtl template-haskell transformers transformers-compat utf8-string + mtl template-haskell transformers utf8-string ]; libraryToolDepends = [ llvm-config ]; testHaskellDepends = [ base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck tasty tasty-hunit tasty-quickcheck temporary transformers - transformers-compat ]; homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "General purpose LLVM bindings"; @@ -126149,22 +125944,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "llvm-hs-pure_5_0_0" = callPackage + "llvm-hs-pure_5_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, mtl , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers, transformers-compat + , transformers }: mkDerivation { pname = "llvm-hs-pure"; - version = "5.0.0"; - sha256 = "1brz1zc9mmx4vyivvidjxv4x3i04wwpn1y060lcpnzmp89zz5pc1"; + version = "5.1.0"; + sha256 = "0m4ahrh2d0h9vfky9852y99g1xwsi7s7qr3xxnbgnw8zci7966f5"; libraryHaskellDepends = [ attoparsec base bytestring containers mtl template-haskell - transformers transformers-compat + transformers ]; testHaskellDepends = [ base containers mtl tasty tasty-hunit tasty-quickcheck transformers - transformers-compat ]; homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "Pure Haskell LLVM functionality (no FFI)"; @@ -126668,10 +126462,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.7.2.0"; - sha256 = "1lxlm76n1yhdkqmi44m4h460sc3a6lmscaz2daci16vvl4kzilds"; - revision = "1"; - editedCabalFile = "0x11xxfvlak8p7p544gknm2k7nqh1wq01bg800gdgppxcpv3m4li"; + version = "0.7.3.0"; + sha256 = "15bf0ly3fl2k7dqn5vskafsihil5lb7ij96vw0nsb3dil80f54qk"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -126734,8 +126526,8 @@ self: { pname = "log-elasticsearch"; version = "0.9.1.0"; sha256 = "0i6mpdh1g25wa9yk9p5isg7idjqh3z0zd2mm43707z4s36pfr9m5"; - revision = "1"; - editedCabalFile = "1c2245z8ajy11n033my5wzj9q79vbj4jlysy477syr6h5840wd6x"; + revision = "2"; + editedCabalFile = "11c7jrc16nwg5jxwsggip5bsvw9zbk8c3gw1my22rwfglnpxg885"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -126803,8 +126595,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.3.0"; - sha256 = "0y5bwva06nl1gs1h0m5csg1sly7v8a4w0q2k1424w3zrm11in79q"; + version = "1.3.1"; + sha256 = "0hagc9yxb8dmc2qxjzdddvynx7pygr02alf99dvhnc4p5v2yx4z7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127935,30 +127727,6 @@ self: { }) {}; "lucid" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph - , mtl, parsec, text, transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.9.8.1"; - sha256 = "026s82bh3a4lgmpy9445i5f6q0iiqpc8cxxx8rhmn32nrqhf187b"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text transformers - ]; - homepage = "https://github.com/chrisdone/lucid"; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lucid_2_9_9" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph , mtl, parsec, text, transformers, unordered-containers @@ -127980,7 +127748,6 @@ self: { homepage = "https://github.com/chrisdone/lucid"; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-extras" = callPackage @@ -128268,6 +128035,8 @@ self: { pname = "lxd-client"; version = "0.1.0.2"; sha256 = "1m1rqzbjnd73p6y2iak5fpdq15n52pn2lancvr5s0japw45knqhz"; + revision = "1"; + editedCabalFile = "003vlaqpqcxhdmc2l0851i4c689bzlc2s9rlrdw6mdcsl4l58qwr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128779,8 +128548,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "2.4.2.10"; - sha256 = "0s6y309prwz148jaa7yiivv17jq4zsvcrkvpgkcs0gah98i601a8"; + version = "2.4.2.14"; + sha256 = "1nimlz7bcn90hzrnb5v26gn8c4jp17ac4i8hl902h0k8ba9rr7i7"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory file-embed process ]; @@ -134735,8 +134504,8 @@ self: { }: mkDerivation { pname = "monad-persist"; - version = "0.0.1.2"; - sha256 = "1k6vfn2a120jxsgscajz9k91ns8spcan555gdyrj4jyrg8fzkbcd"; + version = "0.0.1.4"; + sha256 = "032732piflwzx43rdndbjy757pmkm68p28bb6znz6dsj7r0xv349"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl persistent text transformers-base @@ -134745,6 +134514,7 @@ self: { base hspec monad-control monad-logger persistent persistent-sqlite persistent-template text ]; + homepage = "https://github.com/cjdev/monad-persist#readme"; description = "An mtl-style typeclass and transformer for persistent"; license = stdenv.lib.licenses.isc; }) {}; @@ -138097,7 +137867,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mysql-haskell_0_8_1_0" = callPackage + "mysql-haskell_0_8_3_0" = callPackage ({ mkDerivation, base, binary, binary-ieee754, binary-parsers , blaze-textual, bytestring, bytestring-lexing, cryptonite , io-streams, memory, monad-loops, network, scientific, tasty @@ -138106,8 +137876,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.8.1.0"; - sha256 = "02nxfm3y7f24gqs4hac5pk2q32l0xvaspby6n56zcrdwmpfs3241"; + version = "0.8.3.0"; + sha256 = "1b3sa119m82qmq2mkn0ixhs175i6l92nk4qwvfhh226crj6g5bp9"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring bytestring-lexing cryptonite io-streams memory monad-loops network @@ -138156,6 +137926,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mysql-haskell-openssl_0_8_3_0" = callPackage + ({ mkDerivation, base, binary, HsOpenSSL, mysql-haskell + , tcp-streams, tcp-streams-openssl, wire-streams + }: + mkDerivation { + pname = "mysql-haskell-openssl"; + version = "0.8.3.0"; + sha256 = "0pm5vd2gpb1x68n2i5brvspngfplp283jlw9a351z2yrnpwmwd24"; + libraryHaskellDepends = [ + base binary HsOpenSSL mysql-haskell tcp-streams tcp-streams-openssl + wire-streams + ]; + homepage = "https://github.com/winterland1989/mysql-haskell"; + description = "TLS support for mysql-haskell package using openssl"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mysql-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light @@ -140606,23 +140394,6 @@ self: { }) {}; "network-transport-tests" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl - , network-transport, random - }: - mkDerivation { - pname = "network-transport-tests"; - version = "0.2.4.1"; - sha256 = "1j3sfr8d0fjp7qiqw94rcfwk8hrb55w8vz7cmw891cjjdlf00nb3"; - libraryHaskellDepends = [ - ansi-terminal base bytestring containers mtl network-transport - random - ]; - homepage = "http://haskell-distributed.github.com"; - description = "Unit tests for Network.Transport implementations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport-tests_0_2_4_2" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl , network-transport, random }: @@ -140637,7 +140408,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Unit tests for Network.Transport implementations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-zeromq" = callPackage @@ -141064,8 +140834,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.8.1.0"; - sha256 = "0ab8hh8dh8rk65zghwhhfpvlkvj5i1652cv5vw9a0pd5mqqygh2z"; + version = "0.9.0.0"; + sha256 = "099q24f9879sdwqa0jnlsamvpz1jbyryn90w7jp7np68avbhv9bf"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -143882,13 +143652,13 @@ self: { ({ mkDerivation, base, type-fun }: mkDerivation { pname = "open-union"; - version = "0.2.0.0"; - sha256 = "1glbnkd62999ybmm7d15m4d6q9j6cjmj27pzj3dfvz3afd75v0z9"; + version = "0.3.0.0"; + sha256 = "01wxkla0034d5i331vzbjm5ilkdn2570qhl0pa6lf3m58aghmccn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base type-fun ]; executableHaskellDepends = [ base type-fun ]; - homepage = "https://github.com/bfopa/open-union"; + homepage = "https://github.com/bfops/open-union"; description = "Extensible, type-safe unions"; license = stdenv.lib.licenses.mit; }) {}; @@ -145268,8 +145038,8 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.0.4"; - sha256 = "1229av0i3j69wcnzpxz21z3j02sr2wl491swidfqzp9ifjk4w5l3"; + version = "0.1.1"; + sha256 = "0241f7d996akmqi1id6dqwki5yql7mgw331msxvza616s3gcyd36"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146490,26 +146260,6 @@ self: { }) {}; "pango" = callPackage - ({ mkDerivation, array, base, Cabal, cairo, containers, directory - , filepath, glib, gtk2hs-buildtools, mtl, pango, pretty, process - , text - }: - mkDerivation { - pname = "pango"; - version = "0.13.3.1"; - sha256 = "1frzcgqa1f1i3bk0q229vy8y6gsi423s8hfqvnr56h7ys8blysih"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base cairo containers directory glib mtl pretty process text - ]; - libraryPkgconfigDepends = [ pango ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Pango text rendering engine"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome2) pango;}; - - "pango_0_13_4_0" = callPackage ({ mkDerivation, array, base, Cabal, cairo, containers, directory , filepath, glib, gtk2hs-buildtools, mtl, pango, pretty, process , text @@ -146527,7 +146277,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) pango;}; "panhandle" = callPackage @@ -146607,17 +146356,17 @@ self: { }) {}; "papa" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, papa-base - , papa-base-export, papa-base-implement, papa-bifunctors - , papa-bifunctors-export, papa-bifunctors-implement, papa-lens - , papa-lens-export, papa-lens-implement, papa-semigroupoids + ({ mkDerivation, base, papa-base, papa-base-export + , papa-base-implement, papa-bifunctors, papa-bifunctors-export + , papa-bifunctors-implement, papa-lens, papa-lens-export + , papa-lens-implement, papa-semigroupoids , papa-semigroupoids-export, papa-semigroupoids-implement, papa-x - , papa-x-export, papa-x-implement, QuickCheck, template-haskell + , papa-x-export, papa-x-implement }: mkDerivation { pname = "papa"; - version = "0.3.0"; - sha256 = "0rqk37yv5z0fmk5ksmfp5gsx0fvhb9vgzxf699dfzcyjhr2wza4i"; + version = "0.3.1"; + sha256 = "05w1sj78fvdaw8f4dqq2c8vwm9qyjipabafznlib6qylv27x361c"; libraryHaskellDepends = [ base papa-base papa-base-export papa-base-implement papa-bifunctors papa-bifunctors-export papa-bifunctors-implement papa-lens @@ -146625,117 +146374,84 @@ self: { papa-semigroupoids-export papa-semigroupoids-implement papa-x papa-x-export papa-x-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-base-export, papa-base-implement, QuickCheck - , template-haskell - }: + ({ mkDerivation, base, papa-base-export, papa-base-implement }: mkDerivation { pname = "papa-base"; - version = "0.3.0"; - sha256 = "1mj70lipn90jpnadwzs2sl36q72x0z47bhhnmzdcpr79irqf1fx2"; + version = "0.3.1"; + sha256 = "1clilnnhaz4vf5hdi8cmqy5805l2q8g9mfi2czi3g3rr7wp8x89y"; libraryHaskellDepends = [ base papa-base-export papa-base-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base-export" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , semigroups, template-haskell - }: + ({ mkDerivation, base, semigroups }: mkDerivation { pname = "papa-base-export"; - version = "0.3.0"; - sha256 = "19ix2ckdp22xfjghgb8a7586pbldz291185bc96j37ijmy4lhd5z"; + version = "0.3.1"; + sha256 = "13gd3ldpiwmms3di80smk68x4mf9nigy0irz506cayd9bwqpw3jv"; libraryHaskellDepends = [ base semigroups ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-base-export, QuickCheck, semigroups, template-haskell - }: + ({ mkDerivation, base, papa-base-export, semigroups }: mkDerivation { pname = "papa-base-implement"; - version = "0.3.0"; - sha256 = "17swqgg9nja1jlyhynzaybcq47kqmf0ci7rpd6n2vmwmg2d12inx"; + version = "0.3.1"; + sha256 = "07wpz625sdsjajaf3imqns92hs4h5gwjlmmfsr5mk9rbb3zph7ck"; libraryHaskellDepends = [ base papa-base-export semigroups ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Useful base functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-bifunctors" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-bifunctors-export, papa-bifunctors-implement, QuickCheck - , template-haskell + ({ mkDerivation, base, papa-bifunctors-export + , papa-bifunctors-implement }: mkDerivation { pname = "papa-bifunctors"; - version = "0.3.0"; - sha256 = "04yy7v810sff3k4wjlmkpqjxic3wj35c03vpiqi2mnjawy4dv02m"; + version = "0.3.1"; + sha256 = "1yh742vl8lrs8lrihny4l1ss4ngp3i7willvv2xpslizlrr3n02g"; libraryHaskellDepends = [ base papa-bifunctors-export papa-bifunctors-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-bifunctors-export" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , QuickCheck, template-haskell - }: + ({ mkDerivation, base, bifunctors }: mkDerivation { pname = "papa-bifunctors-export"; - version = "0.3.0"; - sha256 = "0r4sk72ffd6whmmq6x9yjl8yfmq6i8hgywncambhhkprnq0y1lrl"; + version = "0.3.1"; + sha256 = "070br6i23pdhha9kakfw4sq8rslyrjsf1n0iikm60ca5ldbl8vn0"; libraryHaskellDepends = [ base bifunctors ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `bifunctors`"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-bifunctors-implement" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , QuickCheck, template-haskell - }: + ({ mkDerivation, base, bifunctors }: mkDerivation { pname = "papa-bifunctors-implement"; - version = "0.3.0"; - sha256 = "0s003pj5mbqrlp14krzah42920ai111nyp9xz3zi9q0qjqd293x5"; + version = "0.3.1"; + sha256 = "0s1hcpchiz9xrip25z677lkglmflnqibrvy98xmn2ppzp489pm24"; libraryHaskellDepends = [ base bifunctors ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "useful `bifunctors` functions reimplemented"; license = stdenv.lib.licenses.bsd3; @@ -146802,54 +146518,38 @@ self: { }) {}; "papa-lens" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-lens-export, papa-lens-implement, QuickCheck - , template-haskell - }: + ({ mkDerivation, base, papa-lens-export, papa-lens-implement }: mkDerivation { pname = "papa-lens"; - version = "0.3.0"; - sha256 = "0rdxmp9smrbk86hi0n0v4c49mlw4py39961mv7j8mg4szrgnmb8s"; + version = "0.3.1"; + sha256 = "1djx19xr3jbxwnzvr528xwshv1j86cz6ix09zrh32qdilkhfl66v"; libraryHaskellDepends = [ base papa-lens-export papa-lens-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-lens-export" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , QuickCheck, template-haskell - }: + ({ mkDerivation, base, lens }: mkDerivation { pname = "papa-lens-export"; - version = "0.3.0"; - sha256 = "02pqgkx0xdpcwaknk0hh0b2mvk0kqh5i1m0zfx6fvh9k7yzjm510"; + version = "0.3.1"; + sha256 = "1sckrsfljk8r9jkjv1ccpzw6bk4fq50zwvkddhfidjrjnfvkycfb"; libraryHaskellDepends = [ base lens ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `lens`"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-lens-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , QuickCheck, template-haskell - }: + ({ mkDerivation, base, lens }: mkDerivation { pname = "papa-lens-implement"; - version = "0.3.0"; - sha256 = "0scfdiqvjrzimavl6v3g9rlak5rxaa8kdrwxvxsswm4iw7ach1px"; + version = "0.3.1"; + sha256 = "1x7439f7s625mdhnphvwy4pj7llpj6qsvzgvhzjcfg9m3n2a8bn4"; libraryHaskellDepends = [ base lens ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "useful `lens` functions reimplemented"; license = stdenv.lib.licenses.bsd3; @@ -146942,105 +146642,76 @@ self: { }) {}; "papa-semigroupoids" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-semigroupoids-export, papa-semigroupoids-implement - , QuickCheck, template-haskell + ({ mkDerivation, base, papa-semigroupoids-export + , papa-semigroupoids-implement }: mkDerivation { pname = "papa-semigroupoids"; - version = "0.3.0"; - sha256 = "19gdwj4f2cd25qjakkfwij4igbvx1065dn8gjrdy78vkjsnx9c80"; + version = "0.3.1"; + sha256 = "0z6ibgk0r3d27953i8n031al96djznvnbrak4dpgn05qnh9l0338"; libraryHaskellDepends = [ base papa-semigroupoids-export papa-semigroupoids-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-semigroupoids-export" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , semigroupoids, template-haskell - }: + ({ mkDerivation, base, semigroupoids }: mkDerivation { pname = "papa-semigroupoids-export"; - version = "0.3.0"; - sha256 = "19fr1sdpvs9yf8030ff8kx9qahd7zprck5d8mxz2xgrl86zlaa8d"; + version = "0.3.1"; + sha256 = "0arqnnavjmpk0r9rfmpkyr3cxgc3gcr01ym8p15ix0iv0svghhx3"; libraryHaskellDepends = [ base semigroupoids ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `semigroupoids`"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-semigroupoids-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , semigroupoids, semigroups, template-haskell - }: + ({ mkDerivation, base, semigroupoids, semigroups }: mkDerivation { pname = "papa-semigroupoids-implement"; - version = "0.3.0"; - sha256 = "0i84p1gffvgq58pmjr9rp774zfbvzs3w9krpp60d8pyz61rmsgjd"; + version = "0.3.1"; + sha256 = "0walc4zzm8cyjmjl577zrc01lkgf321r8law5mwhlr7n9ihiqfxg"; libraryHaskellDepends = [ base semigroupoids semigroups ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "useful `semigroupoids` functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-x" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, papa-x-export - , papa-x-implement, QuickCheck, template-haskell - }: + ({ mkDerivation, base, papa-x-export, papa-x-implement }: mkDerivation { pname = "papa-x"; - version = "0.3.0"; - sha256 = "0nxhvnhlk622q7qfzl3z6fwzsanjhy26p8i51w1g5p89izwz8yy4"; + version = "0.3.1"; + sha256 = "1dvnnpdbiaxry2mxsfxlm0c42zi8ssx0sxj6m9z5mihwcf76cpld"; libraryHaskellDepends = [ base papa-x-export papa-x-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-x-export" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell - }: + ({ mkDerivation, base }: mkDerivation { pname = "papa-x-export"; - version = "0.3.0"; - sha256 = "1y94kfpzk5v5agwhqlysm4jg3q0n09sqpw1wn9r5qqvvxkkjx9s1"; + version = "0.3.1"; + sha256 = "1l0rklbpg9py2cbp22qlshcxh51wxv9ayiixqh32q70jsgfbkind"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "export useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-x-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell - }: + ({ mkDerivation, base }: mkDerivation { pname = "papa-x-implement"; - version = "0.3.0"; - sha256 = "1qycam0xb99vgfh01sw3vq5mvlgrq9kgjfs2js8inhmzij3a0nv9"; + version = "0.3.1"; + sha256 = "1hwd93nig7vgqsdy3qyxrgvjcq8wwbj98z6r66wpp7lw8jfpqhff"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "useful functions reimplemented"; license = stdenv.lib.licenses.bsd3; @@ -151467,14 +151138,14 @@ self: { }) {}; "pipes-extras" = callPackage - ({ mkDerivation, base, foldl, HUnit, pipes, test-framework + ({ mkDerivation, base, foldl, HUnit, lens, pipes, test-framework , test-framework-hunit, transformers }: mkDerivation { pname = "pipes-extras"; - version = "1.0.10"; - sha256 = "1an1ca8dbwnz7jsz0l9gyrzgibyhl46p855m3hzvy0jvhai0fz2j"; - libraryHaskellDepends = [ base foldl pipes transformers ]; + version = "1.0.11"; + sha256 = "0hllsd5jk88fv59bqiqksk52iwmqm7835fchzqmavgdsrib0nlmi"; + libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers ]; @@ -154056,15 +153727,14 @@ self: { }) {}; "postgres-embedded" = callPackage - ({ mkDerivation, base, directory, filepath, HDBC, HDBC-postgresql - , shell-conduit + ({ mkDerivation, base, directory, filepath, network, shell-conduit }: mkDerivation { pname = "postgres-embedded"; - version = "0.1.0"; - sha256 = "0014lwv8p71krm42dd5nydvfll04hzkfhzfm93csvgbg9s9wiywy"; + version = "0.1.5"; + sha256 = "0g7nvszas7zmx9wh8cdpc5wx5nkv710n7fzipsgbk2qlzj0j7f08"; libraryHaskellDepends = [ - base directory filepath HDBC HDBC-postgresql shell-conduit + base directory filepath network shell-conduit ]; testHaskellDepends = [ base filepath ]; homepage = "https://github.com/ilya-murzinov/postgres-embedded"; @@ -154995,8 +154665,8 @@ self: { }: mkDerivation { pname = "pragmatic-show"; - version = "0.1.0.2"; - sha256 = "0wyn4rdhv8flhcaa41bv7yabs2l5sm5fp7znsdjr137g3v190xpl"; + version = "0.1.1.0"; + sha256 = "0zkvdgghzyarvkx0ggcbpmmcbrkkk9dhbiq6xz4ljvdc9872hya6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector-space @@ -155874,8 +155544,8 @@ self: { ({ mkDerivation, base, criterion, deepseq, HTF, primes }: mkDerivation { pname = "primes-type"; - version = "0.2.0.2"; - sha256 = "0d2nhb0kbpls4ybipnjf2bf73dz1as5qhb0cjz59nmsipkqcr45s"; + version = "0.2.0.3"; + sha256 = "0y0dq283zshkd7gwywr2dvjr073bz5rbjvgqrxkbvnk97dcq4qjx"; libraryHaskellDepends = [ base deepseq primes ]; testHaskellDepends = [ base HTF primes ]; benchmarkHaskellDepends = [ base criterion primes ]; @@ -156107,6 +155777,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "private-hackage-uploader" = callPackage + ({ mkDerivation, base, directory, optparse-applicative, shelly + , text + }: + mkDerivation { + pname = "private-hackage-uploader"; + version = "0.2.3.0"; + sha256 = "0591xfj3wrhkyybycb38kvdvjiyvl62a4174zxzzc9bzj5pr4fji"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory optparse-applicative shelly text + ]; + executableHaskellDepends = [ base directory shelly text ]; + description = "Upload a package to the public or private hackage, building its docs"; + license = stdenv.lib.licenses.mit; + }) {}; + "privileged-concurrency" = callPackage ({ mkDerivation, base, contravariant, lifted-base, monad-control , stm, transformers-base @@ -156748,24 +156436,24 @@ self: { "project-m36" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary - , bytestring, Cabal, cassava, conduit, containers, criterion - , cryptohash-sha256, data-interval, deepseq, deepseq-generics - , directory, distributed-process, distributed-process-async - , distributed-process-client-server, distributed-process-extras - , either, extended-reals, filepath, ghc, ghc-boot, ghc-paths, Glob - , gnuplot, hashable, hashable-time, haskeline, http-api-data, HUnit - , list-t, megaparsec, monad-parallel, MonadRandom, mtl, network - , network-transport, network-transport-tcp, old-locale - , optparse-applicative, parallel, path-pieces, random - , random-shuffle, resourcet, semigroups, stm, stm-containers - , template-haskell, temporary, text, time, transformers, unix - , unordered-containers, uuid, vector, vector-binary-instances - , websockets + , blaze-html, bytestring, Cabal, cassava, conduit, containers + , criterion, cryptohash-sha256, data-interval, deepseq + , deepseq-generics, directory, distributed-process + , distributed-process-async, distributed-process-client-server + , distributed-process-extras, either, extended-reals, filepath, ghc + , ghc-boot, ghc-paths, Glob, gnuplot, hashable, hashable-time + , haskeline, http-api-data, http-types, HUnit, list-t, megaparsec + , monad-parallel, MonadRandom, mtl, network, network-transport + , network-transport-tcp, old-locale, optparse-applicative, parallel + , path-pieces, random, random-shuffle, resourcet, scotty + , semigroups, stm, stm-containers, template-haskell, temporary + , text, time, transformers, unix, unordered-containers, uuid + , vector, vector-binary-instances, websockets, zlib }: mkDerivation { pname = "project-m36"; - version = "0.2"; - sha256 = "0kzsc45qglv89ycj5f39kbpdss0r1b6sl39g6ba4v17syfyb3xxq"; + version = "0.3"; + sha256 = "0l72wafjy12vymsvfjy5xh0gfkswdyzr12hmn1qffham9s280014"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156779,16 +156467,17 @@ self: { network-transport network-transport-tcp old-locale optparse-applicative parallel path-pieces random-shuffle resourcet stm stm-containers temporary text time transformers unix - unordered-containers uuid vector vector-binary-instances + unordered-containers uuid vector vector-binary-instances zlib ]; executableHaskellDepends = [ - aeson attoparsec base base64-bytestring binary bytestring Cabal - cassava conduit containers data-interval deepseq deepseq-generics - directory either filepath ghc ghc-paths gnuplot hashable - hashable-time haskeline http-api-data HUnit list-t megaparsec - MonadRandom mtl network-transport-tcp optparse-applicative parallel - path-pieces random semigroups stm stm-containers template-haskell - temporary text time transformers unordered-containers uuid vector + aeson attoparsec base base64-bytestring binary blaze-html + bytestring Cabal cassava conduit containers data-interval deepseq + deepseq-generics directory either filepath ghc ghc-paths gnuplot + hashable hashable-time haskeline http-api-data http-types HUnit + list-t megaparsec MonadRandom mtl network-transport-tcp + optparse-applicative parallel path-pieces random scotty semigroups + stm stm-containers template-haskell temporary text time + transformers unordered-containers uuid vector vector-binary-instances websockets ]; testHaskellDepends = [ @@ -157818,29 +157507,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.3.0"; - sha256 = "19s36xkbpa8466y56bgcmrqxz7aq1fysliyvw79k2a76bpg9bv95"; - 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_4_0" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue , QuickCheck, random, tagged, test-framework, test-framework-hunit @@ -157861,7 +157527,6 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pstemmer" = callPackage @@ -159854,16 +159519,19 @@ self: { }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, containers, mtl, parallel-io - , QuickCheck, random, stm + ({ 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.1.0"; - sha256 = "1jczx6c1s5ir7r7r90kf5fhac4sydayr4lm6zsvjs4ykqnnparh6"; + version = "0.2.0"; + sha256 = "19d8n0dx3qw1ln7g1klyl6dd43gpldiczml7cy9cygi70rcrzhwr"; libraryHaskellDepends = [ - ansi-wl-pprint base containers mtl parallel-io QuickCheck random - stm + 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"; @@ -162845,14 +162513,15 @@ self: { "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq - , hspec, recursion-schemes, template-haskell + , hspec, lens, recursion-schemes, template-haskell }: mkDerivation { pname = "recursion-schemes-ext"; - version = "0.2.0.1"; - sha256 = "0lnqc4w4lpavs4d6jzdszl35g4qjksgfrqfqsyhv4a8w3w79xnz9"; + version = "0.2.1.0"; + sha256 = "0hm042kqb2dq9j68nsy8a6qgmxicfqclgdg4v3i7q1griscazyjr"; libraryHaskellDepends = [ - base composition-prelude deepseq recursion-schemes template-haskell + base composition-prelude deepseq lens recursion-schemes + template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -163094,26 +162763,6 @@ self: { }) {}; "reducers" = callPackage - ({ mkDerivation, array, base, bytestring, containers, fingertree - , hashable, semigroupoids, semigroups, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "reducers"; - version = "3.12.1"; - sha256 = "0pkddg0s3cn759miq0nfrq7lnp3imk5sx784ihsilsbjh9kvffz4"; - revision = "2"; - editedCabalFile = "00zxyyaj0grvr214qdrg68114b93iwp27vmww254s2yq9z701gf8"; - libraryHaskellDepends = [ - array base bytestring containers fingertree hashable semigroupoids - semigroups text transformers unordered-containers - ]; - homepage = "http://github.com/ekmett/reducers/"; - description = "Semigroups, specialized containers and a general map/reduce framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "reducers_3_12_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, fingertree , hashable, semigroupoids, semigroups, text, transformers , unordered-containers @@ -163129,7 +162778,6 @@ self: { homepage = "http://github.com/ekmett/reducers/"; description = "Semigroups, specialized containers and a general map/reduce framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reedsolomon" = callPackage @@ -163279,29 +162927,6 @@ self: { }) {}; "references" = callPackage - ({ mkDerivation, array, base, containers, directory, either - , filepath, HUnit, instance-control, lens, mtl, template-haskell - , text, transformers, uniplate - }: - mkDerivation { - pname = "references"; - version = "0.3.2.2"; - sha256 = "1p7ygqdycx1zm4fpilb7db0g66kyss50fddkc007812y2ih4vary"; - libraryHaskellDepends = [ - array base containers directory either filepath instance-control - mtl template-haskell text transformers uniplate - ]; - testHaskellDepends = [ - array base containers directory either filepath HUnit - instance-control lens mtl template-haskell text transformers - uniplate - ]; - homepage = "https://github.com/lazac/references"; - description = "Selectors for reading and updating data"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "references_0_3_3_0" = callPackage ({ mkDerivation, array, base, containers, directory, either , filepath, HUnit, instance-control, lens, mtl, template-haskell , text, transformers, uniplate @@ -163322,7 +162947,6 @@ self: { homepage = "https://github.com/lazac/references"; description = "Selectors for reading and updating data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "refh" = callPackage @@ -166404,6 +166028,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rethinkdb-client-driver_0_0_25" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , criterion, hashable, hspec, hspec-smallcheck, mtl, network + , old-locale, scientific, smallcheck, stm, template-haskell, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "rethinkdb-client-driver"; + version = "0.0.25"; + sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g"; + libraryHaskellDepends = [ + aeson base binary bytestring containers hashable mtl network + old-locale scientific stm template-haskell text time + unordered-containers vector + ]; + testHaskellDepends = [ + base hspec hspec-smallcheck smallcheck text time + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion text time unordered-containers vector + ]; + homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; + description = "Client driver for RethinkDB"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rethinkdb-model" = callPackage ({ mkDerivation, aeson, base, mtl, rethinkdb, text, transformers , unordered-containers @@ -168979,10 +168631,10 @@ self: { }: mkDerivation { pname = "saltine"; - version = "0.0.1.0"; - sha256 = "1vsanah757hvzs1yp36944gvhh6li3xmispk3xvjddmjzdlgzn0g"; + version = "0.1.0.0"; + sha256 = "1hkdvw4fr2p2wmgq9ghna0kq9x9yv3kc9sm9wh0c71cl7gxk9g52"; libraryHaskellDepends = [ base bytestring profunctors ]; - librarySystemDepends = [ libsodium ]; + libraryPkgconfigDepends = [ libsodium ]; testHaskellDepends = [ base bytestring QuickCheck test-framework test-framework-quickcheck2 @@ -171428,8 +171080,8 @@ self: { }: mkDerivation { pname = "selda"; - version = "0.1.11.0"; - sha256 = "1jdy7rf98ycqvrw73f70xnyidq5gjhzbavd2h64ib6v0mpcskdhy"; + version = "0.1.11.1"; + sha256 = "0vml5lmhabzps8la9h361bpsj29yq0n7azhvrpdkdmyjvw28svrs"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -171748,17 +171400,19 @@ self: { }: mkDerivation { pname = "semiring-num"; - version = "1.4.0.0"; - sha256 = "0p2ipnxj5kpjplspzllxm97y3xfnwvdndb4cllpa9glk21qx03p4"; + version = "1.5.0.0"; + sha256 = "15gn11razis9fzm58dfk4j2bk41lmnzngi3s4izydzsavzm4qyjx"; libraryHaskellDepends = [ base containers hashable log-domain scientific template-haskell time unordered-containers vector ]; testHaskellDepends = [ base containers doctest log-domain nat-sized-numbers QuickCheck - smallcheck tasty tasty-quickcheck tasty-smallcheck + smallcheck tasty tasty-quickcheck tasty-smallcheck vector + ]; + benchmarkHaskellDepends = [ + base containers criterion random vector ]; - benchmarkHaskellDepends = [ base containers criterion random ]; homepage = "https://github.com/oisdk/semiring-num"; description = "Basic semiring class and instances"; license = stdenv.lib.licenses.mit; @@ -173785,8 +173439,8 @@ self: { }: mkDerivation { pname = "servant-static-th"; - version = "0.1.0.5"; - sha256 = "1i1xyn14nc2jg1b6y926pz3dp4hlgg54q3lzzg9zza1jnh6ncjrp"; + version = "0.1.0.6"; + sha256 = "19rb7xmfnls8wkgyq6gf5b6rri6b6z4qfj1m2pxa9rwx5hfajiax"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174317,8 +173971,8 @@ self: { }: mkDerivation { pname = "sessiontypes"; - version = "0.1.0"; - sha256 = "0p5img64ksk2a4in4qamizyp1w59y4hcwv5ll0c0nis7flzyy3js"; + version = "0.1.1"; + sha256 = "0l9chnnyq8mblxqyg89nlfa55cadwy62mj29arakrc988l6ja3gq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180982,29 +180636,6 @@ self: { }) {}; "sparse-linear-algebra" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec - , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck - , scientific, transformers, vector, vector-algorithms, vector-space - }: - mkDerivation { - pname = "sparse-linear-algebra"; - version = "0.2.9.7"; - sha256 = "0sskv1bbn1q19jh508wk1d898jwzlsf7662v4crrppmb6k6cq1zq"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers exceptions mtl transformers vector - vector-algorithms vector-space - ]; - testHaskellDepends = [ - base containers exceptions hspec matrix-market-attoparsec mtl - mwc-random primitive QuickCheck scientific vector-space - ]; - homepage = "https://github.com/ocramz/sparse-linear-algebra"; - description = "Numerical computation in native Haskell"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "sparse-linear-algebra_0_2_9_8" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck , scientific, transformers, vector, vector-algorithms @@ -181025,7 +180656,6 @@ self: { homepage = "https://github.com/ocramz/sparse-linear-algebra"; description = "Numerical computation in native Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sparsebit" = callPackage @@ -184179,18 +183809,6 @@ self: { }) {}; "stm-extras" = callPackage - ({ mkDerivation, base, stm }: - mkDerivation { - pname = "stm-extras"; - version = "0.1.0.2"; - sha256 = "08c6c53gkfwirgf3lq2ncwbjnhb195zbi7b76m4lwh3f6acckg3y"; - libraryHaskellDepends = [ base stm ]; - homepage = "https://github.com/louispan/stm-extras#readme"; - description = "Extra STM functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stm-extras_0_1_0_3" = callPackage ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-extras"; @@ -184200,7 +183818,6 @@ self: { homepage = "https://github.com/louispan/stm-extras#readme"; description = "Extra STM functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-firehose" = callPackage @@ -184531,20 +184148,6 @@ self: { }) {}; "storable-tuple" = callPackage - ({ mkDerivation, base, base-orphans, storable-record, utility-ht }: - mkDerivation { - pname = "storable-tuple"; - version = "0.0.3.2"; - sha256 = "10l9br5kgwi2vrnhyx4w4an8cvcxqpx8qwg5h4gwr6pwpxdz7lrm"; - libraryHaskellDepends = [ - base base-orphans storable-record utility-ht - ]; - homepage = "http://code.haskell.org/~thielema/storable-tuple/"; - description = "Storable instance for pairs and triples"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "storable-tuple_0_0_3_3" = callPackage ({ mkDerivation, base, base-orphans, storable-record, utility-ht }: mkDerivation { pname = "storable-tuple"; @@ -184556,7 +184159,6 @@ self: { homepage = "http://code.haskell.org/~thielema/storable-tuple/"; description = "Storable instance for pairs and triples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "storablevector" = callPackage @@ -187063,8 +186665,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.2"; - sha256 = "1027kj163mjp78gxl1g77jgxg5n6q5xkhvy4zdx3wlcjc2b3mjah"; + version = "0.0.1.3"; + sha256 = "008k36ica9l6k77729mvcmgjdjayn47q468wn20bcb7anc04sijn"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -187074,7 +186676,7 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers hspec iso8601-time mtl QuickCheck - semigroups text time transformers unordered-containers + semigroups text time transformers unordered-containers vector ]; homepage = "https://github.com/swagger-api/swagger-codegen#readme"; description = "Auto-generated swagger-petstore API Client"; @@ -189690,12 +189292,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "tasty-dejafu_0_7_0_1" = callPackage + "tasty-dejafu_0_7_0_2" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.7.0.1"; - sha256 = "01n9j9sc4lvm0s2giwqc5ig16jyww61h81m0bcjk2jzmnsk9mp7g"; + version = "0.7.0.2"; + sha256 = "1yj4sdprlz79sk14q5b8089sw1bn0z4nqpbdb2sr90smlxa57zpa"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -192056,30 +191658,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.9.4.2"; - sha256 = "1xx3yp5m0rjs8bi1gb4r0xk0mjh5gm4x2pdsgfmbrisw0pl5x0mv"; - 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_9_4_4" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, network-uri, pandoc-types, parsec, process, split, syb , temporary, text, utf8-string, xml @@ -192101,7 +191679,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 @@ -193515,18 +193092,6 @@ self: { }) {}; "th-reify-compat" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "th-reify-compat"; - version = "0.0.1.2"; - sha256 = "102w8zxsgdk1p7478p0sdhapai3paid3wyar2cpia649a17jlhwc"; - libraryHaskellDepends = [ base template-haskell ]; - homepage = "http://github.com/khibino/haskell-th-reify-compat/"; - description = "Compatibility for the result type of TH reify"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-reify-compat_0_0_1_3" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-reify-compat"; @@ -193536,7 +193101,6 @@ self: { homepage = "http://github.com/khibino/haskell-th-reify-compat/"; description = "Compatibility for the result type of TH reify"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-reify-many" = callPackage @@ -194460,6 +194024,8 @@ self: { pname = "tickle"; version = "0.0.6"; sha256 = "19xv9s3qz2q2jvgzig8rfc47c25m8xl3d10xdx1d4dsmhbj1nw55"; + revision = "1"; + editedCabalFile = "1j0npns8ilxq84087gfdg1isncjssp9q0ijgrpg849cip8h0y5y1"; libraryHaskellDepends = [ base bifunctors bytestring filepath lens mtl semigroupoids semigroups transformers validation @@ -196256,6 +195822,26 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "tomlcheck" = callPackage + ({ mkDerivation, base, htoml-megaparsec, megaparsec + , optparse-generic, text + }: + mkDerivation { + pname = "tomlcheck"; + version = "0.1.0.2"; + sha256 = "144hqyx13x9gg2xznrh41h9wi7ha70rxr93dpb020qv0af3cknqc"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base htoml-megaparsec megaparsec optparse-generic text + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/vmchale/tomlcheck#readme"; + description = "Command-line tool to check syntax of TOML files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq , directory, filepath, HUnit, QuickCheck, random @@ -196464,50 +196050,55 @@ self: { }) {toxcore = null;}; "toysolver" = callPackage - ({ mkDerivation, array, base, bytestring, bytestring-builder - , containers, criterion, data-default-class, data-interval, deepseq - , exceptions, extended-reals, filepath, finite-field, ghc-prim - , hashable, haskeline, heaps, intern, loop, mtl, multiset - , mwc-random, OptDir, parse-dimacs, parsec, prettyclass, primes - , process, pseudo-boolean, queue, QuickCheck, semigroups, sign - , split, stm, tasty, tasty-hunit, tasty-quickcheck, tasty-th - , template-haskell, temporary, time, transformers - , transformers-compat, type-level-numbers, unbounded-delays - , unordered-containers, vector, vector-space + ({ mkDerivation, array, attoparsec, base, bytestring + , bytestring-builder, clock, containers, criterion, data-default + , data-default-class, data-interval, deepseq, directory + , extended-reals, filepath, finite-field, ghc-prim, hashable + , hashtables, haskeline, heaps, intern, lattices, log-domain, loop + , megaparsec, mtl, multiset, mwc-random, OptDir, parsec + , prettyclass, primes, primitive, process, pseudo-boolean, queue + , QuickCheck, scientific, semigroups, sign, split, stm, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell + , temporary, text, time, transformers, transformers-compat + , unbounded-delays, unordered-containers, vector, vector-space + , xml-conduit }: mkDerivation { pname = "toysolver"; - version = "0.4.0"; - sha256 = "1gz3z3xx9qb7sajy2nqqk8710absiw4jh8d0gna7vdp6aiw3lqz9"; - revision = "1"; - editedCabalFile = "0bm5v2g4p83km9sv1f72w1qxj0cg0aafldmncjmizij7ifdgqmbx"; + version = "0.5.0"; + sha256 = "0dr34aknbh8p500zj4lcll5mi1km16jxyvjx1gdrp63csdfi1ich"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring bytestring-builder containers - data-default-class data-interval deepseq exceptions extended-reals - filepath finite-field ghc-prim hashable heaps intern loop mtl - multiset mwc-random OptDir parse-dimacs parsec prettyclass primes - process pseudo-boolean queue semigroups sign stm template-haskell - temporary time transformers transformers-compat type-level-numbers - unordered-containers vector vector-space + array base bytestring bytestring-builder clock containers + data-default-class data-interval deepseq extended-reals filepath + finite-field ghc-prim hashable hashtables heaps intern lattices + log-domain loop megaparsec mtl multiset mwc-random OptDir + prettyclass primes primitive process pseudo-boolean queue + scientific semigroups sign stm template-haskell temporary text time + transformers transformers-compat unordered-containers vector + vector-space xml-conduit ]; executableHaskellDepends = [ - array base bytestring containers data-default-class filepath - haskeline mtl mwc-random OptDir parse-dimacs parsec process - pseudo-boolean split time transformers transformers-compat - unbounded-delays vector vector-space + array attoparsec base bytestring bytestring-builder clock + containers data-default data-default-class directory filepath + haskeline intern megaparsec mtl mwc-random OptDir parsec process + pseudo-boolean scientific split temporary text time transformers + transformers-compat unbounded-delays unordered-containers vector ]; testHaskellDepends = [ - array base containers data-default-class data-interval deepseq - finite-field mtl mwc-random OptDir parsec prettyclass QuickCheck - tasty tasty-hunit tasty-quickcheck tasty-th transformers - transformers-compat vector vector-space + array base bytestring bytestring-builder containers + data-default-class data-interval deepseq finite-field hashable + intern lattices megaparsec mtl mwc-random OptDir parsec prettyclass + pseudo-boolean QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-th text transformers transformers-compat unordered-containers + vector vector-space ]; benchmarkHaskellDepends = [ - array base criterion data-default-class parse-dimacs vector + array base criterion data-default-class vector ]; - description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc"; + homepage = "https://github.com/msakai/toysolver/"; + description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -198983,8 +198574,8 @@ self: { ({ mkDerivation, base, containers, template-haskell }: mkDerivation { pname = "tyfam-witnesses"; - version = "0.0.0.1"; - sha256 = "0h79wsdljd5l34rshmx4r809xfr7szcvgap97zfyr5gzp8p24nh0"; + version = "0.1"; + sha256 = "1sy0ffd0i1s20xw2x1vf8a9ydbrzb9klin7j564hncsjf9bzdc1a"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Provide proof witnesses for closed type family evaluation"; license = stdenv.lib.licenses.mit; @@ -201435,8 +201026,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.6.1"; - sha256 = "18q4kydcx273brx24y30i1kqb12h1p20ynvwrl18kfhgprjgz2sk"; + version = "0.7.0"; + sha256 = "1d2887l2g8f9scpwcrvlxk0dm8w9d7qnlpbfjswa08dnmy63kcrf"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe safe-exceptions stm text @@ -202189,20 +201780,6 @@ self: { }) {}; "uri-bytestring-aeson" = callPackage - ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: - mkDerivation { - pname = "uri-bytestring-aeson"; - version = "0.1.0.2"; - sha256 = "1i62sr28fxc3k045j8l2iak4f46nf8ygzqafc2k1pa0grm4l7ipa"; - libraryHaskellDepends = [ - aeson base bytestring text uri-bytestring - ]; - homepage = "https://github.com/reactormonk/uri-bytestring-aeson"; - description = "Aeson instances for URI Bytestring"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring-aeson_0_1_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { pname = "uri-bytestring-aeson"; @@ -202214,7 +201791,6 @@ self: { homepage = "https://github.com/reactormonk/uri-bytestring-aeson"; description = "Aeson instances for URI Bytestring"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -203104,6 +202680,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "uuid-crypto" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptoids + , cryptoids-types, exceptions, uuid + }: + mkDerivation { + pname = "uuid-crypto"; + version = "1.3.0.0"; + sha256 = "02vzxxijz2pdwq4asgvsxvj6gcnjdzrfrhiavwbmc0vckw8s108s"; + libraryHaskellDepends = [ + base binary bytestring cryptoids cryptoids-types exceptions uuid + ]; + description = "Reversable and secure encoding of object ids as uuids"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uuid-le" = callPackage ({ mkDerivation, base, bytestring, uuid }: mkDerivation { @@ -203452,6 +203043,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "validation_0_6_0" = callPackage + ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, directory + , doctest, filepath, lens, mtl, QuickCheck, semigroupoids + , semigroups, template-haskell, transformers + }: + mkDerivation { + pname = "validation"; + version = "0.6.0"; + sha256 = "1x2mi8lgy18q7g2gwwk8c31kg77lkfpmjkxf5nkli5pri9z947av"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors lens mtl semigroupoids semigroups transformers + ]; + testHaskellDepends = [ + base cabal-doctest directory doctest filepath QuickCheck + template-haskell + ]; + homepage = "https://github.com/qfpl/validation"; + description = "A data-type like Either but with an accumulating Applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validations" = callPackage ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -204763,8 +204377,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.8"; - sha256 = "0pll3j9v5fapbawjp86cnyhdscmj2zn6cqwzg8dxi9s7z8nhqxk9"; + version = "0.0.0.9"; + sha256 = "15mvbgf5apb9ysiynv5xc8zynkz8shwbfq16rdfac5bbnl07m97p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -204776,14 +204390,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "viewprof_0_0_0_9" = callPackage + "viewprof_0_0_0_10" = callPackage ({ mkDerivation, base, brick, containers, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: mkDerivation { pname = "viewprof"; - version = "0.0.0.9"; - sha256 = "15mvbgf5apb9ysiynv5xc8zynkz8shwbfq16rdfac5bbnl07m97p"; + version = "0.0.0.10"; + sha256 = "000x7xlais9r2f42nbd2cbp6h07d6p31nn16vvbvyg5a12pw44vh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -211614,23 +211228,6 @@ self: { }) {}; "xml-conduit-writer" = callPackage - ({ mkDerivation, base, containers, dlist, mtl, text, xml-conduit - , xml-types - }: - mkDerivation { - pname = "xml-conduit-writer"; - version = "0.1.1.1"; - sha256 = "1ibiqxjr63gb3v0h9fdfzm205sqjixb5vm5y6413yn4scbf7qm2b"; - libraryHaskellDepends = [ - base containers dlist mtl text xml-conduit xml-types - ]; - testHaskellDepends = [ base text ]; - homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer"; - description = "Warm and fuzzy creation of XML documents"; - license = stdenv.lib.licenses.mit; - }) {}; - - "xml-conduit-writer_0_1_1_2" = callPackage ({ mkDerivation, base, containers, data-default, dlist, mtl, text , xml-conduit, xml-types }: @@ -211645,7 +211242,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer"; description = "Warm and fuzzy creation of XML documents"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-enumerator" = callPackage @@ -211704,29 +211300,6 @@ self: { }) {}; "xml-hamlet" = callPackage - ({ mkDerivation, base, containers, hspec, HUnit, parsec - , shakespeare, template-haskell, text, xml-conduit - }: - mkDerivation { - pname = "xml-hamlet"; - version = "0.4.1"; - sha256 = "1fy29sxby4z6dby518x4za9bpgnh7aqwpwn365lb384rjpsr1wvx"; - revision = "2"; - editedCabalFile = "1qlhn3lir1b534mqwxvx5ndnmn4h4qvmd809zapadx8s1q0i0f53"; - 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; - }) {}; - - "xml-hamlet_0_4_1_1" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, parsec , shakespeare, template-haskell, text, xml-conduit }: @@ -211745,7 +211318,6 @@ self: { 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 @@ -215641,7 +215213,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-core_0_16_0" = callPackage + "yi-core_0_17_0" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring , containers, criterion, data-default, deepseq, directory, dlist , dynamic-state, filepath, hashable, ListLike, microlens-platform @@ -215653,8 +215225,8 @@ self: { }: mkDerivation { pname = "yi-core"; - version = "0.16.0"; - sha256 = "0r7hbwlc0l45mb5qd949vn0h34kg5aqj7ic9shifz23cxlapkssj"; + version = "0.17.0"; + sha256 = "018fcmviyy0xrzrvmcrdl4r4mk69ig7jgck5zgq58y0h7m4wxkmg"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state filepath hashable ListLike @@ -215663,21 +215235,10 @@ self: { unix-compat unordered-containers xdg-basedir yi-language yi-rope ]; testHaskellDepends = [ - array attoparsec base binary bytestring containers data-default - directory dlist dynamic-state filepath hashable ListLike - microlens-platform mtl old-locale oo-prototypes parsec pointedlist - process process-extras quickcheck-text split tasty tasty-hunit - tasty-quickcheck text time transformers-base unix unix-compat - unordered-containers xdg-basedir yi-language yi-rope - ]; - benchmarkHaskellDepends = [ - array attoparsec base binary bytestring containers criterion - data-default deepseq directory dlist dynamic-state filepath - hashable ListLike microlens-platform mtl old-locale oo-prototypes - parsec pointedlist process process-extras split text time - transformers-base unix unix-compat unordered-containers xdg-basedir - yi-language yi-rope + attoparsec base containers quickcheck-text tasty tasty-hunit + tasty-quickcheck text yi-rope ]; + benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor core library"; license = stdenv.lib.licenses.gpl2; @@ -215690,8 +215251,8 @@ self: { }: mkDerivation { pname = "yi-dynamic-configuration"; - version = "0.16.0"; - sha256 = "1y439lsrf6akq1db6gkxm44pq83672jbnyg2hcw2s8b0rlr873vz"; + version = "0.17.0"; + sha256 = "1slf3qrq61b171sg6izw212qajvmjwv786gndhql8r9kyi7na9ys"; libraryHaskellDepends = [ base data-default dyre microlens-platform mtl text transformers-base yi-core yi-rope @@ -215721,8 +215282,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.16.0"; - sha256 = "0dbmkh72rrnmcxs8ixgpzvj6bra0nzrgiwnjz19rlpsgzvw5vfhh"; + version = "0.17.0"; + sha256 = "141kp6f6f0xrql8jmghqj1h5vrbim28z7p1a9psa40xry1hhlhr7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -215752,15 +215313,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-frontend-vty_0_16_0" = callPackage + "yi-frontend-vty_0_17_0" = callPackage ({ mkDerivation, base, containers, data-default, dlist , microlens-platform, pointedlist, stm, text, vty, yi-core , yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.16.0"; - sha256 = "00rmwcm1431rffhq1rif0k0g43wnzdfhw1zhacl4f2n5v2gxkjsq"; + version = "0.17.0"; + sha256 = "12yl4d3dkjkbz8n184lcs8z08mj8yc1ybaj52z7j58nialvq4ibh"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist stm text vty yi-core yi-language yi-rope @@ -215789,18 +215350,19 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-fuzzy-open_0_16_0" = callPackage + "yi-fuzzy-open_0_17_0" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory - , filepath, mtl, text, transformers-base, vector, yi-core - , yi-language, yi-rope + , filepath, mtl, pointedlist, text, transformers-base, vector + , yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.16.0"; - sha256 = "0z59g33rgdpg090sj6ilkwxvcg9r3my0v8wd49vvn72livf3v88k"; + version = "0.17.0"; + sha256 = "1447w8gqwjnala08sysvy1bxhdna1hydh0bnjx2awz7hns5040ap"; libraryHaskellDepends = [ - base binary containers data-default directory filepath mtl text - transformers-base vector yi-core yi-language yi-rope + base binary containers data-default directory filepath mtl + pointedlist text transformers-base vector yi-core yi-language + yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Fuzzy open plugin for yi"; @@ -215837,14 +215399,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-ireader_0_16_0" = callPackage + "yi-ireader_0_17_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-ireader"; - version = "0.16.0"; - sha256 = "1wmkji3sz7hnik7cy25r8wbc7y2x938gy8fyy4cadgrpbpndb58a"; + version = "0.17.0"; + sha256 = "0cwfjajs25lbxhzn8zbpjavy1yjym3k4iliqal9iq3i51k9inacc"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -215871,14 +215433,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-cua_0_16_0" = callPackage + "yi-keymap-cua_0_17_0" = callPackage ({ mkDerivation, base, microlens-platform, text, yi-core , yi-keymap-emacs, yi-rope }: mkDerivation { pname = "yi-keymap-cua"; - version = "0.16.0"; - sha256 = "082f3jhbas2ww4jmq53gqr7ssl8c0cd5gz2avvhqzvfsfxk1qiay"; + version = "0.17.0"; + sha256 = "0v7gcd5arq33r2cf55ig307cfvapz3r1h9cz3ssvkw0fjzr1p1a3"; libraryHaskellDepends = [ base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; @@ -215907,15 +215469,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-emacs_0_16_0" = callPackage + "yi-keymap-emacs_0_17_0" = callPackage ({ mkDerivation, base, containers, filepath, Hclip , microlens-platform, mtl, oo-prototypes, text, transformers-base , yi-core, yi-language, yi-misc-modes, yi-rope }: mkDerivation { pname = "yi-keymap-emacs"; - version = "0.16.0"; - sha256 = "0l0xvkb0y3kp0bkvarl6kdvvj4rn5pm70z1g1yavk1krs41xxz6j"; + version = "0.17.0"; + sha256 = "1d90884kjpq13d7nrxjla9kx6gr09xh8lwzbpnf69jg6iiavjlfg"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes text transformers-base yi-core yi-language yi-misc-modes yi-rope @@ -216012,7 +215574,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-language_0_16_0" = callPackage + "yi-language_0_17_0" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -216021,8 +215583,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.16.0"; - sha256 = "0wq4m665xcy7256iapjwggc3ylrg9y1k1vhvjn5a8716nn23mnr5"; + version = "0.17.0"; + sha256 = "046aavm0pf5s8bx6z0v8fvbizzr3s9s8kq79sj3gvis26im9kzpy"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -216060,14 +215622,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-misc-modes_0_16_0" = callPackage + "yi-misc-modes_0_17_0" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-misc-modes"; - version = "0.16.0"; - sha256 = "1vsdfwpqmpmdiaxh30hshxwlpqmkxzih13ic0hnbsx27amd3mv59"; + version = "0.17.0"; + sha256 = "0ki6dc1frzhgn7dfbsrpbf75a5i32iz9a8cvy1c33xmdh9s8k4fw"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -216097,14 +215659,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-mode-haskell_0_16_0" = callPackage + "yi-mode-haskell_0_17_0" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.16.0"; - sha256 = "0h4796zdcwrj6zkmxcvdjpmwb1rw0zgwzzgsdsch455j770y4dyy"; + version = "0.17.0"; + sha256 = "17cfbww6lpg29dz51pbzlsx95azhxlgv0lqcpxpxk82w9s4c2dji"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -216135,15 +215697,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-mode-javascript_0_16_0" = callPackage + "yi-mode-javascript_0_17_0" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, dlist , filepath, microlens-platform, mtl, text, yi-core, yi-language , yi-rope }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.16.0"; - sha256 = "09xp4a1w4m6spnzm943zkivaxicipmzs07qn9xqrfvcwavy56kha"; + version = "0.17.0"; + sha256 = "040mc9mfm46alfl21p6p4a8n9p8hr12ywn6sfgq32zrhpa1zn9yb"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -216230,15 +215792,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-snippet_0_16_0" = callPackage + "yi-snippet_0_17_0" = callPackage ({ mkDerivation, base, binary, containers, data-default, free , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector , yi-core, yi-rope }: mkDerivation { pname = "yi-snippet"; - version = "0.16.0"; - sha256 = "0n9m2n8k4k79hi661gpjdz0yca1jhxmbjdkxgzg7gnvwiikmfawh"; + version = "0.17.0"; + sha256 = "10680a4zc5r9mnvhajgfrvzxpf8naclx4sygvbi69c5aann4q4a1"; libraryHaskellDepends = [ base binary containers data-default free microlens-platform mtl text vector yi-core yi-rope From 11efabe29c5468b6bfdaa42ef31209dc9276b684 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 12 Oct 2017 08:09:07 -0400 Subject: [PATCH 1063/2806] htoml-megaparsec: build against newest megaparsec --- pkgs/development/haskell-modules/configuration-nix.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 91e95de94af..1051c4e416f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -501,4 +501,6 @@ self: super: builtins.intersectAttrs super { # Without this override, the builds lacks pkg-config. opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); + # Written against the 6.X series of megaparsec + htoml-megaparsec = super.htoml-megaparsec.override { megaparsec = self.megaparsec_6_2_0; }; } From 1d340c9e510afcf11e2b76deaab445d278734156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Thu, 12 Oct 2017 20:45:10 +0200 Subject: [PATCH 1064/2806] udiskie: 1.7.0 -> 1.7.1 --- pkgs/applications/misc/udiskie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 84ecf18c5ae..a3f6fb09f2b 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1dvfhf0d79al0vnrwdknfiy2297m3f7fgn7syr85p29hd6260jnv"; + sha256 = "12d0fc88wlbh5vvsijvy3cwk37wagmg8193n9zcipr1ivmcmhx15"; }; buildInputs = [ From 94fa59228a68b4bb4cb4074f46b91921eabdc5ed Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 12 Oct 2017 19:17:22 +0200 Subject: [PATCH 1065/2806] unrar: 5.5.7 -> 5.5.8 --- pkgs/tools/archivers/unrar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 563b21c76d8..9aedda83fd2 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unrar-${version}"; - version = "5.5.7"; + version = "5.5.8"; src = fetchurl { - url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "13rd69ss6jqsa6yxr8kmgs84kb67k822d2mbiz29m75zj46hmvwa"; + url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; + sha256 = "1x7wnb6zgs09v2bf5xaqz14daba8k7zikadj1qabqi4r78sy8rlv"; }; postPatch = '' From 843e0992ca44be86cd7ca97f337bdd55a91c1655 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 10 Oct 2017 12:24:30 -0400 Subject: [PATCH 1066/2806] Partition all-cabal-hashes into case-insensitive-safe components. OS X by default has a case-insensitive filesystem, and fetching all-cabal-hashes there fails due to a hash mismatch caused by package pairs like compactable and Compactable. This partitions the package set such that each partition contains no equivalent-up-to-case pairs. --- pkgs/data/misc/hackage/default.nix | 38 +++- .../misc/hackage/partition-all-cabal-hashes.c | 190 ++++++++++++++++++ .../haskell-modules/make-package-set.nix | 19 +- 3 files changed, 236 insertions(+), 11 deletions(-) create mode 100644 pkgs/data/misc/hackage/partition-all-cabal-hashes.c diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index eddc833da9d..eae7a814674 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,11 +1,33 @@ -{ fetchFromGitHub }: +{ fetchFromGitHub +, stdenv +, pkgconfig +, libarchive +, glib +, # Override this to use a different revision + src-spec ? + { owner = "commercialhaskell"; + repo = "all-cabal-hashes"; + rev = "901c2522e6797270f5ded4495b1a529e6c16ef45"; + sha256 = "05jmwsgrk77nz9vvgfbpsps0l320qgjpkr2c9zhkn9sc3d275lfb"; + } +, lib +}: # Use builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz" # instead if you want the latest Hackage automatically at the price of frequent re-downloads. - -fetchFromGitHub { - owner = "commercialhaskell"; - repo = "all-cabal-hashes"; - rev = "901c2522e6797270f5ded4495b1a529e6c16ef45"; - sha256 = "0wng314y3yn6bbwa5ar254l7p8y99gsvm8ll4z7f3wg77v5fzish"; -} +let partition-all-cabal-hashes = stdenv.mkDerivation + { name = "partition-all-cabal-hashes"; + src = ./partition-all-cabal-hashes.c; + unpackPhase = "true"; + buildInputs = [ pkgconfig libarchive glib ]; + buildPhase = + "cc -O3 $(pkg-config --cflags --libs libarchive glib-2.0) $src -o partition-all-cabal-hashes"; + installPhase = + '' + mkdir -p $out/bin + install -m755 partition-all-cabal-hashes $out/bin + ''; + }; +in fetchFromGitHub (src-spec // + { postFetch = "${partition-all-cabal-hashes}/bin/partition-all-cabal-hashes $downloadedFile $out"; + }) diff --git a/pkgs/data/misc/hackage/partition-all-cabal-hashes.c b/pkgs/data/misc/hackage/partition-all-cabal-hashes.c new file mode 100644 index 00000000000..d8c3eca3701 --- /dev/null +++ b/pkgs/data/misc/hackage/partition-all-cabal-hashes.c @@ -0,0 +1,190 @@ +#include +#include +#include +#include +#include +#include +#include + +static char * case_normalize(char * str) { + for (char * iter = str; *iter; ++iter) { + *iter = tolower(*iter); + } + return str; +} + +static gint compare_str(const void * a, const void * b, void * _) { + return strcmp(a, b); +} + +int main(int argc, char ** argv) { + if (argc != 3) { + fprintf(stderr, "Usage: %s TARBALL OUTPUT\n", argv[0]); + return 1; + } + + size_t output_len = strlen(argv[2]); + + /* Switch to standard locale to ensure consistency in case-folding. + */ + setlocale(LC_CTYPE, "C"); + + /* Map from case-normalized package name to a sorted sequence of + * package names in the equivalence class defined by + * case-normalization. + */ + GHashTable * equivalence_classes = + g_hash_table_new(g_str_hash, g_str_equal); + + /* Open up the tarball. + */ + struct archive * ar = archive_read_new(); + if (!ar) { + perror("Allocating archive structure"); + return 1; + } + archive_read_support_filter_gzip(ar); + archive_read_support_format_tar(ar); + if (archive_read_open_filename( ar + , argv[1] + , 10240 + ) == ARCHIVE_FATAL) { + fprintf( stderr + , "Error opening %s: %s\n" + , argv[0] + , archive_error_string(ar) + ); + return 1; + } + + /* Extract the length of the output directory that prefixes all + * tarball entries from the first entry in the tarball. + */ + struct archive_entry * ent; + int err = archive_read_next_header(ar, &ent); + if (err != ARCHIVE_OK) { + if (err == ARCHIVE_EOF) { + fprintf( stderr + , "No entries in %s, surely this is an error!\n" + , argv[1] + ); + } else { + fprintf( stderr + , "Error reading entry from %s: %s\n" + , argv[1] + , archive_error_string(ar) + ); + } + return 1; + } + const char * path = archive_entry_pathname(ent); + /* Number of characters from the start of the path name until after + * the slash after the leading directory. + */ + size_t prefix_len = strchr(path, '/') - path + 1; + + /* Extract each entry to the right partition. + */ + do { + path = archive_entry_pathname(ent) + prefix_len; + const char * pkg_end = strchr(path, '/'); + if (!pkg_end) + /* If there is no second slash, then this is either just the entry + * corresponding to the root or some non-package file (e.g. + * travis.yml). In either case, we don't care. + */ + continue; + + /* Find our package in the equivalence class map. + */ + char * pkg_name = g_strndup(path, pkg_end - path); + char * pkg_normalized = + case_normalize(g_strndup(path, pkg_end - path)); + GSequence * pkg_class = + g_hash_table_lookup(equivalence_classes, pkg_normalized); + gint partition_num; + if (!pkg_class) { + /* We haven't seen any packages with this normalized name yet, + * so we need to initialize the sequence and add it to the map. + */ + pkg_class = g_sequence_new(NULL); + g_sequence_append(pkg_class, pkg_name); + g_hash_table_insert( equivalence_classes + , pkg_normalized + , pkg_class + ); + partition_num = 1; + } else { + g_free(pkg_normalized); + /* Find the package name in the equivalence class */ + GSequenceIter * pkg_iter = + g_sequence_search( pkg_class + , pkg_name + , compare_str + , NULL + ); + if (!g_sequence_iter_is_end(pkg_iter)) { + /* If there are any packages after this one in the list, bail + * out. In principle we could solve this by moving them up to + * the next partition, but so far I've never seen any github + * tarballs out of order so let's save ourselves the work + * until we know we need it. + */ + fprintf( stderr + , "Out of order github tarball: %s is after %s\n" + , pkg_name + , (char *) g_sequence_get(pkg_iter) + ); + return 1; + } + pkg_iter = g_sequence_iter_prev(pkg_iter); + if (strcmp( g_sequence_get(pkg_iter) + , pkg_name + ) != 0) { + /* This package doesn't have the same name as the one right + * before where it should be in the sequence, which means it's + * new and needs to be added to the sequence. + * + * !!! We need to change this to use g_sequence_insert_before + * if we ever get an out-of-order github tarball, see comment + * after the check for !g_sequence_iter_is_end(pkg_iter). + */ + pkg_iter = g_sequence_append(pkg_class, pkg_name); + } else { + g_free(pkg_name); + } + /* Get the partition number, starting with 1. + */ + partition_num = g_sequence_iter_get_position(pkg_iter) + 1; + } + + /* Set the destination path. + * The 3 below is for the length of /#/, the partition number part + * of the path. If we have more than 9 partitions, we deserve to + * segfault. The 1 at the end is for the trailing null. + */ + char * dest_path = g_malloc(output_len + 3 + strlen(path) + 1); + sprintf(dest_path, "%s/%d/%s", argv[2], partition_num, path); + archive_entry_set_pathname(ent, dest_path); + + if (archive_read_extract(ar, ent, 0) != ARCHIVE_OK) { + fprintf( stderr + , "Error extracting entry %s from %s: %s\n" + , dest_path + , argv[1] + , archive_error_string(ar) + ); + return 1; + } + } while ((err = archive_read_next_header(ar, &ent)) == ARCHIVE_OK); + if (err != ARCHIVE_EOF) { + fprintf( stderr + , "Error reading entry from %s: %s\n" + , argv[1] + , archive_error_string(ar) + ); + return 1; + } + + return 0; +} diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index ff5be894b92..d84167008d9 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -118,10 +118,23 @@ let ''; }; - hackage2nix = name: version: self.haskellSrc2nix { + all-cabal-hashes-component = name: import (pkgs.runCommand "all-cabal-hashes-component-${name}.nix" {} + '' + set +o pipefail + for component in ${all-cabal-hashes}/*; do + if ls $component | grep -q ${name}; then + echo "builtins.storePath $component" > $out + exit 0 + fi + done + echo "${name} not found in any all-cabal-hashes component, are you sure it's in hackage?" >&2 + exit 1 + ''); + + hackage2nix = name: version: let component = all-cabal-hashes-component name; in self.haskellSrc2nix { name = "${name}-${version}"; - sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")''; - src = "${all-cabal-hashes}/${name}/${version}/${name}.cabal"; + sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${component}/${name}/${version}/${name}.json")''; + src = "${component}/${name}/${version}/${name}.cabal"; }; in package-set { inherit pkgs stdenv callPackage; } self // { From a25ded05d86830d3e23823da9b527ae6a4355f2e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 12 Oct 2017 22:07:41 +0300 Subject: [PATCH 1067/2806] zod: Fix build --- pkgs/games/zod/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index d7a0a62f5bd..f795a2ea3a2 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0gmg4ppr4y6ck04mandlp2fmdcyssmck999m012jx5v1rm57g2hn"; }; + hardeningDisable = [ "format" ]; + unpackPhase = '' mkdir src pushd src @@ -22,10 +24,9 @@ stdenv.mkDerivation rec { sourceRoot=`pwd`/src ''; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql - makeWrapper ]; + buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql makeWrapper ]; - NIX_LDFLAGS="-L${stdenv.lib.getLib libmysql}/lib/mysql"; + NIX_LDFLAGS = "-L${stdenv.lib.getLib libmysql}/lib/mysql"; installPhase = '' mkdir -p $out/bin $out/share/zod From 4b50d543bdfd93abf39ee2d5e827719627d84202 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Oct 2017 16:07:52 +0200 Subject: [PATCH 1068/2806] services.compton: add `opacityRules` option --- nixos/modules/services/x11/compton.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index 56bc66b7179..42ceeb81980 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -7,7 +7,12 @@ let cfg = config.services.compton; - configFile = pkgs.writeText "compton.conf" + configFile = let + opacityRules = optionalString (length cfg.opacityRules != 0) + (concatStringsSep "\n" + (map (a: "opacity-rule = [ \"${a}\" ];") cfg.opacityRules) + ); + in pkgs.writeText "compton.conf" (optionalString cfg.fade '' # fading fading = true; @@ -30,7 +35,9 @@ let active-opacity = ${cfg.activeOpacity}; inactive-opacity = ${cfg.inactiveOpacity}; menu-opacity = ${cfg.menuOpacity}; - + + ${opacityRules} + # other options backend = ${toJSON cfg.backend}; vsync = ${toJSON cfg.vSync}; @@ -155,6 +162,14 @@ in { ''; }; + opacityRules = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Opacity rules to be handled by compton. + ''; + }; + backend = mkOption { type = types.str; default = "glx"; From 393a2ea9797585ce917553009242b1ce0fc6f60d Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 12 Oct 2017 19:51:33 +0200 Subject: [PATCH 1069/2806] fzf: 0.17.0 -> 0.17.0-2 --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 4b76b85287a..e0367dc915d 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.17.0"; + version = "0.17.0-2"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0cj9vvrsrxj7752fxww1bkflz9rap0n4hhwd6shs0qbss1awwqk9"; + sha256 = "0j4m3xf6qxfymfq6y5ml5rgz2rr1glh54k3b5xa9zi4cl5wg43qv"; }; outputs = [ "bin" "out" "man" ]; From c4ef6ee7cc5de8c8a21d92a40a2a2ab198332fbd Mon Sep 17 00:00:00 2001 From: derchris Date: Thu, 12 Oct 2017 23:03:35 +0200 Subject: [PATCH 1070/2806] intecture-cli: 0.3.2 -> 0.3.4 --- pkgs/tools/admin/intecture/cli.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index 0f530f636d7..e98b62bd0ea 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -5,16 +5,16 @@ with rustPlatform; buildRustPackage rec { name = "intecture-cli-${version}"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "intecture"; repo = "cli"; rev = version; - sha256 = "0f5pyrlkxzz4kdfzwambxzqr48g3n06f1pv163h06ggssqa51wbc"; + sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq"; }; - depsSha256 = "0f3rhjs5addppva4cjx3ngpa5gz2i2n46hyc3zd4l7lhh8gaggix"; + depsSha256 = "0nax7h7f5qgalgxsfidrxrv1ybl5xvrpc1k7xc1kmaf955gqmc46"; buildInputs = [ openssl zeromq czmq zlib ]; From 096efff693b77c067e5a99da479dc6c577c23c49 Mon Sep 17 00:00:00 2001 From: derchris Date: Fri, 13 Oct 2017 00:00:28 +0200 Subject: [PATCH 1071/2806] awslogs: 0.7 -> 0.10 --- pkgs/tools/admin/awslogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index dffef09a5d4..ec7febaa598 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "awslogs-${version}"; - version = "0.7"; + version = "0.10"; src = fetchFromGitHub { owner = "jorgebastida"; repo = "awslogs"; rev = "${version}"; - sha256 = "0dqf26h595l1fcnagxi8zsdarsxg3smsihxaqrvnki8fshhfdqsm"; + sha256 = "18s3xxdhhbz96mgj9ipgyrdcax3p9gy8gpmr0rblw8g0grj31dsp"; }; doCheck = false; From b686f934c5dc3904da31c887a961c3dad9bdc062 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 13 Oct 2017 09:38:46 +1030 Subject: [PATCH 1072/2806] awsebcli: 3.10.5 -> 3.11.0 --- pkgs/tools/virtualization/awsebcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 91cb148d8fe..e43bc18ba70 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -67,11 +67,11 @@ let in with localPython.pkgs; buildPythonApplication rec { name = "${pname}-${version}"; pname = "awsebcli"; - version = "3.10.5"; + version = "3.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1g53z2flhp3navdf8lw6rgh99akf3k0ng1zkkqswvh66zswkxnwn"; + sha256 = "052388annhyirlzdr89hbgif8k7pw7win2zm1ybn4iiisr5l49zi"; }; checkInputs = [ From cc5dd66c0357552e6b095a5f0835feac99d31535 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 12 Oct 2017 20:02:15 -0400 Subject: [PATCH 1073/2806] linux: 4.9.55 -> 4.9.56 --- 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 4624e70acad..b820b6a917b 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.55"; + version = "4.9.56"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0a9rjlf7h1rn71kll1ckxa440rxwsikh1yjh37zbsj5i4895gz5i"; + sha256 = "1jnkf0ir42xkandx1lnqrxmskzwl6j46aqmzrxilddx9pkdjplhi"; }; } // (args.argsOverride or {})) From 829730d38f19c203ad6c9e052964a9b65ae43a2b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 13 Oct 2017 10:34:27 +0800 Subject: [PATCH 1074/2806] nixos user: reserve kodi --- nixos/modules/misc/ids.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index d9ca4a35e27..7d9d9984cf2 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -298,6 +298,7 @@ minio = 280; kanboard = 281; pykms = 282; + kodi = 283; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -565,6 +566,7 @@ minio = 280; kanboard = 281; pykms = 282; + kodi = 283; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal From 0946e304705414dd9f01e01f792293338fd37caf Mon Sep 17 00:00:00 2001 From: xd1le Date: Fri, 13 Oct 2017 14:46:51 +1100 Subject: [PATCH 1075/2806] luaPackages: use consistent multiline strings for luafilsystem and luazlib --- pkgs/top-level/lua-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 9bbb5a7c0c0..e4f18258aff 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -169,7 +169,10 @@ let url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1"; }; - preConfigure = "substituteInPlace config --replace 'CC= gcc' '';" + + preConfigure = '' + substituteInPlace config --replace "CC= gcc" ""; + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace config \ --replace 'LIB_OPTION= -shared' '###' \ @@ -357,7 +360,9 @@ let buildInputs = [ zlib ]; - preConfigure = "substituteInPlace Makefile --replace gcc cc --replace '-llua' ''"; + preConfigure = '' + substituteInPlace Makefile --replace gcc cc --replace "-llua" "" + ''; preBuild = '' makeFlagsArray=( From acc076d51fb367ec900c026ab64513f62d997258 Mon Sep 17 00:00:00 2001 From: xd1le Date: Fri, 13 Oct 2017 14:48:17 +1100 Subject: [PATCH 1076/2806] luaPackages: various cosmetic fixes These involve: - Formatting and spacing. - Switching to using fetchFromGitHub where possible. - Adding missing meta attributes. - Correcting license values or adding missing license values. - Adding vyp as maintainer for unmaintained packages. None of these changes should affect the build result. A different revision is used for luasqlite3, however, the source code between these revisions is actually the same. (And the advantage is that the new revision is a tagged release.) --- pkgs/top-level/lua-packages.nix | 297 +++++++++++++++++++++----------- 1 file changed, 194 insertions(+), 103 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e4f18258aff..c94a401db0f 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -43,6 +43,7 @@ let luabitop = buildLuaPackage rec { version = "1.0.2"; name = "bitop-${version}"; + src = fetchurl { url = "http://bitop.luajit.org/download/LuaBitOp-${version}.tar.gz"; sha256 = "16fffbrgfcw40kskh2bn9q7m3gajffwd2f35rafynlnd7llwj1qj"; @@ -66,8 +67,10 @@ let install -p bit.so $out/lib/lua/${lua.luaversion} ''; - meta = { + meta = with stdenv.lib; { + description = "C extension module for Lua which adds bitwise operations on numbers"; homepage = "http://bitop.luajit.org"; + license = licenses.mit; maintainers = with maintainers; [ flosse ]; }; }; @@ -75,7 +78,7 @@ let luacheck = buildLuaPackage rec { pname = "luacheck"; version = "0.20.0"; - name = "${pname}${version}"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mpeterv"; @@ -91,12 +94,13 @@ let installPhase = '' ${lua}/bin/lua install.lua $out - ''; + ''; meta = with stdenv.lib; { description = "A tool for linting and static analysis of Lua code"; homepage = https://github.com/mpeterv/luacheck; license = licenses.mit; + maintainers = with maintainers; [ vyp ]; platforms = platforms.unix; }; }; @@ -106,8 +110,10 @@ let name = "luaevent-${version}"; disabled = isLua52; - src = fetchzip { - url = "https://github.com/harningt/luaevent/archive/v${version}.tar.gz"; + src = fetchFromGitHub { + owner = "harningt"; + repo = "luaevent"; + rev = "v${version}"; sha256 = "1c1n2zqx5rwfwkqaq1jj8gvx1vswvbihj2sy445w28icz1xfhpik"; }; @@ -127,7 +133,7 @@ let homepage = http://luaforge.net/projects/luaevent/; description = "Binding of libevent to Lua"; license = licenses.mit; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -135,6 +141,7 @@ let version = "1.3.0"; name = "expat-${version}"; isLibrary = true; + src = fetchurl { url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz"; sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h"; @@ -156,17 +163,22 @@ let disabled = isLuaJIT; - meta = { + meta = with stdenv.lib; { + description = "SAX XML parser based on the Expat library"; homepage = "http://matthewwild.co.uk/projects/luaexpat"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.flosse ]; + license = licenses.mit; + maintainers = with maintainers; [ flosse ]; + platforms = platforms.unix; }; }; luafilesystem = buildLuaPackage rec { name = "filesystem-1.6.2"; - src = fetchzip { - url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; + + src = fetchFromGitHub { + owner = "keplerproject"; + repo = "luafilesystem"; + rev = "v1_6_2"; sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1"; }; @@ -179,40 +191,47 @@ let --replace '#LIB_OPTION= -bundle' 'LIB_OPTION= -bundle' substituteInPlace Makefile --replace '10.3' '10.5' ''; - meta = { + + meta = with stdenv.lib; { + description = "Lua library complementing filesystem-related functions"; homepage = "https://github.com/keplerproject/luafilesystem"; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; maintainers = with maintainers; [ flosse ]; + platforms = platforms.unix; }; }; luaposix = buildLuaPackage rec { name = "posix-${version}"; version = "33.4.0"; - src = fetchurl { - url = "https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz"; - sha256 = "e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21"; + + src = fetchFromGitHub { + owner = "luaposix"; + repo = "luaposix"; + rev = "release-v${version}"; + sha256 = "0y531p54lx2yf243bcsyp6sv8fvbqidp20yry0xvb85p8zw9dlrq"; }; + buildInputs = [ perl ]; - meta = { + + meta = with stdenv.lib; { description = "Lua bindings for POSIX API"; homepage = "https://github.com/luaposix/luaposix"; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.unix; }; }; lpty = buildLuaPackage rec { name = "lpty-${version}"; version = "1.1.1"; + src = fetchurl { url = "http://www.tset.de/downloads/lpty-1.1-1.tar.gz"; sha256 = "0d4ffda654dcf37dd8c99bcd100d0ee0dde7782cbd0ba9200ef8711c5cab02f1"; }; - meta = { - homepage = "http://www.tset.de/lpty"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; - }; + preBuild = '' makeFlagsArray=( INST_LIBDIR="$out/lib/lua/${lua.luaversion}" @@ -222,15 +241,24 @@ let LUA_LIBDIR="-L${lua}/lib" ); ''; + + meta = with stdenv.lib; { + description = "PTY control for Lua"; + homepage = "http://www.tset.de/lpty"; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; + }; }; lua-iconv = buildLuaPackage rec { name = "lua-iconv-${version}"; version = "7"; + src = fetchFromGitHub { owner = "ittner"; repo = "lua-iconv"; - rev = "e8d34024a6b185a759733915f116cc5588550261"; + rev = name; sha256 = "0rd76966qlxfp8ypkyrbif76nxnm1acclqwfs45wz3972jsk654i"; }; @@ -240,17 +268,18 @@ let ); ''; - meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + meta = with stdenv.lib; { description = "Lua bindings for POSIX iconv"; - maintainers = [ maintainers.richardipsum ]; homepage = "https://ittner.github.io/lua-iconv/"; + license = licenses.mit; + maintainers = with maintainers; [ richardipsum ]; + platforms = platforms.unix; }; }; luasec = buildLuaPackage rec { name = "sec-0.6"; + src = fetchFromGitHub { owner = "brunoos"; repo = "luasec"; @@ -269,19 +298,24 @@ let LIB_PATH="-L$out/lib"); ''; - meta = { + meta = with stdenv.lib; { + description = "Lua binding for OpenSSL library to provide TLS/SSL communication"; homepage = "https://github.com/brunoos/luasec"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.flosse ]; + license = licenses.mit; + maintainers = with maintainers; [ flosse ]; + platforms = platforms.unix; }; }; luasocket = buildLuaPackage rec { name = "socket-${version}"; version = "3.0-rc1"; - src = fetchurl { - url = "https://github.com/diegonehab/luasocket/archive/v${version}.tar.gz"; - sha256 = "0j8jx8bjicvp9khs26xjya8c495wrpb7parxfnabdqa5nnsxjrwb"; + + src = fetchFromGitHub { + owner = "diegonehab"; + repo = "luasocket"; + rev = "v${version}"; + sha256 = "1chs7z7a3i3lck4x7rz60ziwbf793gw169hpjdfca8y4yf1hzsxk"; }; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' @@ -298,29 +332,29 @@ let ''; meta = with stdenv.lib; { + description = "Network support for Lua"; homepage = "http://w3.impa.br/~diego/software/luasocket/"; - platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos; + license = licenses.mit; maintainers = with maintainers; [ mornfall ]; + platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos; }; }; luxio = buildLuaPackage rec { name = "luxio-${version}"; version = "13"; + src = fetchurl { url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2"; sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; }; + nativeBuildInputs = [ which pkgconfig ]; + postPatch = '' patchShebangs . ''; - meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; - description = "Lightweight UNIX I/O and POSIX binding for Lua"; - maintainers = [ maintainers.richardipsum ]; - }; + preBuild = '' makeFlagsArray=( INST_LIBDIR="$out/lib/lua/${lua.luaversion}" @@ -329,23 +363,40 @@ let INSTALL=install ); ''; + + meta = with stdenv.lib; { + description = "Lightweight UNIX I/O and POSIX binding for Lua"; + homepage = "https://www.gitano.org.uk/luxio/"; + license = licenses.mit; + maintainers = with maintainers; [ richardipsum ]; + platforms = platforms.unix; + }; }; luazip = buildLuaPackage rec { name = "zip-${version}"; - version = "1.2.3"; - src = fetchzip { - url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip"; + version = "2007-10-30"; + + src = fetchFromGitHub { + owner = "luaforge"; + repo = "luazip"; + rev = "0b8f5c958e170b1b49f05bc267bc0351ad4dfc44"; sha256 = "0zrrwhmzny5zbpx91bjbl77gzkvvdi3qhhviliggp0aj8w3faxsr"; }; - buildInputs = [ unzip zziplib ]; + + buildInputs = [ zziplib ]; + patches = [ ../development/lua-modules/zip.patch ]; - # does not currently work under lua 5.2 + + # Does not currently work under Lua 5.2 or LuaJIT. disabled = isLua52 || isLuaJIT; - meta = { + + meta = with stdenv.lib; { + description = "Lua library to read files stored inside zip files"; homepage = "https://github.com/luaforge/luazip"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; }; @@ -353,8 +404,10 @@ let name = "zlib-${version}"; version = "1.1"; - src = fetchzip { - url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz"; + src = fetchFromGitHub { + owner = "brimworks"; + repo = "lua-zlib"; + rev = "v${version}"; sha256 = "1520lk4xpf094xn2zallqgqhs0zb4w61l49knv9y8pmhkdkxzzgy"; }; @@ -376,40 +429,49 @@ let preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}"; meta = with stdenv.lib; { + description = "Simple streaming interface to zlib for Lua"; homepage = https://github.com/brimworks/lua-zlib; - platforms = platforms.unix; license = licenses.mit; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; + platforms = platforms.unix; }; }; luastdlib = buildLuaPackage { name = "stdlib"; + src = fetchzip { url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; }; + nativeBuildInputs = [ autoreconfHook unzip ]; - meta = { - homepage = "https://github.com/lua-stdlib/lua-stdlib/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + + meta = with stdenv.lib; { + description = "General Lua libraries"; + homepage = "https://github.com/lua-stdlib/lua-stdlib"; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; }; lrexlib = buildLuaPackage rec { name = "lrexlib-${version}"; version = "2.8.0"; - src = fetchzip { - url = "https://github.com/rrthomas/lrexlib/archive/rel-2-8-0.zip"; + + src = fetchFromGitHub { + owner = "rrthomas"; + repo = "lrexlib"; + rev = "rel-2-8-0"; sha256 = "1c62ny41b1ih6iddw5qn81gr6dqwfffzdp7q6m8x09zzcdz78zhr"; }; - buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ]; + + buildInputs = [ luastdlib pcre luarocks oniguruma gnulib tre glibc ]; buildPhase = let luaVariable = ''LUA_PATH="${luastdlib}/share/lua/${lua.luaversion}/?/init.lua;${luastdlib}/share/lua/${lua.luaversion}/?.lua"''; - pcreVariable = "PCRE_DIR=${pcre.out} PCRE_INCDIR=${pcre.dev}/include"; onigVariable = "ONIG_DIR=${oniguruma}"; gnuVariable = "GNU_INCDIR=${gnulib}/lib"; @@ -425,40 +487,47 @@ let cp -r luarocks/lib $out; ''; - meta = { - homepage = "https://github.com/lua-stdlib/lua-stdlib/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + meta = with stdenv.lib; { + description = "Lua bindings of various regex library APIs"; + homepage = "https://github.com/rrthomas/lrexlib"; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; }; luasqlite3 = buildLuaPackage rec { name = "sqlite3-${version}"; - version = "2.1.1"; - src = fetchzip { - url = "https://github.com/LuaDist/luasql-sqlite3/archive/2acdb6cb256e63e5b5a0ddd72c4639d8c0feb52d.zip"; - sha256 = "17zsa0jzciildil9k4lb0rjn9s1nj80dy16pzx9bxqyi75pjf2d4"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "LuaDist"; + repo = "luasql-sqlite3"; + rev = version; + sha256 = "05k8zs8nsdmlwja3hdhckwknf7ww5cvbp3sxhk2xd1i3ij6aa10b"; }; - buildInputs = [ unzip sqlite ]; + buildInputs = [ sqlite ]; patches = [ ../development/lua-modules/luasql.patch ]; - meta = { + meta = with stdenv.lib; { + description = "Database connectivity for Lua"; homepage = "https://github.com/LuaDist/luasql-sqlite3"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; }; lpeg = buildLuaPackage rec { name = "lpeg-${version}"; version = "0.12"; + src = fetchurl { url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz"; sha256 = "0xlbfw1w7l65a5qhnx5sfw327hkq1zcj8xmg4glfw6fj9ha4b9gg"; }; - buildInputs = [ unzip ]; preBuild = '' makeFlagsArray=(CC=$CC); @@ -472,32 +541,43 @@ let install -p re.lua $out/lib/lua/${lua.luaversion} ''; - meta = { + meta = with stdenv.lib; { + description = "Parsing Expression Grammars For Lua"; homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.all; }; }; cjson = buildLuaPackage rec { name = "cjson-${version}"; version = "2.1.0"; + src = fetchurl { - url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.1.0.tar.gz"; + url = "http://www.kyne.com.au/~mark/software/download/lua-${name}.tar.gz"; sha256 = "0y67yqlsivbhshg8ma535llz90r4zag9xqza5jx0q7lkap6nkg2i"; }; + preBuild = '' sed -i "s|/usr/local|$out|" Makefile ''; + makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; + postInstall = '' rm -rf $out/share/lua/${lua.luaversion}/cjson/tests ''; + installTargets = "install install-extra"; + disabled = isLuaJIT; - meta = { + + meta = with stdenv.lib; { description = "Lua C extension module for JSON support"; - license = stdenv.lib.licenses.mit; + homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php"; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; }; }; @@ -512,15 +592,7 @@ let sha256 = "09pbapjhyc3sn0jgx747shqr9286wqfzw02h43p4pk8fv2b766b9"; }; - meta = with stdenv.lib; { - description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; - homepage = https://github.com/pavouk/lgi; - license = "custom"; - maintainers = with maintainers; [ lovek323 rasendubi ]; - platforms = platforms.unix; - }; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gobjectIntrospection lua ]; makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; @@ -528,31 +600,49 @@ let preBuild = '' sed -i "s|/usr/local|$out|" lgi/Makefile ''; + + meta = with stdenv.lib; { + description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; + homepage = https://github.com/pavouk/lgi; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 rasendubi ]; + platforms = platforms.unix; + }; }; mpack = buildLuaPackage rec { name = "lua-mpack-${libmpack.version}"; + + # NOTE: For updating, new Lua mpack bindings live at: + # https://github.com/libmpack/libmpack-lua. src = libmpack.src; sourceRoot = "libmpack-${libmpack.rev}-src/binding/lua"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libmpack ]; #libtool lua ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmpack ]; # ++ [ libtool lua ]; dontBuild = true; + preInstall = '' mkdir -p $out/lib/lua/${lua.luaversion} ''; + NIX_CFLAGS_COMPILE = "-Wno-error -fpic"; + installFlags = [ "USE_SYSTEM_LUA=yes" "LUA_VERSION_MAJ_MIN=" "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}" ]; + # gcc -llua fails with luajit. disabled = isLuaJIT; - meta = { - description = "Simple implementation of msgpack in C Lua 5.1"; - homepage = "https://github.com/tarruda/libmpack"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.mit; + + meta = with stdenv.lib; { + description = "Lua bindings for libmpack"; + homepage = "https://github.com/libmpack/libmpack-lua"; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = with platforms; linux ++ darwin; }; }; @@ -567,6 +657,14 @@ let sha256 = "0dhy0vklrhqrnmxb9pyqbfvkwwy86lwysk93pzg1j1zwprx366fj"; }; + buildInputs = [ lua ]; + + installPhase = '' + mkdir -p $out/lib/lua/${lua.luaversion}/ + cp -r . $out/lib/lua/${lua.luaversion}/vicious/ + printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua + ''; + meta = with stdenv.lib; { description = "Vicious widgets for window managers"; homepage = https://github.com/Mic92/vicious; @@ -574,13 +672,6 @@ let maintainers = with maintainers; [ makefu mic92 ]; platforms = platforms.linux; }; - - buildInputs = [ lua ]; - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion}/ - cp -r . $out/lib/lua/${lua.luaversion}/vicious/ - printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua - ''; }; }; in self From b2c1020a682d124ea027da699149624eefc88525 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 12 Oct 2017 01:40:37 -0400 Subject: [PATCH 1077/2806] pcl: qt4 -> qt5; 1.8.0 -> 1.8.1 --- pkgs/development/libraries/pcl/default.nix | 19 +++++++------------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 6b8ba68adb7..59f674789e4 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,34 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 +{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase , libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL }: stdenv.mkDerivation rec { - name = "pcl-1.8.0"; + name = "pcl-1.8.1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "1pki4y7mc2dryxc8wa7rs4hg74qab80rpy90jnw3j8fzf09kxcll"; + sha256 = "05wvqqi2fyk5innw4mg356r71c1hmc9alc7xkf4g81ds3b3867xq"; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake qhull flann boost eigen libusb1 libpcap - libpng vtk qt4 libXt ] + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ qhull flann boost eigen libusb1 libpcap + libpng vtk qtbase libXt ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed "s,[[:space:]]*-F$NIX_STORE/[[:alnum:]]*-CF-osx-[[:digit:].]*/Library/Frameworks,,g") - sed -i 's,^\( target_link_libraries("''${LIB_NAME}" "-framework Cocoa")\),\1\n target_link_libraries("''${LIB_NAME}" "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"),' visualization/CMakeLists.txt - sed -i 's,^\(set(SUBSYS_DEPS common io kdtree geometry search)\),\1\nset(CMAKE_OSX_SYSROOT "")\nset(CMAKE_OSX_DEPLOYMENT_TARGET ""),' visualization/CMakeLists.txt - ''; - meta = { homepage = http://pointclouds.org/; description = "Open project for 2D/3D image and point cloud processing"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18bb248c33c..c6c084eaf5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10100,8 +10100,7 @@ with pkgs; pcg_c = callPackage ../development/libraries/pcg-c { }; - pcl = callPackage ../development/libraries/pcl { - vtk = vtkWithQt4; + pcl = libsForQt5.callPackage ../development/libraries/pcl { inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; }; From e8c89aaf06d7509804ccf1f3282f7d4f705a0cd2 Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Fri, 13 Oct 2017 14:02:24 +0800 Subject: [PATCH 1078/2806] go-ethereum-classic: 3.5.86 -> 4.0.0 --- pkgs/applications/altcoins/go-ethereum-classic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix index 37d6264d82f..679312d9a8e 100644 --- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix +++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-classic-${version}"; - version = "3.5.86"; + version = "4.0.0"; goPackagePath = "github.com/ethereumproject/go-ethereum"; subPackages = [ "cmd/evm" "cmd/geth" ]; @@ -10,7 +10,7 @@ buildGoPackage rec { src = fetchgit { rev = "v${version}"; url = "https://github.com/ethereumproject/go-ethereum"; - sha256 = "1k59hl3qvx4422zqlp259566fnxq5bs67jhm0v6a1zfr1k8iqzwh"; + sha256 = "06f1w7s45q4zva1xjrx92xinsdrixl0m6zhx5hvdjmg3xqcbwr79"; }; goDeps = ./deps.nix; From ba6f59ad70d7d4b9c36b7d3f1b6f3b1729379114 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 13 Oct 2017 09:14:22 +1030 Subject: [PATCH 1079/2806] flow: 0.56.0 -> 0.57.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index fc93d8dc6f8..347abc14729 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.56.0"; + version = "0.57.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0979hcz5qqblcnkc4whkklzdhm4f45gzfl6y4zp0wbq0qi1gv7x4"; + sha256 = "1y2znwiwc3zkwz17a2m0m28dpknw7hpjd7ih4h7zf6p8nnqd3k6d"; }; installPhase = '' From 67d56ea69937f416dc374fcf2cb07273eb770b66 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 13 Oct 2017 09:33:25 +0200 Subject: [PATCH 1080/2806] pythonPackages.django: 1.11.5 -> 1.11.6 This is a bugfix release. See https://docs.djangoproject.com/en/1.11/releases/1.11.6/ --- pkgs/development/python-modules/django/1_11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 483a8eb23d0..35845faced7 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "1.11.5"; + version = "1.11.6"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "0a9bk1a0n0264lcr67fmwzqyhkhy6bqdzkxsj9a8dpyzca0qfdhq"; + sha256 = "0q0cmwifa6c0k6kh8fpa3mjmqw7yqd616qz8m4ls3h51xyhjrd63"; }; patches = [ From 8dcaa5b313165d0acb3860cab97ece62e8421162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Desgrange?= Date: Wed, 11 Oct 2017 18:06:20 +0200 Subject: [PATCH 1081/2806] postgis: add v2.4.0 Add postgis 2.4.0 doesn't remove v2.3.1. There are some big change in 2.4 that people may don't want. see https://postgis.net/docs/release_notes.html#idm41021 fix test call modify following recommandation of lsix --- nixos/release.nix | 1 + nixos/tests/postgis.nix | 10 +++---- .../development/libraries/postgis/default.nix | 26 +++++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index ee706ff986d..4060e5df4ec 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -303,6 +303,7 @@ in rec { #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; + tests.postgis = callTest tests/postgis.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 1dba5c363c0..f6ce3fe38ed 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -9,15 +9,11 @@ import ./make-test.nix ({ pkgs, ...} : { { pkgs, config, ... }: { - services.postgresql = let mypg = pkgs.postgresql95; in { + services.postgresql = let mypg = pkgs.postgresql100; in { enable = true; package = mypg; - extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_2_1 ]; - initialScript = pkgs.writeText "postgresql-init.sql" - '' - CREATE ROLE postgres WITH superuser login createdb; - ''; - }; + extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ]; + }; }; }; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 2ba5a262e22..bdf537f4375 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -109,4 +109,30 @@ in rec { ''; }); + v_2_4_0 = pgDerivationBaseNewer.merge ( fix : { + version = "2.4.0"; + sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29"; + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + builtInputs = [gdal json_c pkgconfig]; + + # postgis config directory assumes /include /lib from the same root for json-c library + NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + + dontDisableStatic = true; + preConfigure = '' + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + ''; + postConfigure = '' + sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; + s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/loader/Makefile"; + sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/scripts/python/Makefile"; + ''; + }); + + } From 2864bc8fd904c28c65486c75136f6d3892023e61 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 13 Oct 2017 10:46:44 +0200 Subject: [PATCH 1082/2806] Revert "desktop-managers: do not leak feh to PATH" --- nixos/modules/services/x11/desktop-managers/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 6509a8a16c9..13f339e3fbf 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -109,5 +109,9 @@ in }; - xcfg.displayManager.session = cfg.session.list; + config = { + services.xserver.displayManager.session = cfg.session.list; + environment.systemPackages = + mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable + }; } From 6ec6af462573c07cab55dd56ec8e05f7b3dd719b Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 13 Oct 2017 10:07:56 +0100 Subject: [PATCH 1083/2806] djbdns: fix build in usernamespaces --- pkgs/tools/networking/djbdns/default.nix | 4 ++-- .../djbdns/fix-nix-usernamespace-build.patch | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix index 7537ab1c47a..178d27f2018 100644 --- a/pkgs/tools/networking/djbdns/default.nix +++ b/pkgs/tools/networking/djbdns/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "0j3baf92vkczr5fxww7rp1b7gmczxmmgrqc8w2dy7kgk09m85k9w"; }; - patches = [ ./hier.patch ]; + patches = [ ./hier.patch ./fix-nix-usernamespace-build.patch ]; postPatch = '' echo gcc -O2 -include ${glibc.dev}/include/errno.h > conf-cc @@ -45,4 +45,4 @@ stdenv.mkDerivation { license = licenses.publicDomain; maintainers = with maintainers; [ jerith666 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch b/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch new file mode 100644 index 00000000000..abd9e756a21 --- /dev/null +++ b/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch @@ -0,0 +1,10 @@ +--- djbdns-1.05.org/chkshsgr.c 2001-02-11 21:11:45.000000000 +0000 ++++ djbdns-1.05/chkshsgr.c 2017-10-13 10:06:09.392578927 +0100 +@@ -2,6 +2,7 @@ + + int main() + { ++ return 0; + short x[4]; + + x[0] = x[1] = 0; From bbec429f7a22ee7b7aaf17be3e4d52c89d924cf2 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 12 Oct 2017 22:33:17 -0400 Subject: [PATCH 1084/2806] djbdns: fix root server list at build time as suggested by @peterhoeg in https://github.com/NixOS/nixpkgs/commit/1b7e5eaa79241080eac2a0b79883a17c9e5f4731#commitcomment-24560631 fixes #30379 --- nixos/modules/services/networking/dnscache.nix | 11 +++++++---- pkgs/tools/networking/djbdns/default.nix | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index f782be97f6f..379203cd1ab 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -18,10 +18,13 @@ let '') ips} '') cfg.domainServers)} - # djbdns contains an outdated list of root servers; - # if one was not provided in config, provide a current list - if [ ! -e servers/@ ]; then - awk '/^.?.ROOT-SERVERS.NET/ { print $4 }' ${pkgs.dns-root-data}/root.hints > $out/servers/@ + # if a list of root servers was not provided in config, copy it + # over. (this is also done by dnscache-conf, but we 'rm -rf + # /var/lib/dnscache/root' below & replace it wholesale with this, + # so we have to ensure servers/@ exists ourselves.) + if [ ! -e $out/servers/@ ]; then + # symlink does not work here, due chroot + cp ${pkgs.djbdns}/etc/dnsroots.global $out/servers/@; fi ''; diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix index 178d27f2018..b8a7133e7bc 100644 --- a/pkgs/tools/networking/djbdns/default.nix +++ b/pkgs/tools/networking/djbdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc } : +{ stdenv, fetchurl, glibc, dns-root-data } : let version = "1.05"; @@ -23,6 +23,8 @@ stdenv.mkDerivation { postPatch = '' echo gcc -O2 -include ${glibc.dev}/include/errno.h > conf-cc echo $out > conf-home + # djbdns ships with an outdated list of root servers + awk '/^.?.ROOT-SERVERS.NET/ { print $4 }' ${dns-root-data}/root.hints > dnsroots.global sed -i "s|/etc/dnsroots.global|$out/etc/dnsroots.global|" dnscache-conf.c ''; From 826d7d2e8d35095d34f6390574d85c744b6611c6 Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Fri, 13 Oct 2017 13:23:45 +0300 Subject: [PATCH 1085/2806] yarn: 1.0.1 -> 1.2.1 (#30346) --- pkgs/development/tools/yarn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index fda4e9abd45..0e66727ab1d 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.0.1"; + version = "1.2.1"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1adp5wzxbq5glxbmqfvmjn3vld93mvl65y4bmhjn8clzj7n25piq"; + sha256 = "0jsaszykgmli503jgwdk79qks44krjgjr0qmizh3y7z4lplqdjip"; }; buildInputs = [makeWrapper nodejs]; From 22505d8df4513590616713b2704121caf9a8181b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 5 Oct 2017 11:56:59 +0000 Subject: [PATCH 1086/2806] connman: do not restart after suspend --- nixos/modules/services/networking/connman.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index d0683b87780..546d2706923 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -115,10 +115,5 @@ in { wireless.enable = true; networkmanager.enable = false; }; - - powerManagement.resumeCommands = '' - systemctl restart connman - ''; - }; } From 47d8cd9b6768436848ba3933b8079be12de8afa1 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Thu, 12 Oct 2017 22:48:46 -0700 Subject: [PATCH 1087/2806] expect: update website URL expect.nist.gov no longer resolves. It seems the website has been moved to http://expect.sourceforge.net/ , though there is also a page on nist.gov at https://www.nist.gov/services-resources/software/expect . --- pkgs/tools/misc/expect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 80fb3c6a694..0d1c81c00a6 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for automating interactive applications"; - homepage = http://expect.nist.gov/; + homepage = http://expect.sourceforge.net/; license = "Expect"; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; From 98d5aa05cb8e7a2beb58f61fa40b22f686c616c2 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Thu, 12 Oct 2017 17:07:45 -0400 Subject: [PATCH 1088/2806] salt: 2017.7.1 -> 2017.7.2 --- pkgs/tools/admin/salt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 5afe14209f6..b5056460225 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -8,12 +8,12 @@ python2Packages.buildPythonApplication rec { pname = "salt"; - version = "2017.7.1"; + version = "2017.7.2"; name = "${pname}-${version}"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "079kymgxyzhf47dd42l7f42jp45gx5im4k3g31bj25p1s0aq91py"; + sha256 = "0h18zwp1w90rgxpmqgrmn9wp31h03f0vak8lpnnbh0dzbbgcffzz"; }; propagatedBuildInputs = with python2Packages; [ From 845d0b6005c68ed5e8fe73ab15650fd1388a86c0 Mon Sep 17 00:00:00 2001 From: derchris Date: Thu, 12 Oct 2017 23:55:14 +0200 Subject: [PATCH 1089/2806] intecture-agent: 0.3.0 -> 0.3.1 --- pkgs/tools/admin/intecture/agent.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 27891614f4b..4024ab9b91f 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -5,16 +5,16 @@ with rustPlatform; buildRustPackage rec { name = "intecture-agent-${version}"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "intecture"; repo = "agent"; rev = version; - sha256 = "0b59ij9c7hv2p4jx96f3acbygw27wiv8cfzzg6sg73l6k244k6l6"; + sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj"; }; - depsSha256 = "1f94j54pg94f2x2lmmyj8dlki8plq6vnppmf3hzk3kd0rp7fzban"; + depsSha256 = "1n57i9wkak76ram748mwq0dn32d041ajd31laqc13c76pp29agrp"; buildInputs = [ openssl zeromq czmq zlib ]; From 1d20ee2f92e098aa523bff373b314c52d8f69f97 Mon Sep 17 00:00:00 2001 From: derchris Date: Thu, 12 Oct 2017 23:20:45 +0200 Subject: [PATCH 1090/2806] intecture-auth: 0.1.0 -> 0.1.2 --- pkgs/tools/admin/intecture/auth.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 88ef137d841..c4678c8d4b7 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -5,16 +5,16 @@ with rustPlatform; buildRustPackage rec { name = "intecture-auth-${version}"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "intecture"; repo = "auth"; rev = version; - sha256 = "1p3jahha8k139f22ijg050cl8akfzxda4gzvijpqv869hmhc70py"; + sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2"; }; - depsSha256 = "0mki57yzb29y9fhh16xvpi5gfp6c14r5q3f45f3v8sdj95rjahz1"; + depsSha256 = "0wzr8hk63gh3nm8f7dbzwj8pgc3cm8p8mr2q7bbgvri1a5i83sfb"; buildInputs = [ openssl zeromq czmq zlib ]; From 6f38c8e182efc11549ba9ea6d69b8792ef963668 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 13 Oct 2017 14:47:23 +0200 Subject: [PATCH 1091/2806] cli-visualizer: fix --- pkgs/applications/misc/cli-visualizer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 860a1d186f7..fd88ea61ad8 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, ncurses, libpulseaudio }: +{ stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { version = "1.5"; @@ -15,13 +15,15 @@ stdenv.mkDerivation rec { sed '1i#include ' -i src/Transformer/SpectrumCircleTransformer.cpp ''; - buildInputs = [ fftw ncurses libpulseaudio ]; + buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ]; buildFlags = [ "ENABLE_PULSE=1" ]; installPhase = '' mkdir -p $out/bin cp build/vis $out/bin/vis + # See https://github.com/dpayne/cli-visualizer/issues/62#issuecomment-330738075 + wrapProgram $out/bin/vis --set TERM rxvt-256color ''; meta = { From ea1a925a95493e5e3122f0bb714d7b5f1392265a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 13 Oct 2017 20:49:54 +0800 Subject: [PATCH 1092/2806] cryfs: disable testing as it does not work - I pushed the wrong branch earlier --- pkgs/tools/filesystems/cryfs/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 07b077b9289..5d5d23d4ed3 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -43,11 +43,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCRYFS_UPDATE_CHECKS=OFF" "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive - "-DBUILD_TESTING=ON" + "-DBUILD_TESTING=OFF" ]; - doCheck = true; - meta = with stdenv.lib; { description = "Cryptographic filesystem for the cloud"; homepage = https://www.cryfs.org; From 56e18c50ccb53250e589724ca00f4dd53805bd56 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 13 Oct 2017 09:17:13 -0400 Subject: [PATCH 1093/2806] Revert "Simple proof of concept for how to do other types of services" This reverts commit 7c3253e519a572f90a907fc56bb6407da004b24c. I included this in another push by accident and never intended for it to be in mainline. See https://github.com/NixOS/nixpkgs/pull/26075 if you want more. --- nixos/modules/module-list.nix | 2 -- nixos/modules/service-managers/docker.nix | 29 --------------- nixos/modules/service-managers/trivial.nix | 35 ------------------- .../services/security/hologram-server.nix | 14 ++------ 4 files changed, 3 insertions(+), 77 deletions(-) delete mode 100644 nixos/modules/service-managers/docker.nix delete mode 100644 nixos/modules/service-managers/trivial.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 31d48df47f4..a8cb957ffe2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -131,8 +131,6 @@ ./security/rtkit.nix ./security/wrappers/default.nix ./security/sudo.nix - ./service-managers/docker.nix - ./service-managers/trivial.nix ./services/admin/salt/master.nix ./services/admin/salt/minion.nix ./services/amqp/activemq/default.nix diff --git a/nixos/modules/service-managers/docker.nix b/nixos/modules/service-managers/docker.nix deleted file mode 100644 index 7effe0e85d4..00000000000 --- a/nixos/modules/service-managers/docker.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.docker-containers; - - containerModule = { - options.script = mkOption { - type = types.lines; - description = "Shell commands executed as the service's main process."; - }; - }; - - toContainer = name: value: pkgs.dockerTools.buildImage { - inherit name; - config = { - Cmd = [ value.script ]; - }; - }; -in { - options.docker-containers = mkOption { - default = {}; - type = with types; attrsOf (types.submodule containerModule); - description = "Definition of docker containers"; - }; - - config.system.build.toplevel-docker = lib.mapAttrs toContainer cfg; -} diff --git a/nixos/modules/service-managers/trivial.nix b/nixos/modules/service-managers/trivial.nix deleted file mode 100644 index 77e615d1e2e..00000000000 --- a/nixos/modules/service-managers/trivial.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.trivial-services; - - serviceModule.options = { - script = mkOption { - type = types.lines; - description = "Shell commands executed as the service's main process."; - }; - - environment = mkOption { - default = {}; - type = types.attrs; # FIXME - example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; - description = "Environment variables passed to the service's processes."; - }; - }; - - launcher = name: value: pkgs.writeScript name '' - #!${pkgs.stdenv.shell} -eu - - ${pkgs.writeScript "${name}-entry" value.script} - ''; -in { - options.trivial-services = mkOption { - default = {}; - type = with types; attrsOf (types.submodule serviceModule); - description = "Definition of trivial services"; - }; - - config.system.build.toplevel-trivial = lib.mapAttrs launcher cfg; -} diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix index 8315c9ea5d6..e267fed2795 100644 --- a/nixos/modules/services/security/hologram-server.nix +++ b/nixos/modules/services/security/hologram-server.nix @@ -23,8 +23,6 @@ let stats = cfg.statsAddress; listen = cfg.listenAddress; }); - - script = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}"; in { options = { services.hologram-server = { @@ -96,15 +94,9 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - inherit script; - }; - - docker-containers.hologram-server = { - inherit script; - }; - - trivial-services.hologram-server = { - inherit script; + serviceConfig = { + ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}"; + }; }; }; } From 0ef6e215ff74df480db984aac0c832b0a57d98f8 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 13 Oct 2017 15:35:27 +0100 Subject: [PATCH 1094/2806] Agda: package builds fine these days Tested with 8.0.2 and 8.2.1. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7e8e152b21d..28743ca9481 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -936,12 +936,6 @@ self: super: { sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7"; }); - # happy 1.19.6+ broke the Agda build. Sticking with the previous version - # avoided that issue, but now the build fails with a segmentation fault - # during the install phase for no apparent reason: - # https://hydra.nixos.org/build/60678124 - Agda = markBroken (super.Agda.override { happy = self.happy_1_19_5; }); - # cryptol-2.5.0 doesn't want happy 1.19.6+. cryptol = super.cryptol.override { happy = self.happy_1_19_5; }; From 998f087fea485a338ca4675c6880134a930a00e1 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 13 Oct 2017 15:28:32 +0100 Subject: [PATCH 1095/2806] dbench: fix wrong client.txt location (the path is hard-coded) cc @bjornfor --- pkgs/development/tools/misc/dbench/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index 997b1e18fd7..a1c9c11d34d 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -13,10 +13,18 @@ stdenv.mkDerivation rec { preConfigure = '' ./autogen.sh + configureFlagsArray+=("--datadir=$out/share/dbench") ''; postInstall = '' - cp -R loadfiles/ $out/share/ + cp -R loadfiles/* $out/share/dbench/doc/dbench/loadfiles + + # dbench looks here for the file + ln -s doc/dbench/loadfiles/client.txt $out/share/dbench/client.txt + + # backwards compatible to older nixpkgs packaging introduced by + # 3f27be8e5d5861cd4b9487d6c5212d88bf24316d + ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles ''; meta = with stdenv.lib; { From 4c1b8fc890e90c794e7700e465b9108cce048ff5 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 13 Oct 2017 15:48:38 +0100 Subject: [PATCH 1096/2806] firefox-devedition-bin: 57.0b6 -> 57.0b8 --- .../firefox-bin/devedition_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 6834a57c015..6abdaac0bb7 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b6"; + version = "57.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ach/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ach/firefox-57.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "32572bd7029c8123909c35c36d8790efec84b57ffe1607cdbe4b7f9ebf3d09d5b4e750d1c347094790647eddfc3ec20f083576033b2fe5ee147787247d316a1a"; + sha512 = "669b52b7784d7d02178ae2e3aef14fc4197705749ecb5eaff197ea71aae90b399811029da527964cc2f428707a29706bb0cc3911fc77db3c5001c994b1a2a770"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/af/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/af/firefox-57.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "edfda6b78cc45d7f78f59f23e074abc605a7776b27b89b7bd8d0c171eab9843716af28bdc81b53c993ea16d0e057611fdbc4c3fad7c2d6781ee1847e759057c8"; + sha512 = "d2b96148c787bef4db0f0f5c288ebfdcfbd24b43dfbb890b90fb2f490cb08096ee18f990e2e130d5ef78ad8965bd3e719eaaffb9263d7d94e3b6edfc6867e832"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/an/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/an/firefox-57.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "0a6b80080457500b2b0757491d74696eca3132123f146c17b75ceeb5478bf8ff6a4fbc6e397bd08424ca1df36b82f3b9903bd5f7d5b57d52cb82d9e19ecb8d78"; + sha512 = "db3f9b3470173b176ab2d91807dba82fdd938a00eb2a8cbfc27ad9fdae6d7ba5f5c6af11b5ad191168d958aa8972a1c2404a190d6a1b4d14e09cf9e366a64152"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ar/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ar/firefox-57.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "07001d159fb27773b16a8b8a38d9f6585b2304dfd9f02c9210b0dfabaebc8437ff7ecbe6d86d4f9065ebf67a89206ca870c339e0dcb70c1ee265660bfa060f08"; + sha512 = "a86f18c7fe63098b56ec160982438bfacc4a7f93ac27f17ff7a34b179419e0d4a98d180517d2f3af621e14567ecda01805b8dec9df4b35eeab137a73f681b56c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/as/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/as/firefox-57.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "caf3f545e2bccf5566d2b5913ace96ebd304951a1428790219b74d8fa4461fe8fcae97af30c60c6fddd4cea88f5ad65251db656774acb8bad730ccb75b2ee425"; + sha512 = "78471fa0e2a27101e919efa371be09175b3216174fe321c5258d6b2e02e35cb1b194da1700a7b4392fda6e66ba5034edf70f5b6cc55164327b1f694afda7abd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ast/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ast/firefox-57.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b1660d8c853fa8a322d112241c926f48f63e244baa8fde8e7fe5f703a65656c1c33ef33c6ffe77c9f9f2147f8d27f2cf24782c794670034719fbd5b78a9bcc04"; + sha512 = "69b7626e236b45549aa11e7fd98ed5dd9be2b705869bff521cf6c4d3834846728682fdbb0848bb3fc9c74a42fd1614327f4875c6161408773bf3e5eb29a61f8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/az/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/az/firefox-57.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2d299a7a9aa0e8eadb47cbe2651f4fddb09c21984396d3f41d3d65faa05324768c4a7d88c273dbb3c937aa65086124919f77b0f4a1541d48534a70a01d7077dd"; + sha512 = "d41c8f045b2ff59949297c6d6f8ee4316eb6f7da4d17a670e8c53d5a69fd70ff0b518d5bc6bc1704991a72ae2c43d7718a21966fc56ee4bd27e330fb2d411061"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/be/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/be/firefox-57.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "75a7456d7e7b43118363d0ca7ce24ae6e2727c23542808731a3351c97e2d7fcf2aae44aeb9fdc460dce7ab582d4c8e1a59abbef51284f4fc85e8402307510dc6"; + sha512 = "23e83c6929b13e4738677376832edfc0beae95593f56a18ac359dbbfec0fd9e0280c113f39b53a4b489b5d7a90ec3010bcedc62b5718e5d97905ac402160ae6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bg/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bg/firefox-57.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "ca4be119b8cad3fc84eef3eaa0dc86ce9f6322ad39fa815449866ea13c343ca421c0d2de47de91e5f6ffba0be3d3e04af4442e55b8ef44b4b6ef48fd6ec8bfbd"; + sha512 = "4319f4c81b740907aee2fc3149a818b5cf031bf6f002d4eeaaa6e96b5232da5accfcc0dc9beae9505e8b34541743f347914adf044248c504a5edb37602df0dd4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bn-BD/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bn-BD/firefox-57.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "4b423a596cdf870b17c2744ba440e0cd7cba5218f76c1a1c9d088c4f1743f5d6f34dd7b0798221b26796afc5e888bdcd2246a84c446d543753c6bb80a9fce701"; + sha512 = "62b1b6dc18a418546ae5fc038eb327889ef44344b1abdfda6714f1564a2173af4ad7ae1fddfa0d495e8f32cf740b0e615549c6a2cb17a92cf1db1cc525a7eb86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bn-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bn-IN/firefox-57.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ef308ca2bc4eae44d95bf791b42e1950fc969b750e5945b1fd2b1241d1768d0262065ef5f2a5afd8eb422291977e797c7f6fc65a2e81c88bf9f8c6b092be02bf"; + sha512 = "c829a39e7666c6211948ee8a41298d42cfbd3a9c76265846462a220a136ebdb387e764655820d6b2835424433a2f94d974072e6c91962a343fb9f5544181bc68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/br/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/br/firefox-57.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "37660bc33778bbbb6831710fe34e28d07a52fd1f2a5a3f003d32e89f7f3506bd69f97c45546816f2737ff21a280274f1e3b68ede955820a127941b293aaf5f71"; + sha512 = "c9c9ad941fd32e3bd15e1f84ba27691846cd6730b8f1bbfb70d3eabcdb0820087f22419c1c9efd654687d030f663b87bc1cec512da63bd531c99d67df2a80146"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bs/firefox-57.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fb60c35fd1782d5553f8d479613bd037c6014f7bc15797835bd63537df86146e075879cbe5a144b7f2aa9c2a171f6fd13abe7ea6376cb431f6733305aae79594"; + sha512 = "3fb8b36ededdf18a0e73d3656d063eaa9b68448c4130d3887c554cebd81fe523b986bf82c04e7319a8476ba9b8f1165e30b5f556923099c1503951f5a9a912df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ca/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ca/firefox-57.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "abc66fc5ab47aaf90325df0f699df3db0161fea9ea72d19437e9345b0d3740e80c8e435455941c3eb60aada521c1690dc05f22f833e2ef340677aa85960b46a6"; + sha512 = "502087f8485ba252c0f9ff8bb6e33c8981b3139ef032178984053ed39ff7f82f66c95755e72d14855d1a09e9db29b83d2be9cc8750da80a5c7eb641233005336"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cak/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/cak/firefox-57.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "7df49494bc2bb59c42f025e89081a3825ec27cf17a27deca9c7aa2757ff8c2e6b5598bed06af0699fbd3d15d0e15aa88c38908ca0a96008a8382a5b4fb058c4c"; + sha512 = "d037360832abf0d7545d1e43e7327dc26e8e009cbb9c8c027d1475f04a02262789acb44f41c45dcf5a3171452cb247b14e60f2e2f4d4a0ecddc45990b5a4b27d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/cs/firefox-57.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "316884a24ba4aab3f65df9703ec7b4f201f9536e8b3f8648addc274fd99bb4d5a930e4499be319e040a90097c6b0450a3434a2b1f264625baea5f27b87271233"; + sha512 = "c8d2c9b9347c8b393181ba1021c0f062c711bc2d1316f0512c0374525e3f9e6ea9bcdf8ba5b0466b87493f43ca54c13142528b420df0ca25322b3db68dc1b219"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cy/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/cy/firefox-57.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "929f32656a4c0ced25edc962d43d4baf4119ae75601cb8b5babc88cff953721edda2ac3e300762a8201a161db0d28abf2823de01b96dee4b36721a986d1cfded"; + sha512 = "8e538100f7707b4ec71318f637af0c880bd411e1d5e2c7dfbd3269e40c5a6360e03c97d28e23b66a91c5dd56b236171566d8f6c75e399deda4e3ec17b8baaae3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/da/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/da/firefox-57.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "a8591c86d85a02c146b4695ccd9839eb311e371db420d05301359c833dbc462bbf33886926c602dcf21f8dd69d76fadb5aba875307b24e5553005fcdd47e0cf1"; + sha512 = "d5c21abf48a38f5eb7c3b2c3d70f051be4fa75f1a939023a2d863fe1d17cf567d4371f82f62343017510092cac061ab74b7aba3a15ded5fe039d1b16352be81a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/de/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/de/firefox-57.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "8156fa17843960aa2913a1f12a59e6f3827dad26d4547cc5758888c7586e1a04360a5f41087356002c110f9ac60fade703291b7fd462cdf11cf00858dd45edb4"; + sha512 = "96f6fccff058ea5b4db4b9ec6aa15337788c7ec4b3a9d6af6d63bd2e3342ec4f01f4ab839ea52033322efe0929b683ed73ec31175e82ee2a9a5e18f8c075a81c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/dsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/dsb/firefox-57.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8d79d413a486073329f40caacffda50f8dc0675dc7d99d48fec9b79b7463cda180e6717fb15cdcb6c4f5aa89984a17c77f3703feb6865d802fbccefc66eb4452"; + sha512 = "4e3e82a2deb88cd2f26a9eb154e94c6f0cdfd1b2dcc2ba67f5a5eb4998cf555e615471b6f9d82a83c4abc36e98235218212eada1dd1bf18ab1660a5e143dd1a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/el/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/el/firefox-57.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "17619db107b1a35c0fb8cd0130517529e9cae38730aed31fc92340379228df3435b45b88038bfe421bf4833eb78ed995997456529e15fbf3ef9c823738dfda5a"; + sha512 = "29602ee19947e2123758e0f7c3c1a7ab98a113ff87d867f8cf888c0736570fec7461da23f50b1326aac421f8670acb87979b2ccbf22fb6c42da6094010fb3041"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-GB/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/en-GB/firefox-57.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "5d699c809ea1dac35a73fdfcc3c7c7be5e7f35a34dff1c8e1c5a7e536d72b445c3bc3197ec53cfdcf22a9d9ae43326c958b5d0820218356beafc95690d702860"; + sha512 = "9f8b429a3acc453f143dc36d71e158d0b3473c566790d753a62aff91f9598ce27eea710d6734a205b354d681ea52c4a2ff1c39a6cb1abb2a9c99646718943b96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-US/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/en-US/firefox-57.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "521728456d45ceba010ba8c8dcdcb581d08d64aad0f40294a0f1ecb1fef702e669cca37e35d35a89ef1b9e5bf891d72853aacf225a866c0e0e26ee9d61841efd"; + sha512 = "28a8d28566b79b787ca675221ee918dadbd03b839717eb3bb18b8d9a9b8fae036d6e9e84d68450fe9a6976d856e7a8607edbe71563f7fd4217e75f4c3fb5e952"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-ZA/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/en-ZA/firefox-57.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "f86a0034a310fe26d276fcf867c85647bda35f07bca2cfbac289523a618493e7200668bccf2928f0e56f6f789be4db76f2e344cb3a92c63b6af15a3b682f0cbf"; + sha512 = "63853638b5708931f9d8d3b5b6ca995ecd2bb1a15e26341d2b2dcf588bfe306b14758a97384cb03ff9e55cc84d038c74e6735d2c2250a6656bd77859fb25d830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/eo/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/eo/firefox-57.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "89ea9fff345bcb88bd67eb1c10afb08efb68988c95aa2e489ed706acef083dfb9a1d0c91f00247f7a0afa92592208f356f8539ead8286b4f722014792bfac2a2"; + sha512 = "027c169cebcd4a165b4eb7dee9512f7b46dbf0c31a9f45936d2550dcd80188a4cb9d486cea1c9730a4bdecf555039171d14e887edad77d403e8d877ce55ed1e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-AR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-AR/firefox-57.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "89c07f845771e87e434b36fcf5e9dae459d6b47dfe74715581972ba65cf78418c354eaeb28547de532ae7e53869bff6e94feb9fcf37c7eaead54282e883b0a16"; + sha512 = "fd12bb4da416497eef2ffa824ded23698ac98d83ade117ab758534c1133f3f5b9073d95d84fe2ac518fd4782eaec337d97c60316f0ee1e510f7526cf05c76475"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-CL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-CL/firefox-57.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "c03d76db5d9f8f312077fab403712eebe364ac0f25aa57c754f2c2ef42082a475c0fa8e7447f1bd3bbb72aa0849d1604371c63bd28444db568d42c9f2829ccc1"; + sha512 = "05c42be62f9855c56163319f5da721cb2dfec9f0a36d380620e2a4310d1fe3d3adb6c67f4974b057488f569fcb3c0ec97fea17147b1f8ee3d30dbaae3f1f3433"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-ES/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-ES/firefox-57.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "570b824ca0671c8444e5dff3a837c1726f47b2cb033099d051a1853215c80b928c2a54b129e0d75fa888fff3115e1a51383444737f739f98076b53c44ce6a2a1"; + sha512 = "a081e0ab787190d185259456034266fbac06d8732ad10d608a14871070ff82bb7fa86fbeec8c1fd47df4b2f5b4903da1746762f8c105095dbc09552e8894a7b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-MX/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-MX/firefox-57.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "1c40abca0e01db35a53afd628e7eb15a9448c6fcf1ad1655f2c201373ee8526c2ebd749715f068254757218be91d25d00c3016132841612c9d5b1fe0ded792f0"; + sha512 = "7159d4ccd541bb5fc0128cf0f9e08ae202a4afc9b9a38a88b5d87f7fe456af8e43cc5a95ded085a327060d1a6c9586489ee2387a872a6777f2b207c4cd4a54cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/et/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/et/firefox-57.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "4df4f29036d1f536b88a95fe78936beff16f0b7ff1c2394b0c10af6f12b0b6594866816d162d700d8ba28307b52cdec46090dfe77dcf161716bfc1266173b05e"; + sha512 = "e76ff5a5d1ed68dede803b3f299ac7e3aa61d6cd40d1863b624c074a1c9c837458cc1b34d78c932e94da7dc5d928c38c645ecfb721d8e8b7edd37b0fc8e3d664"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/eu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/eu/firefox-57.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "6474ed745f607d8b989ae1bc72c47717fadb63875a706349269d26ed1aae990e4784e2c5147dc93b6e2339562c568f5539d74522b66f94843dc9373b41e1b7b0"; + sha512 = "c673d2a1375c371bfe50288f94cd6879ccf290dce7ba5e755109b67fcbdfd96ced5363a129d0bf0ec6490b322a1d90beb8bab62ea6392d0120b0275d8c86254c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fa/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fa/firefox-57.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6f9c61132f2310c4c0b08ab7356712acae16cca16e66d82cbd77cb9c45e90868b1f901b68334d9e462dd2598e95c3c05b74c5026ede1f01e69ea8090d7fa6e26"; + sha512 = "cb9b3fee5334bfb11e53f9fe4c3edbab8e8db8cc916046bc21f6abe6a0a134191f1e9921e89c443376dd76475ca1521f8e7b39550a151a3f25f9bfa6312d2082"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ff/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ff/firefox-57.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "9551db4c78847a6f8a0431ee47522a7923f9029fcabfdcdf05bad26b238af9926a6b6a1c21bda2b38e87b67ae90b0a33a09c2477504b865c41854b38acef1a1f"; + sha512 = "d8926743a7a15fc7144656ccbf3035ea1ca542421bdfeb0edc0b0a84343236e2cbf19635dcefe68efc44f4afd14697d2a833b9e85e587abb2a65b816cda74d7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fi/firefox-57.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8d86d0feff634ffdae2be5c691a0da072e86a255addaccc93d9e6ab849fc58b43c2b0bf5b01ecdb28711e88721ef87b772118f096d2da5c893d95acc804ac4fe"; + sha512 = "08b35f12b9182f5a6edf9759e30bdd4b8e8f801e427edbfd53b3c85ddf2f4e28cc7097b1cd08572e79d59a736474353c2bd90dd166eb7f50ca4e713b85f093a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fr/firefox-57.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7784d578af3cc764409f52f72a8de78866088485037512f2d0ed6d7abe6c2881fb14474e4a17e9829d6185a185df9519e7449170af4223c93a0277a2b6264783"; + sha512 = "71e01d15790d27e6466dadbb55965a9f1e5df6409eba80ed6f429f45eb03bd21b0cdeca0b2a162beaf9435c9b75fab57f7ae3a663c944de297b8ab432baeaa8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fy-NL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fy-NL/firefox-57.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3d986bc10f2a4ae11319e08db71cd50cf8aed27550831a399a99709a73abda01bc2bb85857bdffe5cbea06470c8e78d5ceec94bd93b5c5e714620b975260b53a"; + sha512 = "c86e34b5d16a2915d3c80fb6c69a444343c8993aa39d4589b899d702c029804f1a790fe093bca608c9d7fb6a3ce1e90a37696ad069b2075067c2000323b17262"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ga-IE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ga-IE/firefox-57.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8b6728c64452d533f59a899fff367ad03b5b0309fd908086125ddf9c924bb6acbc3a48b35c9787b69e598ef1046a179c0ddc0dc7735fed3fb2176e4c875a054f"; + sha512 = "dc1d58d4b1e480f5dd5883783cb30431fcafdee0612dd1a73585db34a8e42add6a1683b10f3e94765b11637037199eae4517ff416d9db4d12e9126ae07e44a93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gd/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gd/firefox-57.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d511fca44339a41bb9c1e9d72ac333793ebd3b0dbc3a1331b1d230246aa6bd109905aa3fca44212328c3c710868b1de3dba3a2ed4d1f98f2916c14841eba9c6d"; + sha512 = "456b1790f10dec64ce6cff08b7629121710870eab2331019071730a9141b72d714a177a4018847cd66db145a1d3eec5c7fe7d64cd950d106e9fac06fa763af2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gl/firefox-57.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "a817aa07f4ecb4d20a14ac7a69a8163c16a9916cc3315c27240356fcad2ee9ae1fd284d6c28b7f6cf587f45959788c2354e3625e83fbf6ea1051d932473ff8d0"; + sha512 = "68e62e4ca5a77e7552e0eada7d82910c00032b77160dcd7a5d054951778600f898fcd1aec690c38388c82b485ff988ceea7b71d67b715c28aab8f2ce02abff65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gn/firefox-57.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "fda261cf0d175e9304dee206f2aa9874dea15422098e2701a269e66a72191167bc56c18c80399a5b703337ab2171925b7ef0410f54bbb265e3245fe4683a42a8"; + sha512 = "25a9a5d82c54129f4a995cde97bac927f499fecf451d4bc6124a845c0a210ae51d3f73ea7ada0c7e336b016f8a779d46bd8adcc82a2af7c8b7ce886ace779449"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gu-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gu-IN/firefox-57.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "90c0219912fbed11ef6ecd620fbc1ebbb3324bbb36f049c97fa18402e1a71667c74e5aeab81efbad6093a477fbc0f1a8a96b9d43efc514cc3a8fc657dda063da"; + sha512 = "ba8f2cc4b4576f6a9ecd6d7f41a0f36b465a62131041b4ba60171ec86ba9609852af12b1f3b3a96dff5d1a2ce62cbcd9116791db760e5581abb7689c8eaf2380"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/he/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/he/firefox-57.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "bc8e3a2ce6c6cde3193469247f666159a9f5581a739e20f89d0c9f05d83eda48a6e4211b057df0e201797c7d235ca5b48b56b27a3d7ff9e5b3a80e3f120b4848"; + sha512 = "4e67737700cf23ee51c5023fb7fe19eecd546eed20eb52ed4402a247c060bae29a3bdbcb5a0ed88024b1c501d03d11f195ae36d265c30abc228434fe0f4d7b69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hi-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hi-IN/firefox-57.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f69208237376f4a4f129c15f4f05fd7f2bdceddf0a78cb5498f7bd3db9a466cea6a25429e7a164716cf42bcc4b7c2030ecd452a2dcde4763f2eaa9f1a698d991"; + sha512 = "855db36604b8cf08ec74ae74c36fa3c02b26638d48394d9fdcdc42a6d914b5a214b56e121e26cb28b8cafe1d3488cd153c11a8c717ff36557ea77e31d281187a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hr/firefox-57.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "a7cf9db82a924d3a7579fbeccc93b31bbeffe9d044bb71813b3e493d0de40e646860f7fbacca8424d6977cb750c1bd3766ab0ef032113908bf4f4d010c91494e"; + sha512 = "252e9162dd4ebca701425b3c251ca3eaebd6802929049e9087f0e472b60daf645c6a6eebf9d56d2b28dfca97308954e1992c442f2cca5cf21092957af75f03b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hsb/firefox-57.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "3c6f7fc20aa02c3701d8155dcbab0df13e6692760613ad87f27df2ca0ff5615b927bca9b7359914f07f976354d697b54d5ae306644a7e7aa312500df28353204"; + sha512 = "c554fb601f4764e5518ad78c6c78996b6795926b5a9434cdaa734f88d6debb01b20db6648e3fea77cf02739ca22fdfe2ae953c9c2b26ed5204190f7b05c24eb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hu/firefox-57.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "4f581f0f917fefffd6b7df0c570e3107d36232a9feaf5f5bb9b63bdcb51a0b8f8ec27a6d54a7a73ab17ca579fa95d3be601beca35eca2765ce019f3fda8d9f1a"; + sha512 = "f0a3edb3a55fc25f1ba94a5b372f4f7f284f405be03059f86096119f9077450e53e72ce9144ff1ef075d39f3eea291b3aadd9dcb80efbd67af4681aa8f8afe68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hy-AM/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hy-AM/firefox-57.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "1a088aa909fe0feef415698a03665567665f37e1dcf3fe033c45cd7d591a4708f392439b11ec7b96922139575d4edc8442ba08a8974c36255c7a7c349d4ed059"; + sha512 = "2f3f9058f7e7b35bfe9b8203d89696f66b2d9e8985bc563161b38333e6f9065a661452aa41d859094788312c59fdae56c67b15ed11279251f888ba92b038321a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/id/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/id/firefox-57.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "d185592907cda25a41dc8003b2bad9389dc1b56f5d6bf584e3f248abe0bde5ab548c055a039127b18960635338ccf28eea0fd8fd9c1c60f394a8df44f1644fc4"; + sha512 = "100c57b91262c1e7a8ea1c3c4a604c1dbb4b3c3e8c5686c26ce3fbab8c5483e08ea2696b8abd55a19cde310f5b2a41b5327e0c95c5d9daf5c98240cd9cb4b1d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/is/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/is/firefox-57.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ab1fce5528ef7ca3b08eb21d1a653a91403952165a2a16ab0c270a0e799a616858017e2fa8015952556bb8bc132971453e799b01861e078e8774d3db0686b1cb"; + sha512 = "e57db256ad1555d6d4d0aef0542b3a1bc9dd91a41431a914585bf748b924bf045212435dea6e06e72c04d6a16b9f30f1f99289514044f2ddb0260b5149f76cd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/it/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/it/firefox-57.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3b0bb483fdbdae0895ab60032ec09ddc40cd5db4b414fe440e8a449cf06c1b28eafee0aba0f8b05bd7fe278dbef8039ad5d44f9c627198ab1d7aedb483f6e2dc"; + sha512 = "662038be5e6317a97530fbae53200d4285cc197e37dc0676bbd0ffec6719f594ae4d6190df5e157635ba922fbb4c37865deb4e2931f3604411bd23ead6713036"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ja/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ja/firefox-57.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "4acec36fe9193d742dac566677526eb0fbf028aaa3f3ba7226667d1ed6e74dd372f7493f01fe0a289aa0ed8ff3ddb27e6fe069777f6412cca6043d66a284e9b9"; + sha512 = "a51fda61928771c55d2ba7ea73fe30837bb70e0aae7bfd51403422afa290b7b89ea5450eaf71c93b26b5f16f47bc7295d3ab47c4eba0dc823256609ae7f12a72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ka/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ka/firefox-57.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c2a7dd888e9ab06d2e3da86473a91ca12d25e496d58f5899de51aec2e6e8e8087fb65673af7990931c71439f8445ec040c514729d6d5dc45724130dab5056b45"; + sha512 = "936f9794719ca9c25255eecdded55838190f0277a2ee56d1165b066cfa36f517c1c5ffde024791e73f2e7b1cd4172c7fb230f447ae8237f18ed3e4d98d5a765d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kab/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/kab/firefox-57.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "dfa0132593d19f2a68c15a3d7a7f9fc42aaf297c4fb8ff7eb6d88df0a569b10da6d52e5a3eaa8e51e48e890f946bf3015df053f4474466a3207768f0a9f28117"; + sha512 = "3d26c9892a8bee295156b6f7357acddf3f7ff6785e4e78ef6fb4c3f1a86c0a453b914eb026f0314e36d9713e901684b06359c143995356623d77e35bdc11a8ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/kk/firefox-57.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9ca2aa99f561812ea2420a86b28858d62da2f9f91867c93f5605a9a46354c02b2cee873f828225e5c9f78a5bf147d071b9b6fe9307eed42ea950f0a16cc4047b"; + sha512 = "56b3d70858225aa7b10d711e8fafe34b0c5efa65a7afbdc0aef02bbf6fa0195d4670611f401b541df8be038ed07b202fa53abb421a1d1dbebe0042ecf413d347"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/km/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/km/firefox-57.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2152dacb572481fe9ed51e45799bd6f723a80a4efb79d1b351cf1cbccc0674874091add0321630fc3f354707e91c042bba43bf9cd6538c3d18743bd887dfaf01"; + sha512 = "f3e29ce7109b22c2f4c1c14698907e1bd00e689386b3cc8a3b21c188ae5f902b7820911908cb2d740028d6e0eb44cb87ef30aef585d8bd110008f4d57e2de0d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/kn/firefox-57.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "046895dc39db3e2f373de35dee990700d30d47fc0e0e9cf4287fad6b55c23dbda107b95b0a1675c897f09d2ec4249cc16fefeec33b1a8e655d334b19e7786320"; + sha512 = "cbd3dc1bc3043450ae175703a34790334c2a0be8ed71703db29c1d31aaa0cf0f7facdf26603cb04d423a905e6ee527750f2e3783377d5466eadc9cb818b2fb04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ko/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ko/firefox-57.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "c87597a98b2c8c46fac817939128353bf9d1b270f5e467c013b7181aed4210527338994c4913d1b902280e6c3a042a3414f518a2e0a716d25db0a12c0b605af3"; + sha512 = "dab096fd4baf083a9bbe22c6c88fdb0278748e34a32dbf0df947c00d0462788d72860ea88baf84bbd524d808e87cc6d153f24c2bba6ea3400b409abb4459748a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lij/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/lij/firefox-57.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3edf7e1e21ff356fc20be6bc82253535caa76696b9672ea3f4f29b4880b4ac9c1e6747f2953d6e9526abb4e5262b14f7b931bf9845a3b59bb1ab21facfc858e0"; + sha512 = "c1b52bff2b4943b790ae5088db20472a5d51f103722894a57b77c607ceacf68901f5bc8eb3eed50b1d5039f878a3763fe9d629437e1e598eab2533302078789d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lt/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/lt/firefox-57.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7139a914d655ccf53a0cab44fbc3c3ea46e3dac9d1834e6acea59c74329143cdcac5365b828bd21b907e3d3c143a7345ea660c6c4d469418674626c971d9c9ac"; + sha512 = "1cead7d21f0e0535de752038aeb1ea9fc620f84de1f7ec3be49293ed9ac2777fe14ead838c47154ee5e123a010ecf51c9f3effd4f23ebf53fde49196fd9e388f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lv/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/lv/firefox-57.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "05e98b288b71b2260b9bd8fa2aca1851c3131849b9868c1cbf42bf6b5ed622f4ef2f851db39977d77b3135cfe7cf282d7058d96e68fb5e39d95cdd12cc3deb84"; + sha512 = "52dd4ac89d587d9a486742fbd95dc9bb62ca87818ee252e5795bcbb94de379edcca472f5d666c2f0d2867f6ac342dd6b1c282829373eea90577e32d791d77d25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mai/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/mai/firefox-57.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0a84fcead91325eae96026f9a3439806bef6f589205f42859b3f9515c7fdbb29f37903c93f6e9e86b972eaa3e9b1e682b441753afbf529063dde307c2987ea91"; + sha512 = "ddb5f557241b070a068e26d0b93b0b1755820af1bb58c2dea47efb131ab94fcbedef5482770ec32153aaf676b86aa08642f1e2994cd747a7019b545be8978747"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/mk/firefox-57.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c6d3dd3a1123d7094796466fafc9cb7e994824c95204728f7e255abd12004ba9db79ce69c50a3648659217d0c38863010c556bb4075a11883548bd47a51d2212"; + sha512 = "e15d64801baf977b0ad25e3f36dc5745a649dd435f462161f333c6a6ded6430b49a072622574ca17d1a699f65d809badee2f4e0a51b29fe24d03377cb0cd2497"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ml/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ml/firefox-57.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "778885c609688d163fbbba87227ce79e7df0c9e7db0553f4754e23ab87f0cff0f64f7013b861bf8d96f7f6bf715786ac763e5104c983a46b1a3c23a57178a3fb"; + sha512 = "7cd72cd4656f84c9bd4a97e4569e1409c483fadb91c4acd94f9b728834646ee006b402f8b608164f6f9bd8bbd76084eeaec75dacabaca94707047a99038082dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/mr/firefox-57.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "929c6fe735b94f52a26559525f3b846c7a9a1cd95c67ace534f19fa78246ed7faeaa817c004c23ff3ecd78352f9dda7a315e9f8ca1f895bde56b1f53ba8ce005"; + sha512 = "10ea9136e20f2243412b73f5180d08eb0082fe66ecb8e445417db126d0c7a774a9721a1038bdc332751ab87222b3e5c45c89b21afa4aa307be6fbef82c7df9c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ms/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ms/firefox-57.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3e5f73d7934edc570b9a617075ed8deef45dfea01dcf057c712c121302a95cd6e19b0dd5de0529ba38e4b7e08edcae06e4652f462c1c2fdbf423d7c5c8c75c79"; + sha512 = "ee4bec5b6398a2d6e59d2cd5664fc688d6beccb18c75ee2071052680587829ca80aeb320d7ea23dc687c16b3108ef34b33e62d21683cdf698eb9b572716d6e63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/my/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/my/firefox-57.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "98debb77674a17ce8d918e5db0171436dfe62a1633f3a7ddd7df79f1e7e5d1252826ce02f86a231a94158d21f672b40e1714db443f6eecc218e910ffdd3880e8"; + sha512 = "5a239afefe69f6ea857c225358b7569feaa6c5a8eb8442e6a4e194d9e0c902ad8c4faf1ffeb376f87a3cba0bb624363a34f96f53f6e1831c49e4c5b64ba8d24a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nb-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/nb-NO/firefox-57.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "06ee63a1f1a87c50b8960962a987cd1b91052815bf8b3acd495c9cab6a8f2c7ca70d1aa551269df3a53708e8e2ac48fe3324fb333a11330072b5c0fd3ee9fe7a"; + sha512 = "88e9ee275d203caadaaf271974b6a2173302c855c6c61d59e1f01461477800f0eabbb9c2b181961eb27a253ce4343fca56d4bbaf8efefa4289ec990b9426910f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/nl/firefox-57.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "978085f2e33c3adf8d540b5ba144e2f1090795758ee3b97367f1392e4a4c96dafd6f76f62d7daae9341b1637a9d6dd52c02fd43e204dac0bdc7fb0db40fef182"; + sha512 = "c04c96ed3922026afa158aad3fb44649f50f1a77afe6b5245b65e852d720f441a86e9d3330cdd0e9115e5f97fb0d641c3fbd924f1e287712245fd19cbbb5cd99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nn-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/nn-NO/firefox-57.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c62f38b2855a3ee3fd53461dfd9988ed3be866cea6351dc08f2cdf579313aaf238b3cae066b52d823f5c42f7628ff2158fc8e4d914f9372b804b475b5a2803ae"; + sha512 = "e8013252993b58910fc2aa0ce907e187e357007499cc93342ae9002490dfb49ddeb51121dd4194b4c12915542e8759b0d30faabe54afb0b32919ef636bcd549b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/or/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/or/firefox-57.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "2094a90bba5a6795dcdd2c56324a8b517460f690194e0f7c1fb0f278dcdc108d6e2b9ed3f50810e86ade74cd5267367874d32011fbad1a52874454fb965882d0"; + sha512 = "f758d21aa24459750cb7d2cc37668d5f92ef372ca72b166c7376cd0a92db907cc79531748deb4e4418bfdba82c6c5f14e8c1e066e90e0cc64707497458f7465a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pa-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pa-IN/firefox-57.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "01e4fecff221daf211b9ec2b28ff40c6f8077c1bc06509bb78618ae866e26fafb23d060b3a92e397edb47e5fa291ea0a624ea7b51f3a17255ef56c9969dd74e8"; + sha512 = "19f701e52912da03b68fd99a7e8d76de25287bd46b97616c37d3b7d2703d19e45dbcc42038742ee4b533482c89b8e70aa807b4b11c38660e5a7b3af0ebf1ec79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pl/firefox-57.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "c216423e6c6739e2f557b0542f5823e356ca4e494c257a138780f07a27c7173173f3e3a93f5c7e11076ad013d12aad5e4a67dee4845e351a00333e48b34f1edd"; + sha512 = "01339648c867b7f5daf3932ea54febd2130a86e8ff78db6f00a6dd3a7c3b2b474745548a256d8868107a84c005ff73d395c67b2a4e14ec2d9a5d0873ba5b7b24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pt-BR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pt-BR/firefox-57.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "b949fad120650718d99450a5c5a09b0badc7bf142c5c2a37fdbc97039dacacac2f384e3168ad23811356da1c4768bf23c0a3be5bce50a12dd9915b5777c45369"; + sha512 = "4c04df5d84d833e5f35be55cfe6f4fb28f74108043065019c11cd8add64fcd0669d47d0925ba8a9f076e83f00ea2b25695c9ff279cbc05dfdb8dd6a821da15a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pt-PT/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pt-PT/firefox-57.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "aa6ab4f994e4d6049c5d658cbe2b9bf8523fe862c7be632a261caba1a651b12db4e11f160bb18b368234ed8b3c480af7cee1ec7e468551308f4bfdeb6b0a22e4"; + sha512 = "6a7c1d406c620fce6020941bfad7d7623dbd7372eea45d1c8fec1f7553be33b758ffe88e39af0cef59eec02af9d9dd48e540c9cf8e129e70dd33b006f686f842"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/rm/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/rm/firefox-57.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cb3fbc1954157236c92f884539b38d369ad718ea9004f3b05c4b70cc4588e25ffed97ad68391ad37713740fdf87966c039ecbae97984d89f01555a492c2debec"; + sha512 = "000b1df519f0fd275f58d2cd30f8c826c01c5c1874c16e3e0faab0fa3edeb66000a5c34794c03b88eff16da0c0bf4212c31b1d6097af00ecb1140e03ba50a694"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ro/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ro/firefox-57.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "9ff1f5706e058f72b8fa57c35cda62e14809bb502e648df00bdb37f899a7e3b46ec34fe4fd556343ff11139cfac1e658076cb3c3132acd6bc447044e04adcccf"; + sha512 = "6100f64ae76c8c6c370018403bc72479e9d3e0eb28339637d682d1891eb25fdddb9cba9502fdcc278850a957922572b8e451277b21ceb003a896217b69a5d732"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ru/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ru/firefox-57.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "4ab5bf3f84aa8223e24fa3996148ae9fed8fb98b2ba2e7a1e9c035db7521f9590a437e1861cd6e248c63c790163a04fdd87a3eca5a76b9450317ae7c315c9ba0"; + sha512 = "ff87b10a51db21299b673b753143be28ad5db9680dfe2aebe9dac65ae88ec5445ca47052c553c626fc5819e42c991ef57d504af05738db2b440e9cdcfee6ca8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/si/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/si/firefox-57.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a54194765e1169219f050ff4d3404a45197029b4a7201125764a52c18de109b252c05321e18c2ef33b7478168c36cb3025629c0deef24fd297a4bc8937c51b6e"; + sha512 = "1d777698daaaab61ed451510ebc905d1b385e4f6f22a32237ff7fba2593173688a4a51fbaa363c8e51a9f957b5efc1c5fe90fef25588c4962184c8749ec00358"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sk/firefox-57.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "10551c3d57167b66b3a5a9368cb8b6c298471a43a8a9b144c5ea82f2dcc111b840e273821a42194bde0c793e1c217f7d39f54ffe907a706823b411c307ea0f5f"; + sha512 = "dfaaf1f5e79df8e53b84763542e987f2630d5bd13b4b1b0c73a463fe16029ea8004512e57e8657dcbd00ec3b5f295073327a82fdb8e870ffb84f9edf2c9117c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sl/firefox-57.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "cfebbc1438c649a543b5aaecd377a20153917c3f1a07771a3f246c60fe2139f5e3529e26ca507648ffcf062eab301cc3a95f1251df2b586f2f112f9b04aea20f"; + sha512 = "50ac0f9a58b13c26ed7f2368290fd45aafbe991ed0011295e6b7ffffbe1e3deb35c4952b7f107bf195f9e604029da51d3d0f6d00d94348bc9838540be5cc619a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/son/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/son/firefox-57.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d2f71c72c5c1aadaa76ed17adbb81c3c72f59407279fb2b4670fc2e21604d8c7eafa0b247b30df3ddf2923f023d6ee3d9d1c36b7033d77b3b7b9f4a37a6656b6"; + sha512 = "9bbdb11dca6271f8e1dbe5d96704ea63f55d7d778779d8b06206fdfb25ffaff4216d4266a1f463d343220c2badac6462c7af53afba57561b640bfb0681689c07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sq/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sq/firefox-57.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "03833bb8e39665ddee4cf0163123b52fb7184fc6210622597e7fe2084388a662d380a760bb381609b70679217461fa1c6bf69ea4cdbd872528f7bb0ca2e4500d"; + sha512 = "31a6b5bccf5a976732bd2cfddc384923221bb59df027b67cf688fa7c81d67682617e7617b4418a42191decd65d46b0c8cc5db5ce4cb47bbf665de248e4291a91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sr/firefox-57.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3150fc381b81b4903837fb0b076cee1f425dff20dd449899ccc3b540095d80317727600db4b9abe7607ce7e3d280a86bb730ec665525b2efaa4d72d31ef0ec1e"; + sha512 = "7679aa019569d2dc583dba19165da84e0453de6f26c86e11196f5d25ac1f25b3040b375f7a944ddd3550ff4678783efae2dac7990695d9f805a20773196ff287"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sv-SE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sv-SE/firefox-57.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "0d144a98d41dd6372d97c8720cb5a7a28d002f26355379bbd1778446a6ff73670d95d5420940634006dc860e585f26118c20a571ec52bce361a2278ab107b495"; + sha512 = "834a14562bdb8280072daf8ae520296f8ead6278a27048b9cd95b4e31eff83334f7e75369db0febb6b88f333b972eabac94522b1c1dcc1993b51979a9d28da12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ta/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ta/firefox-57.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c609df57bfc5c637c0da9ac1a7418278ba8856bc7b9a283133d6570a3fb99cb9c517a131406dcf01b111a9d69a8624dce34db6e5db73f6bce715b28ecaf2b6b8"; + sha512 = "5d1b2e8c9e5329c0d3dbf73bafade644b797961e0ca91aa0bda65dbcb6ca7a7dccc063cfce29084a3d66016806bbaf643e74e37049b66293151b727f423128de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/te/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/te/firefox-57.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "8e1eeb91b97f93c9ef8ac1ca7020dd05ae89ff4a42849654411f991e483bf64bdd4b8305d2b1de01b5ed2da53ae3136a2cfd3393be1d27cb64c87f6bc52dd840"; + sha512 = "27dcbc709ff7b203688ada657936428eccad4969875b8416d20963c8aaf146e89dcbc50bd18f343df15c25c89f89078d530f242a0711ea4bad6e74dd83f4e06a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/th/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/th/firefox-57.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "68deab0e83db3fc69526c0ea86a97fcafc2a87c9ef116c7f8ff54bc78a647dcaae8ac164017d46cfb63248cf0bdc531898dec4d8db883d78fb0ce897fed7614d"; + sha512 = "b6fc169928f968db1dd0ed6510be4a4bbce447a100df03bd405c1020e74062f1cfbee22aeb737ff1453a22e596d91a14f3cae309d551532aec2ebd1db98668d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/tr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/tr/firefox-57.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "d48dc92b7bfa0dc0cba2ca5013acc2a5ff4c58eec365b5f80b70b2174624dd94eb199008720c799d5a0a6229e3c2b67a9ba4f93363310de3bb52b62136f3cc3c"; + sha512 = "3d139c2ac6efe0de5c4c58e1e029831e93e49ba40831f38fe7e2d88a8a001302971b0d232bdfae49cdc97d5cce422d4fdd9c8ea47e467c16c2ff5465590ab6e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/uk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/uk/firefox-57.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "a726dd6c12914e95c7a2707e050fff8e671e2c01e31ca964aa6f32eb89768b7ddd1039d20986baee54a746d67615fa4e4a327219816ae52356b1c6224a149690"; + sha512 = "27a75956fe9b4e0a68ee14797b941fab1d2a48e5d78dde9cdae7cfa15395c06268fc9a5b2c9fb7ec52007e7e3662c4b3c5622c41acb8547e362771a4cd6722dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ur/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ur/firefox-57.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "f8a0dc9e7e831e72a570bebfefba136e014a27d224537e7eb752a197261b0334cddb28661018c94d41b5c870642288b99d2fca2af3ad64679c7fc41367e8f090"; + sha512 = "b732a652583e99526f2e5d542d09e7f19447683dd30f1674fbcb2b06bf19ada87b66831a0b0e008dfb47be9c581a5981bdc2b6d8642d9c8e40805cfc327578a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/uz/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/uz/firefox-57.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "644ccd2c71a2409e840d87a4e9451b454e6223c83f49f398871acbbd3da9f8e1065ba7ff40aa6c81dc7aaee921c4247e462d49649a042e1fb5f79a6fe786782a"; + sha512 = "8552d4c8d8f39e993c2d35804a9aa00fa39bf294623acbb6362259d8545f5aee1b52b96e5cb8f3d438981da3503b5a31bac008da70c2557ca05d19615efa72ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/vi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/vi/firefox-57.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0a439df7d97e4e6dfead990da08f5a62aefb8e8938ae717b64fbe0d0fc83e9e0aede01060a30016a406af6eb91de1c05e10f71fbc4883fe679a9988858b8d488"; + sha512 = "6aeae2edd0fbc60f5bb83abd5cafbe860494dab193315fc1154a820e4dcb1ea35b88eedea5a3f5c6aea424e0f662d42c38eb0fcac1ee233158c9dbe16173f954"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/xh/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/xh/firefox-57.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "8a777c355641cdd14f9b23ed16f139853a7b338dd6d1f66e8c3971cb1a20745ba49aa12bd68ef26e3900b68112333a86988514f91b196127ae7d6e5bc5533770"; + sha512 = "6824264b337517f497c78f6aa6485606c239588d0729a53a9d9333c836051b7f0f65b852eb10c0abf81c57b166b65d99f09ba0f17b55503c836ad6d9ff82a25e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/zh-CN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/zh-CN/firefox-57.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "17103974a976021fe921600d8a5fd697d65a8e90a595779be256e2d0350f4f5fcf51f8f16906b3b355b990ba12dab8cc1684a4268a0425e68d3421699618f480"; + sha512 = "9dcffaf3db7f7f4cccbd36f5e77276faaab2808dd5b70058820d9bb932b2e4ea4176a52c6850cd7f46953596d6b157eede8c5f20b6bd304fe2ab8263378e19b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/zh-TW/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/zh-TW/firefox-57.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "904aa9865d7f235cc60176e6dff01fa2842178ba812017cc23011f57baf23089da8feb74cfab15968bddd029ee5f161f10bdd2efead5bea33edc53ee27838052"; + sha512 = "9ccd29e7a9e2dce5294cceb2932ccfb7219570e570b58be350fe915464e0cafb7c739c86fdcbe8bbdc8f5112a769cc43dfaf44a292bbe821766d30e11075d20f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ach/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ach/firefox-57.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "6e0076d906a20021a3a161c685404efe584927d39b7e72ea6645a61571c14469b9de07cda7921c24123790fe8f7bfe7b1cf1f644a09f72b86161c3d57be49b7a"; + sha512 = "6c4c5c80365d2b5fb2070528f4072cd6962b7fcbcf4a2444e8af1433c60220a764ed75ba868be95b6f6cb045f76c40903130c354e262e93cb83a94b671cc1243"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/af/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/af/firefox-57.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a36ba7a0838b00beba5f598281631bc2de5a6cef7399c48c32091cd901abe12356eca4e509e964ba8eb6db011bedce802d060502dcb948de00a57eb754182466"; + sha512 = "9d36a15f517f582303ff10ae09c7eb4e709d19a0b98bb9afb6f1a511ec787121676d749c93b46e301ee3a41010c883aa76b1ce5b248c2141086dd4551c4e9887"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/an/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/an/firefox-57.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "262f3a4a7d7007ba22f155e994bd7fc6b69f92efb6932b96e1d07d4a7923b0eb1ca1b4ca60c93e9e1c9feef5c8aba282b4d9af6ad4dc21e8c83cfdc6f4854238"; + sha512 = "aecf7149169b784593234906230f632d1d6d56efe37d6d2a060090ee2823f837551fdfbd5944960c05c436bb2768f529ba581ebeb6afca6f1b05a77c3a56f26a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ar/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ar/firefox-57.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "6fc5c1e07b4d31e8f5cb21f325e282875ed481de67168b43506c5083741c117d690cf681400778d96b291dc925aa6fd866645bbbe5cd477c1c7254cecc940bb0"; + sha512 = "1a49d7c9819a35f1bb5012191009efcb9c0738bf949bffc48f78f24e57ae9289129922e9beb850a919d6f7a19a86639d9681e4abd2b0f7ab882e4038a1653bae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/as/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/as/firefox-57.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "381032696886a2839d927c81abf0bfb48452ab2da37a57290e2f50daeba947fc17fa8bc8e95461f981980bf67cdbd022c7fbbf17cf631f27555fc92174c1c4f6"; + sha512 = "a0309c07f5f8e4ba7283e6d852eb3527145f7e756cb7376acf560a17dd56171269d722b8cfd673ddf8107009c8657daba2c66f48f70c262404e1a349de65abcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ast/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ast/firefox-57.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5eecf58f91ad77de3f9c4afe211138c79aed460d35f0b4f1a7297b27f72400355e0c1ade4fb2c457ae26d8da114ad711c3c0b2a374e5ba6bc33d107c28b3c3aa"; + sha512 = "a3bb2ab70eccabac6f27df4595dbab2fcb63a0978b6fc1ef965db8d4bf0228eabee91f771c67c5e7b7fc5e322c50c8fb8e35e7b95e5d2e913a0c8f19f8619db8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/az/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/az/firefox-57.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "de90f1e9d1950d1f194d0c5da3bc25bba00da5dd4094c6944b035aa660cd56827183714d9dcc8bb9e7ea4c115792bfb969a218034fc743fe85b65921838db610"; + sha512 = "2c17f965753ef834a010e00055120282e003cec20290a90050a6ef9a6b2e134c6553aa33c247cd15962408fa67e654dc50603fc02b04a43a3584c7ade477a9f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/be/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/be/firefox-57.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f043a6e2c6499aac4c9b2df0ac0c2d62207a79a34eb727668a42942a4a4027ff545484212c88c0fcd9ab91c66921daa3846c294bc3260db3a0f8f35dc9a8c2cc"; + sha512 = "da69fd5a5e50b870d76754f81c8d492b75c239d44ae36ffb92ce3fa3504b35105c5a08a0c6228041a24d61763c616dca44c2ed2d4cc941fae59d521d6d3ce064"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bg/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bg/firefox-57.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "cdad058ee575bf2b4acfd3882769b067959ab8215b351add7558d8a6b6898fdce951db35e23e18c7e7d3fec170a78cf71bf61d20c4ef3c42c23a96e66686f59d"; + sha512 = "f85962ffbcb8f01c896cbf56ccabcf9bb6261b0989b40452e0e3e1bd297c31f6ad30d228d2c733498a6cb97c52b468269a4f76892b495a1c19e43f1294ce0830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bn-BD/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bn-BD/firefox-57.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "ac4e823c753a7b765f1bee0cfc8cc0fb216b5b9e70e147866100d4b90fab0b413850ed15f02585170c3a6dc39b4fd5e7906547626379a70d5d5abe67eac0956c"; + sha512 = "dcc23f3fe7df774b752018153161376cd768eed4dd6b3d0842959f5762145a0bcef3e328e77f6cc021c57c95f2d90fa296579565c21c70cc126c29a5e4a43838"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bn-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bn-IN/firefox-57.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "15b12cb32ea9be780dcc68ce75d54afbd16c011fee06a15130e2d1844746ac2cc66dd61397facb083c478f4a754385afc62fe4355442aad31e8ca87dd5270fc4"; + sha512 = "e530547e5d30f8a450f84558d65709568615644373c42e3f442b615742c6d0089f52f04fe15baa8d3b8bc9d1bdc95769f64bb0c555c93d26329968e542944e5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/br/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/br/firefox-57.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "493c260aca10b349b860492b5756814868520f79dc9853745af8e1989f645f2eb17446af9bb5309d21fc79d9139c7e7560dc5a5a1753bfc32ab3df07e5fe729e"; + sha512 = "7a0e21ec418a344d9df7daf1efc14319ab5b44d22701acfe2d15fc04b32fd2c41aa80c592d4357f6fa531c64b74aac6c6bd7cdf2bfad4f1fb90f91c2c966b932"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bs/firefox-57.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ea865333358b245703fbbaaf621ebab603aa9db3a7c579e244f229696ed1c7176ed44158de6a01817cd410576e69c354d2091704af8dc30b4eed2b2f2f3a0629"; + sha512 = "e5eee2dd28d47efe3dd629826d90ad7ac496bea3f2a750389cce8bd7c3fb03587d52bffb1885fbe21ea2b1078e97bada39ea839573b9821340a4e23626a845b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ca/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ca/firefox-57.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "0961c13ae053299c8f0e0c1d704c0825215c1e77b43abd83ba86709448f22e6ee40c6a1b8d858e4f2d801d7c024b293631ab28ae9fa30553790187896a96da1e"; + sha512 = "ee039ecf51f5548615e5af41e3e77be015bdb679f00355601849c826cd18a1ea422a5f9a7bfc0ed9db72a0e321e52148362a79d1515daa9d8980872e04627f26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cak/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/cak/firefox-57.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "3a8dc71fc212a35f83d10ecfc8c8f97381699431964d34fa7a278259b1cdd15b4e92fef33cc9c1f37868baff0f6ff1064599ba632ad718ae2d39dd3b044f758f"; + sha512 = "effb915c80355bda7e6d58befda98ff7e92d8cb70af09182f987d3125127a3c06a830fd55976f0d9b0791cfb910aabe7582fe029e0a5e94b3da84b17f797e4f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/cs/firefox-57.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "eecb76deb0c420790a37ef24c0956574a4a881cc429f8f78d6ee207b4b9f6c12b8c890e6ebd4f69e9cf4ba120728a319ffba6f90a3eb42affac86fd27dc015d3"; + sha512 = "78987c7192835c39caf8ece474f3778bf7b12a20acfedb544bc5a76c41521dee0b9cf240314cf954e6d2f1964e60ea93ae700c63b97260781db03bcc6026d982"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cy/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/cy/firefox-57.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7ca940188627a439f3a3e401075e3dfec2c4082eaa8aa65fc7a58bc669f4e4a4835095225bcba541c3cc8562dc611fefc4a7e1f7089a8d291b4986d557901cb7"; + sha512 = "822ddc34f737d023e833ba4cc156c4f25ab7715e1b80431cb29226d3427a354f16ffe0b98b571a71b0dcf23f6fa35dfa7a8032ad2ba478a08169d44fc89cb802"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/da/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/da/firefox-57.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "366f786e96bbd5c4eb1ae247e2cbe567a7e94b76124a2a78062528daf1aa72236c91aeb2213f623a8214fadb920d10f1ec49a8bdad4a5a855ca23f06665d68dc"; + sha512 = "1379fe59e87b8046373810489af69f4c946b6f28569b684c381a8c573044d81141b7fd88893c211404f3f59b66d65365e0d1a33fd7a2e2cd09d8174c6ee6e1cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/de/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/de/firefox-57.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "43d46c88a8d58f36ebc832afd6b03eea5afaa58bd3eacde85eed36725f248529169f6d396a3580b2d9483d36bdcae3dd9ad53cc1aa69264231b53285915e3d3c"; + sha512 = "dc9cbc7c428704f2f17b50e1b95169e0e922fcefb9d60df73f455384d8cfe37ac56a4e3310de7ec6f29e855ec2f486ebae86544551f91d46f5e7df97566242aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/dsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/dsb/firefox-57.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "16006a1e4ac7662e9d343cf31dae5d3032948a90a7eab1bf1122ea2f45b4f3477c53d8f0fbfb860e4725cb3a58678890c5de186ecc0cb76106153edefb011eff"; + sha512 = "1a2cf9e55547aa47205a83d3dd95183c3f8aaa9d9005dbd3cb47cf629ee9e240a7564f69ce6b3b51a6f320fabbc3f53665a7e739a75480f7d2ac86d9f21a5145"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/el/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/el/firefox-57.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "d5f74e30fc7da9c9765bbdff4f946ef5de3c64ae4626833d31161e62de106485f9246efe0b1866d47c52ba7d236880c648a438e1602f0552774573c76e2c79bd"; + sha512 = "b48a7bc131cd0206bd4e024575df5557b848b4f1f7734c59e1101d34c5617fcbb740a8fb0e75cfd957f6f84757588087fccf5923b6e5b58cfaa6371a416a2a89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-GB/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/en-GB/firefox-57.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4a6ebf46697c02c9a3953cfee25d761254cc79b12a88a049b8477806b3d1cd978e46295124e7afb3770b7d4c01bd2e002e1e8a092ddf252f6c22f6f9afb4c9c6"; + sha512 = "2f8b0c7c6fc4525dffc05f2a74b182e93bbedc45f2c44369bc8a00d889c9b50ef5d0a4db842555663cb3b88c65b4177c946930ff747796d3a60eda87800514a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-US/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/en-US/firefox-57.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f5f1af68ea08cc95b449595d9f15f346a8562e4c27529bba6453b0fb713d65d1b4cfb66c9054f25d8a8b6aa2d7029592a7d00a2a68ee5c2fa8cb7d06174f9f41"; + sha512 = "a37875973326916e2f83f9b5ceb625e3fa3d714d5fb5335d33ae59bf8b196a55a1a9aa24b553ceb6c5048c15eade78e0f1e050f253cf580020a9d24c8227bd74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-ZA/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/en-ZA/firefox-57.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "554221102e16a5ed426afc41b75be680a6d28012bb66a12c094a719c7d7ea61d0ea378a3eab758b907ad407de78063888b687cab8ef5dabe19f3a54d2bc722ee"; + sha512 = "a35bc33e37b1a2eb9591f2a454c228beddcc1231fba8e7f4dba605b00b93077f031d34ba24da84838dff568fca6fcea686273b75f9c1a09fa3b3cf919dffae8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/eo/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/eo/firefox-57.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "bb31a3422a0d86970649485bad7f78588653ee91551fda7babc9214e9855e7a363eb010ddcfe6d353e292410421bf99c2fcde0aef4113b688dfd3843d1f0377d"; + sha512 = "f52b1b7a86a6819ecb9b978653113a9ca6200d1e2933998bfcc2d71caa2a3b29cbe44c5585d4aa5725ccb74c4fa1d2bc0e7cd51191122a927ffac7c7c83bb332"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-AR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-AR/firefox-57.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a47626bef5d9cc8df045d0a38350f0470f5426f4de8ef45bbcb6a60922532656f60f4fa41c4ef4706af82e5c099af5d5020e6d51ee1d61f8275eced5935ec2d8"; + sha512 = "95e8ba066380a32901f264b1c45905ffed067df81195a717d4d0677b10a54750ddc8946ac8c6528c7919cfd894297ee20f17f4ff3cc765b7946ce246417a24a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-CL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-CL/firefox-57.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "cd93d2b921c3fbadd2862f0fd8d1cc628bf5da469d86bcf619c35940560024bf9b461b2fb405a2fde39e7910b6c0367e31e44c8217971f9a82391dfa5a869094"; + sha512 = "8d90f38a6d7b91ed7e63da154ed4a8030ac8648989b3308590153db8c6506e5bd09e4689aedfe785d113d094d8d3b6321aa448755ab236dc2b6513d6ca5aea99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-ES/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-ES/firefox-57.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "1c911d2898749ab249ddbf7747b7cabda4a33a2b4e426c88aef71055b8483e0e9b408511a14b400ee332358f2e92d3a83817cdb73d8edb9b85ada94538f1bffb"; + sha512 = "fff2d992821815bf09a9bd0dd00100a0a9798b5a546a17d5bfef05a18506b37f84d643fde0d3de34871eddf1563c89549e53d5c826bab5b069998102df924ca8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-MX/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-MX/firefox-57.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "bc7aebfaefba4a4df95d1c60a85b6f961e0bf0a31249caedfd0653f1c1bcdc3f7c27c6f52f45b7cdcca54562a556bf99581e79ecfee9488094327af69b909c47"; + sha512 = "048b6037291c13ba355177e0a335d4b48409588612791bd5ed3d43d6d69fadfc6228242339dcdeedcce78e91ac8c6ac366ad1f378e5165576cc48dcdcea0bde4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/et/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/et/firefox-57.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b1871f409cb4a9b1b85215e49ab4620fdd7eeb3db11e5a0145dd40a923ee4192ab6ddd8aaac82c1d28153722973a15c1fe80c822075dfa4baf50204228ea3db6"; + sha512 = "fcef0b940eb21cac6e9c28f4bc13497865539fa24ac7f83fe24fce2e14318f667dfd16c855ab3a7485e9f0f103da60903987a7c6bf275e87a7ecda997775a395"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/eu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/eu/firefox-57.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f3bf362364479ea07a0c681d79987f9c80c9e3c06a54eb82a0c0308ad195aef257845e73f72f86dfb45ec36551c9a6afa9b32958c28066e626ca33e2c3c8d628"; + sha512 = "781aec0d080a00ff86c56af7c626fefc6351e86f23059791dc026858ea5cd7f18c2ee63832f75590bbbe43d8fb50b525f115471c1481f84f6c201c4161a086bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fa/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fa/firefox-57.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "f7976eeb893f7fa4cf51b2ebb3c6442e731f4a96a2d833d532dbda87412789f044491b3239a7302972664c17dc08606648b011263d63e01e7a51e430ca1f243a"; + sha512 = "94d0b6c20048db72df1bac942c348e9f4b7907620507b65ad7e3bbde08a590d10c556f817f2830a8813723f01826c0fbf68925b35a49a4647f3da5dba3cababd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ff/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ff/firefox-57.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "6381ad86b9ccb65b4aae7359554a49cf630e8f898cca26479b327e9bb14695f87f566da9bd8a31af05c9781fee65dfaa8e23cd0588e4441ce6fb8fb25f7d7fa5"; + sha512 = "669d03edde5124cf1d4c6531e65b62c6948afe3a2710f2d16638fe2aaab85108dde864df49ebc34dc628976782770b5413f33b836a76162edca459c85d19e1fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fi/firefox-57.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1a80fef046318667a0306cd8870e697ab246df3f1ff7fba30ef3a24c25551b2e265e6b52a13514fe216dc5bbf237df7f04106bca87e0506a53caad9856c1c426"; + sha512 = "475e298d214356b01938ed692853e982a2dc5b40d15c2b029db81525164444e96a1c537279939ce6c7cab283f535aeb246d28d5d75ecc13750becf16870aba87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fr/firefox-57.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "26b25a2fdb514cca9638748ec8481f7c36e38f1d3953cd5a45025861145d7851a4441b2a2a472f07620c170864a278dffad3e2d625a31cefc0c348cdfb3ff4ee"; + sha512 = "81c0f51da6cfa79e6de8cfb422b41a0851bfda2c4bb114f72662bec504f302b8f3fe40067fbc712aebd3281ef256a9d3e5c4c901f5ebc7ea3fcf271094ebf34b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fy-NL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fy-NL/firefox-57.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d0a322d815f08e4cb1b7f49de22dd21401e1871b13272ef33f4e311f52436e97f863943511190b0dd2bb3c99ddc0a0b8acf95740e367a34bd78be3425af6e3bc"; + sha512 = "66f68daf373a3a2a610914f05ec0273e9e5ba795f947e08301bfdea6122cd1684a1fc7c3aae3f40b534dbe24f6cac5ec613aa239fcb5e52af9e231257e04b3c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ga-IE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ga-IE/firefox-57.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a736609a8a10782273b79a83cee0929bd2d82958edf6e266245c1a4631c4d4656b128789779806d6c9500f914c749beeac52df3c6c85e149f5357f182603f878"; + sha512 = "4fce38ceac5b1186fb0acf5be6d24bc16d246b4a4ba4b7ae37072c3066de7e9d90638e43875fa7d7fd2cb3b5b88e17b1ce8050b8632f4668ee4a2aed2f5ac6a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gd/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gd/firefox-57.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "66e110faabe9a6ee1cc3aad8e471301aa636e00f3c7cd01d49b3aac5dc96ff117aca8c4b0dc2a7d23a8122bbcb152d82200a505a9e534c9a9dc93da8237afa13"; + sha512 = "40574404c29ad847503d3ced707e7ac21cdaec0fca40dba3e31e27f260ae7faf6da07d3852978e3cc190f3ec2102fc151c723d185f626e01e6a21d13e0ba6008"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gl/firefox-57.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5b115d289497efd2c706bdd2f6337b6f3afb57f4fd95178b7a5953b92a5191dbdbdda54fa3324dab23661c49bd5c8992bb1e2bf6afd12dd6e61ccb2900e53d98"; + sha512 = "aeb96aaf9da366ce06e7453f09cda9ee62e576c1ea8b492e71ace5a35b5bc8e2c7239efd733ba565c3c91a9c9e48bba40db3c5b3f39c321b4c3ae8cb1a759218"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gn/firefox-57.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "357bb746ad1f10118e13f439ae58052fb93bf89562eab0f78510c027f24276849df4a69789db6b274a66b5232c4a6794f2d3daf3a3ff35644b8ce1f137febd2f"; + sha512 = "f5a2b9dbeb8d128eb15621d087a753769d40f219c8235eccc3074c014eadd041df5d146d7f43fb15e31990dbca4f138e983ca7ffbf4aaf249c9c58aaa3f03591"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gu-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gu-IN/firefox-57.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "ee4af8b2880c16c55f09d9c2385502ef4b099854c123cb6d148df1d2024e267d7ef9b0ebd8f1b70449698dd3b25be8479c932dc27cccd38d8086d4ffb7c3bdb5"; + sha512 = "7afac4dd885bafa5cd07ef661f307c0ca30cc2cd65b10d5789090709637d3e744198a3624308cbdf2049899ee4b407934777867c471f2424bcbccb8c025ed40a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/he/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/he/firefox-57.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "d937ec20e10ce471f658717310b6d361df800eecf54b81156e412c0af1d98efffc33534492c46fbd600f9e5a4d85e0bcd80fc7f711b22b7eebf7182e78e05abf"; + sha512 = "3b572a06423d16f1b925608d5690d88e6870b0644f12b48abe5f084fec8f90bafd573d2e80b4aa06ddc7dfee3104880f98fca843148124fa15e3b524a80875af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hi-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hi-IN/firefox-57.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "39d55bfe0d78884fc6f27ddbabc3f80e3075ffb027e656ad07cc56fe39cf097f3c3cc501d123abd172c1d4116bd8fb8bb620a2af8a8ac5c48bba5225cdba58dc"; + sha512 = "734d372db67c55f9992b209a7a36438f04f277fd76be4ae0b04c308dcd538274fc92a9971f1a150b7395341fc42b75dd2073fcbe1ad535e5c373d415a4d7c49f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hr/firefox-57.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "aef7a38ccc9ca3a98249bd4d325ec01dd8e12e7b95b9bddd5183bf8b4795f283f8cfc6c87f22e38647fe58c00d40e95e65e1994a21910f3661937042732f0c14"; + sha512 = "bea351913f51977add077afcf79dc3595133631ba35c594dbf0bec5811a7483a6e4e25e10b6c24aa176a07e27142a2668e66bb93da4531e0f9d0dcdcb32551e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hsb/firefox-57.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "daffc6eadeb9376b42fba1c96b759b3dfef0bbace76472df11b56fd3bcf47d05f85f58affcba193aad39bd58d194b72da32ed5ab7a7d9376adcd17c50d19836e"; + sha512 = "8afbf4d5d1beba8dcc3a4ba8e4181cb854e863d8026ffd4b4a56686d8b8007c3e6b68fca9e3a93b11970124a10dfb5ae369fe15971ac96f91759b5c37b1cc7d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hu/firefox-57.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "bdeef0f11f48cff94a0a80033e2e6f63c12130729ab0af7e0ce7133871282a911936b7c1365319495235ee4336cf2683a84995dc05d424ab70f89553ac8d39d1"; + sha512 = "e3d08f02d76f701ed6f390998a7a14be1636cbaf30bff79c803708d1b389153acfd392f094e17ef3fa84835b7f73e8de16273ac6dc9950f36b6f5f1ec87ae150"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hy-AM/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hy-AM/firefox-57.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "2d20876ba70cbbaf66f0f6653ca284f3472511377e9b4cbfc087b763fc96e1343fb4da014523b24731fee709d1d407596b01cf531b390d1c2f3ff5e47c3d3347"; + sha512 = "97bf44b70f307d4a513dc51d5227e7a6763ad0d76ed4d835ae29067831ddd91648a3c03dd4837914f32fb2c8d6c3c23ff0f754cdcc51e7ad6f743981e2f4f9f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/id/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/id/firefox-57.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "09305a81fcd0400239192fcfce0369ed49dd5eb2e014ea1bc12c1470b732e6aea3580d1d34285848e7c12f5017d321e29ea27705cb298fc147abb82d089ad6e6"; + sha512 = "3be0b9be46f1cff625281d30b729016095305bc47af511c6ab9964b7770731d37d956cfffacdf6833c8d30e3ee7357bf4231abcfebabe1a5e9d814e2b1ddbb22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/is/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/is/firefox-57.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "4151a950e6a4fe8a4c9c143ac47714e35d45639a00a3c03c21c7cb974aab46b56b69b4357ce2294abaa84df6b3c561708b74f5d8fc4139221a89d744689d531e"; + sha512 = "e2235cbbfa0ca2c52eda62a9112229dd4e523daea4fdcfc1227cddf69c4f857a433e2cd6f830908ab9fc8660630b873ba4ce269384b89b40bcfb03f024a14873"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/it/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/it/firefox-57.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "3d776b488104b99992e718b2a41c8de09438140143de61625f01ce51cc8461fcc564da883510dd29c854bb181e906b095347c5b34d5b1964ed51c268469842dd"; + sha512 = "1ba58f0668f2890717d18435f7d8d209d523ed368ca06a85514bdaa0ab4c5f822c0dbe4bd398a55bd14d27a7b88b01e557bf76ce00069772f797a8d3265684e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ja/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ja/firefox-57.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "2b0adf6bb4f4729ffa7a4e20e5c5b4973032a4416076cfbd5d1c9d0ca551a8a1ccb0fcbe1998bfa390373ecbb7d74faf163fef47c20d1f2b4d179a9a0f802957"; + sha512 = "723427d8af078aa1be6149d1e495385233f8ac8c6c79a80e2ffd3884dcee5a4f0ccbc0fb81bdef787fabba98d3bf40e12e31f93134237354590a9f58704b0080"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ka/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ka/firefox-57.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "50b718fea376c16b586f1c54012e6215eea03391d2bdbf1227629d5aafdbd864cdcb3e9527fd2e4fe1486bf928392d7cd70ac147f1b35d626ba7072066cb8737"; + sha512 = "7a4aafc51948adceb81d7eed2846320bef587d2b1cf004e75cc2a62c31ada7b02f893a371abbeb2e7a21a51ff39e175610487cb16360736ba601cbbd0dabd412"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kab/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/kab/firefox-57.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ac3490642bfe48817d992706d441009ace6866ddcf38ee71b172eeacc3e7b3fe44d433b15fa9bfe238690078950514f7d5aa5c2ae7239e3698c04c71f725508b"; + sha512 = "af33b16216c12ffecbb4033c94b8a6225a9ad3d0a6061b0aa417aa118a7123167378c196355788aad853fbe84d87aba7f7a5cf9dac06606d5e4ec576a3e45420"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/kk/firefox-57.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "62a6f73528c26264525fa2fb4e1c0a8e1f029c74eb5333c5912ef208146d24e2ce2e037e904bf83fb3f7c10fc81f969586a09c5cc3746213454f206fd6c1286d"; + sha512 = "52b2544a46297a5b6286bbf87a1062155bc843f60ca97cdd5dfe39744caffabca5baf221301bc45666e939d2f8df51f9de3a4230dc5d2ea89f89b8cf1a355d96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/km/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/km/firefox-57.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4dee68ffd5f306edc3e49321bb29edf435e7924371c37a2e1e239a1377e0f9be5cd6ee680aeba46465ebde9f8b090d467e93b0c65e75c9627413c5ff7c720589"; + sha512 = "45344b0494274f8f8d17f39e8d5ff6a76143b426e5c7c3ebd2f1ed01c9a4fbb301e16440358d246c8f3c31f7e3a7dc593ee1b6f5bdbe6b453c32ee2b54307b54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/kn/firefox-57.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b0fc37707804ca6cad153528275076ad64b64685c2c34bebe27ce652c7385cef455da75420f0e8c543aaf20bc1358e080cce48b747a23c08b9c72b1f7640d0c4"; + sha512 = "80fe5cb4c47b6e4fe6fb374492abaa509c6ee53f535c7a4b8c894c4b0e78dd592617ca19826e31b1b6d053dd8a3e91bfcd20e4f13ed0afd8f91ef1499ba609aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ko/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ko/firefox-57.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "26534fd7779e1c29e2937399a4a79690fdafd8fe7aa735d4386fbb03d9e7be09ae83a3fb3d9c2691bbebe40f8f73ee18db24133ac4250b787a8e13263bc1ea2f"; + sha512 = "5c87c5fba5a2212a7194bca3e4fcdea1a098690ccc89e376389e41a7f78e5fd0218a1366811cd76e5561c76ed9f75165bc5b0cd99ca7645e3d7a3c11eb67c519"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lij/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/lij/firefox-57.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "2b42d3afa649bb48d3bef4d67f01fcae216f28d3d912ba096258ad1992914d99c8389abba60128e0198a8ea54ccd87239d857e29b44b297eecc288a08553a6ce"; + sha512 = "d772ee65fb31f00fd77b7d748a79bd4199711c9853552af47de1d1981a7bc79279240c517e89c830bd8ca1ce7301e285d24d994621ae668f9bf53dd9c8656ea5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lt/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/lt/firefox-57.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ab7194527b65667938ba7e4dabce6ef67c075284b1795fa064a81e1970ff71e1d4e60687e202fb82ea4663f46dd4ebdfb0c7ae30734dbd5662c28499484618a4"; + sha512 = "f8d3816c6ea946cb96e8dcad1d3c1f0d624a669ef46a48440919ccd9e87c67ac48abf4b7d78119302107eb7ee098a0e344336a4f0a2ffe80d970b238fdf1416b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lv/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/lv/firefox-57.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "33d3fc939a464389fdb0345cd92c29a1c38e4418fa293d131f7bafd2f39444068ae7c168881076b9392019d77c5260ee670bf7131d9501127095441e43e7353b"; + sha512 = "0af6cce7117be80b400880d05163d6ac777a6a7d2260c68f51ecfdf30ea8693c0d63c5b69dcc0dec2a3be1767761ad23104aac5bc79ab088c770fb678886790a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mai/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/mai/firefox-57.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "69816c5d46e84d0dd4b5fb1473e49875725ff4dce7d08c9a892f4119f6aabed29e30789a77a56585e2399918aea16a84dc94d3d9e04d3e29b85e1ecfd4289a52"; + sha512 = "a53ac3a64f7b8158858acb52b33d188c695633dd2f06ab92839aaf98adfa3eb79668de07b7bac006fbbd884b76342608d3100a284ee638c161f2307cf241d3d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/mk/firefox-57.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "93e41429afa3095ec8cd903f7c942ac46b65a39566c7bffaea937b2ad72d219d755fec27d58e351cd70cd697149433b43f26753b389f8f70ddcac9ba9fab78f5"; + sha512 = "a5732502199793959a3595c080c5f146bac8f445ad11becc841f806c8ea11a37ad8ff9d9fb8815af89f38aadb5e4402cf7473a8be56302d6f99b0468651928f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ml/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ml/firefox-57.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "911e36c834c35664b38c14748f146499bc74217ab7ab6dc3c318df8dc115bf8a5f09ab24f3c650f01d664b85e9edb90b2515f4f4d413fe2c0663a3ec4714df1b"; + sha512 = "fdde429df1c1328f33fe42e5392cb2322350b508deca1467cc14d4f896a32cbc093b43c33e945ddd9199c146ce16676907e2eb458a981618e0871f54124716ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/mr/firefox-57.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "8ea055ece43abe41c21b726df13587f86987b6a836055fc3bc525adc04e5d360db2e3b5104587546f3192868cc10b02fdf08540644e1d5ccc03e963920220286"; + sha512 = "874b37e2d93870bbf3ef47e8f70bb881e5ed1b0516c266535e627197ae6f2013a63b3405b673c695973097197596572736dfa97e6e913308e619e4b899c8c516"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ms/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ms/firefox-57.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b3da22c39ba71e28fe6c5f36cf5b99d63014e68f5a1cae4dfe94846393321a15188358e4cda263f4fab2c2c578c78739e3338345d2e7b761286836db435df868"; + sha512 = "f510ae946e97f23ae278da12e67aa293741d145680ae084fa0ec00d02945939b354003e8e08f32929603ba9dd9c54109b2fda957e6d8b20af3e04774e0eecd3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/my/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/my/firefox-57.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "4ad4201d56fcacd6c238a3b60a36238cf5c635f7fa601ab4342516e7860e2966b449113632c9b1047f1721d31e211a67987bc2ef5a439db9cc09ab437afff2ce"; + sha512 = "c107591dbc83704aec6945ce3758c4c3ce809cbb2c4c1a9ad6ce7efce5f2da5fd1226599a083f0008f597bd108e146bebcd1f2fb5be89b078b7bde07c2391e4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nb-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/nb-NO/firefox-57.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "f167d00296e36ea498df7b331a48161d613cc395c16cd63b83580933a776829cf492213158c22eec1e6df9f2dd1a811ced289046ba404e40230bef5ca28bd4b5"; + sha512 = "18b0e51c9c7ea25dbfd083acf5e0b5220866c0becdfa968e9ee4bd5a431e90db48b61b7e11f1b8854812bbd1ca1e089445a1790d3888295f3d8e3fbce21f205c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/nl/firefox-57.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b53257382aa247d4b6745b0abfbc25c1c015f2c770f5ff2bb619e208ccbc4b499d2a60c9b9ce5d345dd65517a41f6cc4041d948ec8af5a43ebef417efeb91505"; + sha512 = "1032fe9f7fab5bcd8358eb7862722c2201654a8bf2f30e6b050771a15a5b5db6d183cd8d467107f6e855943f1e85113d3b8ef8c8db38b41b2445e74230ec4d0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nn-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/nn-NO/firefox-57.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b7b50ef1127a07a4bf7aaf3c5e3eb2621c502e660528841dc92c4a937b78aea003fd6eba763374990563a63774e0041893ef952f02a387b4c2916b5a3c18fcc7"; + sha512 = "448c8bce480ea9893b73f92d4151b30e76a3896044121d4f65bae554aec7f945f6498c97bbd458657a2093a16858f7c889da40761e99ed9b3de2edb83bf6bb29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/or/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/or/firefox-57.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ba55767451edc408b92d21fc74133a13151c5f1faa532dba0bb27d8ed79f73aebbd76c3acddd2b689023b649665f4b70f72a9495805ffa8de888bb35c1898e78"; + sha512 = "530ffadeba0627ed67af234b282c670c52f8dfee77ba6b43f86e97409d67dee0cc1895ddb8b94c076de8280bba1931427064b5a6f3d9e43892e009fa52dd4070"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pa-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pa-IN/firefox-57.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "97babdc8ea4541d2a2fe07b0c258d636329a03643ff411c1ed752ec949946b6459f7fd21ddd2a688653f788e30fc166c381dbfef238c0437ce276a0fca80323e"; + sha512 = "bb66b9942c6ec1132b70eb54da3b4d9b918cf44e55e6099571c7df4bfcb670a89c4dd5059cc8402002234bd075643a6d6078a1d8b668a5bac28db3f23e6b388e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pl/firefox-57.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "733b22d43c15bc0eba1918a3177654b0742d480bb8891f3ed817c7dcc70e084feb505b6b1c12fed103b73136a74138771fb3a23a0018786cd4cf16f9b745c281"; + sha512 = "146afe4d60e53b7da1f02588f9a6e3b2f6b5d8df81b7a9c857a9d071874dec633b59d7a14dfd2f4a82d9be2eaf1999b4ded98c326add899bbcf825b2c660b9ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pt-BR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pt-BR/firefox-57.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fff3d62b5d85448f8ae5ad30deff720912a5d8efa5838d908a68d97b3bce84164df57f387068b0e10b51469c5bbec9cbb1602279d0937f6cd211072a1222c8a8"; + sha512 = "b24382c3a8badbae0d2b1c4814a3247c66031ed8a9044979dc59117b7d2bff99d08cfaa238b6ab470d34a5625723dde668beca6dce7601e7184bc3afc7d07050"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pt-PT/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pt-PT/firefox-57.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "c49d00cf50d5e6cc8c46e43aa2ef7879c7cdd92783a6834fce58450c8c93553062af060995a2fa8d3e9b5c288fed3522704213d482b60014091569bf12815f81"; + sha512 = "bdbb14b3bd0bcee1182454b54f1c6193e282b3317e715dbe0e1c5314789aefaca248615c1061582e0b3b901173250926e0eababeb4a640865f00dbeafb40e9df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/rm/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/rm/firefox-57.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5a5e383a1e8f95f938b12ae6509076c595709c737a02f8ca40838e638ecc79112aa25c9277086d13c6d7a00d6bc316c809273c8157cf7970c8b4481c5fd7ca4a"; + sha512 = "84820d377d569c7bc55060b9c1c17f7a2b37f2ee7b079f76515d2b66cb5bd4860a96f840393a75c01e30a21350ffff22c8c00195c341778188be53c5f0f05828"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ro/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ro/firefox-57.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "48392338e19fe9bd0b0094b0247e9d9272fc6ca518e1fadfe628e9607d2e1aa2db9e11895fc835dd4cc1bb6e196960afe601354a24885a3ddeef211f2632af04"; + sha512 = "1b00c3f902993a10f764a258c3317c55fa8fb1461a5d88fca8fc24538dc6ccf9e87026410f196900bf2f4d58b2baa725f3c9257d800040b750eb99b7a080e433"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ru/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ru/firefox-57.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "6543a2002291a87f91d224d223a8f292da4f8137b5916db7bb6d2182fbc23b3047133d3cce311275938317bc85ca992d3158d845797509ebdb765c4db76a5324"; + sha512 = "24b28fbf5031c87ac9051208e931f712fb1edc22edcaf632e7e42e79fcc93a7e75fd336497eeb3ecc1049b0088f75a28f4671f94308feabdf6cefa01490fd26b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/si/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/si/firefox-57.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "1aa8bb875f28bbb99c8ba228485e612f8eb2d449d6518cb88268ae8cf31b572762353a210ad532ac9328bc5266b2710946aebbc39070ed98df633ad5b15ee589"; + sha512 = "946a782caa0da5897cdb776b8256b7c1bca6084b73e27075046232e2361e2a402decbafff916ce1196bf12d4ddde73dee4c32bf9fc3af28b6294f7079e744e47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sk/firefox-57.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "ef926b5a984d0f2027cebb405fd48486f1a79595f16f26f74a2f13083453ce5b94e5b123c959101e8b63a9af558f816a2af806cc9f2c87b9f2c3278369e52411"; + sha512 = "a61de035d6c3fbd5d2765f66e3cc0b43b55ec570f841fab19ce28949f68121ffa578db01b89c707e62558dd34e4633de03dd5d9050d805a50e2e22ba2d6cbb06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sl/firefox-57.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "1447deb0e0d97e1a06d795cf66c604301b0c88fb248e96dcee23ffe6954effe11c12bb41706728c4b69f0f807b9f8e7aba6c9535b779a701ce41fbf26cd6a3c5"; + sha512 = "edfc9a836efd8b1a168f1950e47f26c5eb22d7c3e7faf8c6411171271cc0c6c1b7efdc107aeb154b03506ee6997c7805a9f40cc3bb7953a42b952e803988a2c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/son/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/son/firefox-57.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "94c4c28b782268f37601188013957d95fda818d56b242bcd9d4575a787f4aca057c5970bafeebd31a6f31dfc72dd48c07b50fcc20d70ed9926e280b23661ec84"; + sha512 = "e13065f25c6212a9f46cec484c4b532e7c8d7e2985b61f00985a6c03d4f579c057332a889280a07f04a8a73010ac9b07214494913f9dbaf23668d5282f1f37c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sq/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sq/firefox-57.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "7fb22a303bb016c37322bbbc3d4170b96d54cdac6e1ce61e48dabd868800b01009263ad69052d919823eb2c104ca41ebadebd00808c581c7eebbd3e82e2ff810"; + sha512 = "fb4820cb33efb10211507ff61caedd569fda0d8c59a49de61bd3c6bc1546865084daa0c477ea1b213c6089eea5508b5e11610df81411b5bbccdd10760ba46daa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sr/firefox-57.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "991f3c6aeb48db23a4a569a5f51f22aebaa60b5ed6da149818c2a01dd40256eaebecc738e8623d3662ee9633e04581c4c4033461ac23694f81360e980b2ab406"; + sha512 = "898ca5ad052760db2f4115c7215107ff77295ff56a33e7b9141a491a6a228be88f9c94cf7dab6938c886137ea3aad6e2e4b01db87122c4c05830bdd6a75fc05d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sv-SE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sv-SE/firefox-57.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "381667c64722d04fb102d3d1deee0c13805d4271adb801b5176b9fe842c3916a4ae926dc56256552cc309729e5a0a16d82188b79210c4901e8c4f6d4e2930260"; + sha512 = "55c6e54b316f4649e99d305bae059ca844ee48052ce4e89aac75fb850a0f5e255fdc1654fabff7d3fa1de88092f940f3c77f7c142096a76184a0bed668cd254f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ta/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ta/firefox-57.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "099d94a7f35bb7a6c59e34c0ea500ca4f98a473ee52b3e33e10a085693d09ad0904c4dff4097b0d80cfd43f31cf9e05e300c40482aaecb83ee59d6fdb21d20fb"; + sha512 = "b90c2da5176a07a25521ad510cd77da9171e57608517c89c5a056294fc5237a967355d66979840672bdafe62324405db0da7dd4d6f25ab7b28b37f44f737a5d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/te/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/te/firefox-57.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "506c2538ed1a421631f9492894941ecd022ac3f085673c1447bac8f7c52c7dbe91854ff76efc7964f875444fdb83b54bbabf5c96f217cac6f61107af3ec65545"; + sha512 = "86dc71e9df0524ee3219b614154373a473a54f1132ca5c3997125f28cfb3db2710f630a4d614ddfb0765eb58292d33ee328abdbcc8fd8485f79501f68fcb52cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/th/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/th/firefox-57.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "61ee3a8271478647e2d957e5a8304d88a68438043f6ffdb006c5935700856f7fb16d9ffe65785fde03926743c4c5713bde934383887d81d7e684ae6da14e8776"; + sha512 = "f1a8fdbe928fefb9c7118c3066521cac4dc45819423c687b12576003db9aa318df5a818ed5c56842b3855009974d3fe7a208493614607771813bca29e655be73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/tr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/tr/firefox-57.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2204991ea8ff6f06bf9a4aa9de2f395fc7cb88fcbb837476c5dbe2556cfcbcf361934f840b293e09d11e33427d22cd8fec44821779ee671a19e0aa577d9bb2cb"; + sha512 = "1611f4fc7e935d7e5fe8fe7ec08e7dfce1fc9cc82814d39077d7c4a32913dbaa6307131833da8665bc8c01b248c437f826e10fdf2db8859ce788f39fd4c20d6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/uk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/uk/firefox-57.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "d550a3637e8a135b750e0932be53b40adcd2b17073a08dee6d02357b679a088d04f8ca1ddee41cd6370da2d611fe4981a70b2f38caf7e8a5bf1145ce94923307"; + sha512 = "271f54090f7e31dc84c4b8298e4db752a12d3eef7b267aac9ec1ed9958baa78cc6178395ff54306b548163acd5428077423ce0cfa5c69449029cb026aa2a8dc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ur/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ur/firefox-57.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "606f376a7fbfce145cc911fa126b3c4bf7d67d5eda3ad6b82b846e6580b2bdaeed7b2ef4a72d5175a1fb7f5f3327b24d028186ce409d82d5b33f2bdc6bbff336"; + sha512 = "51fa2ee142181727c92fac9044068d28cba20e9c88a1bdac27f2a3b58139ed826a73d7b5a3fff23a0228b964f497e0aec3512a809222fffeec0dce6fa06e4e8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/uz/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/uz/firefox-57.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "aa13daf900c1f1557c3c481bf3bfd0eaed7af46b6a1e9c42da6c1c2be160882a02be9eaf62ada680a1f1124e4afff032c4d50057564cc5b2a5b8985039cbb260"; + sha512 = "324696a348ae491f9b3d51a3880a6dec8e78017ac38b613b8c4d405cc7e4a91dcae4191701be821a693eca4d7726b841a0cd8d9e8163a09a5db754896b6526cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/vi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/vi/firefox-57.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "faa306348b89a9434a3a9068a3a128a9583ebbe647a9d22e5ef9d9b581efee8520f6f76b7590d27d0347c2db34f3d35770f2bdea5c1b6ba73f2c849f228212bc"; + sha512 = "c118e1695938881be2f7c4dfe34273fcd5d8cd6bfa300758de67b220d0f77c8e2d669af8805717dd5ff42ee37e35e3997a37f023361301816243434fe3930a5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/xh/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/xh/firefox-57.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b15a5f62c4dab9e44c620b18d23879886f13807ce8d0008fec028d40f652ba11c75c13cf6f86dbe044afc855d24694872d1ff5502cc82dbc31b75454321a755b"; + sha512 = "44ae616c12b08e2a962944af56ad5ff5845dd44f67cbd634451b3ad5bfb254e91b02b4b73b3d131d88ab0ed7240458312187e1744b4409e6b8012a0bbc809eb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/zh-CN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/zh-CN/firefox-57.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "92deabe9058262a81c465b370b128b08872dabd87b527dc524ff3035d2b5068d40f15705449f5fac8df2e1ca291b91af795844154cb7ee37d5d620f952b7d4a2"; + sha512 = "0f39b59fadc0a1ffb5a34dc99db1b6f0c4cb4b3f839a36643d8ca0fa7eaffbb8e638f9f95f5fdcaee09671c6a28f4fdc14e7123aaf8de51dbe3ad2a69cd83a5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/zh-TW/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/zh-TW/firefox-57.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "dd7266ba6bda17fd0194edd2855f1e1484758182a1c5c4ce14cabb046af31b277b2b385b47f6b368c6ba9840a3138416a0a787494cf7382827ff9bcb39b23655"; + sha512 = "57ebfa7473bed8bac3682f74ef66a1235c9be500c5048ecebaf56bd97513bed69a38c69f098296133f842f1243fb46a845816b56ee637764155eb9e36cb59b3d"; } ]; } From 8efe90a3f45d0b3be2fa266c51875c1fd1dc0998 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 13 Oct 2017 11:05:25 -0400 Subject: [PATCH 1097/2806] nixUnstable: bump --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 21dffd539cd..ac697be555a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5639_fda7b95c"; + suffix = "pre5650_1dd29d7a"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "fda7b95cb08c447a7ee4ec18ea3574d76e6264df"; - sha256 = "1ynrhxc21s7i9hl13bb6ajzf8ypr10j2kzq5vmcamncf5aq0s9q8"; + rev = "1dd29d7aebae706f3e90a18bbfae727f2ed03c70"; + sha256 = "182v2rczm8al1ggbaca8qapvrjyp21li1fd3fiwr5nqgazgr5308"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; From 7a86e4cf0d15cd33cd742b1e15b329367ed8362d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 13 Oct 2017 23:29:20 +0800 Subject: [PATCH 1098/2806] cryfs: Enable tests --- pkgs/tools/filesystems/cryfs/default.nix | 25 +++++++++++++- .../skip-failing-test-large-malloc.patch | 34 +++++++++++++++++++ .../filesystems/cryfs/test-no-network.patch | 24 +++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch create mode 100644 pkgs/tools/filesystems/cryfs/test-no-network.patch diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 5d5d23d4ed3..0469ad54eb1 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { buildInputs = [ boost cryptopp curl fuse openssl python spdlog ]; + patches = [ + ./test-no-network.patch # Disable tests using external networking + ./skip-failing-test-large-malloc.patch + ]; + # coreutils is needed for the vendored scrypt nativeBuildInputs = [ cmake coreutils pkgconfig ]; @@ -43,9 +48,27 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCRYFS_UPDATE_CHECKS=OFF" "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive - "-DBUILD_TESTING=OFF" + "-DBUILD_TESTING=ON" ]; + doCheck = true; + + # Cryfs tests are broken on darwin + checkPhase = stdenv.lib.optionalString (!stdenv.isDarwin) '' + # Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing) + SKIP_IMPURE_TESTS="CMakeFiles|fspp|cryfs-cli" + + for test in `ls -d test/*/ | egrep -v "$SKIP_IMPURE_TESTS"`; do + "./$test`basename $test`-test" + done + ''; + + installPhase = '' + # Building with BUILD_TESTING=ON is missing the install target + mkdir -p $out/bin + install -m 755 ./src/cryfs-cli/cryfs $out/bin/cryfs + ''; + meta = with stdenv.lib; { description = "Cryptographic filesystem for the cloud"; homepage = https://www.cryfs.org; diff --git a/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch b/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch new file mode 100644 index 00000000000..feb0ed9cfbb --- /dev/null +++ b/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch @@ -0,0 +1,34 @@ +From ad3f7e9fa2dececfaab43963887a2f03de52d659 Mon Sep 17 00:00:00 2001 +From: adisbladis +Date: Thu, 12 Oct 2017 21:45:26 +0800 +Subject: [PATCH] Skip failing test: large malloc + +--- + test/cpp-utils/data/DataTest.cpp | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/test/cpp-utils/data/DataTest.cpp b/test/cpp-utils/data/DataTest.cpp +index 6f9df070..bd426e62 100644 +--- a/test/cpp-utils/data/DataTest.cpp ++++ b/test/cpp-utils/data/DataTest.cpp +@@ -191,17 +191,6 @@ TEST_F(DataTest, Inequality_DifferentLastByte) { + EXPECT_TRUE(data1 != data2); + } + +-#ifdef __x86_64__ +-TEST_F(DataTest, LargesizeSize) { +- //Needs 64bit for representation. This value isn't in the size param list, because the list is also used for read/write checks. +- uint64_t size = 4.5L*1024*1024*1024; +- Data data(size); +- EXPECT_EQ(size, data.size()); +-} +-#else +-#warning This is not a 64bit architecture. Large size data tests are disabled. +-#endif +- + TEST_F(DataTest, LoadingNonexistingFile) { + TempFile file(false); // Pass false to constructor, so the tempfile is not created + EXPECT_FALSE(Data::LoadFromFile(file.path())); +-- +2.14.2 + diff --git a/pkgs/tools/filesystems/cryfs/test-no-network.patch b/pkgs/tools/filesystems/cryfs/test-no-network.patch new file mode 100644 index 00000000000..3392d3f855e --- /dev/null +++ b/pkgs/tools/filesystems/cryfs/test-no-network.patch @@ -0,0 +1,24 @@ +From 8b1808e1278d2cb0dc56a4e98781eceeadfb9718 Mon Sep 17 00:00:00 2001 +From: adisbladis +Date: Thu, 12 Oct 2017 18:13:28 +0800 +Subject: [PATCH] Disable tests using external networking + +--- + test/cpp-utils/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/test/cpp-utils/CMakeLists.txt b/test/cpp-utils/CMakeLists.txt +index 5a2bc9f8..d838edba 100644 +--- a/test/cpp-utils/CMakeLists.txt ++++ b/test/cpp-utils/CMakeLists.txt +@@ -20,7 +20,6 @@ set(SOURCES + tempfile/TempFileIncludeTest.cpp + tempfile/TempDirIncludeTest.cpp + tempfile/TempDirTest.cpp +- network/CurlHttpClientTest.cpp + network/FakeHttpClientTest.cpp + io/ConsoleIncludeTest.cpp + io/ConsoleTest_AskYesNo.cpp +-- +2.14.2 + From 06fc476bc6f23426b0d62864f3fa01d400e57445 Mon Sep 17 00:00:00 2001 From: Eisfreak7 Date: Fri, 13 Oct 2017 12:15:19 -0500 Subject: [PATCH 1099/2806] qutebrowser: 0.11 -> 1.0.1 (#30365) * qutebrowser: 0.11 -> 1.0 This updates has a few breaking changes, most importantly WebEngine is now enabled by default and the configuration system was completely changed (requiring uers to manually migrate their configuration). More info: https://blog.qutebrowser.org/qutebrowser-v100-released.html * qutebrowser: 1.0.0 -> 1.0.1 --- .../browsers/qutebrowser/default.nix | 24 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 025e4522f06..a94b0973949 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,10 +2,13 @@ , qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav -, qtwebkit-plugins -, withWebEngineDefault ? false +, qtwebkit-plugins ? null +, attrs +, withWebEngineDefault ? true }: +assert (! withWebEngineDefault) -> qtwebkit-plugins != null; + let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; @@ -26,29 +29,30 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "0.11.0"; + version = "1.0.1"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv"; + sha256 = "1gphn8a0xfy5iqiznvgd6fbbzp7r5sp697ayfwnvllvmbr5az9vs"; }; # Needs tox doCheck = false; buildInputs = [ - qtbase qtwebkit-plugins + qtbase gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav glib_networking - ]; + ] + ++ lib.optional (! withWebEngineDefault) qtwebkit-plugins; nativeBuildInputs = [ makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; propagatedBuildInputs = [ - pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl + pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs ]; postPatch = '' @@ -62,7 +66,7 @@ in buildPythonApplication rec { postInstall = '' install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" - install -Dm644 qutebrowser.desktop \ + install -Dm644 misc/qutebrowser.desktop \ "$out/share/applications/qutebrowser.desktop" for i in 16 24 32 48 64 128 256 512; do install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \ @@ -73,8 +77,8 @@ in buildPythonApplication rec { install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* ''; - postFixup = lib.optionalString withWebEngineDefault '' - wrapProgram $out/bin/qutebrowser --add-flags "--backend webengine" + postFixup = lib.optionalString (! withWebEngineDefault) '' + wrapProgram $out/bin/qutebrowser --add-flags "--backend webkit" ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a53de95c82..86998d80eb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16190,7 +16190,7 @@ with pkgs; falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl; + inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl attrs; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; From a678696e40e6fe71eb4257af43081427dd41818a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 13 Oct 2017 19:33:18 +0200 Subject: [PATCH 1100/2806] neomutt: 20170912 -> 20171013 --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index e18d95dc122..8ada01d58f7 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - version = "20170912"; + version = "20171013"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0qndszmaihly3pp2wqiqm31nxbv9ys3j05kzffaqhzngfilmar9g"; + sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1"; }; nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ]; From cdd3b97d158acaaaf7f92e215cddb51ed3962adb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 13 Oct 2017 16:46:21 +0000 Subject: [PATCH 1101/2806] camlp4: init at 4.06+1 --- pkgs/development/tools/ocaml/camlp4/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 8babfe415df..99bf7400088 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -13,6 +13,9 @@ let param = { "4.05" = { version = "4.05+1"; sha256 = "0wm795hpwvwpib9c9z6p8kw2fh7p7b2hml6g15z8zry3y7w738sv"; }; + "4.06" = { + version = "4.06+1"; + sha256 = "0fazfw2l7wdmbwnqc22xby5n4ri1wz27lw9pfzhsbcdrighykysf"; }; }."${ocaml.meta.branch}"; in From acee0f9bea601733b0fb7ec8aeec8de82d38a284 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 13 Oct 2017 20:15:13 +0100 Subject: [PATCH 1102/2806] android-udev-rules: 20170612 -> 20171014 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 562a46d2210..b8b08430de8 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20170612"; + version = "20171014"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "14x22d00zby6wsjaccyh7n8jq1mqzwpx49s85mhmaahbrfd5jwnw"; + sha256 = "15mqngwv7x2xpdsaiga33lb0s9hcrhnambcv9fp6jvgkf6604cdr"; }; installPhase = '' From 8342c04c9a5d0a197d8acf72d1b665f17cff93e6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 13 Oct 2017 12:23:19 -0500 Subject: [PATCH 1103/2806] =?UTF-8?q?nix-bundle:=200.1.2=20=E2=86=92=200.2?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/package-management/nix-bundle/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix index e3255afe7fe..7c02d2d9a63 100644 --- a/pkgs/tools/package-management/nix-bundle/default.nix +++ b/pkgs/tools/package-management/nix-bundle/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nix-bundle"; name = "${pname}-${version}"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "matthewbauer"; repo = pname; rev = "v${version}"; - sha256 = "15r77pchf4s4cdv4lvw2zw1yic78k8p0n2r954qq370vscw30yac"; + sha256 = "0klabmygbhzlwxja8p2w8fp8ip3xaa5ym9c15rp9qxzh03hfmdjx"; }; # coreutils, gnutar is actually needed by nix for bootstrap @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper $out/share/nix-bundle/nix-bundle.sh $out/bin/nix-bundle \ --prefix PATH : ${binPath} + cp $out/share/nix-bundle/nix-run.sh $out/bin/nix-run ''; meta = with lib; { From 52bedcb14b303a3f5550950cdf8f7d8281b9ea10 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Wed, 11 Oct 2017 21:52:07 +0200 Subject: [PATCH 1104/2806] pgadmin3: 1.22.1 -> 1.22.2 Also include Debian patch https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344 which fixes segfault at start --- pkgs/applications/misc/pgadmin/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 15313befb62..889f516f00b 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,23 +1,32 @@ -{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: +{ stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: stdenv.mkDerivation rec { name = "pgadmin3-${version}"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz"; - sha256 = "0gkqpj8cg6jd6yhssrij1cbh960rg9fkjbdzcpryi6axwv0ag7ki"; + url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; + sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v"; }; enableParallelBuilding = true; buildInputs = [ postgresql wxGTK openssl zlib ]; + patches = [ + (fetchpatch { + sha256 = "09hp7s3zjz80rpx2j3xyznwswwfxzi70z7c05dzrdk74mqjjpkfk"; + name = "843344.patch"; + url = "https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344"; + }) + ]; + preConfigure = '' substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell" ''; configureFlags = [ + "--with-pgsql=${postgresql}" "--with-libxml2=${libxml2.dev}" "--with-libxslt=${libxslt.dev}" ]; From c46fa38c90af96bfd4ffda6091f538022f5ee7bf Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 14 Oct 2017 00:22:12 +0200 Subject: [PATCH 1105/2806] gummi: init at 0.6.6 (#30398) * gummi: init at 0.6.6 * gummi: cleanup --- pkgs/applications/misc/gummi/default.nix | 41 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/gummi/default.nix diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix new file mode 100644 index 00000000000..5fdb8985bbb --- /dev/null +++ b/pkgs/applications/misc/gummi/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, pkgs, makeWrapper +, glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler +, pkgconfig, intltool, autoreconfHook, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + version = "0.6.6"; + name = "gummi-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "alexandervdm"; + repo = "gummi"; + rev = "${version}"; + sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn"; + }; + + nativeBuildInputs = [ + pkgconfig intltool autoreconfHook makeWrapper wrapGAppsHook + ]; + buildInputs = [ + glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler + gnome3.defaultIconTheme + ]; + + preConfigure = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${pkgs.gnome2.gtksourceview}/share") + ''; + + postInstall = '' + install -Dpm644 COPYING $out/share/licenses/$name/COPYING + ''; + + meta = { + homepage = http://gummi.midnightcoding.org/; + description = "Simple LaTex editor for GTK users"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ flokli ]; + platforms = with stdenv.lib.platforms; linux; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0f1b45d325..82b53964f13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19052,6 +19052,8 @@ with pkgs; guetzli = callPackage ../applications/graphics/guetzli { }; + gummi = callPackage ../applications/misc/gummi { }; + gxemul = callPackage ../misc/emulators/gxemul { }; hatari = callPackage ../misc/emulators/hatari { }; From 65b73d71cbe5df15ce62024123eedea284d825db Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 6 Oct 2016 14:37:38 +0800 Subject: [PATCH 1106/2806] ssh: deprecate use of old DSA keys They are not safe and shouldn't be used. --- nixos/modules/services/networking/ssh/sshd.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 8828429a817..0834fc67284 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -363,12 +363,9 @@ in HostKey ${k.path} '')} - # Allow DSA client keys for now. (These were deprecated - # in OpenSSH 7.0.) - PubkeyAcceptedKeyTypes +ssh-dss - - # Re-enable DSA host keys for now. ${optionalString supportOldHostKeys '' + # Allow DSA keys for now. (deprecated in OpenSSH 7.0) + PubkeyAcceptedKeyTypes +ssh-dss HostKeyAlgorithms +ssh-dss ''} ''; From 1917e69b546bc357652a3fd888c064e2a1c9fed8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 11 Oct 2017 23:13:37 +0800 Subject: [PATCH 1107/2806] dnsmasq nixos: make sure it always runs By default we only restart if the dnsmasq daemon fails but we introduce an option to always keep it running. --- nixos/modules/services/networking/dnsmasq.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index fcf5aa5f175..91a3e54474a 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -55,6 +55,14 @@ in ''; }; + alwaysKeepRunning = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, systemd will always respawn dnsmasq even if shut down manually. The default, disabled, will only restart it on error. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -101,10 +109,12 @@ in BusName = "uk.org.thekelleys.dnsmasq"; ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + PrivateTmp = true; + ProtectSystem = true; + ProtectHome = true; + Restart = if cfg.alwaysKeepRunning then "always" else "on-failure"; }; restartTriggers = [ config.environment.etc.hosts.source ]; }; - }; - } From 41306ca50580d66591058211676c463fcb30a2fd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 12 Feb 2017 23:04:01 +0800 Subject: [PATCH 1108/2806] smartd: set drive timeout --- nixos/modules/services/monitoring/smartd.nix | 31 ++++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 4d10299a987..5dcd99a1e71 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -81,13 +81,32 @@ let description = "Options that determine how smartd monitors the device."; }; + timeout = mkOption { + default = -1; + example = "70"; + type = types.int; + description = '' + Set SCT Error Recovery Control timeout in deciseconds for use in raid configurations. + + Values are as follows: + -1 = do not touch, leave at default + 0 = disable SCT ERT + 70 = default in consumer drives (7 seconds) + + Maximum is disk dependant but probably 60 seconds. + ''; + }; + }; }; -in + deviceTimeout = d: + lib.optionalString (d.timeout > -1) '' + ${pkgs.smartmontools}/bin/smartctl -l scterc,${d.timeout},${d.timeout} --silent errorsonly ${d.device} + ''; -{ +in { ###### interface options = { @@ -222,7 +241,13 @@ in path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd - serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork --configfile=${smartdConf}"; + serviceConfig = { + ExecStartPre = '' + ${concatMapStringsSep "\n" deviceTimeout cfg.devices} + ''; + ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork --configfile=${smartdConf}"; + }; + }; }; From 51f1c635e679fdadead32e5aec464b28c254d099 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 7 Apr 2017 17:40:04 +0800 Subject: [PATCH 1109/2806] hyperv-daemons: init at current linux kernel version --- .../linux/hyperv-daemons/default.nix | 109 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 111 insertions(+) create mode 100644 pkgs/os-specific/linux/hyperv-daemons/default.nix diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix new file mode 100644 index 00000000000..91b3c25bd31 --- /dev/null +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -0,0 +1,109 @@ +{ stdenv, lib, python, kernel, makeWrapper, writeText }: + +let + daemons = stdenv.mkDerivation rec { + name = "hyperv-daemons-bin-${version}"; + inherit (kernel) src version; + + nativeBuildInputs = [ makeWrapper ]; + + # as of 4.9 compilation will fail due to -Werror=format-security + hardeningDisable = [ "format" ]; + + preConfigure = '' + cd tools/hv + ''; + + installPhase = '' + runHook preInstall + + for f in fcopy kvp vss ; do + install -Dm755 hv_''${f}_daemon -t $out/bin + done + + install -Dm755 hv_get_dns_info.sh lsvmbus -t $out/bin + + # I don't know why this isn't being handled automatically by fixupPhase + substituteInPlace $out/bin/lsvmbus \ + --replace '/usr/bin/env python' ${python.interpreter} + + runHook postInstall + ''; + + postFixup = '' + # kvp needs to be able to find the script(s) + wrapProgram $out/bin/hv_kvp_daemon --prefix PATH : $out/bin + ''; + }; + + service = bin: title: check: + writeText "hv-${bin}.service" '' + [Unit] + Description=Hyper-V ${title} daemon + ConditionVirtualization=microsoft + ${lib.optionalString (check != "") '' + ConditionPathExists=/dev/vmbus/${check} + ''} + [Service] + ExecStart=@out@/hv_${bin}_daemon -n + Restart=on-failure + PrivateTmp=true + Slice=hyperv.slice + + [Install] + WantedBy=hyperv-daemons.target + ''; + +in stdenv.mkDerivation rec { + name = "hyperv-daemons-${version}"; + + inherit (kernel) version; + + # we just stick the bins into out as well as it requires "out" + outputs = [ "bin" "lib" "out" ]; + + phases = [ "installPhase" ]; + + buildInputs = [ daemons ]; + + installPhase = '' + system=$lib/lib/systemd/system + + mkdir -p $system + + cp ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service + cp ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service + cp ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service + + cat > $system/hyperv-daemons.target < Date: Fri, 7 Apr 2017 17:40:17 +0800 Subject: [PATCH 1110/2806] hyperv-daemons: add nixos module --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/hyperv-guest.nix | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 nixos/modules/virtualisation/hyperv-guest.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a8cb957ffe2..9cc3d73d295 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -724,6 +724,7 @@ ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix ./virtualisation/amazon-options.nix + ./virtualisation/hyperv-guest.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/rkt.nix diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix new file mode 100644 index 00000000000..ecd2a811771 --- /dev/null +++ b/nixos/modules/virtualisation/hyperv-guest.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.hypervGuest; + +in { + options = { + virtualisation.hypervGuest = { + enable = mkEnableOption "Hyper-V Guest Support"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ config.boot.kernelPackages.hyperv-daemons.bin ]; + + security.rngd.enable = false; + + # enable hotadding memory + services.udev.packages = lib.singleton (pkgs.writeTextFile { + name = "hyperv-memory-hotadd-udev-rules"; + destination = "/etc/udev/rules.d/99-hyperv-memory-hotadd.rules"; + text = '' + ACTION="add", SUBSYSTEM=="memory", ATTR{state}="online" + ''; + }); + + systemd = { + packages = [ config.boot.kernelPackages.hyperv-daemons.lib ]; + + targets.hyperv-daemons = { + wantedBy = [ "multi-user.target" ]; + }; + }; + }; +} From 8758f476b36e1d98ad2c854889c642ad6d86c505 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 14 Apr 2017 11:10:33 +0800 Subject: [PATCH 1111/2806] networking: add option to toggle the wait-online service --- nixos/modules/config/networking.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 619f36cd515..5f42ec51703 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -186,6 +186,15 @@ in ''; }; }; + networking.waitForOnline = lib.mkOption { + type = types.bool; + default = true; + description = '' + When bringing up the network, always wait for it to be online before continuing. + + This is currently only implemented for networkd. + ''; + }; }; config = { From 8f21e089a8de9eaa2512af25191d17077eca223a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 14 Apr 2017 11:10:49 +0800 Subject: [PATCH 1112/2806] networkd: only wait for network to be online if configured to do so --- nixos/modules/system/boot/networkd.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 9d2cea3ad16..85e5aa478f1 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -8,6 +8,8 @@ let cfg = config.systemd.network; + waitOnline = config.networking.waitForOnline; + checkLink = checkUnitConfig "Link" [ (assertOnlyFields [ "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name" @@ -699,9 +701,9 @@ in config = mkIf config.systemd.network.enable { systemd.additionalUpstreamSystemUnits = [ - "systemd-networkd.service" "systemd-networkd-wait-online.service" "org.freedesktop.network1.busname" - ]; + "systemd-networkd.service" + ] ++ optional waitOnline "systemd-networkd-wait-online.service"; systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs @@ -714,11 +716,11 @@ in restartTriggers = map (f: f.source) (unitFiles); }; - systemd.services.systemd-networkd-wait-online = { + systemd.services.systemd-networkd-wait-online = lib.mkIf waitOnline { wantedBy = [ "network-online.target" ]; }; - systemd.services."systemd-network-wait-online@" = { + systemd.services."systemd-network-wait-online@" = lib.mkIf waitOnline { description = "Wait for Network Interface %I to be Configured"; conflicts = [ "shutdown.target" ]; requisite = [ "systemd-networkd.service" ]; From 35711638587a5079b1fcb6354a71d9b8203cd6e1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 28 Apr 2017 14:25:52 +0800 Subject: [PATCH 1113/2806] display-manager: systemd-udev-settle serves no purpose --- nixos/modules/services/x11/xserver.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index d4fe475690c..394078e7088 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -603,8 +603,7 @@ in systemd.services.display-manager = { description = "X11 Server"; - after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ]; - wants = [ "systemd-udev-settle.service" ]; + after = [ "acpid.service" "systemd-logind.service" ]; restartIfChanged = false; From 69d8b81b4ba613dbf59850b8f32e2d7ddeb133be Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 28 Sep 2017 14:05:09 +0800 Subject: [PATCH 1114/2806] sshguard: make it run --- nixos/modules/services/security/sshguard.nix | 70 +++++++++----------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 5a183443f71..c36ab405f9b 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -87,54 +87,50 @@ in { config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.sshguard pkgs.iptables pkgs.ipset ]; - - environment.etc."sshguard.conf".text = let + environment.etc."sshguard.conf".text = let list_services = ( name: "-t ${name} "); in '' - BACKEND="${pkgs.sshguard}/libexec/sshg-fw-ipset" - LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl -afb -p info -n1 ${toString (map list_services cfg.services)} -o cat" + BACKEND="${lib.getBin pkgs.sshguard}/libexec/sshg-fw-ipset" + LOGREADER="LANG=C ${lib.getBin pkgs.systemd}/bin/journalctl -afb -p info -n1 ${toString (map list_services cfg.services)} -o cat" ''; - systemd.services.sshguard = - { description = "SSHGuard brute-force attacks protection system"; + systemd.services.sshguard = { + description = "SSHGuard brute-force attacks protection system"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - partOf = optional config.networking.firewall.enable "firewall.service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + partOf = optional config.networking.firewall.enable "firewall.service"; - path = [ pkgs.iptables pkgs.ipset pkgs.iproute pkgs.systemd ]; + path = with pkgs; [ iptables ipset iproute systemd ]; - postStart = '' - mkdir -p /var/lib/sshguard - ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:ip family inet - ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:ip family inet6 - ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP - ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP - ''; + postStart = '' + mkdir -p /var/lib/sshguard + ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:ip family inet + ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:ip family inet6 + ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP + ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP + ''; - preStop = '' - ${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP - ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP - ''; + preStop = '' + ${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP + ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP + ''; - unitConfig.Documentation = "man:sshguard(8)"; + unitConfig.Documentation = "man:sshguard(8)"; - serviceConfig = { - Type = "simple"; - ExecStart = let - list_whitelist = ( name: "-w ${name} "); - in '' - ${pkgs.sshguard}/bin/sshguard -a ${toString cfg.attack_threshold} ${optionalString (cfg.blacklist_threshold != null) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file} "}-i /run/sshguard/sshguard.pid -p ${toString cfg.blocktime} -s ${toString cfg.detection_time} ${toString (map list_whitelist cfg.whitelist)} + serviceConfig = { + Type = "simple"; + ExecStart = let + list_whitelist = ( name: "-w ${name} "); + in '' + ${pkgs.sshguard}/bin/sshguard -a ${toString cfg.attack_threshold} ${optionalString (cfg.blacklist_threshold != null) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file} "}-i /run/sshguard/sshguard.pid -p ${toString cfg.blocktime} -s ${toString cfg.detection_time} ${toString (map list_whitelist cfg.whitelist)} ''; - PIDFile = "/run/sshguard/sshguard.pid"; - Restart = "always"; - - ReadOnlyDirectories = "/"; - ReadWriteDirectories = "/run/sshguard /var/lib/sshguard"; - RuntimeDirectory = "sshguard"; - CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; - }; + Restart = "always"; + ProtectSystem = true; + PrivateTmp = true; + RuntimeDirectory = "sshguard"; + # CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; }; + }; }; } From 707c3ac43589c1b13c16aa834f67b8fb49b8557d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 26 Feb 2017 10:52:30 +0800 Subject: [PATCH 1115/2806] sensu: nixos module --- nixos/modules/module-list.nix | 1 + .../services/monitoring/sensu/checks.nix | 76 ++ .../services/monitoring/sensu/client.nix | 49 ++ .../services/monitoring/sensu/dashboard.nix | 112 +++ .../services/monitoring/sensu/default.nix | 710 ++++++++++++++++++ .../services/monitoring/sensu/handlers.nix | 70 ++ .../monitoring/sensu/host_port_pair.nix | 17 + .../services/monitoring/sensu/mutators.nix | 17 + .../services/monitoring/sensu/plugins.nix | 83 ++ .../services/monitoring/sensu/sites.nix | 59 ++ 10 files changed, 1194 insertions(+) create mode 100644 nixos/modules/services/monitoring/sensu/checks.nix create mode 100644 nixos/modules/services/monitoring/sensu/client.nix create mode 100644 nixos/modules/services/monitoring/sensu/dashboard.nix create mode 100644 nixos/modules/services/monitoring/sensu/default.nix create mode 100644 nixos/modules/services/monitoring/sensu/handlers.nix create mode 100644 nixos/modules/services/monitoring/sensu/host_port_pair.nix create mode 100644 nixos/modules/services/monitoring/sensu/mutators.nix create mode 100644 nixos/modules/services/monitoring/sensu/plugins.nix create mode 100644 nixos/modules/services/monitoring/sensu/sites.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9cc3d73d295..5e6b42dea54 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -379,6 +379,7 @@ ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix ./services/monitoring/scollector.nix + ./services/monitoring/sensu/default.nix ./services/monitoring/smartd.nix ./services/monitoring/statsd.nix ./services/monitoring/sysstat.nix diff --git a/nixos/modules/services/monitoring/sensu/checks.nix b/nixos/modules/services/monitoring/sensu/checks.nix new file mode 100644 index 00000000000..4343286177c --- /dev/null +++ b/nixos/modules/services/monitoring/sensu/checks.nix @@ -0,0 +1,76 @@ +{ lib }: + +{ + options = with lib; with types; { + type = mkOption { + type = enum [ "standard" "metric" ]; + default = "standard"; + description = "Type of check."; + }; + + standalone = mkOption { + type = bool; + default = false; + description = "Scheduled by the client instead of the server."; + }; + + command = mkOption { + type = str; + description = "Command to run."; + }; + + subscribers = mkOption { + type = listOf str; + default = []; + description = "Subscribers"; + }; + + handlers = mkOption { + default = []; + description = "Handlers."; + type = listOf str; + }; + + interval = mkOption { + type = int; + default = 60; + description = "Check interval."; + }; + + timeout = mkOption { + type = int; + default = 30; + description = "Check timeout."; + }; + + ttl = mkOption { + type = int; + default = 120; + description = "Check TTL."; + }; + + source = mkOption { + type = str; + default = ""; + description = "Custom source for JIT checks."; + }; + + occurrences = mkOption { + type = int; + default = 1; + description = "The number of occurrences before triggering an alert."; + }; + + subdue = mkOption { + type = attrs; + default = {}; + description = "Subdue check during certain windows."; + }; + + vars = mkOption { + type = attrs; + default = {}; + description = "Custom variables sent with the check."; + }; + }; +} diff --git a/nixos/modules/services/monitoring/sensu/client.nix b/nixos/modules/services/monitoring/sensu/client.nix new file mode 100644 index 00000000000..dc4c9864c09 --- /dev/null +++ b/nixos/modules/services/monitoring/sensu/client.nix @@ -0,0 +1,49 @@ +{ lib }: + +{ + options = with lib; with types; { + name = mkOption { + type = str; + default = ""; + description = "Name of the client."; + }; + + address = mkOption { + type = str; + default = ""; + description = "IP address"; + }; + + subscriptions = mkOption { + type = listOf str; + default = [ ]; + description = "Subscriptions"; + }; + + socket = mkOption { + description = "The socket configuration."; + default = {}; + type = submodule { + options = { + bind = mkOption { + type = str; + default = "127.0.0.1"; + description = "The IP address on which the client listens."; + }; + + port = mkOption { + type = int; + default = 3030; + description = "The port on which the client listens."; + }; + }; + }; + }; + + vars = mkOption { + type = attrs; + default = {}; + description = "Custom attributes/variables."; + }; + }; +} diff --git a/nixos/modules/services/monitoring/sensu/dashboard.nix b/nixos/modules/services/monitoring/sensu/dashboard.nix new file mode 100644 index 00000000000..dda38f2f8c4 --- /dev/null +++ b/nixos/modules/services/monitoring/sensu/dashboard.nix @@ -0,0 +1,112 @@ +{ config, lib, cfg }: + +{ + options = with lib; with types; { + enable = mkOption { + type = bool; + default = (cfg.role == "server"); + description = "Enable the dashboard"; + }; + + host = mkOption { + type = str; + default = "127.0.0.1"; + description = "The IP address on which Uchiwa will listen."; + }; + + port = mkOption { + type = int; + default = 3000; + description = "The port on which Uchiwa will listen."; + }; + + refresh = mkOption { + type = int; + default = 5; + description = "UI refresh interval."; + }; + + proxy = mkOption { + description = "Proxy traffic to/from the sensu dashboard."; + default = {}; + type = submodule { + options = { + enable = mkOption { + type = bool; + default = false; + description = "Enable proxy."; + }; + + path = mkOption { + type = str; + default = "/"; + description = "The path to the dashboard if behind a proxy."; + }; + + name = mkOption { + type = str; + default = config.networking.hostName; + description = "Hostname on which to repond."; + }; + + enableSSL = mkOption { + type = bool; + default = false; + description = "Force SSL."; + }; + }; + }; + }; + + users = mkOption { + description = "Users"; + default = {}; + type = listOf(submodule { + options = { + username = mkOption { + description = "User name."; + type = str; + }; + + password = mkOption { + description = "Password."; + type = str; + }; + + accessToken = mkOption { + default = ""; + description = "Access token."; + type = str; + }; + + readonly = mkOption { + default = false; + description = "Read only."; + type = bool; + }; + }; + }); + }; + + usersOptions = mkOption { + description = "Options relevant to all users"; + default = {}; + type = submodule { + options = { + + defaultTheme = mkOption { + type = enum [ "uchiwa-default" "uchiwa-dark" ]; + default = "uchiwa-dark"; + description = "The theme to use."; + }; + + logoUrl = mkOption { + type = str; + default = ""; + description = "The logo to use."; + }; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/sensu/default.nix b/nixos/modules/services/monitoring/sensu/default.nix new file mode 100644 index 00000000000..463420b4c18 --- /dev/null +++ b/nixos/modules/services/monitoring/sensu/default.nix @@ -0,0 +1,710 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.services.sensu; + pgm = cfg.programs; + + baseDir = "/etc/sensu"; + + transportIsRabbitMQ = (cfg.transport.name == "rabbitmq"); + roleIsServer = (cfg.role == "server"); + + # Setting the LOG_LEVEL env var doesn't work, so we force the logLevel via -L + bin = binary: lib.concatStringsSep " " [ + "${cfg.package}/bin/sensu-${binary}" + "-c ${baseDir}/config.json" + "-d ${baseDir}/conf.d" + "-e ${baseDir}/extensions" + "-L ${cfg.logLevel}" + ]; + + # Create a dedicated environment to allow for very long paths as systemd has a + # 2048 character limit + clientEnv = pkgs.buildEnv { + name = "sensu-env"; + pathsToLink = [ "/bin" ]; + paths = (with pkgs; [ gawk ] + ++ lib.optionals pgm.common [ check-uptime monitoring-plugins ] + ++ lib.optionals pgm.esx [ check-esxi-hardware ] + ++ lib.optionals pgm.http [ curl ] + ++ lib.optionals pgm.ipmi [ ipmitool which ] + ++ lib.optionals pgm.network [ check-nwc-health mtr ] + ++ lib.optionals pgm.openvpn [ sensu-check-openvpn ] + ++ lib.optionals pgm.snmp [ net_snmp ] + ++ lib.optionals pgm.ups [ check-ups-health ] + ++ cfg.dependencies + );}; + + sensuService = desc: bin: + let + pgm = lib.toLower desc; + isClient = lib.elem pgm [ "client" ]; + isDash = lib.elem pgm [ "dashboard" ]; + isServer = lib.elem pgm [ "api" "server" ]; + in { + description = "Sensu ${desc}"; + wantedBy = [ "sensu.target" ]; + after = [] + ++ lib.optionals isServer [ "redis.service" "rabbmitmq.service" ]; + # 1. Sensu is very shell-happy. I don't know if it actually requires bash + # per se, but it definitely needs a shell. + # 2. We need /run/wrappers early so the wrapped binary is found first + path = [ "/run/wrappers" pkgs.bash cfg.package ] + ++ lib.optional isClient clientEnv; + + # Needed for bundler + environment.HOME = "/run/sensu"; + + restartTriggers = [ ] + ++ lib.optionals isClient [ sensuCfg clientCfg ] + ++ lib.optionals isDash [ dashCfg ] + ++ lib.optionals isServer [ sensuCfg checkCfg filterCfg handlerCfg ]; + serviceConfig = { + ExecStart = bin; + # If you backport this to 17.03, DynamicUser WILL cause certain checks to + # fail as they expect to be able to resolve uid -> user name and the + # required NSS module isn't loaded (it is in master). + DynamicUser = true; + Slice = "sensu.slice"; + Restart = "on-failure"; + # Upstream recommends 1m which seems VERY long + RestartSec = "10s"; + ProtectSystem = "full"; + # ProtectControlGroups = true; + # ProtectKernelTunables = true; + # ProtectKernelModules = true; + # SystemCallArchitectures = "native"; + + # Sensu expects a common file in $HOME which must be shared with the other + # sensu units this can be enabled when our systemd module gets support for + # JoinsNamespaceOf. + PrivateTmp = true; + TimeoutStopSec = "5s"; + RuntimeDirectory = lib.mkIf isClient "sensu"; + # NoNewPrivileges = true; + }; + }; + + # This function serves two purposes: + # + # 1) We do a lot of attrs -> json but nix will add a "_module" key when + # dumping a submodule which is at best noise and in the worst case causes + # an unexpected setting to be set + # + # 2) We do not want to set defaults for everything (as defaults change), so if + # a value is an empty string|list|set, we simply remove the key from the + # generated JSON to allow sensu to apply its own defaults + + cleanAttrSet = set_or_list: + if builtins.isList set_or_list + then (map (s: cleanAttrSet s) set_or_list) + else lib.filterAttrsRecursive (k: v: + !(k == "_module" || v == "" || v == [] || v == {})) set_or_list; + + checkCfg = pkgs.writeText "checks.json" (builtins.toJSON (cleanAttrSet { + inherit (cfg) checks; + })); + + filterCfg = pkgs.writeText "filters.json" (builtins.toJSON (cleanAttrSet { + inherit (cfg) filters; + })); + + handlerCfg = pkgs.writeText "handlers.json" (builtins.toJSON (cleanAttrSet { + inherit (cfg) handlers; + } // cfg.plugins)); + + mutatorCfg = pkgs.writeText "mutators.json" (builtins.toJSON (cleanAttrSet { + inherit (cfg) mutators; + })); + + sensuCfg = let + rabbitmq = cleanAttrSet cfg.rabbitmq; + in pkgs.writeText "config.json" (builtins.toJSON ({ + inherit rabbitmq; + } // (cleanAttrSet (if roleIsServer + then { inherit (cfg) api extensions influxdb mutators redis transport; } // cfg.extraServerConfig + else { inherit (cfg) extensions transport; } // cfg.extraClientConfig)))); + + clientCfg = pkgs.writeText "client.json" (builtins.toJSON (cleanAttrSet { + inherit (cfg) client; + })); + + dashCfg = pkgs.writeText "uchiwa.json" (builtins.toJSON (cleanAttrSet { + sensu = cleanAttrSet cfg.sites; + uchiwa = cfg.dashboard // { + loglevel = cfg.logLevel; + }; + })); + + # Currently not used + makePlugin = name: config: base: + let + fileName = "plugin-${name}.json"; + in { + source = pkgs.writeText fileName (builtins.toJSON { "${name}" = config; }); + target = "${base}/${fileName}"; + }; + +in { + + options = { + services.sensu = with lib; with types; { + enable = mkOption { + type = bool; + default = false; + description = '' + Enable the Sensu network monitoring daemon. + ''; + }; + + # Add support for dashboard rabbitmq redis etc + role = mkOption { + # type = listOf enum [ "server" "client" "dashboard" "influxdb" "rabbmitmq" "redis" ]; + type = enum [ "server" "client" ]; + # default = [ "server" ]; + default = "server"; + description = "Operate as client only or server and client."; + }; + + transport = mkOption { + default = {}; + description = "The transport."; + type = submodule { + options = { + name = mkOption { + type = enum [ "redis" "rabbitmq" ]; + default = "redis"; + description = "The transport to use."; + }; + + reconnect_on_error = mkOption { + type = bool; + default = true; + description = "Automatically reconnect on error."; + }; + }; + }; + }; + + openDefaultPorts = mkOption { + type = bool; + default = false; + description = "Automatically open the firewall ports."; + }; + + defaultClientSubscriptions = mkOption { + type = listOf str; + default = [ "sensu-client" ]; + description = "Default subscriptions for sensu clients."; + }; + + defaultServerSubscriptions = mkOption { + type = listOf str; + default = [ "sensu-server" ]; + description = "Default subscriptions for sensu servers."; + }; + + defaultSubscriptions = { + enable = mkEnableOption "Default checks of the sensu environment."; + + interval = mkOption { + description = "How frequently to run interval checks."; + default = 60; + type = int; + }; + + occurrences = mkOption { + description = "How many occurrences before we trigger an alert."; + default = 2; + type = int; + }; + }; + + package = mkOption { + type = package; + default = pkgs.sensu; + description = "The package to use."; + }; + + dependencies = mkOption { + type = listOf package; + default = []; + description = "Additional packages to inject into the path."; + }; + + logLevel = mkOption { + type = enum [ "debug" "info" "warn" "error" "fatal" ]; + default = "info"; + description = ''The level of logging. The default info is VERY verbose + and you probably want to change this to 'warn' when things are working + ''; + }; + + extraClientConfig = mkOption { + type = attrs; + default = {}; + description = "Additional configuration data that will be added to the client config."; + }; + + extraServerConfig = mkOption { + type = attrs; + default = {}; + description = "Additional configuration data that will be added to the server config."; + }; + + extensions = mkOption { + type = attrs; + default = {}; + description = "Extensions to load."; + }; + + redis = mkOption { + description = "Redis configuration."; + default = {}; + type = (submodule (import ./host_port_pair.nix { + inherit lib; + name = "redis"; + defaultHost = "127.0.0.1"; + defaultPort = 6379; + })); + }; + + influxdb = mkOption { + description = "InfluxDB configuration."; + default = {}; + type = (submodule (import ./host_port_pair.nix { + inherit lib; + name = "influxdb"; + defaultHost = "localhost"; + defaultPort = 8086; + options = { + database = mkOption { + default = "sensu"; + description = "InfluxDB database"; + type = str; + }; + + user = mkOption { + default = null; + description = "InfluxDB user"; + type = nullOr str; + }; + + password = mkOption { + default = null; + description = "InfluxDB password"; + type = nullOr str; + }; + + templates = mkOption { + default = {}; + description = "Templates"; + type = attrs; + }; + }; + })); + }; + + rabbitmq = mkOption { + description = "RabbitMQ configuration."; + default = []; + type = listOf (submodule (import ./host_port_pair.nix { + inherit lib; + name = "rabbitmq"; + defaultHost = "127.0.0.1"; + defaultPort = config.services.rabbitmq.port; + options = { + vhost = mkOption { + default = "/sensu"; + description = "RabbitMQ vhost"; + type = str; + }; + + user = mkOption { + default = "sensu"; + description = "RabbitMQ user"; + type = str; + }; + + password = mkOption { + description = "RabbitMQ password"; + type = str; + }; + + heartbeat = mkOption { + default = 30; + description = "RabbitMQ heartbeat"; + type = int; + }; + + prefetch = mkOption { + default = 50; + description = "RabbitMQ prefetch"; + type = int; + }; + + ssl = mkOption { + default = {}; + description = "RabbitMQ SSL options."; + type = submodule { + options = { + cert_chain_file = mkOption { + default = ""; + description = "Path to the cert chain file."; + type = str; + }; + + private_key_file = mkOption { + default = ""; + description = "Path to the private key file."; + type = str; + }; + }; + }; + }; + }; + })); + }; + + configureInfluxDb = mkOption { + default = false; + description = "Whether the database should be configured for Sensu on InfluxDB."; + type = bool; + }; + + configureRabbitMq = mkOption { + default = false; + description = "Whether the vhost/user/permissions should be configured for Sensu on RabbitMQ."; + type = bool; + }; + + api = mkOption { + description = "API server configuration."; + default = {}; + type = (submodule (import ./host_port_pair.nix { + inherit lib; + name = "api"; + defaultHost = "127.0.0.1"; + defaultPort = 4567; + options = { + bind = mkOption { + type = str; + default = "0.0.0.0"; + description = "The address that the API will bind to (listen on)."; + }; + }; + })); + }; + + programs = let + programOption = name: default: mkOption { + type = bool; + description = "Enable support for ${name}."; + inherit default; + }; in mkOption { + description = "Programs to enable for checks"; + default = {}; + type = submodule { + options = { + # some of the built-in checks require the common package + common = programOption "common" true; + esx = programOption "esx" false; + http = programOption "http" false; + ipmi = programOption "ipmi" false; + network = programOption "network" false; + openvpn = programOption "openvpn" false; + snmp = programOption "snmp" false; + ups = programOption "ups" false; + }; + }; + }; + + checks = mkOption { + type = with types; attrsOf (submodule (import ./checks.nix { inherit lib; })); + default = {}; + description = "The checks configured."; + }; + + client = mkOption { + description = "The client configuration."; + default = {}; + type = submodule (import ./client.nix { inherit lib; }); + }; + + dashboard = mkOption { + description = "The Sensu dashboard."; + default = {}; + type = submodule (import ./dashboard.nix { inherit cfg config lib; }); + }; + + filters = mkOption { + type = attrs; + default = {}; + description = "The filters available to Sensu."; + }; + + handlers = mkOption { + type = with types; attrsOf (submodule (import ./handlers.nix { inherit lib; })); + default = {}; + description = "The handlers available to Sensu."; + }; + + mutators = mkOption { + type = with types; attrsOf (submodule (import ./mutators.nix { inherit lib; })); + default = {}; + description = "The mutators available to Sensu."; + }; + + sites = mkOption { + type = listOf (submodule (import ./sites.nix { inherit lib; })); + description = "The sites configured."; + default = []; + }; + + plugins = mkOption { + type = attrs; + description = "Plugin configuration."; + default = {}; + }; + }; + }; + + config = lib.mkIf cfg.enable { + + # Needed for being able to process UDP traffic + boot.kernel.sysctl = lib.mkDefault { + "net.core.rmem_max" = 26214400; + "net.core.rmem_default" = 26214400; + }; + + environment = let dir = "${lib.removePrefix "/etc/" baseDir}/conf.d"; in { + etc = { + checks = lib.mkIf roleIsServer { + source = checkCfg; + target = "${dir}/checks.json"; + }; + filters = lib.mkIf roleIsServer { + source = filterCfg; + target = "${dir}/filters.json"; + }; + handlers = lib.mkIf roleIsServer { + source = handlerCfg; + target = "${dir}/handlers.json"; + }; + # influxdb_line_protocol = { + # source = "${cfg.package}/bin/mutator-influxdb-line-protocol.rb"; + # target = "sensu/extensions/mutator-influxdb-line-protocol.rb"; + # }; + uchiwa = lib.mkIf roleIsServer { + source = dashCfg; + target = "sensu/uchiwa.json"; + }; + client = { + source = clientCfg; + target = "${dir}/client.json"; + }; + config = { + source = sensuCfg; + target = "sensu/config.json"; + }; + }; + + systemPackages = with pkgs; [ + jq + nmap + tree + ]; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openDefaultPorts ([] + ++ lib.optional (cfg.client.socket != "127.0.0.1") cfg.client.socket.port + ++ lib.optional roleIsServer cfg.api.port + ++ lib.optional (cfg.dashboard.enable) cfg.dashboard.port + ); + + services = let pcfg = cfg.dashboard.proxy; in { + nginx = lib.mkIf pcfg.enable { + enable = true; + virtualHosts = { + "${pcfg.name}" = rec { + addSSL = pcfg.enableSSL; + enableACME = addSSL; + extraConfig = let + inherit (pcfg) enable path; + in '' + location ${path} { + proxy_pass http://localhost:${toString cfg.dashboard.port}; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + + rewrite ${path}(.*) /$1 break; + } + ''; + }; + }; + }; + + rabbitmq = lib.mkIf (roleIsServer && transportIsRabbitMQ) { + enable = true; + }; + + redis = lib.mkIf roleIsServer { + enable = true; + bind = "127.0.0.1"; + }; + + sensu = { + checks = let disk = { warn = 20; crit = 10; }; in { + sensu-disk-root = { + command = lib.concatStringsSep " " [ + "check_disk" + "--warning=${toString disk.warn}" + "--critical=${toString disk.crit}" + "--path=/" + ]; + subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; + inherit (cfg.defaultSubscriptions) interval occurrences; + }; + + sensu-disk-var = { + command = lib.concatStringsSep " " [ + "check_disk" + "--warning=${toString disk.warn}" + "--critical=${toString disk.crit}" + "--path=/var" + ]; + subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; + inherit (cfg.defaultSubscriptions) interval occurrences; + }; + + sensu-load = { + command = lib.concatStringsSep " " [ + "check_load" + "--warning=2.75,2.50,2.00" + "--critical=3.50,3.25,3.00" + "--percpu" + ]; + subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; + inherit (cfg.defaultSubscriptions) interval occurrences; + }; + + sensu-swap = { + command = lib.concatStringsSep " " [ + "check_swap" + "--warning=50%" + "--critical=20%" + "--no-swap=ok" + ]; + subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; + inherit (cfg.defaultSubscriptions) interval occurrences; + }; + + sensu-time = { + command = lib.concatStringsSep " " [ + "check_ntp_time" + "-H :::vars.ntp.host|0.nixos.pool.ntp.org:::" + ]; + subscribers = cfg.defaultServerSubscriptions; + inherit (cfg.defaultSubscriptions) interval occurrences; + }; + + sensu-uptime = { + command = lib.concatStringsSep " " [ + "check_uptime" + "--warning 3:" + ]; + subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; + inherit (cfg.defaultSubscriptions) interval occurrences; + }; + + sensu-influx-ping = { + command = lib.concatStringsSep " " [ + "check-influxdb.rb" + "--host ${cfg.influxdb.host}" + "--port ${toString cfg.influxdb.port}" + ]; + subscribers = cfg.defaultServerSubscriptions; + inherit (cfg.defaultSubscriptions) interval occurrences; + }; + + sensu-redis-mem = { + command = lib.concatStringsSep " " [ + "check-redis-memory-percentage.rb" + "--host ${cfg.redis.host}" + "--port ${toString cfg.redis.port}" + "--critmem 90" + "--warnmem 70" + ]; + subscribers = cfg.defaultServerSubscriptions; + inherit (cfg.defaultSubscriptions) interval occurrences; + }; + + sensu-error-log = { + command = lib.concatStringsSep " " [ + "check-journal.rb" + "--journalctl_args='-p err --quiet' -q ''" + ]; + subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; + inherit (cfg.defaultSubscriptions) interval occurrences; + }; + }; + + client.subscriptions = lib.mkIf cfg.defaultSubscriptions.enable ( + if roleIsServer then cfg.defaultServerSubscriptions + else cfg.defaultClientSubscriptions + ); + + extensions = { + influxdb = { + gem = "sensu-extensions-influxdb"; + }; + }; + }; + }; + + systemd = let + runRabbitMq = (roleIsServer && transportIsRabbitMQ && cfg.configureRabbitMq); + in { + services = { + sensu-api = lib.mkIf roleIsServer (sensuService "API" (bin "api")); + sensu-client = (sensuService "Client" (bin "client")); + sensu-server = lib.mkIf roleIsServer (sensuService "Server" (bin "server")); + sensu-dashboard = lib.mkIf cfg.dashboard.enable (sensuService "Dashboard" + "${pkgs.uchiwa}/bin/uchiwa -c ${baseDir}/uchiwa.json" + ); + + rabbitmq = lib.mkIf runRabbitMq { + wants = [ "rabbitmq-setup.service" ]; + }; + + rabbitmq-setup = lib.mkIf runRabbitMq ( + let + rmq = builtins.head config.services.sensu.rabbitmq; + service = [ "rabbitmq.service" ]; + in lib.mkIf transportIsRabbitMQ { + description = "Configure RabbitMQ queue and user for Sensu"; + wants = service; + after = service; + script = '' + export HOME=${config.services.rabbitmq.dataDir} + export PATH=${lib.makeBinPath (with pkgs; [ coreutils gnused rabbitmq_server ])}:$PATH + + rabbitmqctl add_vhost ${rmq.vhost} + rabbitmqctl add_user ${rmq.user} '${rmq.password}' + rabbitmqctl set_permissions -p ${rmq.vhost} ${rmq.user} ".*" ".*" ".*" + + # get rid of guest + rabbitmqctl delete_user guest + ''; + }); + }; + + targets.sensu = { + description = "Sensu Monitoring"; + wantedBy = [ "multi-user.target" ]; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/sensu/handlers.nix b/nixos/modules/services/monitoring/sensu/handlers.nix new file mode 100644 index 00000000000..befe50fa834 --- /dev/null +++ b/nixos/modules/services/monitoring/sensu/handlers.nix @@ -0,0 +1,70 @@ +{ lib }: + +{ + options = with lib; with types; { + type = mkOption { + description = "Type of handler."; + type = enum [ "pipe" "tcp" "udp" "transport" "set" ]; + }; + + filters = mkOption { + default = []; + description = "List of filters."; + type = listOf str; + }; + + severities = mkOption rec { + default = [ "critical" "warning" "unknown" ]; + description = "Severities to handle."; + type = listOf (enum (default ++ [ "ok" ])); + }; + + subscribers = mkOption { + default = []; + description = "Subscribers"; + type = listOf str; + }; + + timeout = mkOption { + default = 30; + description = "Timeout."; + type = int; + }; + + command = mkOption { + default = ""; + description = "Command for type pipe."; + type = str; + }; + + socket = mkOption { + default = {}; + description = "Socket for type tcp or udp."; + type = attrs; + }; + + pipe = mkOption { + default = {}; + description = "Pipe for type pipe."; + type = attrs; + }; + + mutator = mkOption { + default = ""; + description = "Mutator."; + type = str; + }; + + handlers = mkOption { + default = []; + description = "Handlers for type set."; + type = listOf str; + }; + + subdue = mkOption { + type = attrs; + default = {}; + description = "Subdue handler during certain windows."; + }; + }; +} diff --git a/nixos/modules/services/monitoring/sensu/host_port_pair.nix b/nixos/modules/services/monitoring/sensu/host_port_pair.nix new file mode 100644 index 00000000000..283a8f59acf --- /dev/null +++ b/nixos/modules/services/monitoring/sensu/host_port_pair.nix @@ -0,0 +1,17 @@ +{ lib, name, defaultHost ? null, defaultPort ? null, options ? {} }: + +{ + options = with lib; with types; { + host = mkOption { + type = str; + default = defaultHost; + description = "The hostname of ${name}"; + }; + + port = mkOption { + type = int; + default = defaultPort; + description = "The port of ${name}"; + }; + } // options; +} diff --git a/nixos/modules/services/monitoring/sensu/mutators.nix b/nixos/modules/services/monitoring/sensu/mutators.nix new file mode 100644 index 00000000000..9325ec480e9 --- /dev/null +++ b/nixos/modules/services/monitoring/sensu/mutators.nix @@ -0,0 +1,17 @@ +{ lib }: + +{ + options = with lib; with types; { + command = mkOption { + default = ""; + description = "Command for mutator."; + type = str; + }; + + timeout = mkOption { + default = 30; + description = "Timeout."; + type = int; + }; + }; +} diff --git a/nixos/modules/services/monitoring/sensu/plugins.nix b/nixos/modules/services/monitoring/sensu/plugins.nix new file mode 100644 index 00000000000..95d70f88391 --- /dev/null +++ b/nixos/modules/services/monitoring/sensu/plugins.nix @@ -0,0 +1,83 @@ +{ lib }: + +{ + options = with lib; with types; { + + mailer = mkOption { + description = "sensu-plugins-mailer"; + default = {}; + type = submodule { + options = { + mail_from = mkOption { + type = str; + description = "Sender"; + }; + + mail_to = mkOption { + type = str; + description = "Recipient"; + }; + }; + }; + }; + }; +} + + + + + +# type = mkOption { +# type = enum [ "pipe" "tcp" "udp" "transport" "set" ]; +# description = "Type of handler."; +# }; + +# filters = mkOption { +# type = listOf str; +# default = []; +# description = "List of filters."; +# }; + +# severities = mkOption { +# type = listOf (enum [ "warning" "critical" "unknown" ]); +# default = [ "unknown" ]; +# description = "Severities to handle."; +# }; + +# subscribers = mkOption { +# type = listOf str; +# default = []; +# description = "Subscribers"; +# }; + +# timeout = mkOption { +# type = int; +# default = 30; +# description = "Timeout."; +# }; + +# command = mkOption { +# type = str; +# default = ""; +# description = "Command for type pipe."; +# }; + +# socket = mkOption { +# type = attrs; +# default = {}; +# description = "Socket for type tcp or udp."; +# }; + +# pipe = mkOption { +# type = attrs; +# default = {}; +# description = "Pipe for type pipe."; +# }; + +# handlers = mkOption { +# type = listOf str; +# default = []; +# description = "Handlers for type set."; +# }; +# }; +# } diff --git a/nixos/modules/services/monitoring/sensu/sites.nix b/nixos/modules/services/monitoring/sensu/sites.nix new file mode 100644 index 00000000000..f983305d825 --- /dev/null +++ b/nixos/modules/services/monitoring/sensu/sites.nix @@ -0,0 +1,59 @@ +{ lib }: + +{ + options = with lib; { + name = mkOption { + type = types.str; + default = "Site 1"; + description = "Name of the site."; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = "Host name"; + }; + + port = mkOption { + type = types.int; + default = 4567; + description = "Port"; + }; + + ssl = mkOption { + type = types.bool; + default = true; + description = "Enable SSL"; + }; + + insecure = mkOption { + type = types.bool; + default = true; + description = "Insecure"; + }; + + user = mkOption { + type = types.str; + default = ""; + description = "User name for authentication"; + }; + + pass = mkOption { + type = types.str; + default = ""; + description = "Password for authentication"; + }; + + path = mkOption { + type = types.str; + default = ""; + description = "Path?"; + }; + + timeout = mkOption { + type = types.int; + default = 5; + description = "Timeout"; + }; + }; +} From 1faa5b6b360ae4d6aac3718dc7b9b3a81be6073e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 31 Jul 2017 21:26:06 +0800 Subject: [PATCH 1116/2806] nixos: kodi user --- nixos/modules/misc/ids.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 7d9d9984cf2..3980ad3b5c0 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -304,6 +304,8 @@ nixbld = 30000; # start of range of uids nobody = 65534; + + kodi = 301; }; ids.gids = { @@ -575,6 +577,8 @@ users = 100; nixbld = 30000; nogroup = 65534; + + kodi = 301; }; }; From 15d2cf5494a43b0b5312a834232af9b5b62f32ca Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 27 Apr 2017 16:26:00 +0800 Subject: [PATCH 1117/2806] nix-upgrade-scripts: init at 0.0.4 --- .../nix-upgrade-scripts/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/package-management/nix-upgrade-scripts/default.nix diff --git a/pkgs/tools/package-management/nix-upgrade-scripts/default.nix b/pkgs/tools/package-management/nix-upgrade-scripts/default.nix new file mode 100644 index 00000000000..d80e26a69fd --- /dev/null +++ b/pkgs/tools/package-management/nix-upgrade-scripts/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, nix }: + +stdenv.mkDerivation rec { + name = "nix-upgrade-scripts-${version}"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "peterhoeg"; + repo = "nix-upgrade-scripts"; + rev = "v${version}"; + sha256 = "13v91nniwrs1fr92msrq6sq7vy1whrlxqd1ll4q3p1nrnbzpnxkn"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -r bin lib $out/ + for f in $out/bin/* ; do + substituteInPlace $f \ + --replace '/usr/bin/env nix-shell' ${nix}/bin/nix-shell + done + chmod +x $out/bin/* + ''; + + meta = with stdenv.lib; { + description = "Scripts for making package upgrades easier"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67cce24decf..f01d1d97d31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19146,6 +19146,8 @@ with pkgs; nix-serve = callPackage ../tools/package-management/nix-serve { }; + nix-upgrade-scripts = callPackages ../tools/package-management/nix-upgrade-scripts { }; + nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; From fde0bad57796e29337e8a1f1dcbb0164f5e56b1c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 6 Jun 2017 16:17:03 +0800 Subject: [PATCH 1118/2806] amarok-kf5: init at 2.8.91-20170228 --- pkgs/applications/audio/amarok/kf5.nix | 37 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/audio/amarok/kf5.nix diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix new file mode 100644 index 00000000000..a96aa3ed65d --- /dev/null +++ b/pkgs/applications/audio/amarok/kf5.nix @@ -0,0 +1,37 @@ +{ mkDerivation, fetchgit, lib +, extra-cmake-modules, kdoctools +, qca-qt5, qjson, qtscript, qtwebkit +, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor +, phonon, plasma-framework, threadweaver +, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mariadb, pcre, snappy, taglib, taglib_extras +}: + +let + pname = "amarok"; + version = "2.8.91-20170228"; + +in mkDerivation { + name = "${pname}-${version}"; + + src = fetchgit { + url = git://anongit.kde.org/amarok.git; + # go back to the KDE mirror when kf5 is merged into master + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + rev = "323e2d5b43245c4c06e0b83385d37ef0d32920cb"; + sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + qca-qt5 qjson qtscript qtwebkit + kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor + phonon plasma-framework threadweaver + curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mariadb pcre snappy taglib taglib_extras + ]; + enableParallelBuilding = true; + + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01d1d97d31..565b17984ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13631,6 +13631,8 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; + amarok-kf5 = libsForQt5.callPackage ../applications/audio/amarok/kf5.nix { }; + AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; From 178a96f99be69a173669254295d5a06732e7a906 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 5 Feb 2017 15:36:41 +0800 Subject: [PATCH 1119/2806] firewalld: init at 0.4.4.4 Includes systemd module. --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/firewalld.nix | 53 +++++++++++ pkgs/os-specific/linux/firewalld/default.nix | 94 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 150 insertions(+) create mode 100644 nixos/modules/services/networking/firewalld.nix create mode 100644 pkgs/os-specific/linux/firewalld/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5e6b42dea54..1eef781a31d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -437,6 +437,7 @@ ./services/networking/firefox/sync-server.nix ./services/networking/fireqos.nix ./services/networking/firewall.nix + ./services/networking/firewalld.nix ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix diff --git a/nixos/modules/services/networking/firewalld.nix b/nixos/modules/services/networking/firewalld.nix new file mode 100644 index 00000000000..02d694af390 --- /dev/null +++ b/nixos/modules/services/networking/firewalld.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.firewalld; + +in { + ###### interface + + options = { + networking.firewalld = { + enable = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to enable firewalld. firewalld is a high-level Linux-based packet + filtering framework intended for desktop use cases. + + This conflicts with the standard networking firewall, so make sure to + disable it before using firewalld. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + assertions = [{ + assertion = config.networking.firewall.enable == false; + message = "You can not use firewalld with services.networking.firewall."; + }]; + + environment.etc = [ + { source = "${pkgs.firewalld}/etc/firewalld"; + target = "firewalld"; } + ]; + + services = { + dbus.packages = with pkgs; [ firewalld ]; + }; + + systemd = { + packages = with pkgs; [ firewalld ]; + + services.firewalld = { + wantedBy = [ "multi-user.target" ]; + }; + }; + }; +} diff --git a/pkgs/os-specific/linux/firewalld/default.nix b/pkgs/os-specific/linux/firewalld/default.nix new file mode 100644 index 00000000000..6b2e5803875 --- /dev/null +++ b/pkgs/os-specific/linux/firewalld/default.nix @@ -0,0 +1,94 @@ +{ stdenv, lib, fetchFromGitHub +, autoreconfHook, docbook_xml_dtd_42, docbook_xsl, gettext, python3Packages +, intltool, libxslt, dbus, pkgconfig, iptables, ebtables, ipset, glib, kmod +, withKde ? true, plasma-nm ? null +}: + +let + slip = python3Packages.buildPythonPackage rec { + name = "python-slip-${version}"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "nphilipp"; + repo = "python-slip"; + rev = name; + sha256 = "07zyxy62738dzsvifm1241k0zx5l3xl6s5yfhyn88wc59fa8p570"; + }; + + doCheck = false; # no tests + + buildPhase = '' + runHook preBuild + export PREFIX=$out + make + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make install + runHook postInstall + ''; + + }; + +in python3Packages.buildPythonApplication rec { + name = "firewalld-${version}"; + version = "0.4.4.4"; + + src = fetchFromGitHub { + owner = "t-woerner"; + repo = "firewalld"; + rev = "v${version}"; + sha256 = "048flfcsi3ibp124k01hhf9bnbpyi3b92jgc96fhfvw6ns2l48qc"; + }; + + doCheck = false; # no tests + + propagatedBuildInputs = with python3Packages; [ + dbus + decorator + pygobject3 + pyqt5 + six + slip + ]; + + buildInputs = [ + autoreconfHook pkgconfig + docbook_xml_dtd_42 docbook_xsl gettext intltool libxslt + dbus ebtables glib ipset iptables + ]; + + preConfigure = '' + patchShebangs . + + substituteInPlace doc/xml/*.xml \ + --replace "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd" + + substituteInPlace src/firewall-applet \ + --replace /usr/bin/kde5-nm-connection-editor ${lib.getBin plasma-nm}/bin/kde5-nm-connection-editor + + export MODINFO=${kmod}/bin/modinfo + export MODPROBE=${kmod}/bin/modprobe + export RMMOD=${kmod}/bin/rmmod + ''; + + buildPhase = '' + ./autogen.sh --prefix=$out + make + ''; + + installPhase = '' + make install $out + cp -r config/{helpers,icmptypes,ipsets,services,zones} $out/etc/firewalld + ''; + + meta = with lib; { + description = "A service daemon with D-Bus interface"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 565b17984ce..037e133a7d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12212,6 +12212,8 @@ with pkgs; firejail = callPackage ../os-specific/linux/firejail {}; + firewalld = callPackage ../os-specific/linux/firewalld {}; + fnotifystat = callPackage ../os-specific/linux/fnotifystat { }; forkstat = callPackage ../os-specific/linux/forkstat { }; From 3ba45dd220019af6a230282e884415f35758cb9d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 22 Sep 2017 18:48:13 +0800 Subject: [PATCH 1120/2806] freetds: 0.91 -> 1.00.62 --- .../development/libraries/freetds/default.nix | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 2e06c3bbec7..faf20bda4d9 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,34 +1,35 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, autoreconfHook, pkgconfig +, openssl , odbcSupport ? false, unixODBC ? null }: assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { - name = "freetds-0.91"; + name = "freetds-${version}"; + version = "1.00.62"; src = fetchurl { - url = "http://mirrors.ibiblio.org/freetds/stable/${name}.tar.gz"; - sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; + url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; + sha256 = "10d1rjflp3gkmgk5zlv2ck23p0fgpxrgf1jhfv9pvy3q02h9ldis"; }; - hardeningDisable = [ "format" ]; + configureFlags = [ + "--with-tdsver=7.0" + ]; - buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ]; + buildInputs = [ + openssl + ] ++ stdenv.lib.optional odbcSupport unixODBC; - configureFlags = stdenv.lib.optionalString odbcSupport "--with-odbc=${unixODBC}"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - doDist = true; + enableParallelBuilding = true; - distPhase = '' - touch $out/include/tds.h - touch $out/lib/libtds.a - ''; - - meta = { - description = - "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = http://www.freetds.org; - license = "lgpl"; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; + homepage = http://www.freetds.org; + license = licenses.lgpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; }; } From a7a19401619eb667f784044e461ac9cf87b070b0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 17 Oct 2016 18:02:53 +0800 Subject: [PATCH 1121/2806] skeleton --- pkgs/build-support/make-dbusservice/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pkgs/build-support/make-dbusservice/default.nix diff --git a/pkgs/build-support/make-dbusservice/default.nix b/pkgs/build-support/make-dbusservice/default.nix new file mode 100644 index 00000000000..44ed6dcda67 --- /dev/null +++ b/pkgs/build-support/make-dbusservice/default.nix @@ -0,0 +1,16 @@ +{ stdenv }: + +{ name, exec }: + +stdenv.mkDerivation rec { + dbusName = "dbus-${name}.service"; + buildCommand = '' + mkdir -p $out/lib/systemd/user + cat > $out/lib/systemd/user/${dbusName} < Date: Mon, 1 May 2017 16:33:15 +0800 Subject: [PATCH 1122/2806] msmtp: add nonblocking support --- .../applications/networking/msmtp/default.nix | 37 +++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 85e5abdc9b6..74beba7be49 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,11 +1,21 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig +{ stdenv, lib, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig , openssl, netcat-gnu, gnutls, gsasl, libidn, Security -, systemd ? null }: +, systemd ? null, eject ? null }: let tester = "n"; # {x| |p|P|n|s} journal = if stdenv.isLinux then "y" else "n"; + # preferNonBlock = stdenv.isLinux; + preferNonBlock = false; + + nonblock = fetchFromGitHub { + owner = "Stebalien"; + repo = "msmtp-queue"; + rev = "07032a4e4c8ea0d2364641c959db0c60f52423c7"; + sha256 = "0g2aph30007spkdwxljrlr2bliivf9nrdis3d3jvjpx8l6k60rr9"; + }; + in stdenv.mkDerivation rec { name = "msmtp-${version}"; version = "1.6.6"; @@ -20,13 +30,17 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl gnutls gsasl libidn ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security + ++ lib.optionals preferNonBlock [ nonblock eject ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + enableParallelBuilding = true; + configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' + ${lib.optionalString (!preferNonBlock) '' substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \ --replace @msmtp@ $out/bin/msmtp \ --replace @nc@ ${netcat-gnu}/bin/nc \ @@ -36,6 +50,23 @@ in stdenv.mkDerivation rec { substitute scripts/msmtpq/msmtp-queue $out/bin/msmtp-queue \ --replace @msmtpq@ $out/bin/msmtpq + ''} + ${lib.optionalString preferNonBlock '' + mkdir -p $out/lib/systemd/user + cp ${nonblock}/msmtp* $out/bin/ + cp ${nonblock}/systemd/* $out/lib/systemd/user + for f in $out/bin/msmtpq* ; do + sed $f -i -r \ + -e 's|^QUEUE_DIR.*|QUEUE_DIR="''${MSMTP_QUEUE:-''${XDG_DATA_HOME:-$HOME/.local/share}/mail.queue}"|' \ + -e 's|^CONFIG.*|CONFIG="''${XDG_CONFIG_HOME:-$HOME/.config}/msmtprc"|' \ + -e 's| flock | ${eject}/bin/flock |' + done + for f in $out/lib/systemd/user/* ; do + substituteInPlace $f \ + --replace /usr/local $out \ + --replace .local/share/mail.queue .cache/msmtp/queue + done + ''} chmod +x $out/bin/* ''; From 0dd25e585fd89d352f834a25a7c9e1f478d66c5c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 26 Aug 2017 10:21:55 +0800 Subject: [PATCH 1123/2806] networkmanager: dns and extraConfig --- .../services/networking/networkmanager.nix | 47 ++++++++++++------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index e03309c8729..c58131d6919 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -9,17 +9,17 @@ let # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; - dns = - if cfg.useDnsmasq then "dnsmasq" - else if config.services.resolved.enable then "systemd-resolved" - else if config.services.unbound.enable then "unbound" - else "default"; + useDnsmasq = cfg.dns == "dnsmasq"; + useResolved = cfg.dns == "systemd-resolved"; + + rcman = if useResolved then "unmanaged" else "resolvconf"; configFile = writeText "NetworkManager.conf" '' [main] plugins=keyfile dhcp=${cfg.dhcp} - dns=${dns} + dns=${cfg.dns} + rc-manager=${rcman} [keyfile] ${optionalString (cfg.unmanaged != []) @@ -32,6 +32,8 @@ let ipv6.ip6-privacy=2 ethernet.cloned-mac-address=${cfg.ethernet.macAddress} wifi.cloned-mac-address=${cfg.wifi.macAddress} + + ${cfg.extraConfig} ''; /* @@ -144,6 +146,17 @@ in { apply = list: (attrValues cfg.basePackages) ++ list; }; + dns = mkOption { + type = types.enum [ "default" "dnsmasq" "systemd-resolved" ]; + default = "default"; + description = '' + Enable NetworkManager's integration with other DNS resolvers. NetworkManager can run + dnsmasq as a local caching nameserver or systemd-resolved, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local nameserver. + ''; + }; + dhcp = mkOption { type = types.enum [ "dhclient" "dhcpcd" "internal" ]; default = "dhclient"; @@ -181,17 +194,6 @@ in { ethernet.macAddress = macAddressOpt; wifi.macAddress = macAddressOpt; - useDnsmasq = mkOption { - type = types.bool; - default = false; - description = '' - Enable NetworkManager's dnsmasq integration. NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - resolv.conf to point to the local nameserver. - ''; - }; - dispatcherScripts = mkOption { type = types.listOf (types.submodule { options = { @@ -216,6 +218,12 @@ in { A list of scripts which will be executed in response to network events. ''; }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional configuration added verbatim to the configuration file."; + }; }; }; @@ -289,10 +297,15 @@ in { group = "networkmanager"; }]; + services.resolved = lib.mkIf useResolved { + enable = true; + }; + systemd.packages = cfg.packages; systemd.services."network-manager" = { wantedBy = [ "network.target" ]; + wants = lib.mkIf useResolved [ "systemd-resolved.service" ]; restartTriggers = [ configFile ]; preStart = '' From 15bdbc21f9008561980a471914428ae2875f6cb4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 8 Mar 2017 22:25:04 +0800 Subject: [PATCH 1124/2806] nvidia-firmware: init at 325.15 --- .../linux/firmware/nvidia/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/nvidia/default.nix diff --git a/pkgs/os-specific/linux/firmware/nvidia/default.nix b/pkgs/os-specific/linux/firmware/nvidia/default.nix new file mode 100644 index 00000000000..810c7bd60cc --- /dev/null +++ b/pkgs/os-specific/linux/firmware/nvidia/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, python2Packages, which, xz }: + +let + extractor = fetchurl { + url = https://raw.githubusercontent.com/imirkin/re-vp2/master/extract_firmware.py; + sha256 = "03dd1il0cjs8xi411pkckkfjga348j0cgd6dix20gd4kwmlvyjqm"; + }; + + chipModel = [ + # gt200 should be nva0 but we don't have those and all nvaX are links to the same files anyway + { chip = "nva3"; model = "gt200"; } + { chip = "nva3"; model = "gt215"; } + { chip = "nva5"; model = "gt216"; } + { chip = "nva8"; model = "gt218"; } + { chip = "nve4"; model = "gk104"; } + { chip = "nve6"; model = "gk106"; } + { chip = "nve7"; model = "gk107"; } + ]; + +in stdenv.mkDerivation rec { + name = "linux-firmware-nvidia-${version}"; + version = "325.15"; + + src = fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"; + sha256 = "0xc7w2ia2fnkn20s6aq1f4ib2ljxmd2931vnrkvl2injzr5hwy9x"; + }; + + phases = [ "installPhase" ]; + + nativeBuildInputs = [ which xz ]; + + installPhase = '' + dir=$out/lib/firmware + ${stdenv.shell} ${src} --extract-only + ${python2Packages.python.interpreter} ${extractor} + + mkdir -p $dir/{nouveau,nvidia} + cp -rd nv* vuc-* $dir/nouveau + + ${stdenv.lib.concatStringsSep "\n" (map (entry: '' + mkdir -p $dir/nvidia/${entry.model} + + ln -rs $dir/nouveau/${entry.chip}_fuc409c $dir/nvidia/${entry.model}/fecs_inst.bin + ln -rs $dir/nouveau/${entry.chip}_fuc409d $dir/nvidia/${entry.model}/fecs_data.bin + ln -rs $dir/nouveau/${entry.chip}_fuc41ac $dir/nvidia/${entry.model}/gpccs_inst.bin + ln -rs $dir/nouveau/${entry.chip}_fuc41ad $dir/nvidia/${entry.model}/gpccs_data.bin + '') chipModel)} + ''; + + meta = with stdenv.lib; { + description = "Binary firmware for nVidia cards"; + longDescription = '' + This package contains proprietary firmware blobs for nVidia graphics cards + up to and including the "Kepler" range. +s + If you card is supported but not handled by this package, please find yours + here https://nouveau.freedesktop.org/wiki/CodeNames/ and let us know. + ''; + homepage = http://nvidia.com; + hydraPlatforms = []; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 037e133a7d0..76435f41ae9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12846,6 +12846,8 @@ with pkgs; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; + firmwareLinuxNvidia = callPackage ../os-specific/linux/firmware/nvidia { }; + radeontools = callPackage ../os-specific/linux/radeontools { }; radeontop = callPackage ../os-specific/linux/radeontop { }; From bd5fd61967221ed6ba2674ee009126467a596b84 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 2 May 2017 16:56:04 +0800 Subject: [PATCH 1125/2806] include firmware with enableAllFirmware --- nixos/modules/hardware/all-firmware.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index afaa65f6ce3..d3d82769d4f 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -36,6 +36,7 @@ in { (mkIf (cfg.enableAllFirmware || cfg.enableRedistributableFirmware) { hardware.firmware = with pkgs; [ firmwareLinuxNonfree + firmwareLinuxNvidia intel2200BGFirmware rtl8723bs-firmware rtl8192su-firmware From 46a92333e9a898ecbf1a66d0b3438957a8c42b5b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 12 Oct 2017 12:51:10 +0800 Subject: [PATCH 1126/2806] sddm: silence error about missing wayland directory --- nixos/modules/services/x11/display-managers/sddm.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index e6cc02e4d49..7d48a508cd4 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -55,6 +55,11 @@ let DisplayCommand=${Xsetup} DisplayStopCommand=${Xstop} + # This doesn't mean we have wayland support yet but is only to shut up an + # error about a missing default directory + [Wayland] + SessionDir=${dmcfg.session.desktops} + ${optionalString cfg.autoLogin.enable '' [Autologin] User=${cfg.autoLogin.user} From 9bf0e701e9efb127b09a9763d633979da4bc9d35 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 13 Oct 2017 20:20:39 +0800 Subject: [PATCH 1127/2806] kdeconnect: boy scout cleanups --- pkgs/applications/misc/kdeconnect/default.nix | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index e8235642cb2..a95dd6adbce 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -5,6 +5,7 @@ , kcmutils , kconfigwidgets , kdbusaddons +, kdoctools , kiconthemes , ki18n , knotifications @@ -25,25 +26,19 @@ stdenv.mkDerivation rec { }; buildInputs = [ - kcmutils - kconfigwidgets - kdbusaddons - qca-qt5 - ki18n - kiconthemes - knotifications - libfakekey - libXtst - qtx11extras + libfakekey libXtst + ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications + qca-qt5 qtx11extras ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - meta = { + enableParallelBuilding = true; + + meta = with lib; { description = "KDE Connect provides several features to integrate your phone and your computer"; - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh ]; - homepage = https://community.kde.org/KDEConnect; + homepage = https://community.kde.org/KDEConnect; + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ fridh ]; }; - } From cb61845c4a6dfc585a936d364af1be25c9ad781e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 14 Oct 2017 06:31:55 +0000 Subject: [PATCH 1128/2806] ocamlbuild: remove unused arguments --- pkgs/development/tools/ocaml/ocamlbuild/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 5062f53cd71..b6e439e4e17 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchFromGitHub, ocaml, findlib, buildOcaml, type_conv, camlp4, - ocamlmod, ocamlify, ounit, expect}: +{ stdenv, fetchFromGitHub, ocaml, findlib }: let version = "0.11.0"; in From f3590962107290e80f612486c98124d5820406fe Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:01 +0800 Subject: [PATCH 1129/2806] Revert "sddm: silence error about missing wayland directory" This reverts commit 46a92333e9a898ecbf1a66d0b3438957a8c42b5b. --- nixos/modules/services/x11/display-managers/sddm.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 7d48a508cd4..e6cc02e4d49 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -55,11 +55,6 @@ let DisplayCommand=${Xsetup} DisplayStopCommand=${Xstop} - # This doesn't mean we have wayland support yet but is only to shut up an - # error about a missing default directory - [Wayland] - SessionDir=${dmcfg.session.desktops} - ${optionalString cfg.autoLogin.enable '' [Autologin] User=${cfg.autoLogin.user} From 2c67873b7da8ac96073e772beeafc4ff13c9e4b9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:09 +0800 Subject: [PATCH 1130/2806] Revert "include firmware with enableAllFirmware" This reverts commit bd5fd61967221ed6ba2674ee009126467a596b84. --- nixos/modules/hardware/all-firmware.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index d3d82769d4f..afaa65f6ce3 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -36,7 +36,6 @@ in { (mkIf (cfg.enableAllFirmware || cfg.enableRedistributableFirmware) { hardware.firmware = with pkgs; [ firmwareLinuxNonfree - firmwareLinuxNvidia intel2200BGFirmware rtl8723bs-firmware rtl8192su-firmware From 5f6d2d15acc001b14bfcd8f14923c697aa90f968 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:16 +0800 Subject: [PATCH 1131/2806] Revert "nvidia-firmware: init at 325.15" This reverts commit 15bdbc21f9008561980a471914428ae2875f6cb4. --- .../linux/firmware/nvidia/default.nix | 66 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 68 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/nvidia/default.nix diff --git a/pkgs/os-specific/linux/firmware/nvidia/default.nix b/pkgs/os-specific/linux/firmware/nvidia/default.nix deleted file mode 100644 index 810c7bd60cc..00000000000 --- a/pkgs/os-specific/linux/firmware/nvidia/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, fetchurl, python2Packages, which, xz }: - -let - extractor = fetchurl { - url = https://raw.githubusercontent.com/imirkin/re-vp2/master/extract_firmware.py; - sha256 = "03dd1il0cjs8xi411pkckkfjga348j0cgd6dix20gd4kwmlvyjqm"; - }; - - chipModel = [ - # gt200 should be nva0 but we don't have those and all nvaX are links to the same files anyway - { chip = "nva3"; model = "gt200"; } - { chip = "nva3"; model = "gt215"; } - { chip = "nva5"; model = "gt216"; } - { chip = "nva8"; model = "gt218"; } - { chip = "nve4"; model = "gk104"; } - { chip = "nve6"; model = "gk106"; } - { chip = "nve7"; model = "gk107"; } - ]; - -in stdenv.mkDerivation rec { - name = "linux-firmware-nvidia-${version}"; - version = "325.15"; - - src = fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"; - sha256 = "0xc7w2ia2fnkn20s6aq1f4ib2ljxmd2931vnrkvl2injzr5hwy9x"; - }; - - phases = [ "installPhase" ]; - - nativeBuildInputs = [ which xz ]; - - installPhase = '' - dir=$out/lib/firmware - ${stdenv.shell} ${src} --extract-only - ${python2Packages.python.interpreter} ${extractor} - - mkdir -p $dir/{nouveau,nvidia} - cp -rd nv* vuc-* $dir/nouveau - - ${stdenv.lib.concatStringsSep "\n" (map (entry: '' - mkdir -p $dir/nvidia/${entry.model} - - ln -rs $dir/nouveau/${entry.chip}_fuc409c $dir/nvidia/${entry.model}/fecs_inst.bin - ln -rs $dir/nouveau/${entry.chip}_fuc409d $dir/nvidia/${entry.model}/fecs_data.bin - ln -rs $dir/nouveau/${entry.chip}_fuc41ac $dir/nvidia/${entry.model}/gpccs_inst.bin - ln -rs $dir/nouveau/${entry.chip}_fuc41ad $dir/nvidia/${entry.model}/gpccs_data.bin - '') chipModel)} - ''; - - meta = with stdenv.lib; { - description = "Binary firmware for nVidia cards"; - longDescription = '' - This package contains proprietary firmware blobs for nVidia graphics cards - up to and including the "Kepler" range. -s - If you card is supported but not handled by this package, please find yours - here https://nouveau.freedesktop.org/wiki/CodeNames/ and let us know. - ''; - homepage = http://nvidia.com; - hydraPlatforms = []; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76435f41ae9..037e133a7d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12846,8 +12846,6 @@ with pkgs; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; - firmwareLinuxNvidia = callPackage ../os-specific/linux/firmware/nvidia { }; - radeontools = callPackage ../os-specific/linux/radeontools { }; radeontop = callPackage ../os-specific/linux/radeontop { }; From ff3fd1027c276d54215986cd7e82b3a2037df6f3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:22 +0800 Subject: [PATCH 1132/2806] Revert "networkmanager: dns and extraConfig" This reverts commit 0dd25e585fd89d352f834a25a7c9e1f478d66c5c. --- .../services/networking/networkmanager.nix | 47 +++++++------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index c58131d6919..e03309c8729 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -9,17 +9,17 @@ let # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; - useDnsmasq = cfg.dns == "dnsmasq"; - useResolved = cfg.dns == "systemd-resolved"; - - rcman = if useResolved then "unmanaged" else "resolvconf"; + dns = + if cfg.useDnsmasq then "dnsmasq" + else if config.services.resolved.enable then "systemd-resolved" + else if config.services.unbound.enable then "unbound" + else "default"; configFile = writeText "NetworkManager.conf" '' [main] plugins=keyfile dhcp=${cfg.dhcp} - dns=${cfg.dns} - rc-manager=${rcman} + dns=${dns} [keyfile] ${optionalString (cfg.unmanaged != []) @@ -32,8 +32,6 @@ let ipv6.ip6-privacy=2 ethernet.cloned-mac-address=${cfg.ethernet.macAddress} wifi.cloned-mac-address=${cfg.wifi.macAddress} - - ${cfg.extraConfig} ''; /* @@ -146,17 +144,6 @@ in { apply = list: (attrValues cfg.basePackages) ++ list; }; - dns = mkOption { - type = types.enum [ "default" "dnsmasq" "systemd-resolved" ]; - default = "default"; - description = '' - Enable NetworkManager's integration with other DNS resolvers. NetworkManager can run - dnsmasq as a local caching nameserver or systemd-resolved, using a "split DNS" - configuration if you are connected to a VPN, and then update - resolv.conf to point to the local nameserver. - ''; - }; - dhcp = mkOption { type = types.enum [ "dhclient" "dhcpcd" "internal" ]; default = "dhclient"; @@ -194,6 +181,17 @@ in { ethernet.macAddress = macAddressOpt; wifi.macAddress = macAddressOpt; + useDnsmasq = mkOption { + type = types.bool; + default = false; + description = '' + Enable NetworkManager's dnsmasq integration. NetworkManager will run + dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local nameserver. + ''; + }; + dispatcherScripts = mkOption { type = types.listOf (types.submodule { options = { @@ -218,12 +216,6 @@ in { A list of scripts which will be executed in response to network events. ''; }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Additional configuration added verbatim to the configuration file."; - }; }; }; @@ -297,15 +289,10 @@ in { group = "networkmanager"; }]; - services.resolved = lib.mkIf useResolved { - enable = true; - }; - systemd.packages = cfg.packages; systemd.services."network-manager" = { wantedBy = [ "network.target" ]; - wants = lib.mkIf useResolved [ "systemd-resolved.service" ]; restartTriggers = [ configFile ]; preStart = '' From d81601065d57965767dd87590d93295e13e8fa49 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:29 +0800 Subject: [PATCH 1133/2806] Revert "msmtp: add nonblocking support" This reverts commit 5f29e9fdbfe0ac069c0348084ca169c59cda3ddc. --- .../applications/networking/msmtp/default.nix | 37 ++----------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 74beba7be49..85e5abdc9b6 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,21 +1,11 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig , openssl, netcat-gnu, gnutls, gsasl, libidn, Security -, systemd ? null, eject ? null }: +, systemd ? null }: let tester = "n"; # {x| |p|P|n|s} journal = if stdenv.isLinux then "y" else "n"; - # preferNonBlock = stdenv.isLinux; - preferNonBlock = false; - - nonblock = fetchFromGitHub { - owner = "Stebalien"; - repo = "msmtp-queue"; - rev = "07032a4e4c8ea0d2364641c959db0c60f52423c7"; - sha256 = "0g2aph30007spkdwxljrlr2bliivf9nrdis3d3jvjpx8l6k60rr9"; - }; - in stdenv.mkDerivation rec { name = "msmtp-${version}"; version = "1.6.6"; @@ -30,17 +20,13 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl gnutls gsasl libidn ] - ++ lib.optional stdenv.isDarwin Security - ++ lib.optionals preferNonBlock [ nonblock eject ]; + ++ stdenv.lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - enableParallelBuilding = true; - configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' - ${lib.optionalString (!preferNonBlock) '' substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \ --replace @msmtp@ $out/bin/msmtp \ --replace @nc@ ${netcat-gnu}/bin/nc \ @@ -50,23 +36,6 @@ in stdenv.mkDerivation rec { substitute scripts/msmtpq/msmtp-queue $out/bin/msmtp-queue \ --replace @msmtpq@ $out/bin/msmtpq - ''} - ${lib.optionalString preferNonBlock '' - mkdir -p $out/lib/systemd/user - cp ${nonblock}/msmtp* $out/bin/ - cp ${nonblock}/systemd/* $out/lib/systemd/user - for f in $out/bin/msmtpq* ; do - sed $f -i -r \ - -e 's|^QUEUE_DIR.*|QUEUE_DIR="''${MSMTP_QUEUE:-''${XDG_DATA_HOME:-$HOME/.local/share}/mail.queue}"|' \ - -e 's|^CONFIG.*|CONFIG="''${XDG_CONFIG_HOME:-$HOME/.config}/msmtprc"|' \ - -e 's| flock | ${eject}/bin/flock |' - done - for f in $out/lib/systemd/user/* ; do - substituteInPlace $f \ - --replace /usr/local $out \ - --replace .local/share/mail.queue .cache/msmtp/queue - done - ''} chmod +x $out/bin/* ''; From 85e7bbb2854fc76d895ff087629ae28e65373f48 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:41 +0800 Subject: [PATCH 1134/2806] Revert "skeleton" This reverts commit a7a19401619eb667f784044e461ac9cf87b070b0. --- pkgs/build-support/make-dbusservice/default.nix | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 pkgs/build-support/make-dbusservice/default.nix diff --git a/pkgs/build-support/make-dbusservice/default.nix b/pkgs/build-support/make-dbusservice/default.nix deleted file mode 100644 index 44ed6dcda67..00000000000 --- a/pkgs/build-support/make-dbusservice/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv }: - -{ name, exec }: - -stdenv.mkDerivation rec { - dbusName = "dbus-${name}.service"; - buildCommand = '' - mkdir -p $out/lib/systemd/user - cat > $out/lib/systemd/user/${dbusName} < Date: Sat, 14 Oct 2017 14:40:48 +0800 Subject: [PATCH 1135/2806] Revert "freetds: 0.91 -> 1.00.62" This reverts commit 3ba45dd220019af6a230282e884415f35758cb9d. --- .../development/libraries/freetds/default.nix | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index faf20bda4d9..2e06c3bbec7 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,35 +1,34 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig -, openssl +{ stdenv, fetchurl , odbcSupport ? false, unixODBC ? null }: assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { - name = "freetds-${version}"; - version = "1.00.62"; + name = "freetds-0.91"; src = fetchurl { - url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "10d1rjflp3gkmgk5zlv2ck23p0fgpxrgf1jhfv9pvy3q02h9ldis"; + url = "http://mirrors.ibiblio.org/freetds/stable/${name}.tar.gz"; + sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; }; - configureFlags = [ - "--with-tdsver=7.0" - ]; + hardeningDisable = [ "format" ]; - buildInputs = [ - openssl - ] ++ stdenv.lib.optional odbcSupport unixODBC; + buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + configureFlags = stdenv.lib.optionalString odbcSupport "--with-odbc=${unixODBC}"; - enableParallelBuilding = true; + doDist = true; - meta = with stdenv.lib; { - description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = http://www.freetds.org; - license = licenses.lgpl2; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; + distPhase = '' + touch $out/include/tds.h + touch $out/lib/libtds.a + ''; + + meta = { + description = + "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; + homepage = http://www.freetds.org; + license = "lgpl"; + platforms = stdenv.lib.platforms.all; }; } From 8df1c9ac175d72c0c18ede3d22764ece9dceeeef Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:53 +0800 Subject: [PATCH 1136/2806] Revert "firewalld: init at 0.4.4.4" This reverts commit 178a96f99be69a173669254295d5a06732e7a906. --- nixos/modules/module-list.nix | 1 - .../modules/services/networking/firewalld.nix | 53 ----------- pkgs/os-specific/linux/firewalld/default.nix | 94 ------------------- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 150 deletions(-) delete mode 100644 nixos/modules/services/networking/firewalld.nix delete mode 100644 pkgs/os-specific/linux/firewalld/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1eef781a31d..5e6b42dea54 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -437,7 +437,6 @@ ./services/networking/firefox/sync-server.nix ./services/networking/fireqos.nix ./services/networking/firewall.nix - ./services/networking/firewalld.nix ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix diff --git a/nixos/modules/services/networking/firewalld.nix b/nixos/modules/services/networking/firewalld.nix deleted file mode 100644 index 02d694af390..00000000000 --- a/nixos/modules/services/networking/firewalld.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.networking.firewalld; - -in { - ###### interface - - options = { - networking.firewalld = { - enable = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to enable firewalld. firewalld is a high-level Linux-based packet - filtering framework intended for desktop use cases. - - This conflicts with the standard networking firewall, so make sure to - disable it before using firewalld. - ''; - }; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - assertions = [{ - assertion = config.networking.firewall.enable == false; - message = "You can not use firewalld with services.networking.firewall."; - }]; - - environment.etc = [ - { source = "${pkgs.firewalld}/etc/firewalld"; - target = "firewalld"; } - ]; - - services = { - dbus.packages = with pkgs; [ firewalld ]; - }; - - systemd = { - packages = with pkgs; [ firewalld ]; - - services.firewalld = { - wantedBy = [ "multi-user.target" ]; - }; - }; - }; -} diff --git a/pkgs/os-specific/linux/firewalld/default.nix b/pkgs/os-specific/linux/firewalld/default.nix deleted file mode 100644 index 6b2e5803875..00000000000 --- a/pkgs/os-specific/linux/firewalld/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv, lib, fetchFromGitHub -, autoreconfHook, docbook_xml_dtd_42, docbook_xsl, gettext, python3Packages -, intltool, libxslt, dbus, pkgconfig, iptables, ebtables, ipset, glib, kmod -, withKde ? true, plasma-nm ? null -}: - -let - slip = python3Packages.buildPythonPackage rec { - name = "python-slip-${version}"; - version = "0.6.4"; - - src = fetchFromGitHub { - owner = "nphilipp"; - repo = "python-slip"; - rev = name; - sha256 = "07zyxy62738dzsvifm1241k0zx5l3xl6s5yfhyn88wc59fa8p570"; - }; - - doCheck = false; # no tests - - buildPhase = '' - runHook preBuild - export PREFIX=$out - make - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make install - runHook postInstall - ''; - - }; - -in python3Packages.buildPythonApplication rec { - name = "firewalld-${version}"; - version = "0.4.4.4"; - - src = fetchFromGitHub { - owner = "t-woerner"; - repo = "firewalld"; - rev = "v${version}"; - sha256 = "048flfcsi3ibp124k01hhf9bnbpyi3b92jgc96fhfvw6ns2l48qc"; - }; - - doCheck = false; # no tests - - propagatedBuildInputs = with python3Packages; [ - dbus - decorator - pygobject3 - pyqt5 - six - slip - ]; - - buildInputs = [ - autoreconfHook pkgconfig - docbook_xml_dtd_42 docbook_xsl gettext intltool libxslt - dbus ebtables glib ipset iptables - ]; - - preConfigure = '' - patchShebangs . - - substituteInPlace doc/xml/*.xml \ - --replace "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd" - - substituteInPlace src/firewall-applet \ - --replace /usr/bin/kde5-nm-connection-editor ${lib.getBin plasma-nm}/bin/kde5-nm-connection-editor - - export MODINFO=${kmod}/bin/modinfo - export MODPROBE=${kmod}/bin/modprobe - export RMMOD=${kmod}/bin/rmmod - ''; - - buildPhase = '' - ./autogen.sh --prefix=$out - make - ''; - - installPhase = '' - make install $out - cp -r config/{helpers,icmptypes,ipsets,services,zones} $out/etc/firewalld - ''; - - meta = with lib; { - description = "A service daemon with D-Bus interface"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 037e133a7d0..565b17984ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12212,8 +12212,6 @@ with pkgs; firejail = callPackage ../os-specific/linux/firejail {}; - firewalld = callPackage ../os-specific/linux/firewalld {}; - fnotifystat = callPackage ../os-specific/linux/fnotifystat { }; forkstat = callPackage ../os-specific/linux/forkstat { }; From 72d8eeea88d5b37bff179d6dbb3164f72bddca7e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:58 +0800 Subject: [PATCH 1137/2806] Revert "amarok-kf5: init at 2.8.91-20170228" This reverts commit fde0bad57796e29337e8a1f1dcbb0164f5e56b1c. --- pkgs/applications/audio/amarok/kf5.nix | 37 -------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 39 deletions(-) delete mode 100644 pkgs/applications/audio/amarok/kf5.nix diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix deleted file mode 100644 index a96aa3ed65d..00000000000 --- a/pkgs/applications/audio/amarok/kf5.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ mkDerivation, fetchgit, lib -, extra-cmake-modules, kdoctools -, qca-qt5, qjson, qtscript, qtwebkit -, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor -, phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mariadb, pcre, snappy, taglib, taglib_extras -}: - -let - pname = "amarok"; - version = "2.8.91-20170228"; - -in mkDerivation { - name = "${pname}-${version}"; - - src = fetchgit { - url = git://anongit.kde.org/amarok.git; - # go back to the KDE mirror when kf5 is merged into master - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "323e2d5b43245c4c06e0b83385d37ef0d32920cb"; - sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; - }; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - qca-qt5 qjson qtscript qtwebkit - kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor - phonon plasma-framework threadweaver - curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mariadb pcre snappy taglib taglib_extras - ]; - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 565b17984ce..f01d1d97d31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13631,8 +13631,6 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; - amarok-kf5 = libsForQt5.callPackage ../applications/audio/amarok/kf5.nix { }; - AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; From a5e387592ad82c7197c86944c076d38dcdd44962 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:41:05 +0800 Subject: [PATCH 1138/2806] Revert "nix-upgrade-scripts: init at 0.0.4" This reverts commit 15d2cf5494a43b0b5312a834232af9b5b62f32ca. --- .../nix-upgrade-scripts/default.nix | 30 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/tools/package-management/nix-upgrade-scripts/default.nix diff --git a/pkgs/tools/package-management/nix-upgrade-scripts/default.nix b/pkgs/tools/package-management/nix-upgrade-scripts/default.nix deleted file mode 100644 index d80e26a69fd..00000000000 --- a/pkgs/tools/package-management/nix-upgrade-scripts/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, nix }: - -stdenv.mkDerivation rec { - name = "nix-upgrade-scripts-${version}"; - version = "0.0.4"; - - src = fetchFromGitHub { - owner = "peterhoeg"; - repo = "nix-upgrade-scripts"; - rev = "v${version}"; - sha256 = "13v91nniwrs1fr92msrq6sq7vy1whrlxqd1ll4q3p1nrnbzpnxkn"; - }; - - installPhase = '' - mkdir -p $out/bin - cp -r bin lib $out/ - for f in $out/bin/* ; do - substituteInPlace $f \ - --replace '/usr/bin/env nix-shell' ${nix}/bin/nix-shell - done - chmod +x $out/bin/* - ''; - - meta = with stdenv.lib; { - description = "Scripts for making package upgrades easier"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01d1d97d31..67cce24decf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19146,8 +19146,6 @@ with pkgs; nix-serve = callPackage ../tools/package-management/nix-serve { }; - nix-upgrade-scripts = callPackages ../tools/package-management/nix-upgrade-scripts { }; - nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; From 279ca5738aadd09d1c6d3fc44ea60f81b3aac3c4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:41:13 +0800 Subject: [PATCH 1139/2806] Revert "nixos: kodi user" This reverts commit 1faa5b6b360ae4d6aac3718dc7b9b3a81be6073e. --- nixos/modules/misc/ids.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 3980ad3b5c0..7d9d9984cf2 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -304,8 +304,6 @@ nixbld = 30000; # start of range of uids nobody = 65534; - - kodi = 301; }; ids.gids = { @@ -577,8 +575,6 @@ users = 100; nixbld = 30000; nogroup = 65534; - - kodi = 301; }; }; From 2b5aab4b0f678bb23a122b63d724fbdb066a9479 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:41:18 +0800 Subject: [PATCH 1140/2806] Revert "sensu: nixos module" This reverts commit 707c3ac43589c1b13c16aa834f67b8fb49b8557d. --- nixos/modules/module-list.nix | 1 - .../services/monitoring/sensu/checks.nix | 76 -- .../services/monitoring/sensu/client.nix | 49 -- .../services/monitoring/sensu/dashboard.nix | 112 --- .../services/monitoring/sensu/default.nix | 710 ------------------ .../services/monitoring/sensu/handlers.nix | 70 -- .../monitoring/sensu/host_port_pair.nix | 17 - .../services/monitoring/sensu/mutators.nix | 17 - .../services/monitoring/sensu/plugins.nix | 83 -- .../services/monitoring/sensu/sites.nix | 59 -- 10 files changed, 1194 deletions(-) delete mode 100644 nixos/modules/services/monitoring/sensu/checks.nix delete mode 100644 nixos/modules/services/monitoring/sensu/client.nix delete mode 100644 nixos/modules/services/monitoring/sensu/dashboard.nix delete mode 100644 nixos/modules/services/monitoring/sensu/default.nix delete mode 100644 nixos/modules/services/monitoring/sensu/handlers.nix delete mode 100644 nixos/modules/services/monitoring/sensu/host_port_pair.nix delete mode 100644 nixos/modules/services/monitoring/sensu/mutators.nix delete mode 100644 nixos/modules/services/monitoring/sensu/plugins.nix delete mode 100644 nixos/modules/services/monitoring/sensu/sites.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5e6b42dea54..9cc3d73d295 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -379,7 +379,6 @@ ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix ./services/monitoring/scollector.nix - ./services/monitoring/sensu/default.nix ./services/monitoring/smartd.nix ./services/monitoring/statsd.nix ./services/monitoring/sysstat.nix diff --git a/nixos/modules/services/monitoring/sensu/checks.nix b/nixos/modules/services/monitoring/sensu/checks.nix deleted file mode 100644 index 4343286177c..00000000000 --- a/nixos/modules/services/monitoring/sensu/checks.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib }: - -{ - options = with lib; with types; { - type = mkOption { - type = enum [ "standard" "metric" ]; - default = "standard"; - description = "Type of check."; - }; - - standalone = mkOption { - type = bool; - default = false; - description = "Scheduled by the client instead of the server."; - }; - - command = mkOption { - type = str; - description = "Command to run."; - }; - - subscribers = mkOption { - type = listOf str; - default = []; - description = "Subscribers"; - }; - - handlers = mkOption { - default = []; - description = "Handlers."; - type = listOf str; - }; - - interval = mkOption { - type = int; - default = 60; - description = "Check interval."; - }; - - timeout = mkOption { - type = int; - default = 30; - description = "Check timeout."; - }; - - ttl = mkOption { - type = int; - default = 120; - description = "Check TTL."; - }; - - source = mkOption { - type = str; - default = ""; - description = "Custom source for JIT checks."; - }; - - occurrences = mkOption { - type = int; - default = 1; - description = "The number of occurrences before triggering an alert."; - }; - - subdue = mkOption { - type = attrs; - default = {}; - description = "Subdue check during certain windows."; - }; - - vars = mkOption { - type = attrs; - default = {}; - description = "Custom variables sent with the check."; - }; - }; -} diff --git a/nixos/modules/services/monitoring/sensu/client.nix b/nixos/modules/services/monitoring/sensu/client.nix deleted file mode 100644 index dc4c9864c09..00000000000 --- a/nixos/modules/services/monitoring/sensu/client.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib }: - -{ - options = with lib; with types; { - name = mkOption { - type = str; - default = ""; - description = "Name of the client."; - }; - - address = mkOption { - type = str; - default = ""; - description = "IP address"; - }; - - subscriptions = mkOption { - type = listOf str; - default = [ ]; - description = "Subscriptions"; - }; - - socket = mkOption { - description = "The socket configuration."; - default = {}; - type = submodule { - options = { - bind = mkOption { - type = str; - default = "127.0.0.1"; - description = "The IP address on which the client listens."; - }; - - port = mkOption { - type = int; - default = 3030; - description = "The port on which the client listens."; - }; - }; - }; - }; - - vars = mkOption { - type = attrs; - default = {}; - description = "Custom attributes/variables."; - }; - }; -} diff --git a/nixos/modules/services/monitoring/sensu/dashboard.nix b/nixos/modules/services/monitoring/sensu/dashboard.nix deleted file mode 100644 index dda38f2f8c4..00000000000 --- a/nixos/modules/services/monitoring/sensu/dashboard.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ config, lib, cfg }: - -{ - options = with lib; with types; { - enable = mkOption { - type = bool; - default = (cfg.role == "server"); - description = "Enable the dashboard"; - }; - - host = mkOption { - type = str; - default = "127.0.0.1"; - description = "The IP address on which Uchiwa will listen."; - }; - - port = mkOption { - type = int; - default = 3000; - description = "The port on which Uchiwa will listen."; - }; - - refresh = mkOption { - type = int; - default = 5; - description = "UI refresh interval."; - }; - - proxy = mkOption { - description = "Proxy traffic to/from the sensu dashboard."; - default = {}; - type = submodule { - options = { - enable = mkOption { - type = bool; - default = false; - description = "Enable proxy."; - }; - - path = mkOption { - type = str; - default = "/"; - description = "The path to the dashboard if behind a proxy."; - }; - - name = mkOption { - type = str; - default = config.networking.hostName; - description = "Hostname on which to repond."; - }; - - enableSSL = mkOption { - type = bool; - default = false; - description = "Force SSL."; - }; - }; - }; - }; - - users = mkOption { - description = "Users"; - default = {}; - type = listOf(submodule { - options = { - username = mkOption { - description = "User name."; - type = str; - }; - - password = mkOption { - description = "Password."; - type = str; - }; - - accessToken = mkOption { - default = ""; - description = "Access token."; - type = str; - }; - - readonly = mkOption { - default = false; - description = "Read only."; - type = bool; - }; - }; - }); - }; - - usersOptions = mkOption { - description = "Options relevant to all users"; - default = {}; - type = submodule { - options = { - - defaultTheme = mkOption { - type = enum [ "uchiwa-default" "uchiwa-dark" ]; - default = "uchiwa-dark"; - description = "The theme to use."; - }; - - logoUrl = mkOption { - type = str; - default = ""; - description = "The logo to use."; - }; - }; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/sensu/default.nix b/nixos/modules/services/monitoring/sensu/default.nix deleted file mode 100644 index 463420b4c18..00000000000 --- a/nixos/modules/services/monitoring/sensu/default.nix +++ /dev/null @@ -1,710 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - cfg = config.services.sensu; - pgm = cfg.programs; - - baseDir = "/etc/sensu"; - - transportIsRabbitMQ = (cfg.transport.name == "rabbitmq"); - roleIsServer = (cfg.role == "server"); - - # Setting the LOG_LEVEL env var doesn't work, so we force the logLevel via -L - bin = binary: lib.concatStringsSep " " [ - "${cfg.package}/bin/sensu-${binary}" - "-c ${baseDir}/config.json" - "-d ${baseDir}/conf.d" - "-e ${baseDir}/extensions" - "-L ${cfg.logLevel}" - ]; - - # Create a dedicated environment to allow for very long paths as systemd has a - # 2048 character limit - clientEnv = pkgs.buildEnv { - name = "sensu-env"; - pathsToLink = [ "/bin" ]; - paths = (with pkgs; [ gawk ] - ++ lib.optionals pgm.common [ check-uptime monitoring-plugins ] - ++ lib.optionals pgm.esx [ check-esxi-hardware ] - ++ lib.optionals pgm.http [ curl ] - ++ lib.optionals pgm.ipmi [ ipmitool which ] - ++ lib.optionals pgm.network [ check-nwc-health mtr ] - ++ lib.optionals pgm.openvpn [ sensu-check-openvpn ] - ++ lib.optionals pgm.snmp [ net_snmp ] - ++ lib.optionals pgm.ups [ check-ups-health ] - ++ cfg.dependencies - );}; - - sensuService = desc: bin: - let - pgm = lib.toLower desc; - isClient = lib.elem pgm [ "client" ]; - isDash = lib.elem pgm [ "dashboard" ]; - isServer = lib.elem pgm [ "api" "server" ]; - in { - description = "Sensu ${desc}"; - wantedBy = [ "sensu.target" ]; - after = [] - ++ lib.optionals isServer [ "redis.service" "rabbmitmq.service" ]; - # 1. Sensu is very shell-happy. I don't know if it actually requires bash - # per se, but it definitely needs a shell. - # 2. We need /run/wrappers early so the wrapped binary is found first - path = [ "/run/wrappers" pkgs.bash cfg.package ] - ++ lib.optional isClient clientEnv; - - # Needed for bundler - environment.HOME = "/run/sensu"; - - restartTriggers = [ ] - ++ lib.optionals isClient [ sensuCfg clientCfg ] - ++ lib.optionals isDash [ dashCfg ] - ++ lib.optionals isServer [ sensuCfg checkCfg filterCfg handlerCfg ]; - serviceConfig = { - ExecStart = bin; - # If you backport this to 17.03, DynamicUser WILL cause certain checks to - # fail as they expect to be able to resolve uid -> user name and the - # required NSS module isn't loaded (it is in master). - DynamicUser = true; - Slice = "sensu.slice"; - Restart = "on-failure"; - # Upstream recommends 1m which seems VERY long - RestartSec = "10s"; - ProtectSystem = "full"; - # ProtectControlGroups = true; - # ProtectKernelTunables = true; - # ProtectKernelModules = true; - # SystemCallArchitectures = "native"; - - # Sensu expects a common file in $HOME which must be shared with the other - # sensu units this can be enabled when our systemd module gets support for - # JoinsNamespaceOf. - PrivateTmp = true; - TimeoutStopSec = "5s"; - RuntimeDirectory = lib.mkIf isClient "sensu"; - # NoNewPrivileges = true; - }; - }; - - # This function serves two purposes: - # - # 1) We do a lot of attrs -> json but nix will add a "_module" key when - # dumping a submodule which is at best noise and in the worst case causes - # an unexpected setting to be set - # - # 2) We do not want to set defaults for everything (as defaults change), so if - # a value is an empty string|list|set, we simply remove the key from the - # generated JSON to allow sensu to apply its own defaults - - cleanAttrSet = set_or_list: - if builtins.isList set_or_list - then (map (s: cleanAttrSet s) set_or_list) - else lib.filterAttrsRecursive (k: v: - !(k == "_module" || v == "" || v == [] || v == {})) set_or_list; - - checkCfg = pkgs.writeText "checks.json" (builtins.toJSON (cleanAttrSet { - inherit (cfg) checks; - })); - - filterCfg = pkgs.writeText "filters.json" (builtins.toJSON (cleanAttrSet { - inherit (cfg) filters; - })); - - handlerCfg = pkgs.writeText "handlers.json" (builtins.toJSON (cleanAttrSet { - inherit (cfg) handlers; - } // cfg.plugins)); - - mutatorCfg = pkgs.writeText "mutators.json" (builtins.toJSON (cleanAttrSet { - inherit (cfg) mutators; - })); - - sensuCfg = let - rabbitmq = cleanAttrSet cfg.rabbitmq; - in pkgs.writeText "config.json" (builtins.toJSON ({ - inherit rabbitmq; - } // (cleanAttrSet (if roleIsServer - then { inherit (cfg) api extensions influxdb mutators redis transport; } // cfg.extraServerConfig - else { inherit (cfg) extensions transport; } // cfg.extraClientConfig)))); - - clientCfg = pkgs.writeText "client.json" (builtins.toJSON (cleanAttrSet { - inherit (cfg) client; - })); - - dashCfg = pkgs.writeText "uchiwa.json" (builtins.toJSON (cleanAttrSet { - sensu = cleanAttrSet cfg.sites; - uchiwa = cfg.dashboard // { - loglevel = cfg.logLevel; - }; - })); - - # Currently not used - makePlugin = name: config: base: - let - fileName = "plugin-${name}.json"; - in { - source = pkgs.writeText fileName (builtins.toJSON { "${name}" = config; }); - target = "${base}/${fileName}"; - }; - -in { - - options = { - services.sensu = with lib; with types; { - enable = mkOption { - type = bool; - default = false; - description = '' - Enable the Sensu network monitoring daemon. - ''; - }; - - # Add support for dashboard rabbitmq redis etc - role = mkOption { - # type = listOf enum [ "server" "client" "dashboard" "influxdb" "rabbmitmq" "redis" ]; - type = enum [ "server" "client" ]; - # default = [ "server" ]; - default = "server"; - description = "Operate as client only or server and client."; - }; - - transport = mkOption { - default = {}; - description = "The transport."; - type = submodule { - options = { - name = mkOption { - type = enum [ "redis" "rabbitmq" ]; - default = "redis"; - description = "The transport to use."; - }; - - reconnect_on_error = mkOption { - type = bool; - default = true; - description = "Automatically reconnect on error."; - }; - }; - }; - }; - - openDefaultPorts = mkOption { - type = bool; - default = false; - description = "Automatically open the firewall ports."; - }; - - defaultClientSubscriptions = mkOption { - type = listOf str; - default = [ "sensu-client" ]; - description = "Default subscriptions for sensu clients."; - }; - - defaultServerSubscriptions = mkOption { - type = listOf str; - default = [ "sensu-server" ]; - description = "Default subscriptions for sensu servers."; - }; - - defaultSubscriptions = { - enable = mkEnableOption "Default checks of the sensu environment."; - - interval = mkOption { - description = "How frequently to run interval checks."; - default = 60; - type = int; - }; - - occurrences = mkOption { - description = "How many occurrences before we trigger an alert."; - default = 2; - type = int; - }; - }; - - package = mkOption { - type = package; - default = pkgs.sensu; - description = "The package to use."; - }; - - dependencies = mkOption { - type = listOf package; - default = []; - description = "Additional packages to inject into the path."; - }; - - logLevel = mkOption { - type = enum [ "debug" "info" "warn" "error" "fatal" ]; - default = "info"; - description = ''The level of logging. The default info is VERY verbose - and you probably want to change this to 'warn' when things are working - ''; - }; - - extraClientConfig = mkOption { - type = attrs; - default = {}; - description = "Additional configuration data that will be added to the client config."; - }; - - extraServerConfig = mkOption { - type = attrs; - default = {}; - description = "Additional configuration data that will be added to the server config."; - }; - - extensions = mkOption { - type = attrs; - default = {}; - description = "Extensions to load."; - }; - - redis = mkOption { - description = "Redis configuration."; - default = {}; - type = (submodule (import ./host_port_pair.nix { - inherit lib; - name = "redis"; - defaultHost = "127.0.0.1"; - defaultPort = 6379; - })); - }; - - influxdb = mkOption { - description = "InfluxDB configuration."; - default = {}; - type = (submodule (import ./host_port_pair.nix { - inherit lib; - name = "influxdb"; - defaultHost = "localhost"; - defaultPort = 8086; - options = { - database = mkOption { - default = "sensu"; - description = "InfluxDB database"; - type = str; - }; - - user = mkOption { - default = null; - description = "InfluxDB user"; - type = nullOr str; - }; - - password = mkOption { - default = null; - description = "InfluxDB password"; - type = nullOr str; - }; - - templates = mkOption { - default = {}; - description = "Templates"; - type = attrs; - }; - }; - })); - }; - - rabbitmq = mkOption { - description = "RabbitMQ configuration."; - default = []; - type = listOf (submodule (import ./host_port_pair.nix { - inherit lib; - name = "rabbitmq"; - defaultHost = "127.0.0.1"; - defaultPort = config.services.rabbitmq.port; - options = { - vhost = mkOption { - default = "/sensu"; - description = "RabbitMQ vhost"; - type = str; - }; - - user = mkOption { - default = "sensu"; - description = "RabbitMQ user"; - type = str; - }; - - password = mkOption { - description = "RabbitMQ password"; - type = str; - }; - - heartbeat = mkOption { - default = 30; - description = "RabbitMQ heartbeat"; - type = int; - }; - - prefetch = mkOption { - default = 50; - description = "RabbitMQ prefetch"; - type = int; - }; - - ssl = mkOption { - default = {}; - description = "RabbitMQ SSL options."; - type = submodule { - options = { - cert_chain_file = mkOption { - default = ""; - description = "Path to the cert chain file."; - type = str; - }; - - private_key_file = mkOption { - default = ""; - description = "Path to the private key file."; - type = str; - }; - }; - }; - }; - }; - })); - }; - - configureInfluxDb = mkOption { - default = false; - description = "Whether the database should be configured for Sensu on InfluxDB."; - type = bool; - }; - - configureRabbitMq = mkOption { - default = false; - description = "Whether the vhost/user/permissions should be configured for Sensu on RabbitMQ."; - type = bool; - }; - - api = mkOption { - description = "API server configuration."; - default = {}; - type = (submodule (import ./host_port_pair.nix { - inherit lib; - name = "api"; - defaultHost = "127.0.0.1"; - defaultPort = 4567; - options = { - bind = mkOption { - type = str; - default = "0.0.0.0"; - description = "The address that the API will bind to (listen on)."; - }; - }; - })); - }; - - programs = let - programOption = name: default: mkOption { - type = bool; - description = "Enable support for ${name}."; - inherit default; - }; in mkOption { - description = "Programs to enable for checks"; - default = {}; - type = submodule { - options = { - # some of the built-in checks require the common package - common = programOption "common" true; - esx = programOption "esx" false; - http = programOption "http" false; - ipmi = programOption "ipmi" false; - network = programOption "network" false; - openvpn = programOption "openvpn" false; - snmp = programOption "snmp" false; - ups = programOption "ups" false; - }; - }; - }; - - checks = mkOption { - type = with types; attrsOf (submodule (import ./checks.nix { inherit lib; })); - default = {}; - description = "The checks configured."; - }; - - client = mkOption { - description = "The client configuration."; - default = {}; - type = submodule (import ./client.nix { inherit lib; }); - }; - - dashboard = mkOption { - description = "The Sensu dashboard."; - default = {}; - type = submodule (import ./dashboard.nix { inherit cfg config lib; }); - }; - - filters = mkOption { - type = attrs; - default = {}; - description = "The filters available to Sensu."; - }; - - handlers = mkOption { - type = with types; attrsOf (submodule (import ./handlers.nix { inherit lib; })); - default = {}; - description = "The handlers available to Sensu."; - }; - - mutators = mkOption { - type = with types; attrsOf (submodule (import ./mutators.nix { inherit lib; })); - default = {}; - description = "The mutators available to Sensu."; - }; - - sites = mkOption { - type = listOf (submodule (import ./sites.nix { inherit lib; })); - description = "The sites configured."; - default = []; - }; - - plugins = mkOption { - type = attrs; - description = "Plugin configuration."; - default = {}; - }; - }; - }; - - config = lib.mkIf cfg.enable { - - # Needed for being able to process UDP traffic - boot.kernel.sysctl = lib.mkDefault { - "net.core.rmem_max" = 26214400; - "net.core.rmem_default" = 26214400; - }; - - environment = let dir = "${lib.removePrefix "/etc/" baseDir}/conf.d"; in { - etc = { - checks = lib.mkIf roleIsServer { - source = checkCfg; - target = "${dir}/checks.json"; - }; - filters = lib.mkIf roleIsServer { - source = filterCfg; - target = "${dir}/filters.json"; - }; - handlers = lib.mkIf roleIsServer { - source = handlerCfg; - target = "${dir}/handlers.json"; - }; - # influxdb_line_protocol = { - # source = "${cfg.package}/bin/mutator-influxdb-line-protocol.rb"; - # target = "sensu/extensions/mutator-influxdb-line-protocol.rb"; - # }; - uchiwa = lib.mkIf roleIsServer { - source = dashCfg; - target = "sensu/uchiwa.json"; - }; - client = { - source = clientCfg; - target = "${dir}/client.json"; - }; - config = { - source = sensuCfg; - target = "sensu/config.json"; - }; - }; - - systemPackages = with pkgs; [ - jq - nmap - tree - ]; - }; - - networking.firewall.allowedTCPPorts = lib.mkIf cfg.openDefaultPorts ([] - ++ lib.optional (cfg.client.socket != "127.0.0.1") cfg.client.socket.port - ++ lib.optional roleIsServer cfg.api.port - ++ lib.optional (cfg.dashboard.enable) cfg.dashboard.port - ); - - services = let pcfg = cfg.dashboard.proxy; in { - nginx = lib.mkIf pcfg.enable { - enable = true; - virtualHosts = { - "${pcfg.name}" = rec { - addSSL = pcfg.enableSSL; - enableACME = addSSL; - extraConfig = let - inherit (pcfg) enable path; - in '' - location ${path} { - proxy_pass http://localhost:${toString cfg.dashboard.port}; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - - rewrite ${path}(.*) /$1 break; - } - ''; - }; - }; - }; - - rabbitmq = lib.mkIf (roleIsServer && transportIsRabbitMQ) { - enable = true; - }; - - redis = lib.mkIf roleIsServer { - enable = true; - bind = "127.0.0.1"; - }; - - sensu = { - checks = let disk = { warn = 20; crit = 10; }; in { - sensu-disk-root = { - command = lib.concatStringsSep " " [ - "check_disk" - "--warning=${toString disk.warn}" - "--critical=${toString disk.crit}" - "--path=/" - ]; - subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; - inherit (cfg.defaultSubscriptions) interval occurrences; - }; - - sensu-disk-var = { - command = lib.concatStringsSep " " [ - "check_disk" - "--warning=${toString disk.warn}" - "--critical=${toString disk.crit}" - "--path=/var" - ]; - subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; - inherit (cfg.defaultSubscriptions) interval occurrences; - }; - - sensu-load = { - command = lib.concatStringsSep " " [ - "check_load" - "--warning=2.75,2.50,2.00" - "--critical=3.50,3.25,3.00" - "--percpu" - ]; - subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; - inherit (cfg.defaultSubscriptions) interval occurrences; - }; - - sensu-swap = { - command = lib.concatStringsSep " " [ - "check_swap" - "--warning=50%" - "--critical=20%" - "--no-swap=ok" - ]; - subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; - inherit (cfg.defaultSubscriptions) interval occurrences; - }; - - sensu-time = { - command = lib.concatStringsSep " " [ - "check_ntp_time" - "-H :::vars.ntp.host|0.nixos.pool.ntp.org:::" - ]; - subscribers = cfg.defaultServerSubscriptions; - inherit (cfg.defaultSubscriptions) interval occurrences; - }; - - sensu-uptime = { - command = lib.concatStringsSep " " [ - "check_uptime" - "--warning 3:" - ]; - subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; - inherit (cfg.defaultSubscriptions) interval occurrences; - }; - - sensu-influx-ping = { - command = lib.concatStringsSep " " [ - "check-influxdb.rb" - "--host ${cfg.influxdb.host}" - "--port ${toString cfg.influxdb.port}" - ]; - subscribers = cfg.defaultServerSubscriptions; - inherit (cfg.defaultSubscriptions) interval occurrences; - }; - - sensu-redis-mem = { - command = lib.concatStringsSep " " [ - "check-redis-memory-percentage.rb" - "--host ${cfg.redis.host}" - "--port ${toString cfg.redis.port}" - "--critmem 90" - "--warnmem 70" - ]; - subscribers = cfg.defaultServerSubscriptions; - inherit (cfg.defaultSubscriptions) interval occurrences; - }; - - sensu-error-log = { - command = lib.concatStringsSep " " [ - "check-journal.rb" - "--journalctl_args='-p err --quiet' -q ''" - ]; - subscribers = cfg.defaultServerSubscriptions ++ cfg.defaultClientSubscriptions; - inherit (cfg.defaultSubscriptions) interval occurrences; - }; - }; - - client.subscriptions = lib.mkIf cfg.defaultSubscriptions.enable ( - if roleIsServer then cfg.defaultServerSubscriptions - else cfg.defaultClientSubscriptions - ); - - extensions = { - influxdb = { - gem = "sensu-extensions-influxdb"; - }; - }; - }; - }; - - systemd = let - runRabbitMq = (roleIsServer && transportIsRabbitMQ && cfg.configureRabbitMq); - in { - services = { - sensu-api = lib.mkIf roleIsServer (sensuService "API" (bin "api")); - sensu-client = (sensuService "Client" (bin "client")); - sensu-server = lib.mkIf roleIsServer (sensuService "Server" (bin "server")); - sensu-dashboard = lib.mkIf cfg.dashboard.enable (sensuService "Dashboard" - "${pkgs.uchiwa}/bin/uchiwa -c ${baseDir}/uchiwa.json" - ); - - rabbitmq = lib.mkIf runRabbitMq { - wants = [ "rabbitmq-setup.service" ]; - }; - - rabbitmq-setup = lib.mkIf runRabbitMq ( - let - rmq = builtins.head config.services.sensu.rabbitmq; - service = [ "rabbitmq.service" ]; - in lib.mkIf transportIsRabbitMQ { - description = "Configure RabbitMQ queue and user for Sensu"; - wants = service; - after = service; - script = '' - export HOME=${config.services.rabbitmq.dataDir} - export PATH=${lib.makeBinPath (with pkgs; [ coreutils gnused rabbitmq_server ])}:$PATH - - rabbitmqctl add_vhost ${rmq.vhost} - rabbitmqctl add_user ${rmq.user} '${rmq.password}' - rabbitmqctl set_permissions -p ${rmq.vhost} ${rmq.user} ".*" ".*" ".*" - - # get rid of guest - rabbitmqctl delete_user guest - ''; - }); - }; - - targets.sensu = { - description = "Sensu Monitoring"; - wantedBy = [ "multi-user.target" ]; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/sensu/handlers.nix b/nixos/modules/services/monitoring/sensu/handlers.nix deleted file mode 100644 index befe50fa834..00000000000 --- a/nixos/modules/services/monitoring/sensu/handlers.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib }: - -{ - options = with lib; with types; { - type = mkOption { - description = "Type of handler."; - type = enum [ "pipe" "tcp" "udp" "transport" "set" ]; - }; - - filters = mkOption { - default = []; - description = "List of filters."; - type = listOf str; - }; - - severities = mkOption rec { - default = [ "critical" "warning" "unknown" ]; - description = "Severities to handle."; - type = listOf (enum (default ++ [ "ok" ])); - }; - - subscribers = mkOption { - default = []; - description = "Subscribers"; - type = listOf str; - }; - - timeout = mkOption { - default = 30; - description = "Timeout."; - type = int; - }; - - command = mkOption { - default = ""; - description = "Command for type pipe."; - type = str; - }; - - socket = mkOption { - default = {}; - description = "Socket for type tcp or udp."; - type = attrs; - }; - - pipe = mkOption { - default = {}; - description = "Pipe for type pipe."; - type = attrs; - }; - - mutator = mkOption { - default = ""; - description = "Mutator."; - type = str; - }; - - handlers = mkOption { - default = []; - description = "Handlers for type set."; - type = listOf str; - }; - - subdue = mkOption { - type = attrs; - default = {}; - description = "Subdue handler during certain windows."; - }; - }; -} diff --git a/nixos/modules/services/monitoring/sensu/host_port_pair.nix b/nixos/modules/services/monitoring/sensu/host_port_pair.nix deleted file mode 100644 index 283a8f59acf..00000000000 --- a/nixos/modules/services/monitoring/sensu/host_port_pair.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, name, defaultHost ? null, defaultPort ? null, options ? {} }: - -{ - options = with lib; with types; { - host = mkOption { - type = str; - default = defaultHost; - description = "The hostname of ${name}"; - }; - - port = mkOption { - type = int; - default = defaultPort; - description = "The port of ${name}"; - }; - } // options; -} diff --git a/nixos/modules/services/monitoring/sensu/mutators.nix b/nixos/modules/services/monitoring/sensu/mutators.nix deleted file mode 100644 index 9325ec480e9..00000000000 --- a/nixos/modules/services/monitoring/sensu/mutators.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib }: - -{ - options = with lib; with types; { - command = mkOption { - default = ""; - description = "Command for mutator."; - type = str; - }; - - timeout = mkOption { - default = 30; - description = "Timeout."; - type = int; - }; - }; -} diff --git a/nixos/modules/services/monitoring/sensu/plugins.nix b/nixos/modules/services/monitoring/sensu/plugins.nix deleted file mode 100644 index 95d70f88391..00000000000 --- a/nixos/modules/services/monitoring/sensu/plugins.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib }: - -{ - options = with lib; with types; { - - mailer = mkOption { - description = "sensu-plugins-mailer"; - default = {}; - type = submodule { - options = { - mail_from = mkOption { - type = str; - description = "Sender"; - }; - - mail_to = mkOption { - type = str; - description = "Recipient"; - }; - }; - }; - }; - }; -} - - - - - -# type = mkOption { -# type = enum [ "pipe" "tcp" "udp" "transport" "set" ]; -# description = "Type of handler."; -# }; - -# filters = mkOption { -# type = listOf str; -# default = []; -# description = "List of filters."; -# }; - -# severities = mkOption { -# type = listOf (enum [ "warning" "critical" "unknown" ]); -# default = [ "unknown" ]; -# description = "Severities to handle."; -# }; - -# subscribers = mkOption { -# type = listOf str; -# default = []; -# description = "Subscribers"; -# }; - -# timeout = mkOption { -# type = int; -# default = 30; -# description = "Timeout."; -# }; - -# command = mkOption { -# type = str; -# default = ""; -# description = "Command for type pipe."; -# }; - -# socket = mkOption { -# type = attrs; -# default = {}; -# description = "Socket for type tcp or udp."; -# }; - -# pipe = mkOption { -# type = attrs; -# default = {}; -# description = "Pipe for type pipe."; -# }; - -# handlers = mkOption { -# type = listOf str; -# default = []; -# description = "Handlers for type set."; -# }; -# }; -# } diff --git a/nixos/modules/services/monitoring/sensu/sites.nix b/nixos/modules/services/monitoring/sensu/sites.nix deleted file mode 100644 index f983305d825..00000000000 --- a/nixos/modules/services/monitoring/sensu/sites.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib }: - -{ - options = with lib; { - name = mkOption { - type = types.str; - default = "Site 1"; - description = "Name of the site."; - }; - - host = mkOption { - type = types.str; - default = "localhost"; - description = "Host name"; - }; - - port = mkOption { - type = types.int; - default = 4567; - description = "Port"; - }; - - ssl = mkOption { - type = types.bool; - default = true; - description = "Enable SSL"; - }; - - insecure = mkOption { - type = types.bool; - default = true; - description = "Insecure"; - }; - - user = mkOption { - type = types.str; - default = ""; - description = "User name for authentication"; - }; - - pass = mkOption { - type = types.str; - default = ""; - description = "Password for authentication"; - }; - - path = mkOption { - type = types.str; - default = ""; - description = "Path?"; - }; - - timeout = mkOption { - type = types.int; - default = 5; - description = "Timeout"; - }; - }; -} From 3211098632bcc0328427d19e2f063e5f3ba139cc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:41:48 +0800 Subject: [PATCH 1141/2806] Revert "sshguard: make it run" This reverts commit 69d8b81b4ba613dbf59850b8f32e2d7ddeb133be. --- nixos/modules/services/security/sshguard.nix | 68 +++++++++++--------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index c36ab405f9b..7f09e8893c4 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -87,50 +87,54 @@ in { config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.sshguard pkgs.iptables pkgs.ipset ]; + environment.etc."sshguard.conf".text = let list_services = ( name: "-t ${name} "); in '' - BACKEND="${lib.getBin pkgs.sshguard}/libexec/sshg-fw-ipset" - LOGREADER="LANG=C ${lib.getBin pkgs.systemd}/bin/journalctl -afb -p info -n1 ${toString (map list_services cfg.services)} -o cat" + BACKEND="${pkgs.sshguard}/libexec/sshg-fw-ipset" + LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl -afb -p info -n1 ${toString (map list_services cfg.services)} -o cat" ''; - systemd.services.sshguard = { - description = "SSHGuard brute-force attacks protection system"; + systemd.services.sshguard = + { description = "SSHGuard brute-force attacks protection system"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - partOf = optional config.networking.firewall.enable "firewall.service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + partOf = optional config.networking.firewall.enable "firewall.service"; - path = with pkgs; [ iptables ipset iproute systemd ]; + path = [ pkgs.iptables pkgs.ipset pkgs.iproute pkgs.systemd ]; - postStart = '' - mkdir -p /var/lib/sshguard - ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:ip family inet - ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:ip family inet6 - ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP - ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP - ''; + postStart = '' + mkdir -p /var/lib/sshguard + ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:ip family inet + ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:ip family inet6 + ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP + ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP + ''; - preStop = '' - ${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP - ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP - ''; + preStop = '' + ${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP + ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP + ''; - unitConfig.Documentation = "man:sshguard(8)"; + unitConfig.Documentation = "man:sshguard(8)"; - serviceConfig = { - Type = "simple"; - ExecStart = let - list_whitelist = ( name: "-w ${name} "); - in '' - ${pkgs.sshguard}/bin/sshguard -a ${toString cfg.attack_threshold} ${optionalString (cfg.blacklist_threshold != null) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file} "}-i /run/sshguard/sshguard.pid -p ${toString cfg.blocktime} -s ${toString cfg.detection_time} ${toString (map list_whitelist cfg.whitelist)} + serviceConfig = { + Type = "simple"; + ExecStart = let + list_whitelist = ( name: "-w ${name} "); + in '' + ${pkgs.sshguard}/bin/sshguard -a ${toString cfg.attack_threshold} ${optionalString (cfg.blacklist_threshold != null) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file} "}-i /run/sshguard/sshguard.pid -p ${toString cfg.blocktime} -s ${toString cfg.detection_time} ${toString (map list_whitelist cfg.whitelist)} ''; - Restart = "always"; - ProtectSystem = true; - PrivateTmp = true; - RuntimeDirectory = "sshguard"; - # CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; + PIDFile = "/run/sshguard/sshguard.pid"; + Restart = "always"; + + ReadOnlyDirectories = "/"; + ReadWriteDirectories = "/run/sshguard /var/lib/sshguard"; + RuntimeDirectory = "sshguard"; + CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; + }; }; - }; }; } From 2cd4ebfe93c2ceb5d01073d5b4372b80687c7527 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:41:54 +0800 Subject: [PATCH 1142/2806] Revert "display-manager: systemd-udev-settle serves no purpose" This reverts commit 35711638587a5079b1fcb6354a71d9b8203cd6e1. --- nixos/modules/services/x11/xserver.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 394078e7088..d4fe475690c 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -603,7 +603,8 @@ in systemd.services.display-manager = { description = "X11 Server"; - after = [ "acpid.service" "systemd-logind.service" ]; + after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ]; + wants = [ "systemd-udev-settle.service" ]; restartIfChanged = false; From 0f486c46b2f746007e083b5122145c35c3bd38ed Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:42:01 +0800 Subject: [PATCH 1143/2806] Revert "networkd: only wait for network to be online if configured to do so" This reverts commit 8f21e089a8de9eaa2512af25191d17077eca223a. --- nixos/modules/system/boot/networkd.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 85e5aa478f1..9d2cea3ad16 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -8,8 +8,6 @@ let cfg = config.systemd.network; - waitOnline = config.networking.waitForOnline; - checkLink = checkUnitConfig "Link" [ (assertOnlyFields [ "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name" @@ -701,9 +699,9 @@ in config = mkIf config.systemd.network.enable { systemd.additionalUpstreamSystemUnits = [ + "systemd-networkd.service" "systemd-networkd-wait-online.service" "org.freedesktop.network1.busname" - "systemd-networkd.service" - ] ++ optional waitOnline "systemd-networkd-wait-online.service"; + ]; systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs @@ -716,11 +714,11 @@ in restartTriggers = map (f: f.source) (unitFiles); }; - systemd.services.systemd-networkd-wait-online = lib.mkIf waitOnline { + systemd.services.systemd-networkd-wait-online = { wantedBy = [ "network-online.target" ]; }; - systemd.services."systemd-network-wait-online@" = lib.mkIf waitOnline { + systemd.services."systemd-network-wait-online@" = { description = "Wait for Network Interface %I to be Configured"; conflicts = [ "shutdown.target" ]; requisite = [ "systemd-networkd.service" ]; From 6fd4209594f58bf79bf99aae42125101f9387f15 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:42:07 +0800 Subject: [PATCH 1144/2806] Revert "networking: add option to toggle the wait-online service" This reverts commit 8758f476b36e1d98ad2c854889c642ad6d86c505. --- nixos/modules/config/networking.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 5f42ec51703..619f36cd515 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -186,15 +186,6 @@ in ''; }; }; - networking.waitForOnline = lib.mkOption { - type = types.bool; - default = true; - description = '' - When bringing up the network, always wait for it to be online before continuing. - - This is currently only implemented for networkd. - ''; - }; }; config = { From b366760cf5992fce214abc336aa35c92160e48a5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:42:12 +0800 Subject: [PATCH 1145/2806] Revert "hyperv-daemons: add nixos module" This reverts commit 0944d44f1b040856e420aad815a0d1b62194a2cb. --- nixos/modules/module-list.nix | 1 - nixos/modules/virtualisation/hyperv-guest.nix | 37 ------------------- 2 files changed, 38 deletions(-) delete mode 100644 nixos/modules/virtualisation/hyperv-guest.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9cc3d73d295..a8cb957ffe2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -724,7 +724,6 @@ ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix ./virtualisation/amazon-options.nix - ./virtualisation/hyperv-guest.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/rkt.nix diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix deleted file mode 100644 index ecd2a811771..00000000000 --- a/nixos/modules/virtualisation/hyperv-guest.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.virtualisation.hypervGuest; - -in { - options = { - virtualisation.hypervGuest = { - enable = mkEnableOption "Hyper-V Guest Support"; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ config.boot.kernelPackages.hyperv-daemons.bin ]; - - security.rngd.enable = false; - - # enable hotadding memory - services.udev.packages = lib.singleton (pkgs.writeTextFile { - name = "hyperv-memory-hotadd-udev-rules"; - destination = "/etc/udev/rules.d/99-hyperv-memory-hotadd.rules"; - text = '' - ACTION="add", SUBSYSTEM=="memory", ATTR{state}="online" - ''; - }); - - systemd = { - packages = [ config.boot.kernelPackages.hyperv-daemons.lib ]; - - targets.hyperv-daemons = { - wantedBy = [ "multi-user.target" ]; - }; - }; - }; -} From f22ce20ec0ecb29e8b1f1b08170276f6fe54c589 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:42:17 +0800 Subject: [PATCH 1146/2806] Revert "hyperv-daemons: init at current linux kernel version" This reverts commit 51f1c635e679fdadead32e5aec464b28c254d099. --- .../linux/hyperv-daemons/default.nix | 109 ------------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 111 deletions(-) delete mode 100644 pkgs/os-specific/linux/hyperv-daemons/default.nix diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix deleted file mode 100644 index 91b3c25bd31..00000000000 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ stdenv, lib, python, kernel, makeWrapper, writeText }: - -let - daemons = stdenv.mkDerivation rec { - name = "hyperv-daemons-bin-${version}"; - inherit (kernel) src version; - - nativeBuildInputs = [ makeWrapper ]; - - # as of 4.9 compilation will fail due to -Werror=format-security - hardeningDisable = [ "format" ]; - - preConfigure = '' - cd tools/hv - ''; - - installPhase = '' - runHook preInstall - - for f in fcopy kvp vss ; do - install -Dm755 hv_''${f}_daemon -t $out/bin - done - - install -Dm755 hv_get_dns_info.sh lsvmbus -t $out/bin - - # I don't know why this isn't being handled automatically by fixupPhase - substituteInPlace $out/bin/lsvmbus \ - --replace '/usr/bin/env python' ${python.interpreter} - - runHook postInstall - ''; - - postFixup = '' - # kvp needs to be able to find the script(s) - wrapProgram $out/bin/hv_kvp_daemon --prefix PATH : $out/bin - ''; - }; - - service = bin: title: check: - writeText "hv-${bin}.service" '' - [Unit] - Description=Hyper-V ${title} daemon - ConditionVirtualization=microsoft - ${lib.optionalString (check != "") '' - ConditionPathExists=/dev/vmbus/${check} - ''} - [Service] - ExecStart=@out@/hv_${bin}_daemon -n - Restart=on-failure - PrivateTmp=true - Slice=hyperv.slice - - [Install] - WantedBy=hyperv-daemons.target - ''; - -in stdenv.mkDerivation rec { - name = "hyperv-daemons-${version}"; - - inherit (kernel) version; - - # we just stick the bins into out as well as it requires "out" - outputs = [ "bin" "lib" "out" ]; - - phases = [ "installPhase" ]; - - buildInputs = [ daemons ]; - - installPhase = '' - system=$lib/lib/systemd/system - - mkdir -p $system - - cp ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service - cp ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service - cp ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service - - cat > $system/hyperv-daemons.target < Date: Sat, 14 Oct 2017 14:42:22 +0800 Subject: [PATCH 1147/2806] Revert "smartd: set drive timeout" This reverts commit 41306ca50580d66591058211676c463fcb30a2fd. --- nixos/modules/services/monitoring/smartd.nix | 31 ++------------------ 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 5dcd99a1e71..4d10299a987 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -81,32 +81,13 @@ let description = "Options that determine how smartd monitors the device."; }; - timeout = mkOption { - default = -1; - example = "70"; - type = types.int; - description = '' - Set SCT Error Recovery Control timeout in deciseconds for use in raid configurations. - - Values are as follows: - -1 = do not touch, leave at default - 0 = disable SCT ERT - 70 = default in consumer drives (7 seconds) - - Maximum is disk dependant but probably 60 seconds. - ''; - }; - }; }; - deviceTimeout = d: - lib.optionalString (d.timeout > -1) '' - ${pkgs.smartmontools}/bin/smartctl -l scterc,${d.timeout},${d.timeout} --silent errorsonly ${d.device} - ''; +in -in { +{ ###### interface options = { @@ -241,13 +222,7 @@ in { path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd - serviceConfig = { - ExecStartPre = '' - ${concatMapStringsSep "\n" deviceTimeout cfg.devices} - ''; - ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork --configfile=${smartdConf}"; - }; - + serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork --configfile=${smartdConf}"; }; }; From bdbba026f3f98e26509c21823a00de99af78b9c1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:42:29 +0800 Subject: [PATCH 1148/2806] Revert "dnsmasq nixos: make sure it always runs" This reverts commit 1917e69b546bc357652a3fd888c064e2a1c9fed8. --- nixos/modules/services/networking/dnsmasq.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 91a3e54474a..fcf5aa5f175 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -55,14 +55,6 @@ in ''; }; - alwaysKeepRunning = mkOption { - type = types.bool; - default = false; - description = '' - If enabled, systemd will always respawn dnsmasq even if shut down manually. The default, disabled, will only restart it on error. - ''; - }; - extraConfig = mkOption { type = types.lines; default = ""; @@ -109,12 +101,10 @@ in BusName = "uk.org.thekelleys.dnsmasq"; ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - PrivateTmp = true; - ProtectSystem = true; - ProtectHome = true; - Restart = if cfg.alwaysKeepRunning then "always" else "on-failure"; }; restartTriggers = [ config.environment.etc.hosts.source ]; }; + }; + } From 07bc859e9acec3cc6f7a8129e4b05a7584fef209 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:42:34 +0800 Subject: [PATCH 1149/2806] Revert "ssh: deprecate use of old DSA keys" This reverts commit 65b73d71cbe5df15ce62024123eedea284d825db. --- nixos/modules/services/networking/ssh/sshd.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 0834fc67284..8828429a817 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -363,9 +363,12 @@ in HostKey ${k.path} '')} + # Allow DSA client keys for now. (These were deprecated + # in OpenSSH 7.0.) + PubkeyAcceptedKeyTypes +ssh-dss + + # Re-enable DSA host keys for now. ${optionalString supportOldHostKeys '' - # Allow DSA keys for now. (deprecated in OpenSSH 7.0) - PubkeyAcceptedKeyTypes +ssh-dss HostKeyAlgorithms +ssh-dss ''} ''; From 0bd108d2ceb9f2405a92f2db1bb019968e950e0e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 13 Oct 2017 20:10:51 +0000 Subject: [PATCH 1150/2806] ocamlmod: 0.0.8 -> 0.0.9 --- .../development/tools/ocaml/ocamlmod/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index b24be7ba628..74dee630d29 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { name = "ocamlmod-${version}"; - version = "0.0.8"; + version = "0.0.9"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1544/${name}.tar.gz"; - sha256 = "1w0w8lfyymvk300dv13gvhrddpcyknvyp4g2yvq2vaw7khkhjs9g"; + url = "https://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz"; + sha256 = "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; + configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; + doCheck = true; + + checkPhase = "ocaml setup.ml -test"; + dontStrip = true; meta = { From c2758900a1be38e394b9dab5f1201e8703b695a5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 14 Oct 2017 08:06:01 +0000 Subject: [PATCH 1151/2806] ocamlPackages.ansiterminal: 0.6.5 -> 0.7 --- .../ocaml-modules/ansiterminal/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index ee25a47670e..7b9f0175151 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { - name = "ansiterminal-0.6.5"; + version = "0.7"; + + name = "ocaml${ocaml.version}-ansiterminal-${version}"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1206/ANSITerminal-0.6.5.tar.gz"; - sha256 = "1j9kflv2i16vf9hy031cl6z8hv6791mjbhnd9bw07y1pswdlx1r6"; + url = "https://github.com/Chris00/ANSITerminal/releases/download/${version}/ANSITerminal-${version}.tar.gz"; + sha256 = "03pqfxvw9pa9720l8i5fgxky1qx70kw6wxbczd5i50xi668lh0i9"; }; buildInputs = [ ocaml findlib ocamlbuild ]; @@ -20,7 +22,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://forge.ocamlcore.org/projects/ansiterminal; + homepage = "https://github.com/Chris00/ANSITerminal"; description = "A module allowing to use the colors and cursor movements on ANSI terminals"; longDescription = '' ANSITerminal is a module allowing to use the colors and cursor From 5cca8800a466d6d0a0741bda9db7480288ce50a1 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 14 Oct 2017 11:08:04 +0200 Subject: [PATCH 1152/2806] notmuch-bower: init at 2017-09-27 (#29856) * bower: init and add erictapen as maintainer * bower: fix up * notmuch-bower: rename from bower --- lib/maintainers.nix | 1 + .../mailreaders/notmuch-bower/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/notmuch-bower/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4b4c1d2b507..a6989531347 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -196,6 +196,7 @@ eqyiel = "Ruben Maher "; ericbmerritt = "Eric Merritt "; ericsagnes = "Eric Sagnes "; + erictapen = "Justin Humm "; erikryb = "Erik Rybakken "; ertes = "Ertugrul Söylemez "; ethercrow = "Dmitry Ivanov "; diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix new file mode 100644 index 00000000000..dbdd64d06b5 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }: + +stdenv.mkDerivation rec { + name = "notmuch-bower-${version}"; + version = "2017-09-27"; + + src = fetchFromGitHub { + owner = "wangp"; + repo = "bower"; + rev = "e4918ed581984bf2813f51f007a0aaaa7fa0da7f"; + sha256 = "13np5yharjik1pp23cfgffi0g0ikl6pl5sqqyy0ki7gk7gyy913i"; + }; + + nativeBuildInputs = [ gawk mercury pandoc ]; + + buildInputs = [ ncurses gpgme ]; + + makeFlags = [ "PARALLEL=-j$(NIX_BUILD_CORES)" "bower" "man" ]; + + installPhase = '' + mkdir -p $out/bin + mv bower $out/bin/ + mkdir -p $out/share/man/man1 + mv bower.1 $out/share/man/man1/ + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/wangp/bower; + description = "A curses terminal client for the Notmuch email system"; + maintainers = with maintainers; [ erictapen ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67d619cf988..0860b964032 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13829,6 +13829,8 @@ with pkgs; brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; + notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; + bristol = callPackage ../applications/audio/bristol { }; bs1770gain = callPackage ../applications/audio/bs1770gain { From 30b3b5d85f4493aa0364ca2537b6d2070450a73e Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 14 Oct 2017 11:09:00 +0200 Subject: [PATCH 1153/2806] announce myself as a maintainer added maintainer entries for `cdemu` (which i've created), as well as `wine` and `chromium` (which I regularly contribute to) --- lib/maintainers.nix | 1 + pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- pkgs/misc/emulators/cdemu/base.nix | 1 + pkgs/misc/emulators/cdemu/vhba.nix | 1 + pkgs/misc/emulators/wine/base.nix | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a6989531347..3116336db90 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -72,6 +72,7 @@ bcarrell = "Brandon Carrell "; bcdarwin = "Ben Darwin "; bdimcheff = "Brandon Dimcheff "; + bendlas = "Herwig Hochleitner "; benley = "Benjamin Staffin "; bennofs = "Benno Fünfstück "; benwbooth = "Ben Booth "; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 75f2dcda6a6..54fee5847e1 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ chaoflow bendlas ]; license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else []; diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index cc9d11f8643..e587151d3e7 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -32,5 +32,6 @@ in stdenv.mkDerivation ({ homepage = http://cdemu.sourceforge.net/; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; } // drvParams) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 7ec83959e38..d03b18f12d6 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://cdemu.sourceforge.net/about/vhba/; platforms = platforms.linux; licenses = licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 0f59892cce1..64bb8b4e356 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -109,6 +109,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { homepage = http://www.winehq.org/; license = "LGPL"; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = with stdenv.lib.maintainers; [ avnik raskin ]; + maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ]; }; }) From 4ce42a40c1556832f7b268fcbc70ba1c9fe7bf38 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Oct 2017 22:47:02 +0200 Subject: [PATCH 1154/2806] weechat-xmpp: init at 2017-08-30 --- .../weechat-xmpp/default.nix | 35 +++++++++++++++++++ .../weechat-xmpp/libpath.patch | 16 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 53 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix new file mode 100644 index 00000000000..8c7e80b3ff8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, xmpppy }: + +stdenv.mkDerivation { + name = "weechat-jabber-2017-08-30"; + + src = fetchFromGitHub { + repo = "weechat-xmpp"; + owner = "sleduc"; + sha256 = "0s02xs0ynld9cxxzj07al364sfglyc5ir1i82133mq0s8cpphnxv"; + rev = "8f6c21f5a160c9318c7a2d8fd5dcac7ab2e0d843"; + }; + + installPhase = '' + mkdir -p $out/share + cp jabber.py $out/share/jabber.py + ''; + + buildInputs = [ xmpppy ]; + + postPatch = '' + substituteInPlace jabber.py \ + --replace "__NIX_OUTPUT__" "${xmpppy}/lib/python2.7/site-packages" + ''; + + patches = [ + ./libpath.patch + ]; + + meta = with stdenv.lib; { + description = "A fork of the jabber plugin for weechat"; + homepage = "https://github.com/sleduc/weechat-xmpp"; + maintainers = with maintainers; [ ma27 ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch new file mode 100644 index 00000000000..d3faab33a8e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch @@ -0,0 +1,16 @@ +diff --git a/jabber.py b/jabber.py +index 27006a3..e53c2c0 100644 +--- a/jabber.py ++++ b/jabber.py +@@ -95,6 +95,11 @@ SCRIPT_COMMAND = SCRIPT_NAME + import re + import warnings + ++import sys ++ ++sys.path.append('__NIX_OUTPUT__') ++ ++ + import_ok = True + + try: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd3eef00f03..2f746130506 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17017,6 +17017,8 @@ with pkgs; inherit (luaPackages) cjson; }; + weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp {}; + westonLite = callPackage ../applications/window-managers/weston { pango = null; freerdp = null; From 6328c76e7785791c0397f43eaace1f85cbf33164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Oct 2017 11:53:23 +0200 Subject: [PATCH 1155/2806] xorg libXfont2, libXres: security updates CVE-2013-1988, CVE-2017-{13720,13722} --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/tarballs-7.7.list | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 59abcaaa7c4..da034838390 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -860,11 +860,11 @@ let }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; libXfont2 = (mkDerivation "libXfont2" { - name = "libXfont2-2.0.1"; + name = "libXfont2-2.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2; - sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; + url = mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2; + sha256 = "04f1lswh1ridkycgaivf1hrr77l5ap8smbfr2rqjrm7phwxqs24l"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; @@ -980,11 +980,11 @@ let }) // {inherit renderproto libX11 xproto ;}; libXres = (mkDerivation "libXres" { - name = "libXres-1.0.7"; + name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2; - sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296"; + url = mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2; + sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ resourceproto libX11 libXext xextproto xproto ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 70fca1a35ea..6635770c184 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -69,7 +69,7 @@ mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2 -mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2 +mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 @@ -79,7 +79,7 @@ mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 -mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2 +mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 From eef496f01c2b7d11e21d3f07e049f1f1ca752ecd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Oct 2017 11:54:59 +0200 Subject: [PATCH 1156/2806] pythonPackages.yowsup: init at v2.5.2 (#30406) * pythonPackages.yowsup: init at v2.5.2 * python.pkgs.yowsup: fix tests --- .../yowsup/argparse-dependency.patch | 13 ++++++++ .../python-modules/yowsup/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/yowsup/argparse-dependency.patch create mode 100644 pkgs/development/python-modules/yowsup/default.nix diff --git a/pkgs/development/python-modules/yowsup/argparse-dependency.patch b/pkgs/development/python-modules/yowsup/argparse-dependency.patch new file mode 100644 index 00000000000..364f0054fe7 --- /dev/null +++ b/pkgs/development/python-modules/yowsup/argparse-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 053ed07..60f0d9a 100755 +--- a/setup.py ++++ b/setup.py +@@ -5,7 +5,7 @@ import yowsup + import platform + import sys + +-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six'] ++deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six'] + + if sys.version_info < (2,7): + deps += ['importlib'] diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix new file mode 100644 index 00000000000..fce974ccd3a --- /dev/null +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage, stdenv, fetchFromGitHub, six, python-axolotl, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "yowsup"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "tgalal"; + repo = "yowsup"; + rev = "v${version}"; + sha256 = "16l8jmr32wwvl11m0a4r4id3dkfqj2n7dn6gky1077xwmj2da4fl"; + }; + + checkInputs = [ pytest ]; + checkPhase = '' + HOME=$(mktemp -d) py.test yowsup + ''; + + patches = [ ./argparse-dependency.patch ]; + + propagatedBuildInputs = [ six python-axolotl ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/tgalal/yowsup"; + description = "The python WhatsApp library"; + license = licenses.gpl3; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index facb6eb25b3..5c2b10003ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26537,6 +26537,8 @@ EOF }; }; + yowsup = callPackage ../development/python-modules/yowsup { }; + wptserve = callPackage ../development/python-modules/wptserve { }; yenc = callPackage ../development/python-modules/yenc { }; From 2baf618c3ee503b20fd55f0ba92b325a976de730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Oct 2017 11:55:21 +0200 Subject: [PATCH 1157/2806] xorg-server: security 1.19.4 -> 1.19.5 CVE-2017-{12176,12177,12178,12183} --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index da034838390..b2b238997b9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2576,11 +2576,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.4"; + name = "xorg-server-1.19.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2; - sha256 = "1a690fzv5l5ks45g9zhlzdskdq8q73mcbpb9a3wz3shxm778lxda"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2; + sha256 = "0iql4pgsgpyqcrd3256pv227cdadvz01ych61n0d41ixp67gmzqq"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 6635770c184..42cee12843c 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 From 60a7a4db83d53652e847104421702dd7969c4b9d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 14 Oct 2017 12:36:15 +0200 Subject: [PATCH 1158/2806] erlang: fix ssl on darwin --- pkgs/development/interpreters/erlang/R19.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 680111dbd77..5e2e1c7f215 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,9 +1,18 @@ -{ mkDerivation, fetchurl }: +{ mkDerivation, fetchurl, fetchpatch }: mkDerivation rec { version = "19.3"; sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; + patches = [ + # macOS 10.13 crypto fix from OTP-20.1.2 + (fetchpatch { + name = "darwin-crypto.patch"; + url = "https://github.com/erlang/otp/commit/882c90f72ba4e298aa5a7796661c28053c540a96.patch"; + sha256 = "1gggzpm8ssamz6975z7px0g8qq5i4jqw81j846ikg49c5cxvi0hi"; + }) + ]; + prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' ''; From 27bcd6c426914509e472d742ef17501ae6e885ed Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 14 Oct 2017 14:07:44 +0300 Subject: [PATCH 1159/2806] mailnag: fix working (#30358) * mailnag: fix working * mailnag: use wrapGAppsHook; add icon theme --- .../mailreaders/mailnag/default.nix | 37 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 6b8cf89fc75..281bc690bad 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,9 +1,12 @@ -{ stdenv, fetchurl, gettext, gtk3, python2Packages +{ stdenv, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 -, libgnome_keyring3 ? null, networkmanager ? null +, libgnome_keyring3, networkmanager +, wrapGAppsHook, gnome3 +, withGnomeKeyring ? false +, withNetworkManager ? true }: -python2Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "mailnag-${version}"; version = "1.2.1"; @@ -13,26 +16,20 @@ python2Packages.buildPythonApplication rec { }; buildInputs = [ - gettext gtk3 python2Packages.pygobject3 python2Packages.dbus-python - python2Packages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer + gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad libgnome_keyring3 networkmanager + gst_all_1.gst-plugins-bad + gnome3.defaultIconTheme + ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3 + ++ stdenv.lib.optional withNetworkManager networkmanager; + + nativeBuildInputs = [ + wrapGAppsHook ]; - preFixup = '' - for script in mailnag mailnag-config; do - wrapProgram $out/bin/$script \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix PYTHONPATH : "$PYTHONPATH" - done - ''; - - buildPhase = ""; - - installPhase = "python2 setup.py install --prefix=$out"; + propagatedBuildInputs = with pythonPackages; [ + pygobject3 dbus-python pyxdg + ]; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0860b964032..6b595c94311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3218,7 +3218,9 @@ with pkgs; mailhog = callPackage ../servers/mail/mailhog {}; - mailnag = callPackage ../applications/networking/mailreaders/mailnag { }; + mailnag = callPackage ../applications/networking/mailreaders/mailnag { + pythonPackages = python2Packages; + }; mailsend = callPackage ../tools/networking/mailsend { }; From 3ef3fc43a22f53cf2c00b9994569c28a83898829 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Oct 2017 08:03:53 -0400 Subject: [PATCH 1160/2806] partition-all-cabal-hashes: cross-compile safe --- pkgs/data/misc/hackage/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index eae7a814674..14ae22798c2 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -19,7 +19,8 @@ let partition-all-cabal-hashes = stdenv.mkDerivation { name = "partition-all-cabal-hashes"; src = ./partition-all-cabal-hashes.c; unpackPhase = "true"; - buildInputs = [ pkgconfig libarchive glib ]; + buildInputs = [ libarchive glib ]; + nativeBuildInputs = [ pkgconfig ]; buildPhase = "cc -O3 $(pkg-config --cflags --libs libarchive glib-2.0) $src -o partition-all-cabal-hashes"; installPhase = From 415db05504cdf8422fd8b681fd1f1e91b920230a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 14 Oct 2017 12:53:46 +0000 Subject: [PATCH 1161/2806] ocamlPackages.uuidm: 0.9.5 -> 0.9.6 --- pkgs/development/ocaml-modules/uuidm/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 0391cd5033f..5a1689eaeeb 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner }: stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.9.6"; name = "uuidm-${version}"; src = fetchurl { url = "http://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; - sha256 = "03bgxs119bphv9ggg97nsl5m61s43ixgby05hhggv16iadx9zndm"; + sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc"; }; unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ]; - configurePhase = "ocaml setup.ml -configure --prefix $prefix"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + inherit (topkg) buildPhase installPhase; createFindlibDestdir = true; From 7357d7b5eadf40097d3714ee1973552de9bb87a1 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sat, 14 Oct 2017 14:43:27 +0200 Subject: [PATCH 1162/2806] lxc: 2.0.8 -> 2.1.0 Related to #30023 Note that this comes with new configuration format, for migrating see https://linuxcontainers.org/lxc/news/#lxc-21-release-announcement-5th-of-september-2017 --- pkgs/os-specific/linux/lxc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index c1f9425efc3..f818d2c0d8c 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.0.8"; + version = "2.1.0"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "15449r56rqg3487kzsnfvz0w4p5ajrq0krcsdh6c9r6g0ark93hd"; + sha256 = "1qld0gi19mximxm0qyr6vzav32gymhc7fvp0bzwv37j0b8q0fi1r"; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libapparmor gnutls libselinux libseccomp cgmanager libnih dbus libcap - python3Packages.python systemd + python3Packages.python python3Packages.setuptools systemd ]; patches = [ From 0ff4bb5f875afe8eb208bbabb3f52dc29539d2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 8 Oct 2017 15:35:47 +0200 Subject: [PATCH 1163/2806] nixos: run parted with --script option -s, --script: never prompts for user intervention Sometimes the NixOS installer tests fail when they invoke parted, e.g. https://hydra.nixos.org/build/62513826/nixlog/1. But instead of exiting right there, the tests hang until the Nix builder times out (and kills the build). With this change the tests would instead fail immediately, which is preferred. While at it, use "parted --script" treewide, so nobody gets build timeout due to parted error (or misuse). (Only nixos/ use it, and only non-interactive.) A few instances already use the short option "-s", convert them to long option "--short". --- nixos/lib/make-disk-image.nix | 2 +- .../virtualisation/brightbox-image.nix | 6 +- nixos/tests/installer.nix | 64 +++++++++---------- nixos/tests/virtualbox.nix | 4 +- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index d4b2e338c3e..9fa848301f6 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -80,7 +80,7 @@ let truncate -s ${toString diskSize}M $diskImage ${if partitioned then '' - parted $diskImage -- mklabel msdos mkpart primary ext4 1M -1s + parted --script $diskImage -- mklabel msdos mkpart primary ext4 1M -1s offset=$((2048*512)) '' else '' offset=0 diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index 7f45f0f34f7..08bbcfd9d7c 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -33,9 +33,9 @@ in } '' # Create partition table - ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize} - ${pkgs.parted}/sbin/parted /dev/vda print + ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted --script /dev/vda mkpart primary ext4 1 ${diskSize} + ${pkgs.parted}/sbin/parted --script /dev/vda print . /sys/class/block/vda1/uevent mknod /dev/vda1 b $MAJOR $MINOR diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index c1dae2a34fa..da9582deec1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -260,9 +260,9 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary linux-swap 1M 1024M", - "parted /dev/vda -- mkpart primary ext2 1024M -1s", + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M", + "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", "udevadm settle", "mkswap /dev/vda1 -L swap", "swapon -L swap", @@ -277,11 +277,11 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel gpt", - "parted -s /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot - "parted -s /dev/vda -- set 1 boot on", - "parted -s /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB", - "parted -s /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # / + "parted --script /dev/vda mklabel gpt", + "parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot + "parted --script /dev/vda -- set 1 boot on", + "parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB", + "parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # / "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", @@ -300,10 +300,10 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot - "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M", - "parted /dev/vda -- mkpart primary ext2 1024M -1s", # / + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M", + "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # / "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", @@ -321,10 +321,10 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot - "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M", - "parted /dev/vda -- mkpart primary ext2 1024M -1s", # / + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M", + "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # / "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", @@ -357,9 +357,9 @@ in { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary linux-swap 1M 1024M", - "parted /dev/vda -- mkpart primary 1024M -1s", + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M", + "parted --script /dev/vda -- mkpart primary 1024M -1s", "udevadm settle", "mkswap /dev/vda1 -L swap", @@ -380,11 +380,11 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary 1M 2048M", # PV1 - "parted /dev/vda -- set 1 lvm on", - "parted /dev/vda -- mkpart primary 2048M -1s", # PV2 - "parted /dev/vda -- set 2 lvm on", + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary 1M 2048M", # PV1 + "parted --script /dev/vda -- set 1 lvm on", + "parted --script /dev/vda -- mkpart primary 2048M -1s", # PV2 + "parted --script /dev/vda -- set 2 lvm on", "udevadm settle", "pvcreate /dev/vda1 /dev/vda2", "vgcreate MyVolGroup /dev/vda1 /dev/vda2", @@ -402,10 +402,10 @@ in { luksroot = makeInstallerTest "luksroot" { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot - "parted /dev/vda -- mkpart primary linux-swap 50M 1024M", - "parted /dev/vda -- mkpart primary 1024M -1s", # LUKS + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M", + "parted --script /dev/vda -- mkpart primary 1024M -1s", # LUKS "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", @@ -434,7 +434,7 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda --" + "parted --script /dev/vda --" . " mklabel msdos" . " mkpart primary ext2 1M 100MB" # /boot . " mkpart extended 100M -1s" @@ -469,9 +469,9 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/sda mklabel msdos", - "parted /dev/sda -- mkpart primary linux-swap 1M 1024M", - "parted /dev/sda -- mkpart primary ext2 1024M -1s", + "parted --script /dev/sda mklabel msdos", + "parted --script /dev/sda -- mkpart primary linux-swap 1M 1024M", + "parted --script /dev/sda -- mkpart primary ext2 1024M -1s", "udevadm settle", "mkswap /dev/sda1 -L swap", "swapon -L swap", diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index a1ab7614871..c519d7dae8b 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -107,8 +107,8 @@ let buildInputs = [ pkgs.utillinux pkgs.perl ]; } '' - ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s + ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s . /sys/class/block/vda1/uevent mknod /dev/vda1 b $MAJOR $MINOR From 8c618fce30b958b002c056a73f416b7722b0b6f0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 14 Oct 2017 10:28:27 -0400 Subject: [PATCH 1164/2806] linux: 4.13.6 -> 4.13.7 CVE-2017-5123 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 233c0130983..d54586c5f4f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.6"; + version = "4.13.7"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0l30vlxmp49mm743cydkvr3wfw4nmh0q71avasnksd8xmv71km27"; + sha256 = "16vjjl3qw0a8ci6xbnywhb8bpr3ccbs0i6xa54lc094cd5gvx4v3"; }; } // (args.argsOverride or {})) From 7c4566294726a47cd35f603e06dfedee5e6f1b78 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 14 Oct 2017 16:38:33 +0200 Subject: [PATCH 1165/2806] go-ethereum: 1.7.1 -> 1.7.2 --- pkgs/applications/altcoins/go-ethereum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 279e767173a..4a1c62535f9 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.7.1"; + version = "1.7.2"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1rhqnqp2d951d4084z7dc07q0my4wd5401968a0nqj030a9vgng2"; + sha256 = "11n77zlf8qixhx26sqf33v911716msi6h0z4ng8gxhzhznrn2nrd"; }; # Fix cyclic referencing on Darwin From 8e53ca98f20d8ee6408e80cc7409da5dbba6ba4f Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 14 Oct 2017 16:50:45 +0200 Subject: [PATCH 1166/2806] kexectools: 2.0.14 -> 2.0.15 --- pkgs/os-specific/linux/kexectools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 206dc6889e8..4a68160ce05 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "kexec-tools-${version}"; - version = "2.0.14"; + version = "2.0.15"; src = fetchurl { urls = [ "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" ]; - sha256 = "1ihd3kzw8xnc5skq4pb633rr80007knjm4n1dd67a24xkplygcpz"; + sha256 = "1rwl04y1mpb28yq5ynnk8j124dmhj5p8c4hcdn453sri2j37p6w9"; }; hardeningDisable = [ "format" "pic" "relro" ]; From 741e78804b2947ef0f61a90f1ab7369d76f6df96 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Sat, 14 Oct 2017 18:13:23 +0200 Subject: [PATCH 1167/2806] jenkins: 2.77 -> 2.84 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5c1c586fb90..bcd63769915 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.77"; + version = "2.84"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1hmj5f14qpq58018q2jmdd4j36v2idsbb9caiakxfy08gppzhz00"; + sha256 = "0pwmviaps4gbv9a3sdn17kqdv9jmh5fpbms1wm95jfj77m5dyyq6"; }; buildCommand = '' From 9b2af1869b021d44e119afd8080ba64bcd5a53ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?= Date: Sat, 14 Oct 2017 16:46:58 +0000 Subject: [PATCH 1168/2806] astroid: 0.9.1 -> 0.10.2 - Use gmime3 instead of gmime2: https://github.com/astroidmail/astroid/issues/405 - Remove adwaita-icon-theme, as it is not needed - Add SuprDewd as a maintainer --- .../mailreaders/astroid/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 8ba53b343f3..0324012b278 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,31 +1,30 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x-gtk3 +{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3 , libsass, notmuch, boost, wrapGAppsHook }: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.9.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "0ha2jd3fvc54amh0x8f58s9ac4r8xgyhvkwd4jvs0h4mfh6cg496"; + sha256 = "0y1i40xbjjvnylqpdkvj0m9fl6f5k9zk1z4pqg3vhj8x1ys8am1c"; }; nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings_desktop_schemas - gnome3.adwaita-icon-theme ]; + buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas + notmuch boost gnome3.gsettings_desktop_schemas ]; buildPhase = "scons --propagate-environment --prefix=$out build"; installPhase = "scons --propagate-environment --prefix=$out install"; - meta = { + meta = with stdenv.lib; { homepage = https://astroidmail.github.io/; description = "GTK+ frontend to the notmuch mail system"; - maintainers = [ stdenv.lib.maintainers.bdimcheff ]; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ bdimcheff SuprDewd ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } From 527f6e9c47190b3bcd54f0ee78e523947ee15502 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 Oct 2017 18:56:41 +0200 Subject: [PATCH 1169/2806] android-studio-preview: 3.0.0.15 -> 3.0.0.16 --- pkgs/applications/editors/android-studio/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 8ee5f0319aa..061d75d4016 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio rec { pname = "android-studio-preview"; - version = "3.0.0.15"; # "Android Studio 3.0 Beta 7" - build = "171.4365657"; - sha256Hash = "0am3rq0ag982ik95mpcxvx2zlv0h4l6747b29mlsbqih66868db6"; + version = "3.0.0.16"; # "Android Studio 3.0 RC 1" + build = "171.4392136"; + sha256Hash = "13zaqbbl7bqhiwh0ybbxkfv0h90qsfpa7sim778n2j32jjvdcby5"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; From 8abbf3379ed24d8005e53c9910eea4a96e0e3725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Oct 2017 19:40:03 +0200 Subject: [PATCH 1170/2806] v8: fixup build by using older icu again --- 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 7798ec4444a..b104dc8014b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10850,6 +10850,7 @@ with pkgs; v8 = callPackage ../development/libraries/v8 { inherit (python2Packages) python gyp; cctools = darwin.cctools; + icu = icu58; # v8-5.4.232 fails against icu4c-59.1 }; v8_static = lowPrio (self.v8.override { static = true; }); From 0f01f8b882627b063f00722a2a8985fcfe6a82cf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 14 Oct 2017 20:07:27 +0200 Subject: [PATCH 1171/2806] nginxMainline: 1.13.5 -> 1.13.6 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 5ec0c7d4da5..0eb8979c3ac 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.5"; - sha256 = "0blzna6h76xd7ddz37yb7yqg4yx7gpwsz8zbg8vlbxxk552bjx8f"; + version = "1.13.6"; + sha256 = "1y7qcdpjskjc1iwwrjqsbgm74jpnf873pwv17clsy83ak1pzq4l5"; }) From e067d26f43c2b798db692e329afc074b79acf086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Oct 2017 21:23:16 +0200 Subject: [PATCH 1172/2806] firefox: fixup build on i686-linux after 56.x update Broken since #30143. I can't say I understand why this combination is apparently unsupported. i686-linux is a second-tier platform now, but firefox is still kept a channel blocker... --- 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 cc7927fdc54..b8f57eb2edb 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -130,7 +130,8 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" ] - ++ lib.optionals (stdenv.lib.versionAtLeast version "56") [ + ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + # on i686-linux: --with-libclang-path is not available in this configuration "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] From b5610ed3f0cfdad9a6c7d542e963659f63e4f3a7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 14 Oct 2017 02:10:35 -0500 Subject: [PATCH 1173/2806] sqitch: fix on Darwin Fixes #30389. --- pkgs/development/tools/misc/sqitch/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index b7b42b59653..8328433a823 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin for d in bin/sqitch etc lib share ; do - ln -s ${sqitchModule}/$d $out/$d + # make sure dest alreay exists before symlink + # this prevents installing a broken link into the path + if [ -e ${sqitchModule}/$d ]; then + ln -s ${sqitchModule}/$d $out/$d + fi done ''; dontStrip = true; From c37198e81d7b96568e6c4c82a48fc7cfb7247dd7 Mon Sep 17 00:00:00 2001 From: Kai Harries Date: Sat, 14 Oct 2017 21:47:13 +0200 Subject: [PATCH 1174/2806] lbdb: 0.38 -> 0.44 --- pkgs/tools/misc/lbdb/add-methods-to-rc.patch | 11 +++++++ pkgs/tools/misc/lbdb/default.nix | 32 +++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/misc/lbdb/add-methods-to-rc.patch diff --git a/pkgs/tools/misc/lbdb/add-methods-to-rc.patch b/pkgs/tools/misc/lbdb/add-methods-to-rc.patch new file mode 100644 index 00000000000..d388467559a --- /dev/null +++ b/pkgs/tools/misc/lbdb/add-methods-to-rc.patch @@ -0,0 +1,11 @@ +--- a/lbdb.rc.in ++++ b/lbdb.rc.in +@@ -40,7 +40,7 @@ + # - m_vcf search a vcard (according to RFC2426) file. + # - m_khard search a CardDAV address book via khard + +-METHODS="m_inmail m_passwd m_finger" ++METHODS="@MODULES@" + + + # diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index e81ad349874..35cc95cb2cf 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,17 +1,39 @@ -{ stdenv, fetchurl, perl, finger_bsd }: +{ stdenv, fetchurl, perl, perlPackages, finger_bsd, makeWrapper +, abook ? null +, gnupg ? null +, goobook ? null +, khard ? null +}: let - version = "0.38"; + version = "0.44"; in - +with stdenv.lib; +with perlPackages; stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; - sha256 = "1279ssfrh4cqrjzq5q47xbdlw5qx3aazxjshi86ljm4cw6xxvgar"; + sha256 = "0kjz3n2ilrg6yrz8z40714ppdprgwhbgvzcsjzs822l6da4qxna3"; }; - buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) finger_bsd; + buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ] + ++ optional (!stdenv.isDarwin) finger_bsd + ++ optional (abook != null) abook + ++ optional (gnupg != null) gnupg + ++ optional (goobook != null) goobook + ++ optional (khard != null) khard; + configureFlags = [ ] + ++ optional (abook != null) "--with-abook" + ++ optional (gnupg != null) "--with-gpg" + ++ optional (goobook != null) "--with-goobook" + ++ optional (khard != null) "--with-khard"; + + patches = [ ./add-methods-to-rc.patch ]; + postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : " + + "${AuthenSASL}/${perl.libPrefix}" + + ":${ConvertASN1}/${perl.libPrefix}" + + ":${NetLDAP}/${perl.libPrefix}"; meta = { homepage = http://www.spinnaker.de/lbdb/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8582966e81d..8f7619825e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15280,7 +15280,7 @@ with pkgs; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; - lbdb = callPackage ../tools/misc/lbdb { }; + lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; }; lbzip2 = callPackage ../tools/compression/lbzip2 { }; From 30db0a66f47759da6ef27944770fdd0b4da7ae5e Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 14 Oct 2017 22:05:14 +0200 Subject: [PATCH 1175/2806] check: 0.10.0 -> 0.11.0 --- pkgs/development/libraries/check/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 3bfcde57422..1db991f63fe 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "check-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz"; - sha256 = "0lhhywf5nxl3dd0hdakra3aasl590756c9kmvyifb3vgm9k0gxgm"; + url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; + sha256 = "05jn1pgb7hqb937xky2147nnq3r4qy5wwr79rddpax3bms5a9xr4"; }; # Test can randomly fail: http://hydra.nixos.org/build/7243912 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { can be used within source code editors and IDEs. ''; - homepage = http://check.sourceforge.net/; + homepage = https://libcheck.github.io/check/; license = licenses.lgpl2Plus; platforms = platforms.all; From 416fe660dffbdb13d810f4412acb4d1490f4f460 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 14 Oct 2017 22:08:19 +0200 Subject: [PATCH 1176/2806] rofi: 1.3.1 -> 1.4.1 --- pkgs/applications/misc/rofi/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index c5f4095e59a..1e8320d75a3 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git , cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification +, bison, flex, librsvg, check }: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.4.1"; name = "rofi-${version}"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz"; - sha256 = "09i3vd8k6zqphrm382fglsmxc4q6dg00xddzl96kakszgvdd4qfs"; + sha256 = "19x11s71q24gjdnsjf1ar6raq1drav7qp3nzjkw8qajpgvjrxwcn"; }; preConfigure = '' @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libxkbcommon pango cairo git + buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; doCheck = true; From 874a3c033cabc7882651210aa261d2a3176c8d19 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 14 Oct 2017 20:51:47 +0200 Subject: [PATCH 1177/2806] nixos: limited support archs are not release-critical Lately failing i686 tests like firefox have been blocking channel releases. We're still building the tests for systems with limited support but won't delay a channel release if they fail. --- nixos/release-combined.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index f61d80f5599..125e6b7050b 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -42,12 +42,11 @@ in rec { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; - maintainers = [ pkgs.lib.maintainers.eelco ]; + maintainers = with pkgs.lib.maintainers; [ eelco fpletz ]; }; constituents = let - all = x: map (system: x.${system}) - (supportedSystems ++ limitedSupportedSystems); + all = x: map (system: x.${system}) supportedSystems; in [ nixos.channel (all nixos.dummy) @@ -61,7 +60,7 @@ in rec { nixos.tests.chromium (all nixos.tests.firefox) (all nixos.tests.firewall) - nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux + (all nixos.tests.gnome3) nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only (all nixos.tests.installer.lvm) (all nixos.tests.installer.luksroot) @@ -80,9 +79,8 @@ in rec { (all nixos.tests.boot.uefiCdrom) (all nixos.tests.boot.uefiUsb) (all nixos.tests.boot-stage1) - nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107 + (all nixos.tests.hibernate) nixos.tests.docker - nixos.tests.docker-edge (all nixos.tests.ecryptfs) (all nixos.tests.env) (all nixos.tests.ipv6) @@ -93,7 +91,7 @@ in rec { (all nixos.tests.keymap.dvp) (all nixos.tests.keymap.neo) (all nixos.tests.keymap.qwertz) - nixos.tests.plasma5.x86_64-linux # avoid big build on i686 + (all nixos.tests.plasma5) #(all nixos.tests.lightdm) (all nixos.tests.login) (all nixos.tests.misc) From 22b4c58a9f9003e9149af1b82d85d37aaa841841 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 13 Oct 2017 23:41:05 +0200 Subject: [PATCH 1178/2806] piwik: 3.1.1 -> 3.2.0 --- pkgs/servers/web-apps/piwik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix index 091391166d7..e5d6876ecbf 100644 --- a/pkgs/servers/web-apps/piwik/default.nix +++ b/pkgs/servers/web-apps/piwik/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "piwik-${version}"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "https://builds.piwik.org/${name}.tar.gz"; - sha512 = "2mqzk12959j9xqb9cqz8np35zcs1313zjx9pikbjw9z9mfcqgv0ccvrnl2ymmwll333drr9qaxs54n0mkk66xbhz04nmzmib0kp9k8h"; + sha512 = "21hss97mms5vavfzw41v2p3qsxx0ar8xa3dnr4d2fw2mps8jg3s5ng9i725lqrbl96q7855fh9ymabjsi1zr4q9nif2yap0izaakxib"; }; nativeBuildInputs = [ makeWrapper ]; From 1e6662dc6a12c7454a1296af40a88c8dba1b598e Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 14 Oct 2017 18:13:25 -0500 Subject: [PATCH 1179/2806] sqldeveloper: Add a detailed requireFile message --- .../tools/database/sqldeveloper/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 929aeb23e6d..6895e8b509b 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,12 +1,29 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - name = "sqldeveloper-17.2.0.188.1159"; + version = "17.2.0.188.1159"; + name = "sqldeveloper-${version}"; - src = requireFile { - name = "${name}-no-jre.zip"; - url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/"; - /* Actual direct link (would it be allowed to give that link?): http://download.oracle.com/otn/java/sqldeveloper/sqldeveloper-17.2.0.188.1159-no-jre.zip */ + src = requireFile rec { + name = "sqldeveloper-${version}-no-jre.zip"; + url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-downloads-172-3939055.html"; + message = '' + This Nix expression requires that ${name} already be part of the store. To + obtain it you need to + + - navigate to ${url} + - accept the license agreement + - download the file listed under "Other Platforms" + - sign in or create an oracle account if neccessary + + and then add the file to the Nix store using either: + + nix-store --add-fixed sha256 ${name} + + or + + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; sha256 = "03960705fabc7b3fa98d55a31ee6a17f783b8c8b01462613c6b6a699e8cae4d5"; }; From 6591a70812c9d8d0702b60c05d9e8d55382ecc09 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 14 Oct 2017 18:14:34 -0500 Subject: [PATCH 1180/2806] sqldeveloper: 17.2 -> 17.3 --- .../tools/database/sqldeveloper/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 6895e8b509b..d5acd487e6b 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,17 +1,25 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - version = "17.2.0.188.1159"; + version = "17.3.0.271.2323"; name = "sqldeveloper-${version}"; src = requireFile rec { name = "sqldeveloper-${version}-no-jre.zip"; - url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-downloads-172-3939055.html"; + url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/"; message = '' This Nix expression requires that ${name} already be part of the store. To obtain it you need to - navigate to ${url} + - make sure that it says "Version ${version}" above the list of downloads + - if it does not, click on the "Previous Version" link below the downloads + and repeat until the version is correct. This is necessarry because as the + time of this writing there exists no permanent link for the current version + yet. + Also consider updating this package yourself (you probably just need to + change the `version` variable and update the sha256 to the one of the + new file) or opening an issue at the nixpkgs repo. - accept the license agreement - download the file listed under "Other Platforms" - sign in or create an oracle account if neccessary @@ -24,7 +32,8 @@ stdenv.mkDerivation rec { nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "03960705fabc7b3fa98d55a31ee6a17f783b8c8b01462613c6b6a699e8cae4d5"; + # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip` + sha256 = "06ba5920544bacbea83425548b1b8f69ab3e9bb279076321aece2c0c6d415dad"; }; buildInputs = [ makeWrapper unzip ]; From d9d2c4a4a9a103290c61eca3b393c8d1fc054c63 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 13 Oct 2017 16:35:58 -0400 Subject: [PATCH 1181/2806] nix-info: init --- pkgs/tools/nix/info/default.nix | 37 ++++++ pkgs/tools/nix/info/info.sh | 169 +++++++++++++++++++++++++ pkgs/tools/nix/info/multiuser.nix | 12 ++ pkgs/tools/nix/info/relaxedsandbox.nix | 12 ++ pkgs/tools/nix/info/sandbox.nix | 10 ++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 242 insertions(+) create mode 100644 pkgs/tools/nix/info/default.nix create mode 100755 pkgs/tools/nix/info/info.sh create mode 100644 pkgs/tools/nix/info/multiuser.nix create mode 100644 pkgs/tools/nix/info/relaxedsandbox.nix create mode 100644 pkgs/tools/nix/info/sandbox.nix diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix new file mode 100644 index 00000000000..756478dccb7 --- /dev/null +++ b/pkgs/tools/nix/info/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, coreutils, findutils, gnugrep, darwin, shellcheck }: +stdenv.mkDerivation { + name = "nix-info"; + src = ./info.sh; + + buildInputs = [ + shellcheck + ]; + + path = lib.makeBinPath ([ + coreutils findutils gnugrep + ] ++ (if stdenv.isDarwin then [ darwin.DarwinTools ] else [])); + is_darwin = if stdenv.isDarwin then "yes" else "no"; + + sandboxtest = ./sandbox.nix; + relaxedsandboxtest = ./relaxedsandbox.nix; + multiusertest = ./multiuser.nix; + + unpackCmd = '' + mkdir nix-info + cp $src ./nix-info/nix-info + ''; + + buildPhase = '' + substituteAllInPlace ./nix-info + ''; + + doCheck = true; + checkPhase = '' + shellcheck ./nix-info + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./nix-info $out/bin/nix-info + ''; +} diff --git a/pkgs/tools/nix/info/info.sh b/pkgs/tools/nix/info/info.sh new file mode 100755 index 00000000000..473e035b8e0 --- /dev/null +++ b/pkgs/tools/nix/info/info.sh @@ -0,0 +1,169 @@ +#!/bin/bash + +PATH="@path@:$PATH" +IS_DARWIN="@is_darwin@" + +set -eu +set -o pipefail + +DEBUG=0 +MARKDOWN=0 +HOST_OS=0 +SANDBOX=0 +while true; do + case "${1:-}" in + "") + break + ;; + -d | --debug) + set -x + DEBUG=1 + shift + ;; + -m | --markdown) + MARKDOWN=1 + HOST_OS=1 + SANDBOX=1 + shift + ;; + --host-os) + HOST_OS=1 + shift + ;; + --sandbox) + SANDBOX=1 + shift + ;; + + * ) + cat <&2 + else + cat > /dev/null + fi +} + +nixev() { + nix-instantiate --eval --strict -E "$1" +} + +desc_system() { + nixev '(import {}).system' +} + +desc_host_os() { + printf "%s" "$(uname -sr)" + + if [ "$IS_DARWIN" = "yes" ]; then + printf ", macOS %s" "$(sw_vers -productVersion)" + fi + + if [ -f /etc/os-release ]; then + ( + # shellcheck disable=SC1091 + . /etc/os-release + printf ", %s, %s" "${NAME:-$(uname -v)}" "${VERSION:-noversion}" + ) + fi +} + +desc_multi_user() { + if nix-build --no-out-link @multiusertest@ 2>&1 | debuglog; then + printf "yes" + else + printf "no" + fi +} + +desc_nixpkgs_path() { + nixev '' +} + +channel_facts() { + find /nix/var/nix/profiles/per-user \ + -mindepth 2 \ + -maxdepth 2 \ + -name channels \ + -print0 \ + |\ + while IFS= read -r -d '' userchannelset; do + manifest="$userchannelset/manifest.nix" + + if [ -e "$manifest" ]; then + userchannels=$(nixev \ + "builtins.concatStringsSep \", \" + (map (ch: ch.name) + (import \"$manifest\"))") + + fact "channels($(echo "$manifest" | cut -d/ -f7))" \ + "$userchannels" + fi + done +} + +desc_sandbox() { + if nix-build --no-out-link @sandboxtest@ 2>&1 | debuglog; then + printf "no" + elif nix-build --no-out-link @relaxedsandboxtest@ 2>&1 | debuglog; then + printf "relaxed" + else + printf "yes" + fi +} + +fact() { + name="${1:-0}" + value="${2:-0}" + last="${3:-1}" + if [ $MARKDOWN -eq 0 ]; then + printf "%s: %s" "$name" "$value" + if [ "$last" -eq 1 ]; then + printf ", " + fi + else + printf " - %s: \`%s\`\n" "$name" "$value" + fi + + if [ "$last" -eq 0 ]; then + echo "" + fi +} + +last_fact() { + fact "$1" "$2" 0 +} + +fact "system" "$(desc_system)" +if [ $HOST_OS -eq 1 ]; then + fact "host os" "$(desc_host_os)" +fi +fact "multi-user?" "$(desc_multi_user)" +if [ $SANDBOX -eq 1 ]; then + fact "sandbox" "$(desc_sandbox)" +fi + +fact "version" "$(nix-env --version)" +channel_facts +last_fact "nixpkgs" "$(desc_nixpkgs_path)" diff --git a/pkgs/tools/nix/info/multiuser.nix b/pkgs/tools/nix/info/multiuser.nix new file mode 100644 index 00000000000..827d5298767 --- /dev/null +++ b/pkgs/tools/nix/info/multiuser.nix @@ -0,0 +1,12 @@ +let + pkgs = import {}; +in pkgs.runCommand "diagnostics-multiuser" + { } + '' + set -x + # no cache: ${toString builtins.currentTime} + # For reproducibility, nix always uses nixbld group: + # https://github.com/NixOS/nix/blob/1dd29d7aebae706f3e90a18bbfae727f2ed03c70/src/libstore/build.cc#L1896-L1908 + test "$(groups)" == "nixbld" + touch $out + '' diff --git a/pkgs/tools/nix/info/relaxedsandbox.nix b/pkgs/tools/nix/info/relaxedsandbox.nix new file mode 100644 index 00000000000..625a6ecc39e --- /dev/null +++ b/pkgs/tools/nix/info/relaxedsandbox.nix @@ -0,0 +1,12 @@ +let + pkgs = import {}; +in pkgs.runCommand "diagnostics-sandbox" + { + __noChroot = true; + } + '' + set -x + # no cache: ${toString builtins.currentTime} + test -d "$(dirname "$out")/../var/nix" + touch $out + '' diff --git a/pkgs/tools/nix/info/sandbox.nix b/pkgs/tools/nix/info/sandbox.nix new file mode 100644 index 00000000000..fa4288c2f94 --- /dev/null +++ b/pkgs/tools/nix/info/sandbox.nix @@ -0,0 +1,10 @@ +let + pkgs = import {}; +in pkgs.runCommand "diagnostics-sandbox" + { } + '' + set -x + # no cache: ${toString builtins.currentTime} + test -d "$(dirname "$out")/../var/nix" + touch $out + '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a53de95c82..9c8c3e18bbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19123,6 +19123,8 @@ with pkgs; nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; + nix-info = callPackage ../tools/nix/info { }; + nix-index = callPackage ../tools/package-management/nix-index { }; inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) From b16f3b2131951bab1e313870df0b1f15c5aa58fd Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 13 Oct 2017 18:50:50 -0400 Subject: [PATCH 1182/2806] nix-info: include in nixos' default system-path, nixpkgs's channel --- nixos/modules/config/system-path.nix | 1 + pkgs/top-level/release.nix | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 5d339eaea48..d3212d93160 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -31,6 +31,7 @@ let pkgs.nano pkgs.ncurses pkgs.netcat + pkgs.nix-info config.programs.ssh.package pkgs.perl pkgs.procps diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d6cefb8d184..952b1e8927e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -47,6 +47,7 @@ let jobs.nix-repl.x86_64-darwin jobs.nix.x86_64-darwin jobs.nox.x86_64-darwin + jobs.nix-info.x86_64-darwin jobs.openssh.x86_64-darwin jobs.openssl.x86_64-darwin jobs.postgresql.x86_64-darwin @@ -88,6 +89,9 @@ let # Needed by travis-ci to test PRs jobs.nox.x86_64-linux jobs.nox.x86_64-darwin + # Needed for support + jobs.nix-info.x86_64-linux + jobs.nix-info.x86_64-darwin # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux # Ensure that basic stuff works on darwin From 4eb6e845f96d4fdb48c7d50f6138b68192362e42 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Oct 2017 08:31:37 +0000 Subject: [PATCH 1183/2806] ocamlPackages.javalib: 2.3.3 -> 2.3.4 --- pkgs/development/ocaml-modules/javalib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 843cf44a153..6bd98905afa 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36307/javalib-2.3.3.tar.bz2; - sha256 = "0427n3vfb2h51gy2p4878gdwlp0mb03asn3g9kp9v4wfxmksjj11"; + url = "https://gforge.inria.fr/frs/download.php/file/37153/javalib-2.3.4.tar.bz2"; + sha256 = "081ga3qzx0lkz0wy92qyj6k75k3s79518bvqii2q778hh5wif36f"; }; buildInputs = [ which ocaml findlib camlp4 ]; From b1d32c053848aaefec14d83bdcbe404518541d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Oct 2017 10:44:16 +0200 Subject: [PATCH 1184/2806] aegisub: fixup build with icu-59 Thanks to https://github.com/gentoo/gentoo/commit/779fbc09c456a --- pkgs/applications/video/aegisub/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 39a85a03199..ebc1249dc11 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"; }; + # Fixup build with icu-59 + postPatch = "sed '1i#include ' -i src/utils.cpp"; + buildInputs = with stdenv.lib; [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa libass fftw ffms ffmpeg zlib icu boost boost.out libiconv From 7cdbc8b2462e8aca6740f8dd29a06ff17e6a04ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Oct 2017 10:53:53 +0200 Subject: [PATCH 1185/2806] firebirdSuper: fixup build by using older icu again --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b104dc8014b..489e2278964 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11478,7 +11478,7 @@ with pkgs; fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; - firebirdSuper = callPackage ../servers/firebird { superServer = true; stdenv = overrideCC stdenv gcc5; }; + firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; fleet = callPackage ../servers/fleet { }; From 21034a44f0b820bc6d258bb0aa16bffeffef4aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Oct 2017 11:05:34 +0200 Subject: [PATCH 1186/2806] mailcore2: fixup build by using older icu again --- 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 489e2278964..9b62553b5c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19092,7 +19092,9 @@ with pkgs; }; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; - mailcore2 = callPackage ../development/libraries/mailcore2 { }; + mailcore2 = callPackage ../development/libraries/mailcore2 { + icu = icu58; + }; martyr = callPackage ../development/libraries/martyr { }; From 3932a91776a067c7a8b3f8186d14d38c1bab78e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Oct 2017 11:57:52 +0200 Subject: [PATCH 1187/2806] mapnik: fix build with new icu via upstream patch --- pkgs/development/libraries/mapnik/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 96dbc094b55..0546bdc6359 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip +{ stdenv, fetchzip, fetchpatch , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff , libwebp, libxml2, proj, python2, scons, sqlite, zlib @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065"; }; + patches = [(fetchpatch { + name = "icu-59.diff"; + url = https://github.com/mapnik/mapnik/commit/9e58c890430d.diff; + sha256 = "0h546qq8g19gw9s4979hla9vkq5kcwh3q45ryajyjhmlr2z9fi6p"; + })]; + # a distinct dev output makes python-mapnik fail outputs = [ "out" ]; From 5a21efdcdf7c3f4349192036e661247e2cd07916 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 15 Oct 2017 12:59:30 +0200 Subject: [PATCH 1188/2806] gitAndTools.git-dit: 0.1.0 -> 0.3.0 --- .../git-and-tools/git-dit/default.nix | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index a4b552bcca3..d68430714de 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -1,39 +1,41 @@ -{ stdenv, fetchFromGitHub, pandoc }: +{ stdenv +, fetchFromGitHub +, openssl +, gcc +, zlib +, libssh +, cmake +, perl +, pkgconfig +, rustPlatform +}: -stdenv.mkDerivation rec { +with rustPlatform; + +buildRustPackage rec { name = "git-dit-${version}"; - version = "0.1.0"; - - buildInputs = [ pandoc ]; + version = "0.4.0"; src = fetchFromGitHub { owner = "neithernut"; repo = "git-dit"; rev = "v${version}"; - sha256 = "1rvp2dhnb8yqrracvfpvf8z1vz4fs0rii18hhrskr6n1sfd7x9kd"; + sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2"; }; - # the Makefile doesn’t work, we emulate it below - dontBuild = true; + depsSha256 = "1z2n3z5wkh5z5vc976yscq77fgjszwzwlrp7g17hmsbhzx6x170h"; - postPatch = '' - # resolve binaries to the right path - sed -e "s|exec git-dit-|exec $out/bin/git-dit-|" -i git-dit + nativeBuildInputs = [ + cmake + pkgconfig + perl + ]; - # we change every git dit command to the local subcommand path - # (git dit foo -> /nix/store/…-git-dit/bin/git-dit-foo) - for script in git-dit-*; do - sed -e "s|git dit |$out/bin/git-dit-|g" -i "$script" - done - ''; - - installPhase = '' - mkdir -p $out/{bin,share/man/man1} - # from the Makefile - ${stdenv.lib.getBin pandoc}/bin/pandoc -s -t man git-dit.1.md \ - -o $out/share/man/man1/git-dit.1 - cp git-dit* $out/bin - ''; + buildInputs = [ + openssl + libssh + zlib + ]; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -41,6 +43,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ profpatsch matthiasbeyer ]; }; - - } From 75e419173959f3e96a6569268f310e80f4f836b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Oct 2017 13:49:08 +0200 Subject: [PATCH 1189/2806] libreoffice(-still): fixup build by using older icu It's slightly risky, as many dependencies use the newer icu already. -fresh seems OK without such changes. --- 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 9b62553b5c8..6c8da3080fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15357,6 +15357,7 @@ with pkgs; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; + icu = icu58; # checking whether g++ supports C++14 or C++11... configure: error: no stdenv = overrideCC stdenv gcc5; }); From f7d308dbdc166bef33b677128021eeff29a709b0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 3 Oct 2017 03:50:20 +0300 Subject: [PATCH 1190/2806] plyfile: init at 0.5 --- .../python-modules/plyfile/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/plyfile/default.nix diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix new file mode 100644 index 00000000000..410a633c46b --- /dev/null +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage, numpy +}: + +buildPythonPackage rec { + pname = "plyfile"; + version = "0.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cspvhfy2nw1rfwpvrd69wkz0b6clr4wzqpwpmdk872vk2q89yzi"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = with lib; { + description = "NumPy-based text/binary PLY file reader/writer for Python"; + homepage = "https://github.com/dranjan/python-plyfile"; + maintainers = with maintainers; [ abbradar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c2b10003ca..9ae6fb2ca91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7046,6 +7046,8 @@ in { plotly = callPackage ../development/python-modules/plotly { }; + plyfile = callPackage ../development/python-modules/plyfile { }; + podcastparser = callPackage ../development/python-modules/podcastparser { }; pomegranate = callPackage ../development/python-modules/pomegranate { }; From 26db832fee73ba5e75c7dee29039b6e00125a07e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Oct 2017 14:55:36 +0200 Subject: [PATCH 1191/2806] qt56.qtwebkit: fix with icu-59 by upstream patch The patch is from qtwebkit-5.9.1, but it's fairly simple and seems to work here as well. --- .../qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch | 86 +++++++++++++++++++ .../libraries/qt-5/5.6/qtwebkit/series | 1 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch new file mode 100644 index 00000000000..add365b5dd6 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch @@ -0,0 +1,86 @@ +From: Konstantin Tokarev +Date: Thu, 4 May 2017 12:12:37 +0000 (+0300) +Subject: Fix compilation with ICU 59 +X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebkit.git;a=commitdiff_plain;h=bf172ae289a1348842005a9421797970f9b72060;hp=821eaaadc9d63d03aca65cf757230b520daaaa7c + +Fix compilation with ICU 59 + +Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 + +Task-number: QTBUG-60532 +Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 +Reviewed-by: Allan Sandfeld Jensen +--- + +diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp +index 812f3d4..77a3fd0 100644 +--- a/Source/JavaScriptCore/API/JSStringRef.cpp ++++ b/Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp +index 0b57f01..05e2733 100644 +--- a/Source/JavaScriptCore/runtime/DateConversion.cpp ++++ b/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index 9df2c95..f5d6121 100644 +--- a/Source/WTF/wtf/TypeTraits.h ++++ b/Source/WTF/wtf/TypeTraits.h +@@ -72,6 +72,9 @@ namespace WTF { + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; ++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) ++ template<> struct IsInteger { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger { static const bool value = true; }; + #endif +diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp +index cbac67d..23400a6 100644 +--- a/Source/WebKit2/Shared/API/c/WKString.cpp ++++ b/Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/series b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series index 140e2a3dd4e..7828e491c08 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/series +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series @@ -1,3 +1,4 @@ qtwebkit-dlopen-gtk.patch qtwebkit-dlopen-udev.patch qtwebkit-icucore-darwin.patch +qtwebkit-icu-59.patch From 8619ae38e7d44f0698e181fb64341dd394edfb04 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 14 Oct 2017 22:58:12 +0200 Subject: [PATCH 1192/2806] unifi: 5.6.16 -> 5.6.18 --- pkgs/servers/unifi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 08a9637308c..d0cd8f8085a 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.6.16"; + version = "5.6.18"; src = fetchurl { - url = "https://www.ubnt.com/downloads/unifi/${version}-86cdeea491/unifi_sysvinit_all.deb"; - sha256 = "1kfrawf48q9rx48hcnmiqndbg84v340yfykh23af7xpcxmzl5jy7"; + url = "https://www.ubnt.com/downloads/unifi/${version}-8261dc5066/unifi_sysvinit_all.deb"; + sha256 = "1xcnfmxwzij9qs9l71d3zkmq6q3ci80a8xbmfckb0gz08cvrw5k1"; }; buildInputs = [ dpkg ]; From 5190b05fa243a2a5d238a59e04f83b0081141689 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Oct 2017 15:26:14 +0200 Subject: [PATCH 1193/2806] fastd: disable aes128-ctr, fix build with new libsodium --- pkgs/tools/networking/fastd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index 3a99adb4a9e..ef356935c56 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0c9v3igv3812b3jr7jk75a2np658yy00b3i4kpbpdjgvqzc1jrq8"; }; + postPatch = '' + substituteInPlace src/crypto/cipher/CMakeLists.txt \ + --replace 'add_subdirectory(aes128_ctr)' "" + ''; + nativeBuildInputs = [ pkgconfig bison cmake ]; buildInputs = [ libuecc libsodium libcap json_c ]; From 68d48aae7e9ab230f64ab7b93c6d80afbe4be3c9 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 15 Oct 2017 15:44:50 +0200 Subject: [PATCH 1194/2806] plv8: use v8_6_x --- 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 66248545aa8..7161f723d35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10126,7 +10126,9 @@ with pkgs; pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; - plv8 = callPackage ../servers/sql/postgresql/plv8 {}; + plv8 = callPackage ../servers/sql/postgresql/plv8 { + v8 = v8_6_x; + }; phonon = callPackage ../development/libraries/phonon {}; From 0a58a2fe53794325b164717dad2ca07e69fd82b2 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 15 Oct 2017 15:45:08 +0200 Subject: [PATCH 1195/2806] plv8: 2.0.3 -> 2.1.0 --- pkgs/servers/sql/postgresql/plv8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/plv8/default.nix index 15863373562..009f65b9d81 100644 --- a/pkgs/servers/sql/postgresql/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/plv8/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "plv8-${version}"; - version = "2.0.3"; + version = "2.1.0"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "0cn7ynckmdb08dkzjilvc55xz61d1jiya7yrnphizw404j84y3qc"; + sha256 = "1sfpxz0zcbinn6822j12lkwgrw9kfacrs83ic968rm489rl9w241"; }; preConfigure = '' From 1be825f1e50cba8dad200cc28847ce7ab7ea888f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Oct 2017 16:04:08 +0200 Subject: [PATCH 1196/2806] pythonPackages.libnacl: 1.5.2 -> 1.6.0, fix new libsodum --- pkgs/development/python-modules/libnacl/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index f70c9a57e5f..3704045d79a 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -1,13 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, libsodium }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }: buildPythonPackage rec { pname = "libnacl"; - version = "1.5.2"; + version = "1.6.0"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "c58390b0d191db948fc9ab681f07fdfce2a573cd012356bada47d56795d00ee2"; + src = fetchFromGitHub { + owner = "saltstack"; + repo = pname; + rev = "v${version}"; + sha256 = "0iaql3mrj3hf48km8177bi6nmjdar26kmqjc3jw8mrjc940v99fk"; }; buildInputs = [ pytest ]; From dc38f6c5248992643eef450fd78a5a4f9787843a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Oct 2017 16:13:32 +0200 Subject: [PATCH 1197/2806] pythonPackages.jsmin: init at 2.2.2 --- .../python-modules/jsmin/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/jsmin/default.nix diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix new file mode 100644 index 00000000000..16be096f2ba --- /dev/null +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "jsmin"; + version = "2.2.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fsmqbjvpxvff0984x7c0y8xmf49ax9mncz48b9xjx8wrnr9kpxn"; + }; + + meta = with lib; { + description = "JavaScript minifier"; + homepage = "https://github.com/tikitu/jsmin/"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ae6fb2ca91..9dc764764c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6313,6 +6313,8 @@ in { }; }; + jsmin = callPackage ../development/python-modules/jsmin { }; + jsonpatch = callPackage ../development/python-modules/jsonpatch { }; jsonpointer = buildPythonPackage rec { From c100811d63da25deaa459af3bafd8c5adb463cc8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Oct 2017 16:16:04 +0200 Subject: [PATCH 1198/2806] scudcloud: add jsmin dependency, fixes build --- .../networking/instant-messengers/scudcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index f112d5f6110..441bc020868 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -9,7 +9,7 @@ in python3Packages.buildPythonPackage { sha256 = "e0d1cb72115d0fda17db92d28be51558ad8fe250972683fac3086dbe8d350d22"; }; - propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ]; + propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python jsmin ]; meta = with stdenv.lib; { description = "Non-official desktop client for Slack"; From 8f95aef531de13e6fffc62a31b4106f745d647ec Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Sep 2017 19:59:11 +0000 Subject: [PATCH 1199/2806] meson: do not strip RPATH https://github.com/NixOS/nixpkgs/pull/28444#issuecomment-324033323 --- pkgs/development/tools/build-managers/meson/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 77ff46d9472..1c2e726cdc5 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -18,7 +18,11 @@ python3Packages.buildPythonApplication rec { popd ''; - setupHook = ./setup-hook.sh; + postPatch = '' + sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py + ''; + + setupHook = ./setup-hook.sh; meta = with lib; { homepage = http://mesonbuild.com; From db11d7fd2b3b6c9a5051476856c95967af8998aa Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Sep 2017 20:02:04 +0000 Subject: [PATCH 1200/2806] xf86-input-libinput: 0.25.1 -> 0.26.0 --- pkgs/servers/x11/xorg/overrides.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c3665667107..c27f6a29e9c 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -315,11 +315,11 @@ in installFlags = "sdkdir=\${out}/include/xorg"; }; - xf86inputlibinput = attrs: attrs // { - name = "xf86-input-libinput-0.25.1"; + xf86inputlibinput = attrs: attrs // rec { + name = "xf86-input-libinput-0.26.0"; src = args.fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.1.tar.bz2; - sha256 = "1q67hjd67ni1nq7kgxdrrdgkyhzaqvvn2vlnsiiq9w4y3icpv7s8"; + url = "mirror://xorg/individual/driver/${name}.tar.bz2"; + sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; }; buildInputs = attrs.buildInputs ++ [ args.libinput ]; installFlags = "sdkdir=\${out}/include/xorg"; From 12f460e9e62c08c25309ebf80718f7b27503a780 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Sep 2017 20:01:05 +0000 Subject: [PATCH 1201/2806] libinput: 1.7.3 -> 1.8.3 fixes #29784 --- .../libraries/libinput/default.nix | 33 +++++++------------ .../libinput/udev-absolute-path.patch | 21 ++++++------ 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1cc275b3048..0f0e6726032 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,49 +1,40 @@ -{ stdenv, fetchurl, pkgconfig -, libevdev, mtdev, udev, libwacom +{ stdenv, fetchurl, pkgconfig, meson, ninja, libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support -, testsSupport ? false, check ? null, valgrind ? null -, autoconf, automake -}: +, testsSupport ? false, check ? null, valgrind ? null }: assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null; -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - -with stdenv.lib; -stdenv.mkDerivation rec { +let mkFlag = c: flag: if c then "-D${flag}=true" else "-D${flag}=false"; +in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.7.3"; + version = "1.8.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"; + url = "https://freedesktop.org/software/libinput/${name}.tar.xz"; + sha256 = "0b8l2dmzzm20xf2hw1dr9gnzd3fah9jz5f216p2ajw895zsy5qig"; }; outputs = [ "out" "dev" ]; - configureFlags = [ + mesonFlags = [ (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "event-gui") + (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") ]; - nativeBuildInputs = [ pkgconfig ]; + patches = [ ./udev-absolute-path.patch ]; - buildInputs = [ libevdev mtdev libwacom autoconf automake ] + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ libevdev mtdev libwacom ] ++ optionals eventGUISupport [ cairo glib gtk3 ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind ]; propagatedBuildInputs = [ udev ]; - patches = [ ./udev-absolute-path.patch ]; - patchFlags = [ "-p0" ]; - meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = http://www.freedesktop.org/wiki/Software/libinput; diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index 2d3fa966b29..4b6bfc96d5a 100644 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -1,12 +1,11 @@ ---- configure.ac 2016-05-27 14:00:25.248388226 +0200 -+++ configure.ac 2016-05-27 14:01:28.228943416 +0200 -@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil - # Used by the udev rules so we can use callouts during testing without - # installing everything first. Default is the empty string so the installed - # rule will use udev's default path. Override is in udev/Makefile.am --AC_SUBST(UDEV_TEST_PATH, "") -+UDEV_TEST_PATH="${UDEV_DIR}/" -+AC_SUBST(UDEV_TEST_PATH) - AC_PATH_PROG(SED, [sed]) +--- a/meson.build 2017-09-25 11:37:07.787726521 +0000 ++++ b/meson.build 2017-09-25 11:38:48.958233247 +0000 +@@ -100,7 +100,7 @@ + args : model_quirks) - AC_CONFIG_FILES([Makefile + udev_rules_config = configuration_data() +-udev_rules_config.set('UDEV_TEST_PATH', '') ++udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/') + configure_file(input : 'udev/80-libinput-device-groups.rules.in', + output : '80-libinput-device-groups.rules', + install : true, From 19997f01007efe3124219befaf6467c15521706e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 15 Oct 2017 15:28:16 -0400 Subject: [PATCH 1202/2806] linux-copperhead: 4.13.6.a -> 4.13.7.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 f02a65b90a1..35222f20796 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.13.6"; + version = "4.13.7"; revision = "a"; - sha256 = "1xmnnwwlnc7s5zf08rzb4zqd52iysz81y9iqdn7rdqr3c8j7pdv9"; + sha256 = "1ddhjj77pslivy6ngkqn020z08n5nvq8p261hz14sgp8h69v30is"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From dc60c1e3d0f3291c6f45226fb9ad802a85205d5a Mon Sep 17 00:00:00 2001 From: Heitham Omar Date: Sun, 15 Oct 2017 21:26:00 +0100 Subject: [PATCH 1203/2806] mpv: enable dvb on Linux --- pkgs/applications/video/mpv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index aacfa9d8874..680cad1ec25 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -108,6 +108,7 @@ in stdenv.mkDerivation rec { (enableFeature dvdnavSupport "dvdnav") (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") + (enableFeature stdenv.isLinux "dvbin") ]; configurePhase = '' From 73a8e002d405215ccb1052f7f89560b4f62a369c Mon Sep 17 00:00:00 2001 From: rardiol Date: Sun, 15 Oct 2017 19:28:30 -0200 Subject: [PATCH 1204/2806] doc/installing-usb.xml: fix dead kernel parameter link docs. --- nixos/doc/manual/installation/installing-usb.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index b97f989d902..31d51816e39 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -31,7 +31,7 @@ ISO, copy its contents verbatim to your drive, then either: Edit loader/entries/nixos-livecd.conf on the drive and change the root= field in the options line to point to your drive (see the documentation on root= - in + in the kernel documentation for more details). From 50ef776bd4c50d768b9f2c30fb4dc1e84c672012 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 15 Oct 2017 18:43:15 +0300 Subject: [PATCH 1205/2806] python.pkgs.Keras: remove default backend Theano is discontinued. Instead of setting TensorFlow by default let the user explicitly add preferred backend into environment. --- pkgs/development/python-modules/keras/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 1379d93c6dd..877fbe9470d 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,13 +1,6 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, pytest -, pytestcov -, pytestpep8 -, pytest_xdist -, six -, Theano -, pyyaml +{ stdenv, lib, buildPythonPackage, fetchPypi +, pytest, pytestcov, pytestpep8, pytest_xdist +, six, numpy, scipy, pyyaml }: buildPythonPackage rec { @@ -28,7 +21,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - six Theano pyyaml + six pyyaml numpy scipy ]; # Couldn't get tests working From 2d44e7280166256d8322546b11dcbe9b95f5bc5d Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 16 Oct 2017 00:06:06 +0200 Subject: [PATCH 1206/2806] httpie: remove superfluous field --- pkgs/tools/networking/httpie/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index b445dd93c4c..ef50c0ce084 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -2,7 +2,6 @@ pythonPackages.buildPythonApplication rec { name = "httpie-0.9.9"; - namePrefix = ""; src = fetchurl { url = "mirror://pypi/h/httpie/${name}.tar.gz"; From d5492433af0384893859ee0d4aa1b4f6cd12d355 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 13 Oct 2017 23:14:36 +0300 Subject: [PATCH 1207/2806] epson-escpr: 1.6.12 -> 1.6.16 --- pkgs/misc/drivers/epson-escpr/default.nix | 71 +++++++++++------------ 1 file changed, 33 insertions(+), 38 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 60516190355..ce95ca00e11 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,46 +1,41 @@ { stdenv, fetchurl, cups }: -let - version = "1.6.12"; -in - stdenv.mkDerivation { +stdenv.mkDerivation rec { + name = "epson-escpr-${version}"; + version = "1.6.16"; - name = "epson-escpr-${version}"; - - src = fetchurl { + src = fetchurl { + url = "https://download3.ebz.epson.net/dsc/f/03/00/06/41/54/29588ed107f800e5bc3f91706661567efb369c1c/epson-inkjet-printer-escpr-1.6.16-1lsb3.2.tar.gz"; + sha256 = "0v9mcih3dg3ws18hdcgm014k97hv6imga39hy2a84gnc6badp6n6"; + }; - url = "https://download3.ebz.epson.net/dsc/f/03/00/05/46/21/01534966894f35247dac8c8ef0a0a9c94d1c8b40/epson-inkjet-printer-escpr-1.6.12-1lsb3.2.tar.gz"; - sha256 = "3773e74a0c4debf202eb9ad0aa31c6614a93d6170484ff660c14e99f8698cfda"; - }; + patches = [ ./cups-filter-ppd-dirs.patch ]; - patches = [ ./cups-filter-ppd-dirs.patch ]; + buildInputs = [ cups ]; - buildInputs = [ cups ]; + meta = with stdenv.lib; { + homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; + description = "ESC/P-R Driver (generic driver)"; + longDescription = '' + Epson Inkjet Printer Driver (ESC/P-R) for Linux and the + corresponding PPD files. The list of supported printers + can be found at http://www.openprinting.org/driver/epson-escpr/ . - meta = with stdenv.lib; { - homepage = http://download.ebz.epson.net/dsc/search/01/search/; - description = "ESC/P-R Driver (generic driver)"; - longDescription = '' - Epson Inkjet Printer Driver (ESC/P-R) for Linux and the - corresponding PPD files. The list of supported printers - can be found at http://www.openprinting.org/driver/epson-escpr/ . + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.epson-escpr ]; + }; - To use the driver adjust your configuration.nix file: - services.printing = { - enable = true; - drivers = [ pkgs.epson-escpr ]; - }; - - To setup a wireless printer, enable Avahi which provides - printer's hostname to CUPS and nss-mdns to make this - hostname resolvable: - services.avahi = { - enable = true; - nssmdns = true; - };''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - }; - - } + To setup a wireless printer, enable Avahi which provides + printer's hostname to CUPS and nss-mdns to make this + hostname resolvable: + services.avahi = { + enable = true; + nssmdns = true; + };''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; + }; +} From e333df225e0cbeda543b577f3a7dee57741dec47 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 15 Oct 2017 18:07:27 -0500 Subject: [PATCH 1208/2806] robotfindskitten: install req'd data and put bin in $out/bin --- pkgs/games/robotfindskitten/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix index 16e36a03dce..00d73f95bdb 100644 --- a/pkgs/games/robotfindskitten/default.nix +++ b/pkgs/games/robotfindskitten/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; + makeFlags = [ "execgamesdir=$(out)/bin" ]; + + postInstall = '' + install -Dm644 {nki,$out/share/games/robotfindskitten}/vanilla.nki + ''; + meta = { description = "Yet another zen simulation; A simple find-the-kitten game"; homepage = http://robotfindskitten.org/; From 8c85edb446872b5e97022044c9e0b5e4ff0747e8 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Mon, 16 Oct 2017 09:37:34 +1030 Subject: [PATCH 1209/2806] flow: 0.57.0 -> 0.57.2 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 347abc14729..2f9d4f48d3f 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.57.0"; + version = "0.57.2"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1y2znwiwc3zkwz17a2m0m28dpknw7hpjd7ih4h7zf6p8nnqd3k6d"; + sha256 = "04fqnan9m69rjwvm97p0br1wd862ldiybp0v2nqlm6giaaa691r0"; }; installPhase = '' From cd9d780f894a0758ce0118945ee981d585116a3c Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Sun, 15 Oct 2017 21:50:53 +0200 Subject: [PATCH 1210/2806] nodejs: 8.6.0 -> 8.7.0 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 013cab8f57b..560df06b8c5 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.6.0"; + version = "8.7.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "14vy9xnyfz44j460hkrx423g7acpzzyqlxiv6sgmna9qj8872w5i"; + sha256 = "16mml3cwjnq7yf9yd67d2dybav3nvbnk89fkixs1wz7fd26d05ss"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; From bb94e0408f82e1279261b8dfff0111e466db74ff Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Sun, 15 Oct 2017 20:01:24 +0200 Subject: [PATCH 1211/2806] rstudio: 1.1.351 -> 1.1.383 --- pkgs/applications/editors/rstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 930a18e39a6..bf8374fdaaa 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -3,7 +3,7 @@ R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc }: let - version = "1.1.351"; + version = "1.1.383"; ginVer = "1.5"; gwtVer = "2.7.0"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; - sha256 = "0dpzmkq7jkdndidmmgdcr849q33ypmzkqwx22fraaqcy7w4f0pcn"; + sha256 = "06680l9amq03b4jarmzfr605bijhb79fip9rk464zab6hgwqbp3f"; }; # Hack RStudio to only use the input R. From 800f751740ac699b7e881806239677e3cca31e89 Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Sun, 15 Oct 2017 16:17:15 +0200 Subject: [PATCH 1212/2806] abella: 2.0.2 -> 2.0.4 --- pkgs/applications/science/logic/abella/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index d9afc897cff..968404362fc 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "abella-${version}"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { url = "http://abella-prover.org/distributions/${name}.tar.gz"; - sha256 = "b56d865ebdb198111f1dcd5b6fbcc0d7fc6dd1294f7601903ba4e3c3322c099c"; + sha256 = "1hnccjlyzwgz7kqsr4xmx9y4wmalbxsj0g6fxdk6xrgpc84ihw2c"; }; - buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild ]); + buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); installPhase = '' mkdir -p $out/bin @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; homepage = http://abella-prover.org/; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ bcdarwin ]; + maintainers = with stdenv.lib.maintainers; [ bcdarwin ciil ]; platforms = stdenv.lib.platforms.unix; }; } From 7bf191337ef46e5ca5f5860419c8a85c446a5a45 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Oct 2017 03:37:37 +0300 Subject: [PATCH 1213/2806] opencv: use BLAS and eigen by default Gives a performance boost. --- pkgs/development/libraries/opencv/3.x.nix | 4 ++-- pkgs/development/libraries/opencv/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index f6811b13717..8596ab6de88 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -14,8 +14,8 @@ , enableGtk3 ? false, gtk3 , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 -, enableEigen ? false, eigen -, enableOpenblas ? false, openblas +, enableEigen ? true, eigen +, enableOpenblas ? true, openblas , enableCuda ? false, cudatoolkit, gcc5 , enableTesseract ? false, tesseract, leptonica , AVFoundation, Cocoa, QTKit diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index d7824dbed34..aadd108620a 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -9,7 +9,7 @@ , enableJPEG2K ? true, jasper , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all -, enableEigen ? false, eigen +, enableEigen ? true, eigen , darwin }: From b6d3d7cfc43a408277f0da117c9f1a458a6d1129 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sun, 15 Oct 2017 21:21:20 -0700 Subject: [PATCH 1214/2806] ghq: 0.7.4 -> 0.8.0 --- .../git-and-tools/ghq/default.nix | 4 ++-- .../git-and-tools/ghq/deps.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 4ba86a2a086..84a441641df 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "ghq-${version}"; - version = "0.7.4"; + version = "0.8.0"; goPackagePath = "github.com/motemen/ghq"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "0x2agr7why8mcjhq2j8kh8d0gbwx2333zgf1ribc9fn14ryas1j2"; + sha256 = "1gdi0sbmq9kfi8hzd0dpgmhbmcf8q93jy3x08dd8smayrhbbwmld"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix index ec54803a6e7..1df37aa0f21 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix @@ -1,11 +1,11 @@ [ { - goPackagePath = "github.com/codegangsta/cli"; + goPackagePath = "github.com/daviddengcn/go-colortext"; fetch = { type = "git"; - url = "https://github.com/codegangsta/cli"; - rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; - sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; + url = "https://github.com/daviddengcn/go-colortext"; + rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a"; + sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf"; }; } { @@ -27,12 +27,12 @@ }; } { - goPackagePath = "github.com/daviddengcn/go-colortext"; + goPackagePath = "github.com/urfave/cli"; fetch = { type = "git"; - url = "https://github.com/daviddengcn/go-colortext"; - rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a"; - sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf"; + url = "https://github.com/urfave/cli"; + rev = "f017f86fccc5a039a98f23311f34fdf78b014f78"; + sha256 = "1biq4wl4z8l0ycinb39mfavnk13d0qnqqdplqybl7klxmk67cvhv"; }; } ] From 02a23b7b24d753baec14a860404a93de6d62931d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 15 Oct 2017 14:58:08 +0800 Subject: [PATCH 1215/2806] sddm: theme background images use a relative path which breaks sddm-kcm --- pkgs/applications/display-managers/sddm/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 97f05f6a433..3ce8d075410 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -50,12 +50,16 @@ in mkDerivation rec { postInstall = '' # remove empty scripts rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop" + for f in $out/share/sddm/themes/**/theme.conf ; do + substituteInPlace $f \ + --replace 'background=' "background=$(dirname $f)/" + done ''; meta = with lib; { description = "QML based X11 display manager"; - homepage = https://github.com/sddm/sddm; - platforms = platforms.linux; + homepage = https://github.com/sddm/sddm; maintainers = with maintainers; [ abbradar ttuegel ]; + platforms = platforms.linux; }; } From 4cec2d6fb71c8cdd04c8164101cfebe22e786929 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 16 Oct 2017 05:49:12 +0000 Subject: [PATCH 1216/2806] ocamlPackages.qtest: 2.6 -> 2.7 --- pkgs/development/ocaml-modules/qtest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index eb65384fc97..ecc1a89a804 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -4,13 +4,13 @@ if !stdenv.lib.versionAtLeast ocaml.version "4" then throw "qtest is not available for OCaml ${ocaml.version}" else -let version = "2.6"; in +let version = "2.7"; in stdenv.mkDerivation { - name = "ocaml-qtest-${version}"; + name = "ocaml${ocaml.version}-qtest-${version}"; src = fetchzip { url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; - sha256 = "1v5c1n5p8rhnisn606fs05q8764lqwgw08w66y5dm8wgmxgmsb3k"; + sha256 = "0z72m2drp67qchvsxx4sg2qjrrq8hp6p9kzdx16ibx58pvpw1sh2"; }; buildInputs = [ ocaml findlib ocamlbuild ]; From c6f90f949337c6296fe9fd8137c2ba0bbdc318d5 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Sun, 15 Oct 2017 17:15:45 +0100 Subject: [PATCH 1217/2806] pew: 0.1.14 -> 1.1.0 Pew was actually broken, due to a SHELL PATH check that had been added in the previous release (though this shouldn't have hampered users with bash as their shell) --- pkgs/development/tools/pew/default.nix | 32 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 21 ----------------- 3 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/tools/pew/default.nix diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix new file mode 100644 index 00000000000..16fc4817417 --- /dev/null +++ b/pkgs/development/tools/pew/default.nix @@ -0,0 +1,32 @@ +{ stdenv, python3Packages }: +with python3Packages; buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "pew"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b8z1vjsll1kgnh3mmdjps5rr9gayy091rapp2dra71jrwkx3yfh"; + }; + + propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; + + postFixup = '' + set -euo pipefail + PEW_SITE="$out/lib/${python.libPrefix}/site-packages" + SETUPTOOLS="${setuptools}/lib/${python.libPrefix}/site-packages" + SETUPTOOLS_SITE=$SETUPTOOLS/$(cat $SETUPTOOLS/setuptools.pth) + CLONEVENV_SITE="${virtualenv-clone}/lib/${python.libPrefix}/site-packages" + SITE_PACKAGES="[\'$PEW_SITE\',\'$SETUPTOOLS_SITE\',\'$CLONEVENV_SITE\']" + substituteInPlace $PEW_SITE/pew/pew.py \ + --replace "from pew.pew" "import sys; sys.path.extend($SITE_PACKAGES); from pew.pew" \ + --replace 'sys.executable, "-m", "virtualenv"' "'${virtualenv}/bin/virtualenv'" + ''; + + meta = with stdenv.lib; { + description = "Tools to manage multiple virtualenvs written in pure python"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ berdario ]; + }; + } \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8616756a9ad..0c967d925e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6674,6 +6674,8 @@ with pkgs; svg2tikz = python27Packages.svg2tikz; + pew = callPackage ../development/tools/pew {}; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a52015334b..231d5fecf6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6994,27 +6994,6 @@ in { }; }; - pew = buildPythonPackage rec { - name = "pew-0.1.14"; - namePrefix = ""; - - disabled = pythonOlder "3.4"; # old versions require backported libraries - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pew/${name}.tar.gz"; - sha256 = "0p188ah80l0rzbib2srahj2sswz8rcpqwbrbajyv2r5c1m5k6r4b"; - }; - - propagatedBuildInputs = with self; [ virtualenv virtualenv-clone ]; - - meta = { - description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ berdario ]; - }; - }; - pex = buildPythonPackage rec { name = "pex-${version}"; version = "1.2.7"; From e55b99e840e713f840f4a6989211913707838708 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Sun, 15 Oct 2017 17:16:51 +0100 Subject: [PATCH 1218/2806] pipenv: init at 8.2.7 fixes #30442 --- pkgs/development/tools/pipenv/default.nix | 24 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/pipenv/default.nix diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix new file mode 100644 index 00000000000..01433a6ce4d --- /dev/null +++ b/pkgs/development/tools/pipenv/default.nix @@ -0,0 +1,24 @@ +{ stdenv, python3Packages, pew }: +with python3Packages; buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "pipenv"; + version = "8.2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "08wkxs6qqgzxamym523bjv7zahg8p9v18x0yi9vwclij5k91iyzm"; + }; + + LC_ALL = "en_US.UTF-8"; + + propagatedBuildInputs = [ pew pip requests flake8 ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python Development Workflow for Humans"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ berdario ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c967d925e2..8d70d61113b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6675,6 +6675,7 @@ with pkgs; svg2tikz = python27Packages.svg2tikz; pew = callPackage ../development/tools/pew {}; + pipenv = callPackage ../development/tools/pipenv {}; pyrex = pyrex095; From 14bbec180188db61818a757872378f6b73d0ac28 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 16 Oct 2017 11:08:06 +0200 Subject: [PATCH 1219/2806] bb: init at 1.3rc1 --- pkgs/applications/misc/bb/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/bb/default.nix diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix new file mode 100644 index 00000000000..71196e91991 --- /dev/null +++ b/pkgs/applications/misc/bb/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, aalib, ncurses, xorg, libmikmod }: + +stdenv.mkDerivation rec { + name = "bb-${version}"; + version = "1.3rc1"; + + src = fetchurl { + url = "mirror://sourceforge/aa-project/bb/${version}/${name}.tar.gz"; + sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr"; + }; + + buildInputs = [ + aalib ncurses libmikmod + xorg.libXau xorg.libXdmcp xorg.libX11 + ]; + + meta = with stdenv.lib; { + homepage = http://aa-project.sourceforge.net/bb; + description = "AA-lib demo"; + license = licenses.gpl2; + maintainers = maintainers.rnhmjoj; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8262eb8dbd..9b395ca96bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13611,6 +13611,8 @@ with pkgs; bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { }; + bb = callPackage ../applications/misc/bb { }; + beast = callPackage ../applications/audio/beast { inherit (gnome2) libgnomecanvas libart_lgpl; guile = guile_1_8; From 88b853eb80ec0d0df3c01e773c57618df16e0ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 16 Oct 2017 11:55:40 +0200 Subject: [PATCH 1220/2806] Revert "libinput: 1.7.3 -> 1.8.3" This reverts commit 12f460e9e62c08c25309ebf80718f7b27503a780. It doesn't build. Discuss at #29784. --- .../libraries/libinput/default.nix | 33 ++++++++++++------- .../libinput/udev-absolute-path.patch | 21 ++++++------ 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 0f0e6726032..1cc275b3048 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,40 +1,49 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, libevdev, mtdev, udev, libwacom +{ stdenv, fetchurl, pkgconfig +, libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support -, testsSupport ? false, check ? null, valgrind ? null }: +, testsSupport ? false, check ? null, valgrind ? null +, autoconf, automake +}: assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null; -let mkFlag = c: flag: if c then "-D${flag}=true" else "-D${flag}=false"; -in with stdenv.lib; stdenv.mkDerivation rec { +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + +with stdenv.lib; +stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.8.3"; + version = "1.7.3"; src = fetchurl { - url = "https://freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0b8l2dmzzm20xf2hw1dr9gnzd3fah9jz5f216p2ajw895zsy5qig"; + url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; + sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"; }; outputs = [ "out" "dev" ]; - mesonFlags = [ + configureFlags = [ (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "debug-gui") + (mkFlag eventGUISupport "event-gui") (mkFlag testsSupport "tests") ]; - patches = [ ./udev-absolute-path.patch ]; + nativeBuildInputs = [ pkgconfig ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = [ libevdev mtdev libwacom ] + buildInputs = [ libevdev mtdev libwacom autoconf automake ] ++ optionals eventGUISupport [ cairo glib gtk3 ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind ]; propagatedBuildInputs = [ udev ]; + patches = [ ./udev-absolute-path.patch ]; + patchFlags = [ "-p0" ]; + meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = http://www.freedesktop.org/wiki/Software/libinput; diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index 4b6bfc96d5a..2d3fa966b29 100644 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -1,11 +1,12 @@ ---- a/meson.build 2017-09-25 11:37:07.787726521 +0000 -+++ b/meson.build 2017-09-25 11:38:48.958233247 +0000 -@@ -100,7 +100,7 @@ - args : model_quirks) +--- configure.ac 2016-05-27 14:00:25.248388226 +0200 ++++ configure.ac 2016-05-27 14:01:28.228943416 +0200 +@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil + # Used by the udev rules so we can use callouts during testing without + # installing everything first. Default is the empty string so the installed + # rule will use udev's default path. Override is in udev/Makefile.am +-AC_SUBST(UDEV_TEST_PATH, "") ++UDEV_TEST_PATH="${UDEV_DIR}/" ++AC_SUBST(UDEV_TEST_PATH) + AC_PATH_PROG(SED, [sed]) - udev_rules_config = configuration_data() --udev_rules_config.set('UDEV_TEST_PATH', '') -+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/') - configure_file(input : 'udev/80-libinput-device-groups.rules.in', - output : '80-libinput-device-groups.rules', - install : true, + AC_CONFIG_FILES([Makefile From 629965a53251afa23a60c08c16000b732374b9f9 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 16 Oct 2017 07:30:35 -0400 Subject: [PATCH 1221/2806] hostapd: patch for KRACKAttack CVE-2017-13077: Reinstallation of the pairwise encryption key (PTK-TK) in the 4-way handshake. CVE-2017-13078: Reinstallation of the group key (GTK) in the 4-way handshake. CVE-2017-13079: Reinstallation of the integrity group key (IGTK) in the 4-way handshake. CVE-2017-13080: Reinstallation of the group key (GTK) in the group key handshake. CVE-2017-13081: Reinstallation of the integrity group key (IGTK) in the group key handshake. CVE-2017-13082: Accepting a retransmitted Fast BSS Transition (FT) Reassociation Request and reinstalling the pairwise encryption key (PTK-TK) while processing it. CVE-2017-13084: Reinstallation of the STK key in the PeerKey handshake. CVE-2017-13086: reinstallation of the Tunneled Direct-Link Setup (TDLS) PeerKey (TPK) key in the TDLS handshake. CVE-2017-13087: reinstallation of the group key (GTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame. CVE-2017-13088: reinstallation of the integrity group key (IGTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame. --- pkgs/os-specific/linux/hostapd/default.nix | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index c2320f8d7c7..fa4d604b400 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -23,6 +23,40 @@ stdenv.mkDerivation rec { url = "https://w1.fi/cgit/hostap/patch/?id=b70d508c50e8e2d2b8fb96ae44ae10f84cf0c1ae"; sha256 = "0pslmsbay2cy1k07w1mdcr0b8w059jkrqrr9zi1aljvkm3vbwhj1"; }) + + #KRACKAttack.com + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; + sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; + sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; + sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; + sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; + sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; + sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; + }) + #(fetchurl { # wpa-supplicant only + # url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; + # sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; + #}) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; + sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; + }) ]; nativeBuildInputs = [ pkgconfig ]; From ea50efcc67cfa6c8331b54ff33ab791dacd52fe4 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 16 Oct 2017 07:31:01 -0400 Subject: [PATCH 1222/2806] wpa_supplicant: patch for KRACKAttack CVE-2017-13077: Reinstallation of the pairwise encryption key (PTK-TK) in the 4-way handshake. CVE-2017-13078: Reinstallation of the group key (GTK) in the 4-way handshake. CVE-2017-13079: Reinstallation of the integrity group key (IGTK) in the 4-way handshake. CVE-2017-13080: Reinstallation of the group key (GTK) in the group key handshake. CVE-2017-13081: Reinstallation of the integrity group key (IGTK) in the group key handshake. CVE-2017-13082: Accepting a retransmitted Fast BSS Transition (FT) Reassociation Request and reinstalling the pairwise encryption key (PTK-TK) while processing it. CVE-2017-13084: Reinstallation of the STK key in the PeerKey handshake. CVE-2017-13086: reinstallation of the Tunneled Direct-Link Setup (TDLS) PeerKey (TPK) key in the TDLS handshake. CVE-2017-13087: reinstallation of the group key (GTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame. CVE-2017-13088: reinstallation of the integrity group key (IGTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame. --- .../linux/wpa_supplicant/default.nix | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 25160fb0c95..c2c05a6b99e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -80,6 +80,39 @@ stdenv.mkDerivation rec { patches = [ ./build-fix.patch + #KRACKAttack.com + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; + sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; + sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; + sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; + sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; + sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; + sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; + }) + (fetchurl { # wpa-supplicant only + url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; + sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; + sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; + }) ]; postInstall = '' From ef39873f0fe1ad3b1e90bb25378eefed50e93236 Mon Sep 17 00:00:00 2001 From: Eli Flanagan Date: Mon, 16 Oct 2017 07:34:30 -0400 Subject: [PATCH 1223/2806] sqitch-pg: 0.9994 -> 0.9996 --- 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 2ad39ccd280..77eef4d0ae0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -309,11 +309,11 @@ let self = _self // overrides; _self = with self; { }; AppSqitch = buildPerlModule rec { - version = "0.9994"; + version = "0.9996"; name = "App-Sqitch-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "0in602z40s50fdlmws4g0a1pb8p7yn0wx8jgsacz26a4i1q7gpi4"; + sha256 = "864edde554e7cd6578e8fe2a4c17ea8eda82da878cdfd00fd9fb3c53f696fc1e"; }; buildInputs = [ CaptureTiny PathClass TestDeep TestDir TestException From 2c8058183f82a1862c90c3962d3260cda87c5324 Mon Sep 17 00:00:00 2001 From: Niclas Thall Date: Mon, 16 Oct 2017 13:41:39 +0200 Subject: [PATCH 1224/2806] qgis: 2.18.12 -> 2.18.13 --- pkgs/applications/gis/qgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index a3ea89e2668..a008835f59f 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.12"; + name = "qgis-2.18.13"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "0fh256j2d2kh9hjx6q1zdzxfqsgifg9dvgk214sv6zxzhsn0kxvs"; + sha256 = "033l3wg3l7hv4642wmsdycjca1dw8p89sk9xyc51wpb3id17vgv2"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; From 3f4a6754ef54b7584ab9779081e66b480a517db4 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 16 Oct 2017 13:50:12 +0100 Subject: [PATCH 1225/2806] wireguard: 0.0.20171005 -> 0.0.20171011 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 3c35bb372a2..b6d294836c2 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20171005"; + version = "0.0.20171011"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "026n0a7fln5w8s7lsxdn4fgzqxdwhqnnnfhczn36j3sipdy3nal3"; + sha256 = "15hby5fi85r7h7adr8kva26w9b2sz3147d7nl2y0fdblb3v4zr72"; }; meta = with stdenv.lib; { From f250015ea396560b42c51c9289f5b65202882780 Mon Sep 17 00:00:00 2001 From: Markus Mueller Date: Sat, 14 Oct 2017 20:54:13 +0000 Subject: [PATCH 1226/2806] nixos/gitlab: fix uploades directory permissions --- nixos/modules/services/misc/gitlab.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 0fa9e417785..38c73a13de9 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -639,10 +639,10 @@ in { chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories chmod -R ug-s ${cfg.statePath}/repositories find ${cfg.statePath}/repositories -type d -print0 | xargs -0 chmod g+s - chmod 700 ${cfg.statePath}/uploads + chmod 770 ${cfg.statePath}/uploads chown -R git ${cfg.statePath}/uploads find ${cfg.statePath}/uploads -type f -exec chmod 0644 {} \; - find ${cfg.statePath}/uploads -type d -not -path ${cfg.statePath}/uploads -exec chmod 0700 {} \; + find ${cfg.statePath}/uploads -type d -not -path ${cfg.statePath}/uploads -exec chmod 0770 {} \; ''; serviceConfig = { From 60b0db0e08197b9fd773a417ed96000841a905a5 Mon Sep 17 00:00:00 2001 From: Markus Mueller Date: Sat, 14 Oct 2017 20:58:02 +0000 Subject: [PATCH 1227/2806] gitlab: link tmp/ directory to writable path --- nixos/modules/services/misc/gitlab.nix | 1 + pkgs/applications/version-management/gitlab/default.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 38c73a13de9..14c184c3d68 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -581,6 +581,7 @@ in { mkdir -p ${cfg.statePath}/{log,uploads} ln -sf ${cfg.statePath}/log /run/gitlab/log ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads + ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp chown -R ${cfg.user}:${cfg.group} /run/gitlab # Prepare home directory diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 93829b05dae..657221d4b42 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -84,12 +84,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' + rm -r tmp mkdir -p $out/share cp -r . $out/share/gitlab rm -rf $out/share/gitlab/log ln -sf /run/gitlab/log $out/share/gitlab/log ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads ln -sf /run/gitlab/config $out/share/gitlab/config + ln -sf /run/gitlab/tmp $out/share/gitlab/tmp # rake tasks to mitigate CVE-2017-0882 # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ From f6d8a969937ff078651ac3582e726b185d9c794d Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 16 Oct 2017 15:11:58 +0200 Subject: [PATCH 1228/2806] nsswitch: use [NOTFOUND=return] for mdns Commit 987aac7 and issue #18183 were intended to fix support for other things, but in the process, changed mdns_minimal to use the wrong return setting, resulting in permanent failures in early boot, affecting things like issue #30459. Signed-off-by: Jason A. Donenfeld --- nixos/modules/config/nsswitch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 97278238dcd..7b36d4f1cbd 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -18,7 +18,7 @@ let hostArray = [ "files" ] ++ optionals mymachines [ "mymachines" ] - ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ] + ++ optionals nssmdns [ "mdns_minimal [NOTFOUND=return]" ] ++ optionals nsswins [ "wins" ] ++ optionals resolved ["resolve [!UNAVAIL=return]"] ++ [ "dns" ] From 00669df0c164f0d97c785b1fe48e1ba30b56a6ac Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 16 Oct 2017 09:26:36 -0400 Subject: [PATCH 1229/2806] linux: 4.14-rc4 -> 4.14-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 30445500376..fe5cd8989de 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc4"; - modDirVersion = "4.14.0-rc4"; + version = "4.14-rc5"; + modDirVersion = "4.14.0-rc5"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1n9jni7sdawhjnlpl1g3rw89ggfi8d6s088wv1h21cnmsav911ik"; + sha256 = "1y383vw79jhpr15s919xwzxif2y8zbiwa64sg2aan075xfhzijp8"; }; # Should the testing kernels ever be built on Hydra? From f804a8ff98b4a2550d4e854fa7506e1fe56d33d6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 16 Oct 2017 17:46:06 +0200 Subject: [PATCH 1230/2806] encrypted devices: don't override default cryptoModules --- nixos/modules/tasks/encrypted-devices.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 6bbf335e7db..0b4c41a0f2a 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -67,7 +67,6 @@ in luks = { devices = map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs; - cryptoModules = [ "aes" "sha256" "sha1" "xts" ]; forceLuksSupportInInitrd = true; }; postMountCommands = From 77be4d91f7448636749049672dc78c0d08ea3d45 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 16 Oct 2017 17:46:46 +0200 Subject: [PATCH 1231/2806] encrypted devices: provide working example --- nixos/modules/tasks/encrypted-devices.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 0b4c41a0f2a..da0c9408d89 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -36,7 +36,7 @@ let keyFile = mkOption { default = null; - example = "/root/.swapkey"; + example = "/mnt-root/root/.swapkey"; type = types.nullOr types.str; description = "File system location of keyfile. This unlocks the drive after the root has been mounted to /mnt-root."; }; From 11cd2c52c4a4a760e0ae8338afafba5ad4fdaa56 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 02:24:02 -0500 Subject: [PATCH 1232/2806] nixpkgs: icestorm 2017.08.31 -> 2017.10.16 Also add myself to the maintainers list. Signed-off-by: Austin Seipp --- pkgs/development/tools/icestorm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 149901b78ea..b01127ffa56 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 = "2017.08.31"; + version = "2017.10.16"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "8354bc6086f11002cc58497f91f43200a09c13a9"; - sha256 = "0mg6sp5ymdxmkyzmssyavsjicw0z74bn4lv1jqwxjnmynw5l0f9b"; + rev = "d9d2a3dcaa749014f5b9a539768b8368bb529b28"; + sha256 = "1a755jnbjq3v7a3l90qjlgihmrpbdfiiabb4g8sw3ay3qmvzwh6b"; }; buildInputs = [ python3 libftdi ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.clifford.at/icestorm/; license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.shell ]; + maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; platforms = stdenv.lib.platforms.linux; }; } From 3b08d97e071ee86e113b915f6bbeb9d9c9b98f15 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 02:29:21 -0500 Subject: [PATCH 1233/2806] nixpkgs: simplify arachne-pnr makeFlags, make myself maintainer Signed-off-by: Austin Seipp --- pkgs/development/compilers/arachne-pnr/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 6508b05a534..0a0f8bbf082 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -11,10 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1wszcx6hgw4q4r778zswrlwdwvwxq834bkajck8w9yfqwxs9lmq8"; }; - preBuild = '' - makeFlags="DESTDIR=$out $makeFlags" - ''; - makeFlags = "ICEBOX=${icestorm}/share/icebox"; + makeFlags = + [ "DESTDIR=$(out)" "ICEBOX=${icestorm}/share/icebox" + ]; meta = { description = "Place and route tool for FPGAs"; @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/cseed/arachne-pnr; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.shell ]; + maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; platforms = stdenv.lib.platforms.linux; }; } From 35c885dc3d4f385b540e6ee18c8bec010e6f4ff8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 02:34:04 -0500 Subject: [PATCH 1234/2806] nixpkgs: yosys 2017.09.01 -> 2017.10.16, enable parallel builds Signed-off-by: Austin Seipp --- pkgs/development/compilers/yosys/default.nix | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 35172dbd15b..02f5d3494e6 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,27 +1,30 @@ -{ stdenv, fetchFromGitHub, fetchFromBitbucket, pkgconfig, tcl, readline, libffi, python3, bison, flex }: +{ stdenv, fetchFromGitHub, fetchFromBitbucket +, pkgconfig, tcl, readline, libffi, python3, bison, flex +}: stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2017.09.01"; + version = "2017.10.16"; srcs = [ (fetchFromGitHub { owner = "cliffordwolf"; repo = "yosys"; - rev = "18609f3df82a3403c41d552908183f7e49ff5678"; - sha256 = "0qdjxqg3l098g8pda5a4cif4bd78rx7vilv3z62r56ppj55mgw96"; + rev = "716dbc92745aa8b41d85a60d50263433d5a79393"; + sha256 = "0va77my4iddsw6psgjfhfgs0z0z1hpj0l8ipchcl8crpxipxcr77"; name = "yosys"; }) (fetchFromBitbucket { owner = "alanmi"; repo = "abc"; - rev = "ff5be0604997"; - sha256 = "08gdvxm44dvhgjw6lf2jx0xyk6h4ai37h6b88dysvaa69sx7rh8n"; + rev = "6283c5d99b06"; + sha256 = "1mv8r1la4d4r9bk32sl4nq3flyxi8jf2ccaak64j5rz9hirrlpla"; name = "yosys-abc"; }) ]; sourceRoot = "yosys"; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ tcl readline libffi python3 bison flex ]; preBuild = '' @@ -43,9 +46,9 @@ stdenv.mkDerivation rec { adding additional passes as needed by extending the yosys C++ code base. ''; - homepage = http://www.clifford.at/yosys/; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.shell ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://www.clifford.at/yosys/; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; }; } From 740fb165da558cd0f341ddd46a4ff2585a3a294c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 02:44:00 -0500 Subject: [PATCH 1235/2806] nixpkgs: add symbiyosys, for HDL verification flows Signed-off-by: Austin Seipp --- .../science/logic/symbiyosys/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/science/logic/symbiyosys/default.nix diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix new file mode 100644 index 00000000000..5da3e7c31b4 --- /dev/null +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, yosys, python3 }: + +stdenv.mkDerivation rec { + name = "symbiyosys-${version}"; + version = "2017.10.16"; + + src = fetchFromGitHub { + owner = "cliffordwolf"; + repo = "symbiyosys"; + rev = "f403b99fae053baab651e3ec8345a68cb3ba6a96"; + sha256 = "0jzzlybxaqmhrasfjv3q3skshalr7lvv4p142qgdqz1ig36znbi8"; + }; + + buildInputs = [ python3 yosys ]; + + buildPhase = "true"; + installPhase = '' + mkdir -p $out/bin $out/share/yosys/python3 + + cp sbysrc/sby_*.py $out/share/yosys/python3/ + cp sbysrc/sby.py $out/bin/sby + chmod +x $out/bin/sby + + # Fix up shebang and Yosys imports + patchShebangs $out/bin/sby + substituteInPlace $out/bin/sby \ + --replace "##yosys-sys-path##" \ + "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" + ''; + meta = { + description = "Yosys verification tools for Hardware Definition Languages"; + homepage = https://symbiyosys.readthedocs.io/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d70d61113b..1afc58c6a21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18684,6 +18684,8 @@ with pkgs; boolector = callPackage ../applications/science/logic/boolector {}; + symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; + ### SCIENCE / ELECTRONICS adms = callPackage ../applications/science/electronics/adms { }; From e84cec2762312aed553217117733ecf7fe5bff12 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 03:56:08 -0500 Subject: [PATCH 1236/2806] nixpkgs: add 'avy' -- property directed AIGER model checking Signed-off-by: Austin Seipp --- .../logic/avy/0001-no-static-boost-libs.patch | 12 +++++++ .../science/logic/avy/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch create mode 100644 pkgs/applications/science/logic/avy/default.nix diff --git a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch b/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch new file mode 100644 index 00000000000..a53142faba6 --- /dev/null +++ b/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch @@ -0,0 +1,12 @@ +diff --git a/avy/CMakeLists.txt b/avy/CMakeLists.txt +index 5913076..b0453b5 100644 +--- a/avy/CMakeLists.txt ++++ b/avy/CMakeLists.txt +@@ -23,7 +23,6 @@ if (CUSTOM_BOOST_ROOT) + set (Boost_NO_SYSTEM_PATHS "ON") + endif() + +-set (Boost_USE_STATIC_LIBS ON) + find_package (Boost 1.46.1 REQUIRED program_options) + IF (Boost_FOUND) + include_directories (${Boost_INCLUDE_DIRS}) diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix new file mode 100644 index 00000000000..379224c73f8 --- /dev/null +++ b/pkgs/applications/science/logic/avy/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, cmake, zlib, boost }: + +stdenv.mkDerivation rec { + name = "avy-${version}"; + version = "2017.10.16"; + + src = fetchgit { + url = "https://bitbucket.org/arieg/extavy"; + rev = "c75c83379c38d6ea1046d0caee95aef77283ffe3"; + sha256 = "0zcycnypg4q5g710bnkjpycaawmibc092vmyhgfbixkgq9fb5lfh"; + fetchSubmodules = true; + }; + + buildInputs = [ cmake zlib boost.out boost.dev ]; + NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + patches = + [ ./0001-no-static-boost-libs.patch + ]; + + installPhase = '' + mkdir -p $out/bin + cp avy/src/{avy,avybmc} $out/bin/ + ''; + + meta = { + description = "AIGER model checking for Property Directed Reachability"; + homepage = https://arieg.bitbucket.io/avy/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1afc58c6a21..cee09d72987 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18682,6 +18682,8 @@ with pkgs; z3 = callPackage ../applications/science/logic/z3 {}; + avy = callPackage ../applications/science/logic/avy {}; + boolector = callPackage ../applications/science/logic/boolector {}; symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; From b72f543f96159a07ca3e51f43b05b5b724c09b31 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 05:12:18 -0500 Subject: [PATCH 1237/2806] picosat: install more stuff Projects like the AIGER toolkit want to use the picosat.o object file in order to do SAT solving. Install this, along with the header and version information, so a build of the AIGER can use it. This means that picosat does not need to be built twice. Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/picosat/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 070664980dc..e026cfad218 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { configurePhase = "./configure.sh --shared --trace"; installPhase = '' - mkdir -p $out/bin $out/lib $out/include/picosat + mkdir -p $out/bin $out/lib $out/share $out/include/picosat cp picomus picomcs picosat picogcnf "$out"/bin + cp VERSION "$out"/share/picosat.version + cp picosat.o "$out"/lib cp libpicosat.a "$out"/lib cp libpicosat.so "$out"/lib From 635fbcbd33e80663824164bd17571cc45c8bb934 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 05:13:46 -0500 Subject: [PATCH 1238/2806] nixpkgs: add aiger 1.9.9 Signed-off-by: Austin Seipp --- .../science/logic/aiger/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/science/logic/aiger/default.nix diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix new file mode 100644 index 00000000000..2b959c72d37 --- /dev/null +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, picosat }: + +stdenv.mkDerivation rec { + name = "aiger-${version}"; + version = "1.9.9"; + + src = fetchurl { + url = "http://fmv.jku/aiger/${name}.tar.gz"; + sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y"; + }; + + enableParallelBuilding = true; + + configurePhase = '' + # Set up picosat, so we can build 'aigbmc' + echo $(pwd) + ls .. + mkdir ../picosat + ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h + ln -s ${picosat}/lib/picosat.o ../picosat/picosat.o + ln -s ${picosat}/share/picosat.version ../picosat/VERSION + ls .. + ./configure.sh + ''; + + installPhase = '' + mkdir -p $out/bin + + # Do the installation manually, as the Makefile has odd + # cyrillic characters, and this is easier than adding + # a whole .patch file. + BINS=( \ + aigand aigdd aigflip aigfuzz aiginfo aigjoin \ + aigmiter aigmove aignm aigor aigreset aigsim \ + aigsplit aigstrip aigtoaig aigtoblif aigtocnf \ + aigtodot aigtosmv aigunconstraint aigunroll \ + andtoaig bliftoaig smvtoaig soltostim wrapstim \ + aigbmc aigdep + ) + + for x in ''${BINS[*]}; do + install -m 755 -s $x $out/bin/$x + done + ''; + + meta = { + description = "And-Inverter Graph (AIG) utilities"; + homepage = http://fmv.jku.at/aiger/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cee09d72987..d6394c53b6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18682,6 +18682,8 @@ with pkgs; z3 = callPackage ../applications/science/logic/z3 {}; + aiger = callPackage ../applications/science/logic/aiger {}; + avy = callPackage ../applications/science/logic/avy {}; boolector = callPackage ../applications/science/logic/boolector {}; From 38e6ae8e440d3c1eb53c7f2bae9dedd2fdf9a5bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 14 Oct 2017 22:35:53 +0200 Subject: [PATCH 1239/2806] at: fix permission errors with "batch" on NixOS Fixes https://github.com/NixOS/nixpkgs/issues/12392 --- pkgs/tools/system/at/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 501a1bde33b..cc4ccdd40f0 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,4 +1,7 @@ -{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/run/wrappers/bin/sendmail" }: +{ fetchurl, stdenv, bison, flex, pam +, sendmailPath ? "/run/wrappers/bin/sendmail" +, atWrapperPath ? "/run/wrappers/bin/at" +}: stdenv.mkDerivation rec { name = "at-${version}"; @@ -30,6 +33,13 @@ stdenv.mkDerivation rec { --with-daemon_username=atd --with-daemon_groupname=atd ''; + # Ensure that "batch" can invoke the setuid "at" wrapper, if it exists, or + # else we get permission errors (on NixOS). "batch" is a shell script, so + # when the kernel executes it it drops setuid perms. + postInstall = '' + sed -i "6i test -x ${atWrapperPath} && exec ${atWrapperPath} -qb now # exec doesn't return" "$out/bin/batch" + ''; + meta = { description = ''The classical Unix `at' job scheduling command''; license = stdenv.lib.licenses.gpl2Plus; From 943730ff9b6b05c61ef75d7e2f3fae17d4cbdf4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 14 Oct 2017 22:38:10 +0200 Subject: [PATCH 1240/2806] nixos/tests: add basic test for services.atd --- nixos/release.nix | 1 + nixos/tests/atd.nix | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 nixos/tests/atd.nix diff --git a/nixos/release.nix b/nixos/release.nix index 4060e5df4ec..5fa9e1f10d4 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -214,6 +214,7 @@ in rec { # Run the tests for each platform. You can run a test by doing # e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently, # ‘nix-build tests/login.nix -A result’. + tests.atd = callTest tests/atd.nix {}; tests.acme = callTest tests/acme.nix {}; tests.avahi = callTest tests/avahi.nix {}; tests.bittorrent = callTest tests/bittorrent.nix {}; diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix new file mode 100644 index 00000000000..c2c0a716e0d --- /dev/null +++ b/nixos/tests/atd.nix @@ -0,0 +1,36 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +{ + name = "atd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bjornfor ]; + }; + + machine = + { config, pkgs, ... }: + { services.atd.enable = true; + users.extraUsers.alice = { isNormalUser = true; }; + }; + + # "at" has a resolution of 1 minute + testScript = '' + startAll; + + $machine->fail("test -f ~root/at-1"); + $machine->fail("test -f ~root/batch-1"); + $machine->fail("test -f ~alice/at-1"); + $machine->fail("test -f ~alice/batch-1"); + + $machine->succeed("echo 'touch ~root/at-1' | at now+1min"); + $machine->succeed("echo 'touch ~root/batch-1' | batch"); + $machine->succeed("su - alice -c \"echo 'touch at-1' | at now+1min\""); + $machine->succeed("su - alice -c \"echo 'touch batch-1' | batch\""); + + $machine->succeed("sleep 1.5m"); + + $machine->succeed("test -f ~root/at-1"); + $machine->succeed("test -f ~root/batch-1"); + $machine->succeed("test -f ~alice/at-1"); + $machine->succeed("test -f ~alice/batch-1"); + ''; +}) From 497108b4568d01cefee6acdf92b738ee80e22023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 15 Oct 2017 11:20:11 +0200 Subject: [PATCH 1241/2806] nixos/atd: remove "batch" from setuid wrappers "batch" is a shell script so invoking it via setuid wrapper never worked anyway. (The kernel drops perms on executables with shebang.) A previous nixpkgs commit made "batch" invoke the NixOS setuid "at" wrapper to gain needed privileges. Thanks to @yesbox for noticing. --- nixos/modules/services/scheduling/atd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 0216c9771c9..77a3f6b51e8 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -42,6 +42,8 @@ in config = mkIf cfg.enable { + # Not wrapping "batch" because it's a shell script (kernel drops perms + # anyway) and it's patched to invoke the "at" setuid wrapper. security.wrappers = builtins.listToAttrs ( map (program: { name = "${program}"; value = { source = "${at}/bin/${program}"; @@ -49,7 +51,7 @@ in group = "atd"; setuid = true; setgid = true; - };}) [ "at" "atq" "atrm" "batch" ]); + };}) [ "at" "atq" "atrm" ]); environment.systemPackages = [ at ]; From 10e79d43f61a6f73e1ac4686c280ec44d041c2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 14 Oct 2017 10:42:37 +0200 Subject: [PATCH 1242/2806] nixos/tests: add gitolite test --- nixos/release.nix | 1 + nixos/tests/gitolite.nix | 139 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 nixos/tests/gitolite.nix diff --git a/nixos/release.nix b/nixos/release.nix index 5fa9e1f10d4..fecd8ce00e3 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -250,6 +250,7 @@ in rec { tests.firewall = callTest tests/firewall.nix {}; tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); #tests.gitlab = callTest tests/gitlab.nix {}; + tests.gitolite = callTest tests/gitolite.nix {}; tests.glance = callTest tests/glance.nix {}; tests.gocd-agent = callTest tests/gocd-agent.nix {}; tests.gocd-server = callTest tests/gocd-server.nix {}; diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix new file mode 100644 index 00000000000..643ea4ff03e --- /dev/null +++ b/nixos/tests/gitolite.nix @@ -0,0 +1,139 @@ +import ./make-test.nix ({ pkgs, ...}: + +let + adminPrivateKey = pkgs.writeText "id_ed25519" '' + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACDu7qxYQAPdAU6RrhB3llk2N1v4PTwcVzcX1oX265uC3gAAAJBJiYxDSYmM + QwAAAAtzc2gtZWQyNTUxOQAAACDu7qxYQAPdAU6RrhB3llk2N1v4PTwcVzcX1oX265uC3g + AAAEDE1W6vMwSEUcF1r7Hyypm/+sCOoDmKZgPxi3WOa1mD2u7urFhAA90BTpGuEHeWWTY3 + W/g9PBxXNxfWhfbrm4LeAAAACGJmb0BtaW5pAQIDBAU= + -----END OPENSSH PRIVATE KEY----- + ''; + + adminPublicKey = pkgs.writeText "id_ed25519.pub" '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7urFhAA90BTpGuEHeWWTY3W/g9PBxXNxfWhfbrm4Le root@client + ''; + + alicePrivateKey = pkgs.writeText "id_ed25519" '' + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACBbeWvHh/AWGWI6EIc1xlSihyXtacNQ9KeztlW/VUy8wQAAAJAwVQ5VMFUO + VQAAAAtzc2gtZWQyNTUxOQAAACBbeWvHh/AWGWI6EIc1xlSihyXtacNQ9KeztlW/VUy8wQ + AAAEB7lbfkkdkJoE+4TKHPdPQWBKLSx+J54Eg8DaTr+3KoSlt5a8eH8BYZYjoQhzXGVKKH + Je1pw1D0p7O2Vb9VTLzBAAAACGJmb0BtaW5pAQIDBAU= + -----END OPENSSH PRIVATE KEY----- + ''; + + alicePublicKey = pkgs.writeText "id_ed25519.pub" '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFt5a8eH8BYZYjoQhzXGVKKHJe1pw1D0p7O2Vb9VTLzB alice@client + ''; + + bobPrivateKey = pkgs.writeText "id_ed25519" '' + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACCWTaJ1D9Xjxy6759FvQ9oXTes1lmWBciXPkEeqTikBMAAAAJDQBmNV0AZj + VQAAAAtzc2gtZWQyNTUxOQAAACCWTaJ1D9Xjxy6759FvQ9oXTes1lmWBciXPkEeqTikBMA + AAAEDM1IYYFUwk/IVxauha9kuR6bbRtT3gZ6ZA0GLb9txb/pZNonUP1ePHLrvn0W9D2hdN + 6zWWZYFyJc+QR6pOKQEwAAAACGJmb0BtaW5pAQIDBAU= + -----END OPENSSH PRIVATE KEY----- + ''; + + bobPublicKey = pkgs.writeText "id_ed25519.pub" '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJZNonUP1ePHLrvn0W9D2hdN6zWWZYFyJc+QR6pOKQEw bob@client + ''; + + gitoliteAdminConfSnippet = '' + repo alice-project + RW+ = alice + ''; +in +{ + name = "gitolite"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bjornfor ]; + }; + + nodes = { + + server = + { config, pkgs, lib, ... }: + { + services.gitolite = { + enable = true; + adminPubkey = builtins.readFile adminPublicKey; + }; + services.openssh.enable = true; + }; + + client = + { config, pkgs, lib, ... }: + { + environment.systemPackages = [ pkgs.git ]; + programs.ssh.extraConfig = '' + Host * + UserKnownHostsFile /dev/null + StrictHostKeyChecking no + # there's nobody around that can input password + PreferredAuthentications publickey + ''; + users.extraUsers.alice = { isNormalUser = true; }; + users.extraUsers.bob = { isNormalUser = true; }; + }; + + }; + + testScript = '' + startAll; + + subtest "can setup ssh keys on system", sub { + $client->mustSucceed("mkdir -p ~root/.ssh"); + $client->mustSucceed("cp ${adminPrivateKey} ~root/.ssh/id_ed25519"); + $client->mustSucceed("chmod 600 ~root/.ssh/id_ed25519"); + + $client->mustSucceed("sudo -u alice mkdir -p ~alice/.ssh"); + $client->mustSucceed("sudo -u alice cp ${alicePrivateKey} ~alice/.ssh/id_ed25519"); + $client->mustSucceed("sudo -u alice chmod 600 ~alice/.ssh/id_ed25519"); + + $client->mustSucceed("sudo -u bob mkdir -p ~bob/.ssh"); + $client->mustSucceed("sudo -u bob cp ${bobPrivateKey} ~bob/.ssh/id_ed25519"); + $client->mustSucceed("sudo -u bob chmod 600 ~bob/.ssh/id_ed25519"); + }; + + subtest "gitolite server starts", sub { + $server->waitForUnit("gitolite-init.service"); + $server->waitForUnit("sshd.service"); + $client->mustSucceed('ssh gitolite@server info'); + }; + + subtest "admin can clone and configure gitolite-admin.git", sub { + $client->mustSucceed('git clone gitolite@server:gitolite-admin.git'); + $client->mustSucceed("git config --global user.name 'System Administrator'"); + $client->mustSucceed("git config --global user.email root\@domain.example"); + $client->mustSucceed("cp ${alicePublicKey} gitolite-admin/keydir/alice.pub"); + $client->mustSucceed("cp ${bobPublicKey} gitolite-admin/keydir/bob.pub"); + $client->mustSucceed('(cd gitolite-admin && git add . && git commit -m "Add keys for alice, bob" && git push)'); + $client->mustSucceed("printf '${gitoliteAdminConfSnippet}' >> gitolite-admin/conf/gitolite.conf"); + $client->mustSucceed('(cd gitolite-admin && git add . && git commit -m "Add repo for alice" && git push)'); + }; + + subtest "non-admins cannot clone gitolite-admin.git", sub { + $client->mustFail('sudo -i -u alice git clone gitolite@server:gitolite-admin.git'); + $client->mustFail('sudo -i -u bob git clone gitolite@server:gitolite-admin.git'); + }; + + subtest "non-admins can clone testing.git", sub { + $client->mustSucceed('sudo -i -u alice git clone gitolite@server:testing.git'); + $client->mustSucceed('sudo -i -u bob git clone gitolite@server:testing.git'); + }; + + subtest "alice can clone alice-project.git", sub { + $client->mustSucceed('sudo -i -u alice git clone gitolite@server:alice-project.git'); + }; + + subtest "bob cannot clone alice-project.git", sub { + $client->mustFail('sudo -i -u bob git clone gitolite@server:alice-project.git'); + }; + ''; +}) From cd52a3d53cd9bd0d23975147c025f9f6b8a58c9f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 13:01:40 -0500 Subject: [PATCH 1243/2806] aiger: fix stupid incorrect download link Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/aiger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index 2b959c72d37..1a60c5e148c 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.9.9"; src = fetchurl { - url = "http://fmv.jku/aiger/${name}.tar.gz"; + url = "http://fmv.jku.at/aiger/${name}.tar.gz"; sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y"; }; From e1e72513395959f133c4186c1c144a1c7a72efd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 16 Oct 2017 20:05:12 +0200 Subject: [PATCH 1244/2806] libdrm: 2.4.83 -> 2.4.84 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4903d8e66df..992b1ea70dc 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.83"; + name = "libdrm-2.4.84"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1minzvsyz5hgm6ixpj8ysa6jsv7vm8qc8nx390jxdsk0v9ljd983"; + sha256 = "7ae9c24d91139ac9a2cdee06fe46dbe1c401a1eda1c0bd2a6d1ecf72f479e0aa"; }; outputs = [ "out" "dev" "bin" ]; From d392f4be1c6bfcd459b277030732197bdacdafa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 16 Oct 2017 20:05:30 +0200 Subject: [PATCH 1245/2806] systemd: no need to use older gperf anymore For a long time. --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c8da3080fc..df896cf5f69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12920,7 +12920,6 @@ with pkgs; systemd = callPackage ../os-specific/linux/systemd { utillinux = utillinuxMinimal; # break the cyclic dependency - gperf = gperf_3_0; # fix build until v233 } // { udev.bin = systemd; # ${systemd.udev.bin}/bin/udevadm From 774d05878a9c50400cb6556044dd3ae9d833e2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 16 Oct 2017 19:36:08 +0200 Subject: [PATCH 1246/2806] nixos/tests: unbreak prometheus test Commit 271d3f7a432f ("prometheus service: globalConfig.labels is obsolete") removed globalConfig.labels. Update the test config accordingly. --- nixos/tests/prometheus.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index ade097597bb..374fb2d634b 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -5,9 +5,6 @@ import ./make-test.nix { one = { config, pkgs, ... }: { services.prometheus = { enable = true; - globalConfig = { - labels = { foo = "bar"; }; - }; scrapeConfigs = [{ job_name = "prometheus"; static_configs = [{ From 12d6fed2ba3d6ad40f493e320fe55995166783fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 16 Oct 2017 19:36:13 +0200 Subject: [PATCH 1247/2806] nixos/tests: enable prometheus test As far as I can tell, we've had this test since 2015, but it was never enabled. --- nixos/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release.nix b/nixos/release.nix index fecd8ce00e3..63f739e8e89 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -308,6 +308,7 @@ in rec { tests.postgis = callTest tests/postgis.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {}; tests.printing = callTest tests/printing.nix {}; + tests.prometheus = callTest tests/prometheus.nix {}; tests.proxy = callTest tests/proxy.nix {}; tests.pumpio = callTest tests/pump.io.nix {}; # tests.quagga = callTest tests/quagga.nix {}; From 38ffe0e1f6bcce05c7f209666354f3487b512149 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Oct 2017 02:58:04 +0300 Subject: [PATCH 1248/2806] steam-run-native: init Refactor Steam so that native steam-run can be built as a free package and expose it so that Hydra builds needed i686 packages. --- pkgs/games/steam/chrootenv.nix | 12 ++++++------ pkgs/games/steam/default.nix | 10 +++++++--- pkgs/games/steam/runtime-wrapped.nix | 22 ++++++++++++++++------ pkgs/games/steam/runtime.nix | 19 ++----------------- pkgs/top-level/all-packages.nix | 3 +++ 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 0c59821bdd2..856e4f6c6c1 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,5 +1,5 @@ { stdenv, lib, writeScript, buildFHSUserEnv, steam -, steam-runtime, steam-runtime-i686 ? null +, steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , withJava ? false , withPrimus ? false , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs @@ -69,9 +69,9 @@ in buildFHSUserEnv rec { extraBuildCommands = '' mkdir -p steamrt - ln -s ../lib/steam-runtime steamrt/${steam-runtime.arch} - ${lib.optionalString (steam-runtime-i686 != null) '' - ln -s ../lib32/steam-runtime steamrt/${steam-runtime-i686.arch} + ln -s ../lib/steam-runtime steamrt/${steam-runtime-wrapped.arch} + ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' + ln -s ../lib32/steam-runtime steamrt/${steam-runtime-wrapped-i686.arch} ''} ''; @@ -96,8 +96,8 @@ in buildFHSUserEnv rec { inherit multiPkgs extraBuildCommands; runScript = - let ldPath = map (x: "/steamrt/${steam-runtime.arch}/" + x) steam-runtime.libs - ++ lib.optionals (steam-runtime-i686 != null) (map (x: "/steamrt/${steam-runtime-i686.arch}/" + x) steam-runtime-i686.libs); + let ldPath = map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs + ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); in writeScript "steam-run" '' #!${stdenv.shell} run="$1" diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index ae3fe561272..54805e91b2b 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -4,14 +4,18 @@ let callPackage = newScope self; self = rec { + steamArch = if pkgs.stdenv.system == "x86_64-linux" then "amd64" + else if pkgs.stdenv.system == "i686-linux" then "i386" + else abort "Unsupported platform"; + steam-runtime = callPackage ./runtime.nix { }; steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; steam = callPackage ./steam.nix { }; steam-fonts = callPackage ./fonts.nix { }; steam-chrootenv = callPackage ./chrootenv.nix { - steam-runtime-i686 = - if pkgs.system == "x86_64-linux" - then pkgs.pkgsi686Linux.steamPackages.steam-runtime + steam-runtime-wrapped-i686 = + if steamArch == "amd64" + then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped else null; }; }; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 3d614bda31e..1ec9fc7d5d9 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, perl, pkgs, steam-runtime +{ stdenv, steamArch, lib, perl, pkgs, steam-runtime , nativeOnly ? false , runtimeOnly ? false }: @@ -96,6 +96,13 @@ let allPkgs = ourRuntime ++ steamRuntime; + gnuArch = if steamArch == "amd64" then "x86_64-linux-gnu" + else if steamArch == "i386" then "i386-linux-gnu" + else abort "Unsupported architecture"; + + libs = [ "lib/${gnuArch}" "lib" "usr/lib/${gnuArch}" "usr/lib" ]; + bins = [ "bin" "usr/bin" ]; + in stdenv.mkDerivation rec { name = "steam-runtime-wrapped"; @@ -103,10 +110,13 @@ in stdenv.mkDerivation rec { builder = ./build-wrapped.sh; - installPhase = '' - buildDir "${toString steam-runtime.libs}" "${toString (map lib.getLib allPkgs)}" - buildDir "${toString steam-runtime.bins}" "${toString (map lib.getBin allPkgs)}" - ''; + passthru = { + inherit gnuArch libs bins; + arch = steamArch; + }; - meta.hydraPlatforms = []; + installPhase = '' + buildDir "${toString libs}" "${toString (map lib.getLib allPkgs)}" + buildDir "${toString bins}" "${toString (map lib.getBin allPkgs)}" + ''; } diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index fa1da479196..82fce93a66a 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -1,10 +1,6 @@ -{ stdenv, fetchurl, writeText, python2, dpkg, binutils }: +{ stdenv, steamArch, fetchurl, writeText, python2, dpkg, binutils }: -let arch = if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "i686-linux" then "i386" - else abort "Unsupported platform"; - - input = builtins.getAttr arch (import ./runtime-generated.nix { inherit fetchurl; }); +let input = builtins.getAttr steamArch (import ./runtime-generated.nix { inherit fetchurl; }); inputFile = writeText "steam-runtime.json" (builtins.toJSON input); @@ -18,17 +14,6 @@ in stdenv.mkDerivation { python2 ${./build-runtime.py} -i ${inputFile} -r $out ''; - passthru = rec { - inherit arch; - - gnuArch = if arch == "amd64" then "x86_64-linux-gnu" - else if arch == "i386" then "i386-linux-gnu" - else abort "Unsupported architecture"; - - libs = [ "lib/${gnuArch}" "lib" "usr/lib/${gnuArch}" "usr/lib" ]; - bins = [ "bin" "usr/bin" ]; - }; - meta = with stdenv.lib; { description = "The official runtime used by Steam"; homepage = https://github.com/ValveSoftware/steam-runtime; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6394c53b6e..5396e984b91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17942,6 +17942,9 @@ with pkgs; }; steam-run = steam.run; + steam-run-native = (steam.override { + nativeOnly = true; + }).run; stepmania = callPackage ../games/stepmania { ffmpeg = ffmpeg_2; From 339d2e8006995ac9f5fbe48e6826c85c8f27891d Mon Sep 17 00:00:00 2001 From: geistesk Date: Sat, 14 Oct 2017 16:13:46 +0200 Subject: [PATCH 1249/2806] openrct2: init at 0.1.1 --- pkgs/games/openrct2/default.nix | 70 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/games/openrct2/default.nix diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix new file mode 100644 index 00000000000..a54d3a45ae8 --- /dev/null +++ b/pkgs/games/openrct2/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchurl, fetchFromGitHub, + SDL2, cmake, curl, fontconfig, freetype, jansson, libiconv, libpng, + libpthreadstubs, libzip, mesa_glu, openssl, pkgconfig, speexdsp, zlib +}: + +let + name = "openrct2-${version}"; + version = "0.1.1"; + + openrct2-src = fetchFromGitHub { + owner = "OpenRCT2"; + repo = "OpenRCT2"; + rev = "v${version}"; + sha256 = "1xxwqx2gzvsdrsy76rz3sys9m4pyn9q25nbnkba3cw1z4l2b73lg"; + }; + + title-sequences-src = fetchFromGitHub { + owner = "OpenRCT2"; + repo = "title-sequences"; + rev = "v0.1.0"; + sha256 = "17c926lhby90ilvyyl6jsiy0df8dw5jws97xigp3x8hddhvv7c16"; + }; +in +stdenv.mkDerivation rec { + inherit name; + + srcs = [ openrct2-src title-sequences-src ]; + sourceRoot = "."; + + buildInputs = [ + SDL2 + cmake + curl + fontconfig + freetype + jansson + libiconv + libpng + libpthreadstubs + libzip + mesa_glu + openssl + pkgconfig + speexdsp + zlib + ]; + + postUnpack = '' + cp -r ${openrct2-src}/* ${sourceRoot} + cp -r ${title-sequences-src} ${sourceRoot}/title + + # creating temporary files in fixCmakeFiles fails otherwise + chmod -R u+w ${sourceRoot} + ''; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" "-DDOWNLOAD_TITLE_SEQUENCES=OFF"]; + + makeFlags = ["all" "g2"]; + + preFixup = "ln -s $out/share/openrct2 $out/bin/data"; + + meta = with stdenv.lib; { + description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; + homepage = https://openrct2.website/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86998d80eb2..08ee4755793 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10090,6 +10090,8 @@ with pkgs; ortp = callPackage ../development/libraries/ortp { }; + openrct2 = callPackage ../games/openrct2/default.nix { }; + osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; p11_kit = callPackage ../development/libraries/p11-kit { }; From a4203d0ffc6742602d20702073683fb3001051f7 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 16 Oct 2017 15:16:01 -0400 Subject: [PATCH 1250/2806] emacsMacport: 25.3-6.7 -> 25.3-6.8 --- pkgs/applications/editors/emacs/macport.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 421d0ddd9f6..70c723b40da 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { emacsVersion = "25.3"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "6.7"; + macportVersion = "6.8"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; builder = ./builder.sh; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "0fivrasvigszr31w8wg8kb808hmqv2cc8klrm9n0hdxwg5fs5d0y"; + sha256 = "167lgl76jz1bq6whb9ajshhw5v9bbw9ci4lji4qlmd5nrwnb7kqg"; }; hiresSrc = fetchurl { From 188a413ebc0d89f67cb239255ea97f5d147f3b35 Mon Sep 17 00:00:00 2001 From: Dan Haraj Date: Mon, 16 Oct 2017 15:56:07 -0400 Subject: [PATCH 1251/2806] sc2-headless: init at 3.17 This packages up the Starcraft II headless Linux client provided by Blizzard for machine learning research. --- .../machine-learning/sc2-headless/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/applications/science/machine-learning/sc2-headless/default.nix diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix new file mode 100644 index 00000000000..cf6c3f89920 --- /dev/null +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchurl +, unzip +, licenseAccepted ? false +}: + +if !licenseAccepted then throw '' + You must accept the Blizzard® Starcraft® II AI and Machine Learning License at + https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html + by setting nixpkgs config option 'sc2-headless.accept_license = true;' + '' +else assert licenseAccepted; +stdenv.mkDerivation rec { + version = "3.17"; + name = "sc2-headless-${version}"; + + src = fetchurl { + url = "https://blzdistsc2-a.akamaihd.net/Linux/SC2.${version}.zip"; + sha256 = "1biyxpf7n95hali1pw30h91rhzrj6sbwrx6s52d00mlnwdhmf2v0"; + }; + + unpackCmd = '' + unzip -P 'iagreetotheeula' $curSrc + ''; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out + cp -r . "$out" + rm -r $out/Libs + ''; + + preFixup = '' + find $out -type f -print0 | while IFS=''' read -d ''' -r file; do + isELF "$file" || continue + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]} \ + "$file" + done + ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + description = "Starcraft II headless linux client for machine learning research"; + license = { + fullName = "BLIZZARD® STARCRAFT® II AI AND MACHINE LEARNING LICENSE"; + url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html"; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5396e984b91..6057489c565 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18327,6 +18327,12 @@ with pkgs; bwa = callPackage ../applications/science/biology/bwa/default.nix { }; + ### SCIENCE/MACHINE LEARNING + + sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { + licenseAccepted = (config.sc2-headless.accept_license or false); + }; + ### SCIENCE/MATH arpack = callPackage ../development/libraries/science/math/arpack { }; From 6e1f864fd079b819cfdc1fd5dc874bedc4b3ca38 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 16 Oct 2017 17:06:48 -0400 Subject: [PATCH 1252/2806] sc2-headless: License is unfree I wrongly assumed that was the default when reviewing the PR. --- .../science/machine-learning/sc2-headless/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index cf6c3f89920..c06bfc04e07 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { license = { fullName = "BLIZZARD® STARCRAFT® II AI AND MACHINE LEARNING LICENSE"; url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html"; + free = false; }; }; } From 2a036ca1a5eafdaed11be14d14a91c3b24508379 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Oct 2017 22:06:05 +0300 Subject: [PATCH 1253/2806] buildFHSEnv: fix NIX_* compiler flags This is needed now after #27672. --- pkgs/build-support/build-fhs-userenv/env.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 9c228b39114..da8a86b68f5 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -54,6 +54,7 @@ let export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin' # Force compilers and other tools to look in default search paths + export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1 export NIX_CFLAGS_COMPILE='-idirafter /usr/include' export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32' export PKG_CONFIG_PATH=/usr/lib/pkgconfig From 356892f0e2c615848817ffa0151ad748e3e0b195 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Mon, 16 Oct 2017 14:58:56 -0700 Subject: [PATCH 1254/2806] ArrayFIFO: init at 0.10. --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2ad39ccd280..9dfd5a06883 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -391,6 +391,21 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestNoWarnings Moo TypeTiny ]; }; + ArrayFIFO = buildPerlPackage rec { + name = "Array-FIFO-0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz"; + sha256 = "8082b7ca456d02c7c862ba409cbd62a9cafdb8c5832f5d7fb1d37ba8698ee5b1"; + }; + buildInputs = [ TestSpec ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; + meta = { + homepage = https://github.com/dwburke/perl-Array-FIFO; + description = "A Simple limitable FIFO array, with sum and average methods"; + license = stdenv.lib.licenses.artistic2; + }; + }; + ListCompare = buildPerlPackage rec { name = "List-Compare-0.53"; src = fetchurl { From cef2fc4d3295270529c1a02fbcbfa3b1eac22ac6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 16 Oct 2017 10:30:23 -0400 Subject: [PATCH 1255/2806] elpa-packages: 2017-10-16 --- .../editors/emacs-modes/elpa-generated.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index cf49b8d2ea7..ac716ad0552 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.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.5.0.tar"; - sha256 = "0xxzmqawd7cwafzb9z6c7hjlh6adc5sj7hfcqxf30b7b7ragqn19"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.6.0.tar"; + sha256 = "1b0x7g753gn7mym8286b937zmxv50jgdish2h6wc05w1g1lygwsz"; }; packageRequires = [ emacs ]; meta = { @@ -201,10 +201,10 @@ }) {}; auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auto-correct"; - version = "1.1"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auto-correct-1.1.el"; - sha256 = "19i84dqqnxc5v36lsmj9zj8wbmg267c50jvq2i9bb66i9pzd0s53"; + url = "https://elpa.gnu.org/packages/auto-correct-1.1.1.el"; + sha256 = "141dp4r6v6qs1a58z2qmsyr3pfgp3xji0sqg3fn91q2x4dkvqfzl"; }; packageRequires = []; meta = { @@ -281,10 +281,10 @@ }) {}; captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "captain"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/captain-1.0.2.el"; - sha256 = "0rslksfwzf5bngmbfgv2mwmls5dpwmz7rs9av9p60y7k848haqf1"; + url = "https://elpa.gnu.org/packages/captain-1.0.3.el"; + sha256 = "02b4s4pfnwfwc3xgh4g96wrqll37m35dc2x09pjwkdjxglki7045"; }; packageRequires = []; meta = { @@ -1464,10 +1464,10 @@ }) {}; nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "nlinum"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nlinum-1.7.el"; - sha256 = "0ql1dbad29sdv3wmv65985g8ibl2176m2hqhjfrppgg34h3w51lz"; + url = "https://elpa.gnu.org/packages/nlinum-1.8.el"; + sha256 = "0bb1c8a68fzv59q2ri7ppbx8cm7sa8n4hxxvxv73db2dcgwrgwga"; }; packageRequires = []; meta = { @@ -1556,10 +1556,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20171009"; + version = "20171016"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20171009.tar"; - sha256 = "03j7vcj5rihhdh1mmy667s1jy39wfs0kf4gc0gmqxldml062gcpm"; + url = "https://elpa.gnu.org/packages/org-20171016.tar"; + sha256 = "1196kv83p953nd9c5gxkn8ndw2kmm2kfw34dldap6m89khqflz5a"; }; packageRequires = []; meta = { From b8e051acbcdb7797cba4d674d326ec1ae8e0b7f6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 16 Oct 2017 10:30:40 -0400 Subject: [PATCH 1256/2806] org-packages: 2017-10-16 --- .../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 1dd0f37b468..8d47f36f346 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 = "20171009"; + version = "20171016"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20171009.tar"; - sha256 = "1v8y4gmfrnzsdy9mspqzn157da7lb7z2wvp95r1iywf64325gv5s"; + url = "http://orgmode.org/elpa/org-20171016.tar"; + sha256 = "1v89wl8xlxavvv2kdd5vms0rwpqaw2x73q0162ybxmrzf4a5f5mw"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20171009"; + version = "20171016"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20171009.tar"; - sha256 = "0iv1f7hbqh46mymk097x69q00pqpbkcyzjfd9a9slf5xkw1g1lk1"; + url = "http://orgmode.org/elpa/org-plus-contrib-20171016.tar"; + sha256 = "0xy2xrndlhs4kyvh6mmv24dnh3fn5p63d2gaimnrypf1p8znwzh4"; }; packageRequires = []; meta = { From faf85e2ad6897eb123791ecdcef9c6d9295704af Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 16 Oct 2017 18:04:41 -0400 Subject: [PATCH 1257/2806] melpa-stable-packages: 2017-10-16 --- .../emacs-modes/melpa-stable-generated.nix | 342 +++++++++++++----- 1 file changed, 249 insertions(+), 93 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index c97402c0f65..455b391d056 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1031,12 +1031,12 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "998407f56009f441a7cb83d678118d4d8e68f661"; - sha256 = "0brggqlij0nacx0yjk10rkn045nk0z03r8llmnqkangjm47ffksr"; + rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3"; + sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1073,12 +1073,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "85a1af27541f6a73a63120fac2cfbb7ba39531c9"; - sha256 = "0z1kh8xj16lp7ydzw1fxypw37vlrcxcb8bpx96w6aj6zcd7pzwmn"; + rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c"; + sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1732,12 +1732,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "0.2.1"; + version = "0.3"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "74b27a95429b3207d0005610d11223728039ba81"; - sha256 = "1vp5crdjk3pswn6ip3vgkkc49kqnpayfjgzivfi6fplvhz8klrr1"; + rev = "c36eff71af1299cc85c5b6fde3ed15eff8a5bd06"; + sha256 = "0dwzb7ix4zia6yzm2m1f0lp8hvv4sv3vvlcbnkmng1anjfmmdrn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2722,6 +2722,27 @@ license = lib.licenses.free; }; }) {}; + benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "benchstat"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "Quasilyte"; + repo = "benchstat.el"; + rev = "b39a97f3072c2d3c1d3f86790b9e134d05b8d7e6"; + sha256 = "0j508n860dp4in1psnkcriqck6by1jvnscalyff5na8hx6xgyysm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat"; + sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9"; + name = "benchstat"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/benchstat"; + license = lib.licenses.free; + }; + }) {}; better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-defaults"; @@ -3649,12 +3670,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.0beta1"; + version = "4.6.0beta2"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "185bf236abb2bf10abfd3bff45c723ba10551c80"; - sha256 = "0057iik539jfcw287vcacb8hfxdnyfk17cc0ymxxy3sk5y1mfjik"; + rev = "817604da4d38362b6b2bd4c7787a5add6741cd21"; + sha256 = "1d49kiv9nfr624924qwmf0mfsvja28mvliipaylfbslyb3f7jpkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -4646,12 +4667,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.10.0pre1"; + version = "3.10.0pre2"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "ecaddda2fea374089d867ad17b8b4700b189f397"; - sha256 = "0j6zzirbx1pcb0hyih77w6dbjmz2axknib7aryrcm7pjwd9d0q23"; + rev = "4d04ede10c451ce9a53e8bc34e0d64ab167ad9f9"; + sha256 = "1ayc9zm7ll58ykdmyzilml17hapq7gc6ssmjr645sbcj3w70ba71"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5867,22 +5888,22 @@ license = lib.licenses.free; }; }) {}; - counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-bbdb"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-bbdb"; - rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555"; - sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7"; + rev = "f95e4812cd17e5f8069c9209241396780d414680"; + sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; name = "counsel-bbdb"; }; - packageRequires = [ emacs ivy ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/counsel-bbdb"; license = lib.licenses.free; @@ -6416,12 +6437,12 @@ darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; - version = "1.2"; + version = "1.7"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-darcula-theme"; - rev = "da9852867ac115a54ee350a750d4dae182706117"; - sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s"; + rev = "25f179b9fb72c1b95a3907aa4b4a44f8d261e45a"; + sha256 = "0x1amh0ycjvk218d6cyqizkak47b6r1wczakbfkvnbr0khgkgmr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -7214,12 +7235,12 @@ diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredfl"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "purcell"; repo = "diredfl"; - rev = "2393653a1518b118180ff90ef2b66cfb7d0b555c"; - sha256 = "04yykal90pc4nsdlk08z6svsnddjzaz1drwvs3bqfjw01fr50xcs"; + rev = "45e9c46f58c655694758d4986b9195c8bb40ddf3"; + sha256 = "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; @@ -8018,12 +8039,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "1.9.11"; + version = "2.0.13"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "8f16fb1f510a147e7ab846030057d4c74127ffb2"; - sha256 = "15axmg6z1nlaz7xsf70arxazkkskkga2fa71iswpnhwqsrr90w8l"; + rev = "0269de80c97c80134c2fd6127de24dd2c25e5d8e"; + sha256 = "1rwwhr5wsvbv06l6cv3mi6g4ka24a6zqxgdx6mi1y3mxj08vmn0f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -10022,12 +10043,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.1.1"; + version = "20.1.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "69292a11cd4b31fd3ff73b44f28d527f2d16f555"; - sha256 = "1v5hna4gf2i9lmiyykbs4w2r1yym2p6jb21nxfa5vlhwq85mldfb"; + rev = "919ef5de2858e606d4a9be3e0e995b0802c76e33"; + sha256 = "0y76ci80wmzrxvj90bhiz6cvwbis34kcc6dzas9xxsj92b6sh7sk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -11260,12 +11281,12 @@ evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visual-replace"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "troyp"; repo = "evil-visual-replace"; - rev = "9bfbaf71898294e25d588a887fb4753641edfbe9"; - sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s"; + rev = "163fc827a1ffc106475da470c37fb26f4cc9b008"; + sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace"; @@ -11616,12 +11637,12 @@ fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fancy-narrow"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "Malabarba"; repo = "fancy-narrow"; - rev = "cd381c1acd5e0d9b6acd7f3e76c3b1de21e8b6df"; - sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91"; + rev = "c0f70b4333d4764323b7154e37a378adb1610ab7"; + sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow"; @@ -12546,12 +12567,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "b16b77f95e4e53a8951ebee6209a5de311748447"; - sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh"; + rev = "29a9eb320d62400564360986f7ad400b74070d8e"; + sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -17476,12 +17497,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "93df6808dda8f50da4f435c47763733703905119"; - sha256 = "1zyl8x03n9n9sc7bys2nqdmzadl5qrwi01qn1gy48jrkfhgiva6g"; + rev = "26749ff9f34b2abddf7c47ff71b1046942e38398"; + sha256 = "1q969rlqj706wdzd3s54pqpfpqkg18bzl5srl7xkw43cfzxpcpj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -20473,6 +20494,27 @@ license = lib.licenses.free; }; }) {}; + js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "js-auto-format-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ybiquitous"; + repo = "js-auto-format-mode"; + rev = "37def86f6e46742ddd5e774778d1c208e7942e0e"; + sha256 = "0w92r1lk2xb9lqjnqkxp2zv8rmf71kqyvq4mhaxvz36gm19rz1yd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; + sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs"; + name = "js-auto-format-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/js-auto-format-mode"; + license = lib.licenses.free; + }; + }) {}; js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; @@ -21890,12 +21932,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "0da66c7c01e8fea952faa3e21a34664b37918400"; - sha256 = "0xzqg5nrrsapxsnyk919w5nb6pad7w06f0c266x9cs4m9wih82wk"; + rev = "619a1b35b9a8151703421e2716ea0409162a4b84"; + sha256 = "0dakcsdn6pax0q6wdvg23fg327nk35z3lzk2vlvc76780d0fi85h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -22869,12 +22911,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "92caeddbb3c3de61707d12db62b9915e271807b7"; - sha256 = "0fajz4k3p2ki237jz0c3wfab5272fvvw9vzxzfivpmpcnws6gbn6"; + rev = "3c15edd8ddfb29a5151182983392ee831826d9d0"; + sha256 = "1a17csrp7ni4if8l5bvxb2024fav28vjii1qqym3gcalw0jg6ink"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -23181,6 +23223,27 @@ license = lib.licenses.free; }; }) {}; + meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "meson-mode"; + version = "0.1"; + src = fetchFromGitHub { + owner = "wentasah"; + repo = "meson-mode"; + rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee"; + sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode"; + sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80"; + name = "meson-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/meson-mode"; + license = lib.licenses.free; + }; + }) {}; meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "meta-presenter"; @@ -23687,12 +23750,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36"; - sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r"; + rev = "019e07947426f0192fc3458f3f72c19031b607de"; + sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -25258,12 +25321,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8"; - sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4"; + rev = "9bd41082a593ba90f3e9e34d3ffc29bbb276b674"; + sha256 = "0j33wn2kda5fi906h6y0zd5d0ygw0jg576kdndc3zyb4pxby96dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -25342,12 +25405,12 @@ omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "e73d4c3f9e0d4774261496d018cf944a254e06f5"; - sha256 = "0rmpnqb16v0hxfhw4lq2d27vhfhqv1mh8whq2l718l8c280yfn6k"; + rev = "636374c59c7d33c2f72c97ad8ba9fb4854f2324d"; + sha256 = "0w62bk2m0gs4b605s691z4iap9baz1z6c8z4v9vb05917qlsx5xb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -25388,8 +25451,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "40b6251a96057c80a958362a0886c06eea5bfd62"; - sha256 = "176qfjd0qfgypj7pyi2p7v6zn7sic86gcgxz056k4y2akm6aa2p6"; + rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a"; + sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -27052,12 +27115,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "a0a1bb95d12fd45e3e111d29fd49b8171db1109b"; - sha256 = "00pn5adk6qw4lpfsw1lxhp0466q3sndgqgrh4y821lbxssx89lh7"; + rev = "37d7a0d3d633542de02b4c415b1931ae93dd8ff6"; + sha256 = "09vgv82ws53wgd1inyin8y3v2yixg74w6bnr7awry4jmxbb15kz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -27388,12 +27451,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "17a6690d42a1e854ec270ed930c7494077570fc8"; - sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc"; + rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245"; + sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -28618,6 +28681,36 @@ license = lib.licenses.free; }; }) {}; + pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: + melpaBuild { + pname = "pocket-reader"; + version = "0.1"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "pocket-reader.el"; + rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd"; + sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; + sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf"; + name = "pocket-reader"; + }; + packageRequires = [ + dash + emacs + kv + org-web-tools + ov + pocket-lib + rainbow-identifiers + s + ]; + meta = { + homepage = "https://melpa.org/#/pocket-reader"; + license = lib.licenses.free; + }; + }) {}; point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-pos"; @@ -29163,6 +29256,27 @@ license = lib.licenses.free; }; }) {}; + projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: + melpaBuild { + pname = "projectile-trailblazer"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "micdahl"; + repo = "projectile-trailblazer"; + rev = "79299498d74876f2ac3fe8075716b39a5bdd04cd"; + sha256 = "1lkj9jdr3g7nl80fxvic6g5cn7vbkyxys7m3kcmd6xa9mq7nvci4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer"; + sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4"; + name = "projectile-trailblazer"; + }; + packageRequires = [ emacs f inf-ruby inflections projectile rake ]; + meta = { + homepage = "https://melpa.org/#/projectile-trailblazer"; + license = lib.licenses.free; + }; + }) {}; projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projectile-variable"; @@ -30846,12 +30960,12 @@ rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rich-minority"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "311ac8ee54078f95b7279e532da6cf5a2afb4125"; - sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3"; + rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4"; + sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -31182,12 +31296,12 @@ ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-hash-syntax"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "a0362c2dc449a1e67ef75ad736bcf8b03b083226"; - sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k"; + rev = "bc05c3130a5d3237f04c6064297e56de5f73887d"; + sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -31852,12 +31966,12 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "2.1"; + version = "3.1"; src = fetchFromGitHub { owner = "voloyev"; repo = "sexy-monochrome-theme"; - rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96"; - sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg"; + rev = "f64714a176d9212c9fa82355dd8ec89587ce13f0"; + sha256 = "17ahrdyk2v7vz13b4934xn8xjza4b7bfrkq8n42frq3pc8mgwqfd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; @@ -32731,6 +32845,27 @@ license = lib.licenses.free; }; }) {}; + smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smart-semicolon"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "iquiw"; + repo = "smart-semicolon"; + rev = "c11096679dbed3875c37413337ee490ee7951b63"; + sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon"; + sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0"; + name = "smart-semicolon"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/smart-semicolon"; + license = lib.licenses.free; + }; + }) {}; smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-tabs-mode"; @@ -34955,6 +35090,27 @@ license = lib.licenses.free; }; }) {}; + tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "tickscript-mode"; + version = "0.1"; + src = fetchFromGitHub { + owner = "msherry"; + repo = "tickscript-mode"; + rev = "e0184d7f954ce8d2d2ff4d34610658b0ce88859c"; + sha256 = "08ydrg3z3kvb54kxzlhiljrwil8681akp1lihkiplxdvrvg24934"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; + sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54"; + name = "tickscript-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/tickscript-mode"; + license = lib.licenses.free; + }; + }) {}; tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; @@ -35167,12 +35323,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.11.5"; + version = "1.11.7"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; - sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; + rev = "fa064dfba2e98c23f2c79639347adcb601590df3"; + sha256 = "0ma55scqng5bmijyaz1q6lcl3w2b68dkvri5191kl19qgddcpg37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; @@ -35188,12 +35344,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.11.5"; + version = "1.11.7"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; - sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; + rev = "fa064dfba2e98c23f2c79639347adcb601590df3"; + sha256 = "0ma55scqng5bmijyaz1q6lcl3w2b68dkvri5191kl19qgddcpg37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -35209,12 +35365,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.11.5"; + version = "1.11.7"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; - sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; + rev = "fa064dfba2e98c23f2c79639347adcb601590df3"; + sha256 = "0ma55scqng5bmijyaz1q6lcl3w2b68dkvri5191kl19qgddcpg37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -35761,12 +35917,12 @@ unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unify-opening"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "unify-opening"; - rev = "2812e43029cab7183197ce5e3c9577856bfd22c5"; - sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p"; + rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf"; + sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening"; @@ -36832,12 +36988,12 @@ whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whizzml-mode"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "662c60173cdb396fcb2386d7d7c774d26f16cd9f"; - sha256 = "1nyl1whhi3zrzb5b4vkmqdaggnxrqmzmw1amf7hbw0mvx5mpy9pa"; + rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22"; + sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; @@ -37066,8 +37222,8 @@ version = "0.9.6"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "4d41c0814bbc"; - sha256 = "1xy9a27qdl7hm7x2gbhxql63paxi16441rczl2i8ps032l4ffdnj"; + rev = "b56ca38c1447"; + sha256 = "10vn8i1ndyn2211ddy0z8vyv6y4myh2wd3xsk5nwx7qjlhkpjg6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; From a6e489cca4a8723baecd91fac9667024bf7e8f54 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 16 Oct 2017 18:07:01 -0400 Subject: [PATCH 1258/2806] melpa-packages: 2017-10-16 Removals: - org-chinese-utils: removed from melpa --- .../editors/emacs-modes/melpa-generated.nix | 1342 ++++++++++------- 1 file changed, 807 insertions(+), 535 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index d28cf3a3edf..75db0db4fe5 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -740,8 +740,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; - sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; + rev = "6ba48256ec1b7b5aa31204c75e29a3eb7e284478"; + sha256 = "16nnywf0pakn1r6674aw9qr7iyjd46d54drmilr8d5hb3cj2fyqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -757,12 +757,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20170925.821"; + version = "20171014.1920"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; - sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; + rev = "6ba48256ec1b7b5aa31204c75e29a3eb7e284478"; + sha256 = "16nnywf0pakn1r6674aw9qr7iyjd46d54drmilr8d5hb3cj2fyqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -803,8 +803,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; + sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1344,12 +1344,12 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "20170627.1223"; + version = "20171012.1107"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3"; - sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w"; + rev = "1d7185d27020c3e91a7da21800716079297938ac"; + sha256 = "0397kfy0lmgdic4jc8fqhsgpv8r4lrqcfanqbfbchfxwfswbqb8p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1405,12 +1405,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20170926.1903"; + version = "20171009.1931"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "85a1af27541f6a73a63120fac2cfbb7ba39531c9"; - sha256 = "0z1kh8xj16lp7ydzw1fxypw37vlrcxcb8bpx96w6aj6zcd7pzwmn"; + rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c"; + sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1594,12 +1594,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170914.129"; + version = "20171011.324"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "8f269ae0ddec217db4ec643f8e167eb431091b72"; - sha256 = "1wprrwv099w61blam6x8wfxym1dfx802ra7cddbkmh07vfi1w6bx"; + rev = "b93707e3a3a7a4968b3e212b890edfe265dcd57d"; + sha256 = "09hyg0fs3qgyc6dbn23pw8p7w2m9xvkf5cz8v0f18a7fkvq2j2f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -2463,12 +2463,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20170908.1740"; + version = "20171014.2048"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "db7a2abbbb74719dfd0867612a9a3bde4c574cc7"; - sha256 = "133mgzks4ig2z67bk63gligg45zj82mra99m9qdz7d3qpx7c9027"; + rev = "c36eff71af1299cc85c5b6fde3ed15eff8a5bd06"; + sha256 = "0dwzb7ix4zia6yzm2m1f0lp8hvv4sv3vvlcbnkmng1anjfmmdrn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2547,12 +2547,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20170829.754"; + version = "20171010.1420"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "68145a891348cb74db5209548c74dbc8a80e6902"; - sha256 = "1r46810dn99cnbv3railbw79k42sz1pmhx2fbx60c4g80w2kcjy6"; + rev = "b4d5a2fedec176d3562943668609766fab0b23ff"; + sha256 = "0y31zx6npv03ygjywy23pvrpvjwi1fh1qhs1qzxsi25pbbk1hkq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2565,6 +2565,26 @@ license = lib.licenses.free; }; }) {}; + apt-sources-list = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "apt-sources-list"; + version = "20171004.1143"; + src = fetchgit { + url = "https://git.korewanetadesu.com/apt-sources-list.git"; + rev = "842c3896f660295e4c16938aa1fd195e5d377460"; + sha256 = "1d1v2h91vabqdrjcrdnzqj4xzmm7gbad4mxcphrj5yfnc4rrfc12"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/141a22e593415302d64cf8ebd2635a1baf35eb38/recipes/apt-sources-list"; + sha256 = "1gnl6zqv6imk2qpv4lj7qyjgf1ldxib3k14gsmwqm0c1zwjsid3j"; + name = "apt-sources-list"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/apt-sources-list"; + license = lib.licenses.free; + }; + }) {}; arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "arch-packer"; @@ -2610,12 +2630,12 @@ archive-rpm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "archive-rpm"; - version = "20171005.1548"; + version = "20171016.112"; src = fetchFromGitHub { owner = "legoscia"; repo = "archive-rpm"; - rev = "830158cfb3b43c85cfcb4bd5b92d4457d015c80a"; - sha256 = "18vmwffvxxg9clddmrkyv9lkjxiczaig69yyxzghigmzmg8wk557"; + rev = "e2fac6c018c19001f1f28e7c80721724684f8941"; + sha256 = "1qq0z5mmbhd0ma8v8bxy53n6ynqz5qf9n3h7566dylmdncyyv7hw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5f5653e62afdc022eac30bda3d21bd2d2625d2e/recipes/archive-rpm"; @@ -2820,12 +2840,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20170916.2256"; + version = "20171015.2239"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "87853ae35f19646f83f653b798e9f6d646de7113"; - sha256 = "17q1x9nddjy14nbm3h343s8kv9y8p6kj7yvixa7vbf71396dwsxm"; + rev = "424ecd8a28cd59fe7d2de3cb4b37a4224e34c123"; + sha256 = "0zmbg3r6sykmchy8hhbw8glzl8xvki030rzg9r55v4g61k8qy13r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -3891,12 +3911,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170819.1039"; + version = "20171014.20"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "245b5d62feb6f276971be53e63311de4a243bfbc"; - sha256 = "0r2p01hnflaa7dc0xfrrd5hgwgx530m4cxzpw3p1nmdajlk4mbyy"; + rev = "36f768d9e320d300b81799e0fcc097cb89aad780"; + sha256 = "05jx71v5shdynia21wkrc1012r0wajdn0km1rclpyvf3ck34rh8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -4275,12 +4295,12 @@ basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "basic-mode"; - version = "20171004.1218"; + version = "20171011.1126"; src = fetchFromGitHub { owner = "dykstrom"; repo = "basic-mode"; - rev = "d5f480fce6b25de4857e0f04c419cab5268185e3"; - sha256 = "1kkqqi5ipbf5pyqdx1kzwxkn6gzgsmayg0dbyjzkdgc8zqihw4w3"; + rev = "7683d9812b1f4c6ac33b386abf81461175075c30"; + sha256 = "01pmxcff8v64sc49ahzkks636p778l4fy8s5x6p9rngnwm72gmnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode"; @@ -4358,11 +4378,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20170725.300"; + version = "20171011.1939"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/bbdb.git"; - rev = "c951e15cd01d84193937ae5e347143321c3a2da9"; - sha256 = "1m19f74zkyh0zyigv807rlznvf2l72kdg6gfizf8pan85qvk949l"; + rev = "bd06080d37237584cd7a30c9969712be350ba7bd"; + sha256 = "1hjijyw5hfgnla0ms53ksd2nfdiv55y1828qkiirm9yz14iv5bq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; @@ -4606,6 +4626,27 @@ license = lib.licenses.free; }; }) {}; + benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "benchstat"; + version = "20171013.2012"; + src = fetchFromGitHub { + owner = "Quasilyte"; + repo = "benchstat.el"; + rev = "a5b67cf7972ca2bbc9f5bc6a0f521ab02b76d4f0"; + sha256 = "02v5l9qvzcr58qr973phgj1c846pqp3cj16khn4h9v3f3gb180n1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat"; + sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9"; + name = "benchstat"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/benchstat"; + license = lib.licenses.free; + }; + }) {}; bert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bert"; @@ -4886,8 +4927,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "16abb66246170fe06325ff32a4889e4b51bfd979"; - sha256 = "1fav32ax7qykclvrimlf00pyp534yfngizm697mbr9346va1zqm6"; + rev = "cb89901b52a9413b6c233d7fbb616a2d8f38b50a"; + sha256 = "1fypvrmn1brrq2200kr8s8zbcc30z9nhfv3k8vs36iawab2g573k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -6099,12 +6140,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20170929.512"; + version = "20171015.555"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "c1187b34c11cdf4030c57427261f3af4d6374b15"; - sha256 = "0sk9s29521kh4qhi4px917vql6ba07ijvp7vrc0dzr1gdpm0b3w2"; + rev = "ae606fc37efcde89de926b662109a6d89743cc5c"; + sha256 = "0yy0jjw2qg94z3fbhhfl1arlf6gdw3q248i51l41x9bnr3klr09a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6544,8 +6585,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "8eef73ea8d0a4994cb1c7210b83ba58e00d80144"; - sha256 = "03c5cc0xh1azqqj7119g5yiy7w1jr3qddinqc30m7db1jrjsg3nq"; + rev = "d229144189dc033b52477610853a034397378c4c"; + sha256 = "139nx7spvxjrnm4hivsbz68ihyf4p5swizgggs169k1gs76rw566"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7005,8 +7046,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "4097e6453093b7aa8cb96e47d23847cc65b3fbe0"; - sha256 = "01irq5g2n55s5arj7b3clnq50ym38qwghg20mdwhij1zljp42zb1"; + rev = "7aa23462d29322e75af0d1434c80ce88c17b70eb"; + sha256 = "04n36c997dvbh5wbkq7rrrw9qd8vdzkwac7qbid3v51ic7mpzxy3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7505,12 +7546,12 @@ chinese-yasdcv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: melpaBuild { pname = "chinese-yasdcv"; - version = "20170827.1650"; + version = "20171014.1844"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-yasdcv"; - rev = "fe14df025491530680529c98df3e3239ff44f57f"; - sha256 = "0vcm381i2zvpjcq8jcxldk7dn2c7pbszmb8j3qwrw038hx0lbi3i"; + rev = "5ab830daf1273d5a5cddcb94b56a9737f12d996f"; + sha256 = "1mv1n6m73aamxj18i851ww53q7p4ydiqgaapxyvjbm6sx8ddz9ak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv"; @@ -7593,8 +7634,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "c60d1ae5802ec1dba90f5e4b51579488bbda55c6"; - sha256 = "15r4lbb2wraadi27300gw9yarfpgwnclhjfvgr8vgiy1pqg1y5bi"; + rev = "946a9d44e0d3806f1e06ab68fd832f24dd152086"; + sha256 = "0fifp2cjspfqvwmy9l9sxm8na7jj3wxbiz0mpq0pj3jm4aa7v6cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8529,8 +8570,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "cb8f26f199e18be231f40f523bfe64375e749e35"; - sha256 = "13zywybi3r9pzwlqvailgafqc68v62adkrkca1lm7mjrr33jdsfn"; + rev = "386f7c6e98a6ed2bb64915670b28aa7e95b517a6"; + sha256 = "1kxpgkmp5n51ysqzidx1mc3ciqmadm5s0yazq9la5kb8sm4rmh45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8798,12 +8839,12 @@ colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colemak-evil"; - version = "20170401.1626"; + version = "20171015.1607"; src = fetchFromGitHub { owner = "patbl"; repo = "colemak-evil"; - rev = "b01296a50ee225d0e21e81f99c3c01432f89a7c7"; - sha256 = "09ipxdwvi1bsicl67fbpd5aq5g9ws9frim9q24y7h6srynj4awa7"; + rev = "192c779281ae1fbf2405dcdb55b3c5b2a1d0b3d1"; + sha256 = "1clnvr7n6mx5b8pq1c6zchq7n1g8ip8hwgzc61ywrmiyv0v8rnc6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil"; @@ -8987,12 +9028,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20171003.235"; + version = "20171014.1430"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "c5855d0906c672150dc2b00486dda633823d9477"; - sha256 = "1p2qjgwxj969hffawc8h1zikl5zgqj91qii7fv31n2h4sqxxybks"; + rev = "acd7887256a77c07006fb45ebab67f1cd68df2f6"; + sha256 = "0rjidxjwaxmkrc8dcz37v3h76rzm4kf2gjx2s2mj3dym8l6bg5cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9713,6 +9754,27 @@ license = lib.licenses.free; }; }) {}; + company-glsl = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, glsl-mode, lib, melpaBuild }: + melpaBuild { + pname = "company-glsl"; + version = "20171015.1049"; + src = fetchFromGitHub { + owner = "GuidoSchmidt"; + repo = "company-glsl"; + rev = "a262c12c3bcd0807718c4edcaf2b054e30ef0e26"; + sha256 = "0338bym8ifvkgpbc4vyzf3nmlp6rc8lihyxcbym5m08612ln78mk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/abab3b5a9762639812e2aabf9d288ed367dcdc22/recipes/company-glsl"; + sha256 = "0lzy3xln5780yjwhhcz6vnc2j0k0rc7jfvqc8bv0xfabikgadmkn"; + name = "company-glsl"; + }; + packageRequires = [ company emacs glsl-mode ]; + meta = { + homepage = "https://melpa.org/#/company-glsl"; + license = lib.licenses.free; + }; + }) {}; company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "company-go"; @@ -9720,8 +9782,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "1a78dd6c36d7f37cbb60073523c2e9ca3f6519fa"; - sha256 = "1bcd62rggq3sk96n3dlpidrv4pbx6x385x17knfnp35avgrhsv4b"; + rev = "e990796e68a2ebfc099afed20b99e26d6b64061a"; + sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9825,8 +9887,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; - sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + rev = "2f73061c886bae07bc51e4d9eb545ed8027c0442"; + sha256 = "17bqx7bkfzv4w7cf0l139xwg1shns680rq74hrqgicammb453kz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean"; @@ -9846,8 +9908,8 @@ src = fetchFromGitHub { owner = "ptrv"; repo = "company-lua"; - rev = "0be8122f3adf57ad27953bf4b03545d6298d3da4"; - sha256 = "1d9i165apgmwns7b2fd5wcpjpkah3dyj20v5sb8ynvz6qhhr5r9c"; + rev = "6a542ba16d7fa47865879b5a99dedd121a84a880"; + sha256 = "10wy9s29sbzaz61p62vda6cqwjk6rpa6ia8zm4n3d6xvpv2wqa70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8191ab2aaa72041be46091e363d216cf1b73fde/recipes/company-lua"; @@ -9951,8 +10013,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; - sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; + rev = "6ba48256ec1b7b5aa31204c75e29a3eb7e284478"; + sha256 = "16nnywf0pakn1r6674aw9qr7iyjd46d54drmilr8d5hb3cj2fyqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10104,8 +10166,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; + sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10289,12 +10351,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20170926.2252"; + version = "20171010.2258"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "393724d0d36a8269e57a0e4c2b3723071caf0a3c"; - sha256 = "02pm3x9frscgz5szddvbir0i7amnkzfj7pl4lgiah57bhcg1lhd0"; + rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; + sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10373,12 +10435,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "20170608.756"; + version = "20171009.1921"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "468a9090f3a41e4c14d23a3b7987defd27ccd799"; - sha256 = "0bcjvqs3m5vwmixm745mp19sy0fkdpv080issqf97jqxh3arqh1k"; + rev = "32f87d1f940058404858e5e6472877a069df219e"; + sha256 = "0zr86fr0dswxchm28jvkc4fdqg3wp7hw5ch8jai2pm3cn45cqk7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10730,12 +10792,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20171007.231"; + version = "20171010.105"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "6827edffb70890f2e94c3d146ed129bde581992d"; - sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; + rev = "f7470feef4880a735495c5013465efffd049270d"; + sha256 = "13b05yzqppcm5lp3ryhhv5gp031nrvh0vc59hv7fyisw48byv3i7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10748,22 +10810,22 @@ license = lib.licenses.free; }; }) {}; - counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-bbdb"; - version = "20161105.350"; + version = "20171013.1925"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-bbdb"; - rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555"; - sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7"; + rev = "f95e4812cd17e5f8069c9209241396780d414680"; + sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; name = "counsel-bbdb"; }; - packageRequires = [ emacs ivy ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/counsel-bbdb"; license = lib.licenses.free; @@ -11483,6 +11545,27 @@ license = lib.licenses.free; }; }) {}; + cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cubicle-mode"; + version = "20171009.1257"; + src = fetchFromGitHub { + owner = "cubicle-model-checker"; + repo = "cubicle"; + rev = "9d108b900e0123236b4991c2d06b5061f34feee8"; + sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode"; + sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv"; + name = "cubicle-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/cubicle-mode"; + license = lib.licenses.free; + }; + }) {}; cucumber-goto-step = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }: melpaBuild { pname = "cucumber-goto-step"; @@ -11679,8 +11762,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "14b085980903fa5a172a118929aecbae2d1975c4"; - sha256 = "0rpilj79a1kpd7z5pmq04pqc7gxaxlfj7br6gfsx2bs07mc0j6b8"; + rev = "01e9ff8856f92ad6b76950a41a375bc9c2f91fda"; + sha256 = "05xc8d1h60kskvbj3c659f8379qjvgf4fc4bij8r4dwg0iv3l93m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11822,12 +11905,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170928.1211"; + version = "20171012.530"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "b516cf4556bb2a1a898701d953374b96079678b3"; - sha256 = "0ilzd6qwjjj5lfimv3b5him54yh7lpxhlm0hnsmk6zcrr6884vsl"; + rev = "d6cef9977c52f87233344c9dd1789392b77d16b7"; + sha256 = "0x7z6rrym5n3q42ij7sgk9s1b3jpk7p4153bkwskmgmsapvqc93k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11843,12 +11926,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20171004.1231"; + version = "20171016.103"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "17961ec04dbe924a4c43ff0fe94bd72d044d9703"; - sha256 = "14r1jhrrq4d5l0fsjacf619f4nhc86aq4jab8qzfkszi348r5g7j"; + rev = "7bf175598de1cd13f02d984199ce55411dd36722"; + sha256 = "0b0g6p61fqiifhx02mppz77kr45m509ggi90nsqa0rimkg5y4nya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -11885,12 +11968,12 @@ darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; - version = "20170905.941"; + version = "20171016.149"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-darcula-theme"; - rev = "da9852867ac115a54ee350a750d4dae182706117"; - sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s"; + rev = "25f179b9fb72c1b95a3907aa4b4a44f8d261e45a"; + sha256 = "0x1amh0ycjvk218d6cyqizkak47b6r1wczakbfkvnbr0khgkgmr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -12032,12 +12115,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20170715.1624"; + version = "20171010.2057"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "257b0674a5c4ec510b51febba0c7a18e0f10a1bf"; - sha256 = "1ww12h19scda90r4rkgiynk3zvhkhk44gwfqj2m49pr89y7j8lap"; + rev = "e7c13abeeb18f50658482c7df32701ae4ec375a0"; + sha256 = "09smbgql9ibgn9l729ylas747xj48ipm6as61l6a5pbch376qriw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12074,12 +12157,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20171009.105"; + version = "20171010.131"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "8ef32875da21ea278002da823c05b7206cc1a81e"; - sha256 = "1zci5bbc5s9m6dvgiypsxwkqiqd67la5wxrqny1qnsii5c4id1kc"; + rev = "a57c2c335d0527909f472ca51a2201ad44d38aab"; + sha256 = "0dg032h4ypib2baw83x5hgz7kkclgr6fkc0fiqd6rcikjg10y2rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12120,8 +12203,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "8ef32875da21ea278002da823c05b7206cc1a81e"; - sha256 = "1zci5bbc5s9m6dvgiypsxwkqiqd67la5wxrqny1qnsii5c4id1kc"; + rev = "a57c2c335d0527909f472ca51a2201ad44d38aab"; + sha256 = "0dg032h4ypib2baw83x5hgz7kkclgr6fkc0fiqd6rcikjg10y2rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -13064,8 +13147,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; + sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13081,12 +13164,12 @@ dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-collapse"; - version = "20170910.1522"; + version = "20171010.1222"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; + sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13207,12 +13290,12 @@ dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-filter"; - version = "20171006.711"; + version = "20171010.204"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; + sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13232,8 +13315,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; + sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13358,8 +13441,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; + sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13379,8 +13462,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; + sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13421,8 +13504,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; + sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13442,8 +13525,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; + sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13505,8 +13588,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; + sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -13564,12 +13647,12 @@ diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredfl"; - version = "20171005.39"; + version = "20171014.1402"; src = fetchFromGitHub { owner = "purcell"; repo = "diredfl"; - rev = "2393653a1518b118180ff90ef2b66cfb7d0b555c"; - sha256 = "04yykal90pc4nsdlk08z6svsnddjzaz1drwvs3bqfjw01fr50xcs"; + rev = "45e9c46f58c655694758d4986b9195c8bb40ddf3"; + sha256 = "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; @@ -13732,12 +13815,12 @@ disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disaster"; - version = "20170507.1626"; + version = "20171011.2058"; src = fetchFromGitHub { owner = "jart"; repo = "disaster"; - rev = "3bab3c0db29c6d5484ab8aacbf29490e3aa2d713"; - sha256 = "15brdrcq2i3rckdh2ml5m1fvf7asgqij9swc1p9fgp1fk2i05sfn"; + rev = "3bbb15c9b974cd1d2ed2319e7bfa9792ae40968f"; + sha256 = "1bd2lz7jbx9yyni1yqfsxmlmhkrd8nds9wdzc0fcj7jp48qrdcjg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4654b3646b96f967e2c75440e664a417cd0f517/recipes/disaster"; @@ -14474,12 +14557,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170927.1705"; + version = "20171010.1752"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "99a4c8691436b80ffb242512f026a8cc32b9539a"; - sha256 = "0ww95dr3djxdwba0kark0d1j1q4vkjhnpiv5s5gc5zhgbc0421rb"; + rev = "71b28384477397d38fcef15fe7d220844b175e61"; + sha256 = "0y5d3fl7xsn585qcm976fdg8ym5vggxz06kkm976bkfrplkd1gpy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -14957,12 +15040,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170918.2024"; + version = "20171013.2105"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "0d39c148abd5c76e5b39847a794ab3a240a7e018"; - sha256 = "0ksddljicrjx4cbx8ws31bskcirjvbsxz60f4xh8j8ywi3s7wj4b"; + rev = "e1140c3c27c0e434ecaaf748aa77f63e2289df41"; + sha256 = "19r77cya0bi1isv46l26k3n6vnqxf0jclx6w75jbbiirivpy9nr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15041,11 +15124,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20170926.500"; + version = "20171012.1339"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "023d2edde61d"; - sha256 = "1izhlafsbxfav4jvl7bqg188d71895r1sqacxsblvcld8c0brsqp"; + rev = "9e446540a794"; + sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -15355,12 +15438,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20171008.9"; + version = "20171015.212"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "8f16fb1f510a147e7ab846030057d4c74127ffb2"; - sha256 = "15axmg6z1nlaz7xsf70arxazkkskkga2fa71iswpnhwqsrr90w8l"; + rev = "621f8f0b4243d6525367c5eb500417b2d784aa61"; + sha256 = "0s5372njks9bmxy23iw84hinsmlw45rhr70nrzgn5bnhskc8ycmv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -17066,12 +17149,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20171001.26"; + version = "20171011.101"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "a0339b196760823a0f3bb0bcaf26daa62c356535"; - sha256 = "0vsyibph08xcxinjri4lzy44ji3albwpcpb469q0h43jjd2jw2v4"; + rev = "9c182dbbd7170c6626afb031bbc6a399399d2cd9"; + sha256 = "1vz8gc8az8cw2v7gg11l6ncg3cw09ynspxmp29rbcxl63qbis6fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17276,12 +17359,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "20170722.422"; + version = "20171012.15"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "5c793f6df944b7f1a68893438696c12240f0b930"; - sha256 = "0p5q44p6jl306qns4xf7f03pq091zczvjnh9bjax6z6sx54yadsd"; + rev = "f4a84f71368dc343d09093312d1b2c2e9a5a3987"; + sha256 = "07j3bsv3vinpkxxbw4fyfgb5jb1kcd068821l59pk9yrw145kb96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -17297,12 +17380,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20171005.1105"; + version = "20171015.548"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "2d6dc9f31de8805f2b7630c874942fb7e8fb5bd3"; - sha256 = "1mrda1kvwv0mzgxi8z28a9qynlkfzpw0wgvwc86pkq94fzr6l2pj"; + rev = "36d40a66832a3ec37702813463e4acfbb7b6b5ac"; + sha256 = "1030ihnb35dyad1v7a63kyn94jk0rdkdgil7wnj8pkpzxjvyrwqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17892,11 +17975,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20170929.1427"; + version = "20171011.1158"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "b1ea89a08da3f5953d55072fffed8f781b461315"; - sha256 = "0kih2hvwrzjsw8k271hciwx4p2bxn4hgm4bsk9zdrsw9lxy0qqnm"; + rev = "175e5af5250503c12a395f5559923d2b9367aae3"; + sha256 = "182q09g73161h557chddfg2qmbbz5vmnw2mnn96p962whi35n4aw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -19027,8 +19110,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "e38c688d3961bedcd85f842fd052836cb345a902"; - sha256 = "1izh0zblnyklhya72cz8rf8pwq8q5smm4yp520vrkplspcspwbva"; + rev = "41765cc89a82fd28159b492c2156b6418e6dd8b8"; + sha256 = "0qsmkgpgwfh65zcrk6xnbd3469k6m0fcwsrhrz5v5y4lx61847z6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19631,12 +19714,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20171007.516"; + version = "20171015.130"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "d559b3d0e7db97a74823c20fda4095d1a14d9209"; - sha256 = "1cxq8k9m2m36zz3x04dranzg40k61qprhy4w91chl3384jf1rb39"; + rev = "78d86bf3a842af4dc77f02b01ed7589d8f9eedd2"; + sha256 = "064d3n05kkg8rkp6dnqsjpm9jy2qiiry01m6k7ifk25z6ab02kgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19967,12 +20050,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20171006.2359"; + version = "20171016.3"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "b6ed94c9a531ba905b729e0c3dc89fc32d888f46"; - sha256 = "0idp7wl22vzpy440jcrxspb47snk098h7gi7vn5fq5awc9pknwpi"; + rev = "6ca96e8df9fb957c423ae4738e6229106861d6b5"; + sha256 = "1ij64cg6qq93vwxsj4w60xq7377rlzmrlddnqaxm95m2fkbwr7fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20324,12 +20407,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20171002.2303"; + version = "20171011.655"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "92d614e731d1f2b8cafa4bf211e560294e378c14"; - sha256 = "006ny911qmxl7p1azdcf4d6daswglc06jh295glhn963sqkc2mgf"; + rev = "f282263af448a87d2f51b9a1fda3c3942d2c025f"; + sha256 = "1iayfdmxf8mxi8chwdc06rzqpr30f7v85vwgzlff7vm0bvz51hdb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -21021,8 +21104,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "b6ed94c9a531ba905b729e0c3dc89fc32d888f46"; - sha256 = "0idp7wl22vzpy440jcrxspb47snk098h7gi7vn5fq5awc9pknwpi"; + rev = "6ca96e8df9fb957c423ae4738e6229106861d6b5"; + sha256 = "1ij64cg6qq93vwxsj4w60xq7377rlzmrlddnqaxm95m2fkbwr7fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21185,12 +21268,12 @@ evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visual-replace"; - version = "20170201.1920"; + version = "20171015.2313"; src = fetchFromGitHub { owner = "troyp"; repo = "evil-visual-replace"; - rev = "99559e1a6e813056a132f4be32b20f259470e9ed"; - sha256 = "053fqsl8cd2s0cyinvmihaglq4cv1l1ymxy7rcx9spknipcil1xp"; + rev = "163fc827a1ffc106475da470c37fb26f4cc9b008"; + sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace"; @@ -21331,12 +21414,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20171009.445"; + version = "20171014.1848"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "086d1539e681e38829e3861cffdf62e49213ed58"; - sha256 = "17prr6b5za43mahdfz355k1p1b2jkwd1csb6wlph5g4nmplh5c61"; + rev = "7c98104de8008c04b4f8c54829089396622c080f"; + sha256 = "0ylh58sqhh0zmapcp53hq889cc16rrpm4d74ms4a3b7wv5kyai6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -21805,8 +21888,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "fancy-narrow"; - rev = "4737d706d1f3e90885e6642ba782f1fa605414c6"; - sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid"; + rev = "c0f70b4333d4764323b7154e37a378adb1610ab7"; + sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow"; @@ -22875,12 +22958,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20171007.33"; + version = "20171009.1145"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "b339f0efd72db0fea00964c224c20c6ee8ef92c8"; - sha256 = "0vyp9l8190xgy27jil0pfvc9j0hjwfiq0w0ia69flid0jxgirslz"; + rev = "cfe02c0b2f0ad09ff0555583b5cf43125f549108"; + sha256 = "1l1dc58y5wya3ml4rzzkkq7j2cg3nb1lfqfp9n0g9zv8qgnh46j1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23778,12 +23861,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "20170417.1807"; + version = "20171014.651"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "b16b77f95e4e53a8951ebee6209a5de311748447"; - sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh"; + rev = "29a9eb320d62400564360986f7ad400b74070d8e"; + sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -23988,12 +24071,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "20170928.1808"; + version = "20171011.2136"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "fedb4094976349da1449f821fd79cacd7537e80b"; - sha256 = "0cxpcmx810zkrnqbzj064kgbsyj4qkr7dpps16xdk4ckbiih55rj"; + rev = "0cc2d60ae31f7e2b4e5898091f0a9ba7bafdc854"; + sha256 = "09a5x83qw5znxdrvrq71r0sgi77qjz901dhhwgzcfgf986si4rhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -24055,8 +24138,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; + sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24286,8 +24369,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "393724d0d36a8269e57a0e4c2b3723071caf0a3c"; - sha256 = "02pm3x9frscgz5szddvbir0i7amnkzfj7pl4lgiah57bhcg1lhd0"; + rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; + sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -25823,12 +25906,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20171004.806"; + version = "20171013.1920"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "0e438c206059d268d085bb94d64782d4e2ae46b7"; - sha256 = "02wpp9q4aijv81vspvzgw9pjdmagflfnrd7w1m21xgw56hrg0mj5"; + rev = "85fe74f211a234b59e0da9fad7c6b3f039346287"; + sha256 = "1ywy0hx3aadzaia7bb18gkfz5agbq4kczh1mk5mbxmczmlc7xj3h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -25856,8 +25939,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "b8a0feea5cc28136d053888b45c50a6e0d3d07fd"; - sha256 = "1rmfvvxgjdng1wybri8a2lqcimf4ywpl1wx9q04zzl8zmm5f2diq"; + rev = "dc001f9a34dba13a109310ac9b82903448e5007f"; + sha256 = "1sjzbnlp7kgzl33pkyaz9qpa902jgwygqxirs7w479jmvjkz1ci2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -25982,8 +26065,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "a0ab1dc5d3f8e84e505d97041b3ce28a4cac94ce"; - sha256 = "0fka2dpv2gib19czg2p4x69h1d7s3hdg8j102qgc3da8d9vvhng8"; + rev = "0035b08ca445fb0dab3bb342a441d9ecd1b7b02c"; + sha256 = "0hkpjwil08321bkp2hwy85jpg8xbzjrqsnraa1aw91dm90fj0wh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26270,12 +26353,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170928.2221"; + version = "20171010.1610"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "839dc555861dbb77ea2632b8dd4d58904f33a396"; - sha256 = "1hykxw6a14d6xivin44bfbgr8dy4l5pr50cg0fk4n18a7dym7pjj"; + rev = "c266950549a7a0841bf21e092fba632a1e061187"; + sha256 = "14axzczgnsvmwl32qvpw9p53iknwrya8jbqzhc4d2s4p9vrghk1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -26585,12 +26668,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20171007.1056"; + version = "20171014.2102"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "ac973a806e79ec883a3d041e91d06745084a622e"; - sha256 = "1063wh3h5vv17mmppwbpsi8l8qnph0203h1lr6lz5001xv9rih91"; + rev = "571b1323061fac806b376b8214642d48988e272c"; + sha256 = "14fwbvxrvfcn85xxk6wbaz2khdxix271xxf1daqygbhzj6j0h0jf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -26778,8 +26861,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; - sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; + rev = "b4038b74cad1a3f3773b6ba08cd5e4f5e5c7847f"; + sha256 = "1c39m0cq5r671v2lcxq9p1zi8qh1rs9q61rpzf5pixib0ciyij28"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -26799,8 +26882,8 @@ src = fetchFromGitLab { owner = "emacs-stuff"; repo = "git-commit-insert-issue"; - rev = "5f08c17bf93b17915415d435ee41923d924fe20b"; - sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas"; + rev = "8d2448959073646d652687355efec6ba7b1e1af8"; + sha256 = "1ix2hbs3dfvjlpldpnb06j9al13zss6gmgl6l09dq2ic4warbag7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue"; @@ -27635,12 +27718,12 @@ gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnuplot-mode"; - version = "20170727.1339"; + version = "20171013.916"; src = fetchFromGitHub { owner = "mkmcc"; repo = "gnuplot-mode"; - rev = "eafa9395771a5ceace503cf5922efac1df0f5ec5"; - sha256 = "03799c7gwblpwpinbahbp5l510lg6yi85cmpsahsncfvkwirp2rm"; + rev = "601f6392986f0cba332c87678d31ae0d0a496ce7"; + sha256 = "14f0yh1rjqc3337j4sbqzfb7pjim2c8a7wk1a73xkrdkmjn82vgb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/gnuplot-mode"; @@ -27807,8 +27890,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "1a78dd6c36d7f37cbb60073523c2e9ca3f6519fa"; - sha256 = "1bcd62rggq3sk96n3dlpidrv4pbx6x385x17knfnp35avgrhsv4b"; + rev = "e990796e68a2ebfc099afed20b99e26d6b64061a"; + sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28538,12 +28621,12 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20171007.0"; + version = "20171013.1216"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; - rev = "393da2aa55054b3ad06d24bf6f09a90554b6d37c"; - sha256 = "134cw4g0hj6msyxyni71hkhf8wa2v2fxr41zyamg8xf76j75jr5b"; + rev = "5e97554d1f9639698faedb0660e63694be33bd84"; + sha256 = "18x0b2qmyzf9sddsv9ps1059pi4ndzq44rm4yl87slq03y75nxi9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; @@ -28626,8 +28709,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "456200c5d4982d6938b7ed14fc9bb72cc12b1576"; - sha256 = "0i10i311fr7lc2mf7na1jwxfj2lmi3l4f1bx22f01q4yy32kv3ap"; + rev = "dee49fa3694c5aff05e4b340b0686772f65c1fe1"; + sha256 = "05kfklvgdn4wj1b0273i7qlwx19f8kk1b44s6np2mb7wy1rvazyp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -28752,8 +28835,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "167311c6c270f1bbcf51d2181e4af578a34c1ce7"; - sha256 = "17bvizl9m1wdv3k6b289la5q56iy6b0bd96axlhb0ff10n48y29h"; + rev = "923c77a37a89811d583042eaec56a9d4f20cdac2"; + sha256 = "1vp80iw0fgrpgph512ia36bx2akcyanp0ydkf6q02wg4iidaw6fz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29135,12 +29218,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170928.728"; + version = "20171015.430"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "167311c6c270f1bbcf51d2181e4af578a34c1ce7"; - sha256 = "17bvizl9m1wdv3k6b289la5q56iy6b0bd96axlhb0ff10n48y29h"; + rev = "923c77a37a89811d583042eaec56a9d4f20cdac2"; + sha256 = "1vp80iw0fgrpgph512ia36bx2akcyanp0ydkf6q02wg4iidaw6fz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -30120,12 +30203,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20171009.221"; + version = "20171015.2155"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8529bbd8a850bc0c212c38120621f2b2cc8a7656"; - sha256 = "1rav46bbw807cbv93ash7ah3azsxbrnnpcsfm14mmc9x3mmjygrk"; + rev = "ba422033ec8142af5a9f18cff266f322737d7ef7"; + sha256 = "1gyyacylzfxq12nn6sgm6vnfs0apd2nlz0p6cfxis0ams31zrvhn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30351,12 +30434,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20171003.131"; + version = "20171012.332"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "299090ecb376ba269f2ffe547a672d210ddaceb3"; - sha256 = "07jym5zh07zksrn1f7x2j8m3agjzq06f9xchmiv7cic6x7b3shcj"; + rev = "1e1eecfdb62e80a9166cf6e7a3ddb8ff0e80846e"; + sha256 = "0j8xfd11ragnmz51fgfnliwqcxsphghcs8l0cn7m44kfl1kpn9pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -30750,12 +30833,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170929.2213"; + version = "20171015.2334"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8529bbd8a850bc0c212c38120621f2b2cc8a7656"; - sha256 = "1rav46bbw807cbv93ash7ah3azsxbrnnpcsfm14mmc9x3mmjygrk"; + rev = "ba422033ec8142af5a9f18cff266f322737d7ef7"; + sha256 = "1gyyacylzfxq12nn6sgm6vnfs0apd2nlz0p6cfxis0ams31zrvhn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31867,8 +31950,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; - sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + rev = "2f73061c886bae07bc51e4d9eb545ed8027c0442"; + sha256 = "17bqx7bkfzv4w7cf0l139xwg1shns680rq74hrqgicammb453kz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean"; @@ -32052,12 +32135,12 @@ helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-mu"; - version = "20161010.102"; + version = "20171009.1022"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-mu"; - rev = "1f9a6b0f8217c0c6359f53b724d9da4c3c3f896c"; - sha256 = "0ch0zip9ldsza3vq66hs8kyczlhdywr2i9sqkza4inm8b938y1dv"; + rev = "c3d7fb6fd55c760895e0bd6491bafe70aa11409c"; + sha256 = "15jfn7djc8bdvb7xhw2j1d69bn2zn63xdss4cvcckd8dgxpkqrbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu"; @@ -32665,8 +32748,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; + sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33144,12 +33227,12 @@ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "20171008.1448"; + version = "20171015.528"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "aec98ee3c44c911936a309b56510384b8e835ff2"; - sha256 = "1x2f34bpzlckiyn2ndknm5gmra8xginsnavjqs4dn6n0knbcrq32"; + rev = "3068b0229383bf18a88cd0b59694d611077cd58d"; + sha256 = "19l16zqg66y55bq6y8myv2iqcf5y604znf252j35prl12i0jiix4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -33819,8 +33902,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "4556ff94e6ed35eabdd28a061a07aadf436f0daf"; - sha256 = "1w5hwy1lszwcgqz43hw2mq95v6qm6ghxrzgrrw9p3cj2c4cz0kis"; + rev = "e7068cfc0ac506690ba2237381dae15f617875be"; + sha256 = "1lcwq3694kvfixzdwilfnpm3gsyvm7c70jq2208c1y520f2n002c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34341,13 +34424,13 @@ pname = "howm"; version = "20160928.439"; src = fetchgit { - url = "git://git.osdn.jp/gitroot/howm/howm.git"; + url = "https://scm.osdn.net/gitroot/howm/howm.git"; rev = "e0237b07f60011a1926b36848c73340ae46cdb3e"; sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f66d7b6835d06b8e7451aec9e32bb9288a6020/recipes/howm"; - sha256 = "007r8mjn7m7m1mvsb1gaiqbizlwykh23k72g48nwan8bw556gfcr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm"; + sha256 = "07wx3wmc51vm42s81km5sdbm600ax2pv83xg0116xsyn05za3bfn"; name = "howm"; }; packageRequires = [ cl-lib ]; @@ -34674,12 +34757,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20171008.1642"; + version = "20171015.1420"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "6d45ce89f26efe7ed0652415d2e999e5afcc5802"; - sha256 = "0ycn3gn442ap6gc1z9snbmmlrwd97rsf10cr3agf1z3xhzz2jycn"; + rev = "0898d352551c93b258eb863d4ab540cd00c76a53"; + sha256 = "0b11plipm4l6cc963kdcb2hc9n0jac8y2kgxrlz5y5cp0xaf7gk5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35912,8 +35995,8 @@ src = fetchFromGitHub { owner = "netguy204"; repo = "imp.el"; - rev = "11600a8441a1c0339252b0c19f151ccac3ee96c7"; - sha256 = "1k251pidqgjn380xbs2h3j02r76lq1gcqkslwfpvq2g3l3ksqkkd"; + rev = "48e6c4842b1fc2657a3c6c23029f89e35fafc859"; + sha256 = "0srjgzcmdgvdi9fm127wlj7zsbq00wsmb3fkzzpy05nvmm2dgng5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode"; @@ -36052,22 +36135,22 @@ license = lib.licenses.free; }; }) {}; - indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, sourcemap, websocket }: + indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20171009.444"; + version = "20171013.1300"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "261f3a8f4ce7edb8fb04457896fe747013a926b5"; - sha256 = "1yikx5b6yy138aplzpdxda5pssnchbkpp1xr9lsl869vi4q25igi"; + rev = "0119deb750c9b91b644867eef187606fed84eecc"; + sha256 = "1n3llb682cxfsfrsn0qpanaz83jcrxnhg5dsc8schgyqn4wnsgvb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; name = "indium"; }; - packageRequires = [ company emacs js2-mode seq sourcemap websocket ]; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/indium"; license = lib.licenses.free; @@ -37125,12 +37208,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20171007.224"; + version = "20171011.1055"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "6827edffb70890f2e94c3d146ed129bde581992d"; - sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; + rev = "f7470feef4880a735495c5013465efffd049270d"; + sha256 = "13b05yzqppcm5lp3ryhhv5gp031nrvh0vc59hv7fyisw48byv3i7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37146,12 +37229,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20171003.131"; + version = "20171012.332"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "299090ecb376ba269f2ffe547a672d210ddaceb3"; - sha256 = "07jym5zh07zksrn1f7x2j8m3agjzq06f9xchmiv7cic6x7b3shcj"; + rev = "1e1eecfdb62e80a9166cf6e7a3ddb8ff0e80846e"; + sha256 = "0j8xfd11ragnmz51fgfnliwqcxsphghcs8l0cn7m44kfl1kpn9pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -37255,8 +37338,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "6827edffb70890f2e94c3d146ed129bde581992d"; - sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; + rev = "f7470feef4880a735495c5013465efffd049270d"; + sha256 = "13b05yzqppcm5lp3ryhhv5gp031nrvh0vc59hv7fyisw48byv3i7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37381,8 +37464,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; + sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -37879,12 +37962,12 @@ jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jbeans-theme"; - version = "20170816.754"; + version = "20171011.927"; src = fetchFromGitHub { owner = "synic"; repo = "jbeans-emacs"; - rev = "19a09bebc20fc981e77950e8495162de49c824ae"; - sha256 = "06my9qmj936f80gc9nn1akjr6fjal23125zkllz8csm1j83vqcvk"; + rev = "d3cd21b794ba94680f0f3aa574b5029a749430e6"; + sha256 = "1c3qb3f4dapvfwwrnbgx5sim515pr2i5lvmnid780wphymwjslsc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme"; @@ -38296,6 +38379,27 @@ license = lib.licenses.free; }; }) {}; + js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "js-auto-format-mode"; + version = "20171014.911"; + src = fetchFromGitHub { + owner = "ybiquitous"; + repo = "js-auto-format-mode"; + rev = "37def86f6e46742ddd5e774778d1c208e7942e0e"; + sha256 = "0w92r1lk2xb9lqjnqkxp2zv8rmf71kqyvq4mhaxvz36gm19rz1yd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; + sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs"; + name = "js-auto-format-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/js-auto-format-mode"; + license = lib.licenses.free; + }; + }) {}; js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; @@ -38425,12 +38529,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170930.820"; + version = "20171014.1229"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "5cb52a7de8218bb2d50f67ba422fa7b2d51d1dc6"; - sha256 = "1b4kq8qix2lqhcqabbyhl3rzm99dzjspqqs6srgsgwvb9726q25f"; + rev = "dd295e838d3878188b1797b82a86867e3e56d22c"; + sha256 = "04axxxhy1jbn21bzsxwlirsv9mnzbrwcxbql28vzvw6572vkrb9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -38446,12 +38550,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20170703.314"; + version = "20171013.258"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "924936b42777f2513ec6893c68a41756bcfeba83"; - sha256 = "00p4yvlc0bcwrcr203my4i737fbsv42iz92pfgxwq6p47c42nq2a"; + rev = "b9829059745fbedfeb8c48646056fb27ce23a33a"; + sha256 = "1jwkly6srxx21ff6xnkvr7qqrlpsvis8i89v0z7vfz5f05yryscj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -38885,12 +38989,12 @@ jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jump-tree"; - version = "20170819.2137"; + version = "20171014.851"; src = fetchFromGitHub { owner = "yangwen0228"; repo = "jump-tree"; - rev = "70db2bed56e6e3433ae1f57df4aaa128e644faa7"; - sha256 = "1w0a33mrg4dqkq7rfs182d57lg9r15ab48m7hzb9zm0i6c79aqzy"; + rev = "282267dc6305889e31d46b405b7ad4dfe5923b66"; + sha256 = "0r6cwpks4aylndvq5lcny3799fag05zm36gd11043wca7sgr90fz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree"; @@ -39114,12 +39218,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20171008.451"; + version = "20171015.2347"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "kaolin-theme"; - rev = "bd105da4115d3685f14b511dbc975b22a1c94483"; - sha256 = "1iz288qygwcsz2gmnbcp9l92hbqvn27vkk07ik4bxgziksxyf2l4"; + rev = "2521473512e31d9592b38927c65ca1e6291cb22d"; + sha256 = "1ya5yl8m5m7c99kyikd1dqbzfqh40w9aj1l9fpvzdnma7v9sshnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; @@ -39622,8 +39726,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "fed61946603baf381404ae74009f742ab277d848"; - sha256 = "1gxav0a4934z53sdkfa4wllzcfc5cnz66xcjayrzb17g1dxr3yzj"; + rev = "70840e22fe16bd085946f1a5580849f16e62ff0a"; + sha256 = "0acqqaw4a6xsi75ys0v9ngndxxscdglh81j8jhgabz0rbzf8mkyf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -39807,12 +39911,12 @@ kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kotlin-mode"; - version = "20170522.1524"; + version = "20171009.1301"; src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; repo = "kotlin-mode"; - rev = "1ed0c5589ef2d53242f767f6071dbea90c64e813"; - sha256 = "0nywyf0znaffkchca5hal1w6h7fis9pybiivz7vzrr85ppl0gzas"; + rev = "ebcf6f3730f455894ebb7ed8e42950f66e8e1c1d"; + sha256 = "1345ahc8i69sl2d9v03gdgrdcj7qkbzrl0pl957hjn3vbvmhrz00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; @@ -40356,8 +40460,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; - sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + rev = "2f73061c886bae07bc51e4d9eb545ed8027c0442"; + sha256 = "17bqx7bkfzv4w7cf0l139xwg1shns680rq74hrqgicammb453kz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode"; @@ -40948,12 +41052,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20171007.209"; + version = "20171014.17"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "7de90475f922ea1ec757c16bc96d704b2d876198"; - sha256 = "13rx0ywbcplnh6swkmzq5ypd8a9ymd4w198pkl97cw5s6vzskh62"; + rev = "883019f755f875f9ab7ee5a1347be8510dd1c98c"; + sha256 = "178qw1946mp3aw65iaj1dh4x97i95ln3rpzj6qqsqdasmzvf1744"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -41371,8 +41475,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "f7ceddc7e61d486863a6bf9ddcf74bb87fd1b977"; - sha256 = "1v0wwdg57l613s5zd47wri75pgbwh6n401q64mnyj8frfb2670j0"; + rev = "ddb14f8532dc5b64fa4b83d54eb3625077751be7"; + sha256 = "0vsqsj9q0px4wyjxswmwx21dc99h5nybl1zf2p33jz3hj2spcdc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -41806,12 +41910,12 @@ lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-haskell"; - version = "20170919.626"; + version = "20171010.2245"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "a749bd017c293a7231639f75f024ee922f44818a"; - sha256 = "1yynwf0m0mkm0xxbj3sgy0zhkxzfw1qhwyvfq5fcgpqw59xfps6w"; + rev = "87ddaed885bdfc4ef0b92d6c608bd19161bc41b2"; + sha256 = "18j5hc7iv8q84c444bq3ggxg06k3vrxk6y72pc4s8b2k1gpba28x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -41845,36 +41949,57 @@ license = lib.licenses.free; }; }) {}; - lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "lsp-javacomp"; - version = "20171005.659"; + version = "20171011.422"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "e45ac9ac18375d63fc068cbb466ed580ccd9476a"; - sha256 = "0hpidswz1rfy8fmjw3m6jxhl4p9134521nj7fana5x3dl3v5c9kh"; + rev = "bd3c3714158fe52d19025e9a13efd5e490b1d202"; + sha256 = "1gv0dl0vp2nkf7j74hin8kdmjppqz9cgfn2lhg06yj32yzvg6xbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; sha256 = "1gp8dlcpik2lmpicccq2kya498pmw9m8vz9m1fbd725p7wk58fhi"; name = "lsp-javacomp"; }; - packageRequires = [ emacs lsp-mode ]; + packageRequires = [ emacs lsp-mode s ]; meta = { homepage = "https://melpa.org/#/lsp-javacomp"; license = lib.licenses.free; }; }) {}; + lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-javascript-typescript"; + version = "20171011.904"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-javascript"; + rev = "2339bca13cd5e13f7954991653402c6bba330bd2"; + sha256 = "1jcrdbmalkyw2nm3bdd18aa98hj0vwzawbrvilr0xyhwlbgkfim9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; + sha256 = "0pml7f7874c5xx94qpq7w5sz5hcail8s5nm5sy5vgax1j742r5y1"; + name = "lsp-javascript-typescript"; + }; + packageRequires = [ lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-javascript-typescript"; + license = lib.licenses.free; + }; + }) {}; lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20171005.946"; + version = "20171014.913"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "252396b8631c5f6d5fc4725e9430feebe408568b"; - sha256 = "0hbhv6ch23z2wyigsq3270x07kqr7j2kxz254ps6ym67dr3kka4x"; + rev = "5acfc65929e7eab517f3ee8bf19407fa0ad2c32a"; + sha256 = "0mzlkrzh9dyd2a423rm3x4hkqr154bvy6snig992rjwrz568ln1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42247,12 +42372,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20171009.314"; + version = "20171015.2104"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; - sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; + rev = "b4038b74cad1a3f3773b6ba08cd5e4f5e5c7847f"; + sha256 = "1c39m0cq5r671v2lcxq9p1zi8qh1rs9q61rpzf5pixib0ciyij28"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42464,12 +42589,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20171009.258"; + version = "20171014.202"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; - sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; + rev = "b4038b74cad1a3f3773b6ba08cd5e4f5e5c7847f"; + sha256 = "1c39m0cq5r671v2lcxq9p1zi8qh1rs9q61rpzf5pixib0ciyij28"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -42590,12 +42715,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20171008.917"; + version = "20171012.2051"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "50bb82d310d5720db82ad5b437ca47c0ff0d83a3"; - sha256 = "10ri2kqzcq48xvdyz9pm9d5j5vlh6f7nx4095s4wwxf22swkpnr6"; + rev = "1ca114322c928bf07bf9e57058abe12c91cc96c1"; + sha256 = "0k1m81cr1nydmkbns9f91nfikp9dgwgv9yp95yfsq55xay3virxp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -43123,12 +43248,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20171001.730"; + version = "20171015.1901"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "bc79248c605a5ebd01d96b26e5d5dba39bddcdc7"; - sha256 = "1d0c5l4g3miwzn51a3fsjqnv9shm8kw4inn2hwg2ff40jfrgfy1n"; + rev = "9614c2135023fa443c03161fa8fb18f20fb7268d"; + sha256 = "19c7r643fw0gcavr68j3skcn67ldj16053inwx0ziy3s13s917xj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -43319,12 +43444,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "20160807.1954"; + version = "20171014.1332"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "d5b6fdd97159b22d5a9dbc3b0db18a04089b3f2f"; - sha256 = "1pix1cz8zv3kgf103ml1y42a0l2hvakbykfpbyx81z4nw7n958lf"; + rev = "3c15edd8ddfb29a5151182983392ee831826d9d0"; + sha256 = "1a17csrp7ni4if8l5bvxb2024fav28vjii1qqym3gcalw0jg6ink"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -44011,12 +44136,12 @@ mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mhc"; - version = "20160704.633"; + version = "20171016.335"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "d5f7c5abe90831248581c26ef3abfec70b2c2b9c"; - sha256 = "0f5ilbl6dc5hf9s4lfp027qjdlwd0kzb7sni7lda6v5597vhsnb4"; + rev = "03a50a7dd5f90fb981b72e4b9e9385e4d1fe3be3"; + sha256 = "17p6gkf6xmx6sflzd3pyc3p3x7ma8p497hmj1yc7w863kqm8jclk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -44912,12 +45037,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20170731.504"; + version = "20171013.236"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "8dacce10f3c2d362c4fb39485a3f33c3b911b8b3"; - sha256 = "1j6zz9lkr4n5k758qqmk3n0w69fi9grgcv8zqvhxx7yvpk9c8nvs"; + rev = "019e07947426f0192fc3458f3f72c19031b607de"; + sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -46049,8 +46174,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "Nameless"; - rev = "ab1a5c589378334eafca105af1a17f73b9065423"; - sha256 = "107q1rximjnag9r9vgwh0iv687i3rsscbdnjc46f8l16j6vi4n7d"; + rev = "108f16e743aecd35401c0e914c896572cf1d5082"; + sha256 = "110bxdn2sqxlxqffaxp0yc6g2hglbv91az00mmgc01n6hjxcrc3h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless"; @@ -46066,12 +46191,12 @@ names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "names"; - version = "20151201.404"; + version = "20171012.1214"; src = fetchFromGitHub { owner = "Malabarba"; repo = "names"; - rev = "65b577b1215c4cfaee1ed5e98b0545e9ef7b9964"; - sha256 = "13r1qmibjikx6hz36m6xf79wap6fci2x7jz7rac5s52hq2hdj2wk"; + rev = "1d45ec50568eb2f5b55973f7ed0b48c68f9f13aa"; + sha256 = "1z0zdi9r6x6pqy2qfj9krkmbmlw9rlrgdvgn4dppfzrmrig8libr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names"; @@ -46741,8 +46866,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "b26168be150bd1cbdd6daca59f53755a56fe7939"; - sha256 = "1g10scd55asi5mfkbj0mdi098nkhy0phvnllwbv52vy6p0amppq9"; + rev = "887eccf1fdd91d50c4761bba79b5cf329a280ffb"; + sha256 = "1bzf4sy3r5n7prxh4ifgh1q2n2zy2zh6brn0n5d955syi2fl1aji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -47136,8 +47261,8 @@ version = "20170927.415"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "54aef071590cb23f61da943daa29080cf7446696"; - sha256 = "0hh7276br857a5s5wms2wxf24jz3vvdpqm2d3zrzdfgz54ix6cp7"; + rev = "ab8b40f7e350c0661dda5b9d52041150ed339a39"; + sha256 = "06s4988wmrr025434hamzplamw0knghkiny38q5pxnazbmq2q14p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47300,12 +47425,12 @@ nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree }: melpaBuild { pname = "nu-mode"; - version = "20171007.1521"; + version = "20171012.1501"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "4a3fe40585031a1c2b323e28f536a3840f0776bd"; - sha256 = "01pl34cn6z1hky7gwh832vrkpyjsbc62ihbnqxj9rma5w9dfwarx"; + rev = "fbecd9cd2e3d03ef1838de64be9d68937681e1bd"; + sha256 = "1nygzgjyv95sz1ps9wy1vxsv2r0zj3063m3z3n2b6ybxw2a8hqc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -47583,8 +47708,8 @@ src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "079dbcbfa229407ae2f53689a4d045f827adabd5"; - sha256 = "0jinxwv72yypns22iv2v4ll1wkg2ca5vbx1v36pgxgmjvawfilvr"; + rev = "f0bfe88d6032e9ae8f4953e2569aeca5431a3e3d"; + sha256 = "0ak23m2i24ix9443236zdvp3f3j27dis5k6pivic3whmb618g3v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; @@ -48670,12 +48795,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20170823.1754"; + version = "20171015.730"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "da7955aaea2a3f3ad07b457b9737a24534674e33"; - sha256 = "11qvlwsy6l4v9jcdnf7g3yxy85g1qii4hmrpv6s85vbfsn9rxxw0"; + rev = "df2477e92e19414d28c72ebd14e2dfbdc4c662fd"; + sha256 = "0l5cadnl1a3fk66c0l7ciw55p6djjbvlc4qgc2k527zh62z1ch1h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -48712,12 +48837,12 @@ omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-kill"; - version = "20171005.955"; + version = "20171012.1113"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-kill.el"; - rev = "192d51d843c6581d593a4eb01f1b49ad59d206cf"; - sha256 = "0n24rhzl1zhlkdkjigsczyc0z3yrihz9qnn1icrk6nkms107qbnn"; + rev = "d14f71eb1783078d2d9090509167d09088463189"; + sha256 = "0bjq2zz19yjcr1f21d5bvbf5npjzf6dksfxmn39dqj4v4h3nn1wg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; @@ -48775,12 +48900,12 @@ omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "20171008.1207"; + version = "20171009.1451"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "98cdc402c3663e30a2bd260911b2ac0c93f93129"; - sha256 = "19pwhbg4db5g4nq3j7axdh81k6ikm2jirwdkl38nqyr0sb0s2w33"; + rev = "9eee3161e5cb6df58618548a2173f4da7d194814"; + sha256 = "1cppy9p5k8737jjgjlmfqqfdx048kpjn5cx7iw0dxal180y3i39g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -48838,12 +48963,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20171007.416"; + version = "20171015.1228"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "40b6251a96057c80a958362a0886c06eea5bfd62"; - sha256 = "176qfjd0qfgypj7pyi2p7v6zn7sic86gcgxz056k4y2akm6aa2p6"; + rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a"; + sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49439,8 +49564,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; - sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; + rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; + sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; @@ -49453,27 +49578,6 @@ license = lib.licenses.free; }; }) {}; - org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-chinese-utils"; - version = "20170313.2148"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "org-chinese-utils"; - rev = "f44d7114899102f1e1109bb7aeeab4330281ff94"; - sha256 = "127nnjdd7p3sy38pd39ivrpxgnzdhbh6sf99667s7qxryfx837y8"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-chinese-utils"; - sha256 = "0bxx81zigbv5vv3aficd65p03lgpp2iknj8qgvn2k4wgbv56j4q4"; - name = "org-chinese-utils"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-chinese-utils"; - license = lib.licenses.free; - }; - }) {}; org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-cliplink"; @@ -50106,12 +50210,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20171008.644"; + version = "20171014.141"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "0a0aa9b11005ff620b447c75e15122f6c0f9d81b"; - sha256 = "1m5qih09zyi8awwf2badis9czy0biwnpxrhd26an3ssb07i7ajgs"; + rev = "db707a73379fb3b21ae6e24c6230bfd3dde7ef45"; + sha256 = "1sy5d1nnhvkan877bx2pbc16n7sy2jn5cpdsca06mrxb1m3mxzbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -50127,12 +50231,12 @@ org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-mind-map"; - version = "20170912.1411"; + version = "20171012.1834"; src = fetchFromGitHub { owner = "theodorewiles"; repo = "org-mind-map"; - rev = "73026279191516396637e6e33628be9c0314545b"; - sha256 = "04v5gdmprga75y9yqx2ism28vnwsy5ky7hfzzdi44mq2gd3m8hfl"; + rev = "cd5dbe2bded1294de1bdc881e53d691244e5c921"; + sha256 = "0x7nbgcsf0nhda4m7qrxdaa0sffkndfd59nrr09vcxap84rfwacm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map"; @@ -50250,6 +50354,27 @@ license = lib.licenses.free; }; }) {}; + org-onenote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, org, request }: + melpaBuild { + pname = "org-onenote"; + version = "20171007.2200"; + src = fetchFromGitHub { + owner = "ifree"; + repo = "org-onenote"; + rev = "5ce5cf4edb143180e0b185ac26826d39ae5bc929"; + sha256 = "1jlnnb04ichcl155lklvjw91l8j1dvg77bv1815chak226aq4xqj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7705ee9a8733733664b6214bf4eec15d640c6895/recipes/org-onenote"; + sha256 = "0qgmizzryb6747yd80d3nic3546f4h8vjd6c30jr99vv2ildjsfk"; + name = "org-onenote"; + }; + packageRequires = [ oauth2 org request ]; + meta = { + homepage = "https://melpa.org/#/org-onenote"; + license = lib.licenses.free; + }; + }) {}; org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-outlook"; @@ -50432,8 +50557,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; - sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; + rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; + sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -50453,8 +50578,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; - sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; + rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; + sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; @@ -50581,12 +50706,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 = "20170927.2056"; + version = "20171011.1421"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "5fcbd975523281e5bacaf0284af21b4387147a98"; - sha256 = "0fc5kcz1xy819m960qn28hz9c13qpc542kzihmzkc3ykm5d96x3c"; + rev = "86367a1f2306bec25206696ad0429a2b7cc32655"; + sha256 = "0vvw1djr6ihwrbv9b7dxgdy4rnwczvw9x6jqg34jnnb1zqr88q6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51054,12 +51179,12 @@ org-web-tools = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-web-tools"; - version = "20171008.2128"; + version = "20171014.804"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-web-tools"; - rev = "dac686b18cddbf3af4632054b15ff53c1ae8d564"; - sha256 = "1bw543dc0lbzf4s3sjwg6y8pszfpkby5dyj0pykg98pcii51agkj"; + rev = "e9583248e838806271643770102e786671fabaf5"; + sha256 = "07kdgkkl3f7w1nxdw1j7vcm2f05sdpd06dlw7vpdd77pdbwafp3h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools"; @@ -51114,6 +51239,27 @@ license = lib.licenses.free; }; }) {}; + org2ctex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org2ctex"; + version = "20171016.158"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "org2ctex"; + rev = "c5ea6d92e3ecc311123954bee2e45830fd873d41"; + sha256 = "01xy6nzib4c0ldn7s8kk155xzm1sribhs5695b3vhsp951h9pjhl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8f77fe537ca8ee2ddb6e3efe71f3b3c560c52c7d/recipes/org2ctex"; + sha256 = "0049zf3ls7vbbcz1hdwai57ih9gppk2j0gzwijzwkb23ccwaf64a"; + name = "org2ctex"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org2ctex"; + license = lib.licenses.free; + }; + }) {}; org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org2elcomment"; @@ -51966,12 +52112,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20170930.1905"; + version = "20171011.137"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "98346caff78f5e8740505bcade85e00914bc54a6"; - sha256 = "0c1ajqybpcv0nc5fklq01lkz1f0320wnn43i0r22d4m8dflqfhy0"; + rev = "daed39f8953d3ec8c089ec4178b2b82f8b2d57f5"; + sha256 = "1c0msmk835sn02bc6llsv7nmza89r2fwhwg03pkmanaz5n3gr016"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -52050,12 +52196,12 @@ ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-latex-chinese"; - version = "20170401.439"; + version = "20171014.1532"; src = fetchFromGitHub { owner = "tumashu"; repo = "ox-latex-chinese"; - rev = "f79d25443987a169a1234f5fbb2bc115cccea33e"; - sha256 = "1sw7wvsyp5z7jdijkc3lyfx7b0cq3c60fjdvmqlpygl9020md99w"; + rev = "3af3872c5435b6d4feccd0fd2bac32cd156724dd"; + sha256 = "06b3k3c407dvj0gx73w8wspy2mndl1q2s9wlq4g6hs2v4i2pd9dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese"; @@ -52138,8 +52284,8 @@ src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "7a7635ceb3e6c6050e1a932dc91b639c41572b51"; - sha256 = "1fr33hljpb9f8035ghqrrw14ybqjnc8w0m714yx8jp6hbvjvgkdn"; + rev = "63a1e2b39049a95f6ad7f599561bcfea45086bc2"; + sha256 = "0iw5imsf7qllkrh39p4pwp6ibwx08nfydfrzwc7bvck0qgzrs7fv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc"; @@ -52407,12 +52553,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20171008.2352"; + version = "20171013.1125"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "6c288fd22eef6332adc5680aa0843d1c678c4832"; - sha256 = "1s2p5c1c8fyiwi6idjl4bw2cxikdim0maw6w5pf12k2j1bwm98qy"; + rev = "2ee54b5f869770a30a2aa35cda743d669c16b20d"; + sha256 = "0az23kzy82fahqdijqfag3kiwnyn8sp8d58mhv6pg04r994a5z81"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -53077,12 +53223,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: melpaBuild { pname = "pass"; - version = "20170928.1118"; + version = "20171010.410"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "adcafc25e1bbd43b70251305a07252cc46d20308"; - sha256 = "0hbbqgj0vi5xlb48fjdy7yh8qx43hi6rw3jqrcmvlh3gnm47yhky"; + rev = "0f4ff034fb31b18f387e67f1de4029826db6cd0b"; + sha256 = "084497na8qql638qjhgad02rvhwyzz81xwh70p6rxxwfzj0i1p17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -53186,8 +53332,8 @@ src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "c1b3ff04425844ed88fac2a634232bdb8e2662bc"; - sha256 = "07hfca1r09m5p5i8y62b54xmhw1ymcq68ys0gk579d7lvvy6s5qf"; + rev = "7252e8b3cf829e908179913daad16ff2b8bdefdd"; + sha256 = "1wmayp7wjlfxdjb0wlmjqyxqa95ssrhhxhkiy0ip3bgip77s7rbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; @@ -53665,12 +53811,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170918.934"; + version = "20171012.2226"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "52acd65c0db97a83e3f86ca97f9a3bf27135e8f3"; - sha256 = "19d5nmy7kdlysxzig2akbxvg9h1vnjagp4xh1qpyw8iqgm3kpxxn"; + rev = "094b2931de775c734ad353c5d06cf5fc6a55f11d"; + sha256 = "0g92rd68m1l377hw5rr1y14z7fcs1blmyc6vi5a9gybr19bcxb7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -54440,12 +54586,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170729.1258"; + version = "20171014.1455"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "151ae717b03d6d5fcc2bc86e349175840bfbe079"; - sha256 = "00f2k41zmda299rj4lfpxisnrr9i5f0gg51cb8fri7lyjzrq829a"; + rev = "2fc32548955c0aaf862f578259763149a8cc816e"; + sha256 = "09fhsiavxhbvxkzdjnv18ryb8i44ya8bpjjgfy7j998nvinvx63r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -55217,8 +55363,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "b05d13f04990f6ed74637ee8bdb42fd1500974ac"; - sha256 = "03bcknd6y6rhg6185bjga2idswq4p0d87jmyhkx2x56gdybpa9mr"; + rev = "981c523ddbd1462970335a1069573ca3bdd3df5e"; + sha256 = "1aq95scp0lg5r1fsn62r54dqamm3174wzrr0h3vxx75m3iycsxxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -55297,12 +55443,12 @@ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: melpaBuild { pname = "pocket-reader"; - version = "20171008.1411"; + version = "20171015.1705"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-reader.el"; - rev = "410add35782f037e4c42d3f740fb5623901ebf39"; - sha256 = "1lchwlv32b5gfgkp2i3li3rk3w1xyz8axamz5mqs1imb6mkc1dws"; + rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd"; + sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; @@ -55873,12 +56019,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20171008.2002"; + version = "20171010.713"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "b51217d52ea0b8b91b15783d364562b6668ac0d0"; - sha256 = "0afhs8dpvlc29xpdgwm0jp1syyyraqipscxx89x1yi0idkgvxj29"; + rev = "595a9c1b230f4fcc4d72e6ed9c67aed7b838452d"; + sha256 = "0xpvsrr4klsw3fkclpkxcxrfwg2gk4fzc20n6di22cs5pysilp8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -56418,12 +56564,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20171008.135"; + version = "20171009.848"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "933fcbd849781ea5e0ace32b9dc655d00de7df06"; - sha256 = "020j7cpa5ljblanf4y7xsr7gvz12b8cdgpy75k0hb4igc62qzkym"; + rev = "dd48cb8af4cf41d109fb6d46f0c3f2134f37fcfb"; + sha256 = "0qgw3g4xq1qa6dvxyyhnb6536ay29jzf12829z9s689xqg0n7zsn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -56604,6 +56750,27 @@ license = lib.licenses.free; }; }) {}; + projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: + melpaBuild { + pname = "projectile-trailblazer"; + version = "20170928.924"; + src = fetchFromGitHub { + owner = "micdahl"; + repo = "projectile-trailblazer"; + rev = "a37a4f7b7f727d98e4c74c0256e059e84263553d"; + sha256 = "1njs2aps4mlbnnfjkfwrb8vy8lg6lyxzxkxpscv91la7yf3wpc3g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer"; + sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4"; + name = "projectile-trailblazer"; + }; + packageRequires = [ emacs f inf-ruby inflections projectile rake ]; + meta = { + homepage = "https://melpa.org/#/projectile-trailblazer"; + license = lib.licenses.free; + }; + }) {}; projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projectile-variable"; @@ -56842,8 +57009,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "77f64bb7779ec2195f9bc4dc82497d12c18fc6b7"; - sha256 = "0176y1ikr6pi3paz4q588ka3c02al25fnbn0y09z10mi7nplrx85"; + rev = "f850188e6e1021b4fe21ecb0aca548a54c272ce5"; + sha256 = "1ydf4fl75byx01r9r7ga555hw0i61bg2bqckigmv26nyajkqsd5a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -56911,12 +57078,12 @@ psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: melpaBuild { pname = "psci"; - version = "20170914.1048"; + version = "20171011.50"; src = fetchFromGitHub { owner = "purescript-emacs"; repo = "emacs-psci"; - rev = "47a0ba79e7284c71bebd8abe753246badeb1251d"; - sha256 = "1j2zbxk2d7yjpwhhv48j6qlsnmapk0858zrdiqpcicapddbsv66w"; + rev = "5360b244c588ed2f2a5bb86180cb5d4deb2216de"; + sha256 = "0m9lpwwm29h0pms1rnwnh67ff1n1dmf25yy429g438zq98l94x9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci"; @@ -57711,8 +57878,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "0b1b25a63f6d68a4dc21dbc47a0af79d3eed973e"; - sha256 = "0n3ihw3p61y46a8njq1ah5gxb26m13aawqsciy944l203s305845"; + rev = "dd78aedcf0f499188ad8232f2193ba62c791d33e"; + sha256 = "0hqxh294hg9y8nz4i8p2mipg65d6p6wfy9kqlfx9zy5cm19dn7fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -59061,8 +59228,8 @@ src = fetchFromGitHub { owner = "vic"; repo = "rebecca-theme"; - rev = "ee0d8796eca831110b7084a2af96fb4184d0a418"; - sha256 = "138hs6lgql40cn86p7v2xhb7ck2zcvz1vi6jd7fk55l0xgj5w61k"; + rev = "add349748d0f648587bf17d14036677570f081aa"; + sha256 = "1932ga5j5cv3w32iwxjdjs2jdz20sw5ai10dnxb6bdzh68kkw4f3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; @@ -59250,8 +59417,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "887d32fa14ec6e9e024e50077c119b95b22d91d3"; - sha256 = "1ibrqnnnsqplgx2hdj3jf8jcg3dwc01d50pkfb75wwi1w2xvsjmk"; + rev = "164d0b65d05fd883fc9ac66dd62d7427660fea37"; + sha256 = "1h09mlvrh7qx55s47135nkamv7frhcm3865xacpvifj72z46alg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -60068,8 +60235,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "333e4669f76a0fb68b433117d377711e418a525e"; - sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic"; + rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4"; + sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -60211,12 +60378,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20171009.608"; + version = "20171010.725"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "487ce00922571f84918e99ade678fe83d55bd6e0"; - sha256 = "1q396gzpqba7a4knnnx5pjwgbdh7r4q8ac7f81z9mp624w2zlgam"; + rev = "4979f4fc53eb341dc1d76bb1762bd2c734dded40"; + sha256 = "0kf5sll3npw949hxqga2ywadm1mxc2sm9h136dvnrliaqvi4s95g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -60442,12 +60609,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20171006.1343"; + version = "20171010.1544"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; + sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -60610,12 +60777,12 @@ ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-hash-syntax"; - version = "20141010.839"; + version = "20171013.50"; src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "f3270274a9d12537263d9ae0b8f4e60c542cf77f"; - sha256 = "1ck3xhavilq5qdcc9libd6dyzqz7b0cxd3q5nd7kaxicc28h9p80"; + rev = "bc05c3130a5d3237f04c6064297e56de5f73887d"; + sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -60820,12 +60987,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170920.1919"; + version = "20171013.258"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "eae291ab7b3e1a52e158261d1192ea1ca2b332f4"; - sha256 = "0g68yy281v232f3f8k9r16nqxlirkb52yca1wknng57addma4cjv"; + rev = "b8e49089713714a9f3f815b399df569a0e507e73"; + sha256 = "0ny5prsm70incv30g5310bknbpix0415dn16hhf55rhjhwg39dns"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -60946,12 +61113,12 @@ s12cpuv2-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s12cpuv2-mode"; - version = "20170828.1901"; + version = "20171013.1351"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "s12cpuv2-mode"; - rev = "446696222fec364442fa7a52f523be10bb5cff68"; - sha256 = "1l8950p4bakgxwd61n9agiyi15s1l09r1rnrijl4dnyv6vxmwghl"; + rev = "b17d4cf848dec1e20e66458e5c7ff77a2c051a8c"; + sha256 = "1fc132gv48xwrxiw139kc9f5wkhjgsgqdfm6b7v97xj5025zg6hr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c1b9bbdc4deb17636270c7f2be0b43b647c695a/recipes/s12cpuv2-mode"; @@ -61244,8 +61411,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "5fbb1060ad967ac8af34687c7e7bcac69c7381e0"; - sha256 = "1gfpkqhqw9n0x325ar7ln9j2052r8hk65ilhz3dp7x865mqdm2wn"; + rev = "aaa3eca9dead0205a2c101e36aea42f4e0de98e1"; + sha256 = "0yn4gpnc7nyix8q2xcq885bpxcdi7n70wcvw7in3h6kfixd3g0ls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -62183,12 +62350,12 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "20170611.859"; + version = "20171011.536"; src = fetchFromGitHub { owner = "voloyev"; repo = "sexy-monochrome-theme"; - rev = "8def559784c9f3ebaad179caaff58a9c6afc83a5"; - sha256 = "043pplyjdvqz45q1vlnkh8j8a4fhiw4km3b2xb06bycgs3ysb42h"; + rev = "9fb835606088a0d24600faa12fe24d85cb2c0731"; + sha256 = "182wzr7lisrszivxpjp29m7vjxxi429mshp2labf2abqkfrb9jv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; @@ -63296,12 +63463,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170927.2004"; + version = "20171011.1945"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "5fabc901a316569ab84edaf7ea3aa7143ab91796"; - sha256 = "076yk65wyqgcqd9w8d4pgada0hsdlb58gvcldhvirlqsbmvjp9wl"; + rev = "1d4436d3e6e0689fd30aad01a8667a1743c000bf"; + sha256 = "1k6ymjdcl1sipf3xswx4cw3bbhpfnp4sr9yi3iivi8i3kdai84dr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -63527,12 +63694,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20170928.1829"; + version = "20171011.809"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "6f7d1c5e5d51100c573f3e5b6d3eb1eabe3dfaa2"; - sha256 = "1684agg19nxc9mirpkr062z9ycri2d78nr9hg8y7kgkq814vbbsi"; + rev = "687942cb08525bb10abef0d0fdfb57dd69e988b8"; + sha256 = "1hzc6cpndzc9lb82g6k8g65spnw09impgnfj6lfm9v25pbyg8y2m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -63650,6 +63817,27 @@ license = lib.licenses.free; }; }) {}; + smart-backspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smart-backspace"; + version = "20171013.2226"; + src = fetchFromGitHub { + owner = "itome"; + repo = "smart-backspace"; + rev = "a10ec44ff325ec8c4c98b1a6e44e89e60a9aa4ac"; + sha256 = "0p19qikalmvs9y1lws08mxvh2k8s219mpm3nyi9aqq62ryyfwf1n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/88cd95cd623fb00d1bc6800c1dd3c665a0cce349/recipes/smart-backspace"; + sha256 = "152xdxzrr91qiyq25ghvjlbpc627cw4s120axmz2p2d48pinwir9"; + name = "smart-backspace"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/smart-backspace"; + license = lib.licenses.free; + }; + }) {}; smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-comment"; @@ -63820,12 +64008,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "20170708.1317"; + version = "20171013.849"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e"; - sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30"; + rev = "1facbe9816b602c640ddb23602e30588d6d904ca"; + sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -63845,8 +64033,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e"; - sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30"; + rev = "1facbe9816b602c640ddb23602e30588d6d904ca"; + sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -63901,6 +64089,27 @@ license = lib.licenses.free; }; }) {}; + smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smart-semicolon"; + version = "20171007.1833"; + src = fetchFromGitHub { + owner = "iquiw"; + repo = "smart-semicolon"; + rev = "c11096679dbed3875c37413337ee490ee7951b63"; + sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon"; + sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0"; + name = "smart-semicolon"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/smart-semicolon"; + license = lib.licenses.free; + }; + }) {}; smart-shift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-shift"; @@ -63988,12 +64197,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20171005.541"; + version = "20171015.1259"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "456b78c5b7af52f84701aea0ad51a9d6d7de23d5"; - sha256 = "1b5mp87qjyjs0d2mn9rz0iy6qmdmhkb8699ddlbjxrmid2s8g73h"; + rev = "d73e18fc6ac4f76736ce046df4a7d95147f6cf66"; + sha256 = "0dqi8f4x8ni7d0k15jp7wnnl97ip5kgzw8p17z3hrhj4v19wvmr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -64324,12 +64533,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20170920.1454"; + version = "20171010.808"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "9a29ca3f5c7302a67f969b10defeb75e2fda688a"; - sha256 = "1hskg4llb0wfdmzgnanbvppbjj55zkifh2yan5rvzkkwma1vb2ry"; + rev = "95e8d8aa8312b54d6ea18b35667fa3005be1bc76"; + sha256 = "1fbn6wqm515x8barbf8bjxkvxyv8p3szdz0h9zaam7hz7zbpdap2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -64597,12 +64806,12 @@ sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }: melpaBuild { pname = "sonic-pi"; - version = "20171002.343"; + version = "20171011.503"; src = fetchFromGitHub { owner = "repl-electric"; repo = "sonic-pi.el"; - rev = "f4bb7abafea564c97d3b9a28b1b2c3858191674f"; - sha256 = "1xdv94k830a70hi8cmvv2gxzybk16cfsf5my8c1b2kw7041a074q"; + rev = "6b362bbdfacf7aabeb494c3e22f6fd3f48ca9738"; + sha256 = "0xk03swaclhm41vnwzmwil05mgabkb23lrp28wvl6qxzhd3hmrwq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi"; @@ -64898,12 +65107,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20170630.2327"; + version = "20171016.157"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "e6ccec6c80ee2bbddbad5a88cb9d2cd2db8a1a33"; - sha256 = "0ga99imh00h0bnc4m2q335y0x8zp6xs1n47rqqhxp6iwmw2fz20z"; + rev = "251d92ef77ed4daa798e3300e5c671052870827e"; + sha256 = "13mnsvlncrzsh2q8xhx5ippvhlrk9sgsrbpcihk0m90d2bxj53qy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -65636,8 +65845,8 @@ src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "af7f33c85fe7d8e6c597fe5c674b1c7bf8ce2bfd"; - sha256 = "0n1h510v1bkq4yrmfyhih2721yagfb2slm97b0vpjfp3f94m2nvz"; + rev = "5e0403c93694243643a2b812313718d86955f0db"; + sha256 = "0an0zafnacrg2yvpkmiwrw7hbgsw8pb6m2y80ldp2gxbxl2i5rx0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -66323,12 +66532,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20171007.930"; + version = "20171012.1200"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "f9cd0db1c62073b5dacefad20483f181c2d8d019"; - sha256 = "0xhj6x1c9r69sw6xw9kdvdhkvmr000mnmw7ihqmy6fkar945046f"; + rev = "cfc56a9ed853258c3880c34d87debf920d53dcdc"; + sha256 = "0mqgkvx9wsk53cbj2qdr2s8ja30q3p1rnrf74q3j5q9x2mkzgymj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -66362,6 +66571,27 @@ license = lib.licenses.free; }; }) {}; + sunburn-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sunburn-theme"; + version = "20171014.8"; + src = fetchFromGitHub { + owner = "mvarela"; + repo = "Sunburn-Theme"; + rev = "8b6f3d6a5d44ae2d87d0022203ecfb33e0b76f78"; + sha256 = "0ip2pw5h8z19qvk768vxhjs6xrz876rl3nw7bmlxy0wb1ffd38s5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme"; + sha256 = "09shmaaii0lfd52v49cazn91sj4jz2siqbanw682vi7zsl79jx9f"; + name = "sunburn-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/sunburn-theme"; + license = lib.licenses.free; + }; + }) {}; sunny-day-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunny-day-theme"; @@ -66663,8 +66893,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "6827edffb70890f2e94c3d146ed129bde581992d"; - sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; + rev = "f7470feef4880a735495c5013465efffd049270d"; + sha256 = "13b05yzqppcm5lp3ryhhv5gp031nrvh0vc59hv7fyisw48byv3i7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -66701,12 +66931,12 @@ switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-buffer-functions"; - version = "20171004.2056"; + version = "20171011.1004"; src = fetchFromGitHub { owner = "10sr"; repo = "switch-buffer-functions-el"; - rev = "ce61a74a88bf64afa699d20ed27b8be4cc63f80a"; - sha256 = "1bdcsgbnyabkrri296dgb5q42vjb1v0yji2la5ir6sfxmhw0mrb6"; + rev = "651696ef9dec7affbe51c81d9318288376c35899"; + sha256 = "0xv57imh6w6kbh1i1ib9k9x2h01l4vdxs2i667a76ym6dmsjbx2x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d37ebd28f4a2f770958bd9a2669cce86cc76cbe7/recipes/switch-buffer-functions"; @@ -68299,8 +68529,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "9f9e30b51e3912c0b63258badf5501d3cb2550be"; - sha256 = "1pxjsql4d02igqzz4qk5mc1l8as9myfml28bg9q2bqcjsl6rh0s9"; + rev = "8b8a8efea13d1c97f856053af0a5c0e6a8a76354"; + sha256 = "0m2965iga7acl21015ny2d7zcckfr06ncc681vb2yffss5jjjpj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -68334,15 +68564,36 @@ license = lib.licenses.free; }; }) {}; + tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "tickscript-mode"; + version = "20171014.247"; + src = fetchFromGitHub { + owner = "msherry"; + repo = "tickscript-mode"; + rev = "5ae2c36746e83f1aaba4285e80af2e499f6e4317"; + sha256 = "1yk0garmwxrdz4600hw5i5ds6rnl9qyl6jplywhxys8amv35zs7k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; + sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54"; + name = "tickscript-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/tickscript-mode"; + license = lib.licenses.free; + }; + }) {}; tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20171008.2022"; + version = "20171009.1142"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "e5d1d3852aaf63cbfb0abaec1792a62bed024a72"; - sha256 = "1kwssyzbjwl2vyll0p49l57z41yv6k1jnzbsdnh0d1h81nixg5wk"; + rev = "d4a86487475b08adcbc1974c3362ce247d65a381"; + sha256 = "1f0l8s50ihhl4w00q5f101g9bfn9zssh4ippbchfdz4ialisyk2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -68996,12 +69247,12 @@ traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; - version = "20170916.252"; + version = "20171010.2353"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "bb9e86958a92cb5b6ca107f90d05c1890a47cf63"; - sha256 = "0vjql7z5wda701s63x1h5m6m02342dw1pylngbbxxs29d70mzybn"; + rev = "5ee7a4411fa39601ff59873f1e129fdb64df4e97"; + sha256 = "0h9hx5jpi0clmrj7sf0srisdp9h5zgakwrs7cyqs3hmw7z4ds5r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -69233,12 +69484,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20171004.631"; + version = "20171014.737"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; - sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; + rev = "22fb1fa2b1c53863157871ce860dfb1a7d0d593b"; + sha256 = "094yiafilr0bg22jx00ixzhlyfhwjivvf9avp6c127fky2z2snc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; @@ -69258,8 +69509,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; - sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; + rev = "22fb1fa2b1c53863157871ce860dfb1a7d0d593b"; + sha256 = "094yiafilr0bg22jx00ixzhlyfhwjivvf9avp6c127fky2z2snc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -69279,8 +69530,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; - sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; + rev = "22fb1fa2b1c53863157871ce860dfb1a7d0d593b"; + sha256 = "094yiafilr0bg22jx00ixzhlyfhwjivvf9avp6c127fky2z2snc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -69483,12 +69734,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20171008.1240"; + version = "20171010.1111"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "3ef5d4c4cad10b63fac200ece4604bf7370994b7"; - sha256 = "09v32d9diky72hrixjqd5k5358wsvyyiwwawf99rziaa33qvyns9"; + rev = "20de81c91b02f799be4203d11707f68a0c8e900e"; + sha256 = "0hrzsfdn717dlj2kss3qxqgyn3gdzlsvdvhwjhw3yixgxkr08hzq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -70312,12 +70563,12 @@ unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unify-opening"; - version = "20170215.657"; + version = "20171011.201"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "unify-opening"; - rev = "2f0164328b9234c9083758349103be873cb65af8"; - sha256 = "0d7advfxfnx0v2y292fq4ynqm7ial6p0x7mh28l511b8b4qgpjgv"; + rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf"; + sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening"; @@ -70501,12 +70752,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170812.2256"; + version = "20171013.1548"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "16abb66246170fe06325ff32a4889e4b51bfd979"; - sha256 = "1fav32ax7qykclvrimlf00pyp534yfngizm697mbr9346va1zqm6"; + rev = "cb89901b52a9413b6c233d7fbb616a2d8f38b50a"; + sha256 = "1fypvrmn1brrq2200kr8s8zbcc30z9nhfv3k8vs36iawab2g573k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -71530,12 +71781,12 @@ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20171004.744"; + version = "20171013.1728"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "3b3cbbf6cb89380a721584dd62528cf3568ad9c7"; - sha256 = "1nfxvfpiwqjyn6h53gwpifmrsv0l4az9fsv7mrvnvf67pk3jawg0"; + rev = "0a6b7c226c5c0a26f3402cfe40169cb00f5d792f"; + sha256 = "1s08rc3d2k6rnnn4fir854ndwq2b2xxh1blv1f2055gdf4jw25rf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -72432,12 +72683,12 @@ whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whizzml-mode"; - version = "20170525.818"; + version = "20171015.938"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "92986cbb260642c129b049950036b2b6698a8bd9"; - sha256 = "01mxjyan8bbjxl055f8zbsydsn01iszk3qi3668aa6i1m3vsz60h"; + rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22"; + sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; @@ -72520,8 +72771,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "597b3e1cab9f32591561a299670999260112afbe"; - sha256 = "1ndxd5s3raw4630zfxp5iz0mmnc6rrim6lgpzp4wjipb4zryjlnk"; + rev = "b05d584a4b3e0db168c3b920ce4a270b3908d842"; + sha256 = "0shgxd08da8a7ij37k5ybmvyqbqzq4nqxdyfbbpgnh1vgw61gr6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -73523,12 +73774,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20171009.422"; + version = "20171014.2157"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "15dc0360011eb8ec542db5e8e5bdfa1147366557"; - sha256 = "0n8j36q16njkcyr23qc8zx19wn4qx7pjiankimgjp96bcxsfa9df"; + rev = "4e8a74278dd9ed7095519d0b6ceaa5c7250061e6"; + sha256 = "06v50xyi7cyrjhix3a27k7plsnvlaj7ndwlfyqcvyv2bxa3js325"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -74489,12 +74740,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20171006.918"; + version = "20171010.1224"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "29ce99b8412ef919b7f03f259a877c4111362410"; - sha256 = "0xq3vjlsm4fvk809r69bln8i7fkqx49xi1gk1nff0v8y5b26vnxp"; + rev = "07389c67234e67c8ae423779468f56d0bd65da5e"; + sha256 = "105jdikzwggn1isnqmvj6hcmni4z387r2nfy2cwd11pan31vd4wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -74592,12 +74843,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20171009.702"; + version = "20171012.1610"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "dfb0b02d0e19a05c8712d1877834a3eaafe453d4"; - sha256 = "10w5194lj6s5bvwl9r9zgw479f2a1i4lx87954xymcbridbcih6y"; + rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; + sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -74746,6 +74997,27 @@ license = lib.licenses.free; }; }) {}; + zel = callPackage ({ emacs, fetchFromGitHub, fetchurl, frecency, lib, melpaBuild }: + melpaBuild { + pname = "zel"; + version = "20171014.132"; + src = fetchFromGitHub { + owner = "rudolfochrist"; + repo = "zel"; + rev = "23b12d107f123667ddd443b9f3e2047209e0055a"; + sha256 = "1m8bw588r2a1034ynigrzgab857261nrjwnzag5i3rgwn27brfcz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b48132eb4c0fd01b9fc31236c5c4701f8f83a806/recipes/zel"; + sha256 = "14qf83n1wz8hg9wfmbh8b50c5xshc28x1xq6wh4g4lfqbfm7marh"; + name = "zel"; + }; + packageRequires = [ emacs frecency ]; + meta = { + homepage = "https://melpa.org/#/zel"; + license = lib.licenses.free; + }; + }) {}; zen-and-art-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zen-and-art-theme"; @@ -74770,12 +75042,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20170511.1337"; + version = "20171010.543"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "2f31ef9a954ec08202668a8d1b004db5a05831a2"; - sha256 = "0g4vgdzpbp0l734ajd1r9lj6qylljxaazk139lhzzyvmqd5dwaf9"; + rev = "a26323ca3029d653f658b8236ae9528d242c885b"; + sha256 = "0gx6yl3bl3z7rgl4m1np8bx8b53ywbni4wi2bhc716f4b96q658x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -74853,12 +75125,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20170928.827"; + version = "20171016.59"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "248e95616304e4eb1adde458bbb59442c11d1cb9"; - sha256 = "1bckvqfid2acmn5xcxzflid7hqhflsjw51r9gws3vxb9hpj5qqyb"; + rev = "ccadcfba1a708352508d4c0857359df7425e7574"; + sha256 = "1mg1dhda9zvdinxizckvz454633lrl62a382vdm838295gvc40wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -75063,12 +75335,12 @@ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom"; - version = "20171008.1325"; + version = "20171014.811"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "a78361f6db1753ad749f5b865f2076579a276971"; - sha256 = "1c2ww8a6q64w486hb0gp18hcxvxyjjw3qpkwqkx7rfj5smy12zim"; + rev = "d36b9b5892615c3937f4a4d4bd9242f870c4bc50"; + sha256 = "0x1w35i4ckmaiqc88gdpnw6585adh851lw1wnyj4kgskdvvvz5f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; From 36bbc3cfda6ca2fa4e9dee29cda925c966cda03b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 16 Oct 2017 23:52:42 +0200 Subject: [PATCH 1259/2806] nixos/compton: improve options type-checking --- nixos/modules/services/x11/compton.nix | 69 +++++++++++++++----------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index 42ceeb81980..fcccf98c9cf 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -7,12 +7,15 @@ let cfg = config.services.compton; - configFile = let - opacityRules = optionalString (length cfg.opacityRules != 0) - (concatStringsSep "\n" - (map (a: "opacity-rule = [ \"${a}\" ];") cfg.opacityRules) - ); - in pkgs.writeText "compton.conf" + floatBetween = a: b: with lib; with types; + addCheck str (x: versionAtLeast x a && versionOlder x b); + + pairOf = x: with types; addCheck (listOf x) (y: lib.length y == 2); + + opacityRules = optionalString (length cfg.opacityRules != 0) + (concatMapStringsSep ",\n" (rule: ''"${rule}"'') cfg.opacityRules); + + configFile = pkgs.writeText "compton.conf" (optionalString cfg.fade '' # fading fading = true; @@ -36,7 +39,9 @@ let inactive-opacity = ${cfg.inactiveOpacity}; menu-opacity = ${cfg.menuOpacity}; - ${opacityRules} + opacity-rule = [ + ${opacityRules} + ]; # other options backend = ${toJSON cfg.backend}; @@ -64,7 +69,7 @@ in { }; fadeDelta = mkOption { - type = types.int; + type = types.addCheck types.int (x: x > 0); default = 10; example = 5; description = '' @@ -73,11 +78,12 @@ in { }; fadeSteps = mkOption { - type = types.listOf types.str; + type = pairOf (floatBetween "0.01" "1.01"); default = [ "0.028" "0.03" ]; example = [ "0.04" "0.04" ]; description = '' Opacity change between fade steps (in and out). + (numbers in range 0.01 - 1.0) ''; }; @@ -104,7 +110,7 @@ in { }; shadowOffsets = mkOption { - type = types.listOf types.int; + type = pairOf types.int; default = [ (-15) (-15) ]; example = [ (-10) (-15) ]; description = '' @@ -113,11 +119,11 @@ in { }; shadowOpacity = mkOption { - type = types.str; + type = floatBetween "0.0" "1.01"; default = "0.75"; example = "0.8"; description = '' - Window shadows opacity (number in range 0 - 1). + Window shadows opacity (number in range 0.0 - 1.0). ''; }; @@ -136,42 +142,46 @@ in { }; activeOpacity = mkOption { - type = types.str; + type = floatBetween "0.0" "1.01"; default = "1.0"; example = "0.8"; description = '' - Opacity of active windows. + Opacity of active windows (number in range 0.0 - 1.0). ''; }; inactiveOpacity = mkOption { - type = types.str; + type = floatBetween "0.1" "1.01"; default = "1.0"; example = "0.8"; description = '' - Opacity of inactive windows. + Opacity of inactive windows (number in range 0.1 - 1.0). ''; }; menuOpacity = mkOption { - type = types.str; + type = floatBetween "0.0" "1.01"; default = "1.0"; example = "0.8"; description = '' - Opacity of dropdown and popup menu. + Opacity of dropdown and popup menu (number in range 0.0 - 1.0). ''; }; opacityRules = mkOption { type = types.listOf types.str; default = []; + example = [ + "95:class_g = 'URxvt' && !_NET_WM_STATE@:32a" + "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'" + ]; description = '' - Opacity rules to be handled by compton. + Rules that control the opacity of windows, in format PERCENT:PATTERN. ''; }; backend = mkOption { - type = types.str; + type = types.enum [ "glx" "xrender" ]; default = "glx"; description = '' Backend to use: glx or xrender. @@ -179,17 +189,20 @@ in { }; vSync = mkOption { - type = types.str; - default = "none"; - example = "opengl-swc"; - description = '' - Enable vertical synchronization using the specified method. - See compton(1) man page available methods. - ''; + type = types.enum [ + "none" "drm" "opengl" + "opengl-oml" "opengl-swc" "opengl-mswc" + ]; + default = "none"; + example = "opengl-swc"; + description = '' + Enable vertical synchronization using the specified method. + See compton(1) man page an explanation. + ''; }; refreshRate = mkOption { - type = types.int; + type = types.addCheck types.int (x: x >= 0); default = 0; example = 60; description = '' From 3918385f29e01e0f17eaf074d4832af581e8e687 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 16 Oct 2017 23:54:10 +0200 Subject: [PATCH 1260/2806] nixos/compton: use xrender by default --- nixos/modules/services/x11/compton.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index fcccf98c9cf..8701354b528 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -182,7 +182,7 @@ in { backend = mkOption { type = types.enum [ "glx" "xrender" ]; - default = "glx"; + default = "xrender"; description = '' Backend to use: glx or xrender. ''; From 30c63ace56411bfdede7f49b65042f2bdaad1525 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Tue, 17 Oct 2017 11:57:38 +1300 Subject: [PATCH 1261/2806] kt: 11.1.0 -> 12.1.0 --- pkgs/tools/misc/kt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index 738eceb20a0..eb0f78e787a 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "kt-${version}"; - version = "11.1.0"; + version = "12.1.0"; src = fetchFromGitHub { owner = "fgeller"; repo = "kt"; rev = "v${version}"; - sha256 = "1ymygd3l5pfbnjmdjcrspj520v29hnv3bdgxpim38dpv3qj518vq"; + sha256 = "014q39bg88vg1xdq1bz6wj982zb148sip3a42hbrinh8qj41y4yg"; }; goPackagePath = "github.com/fgeller/kt"; From 5850b243ea883db4bd175a43b217d223c3883de8 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Tue, 17 Oct 2017 00:01:18 +0100 Subject: [PATCH 1262/2806] BerkeleyDB 5.3 is under the Sleepycat license, not AGPL --- pkgs/development/libraries/db/db-5.3.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index d1d3c953fc9..066eca4e63d 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,6 +3,5 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - license = stdenv.lib.licenses.agpl3; extraPatches = [ ./clang-5.3.patch ]; }) From 8ec75ae403ae5b654dbe4192da9de97d0fe4a376 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Tue, 17 Oct 2017 09:56:05 +1030 Subject: [PATCH 1263/2806] flow: 0.57.2 -> 0.57.3 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 2f9d4f48d3f..372295084d5 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.57.2"; + version = "0.57.3"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "04fqnan9m69rjwvm97p0br1wd862ldiybp0v2nqlm6giaaa691r0"; + sha256 = "0pmgj2mv4pmgw8slh4gdj7jskcgxbdsy09arh5rnwf0byy81fky6"; }; installPhase = '' From 23ea2e931f708a16eca9a8de5bb81d41bd7a47fa Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 07:04:49 +0300 Subject: [PATCH 1264/2806] boost165: init at 1.65.1 --- pkgs/development/libraries/boost/1.65.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/1.65.nix diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix new file mode 100644 index 00000000000..9837e1c6919 --- /dev/null +++ b/pkgs/development/libraries/boost/1.65.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.65.1"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_65_1.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_65_1.html + sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; + }; + +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7eb088e7447..9a1a4679309 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7776,7 +7776,8 @@ with pkgs; boost162 = callPackage ../development/libraries/boost/1.62.nix { }; boost163 = callPackage ../development/libraries/boost/1.63.nix { }; boost164 = callPackage ../development/libraries/boost/1.64.nix { }; - boost16x = boost164; + boost165 = callPackage ../development/libraries/boost/1.65.nix { }; + boost16x = boost165; boost = boost162; boost_process = callPackage ../development/libraries/boost-process { }; From b1736511cedee31dbc76bf48da1de9904d4825b7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 07:08:28 +0300 Subject: [PATCH 1265/2806] boost: make 1.65 the default --- pkgs/applications/altcoins/default.nix | 3 +-- pkgs/applications/editors/rstudio/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 +++------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 0264ce39776..1a21efc3232 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }: +{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }: rec { @@ -59,6 +59,5 @@ rec { zcash = callPackage ./zcash { withGui = false; openssl = openssl_1_1_0; - boost = boost163; }; } diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index bf8374fdaaa..80f020b6c50 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost163, zlib, openssl, +{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl, R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc }: @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { name = "RStudio-${version}"; - buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ]; + buildInputs = [ cmake boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ]; src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf16b071684..487b32526d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -645,9 +645,7 @@ with pkgs; }; aria = aria2; - aspcud = callPackage ../tools/misc/aspcud { - boost = boost163; - }; + aspcud = callPackage ../tools/misc/aspcud { }; at = callPackage ../tools/system/at { }; @@ -1402,9 +1400,7 @@ with pkgs; citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; - citra = libsForQt5.callPackage ../misc/emulators/citra { - boost = boost163; - }; + citra = libsForQt5.callPackage ../misc/emulators/citra { }; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; @@ -7826,7 +7822,7 @@ with pkgs; boost164 = callPackage ../development/libraries/boost/1.64.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; boost16x = boost165; - boost = boost162; + boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; From e2a7f508fc2e3ef665ce6a66bd9bc753dfdf13f5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 26 Sep 2017 21:23:10 +0300 Subject: [PATCH 1266/2806] rstudio: enable parallel building Also cleanup inputs. --- pkgs/applications/editors/rstudio/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 80f020b6c50..a5049e4236b 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -10,7 +10,9 @@ in stdenv.mkDerivation rec { name = "RStudio-${version}"; - buildInputs = [ cmake boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ]; + nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; + + buildInputs = [ boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid ]; src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; @@ -96,6 +98,8 @@ stdenv.mkDerivation rec { cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ ''; + enableParallelBuilding = true; + cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { From b1e499788c72f33ddacf5e7cc88b921681633c0c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 23 Sep 2017 09:54:46 +0300 Subject: [PATCH 1267/2806] boost: add numpy support Not built by default. Also add enablePython flag (enabled by default) and cleanup a bit. --- pkgs/development/libraries/boost/generic.nix | 15 +++++++++++---- pkgs/top-level/python-packages.nix | 6 ++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 22ef02023f8..3f9ae113f84 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -9,6 +9,8 @@ , enableStatic ? !enableShared , enablePIC ? false , enableExceptions ? false +, enablePython ? hostPlatform == buildPlatform +, enableNumpy ? false, numpy ? null , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , patches ? null , mpi ? null @@ -21,6 +23,9 @@ # We must build at least one type of libraries assert !enableShared -> enableStatic; +assert enablePython -> hostPlatform == buildPlatform; +assert enableNumpy -> enablePython; + with stdenv.lib; let @@ -62,7 +67,8 @@ let ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [ "link=${link}" "${cflags}" - ] ++ optional (variant == "release") "debug-symbols=off"; + ] ++ optional (variant == "release") "debug-symbols=off" + ++ optional (!enablePython) "--without-python"; nativeB2Flags = [ "-sEXPAT_INCLUDE=${expat.dev}/include" @@ -76,7 +82,6 @@ let "-sEXPAT_LIBPATH=${expat.crossDrv}/lib" "--user-config=user-config.jam" "toolset=gcc-cross" - "--without-python" ] ++ optionals (hostPlatform.libc == "msvcrt") [ "target-os=windows" "threadapi=win32" @@ -148,8 +153,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = [ expat zlib bzip2 libiconv ] - ++ stdenv.lib.optionals (hostPlatform == buildPlatform) [ python icu ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ optional (hostPlatform == buildPlatform) icu + ++ optional stdenv.isDarwin fixDarwinDylibNames + ++ optional enablePython python + ++ optional enableNumpy numpy; configureScript = "./bootstrap.sh"; configureFlags = commonConfigureFlags diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 231d5fecf6b..f7d2ce160ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1476,7 +1476,10 @@ in { # Build boost for this specific Python version # TODO: use separate output for libboost_python.so - boost = pkgs.boost.override {inherit python;}; + boost = pkgs.boost.override { + inherit (self) python numpy; + enablePython = true; + }; buttersink = buildPythonPackage rec { name = "buttersink-0.6.8"; @@ -1531,7 +1534,6 @@ in { python = self.python; boost = self.boost; numpy = self.numpy; - pythonSupport = true; }; capstone = buildPythonPackage rec { From bd87a3be2de2af63d0bd5b27e4495321362e35f1 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 16 Oct 2017 21:35:04 -0400 Subject: [PATCH 1268/2806] vagrant: Adds bash-completion to the proper folder. (#30482) --- pkgs/development/tools/vagrant/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index c61d521ecab..d37873aaaf3 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -126,6 +126,9 @@ in stdenv.mkDerivation rec { cp -r usr/bin "$out" wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxml2 libxslt ]}" \ --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib" + + install -D "opt/vagrant/embedded/gems/gems/vagrant-$version/contrib/bash/completion.sh" \ + "$out/share/bash-completion/completions/vagrant" ''; preFixup = '' From 1101eebefdb160f8743893a1a8227396e898830d Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 16 Oct 2017 10:18:18 -0400 Subject: [PATCH 1269/2806] wlc: 0.0.9 -> 0.0.10 --- pkgs/development/libraries/wlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index c67070094de..95a8603e08c 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "0.0.9"; # 0.0.10 currently causes segfaults + version = "0.0.10"; src = fetchFromGitHub { owner = "Cloudef"; repo = "wlc"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; + sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 1dc92fe688f5e5bba904b6e60dc6a47d127a0a0b Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 16 Oct 2017 21:47:59 -0400 Subject: [PATCH 1270/2806] sway: 0.13.0 -> 0.14.0 --- pkgs/applications/window-managers/sway/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 2c94f7f6fec..8de87d2e8fd 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -5,17 +5,15 @@ , libXdmcp }: -let - # TODO: Sway 0.14.0 with wlc 0.0.10 segfaults - version = "0.13.0"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "sway-${version}"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q"; + sha256 = "1l8v9cdzd44bm4q71d47vqg6933b8j42q1a61r362vz2la1rcpq2"; }; nativeBuildInputs = [ From 40f402cf653db5c9a3c8a704b25f9437e40fc033 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 16 Oct 2017 17:49:07 +0800 Subject: [PATCH 1271/2806] display-managers: Import DBUS session bus address & Xauthority in systemd user session --- nixos/modules/services/x11/display-managers/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 58773685ec1..3fa482fb672 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -92,9 +92,12 @@ let ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" ''} - # Tell systemd about our $DISPLAY. This is needed by the - # ssh-agent unit. - ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY + # Tell systemd about our $DISPLAY and $XAUTHORITY. + # This is needed by the ssh-agent unit. + # + # Also tell systemd about the dbus session bus address. + # This is required by user units using the session bus. + ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS # Load X defaults. ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} From e53785ad95b16310b1031897a674648464fe795b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 16 Oct 2017 23:00:35 -0400 Subject: [PATCH 1272/2806] proot: static by default --- pkgs/tools/system/proot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 640750b4f2d..16ee4fccce8 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , talloc, docutils -, enableStatic ? false }: +, enableStatic ? true }: stdenv.mkDerivation rec { name = "proot-${version}"; From be73e42f149a9cec8dce3d5e4fb07d5b10c30f69 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 17 Oct 2017 10:51:26 +0800 Subject: [PATCH 1273/2806] smartmontools: drive DB 4394 -> 4548 --- pkgs/tools/system/smartmontools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 26d84ae0320..6ef1f54c23b 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -4,12 +4,12 @@ let version = "6.5"; - dbrev = "4394"; + dbrev = "4548"; drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB"; driverdb = fetchurl { - url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "1kdpgbl1az0xhqn7j613cx366n7amra8xz3391jpzzrd3vlga393"; - name = "smartmontools-drivedb.h"; + url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; + sha256 = "0nwk4ir0c40b01frqm7a0lvljh5k9yhslc3j4485zjsx3v5w269f"; + name = "smartmontools-drivedb.h"; }; in stdenv.mkDerivation rec { From 2ef36f2ee58d3566374b09724d93ac8114796921 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 13:17:50 +0800 Subject: [PATCH 1274/2806] neomutt: minor cleanups - neomutt has changed the binary name so we enable "mutt" via a wrapper script with a warning - we don't have to manually run the prepare.sh script as autoreconfHook handles everything for us - doc generation was previously trying to fetch DTDs from the net --- .../mailreaders/neomutt/default.nix | 45 ++++++++++++++----- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index a6cd17878b0..d9d2f201fdc 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,7 +1,19 @@ -{ stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl +{ stdenv, fetchFromGitHub, which, autoreconfHook, writeScript, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42 }: -stdenv.mkDerivation rec { +let + muttWrapper = writeScript "mutt" '' + #!${stdenv.shell} -eu + + echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.' + echo "" + echo 'This wrapper is provided for compatibility purposes only. You should start calling `neomutt` instead.' + echo "" + read -p 'Press any key to launch NeoMutt...' -n1 -s + exec neomutt "$@" + ''; + +in stdenv.mkDerivation rec { version = "20171013"; name = "neomutt-${version}"; @@ -12,24 +24,35 @@ stdenv.mkDerivation rec { sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1"; }; - nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ]; buildInputs = [ cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ]; + + enableParallelBuilding = true; + + postPatch = '' + for f in doc/*.{xml,xsl}* ; do + substituteInPlace $f \ + --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl \ + --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd + done + ''; + configureFlags = [ "--enable-debug" "--enable-gpgme" "--enable-notmuch" - "--with-homespool=mailbox" - "--with-gss" - "--with-mailpath=" - "--with-ssl" - "--with-sasl" "--with-curses" + "--with-gss" + "--with-homespool=mailbox" "--with-idn" "--with-lmdb" + "--with-mailpath=" + "--with-sasl" + "--with-ssl" # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail "ac_cv_path_SENDMAIL=sendmail" @@ -40,9 +63,9 @@ stdenv.mkDerivation rec { # like pgpring, pgpewrap, ... NIX_LDFLAGS = "-lidn"; - configureScript = "./prepare"; - - enableParallelBuilding = true; + postInstall = '' + cp ${muttWrapper} $out/bin/mutt + ''; meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; From f68347cb26a01132aae05c7dc1925d8e5307de7f Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Tue, 17 Oct 2017 12:26:02 +0800 Subject: [PATCH 1275/2806] fastlane: 2.60.1 -> 2.61.0 --- pkgs/tools/admin/fastlane/Gemfile.lock | 6 +++--- pkgs/tools/admin/fastlane/gemset.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 5f15a9d0455..8f10ee22ddc 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -24,7 +24,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.60.1) + fastlane (2.61.0) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -103,10 +103,10 @@ GEM rouge (2.0.7) rubyzip (1.2.1) security (0.1.3) - signet (0.7.3) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) slack-notifier (1.5.1) terminal-notifier (1.8.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 0d9c1f55835..c1285e43496 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -137,10 +137,10 @@ dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sg8xh1rjigiq438knkpdq685kyw34ki3h7baj65qh9mkkc8drxy"; + sha256 = "0n73748vw7y29ycx0rjdg9zvn8xhncq07zq1l4a16n5s82rb14iy"; type = "gem"; }; - version = "2.60.1"; + version = "2.61.0"; }; gh_inspector = { source = { @@ -360,10 +360,10 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; type = "gem"; }; - version = "0.7.3"; + version = "0.8.1"; }; slack-notifier = { source = { From c800d574bfc5c173b3d248fe447c42a6aa9e817e Mon Sep 17 00:00:00 2001 From: Jun Hao Date: Sat, 14 Oct 2017 13:19:58 +0800 Subject: [PATCH 1276/2806] qt5: fix Darwin build for 5.9.2 --- .../libraries/qt-5/5.9/qtbase/default.nix | 4 +- .../5.9/qtbase/mkspecs-features-mac.patch | 66 +++++++++++-------- .../qt-5/qtbase-setup-hook-darwin.sh | 3 +- 3 files changed, 45 insertions(+), 28 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index fc5e5d39c63..418a13fc991 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation { '' substituteInPlace configure --replace /bin/pwd pwd substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i mkspecs/*/*.conf sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5Config.cmake.in sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake @@ -105,6 +105,7 @@ stdenv.mkDerivation { -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \ + -e 's|sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)|sysroot=/nonsense|' \ -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ @@ -155,6 +156,7 @@ stdenv.mkDerivation { ++ lib.optionals stdenv.isDarwin [ + "-Wno-missing-sysroot" "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090" "-D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))" # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch index 6f7baa558db..46d950a767b 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch @@ -1,7 +1,7 @@ -diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf ---- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf 2017-09-16 16:40:30.000000000 +0800 -+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf 2017-09-16 16:41:03.000000000 +0800 -@@ -24,165 +24,3 @@ +diff -u -r qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/default_post.prf qtbase-opensource-src-5.9.2/mkspecs/features/mac/default_post.prf +--- qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/default_post.prf 2017-10-14 12:31:04.000000000 +0800 ++++ qtbase-opensource-src-5.9.2/mkspecs/features/mac/default_post.prf 2017-10-14 12:42:02.000000000 +0800 +@@ -24,166 +24,3 @@ } } } @@ -164,13 +164,14 @@ diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf q -} - -cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --cache(QMAKE_XCODE_VERSION, stash) +-!isEmpty(QMAKE_XCODE_VERSION): \ +- cache(QMAKE_XCODE_VERSION, stash) - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf ---- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:30.000000000 +0800 -+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:45.000000000 +0800 -@@ -1,51 +1,2 @@ +diff -u -r qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/default_pre.prf qtbase-opensource-src-5.9.2/mkspecs/features/mac/default_pre.prf +--- qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/default_pre.prf 2017-10-14 12:31:04.000000000 +0800 ++++ qtbase-opensource-src-5.9.2/mkspecs/features/mac/default_pre.prf 2017-10-14 12:42:02.000000000 +0800 +@@ -1,56 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) - @@ -183,18 +184,23 @@ diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf qt - # Make sure Xcode path is valid - !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode is set up properly -- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ -- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") -} - --isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) +-isEmpty(QMAKE_XCODEBUILD_PATH): \ +- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") +- +-!isEmpty(QMAKE_XCODEBUILD_PATH) { +- # Make sure Xcode is set up properly +- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ +- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") +- +- isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +- } -} - -isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { @@ -222,10 +228,10 @@ diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf qt -# feature, which allows Xcode to choose the Qt libraries to link to -# at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf ---- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf 2017-09-16 16:40:30.000000000 +0800 -+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf 2017-09-16 16:41:16.000000000 +0800 -@@ -1,49 +0,0 @@ +diff -u -r qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/sdk.prf qtbase-opensource-src-5.9.2/mkspecs/features/mac/sdk.prf +--- qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/sdk.prf 2017-10-14 12:31:04.000000000 +0800 ++++ qtbase-opensource-src-5.9.2/mkspecs/features/mac/sdk.prf 2017-10-14 12:42:10.000000000 +0800 +@@ -1,58 +0,0 @@ - -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") @@ -235,13 +241,22 @@ diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf qtbase-ope - -defineReplace(xcodeSDKInfo) { - info = $$1 +- equals(info, "Path"): \ +- info = --show-sdk-path +- equals(info, "PlatformPath"): \ +- info = --show-sdk-platform-path +- equals(info, "SDKVersion"): \ +- info = --show-sdk-version - sdk = $$2 - isEmpty(sdk): \ - sdk = $$QMAKE_MAC_SDK - - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null") -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'") +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") +- # --show-sdk-platform-path won't work for Command Line Tools; this is fine +- # only used by the XCTest backend to testlib +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ +- error("Could not resolve SDK $$info for \'$$sdk\'") - cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) - } - @@ -275,4 +290,3 @@ diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf qtbase-ope - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} -Common subdirectories: qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/unsupported and qtbase-opensource-src-5.9.1/mkspecs/features/mac/unsupported diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh index 4458e18a454..ce1dada0c47 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh @@ -182,7 +182,8 @@ _qtFixCMakePaths() { find "${!outputLib}" -name "*.cmake" | while read file; do substituteInPlace "$file" \ --subst-var-by NIX_OUT "${!outputLib}" \ - --subst-var-by NIX_DEV "${!outputDev}" + --subst-var-by NIX_DEV "${!outputDev}" \ + --subst-var-by NIX_BIN "${!outputBin}" done } From 26891c576ca8b9f2a2d06db5f00c333cccee0851 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Oct 2017 01:28:08 -0500 Subject: [PATCH 1277/2806] nixpkgs: gtkwave 3.3.70 -> 3.3.86 Signed-off-by: Austin Seipp --- .../science/electronics/gtkwave/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 62d920d929a..e866b947fbc 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,12 @@ {stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: + stdenv.mkDerivation rec { - name = "gtkwave-3.3.70"; + name = "gtkwave-${version}"; + version = "3.3.86"; src = fetchurl { - url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz"; + url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; + sha256 = "1l1hikhhk7drkbpdmj9qg7c3lj1b86z7f5rnwagrql8bss2j80fx"; }; nativeBuildInputs = [ pkgconfig ]; @@ -13,10 +15,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; meta = { - description = "Wave viewer for Unix and Win32"; - homepage = http://gtkwave.sourceforge.net; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + description = "VCD/Waveform viewer for Unix and Win32"; + homepage = http://gtkwave.sourceforge.net; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice viric ]; + platforms = stdenv.lib.platforms.linux; }; } From b367d0ff106f45ed48bf370a16485062cb144580 Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Tue, 17 Oct 2017 09:36:03 +0300 Subject: [PATCH 1278/2806] qutebrowser: 1.0.1 -> 1.0.2 --- 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 a94b0973949..da3c826adcd 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -29,12 +29,12 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "1.0.1"; + version = "1.0.2"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1gphn8a0xfy5iqiznvgd6fbbzp7r5sp697ayfwnvllvmbr5az9vs"; + sha256 = "093nmvl9x3ykrpmvnmx98g9npg4wmq0mmf7qzgbzmg93dnyq2cpk"; }; # Needs tox From 182b357c9de1ac94811c5893869cd842635e8764 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 10 Oct 2017 04:36:42 +0000 Subject: [PATCH 1279/2806] ocamlPackages.camlp5: 7.01 -> 7.02 --- pkgs/development/tools/ocaml/camlp5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 648ec965d35..e5c79f534b0 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-7.01"; + name = "camlp5${if transitional then "_transitional" else ""}-7.02"; src = fetchzip { - url = https://github.com/camlp5/camlp5/archive/rel701.tar.gz; - sha256 = "1gxhj7y30f1hbcqnqgg80wz0ymbslsfh09kl2kiackp49fywl606"; + url = https://github.com/camlp5/camlp5/archive/rel702.tar.gz; + sha256 = "1m2d55zrgllidhgslvzgmr27f56qzdahz2sv56bvjs3bg7grmhnc"; }; buildInputs = [ ocaml ]; From 79570676225ca13db028fed86de419f9183840c6 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Tue, 17 Oct 2017 09:03:41 +0200 Subject: [PATCH 1280/2806] axel: 2.14.1 -> 2.15 --- pkgs/tools/networking/axel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 99c225ec259..b19d4cca315 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.14.1"; + version = "2.15"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "0fayfpyc9cs6yp474400nyjbix6aywicz6pw17rzm4m7k06q5xmc"; + sha256 = "0wm16s129615i7rw48422q3x3ixr4v2p9942p0s6qk2fjlc3y8hf"; }; nativeBuildInputs = [ autoreconfHook ]; From 9805818d2443ea663408561a82defb195b073dca Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 17 Oct 2017 09:57:19 +0200 Subject: [PATCH 1281/2806] nix-info: fix nixpkgs tarball evaluation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit error: while evaluating the attribute ‘darwin-tested’ at /build/git-export/lib/attrsets.nix:199:44: [..] while evaluating the attribute ‘nix-info.x86_64-darwin’ at /build/git-export/lib/attrsets.nix:199:44: attribute ‘x86_64-darwin’ missing, at /build/git-export/pkgs/top-level/release.nix:50:15 --- pkgs/tools/nix/info/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index 756478dccb7..1e6aef04f6d 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -34,4 +34,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp ./nix-info $out/bin/nix-info ''; + + meta = { + platforms = lib.platforms.all; + }; } From ef198c93a86ffbf8f91103125b7ecc73fe2c6fcb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 17 Oct 2017 06:02:40 -0200 Subject: [PATCH 1282/2806] higan: 104 -> 105 --- .../emulators/higan/0001-change-flags.diff | 35 ++++++++++--------- pkgs/misc/emulators/higan/default.nix | 9 ++--- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/misc/emulators/higan/0001-change-flags.diff b/pkgs/misc/emulators/higan/0001-change-flags.diff index 1ac1b1360b2..5821a9c130b 100644 --- a/pkgs/misc/emulators/higan/0001-change-flags.diff +++ b/pkgs/misc/emulators/higan/0001-change-flags.diff @@ -1,23 +1,26 @@ -diff -rupN higan_v097-source.old/higan/GNUmakefile higan_v097-source/higan/GNUmakefile ---- higan_v097-source.old/higan/GNUmakefile 2016-01-24 09:21:45.822940200 +0100 -+++ higan_v097-source/higan/GNUmakefile 2016-01-24 09:24:03.028722500 +0100 -@@ -36,7 +36,7 @@ ifeq ($(platform),windows) - else ifeq ($(platform),macosx) - flags += -march=native - else ifneq ($(filter $(platform),linux bsd),) -- flags += -march=native -fopenmp -+ flags += -fopenmp +diff -Naur higan_v105-source.old/higan/GNUmakefile higan_v105-source.new/higan/GNUmakefile +--- higan_v105-source.old/higan/GNUmakefile 2017-10-07 01:34:22.000000000 -0300 ++++ higan_v105-source.new/higan/GNUmakefile 2017-10-17 00:02:40.580957396 -0200 +@@ -26,7 +26,7 @@ + flags += -fopenmp link += -fopenmp - link += -Wl,-export-dynamic - link += -lX11 -lXext -diff -rupN higan_v097-source.old/nall/GNUmakefile higan_v097-source/nall/GNUmakefile ---- higan_v097-source.old/nall/GNUmakefile 2016-01-24 09:21:46.021749600 +0100 -+++ higan_v097-source/nall/GNUmakefile 2016-01-24 09:25:06.347100800 +0100 -@@ -40,8 +40,8 @@ cflags := -x c -std=c99 - objcflags := -x objective-c -std=c99 + ifeq ($(binary),application) +- flags += -march=native ++ flags += + link += -Wl,-export-dynamic + link += -lX11 -lXext + else ifeq ($(binary),library) +diff -Naur higan_v105-source.old/nall/GNUmakefile higan_v105-source.new/nall/GNUmakefile +--- higan_v105-source.old/nall/GNUmakefile 2017-09-23 18:34:22.000000000 -0300 ++++ higan_v105-source.new/nall/GNUmakefile 2017-10-17 00:03:33.568916550 -0200 +@@ -40,8 +40,8 @@ + objcflags := -x objective-c -std=c11 cppflags := -x c++ -std=c++14 objcppflags := -x objective-c++ -std=c++14 -flags := -link := +flags := $(CXXFLAGS) +link := $(LDFLAGS) + + # compiler detection + ifeq ($(compiler),) diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index f055c8ed088..75331e0e09a 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "higan-${version}"; - version = "104"; + version = "105"; sourceName = "higan_v${version}-source"; src = fetchurl { urls = [ "http://download.byuu.org/${sourceName}.7z" ]; - sha256 = "0i2ma8zjjxadq4368n4m41vhmrb62na6s7pi219ajdsb96x0091l"; + sha256 = "1lpj345vlnwcywhzq1fzxwl08zc2x4d103rgyyp7yw8m0f8f9sdl"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; @@ -81,8 +81,3 @@ stdenv.mkDerivation rec { platforms = with platforms; unix; }; } - -# -# TODO: -# - fix the BML and BIOS paths - maybe submitting -# a custom patch to upstream would not be a bad idea... From b59013249edd23870197b3da854a90b572733c8e Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Tue, 17 Oct 2017 01:10:42 -0700 Subject: [PATCH 1283/2806] strongswan: enable openssl plugin (#30494) The NIST elliptic curve groups (ecp192 etc.) are only available if the OpenSSL plugin is enabled, and these groups are currently the only EC groups supported on iOS and macOS devices. --- pkgs/tools/networking/strongswan/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 0671b7d0089..641e1238872 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-swanctl" "--enable-cmd" "--enable-systemd" "--enable-farp" "--enable-dhcp" + "--enable-openssl" "--enable-eap-sim" "--enable-eap-sim-file" "--enable-eap-simaka-pseudonym" "--enable-eap-simaka-reauth" "--enable-eap-identity" "--enable-eap-md5" "--enable-eap-gtc" "--enable-eap-aka" "--enable-eap-aka-3gpp2" @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" ++ stdenv.lib.optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" - "--enable-curl" "--enable-openssl" + "--enable-curl" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation" "--enable-tnc-imv" "--enable-imv-attestation" From c4088dd0afc1edfe024bdc84b0ef1969b6556fce Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 16 Oct 2017 14:30:36 +0200 Subject: [PATCH 1284/2806] nixos/resolved: clean up option descriptions Also change LLMNR RFC to the correct id 4795. --- nixos/modules/system/boot/resolved.nix | 72 ++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 9 deletions(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index a3fb733c289..2147d43c4f1 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -31,8 +31,15 @@ in example = [ "example.com" ]; type = types.listOf types.str; description = '' - A list of domains. These domains are used as search suffixes when resolving single-label host names (domain names which contain no dot), in order to qualify them into fully-qualified domain names (FQDNs). - For compatibility reasons, if this setting is not specified, the search domains listed in /etc/resolv.conf are used instead, if that file exists and any domains are configured in it. + A list of domains. These domains are used as search suffixes + when resolving single-label host names (domain names which + contain no dot), in order to qualify them into fully-qualified + domain names (FQDNs). + + For compatibility reasons, if this setting is not specified, + the search domains listed in + /etc/resolv.conf are used instead, if + that file exists and any domains are configured in it. ''; }; @@ -41,10 +48,30 @@ in example = "false"; type = types.enum [ "true" "resolve" "false" ]; description = '' - Controls Link-Local Multicast Name Resolution support (RFC 4794) on the local host. - If true, enables full LLMNR responder and resolver support. - If false, disables both. - If set to "resolve", only resolution support is enabled, but responding is disabled. + Controls Link-Local Multicast Name Resolution support + (RFC 4795) on the local host. + + If set to + + + "true" + + Enables full LLMNR responder and resolver support. + + + + "false" + + Disables both. + + + + "resolve" + + Only resolution support is enabled, but responding is disabled. + + + ''; }; @@ -53,9 +80,36 @@ in example = "true"; type = types.enum [ "true" "allow-downgrade" "false" ]; description = '' - If true all DNS lookups are DNSSEC-validated locally (excluding LLMNR and Multicast DNS). Note that this mode requires a DNS server that supports DNSSEC. If the DNS server does not properly support DNSSEC all validations will fail. - If set to "allow-downgrade" DNSSEC validation is attempted, but if the server does not support DNSSEC properly, DNSSEC mode is automatically disabled. Note that this mode makes DNSSEC validation vulnerable to "downgrade" attacks, where an attacker might be able to trigger a downgrade to non-DNSSEC mode by synthesizing a DNS response that suggests DNSSEC was not supported. - If set to false, DNS lookups are not DNSSEC validated. + If set to + + + "true" + + all DNS lookups are DNSSEC-validated locally (excluding + LLMNR and Multicast DNS). Note that this mode requires a + DNS server that supports DNSSEC. If the DNS server does + not properly support DNSSEC all validations will fail. + + + + "allow-downgrade" + + DNSSEC validation is attempted, but if the server does not + support DNSSEC properly, DNSSEC mode is automatically + disabled. Note that this mode makes DNSSEC validation + vulnerable to "downgrade" attacks, where an attacker might + be able to trigger a downgrade to non-DNSSEC mode by + synthesizing a DNS response that suggests DNSSEC was not + supported. + + + + "false" + + DNS lookups are not DNSSEC validated. + + + ''; }; From 85a1c9e8674ac4bdfb43b5e59b097cb91bb022c6 Mon Sep 17 00:00:00 2001 From: lewo Date: Tue, 17 Oct 2017 10:37:20 +0200 Subject: [PATCH 1285/2806] bgpdump: init at 2017-09-29 (#30461) * bgpdump: init at 2017-09-29 * bgpdump: switch to autoreconfHook --- pkgs/tools/networking/bgpdump/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/networking/bgpdump/default.nix diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix new file mode 100644 index 00000000000..55b168a21ae --- /dev/null +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip, autoreconfHook, zlib, bzip2 }: + +stdenv.mkDerivation rec { + name = "bgpdump-2017-09-29"; + + src = fetchzip { + url = "https://bitbucket.org/ripencc/bgpdump/get/94a0e724b335.zip"; + sha256 = "09g9vz2zc4nyzl669w1j7fxw21ifja6dxbp0xbqh6n7w3gpx2g88"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib bzip2 ]; + + meta = { + homepage = https://bitbucket.org/ripencc/bgpdump/wiki/Home; + description = ''Analyze dump files produced by Zebra/Quagga or MRT''; + license = stdenv.lib.licenses.hpnd; + maintainers = with stdenv.lib.maintainers; [ lewo ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2f7d462a9f..0d63e6286c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13814,6 +13814,8 @@ with pkgs; inherit (gnome2) zenity; }; + bgpdump = callPackage ../tools/networking/bgpdump { }; + blackbox = callPackage ../applications/version-management/blackbox { }; bleachbit = callPackage ../applications/misc/bleachbit { }; From b6b4783ca8e69fbedc1ce8f1688d06953d9f94b5 Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Tue, 17 Oct 2017 12:48:17 +0200 Subject: [PATCH 1286/2806] tribler: 7.0.0-rc2 -> 7.0.0-rc3 --- pkgs/applications/networking/p2p/tribler/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index e5c0e30bce3..9d26a74f8bb 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -4,12 +4,11 @@ stdenv.mkDerivation rec { pname = "tribler"; name = "${pname}-${version}"; - version = "7.0.0-rc2"; - revision = "1d3ddb8"; + version = "7.0.0-rc3"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0wlv32cw52c5khnrm218dccgn2l177933p4dhp7m50hipqfb0ly2"; + sha256 = "0f1f8mzbk1ygkh8lv9y1s9mvslv12d94mxvmp3b4s2vm8w4syza7"; }; buildInputs = [ @@ -40,6 +39,8 @@ stdenv.mkDerivation rec { pythonPackages.decorator pythonPackages.feedparser pythonPackages.service-identity + pythonPackages.psutil + pythonPackages.meliae ]; postPatch = '' From c2dcde845082823f3d5e45bf279fc823ec75e641 Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Tue, 17 Oct 2017 13:45:52 +0200 Subject: [PATCH 1287/2806] snd: 16.9 -> 17.8 --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index da76d7f16db..1932ec3d93b 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-16.9"; + name = "snd-17.8"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1rw9wrj1f0g413ya32s9mwhvv3c6iasjza22irzf6xlv49b9s5dp"; + sha256 = "161bx2xgz692iqmsmhv9yi8rvd7y31si4rniizwirwz7q4y4vwvf"; }; nativeBuildInputs = [ pkgconfig ]; From a060b850f68906e8a5928aa24398a5d4ec76361f Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 16 Oct 2017 15:14:33 +0900 Subject: [PATCH 1288/2806] flashplayer: 27.0.0.159 -> 27.0.0.170 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 24ab054e0a6..f7cbf518732 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "27.0.0.159"; + version = "27.0.0.170"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "00nbn8nv6irsak05cwlx9x8q0n91kbjxnkdg4c66ilx2gq5wrz05"; + sha256 = "191gqgpsl5dl39m04mm5bkkbv5m5npg91anbwsvzb29cs2yqq95m"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index f26e815764f..5034053a734 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "27.0.0.159"; + version = "27.0.0.170"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0fgz1aszihjrxpzyrs29wr11imfgnyfb2ca9c1i3n6k9wpwv926p" + "018dx7vpl8ha5c7wlcvh422ll5f0zb9cb77cmylbai84dwb9wrvg" else - "052dx764b6cfbc7mkxckcr3hbwd5b7l98cp3jqmddkllv4w4h6dp" + "09qd15khv914xcr9c4vy770mm33bl6szfy334ddb5gv6dh6h2gd8" else if arch == "x86_64" then - "1p136zn059hp59j0llk7rfsybjx51qjz2h5sd4xl8zqbs0szynid" + "0hyc25ygxrp8k0w1xmg5wx1d2l959glc23bjswf30agwlpyn2rwn" else - "06l8rjnhpqip6ikc97rf3zsgmy381q4wgzyl9rsjwlvhpgqdlhrl"; + "1jsq8lgs4jvplwkkb2pngnr7vq9xv9knajk2247qpraq51fq2vd0"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 4d52047f16c..9d64827df4a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "27.0.0.159"; + version = "27.0.0.170"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0h9jpkdkf4kvr2sg61r6pkwcdyf4z3qdj0nlnm27whac9w56jjpj" + "1mz1sxg9wvkgpcwmvbgn1s8x01lx9vkm7wbldfn66j230yrx2mlh" else - "013a0ar5afm62bk7f4s89235bx36n75z65b3afv941jajijiacc9"; + "1ysdl7j7d9fqy509wz0gq2sray08j1v3bv9zwd6nzplgd60qdrva"; }; nativeBuildInputs = [ unzip ]; From b304695c7fe616fa29f845af7597d4b419330b64 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Oct 2017 06:11:00 -0500 Subject: [PATCH 1289/2806] arachne-pnr: fix stupid install error, enable parallelism Signed-off-by: Austin Seipp --- pkgs/development/compilers/arachne-pnr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 0a0f8bbf082..17f068c1c6f 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1wszcx6hgw4q4r778zswrlwdwvwxq834bkajck8w9yfqwxs9lmq8"; }; + enableParallelBuilding = true; makeFlags = - [ "DESTDIR=$(out)" "ICEBOX=${icestorm}/share/icebox" + [ "PREFIX=$(out)" "ICEBOX=${icestorm}/share/icebox" ]; meta = { From 603ba57e279a1fdecc5881ce79c98ca97fa6b57e Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Tue, 17 Oct 2017 17:43:48 +0300 Subject: [PATCH 1290/2806] hyper: 1.4.3 -> 1.4.8 --- pkgs/applications/misc/hyper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 3c9eeac891d..9349c07a62e 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -12,11 +12,11 @@ let ]; in stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.4.8"; name = "hyper-${version}"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; - sha256 = "0f0qxhvwwcpsjnv1rgmdzdl5jwfprnd7fjnd6sb8liq250pij3ld"; + sha256 = "0v31z3p5h3qr8likifbq9kk08fpfyf8g1hrz6f6v90z4b2yhkf51"; }; buildInputs = [ dpkg ]; unpackPhase = '' From 34d80d75fc4ccfe985feb88cac10f162940a109c Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Tue, 17 Oct 2017 16:04:29 +0100 Subject: [PATCH 1291/2806] nixpkgs manual: remove reference to now defunct nixpkgs monitor --- doc/introduction.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/introduction.md b/doc/introduction.md index 96a5571b426..8b03221c64b 100644 --- a/doc/introduction.md +++ b/doc/introduction.md @@ -48,6 +48,4 @@ The binaries are made available via a [binary cache](https://cache.nixos.org). The current Nix expressions of the channels are available in the [`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository, -which has branches corresponding to the available channels. There is also the -[Nixpkgs Monitor](http://monitor.nixos.org) which keeps track of updates -and security vulnerabilities. +which has branches corresponding to the available channels. From 2348c6ce566429b83ba5ba8ba821fb3bd23d8989 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Tue, 17 Oct 2017 17:13:23 +0200 Subject: [PATCH 1292/2806] opensubdiv: fix glew paths Include and lib are not in ${glew} but in ${glew.dev}. This changes what is found by the cmake of opensubdiv and some features are now enabled, such as OpenGL 4.2 support. --- pkgs/development/libraries/opensubdiv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index ef979996a47..442a8444942 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -28,8 +28,8 @@ [ "-DNO_TUTORIALS=1" "-DNO_REGRESSION=1" "-DNO_EXAMPLES=1" - "-DGLEW_INCLUDE_DIR=${glew}/include" - "-DGLEW_LIBRARY=${glew}/lib" + "-DGLEW_INCLUDE_DIR=${glew.dev}/include" + "-DGLEW_LIBRARY=${glew.dev}/lib" ]; enableParallelBuilding = true; From e866bb421a9c21d8d0b7aa27febe402536dbb90b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 17 Oct 2017 16:42:46 +0300 Subject: [PATCH 1293/2806] nix-info: Disable doCheck by default ShellCheck depends on GHC which is quite a large package to have in the build-time closure of all NixOS systems. --- pkgs/tools/nix/info/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index 1e6aef04f6d..e60c4eecbaf 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -1,9 +1,12 @@ -{ stdenv, lib, coreutils, findutils, gnugrep, darwin, shellcheck }: +{ stdenv, lib, coreutils, findutils, gnugrep, darwin, shellcheck +, doCheck ? false # Avoid having GHC in the build-time closure of all NixOS configuratinos +}: + stdenv.mkDerivation { name = "nix-info"; src = ./info.sh; - buildInputs = [ + nativeBuildInputs = lib.optionals doCheck [ shellcheck ]; @@ -25,7 +28,7 @@ stdenv.mkDerivation { substituteAllInPlace ./nix-info ''; - doCheck = true; + inherit doCheck; checkPhase = '' shellcheck ./nix-info ''; From 0dd2ebc518c36f2dbf163d0d651777743b44b440 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 17 Oct 2017 16:51:51 +0300 Subject: [PATCH 1294/2806] nix-info: Add separate tested variant for Hydra --- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/release.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d63e6286c8..7a32a338042 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19159,6 +19159,7 @@ with pkgs; nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; nix-info = callPackage ../tools/nix/info { }; + nix-info-tested = callPackage ../tools/nix/info { doCheck = true; }; nix-index = callPackage ../tools/package-management/nix-index { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 952b1e8927e..8cbb7063b4e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -48,6 +48,7 @@ let jobs.nix.x86_64-darwin jobs.nox.x86_64-darwin jobs.nix-info.x86_64-darwin + jobs.nix-info-tested.x86_64-darwin jobs.openssh.x86_64-darwin jobs.openssl.x86_64-darwin jobs.postgresql.x86_64-darwin @@ -92,6 +93,8 @@ let # Needed for support jobs.nix-info.x86_64-linux jobs.nix-info.x86_64-darwin + jobs.nix-info-tested.x86_64-linux + jobs.nix-info-tested.x86_64-darwin # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux # Ensure that basic stuff works on darwin From 69607d76626ae006aee19433247d77870565f27e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 17 Oct 2017 13:59:44 -0400 Subject: [PATCH 1295/2806] nixUnstable: Bump for fetchgit fixes --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ac697be555a..de6c1178221 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5650_1dd29d7a"; + suffix = "pre5655_cbc21691"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "1dd29d7aebae706f3e90a18bbfae727f2ed03c70"; - sha256 = "182v2rczm8al1ggbaca8qapvrjyp21li1fd3fiwr5nqgazgr5308"; + rev = "cbc216911dbda23c3bc050c969bc725fe60760ef"; + sha256 = "0ynnk2m2n5pjmhy5gry90dy5k2wwy29v2wnq6zz32ak9zwz36x8r"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; From 08075d57e853a6b6ba71e64d4da5295e1c6aed4f Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 18 Oct 2017 03:13:23 +0900 Subject: [PATCH 1296/2806] oraclejdk: 8u144 -> 8u151, 8u152 --- pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 6 +++--- pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 0d12b3ac89b..f8f37160a26 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "144"; + patchVersion = "151"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32"; - sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8"; + sha256_i686 = "0w1snn9hxwvdnk77frhdzbsm6v30v99dy5zmpy8ij7yxd57z6ql0"; + sha256_x86_64 = "0zq2dxbxmshz080yskhc8y2wbqi0y0kl9girxjbb4rwk837010n7"; sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 0d12b3ac89b..863621bf6b0 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "144"; + patchVersion = "152"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32"; - sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8"; + sha256_i686 = "0gjc7kcfx40f43z1w1qsn1fqxdz8d46wml2g11qgm55ishhv2q7w"; + sha256_x86_64 = "1gv1348hrgna9l3sssv3g9jzs37y1lkx05xq83chav9z1hs3p2r1"; sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; From 4a10878d0df7bae53badb6961205dec85d6e15e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Oct 2017 08:53:13 +0200 Subject: [PATCH 1297/2806] LTS Haskell 9.9 --- .../configuration-hackage2nix.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 482d7579615..82e48f37f66 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.8 + # LTS Haskell 9.9 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -191,7 +191,7 @@ default-package-overrides: - async-dejafu ==0.1.3.0 - async-extra ==0.2.0.0 - async-refresh ==0.2.0.2 - - async-refresh-tokens ==0.3.0.0 + - async-refresh-tokens ==0.3.0.1 - async-timer ==0.1.4.0 - atom-basic ==0.2.5 - atom-conduit ==0.4.0.3 @@ -225,7 +225,7 @@ default-package-overrides: - base64-bytestring ==1.0.0.1 - base64-string ==0.2 - base-compat ==0.9.3 - - basement ==0.0.2 + - basement ==0.0.3 - base-noprelude ==4.9.1.0 - base-orphans ==0.6 - base-prelude ==1.2.0.1 @@ -730,7 +730,7 @@ default-package-overrides: - forma ==0.2.0 - format-numbers ==0.1.0.0 - formatting ==6.2.5 - - foundation ==0.0.15 + - foundation ==0.0.16 - Frames ==0.1.9 - free ==4.12.4 - freenect ==1.2.1 @@ -773,7 +773,7 @@ default-package-overrides: - ghc-tcplugins-extra ==0.2.1 - ghc-typelits-extra ==0.2.3 - ghc-typelits-knownnat ==0.3.1 - - ghc-typelits-natnormalise ==0.5.3 + - ghc-typelits-natnormalise ==0.5.4 - gi-atk ==2.0.14 - gi-cairo ==1.0.14 - gi-gdk ==3.0.14 @@ -962,7 +962,7 @@ default-package-overrides: - happstack-jmacro ==7.0.12 - happstack-server ==7.4.6.4 - happstack-server-tls ==7.1.6.4 - - happy ==1.19.7 + - happy ==1.19.8 - harp ==0.4.3 - hasbolt ==0.1.3.0 - hashable ==1.2.6.1 @@ -995,11 +995,11 @@ default-package-overrides: - haskell-tools-refactor ==0.8.1.0 - haskell-tools-rewrite ==0.8.1.0 - haskintex ==0.7.0.1 - - hasmin ==0.3.2.4 + - hasmin ==0.3.3 - hasql ==0.19.18.2 - hasql-migration ==0.1.3 - hasql-pool ==0.4.1 - - hasql-transaction ==0.5 + - hasql-transaction ==0.5.1 - hastache ==0.6.1 - hasty-hamiltonian ==1.3.0 - HaTeX ==3.17.3.1 @@ -1692,7 +1692,7 @@ default-package-overrides: - postgresql-simple ==0.5.3.0 - postgresql-simple-migration ==0.1.11.0 - postgresql-simple-opts ==0.2.0.2 - - postgresql-simple-queue ==0.5.0.1 + - postgresql-simple-queue ==0.5.1.1 - postgresql-simple-url ==0.2.0.0 - postgresql-transactional ==1.1.1 - postgresql-typed ==0.5.1 @@ -1851,7 +1851,7 @@ default-package-overrides: - rest-wai ==0.2.0.1 - result ==0.2.6.0 - rethinkdb ==2.2.0.10 - - rethinkdb-client-driver ==0.0.24 + - rethinkdb-client-driver ==0.0.25 - retry ==0.7.4.2 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 @@ -2326,7 +2326,7 @@ default-package-overrides: - versions ==3.1.1 - vhd ==0.2.2 - ViennaRNAParser ==1.3.2 - - viewprof ==0.0.0.9 + - viewprof ==0.0.0.10 - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - void ==0.7.2 From 3f9568a33ae5a507db9b66da9042f91b24fe3778 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Oct 2017 11:53:58 +0200 Subject: [PATCH 1298/2806] hackage2nix: disable broken builds --- .../configuration-hackage2nix.yaml | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 82e48f37f66..360f86f340e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3497,6 +3497,9 @@ dont-distribute-packages: collections: [ i686-linux, x86_64-linux, x86_64-darwin ] colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] + colorless-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + colorless-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] + colorless: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3940,6 +3943,7 @@ dont-distribute-packages: docker: [ i686-linux, x86_64-linux, x86_64-darwin ] dockercook: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] + doctest-driver-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] docvim: [ i686-linux, x86_64-linux, x86_64-darwin ] DOH: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4295,6 +4299,7 @@ dont-distribute-packages: fordo: [ i686-linux, x86_64-linux, x86_64-darwin ] forecast-io: [ i686-linux, x86_64-linux, x86_64-darwin ] foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ] + forest-fire: [ i686-linux, x86_64-linux, x86_64-darwin ] forger: [ i686-linux, x86_64-linux, x86_64-darwin ] forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] ForkableT: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4553,7 +4558,9 @@ dont-distribute-packages: goatee: [ i686-linux, x86_64-linux, x86_64-darwin ] gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-games: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-youtube: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4603,6 +4610,7 @@ dont-distribute-packages: graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] graphite: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphql-api: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4655,7 +4663,8 @@ dont-distribute-packages: GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkrsync: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtksourceview3: [ "x86_64-darwin" ] + gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtksourceview3: [ i686-linux, x86_64-linux, x86_64-darwin ] guarded-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] guid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4724,6 +4733,7 @@ dont-distribute-packages: hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-shortcode: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5018,6 +5028,7 @@ dont-distribute-packages: herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ] hesh: [ i686-linux, x86_64-linux, x86_64-darwin ] hesql: [ i686-linux, x86_64-linux, x86_64-darwin ] + heterolist: [ i686-linux, x86_64-linux, x86_64-darwin ] hetris: [ i686-linux, x86_64-linux, x86_64-darwin ] heukarya: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6019,6 +6030,7 @@ dont-distribute-packages: log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-warper: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log: [ i686-linux, x86_64-linux, x86_64-darwin ] logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6073,6 +6085,7 @@ dont-distribute-packages: lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] + lxd-client-config: [ i686-linux, x86_64-linux, x86_64-darwin ] lxd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6195,6 +6208,7 @@ dont-distribute-packages: Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] metronome: [ i686-linux, x86_64-linux, x86_64-darwin ] + mezzo: [ i686-linux, x86_64-linux, x86_64-darwin ] mezzolens: [ i686-linux, x86_64-linux, x86_64-darwin ] mgeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6425,6 +6439,7 @@ dont-distribute-packages: neet: [ i686-linux, x86_64-linux, x86_64-darwin ] nehe-tuts: [ i686-linux, x86_64-linux, x86_64-darwin ] neither: [ i686-linux, x86_64-linux, x86_64-darwin ] + neko-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] Neks: [ i686-linux, x86_64-linux, x86_64-darwin ] nemesis-titan: [ i686-linux, x86_64-linux, x86_64-darwin ] nerf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6855,6 +6870,7 @@ dont-distribute-packages: posix-timer: [ "x86_64-darwin" ] posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgres-embedded: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-named: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7036,6 +7052,7 @@ dont-distribute-packages: rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] raketka: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] + rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] raml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7109,6 +7126,7 @@ dont-distribute-packages: record: [ i686-linux, x86_64-linux, x86_64-darwin ] records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] + recursion-schemes-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] recursors: [ i686-linux, x86_64-linux, x86_64-darwin ] reddit: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7252,6 +7270,7 @@ dont-distribute-packages: robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ] roc-cluster-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] roc-cluster: [ i686-linux, x86_64-linux, x86_64-darwin ] + rocksdb-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7410,6 +7429,7 @@ dont-distribute-packages: seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] sequor: [ i686-linux, x86_64-linux, x86_64-darwin ] + serokell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] serpentine: [ i686-linux, x86_64-linux, x86_64-darwin ] serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] serv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7422,6 +7442,7 @@ dont-distribute-packages: servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-token-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7436,6 +7457,7 @@ dont-distribute-packages: servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-rawm: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7671,6 +7693,7 @@ dont-distribute-packages: spata: [ i686-linux, x86_64-linux, x86_64-darwin ] special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + species: [ i686-linux, x86_64-linux, x86_64-darwin ] speculate: [ "x86_64-darwin" ] spelling-suggest: [ i686-linux, x86_64-linux, x86_64-darwin ] sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7957,6 +7980,7 @@ dont-distribute-packages: tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] texbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8142,6 +8166,7 @@ dont-distribute-packages: tx: [ i686-linux, x86_64-linux, x86_64-darwin ] txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] + tyfam-witnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8615,6 +8640,7 @@ dont-distribute-packages: yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-dynamic-configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-frontend-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-monokai: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] From e8733f5919c111cc1c9886814d23a885b211380c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Oct 2017 03:00:31 +0200 Subject: [PATCH 1299/2806] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.6-11-g74d58ee from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/b460814f240a7b9a1ca0e06a7055f8cfd410c438. --- .../haskell-modules/hackage-packages.nix | 1110 ++++++++++++----- 1 file changed, 780 insertions(+), 330 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f0fcff013a2..a59b296b8f3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -20049,10 +20049,8 @@ self: { }: mkDerivation { pname = "accelerate-io"; - version = "1.0.0.0"; - sha256 = "0h5nr0n1cdch20ld7s7mchr7wciasac4rmf4w2z61a48nj2knayi"; - revision = "1"; - editedCabalFile = "0k8zwri66bsjiarmp0s4lvv67ja8ip8qg5kzhzw17n22m21ww0dq"; + version = "1.0.0.1"; + sha256 = "1q3l4k4h6p8y9w6qzxjanm5ww3ncz236fna2kqdqndyv18b8v9pm"; libraryHaskellDepends = [ accelerate array base bmp bytestring repa vector ]; @@ -20072,6 +20070,8 @@ self: { pname = "accelerate-llvm"; version = "1.1.0.0"; sha256 = "1x42gaafdm998k3x9qfpv8qb5jn7mh5h8rim3ywaj5cm9fk280qw"; + revision = "1"; + editedCabalFile = "1h26kcajp26w72fhl31i3bagdyn20za4qpb26fb90v15iygq9q46"; libraryHaskellDepends = [ abstract-deque accelerate base bytestring chaselev-deque containers data-default-class deepseq directory dlist exceptions fclabels @@ -20093,6 +20093,8 @@ self: { pname = "accelerate-llvm-native"; version = "1.1.0.1"; sha256 = "0hxws9lsmcsrhj0gxwnl86mcsg8x7wyv13lbb2lrglkychqkkv5l"; + revision = "1"; + editedCabalFile = "1kqv7bpa3mm4qzc141z5kqq934930b1cv2djr9m2ycwvb3y8ysfl"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring Cabal cereal containers directory dlist fclabels filepath ghc ghc-prim hashable libffi @@ -20114,6 +20116,8 @@ self: { 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 @@ -21251,35 +21255,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson_0_11_3_0" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring - , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl - , QuickCheck, quickcheck-instances, scientific, syb, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "aeson"; - version = "0.11.3.0"; - sha256 = "1sgcjmf945hazdfx7iyr60w0x9l3y292q2k13zcjihl1g32zl9pk"; - libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq dlist fail ghc-prim - hashable mtl scientific syb tagged template-haskell text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base base-orphans bytestring containers ghc-prim - hashable HUnit QuickCheck quickcheck-instances tagged - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time unordered-containers vector - ]; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "aeson" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory @@ -25992,8 +25967,8 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.2.4.2"; - sha256 = "1llbwhws24k8ca22v3zfpz8jzbr1wj92vvwqypqv1iig03bgbbvh"; + version = "0.2.4.3"; + sha256 = "01l9q8wbxiad3r1k2s8y3r08aq12148wr84y565s8i3y3w8ff8fp"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -28267,29 +28242,6 @@ self: { }) {}; "async-refresh-tokens" = callPackage - ({ mkDerivation, async-refresh, base, bytestring, criterion - , formatting, HUnit, lifted-async, microlens, microlens-th - , monad-control, monad-logger, safe-exceptions, stm, test-framework - , test-framework-hunit, text - }: - mkDerivation { - pname = "async-refresh-tokens"; - version = "0.3.0.0"; - sha256 = "11kwkqxxqipfl193wk1a441r8jr6h1lj50xrzmpjhqmacwr212nm"; - libraryHaskellDepends = [ - async-refresh base bytestring formatting lifted-async microlens - microlens-th monad-control monad-logger safe-exceptions stm text - ]; - testHaskellDepends = [ - base criterion HUnit monad-logger stm test-framework - test-framework-hunit - ]; - homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; - description = "Package implementing core logic for refreshing of expiring access tokens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "async-refresh-tokens_0_3_0_1" = callPackage ({ mkDerivation, async-refresh, base, bytestring, criterion , formatting, HUnit, lifted-async, microlens, microlens-th , monad-control, monad-logger, safe-exceptions, stm, test-framework @@ -28310,7 +28262,6 @@ self: { homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; description = "Package implementing core logic for refreshing of expiring access tokens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-timer" = callPackage @@ -30459,8 +30410,8 @@ self: { }: mkDerivation { pname = "azubi"; - version = "0.2.0.2"; - sha256 = "00jnj7wfb588q6pll8l39prmn335cfcd5j1wwlcfanbznpz02nav"; + version = "0.2.0.3"; + sha256 = "00w3bbm2li3hdjqqww7m1chq3cpbqly3gl8y7sx469356rzils52"; libraryHaskellDepends = [ base Diff directory filepath options process unix ]; @@ -31218,20 +31169,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base-orphans_0_5_4" = callPackage - ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: - mkDerivation { - pname = "base-orphans"; - version = "0.5.4"; - sha256 = "0qv20n4yabg7sc3rs2dd46a53c7idnd88by7n3s36dkbc21m41q4"; - libraryHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/haskell-compat/base-orphans#readme"; - description = "Backwards-compatible orphan instances for base"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "base-orphans" = callPackage ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: mkDerivation { @@ -31442,8 +31379,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; - version = "0.0.2"; - sha256 = "01jvdi7xb61jgrq64ll325mvhibmm2q8nllq7aicy13mwxqgcyac"; + version = "0.0.3"; + sha256 = "06jwanjdd3dw2n6i1c77513abin113f90nsj9vals8krgvq8jnr7"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell-foundation/foundation"; description = "Foundation scrap box of array & string"; @@ -36180,6 +36117,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bool8" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "bool8"; + version = "0.0.1.1"; + sha256 = "0hrh3sh19hjdjjm5g1xwvhkf8l13qdrdrxvnylh8sn3d54krhixw"; + libraryHaskellDepends = [ base ]; + description = "Alternative Bool type stored as byte"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "boolean-like" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , semigroups, text, vector @@ -38490,8 +38438,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.35.9"; - sha256 = "1d7xd9v8gc0ahyx557470dw01s3zs6vz594a4hy95bgx5d45s357"; + version = "4.36"; + sha256 = "0kwn0drd57wkpz2xl4n8104zc8zjf32gab6sks9vg03zhy4hjvwq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43398,6 +43346,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clang-compilation-database" = callPackage + ({ mkDerivation, aeson, base, bytestring, text }: + mkDerivation { + pname = "clang-compilation-database"; + version = "0.1.0.0"; + sha256 = "1nnbcx9450kppm1qsqspdj4ywjgcmfg2zicgs309hdb7kvszpdla"; + libraryHaskellDepends = [ aeson base bytestring text ]; + homepage = "https://github.com/lambdageek/clang-compilation-database"; + description = "JSON Compilation Database Format encoding and decoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "clang-pure" = callPackage ({ mkDerivation, base, bytestring, clang, containers, contravariant , hashable, inline-c, lens, microlens, microlens-contra, singletons @@ -45405,16 +45365,18 @@ self: { "codec-rpm" = callPackage ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring - , conduit, conduit-combinators, conduit-extra, hspec - , hspec-attoparsec, HUnit, mtl, parsec, pretty, resourcet, text + , conduit, conduit-combinators, conduit-extra, cpio-conduit, hspec + , hspec-attoparsec, HUnit, lzma-conduit, mtl, parsec, pretty + , resourcet, text }: mkDerivation { pname = "codec-rpm"; - version = "0.1.3"; - sha256 = "18f7rn2k33v5k2g3gbfd6rmpq81gm02aj5xwdy1c8fxsf67fnn00"; + version = "0.2.0"; + sha256 = "1n977xndg2ii866a868rvbi581p0gbz5zpy1glrg6n9znm6y9l4h"; libraryHaskellDepends = [ attoparsec attoparsec-binary base bytestring conduit - conduit-combinators conduit-extra mtl parsec pretty resourcet text + conduit-combinators conduit-extra cpio-conduit lzma-conduit mtl + parsec pretty resourcet text ]; testHaskellDepends = [ attoparsec base bytestring hspec hspec-attoparsec HUnit text @@ -45931,8 +45893,8 @@ self: { }: mkDerivation { pname = "colorless"; - version = "2.2.17"; - sha256 = "1l771glmnbgnwkjg0ijg70i0apj66b4n19v1glx6jzdp98z4kgl3"; + version = "2.2.20"; + sha256 = "1wg0p06bvp6zvnc8qi9k942l1ijzcnksmd6jxnk0c7v9f2kdnib2"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async monad-control monad-logger mtl random safe-exceptions scientific @@ -45943,6 +45905,7 @@ self: { ]; description = "Colorless | The Programmatic IDL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colorless-http-client" = callPackage @@ -45959,6 +45922,7 @@ self: { ]; description = "Http Client addon for Colorless"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colorless-scotty" = callPackage @@ -45972,6 +45936,7 @@ self: { ]; description = "Scotty server add-on for Colorless"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colors" = callPackage @@ -47176,6 +47141,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "computational-geometry" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, lens-family-core + , linear, protolude, vector + }: + mkDerivation { + pname = "computational-geometry"; + version = "0.1.0.3"; + sha256 = "0hslx5g5qzkrxx79f12x82b9jfn0kxvwb7y8whiq85887p4w7zxh"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers lens-family-core linear protolude + vector + ]; + description = "Collection of algorithms in Computational Geometry"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "computations" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -47426,14 +47407,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_2_1_1" = callPackage + "concurrency_1_2_1_2" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.2.1.1"; - sha256 = "1zr59s73a0iy27qh1m41lizjy55bgrnkb8zh8s3xp15sqhq9yvgv"; + version = "1.2.1.2"; + sha256 = "110666c1ms104byr2shcjj1dlq1rixppsskfjzm3iyjp24diwyq6"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -48722,8 +48703,8 @@ self: { ({ mkDerivation, base, indextype }: mkDerivation { pname = "constraint-manip"; - version = "0.1.0.0"; - sha256 = "1janlm8nicnj11yy35b8n73dik6bib5aqphgl248c2kn2lgs7fj8"; + version = "0.1.1.0"; + sha256 = "1kxg2iid906rw53r12rha8q3031ixdi3wlviprswig911x9c0zbk"; libraryHaskellDepends = [ base indextype ]; description = "Some conviencience type functions for manipulating constraints"; license = stdenv.lib.licenses.mit; @@ -54137,14 +54118,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_0_11_0_0" = callPackage + "data-diverse_1_2_0_2" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "0.11.0.0"; - sha256 = "0vbhp2gnmg6nlha4jly6yjpvky2dhk2x099r58r7gdrr5prh1lpi"; + version = "1.2.0.2"; + sha256 = "0h0wifwckybn0py6xndaj1fp0sld28aca4qgclw07qsyfd9rnc9x"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54169,12 +54150,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_0_4_0_0" = callPackage + "data-diverse-lens_0_5_0_0" = callPackage ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "0.4.0.0"; - sha256 = "0jwq45b9s2v539lkav84vrjcqznlb2yvprhaflshaz5gsw04dfyc"; + version = "0.5.0.0"; + sha256 = "1can16ndkff8c3dfn585hdbg8zw805icax01hfm0ys3rvypwn4vq"; libraryHaskellDepends = [ base data-diverse lens tagged ]; testHaskellDepends = [ base data-diverse hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse-lens#readme"; @@ -55892,8 +55873,8 @@ self: { }: mkDerivation { pname = "dbus-th-introspection"; - version = "0.1.0.0"; - sha256 = "10c4fvnw20xvlm4pqqw5vcw5gw9519g4ksawidrrr7bq25gy1ia2"; + version = "0.1.0.2"; + sha256 = "1f6lv7jag9mbl8lkk9m4fnggfhbc301g142adk533sx6pwm6zn8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60795,8 +60776,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.4.1.0"; - sha256 = "1ywqi7mcyb39fir040gfnk8cb57ysa8mnhcss5x2jvhgqfg3vffw"; + version = "0.4.1.1"; + sha256 = "103j8hcabfwrzjmjzxw3ks7b90nnanznck941v956q1h3240npka"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -61043,6 +61024,7 @@ self: { homepage = "https://github.com/Hexirp/doctest-driver-gen#readme"; description = "Generate doctest-driver.hs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-prop" = callPackage @@ -62239,8 +62221,8 @@ self: { }: mkDerivation { pname = "duckling"; - version = "0.1.2.0"; - sha256 = "1sqkygqx28srbpvnq05fyzqs9c9ixsfdfgivvzqr8yqkwvbxajxr"; + version = "0.1.3.0"; + sha256 = "1nk9rdfd4kcim5i9p891cic562g2wda0l6d1xvkkl4hh4b8bym7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63853,19 +63835,21 @@ self: { }) {}; "ekg-cloudwatch" = callPackage - ({ mkDerivation, amazonka, amazonka-cloudwatch, base, ekg-core - , hspec, lens, text, time, unordered-containers + ({ mkDerivation, aeson, amazonka, amazonka-cloudwatch + , amazonka-core, base, bytestring, ekg-core, hspec, lens, resourcet + , semigroups, text, time, unordered-containers }: mkDerivation { pname = "ekg-cloudwatch"; - version = "0.0.1.4"; - sha256 = "0076rc1b6y3yqs7l45q00vbax17miqavjjk92mgkbrc9d376n23y"; + version = "0.0.1.5"; + sha256 = "1k3g6rq0kpslyqajcmw7cymd0pq89kfklpfs59kc4ksv27569zfm"; libraryHaskellDepends = [ - amazonka amazonka-cloudwatch base ekg-core lens text time - unordered-containers + aeson amazonka amazonka-cloudwatch amazonka-core base bytestring + ekg-core lens resourcet semigroups text time unordered-containers ]; testHaskellDepends = [ - amazonka amazonka-cloudwatch base ekg-core hspec lens text time + aeson amazonka amazonka-cloudwatch amazonka-core base bytestring + ekg-core hspec lens resourcet semigroups text time unordered-containers ]; homepage = "https://github.com/sellerlabs/ekg-cloudwatch#readme"; @@ -66142,8 +66126,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer"; - version = "2.0.2"; - sha256 = "05pmgkm2cy60b6lx39ly03i7h3yjh4zy2zzxbk5i68w9xkjcvbxq"; + version = "3.0.0"; + sha256 = "008y4r5xfw8sd3s1lq39clb9sbzhph4xjdw34875hg1shny3n902"; libraryHaskellDepends = [ aeson base bimap bytestring containers ethereum-analyzer-deps extra fgl GenericPretty graphviz hexstring hoopl pretty protolude split @@ -66153,7 +66137,7 @@ self: { base bytestring ethereum-analyzer-deps extra GenericPretty hoopl hspec protolude text wl-pprint-text ]; - homepage = "https://github.com/ethereumK/ethereum-analyzer"; + homepage = "https://github.com/zchn/ethereum-analyzer"; description = "A Ethereum contract analyzer"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -66168,8 +66152,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-cli"; - version = "2.0.2"; - sha256 = "03kbdddp1kk48a64mq5xzhiqwkznmf58qyyqwlk7fv4614awlvx6"; + version = "3.0.0"; + sha256 = "1fsvslfa94v9yfy94l5qwgn7gl96f6k8826rmdllbzsq8q6wgrzz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66182,7 +66166,7 @@ self: { base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger optparse-applicative optparse-text protolude text ]; - homepage = "https://github.com/ethereumK/ethereum-analyzer"; + homepage = "https://github.com/zchn/ethereum-analyzer"; description = "A CLI frontend for ethereum-analyzer"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -66195,8 +66179,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-deps"; - version = "2.0.2"; - sha256 = "1fpr6jl2qd1amdfrabzhyyvd8izmm1dcjg7rvpzc5l3j4sw5hxc8"; + version = "3.0.0"; + sha256 = "0d23sa2zva6bzzg7369g770azvx9xhbvc61kafa6gk1wcfb6y7qz"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base16-bytestring binary bytestring containers deepseq fast-logger global-lock monad-logger split text @@ -66216,8 +66200,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-webui"; - version = "2.0.2"; - sha256 = "04l1f7ijjbb5czcfz0n8v8v7w6zf6rrw8ds8ayjfxzw4yr4d2zvc"; + version = "3.0.0"; + sha256 = "1nf134v74spqbwjk5b0hb3f298ps4h6073nmwxhadhm886sif8k5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66230,7 +66214,7 @@ self: { executableHaskellDepends = [ base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger ]; - homepage = "https://github.com/ethereumK/ethereum-analyzer"; + homepage = "https://github.com/zchn/ethereum-analyzer"; description = "A web frontend for ethereum-analyzer"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -71729,6 +71713,45 @@ self: { license = "unknown"; }) {}; + "fluid-idl" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, errors + , exceptions, fluid, hspec, lifted-async, monad-control + , monad-logger, mtl, random, safe-exceptions, scientific, text + , text-conversions, tuple, unordered-containers, vector + }: + mkDerivation { + pname = "fluid-idl"; + version = "0.0.0"; + sha256 = "1j1j0sr9sw0ksdjcpcyf6w89drszqd3848lv7hb5rjp59aapnpv8"; + libraryHaskellDepends = [ + aeson base bytestring containers errors exceptions lifted-async + monad-control monad-logger mtl random safe-exceptions scientific + text text-conversions unordered-containers vector + ]; + testHaskellDepends = [ + aeson base containers fluid hspec scientific text tuple vector + ]; + description = "Fluid | The Programmatic IDL"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {fluid = null;}; + + "fluid-idl-http-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, fluid-idl, http-client + , http-types, text-conversions + }: + mkDerivation { + pname = "fluid-idl-http-client"; + version = "0.0.0"; + sha256 = "0ah4sfybkwzr1z8gvl3zdh2001a84b3rwgd47nqbn6crks3yvdz8"; + libraryHaskellDepends = [ + aeson base bytestring fluid-idl http-client http-types + text-conversions + ]; + description = "Http Client addon for Fluid"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fluidsynth" = callPackage ({ mkDerivation, base, bindings-DSL, containers, directory , fluidsynth @@ -71930,6 +71953,8 @@ self: { pname = "foldl"; version = "1.2.5"; sha256 = "0jzc00dqwkr3kvy40f8f9klh24s8zvhfk2flrlyichc6zcy5qbda"; + revision = "1"; + editedCabalFile = "02lk5838594mi15bylz2kpcm1c4akbsswj73i7k8xw4ns66iaq04"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors text transformers @@ -72109,6 +72134,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "follow-file" = callPackage + ({ mkDerivation, attoparsec, attoparsec-path, base, bytestring + , conduit, conduit-combinators, directory, exceptions, hinotify + , monad-control, mtl, path, text, unix, utf8-string + }: + mkDerivation { + pname = "follow-file"; + version = "0.0.2"; + sha256 = "0661fp7gf5gyb4w06qm7lfaclzp0zk96gkhcx3pallckfr3214hk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec attoparsec-path base bytestring conduit directory + exceptions hinotify monad-control mtl path text unix utf8-string + ]; + executableHaskellDepends = [ + attoparsec attoparsec-path base bytestring conduit + conduit-combinators directory hinotify path text + ]; + description = "Be notified when a file gets appended, solely with what was added"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "follower" = callPackage ({ mkDerivation, ansi-wl-pprint, base, cmdargs, directory, filepath , hs-twitter, old-locale, strict, time @@ -72345,8 +72393,8 @@ self: { }: mkDerivation { pname = "forest-fire"; - version = "0.2"; - sha256 = "1y50nlj2k2glzypr3nvwcx7pdf7bwn0n4d4vks5n8balvx6yaniq"; + version = "0.2.1"; + sha256 = "007jx5iylhfxjdq7x3ffn1cx27wy7201wvxw23w5nds48vfna6ia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72359,6 +72407,7 @@ self: { homepage = "https://github.com/toothbrush/forest-fire#readme"; description = "Recursively delete CloudFormation stacks and their dependants"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forger" = callPackage @@ -72723,8 +72772,8 @@ self: { ({ mkDerivation, base, basement, criterion, ghc-prim }: mkDerivation { pname = "foundation"; - version = "0.0.15"; - sha256 = "05xl96lc7qi2sdkfc0s5rcrp84cbsyz0r0v3dffmgnv4n1f06cdh"; + version = "0.0.16"; + sha256 = "1kyczi9lfiwbib9irgz4dzy1h60hv6irxyqba6x48bp6vzylfscr"; libraryHaskellDepends = [ base basement ghc-prim ]; testHaskellDepends = [ base basement ]; benchmarkHaskellDepends = [ base basement criterion ]; @@ -74803,6 +74852,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gargoyle" = callPackage + ({ mkDerivation, base, directory, filelock, filepath, network + , process + }: + mkDerivation { + pname = "gargoyle"; + version = "0.1"; + sha256 = "1yjvn1bfjnr8prs6inz5nhmywszwp8f38iz6v6i3lfazcck8qb43"; + libraryHaskellDepends = [ + base directory filelock filepath network process + ]; + description = "Automatically spin up and spin down local daemons"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gargoyle-postgresql" = callPackage + ({ mkDerivation, base, bytestring, directory, gargoyle, process + , stringsearch, text, unix + }: + mkDerivation { + pname = "gargoyle-postgresql"; + version = "0.1"; + sha256 = "13s2r5kxqkpq4g13dpqig7y2ya0n19xw5ng1sw093kp2kmfjs4h4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory gargoyle process stringsearch text unix + ]; + executableHaskellDepends = [ + base bytestring gargoyle process text unix + ]; + description = "Manage PostgreSQL servers with gargoyle"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "garsia-wachs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -77408,8 +77492,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5.3"; - sha256 = "07vdqa2zcivayk1zbj86ab25vawsgywpjng8ixxlsxzdf9arwhhi"; + version = "0.5.4"; + sha256 = "1qi4nwjkymjgag8m1yf04hddqzcj3iq1xllfffwwdp7g57b4p917"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -81769,6 +81853,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-games-configuration" = callPackage @@ -82418,6 +82503,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-youtube-analytics" = callPackage @@ -83189,8 +83275,8 @@ self: { }: mkDerivation { pname = "grammatical-parsers"; - version = "0.2"; - sha256 = "0vn6qfzwhgvn59z6wfj0k19g5g2sxcgkm7jn3qlzhmpzw0016f47"; + version = "0.2.1"; + sha256 = "0225lgg44plnz1140fj91rc45x59a7920hw494qavn968cldkv17"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83691,16 +83777,16 @@ self: { "graphite" = callPackage ({ mkDerivation, base, bytestring, cassava, containers, criterion - , deepseq, dequeue, graphviz, hashable, hspec, process, QuickCheck - , random, unordered-containers, vector + , deepseq, graphviz, hashable, hspec, process, QuickCheck, random + , unordered-containers, vector }: mkDerivation { pname = "graphite"; - version = "0.7.0.0"; - sha256 = "0bapl5hvv3dqfrpx9jx70s6akas11xpvfm1zzdkp02w3i106dchj"; + version = "0.9.0.0"; + sha256 = "0s252k5syfkvrvg7amabkzmlvcr4ms2cv1ykli55gfslyzi7809n"; libraryHaskellDepends = [ - base bytestring cassava containers deepseq dequeue graphviz - hashable process QuickCheck random unordered-containers vector + base bytestring cassava containers deepseq graphviz hashable + process QuickCheck random unordered-containers vector ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -83744,17 +83830,17 @@ self: { "graphql-api" = callPackage ({ mkDerivation, aeson, attoparsec, base, containers, criterion - , directory, doctest, exceptions, hspec, protolude, QuickCheck - , raw-strings-qq, scientific, tasty, tasty-hspec, text + , directory, doctest, exceptions, ghc-prim, hspec, protolude + , QuickCheck, raw-strings-qq, scientific, tasty, tasty-hspec, text , transformers }: mkDerivation { pname = "graphql-api"; - version = "0.1.2"; - sha256 = "04wc5sg6x75xw0y37is2y0yiyn179sknpziy7l0bdcsh8ydxy846"; + version = "0.2.0"; + sha256 = "08hsrqh4v7fmkmilwnmxpii8iqkhc0affcv3mmjmp3my0qi79xrl"; libraryHaskellDepends = [ - aeson attoparsec base containers exceptions protolude QuickCheck - scientific text transformers + aeson attoparsec base containers exceptions ghc-prim protolude + QuickCheck scientific text transformers ]; testHaskellDepends = [ aeson attoparsec base containers directory doctest exceptions hspec @@ -83766,6 +83852,7 @@ self: { homepage = "https://github.com/jml/graphql-api#readme"; description = "Sketch of GraphQL stuff"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphs" = callPackage @@ -85122,6 +85209,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) gtksourceview;}; "gtksourceview3" = callPackage @@ -85141,7 +85229,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "guarded-rewriting" = callPackage @@ -87752,6 +87840,7 @@ self: { ]; description = "A shortcode extension module for Hakyll"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halberd" = callPackage @@ -89138,26 +89227,6 @@ self: { }) {}; "happy" = callPackage - ({ mkDerivation, array, base, Cabal, containers, directory - , filepath, mtl, process - }: - mkDerivation { - pname = "happy"; - version = "1.19.7"; - sha256 = "16vg292pp12wnkny7znsv7bichh9ghny7swl7v55qafmcfg2lcdv"; - revision = "1"; - editedCabalFile = "1w0sm3qn1icxiiif6355pr6cwd9bqfh56g8qc5hycagcnms8hip1"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ array base containers mtl ]; - testHaskellDepends = [ base process ]; - homepage = "https://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "happy_1_19_8" = callPackage ({ mkDerivation, array, base, Cabal, containers, directory , filepath, mtl, process }: @@ -89173,7 +89242,6 @@ self: { homepage = "https://www.haskell.org/happy/"; description = "Happy is a parser generator for Haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happy-meta" = callPackage @@ -93138,8 +93206,8 @@ self: { }: mkDerivation { pname = "hasmin"; - version = "0.3.2.4"; - sha256 = "0xbc5pihr9izms94idc3bmapfs58pg2smn3ym3wnsxs69bah8xfi"; + version = "0.3.3"; + sha256 = "0xpy48vhrjy8lckyym76888r8byyipcq27qcml04j3fvk5gw0cf0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93215,6 +93283,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_1" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, data-default-class, dlist, either, hashable + , hashtables, loch-th, mtl, placeholders, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rebase, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1"; + sha256 = "0zhk9vwlmjc1cwbqx1l9nns155a5f2zbb8k1240wqcylignfqi2b"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras data-default-class dlist either + hashable hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors semigroups text transformers vector + ]; + testHaskellDepends = [ + bug data-default-class QuickCheck quickcheck-instances rebase + rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -93266,8 +93364,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.2"; - sha256 = "0mkmn2myga4r0fanb3mh3dwdlhv0mjfqqv4wk1fbx7zncgmciwlw"; + version = "0.4.3.1"; + sha256 = "0m9lr2n5ac0n9gslj2v24jmm68b1aq29zb9ca5wszfs16x6v92ci"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors @@ -93289,8 +93387,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6.1"; - sha256 = "1gw5dfg2qh38sbi2n4bhf3vhyh9rynj3gq02vv5i49r10kqdfs2g"; + version = "0.6.2.1"; + sha256 = "113fkkkdh2ar431b9l3jbqabymmas2r0fwc7icfys3ayh8r50fg7"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql hasql-transaction transformers @@ -93349,8 +93447,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.2.2"; - sha256 = "1ymx36v267ypjx76n9pp8rpmb99z0llpajs0i2z4fkziz7dvjjbf"; + version = "0.2.3"; + sha256 = "0ph2dzfl12bcdcd4xqw5kg1sdyd36ajz3n3ha27rnvv0l8slld6i"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -93371,6 +93469,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-pool_0_4_2_1" = callPackage + ({ mkDerivation, base-prelude, hasql, resource-pool, time }: + mkDerivation { + pname = "hasql-pool"; + version = "0.4.2.1"; + sha256 = "0gr7cml6qzj4936yaf4wn4y9ss3vklndlnxfg10lgm8f85sgg40m"; + libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + homepage = "https://github.com/nikita-volkov/hasql-pool"; + description = "A pool of connections for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , criterion-plus, deepseq, directory, doctest, either, filepath @@ -93463,8 +93574,8 @@ self: { }: mkDerivation { pname = "hasql-transaction"; - version = "0.5"; - sha256 = "0hdkw0rrma0cys1gd4phw9ajrimgbaabmsyp533fm6x5fznk7m0w"; + version = "0.5.1"; + sha256 = "0iy114xfkqxpqya13wb5h238wk8gqf4hhh2k5mcqrjxp24cmwl78"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers @@ -95068,6 +95179,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heavy-logger" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, fast-logger, hsyslog + , monad-control, monad-logger, mtl, template-haskell, text + , text-format-heavy, transformers-base + }: + mkDerivation { + pname = "heavy-logger"; + version = "0.1.0.0"; + sha256 = "0wnvgjbhwscmq0wm7arlwpqj5dsrshaqhnx5nvlcvjkzrhcpxlpp"; + libraryHaskellDepends = [ + attoparsec base bytestring fast-logger hsyslog monad-control + monad-logger mtl template-haskell text text-format-heavy + transformers-base + ]; + description = "Full-weight logging based on fast-logger"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hebrew-time" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, time @@ -96146,6 +96275,7 @@ self: { ]; description = "A heterogeneous list type"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hetris" = callPackage @@ -99492,18 +99622,18 @@ self: { "hmep" = callPackage ({ mkDerivation, base, HUnit, mwc-random, primitive, probable - , statistics, vector + , vector }: mkDerivation { pname = "hmep"; - version = "0.1.0"; - sha256 = "1106lkaac4z33r0q17dpxyk5zajg0xnycszgvijmsr2bym0qzb8k"; + version = "0.1.1"; + sha256 = "1q8ns90mrww27pz90c0q3hr817s61rr0yvpksamkq8g75ywy5qma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base mwc-random primitive probable statistics vector + base mwc-random primitive probable vector ]; - executableHaskellDepends = [ base probable statistics vector ]; + executableHaskellDepends = [ base probable vector ]; testHaskellDepends = [ base HUnit vector ]; homepage = "https://github.com/masterdezign/hmep#readme"; description = "HMEP Multi Expression Programming – a genetic programming variant"; @@ -99769,35 +99899,36 @@ self: { ({ mkDerivation, aeson, aeson-pretty, attoparsec , attoparsec-iso8601, base, bytestring, conduit , conduit-combinators, conduit-extra, containers, criterion - , deepseq, directory, hspec, hspec-attoparsec, hspec-core + , directory, hspec, hspec-attoparsec, hspec-core , hspec-expectations, ip, lifted-base, monad-control, monad-loops - , mtl, optparse-applicative, permute, random, resourcet, text, time - , transformers-base, unix, unordered-containers, word8, yaml - , zeromq4-conduit, zeromq4-haskell + , monad-par, mtl, optparse-applicative, permute, random, resourcet + , text, time, transformers-base, unix, unordered-containers, word8 + , yaml, zeromq4-conduit, zeromq4-haskell }: mkDerivation { pname = "hnormalise"; - version = "0.4.7.0"; - sha256 = "0ag600ms1kay8hg2axv65d4nr699c6fq7p2gdjzjjr2cvs6l06ws"; + version = "0.4.8.0"; + sha256 = "1s4ilaw574xhvfhsl9afvb7khz50sg7bag6hckbfadf1h4mhblal"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring - containers directory ip permute text time unordered-containers yaml + containers directory ip permute resourcet text time + unordered-containers yaml ]; executableHaskellDepends = [ aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring conduit conduit-combinators conduit-extra containers directory ip - lifted-base monad-control monad-loops mtl optparse-applicative - resourcet text time transformers-base unix word8 yaml - zeromq4-conduit zeromq4-haskell + lifted-base monad-control monad-loops monad-par mtl + optparse-applicative resourcet text time transformers-base unix + word8 yaml zeromq4-conduit zeromq4-haskell ]; testHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base conduit-extra hspec hspec-attoparsec hspec-core hspec-expectations ip text time ]; benchmarkHaskellDepends = [ - aeson attoparsec base criterion deepseq random text + aeson attoparsec base criterion random text ]; homepage = "https://github.com/itkovian/hnormalise#readme"; description = "Log message normalisation tool producing structured JSON messages"; @@ -101404,8 +101535,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.19.2"; - sha256 = "0kwsy3qwhvc55czszddbq16nz2wniwx7m04i9fkywxcrifjkk7n4"; + version = "0.19.3"; + sha256 = "16czxklzgxv36s30zaqym80wb3jc40nnd32r8gswb1xi85y97fgr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104313,15 +104444,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_1;}; - "hslua_0_9_0" = callPackage + "hslua_0_9_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, fail , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "0.9.0"; - sha256 = "1ka6vacjrs4y7c83ay7zpvw3kgv19snb50jmfb8j00dprap5wwgq"; + version = "0.9.1"; + sha256 = "037w7s0fjji54wa5hl8rarf4c655ybzw4p1jzfy41k6qhwnk4i5i"; configureFlags = [ "-fsystem-lua" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text @@ -106611,20 +106742,20 @@ self: { "htoml-megaparsec" = callPackage ({ mkDerivation, aeson, base, bytestring, composition-prelude - , containers, criterion, deepseq, file-embed, megaparsec, mtl - , old-locale, tasty, tasty-hspec, tasty-hunit, text, time + , containers, criterion, deepseq, file-embed, hspec, megaparsec + , mtl, old-locale, tasty, tasty-hspec, tasty-hunit, text, time , unordered-containers, vector }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.0.1.1"; - sha256 = "02zrqdpry6hggd1q71dh85j9g3chzcln904ag507rihilxv90s45"; + version = "1.0.1.11"; + sha256 = "09810a4s0gfza0sh4ldh355sbp3810qy8gkcpvq2048h6ajh2kz5"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl old-locale text time unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers file-embed megaparsec tasty + aeson base bytestring containers file-embed hspec megaparsec tasty tasty-hspec tasty-hunit text time unordered-containers vector ]; benchmarkHaskellDepends = [ @@ -112138,12 +112269,12 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "indextype"; - version = "0.2.0.0"; - sha256 = "1fwpygmnlwm4h2mp7vwv1kwsbl5agzlc1cq0icijjm5jgw50ns4v"; + version = "0.3.0.0"; + sha256 = "06z4976dy45xyg511bw3nfsfa2lb7m0b081lqpw8q3gmfgrwm66f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A series of type families and constraints for \"indexable\" types"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; }) {}; "indian-language-font-converter" = callPackage @@ -115654,6 +115785,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "javascript-extras_0_3_2_0" = callPackage + ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }: + mkDerivation { + pname = "javascript-extras"; + version = "0.3.2.0"; + sha256 = "0y8cckckg5709in084vyxaad15w6pl1rvmin505s321znfifh838"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq ghcjs-base-stub parallel text + ]; + executableHaskellDepends = [ base ghcjs-base-stub ]; + homepage = "https://github.com/louispan/javascript-extras#readme"; + description = "Extra javascript functions when using GHCJS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "javasf" = callPackage ({ mkDerivation, base, binary, bytestring, directory, doctest , filepath, language-java-classfile, QuickCheck @@ -117386,12 +117535,17 @@ self: { }) {}; "justified-containers" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, ghc-prim, hspec, QuickCheck + , roles, should-not-typecheck + }: mkDerivation { pname = "justified-containers"; - version = "0.1.2.0"; - sha256 = "1rzphablg1wpx2b33zgdyslb9ch436g0wi59vy6gk06572najvz4"; - libraryHaskellDepends = [ base containers ]; + version = "0.2.0.0"; + sha256 = "0fsr9j4qnlffhkgbz50lwy3f18d619risxfl44wgfgr9b722xj8r"; + libraryHaskellDepends = [ base containers roles ]; + testHaskellDepends = [ + base containers ghc-prim hspec QuickCheck should-not-typecheck + ]; homepage = "https://github.com/matt-noonan/justified-containers"; description = "Keyed container types with type-checked proofs of key presence"; license = stdenv.lib.licenses.bsd2; @@ -117994,6 +118148,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "katip_0_5_0_4" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , filepath, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , safe-exceptions, scientific, semigroups, stm, string-conv, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, time-locale-compat, transformers, transformers-base + , transformers-compat, unix, unordered-containers + }: + mkDerivation { + pname = "katip"; + version = "0.5.0.4"; + sha256 = "1plxvljhcpdws78fx36v2wn2s7vzbmf1h7rq00yf9680fvcyaq8y"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either hostname + microlens microlens-th monad-control mtl old-locale resourcet + safe-exceptions scientific semigroups stm string-conv + template-haskell text time transformers transformers-base + transformers-compat unix unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory microlens + quickcheck-instances regex-tdfa safe-exceptions stm tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq directory filepath + safe-exceptions text time transformers unix + ]; + homepage = "https://github.com/Soostone/katip"; + description = "A structured logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, bytestring , containers, criterion, deepseq, enclosed-exceptions, exceptions @@ -125110,8 +125301,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.0.5"; - sha256 = "02iixi1ika6rjdf8qzf404prvjl2l0qhq7rgyzbkrfvk7k4x1mbv"; + version = "0.8.2.0"; + sha256 = "17fm1jn00wns6nkwvxm96j85jwiiaqmw3s7w4ilkslzgr9wslp8f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -126595,8 +126786,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.3.1"; - sha256 = "0hagc9yxb8dmc2qxjzdddvynx7pygr02alf99dvhnc4p5v2yx4z7"; + version = "1.3.3"; + sha256 = "1r7x9fsnaqzs7d3a5kvbaqyhvha8yddb6z5856bqcfk3wflqpcas"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126614,6 +126805,7 @@ self: { homepage = "https://github.com/serokell/log-warper"; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log2json" = callPackage @@ -128056,6 +128248,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lxd-client-config" = callPackage + ({ mkDerivation, aeson, base, containers, directory, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, yaml + }: + mkDerivation { + pname = "lxd-client-config"; + version = "0.1.0.0"; + sha256 = "0cvjfdi2dkysprqy4975x6nxpmk6ppwr8i345hqjwrcahz7hv6i8"; + revision = "1"; + editedCabalFile = "0i2fpnvdnld5qpybf7szcanvrla917rfak0r7fk1wk4yk09lsyl4"; + libraryHaskellDepends = [ + aeson base containers directory filepath text yaml + ]; + testHaskellDepends = [ + base containers HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text yaml + ]; + homepage = "https://github.com/hverr/haskell-lxd-client-config#readme"; + description = "Read the configuration file of the standard LXD client"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lye" = callPackage ({ mkDerivation, base, containers, free, HCodecs, lens, parsers , transformers, trifecta @@ -128540,29 +128756,27 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal - , composition-prelude, containers, criterion, directory, file-embed - , hspec, hspec-megaparsec, http-client, megaparsec, MonadRandom - , mtl, optparse-applicative, process, random-shuffle - , recursion-schemes, tar, template-haskell, text, zip-archive, zlib + ({ mkDerivation, ansi-wl-pprint, base, Cabal, composition-prelude + , containers, criterion, directory, file-embed, hspec + , hspec-megaparsec, http-client, megaparsec, MonadRandom, mtl + , optparse-applicative, process, random-shuffle, recursion-schemes + , tar, template-haskell, text, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "2.4.2.14"; - sha256 = "1nimlz7bcn90hzrnb5v26gn8c4jp17ac4i8hl902h0k8ba9rr7i7"; + version = "2.4.2.22"; + sha256 = "1wg2lph25s0lz4ac1jvzy8vsizkyr7pcdq2cc8wxjj2z7f5k2yia"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory file-embed process ]; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring composition-prelude containers - directory file-embed http-client megaparsec MonadRandom mtl + ansi-wl-pprint base composition-prelude containers directory + file-embed http-client megaparsec MonadRandom mtl optparse-applicative random-shuffle recursion-schemes tar template-haskell text zip-archive zlib ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base hspec hspec-megaparsec megaparsec mtl text - ]; + testHaskellDepends = [ base hspec hspec-megaparsec text ]; benchmarkHaskellDepends = [ base criterion megaparsec text ]; homepage = "https://hub.darcs.net/vmchale/madlang"; description = "Randomized templating language DSL"; @@ -130195,6 +130409,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "matplotlib_0_6_0" = callPackage + ({ mkDerivation, ad, aeson, base, bytestring, containers, deepseq + , filepath, process, random, raw-strings-qq, split, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit, temporary + }: + mkDerivation { + pname = "matplotlib"; + version = "0.6.0"; + sha256 = "105rqbqpqgnsgqxvzqgp203bp4bckf35z7cncqg7nwypgf10ipvd"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq filepath process split + temporary + ]; + testHaskellDepends = [ + ad base bytestring process random raw-strings-qq split tasty + tasty-expected-failure tasty-golden tasty-hunit temporary + ]; + homepage = "https://github.com/abarbu/matplotlib-haskell"; + description = "Bindings to Matplotlib; a Python plotting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "matrices" = callPackage ({ mkDerivation, base, criterion, deepseq, primitive, tasty , tasty-hunit, tasty-quickcheck, vector @@ -131884,6 +132121,7 @@ self: { homepage = "https://github.com/DimaSamoz/mezzo"; description = "Typesafe music composition"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mezzolens" = callPackage @@ -138924,6 +139162,7 @@ self: { homepage = "http://github.com/ppenzin/neko-lib-hs/"; description = "Neko VM code generation and disassembly library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "neko-obfs" = callPackage @@ -147588,6 +147827,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "partial-semigroup" = callPackage + ({ mkDerivation, base, doctest, hedgehog, partial-semigroup-test }: + mkDerivation { + pname = "partial-semigroup"; + version = "0.1.0.1"; + sha256 = "1bkm2hsngw8z77zsgxlrqdfzh8hk0hbsr42cjc4c8v84npr1lh7f"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hedgehog partial-semigroup-test + ]; + homepage = "https://github.com/chris-martin/partial-semigroup#readme"; + description = "A partial binary associative operator"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "partial-semigroup-test" = callPackage + ({ mkDerivation, base, hedgehog, partial-semigroup }: + mkDerivation { + pname = "partial-semigroup-test"; + version = "0.1.0.1"; + sha256 = "1346056kzswfa3bakhfh24y07a2sj2qa5cq5npzf01n99x08jvgz"; + libraryHaskellDepends = [ base hedgehog partial-semigroup ]; + homepage = "https://github.com/chris-martin/partial-semigroup#readme"; + description = "Testing utilities for the partial-semigroup package"; + license = stdenv.lib.licenses.asl20; + }) {}; + "partial-uri" = callPackage ({ mkDerivation, base, network-uri }: mkDerivation { @@ -147887,6 +148153,20 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "path-text-utf8" = callPackage + ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: + mkDerivation { + pname = "path-text-utf8"; + version = "0.0.0.2"; + sha256 = "0m1rmzyjsiwb1k1rpj7mwjmbg6y9rmbv69bxqm0pbc6ylkh678ja"; + libraryHaskellDepends = [ + base bytestring path safe-exceptions text + ]; + homepage = "https://github.com/chris-martin/path-text-utf8#readme"; + description = "Read and write UTF-8 text files"; + license = stdenv.lib.licenses.asl20; + }) {}; + "pathfinding" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -149384,7 +149664,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql-haskell_0_3_3" = callPackage + "persistent-mysql-haskell_0_3_4" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-control, monad-logger, mysql-haskell, network , persistent, persistent-template, resource-pool, resourcet, text @@ -149392,8 +149672,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.3.3"; - sha256 = "1dvdz1l5kpliy9h3l11vlrx9yis7a1a54fnj2c764pg6s5kp8rjq"; + version = "0.3.4"; + sha256 = "1g1i71zpnwbngw56fn7in06k79v4pa5lcq4vk606p8aqyhf4xgfp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149612,6 +149892,31 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template_2_5_3" = 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"; + sha256 = "1b8n99l2dh4ng1pf86541q5s2is30scnsx3p3vzh0kif9myrk5cy"; + 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-vector" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck , test-framework, test-framework-quickcheck2 @@ -149921,8 +150226,8 @@ self: { pname = "pgdl"; version = "10.9"; sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; - revision = "5"; - editedCabalFile = "1asqw4k0v57ysi7yqlk506vnkb162swfv2230s8q43r6kvj7171k"; + revision = "6"; + editedCabalFile = "193ndd6awakj53h027p11cjj6j3lcqrrzrbvav94ccx40b72k3xd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -152978,19 +153283,35 @@ self: { }) {}; "polydata" = callPackage - ({ mkDerivation, base, constraint-manip, hspec, indextype }: + ({ mkDerivation, base, constraint-manip, hspec, indextype + , polydata-core + }: mkDerivation { pname = "polydata"; - version = "0.1.0.0"; - sha256 = "1fxp5m54nqxvyg4qljhdrykm3i6fckjl053p37dnib4g3nrqa5qy"; - revision = "1"; - editedCabalFile = "104rx39v78nnpl8w350fxdkx6zzv1kwql7f21xz62256ybwza4ra"; - libraryHaskellDepends = [ base constraint-manip indextype ]; - testHaskellDepends = [ base constraint-manip hspec indextype ]; - description = "Wrap together data and its constraints"; + version = "0.3.0.0"; + sha256 = "13rn72baypvnyvcf0dc51dliq467fqh47g4kpyc7c8jlhbs0p4fi"; + libraryHaskellDepends = [ + base constraint-manip indextype polydata-core + ]; + testHaskellDepends = [ + base constraint-manip hspec indextype polydata-core + ]; + description = "Wrap together data and it's constraints"; license = stdenv.lib.licenses.mit; }) {}; + "polydata-core" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "polydata-core"; + version = "0.1.0.0"; + sha256 = "1wdi8a1s235knb98bmhfqvy7qbqvj804dx6rn846x8aj50drjjqv"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/clintonmead/polydata-core#readme"; + description = "Core data definitions for the \"polydata\" package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "polymap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -153727,18 +154048,23 @@ self: { }) {}; "postgres-embedded" = callPackage - ({ mkDerivation, base, directory, filepath, network, shell-conduit + ({ mkDerivation, base, bytestring, directory, filepath, network + , postgresql-simple, shell-conduit }: mkDerivation { pname = "postgres-embedded"; - version = "0.1.5"; - sha256 = "0g7nvszas7zmx9wh8cdpc5wx5nkv710n7fzipsgbk2qlzj0j7f08"; + version = "0.1.7"; + sha256 = "19jwgrqx8sycfy9lrz9qgz0hqksfh4z0a44ij7xsm8jvbmaqfqhy"; libraryHaskellDepends = [ base directory filepath network shell-conduit ]; - testHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring filepath postgresql-simple shell-conduit + ]; homepage = "https://github.com/ilya-murzinov/postgres-embedded"; + description = "Library for easily running embedded PostgreSQL server for tests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgres-tmp" = callPackage @@ -154089,8 +154415,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-queue"; - version = "0.5.0.1"; - sha256 = "0nzl7yknva09gwrmnvk4swlkgdksbcxw83bk4cacnmm2n42y3h8a"; + version = "0.5.1.1"; + sha256 = "05bzpfawf5pllmlqhsypp69rjrhady9vdql0khi9k75kk4ndl9r3"; libraryHaskellDepends = [ aeson base bytestring exceptions monad-control pg-transact postgresql-simple random text time transformers @@ -158186,8 +158512,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.1.0.4"; - sha256 = "1mrlr7x6njb1n21185wn81fybyg89c4jyph8sabf20gg7qng893s"; + version = "0.1.0.5"; + sha256 = "1gxna2ikq6q1gnarqwsy1xcbqz19j5015girn4mc52sai852ny5z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160363,6 +160689,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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.0"; + sha256 = "18gasv78zq8l51kpwvx6gc089day6pmlz2f43vrfichqbivahmhf"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ralist" = callPackage ({ mkDerivation, base, criterion, deepseq, hspec }: mkDerivation { @@ -162528,6 +162880,7 @@ self: { homepage = "https://hub.darcs.net/vmchale/recursion-schemes-ext#readme"; description = "Amateur addenda to recursion-schemes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "recursive-line-count" = callPackage @@ -166001,34 +166354,6 @@ self: { }) {}; "rethinkdb-client-driver" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , criterion, hashable, hspec, hspec-smallcheck, mtl, network - , old-locale, scientific, smallcheck, stm, template-haskell, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "rethinkdb-client-driver"; - version = "0.0.24"; - sha256 = "06fhrip547mgv0nqjsiilbdhc0nphqqwy3qacxw36macvg6mhsbb"; - libraryHaskellDepends = [ - aeson base binary bytestring containers hashable mtl network - old-locale scientific stm template-haskell text time - unordered-containers vector - ]; - testHaskellDepends = [ - base hspec hspec-smallcheck smallcheck text time - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base criterion text time unordered-containers vector - ]; - homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; - description = "Client driver for RethinkDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "rethinkdb-client-driver_0_0_25" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , criterion, hashable, hspec, hspec-smallcheck, mtl, network , old-locale, scientific, smallcheck, stm, template-haskell, text @@ -166326,6 +166651,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rhine" = callPackage + ({ mkDerivation, base, containers, dunai, free, time, transformers + }: + mkDerivation { + pname = "rhine"; + version = "0.1.0.0"; + sha256 = "1gjz5i7a00kq48fkg7ms3qr04jzg8mw5vb3lgn1pflp45m4p95vi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers dunai free time transformers + ]; + executableHaskellDepends = [ base ]; + description = "Functional Reactive Programming with type-level clocks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rhythm-game-tutorial" = callPackage ({ mkDerivation, base, call, containers, lens, mtl, objective , split @@ -166984,6 +167326,7 @@ self: { homepage = "http://github.com/serokell/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -167060,6 +167403,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "roles" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "roles"; + version = "0.2.0.0"; + sha256 = "181lmjmvv6285q5zh6cf991jw7d6f0g225vya3iqqb8vn8qjz7g2"; + libraryHaskellDepends = [ base containers ]; + homepage = "http://github.com/matt-noonan/roles/"; + description = "Composable class-based roles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rollbar" = callPackage ({ mkDerivation, aeson, base, basic-prelude, http-conduit , monad-control, network, resourcet, text, vector @@ -169649,21 +170004,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "schematic_0_3_2_0" = callPackage + "schematic_0_4_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens , mtl, profunctors, regex-tdfa, regex-tdfa-text, scientific - , singletons, smallcheck, tagged, text, unordered-containers - , validationt, vector, vinyl + , singletons, smallcheck, tagged, template-haskell, text, union + , unordered-containers, validationt, vector, vinyl }: mkDerivation { pname = "schematic"; - version = "0.3.2.0"; - sha256 = "0bzxab3ijnc5qxglcw4kbcznv22r8n11h5qrsgwlyh3r4qa0by72"; + version = "0.4.0.0"; + sha256 = "1n0i7irbf4flnhybhvl5kqkcyz673nyv7bl8z14yxi152a7kjkqi"; libraryHaskellDepends = [ aeson base bytestring containers hjsonschema mtl profunctors regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged - text unordered-containers validationt vector vinyl + template-haskell text union unordered-containers validationt vector + vinyl ]; testHaskellDepends = [ aeson base bytestring containers hjsonschema hspec hspec-core @@ -171393,18 +171749,18 @@ self: { }) {}; "semiring-num" = callPackage - ({ mkDerivation, base, containers, criterion, doctest, hashable - , log-domain, nat-sized-numbers, QuickCheck, random, scientific - , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck + ({ mkDerivation, base, containers, criterion, deepseq, doctest + , hashable, log-domain, nat-sized-numbers, QuickCheck, random + , scientific, smallcheck, tasty, tasty-quickcheck, tasty-smallcheck , template-haskell, time, unordered-containers, vector }: mkDerivation { pname = "semiring-num"; - version = "1.5.0.0"; - sha256 = "15gn11razis9fzm58dfk4j2bk41lmnzngi3s4izydzsavzm4qyjx"; + version = "1.6.0.0"; + sha256 = "0c12pg87y0ndpkmfpvl921495920fv4gx8i23hmvcq6nim9yy1ir"; libraryHaskellDepends = [ - base containers hashable log-domain scientific template-haskell - time unordered-containers vector + base containers deepseq hashable log-domain scientific + template-haskell time unordered-containers vector ]; testHaskellDepends = [ base containers doctest log-domain nat-sized-numbers QuickCheck @@ -172005,6 +172361,7 @@ self: { homepage = "https://github.com/serokell/serokell-util"; description = "General-purpose functions by Serokell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serpentine" = callPackage @@ -172461,6 +172818,7 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "RocksDB backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-blaze" = callPackage @@ -173199,8 +173557,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.2.4"; - sha256 = "1jf7r9wa9b2afj573knafpgp49xf6mslq0qifw7cdww5j57993b2"; + version = "0.0.3.0"; + sha256 = "1spqwfg1y0qajs5nl92gxif1qicgr4s8y0knkp9q76gvag1dyfng"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -173208,9 +173566,9 @@ self: { split string-conversions temporary text time warp ]; testHaskellDepends = [ - base base-compat bytestring hspec hspec-core http-client QuickCheck - quickcheck-io servant servant-client servant-server transformers - warp + aeson base base-compat bytestring hspec hspec-core http-client + QuickCheck quickcheck-io servant servant-client servant-server + transformers warp ]; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; @@ -173218,30 +173576,37 @@ self: { }) {}; "servant-rawm" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath - , http-client, http-media, http-types, lens, resourcet, servant - , servant-client, servant-docs, servant-server, text, transformers - , wai, wai-app-static, warp + ({ mkDerivation, base, bytestring, doctest, filepath, Glob + , hspec-wai, http-client, http-media, http-types, lens, resourcet + , servant, servant-client, servant-docs, servant-server, tasty + , tasty-hspec, tasty-hunit, text, transformers, wai, wai-app-static + , warp }: mkDerivation { pname = "servant-rawm"; - version = "0.2.0.0"; - sha256 = "029lwzy0r28l1axpmrlcazsqa38q7a6fbq1vzh484dhfy9j2j5wj"; + version = "0.2.0.1"; + sha256 = "1cd94qyv8qbsl6nab0nv7j10wjqa1q1fpsm7pxlp15wzvkp60kk2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers filepath http-client http-media - http-types lens resourcet servant servant-client servant-docs - servant-server wai wai-app-static + base bytestring filepath http-client http-media http-types lens + resourcet servant-client servant-docs servant-server wai + wai-app-static ]; executableHaskellDepends = [ base bytestring http-client http-media http-types servant servant-client servant-docs servant-server text transformers wai warp ]; + testHaskellDepends = [ + base bytestring doctest Glob hspec-wai http-client http-media + http-types servant servant-client servant-server tasty tasty-hspec + tasty-hunit transformers wai warp + ]; homepage = "https://github.com/cdepillabout/servant-rawm"; description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-response" = callPackage @@ -180834,12 +181199,15 @@ self: { pname = "species"; version = "0.4"; sha256 = "04n9lrh058n66175drw3vsn57fd64j8wmn9wdchfb0557yqcjcmn"; + revision = "1"; + editedCabalFile = "0j69s6gpq0bzv42hkalz3nw35q07m5agdcs8kxv11s62jcm6idrs"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell ]; description = "Computational combinatorial species"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculate" = callPackage @@ -183014,8 +183382,8 @@ self: { }: mkDerivation { pname = "state-codes"; - version = "0.1.2"; - sha256 = "08i4ly81yr8sxjhjl6y2kk58ya597q0rcyw3dr50gfxrg20p36dj"; + version = "0.1.3"; + sha256 = "18gls0gyk3iz9i03zw31x3xhi5m1y2r98qkkrah8kz07fsbxqrqn"; libraryHaskellDepends = [ aeson base shakespeare text ]; testHaskellDepends = [ aeson base hspec QuickCheck text ]; homepage = "https://github.com/acamino/state-codes#README"; @@ -186743,6 +187111,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "swagger2_2_2" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob + , hashable, hspec, http-media, HUnit, insert-ordered-containers + , lens, mtl, network, QuickCheck, scientific, template-haskell + , text, time, transformers, transformers-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.2"; + sha256 = "0byzfz52mbnxcmspmk4s43bhprfwrjnh2mkpyfrdir64axqx7yf6"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers generics-sop hashable + http-media insert-ordered-containers lens mtl network scientific + template-haskell text time transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + text time unordered-containers vector + ]; + homepage = "https://github.com/GetShopTV/swagger2"; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -191792,6 +192190,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "text-containers" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , hashable, QuickCheck, quickcheck-instances, tasty + , tasty-quickcheck, text, text-short, vector + }: + mkDerivation { + pname = "text-containers"; + version = "0.1.0.0"; + sha256 = "0dsaqzh2hy6w9mzpsk22vmgmhx54l12il21n49f9g3cbr9kc9cv1"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable text-short + ]; + testHaskellDepends = [ + base bytestring containers QuickCheck quickcheck-instances tasty + tasty-quickcheck text text-short vector + ]; + description = "Memory-efficient string-indexed container types"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-conversions" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, errors, hspec, hspec-discover, text @@ -191844,14 +192263,15 @@ self: { }) {}; "text-format-heavy" = callPackage - ({ mkDerivation, base, containers, data-default, parsec, text, time + ({ mkDerivation, base, bytestring, containers, data-default, parsec + , text, time }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.1.0"; - sha256 = "082j0dzmy5d8lpjxhg9k7qhnjykg851a0yllszf43kx09hk0kmb1"; + version = "0.1.3.0"; + sha256 = "1cv6j0g3x7xw6ivfs9x2hdv063jsa2739zc6x8fya9540l8d4hys"; libraryHaskellDepends = [ - base containers data-default parsec text time + base bytestring containers data-default parsec text time ]; description = "Full-weight string formatting library, analog of Python's string.format"; license = stdenv.lib.licenses.bsd3; @@ -193479,8 +193899,8 @@ self: { }: mkDerivation { pname = "thread-hierarchy"; - version = "0.1.0.1"; - sha256 = "05qpm77711r9viwij5vznrmk8ij89lxhpwxdk8dpk0rq2ll5iyyq"; + version = "0.1.0.2"; + sha256 = "1fhbwzx8shf2ph9l5mkrlz40dxdzn02rvjgz9l2kvjmi8v5rclxk"; libraryHaskellDepends = [ base containers lifted-base monad-control transformers-base ]; @@ -195828,8 +196248,8 @@ self: { }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.2"; - sha256 = "144hqyx13x9gg2xznrh41h9wi7ha70rxr93dpb020qv0af3cknqc"; + version = "0.1.0.14"; + sha256 = "1zms4vigyy29c3wmjh6zmhjlmvj3x98dx99mdpxws6sxl0wibfcv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -196692,6 +197112,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "translate-cli" = callPackage + ({ mkDerivation, aeson, aeson-lens, base, HUnit, lens, text, turtle + , wreq + }: + mkDerivation { + pname = "translate-cli"; + version = "1.0.0.0"; + sha256 = "0kksrdmx2vx24j84nwz106bkc4h353bwybwz7zb5mi0pwkcawfa2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson aeson-lens base lens text wreq ]; + executableHaskellDepends = [ base text turtle ]; + testHaskellDepends = [ base HUnit ]; + homepage = "https://github.com/andys8/translate-cli#readme"; + description = "Translation cli tool"; + license = stdenv.lib.licenses.mit; + }) {}; + "trasa" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, hashable , http-media, http-types, tasty, tasty-hunit, tasty-quickcheck @@ -198574,11 +199012,12 @@ self: { ({ mkDerivation, base, containers, template-haskell }: mkDerivation { pname = "tyfam-witnesses"; - version = "0.1"; - sha256 = "1sy0ffd0i1s20xw2x1vf8a9ydbrzb9klin7j564hncsjf9bzdc1a"; + version = "0.1.1.1"; + sha256 = "1rnmnj2dlzbzj12fddv73mg0p0qgvn5blknb7d9ayns6pxc57aap"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Provide proof witnesses for closed type family evaluation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typalyze" = callPackage @@ -201239,6 +201678,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "unliftio_0_1_1_0" = callPackage + ({ mkDerivation, async, base, deepseq, directory, filepath + , monad-logger, resourcet, transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.1.1.0"; + sha256 = "1hhqcxvfh906xl9qhqk6wrsd2xc6rkwh5lqgwfizlb2wns7irkkd"; + libraryHaskellDepends = [ + async base deepseq directory filepath monad-logger resourcet + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -204372,25 +204829,6 @@ self: { }) {}; "viewprof" = callPackage - ({ mkDerivation, base, brick, containers, ghc-prof, lens - , scientific, text, vector, vector-algorithms, vty - }: - mkDerivation { - pname = "viewprof"; - version = "0.0.0.9"; - sha256 = "15mvbgf5apb9ysiynv5xc8zynkz8shwbfq16rdfac5bbnl07m97p"; - 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_10" = callPackage ({ mkDerivation, base, brick, containers, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: @@ -204407,7 +204845,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 @@ -208872,6 +209309,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "with-index" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "with-index"; + version = "0.1.0.0"; + sha256 = "0dv81mp66l0j0dfa0mm9vqmdfxvhfg5py1gxqwh1jvpr8iks1q8q"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/paf31/with-index"; + description = "A tiny library for composing indexed traversals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "with-location" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -215293,6 +215742,7 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Pango frontend for Yi editor"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-frontend-vty" = callPackage From a7144523cf310cd34a873f18fc4f55e06acf8d9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Oct 2017 11:49:29 +0200 Subject: [PATCH 1300/2806] haskell-partial-semigroup: break cyclic reference that results in an infinite recursion --- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1051c4e416f..8146674a943 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -503,4 +503,8 @@ self: super: builtins.intersectAttrs super { # Written against the 6.X series of megaparsec htoml-megaparsec = super.htoml-megaparsec.override { megaparsec = self.megaparsec_6_2_0; }; + + # Break cyclic reference that results in an infinite recursion. + partial-semigroup = dontCheck super.partial-semigroup; + } From f9b72047f8c61140e2f928f2df1c7777fab3dede Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Oct 2017 11:52:02 +0200 Subject: [PATCH 1301/2806] haskell-fluid-idl-http-client: disable broken build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 28743ca9481..4e753ee94ff 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -967,4 +967,7 @@ self: super: { # https://github.com/mgajda/json-autotype/issues/15 json-autotype = doJailbreak super.json-autotype; + # Depends on broken fluid. + fluid-idl-http-client = markBroken super.fluid-idl-http-client; + } From 09a13160dd104f36c2eae5683998cf27950b1d0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Oct 2017 18:21:03 +0200 Subject: [PATCH 1302/2806] liquidhaskell: new release copes with recent versions of its dependencies --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++--- .../haskell-modules/configuration-hackage2nix.yaml | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4e753ee94ff..ba5ef0348ab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -891,9 +891,8 @@ self: super: { # https://github.com/danidiaz/tailfile-hinotify/issues/2 tailfile-hinotify = dontCheck super.tailfile-hinotify; - # build liquidhaskell with the proper (old) aeson version - liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; }; - aeson_0_11_3_0 = super.aeson_0_11_3_0.override { base-orphans = self.base-orphans_0_5_4; }; + # build liquidhaskell with the proper (new) aeson version + liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_2_0; }; # Test suite fails: https://github.com/lymar/hastache/issues/46. # Don't install internal mkReadme tool. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 360f86f340e..f7a3019d3ea 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2517,10 +2517,8 @@ default-package-overrides: extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier - - aeson < 1 # required by liquidhaskell-0.8.0.0 - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - - base-orphans < 0.6 # required by liquidhaskell-0.8.0.0 - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - Cabal == 1.18.* # required for cabal-install et al on old GHC versions From 29f9ca40cb17b30ef6ebd974a4e4e1a7a567623e Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Wed, 18 Oct 2017 05:03:43 +0800 Subject: [PATCH 1303/2806] ansible_2_4: init at 2.4.0.0 (#30073) --- pkgs/tools/admin/ansible/2.4.nix | 40 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/admin/ansible/2.4.nix diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix new file mode 100644 index 00000000000..dd9c12c831c --- /dev/null +++ b/pkgs/tools/admin/ansible/2.4.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchurl +, pythonPackages +, windowsSupport ? false +}: + +pythonPackages.buildPythonPackage rec { + pname = "ansible"; + version = "2.4.0.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://releases.ansible.com/ansible/${name}.tar.gz"; + sha256 = "0xkwnx817rygb1922gncv9ivgvb7hjg8g53r39hfdm3jgzp6y9qs"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = false; + + propagatedBuildInputs = with pythonPackages; [ + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns + ] ++ stdenv.lib.optional windowsSupport pywinrm; + + meta = with stdenv.lib; { + homepage = http://www.ansible.com; + description = "A simple automation tool"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ + jgeerds + joamaki + ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a32a338042..6bef03ff836 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6859,8 +6859,9 @@ with pkgs; ansible_2_1 = callPackage ../tools/admin/ansible/2.1.nix {}; ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {}; ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {}; - ansible = ansible_2_3; - ansible2 = ansible_2_3; + ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {}; + ansible = ansible_2_4; + ansible2 = ansible_2_4; antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; From 4e67a1657f124974743eed3c9be9c5f59347776b Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Tue, 17 Oct 2017 14:52:22 +0200 Subject: [PATCH 1304/2806] ocamlPackages.re: 1.5.0 -> 1.7.1 --- pkgs/development/ocaml-modules/re/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 1ea2310bf9f..3be49072eb3 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { - name = "ocaml-re-1.5.0"; + name = "ocaml-re-${version}"; + version = "1.7.1"; src = fetchzip { - url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz"; - sha256 = "17avk7kwmgdjkri1sj5q4a59ykc9rj0bxj6ixxpl6i0n49br3f92"; + url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; + sha256 = "1z2z4fjrpdbl0q50fdxvy3746w1vx6ybxcb0k81hqm1342nylbmw"; }; buildInputs = [ ocaml findlib ocamlbuild ounit ]; From 644e3cb20430e07512fe7dc78536555ef378bf6d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 17 Oct 2017 07:30:25 +0000 Subject: [PATCH 1305/2806] ocamlPackages.ocaml_pcre: 7.1.1 -> 7.2.3 --- pkgs/development/ocaml-modules/pcre/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 63696ad3e0c..e5533d3ad4b 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -2,11 +2,11 @@ buildOcaml { name = "pcre"; - version = "7.1.1"; + version = "7.2.3"; src = fetchurl { - url = https://github.com/mmottl/pcre-ocaml/releases/download/v7.1.1/pcre-ocaml-7.1.1.tar.gz; - sha256 = "0nj4gb6hjjjmz5gnl9cjrh4w82rw8cvbwnk0hxhfgfd25p9k50n3"; + url = "https://github.com/mmottl/pcre-ocaml/releases/download/v7.2.3/pcre-ocaml-7.2.3.tar.gz"; + sha256 = "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3"; }; buildInputs = [ocaml findlib]; From 268618dfa2bf7374c9d3d37046e8c036fbbd66fc Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Wed, 18 Oct 2017 00:08:27 +0200 Subject: [PATCH 1306/2806] playOnLinux: 4.2.10 -> 4.2.12 --- pkgs/applications/misc/playonlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index b604905320b..3f39a356312 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -24,7 +24,7 @@ assert stdenv.isLinux; let - version = "4.2.10"; + version = "4.2.12"; binpath = stdenv.lib.makeBinPath [ cabextract @@ -57,7 +57,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; - sha256 = "0ws94hgxajaww450q8ivrp28ypv39mashs29ak41faxf29cr097m"; + sha256 = "03k8v9dknc5hfrfzqw1nkpifz7wkixv3mvjl1vnp4fx8rj2xrjrq"; }; nativeBuildInputs = [ makeWrapper ]; From ceb2b71f691e70aa36e4419d9556881502b6845c Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Tue, 17 Oct 2017 15:53:51 -0700 Subject: [PATCH 1307/2806] kernel: Build Tegra PCI support. --- lib/systems/platforms.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 7aeb4d88e51..9ce697a1f7a 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -545,6 +545,9 @@ rec { # Cavium ThunderX stuff. PCI_HOST_THUNDER_ECAM y + # Nvidia Tegra stuff. + PCI_TEGRA y + # The default (=y) forces us to have the XHCI firmware available in initrd, # which our initrd builder can't currently do easily. USB_XHCI_TEGRA m From ff3fde8f79b465ecc195d71d239d49a86f1e9f12 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 18 Oct 2017 11:13:20 +1100 Subject: [PATCH 1308/2806] udiskie: 1.7.1 -> 1.7.2 Closes #30506. --- pkgs/applications/misc/udiskie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index a3f6fb09f2b..bcf43514f45 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "12d0fc88wlbh5vvsijvy3cwk37wagmg8193n9zcipr1ivmcmhx15"; + sha256 = "1p732gi6lhwcqxvsa0pknb6jmhy3kgv3yzz7xzmdzhy47m312965"; }; buildInputs = [ From 8f43c56755ecedc63b54a022057f1ff79dcbae89 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Oct 2017 02:51:58 +0300 Subject: [PATCH 1309/2806] libtorrentRasterbar: 1.1.4 -> 1.1.5 Fixes build with new Boost. Also add corresponding patch to libtorrentRasterbar_1_0. --- .../libraries/libtorrent-rasterbar/1.0.nix | 13 ++++++++++--- .../libraries/libtorrent-rasterbar/default.nix | 10 +++++----- .../libraries/libtorrent-rasterbar/generic.nix | 8 +++++--- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix index 877d8ed434c..fbd30ac04f7 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix @@ -1,6 +1,13 @@ -{ callPackage, ... } @ args: +args@{ callPackage, fetchpatch, ... }: -callPackage ./generic.nix (args // { +callPackage (import ./generic.nix { version = "1.0.11"; sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i"; -}) + patches = [ + # Compatibility with new Boost + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/7eb3cf6bc6dbada3fa7bb7ff4d5981182813a0e2.patch"; + sha256 = "07agbrii6i8q4wmgpqbln7ldhhadaf5npcinvi6hnyipsr48jbj5"; + }) + ]; +}) args diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index ed52902938d..ff5027fd472 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ -{ callPackage, ... } @ args: +args@{ callPackage, ... }: -callPackage ./generic.nix (args // { - version = "1.1.4"; - sha256 = "1rrp4b7zfz0fnjvax2r9r5rrh6z1s4xqb9dx20gzr4gs8x5v5jws"; -}) +callPackage (import ./generic.nix { + version = "1.1.5"; + sha256 = "1ifpcqw5mj2dwk23lhc2vpb47mg3j573v5z4zp8dkczpz7wg5jxq"; +}) args diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index 351ec3e7733..315385cba6c 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip # Version specific options -, version, sha256 -, ... }: +{ version, sha256, patches ? [] }: + +{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: let formattedVersion = lib.replaceChars ["."] ["_"] version; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { inherit sha256; }; + inherit patches; + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boost openssl zlib python libiconv geoip ]; From 3e4737d16c0cbb92f3025bb1d83be257e0782f20 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Oct 2017 02:55:25 +0300 Subject: [PATCH 1310/2806] bastet: fix build with new boost --- pkgs/games/bastet/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix index 4c55d571bd5..27ddec616bc 100644 --- a/pkgs/games/bastet/default.nix +++ b/pkgs/games/bastet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, boost }: +{ stdenv, fetchFromGitHub, fetchpatch, ncurses, boost }: stdenv.mkDerivation rec { name = "bastet-${version}"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn"; }; + patches = [ + # Compatibility with new Boost + (fetchpatch { + url = "https://github.com/fph/bastet/commit/0e03f8d4d6bc6949cf1c447e632ce0d1b98c4be1.patch"; + sha256 = "1475hisbm44jirsrhdlnddppsyn83xmvcx09gfkm9drcix05alzj"; + }) + ]; + installPhase = '' mkdir -p "$out"/bin cp bastet "$out"/bin/ From 593c6a8ba37cb0d54a5a81ccee79fdee04bea14a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Oct 2017 03:01:00 +0300 Subject: [PATCH 1311/2806] povray: 3.7.0.3 -> 3.7.0.4 Fixes build with new Boost. --- pkgs/tools/graphics/povray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 6bdff06699b..7284ee95a90 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "povray-${version}"; - version = "3.7.0.3"; + version = "3.7.0.4"; src = fetchFromGitHub { owner = "POV-Ray"; repo = "povray"; rev = "v${version}"; - sha256 = "0mzkgk3gn8jfrw1fq0z3kqbysdfq8nwdl8a28l18v8gzb31bblhq"; + sha256 = "1wkwb43w5r9pa79yazy4w4s8n6g280igag97hgl7dyi289q39n0q"; }; From cb744d55c5e5179e099045a7ae117b16245882bd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Oct 2017 03:11:47 +0300 Subject: [PATCH 1312/2806] snapper: fix build with new boost --- pkgs/tools/misc/snapper/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 9895fff3ba8..4b7857d60e7 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2 , lvm2, pam, python, utillinux }: @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { sha256 = "14hrv23film4iihyclcvc2r2dgxl8w3as50r81xjjc85iyp6yxkm"; }; + patches = [ + # Fix build with new Boost + (fetchpatch { + url = "https://github.com/openSUSE/snapper/commit/2e3812d2c1d1f54861fb79f5c2b0197de96a00a3.patch"; + sha256 = "0yrzss1v7lmcvkajmchz917yqsvlsdfz871szzw790v6pql1322s"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig docbook_xsl libxslt docbook_xml_dtd_45 From cae2a8ce9f99da42714dbfb7b453be4a4594e87e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Oct 2017 03:14:01 +0300 Subject: [PATCH 1313/2806] python3.pkgs.pyftgl: fix build with new boost --- pkgs/development/python-modules/pyftgl/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 51de5e8fad5..a02aa94576e 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k , boost, freetype, ftgl, mesa }: buildPythonPackage rec { @@ -11,6 +11,10 @@ buildPythonPackage rec { sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; + postPatch = stdenv.lib.optional isPy3k '' + sed -i "s,'boost_python','boost_python3',g" setup.py + ''; + buildInputs = [ boost freetype ftgl mesa ]; meta = with stdenv.lib; { From edcdb957463f8728e2cb3a9e3e44e18ecba748e8 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Tue, 17 Oct 2017 20:33:33 -0400 Subject: [PATCH 1314/2806] isync: 1.2.1 -> 1.3.0 --- pkgs/tools/networking/isync/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 8b81e0696c2..7dcfc6b512f 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, openssl, pkgconfig, db, cyrus_sasl }: +{ fetchurl, stdenv, openssl, pkgconfig, db, cyrus_sasl, perl }: stdenv.mkDerivation rec { - name = "isync-1.2.1"; + name = "isync-1.3.0"; src = fetchurl { url = "mirror://sourceforge/isync/${name}.tar.gz"; - sha256 = "1bij6nm06ghkg98n2pdyacam2fyg5y8f7ajw0d5653m0r4ldw5p7"; + sha256 = "173wd7x8y5sp94slzwlnb7zhgs32r57zl9xspl2rf4g3fqwmhpwd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ openssl db cyrus_sasl ]; meta = with stdenv.lib; { From 10cc95e154d32c096155649d54f6774dee50889e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 17 Oct 2017 18:54:16 -0400 Subject: [PATCH 1315/2806] proot: 5.1.0 -> 5.1.0.20171015 --- pkgs/tools/system/proot/default.nix | 32 +++++++++++++++++++---------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 16ee4fccce8..8cf7f81381f 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -2,13 +2,12 @@ , talloc, docutils , enableStatic ? true }: -stdenv.mkDerivation rec { +({ version, rev, sha256, patches }: stdenv.mkDerivation { name = "proot-${version}"; - version = "5.1.0"; + inherit version; src = fetchFromGitHub { - sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz"; - rev = "v${version}"; + inherit rev sha256; repo = "proot"; owner = "cedric-vincent"; }; @@ -18,12 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ - (fetchpatch { # debian patch for aarch64 build - sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv"; - url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch"; - }) - ]; + inherit patches; preBuild = stdenv.lib.optionalString enableStatic '' export LDFLAGS="-static" @@ -48,4 +42,20 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ ianwookim nckx makefu ]; }; -} +}) +(if stdenv.isAarch64 then rec { + version = "5.1.0"; + sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz"; + rev = "v${version}"; + patches = [ + (fetchpatch { # debian patch for aarch64 build + sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv"; + url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch"; + }) + ]; +} else { + version = "5.1.0.20171015"; + sha256 = "0jam87msh5jx8vpb19n6xwxw1xlig5amdcqif7gn2rc8nhswpxif"; + rev = "0bf2ee17daafeeadfed079cec97fe1ac781e696a"; + patches = []; +}) From 717436b4aa029cbd6161fdf49938fc955f3a46a0 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Wed, 18 Oct 2017 00:16:33 -0400 Subject: [PATCH 1316/2806] gitea: init at 1.2.1 --- .../version-management/gitea/default.nix | 50 +++++++++++++++++++ .../gitea/static-root-path.patch | 13 +++++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/version-management/gitea/default.nix create mode 100644 pkgs/applications/version-management/gitea/static-root-path.patch diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix new file mode 100644 index 00000000000..734b9d3629c --- /dev/null +++ b/pkgs/applications/version-management/gitea/default.nix @@ -0,0 +1,50 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper +, git, coreutils, bash, gzip, openssh +, sqliteSupport ? true +}: + +with stdenv.lib; + +buildGoPackage rec { + name = "gitea-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "go-gitea"; + repo = "gitea"; + rev = "v${version}"; + sha256 = "15zw4b6hnx4hmzn2xlsi4p7jvh6jx4g4smbdidnrzrykzyq4rmpp"; + }; + + patches = [ ./static-root-path.patch ]; + + postPatch = '' + patchShebangs . + substituteInPlace modules/setting/setting.go --subst-var data + ''; + + nativeBuildInputs = [ makeWrapper ]; + + buildFlags = optionalString sqliteSupport "-tags sqlite"; + + outputs = [ "bin" "out" "data" ]; + + postInstall = '' + mkdir $data + cp -R $src/{public,templates} $data + mkdir -p $out + cp -R $src/options/locale $out/locale + + wrapProgram $bin/bin/gitea \ + --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} + ''; + + goPackagePath = "code.gitea.io/gitea"; + + meta = { + description = "Git with a cup of tea"; + homepage = http://gitea.io; + license = licenses.mit; + maintainers = [ maintainers.disassembler ]; + }; +} diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch new file mode 100644 index 00000000000..06ce521e9e8 --- /dev/null +++ b/pkgs/applications/version-management/gitea/static-root-path.patch @@ -0,0 +1,13 @@ +diff --git i/modules/setting/setting.go w/modules/setting/setting.go +index aafe2d1b..1e4a8064 100644 +--- i/modules/setting/setting.go ++++ w/modules/setting/setting.go +@@ -683,7 +683,7 @@ func NewContext() { + LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL) + OfflineMode = sec.Key("OFFLINE_MODE").MustBool() + DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() +- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) ++ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") + AppDataPath = sec.Key("APP_DATA_PATH").MustString("data") + EnableGzip = sec.Key("ENABLE_GZIP").MustBool() + EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false) From bed68ed344d9e7a7cfebf0a1b653c82ca05aff85 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 19:32:29 +0200 Subject: [PATCH 1317/2806] Add *guibou* in maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3116336db90..e7bf217ac1d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -248,6 +248,7 @@ grburst = "Julius Elias "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; + guibou = "Guillaume Bouchard "; guillaumekoenig = "Guillaume Koenig "; guyonvarch = "Joris Guyonvarch "; hakuch = "Jesse Haber-Kucharsky "; From 7f83bf42617ad296fb29346ecf44bf8811fc633c Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 21:51:15 +0200 Subject: [PATCH 1318/2806] ptex: init at 2.1.28 --- pkgs/development/libraries/ptex/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/libraries/ptex/default.nix diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix new file mode 100644 index 00000000000..7774cdbcb88 --- /dev/null +++ b/pkgs/development/libraries/ptex/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, zlib, python, cmake }: + +stdenv.mkDerivation rec +{ + name = "ptex-${version}"; + version = "2.1.28"; + + src = fetchFromGitHub { + owner = "wdas"; + repo = "ptex"; + rev = "v${version}"; + sha256 = "1h6gb3mpis4m6ph7h9q764w50f9jrar3jz2ja76rn5czy6wn318x"; + }; + + outputs = [ "bin" "dev" "out" "lib" ]; + + buildInputs = [ zlib python cmake ]; + + sourceRoot = "ptex-v${version}-src"; + + enableParallelBuilding = true; + + buildPhase = '' + mkdir -p $out + + make prefix=$out + + mkdir -p $bin/bin + mkdir -p $dev/include + mkdir -p $lib/lib + ''; + + installPhase = '' + make install + mv $out/bin $bin/ + ''; + + meta = with stdenv.lib; { + description = "Per-Face Texture Mapping for Production Rendering"; + homepage = "http://ptex.us/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bef03ff836..4bacea9dde8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15740,6 +15740,8 @@ with pkgs; polybar = callPackage ../applications/misc/polybar { }; + ptex = callPackage ../development/libraries/ptex {}; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; From db6e674bc8b078a9f540e3cecc9482b45e9f1ff1 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 22:00:38 +0200 Subject: [PATCH 1319/2806] alembic: init at 1.7.4 --- .../development/libraries/alembic/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/alembic/default.nix diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix new file mode 100644 index 00000000000..4ab09f5bb1d --- /dev/null +++ b/pkgs/development/libraries/alembic/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5 }: + +stdenv.mkDerivation rec +{ + name = "alembic-${version}"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "alembic"; + repo = "alembic"; + rev = "${version}"; + sha256 = "00r6d8xk2sq5hdl5lp14nhyh1b2d68fxpzbm69fk6iq2f2gv0iqv"; + }; + + outputs = [ "bin" "dev" "out" "lib" ]; + + buildInputs = [ unzip cmake openexr hdf5 ]; + + sourceRoot = "${name}-src"; + + enableParallelBuilding = true; + + buildPhase = '' + cmake -DUSE_HDF5=ON -DCMAKE_INSTALL_PREFIX=$out/ -DUSE_TESTS=OFF . + + mkdir $out + mkdir -p $bin/bin + mkdir -p $dev/include + mkdir -p $lib/lib + ''; + + installPhase = '' + make install + + mv $out/bin $bin/ + mv $out/lib $lib/ + mv $out/include $dev/ + ''; + + meta = with stdenv.lib; { + description = "An open framework for storing and sharing scene data"; + homepage = "http://alembic.io/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bacea9dde8..0497dedf976 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13621,6 +13621,8 @@ with pkgs; airwave = callPackage ../applications/audio/airwave/default.nix { }; + alembic = callPackage ../development/libraries/alembic {}; + alchemy = callPackage ../applications/graphics/alchemy { }; alock = callPackage ../misc/screensavers/alock { }; From 3cbecaadc21e20ae54b347534b88b9566380b077 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 22:16:04 +0200 Subject: [PATCH 1320/2806] partio: init at 1.1.0 --- pkgs/development/libraries/partio/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/libraries/partio/default.nix diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix new file mode 100644 index 00000000000..ed0f38f8538 --- /dev/null +++ b/pkgs/development/libraries/partio/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, mesa, zlib, swig, python, doxygen, xorg }: + +stdenv.mkDerivation rec +{ + name = "partio-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "wdas"; + repo = "partio"; + rev = "v${version}"; + sha256 = "0z7n5ay21ca7g7xb80v6jmr96x9k7vm7zawawvmx71yj32rg1n34"; + }; + + outputs = [ "dev" "out" "lib" ]; + + buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; + + sourceRoot = "partio-v${version}-src"; + + enableParallelBuilding = true; + + buildPhase = '' + sed 's/ADD_LIBRARY (partio /ADD_LIBRARY (partio SHARED /' -i ../src/lib/CMakeLists.txt + CXXFLAGS="-std=c++11" cmake . + make partio + + mkdir $dev + mkdir -p $lib/lib + mkdir $out + ''; + + # TODO: + # Sexpr support + + installPhase = '' + mkdir $dev/lib + mkdir -p $dev/include/partio + + mv lib/libpartio.so $lib/lib + + mv ../src/lib/* $dev/include/partio + ''; + + meta = with stdenv.lib; { + description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; + homepage = "https://www.disneyanimation.com/technology/partio.html"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0497dedf976..78db19cc43f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15724,6 +15724,8 @@ with pkgs; ruby = ruby_2_1; }; + partio = callPackage ../development/libraries/partio {}; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; pcmanfm-qt = lxqt.pcmanfm-qt; From d99e00c9d88fa2f26ee192a2706153bd6d61668d Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 22:32:03 +0200 Subject: [PATCH 1321/2806] openfx: init at 1.4 --- pkgs/development/libraries/openfx/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/openfx/default.nix diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix new file mode 100644 index 00000000000..42edb1958ce --- /dev/null +++ b/pkgs/development/libraries/openfx/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, unzip }: + +stdenv.mkDerivation rec +{ + name = "openfx-${version}"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "ofxa"; + repo = "openfx"; + rev = "OFX_Release_1_4_TAG"; + sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; + }; + + buildInputs = [ unzip ]; + + outputs = [ "dev" "out" ]; + + enableParallelBuilding = true; + + buildPhase = '' + mkdir $dev + mkdir $out + ''; + + installPhase = '' + mkdir -p $dev/include/OpenFX/ + cp -r include/* $dev/include/OpenFX/ + ''; + + meta = with stdenv.lib; { + description = "Image processing plug-in standard"; + homepage = "http://openeffects.org/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78db19cc43f..754392b5e99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15890,6 +15890,8 @@ with pkgs; opencpn = callPackage ../applications/misc/opencpn { }; + openfx = callPackage ../development/libraries/openfx {}; + openimageio = callPackage ../applications/graphics/openimageio { }; openjump = callPackage ../applications/misc/openjump { }; From afc6a8a25944e5d980cdf41a6b7a22760ab2595e Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 22:31:28 +0200 Subject: [PATCH 1322/2806] openexrid-unstable: init at 2017-09-17 --- .../libraries/openexrid-unstable/default.nix | 50 +++++++++++++++++++ .../openexrid-unstable/openexrid.patch | 35 +++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 87 insertions(+) create mode 100644 pkgs/development/libraries/openexrid-unstable/default.nix create mode 100644 pkgs/development/libraries/openexrid-unstable/openexrid.patch diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix new file mode 100644 index 00000000000..fcf4c2c2468 --- /dev/null +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, mesa, openexr }: + +stdenv.mkDerivation rec +{ + name = "openexrid-unstable-${version}"; + version = "2017-09-17"; + + src = fetchFromGitHub { + owner = "MercenariesEngineering"; + repo = "openexrid"; + rev = "bec0081548a096f9bcdd1504970c96264b0fc050"; + sha256 = "0h4b74lv59p4hhrvrqdmlnchn2i0v5id4kl8xc7j26l9884q0383"; + }; + + outputs = [ "dev" "out" "lib" ]; + + patches = [ ./openexrid.patch ]; + + NIX_CFLAGS_COMPILE=''-I${ilmbase.dev}/include/OpenEXR + -I${openexr.dev}/include/OpenEXR + -I${openfx.dev}/include/OpenFX + ''; + + buildInputs = [ unzip re2 openfx zlib ilmbase mesa openexr ]; + + enableParallelBuilding = true; + + buildPhase = '' + mkdir openexrid/release + + PREFIX=$out make -C openexrid install + + mkdir $dev; + mkdir $lib; + ''; + + installPhase = '' + find $out + mv $out/include $dev/ + mv $out/lib $lib/ + ''; + + meta = with stdenv.lib; { + description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing"; + homepage = "https://github.com/MercenariesEngineering/openexrid"; + maintainers = [ maintainers.guibou ]; + platforms = platforms.all; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/openexrid-unstable/openexrid.patch b/pkgs/development/libraries/openexrid-unstable/openexrid.patch new file mode 100644 index 00000000000..bbbf75b575d --- /dev/null +++ b/pkgs/development/libraries/openexrid-unstable/openexrid.patch @@ -0,0 +1,35 @@ +diff --git a/makefile b/makefile +index 7a92771..31ef664 100644 +--- a/makefile ++++ b/makefile +@@ -8,8 +8,8 @@ _openexrid: + _openfx: + make -C openfx + +-_test: _openexrid +- make -C test ++#_test: _openexrid ++# make -C test + + clean: + make -C openfx clean +diff --git a/makefile.config b/makefile.config +index 0c6cdfa..0166c4c 100644 +--- a/makefile.config ++++ b/makefile.config +@@ -4,7 +4,7 @@ + + PREFIX ?= ~/openexrid + +-OFX_INCLUDE ?= /usr/include/openfx ++OFX_INCLUDE ?= /usr/include/OpenFX + EXR_INCLUDE ?= /usr/include/OpenEXR + EXR_LIB ?= /usr/lib + RE2_INCLUDE ?= /usr/include +@@ -13,5 +13,5 @@ RE2_LIB ?= /usr/lib + VERSION ?= release + CPPFLAGS += -O3 -Wall -DNDEBUG -fPIC -I $(EXR_INCLUDE) -I $(OFX_INCLUDE) -I $(RE2_INCLUDE) -Dlinux + LDFLAGS += -L$(EXR_LIB) -L$(RE2_LIB) -L../openexrid/$(VERSION) -lpthread +-LDFLAGS += -Wl,-Bstatic -lopenexrid -lIlmImf -lIlmThread -lIex -lImath -lHalf -lz -lre2 -Wl,-Bdynamic ++LDFLAGS += -lopenexrid -lIlmImf -lIlmThread -lIex -lImath -lHalf -lz -lre2 -Wl,-Bdynamic + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 754392b5e99..3fe80321945 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10032,6 +10032,8 @@ with pkgs; openexr = callPackage ../development/libraries/openexr { }; + openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; + openldap = callPackage ../development/libraries/openldap { }; opencolorio = callPackage ../development/libraries/opencolorio { }; From 41b06c1519533a51e356c6d53b0005ba21c1c901 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 22:42:14 +0200 Subject: [PATCH 1323/2806] openvdb: init at 4.0.2 --- .../development/libraries/openvdb/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/openvdb/default.nix diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix new file mode 100644 index 00000000000..b172b82a295 --- /dev/null +++ b/pkgs/development/libraries/openvdb/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: + +stdenv.mkDerivation rec +{ + name = "openvdb-${version}"; + version = "4.0.2"; + + src = fetchFromGitHub { + owner = "dreamworksanimation"; + repo = "openvdb"; + rev = "v${version}"; + sha256 = "0kqlsfa9rdpxpw7v61vfknvs11axh196ilqk6bnyyfkslmmcak45"; + }; + + outputs = [ "out" ]; + + buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ]; + + sourceRoot = "openvdb-v${version}-src/openvdb"; + + installTargets = "install_lib"; + + enableParallelBuilding = true; + + buildFlags = ''lib + DESTDIR=$(out) + HALF_LIB=-lHalf + TBB_LIB=-ltbb + BLOSC_LIB=-lblosc + LOG4CPLUS_LIB= + BLOSC_INCLUDE_DIR=${c-blosc}/include/ + BLOSC_LIB_DIR=${c-blosc}/lib/ + ''; + + installFlags = ''DESTDIR=$(out)''; + + NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; + NIX_LDFLAGS="-lboost_iostreams"; + + meta = with stdenv.lib; { + description = "An open framework for voxel"; + homepage = "http://www.openvdb.org"; + maintainers = [ maintainers.guibou ]; + platforms = platforms.all; + license = licenses.mpl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fe80321945..0aaa727286d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10058,6 +10058,8 @@ with pkgs; openslp = callPackage ../development/libraries/openslp {}; + openvdb = callPackage ../development/libraries/openvdb {}; + inherit (callPackages ../development/libraries/libressl { }) libressl_2_5 libressl_2_6; From 5bf6a2bca5f4feb224f934fb5613f1498daef430 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 18 Oct 2017 20:59:44 +0900 Subject: [PATCH 1324/2806] oraclejdk: 9 -> 9.0.1 --- pkgs/development/compilers/oraclejdk/jdk9-linux.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix index 7f0a5750c0e..fbda96e1425 100644 --- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix @@ -30,7 +30,7 @@ assert stdenv.system == "x86_64-linux"; assert swingSupport -> xorg != null; let - version = "9"; + version = "9.0.1"; downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; @@ -63,19 +63,19 @@ let result = stdenv.mkDerivation rec { requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jdk9-downloads-3848520.html"; - sha256 = "0vbgy7h9h089l3xh6sl57v57g28x1djyiigqs4z6gh7wahx7hv8w"; + sha256 = "0560dc3icrwb0ifykshvzkr04b1jr153m26x1r8rp0nhjbzz1nic"; } else if packageType == "JRE" then requireFile { name = "jre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jre9-downloads-3848532.html"; - sha256 = "18i4jjb6sby67xg5ql6dkk3ja1nackbb23g1bnp522450nclpxdb"; + sha256 = "11pfcck8am48yv7riaj10g6h79xdiy8lm5a9wjqbm3g9cls9ar1w"; } else if packageType == "ServerJRE" then requireFile { name = "serverjre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/server-jre9-downloads-3848530.html"; - sha256 = "01bxi7lx13lhlpbifw93b6r7a9bayiykw8kzwlyyqi8pz3pw8c5h"; + sha256 = "1biyks6jy0a2kksaj9qbsjifv34ym5mdw8akibmkwr1xh0wavygc"; } else abort "unknown package Type ${packageType}"; From de3d191b91a6d00f160c26974cf338e189bc519d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 17 Oct 2017 17:22:25 -0400 Subject: [PATCH 1325/2806] docker: add 17.10.0-ce --- .../virtualization/docker/default.nix | 38 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 +-- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 49920e28f76..48bb512e134 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -46,10 +46,10 @@ rec { }; # This should go into the containerd derivation once 1.0.0 is out - preBuild = (optionalString (version == "17.09.0-ce") '' + preBuild = '' mkdir $(pwd)/vendor/src mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ - '') + oldAttrs.preBuild; + '' + oldAttrs.preBuild; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { name = "docker-init"; @@ -122,7 +122,13 @@ rec { installPhase = '' install -Dm755 ./components/cli/docker $out/libexec/docker/docker - install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + + if [ -d "./components/engine/bundles/${version}" ]; then + install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + else + install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + fi + makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ @@ -175,7 +181,7 @@ rec { homepage = https://www.docker.com/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook vdemeester ]; + maintainers = with maintainers; [ nequissimus offline tailhook vdemeester ]; platforms = platforms.linux; }; }; @@ -183,18 +189,6 @@ rec { # Get revisions from # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits - docker_17_06 = dockerGen rec { - version = "17.06.2-ce"; - rev = "cec0b72a9940e047e945a09e1febd781e88366d6"; # git commit - sha256 = "1scqx28vzh72ziq00lbx92vsb896mj974j8f0zg11y6qc5n5jx3l"; - runcRev = "810190ceaa507aa2727d7ae6f4790c76ec150bd2"; - runcSha256 = "0f1x1z262qg579qb1w21axj3mibq4fbff3gamliw49sdqqnb7vk3"; - containerdRev = "6e23458c129b551d5c9871e5174f6b1b7f6d1170"; - containerdSha256 = "12kzc5z1nhxdbizzr494ywilbs6rdv39v5ql7lmfzwh350gwlg93"; - tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; - tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; - }; - docker_17_09 = dockerGen rec { version = "17.09.0-ce"; rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit @@ -206,4 +200,16 @@ rec { tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; + + docker_17_10 = dockerGen rec { + version = "17.10.0-ce"; + rev = "f4ffd2511ce93aa9e5eefdf0e912f77543080b0b"; # git commit + sha256 = "07x47cfdaz4lhlga1pchcbqqy0nd2q6zch0ycag18vzi99w4gmh2"; + runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d"; + runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0"; + containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; + containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a32a338042..566d5f3aef5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14098,11 +14098,11 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_06 - docker_17_09; + docker_17_09 + docker_17_10; docker = docker_17_09; - docker-edge = docker_17_09; + docker-edge = docker_17_10; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; From 1b0e69966b2ce659989702fe3bbfcafa52e3b505 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 18 Oct 2017 08:38:27 -0400 Subject: [PATCH 1326/2806] linux: 4.9.56 -> 4.9.57 --- 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 b820b6a917b..8a1ad7ca9dd 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.56"; + version = "4.9.57"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jnkf0ir42xkandx1lnqrxmskzwl6j46aqmzrxilddx9pkdjplhi"; + sha256 = "19lndirbyryx0qdwqqhn1g4rng7d79rk4sra5lpa2d3axia0a8q9"; }; } // (args.argsOverride or {})) From 67343e2f30f6ca5ae9d93619f9c625a0d09ea3f9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 18 Oct 2017 08:38:39 -0400 Subject: [PATCH 1327/2806] linux: 4.13.7 -> 4.13.8 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index d54586c5f4f..ee1aa79f540 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.7"; + version = "4.13.8"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16vjjl3qw0a8ci6xbnywhb8bpr3ccbs0i6xa54lc094cd5gvx4v3"; + sha256 = "09zl4gpw9j4xn6p78s6ba6qjjxpsy8whhvn19wnjhr9w4al8rrk4"; }; } // (args.argsOverride or {})) From 98c7361d3ba065610c10566cba9db2086d868f9c Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 19 Oct 2017 02:03:36 +1100 Subject: [PATCH 1328/2806] idrisPackages.lightyear: 2016-08-01 -> 2017-09-10 --- pkgs/development/idris-modules/lightyear.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix index 11afd4ebe76..27828e6f41f 100644 --- a/pkgs/development/idris-modules/lightyear.nix +++ b/pkgs/development/idris-modules/lightyear.nix @@ -8,7 +8,7 @@ }: let - date = "2016-08-01"; + date = "2017-09-10"; in build-idris-package { name = "lightyear-${date}"; @@ -16,8 +16,8 @@ build-idris-package { src = fetchFromGitHub { owner = "ziman"; repo = "lightyear"; - rev = "9420f9e892e23a7016dea1a61d8ce43a6d4ecf15"; - sha256 = "0xbjwq7sk4x78mi2zcqxbx7wziijlr1ayxihb1vml33lqmsgl1dn"; + rev = "f737e25a09c1fe7c5fff063c53bd7458be232cc8"; + sha256 = "05x66abhpbdm6yr0afbwfk6w04ysdk78gylj5alhgwhy4jqakv29"; }; propagatedBuildInputs = [ prelude base effects ]; From b269452346b0ed40530cccd3edb530f69c1b75af Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 18 Oct 2017 11:11:43 -0400 Subject: [PATCH 1329/2806] vscode: 1.17.1 -> 1.17.2 --- 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 b5b2a49c42b..23bcdae5fb2 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.17.1"; + version = "1.17.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "09nvibfn2z5cxjcdxqa2xy63jqwpvfgk7hdy1pc0mnpszz6kn4v7"; - "x86_64-linux" = "1fb3hil7dggnz7hks1i806ckd3wl5g0a2syjdbh9dx5iqarp2782"; - "x86_64-darwin" = "1vgbsmbcsdxc0h0ny61a3rhbwxzrfzkxl47sy3w410xcqlv8ad2v"; + "i686-linux" = "04mnj74pqkgfgdacq4643qrd7ybka1366lr7mwn0f70lk05wb2h2"; + "x86_64-linux" = "0y37wwvq6flaa2fh2r6b9cplbcszq726zrx6b8slzq6s5wl2lgmr"; + "x86_64-darwin" = "1cqyir7ijwafy68d5vbw47cs1x2lqs1wjnvhhw15yi2d7c14fq7q"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From 914fcc8b4b764bdef3c44f79a7739067786abe01 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 18 Oct 2017 16:38:51 +0100 Subject: [PATCH 1330/2806] telegraf: 1.4.1 -> 1.4.2 --- pkgs/servers/monitoring/telegraf/default.nix | 4 ++-- .../monitoring/telegraf/{deps-1.4.1.nix => deps-1.4.2.nix} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/servers/monitoring/telegraf/{deps-1.4.1.nix => deps-1.4.2.nix} (100%) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 8e11fe877c8..59b27efba56 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.4.1"; + version = "1.4.2"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1q0xl599zyqyralsl6mml1xl0h2206564sa2azivjmg48z7blcll"; + sha256 = "1lmk0czqbr4mn1zf99403r8s6nyyk3bxwgvxfx7w4apvxl433iw4"; }; buildFlagsArray = [ ''-ldflags= diff --git a/pkgs/servers/monitoring/telegraf/deps-1.4.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.4.2.nix similarity index 100% rename from pkgs/servers/monitoring/telegraf/deps-1.4.1.nix rename to pkgs/servers/monitoring/telegraf/deps-1.4.2.nix From e307421d26cc16eae7ad1dceb84fcbede4ee9976 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 17 Oct 2017 17:48:50 +0200 Subject: [PATCH 1331/2806] atlassian-confluence: 6.4.0 -> 6.4.2 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index a4cc5c8780d..8b107e74f3f 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.4.0"; + version = "6.4.2"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "1ba8zpcywnnanzqxjaqiyfc6j5qr6jk6laryz8npiqz4grv3qk61"; + sha256 = "1akwbgbks6k63m22vrcvvz9jz4wqz380j8gb8lzbzm4yk8y7f4p9"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; From 369cbba1408da0250b52219a82f220f7d5e2d98d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 17 Oct 2017 17:49:03 +0200 Subject: [PATCH 1332/2806] atlassian-jira: 7.5.0 -> 7.5.1 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index f2ccb523e2f..c8b9978a9ed 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.5.0"; + version = "7.5.1"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "12pf0q1ixsf9ld0569mbwvjz5v9bhh7ad3bd8x9qx188vq5cz381"; + sha256 = "0dl9sjp1z7h340phmfhwha2j7hj5zcspk8v7n6vhsrfsjbkm80vy"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; From 8bd1580d1a53217770e98232ba5b75aa04c1efc2 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 18 Oct 2017 16:46:54 +0100 Subject: [PATCH 1333/2806] powerdns: 4.0.3 -> 4.0.4 --- pkgs/servers/dns/powerdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 8a669d78d57..0ad51690abb 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "10p2m2zbydbd5xjdgf8z4zgvl8diyb4k3bq1hzsl32r71daj3yk0"; + sha256 = "0qypns1iqlrc5d3iwabrsi1vpb0yffy36chsb1zpqiv9vs4snx6r"; }; nativeBuildInputs = [ pkgconfig ]; From 66201d49bb3f2a0c2e2c4665791880b7a32f0622 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Wed, 18 Oct 2017 00:16:46 -0400 Subject: [PATCH 1334/2806] gitea: add nixos service module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/gitea.nix | 270 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 273 insertions(+) create mode 100644 nixos/modules/services/misc/gitea.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a8cb957ffe2..7486f27ec1a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -296,6 +296,7 @@ ./services/misc/fstrim.nix ./services/misc/gammu-smsd.nix ./services/misc/geoip-updater.nix + ./services/misc/gitea.nix #./services/misc/gitit.nix ./services/misc/gitlab.nix ./services/misc/gitolite.nix diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix new file mode 100644 index 00000000000..f0b44b7bede --- /dev/null +++ b/nixos/modules/services/misc/gitea.nix @@ -0,0 +1,270 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.gitea; + configFile = pkgs.writeText "app.ini" '' + APP_NAME = ${cfg.appName} + RUN_USER = ${cfg.user} + RUN_MODE = prod + + [database] + DB_TYPE = ${cfg.database.type} + HOST = ${cfg.database.host}:${toString cfg.database.port} + NAME = ${cfg.database.name} + USER = ${cfg.database.user} + PASSWD = #dbpass# + PATH = ${cfg.database.path} + + [repository] + ROOT = ${cfg.repositoryRoot} + + [server] + DOMAIN = ${cfg.domain} + HTTP_ADDR = ${cfg.httpAddress} + HTTP_PORT = ${toString cfg.httpPort} + ROOT_URL = ${cfg.rootUrl} + STATIC_ROOT_PATH = ${cfg.staticRootPath} + + [session] + COOKIE_NAME = session + COOKIE_SECURE = ${boolToString cfg.cookieSecure} + + [security] + SECRET_KEY = #secretkey# + INSTALL_LOCK = true + + ${cfg.extraConfig} + ''; +in + +{ + options = { + services.gitea = { + enable = mkOption { + default = false; + type = types.bool; + description = "Enable Gitea Service."; + }; + + useWizard = mkOption { + default = false; + type = types.bool; + description = "Do not generate a configuration and use gitea' installation wizard instead. The first registered user will be administrator."; + }; + + stateDir = mkOption { + default = "/var/lib/gitea"; + type = types.str; + description = "gitea data directory."; + }; + + user = mkOption { + type = types.str; + default = "gitea"; + description = "User account under which gitea runs."; + }; + + database = { + type = mkOption { + type = types.enum [ "sqlite3" "mysql" "postgres" ]; + example = "mysql"; + default = "sqlite3"; + description = "Database engine to use."; + }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Database host address."; + }; + + port = mkOption { + type = types.int; + default = 3306; + description = "Database host port."; + }; + + name = mkOption { + type = types.str; + default = "gitea"; + description = "Database name."; + }; + + user = mkOption { + type = types.str; + default = "gitea"; + description = "Database user."; + }; + + password = mkOption { + type = types.str; + default = ""; + description = '' + The password corresponding to . + Warning: this is stored in cleartext in the Nix store! + Use instead. + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/gitea-dbpassword"; + description = '' + A file containing the password corresponding to + . + ''; + }; + + path = mkOption { + type = types.str; + default = "${cfg.stateDir}/data/gitea.db"; + description = "Path to the sqlite3 database file."; + }; + }; + + appName = mkOption { + type = types.str; + default = "gitea: Gitea Service"; + description = "Application name."; + }; + + repositoryRoot = mkOption { + type = types.str; + default = "${cfg.stateDir}/repositories"; + description = "Path to the git repositories."; + }; + + domain = mkOption { + type = types.str; + default = "localhost"; + description = "Domain name of your server."; + }; + + rootUrl = mkOption { + type = types.str; + default = "http://localhost:3000/"; + description = "Full public URL of gitea server."; + }; + + httpAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "HTTP listen address."; + }; + + httpPort = mkOption { + type = types.int; + default = 3000; + description = "HTTP listen port."; + }; + + cookieSecure = mkOption { + type = types.bool; + default = false; + description = '' + Marks session cookies as "secure" as a hint for browsers to only send + them via HTTPS. This option is recommend, if gitea is being served over HTTPS. + ''; + }; + + staticRootPath = mkOption { + type = types.str; + default = "${pkgs.gitea.data}"; + example = "/var/lib/gitea/data"; + description = "Upper level of template and static files path."; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Configuration lines appended to the generated gitea configuration file."; + }; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.gitea = { + description = "gitea"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.gitea.bin ]; + + preStart = let + runConfig = "${cfg.stateDir}/custom/conf/app.ini"; + secretKey = "${cfg.stateDir}/custom/conf/secret_key"; + in '' + mkdir -p ${cfg.stateDir} + + # copy custom configuration and generate a random secret key if needed + ${optionalString (cfg.useWizard == false) '' + mkdir -p ${cfg.stateDir}/custom/conf + cp -f ${configFile} ${runConfig} + + if [ ! -e ${secretKey} ]; then + head -c 16 /dev/urandom | base64 > ${secretKey} + fi + + KEY=$(head -n1 ${secretKey}) + DBPASS=$(head -n1 ${cfg.database.passwordFile}) + sed -e "s,#secretkey#,$KEY,g" \ + -e "s,#dbpass#,$DBPASS,g" \ + -i ${runConfig} + chmod 640 ${runConfig} ${secretKey} + ''} + + mkdir -p ${cfg.repositoryRoot} + # update all hooks' binary paths + HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*") + if [ "$HOOKS" ] + then + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${pkgs.gitea.bin}/bin/gitea,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS + fi + if [ ! -d ${cfg.stateDir}/conf/locale ] + then + mkdir -p ${cfg.stateDir}/conf + cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale + fi + ''; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + WorkingDirectory = cfg.stateDir; + ExecStart = "${pkgs.gitea.bin}/bin/gitea web"; + Restart = "always"; + }; + + environment = { + USER = cfg.user; + HOME = cfg.stateDir; + GITEA_WORK_DIR = cfg.stateDir; + }; + }; + + users = mkIf (cfg.user == "gitea") { + extraUsers.gitea = { + description = "Gitea Service"; + home = cfg.stateDir; + createHome = true; + }; + }; + + warnings = optional (cfg.database.password != "") + ''config.services.gitea.database.password will be stored as plaintext + in the Nix store. Use database.passwordFile instead.''; + + # Create database passwordFile default when password is configured. + services.gitea.database.passwordFile = + (mkDefault (toString (pkgs.writeTextFile { + name = "gitea-database-password"; + text = cfg.database.password; + }))); + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bef03ff836..84bf74a2234 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2255,6 +2255,8 @@ with pkgs; git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; + gitea = callPackage ../applications/version-management/gitea { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; From 4233b83226c80b1b708cfd9ce9011cea1bc88888 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 18 Oct 2017 18:52:21 +0200 Subject: [PATCH 1335/2806] perl-CryptX: 0.050 -> 0.054 --- 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 69c89c2529d..9f1423c65c1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2917,10 +2917,10 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.050"; + name = "CryptX-0.054"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "c1de040779d9f5482d0a2f17a9a5aa6b069c7c58c07fbe26ab62bc689a5c9161"; + sha256 = "f084a706f6ff032ca5c46ec6f90ba5b6a26ae8752584911830f6535bf76d8e57"; }; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { From 34309999ed63fb5dfabd6e5068856157d2e35608 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 18 Oct 2017 05:50:06 +0000 Subject: [PATCH 1336/2806] ocamlPackages.lablgtk: remove unused dependency to campl4 --- pkgs/development/ocaml-modules/lablgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index d6e56126018..9d01b73479a 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: let pname = "lablgtk"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4]; + buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; From c9da6d37e933b5440f007ea82f735c450c7aee73 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 18 Oct 2017 19:49:23 +0100 Subject: [PATCH 1337/2806] powerdns: remove nhooyr as maintainer --- pkgs/servers/dns/powerdns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 0ad51690abb..ff21a9e8f09 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # cannot find postgresql libs on macos x license = licenses.gpl2; - maintainers = [ maintainers.mic92 maintainers.nhooyr ]; + maintainers = [ maintainers.mic92 ]; }; } From b93881139387d70772d3fc4e8a2deacf1ce3f102 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 18 Oct 2017 05:25:48 +0000 Subject: [PATCH 1338/2806] ocamlgraph: 1.8.7 -> 1.8.8 --- pkgs/development/ocaml-modules/ocamlgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index f6379c8b5a7..e005024d222 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocamlgraph-${version}"; - version = "1.8.7"; + version = "1.8.8"; src = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; - sha256 = "1845r537swjil2fcj7lgbibc2zybfwqqasrd2s7bncajs83cl1nz"; + sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"; }; buildInputs = [ ocaml findlib lablgtk ]; From 9c8a0c0bcced933125c1fc21d444f9d3b4686dfe Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 16 Oct 2017 00:09:30 +0200 Subject: [PATCH 1339/2806] tor-browser-bundle.tor-launcher: 0.2.12.3 -> 0.2.13 --- .../networking/browsers/tor-browser-bundle/extensions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index 53c278bc065..2f2d2ffab9d 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -88,14 +88,14 @@ tor-launcher = stdenv.mkDerivation rec { name = "tor-launcher-${version}"; - version = "0.2.12.3"; + version = "0.2.13"; extid = "tor-launcher@torproject.org"; src = fetchgit { url = "https://git.torproject.org/tor-launcher.git"; rev = "refs/tags/${version}"; - sha256 = "0126x48pjiy2zm4l8jzhk70w24hviaz560ffp4lb9x0ar615bc9q"; + sha256 = "1f98v88y2clwvjiw77kxqc9cacp5h0489a540nc2wmsx7vnskrq0"; }; nativeBuildInputs = [ zip ]; From 9cf5492a7b19bf1191e632ac1779cb21241e93c3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 16 Oct 2017 00:10:02 +0200 Subject: [PATCH 1340/2806] tor-browser-bundle.https-everywhere: 2017.9.12 -> 2017.10.4 --- .../networking/browsers/tor-browser-bundle/extensions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index 2f2d2ffab9d..64ed0eca301 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -16,14 +16,14 @@ { https-everywhere = stdenv.mkDerivation rec { name = "https-everywhere-${version}"; - version = "2017.9.12"; + version = "2017.10.4"; extid = "https-everywhere-eff@eff.org"; src = fetchgit { url = "https://git.torproject.org/https-everywhere.git"; rev = "refs/tags/${version}"; - sha256 = "179429pngyksp9xkr86nf2m5q6zmg19c7ng1dhqjfb1vsncwgw66"; + sha256 = "1g7971xygnhagnb25xjdf6mli6091ai9igx42d0ww88g8i0cqfzj"; fetchSubmodules = true; # for translations, TODO: remove }; From 6d31872885e4cc23576492a285311a822bb9ff47 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 16 Oct 2017 00:10:18 +0200 Subject: [PATCH 1341/2806] tor-browser-bundle.noscript: 5.0.10 -> 5.1.2 --- .../networking/browsers/tor-browser-bundle/extensions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index 64ed0eca301..86c2f53b9ad 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -47,13 +47,13 @@ noscript = stdenv.mkDerivation rec { name = "noscript-${version}"; - version = "5.0.10"; + version = "5.1.2"; extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}"; src = fetchurl { url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi"; - sha256 = "18k5karbaj5mhd9cyjbqgik6044bw88rjalkh6anjanxbn503j6g"; + sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42"; }; unpackPhase = ":"; From 5c732e3c465223508286428f0367b04e6c066c0f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 17 Oct 2017 02:18:18 +0200 Subject: [PATCH 1342/2806] tinycc: 0.9.27pre-20170924 -> 0.9.27pre-20171016 --- pkgs/development/compilers/tinycc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 4d655521334..e88246ecb93 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,9 +2,9 @@ with stdenv.lib; let - date = "20170924"; - rev = "1443039416dd02750765efde1af35e31c8d41be3"; - sha256 = "060l0f77hirq3i5bg294gxcszlvyn89ds2q21jwgy3ryrapfbl8i"; + date = "20171016"; + rev = "da8c62f75d893449e232944fc62566c020b4d010"; + sha256 = "0pdvyhrx7g9imxpc7gr75116imi6ifn0ihsl4fbffsji2dpi61y2"; version = "0.9.27pre-${date}"; in From a8a38feeeb1efafcfea396f612a9a852e405f4b0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Oct 2017 21:30:25 +0200 Subject: [PATCH 1343/2806] lkl: 2017-08-09 -> 2017-10-18 Based on linux 4.13 --- pkgs/applications/virtualization/lkl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index b790a15e607..c62fa63ea59 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: stdenv.mkDerivation rec { - name = "lkl-2017-08-09"; - rev = "083cdeece0577635d523244dcf0da86074e23e4e"; + name = "lkl-2017-10-18"; + rev = "bfb315c4612c38427e3239d0a427a125d9ba0ede"; outputs = [ "dev" "lib" "out" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "1fyh0p54jgsqywswj40zbw64jbqx2w10wax1k3j2szzlhjrv9x1a"; + sha256 = "172ccn2gsybnji7giiqq63bvp9nsw8kri88pjlvinwpwsv7x81aa"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds From 468cccbb7b67d3405cc79c49a1bfc2549d95eed2 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 18 Oct 2017 12:11:14 -0400 Subject: [PATCH 1344/2806] eclipse-platform, eclipse-sdk: 4.7.0 -> 4.7.1a --- pkgs/applications/editors/eclipse/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index b039bd168d8..5ef29081cf0 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -8,6 +8,9 @@ assert stdenv ? glibc; +# http://download.eclipse.org/eclipse/downloads/ is the main place to +# find the downloads needed for new versions + rec { buildEclipse = import ./build-eclipse.nix { @@ -111,16 +114,16 @@ rec { }; eclipse-platform-47 = buildEclipse { - name = "eclipse-platform-4.7"; + name = "eclipse-platform-4.7.1a"; description = "Eclipse Platform Oxygen"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk-x86_64.tar.gz; - sha256 = "0hrgijydxvd2zz1npv5qw8d79f48a6lsdw3qy1wqf7k59aqyg2fq"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz; + sha256 = "13gyrnhyhdpsrbi5nl0fhpwrqz3gdyqq3r0m1f2z3y6yr75sgw33"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk.tar.gz; - sha256 = "00m89j26m8nj190q144wx8d88mldx1z6i797p8isg3rhbz3x5dbc"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk.tar.gz; + sha256 = "013dfk23wa4jy177ywrkkr16wdjf6jxzjcz6mkl4ygki47yj9c5s"; }; }; }; @@ -165,16 +168,16 @@ rec { }; eclipse-sdk-47 = buildEclipse { - name = "eclipse-sdk-4.7"; + name = "eclipse-sdk-4.7.1a"; description = "Eclipse Oxygen Classic"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk-x86_64.tar.gz; - sha256 = "1nz0hl0gg4a8iffnaggbhdw0ra8a7wljlimvijbbybh0nhvfd9n3"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk-x86_64.tar.gz; + sha256 = "05xpdbig170rw7k5dx33dlyz187wv62mma8s5wxrqi7f4117sx4y"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk.tar.gz; - sha256 = "0dar69v7d7bkl18si45bccvil809a85ghb7k88m1q2cq1kd2r8z5"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk.tar.gz; + sha256 = "09c9m88k1cm9bhd900p5yf2q9pijrymgjcbhmagz0fcwhldrv0ys"; }; }; }; From 346fa91176c702eb662041840f352562172a8460 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 18 Oct 2017 12:22:43 -0400 Subject: [PATCH 1345/2806] eclipse-plugin-jdt: 4.7 -> 4.7.1a --- pkgs/applications/editors/eclipse/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index b9b0ee61c0b..f3459e57d9b 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -364,12 +364,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.7"; + version = "4.7.1a"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/org.eclipse.jdt-4.7.zip"; - sha256 = "0y17shnlh90gg9226lraknvdnp2i71ck91dnxbbzvxl8b64v8v1p"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/org.eclipse.jdt-4.7.1a.zip; + sha256 = "1hpvpj8ghfk8aqbzfrpcxw3wxrczq6zd3bpx4sxjrsi926jsjaf4"; }; meta = with stdenv.lib; { From 43ebfb5016945390bf5854dfd37ef9b6a5ef8a98 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 18 Oct 2017 23:21:37 +0000 Subject: [PATCH 1346/2806] coqPackages.flocq: 2.5.2 -> 2.6.0 --- pkgs/development/coq-modules/flocq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 30ec69ba653..092337125a4 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "coq${coq.coq-version}-flocq-${version}"; - version = "2.5.2"; + version = "2.6.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36199/flocq-2.5.2.tar.gz; - sha256 = "0h5mlasirfzc0wwn2isg4kahk384n73145akkpinrxq5jsn5d22h"; + url = https://gforge.inria.fr/frs/download.php/file/37054/flocq-2.6.0.tar.gz; + sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3"; }; buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ]; From 318b3fb34e3dd5f8f3a86f6e60ade1ac3bce6305 Mon Sep 17 00:00:00 2001 From: Volth Date: Thu, 19 Oct 2017 00:45:09 +0000 Subject: [PATCH 1347/2806] tixati: init at 2.55 --- .../networking/p2p/tixati/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/networking/p2p/tixati/default.nix diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix new file mode 100644 index 00000000000..76034e6f735 --- /dev/null +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, glib, zlib, dbus, dbus_glib, gtk2, gdk_pixbuf, cairo, pango }: + +stdenv.mkDerivation rec { + name = "tixati-${version}"; + version = "2.55"; + + src = fetchurl { + url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; + sha256 = "02mha6lfcb0mg0y977bxa6xg8krpbsbzpm4b5xw6y6wign4d8a8w"; + }; + + installPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus_glib gtk2 gdk_pixbuf cairo pango ]} \ + tixati + install -D tixati $out/bin/tixati + install -D tixati.desktop $out/share/applications/tixati.desktop + install -D tixati.png $out/share/icons/tixati.png + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "Torrent client"; + homepage = http://www.tixati.com; + license = licenses.free; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ volth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9a3674ee6c..d604f410898 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16723,6 +16723,8 @@ with pkgs; tint2 = callPackage ../applications/misc/tint2 { }; + tixati = callPackage ../applications/networking/p2p/tixati { }; + tkcvs = callPackage ../applications/version-management/tkcvs { }; tla = callPackage ../applications/version-management/arch { }; From a8989e6bb0c5478928d5c4e684957b579e8e2743 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 19 Oct 2017 03:49:33 +0200 Subject: [PATCH 1348/2806] libqtav: unstable-2017-03-30 -> 1.12.0 This was actually already mentioned in the comment above version: Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the the reason behind taking an unstable git rev. So version 1.12.0 has been released in the meantime and it's also needed by the latest version of digiKam, which is the only package in nixpkgs that depends on libqtav. As we're going to bump digiKam, I think bumping this is safe as in the worst case we can only make things broken which are already broken (digiKam currently doesn't build). The fixes for the CMakeLists.txt are now also no longer needed, so we can safely drop them as well. Signed-off-by: aszlig Cc: @jraygauthier --- pkgs/development/libraries/libqtav/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index a79e6d90384..93d8ced49ce 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -9,13 +9,10 @@ with lib; mkDerivation rec { name = "libqtav-${version}"; - - # Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the - # the reason behind taking an unstable git rev. - version = "unstable-2017-03-30"; + version = "1.12.0"; nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ + buildInputs = [ qtbase qtmultimedia qtquick1 mesa libX11 libass openal ffmpeg libuchardet @@ -23,18 +20,13 @@ mkDerivation rec { ]; src = fetchFromGitHub { - sha256 = "1xw0ynm9w501651rna3ppf8p336ag1p60i9dxhghzm543l7as93v"; - rev = "4b4ae3b470b2fcbbcf1b541c2537fb270ee0bcfa"; + sha256 = "03ii9l38l3fsr27g42fx4151ipzkip2kr4akdr8x28sx5r9rr5m2"; + rev = "v${version}"; repo = "QtAV"; owner = "wang-bin"; fetchSubmodules = true; }; - patchPhase = '' - sed -i -e 's#CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT#TRUE#g' ./CMakeLists.txt - sed -i -e 's#DESTINATION ''${QT_INSTALL_LIBS}/cmake#DESTINATION ''${QTAV_INSTALL_LIBS}/cmake#g' ./CMakeLists.txt - ''; - # Make sure libqtav finds its libGL dependancy at both link and run time # by adding mesa to rpath. Not sure why it wasn't done automatically like # the other libraries as `mesa` is part of our `buildInputs`. From 922bd8182e060e576150b0bc442f116d0a6eca1e Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Mon, 16 Oct 2017 15:46:10 -0700 Subject: [PATCH 1349/2806] tzupdate: init at 1.2.0 --- pkgs/applications/misc/tzupdate/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/tzupdate/default.nix diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix new file mode 100644 index 00000000000..7eb0f2d41b5 --- /dev/null +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, python }: + +let + inherit (python.pkgs) buildPythonApplication fetchPypi requests; +in +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "tzupdate"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wj2r1wirnn5kllaasdldimvp3cc3w7w890iqrjksz5wwjbnj8pk"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + description = "Update timezone information based on geoip."; + homepage = https://github.com/cdown/tzupdate; + maintainers = [ maintainers.michaelpj ]; + license = licenses.unlicense; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bef03ff836..6076927584f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4635,6 +4635,8 @@ with pkgs; timetrap = callPackage ../applications/office/timetrap { }; + tzupdate = callPackage ../applications/misc/tzupdate { }; + tinc = callPackage ../tools/networking/tinc { }; tie = callPackage ../development/tools/misc/tie { }; From 27b7192726e565b463fd5af74842a6d0287fec48 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 19 Oct 2017 03:04:45 +0200 Subject: [PATCH 1350/2806] digikam: 5.4.0 -> 5.7.0 The build for the version 5.4.0 of digiKam has been broken at the time prior to this commit, which is the main reason for this update as I don't think it makes sense to fix the build for 5.4.0 when we're going to update it anyway. A lot has changed upstream between version 5.4.0 and 5.7.0 and it's too much to be summarized here, so here are the URLs to the upstream announcements: * https://www.digikam.org/news/2017-03-14_digiKam_5.5.0_is_released/ * https://www.digikam.org/news/2017-06-21-5.6.0-release-announcement/ * https://www.digikam.org/news/2017-09-11-5.7.0_release_announcement/ On the packaging side, we now no longer have the patch that disables -fno-operator-names because the build runs fine without that patch (which didn't even apply but I didn't check why) and IMO it doesn't make sense to rebase that patch for no reason. Additionally, there were build time dependencies lurking around in propagatedBuildInputs, which is kinda pointless and the application just runs fine if those dependencies are listed in buildInputs. While looking for clues about why that might be necessary I haven't found any comment about it in the source nor a clarification within the message of the commit where this has been introduced. The commit in question is be7b7d908f82e8ab16c43ffd0e240addd6f4018a. Apart from these changes, the rest is just adding a few dependencies (kcalcore, libksane, mesa and pcre) to get less errors during cmakeConfigurePhase. I've tested digiKam by playing around within a VM using photos I netcat'ed into it and it works so far. The VM was built using: nix-build nixos --arg configuration '{ pkgs, ... }: { imports = [ ./nixos/tests/common/user-account.nix ]; environment.systemPackages = [ pkgs.digikam ]; services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.default = "plasma5"; virtualisation.memorySize = 1024; }' -A vm What I didn't test however was whether importing from a camera would work (as I don't have one), but aside from that, the application seems to run fine compared to the fact that it didn't even build until now :-) Signed-off-by: aszlig Cc: @the-kenny, @urkud, @viric, @cillianderoiste, @ttuegel Cc: @jraygauthier, @fkz, @sh01, @lsix --- .../0001-Disable-fno-operator-names.patch | 25 ------------------- .../applications/graphics/digikam/default.nix | 22 ++++++++-------- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 13 insertions(+), 35 deletions(-) delete mode 100644 pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch diff --git a/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch b/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch deleted file mode 100644 index 149a2b2b1ac..00000000000 --- a/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch +++ /dev/null @@ -1,25 +0,0 @@ -From beb9ad0149adfe448acfa650fb3e171d5fdd7e27 Mon Sep 17 00:00:00 2001 -From: Moritz Ulrich -Date: Wed, 22 Feb 2017 15:28:11 +0100 -Subject: [PATCH] Disable `-fno-operator-names` - ---- - core/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 89e06827e6..01d0c88ea9 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -98,6 +98,8 @@ include(MacroOpenCV) - include(MacroJPEG) - include(MacroBoolTo01) - -+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+ - # ================================================================================================== - - option(ENABLE_OPENCV3 "Build digiKam with OpenCV3 instead OpenCV2 (default=OFF)" OFF) --- -2.11.1 - diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 96b1ca54d55..44ee807fe98 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -8,6 +8,7 @@ , qtsvg , qtwebkit +, kcalcore , kconfigwidgets , kcoreaddons , kdoctools @@ -28,12 +29,15 @@ , lensfun , libgphoto2 , libkipi +, libksane , liblqr1 , libqtav , libusb1 +, mesa , marble , mysql -, opencv +, opencv3 +, pcre , threadweaver # For panorama and focus stacking @@ -46,17 +50,15 @@ mkDerivation rec { name = "digikam-${version}"; - version = "5.4.0"; + version = "5.7.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; - sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg"; + sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; }; nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ]; - patches = [ ./0001-Disable-fno-operator-names.patch ]; - buildInputs = [ bison boost @@ -68,19 +70,21 @@ mkDerivation rec { lensfun libgphoto2 libkipi + libksane liblqr1 libqtav libusb1 + mesa mysql - opencv - ]; + opencv3 + pcre - propagatedBuildInputs = [ qtbase qtxmlpatterns qtsvg qtwebkit + kcalcore kconfigwidgets kcoreaddons kfilemetadata @@ -98,8 +102,6 @@ mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" - "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" "-DENABLE_MEDIAPLAYER=1" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9a3674ee6c..515698b1c12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17576,6 +17576,7 @@ with pkgs; digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; + inherit (kdeApplications) kcalcore; boost = boost160; }; From eb31aec16e77798619ebf7b515c4fd26da28ec9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Thu, 12 Oct 2017 21:26:33 +0200 Subject: [PATCH 1351/2806] profanity: enable parallel build --- .../networking/instant-messengers/profanity/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 79fb9b5c7f9..b8cd292b6ca 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ readline libuuid libmesode glib openssl expat ncurses libotr curl From a441af368a653b0b48d739c8e6bbf36a6fc0072c Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Wed, 18 Oct 2017 20:05:04 -0700 Subject: [PATCH 1352/2806] alacritty: unstable 2017-09-02 -> 2017-10-17 --- pkgs/applications/misc/alacritty/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 79333e7d9fa..411705e6a6a 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -29,16 +29,16 @@ let in buildRustPackage rec { - name = "alacritty-unstable-2017-09-02"; + name = "alacritty-unstable-2017-10-17"; src = fetchFromGitHub { owner = "jwilm"; repo = "alacritty"; - rev = "22fa4260fc9210fbb5288090df79c92e7b3788e4"; - sha256 = "0jjvvm0fm25p1h1rgfqlnhq4bwrjdxpb2pgnmpik9pl7qwy3q7s1"; + rev = "5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6"; + sha256 = "0h37x12r33xwz9vf1n8y24c0ph5w17lhkpfi5q6lbpgidvbs6fyx"; }; - depsSha256 = "19lrj4i6vzmf22r6xg99zcwvzjpiar8pqin1m2nvv78xzxx5yvgb"; + depsSha256 = "05gkl2zg546i2pm0gx11s56f7dk72qpm39kml1d2myj81s0vyb5z"; buildInputs = [ cmake From 07e81b66f228d6d2d4ff059c6ba85a0202d31058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Thu, 12 Oct 2017 21:28:21 +0200 Subject: [PATCH 1353/2806] profanity: enable pgp support --- .../networking/instant-messengers/profanity/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index b8cd292b6ca..e994a9849c8 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -4,11 +4,13 @@ , autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null , notifySupport ? false, libnotify ? null, gdk_pixbuf ? null , traySupport ? false, gnome2 ? null +, pgpSupport ? true, gpgme ? null }: assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; assert notifySupport -> libnotify != null && gdk_pixbuf != null; assert traySupport -> gnome2 != null; +assert pgpSupport -> gpgme != null; with stdenv.lib; @@ -30,7 +32,8 @@ stdenv.mkDerivation rec { glib openssl expat ncurses libotr curl ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ optionals notifySupport [ libnotify gdk_pixbuf ] - ++ optionals traySupport [ gnome2.gtk ]; + ++ optionals traySupport [ gnome2.gtk ] + ++ optionals pgpSupport [ gpgme ]; meta = { description = "A console based XMPP client"; From 84847258bb9c7ae724fc1eaaea70eb39ef70f676 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 11 Oct 2017 12:29:30 +0800 Subject: [PATCH 1354/2806] plasma: 5.10.5 -> 5.11.1 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/kde-cli-tools.nix | 4 +- .../plasma-5/plasma-desktop/ibus.patch | 26 -- .../plasma-desktop/qml-import-paths.patch | 27 +- pkgs/desktops/plasma-5/plasma-desktop/series | 1 - pkgs/desktops/plasma-5/plasma-integration.nix | 4 +- .../plasma-workspace/qml-import-path.patch | 51 +-- pkgs/desktops/plasma-5/srcs.nix | 352 +++++++++--------- pkgs/desktops/plasma-5/systemsettings.nix | 4 +- .../libraries/kde-frameworks/default.nix | 1 + .../libraries/kde-frameworks/kirigami2.nix | 11 + pkgs/top-level/all-packages.nix | 2 +- 12 files changed, 218 insertions(+), 267 deletions(-) delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/ibus.patch create mode 100644 pkgs/development/libraries/kde-frameworks/kirigami2.nix diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 7513c83c107..f4d39604726 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index 6bcafc5813a..63219d8cbe1 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem, - qtsvg, qtx11extras, + qtsvg, qtx11extras, kactivities }: mkDerivation { @@ -9,6 +9,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg - qtx11extras + qtx11extras kactivities ]; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch b/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch deleted file mode 100644 index d5ac4b25087..00000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp -=================================================================== ---- plasma-desktop-5.8.5.orig/kcms/keyboard/xkb_helper.cpp -+++ plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp -@@ -185,21 +185,5 @@ bool XkbHelper::initializeKeyboardLayout - - bool XkbHelper::preInitialize() - { -- // stop ibus so it does not mess with our layouts, we can remove this when we integrate IM into keyboard module -- -- QString ibusExe = QStandardPaths::findExecutable(QStringLiteral("ibus")); -- if( ibusExe.isEmpty() ) { -- return 0; -- } -- -- KProcess ibusProcess; -- ibusProcess << ibusExe << QStringLiteral("exit"); -- ibusProcess.setOutputChannelMode(KProcess::SeparateChannels); -- int res = ibusProcess.execute(); -- -- if( res == 0 ) { -- qCWarning(KCM_KEYBOARD) << "ibus successfully stopped"; -- } -- - return 0; - } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch index def5b577b97..d3f5166d5ed 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch +++ b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch @@ -1,27 +1,14 @@ -Index: plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml -=================================================================== ---- plasma-desktop-5.8.5.orig/applets/pager/package/contents/ui/main.qml -+++ plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as - import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents - import org.kde.draganddrop 2.0 - import org.kde.plasma.private.pager 2.0 --import "utils.js" as Utils -+import "../code/utils.js" as Utils - - MouseArea { - id: root Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml =================================================================== --- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml +++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml @@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas import org.kde.kquickcontrolsaddons 2.0 - + import org.kde.private.desktopcontainment.folder 0.1 as Folder -import "FolderTools.js" as FolderTools +import "../code/FolderTools.js" as FolderTools - + Item { id: main Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml @@ -29,14 +16,14 @@ Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml --- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml +++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml @@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0 - + import org.kde.private.desktopcontainment.desktop 0.1 as Desktop - + -import "LayoutManager.js" as LayoutManager -import "FolderTools.js" as FolderTools +import "../code/LayoutManager.js" as LayoutManager +import "../code/FolderTools.js" as FolderTools - + DragDrop.DropArea { id: root Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml @@ -46,9 +33,9 @@ Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml @@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as import org.kde.kquickcontrolsaddons 2.0 import org.kde.draganddrop 2.0 as DragDrop - + -import "LayoutManager.js" as LayoutManager +import "../code/LayoutManager.js" as LayoutManager - + DragDrop.DropArea { id: root diff --git a/pkgs/desktops/plasma-5/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series index 36778cd1c56..6334deb7d97 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/series +++ b/pkgs/desktops/plasma-5/plasma-desktop/series @@ -1,4 +1,3 @@ qml-import-paths.patch hwclock-path.patch tzdir.patch -ibus.patch diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix index de46bb4373c..f6964428762 100644 --- a/pkgs/desktops/plasma-5/plasma-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-integration.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, - kwayland, libXcursor + kwayland, libXcursor, qtquickcontrols2 }: # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration @@ -12,6 +12,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland - libXcursor + libXcursor qtquickcontrols2 ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch index 12eb65caa71..3b3d318d3bb 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch @@ -1,16 +1,3 @@ -Index: plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/analog-clock/contents/ui/analogclock.qml -+++ plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml -@@ -26,7 +26,7 @@ import QtQuick.Layouts 1.1 - - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as PlasmaComponents --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: analogclock Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml =================================================================== --- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml @@ -21,35 +8,9 @@ Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/Battery import org.kde.kcoreaddons 1.0 as KCoreAddons -import "logic.js" as Logic +import "../code/logic.js" as Logic - + Item { id: batteryItem -Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.workspace.components 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - MouseArea { - id: root -Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml -+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - FocusScope { - id: dialog Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml =================================================================== --- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml @@ -60,7 +21,7 @@ Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/battery import org.kde.kquickcontrolsaddons 2.0 -import "logic.js" as Logic +import "../code/logic.js" as Logic - + Item { id: batterymonitor Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml @@ -73,7 +34,7 @@ Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml import org.kde.kquickcontrolsaddons 2.0 -import "data.js" as Data +import "../code/data.js" as Data - + Flow { id: lockout Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml @@ -81,11 +42,11 @@ Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml --- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml +++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml @@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas - + import org.kde.plasma.private.notifications 1.0 - + -import "uiproperties.js" as UiProperties +import "../code/uiproperties.js" as UiProperties - + MouseEventListener { id: notificationsApplet diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 854b86c1640..900c6c0b2c4 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,339 +3,355 @@ { bluedevil = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/bluedevil-5.10.5.tar.xz"; - sha256 = "01nhfggikkygfzyjbm7zqszhq2x1fhc619wskwjb7hm9p35laj9r"; - name = "bluedevil-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/bluedevil-5.11.1.tar.xz"; + sha256 = "0p1y3p87xg7rjj35n81jg4v4yr2k7bf80qzfnwslbvwrpnzs982q"; + name = "bluedevil-5.11.1.tar.xz"; }; }; breeze = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-5.10.5.tar.xz"; - sha256 = "0rmc3nn9b63jyij814hqx1zg38iphvd03pg7qybkp61zw40ng90v"; - name = "breeze-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-5.11.1.tar.xz"; + sha256 = "0yqbr7j0iqnmczbfv454f1l5x3787vzfchgkrd995d6za2d0w2lp"; + name = "breeze-5.11.1.tar.xz"; }; }; breeze-grub = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-grub-5.10.5.tar.xz"; - sha256 = "0am1hldqyrsryda907q2qwfc09xcsxrv7bq9v23ig0xmylcsq3if"; - name = "breeze-grub-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-grub-5.11.1.tar.xz"; + sha256 = "0pcri1z4min5m6wb6ncyjavwd9nszyis3cqdyw6mqb4av55z0xl0"; + name = "breeze-grub-5.11.1.tar.xz"; }; }; breeze-gtk = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-gtk-5.10.5.tar.xz"; - sha256 = "0i5ddrq9h1www5362qyfwpqpspn3brr43mbsv7ax7gk30san6w0a"; - name = "breeze-gtk-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-gtk-5.11.1.tar.xz"; + sha256 = "0qb3ykf1mdw1iparsaxnypc4z41lfal6idksz9va25p3vclh02gr"; + name = "breeze-gtk-5.11.1.tar.xz"; }; }; breeze-plymouth = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-plymouth-5.10.5.tar.xz"; - sha256 = "197g84mvh8s3f163zx24y1mmzk26fg3ni19pw21njdj2j813hd35"; - name = "breeze-plymouth-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-plymouth-5.11.1.tar.xz"; + sha256 = "1z175176583aqdvv6gwy7mdkndr50x1c8xdihrrcvdhvqy9qc7hr"; + name = "breeze-plymouth-5.11.1.tar.xz"; }; }; discover = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/discover-5.10.5.tar.xz"; - sha256 = "085lq0y9a6r12jbx2ik7zqp4r9bjw332ykfh2gbzzz4s7l7rj4xf"; - name = "discover-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/discover-5.11.1.tar.xz"; + sha256 = "0zr53nw9lix80wlf7wa7irng2vvy80wccjs439ib8r1yh3ggiq4c"; + name = "discover-5.11.1.tar.xz"; + }; + }; + drkonqi = { + version = "5.11.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.11.1/drkonqi-5.11.1.tar.xz"; + sha256 = "0kq06sz39m8qg19b4cjqfwnx19j3s29hddhls8wywswwxlz4aq35"; + name = "drkonqi-5.11.1.tar.xz"; }; }; kactivitymanagerd = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kactivitymanagerd-5.10.5.tar.xz"; - sha256 = "19c297iyaq54vxc6xmvqsa1qlj5vr8071ydmkkfx3fa3lijp34v7"; - name = "kactivitymanagerd-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kactivitymanagerd-5.11.1.tar.xz"; + sha256 = "1j36mbngga492xxhm1ndw1bnq1qn480qpvzi94wyax9y3r4szmhg"; + name = "kactivitymanagerd-5.11.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kde-cli-tools-5.10.5.tar.xz"; - sha256 = "1i2frbxvzlqlv210w50ccxn8ksqxranc93v0wfjvnhd7f8p9c7vk"; - name = "kde-cli-tools-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kde-cli-tools-5.11.1.tar.xz"; + sha256 = "0di7ypyhda4gpadhi0lbji4nyi9xk1y844kxfb586wpzkim5w82c"; + name = "kde-cli-tools-5.11.1.tar.xz"; }; }; kdecoration = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kdecoration-5.10.5.tar.xz"; - sha256 = "0g24gisbnp92niff36bcnjk5pp84qc8cwmx283b887fzcn8v4mf3"; - name = "kdecoration-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kdecoration-5.11.1.tar.xz"; + sha256 = "1jpvdscmy5ymyvj22784swvf6181f7ggr875djhx57c7i4shb3ph"; + name = "kdecoration-5.11.1.tar.xz"; }; }; kde-gtk-config = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kde-gtk-config-5.10.5.tar.xz"; - sha256 = "1a5q8skykhvr5mixi59db2w1qsh8nj2dqncw4nmsh5nlh2ldmgm5"; - name = "kde-gtk-config-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kde-gtk-config-5.11.1.tar.xz"; + sha256 = "1afbwdrjdv9a2qwyxysgnslavan20cmhrz88kmnf9imxlll0i7al"; + name = "kde-gtk-config-5.11.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kdeplasma-addons-5.10.5.tar.xz"; - sha256 = "1xdsa38i60x24p6xiv4x1cqd7f2xijs15c19qsjv594lnmbizbr5"; - name = "kdeplasma-addons-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kdeplasma-addons-5.11.1.tar.xz"; + sha256 = "09dwmd1aiiivkvdbyv97fili067sd8mw9dpknawair4mh7qb0zln"; + name = "kdeplasma-addons-5.11.1.tar.xz"; }; }; kgamma5 = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kgamma5-5.10.5.tar.xz"; - sha256 = "0rci4v5amhfiwawf2sj5f6cmcyq3lrx68mn8id279bpq35mr23v1"; - name = "kgamma5-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kgamma5-5.11.1.tar.xz"; + sha256 = "1m9maxzn5y3zijmj2fkwsfwhinprhz97v9fi312dmwyvfhq3qvyd"; + name = "kgamma5-5.11.1.tar.xz"; }; }; khotkeys = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/khotkeys-5.10.5.tar.xz"; - sha256 = "1ixxb18nz3f4i2qqr1lvss7b662sgj78kzqjs0gd9mf5ylhqj5is"; - name = "khotkeys-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/khotkeys-5.11.1.tar.xz"; + sha256 = "0d1p1sia9qvdls38m29jijsf1ya8zvza557flmhcajb5ldn243l5"; + name = "khotkeys-5.11.1.tar.xz"; }; }; kinfocenter = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kinfocenter-5.10.5.tar.xz"; - sha256 = "0flfjypp6v2k99h11srigyc0ahy23869wz3ljbqbm3b0pgqs69sm"; - name = "kinfocenter-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kinfocenter-5.11.1.tar.xz"; + sha256 = "0ivhf460y83qv4qdphdvskx2nlfqzy453xfnq7ldyzp2yacdmcc8"; + name = "kinfocenter-5.11.1.tar.xz"; }; }; kmenuedit = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kmenuedit-5.10.5.tar.xz"; - sha256 = "0b786l5gm093dq1hvxcn97yg9fr0jmjhfl7sfd0cdn4pkg6almam"; - name = "kmenuedit-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kmenuedit-5.11.1.tar.xz"; + sha256 = "081lqh5ck854pha1f99w6w4j032spl3v28ild61fmhvhzkvx48a6"; + name = "kmenuedit-5.11.1.tar.xz"; }; }; kscreen = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kscreen-5.10.5.tar.xz"; - sha256 = "1a8bqa4wqnjav2w0s39dh7hmb3mqxjnhqwsw6mycgaxicl0h37vf"; - name = "kscreen-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kscreen-5.11.1.tar.xz"; + sha256 = "1skdg59qacxxkiyz3gc1nn4y4lflbynpcb4mpsliqb2n2xdhvg8r"; + name = "kscreen-5.11.1.tar.xz"; }; }; kscreenlocker = { - version = "5.10.5.1"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kscreenlocker-5.10.5.1.tar.xz"; - sha256 = "03ih0dyyjljv40wl7mpbssfirkkljw8mnpjjhzk357lzadkplzvp"; - name = "kscreenlocker-5.10.5.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kscreenlocker-5.11.1.tar.xz"; + sha256 = "0jgq2w7zi1i4wdlfmfz1jh1kbkcn2lxkdg9ds5brisc3f6r4n3vg"; + name = "kscreenlocker-5.11.1.tar.xz"; }; }; ksshaskpass = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/ksshaskpass-5.10.5.tar.xz"; - sha256 = "194ca18kclwmg7j9kcl02hm01cidy0hh2r68j6gxkafnlmn1cjjw"; - name = "ksshaskpass-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/ksshaskpass-5.11.1.tar.xz"; + sha256 = "00ghycjmagc8mjwsgny9bkr45ppnad6aay44ha6fn5gyx973xcmx"; + name = "ksshaskpass-5.11.1.tar.xz"; }; }; ksysguard = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/ksysguard-5.10.5.tar.xz"; - sha256 = "0ywz0ax29y0gm7c3lxwdkn5xvzpkd82a313wb3cz4iphqqga3jqn"; - name = "ksysguard-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/ksysguard-5.11.1.tar.xz"; + sha256 = "11z29w95ji815gwaggs0n9bw8f040z4fd87ci2wmqcpyrjs7a6z1"; + name = "ksysguard-5.11.1.tar.xz"; }; }; kwallet-pam = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwallet-pam-5.10.5.tar.xz"; - sha256 = "0ws0835a0j3wqia85hcdsgfn48d71v96dmmvc2y5pp45ki648bn4"; - name = "kwallet-pam-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwallet-pam-5.11.1.tar.xz"; + sha256 = "0zipldqjg3mazm2j7vrxkc0pqp7x7mmdq7cg1vlb1xlj8ld2vl7y"; + name = "kwallet-pam-5.11.1.tar.xz"; }; }; kwayland-integration = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwayland-integration-5.10.5.tar.xz"; - sha256 = "0s1yhrvjgn455ayi368fkmdpmpyxl97c2pxy8rchfnk3g1ffhmdy"; - name = "kwayland-integration-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwayland-integration-5.11.1.tar.xz"; + sha256 = "1h1lcvzbcf628hs5hj3ykpzy086ylvf5bz63gr0clhyckjxrbbkh"; + name = "kwayland-integration-5.11.1.tar.xz"; }; }; kwin = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwin-5.10.5.tar.xz"; - sha256 = "1nxyn31a00r9kh0aw5fmvxklw21b2l07y267m0q0n9w6bmn6nzyc"; - name = "kwin-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwin-5.11.1.tar.xz"; + sha256 = "1anc8pblpsb8g7lvnq43ji6fgpwxsnmypc3gkip26lb4j7gqfhqm"; + name = "kwin-5.11.1.tar.xz"; }; }; kwrited = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwrited-5.10.5.tar.xz"; - sha256 = "0wphhb4l6qb7lbklgxh2sc6wgqij4n3iwnhaarv2d17864r7ykc9"; - name = "kwrited-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwrited-5.11.1.tar.xz"; + sha256 = "11y2dpjs0g01nah1924dzf39y1smzlswc6nx1cwgfky3raaz3cj0"; + name = "kwrited-5.11.1.tar.xz"; }; }; libkscreen = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/libkscreen-5.10.5.tar.xz"; - sha256 = "0a2lrrp8wp7ndgdvnh48781isin868ndsqw0xr21rn78n90580n6"; - name = "libkscreen-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/libkscreen-5.11.1.tar.xz"; + sha256 = "0drv6f8gzilirwp7p31qrng7cdp7b23ar5v1d5bkdrr1q29z8wdv"; + name = "libkscreen-5.11.1.tar.xz"; }; }; libksysguard = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/libksysguard-5.10.5.tar.xz"; - sha256 = "0ldcpjxy10cnwwc82ihy8xqjkavycrmv6wlbn0rwhnfs04n2rryn"; - name = "libksysguard-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/libksysguard-5.11.1.tar.xz"; + sha256 = "1m8514jv2487fbypxys65qb0a55psqvyzkw5l81ka4ydnrhl2hhm"; + name = "libksysguard-5.11.1.tar.xz"; }; }; milou = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/milou-5.10.5.tar.xz"; - sha256 = "06kq9s9lij66vy5024aps03pzpcz1ixf0b79a7ii1px2h1s7z4gz"; - name = "milou-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/milou-5.11.1.tar.xz"; + sha256 = "1v7rbjw8i1pdvl60xh8s0srrp17jks360zk42rp3hq9srsffd8cp"; + name = "milou-5.11.1.tar.xz"; }; }; oxygen = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/oxygen-5.10.5.tar.xz"; - sha256 = "0p1isrb8v0dkd27jnz6nbq44py7y3zzsjljn9xbv3d02vg802ym9"; - name = "oxygen-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/oxygen-5.11.1.tar.xz"; + sha256 = "0b3yl4q5cbcj6d07xrmifpvwysaa870gf56a7l38zjba6z04819z"; + name = "oxygen-5.11.1.tar.xz"; }; }; plasma-desktop = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-desktop-5.10.5.tar.xz"; - sha256 = "1sxy2k2p15ag5pcy36lpn83nz8d1jb1iyq2nihf4yrc9jlxx9gqm"; - name = "plasma-desktop-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-desktop-5.11.1.tar.xz"; + sha256 = "1r7chviykyq2650k513qcp665pv8vpdczvbrvqfhbpn4yy47crps"; + name = "plasma-desktop-5.11.1.tar.xz"; }; }; plasma-integration = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-integration-5.10.5.tar.xz"; - sha256 = "15cxwsdp78kx55py0wkwqpv4w8cf130hadmdvdw64lwr4gssvhjn"; - name = "plasma-integration-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-integration-5.11.1.tar.xz"; + sha256 = "0jpshilcpklyx7cbpn0cf96md2h6pwd86bk8lphzm64zv3c655ly"; + name = "plasma-integration-5.11.1.tar.xz"; }; }; plasma-nm = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-nm-5.10.5.tar.xz"; - sha256 = "004nmkfy74qaba6hslv2cyb52l7q6ihpavi5j5ax8k66n5zx00bi"; - name = "plasma-nm-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-nm-5.11.1.tar.xz"; + sha256 = "0479cqy7503krish11djg7rc4g7kdlbj3gapsbgvlq9x6j7ixz1p"; + name = "plasma-nm-5.11.1.tar.xz"; }; }; plasma-pa = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-pa-5.10.5.tar.xz"; - sha256 = "0300x3w7mhyb5wpsj47qsfm73fc90iw1vxrgzl9014pxc3h14np1"; - name = "plasma-pa-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-pa-5.11.1.tar.xz"; + sha256 = "0g565v4dwcn6jppn1p2dvljg5r39xmgjzgf8rcipw70kcwc1nx4c"; + name = "plasma-pa-5.11.1.tar.xz"; }; }; plasma-sdk = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-sdk-5.10.5.tar.xz"; - sha256 = "0mjndw132rn46sqjw5jdin8hn6lbrx5955h05jawk95sncr3d0yb"; - name = "plasma-sdk-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-sdk-5.11.1.tar.xz"; + sha256 = "0ss148yig5zzprkk2ydq3np34gr0bnbh1gn18hgb5z33iglbdl3n"; + name = "plasma-sdk-5.11.1.tar.xz"; }; }; plasma-tests = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-tests-5.10.5.tar.xz"; - sha256 = "0mfh35zdc4n52q01jbagxgr51hsvjlyfmnj6x4l2zpif0fpqpxh8"; - name = "plasma-tests-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-tests-5.11.1.tar.xz"; + sha256 = "03r5dczb9iqigg2s7h0k6zgb616358lqvl2h0k0bg2hxggnh8lpk"; + name = "plasma-tests-5.11.1.tar.xz"; + }; + }; + plasma-vault = { + version = "5.11.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.11.1/plasma-vault-5.11.1.tar.xz"; + sha256 = "09wbjk0bsbjyh5n1d5gywdvaimajqr50sd23dbfdbnpi3br0gk10"; + name = "plasma-vault-5.11.1.tar.xz"; }; }; plasma-workspace = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-5.10.5.tar.xz"; - sha256 = "1n12vzjnrhndkzki7dh9kzrwrvll5xqq0y02srb9bg3gyjbp54jl"; - name = "plasma-workspace-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-5.11.1.tar.xz"; + sha256 = "1fy4bdxrz8mn29nc2qjxjnpxzjy9mynwwdjxj0jr61w0ljd40wiy"; + name = "plasma-workspace-5.11.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-wallpapers-5.10.5.tar.xz"; - sha256 = "1z7mqk9nxh232dxl5jg20zbc5nkq5srks4f8b02va6wzfjhwhc88"; - name = "plasma-workspace-wallpapers-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-wallpapers-5.11.1.tar.xz"; + sha256 = "0dcfrad2543fxapizmlikv52m9nmdg45gddvh9chc83kangsydlc"; + name = "plasma-workspace-wallpapers-5.11.1.tar.xz"; }; }; plymouth-kcm = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plymouth-kcm-5.10.5.tar.xz"; - sha256 = "11vfaaqd3mxbnq16rv7xsmfcj33i2cmdljdxib1sg5minybd072y"; - name = "plymouth-kcm-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plymouth-kcm-5.11.1.tar.xz"; + sha256 = "0w3yhazbx79s9k1yc3lj16hanc3wrqphhk9zjl9q1vxsn2rzas8h"; + name = "plymouth-kcm-5.11.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.10.5"; + version = "1-5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/polkit-kde-agent-1-5.10.5.tar.xz"; - sha256 = "158lkf76fz65nr0lx14skkcsk2p3xw98nh43z00wvm2c5qqzmnp2"; - name = "polkit-kde-agent-1-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/polkit-kde-agent-1-5.11.1.tar.xz"; + sha256 = "04ycjqx9hnk3ab8qxk5gqz7b4r7im3bwap613qcgxjqr5cagp66w"; + name = "polkit-kde-agent-1-5.11.1.tar.xz"; }; }; powerdevil = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/powerdevil-5.10.5.tar.xz"; - sha256 = "0dghlgva8fybvhc09y1avzhgak246n4ad2njjvfnxpazpi2laxv7"; - name = "powerdevil-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/powerdevil-5.11.1.tar.xz"; + sha256 = "02rf8iz2spcc78xs88dknl6a7slwgfgh4ra8lhwk69d210cxgahq"; + name = "powerdevil-5.11.1.tar.xz"; }; }; sddm-kcm = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/sddm-kcm-5.10.5.tar.xz"; - sha256 = "13hld5bndxhs6j3lja08zrc6czvpl4k385i8lb3g9zvn9vrk29sw"; - name = "sddm-kcm-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/sddm-kcm-5.11.1.tar.xz"; + sha256 = "0sac2cknq7m26v8a59q1aakn6xjzmspnslfs6k633a8yz8w4lh19"; + name = "sddm-kcm-5.11.1.tar.xz"; }; }; systemsettings = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/systemsettings-5.10.5.tar.xz"; - sha256 = "0b3wpmfjj2zmi7ickppz32i63dpn4jja3nnjrxn912yw47z4bri2"; - name = "systemsettings-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/systemsettings-5.11.1.tar.xz"; + sha256 = "0bnygmb3g573b7a8g0qg3ddj65miw29v3p25sh0ic9ij5bx6f4rw"; + name = "systemsettings-5.11.1.tar.xz"; }; }; user-manager = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/user-manager-5.10.5.tar.xz"; - sha256 = "1fiih72jafshxgwfq4q9csv1i62mgj35qr87lh6lyady6aghajnq"; - name = "user-manager-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/user-manager-5.11.1.tar.xz"; + sha256 = "1iz5wm8d3ljn97msbh1bc7v8zmmgxrfr5mwfzh0ssdldba4wqlpm"; + name = "user-manager-5.11.1.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/xdg-desktop-portal-kde-5.10.5.tar.xz"; - sha256 = "0rgv4nqkrwjzvhg8cmkin348n0i6sd4v444bk6j83y4m0lxdi1ba"; - name = "xdg-desktop-portal-kde-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/xdg-desktop-portal-kde-5.11.1.tar.xz"; + sha256 = "0w822jlg0h7qim70zamm7q5x2b614qmiggz9wr8yxq80lajizxnf"; + name = "xdg-desktop-portal-kde-5.11.1.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index a24eabc39f3..954a8f9f45b 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -1,7 +1,8 @@ { mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2 + kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, + kactivities, kactivities-stats, kirigami2 }: mkDerivation { @@ -10,6 +11,7 @@ mkDerivation { buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 + kactivities kactivities-stats kirigami2 ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index d5995459fd4..de99503131c 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -132,6 +132,7 @@ let sonnet = callPackage ./sonnet.nix {}; syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; + kirigami2 = callPackage ./kirigami2.nix {}; # TIER 2 kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix new file mode 100644 index 00000000000..f4fc40f6d31 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -0,0 +1,11 @@ +{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations }: + +mkDerivation { + name = "kirigami2"; + meta = { + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase qtquickcontrols2 qttranslations ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 515698b1c12..8e3e5ec3556 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10313,7 +10313,7 @@ with pkgs; kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting - threadweaver; + threadweaver kirigami2; ### KDE PLASMA 5 From f8368f68ea6e6e55fbefc3df3a95efb398354068 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 11 Oct 2017 13:37:54 +0800 Subject: [PATCH 1355/2806] plasma5.plasma-vault: init at 5.11.1 --- pkgs/desktops/plasma-5/default.nix | 1 + .../plasma-5/plasma-vault/cryfs-path.patch | 17 +++++++++ .../plasma-5/plasma-vault/default.nix | 38 +++++++++++++++++++ .../plasma-5/plasma-vault/encfs-path.patch | 24 ++++++++++++ .../plasma-vault/fusermount-path.patch | 18 +++++++++ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch create mode 100644 pkgs/desktops/plasma-5/plasma-vault/default.nix create mode 100644 pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch create mode 100644 pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 2bb4b7decef..a9b3f178132 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -133,6 +133,7 @@ let plasma-integration = callPackage ./plasma-integration.nix {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-vault = callPackage ./plasma-vault {}; plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; diff --git a/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch new file mode 100644 index 00000000000..b3f19c4e002 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch @@ -0,0 +1,17 @@ +diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp +index f6ef54f..160034a 100644 +--- a/kded/engine/backends/cryfs/cryfsbackend.cpp ++++ b/kded/engine/backends/cryfs/cryfsbackend.cpp +@@ -136,11 +136,10 @@ bool CryFsBackend::isInitialized(const Device &device) const + + QProcess *CryFsBackend::cryfs(const QStringList &arguments) const + { +- return process("cryfs", ++ return process(NIXPKGS_CRYFS, + arguments, + { { "CRYFS_FRONTEND", "noninteractive" } }); + } + + + } // namespace PlasmaVault +- diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix new file mode 100644 index 00000000000..203ff50d735 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -0,0 +1,38 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + + kactivities, + plasma-framework, + kwindowsystem, + libksysguard, + + encfs, + cryfs, + fuse +}: + +mkDerivation { + name = "plasma-vault"; + nativeBuildInputs = [ extra-cmake-modules ]; + + patches = [ + ./encfs-path.patch + ./cryfs-path.patch + ./fusermount-path.patch + ]; + + buildInputs = [ + kactivities plasma-framework kwindowsystem libksysguard + ]; + + NIX_CFLAGS_COMPILE = [ + ''-DNIXPKGS_ENCFS="${lib.getBin encfs}/bin/encfs"'' + ''-DNIXPKGS_ENCFSCTL="${lib.getBin encfs}/bin/encfsctl"'' + + ''-DNIXPKGS_CRYFS="${lib.getBin cryfs}/bin/cryfs"'' + + ''-DNIXPKGS_FUSERMOUNT="${lib.getBin fuse}/bin/fusermount"'' + ]; + +} diff --git a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch new file mode 100644 index 00000000000..b494df55c5d --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch @@ -0,0 +1,24 @@ +diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp +index 47bb237..4ff064d 100644 +--- a/kded/engine/backends/encfs/encfsbackend.cpp ++++ b/kded/engine/backends/encfs/encfsbackend.cpp +@@ -132,17 +132,16 @@ bool EncFsBackend::isInitialized(const Device &device) const + + QProcess *EncFsBackend::encfs(const QStringList &arguments) const + { +- return process("encfs", arguments, {}); ++ return process(NIXPKGS_ENCFS, arguments, {}); + } + + + + QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const + { +- return process("encfsctl", arguments, {}); ++ return process(NIXPKGS_ENCFSCTL, arguments, {}); + } + + + + } // namespace PlasmaVault +- diff --git a/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch new file mode 100644 index 00000000000..cd1b736a103 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch @@ -0,0 +1,18 @@ +diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp +index 81ce494..d3c5c9f 100644 +--- a/kded/engine/fusebackend_p.cpp ++++ b/kded/engine/fusebackend_p.cpp +@@ -103,7 +103,7 @@ QProcess *FuseBackend::process(const QString &executable, + + QProcess *FuseBackend::fusermount(const QStringList &arguments) const + { +- return process("fusermount", arguments, {}); ++ return process(NIXPKGS_FUSERMOUNT, arguments, {}); + } + + +@@ -245,4 +245,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const + } + + } // namespace PlasmaVault +- diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e3e5ec3556..ac74a41dfd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18257,7 +18257,7 @@ with pkgs; kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop - plasma-integration plasma-nm plasma-pa plasma-workspace + plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm startkde systemsettings; From 0d45be3d914fa809a441331e4669aaef61310d89 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 12 Oct 2017 12:01:42 +0800 Subject: [PATCH 1356/2806] sddm: 0.15.0 -> 0.16.0 --- .../display-managers/sddm/default.nix | 4 +- .../sddm/disable-hidpi-xorg.patch | 26 ++++++++ .../sddm/sddm-ignore-config-mtime.patch | 59 ++++++++++++------- .../applications/display-managers/sddm/series | 3 +- 4 files changed, 67 insertions(+), 25 deletions(-) create mode 100644 pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 3ce8d075410..47365fad6c4 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -5,7 +5,7 @@ let - version = "0.15.0"; + version = "0.16.0"; in mkDerivation rec { name = "sddm-${version}"; @@ -14,7 +14,7 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "1wissgl7wd7fblq8ghz8n2fr6wqip7h88p9fiarfpvi1918fgng8"; + sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb"; }; patches = diff --git a/pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch b/pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch new file mode 100644 index 00000000000..abd10016a20 --- /dev/null +++ b/pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch @@ -0,0 +1,26 @@ +From 6bff89542a2c1b5719370baf3c3a38fd8b2b3c37 Mon Sep 17 00:00:00 2001 +From: adisbladis +Date: Mon, 16 Oct 2017 02:25:50 +0800 +Subject: [PATCH] Disable HiDPI by default on X11 as it causes segmentation + faults with certain themes (KDE Breeze) + +--- + src/common/Configuration.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common/Configuration.h b/src/common/Configuration.h +index 19c6fb1..2bb1dc5 100644 +--- a/src/common/Configuration.h ++++ b/src/common/Configuration.h +@@ -69,7 +69,7 @@ namespace SDDM { + Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server")); + Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server")); + Entry(MinimumVT, int, MINIMUM_VT, _S("The lowest virtual terminal number that will be used.")); +- Entry(EnableHiDPI, bool, false, _S("Enable Qt's automatic high-DPI scaling")); ++ Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling")); + ); + + Section(Wayland, +-- +2.14.2 + diff --git a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch index 836df2de292..aac09dfe876 100644 --- a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch +++ b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch @@ -1,28 +1,43 @@ -From e9d82bfbc49993a5be2c93f6b72a969630587f26 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 23 Nov 2015 06:56:28 -0600 -Subject: [PATCH 1/2] ignore config mtime - ---- - src/common/ConfigReader.cpp | 5 ----- - 1 file changed, 5 deletions(-) - diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp -index cfc9940..5bf5a6a 100644 +index 4b5983c..911c511 100644 --- a/src/common/ConfigReader.cpp +++ b/src/common/ConfigReader.cpp -@@ -138,11 +138,6 @@ namespace SDDM { - QString currentSection = QStringLiteral(IMPLICIT_SECTION); +@@ -147,16 +147,13 @@ namespace SDDM { + // * m_path (classic fallback /etc/sddm.conf) - QFile in(m_path); -- QDateTime modificationTime = QFileInfo(in).lastModified(); -- if (modificationTime <= m_fileModificationTime) { + QStringList files; +- QDateTime latestModificationTime = QFileInfo(m_path).lastModified(); + + if (!m_sysConfigDir.isEmpty()) { + //include the configDir in modification time so we also reload on any files added/removed + QDir dir(m_sysConfigDir); + if (dir.exists()) { +- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_sysConfigDir).lastModified()); + foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) { + files << (file.absoluteFilePath()); +- latestModificationTime = std::max(latestModificationTime, file.lastModified()); + } + } + } +@@ -164,21 +161,14 @@ namespace SDDM { + //include the configDir in modification time so we also reload on any files added/removed + QDir dir(m_configDir); + if (dir.exists()) { +- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_configDir).lastModified()); + foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) { + files << (file.absoluteFilePath()); +- latestModificationTime = std::max(latestModificationTime, file.lastModified()); + } + } + } + + files << m_path; + +- if (latestModificationTime <= m_fileModificationTime) { - return; - } -- m_fileModificationTime = modificationTime; - - in.open(QIODevice::ReadOnly); - while (!in.atEnd()) { --- -2.6.3 - +- m_fileModificationTime = latestModificationTime; +- + foreach (const QString &filepath, files) { + loadInternal(filepath); + } diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series index cb6ea65fedb..09992b211c5 100644 --- a/pkgs/applications/display-managers/sddm/series +++ b/pkgs/applications/display-managers/sddm/series @@ -1 +1,2 @@ -sddm-ignore-config-mtime.patch \ No newline at end of file +sddm-ignore-config-mtime.patch +disable-hidpi-xorg.patch From 7132cbd598f01f34aae27d97583fa1b8b40a88b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 18 Oct 2017 12:08:20 +0200 Subject: [PATCH 1357/2806] qt5: Disable gold linker on Linux as it generates duplicate symbols Signed-off-by: adisbladis --- pkgs/development/libraries/qt-5/5.9/qtbase/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index fc5e5d39c63..ce3f6d15713 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -252,6 +252,9 @@ stdenv.mkDerivation { "-inotify" "-system-libjpeg" "-system-libpng" + # gold linker of binutils 2.28 generates duplicate symbols + # TODO: remove for newer version of binutils + "-no-use-gold-linker" ] ++ lib.optionals stdenv.isDarwin [ From 7a82f81b84dd5e98a43719e5ee8576d65e2f7cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Thu, 12 Oct 2017 22:08:20 +0200 Subject: [PATCH 1358/2806] profanity: enable support for python plugins --- .../instant-messengers/profanity/default.nix | 27 ++++++++++--------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index e994a9849c8..6c57624d28e 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode , ncurses, libotr, curl, readline, libuuid -, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null -, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null -, traySupport ? false, gnome2 ? null -, pgpSupport ? true, gpgme ? null +, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null +, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null +, traySupport ? false, gnome2 ? null +, pgpSupport ? true, gpgme ? null +, pythonPluginSupport ? true, python ? null }: -assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; -assert notifySupport -> libnotify != null && gdk_pixbuf != null; -assert traySupport -> gnome2 != null; -assert pgpSupport -> gpgme != null; +assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; +assert notifySupport -> libnotify != null && gdk_pixbuf != null; +assert traySupport -> gnome2 != null; +assert pgpSupport -> gpgme != null; +assert pythonPluginSupport -> python != null; with stdenv.lib; @@ -30,10 +32,11 @@ stdenv.mkDerivation rec { buildInputs = [ readline libuuid libmesode glib openssl expat ncurses libotr curl - ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] - ++ optionals notifySupport [ libnotify gdk_pixbuf ] - ++ optionals traySupport [ gnome2.gtk ] - ++ optionals pgpSupport [ gpgme ]; + ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] + ++ optionals notifySupport [ libnotify gdk_pixbuf ] + ++ optionals traySupport [ gnome2.gtk ] + ++ optionals pgpSupport [ gpgme ] + ++ optionals pythonPluginSupport [ python ]; meta = { description = "A console based XMPP client"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9a3674ee6c..b33c9ffe1a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16084,6 +16084,7 @@ with pkgs; notifySupport = config.profanity.notifySupport or true; traySupport = config.profanity.traySupport or true; autoAwaySupport = config.profanity.autoAwaySupport or true; + python = python3; }; psi = kde4.callPackage ../applications/networking/instant-messengers/psi { }; From e4cf6635abe7508537a6bc8b8691fb12a36fd207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Thu, 12 Oct 2017 22:11:15 +0200 Subject: [PATCH 1359/2806] profanity: explicit feature flags so build fails when libs are missing When the feature flags during configuration are not set explicitly the build will continue even when needed libs are missing, disabling the feature. To get notified of problems, we set the feature flags explicitly. --- .../networking/instant-messengers/profanity/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 6c57624d28e..74dc36bc7ac 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -38,6 +38,13 @@ stdenv.mkDerivation rec { ++ optionals pgpSupport [ gpgme ] ++ optionals pythonPluginSupport [ python ]; + # Enable feature flags, so that build fail if libs are missing + configureFlags = [ "--enable-c-plugins" "--enable-otr" ] + ++ optionals notifySupport [ "--enable-notifications" ] + ++ optionals traySupport [ "--enable-icons" ] + ++ optionals pgpSupport [ "--enable-pgp" ] + ++ optionals pythonPluginSupport [ "--enable-python-plugins" ]; + meta = { description = "A console based XMPP client"; longDescription = '' From 281bf1ddeda5705cc23ee0cf0bf95cbeb84832a0 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Tue, 17 Oct 2017 09:26:02 -0700 Subject: [PATCH 1360/2806] tzupdate service: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/tzupdate.nix | 45 ++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 nixos/modules/services/misc/tzupdate.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a8cb957ffe2..4c92c28dda9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -343,6 +343,7 @@ ./services/misc/svnserve.nix ./services/misc/synergy.nix ./services/misc/taskserver + ./services/misc/tzupdate.nix ./services/misc/uhub.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix new file mode 100644 index 00000000000..570982ced29 --- /dev/null +++ b/nixos/modules/services/misc/tzupdate.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.tzupdate; +in { + options.services.tzupdate = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the tzupdate timezone updating service. This provides + a one-shot service which can be activated with systemctl to + update the timezone. + ''; + }; + }; + + config = mkIf cfg.enable { + # We need to have imperative time zone management for this to work. + # This will give users an error if they have set an explicit time + # zone, which is better than silently overriding it. + time.timeZone = null; + + # We provide a one-shot service which can be manually run. We could + # provide a service that runs on startup, but it's tricky to get + # a service to run after you have *internet* access. + systemd.services.tzupdate = { + description = "tzupdate timezone update service"; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + + serviceConfig = { + Type = "oneshot"; + # We could link directly into pkgs.tzdata, but at least timedatectl seems + # to expect the symlink to point directly to a file in etc. + # Setting the "debian timezone file" to point at /dev/null stops it doing anything. + ExecStart = "${pkgs.tzupdate}/bin/tzupdate -z /etc/zoneinfo -d /dev/null"; + }; + }; + }; + + meta.maintainers = [ maintainers.michaelpj ]; +} From 19efa65f59f7b219c316f9d349bd9968fe7e202c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 19 Oct 2017 00:25:24 -0400 Subject: [PATCH 1361/2806] texlive: fix after dependency update --- pkgs/tools/typesetting/tex/texlive/bin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 34a689ee9bd..30979e312fc 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -187,6 +187,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex ''; preBuild = "cd texk/web2c"; + CXXFLAGS = "-std=c++11 -Wno-reserved-user-defined-literal"; # TODO: remove once texlive 2017 is out? enableParallelBuilding = true; # now distribute stuff into outputs, roughly as upstream TL From 3e4b500529732c00fe0c3b33e51a8998fc6f03e6 Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Wed, 18 Oct 2017 22:04:01 -0700 Subject: [PATCH 1362/2806] maintainers: add Kevin Quick --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3116336db90..3565303dca4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -323,6 +323,7 @@ konimex = "Muhammad Herdiansyah "; koral = "Koral "; kovirobi = "Kovacsics Robert "; + kquick = "Kevin Quick "; kragniz = "Louis Taylor "; kristoff3r = "Kristoffer Søholm "; ktosiek = "Tomasz Kontusz "; From a1afec9c147d070bbb9a259ea9942bf92916ca06 Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Wed, 18 Oct 2017 22:04:01 -0700 Subject: [PATCH 1363/2806] maintainers: add Kevin Quick --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3116336db90..3565303dca4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -323,6 +323,7 @@ konimex = "Muhammad Herdiansyah "; koral = "Koral "; kovirobi = "Kovacsics Robert "; + kquick = "Kevin Quick "; kragniz = "Louis Taylor "; kristoff3r = "Kristoffer Søholm "; ktosiek = "Tomasz Kontusz "; From 6015fdc76aa9061af5c79e23c169072de4df5495 Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Wed, 18 Oct 2017 23:23:09 -0700 Subject: [PATCH 1364/2806] theft: add new theft development library package --- pkgs/development/libraries/theft/default.nix | 33 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/theft/default.nix diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix new file mode 100644 index 00000000000..00534413c7b --- /dev/null +++ b/pkgs/development/libraries/theft/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.4.3"; + name = "theft-${version}"; + + src = fetchFromGitHub { + owner = "silentbicycle"; + repo = "theft"; + rev = "v${version}"; + sha256 = "1ibh8np12lafnrsrvjbbzlyq45zq654939x0y22vdnc6s8dpbhw4"; + }; + + preConfigure = "patchShebangs ./scripts/mk_bits_lut"; + # doCheck = true; + + propagatedBuildInputs = [ ]; + + buildInputs = [ ]; + + installFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + install -m644 vendor/greatest.h $out/include/ + ''; + + meta = { + description = "A C library for property-based testing."; + platforms = stdenv.lib.platforms.linux; + homepage = "http://github.com/silentbicycle/theft/"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.kquick ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9a3674ee6c..0be5b4b3c68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10766,6 +10766,8 @@ with pkgs; tet = callPackage ../development/tools/misc/tet { }; + theft = callPackage ../development/libraries/theft { }; + thrift = callPackage ../development/libraries/thrift { inherit (pythonPackages) twisted; }; From 2856891562da4c5b1d834bc75e89c5eeea72f3e7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 19 Oct 2017 09:49:24 +0200 Subject: [PATCH 1365/2806] twilio: init at 6.8.0 --- .../python-modules/twilio/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/twilio/default.nix diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix new file mode 100644 index 00000000000..faca6edace5 --- /dev/null +++ b/pkgs/development/python-modules/twilio/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, pyjwt, pysocks, pytz, requests, six, nose, mock }: + +buildPythonPackage rec { + pname = "twilio"; + version = "6.8.0"; + name = "${pname}-${version}"; + + # tests not included in PyPi, so fetch from github instead + src = fetchFromGitHub { + owner = "twilio"; + repo = "twilio-python"; + rev = version; + sha256 = "1vi3m6kvbmv643jbz95q59rcn871y0sss48kw2nqziyr5iswfx8c"; + }; + + buildInputs = [ nose mock ]; + + propagatedBuildInputs = [ pyjwt pysocks pytz six requests ]; + + meta = with stdenv.lib; { + description = "Twilio API client and TwiML generator"; + homepage = https://github.com/twilio/twilio-python/; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 231d5fecf6b..43e6ad64e81 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26486,6 +26486,8 @@ EOF stripe = callPackage ../development/python-modules/stripe { }; + twilio = callPackage ../development/python-modules/twilio { }; + uranium = callPackage ../development/python-modules/uranium { }; vine = callPackage ../development/python-modules/vine { }; From 65256b7f26db18e68562c887b4dd2268498ba6aa Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 19 Oct 2017 09:40:21 +0100 Subject: [PATCH 1366/2806] wireguard: 0.0.20171011 -> 0.0.20171017 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index b6d294836c2..18ed3287edc 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20171011"; + version = "0.0.20171017"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "15hby5fi85r7h7adr8kva26w9b2sz3147d7nl2y0fdblb3v4zr72"; + sha256 = "1k9m980d7zmnhpj9kanyfavqrn7ryva16iblk9jrk6sdhxi9mdsp"; }; meta = with stdenv.lib; { From c0e00efdaeaeaf799452198efa201d086ed83238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 19 Oct 2017 11:18:20 +0200 Subject: [PATCH 1367/2806] knot-dns: fix `kdig +tls` broken in 2.6.0 --- pkgs/servers/dns/knot-dns/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index cdbdf04f445..00d1c5c568d 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn , systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty +, fetchpatch }: let inherit (stdenv.lib) optional optionals; in @@ -14,6 +15,12 @@ stdenv.mkDerivation rec { sha256 = "68e04961d0bf6ba193cb7ec658b295c4ff6e60b3754d64bcd77ebdcee0f283fd"; }; + patches = [(fetchpatch { # remove for >= 2.6.1 + name = "kdig-tls.patch"; + url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/b72d5cd032795.diff"; + sha256 = "0ig31rp82j49jh8n3s0dcf5abhh35mcp2k2wii7bh0c60ngb29k6"; + })]; + outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; From fe7c7a852d9e22bb96cfa53caf357a2a42d98191 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 06:43:41 +0300 Subject: [PATCH 1368/2806] cudatoolkit9: init at 9.0.176 Make CUDA Toolkit 9 the default choice. --- .../compilers/cudatoolkit/default.nix | 49 +++++++++++++------ pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index f6e52a59fe5..5cdd5a1a146 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,26 +1,39 @@ -{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python27, zlib +{ lib, stdenv, fetchurl, requireFile, patchelf, perl, ncurses, expat, python27, zlib , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc }: let common = - { version, url, sha256 + args@{ version, sha256 + , url ? "" + , name ? "" + , developerProgram ? false , python ? python27 }: stdenv.mkDerivation rec { name = "cudatoolkit-${version}"; + inherit (args) version; dontPatchELF = true; dontStrip = true; src = - if stdenv.system == "x86_64-linux" then - fetchurl { - inherit url sha256; + if developerProgram then + requireFile { + message = '' + This nix expression requires that ${args.name} is already part of the store. + Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit + at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory: + nix-prefetch-url file://${args.name} + ''; + inherit (args) name sha256; } - else throw "cudatoolkit does not support platform ${stdenv.system}"; + else + fetchurl { + inherit (args) url sha256; + }; outputs = [ "out" "lib" "doc" ]; @@ -37,8 +50,8 @@ let unpackPhase = '' sh $src --keep --noexec cd pkg/run_files - sh cuda-linux64-rel-${version}-*.run --keep --noexec - sh cuda-samples-linux-${version}-*.run --keep --noexec + sh cuda-linux*.run --keep --noexec + sh cuda-samples*.run --keep --noexec cd pkg ''; @@ -99,8 +112,8 @@ let meta = with stdenv.lib; { description = "A compiler for NVIDIA GPUs, math libraries, and tools"; - homepage = https://developer.nvidia.com/cuda-toolkit; - platforms = platforms.linux; + homepage = "https://developer.nvidia.com/cuda-toolkit"; + platforms = [ "x86_64-linux" ]; license = licenses.unfree; }; }; @@ -109,33 +122,39 @@ in { cudatoolkit6 = common { version = "6.0.37"; - url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run; + url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run"; sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40"; }; cudatoolkit65 = common { version = "6.5.19"; - url = http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run; + url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run"; sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj"; }; cudatoolkit7 = common { version = "7.0.28"; - url = http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run; + url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run"; sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi"; }; cudatoolkit75 = common { version = "7.5.18"; - url = http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run; + url = "http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run"; sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88"; }; cudatoolkit8 = common { version = "8.0.61"; - url = https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run; + url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"; sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; }; + cudatoolkit9 = common { + version = "9.0.176"; + url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; + sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2e3cad5a0b..c0501cc061d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1577,9 +1577,10 @@ with pkgs; cudatoolkit65 cudatoolkit7 cudatoolkit75 - cudatoolkit8; + cudatoolkit8 + cudatoolkit9; - cudatoolkit = cudatoolkit8; + cudatoolkit = cudatoolkit9; cudnn = callPackage ../development/libraries/science/math/cudnn/default.nix {}; From 7cf6010fd3db3dae411c8db198fe158cef10227d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 15 Oct 2017 14:44:09 +0300 Subject: [PATCH 1369/2806] cudatoolkit: use recommended gcc by default This way one may build packages requiring old CUDA Toolkit with usual stdenv; only bits which are compiled with NVCC would use older GCC. --- .../compilers/cudatoolkit/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 5cdd5a1a146..62b2e7c1850 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchurl, requireFile, patchelf, perl, ncurses, expat, python27, zlib +{ lib, stdenv, makeWrapper, fetchurl, requireFile, patchelf, perl, ncurses, expat, python27, zlib +, gcc48, gcc49, gcc5, gcc6 , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc }: let common = - args@{ version, sha256 + args@{ gcc, version, sha256 , url ? "" , name ? "" , developerProgram ? false @@ -37,7 +38,7 @@ let outputs = [ "out" "lib" "doc" ]; - buildInputs = [ perl ]; + nativeBuildInputs = [ perl makeWrapper ]; runtimeDependencies = [ ncurses expat python zlib glibc @@ -105,11 +106,21 @@ let # Remove OpenCL libraries as they are provided by ocl-icd and driver. rm -f $out/lib64/libOpenCL* + # Set compiler for NVCC. + wrapProgram $out/bin/nvcc \ + --prefix PATH : ${gcc}/bin '' + lib.optionalString (lib.versionOlder version "8.0") '' # Hack to fix building against recent Glibc/GCC. echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook ''; + passthru = { + cc = gcc; + majorVersion = + let versionParts = lib.splitString "." version; + in "${lib.elemAt versionParts 0}.${lib.elemAt versionParts 1}"; + }; + meta = with stdenv.lib; { description = "A compiler for NVIDIA GPUs, math libraries, and tools"; homepage = "https://developer.nvidia.com/cuda-toolkit"; @@ -124,36 +135,42 @@ in { version = "6.0.37"; url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run"; sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40"; + gcc = gcc48; }; cudatoolkit65 = common { version = "6.5.19"; url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run"; sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj"; + gcc = gcc48; }; cudatoolkit7 = common { version = "7.0.28"; url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run"; sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi"; + gcc = gcc49; }; cudatoolkit75 = common { version = "7.5.18"; url = "http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run"; sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88"; + gcc = gcc49; }; cudatoolkit8 = common { version = "8.0.61"; url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"; sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; + gcc = gcc5; }; cudatoolkit9 = common { version = "9.0.176"; url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; + gcc = gcc6; }; } From ce9059a120713ffef30a1f237f56a290c8680740 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 07:07:40 +0300 Subject: [PATCH 1370/2806] cudnn_cudatoolkit9: init at 7.0 Make it the default. --- .../math/cudnn/{ => 7.0-4.0}/default.nix | 0 .../cudnn/{7.5-5.0 => 7.5-6.0}/default.nix | 15 +++--- .../science/math/cudnn/8.0-5.1/default.nix | 40 ---------------- .../science/math/cudnn/8.0-6.0/default.nix | 40 ---------------- .../cudnn/{8.0-5.0 => 8.0-7.0}/default.nix | 15 +++--- .../science/math/cudnn/9.0-7.0/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 16 +++---- 7 files changed, 73 insertions(+), 101 deletions(-) rename pkgs/development/libraries/science/math/cudnn/{ => 7.0-4.0}/default.nix (100%) rename pkgs/development/libraries/science/math/cudnn/{7.5-5.0 => 7.5-6.0}/default.nix (74%) delete mode 100644 pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix delete mode 100644 pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix rename pkgs/development/libraries/science/math/cudnn/{8.0-5.0 => 8.0-7.0}/default.nix (72%) create mode 100644 pkgs/development/libraries/science/math/cudnn/9.0-7.0/default.nix diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/7.0-4.0/default.nix similarity index 100% rename from pkgs/development/libraries/science/math/cudnn/default.nix rename to pkgs/development/libraries/science/math/cudnn/7.0-4.0/default.nix diff --git a/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/7.5-6.0/default.nix similarity index 74% rename from pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix rename to pkgs/development/libraries/science/math/cudnn/7.5-6.0/default.nix index 2e0b98496f3..90d130ff19d 100644 --- a/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/7.5-6.0/default.nix @@ -4,20 +4,20 @@ }: stdenv.mkDerivation rec { - version = "5.0"; + version = "6.0"; cudatoolkit_version = "7.5"; name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; src = requireFile rec { - name = "cudnn-${cudatoolkit_version}-linux-x64-v${version}-ga.tgz"; + name = "cudnn-${cudatoolkit_version}-linux-x64-v${version}.tgz"; message = '' This nix expression requires that ${name} is already part of the store. Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library at https://developer.nvidia.com/cudnn, and run the following command in the download directory: nix-prefetch-url file://${name} ''; - sha256 = "c4739a00608c3b66a004a74fc8e721848f9112c5cb15f730c1be4964b3a23b3a"; + sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an"; }; phases = "unpackPhase installPhase fixupPhase"; @@ -31,16 +31,17 @@ stdenv.mkDerivation rec { mkdir -p $out cp -a include $out/include - cp -a lib64 $out/lib64 + cp -a lib64 $out/lib ''; propagatedBuildInputs = [ cudatoolkit ]; - meta = { + meta = with stdenv.lib; { description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = https://developer.nvidia.com/cudnn; - license = stdenv.lib.licenses.unfree; + homepage = "https://developer.nvidia.com/cudnn"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix deleted file mode 100644 index fd98001da82..00000000000 --- a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, requireFile -, cudatoolkit -, fetchurl -}: - -stdenv.mkDerivation rec { - version = "5.1"; - cudatoolkit_version = "8.0"; - - name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; - - src = fetchurl { - url = "http://developer.download.nvidia.com/compute/redist/cudnn/v5.1/cudnn-8.0-linux-x64-v5.1.tgz"; - sha256 = "1kj50smlkm347wfbfqvy09ylvad1zapqjc9yqvfykmiddyrij1y1"; - }; - - installPhase = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 - } - fixRunPath lib64/libcudnn.so - - mkdir -p $out - cp -a include $out/include - cp -a lib64 $out/lib64 - ''; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - meta = with stdenv.lib; { - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = https://developer.nvidia.com/cudnn; - license = stdenv.lib.licenses.unfree; - maintainers = with maintainers; [ mdaiter ]; - }; -} diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix deleted file mode 100644 index f0cfb906b1f..00000000000 --- a/pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, requireFile -, cudatoolkit -, fetchurl -}: - -stdenv.mkDerivation rec { - version = "6.0"; - cudatoolkit_version = "8.0"; - - name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; - - src = fetchurl { - url = "http://developer.download.nvidia.com/compute/redist/cudnn/v6.0/cudnn-8.0-linux-x64-v6.0.tgz"; - sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv"; - }; - - installPhase = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 - } - fixRunPath lib64/libcudnn.so - - mkdir -p $out - cp -a include $out/include - cp -a lib64 $out/lib64 - ''; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - meta = with stdenv.lib; { - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = https://developer.nvidia.com/cudnn; - license = stdenv.lib.licenses.unfree; - maintainers = with maintainers; [ jyp ]; - }; -} diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-7.0/default.nix similarity index 72% rename from pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix rename to pkgs/development/libraries/science/math/cudnn/8.0-7.0/default.nix index a0d8baae78f..e8306098039 100644 --- a/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/8.0-7.0/default.nix @@ -1,29 +1,31 @@ { stdenv +, lib , requireFile , cudatoolkit +, fetchurl }: stdenv.mkDerivation rec { - version = "5.0"; + version = "7.0"; cudatoolkit_version = "8.0"; name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; src = requireFile rec { - name = "cudnn-${cudatoolkit_version}-linux-x64-v${version}-ga.tgz"; + name = "cudnn-${cudatoolkit_version}-linux-x64-v7.tgz"; message = '' This nix expression requires that ${name} is already part of the store. Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library at https://developer.nvidia.com/cudnn, and run the following command in the download directory: nix-prefetch-url file://${name} ''; - sha256 = "af80eb1ce0cb51e6a734b2bdc599e6d50b676eab3921e5bddfe5443485df86b6"; + sha256 = "19yjdslrslwv5ic4vgpzb0fa0mqbgi6a66b7gc66vdc9n9589398"; }; installPhase = '' function fixRunPath { p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 } fixRunPath lib64/libcudnn.so @@ -38,8 +40,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = https://developer.nvidia.com/cudnn; - license = stdenv.lib.licenses.unfree; + homepage = "https://developer.nvidia.com/cudnn"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mdaiter ]; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/9.0-7.0/default.nix b/pkgs/development/libraries/science/math/cudnn/9.0-7.0/default.nix new file mode 100644 index 00000000000..f5215ac3764 --- /dev/null +++ b/pkgs/development/libraries/science/math/cudnn/9.0-7.0/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, requireFile +, cudatoolkit +, fetchurl +}: + +stdenv.mkDerivation rec { + version = "7.0"; + cudatoolkit_version = "9.0"; + + name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; + + src = requireFile rec { + name = "cudnn-${cudatoolkit_version}-linux-x64-v7.tgz"; + message = '' + This nix expression requires that ${name} is already part of the store. + Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library + at https://developer.nvidia.com/cudnn, and run the following command in the download directory: + nix-prefetch-url file://${name} + ''; + sha256 = "1ld5x819vya6p2ppmr7i3lz9ac2y81kssgbzgd0lsign7r2qjapc"; + }; + + installPhase = '' + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + } + fixRunPath lib64/libcudnn.so + + mkdir -p $out + cp -a include $out/include + cp -a lib64 $out/lib64 + ''; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + meta = with stdenv.lib; { + description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; + homepage = "https://developer.nvidia.com/cudnn"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0501cc061d..e1adb0b5c3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1582,23 +1582,23 @@ with pkgs; cudatoolkit = cudatoolkit9; - cudnn = callPackage ../development/libraries/science/math/cudnn/default.nix {}; + cudnn_cudatoolkit7 = callPackage ../development/libraries/science/math/cudnn/7.0-4.0 { + cudatoolkit = cudatoolkit7; + }; - cudnn5_cudatoolkit75 = callPackage ../development/libraries/science/math/cudnn/7.5-5.0 { + cudnn_cudatoolkit75 = callPackage ../development/libraries/science/math/cudnn/7.5-6.0 { cudatoolkit = cudatoolkit75; }; - cudnn5_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-5.0 { + cudnn_cudatoolkit8 = callPackage ../development/libraries/science/math/cudnn/8.0-7.0 { cudatoolkit = cudatoolkit8; }; - cudnn51_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-5.1 { - cudatoolkit = cudatoolkit8; + cudnn_cudatoolkit9 = callPackage ../development/libraries/science/math/cudnn/9.0-7.0 { + cudatoolkit = cudatoolkit9; }; - cudnn60_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-6.0 { - cudatoolkit = cudatoolkit8; - }; + cudnn = cudnn_cudatoolkit9; curlFull = curl.override { idnSupport = true; From 6309e5fa0139d1fee020e8d4ca18e5658c93ae3a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 15 Oct 2017 14:44:54 +0300 Subject: [PATCH 1371/2806] cudnn: refactor to use shared derivation Also return 8.0-6.0 version for TensorFlow. --- .../science/math/cudnn/7.0-4.0/default.nix | 34 ------------- .../science/math/cudnn/7.5-6.0/default.nix | 47 ------------------ .../science/math/cudnn/9.0-7.0/default.nix | 48 ------------------- .../libraries/science/math/cudnn/default.nix | 45 +++++++++++++++++ .../{8.0-7.0/default.nix => generic.nix} | 20 +++++--- pkgs/top-level/all-packages.nix | 21 +++----- 6 files changed, 65 insertions(+), 150 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/cudnn/7.0-4.0/default.nix delete mode 100644 pkgs/development/libraries/science/math/cudnn/7.5-6.0/default.nix delete mode 100644 pkgs/development/libraries/science/math/cudnn/9.0-7.0/default.nix create mode 100644 pkgs/development/libraries/science/math/cudnn/default.nix rename pkgs/development/libraries/science/math/cudnn/{8.0-7.0/default.nix => generic.nix} (79%) diff --git a/pkgs/development/libraries/science/math/cudnn/7.0-4.0/default.nix b/pkgs/development/libraries/science/math/cudnn/7.0-4.0/default.nix deleted file mode 100644 index 1e1a37af2f0..00000000000 --- a/pkgs/development/libraries/science/math/cudnn/7.0-4.0/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, requireFile, cudatoolkit }: - -stdenv.mkDerivation rec { - version = "4.0"; - - name = "cudnn-${version}"; - - src = requireFile rec { - name = "cudnn-7.0-linux-x64-v${version}-prod.tgz"; - message = '' - This nix expression requires that ${name} is - already part of the store. Register yourself to NVIDIA Accelerated Computing Developer Program - and download cuDNN library at https://developer.nvidia.com/cudnn, and store it to the nix store with nix-store --add-fixed sha256 . - ''; - sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f"; - - }; - - phases = "unpackPhase installPhase fixupPhase"; - - propagatedBuildInputs = [ cudatoolkit ]; - - installPhase = '' - mkdir -p $out - cp -a include $out/include - cp -a lib64 $out/lib64 - ''; - - meta = { - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = https://developer.nvidia.com/cudnn; - license = stdenv.lib.licenses.unfree; - }; -} diff --git a/pkgs/development/libraries/science/math/cudnn/7.5-6.0/default.nix b/pkgs/development/libraries/science/math/cudnn/7.5-6.0/default.nix deleted file mode 100644 index 90d130ff19d..00000000000 --- a/pkgs/development/libraries/science/math/cudnn/7.5-6.0/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv -, requireFile -, cudatoolkit -}: - -stdenv.mkDerivation rec { - version = "6.0"; - cudatoolkit_version = "7.5"; - - name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; - - src = requireFile rec { - name = "cudnn-${cudatoolkit_version}-linux-x64-v${version}.tgz"; - message = '' - This nix expression requires that ${name} is already part of the store. - Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library - at https://developer.nvidia.com/cudnn, and run the following command in the download directory: - nix-prefetch-url file://${name} - ''; - sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an"; - }; - - phases = "unpackPhase installPhase fixupPhase"; - - installPhase = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 - } - fixRunPath lib64/libcudnn.so - - mkdir -p $out - cp -a include $out/include - cp -a lib64 $out/lib - ''; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - meta = with stdenv.lib; { - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = "https://developer.nvidia.com/cudnn"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/science/math/cudnn/9.0-7.0/default.nix b/pkgs/development/libraries/science/math/cudnn/9.0-7.0/default.nix deleted file mode 100644 index f5215ac3764..00000000000 --- a/pkgs/development/libraries/science/math/cudnn/9.0-7.0/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv -, lib -, requireFile -, cudatoolkit -, fetchurl -}: - -stdenv.mkDerivation rec { - version = "7.0"; - cudatoolkit_version = "9.0"; - - name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; - - src = requireFile rec { - name = "cudnn-${cudatoolkit_version}-linux-x64-v7.tgz"; - message = '' - This nix expression requires that ${name} is already part of the store. - Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library - at https://developer.nvidia.com/cudnn, and run the following command in the download directory: - nix-prefetch-url file://${name} - ''; - sha256 = "1ld5x819vya6p2ppmr7i3lz9ac2y81kssgbzgd0lsign7r2qjapc"; - }; - - installPhase = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 - } - fixRunPath lib64/libcudnn.so - - mkdir -p $out - cp -a include $out/include - cp -a lib64 $out/lib64 - ''; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - meta = with stdenv.lib; { - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = "https://developer.nvidia.com/cudnn"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mdaiter ]; - }; -} diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix new file mode 100644 index 00000000000..db66d854588 --- /dev/null +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -0,0 +1,45 @@ +{ callPackage, cudatoolkit7, cudatoolkit75, cudatoolkit8, cudatoolkit9 }: + +let + generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { + inherit (args) cudatoolkit; + }; + +in + +{ + cudnn_cudatoolkit7 = generic rec { + version = "4.0"; + cudatoolkit = cudatoolkit7; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz"; + sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f"; + }; + + cudnn_cudatoolkit75 = generic rec { + version = "6.0"; + cudatoolkit = cudatoolkit75; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; + sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an"; + }; + + cudnn6_cudatoolkit8 = generic rec { + version = "6.0"; + cudatoolkit = cudatoolkit8; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; + sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv"; + }; + + cudnn_cudatoolkit8 = generic rec { + version = "7.0"; + cudatoolkit = cudatoolkit8; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; + sha256 = "19yjdslrslwv5ic4vgpzb0fa0mqbgi6a66b7gc66vdc9n9589398"; + }; + + cudnn_cudatoolkit9 = generic rec { + version = "7.0"; + cudatoolkit = cudatoolkit9; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; + sha256 = "1ld5x819vya6p2ppmr7i3lz9ac2y81kssgbzgd0lsign7r2qjapc"; + }; +} diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-7.0/default.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix similarity index 79% rename from pkgs/development/libraries/science/math/cudnn/8.0-7.0/default.nix rename to pkgs/development/libraries/science/math/cudnn/generic.nix index e8306098039..663b741e474 100644 --- a/pkgs/development/libraries/science/math/cudnn/8.0-7.0/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,25 +1,28 @@ +{ version +, srcName +, sha256 +}: + { stdenv , lib , requireFile , cudatoolkit -, fetchurl }: stdenv.mkDerivation rec { - version = "7.0"; - cudatoolkit_version = "8.0"; + name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; - name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; + inherit version; src = requireFile rec { - name = "cudnn-${cudatoolkit_version}-linux-x64-v7.tgz"; + name = srcName; + inherit sha256; message = '' This nix expression requires that ${name} is already part of the store. Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library at https://developer.nvidia.com/cudnn, and run the following command in the download directory: nix-prefetch-url file://${name} ''; - sha256 = "19yjdslrslwv5ic4vgpzb0fa0mqbgi6a66b7gc66vdc9n9589398"; }; installPhase = '' @@ -38,6 +41,11 @@ stdenv.mkDerivation rec { cudatoolkit ]; + passthru = { + inherit cudatoolkit; + majorVersion = lib.head (lib.splitString "." version); + }; + meta = with stdenv.lib; { description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1adb0b5c3f..d0be8c9a547 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1582,21 +1582,12 @@ with pkgs; cudatoolkit = cudatoolkit9; - cudnn_cudatoolkit7 = callPackage ../development/libraries/science/math/cudnn/7.0-4.0 { - cudatoolkit = cudatoolkit7; - }; - - cudnn_cudatoolkit75 = callPackage ../development/libraries/science/math/cudnn/7.5-6.0 { - cudatoolkit = cudatoolkit75; - }; - - cudnn_cudatoolkit8 = callPackage ../development/libraries/science/math/cudnn/8.0-7.0 { - cudatoolkit = cudatoolkit8; - }; - - cudnn_cudatoolkit9 = callPackage ../development/libraries/science/math/cudnn/9.0-7.0 { - cudatoolkit = cudatoolkit9; - }; + inherit (callPackages ../development/libraries/science/math/cudnn { }) + cudnn_cudatoolkit7 + cudnn_cudatoolkit75 + cudnn6_cudatoolkit8 + cudnn_cudatoolkit8 + cudnn_cudatoolkit9; cudnn = cudnn_cudatoolkit9; From 85d3c00dcebc6f9d9fd33af2e2995e4ada2b7366 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 07:08:07 +0300 Subject: [PATCH 1372/2806] treewise: respect config.cudaSupport in packages --- pkgs/top-level/all-packages.nix | 10 +++++++--- pkgs/top-level/python-packages.nix | 12 +++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0be8c9a547..098fe11b3e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10013,6 +10013,7 @@ with pkgs; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { + enableCuda = config.cudaSupport or false; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; }; @@ -10076,6 +10077,7 @@ with pkgs; opensubdiv = callPackage ../development/libraries/opensubdiv { stdenv_gcc5 = overrideCC stdenv gcc5; + cudaSupport = config.cudaSupport or false; cmake = cmake_2_8; }; @@ -13813,6 +13815,7 @@ with pkgs; blender = callPackage ../applications/misc/blender { stdenv_gcc5 = overrideCC stdenv gcc5; + cudaSupport = config.cudaSupport or false; python = python35; }; @@ -18730,8 +18733,7 @@ with pkgs; caffe = callPackage ../applications/science/math/caffe rec { cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false; - # CUDA 8 doesn't support GCC 6. - stdenv = if cudaSupport then overrideCC pkgs.stdenv gcc5 else pkgs.stdenv; + cudnnSupport = cudaSupport; }; ecm = callPackage ../applications/science/math/ecm { }; @@ -18755,7 +18757,9 @@ with pkgs; sbcl = null; }; - mxnet = callPackage ../applications/science/math/mxnet { + mxnet = callPackage ../applications/science/math/mxnet rec { + cudaSupport = config.cudaSupport or false; + cudnnSupport = cudaSupport; inherit (linuxPackages) nvidia_x11; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efa21bf121e..d2026107b77 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25980,14 +25980,16 @@ EOF tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflow = self.tensorflowWithoutCuda; + tensorflow = callPackage ../development/python-modules/tensorflow { + cudaSupport = pkgs.config.cudaSupport or false; + }; - tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { }; + tensorflowWithoutCuda = self.tensorflow.override { + cudaSupport = false; + }; - tensorflowWithCuda = callPackage ../development/python-modules/tensorflow { + tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; - cudatoolkit = pkgs.cudatoolkit8; - cudnn = pkgs.cudnn60_cudatoolkit80; }; tflearn = buildPythonPackage rec { From 378bfba0236967aa3af336d686fb3f3b7950e7e4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Oct 2017 03:34:16 +0300 Subject: [PATCH 1373/2806] treewide: use default compiler for cuda --- pkgs/applications/misc/blender/default.nix | 4 ++-- pkgs/development/libraries/opencv/3.x.nix | 4 ++-- pkgs/development/libraries/opensubdiv/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 86b2ab6eb1c..ccbcb239502 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenv_gcc5, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew +{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python @@ -10,7 +10,7 @@ with lib; -(if cudaSupport then stdenv_gcc5 else stdenv).mkDerivation rec { +stdenv.mkDerivation rec { name = "blender-2.79"; src = fetchurl { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 8596ab6de88..46ee4ea565b 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -16,7 +16,7 @@ , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , enableOpenblas ? true, openblas -, enableCuda ? false, cudatoolkit, gcc5 +, enableCuda ? false, cudatoolkit , enableTesseract ? false, tesseract, leptonica , AVFoundation, Cocoa, QTKit }: @@ -145,7 +145,7 @@ stdenv.mkDerivation rec { # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] - ++ lib.optionals enableCuda [ cudatoolkit gcc5 ] + ++ lib.optional enableCuda cudatoolkit ++ lib.optional buildContrib protobuf ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 442a8444942..64c4f57c724 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, stdenv_gcc5, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu , mesa_noglu, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit }: -(if cudaSupport then stdenv_gcc5 else stdenv).mkDerivation rec { +stdenv.mkDerivation rec { name = "opensubdiv-${version}"; version = "3.2.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 098fe11b3e2..c9b227ac540 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10076,7 +10076,6 @@ with pkgs; }; opensubdiv = callPackage ../development/libraries/opensubdiv { - stdenv_gcc5 = overrideCC stdenv gcc5; cudaSupport = config.cudaSupport or false; cmake = cmake_2_8; }; @@ -13814,7 +13813,6 @@ with pkgs; bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { - stdenv_gcc5 = overrideCC stdenv gcc5; cudaSupport = config.cudaSupport or false; python = python35; }; From 57f82de364d9f80914cfc63cbdfd8d3f731004b8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 07:08:22 +0300 Subject: [PATCH 1374/2806] caffe: 1.0-rc5 -> 1.0 Fix build with cudatoolkit9. --- .../science/math/caffe/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index cb28d38bf1d..8dc3e3ce43d 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -22,22 +22,23 @@ assert pythonSupport -> (python != null && numpy != null); stdenv.mkDerivation rec { name = "caffe-${version}"; - version = "1.0-rc5"; + version = "1.0"; src = fetchFromGitHub { owner = "BVLC"; repo = "caffe"; - rev = "rc5"; - sha256 = "0lfmmc0n6xvkpygvxclzrvd0zigb4yfc5612anv2ahlxpfi9031c"; + rev = version; + sha256 = "104jp3cm823i3cdph7hgsnj6l77ygbwsy35mdmzhmsi4jxprd9j3"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake doxygen ]; - cmakeFlags = [ "-DCUDA_ARCH_NAME=All" ] - ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON" - ++ lib.optional (!pythonSupport) "-DBUILD_python=OFF"; + cmakeFlags = [ + "-DCUDA_ARCH_NAME=All" + (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") + ] ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON"; buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ] ++ lib.optional cudaSupport cudatoolkit @@ -49,6 +50,16 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out"]; propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle + preConfigure = lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") '' + # CUDA 9.0 doesn't support sm_20 + sed -i 's,20 21(20) ,,' cmake/Cuda.cmake + '' + lib.optionalString (python.isPy3 or false) '' + sed -i \ + -e 's,"python-py''${boost_py_version}",python3,g' \ + -e 's,''${Boost_PYTHON-PY''${boost_py_version}_FOUND},''${Boost_PYTHON3_FOUND},g' \ + cmake/Dependencies.cmake + ''; + postInstall = '' # Internal static library. rm $out/lib/libproto.a From 50a223b1446224d4fb0144ecd13c2a2d9955a156 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 18:00:28 +0300 Subject: [PATCH 1375/2806] clblas: 20160505 -> 2.12 --- .../science/math/clblas/cuda/default.nix | 73 ------------------- .../libraries/science/math/clblas/default.nix | 62 ++++++++++++++++ .../math/clblas/{cuda => }/platform.patch | 0 pkgs/top-level/all-packages.nix | 5 +- 4 files changed, 63 insertions(+), 77 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/clblas/cuda/default.nix create mode 100644 pkgs/development/libraries/science/math/clblas/default.nix rename pkgs/development/libraries/science/math/clblas/{cuda => }/platform.patch (100%) diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix deleted file mode 100644 index ae568bc6db1..00000000000 --- a/pkgs/development/libraries/science/math/clblas/cuda/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -, gfortran -, blas -, boost -, python -, ocl-icd -, cudatoolkit -, nvidia_x11 -, gtest -}: - -stdenv.mkDerivation rec { - name = "clblas-cuda-${version}"; - version = "git-20160505"; - - src = fetchFromGitHub { - owner = "clMathLibraries"; - repo = "clBLAS"; - rev = "d20977ec4389c6b3751e318779410007c5e272f8"; - sha256 = "1jna176cxznv7iz43svd6cjrbbf0fc2lrbpfpg4s08vc7xnwp0n4"; - }; - - patches = [ ./platform.patch ]; - - postPatch = '' - sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt - ''; - - configurePhase = '' - findInputs ${boost.dev} boost_dirs propagated-native-build-inputs - - export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include - export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib - - mkdir -p Build - pushd Build - - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ blas nvidia_x11 ]}" - - cmake ../src -DCMAKE_INSTALL_PREFIX=$out \ - -DCMAKE_BUILD_TYPE=Release \ - -DOPENCL_ROOT=${cudatoolkit} \ - -DUSE_SYSTEM_GTEST=ON - ''; - - dontStrip = true; - - buildInputs = [ - cmake - gfortran - blas - python - ocl-icd - cudatoolkit - nvidia_x11 - gtest - ]; - - meta = with stdenv.lib; { - homepage = https://github.com/clMathLibraries/clBLAS; - description = "A software library containing BLAS functions written in OpenCL"; - longDescription = '' - This package contains a library of BLAS functions on top of OpenCL. - The current version is linked to the NVIDIA OpenCL implementation provided by the CUDA toolkit. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix new file mode 100644 index 00000000000..40b02d30341 --- /dev/null +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, cmake +, gfortran +, blas +, boost +, python +, ocl-icd +, opencl-headers +, gtest +}: + +stdenv.mkDerivation rec { + name = "clblas-${version}"; + version = "2.12"; + + src = fetchFromGitHub { + owner = "clMathLibraries"; + repo = "clBLAS"; + rev = "v${version}"; + sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs"; + }; + + patches = [ ./platform.patch ]; + + postPatch = '' + sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt + ''; + + preConfigure = '' + cd src + ''; + + cmakeFlags = [ + "-DUSE_SYSTEM_GTEST=ON" + ]; + + buildInputs = [ + cmake + gfortran + blas + python + ocl-icd + opencl-headers + boost + gtest + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/clMathLibraries/clBLAS"; + description = "A software library containing BLAS functions written in OpenCL"; + longDescription = '' + This package contains a library of BLAS functions on top of OpenCL. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/science/math/clblas/cuda/platform.patch b/pkgs/development/libraries/science/math/clblas/platform.patch similarity index 100% rename from pkgs/development/libraries/science/math/clblas/cuda/platform.patch rename to pkgs/development/libraries/science/math/clblas/platform.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9b227ac540..2ecba5c486e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18346,10 +18346,7 @@ with pkgs; blas = callPackage ../development/libraries/science/math/blas { }; - clblas-cuda = callPackage ../development/libraries/science/math/clblas/cuda { - cudatoolkit = pkgs.cudatoolkit75; - inherit (linuxPackages) nvidia_x11; - }; + clblas = callPackage ../development/libraries/science/math/clblas { }; jags = callPackage ../applications/science/math/jags { }; From efd2444de5663df1cad443f41d4bfec4a1745f28 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 18:02:20 +0300 Subject: [PATCH 1376/2806] python.pkgs.libgpuarray: -9998.0 -> 0.6.9 --- .../libgpuarray/cuda/default.nix | 129 ------------------ .../python-modules/libgpuarray/default.nix | 81 +++++++++++ pkgs/top-level/python-packages.nix | 10 +- 3 files changed, 85 insertions(+), 135 deletions(-) delete mode 100644 pkgs/development/python-modules/libgpuarray/cuda/default.nix create mode 100644 pkgs/development/python-modules/libgpuarray/default.nix diff --git a/pkgs/development/python-modules/libgpuarray/cuda/default.nix b/pkgs/development/python-modules/libgpuarray/cuda/default.nix deleted file mode 100644 index a9c64cd7d7f..00000000000 --- a/pkgs/development/python-modules/libgpuarray/cuda/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, cmake -, cython -, numpy -, Mako -, six -, nose -, beaker -, memcached -, pkgconfig -, glibc -, clblas -, Babel -, pygments -, scipy -, python -, cudatoolkit -, nvidia_x11 -}: -buildPythonPackage rec { - name = "libgpuarray-cuda-${version}"; - version = "-9998.0"; - - src = fetchFromGitHub { - owner = "Theano"; - repo = "libgpuarray"; - rev = "fc36a40526c0a8303ace6c574ffdefba7feafe17"; - sha256 = "1kb0k42addqjxiahlcbv6v6271yhsmz71j12186fpy60870i7zm7"; - }; - - doCheck = true; - - configurePhase = '' - mkdir -p Build/Install - pushd Build - - cmake .. -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=./Install \ - -DCLBLAS_ROOT_DIR=${clblas} - - popd - ''; - - preBuild = '' - pushd Build - make - make install - - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ cudatoolkit clblas nvidia_x11 ]}" $1 - } - - fixRunPath Install/lib/libgpuarray.so - - popd - ''; - - setupPyBuildFlags = [ "-L $(pwd)/Build/Install/lib" "-I $(pwd)/Build/Install/include" ]; - - preInstall = '' - cp -r Build/Install $out - ''; - - postInstall = '' - pushd $out/${python.sitePackages}/pygpu - for f in $(find $out/pygpu -name "*.h"); do - ln -s $f $(basename $f) - done - popd - ''; - checkPhase = '' - mkdir -p my_bin - pushd my_bin - - cat > libgpuarray_run_tests << EOF -#!/bin/sh -if [ \$# -eq 0 ]; then - echo "No argument provided." - echo "Available tests:" - ls $out/${python.sitePackages}/pygpu/tests | grep "test_" - exit 1 -else - nosetests -v "$out/${python.sitePackages}/pygpu/tests/\$@" -fi -EOF - - chmod +x libgpuarray_run_tests - popd - - cp -r my_bin $out/bin - ''; - - dontStrip = true; - - propagatedBuildInputs = [ - numpy - scipy - nose - six - Mako - ]; - - buildInputs = [ - cmake - cython - beaker - memcached - pkgconfig - glibc - Babel - pygments - numpy.blas - cudatoolkit - nvidia_x11 - clblas - ]; - - meta = with stdenv.lib; { - homepage = https://github.com/Theano/libgpuarray; - description = "Library to manipulate tensors on GPU."; - license = licenses.free; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix new file mode 100644 index 00000000000..3c24c2ed24c --- /dev/null +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -0,0 +1,81 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, cython +, numpy +, six +, nose +, Mako +, python +, cudaSupport ? false, cudatoolkit +, openclSupport ? true, ocl-icd, clblas +}: + +buildPythonPackage rec { + name = "libgpuarray-${version}"; + version = "0.6.9"; + + src = fetchFromGitHub { + owner = "Theano"; + repo = "libgpuarray"; + rev = "v${version}"; + sha256 = "06z47ls42a37gbv0x7f3l1qvils7q0hvy02s95l530klgibp19s0"; + }; + + # requires a GPU + doCheck = false; + + configurePhase = "cmakeConfigurePhase"; + + libraryPath = lib.makeLibraryPath ( + [] + ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] + ++ lib.optionals openclSupport [ ocl-icd clblas ] + ); + + preBuild = '' + make -j$NIX_BUILD_CORES + make install + + ls $out/lib + export NIX_CFLAGS_COMPILE="-L $out/lib -I $out/include $NIX_CFLAGS_COMPILE" + + cd .. + ''; + + postFixup = '' + rm $out/lib/libgpuarray-static.a + + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:$libraryPath" $1 + } + + fixRunPath $out/lib/libgpuarray.so + ''; + + propagatedBuildInputs = [ + numpy + six + Mako + ]; + + enableParallelBuilding = true; + + buildInputs = [ + cmake + cython + nose + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/Theano/libgpuarray"; + description = "Library to manipulate tensors on GPU."; + license = licenses.free; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2026107b77..53469afd593 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11129,14 +11129,12 @@ in { }; }); - libgpuarray-cuda = callPackage ../development/python-modules/libgpuarray/cuda/default.nix rec { - inherit (self) numpy scipy; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit75; - clblas = pkgs.clblas-cuda; + libgpuarray = callPackage ../development/python-modules/libgpuarray { + clblas = pkgs.clblas.override { boost = self.boost; }; + cudaSupport = pkgs.config.cudaSupport or false; }; - libnacl = callPackage ../development/python-modules/libnacl/default.nix { + libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; }; From 771e403786d58bd48898b951de733e2d726b3e35 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Sep 2017 18:03:00 +0300 Subject: [PATCH 1377/2806] python.pkgs.Theano: merge CUDA and non-CUDA versions --- .../python-modules/Theano/default.nix | 75 +++++++++++++++++++ .../Theano/theano-with-cuda/default.nix | 65 ---------------- .../Theano/theano-without-cuda/default.nix | 44 ----------- pkgs/top-level/python-packages.nix | 28 +++---- 4 files changed, 87 insertions(+), 125 deletions(-) create mode 100644 pkgs/development/python-modules/Theano/default.nix delete mode 100644 pkgs/development/python-modules/Theano/theano-with-cuda/default.nix delete mode 100644 pkgs/development/python-modules/Theano/theano-without-cuda/default.nix diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix new file mode 100644 index 00000000000..e0ff839ce1b --- /dev/null +++ b/pkgs/development/python-modules/Theano/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, lib +, fetchPypi +, gcc +, writeScriptBin +, buildPythonPackage +, isPyPy +, pythonOlder +, isPy3k +, nose +, numpy +, pydot_ng +, scipy +, six +, libgpuarray +, cudaSupport ? false, cudatoolkit +, cudnnSupport ? false, cudnn +}: + +assert cudnnSupport -> cudaSupport; + +let + extraFlags = + lib.optionals cudaSupport [ "-I ${cudatoolkit}/include" "-L ${cudatoolkit}/lib" ] + ++ lib.optionals cudnnSupport [ "-I ${cudnn}/include" "-L ${cudnn}/lib" ]; + + gcc_ = writeScriptBin "g++" '' + #!${stdenv.shell} + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${toString extraFlags}" + exec ${gcc}/bin/g++ "$@" + ''; + + libgpuarray_ = libgpuarray.override { inherit cudaSupport; }; + +in buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Theano"; + version = "0.9.0"; + + disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); + + src = fetchPypi { + inherit pname version; + sha256 = "05xwg00da8smkvkh6ywbywqzj8dw7x840jr74wqhdy9icmqncpbl"; + }; + + postPatch = '' + sed -i 's,g++,${gcc_}/bin/g++,g' theano/configdefaults.py + '' + lib.optionalString cudnnSupport '' + sed -i \ + -e "s,ctypes.util.find_library('cudnn'),'${cudnn}/lib/libcudnn.so',g" \ + -e "s/= _dnn_check_compile()/= (True, None)/g" \ + theano/gpuarray/dnn.py + ''; + + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + doCheck = false; + # takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'" + # when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276, + # the fix for which hasn't been merged yet. + + # keep Nose around since running the tests by hand is possible from Python or bash + checkInputs = [ nose ]; + propagatedBuildInputs = [ numpy numpy.blas scipy six libgpuarray_ ]; + + meta = with stdenv.lib; { + homepage = http://deeplearning.net/software/theano/; + description = "A Python library for large-scale array computation"; + license = licenses.bsd3; + maintainers = with maintainers; [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix deleted file mode 100644 index f8b7a713d08..00000000000 --- a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ buildPythonPackage -, fetchFromGitHub -, pythonOlder -, future -, numpy -, six -, scipy -, nose -, nose-parameterized -, pydot_ng -, sphinx -, pygments -, libgpuarray -, python -, pycuda -, cudatoolkit -, cudnn -, stdenv -}: - -buildPythonPackage rec { - name = "Theano-cuda-${version}"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "Theano"; - repo = "Theano"; - rev = "46fbfeb628220b5e42bf8277a5955c52d153e874"; - sha256 = "1sl91gli3jaw5gpjqqab4fiq4x6282spqciaid1s65pjsf3k55sc"; - }; - - doCheck = false; - - patchPhase = '' - pushd theano/sandbox/gpuarray - sed -i -re '2s/^/from builtins import bytes\n/g' subtensor.py - sed -i -re "s/(b'2')/int(bytes(\1))/g" subtensor.py - sed -i -re "s/(ctx.bin_id\[\-2\])/int(\1)/g" subtensor.py - - sed -i -re '2s/^/from builtins import bytes\n/g' dnn.py - sed -i -re "s/(b'30')/int(bytes(\1))/g" dnn.py - sed -i -re "s/(ctx.bin_id\[\-2:\])/int(\1)/g" dnn.py - popd - ''; - - dontStrip = true; - - propagatedBuildInputs = [ - numpy.blas - numpy - six - scipy - nose - nose-parameterized - pydot_ng - sphinx - pygments - pycuda - cudatoolkit - libgpuarray - cudnn - ] ++ (stdenv.lib.optional (pythonOlder "3.0") future); - - passthru.cudaSupport = true; -} diff --git a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix deleted file mode 100644 index e93af743619..00000000000 --- a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, fetchurl -, buildPythonPackage -, isPyPy -, pythonOlder -, isPy3k -, nose -, numpy -, pydot_ng -, scipy -, six -}: - -buildPythonPackage rec { - name = "Theano-0.9.0"; - - disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); - - src = fetchurl { - url = "mirror://pypi/T/Theano/${name}.tar.gz"; - sha256 = "05xwg00da8smkvkh6ywbywqzj8dw7x840jr74wqhdy9icmqncpbl"; - }; - - #preCheck = '' - # mkdir -p check-phase - # export HOME=$(pwd)/check-phase - #''; - doCheck = false; - # takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'" - # when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276, - # the fix for which hasn't been merged yet. - - # keep Nose around since running the tests by hand is possible from Python or bash - propagatedBuildInputs = [ nose numpy numpy.blas pydot_ng scipy six ]; - - meta = { - homepage = http://deeplearning.net/software/theano/; - description = "A Python library for large-scale array computation"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.bcdarwin ]; - }; - - passthru.cudaSupport = false; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53469afd593..a084abf9bed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19833,24 +19833,20 @@ in { stevedore = callPackage ../development/python-modules/stevedore {}; - Theano = self.TheanoWithoutCuda; + Theano = callPackage ../development/python-modules/Theano rec { + cudaSupport = pkgs.config.cudaSupport or false; + cudnnSupport = cudaSupport; + }; - TheanoWithoutCuda = callPackage ../development/python-modules/Theano/theano-without-cuda { }; + TheanoWithoutCuda = self.Theano.override { + cudaSupport = true; + cudnnSupport = true; + }; - TheanoWithCuda = callPackage ../development/python-modules/Theano/theano-with-cuda ( - let - boost = pkgs.boost159.override { - inherit (self) python numpy scipy; - }; - in rec { - cudatoolkit = pkgs.cudatoolkit75; - cudnn = pkgs.cudnn5_cudatoolkit75; - inherit (self) numpy scipy; - pycuda = self.pycuda.override { inherit boost; }; - libgpuarray = self.libgpuarray-cuda.override { - clblas = pkgs.clblas-cuda.override { inherit boost; }; - }; - }); + TheanoWithCuda = self.Theano.override { + cudaSupport = false; + cudnnSupport = false; + }; tidylib = buildPythonPackage rec { version = "0.2.4"; From b317d7cfd41e785cd7c7aa7ba8f6cf98fa597184 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Oct 2017 03:46:30 +0300 Subject: [PATCH 1378/2806] opensubdiv: 3.2.0 -> 3.3.0 Fix build with new CUDA toolkit. --- pkgs/development/libraries/opensubdiv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 64c4f57c724..91899ad8da4 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "opensubdiv-${version}"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "0wk12n1s8za3sz8d6bmfm3rfjyx20j48gy1xp57dvbnjvlvzqy3w"; + sha256 = "0wpjwfik4q9s4r30hndhzmfyzv968mmg5lgng0123l07mn47d2yl"; }; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DNO_EXAMPLES=1" "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" - ]; + ] ++ lib.optional cudaSupport "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30"; enableParallelBuilding = true; From 22b582821d2758bcb6b716e897d4aee57b2be1c9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Oct 2017 04:04:29 +0300 Subject: [PATCH 1379/2806] blender: fix build with new cudatoolkit --- pkgs/applications/misc/blender/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index ccbcb239502..b348f253b35 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -57,9 +57,8 @@ stdenv.mkDerivation rec { ++ optional jackaudioSupport "-DWITH_JACK=ON" ++ optionals cudaSupport [ "-DWITH_CYCLES_CUDA_BINARIES=ON" - # Disable the sm_20 architecture to work around a segfault in - # ptxas, as suggested on #blendercoders. - "-DCYCLES_CUDA_BINARIES_ARCH=sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61" + # Disable architectures before sm_30 to support new CUDA toolkits. + "-DCYCLES_CUDA_BINARIES_ARCH=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61" ] ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; From 59f51eba29820a1b6294a66c977a49d4a92a55c7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Oct 2017 04:25:18 +0300 Subject: [PATCH 1380/2806] opencv3: use older cudatoolkit --- pkgs/development/libraries/opencv/3.x.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 46ee4ea565b..ecb7bf78b20 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -165,8 +165,10 @@ stdenv.mkDerivation rec { (opencvFlag "OPENEXR" enableEXR) (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) - ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ] - ++ lib.optional buildContrib "-DBUILD_PROTOBUF=off" + ] ++ lib.optionals enableCuda [ + "-DCUDA_FAST_MATH=ON" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" + ] ++ lib.optional buildContrib "-DBUILD_PROTOBUF=off" ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ecba5c486e..a91a3b7c3ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10014,6 +10014,7 @@ with pkgs; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { enableCuda = config.cudaSupport or false; + cudatoolkit = cudatoolkit8; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; }; From 1360c356e3b8082dbfb279069c12a29e550d503d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 19 Oct 2017 13:11:20 +0300 Subject: [PATCH 1381/2806] driversi686Linux: init This is added so that Hydra would build several drivers-related packages for i686. Closes #30455. --- pkgs/top-level/all-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2e3cad5a0b..01dd85a671e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8029,6 +8029,18 @@ with pkgs; dotconf = callPackage ../development/libraries/dotconf { }; + # Multi-arch "drivers" which we want to build for i686. + driversi686Linux = recurseIntoAttrs { + inherit (pkgsi686Linux) + mesa_noglu + vaapiIntel + libvdpau-va-gl + vaapiVdpau + beignet + glxinfo + vdpauinfo; + }; + dssi = callPackage ../development/libraries/dssi {}; dxflib = callPackage ../development/libraries/dxflib {}; From ba9cde1dd55532f673c3fd64bce62290c19b4e32 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 15 Oct 2017 14:45:19 +0300 Subject: [PATCH 1382/2806] bazel_0_4: add optional Nix-specific hacks * Skip verifying checksums for already fetched packages. Needed for two-staged building in Nix: 1. Build a fixed derivation with `bazel fetch` (filtered out of non-reproducable bits). 2. Build an actual derivation which uses fetched dependencies (skipping checksums needed here because they depend on the build directory). * Don't clean environment variables for children processes. Needed for Nix compiler wrappers. --- .../tools/build-managers/bazel/0.4.nix | 8 ++- .../build-managers/bazel/nix-hacks.patch | 51 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/build-managers/bazel/nix-hacks.patch diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index 2137c5c1497..bd61bb00ee1 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper, which }: +{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, makeWrapper, which +# Always assume all markers valid (don't redownload dependencies). +# Also, don't clean up environment variables. +, enableNixHacks ? false +}: stdenv.mkDerivation rec { @@ -21,6 +25,8 @@ stdenv.mkDerivation rec { sourceRoot = "."; + patches = lib.optional enableNixHacks ./nix-hacks.patch; + postPatch = '' for f in $(grep -l -r '#!/bin/bash'); do substituteInPlace "$f" --replace '#!/bin/bash' '#!${bash}/bin/bash' diff --git a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch new file mode 100644 index 00000000000..563fe635e6b --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch @@ -0,0 +1,51 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +index eafa09fb5..d2d5e40e8 100644 +--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java ++++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +@@ -287,21 +287,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction { + markerData.put(key, value); + } + } +- boolean result = false; +- if (markerRuleKey.equals(ruleKey)) { +- result = handler.verifyMarkerData(rule, markerData, env); +- if (env.valuesMissing()) { +- return null; +- } +- } + +- if (result) { +- return new Fingerprint().addString(content).digestAndReset(); +- } else { +- // So that we are in a consistent state if something happens while fetching the repository +- markerPath.delete(); +- return null; +- } ++ return new Fingerprint().addString(content).digestAndReset(); + + } catch (IOException e) { + throw new RepositoryFunctionException(e, Transience.TRANSIENT); +diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java +index a7ebc8f7a..40f2049fa 100644 +--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java ++++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java +@@ -129,7 +129,6 @@ public class JavaSubprocessFactory implements SubprocessFactory { + ProcessBuilder builder = new ProcessBuilder(); + builder.command(params.getArgv()); + if (params.getEnv() != null) { +- builder.environment().clear(); + builder.environment().putAll(params.getEnv()); + } + +diff --git a/src/main/java/com/google/devtools/build/lib/worker/Worker.java b/src/main/java/com/google/devtools/build/lib/worker/Worker.java +index 0268d1b2b..637364657 100644 +--- a/src/main/java/com/google/devtools/build/lib/worker/Worker.java ++++ b/src/main/java/com/google/devtools/build/lib/worker/Worker.java +@@ -77,7 +77,6 @@ class Worker { + new ProcessBuilder(command) + .directory(workDir.getPathFile()) + .redirectError(Redirect.appendTo(logFile.getPathFile())); +- processBuilder.environment().clear(); + processBuilder.environment().putAll(workerKey.getEnv()); + + this.process = processBuilder.start(); From e3afbd6d2670e51d37707f932f5b426daa8ae422 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 17 Oct 2017 18:10:58 +0300 Subject: [PATCH 1383/2806] bazel_0_4: set absolute path to /usr/bin/env Also cleanup TMPDIR. --- .../tools/build-managers/bazel/0.4.nix | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index bd61bb00ee1..467ce6a1789 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, makeWrapper, which +{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, makeWrapper, which, coreutils # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -23,27 +23,24 @@ stdenv.mkDerivation rec { sha256 = "0asmq3kxnl4326zhgh13mvcrc8jvmiswjj4ymrq0943q4vj7nwrb"; }; + preUnpack = '' + mkdir bazel + cd bazel + ''; sourceRoot = "."; patches = lib.optional enableNixHacks ./nix-hacks.patch; postPatch = '' - for f in $(grep -l -r '#!/bin/bash'); do - substituteInPlace "$f" --replace '#!/bin/bash' '#!${bash}/bin/bash' + for f in $(grep -l -r '/bin/bash'); do + substituteInPlace "$f" --replace '/bin/bash' '${bash}/bin/bash' done - for f in \ - src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java \ - src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java \ - src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java \ - src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java \ - ; do - substituteInPlace "$f" --replace /bin/bash ${bash}/bin/bash + for f in $(grep -l -r '/usr/bin/env'); do + substituteInPlace "$f" --replace '/usr/bin/env' '${coreutils}/bin/env' done ''; buildInputs = [ - stdenv.cc - stdenv.cc.cc.lib jdk zip unzip @@ -58,12 +55,7 @@ stdenv.mkDerivation rec { bash ]; - # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink - # detector (see com.google.devtools.build.lib.skyframe.FileFunction). - # Change this to $(mktemp -d) as soon as we figure out why. - buildPhase = '' - export TMPDIR=/tmp ./compile.sh ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ --spawn_strategy=standalone \ From fe153d73ce3add3f0733469c40b1748cd0743e5f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 15 Oct 2017 15:23:56 +0300 Subject: [PATCH 1384/2806] tensorflow: 1.3.0 ->1.3.1 Build from source. It's implemented as a two-staged Bazel build (see also 546b4aec776b3ea676bb4d58d89751919ce4f1ef). --- .../python-modules/tensorflow/default.nix | 297 ++++++++++-------- pkgs/top-level/python-packages.nix | 6 +- 2 files changed, 165 insertions(+), 138 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 00a5df843c5..a0a2f3a24af 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,156 +1,179 @@ -{ stdenv -, symlinkJoin -, lib -, fetchurl -, buildPythonPackage -, isPy3k, isPy35, isPy36, isPy27 -, cudaSupport ? false -, cudatoolkit ? null -, cudnn ? null -, linuxPackages ? null -, numpy -, six -, protobuf -, mock -, backports_weakref -, zlib -, tensorflow-tensorboard +{ stdenv, lib, fetchFromGitHub, fetchpatch, symlinkJoin, buildPythonPackage, isPy3k, pythonOlder +, bazel, which, swig, binutils, glibcLocales +, python, jemalloc, openmpi +, numpy, six, protobuf, tensorflow-tensorboard, backports_weakref +, wheel, mock, scipy +, xlaSupport ? true +, cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null +# Default from ./configure script +, cudaCapabilities ? [ "3.5" "5.2" ] }: assert cudaSupport -> cudatoolkit != null - && cudnn != null - && linuxPackages != null; + && cudnn != null; # unsupported combination assert ! (stdenv.isDarwin && cudaSupport); -# tensorflow is built from a downloaded wheel, because the upstream -# project's build system is an arcane beast based on -# bazel. Untangling it and building the wheel from source is an open -# problem. +let -buildPythonPackage rec { - pname = "tensorflow"; - version = "1.3.0"; - name = "${pname}-${version}"; - format = "wheel"; - disabled = ! (isPy35 || isPy36 || isPy27); + withTensorboard = pythonOlder "3.6"; - # cudatoolkit is split (see https://github.com/NixOS/nixpkgs/commit/bb1c9b027d343f2ce263496582d6b56af8af92e6) - # However this means that libcusolver is not loadable by tensor flow. So we undo the split here. cudatoolkit_joined = symlinkJoin { - name = "unsplit_cudatoolkit"; - paths = [ cudatoolkit.out - cudatoolkit.lib ];}; + name = "${cudatoolkit.name}-unsplit"; + paths = [ cudatoolkit.out cudatoolkit.lib ]; + }; - src = let - tfurl = sys: proc: pykind: - let - tfpref = if proc == "gpu" - then "gpu/tensorflow_gpu" - else "cpu/tensorflow"; - in - "https://storage.googleapis.com/tensorflow/${sys}/${tfpref}-${version}-${pykind}.whl"; - dls = - { - darwin.cpu = { - py2 = { - url = tfurl "mac" "cpu" "py2-none-any" ; - sha256 = "0nkymqbqjx8rsmc8vkc26cfsg4hpr6lj9zrwhjnfizvkzbbsh5z4"; - }; - py3 = { - url = tfurl "mac" "cpu" "py3-none-any" ; - sha256 = "1rj4m817w3lajnb1lgn3bwfwwk3qwvypyx11dim1ybakbmsc1j20"; - }; - }; - linux-x86_64.cpu = { - py2 = { - url = tfurl "linux" "cpu" "cp27-none-linux_x86_64"; - sha256 = "09pcyx0yfil4dm6cij8n3907pfgva07a38avrbai4qk5h6hxm8w9"; - }; - py35 = { - url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64"; - sha256 = "0p10zcf41pi33bi025fibqkq9rpd3v0rrbdmc9i9yd7igy076a07"; - }; - py36 = { - url = tfurl "linux" "cpu" "cp36-cp36m-linux_x86_64"; - sha256 = "1qm8lm2f6bf9d462ybgwrz0dn9i6cnisgwdvyq9ssmy2f1gp8hxk"; - }; - }; - linux-x86_64.cuda = { - py2 = { - url = tfurl "linux" "gpu" "cp27-none-linux_x86_64"; - sha256 = "10yyyn4g2fsv1xgmw99bbr0fg7jvykay4gb5pxrrylh7h38h6wah"; - }; - py35 = { - url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64"; - sha256 = "0icwnhkcf3fxr6bmbihqzipnn4pxybd06qv7l3k0p4xdgycwzmzk"; - }; - py36 = { - url = tfurl "linux" "gpu" "cp36-cp36m-linux_x86_64"; - sha256 = "12g3akkr083gs3sisjbmm0lpsk8phn3dvy7jjfadfxshqc7za14i"; - }; - }; - }; - in - fetchurl ( - if stdenv.isDarwin then - if isPy3k then - dls.darwin.cpu.py3 - else - dls.darwin.cpu.py2 - else - if isPy35 then - if cudaSupport then - dls.linux-x86_64.cuda.py35 - else - dls.linux-x86_64.cpu.py35 - else if isPy36 then - if cudaSupport then - dls.linux-x86_64.cuda.py36 - else - dls.linux-x86_64.cpu.py36 - else - if cudaSupport then - dls.linux-x86_64.cuda.py2 - else - dls.linux-x86_64.cpu.py2 - ); + cudaLibPath = lib.makeLibraryPath [ cudatoolkit.out cudatoolkit.lib nvidia_x11 cudnn ]; - propagatedBuildInputs = - [ numpy six protobuf mock backports_weakref ] - ++ lib.optional (!isPy36) tensorflow-tensorboard - ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn stdenv.cc ]; + tfFeature = x: if x then "1" else "0"; - # tensorflow-gpu depends on tensorflow_tensorboard, which cannot be + common = rec { + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "tensorflow"; + repo = "tensorflow"; + rev = "v${version}"; + sha256 = "0gvi32dvv4ynr05p0gg5i0a6c55pig48k5qm7zslcqnp4sifwx0i"; + }; + + nativeBuildInputs = [ swig which wheel scipy ]; + + buildInputs = [ python jemalloc openmpi glibcLocales ] + ++ lib.optionals cudaSupport [ cudatoolkit cudnn ]; + + propagatedBuildInputs = [ numpy six protobuf ] + ++ lib.optional (!isPy3k) mock + ++ lib.optional (pythonOlder "3.4") backports_weakref + ++ lib.optional withTensorboard tensorflow-tensorboard; + + preConfigure = '' + patchShebangs configure + export HOME="$NIX_BUILD_TOP" + + export PYTHON_BIN_PATH="${python.interpreter}" + export TF_NEED_GCP=1 + export TF_NEED_HDFS=1 + export TF_NEED_CUDA=${tfFeature cudaSupport} + export TF_NEED_MPI=1 + export TF_ENABLE_XLA=${tfFeature xlaSupport} + ${lib.optionalString cudaSupport '' + export CUDA_TOOLKIT_PATH=${cudatoolkit_joined} + export TF_CUDA_VERSION=${cudatoolkit.majorVersion} + export CUDNN_INSTALL_PATH=${cudnn} + export TF_CUDNN_VERSION=${cudnn.majorVersion} + export GCC_HOST_COMPILER_PATH=${cudatoolkit.cc}/bin/gcc + export TF_CUDA_COMPUTE_CAPABILITIES=${lib.concatStringsSep "," cudaCapabilities} + ''} + + # There is _no_ non-interactive mode of configure. + sed -i \ + -e 's,read -p,echo,g' \ + -e 's,lib64,lib,g' \ + configure + ''; + + hardeningDisable = [ "all" ]; + + bazelFlags = [ "--config=opt" ] + ++ lib.optional cudaSupport "--config=cuda"; + + bazelTarget = "//tensorflow/tools/pip_package:build_pip_package"; + + meta = with stdenv.lib; { + description = "Computation using data flow graphs for scalable machine learning"; + homepage = "http://tensorflow.org"; + license = licenses.asl20; + maintainers = with maintainers; [ jyp abbradar ]; + platforms = with platforms; if cudaSupport then linux else linux ++ darwin; + }; + }; + +in buildPythonPackage (common // { + name = "tensorflow-${common.version}"; + + deps = stdenv.mkDerivation (common // { + name = "tensorflow-external-${common.version}"; + + nativeBuildInputs = common.nativeBuildInputs ++ [ bazel ]; + + preConfigure = common.preConfigure + '' + export PYTHON_LIB_PATH="$(pwd)/site-packages" + ''; + + buildPhase = '' + mkdir site-packages + bazel --output_base="$(pwd)/output" fetch $bazelFlags $bazelTarget + ''; + + installPhase = '' + rm -rf output/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*} + # Patching markers to make them deterministic + for i in output/external/\@*.marker; do + sed -i 's, -\?[0-9][0-9]*$, 1,' "$i" + done + # Patching symlinks to remove build directory reference + find output/external -type l | while read symlink; do + ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink" + done + + cp -r output/external $out + ''; + + dontFixup = true; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "0xs2n061gnpizfcnhs5jjpfk2av634j1l2l17zhy10bbmrwn3vrp"; + }); + + nativeBuildInputs = common.nativeBuildInputs ++ [ (bazel.override { enableNixHacks = true; }) ]; + + configurePhase = '' + runHook preConfigure + export PYTHON_LIB_PATH="$out/${python.sitePackages}" + ./configure + runHook postConfigure + ''; + + buildPhase = '' + mkdir -p output/external + cp -r $deps/* output/external + chmod -R +w output + find output -type l | while read symlink; do + ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" + done + + patchShebangs . + find -type f -name CROSSTOOL\* -exec sed -i \ + -e 's,/usr/bin/ar,${binutils}/bin/ar,g' \ + {} \; + + mkdir -p $out/${python.sitePackages} + bazel --output_base="$(pwd)/output" build $bazelFlags $bazelTarget + + bazel-bin/tensorflow/tools/pip_package/build_pip_package $PWD/dist + ''; + + # tensorflow depends on tensorflow_tensorboard, which cannot be # built at the moment (some of its dependencies do not build # [htlm5lib9999999 (seven nines) -> tensorboard], and it depends on an old version of # bleach) Hence we disable dependency checking for now. - installFlags = lib.optional isPy36 "--no-dependencies"; - - # Note that we need to run *after* the fixup phase because the - # libraries are loaded at runtime. If we run in preFixup then - # patchelf --shrink-rpath will remove the cuda libraries. - postFixup = let - rpath = stdenv.lib.makeLibraryPath - (if cudaSupport then - [ stdenv.cc.cc.lib zlib cudatoolkit_joined cudnn - linuxPackages.nvidia_x11 ] - else - [ stdenv.cc.cc.lib zlib ] - ); - in - '' - find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \; - ''; + installFlags = lib.optional (!withTensorboard) "--no-dependencies"; + # Tests are slow and impure. doCheck = false; - meta = with stdenv.lib; { - description = "TensorFlow helps the tensors flow"; - homepage = http://tensorflow.org; - license = licenses.asl20; - maintainers = with maintainers; [ jyp ]; - platforms = with platforms; if cudaSupport then linux else linux ++ darwin; - }; -} + # For some reason, CUDA is not retained in RPATH. + postFixup = lib.optionalString cudaSupport '' + libPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so" + patchelf --set-rpath "$(patchelf --print-rpath "$libPath"):${cudaLibPath}" "$libPath" + ''; + + doInstallCheck = true; + installCheckPhase = '' + cd $NIX_BUILD_TOP + ${python.interpreter} -c "import tensorflow" + ''; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a084abf9bed..60946e8e8dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25974,8 +25974,12 @@ EOF tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflow = callPackage ../development/python-modules/tensorflow { + tensorflow = callPackage ../development/python-modules/tensorflow rec { + bazel = pkgs.bazel_0_4; cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit8; + cudnn = pkgs.cudnn6_cudatoolkit8; }; tensorflowWithoutCuda = self.tensorflow.override { From 94dc37d6223ff6e47745afa92d2fb0efcb3df44f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Oct 2017 00:56:43 +0300 Subject: [PATCH 1385/2806] cntk: init at 2.2 --- .../science/math/cntk/default.nix | 98 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++ pkgs/top-level/python-packages.nix | 21 ++++ 3 files changed, 127 insertions(+) create mode 100644 pkgs/applications/science/math/cntk/default.nix diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix new file mode 100644 index 00000000000..80a5f6f032b --- /dev/null +++ b/pkgs/applications/science/math/cntk/default.nix @@ -0,0 +1,98 @@ +{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake +, openblas, opencv3, libzip, boost, protobuf, openmpi +, onebitSGDSupport ? false +, cudaSupport ? false, cudatoolkit, nvidia_x11 +, cudnnSupport ? false, cudnn +}: + +assert cudnnSupport -> cudaSupport; + +let + # Old specific version required for CNTK. + cub = fetchFromGitHub { + owner = "NVlabs"; + repo = "cub"; + rev = "1.4.1"; + sha256 = "1lcdwblz03c0yq1lxndg566kg14b5qm14x5qixjbmz6wq85kgmqc"; + }; + +in stdenv.mkDerivation rec { + name = "CNTK-${version}"; + version = "2.2"; + + # Submodules + src = fetchgit { + url = "https://github.com/Microsoft/CNTK"; + rev = "v${version}"; + sha256 = "0q4knrwiyphb2fbqf9jzqvkz2jzj6jmbmang3lavdvsh7z0n8zz9"; + }; + + patches = [ + # Fix "'exp' was not declared" + (fetchpatch { + url = "https://github.com/imriss/CNTK/commit/ef1cca6df95cc507deb8471df2c0dd8cbfeef23b.patch"; + sha256 = "0z7xyrxwric0c4h7rfs05f544mcq6d10wgs0vvfcyd2pcf410hy7"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ] + ++ lib.optional cudaSupport cudatoolkit + ++ lib.optional cudnnSupport cudnn; + + configureFlags = [ + "--with-opencv=${opencv3}" + "--with-libzip=${libzip.dev}" + "--with-openblas=${openblas}" + "--with-boost=${boost.dev}" + "--with-protobuf=${protobuf}" + "--with-mpi=${openmpi}" + ] ++ lib.optionals cudaSupport [ + "--cuda=yes" + "--with-cuda=${cudatoolkit}" + "--with-gdk-include=${cudatoolkit}/include" + "--with-gdk-nvml-lib=${nvidia_x11}/lib" + "--with-cub=${cub}" + ] ++ lib.optional onebitSGDSupport "--1bitsgd=yes"; + + configurePhase = '' + sed -i \ + -e 's,^GIT_STATUS=.*,GIT_STATUS=,' \ + -e 's,^GIT_COMMIT=.*,GIT_COMMIT=v${version},' \ + -e 's,^GIT_BRANCH=.*,GIT_BRANCH=v${version},' \ + -e 's,^BUILDER=.*,BUILDER=nixbld,' \ + -e 's,^BUILDMACHINE=.*,BUILDMACHINE=machine,' \ + -e 's,^BUILDPATH=.*,BUILDPATH=/homeless-shelter,' \ + -e '/git does not exist/d' \ + Tools/generate_build_info + + patchShebangs . + mkdir build + cd build + ${lib.optionalString cudnnSupport '' + mkdir cuda + ln -s ${cudnn}/include cuda + export configureFlags="$configureFlags --with-cudnn=$PWD" + ''} + ../configure $configureFlags + ''; + + installPhase = '' + mkdir -p $out/bin + # Moving to make patchelf remove references later. + mv lib $out + cp bin/cntk $out/bin + ''; + + hardeningDisable = [ "format" ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/Microsoft/CNTK"; + description = "An open source deep-learning toolkit"; + license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a290783fe7d..90890e0f2d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18744,6 +18744,14 @@ with pkgs; cudnnSupport = cudaSupport; }; + cntk = callPackage ../applications/science/math/cntk rec { + cudaSupport = pkgs.config.cudaSupport or false; + cudnnSupport = cudaSupport; + inherit (linuxPackages) nvidia_x11; + cudatoolkit = cudatoolkit8; + cudnn = cudnn6_cudatoolkit8; + }; + ecm = callPackage ../applications/science/math/ecm { }; eukleides = callPackage ../applications/science/math/eukleides { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60946e8e8dd..4e8c4add167 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2578,6 +2578,27 @@ in { }; }; + cntk = buildPythonPackage rec { + inherit (pkgs.cntk) name version src meta; + + buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ]; + propagatedBuildInputs = with self; [ numpy scipy enum34 protobuf pip ]; + + CNTK_LIB_PATH = "${pkgs.cntk}/lib"; + CNTK_COMPONENT_VERSION = pkgs.cntk.version; + + postPatch = '' + cd bindings/python + ''; + + postInstall = '' + rm -rf $out/${python.sitePackages}/cntk/libs + ln -s ${pkgs.cntk}/lib $out/${python.sitePackages}/cntk/libs + # It's not installed for some reason. + cp cntk/cntk_py.py $out/${python.sitePackages}/cntk + ''; + }; + celery = buildPythonPackage rec { name = "celery-${version}"; version = "4.0.2"; From 0cc2171910f14b89cc6e3d6973c776de2033981c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 19 Oct 2017 06:51:44 -0500 Subject: [PATCH 1386/2806] grantlee5: Fix debug build --- pkgs/development/libraries/grantlee/5/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 6fae90a8d89..3eed4f0c2e2 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -21,8 +21,12 @@ mkDerivation rec { postFixup = # Disabuse CMake of the notion that libraries are in $dev '' - sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \ - -e "s|\''${_IMPORT_PREFIX}|$out|" + for way in release debug; do + cmake="$dev/lib/cmake/Grantlee5/GrantleeTargets-$way.cmake" + if [ -f "$cmake" ]; then + sed -i "$cmake" -e "s|\''${_IMPORT_PREFIX}|$out|" + fi + done ''; setupHook = ./setup-hook.sh; From 0b409b37d4aae15c69ee30f0fb2e905f3a437958 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 19 Oct 2017 08:02:26 -0400 Subject: [PATCH 1387/2806] linux-copperhead: 4.13.7.a -> 4.13.8.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 35222f20796..0c9c05312ba 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.13.7"; + version = "4.13.8"; revision = "a"; - sha256 = "1ddhjj77pslivy6ngkqn020z08n5nvq8p261hz14sgp8h69v30is"; + sha256 = "1yjam6ni32f9p7c1x2q12vi9fc9v10g1w35pr4p7qgs12zx8dy27"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From ef4a6bd1817276c23236cbce906ec551fa4b7a9f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 19 Oct 2017 07:07:24 -0500 Subject: [PATCH 1388/2806] sddm: remove HiDPI patch Disabling HiDPI support seemed to resolve a segfault at SDDM startup, but that was a red herring. The problem actually resulted from a QML cache invalidation bug. It should be safe to enable HiDPI support again. --- .../display-managers/sddm/default.nix | 5 ++-- .../sddm/disable-hidpi-xorg.patch | 26 ------------------- .../applications/display-managers/sddm/series | 2 -- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch delete mode 100644 pkgs/applications/display-managers/sddm/series diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 47365fad6c4..86a963bdac4 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: @@ -17,8 +17,7 @@ in mkDerivation rec { sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb"; }; - patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ ./sddm-ignore-config-mtime.patch ]; postPatch = # Module Qt5::Test must be included in `find_package` before it is used. diff --git a/pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch b/pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch deleted file mode 100644 index abd10016a20..00000000000 --- a/pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6bff89542a2c1b5719370baf3c3a38fd8b2b3c37 Mon Sep 17 00:00:00 2001 -From: adisbladis -Date: Mon, 16 Oct 2017 02:25:50 +0800 -Subject: [PATCH] Disable HiDPI by default on X11 as it causes segmentation - faults with certain themes (KDE Breeze) - ---- - src/common/Configuration.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/Configuration.h b/src/common/Configuration.h -index 19c6fb1..2bb1dc5 100644 ---- a/src/common/Configuration.h -+++ b/src/common/Configuration.h -@@ -69,7 +69,7 @@ namespace SDDM { - Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server")); - Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server")); - Entry(MinimumVT, int, MINIMUM_VT, _S("The lowest virtual terminal number that will be used.")); -- Entry(EnableHiDPI, bool, false, _S("Enable Qt's automatic high-DPI scaling")); -+ Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling")); - ); - - Section(Wayland, --- -2.14.2 - diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series deleted file mode 100644 index 09992b211c5..00000000000 --- a/pkgs/applications/display-managers/sddm/series +++ /dev/null @@ -1,2 +0,0 @@ -sddm-ignore-config-mtime.patch -disable-hidpi-xorg.patch From dae260034cad3ec5d644e798d6e6947f3074c9dc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 19 Oct 2017 07:09:01 -0500 Subject: [PATCH 1389/2806] nixos/sddm: delete QML cache Prior to Qt 5.9.2, there is a QML cache invalidation bug which causes SDDM to segfault when upgrading Plasma. See also: https://bugreports.qt.io/browse/QTBUG-62302 --- nixos/modules/services/x11/display-managers/sddm.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index e6cc02e4d49..facaea131ae 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -19,6 +19,17 @@ let Xsetup = pkgs.writeScript "Xsetup" '' #!/bin/sh + + # Prior to Qt 5.9.2, there is a QML cache invalidation bug which sometimes + # strikes new Plasma 5 releases. If the QML cache is not invalidated, SDDM + # will segfault without explanation. We really tore our hair out for awhile + # before finding the bug: + # https://bugreports.qt.io/browse/QTBUG-62302 + # We work around the problem by deleting the QML cache before startup. It + # will be regenerated, causing a small but perceptible delay when SDDM + # starts. + rm -fr /var/lib/sddm/.cache/sddm-greeter/qmlcache + ${cfg.setupScript} ''; From 1c71b0ef313b23cd5fbbe924240b9ef9d664fe25 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 19 Oct 2017 08:39:01 -0400 Subject: [PATCH 1390/2806] openjdk: 8u144 -> 8u152 --- pkgs/development/compilers/openjdk/8.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index fef41d33d08..4499a9126a0 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,42 +21,42 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "144"; - build = "01"; + update = "152"; + build = "16"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "08b7ia2ifvcl8xnpflf019ak3xcbdjnxcy1mhfp3nbfsbk2sia45"; + sha256 = "12r5v6srwbm5hcfwz5kib7419a72cppls1d1xkrh5pjlina74zpf"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0g7q6ljvn79psrcak3l4imd27w047ngavn9jcn3xwivg5wppsfks"; + sha256 = "002f0nfw2g3q41iy8cvaqyiglcy1fx9dglgik8gv067c2zslwwqm"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "1hbbzf0m2a78dm8pyvc11jwfpj7q67pvjrp3hf0cnc38k9mzrn8q"; + sha256 = "0mnck2c3ky4hbcjfy6p3z831dxm1y2fkxq5k94zbswm4wcvlkzia"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1znc0prsb814ggm6qjgbsykm864mwypnxgi9w9f9riq8gs0578gh"; + sha256 = "1xl3mc3hd5lwh1bxzck4hw60d678h3mjh144kq90iz8kfi197hpj"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0gx5md1v1jmqhdwcc7smpf46sgp4alvb6jz3n6yjlcyfzk92yi78"; + sha256 = "1hsfgjhp5nrsy4v6c282wq6cv37hgpm8l51cls0rnpbfqvd2cw16"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0ad9w7gnwlpdssw2p3kfny02mmvzc6z8i2n7qq0177ml48c88iji"; + sha256 = "07ispgrzcf39nxs7a9yn6gkbq0ygdzlzyq32sfk57w6vy1mrgwjh"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "14yzbbishsyrzmymws6mnndqj6hvs69ivfdbjhgwi0wl23g9siym"; + sha256 = "1kj5w6gk579wh1iszq2bn6k1ib7kjpjf1lp46p5rqkx0qin79sn9"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "175q29n4bfmm1cyyga7x58zhh6ann9rm3wibw0scrhgy23lx052x"; + sha256 = "1j9r5r8rihp02n0ciwqr01c07d91z1hs0069rd8hk6i03dkkhk84"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; From 5c11622348ecdc5c7ed9aad2b86b8733342f10c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Oct 2017 14:57:19 +0200 Subject: [PATCH 1391/2806] python.pkgs.powerline: remove vcs clients from propagatedBuildInputs --- pkgs/development/python-modules/powerline/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 86f5adb2824..028d81d2934 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -8,6 +8,9 @@ , pygit2 }: +# The source of this package needs to be patched to include the full path to +# the executables of git, mercurial and bazaar. + buildPythonPackage rec { rev = "2.6"; name = "powerline-${rev}"; @@ -17,7 +20,7 @@ buildPythonPackage rec { sha256 = "c108f11fe10dc910febb94b87d3abded85d4363fb950366a9e30282b9ba7c272"; }; - propagatedBuildInputs = [ git mercurial bazaar psutil pygit2]; + propagatedBuildInputs = [ psutil pygit2]; # error: This is still beta and some tests still fail doCheck = false; From 0d5ff53a150ab6454a61dbeae45ef6e1b876fe1f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 19 Oct 2017 16:37:47 +0300 Subject: [PATCH 1392/2806] bazel_0_4: build on Darwin --- pkgs/development/tools/build-managers/bazel/0.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index 467ce6a1789..0b25623511a 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; maintainers = with maintainers; [ cstrahan philandstuff ]; - platforms = platforms.linux; + platforms = platforms.unix; }; name = "bazel-${version}"; From 38b94d1f1f7c6ac691b6131986fcec0da342a3f3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 19 Oct 2017 17:05:35 +0300 Subject: [PATCH 1393/2806] wt: 3.3.6 -> 4.0.0 Fix build with new Boost. --- pkgs/development/libraries/wt/cmake.patch | 10 ---------- pkgs/development/libraries/wt/default.nix | 6 ++---- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 pkgs/development/libraries/wt/cmake.patch diff --git a/pkgs/development/libraries/wt/cmake.patch b/pkgs/development/libraries/wt/cmake.patch deleted file mode 100644 index e7b1f87411d..00000000000 --- a/pkgs/development/libraries/wt/cmake.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt 2016-07-13 14:27:26.000000000 +0200 -+++ b/CMakeLists.txt 2016-08-16 12:58:28.135652964 +0200 -@@ -6,6 +6,7 @@ - CMAKE_POLICY(SET CMP0002 OLD) - CMAKE_POLICY(SET CMP0003 OLD) - CMAKE_POLICY(SET CMP0005 OLD) -+ CMAKE_POLICY(SET CMP0037 OLD) - ENDIF(COMMAND CMAKE_POLICY) - - PROJECT(WT) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 5d4caed890a..8dc6db03bc3 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "wt"; - version = "3.3.6"; + version = "4.0.0"; src = fetchFromGitHub { owner = "kdeforche"; repo = name; rev = version; - sha256 = "1pvykc969l9cpd0da8bgpi4gr8f6qczrbpprrxamyj1pn0ydzvq3"; + sha256 = "1451xxvnx6mlvxg0jxlr1mfv5v18h2214kijk5kacilqashfc43i"; }; enableParallelBuilding = true; @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { "--no-warn-unused-cli" ]; - patches = [ ./cmake.patch ]; # fix a cmake warning; PR sent to upstream - meta = with stdenv.lib; { homepage = https://www.webtoolkit.eu/wt; description = "C++ library for developing web applications"; From f3d368b93fcaf4c5f5109cb772f2b63ccd7cc6ae Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 19 Oct 2017 17:22:49 +0300 Subject: [PATCH 1394/2806] python.pkgs.python-mapnik: 2016-08-30 -> 3.0.13 --- pkgs/top-level/python-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f395232005..a0eb42209d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6671,14 +6671,15 @@ in { }; }; - python-mapnik = buildPythonPackage { - name = "python-mapnik-git-2016-08-30"; + python-mapnik = buildPythonPackage rec { + name = "python-mapnik-${version}"; + version = "3.0.13"; src = pkgs.fetchFromGitHub { owner = "mapnik"; repo = "python-mapnik"; - rev = "541fd962d4fc99d50ec472af6ddccfdbf98cff37"; - sha256 = "1d93qjnzggdpbhnmxlmk5jh0zd2jnpfl4n4aip5ypd39ilqibhf3"; + rev = "v${version}"; + sha256 = "0biw9bfkbsgfyjihyvkj4abx9s9r3h81rk6dc1y32022rypsqhkp"; }; disabled = isPyPy; From 47299d94f1766cbd44e43075c6858dfb10941922 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Thu, 19 Oct 2017 12:18:45 +0200 Subject: [PATCH 1395/2806] uftp: 4.9.3 -> 4.9.4 --- pkgs/servers/uftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 2e32f75c867..102868c0d46 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.3"; + version = "4.9.4"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "13y7k6g6jksnllw0mwgzw4dqczh5c5hvq3zlqin7q98m0fpib4ly"; + sha256 = "1npfl7n1w2l0j6c6iizw1szzq0lz9wy6jb55qmwhfkzwj0zd7mqp"; }; buildInputs = [ openssl ]; From 22de3b48cf388774cc5d351ff62cef059458d1ce Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 18 Oct 2017 16:53:24 +0200 Subject: [PATCH 1396/2806] python.pkgs.colorlover: init at 0.2.1 --- .../python-modules/colorlover/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/colorlover/default.nix diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix new file mode 100644 index 00000000000..7c2147a6431 --- /dev/null +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage, fetchPypi, python, stdenv, nose +}: + +buildPythonPackage rec { + pname = "colorlover"; + version = "0.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1clwvssrj007r07prfvkqnpjy3f77dlp584lj879x8mwl8f0japi"; + }; + + # no tests included in distributed archive + doCheck = false; + + meta = { + homepage = https://github.com/jackparmer/colorlover; + description = "Color scales in Python for humans"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a0eb42209d0..f167d50e4ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2932,6 +2932,8 @@ in { colorama = callPackage ../development/python-modules/colorama { }; + colorlover = callPackage ../development/python-modules/colorlover { }; + CommonMark = buildPythonPackage rec { name = "CommonMark-${version}"; version = "0.6.3"; From c6adc2e3487e09ef7bd61ab1bd244af84e2d6be4 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 18 Oct 2017 16:54:05 +0200 Subject: [PATCH 1397/2806] python.pkgs.cufflinks: init at 0.12.0 --- .../python-modules/cufflinks/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/cufflinks/default.nix diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix new file mode 100644 index 00000000000..620f85e436d --- /dev/null +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, stdenv, fetchPypi, pandas, plotly, colorlover +}: + +buildPythonPackage rec { + pname = "cufflinks"; + version = "0.12.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "04ninvwm6277n3hqc17ririss90cd832wza3q3vf115rrrds3xyy"; + }; + + propagatedBuildInputs = [ pandas plotly colorlover ]; + + # tests not included in archive + doCheck = false; + + meta = { + homepage = https://github.com/santosjorge/cufflinks; + description = "Productivity Tools for Plotly + Pandas"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f167d50e4ec..0f4cdf69171 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1669,6 +1669,8 @@ in { csvkit = callPackage ../development/python-modules/csvkit { }; + cufflinks = callPackage ../development/python-modules/cufflinks { }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; cvxopt = buildPythonPackage rec { From f8085cb1dd8f86253e57330371f00147a98ac3ae Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 17 Oct 2017 15:09:42 +0100 Subject: [PATCH 1398/2806] nixos/sway: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/sway.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 nixos/modules/programs/sway.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a8cb957ffe2..e8fecafb2c8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -99,6 +99,7 @@ ./programs/ssh.nix ./programs/ssmtp.nix ./programs/sysdig.nix + ./programs/sway.nix ./programs/thefuck.nix ./programs/tmux.nix ./programs/venus.nix diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix new file mode 100644 index 00000000000..fc8a06d106a --- /dev/null +++ b/nixos/modules/programs/sway.nix @@ -0,0 +1,19 @@ +{ config, pkgs, lib, ... }: + +with lib; +{ + options.programs.sway.enable = mkEnableOption "sway"; + + config = mkIf config.programs.sway.enable { + environment.systemPackages = [ pkgs.sway pkgs.xwayland ]; + security.wrappers.sway = { + source = "${pkgs.sway}/bin/sway"; + capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip"; + owner = "root"; + group = "sway"; + permissions = "u+rx,g+rx"; + }; + + users.extraGroups.sway = {}; + }; +} From 9cf797408c453f9413cf890072273a7882d14ce2 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Thu, 19 Oct 2017 08:57:37 -0600 Subject: [PATCH 1399/2806] jenkins: 2.84 -> 2.85 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index bcd63769915..1c5950a04c2 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.84"; + version = "2.85"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0pwmviaps4gbv9a3sdn17kqdv9jmh5fpbms1wm95jfj77m5dyyq6"; + sha256 = "0z8rv6fxsvnw71f8s711n9s60r8jd43bigy9rqz5805k3xa68whr"; }; buildCommand = '' From d8842199cb4b178e4c2b634dee355b92d524af37 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 16 Oct 2017 11:35:44 +0100 Subject: [PATCH 1400/2806] splUnstable: 2017-09-26 -> 2017-10-16 --- pkgs/os-specific/linux/spl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 75fbacfb90e..5e0f83c4c68 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -68,8 +68,8 @@ in }; splUnstable = common { - version = "2017-09-26"; - rev = "e8474f9ad3b3d23c3277535c4f53f8fd1e6cbd74"; - sha256 = "0251cnffgx98nckgz6imwa8dnvba44wc02aacmr1n430gmq72xra"; + version = "2017-10-16"; + rev = "28920ea3346c1c905c5f727ea3e54297e6257568"; + sha256 = "0m42na009ivb9q9gz15ra94wqx5xdw18waanm56aqzrjxbqqa3ll"; }; } From 485fe616576be7805bcc10222db5e17ea049beb5 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 16 Oct 2017 11:36:01 +0100 Subject: [PATCH 1401/2806] zfsUnstable: 2017-09-26 -> 2017-10-16 --- pkgs/os-specific/linux/zfs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index dfcb3896244..bfa8dac72ba 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -2,7 +2,7 @@ , configFile ? "all" # Userspace dependencies -, zlib, libuuid, python, attr +, zlib, libuuid, python, attr, openssl # Kernel dependencies , kernel ? null, spl ? null, splUnstable ? null @@ -41,7 +41,8 @@ let nativeBuildInputs = [ autoreconfHook nukeReferences ]; buildInputs = optionals buildKernel [ spl ] - ++ optionals buildUser [ zlib libuuid python attr ]; + ++ optionals buildUser [ zlib libuuid python attr ] + ++ optionals (buildUser && isUnstable) [ openssl ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; @@ -158,10 +159,10 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2017-09-26"; + version = "2017-10-16"; - rev = "7e98073379353a05498ac5a2f1a5df2a2257d6b0"; - sha256 = "1hydfhmngpq31gxkxipqxnin74l760d1ia202h12vsgix9sp32h7"; + rev = "7670f721fc82e6cdcdd31f83760a79b6f2f2b998"; + sha256 = "0ask9d9936s7mhs9q5wzvn6c8fd322i76hs2n7fajfk17b1a1lkj"; isUnstable = true; extraPatches = [ From c5f71751977b2891ad3b58df13166272262e02d6 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Wed, 18 Oct 2017 09:14:33 +0200 Subject: [PATCH 1402/2806] ponyc: 0.19.3 -> 0.20.0 https://github.com/ponylang/ponyc/issues/2286 --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 63c1d97006f..8c744e7038e 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0aishczaasp877z1a17iq0vk6pp369bv7yz5mvinr7wm44930qr3"; + sha256 = "0shln9v0bp0q9qfipm3834vl284q5vwz9333yzgx46d0l2ivggyi"; }; buildInputs = [ llvm makeWrapper which ]; From 1923cabeb4dae8fe9e6655d375cbd638965b1b9d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Sep 2017 07:20:08 +0000 Subject: [PATCH 1403/2806] ocamlPackages: default to 4.04 --- pkgs/applications/virtualization/xen/4.5.nix | 3 +- pkgs/tools/audio/liquidsoap/full.nix | 6 +-- pkgs/top-level/all-packages.nix | 40 ++++++++++---------- pkgs/top-level/ocaml-packages.nix | 2 +- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 5fe4fa823fe..614122a3b24 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -1,4 +1,5 @@ { stdenv, callPackage, fetchurl, fetchpatch, fetchgit +, ocamlPackages_4_02 , withInternalQemu ? true , withInternalTraditionalQemu ? true , withInternalSeabios ? true @@ -414,4 +415,4 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; -})) args +})) ({ ocamlPackages = ocamlPackages_4_02; } // args) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 318bb2859e5..eb544fc693e 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, pkgconfig -, ocaml, ocamlPackages +, ocamlPackages , libao, portaudio, alsaLib, libpulseaudio, libjack2 , libsamplerate, libmad, taglib, lame, libogg , libvorbis, speex, libtheora, libopus, fdk_aac @@ -26,7 +26,7 @@ stdenv.mkDerivation { configureFlags = [ "--localstatedir=/var" ]; buildInputs = - [ which ocaml ocamlPackages.findlib pkgconfig + [ which ocamlPackages.ocaml ocamlPackages.findlib pkgconfig libao portaudio alsaLib libpulseaudio libjack2 libsamplerate libmad taglib lame libogg libvorbis speex libtheora libopus fdk_aac @@ -40,6 +40,6 @@ stdenv.mkDerivation { homepage = http://liquidsoap.fm/; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; - platforms = ocaml.meta.platforms or []; + platforms = ocamlPackages.ocaml.meta.platforms or []; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 677357e4782..49fb69b9e3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1149,9 +1149,7 @@ with pkgs; nfdump = callPackage ../tools/networking/nfdump { }; - patdiff = callPackage ../tools/misc/patdiff { - ocamlPackages = ocamlPackages_4_03; - }; + patdiff = callPackage ../tools/misc/patdiff { }; playerctl = callPackage ../tools/audio/playerctl { }; @@ -2893,6 +2891,7 @@ with pkgs; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg_2; + ocamlPackages = ocamlPackages_4_02; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; @@ -4379,7 +4378,7 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { inherit (ocamlPackages) ocaml camlp4; }; + sks = callPackage ../servers/sks { inherit (ocamlPackages_4_02) ocaml camlp4; }; skydns = callPackage ../servers/skydns { }; @@ -6145,9 +6144,7 @@ with pkgs; ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; - ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { - ocamlPackages = ocamlPackages_4_03; - }; + ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { nodejs = nodejs-4_x; @@ -6286,6 +6283,7 @@ with pkgs; }; teyjus = callPackage ../development/compilers/teyjus { + inherit (ocamlPackages_4_02) ocaml; omake = omake_rc1; }; @@ -7187,10 +7185,12 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - inherit (ocamlPackages_4_03) ocaml findlib camlp4 sedlex ocamlbuild; + inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild; }; - framac = callPackage ../development/tools/analysis/frama-c { }; + framac = callPackage ../development/tools/analysis/frama-c { + ocamlPackages = ocamlPackages_4_03; + }; frame = callPackage ../development/libraries/frame { }; @@ -7412,9 +7412,7 @@ with pkgs; noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; - obelisk = callPackage ../development/tools/ocaml/obelisk { - ocamlPackages = ocaml-ng.ocamlPackages_4_03; - }; + obelisk = callPackage ../development/tools/ocaml/obelisk { }; obuild = callPackage ../development/tools/ocaml/obuild { }; @@ -15418,7 +15416,7 @@ with pkgs; bison = bison2; }; - llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { }; + llpp = ocaml-ng.ocamlPackages.callPackage ../applications/misc/llpp { }; lmms = callPackage ../applications/audio/lmms { stdenv = overrideCC stdenv gcc5; @@ -15920,7 +15918,7 @@ with pkgs; opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; }; + orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; ocamlPackages = ocamlPackages_4_02; }; osmo = callPackage ../applications/office/osmo { }; @@ -16571,7 +16569,7 @@ with pkgs; stalonetray = callPackage ../applications/window-managers/stalonetray {}; - inherit (ocamlPackages_4_03) stog; + inherit (ocamlPackages) stog; stp = callPackage ../applications/science/logic/stp {}; @@ -18497,9 +18495,7 @@ with pkgs; abella = callPackage ../applications/science/logic/abella {}; - acgtk = callPackage ../applications/science/logic/acgtk { - ocamlPackages = ocamlPackages_4_03; - }; + acgtk = callPackage ../applications/science/logic/acgtk { }; alt-ergo = callPackage ../applications/science/logic/alt-ergo { ocamlPackages = ocamlPackages_4_02; @@ -18600,7 +18596,9 @@ with pkgs; }; cvc4 = callPackage ../applications/science/logic/cvc4 {}; - ekrhyper = callPackage ../applications/science/logic/ekrhyper {}; + ekrhyper = callPackage ../applications/science/logic/ekrhyper { + inherit (ocamlPackages_4_02) ocaml; + }; eprover = callPackage ../applications/science/logic/eprover { }; @@ -18631,7 +18629,9 @@ with pkgs; java = if stdenv.isLinux then jre else jdk; }; - iprover = callPackage ../applications/science/logic/iprover {}; + iprover = callPackage ../applications/science/logic/iprover { + inherit (ocamlPackages_4_02) ocaml; + }; jonprl = callPackage ../applications/science/logic/jonprl { smlnj = if stdenv.isDarwin diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 275c0739ce6..c27cb1bcdfd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -986,5 +986,5 @@ in rec ocamlPackages_latest = ocamlPackages_4_05; - ocamlPackages = ocamlPackages_4_02; + ocamlPackages = ocamlPackages_4_04; } From bb47bea024e692ed6c983bda2b48e7a25f377098 Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Thu, 19 Oct 2017 09:37:10 -0700 Subject: [PATCH 1404/2806] Enable checks and remove unnecessary lines. --- pkgs/development/libraries/theft/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 00534413c7b..909df510dff 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -12,12 +12,10 @@ stdenv.mkDerivation rec { }; preConfigure = "patchShebangs ./scripts/mk_bits_lut"; - # doCheck = true; + + doCheck = true; + checkTarget = "test"; - propagatedBuildInputs = [ ]; - - buildInputs = [ ]; - installFlags = [ "PREFIX=$(out)" ]; postInstall = '' install -m644 vendor/greatest.h $out/include/ From 6bfa45997b9bb5c177082d45682ed223c932a123 Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Thu, 19 Oct 2017 10:01:48 -0700 Subject: [PATCH 1405/2806] Remove trailing period from description per contribution guidelines. --- pkgs/development/libraries/theft/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 909df510dff..345401dfa76 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A C library for property-based testing."; + description = "A C library for property-based testing"; platforms = stdenv.lib.platforms.linux; homepage = "http://github.com/silentbicycle/theft/"; license = stdenv.lib.licenses.isc; From b17ec549a14a4b3fb8cdfff914afddd65fee942e Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 19 Oct 2017 13:35:09 +0300 Subject: [PATCH 1406/2806] pythonPackages.fontconfig: init at 0.5.1 --- .../python-fontconfig/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/python-fontconfig/default.nix diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix new file mode 100644 index 00000000000..a8faadffc11 --- /dev/null +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, fontconfig, python, freefont_ttf, makeFontsConf }: + +let + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; +in buildPythonPackage rec { + pname = "Python-fontconfig"; + version = "0.5.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "154rfd0ygcbj9y8m32n537b457yijpfx9dvmf76vi0rg4ikf7kxp"; + }; + + buildInputs = [ fontconfig ]; + + checkPhase = '' + export FONTCONFIG_FILE=${fontsConf}; + echo y | ${python.interpreter} test/test.py + ''; + + meta = { + homepage = https://github.com/Vayn/python-fontconfig; + description = "Python binding for Fontconfig"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f4cdf69171..daee60ccec4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -535,6 +535,8 @@ in { }; } else null; + python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; + funcsigs = callPackage ../development/python-modules/funcsigs { }; APScheduler = callPackage ../development/python-modules/APScheduler { }; From 89dc04fe93699e8f43bb22ad59bdb6a76565957b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Thu, 19 Oct 2017 21:19:58 +0200 Subject: [PATCH 1407/2806] electrum: enable plotting support Plotting seems to be a core feature now, with a menu entry available by default. Without the matplotlib dependency this opens a warning popup though. --- pkgs/applications/misc/electrum/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 0781617eb69..abe8d0dde84 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -13,6 +13,7 @@ python2Packages.buildPythonApplication rec { dns ecdsa jsonrpclib + matplotlib pbkdf2 protobuf pyaes @@ -30,7 +31,6 @@ python2Packages.buildPythonApplication rec { # TODO plugins # amodem # btchip - # matplotlib ]; preBuild = '' From 9a84b52c931ab4e419adb29e04877dd5e41a2f77 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 19 Oct 2017 23:18:47 +0300 Subject: [PATCH 1408/2806] openra: 20161019 -> 20171014 Closes #30581. --- pkgs/games/openra/default.nix | 100 +++++++++------------------------- 1 file changed, 25 insertions(+), 75 deletions(-) diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index ee8e865a6f1..fb01346d84e 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, mono, makeWrapper, lua +{ stdenv, fetchFromGitHub, mono, makeWrapper, lua , SDL2, freetype, openal, systemd, pkgconfig, - dotnetPackages, gnome3, curl, unzip + dotnetPackages, gnome3, curl, unzip, which }: -let - version = "20161019"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "openra-${version}"; + version = "20171014"; meta = with stdenv.lib; { description = "Real Time Strategy game engine recreating the C&C titles"; @@ -16,24 +15,33 @@ in stdenv.mkDerivation rec { platforms = platforms.linux; }; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz"; - sha256 = "1psmq3kb2whkavh5pm0xc4m5b4bihvrl8pfrk851iqg1cs22bg0w"; + src = fetchFromGitHub { + owner = "OpenRA"; + repo = "OpenRA"; + rev = "release-${version}"; + sha256 = "0nlwpmiwhjs3qc2lxwnrh4p874v5y6mf4avi6bqgr1wvzc43n8wr"; + + extraPostFetch = '' + sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh + $out/thirdparty/fetch-thirdparty-deps.sh + ''; }; dontStrip = true; - buildInputs = with dotnetPackages; - [ NUnit3 NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp NUnitConsole OpenNAT ] + buildInputs = (with dotnetPackages; + [ NUnit3 NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp NUnitConsole OpenNAT ]) ++ [ curl unzip lua gnome3.zenity ]; nativeBuildInputs = [ curl unzip mono makeWrapper lua pkgconfig ]; - patchPhase = '' + postPatch = '' mkdir Support - sed -i 's/^VERSION.*/VERSION = release-${version}/g' Makefile + sed -i \ + -e 's/^VERSION.*/VERSION = release-${version}/g' \ + -e '/GeoLite2-Country.mmdb.gz/d' \ + -e '/fetch-geoip-db.sh/d' \ + Makefile substituteInPlace thirdparty/configure-native-deps.sh --replace "locations=\"" "locations=\"${lua}/lib " - substituteInPlace Makefile --replace "@./thirdparty/fetch-geoip-db.sh" "" ''; preConfigure = '' @@ -41,63 +49,6 @@ in stdenv.mkDerivation rec { make version ''; - preBuild = let dotnetPackagesDlls = with dotnetPackages; [ - "${OpenNAT}/lib/dotnet/Open.NAT/net45/Open.Nat.dll" - "${MonoNat}/lib/dotnet/Mono.Nat/net40/Mono.Nat.dll" - "${FuzzyLogicLibrary}/lib/dotnet/FuzzyLogicLibrary/Release/FuzzyLogicLibrary.dll" - "${SmartIrc4net}/lib/dotnet/SmartIrc4net/net40/SmarIrc4net*" - "${SharpZipLib}/lib/dotnet/SharpZipLib/20/ICSharpCode.SharpZipLib.dll" - "${MaxMindGeoIP2}/lib/dotnet/MaxMind.GeoIP2/net40/MaxMind.GeoIP2*" - "${MaxMindDb}/lib/dotnet/MaxMind.Db/net40/MaxMind.Db.*" - "${SharpFont}/lib/dotnet/SharpFont/net20/SharpFont.dll" - "${SharpFont}/lib/dotnet/SharpFont/SharpFont.dll.config" - "${StyleCopMSBuild}/lib/dotnet/StyleCop.MSBuild/StyleCop*.dll" - "${StyleCopPlusMSBuild}/lib/dotnet/StyleCopPlus.MSBuild/StyleCopPlus.dll" - "${RestSharp}/lib/dotnet/RestSharp/net4-client/RestSharp.dll" - "${NUnit}/lib/dotnet/NUnit/nunit.framework.*" - "${NUnitConsole}/lib/dotnet/NUnit.Console/*" - "${NewtonsoftJson}/lib/dotnet/Newtonsoft.Json/Newtonsoft.Json.dll" - ]; - movePackages = [ - ( let filename = "Eluant.dll"; in { origin = fetchurl { - url = "https://github.com/OpenRA/Eluant/releases/download/20160124/${filename}"; - sha256 = "1c20whz7dzfhg3szd62rvb79745x5iwrd5pp62j3bbj1q9wpddmb"; - }; target = filename; }) - - ( let filename = "SDL2-CS.dll"; in { origin = fetchurl { - url = "https://github.com/OpenRA/SDL2-CS/releases/download/20151227/${filename}"; - sha256 = "0gqw2wg37cqhhlc2a9lfc4ndkyfi4m8bkv7ckxbawgydjlknq83n"; - }; target = filename; }) - - ( let filename = "SDL2-CS.dll.config"; in { origin = fetchurl { - url = "https://github.com/OpenRA/SDL2-CS/releases/download/20151227/${filename}"; - sha256 = "15709iscdg44wd33szw5y0fdxwvqfjw8v3xjq6a0mm46gr7mkw7g"; - }; target = filename; }) - - ( let filename = "OpenAL-CS.dll"; in { origin = fetchurl { - url = "https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/${filename}"; - sha256 = "0lvyjkn7fqys97wym8rwlcp6ay2z059iabfvlcxhlrscjpyr2cyk"; - }; target = filename; }) - - ( let filename = "OpenAL-CS.dll.config"; in { origin = fetchurl { - url = "https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/${filename}"; - sha256 = "0wcmk3dw26s93598ck5jism5609v0y233i0f1b76yilyfimg9sjq"; - }; target = filename; }) - - ( let filename = "GeoLite2-Country.mmdb.gz"; in { origin = fetchurl { - url = "http://geolite.maxmind.com/download/geoip/database/${filename}"; - sha256 = "0a82v0sj4zf5vigrn1pd6mnbqz6zl3rgk9nidqqzy836as2kxk9v"; - }; target = filename; }) - ]; - in '' - mkdir thirdparty/download/ - - ${stdenv.lib.concatMapStringsSep "\n" (from: "cp -r ${from} thirdparty/download") dotnetPackagesDlls} - ${stdenv.lib.concatMapStringsSep "\n" ({origin, target}: "cp ${origin} thirdparty/download/${target}") movePackages} - - make dependencies - ''; - buildFlags = [ "DEBUG=false" "default" "man-page" ]; doCheck = true; @@ -109,14 +60,13 @@ in stdenv.mkDerivation rec { postInstall = with stdenv.lib; let runtime = makeLibraryPath [ SDL2 freetype openal systemd lua ]; + binaries= makeBinPath [ which mono gnome3.zenity ]; in '' wrapProgram $out/lib/openra/launch-game.sh \ - --prefix PATH : "${mono}/bin" \ - --set PWD $out/lib/openra/ \ + --prefix PATH : "${binaries}" \ --prefix LD_LIBRARY_PATH : "${runtime}" mkdir -p $out/bin - echo -e "#!${stdenv.shell}\ncd $out/lib/openra && $out/lib/openra/launch-game.sh" > $out/bin/openra - chmod +x $out/bin/openra + makeWrapper $out/lib/openra/launch-game.sh $out/bin/openra --run "cd $out/lib/openra" ''; } From acd80042a475f2b44dd2adc54e75f3f294ede1f1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 19 Oct 2017 22:49:41 +0200 Subject: [PATCH 1409/2806] android-studio-preview: 3.0.0.16 -> 3.0.0.17 --- pkgs/applications/editors/android-studio/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 061d75d4016..4e834afa9d0 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio rec { pname = "android-studio-preview"; - version = "3.0.0.16"; # "Android Studio 3.0 RC 1" - build = "171.4392136"; - sha256Hash = "13zaqbbl7bqhiwh0ybbxkfv0h90qsfpa7sim778n2j32jjvdcby5"; + version = "3.0.0.17"; # "Android Studio 3.0 RC 2" + build = "171.4402976"; + sha256Hash = "18f5cq1dcmyjxaq520kqjac332bpp35pis02yplh6gzp65i4bvvf"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; From 4eb090efc88aed4479f607e0293ca1494cc1672e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 19 Oct 2017 15:57:19 -0500 Subject: [PATCH 1410/2806] musl: 1.1.16 -> 1.1.17, build with stack protector --- pkgs/os-specific/linux/musl/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index e37a2b9f55e..c51b8b26c80 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.16"; + version = "1.1.17"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "048h0w4yjyza4h05bkc6dpwg3hq6l03na46g0q1ha8fpwnjqawck"; + sha256 = "0r0lyp2w6v2bvm8h1si7w3p2qx037szl14qnxm5p00568z3m3an8"; }; enableParallelBuilding = true; - # required to avoid busybox segfaulting on startup when invoking - # nix-build "" + # Disable auto-adding stack protector flags, + # so musl can selectively disable as needed hardeningDisable = [ "stackprotector" ]; preConfigure = '' @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--enable-static" + "CFLAGS=-fstack-protector-strong" ]; patches = []; From aae32e15af60cbe96dcb8e70430be9f3eb82960c Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Thu, 19 Oct 2017 12:17:47 -0600 Subject: [PATCH 1411/2806] nixos/jenkins: add an option for the package This allows NixOS configuration to specify the desired Jenkins package. --- .../services/continuous-integration/jenkins/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index c14aa416723..0dd59e4fb44 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -78,6 +78,13 @@ in { ''; }; + package = mkOption { + default = pkgs.jenkins; + defaultText = "pkgs.jenkins"; + type = types.package; + description = "Jenkins package to use."; + }; + packages = mkOption { default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]; defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]"; @@ -194,7 +201,7 @@ in { ''; script = '' - ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ + ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ --httpPort=${toString cfg.port} \ --prefix=${cfg.prefix} \ ${concatStringsSep " " cfg.extraOptions} From 5da5af56e11ea26841d0c3226dc27c0dc720b3c9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 19 Oct 2017 19:25:08 -0400 Subject: [PATCH 1412/2806] nixUnstable: Bump for nix-shell interpreter bugfix --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index de6c1178221..4359682d96a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5655_cbc21691"; + suffix = "pre5663_c7af84ce"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "cbc216911dbda23c3bc050c969bc725fe60760ef"; - sha256 = "0ynnk2m2n5pjmhy5gry90dy5k2wwy29v2wnq6zz32ak9zwz36x8r"; + rev = "c7af84ce846a9deefa5b4db1b1bce1c091ca2a1e"; + sha256 = "1sc6rkx0500jz4fyfqm7443s1q24whmpx10mfs12wdk516f0q8qh"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; From 4d85689cf37f1ac5cfcbecd3cb96385a110a1656 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 20 Oct 2017 00:57:45 -0400 Subject: [PATCH 1413/2806] xxHash: init at 0.6.3.20171018 --- pkgs/development/libraries/xxHash/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/xxHash/default.nix diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix new file mode 100644 index 00000000000..d702500bf71 --- /dev/null +++ b/pkgs/development/libraries/xxHash/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "xxHash-${version}"; + version = "0.6.3.20171018"; + + src = fetchFromGitHub { + sha256 = "0061ivxpx0p24m4vg7kfx9fs9f0jxvv4g76bmyss5gp90p05hc18"; + rev = "333804ccf0c0339451accac023deeab9e5f7c002"; + repo = "xxHash"; + owner = "Cyan4973"; + }; + + outputs = [ "out" "dev" ]; + + makeFlags = [ "PREFIX=$(out)" "INCLUDEDIR=$(dev)/include" ]; + + meta = with stdenv.lib; { + description = "Extremely fast hash algorithm"; + longDescription = '' + xxHash is an Extremely fast Hash algorithm, running at RAM speed limits. + It successfully completes the SMHasher test suite which evaluates + collision, dispersion and randomness qualities of hash functions. Code is + highly portable, and hashes are identical on all platforms (little / big + endian). + ''; + homepage = https://github.com/Cyan4973/xxHash; + license = with licenses; [ bsd2 gpl2 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49fb69b9e3d..974ed3fee52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11059,6 +11059,8 @@ with pkgs; xvidcore = callPackage ../development/libraries/xvidcore { }; + xxHash = callPackage ../development/libraries/xxHash {}; + xylib = callPackage ../development/libraries/xylib { }; yajl = callPackage ../development/libraries/yajl { }; From ef2fc289a6547141212bd9528cdd1ac97a1df7c1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 19 Oct 2017 23:15:53 -0400 Subject: [PATCH 1414/2806] root: 6.10.04 -> 6.10.08 --- .../science/misc/root/ROOT-8728-extra.patch | 175 ------------------ .../science/misc/root/default.nix | 14 +- .../science/misc/root/thisroot.patch | 15 -- 3 files changed, 4 insertions(+), 200 deletions(-) delete mode 100644 pkgs/applications/science/misc/root/ROOT-8728-extra.patch delete mode 100644 pkgs/applications/science/misc/root/thisroot.patch diff --git a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch deleted file mode 100644 index a396a848f14..00000000000 --- a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx -index d71cb74..076facb 100644 ---- a/core/metacling/src/TCling.cxx -+++ b/core/metacling/src/TCling.cxx -@@ -756,7 +756,7 @@ int TCling_GenerateDictionary(const std::vector &classes, - gSystem->PrependPathName(dirbase, header); - dir = gSystem->DirName(dir); - } -- fileContent += TString("#include \"") + header + "\"\n"; -+ fileContent += (TString("#include \"") + header + "\"\n").Data(); - } - } - for (it = fwdDecls.begin(); it != fwdDecls.end(); ++it) { -@@ -1061,7 +1061,7 @@ TCling::TCling(const char *name, const char *title) - ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage); - - // Add -I early so ASTReader can find the headers. -- std::string interpInclude(TROOT::GetEtcDir()); -+ std::string interpInclude(TROOT::GetEtcDir().Data()); - clingArgsStorage.push_back("-I" + interpInclude); - - // Add include path to etc/cling. FIXME: This is a short term solution. The -@@ -1070,7 +1070,7 @@ TCling::TCling(const char *name, const char *title) - clingArgsStorage.push_back("-I" + interpInclude + "/cling"); - - // Add the root include directory and etc/ to list searched by default. -- clingArgsStorage.push_back(std::string("-I" + TROOT::GetIncludeDir())); -+ clingArgsStorage.push_back(std::string(("-I" + TROOT::GetIncludeDir()).Data())); - - // Add the current path to the include path - // TCling::AddIncludePath("."); -diff --git a/hist/hist/src/TFormula.cxx b/hist/hist/src/TFormula.cxx -index abf3929..e7dad98 100644 ---- a/hist/hist/src/TFormula.cxx -+++ b/hist/hist/src/TFormula.cxx -@@ -1677,7 +1677,7 @@ void TFormula::ProcessFormula(TString &formula) - if(fun.fName.Contains("::")) // add support for nested namespaces - { - // look for last occurence of "::" -- std::string name(fun.fName); -+ std::string name(fun.fName.Data()); - size_t index = name.rfind("::"); - assert(index != std::string::npos); - TString className = fun.fName(0,fun.fName(0,index).Length()); -@@ -1869,7 +1869,7 @@ void TFormula::ProcessFormula(TString &formula) - - // save copy of inputFormula in a std::strig for the unordered map - // and also formula is same as FClingInput typically and it will be modified -- std::string inputFormula = std::string(formula); -+ std::string inputFormula = std::string(formula.Data()); - - - // valid input formula - try to put into Cling -diff --git a/main/src/nbmain.cxx b/main/src/nbmain.cxx -index 55d4f2f..8490149 100644 ---- a/main/src/nbmain.cxx -+++ b/main/src/nbmain.cxx -@@ -173,9 +173,9 @@ static bool CreateStamp(string dest) - - int main() - { -- string rootbin(TROOT::GetBinDir()); -- string rootlib(TROOT::GetLibDir()); -- string rootetc(TROOT::GetEtcDir()); -+ string rootbin(TROOT::GetBinDir().Data()); -+ string rootlib(TROOT::GetLibDir().Data()); -+ string rootetc(TROOT::GetEtcDir().Data()); - - // If needed, install ROOT notebook files in the user's home directory - #ifdef WIN32 -diff --git a/math/minuit/src/TMinuitMinimizer.cxx b/math/minuit/src/TMinuitMinimizer.cxx -index 4e2082a..18215c0 100644 ---- a/math/minuit/src/TMinuitMinimizer.cxx -+++ b/math/minuit/src/TMinuitMinimizer.cxx -@@ -454,7 +454,7 @@ std::string TMinuitMinimizer::VariableName(unsigned int ivar) const { - // return the variable name - if (!CheckMinuitInstance()) return std::string(); - if (!CheckVarIndex(ivar)) return std::string(); -- return std::string(fMinuit->fCpnam[ivar]); -+ return std::string(fMinuit->fCpnam[ivar].Data()); - } - - int TMinuitMinimizer::VariableIndex(const std::string & ) const { -diff --git a/tmva/tmva/src/Factory.cxx b/tmva/tmva/src/Factory.cxx -index 36060ef..a1bbe34 100644 ---- a/tmva/tmva/src/Factory.cxx -+++ b/tmva/tmva/src/Factory.cxx -@@ -390,7 +390,7 @@ TMVA::MethodBase* TMVA::Factory::BookMethod( TMVA::DataLoader *loader, TString t - // initialize methods - IMethod* im; - if (!boostNum) { -- im = ClassifierFactory::Instance().Create( std::string(theMethodName), -+ im = ClassifierFactory::Instance().Create( std::string(theMethodName.Data()), - fJobName, - methodTitle, - loader->DefaultDataSetInfo(), -@@ -933,7 +933,7 @@ void TMVA::Factory::TrainAllMethods() - - // recreate - m = dynamic_cast( ClassifierFactory::Instance() -- .Create( std::string(Types::Instance().GetMethodName(methodType)), -+ .Create( std::string(Types::Instance().GetMethodName(methodType).Data()), - dataSetInfo, weightfile ) ); - if( m->GetMethodType() == Types::kCategory ){ - MethodCategory *methCat = (dynamic_cast(m)); -diff --git a/tmva/tmva/src/MethodBoost.cxx b/tmva/tmva/src/MethodBoost.cxx -index 1349e5d..2125ab3 100644 ---- a/tmva/tmva/src/MethodBoost.cxx -+++ b/tmva/tmva/src/MethodBoost.cxx -@@ -389,7 +389,7 @@ void TMVA::MethodBoost::Train() - // the first classifier shows the option string output, the rest not - if (fCurrentMethodIdx>0) TMVA::MsgLogger::InhibitOutput(); - -- IMethod* method = ClassifierFactory::Instance().Create(std::string(fBoostedMethodName), -+ IMethod* method = ClassifierFactory::Instance().Create(std::string(fBoostedMethodName.Data()), - GetJobName(), - Form("%s_B%04i", fBoostedMethodTitle.Data(),fCurrentMethodIdx), - DataInfo(), -diff --git a/tmva/tmva/src/MethodCategory.cxx b/tmva/tmva/src/MethodCategory.cxx -index c2cbe80..d278cca 100644 ---- a/tmva/tmva/src/MethodCategory.cxx -+++ b/tmva/tmva/src/MethodCategory.cxx -@@ -147,7 +147,7 @@ TMVA::IMethod* TMVA::MethodCategory::AddMethod( const TCut& theCut, - const TString& theTitle, - const TString& theOptions ) - { -- std::string addedMethodName = std::string(Types::Instance().GetMethodName(theMethod)); -+ std::string addedMethodName = std::string(Types::Instance().GetMethodName(theMethod).Data()); - - Log() << kINFO << "Adding sub-classifier: " << addedMethodName << "::" << theTitle << Endl; - -diff --git a/tmva/tmva/src/MethodCompositeBase.cxx b/tmva/tmva/src/MethodCompositeBase.cxx -index 98fa5da..96bd9a3 100644 ---- a/tmva/tmva/src/MethodCompositeBase.cxx -+++ b/tmva/tmva/src/MethodCompositeBase.cxx -@@ -194,7 +194,7 @@ void TMVA::MethodCompositeBase::ReadWeightsFromXML( void* wghtnode ) - ((TMVA::MethodBoost*)this)->BookMethod( Types::Instance().GetMethodType( methodTypeName), methodName, optionString ); - } - fMethods.push_back(ClassifierFactory::Instance().Create( -- std::string(methodTypeName),jobName, methodName,DataInfo(),optionString)); -+ std::string(methodTypeName.Data()),jobName, methodName,DataInfo(),optionString)); - - fMethodWeight.push_back(methodWeight); - MethodBase* meth = dynamic_cast(fMethods.back()); -@@ -259,7 +259,7 @@ void TMVA::MethodCompositeBase::ReadWeightsFromStream( std::istream& istr ) - ((TMVA::MethodBoost*)this)->BookMethod( Types::Instance().GetMethodType( methodName), methodTitle, optionString ); - } - else methodTitle=Form("%s (%04i)",GetMethodName().Data(),fCurrentMethodIdx); -- fMethods.push_back(ClassifierFactory::Instance().Create( std::string(methodName), jobName, -+ fMethods.push_back(ClassifierFactory::Instance().Create( std::string(methodName.Data()), jobName, - methodTitle,DataInfo(), optionString) ); - fMethodWeight.push_back( methodWeight ); - if(MethodBase* m = dynamic_cast(fMethods.back()) ) -diff --git a/tmva/tmva/src/Reader.cxx b/tmva/tmva/src/Reader.cxx -index 94a8b28..0b67867 100644 ---- a/tmva/tmva/src/Reader.cxx -+++ b/tmva/tmva/src/Reader.cxx -@@ -401,7 +401,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( const TString& methodTag, const TString& w - - TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const TString& weightfile ) - { -- IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType )), -+ IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType ).Data()), - DataInfo(), weightfile ); - - MethodBase *method = (dynamic_cast(im)); -@@ -440,7 +440,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const char* - #if ROOT_VERSION_CODE >= ROOT_VERSION(5,26,00) - - // books MVA method from weightfile -- IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType )), -+ IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType ).Data()), - DataInfo(), "" ); - - MethodBase *method = (dynamic_cast(im)); diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index ac04321ae0c..676395d03d5 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,30 +1,24 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lzma, gsl +, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lz4, lzma, gsl, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.10.04"; + version = "6.10.08"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "0nwg4bw02v6vahm2rwfaj7fzp3ffhjg5jk7h20il4246swhxw6s6"; + sha256 = "12mddl6pqwwc9nr4jqzp6h1jm4zycazd3v88dz306m1nmk97dlic"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl ] + buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; patches = [ ./sw_vers.patch - - # this prevents thisroot.sh from setting $p, which interferes with stdenv setup - ./thisroot.patch - - # https://sft.its.cern.ch/jira/browse/ROOT-8728 - ./ROOT-8728-extra.patch ]; preConfigure = '' diff --git a/pkgs/applications/science/misc/root/thisroot.patch b/pkgs/applications/science/misc/root/thisroot.patch deleted file mode 100644 index 57cd5838e64..00000000000 --- a/pkgs/applications/science/misc/root/thisroot.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/config/thisroot.sh b/config/thisroot.sh -index 85dee20..532cb28 100644 ---- a/config/thisroot.sh -+++ b/config/thisroot.sh -@@ -15,8 +15,8 @@ drop_from_path() - return 1 - fi - -- p=$1 -- drop=$2 -+ local p=$1 -+ local drop=$2 - - newpath=`echo $p | sed -e "s;:${drop}:;:;g" \ - -e "s;:${drop};;g" \ From 68ed8f685b35b80c7caf1c5296526beb1e977552 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 19 Oct 2017 21:09:20 +0000 Subject: [PATCH 1415/2806] ocamlPackages.camomile: 0.8.5 -> 0.8.6 --- .../ocaml-modules/camomile/0.8.5.nix | 30 ++++++++++++++ .../ocaml-modules/camomile/default.nix | 41 +++++++++---------- pkgs/top-level/ocaml-packages.nix | 5 ++- 3 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/ocaml-modules/camomile/0.8.5.nix diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix new file mode 100644 index 00000000000..48517036dc6 --- /dev/null +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: + +stdenv.mkDerivation rec { + name = "camomile-${version}"; + version = "0.8.5"; + + src = fetchurl { + url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; + sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; + }; + + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch; + sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; + })]; + + buildInputs = [ocaml findlib camlp4]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; + description = "A comprehensive Unicode library for OCaml"; + license = stdenv.lib.licenses.lgpl21; + platforms = ocaml.meta.platforms or []; + maintainers = [ + stdenv.lib.maintainers.z77z + ]; + }; +} diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 48517036dc6..897a3ff6036 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,30 +1,27 @@ -{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, cppo }: stdenv.mkDerivation rec { - name = "camomile-${version}"; - version = "0.8.5"; + version = "0.8.6"; + name = "ocaml${ocaml.version}-camomile-${version}"; - src = fetchurl { - url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; - sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; - }; + src = fetchFromGitHub { + owner = "yoriyuki"; + repo = "camomile"; + rev = "rel-${version}"; + sha256 = "1jq1xhaikczk6lbvas7c35aa04q0kjaqd8m54c4jivpj80yvg4x9"; + }; - patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch; - sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; - })]; + buildInputs = [ ocaml findlib jbuilder cppo ]; - buildInputs = [ocaml findlib camlp4]; + configurePhase = "ocaml configure.ml --share $out/share/camomile"; - createFindlibDestdir = true; + inherit (jbuilder) installPhase; - meta = { - homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; - description = "A comprehensive Unicode library for OCaml"; - license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or []; - maintainers = [ - stdenv.lib.maintainers.z77z - ]; - }; + meta = { + inherit (ocaml.meta) platforms; + inherit (src.meta) homepage; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.lgpl21; + description = "A Unicode library for OCaml"; + }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c27cb1bcdfd..43c249e7b1d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -98,7 +98,10 @@ let camlzip = callPackage ../development/ocaml-modules/camlzip { }; camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; - camomile = callPackage ../development/ocaml-modules/camomile { }; + camomile = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/ocaml-modules/camomile { } + else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { }; camlimages_4_0 = if lib.versionOlder "4.02" ocaml.version From 26b7a68596e251be51d63fa9b8b06a5fc36b9f41 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 20 Oct 2017 10:12:28 +0200 Subject: [PATCH 1416/2806] bitcoinarmory: use buildPythonApplication because mkPythonDerivation shouldn't be used directly anymore. --- pkgs/applications/misc/bitcoinarmory/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index f4547c69dc4..a9d32d4b252 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -7,9 +7,9 @@ let version = "0.96.1"; sitePackages = pythonPackages.python.sitePackages; - inherit (pythonPackages) mkPythonDerivation pyqt4 psutil twisted; + inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted; -in mkPythonDerivation { +in buildPythonApplication { name = "bitcoinarmory-${version}"; @@ -21,6 +21,8 @@ in mkPythonDerivation { sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true; }; + format = "other"; + # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. #patches = [ ./shutdown-fix.patch ]; From cc2e11b8c9d1f2b99c2f511da0507b17626a655e Mon Sep 17 00:00:00 2001 From: Ignat Loskutov Date: Fri, 20 Oct 2017 13:30:32 +0300 Subject: [PATCH 1417/2806] scala: 2.12.3 -> 2.12.4 --- pkgs/development/compilers/scala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index d4d4a0f31bc..7622fbb9d18 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.3"; + name = "scala-2.12.4"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "133w4r2214ci7r4sg2yyk9lhn62ldm4ad0d89drwrvgvffvnly9b"; + sha256 = "089a54qj8psh4jxqbrrwk5zahw13fyqq24l87s3031xa675a0m4m"; }; propagatedBuildInputs = [ jre ] ; From 05ac929444bf8c5a1f365b662fc85d1f6e9b1482 Mon Sep 17 00:00:00 2001 From: Ignat Loskutov Date: Fri, 20 Oct 2017 13:51:00 +0300 Subject: [PATCH 1418/2806] scalafmt: fix platforms --- pkgs/development/tools/scalafmt/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index dc7f96ea8a0..391c653b98a 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { description = "Opinionated code formatter for Scala"; homepage = http://scalafmt.org; license = licenses.asl20; - platforms = platforms.linux; maintainers = [ maintainers.markus1189 ]; }; } From 9f2409096b53658bc51ebfdbb6c03cc9d3f3840f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Oct 2017 13:00:55 +0200 Subject: [PATCH 1419/2806] wt: fixup build by using older boost again 160 seems a popular version in nixpkgs. --- 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 677357e4782..75f6ceb00b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10967,7 +10967,9 @@ with pkgs; wiredtiger = callPackage ../development/libraries/wiredtiger { }; - wt = callPackage ../development/libraries/wt { }; + wt = callPackage ../development/libraries/wt { + boost = boost160; # 165: error: invalid conversion from 'const char*'... + }; wxGTK = wxGTK28; From 0e339ca7a50f5e7c37029906c486e1f8eb898fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Oct 2017 13:12:42 +0200 Subject: [PATCH 1420/2806] clickhouse: fixup build by using older boost again 160 seems a popular version in nixpkgs. --- 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 75f6ceb00b4..5820ff86621 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11421,7 +11421,9 @@ with pkgs; charybdis = callPackage ../servers/irc/charybdis {}; - clickhouse = callPackage ../servers/clickhouse { }; + clickhouse = callPackage ../servers/clickhouse { + boost = boost160; + }; couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_1_8_5; From eba08858cce77b9fd68bbcc0fbfe09e1da652b4e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 20 Oct 2017 15:07:46 +0200 Subject: [PATCH 1421/2806] tor-browser-bundle-bin: 7.0.6 -> 7.0.7 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index c9c67c01599..053ba1fca84 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.6"; + version = "7.0.7"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "11z3r0577p78ifi9lk4lrh9wb46k77wy77g5p9l8il02760bgq6m"; + sha256 = "1848j28majbb61r080g6dw0lmh7hbp515iidyjdrpgcwhazzg06j"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1r8v5w66clmm76kzpkf0f5jcxs76whb5xrl20rkirp79fybqn4hx"; + sha256 = "08wvpymmyg16ifz23awnjy0pbva8xh1fdx2i8c1n18x3k12d5r7h"; }; }; in From a09d626053ac400da6f7965f577b18de4633d1e8 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 20 Oct 2017 15:24:20 +0200 Subject: [PATCH 1422/2806] tor-browser-bundle-bin: support installing extensions Closes https://github.com/NixOS/nixpkgs/issues/30443 --- .../browsers/tor-browser-bundle-bin/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 053ba1fca84..56cab9de5d0 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -246,6 +246,11 @@ stdenv.mkDerivation rec { # having to synchronize between local state and store. mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js + # Preload extensions by moving into the runtime instead of storing under the + # user's profile directory. + mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \ + "$TBB_IN_STORE/browser/extensions" + # Hard-code paths to geoip data files. TBB resolves the geoip files # relative to torrc-defaults_path but if we do not hard-code them # here, these paths end up being written to the torrc in the user's @@ -301,10 +306,6 @@ stdenv.mkDerivation rec { # easily generated by firefox at startup. rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json} - # Ensure that we're always using the up-to-date extensions. - ln -snf "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions" \ - "\$HOME/TorBrowser/Data/Browser/profile.default/extensions" - ${optionalString pulseaudioSupport '' # Figure out some envvars for pulseaudio : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" From ebcccaf7544457a2cce2f08a404d6ccb565b7acd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 19 Oct 2017 18:22:03 -0500 Subject: [PATCH 1423/2806] plasma-workspace: enable Wayland session support --- .../services/x11/desktop-managers/plasma5.nix | 2 +- .../plasma-5/plasma-workspace/default.nix | 56 +- .../plasma-workspace/plasma-workspace.patch | 1191 +++++++++++++++++ .../plasma-workspace/qml-import-path.patch | 52 - .../desktops/plasma-5/plasma-workspace/series | 1 - 5 files changed, 1235 insertions(+), 67 deletions(-) create mode 100644 pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace/series diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index d7e72c4a7ae..b9498b1627f 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -47,7 +47,7 @@ in ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ''} - exec "${plasma5.startkde}" + exec "${getBin plasma5.plasma-workspace}/bin/startkde" ''; }; diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index b28a1e87fb6..6fc6ef6d9e1 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -1,19 +1,23 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, - isocodes, libdbusmenu, libSM, libXcursor, libXtst, pam, wayland, + coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, + libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, - kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff, + kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff, knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, phonon, plasma-framework, prison, solid, - qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qtx11extras, + qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, + qtwayland, qtx11extras, }: +let inherit (lib) getBin getLib; in + mkDerivation { name = "plasma-workspace"; @@ -27,21 +31,47 @@ mkDerivation { kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon plasma-framework prison solid - qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtx11extras + qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; outputs = [ "out" "dev" "bin" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + cmakeFlags = [ + "-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage" + "-DNIXPKGS_MKDIR=${getBin coreutils}/bin/mkdir" + "-DNIXPKGS_XRDB=${getBin xrdb}/bin/xrdb" + "-DNIXPKGS_QTPATHS=${getBin qttools}/bin/qtpaths" + "-DNIXPKGS_XSETROOT=${getBin xsetroot}/bin/xsetroot" + "-DNIXPKGS_XPROP=${getBin xprop}/bin/xprop" + "-DNIXPKGS_ID=${getBin coreutils}/bin/id" + "-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT=${getBin dbus}/bin/dbus-update-activation-environment" + "-DNIXPKGS_START_KDEINIT_WRAPPER=${getLib kinit}/lib/libexec/kf5/start_kdeinit_wrapper" + "-DNIXPKGS_QDBUS=${getBin qttools}/bin/qdbus" + "-DNIXPKGS_KWRAPPER5=${getBin kinit}/bin/kwrapper5" + "-DNIXPKGS_KREADCONFIG5=${getBin kconfig}/bin/kreadconfig5" + "-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep" + "-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown" + "-DNIXPKGS_SED=${getBin gnused}/bin/sed" + ]; - postPatch = '' - substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ - --replace kdostartupconfig5 ''${!outputBin}/bin/kdostartupconfig5 + # To regenerate ./plasma-workspace.patch, + # + # > git clone https://github.com/ttuegel/plasma-workspace + # > cd plasma-workspace + # > git checkout nixpkgs/$x.$y # where $x.$y.$z == $version + # ... make some commits ... + # > git diff v$x.$y.$z + # + # Add upstream patches to the list below. For new patchs, particularly if not + # submitted upstream, please make a pull request and add it to + # ./plasma-workspace.patch. + patches = [ ./plasma-workspace.patch ]; + + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\"" + cmakeFlags+=" -DNIXPKGS_STARTPLASMA=''${!outputBin}/lib/libexec/startplasma" ''; postInstall = '' - rm "''${!outputBin}/bin/startkde" - rm "''${!outputBin}/bin/startplasmacompositor" - rm "''${!outputLib}/lib/libexec/startplasma" - rm -r "''${!outputBin}/share/wayland-sessions" + moveToOutput lib/libexec/startplasma ''${!outputBin} ''; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch new file mode 100644 index 00000000000..1f4b83cf83b --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -0,0 +1,1191 @@ +diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml +index 7e2d9758..40a5797b 100644 +--- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml ++++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml +@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents + import org.kde.plasma.extras 2.0 as PlasmaExtras + import org.kde.plasma.workspace.components 2.0 + import org.kde.kcoreaddons 1.0 as KCoreAddons +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + Item { + id: batteryItem +diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml +index ae6d5919..c2f99c86 100644 +--- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml ++++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.kcoreaddons 1.0 as KCoreAddons + import org.kde.kquickcontrolsaddons 2.0 +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + Item { + id: batterymonitor +diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml +index 80e7e53b..0083cf01 100644 +--- a/applets/lock_logout/contents/ui/lockout.qml ++++ b/applets/lock_logout/contents/ui/lockout.qml +@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 + import org.kde.kquickcontrolsaddons 2.0 +-import "data.js" as Data ++import "../code/data.js" as Data + + Flow { + id: lockout +diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml +index acdda88f..989de8ab 100644 +--- a/applets/notifications/package/contents/ui/main.qml ++++ b/applets/notifications/package/contents/ui/main.qml +@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras + + import org.kde.plasma.private.notifications 1.0 + +-import "uiproperties.js" as UiProperties ++import "../code/uiproperties.js" as UiProperties + + MouseEventListener { + id: notificationsApplet +diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in +index 85715214..294eab08 100644 +--- a/krunner/dbus/org.kde.krunner.service.in ++++ b/krunner/dbus/org.kde.krunner.service.in +@@ -1,4 +1,4 @@ + [D-BUS Service] + Name=org.kde.krunner +-Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner ++Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner + +diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in +index 7a86d07f..5b3030cc 100644 +--- a/kuiserver/org.kde.kuiserver.service.in ++++ b/kuiserver/org.kde.kuiserver.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.kde.kuiserver +-Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5 ++Exec=@CMAKE_INSTALL_FULL_BINDIR@/kuiserver5 +diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt +index fe29f57a..247db953 100644 +--- a/startkde/CMakeLists.txt ++++ b/startkde/CMakeLists.txt +@@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig) + add_subdirectory(ksyncdbusenv) + add_subdirectory(waitforname) + +-#FIXME: reconsider, looks fishy +-if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") +- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH") +-endif() +- + configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY) + configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY) + configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY) +diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp +index c9927855..bd506ce2 100644 +--- a/startkde/kstartupconfig/kstartupconfig.cpp ++++ b/startkde/kstartupconfig/kstartupconfig.cpp +@@ -147,5 +147,5 @@ int main() + fclose( keys ); + fclose( config ); + doit: +- return system( "kdostartupconfig5" ); ++ return system( NIXPKGS_KDOSTARTUPCONFIG5 ); + } +diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake +index e9fa0bee..79e50a96 100644 +--- a/startkde/startkde.cmake ++++ b/startkde/startkde.cmake +@@ -1,22 +1,31 @@ + #!/bin/sh + # +-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) ++# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) + # + ++if test "x$1" = x--failsafe; then ++ KDE_FAILSAFE=1 # General failsafe flag ++ KWIN_COMPOSE=N # Disable KWin's compositing ++ QT_XCB_FORCE_SOFTWARE_OPENGL=1 ++ export KWIN_COMPOSE KDE_FAILSAFE QT_XCB_FORCE_SOFTWARE_OPENGL ++fi ++ + # When the X server dies we get a HUP signal from xinit. We must ignore it + # because we still need to do some cleanup. + trap 'echo GOT SIGHUP' HUP + +-# Check if a Plasma session already is running and whether it's possible to connect to X +-kcheckrunning ++# we have to unset this for Darwin since it will screw up KDE's dynamic-loading ++unset DYLD_FORCE_FLAT_NAMESPACE ++ ++# Check if a KDE session already is running and whether it's possible to connect to X ++@CMAKE_INSTALL_FULL_BINDIR@/kcheckrunning + kcheckrunning_result=$? +-if test $kcheckrunning_result -eq 0 ; then +- echo "Plasma seems to be already running on this display." +- xmessage -geometry 500x100 "Plasma seems to be already running on this display." > /dev/null 2>/dev/null +- exit 1 +-elif test $kcheckrunning_result -eq 2 ; then +- echo "\$DISPLAY is not set or cannot connect to the X server." +- exit 1 ++if [ $kcheckrunning_result -eq 0 ]; then ++ echo "KDE seems to be already running on this display." ++ exit 1 ++elif [ $kcheckrunning_result -eq 2 ]; then ++ echo "\$DISPLAY is not set or cannot connect to the X server." ++ exit 1 + fi + + # Boot sequence: +@@ -33,59 +42,132 @@ fi + # + # * Then ksmserver is started which takes control of the rest of the startup sequence + +-# We need to create config folder so we can write startupconfigkeys +-if [ ${XDG_CONFIG_HOME} ]; then +- configDir=$XDG_CONFIG_HOME; +-else +- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html ++export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" ++@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME" ++ ++# The KDE icon cache is supposed to update itself ++# automatically, but it uses the timestamp on the icon ++# theme directory as a trigger. Since in Nix the ++# timestamp is always the same, this doesn't work. So as ++# a workaround, nuke the icon cache on login. This isn't ++# perfect, since it may require logging out after ++# installing new applications to update the cache. ++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html ++rm -fv $HOME/.cache/icon-cache.kcache ++ ++# Qt writes a weird ‘libraryPath’ line to ++# ~/.config/Trolltech.conf that causes the KDE plugin ++# paths of previous KDE invocations to be searched. ++# Obviously using mismatching KDE libraries is potentially ++# disastrous, so here we nuke references to the Nix store ++# in Trolltech.conf. A better solution would be to stop ++# Qt from doing this wackiness in the first place. ++if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then ++ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf + fi + +-mkdir -p $configDir ++@NIXPKGS_KBUILDSYCOCA5@ ++ ++# Set the default GTK 2 theme ++gtkrc2="$HOME/.gtkrc-2.0" ++breeze_gtkrc2="/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" ++if ! [ -e "$gtkrc2" ] && [ -e "$breeze_gtkrc2" ]; then ++ cat >"$gtkrc2" <"$gtk3_settings" <"$kcminputrc" <$configDir/startupconfigkeys <"$XDG_CONFIG_HOME/startupconfigkeys" <$plasmalocalerc <"$plasmalocalerc" <$kdeglobalsfile <"$kdeglobalsfile" <&2 + exit 1 + fi +-[ -r $configDir/startupconfig ] && . $configDir/startupconfig ++if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then ++ . "$XDG_CONFIG_HOME/startupconfig" ++fi + + if [ "$kdeglobals_kscreen_screenscalefactors" ]; then + export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors" +@@ -94,26 +176,33 @@ fi + #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us + export QT_AUTO_SCREEN_SCALE_FACTOR=0 + ++#Set the QtQuickControls style to our own: for QtQuickControls1 ++#it will fall back to Desktop, while it will use our own org.kde.desktop ++#for QtQuickControlsStyle and Kirigami ++export QT_QUICK_CONTROLS_STYLE=org.kde.desktop ++ ++XCURSOR_PATH=~/.icons ++IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" ++for xdgDir in "${xdgDirs[@]}"; do ++ XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" ++done ++export XCURSOR_PATH ++ + # XCursor mouse theme needs to be applied here to work even for kded or ksmserver + if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then +- @EXPORT_XCURSOR_PATH@ +- + kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" +- if test $? -eq 10; then +- XCURSOR_THEME=breeze_cursors +- export XCURSOR_THEME +- elif test -n "$kcminputrc_mouse_cursortheme"; then +- XCURSOR_THEME="$kcminputrc_mouse_cursortheme" +- export XCURSOR_THEME ++ if [ $? -eq 10 ]; then ++ export XCURSOR_THEME=breeze_cursors ++ elif [ -n "$kcminputrc_mouse_cursortheme" ]; then ++ export XCURSOR_THEME="$kcminputrc_mouse_cursortheme" + fi +- if test -n "$kcminputrc_mouse_cursorsize"; then +- XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" +- export XCURSOR_SIZE ++ if [ -n "$kcminputrc_mouse_cursorsize" ]; then ++ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" + fi + fi + +-if test "$kcmfonts_general_forcefontdpi" -ne 0; then +- xrdb -quiet -merge -nocpp </plasma-workspace/env/*.sh +-# (where correspond to the system and user's configuration +-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config +-# and /etc/xdg/ on Linux) +-# +-# This is where you can define environment variables that will be available to +-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` +-# or eval `gpg-agent --daemon`. +-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script +-# +-# (see end of this file). +-# For anything else (that doesn't set env vars, or that needs a window manager), +-# better use the Autostart folder. +- +-scriptpath=`qtpaths --locate-dirs GenericConfigLocation plasma-workspace | tr ':' '\n'` +- +-# Add /env/ to the directory to locate the scripts to be sourced +-for prefix in `echo $scriptpath`; do +- for file in "$prefix"/env/*.sh; do +- test -r "$file" && . "$file" || true +- done +-done +- +-# Activate the kde font directories. +-# +-# There are 4 directories that may be used for supplying fonts for KDE. +-# +-# There are two system directories. These belong to the administrator. +-# There are two user directories, where the user may add her own fonts. +-# +-# The 'override' versions are for fonts that should come first in the list, +-# i.e. if you have a font in your 'override' directory, it will be used in +-# preference to any other. +-# +-# The preference order looks like this: +-# user override, system override, X, user, system +-# +-# Where X is the original font database that was set up before this script +-# runs. +- +-usr_odir=$HOME/.fonts/kde-override +-usr_fdir=$HOME/.fonts +- +-if test -n "$KDEDIRS"; then +- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` +- sys_odir=$kdedirs_first/share/fonts/override +- sys_fdir=$kdedirs_first/share/fonts +-else +- sys_odir=$KDEDIR/share/fonts/override +- sys_fdir=$KDEDIR/share/fonts +-fi +- +-# We run mkfontdir on the user's font dirs (if we have permission) to pick +-# up any new fonts they may have installed. If mkfontdir fails, we still +-# add the user's dirs to the font path, as they might simply have been made +-# read-only by the administrator, for whatever reason. +- +-test -d "$sys_odir" && xset +fp "$sys_odir" +-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") +-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") +-test -d "$sys_fdir" && xset fp+ "$sys_fdir" +- +-# Ask X11 to rebuild its font list. +-xset fp rehash +- + # Set a left cursor instead of the standard X11 "X" cursor, since I've heard + # from some users that they're confused and don't know what to do. This is + # especially necessary on slow machines, where starting KDE takes one or two +@@ -208,28 +232,10 @@ xset fp rehash + # If the user has overwritten fonts, the cursor font may be different now + # so don't move this up. + # +-xsetroot -cursor_name left_ptr +- +-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap +-if test -n "$GS_LIB" ; then +- GS_LIB=$usr_fdir:$GS_LIB +- export GS_LIB +-else +- GS_LIB=$usr_fdir +- export GS_LIB +-fi ++@NIXPKGS_XSETROOT@ -cursor_name left_ptr + + echo 'startkde: Starting up...' 1>&2 + +-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. +-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend +-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or +-# /usr/local. +-if test -z "$XDG_DATA_DIRS"; then +- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" +-fi +-export XDG_DATA_DIRS +- + # Mark that full KDE session is running (e.g. Konqueror preloading works only + # with full KDE running). The KDE_FULL_SESSION property can be detected by + # any X client connected to the same X session, even if not launched +@@ -254,44 +260,65 @@ export XDG_DATA_DIRS + # + KDE_FULL_SESSION=true + export KDE_FULL_SESSION +-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true ++@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true + + KDE_SESSION_VERSION=5 + export KDE_SESSION_VERSION +-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 ++@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 + +-KDE_SESSION_UID=`id -ru` ++KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) + export KDE_SESSION_UID + + XDG_CURRENT_DESKTOP=KDE + export XDG_CURRENT_DESKTOP + ++# Enforce xcb QPA. Helps switching between Wayland and X sessions. ++export QT_QPA_PLATFORM=xcb ++ ++# Source scripts found in /plasma-workspace/env/*.sh ++# (where correspond to the system and user's configuration ++# directories, as identified by Qt's qtpaths, e.g. $HOME/.config ++# and /etc/xdg/ on Linux) ++# ++# This is where you can define environment variables that will be available to ++# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` ++# or eval `gpg-agent --daemon`. ++# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script ++# ++# (see end of this file). ++# For anything else (that doesn't set env vars, or that needs a window manager), ++# better use the Autostart folder. ++ ++IFS=":" read -r -a scriptpath <<< $(@NIXPKGS_QTPATHS@ --paths GenericConfigLocation) ++# Add /env/ to the directory to locate the scripts to be sourced ++for prefix in "${scriptpath[@]}"; do ++ for file in "$prefix"/plasma-workspace/env/*.sh; do ++ if [ -r "$file" ]; then ++ . "$file" ++ fi ++ done ++done ++ + # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment +-if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then +- dbus-update-activation-environment --systemd --all +-else +- @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv +-fi +-if test $? -ne 0; then ++ ++if ! @NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT@ --systemd --all; then + # Startup error + echo 'startkde: Could not sync environment to dbus.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not sync environment to dbus." + exit 1 + fi + + # We set LD_BIND_NOW to increase the efficiency of kdeinit. + # kdeinit unsets this variable before loading applications. +-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup ++LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup + if test $? -ne 0; then + # Startup error + echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." + exit 1 + fi + +-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & ++@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & + + # finally, give the session control to the session manager + # see kdebase/ksmserver for the description of the rest of the startup sequence +@@ -303,34 +330,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & + # We only check for 255 which means that the ksmserver process could not be + # started, any problems thereafter, e.g. ksmserver failing to initialize, + # will remain undetected. +-test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" ++if [ -n "$KDEWM" ]; then ++ KDEWM="--windowmanager $KDEWM" ++fi + # If the session should be locked from the start (locked autologin), + # lock now and do the rest of the KDE startup underneath the locker. + KSMSERVEROPTIONS="" +-test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" +-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS ++if [ -n "$dl" ]; then ++ KSMSERVEROPTIONS=" --lockscreen" ++fi ++@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS + if test $? -eq 255; then + # Startup error + echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." + fi + + #Anything after here is logout/shutdown + +-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` ++wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) + +-if test x"$wait_drkonqi"x = x"true"x ; then ++if [ x"$wait_drkonqi"x = x"true"x ]; then + # wait for remaining drkonqi instances with timeout (in seconds) +- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` ++ wait_drkonqi_timeout=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900) + wait_drkonqi_counter=0 +- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do ++ while @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ -q "^[^w]*org.kde.drkonqi" ; do + sleep 5 + wait_drkonqi_counter=$((wait_drkonqi_counter+5)) +- if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then ++ if [ "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ]; then + # ask remaining drkonqis to die in a graceful way +- qdbus | grep 'org.kde.drkonqi-' | while read address ; do +- qdbus "$address" "/MainApplication" "quit" ++ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do ++ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit" + done + break + fi +@@ -339,15 +369,17 @@ fi + + echo 'startkde: Shutting down...' 1>&2 + # just in case +-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null ++if [ -n "$ksplash_pid" ]; then ++ kill "$ksplash_pid" 2>/dev/null ++fi + + # Clean up +-kdeinit5_shutdown ++@NIXPKGS_KDEINIT5_SHUTDOWN@ + + unset KDE_FULL_SESSION +-xprop -root -remove KDE_FULL_SESSION ++@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION +-xprop -root -remove KDE_SESSION_VERSION ++@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION + unset KDE_SESSION_UID + + echo 'startkde: Done.' 1>&2 +diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake +index fd232bdf..e1c8fff6 100644 +--- a/startkde/startplasma.cmake ++++ b/startkde/startplasma.cmake +@@ -1,6 +1,6 @@ + #!/bin/sh + # +-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) ++# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) + # + + # Boot sequence: +@@ -17,17 +17,13 @@ + # + # * Then ksmserver is started which takes control of the rest of the startup sequence + +-# We need to create config folder so we can write startupconfigkeys +-if [ ${XDG_CONFIG_HOME} ]; then +- configDir=$XDG_CONFIG_HOME; +-else +- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html ++export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" ++if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then ++ . "$XDG_CONFIG_HOME/startupconfig" + fi + +-[ -r $configDir/startupconfig ] && . $configDir/startupconfig +- +-if test "$kcmfonts_general_forcefontdpi" -ne 0; then +- xrdb -quiet -merge -nocpp <&2 + + # export our session variables to the Xwayland server +-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 ++@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true ++@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 + + # We set LD_BIND_NOW to increase the efficiency of kdeinit. + # kdeinit unsets this variable before loading applications. +-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup ++LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup + if test $? -ne 0; then + # Startup error + echo 'startplasma: Could not start kdeinit5. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." + exit 1 + fi + +-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit ++@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit + + # finally, give the session control to the session manager + # see kdebase/ksmserver for the description of the rest of the startup sequence +@@ -145,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit + # If the session should be locked from the start (locked autologin), + # lock now and do the rest of the KDE startup underneath the locker. + KSMSERVEROPTIONS=" --no-lockscreen" +-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS ++@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS + if test $? -eq 255; then + # Startup error + echo 'startplasma: Could not start ksmserver. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." + fi + +-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` ++wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) + +-if test x"$wait_drkonqi"x = x"true"x ; then ++if [ x"$wait_drkonqi"x = x"true"x ]; then + # wait for remaining drkonqi instances with timeout (in seconds) +- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` ++ wait_drkonqi_timeout=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900) + wait_drkonqi_counter=0 +- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do ++ while @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ -q "^[^w]*org.kde.drkonqi" ; do + sleep 5 + wait_drkonqi_counter=$((wait_drkonqi_counter+5)) +- if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then ++ if [ "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ]; then + # ask remaining drkonqis to die in a graceful way +- qdbus | grep 'org.kde.drkonqi-' | while read address ; do +- qdbus "$address" "/MainApplication" "quit" ++ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do ++ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit" + done + break + fi +@@ -174,15 +117,17 @@ fi + + echo 'startplasma: Shutting down...' 1>&2 + # just in case +-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null ++if [ -n "$ksplash_pid" ]; then ++ kill "$ksplash_pid" 2>/dev/null ++fi + + # Clean up +-kdeinit5_shutdown ++@NIXPKGS_KDEINIT5_SHUTDOWN@ + + unset KDE_FULL_SESSION +-xprop -root -remove KDE_FULL_SESSION ++@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION +-xprop -root -remove KDE_SESSION_VERSION ++@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION + unset KDE_SESSION_UID + + echo 'startplasma: Done.' 1>&2 +diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake +index 417a87d4..3f62745a 100644 +--- a/startkde/startplasmacompositor.cmake ++++ b/startkde/startplasmacompositor.cmake +@@ -1,173 +1,171 @@ + #!/bin/sh + # +-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) ++# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) + # + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`qtpaths --binaries-dir` +- qdbus=$qbindir/qdbus +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-else +- qdbus=qdbus ++# we have to unset this for Darwin since it will screw up KDE's dynamic-loading ++unset DYLD_FORCE_FLAT_NAMESPACE ++ ++export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" ++@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME" ++ ++# The KDE icon cache is supposed to update itself ++# automatically, but it uses the timestamp on the icon ++# theme directory as a trigger. Since in Nix the ++# timestamp is always the same, this doesn't work. So as ++# a workaround, nuke the icon cache on login. This isn't ++# perfect, since it may require logging out after ++# installing new applications to update the cache. ++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html ++rm -fv $HOME/.cache/icon-cache.kcache ++ ++# Qt writes a weird ‘libraryPath’ line to ++# ~/.config/Trolltech.conf that causes the KDE plugin ++# paths of previous KDE invocations to be searched. ++# Obviously using mismatching KDE libraries is potentially ++# disastrous, so here we nuke references to the Nix store ++# in Trolltech.conf. A better solution would be to stop ++# Qt from doing this wackiness in the first place. ++if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then ++ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf + fi + +-# We need to create config folder so we can write startupconfigkeys +-if [ ${XDG_CONFIG_HOME} ]; then +- configDir=$XDG_CONFIG_HOME; +-else +- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html ++@NIXPKGS_KBUILDSYCOCA5@ ++ ++# Set the default GTK 2 theme ++gtkrc2="$HOME/.gtkrc-2.0" ++breeze_gtkrc2="/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" ++if ! [ -e "$gtkrc2" ] && [ -e "$breeze_gtkrc2" ]; then ++ cat >"$gtkrc2" <"$gtk3_settings" <"$kcminputrc" <$configDir/startupconfigkeys <"$XDG_CONFIG_HOME/startupconfigkeys" <$plasmalocalerc <"$plasmalocalerc" <$kdeglobalsfile <"$kdeglobalsfile" </plasma-workspace/env/*.sh +-# (where correspond to the system and user's configuration +-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config +-# and /etc/xdg/ on Linux) +-# +-# This is where you can define environment variables that will be available to +-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` +-# or eval `gpg-agent --daemon`. +-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script +-# +-# (see end of this file). +-# For anything else (that doesn't set env vars, or that needs a window manager), +-# better use the Autostart folder. +- +-# TODO: Use GenericConfigLocation once we depend on Qt 5.4 +-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` +- +-# Add /env/ to the directory to locate the scripts to be sourced +-for prefix in `echo $scriptpath`; do +- for file in "$prefix"/env/*.sh; do +- test -r "$file" && . "$file" +- done +-done +- + echo 'startplasmacompositor: Starting up...' 1>&2 + +-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. +-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend +-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or +-# /usr/local. +-if test -z "$XDG_DATA_DIRS"; then +-XDG_DATA_DIRS="@KDE_INSTALL_FULL_DATADIR@:/usr/share:/usr/local/share" +-fi +-export XDG_DATA_DIRS +- + # Make sure that D-Bus is running +-if $qdbus >/dev/null 2>/dev/null; then +- : # ok +-else ++if ! @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then + echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + exit 1 +@@ -202,7 +200,7 @@ export KDE_FULL_SESSION + KDE_SESSION_VERSION=5 + export KDE_SESSION_VERSION + +-KDE_SESSION_UID=`id -ru` ++KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) + export KDE_SESSION_UID + + XDG_CURRENT_DESKTOP=KDE +@@ -212,26 +210,47 @@ export XDG_CURRENT_DESKTOP + QT_QPA_PLATFORM=wayland + export QT_QPA_PLATFORM + ++# Source scripts found in /plasma-workspace/env/*.sh ++# (where correspond to the system and user's configuration ++# directories, as identified by Qt's qtpaths, e.g. $HOME/.config ++# and /etc/xdg/ on Linux) ++# ++# This is where you can define environment variables that will be available to ++# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` ++# or eval `gpg-agent --daemon`. ++# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script ++# ++# (see end of this file). ++# For anything else (that doesn't set env vars, or that needs a window manager), ++# better use the Autostart folder. ++ ++IFS=":" read -r -a scriptpath <<< $(@NIXPKGS_QTPATHS@ --paths GenericConfigLocation) ++# Add /env/ to the directory to locate the scripts to be sourced ++for prefix in "${scriptpath[@]}"; do ++ for file in "$prefix"/plasma-workspace/env/*.sh; do ++ if [ -r "$file" ]; then ++ . "$file" ++ fi ++ done ++done ++ + # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment +-if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then +- dbus-update-activation-environment --systemd --all +-else +- @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv +-fi +-if test $? -ne 0; then +- # Startup error +- echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2 +- exit 1 ++if ! @NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT@ --systemd --all; then ++ # Startup error ++ echo 'startkde: Could not sync environment to dbus.' 1>&2 ++ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null ++ echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2 ++ exit 1 + fi + +-@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma ++@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@NIXPKGS_STARTPLASMA@ + + echo 'startplasmacompositor: Shutting down...' 1>&2 + + unset KDE_FULL_SESSION +-xprop -root -remove KDE_FULL_SESSION ++@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION +-xprop -root -remove KDE_SESSION_VERSION ++@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION + unset KDE_SESSION_UID + + echo 'startplasmacompositor: Done.' 1>&2 +diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in +index 0a51b84b..f48b5d8a 100644 +--- a/startkde/waitforname/org.kde.plasma.Notifications.service.in ++++ b/startkde/waitforname/org.kde.plasma.Notifications.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.freedesktop.Notifications +-Exec=@CMAKE_INSTALL_PREFIX@/bin/plasma_waitforname org.freedesktop.Notifications ++Exec=@CMAKE_INSTALL_FULL_BINDIR@/plasma_waitforname org.freedesktop.Notifications diff --git a/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch deleted file mode 100644 index 3b3d318d3bb..00000000000 --- a/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml -+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml -@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.plasma.workspace.components 2.0 - import org.kde.kcoreaddons 1.0 as KCoreAddons --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: batteryItem -Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml -+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.kcoreaddons 1.0 as KCoreAddons - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: batterymonitor -Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/lock_logout/contents/ui/lockout.qml -+++ plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 - import org.kde.kquickcontrolsaddons 2.0 --import "data.js" as Data -+import "../code/data.js" as Data - - Flow { - id: lockout -Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml -+++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml -@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas - - import org.kde.plasma.private.notifications 1.0 - --import "uiproperties.js" as UiProperties -+import "../code/uiproperties.js" as UiProperties - - MouseEventListener { - id: notificationsApplet diff --git a/pkgs/desktops/plasma-5/plasma-workspace/series b/pkgs/desktops/plasma-5/plasma-workspace/series deleted file mode 100644 index b9081298bd6..00000000000 --- a/pkgs/desktops/plasma-5/plasma-workspace/series +++ /dev/null @@ -1 +0,0 @@ -qml-import-path.patch From 0cd1b028174fe250c071c735be231db881fe964f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 20 Oct 2017 09:16:12 -0500 Subject: [PATCH 1424/2806] plasma-5: remove `startkde` We no longer have a separate `startkde` script; instead we patch the script which comes with `plasma-workspace`. The primary reason to do this is that we have not been keeping up with the minor bugfixes that the upstream script receives. A secondary reason is: now that we support Wayland, we don't really want to have a separate package for each session script. --- pkgs/desktops/plasma-5/default.nix | 1 - pkgs/desktops/plasma-5/startkde/default.nix | 41 --- pkgs/desktops/plasma-5/startkde/startkde.sh | 384 -------------------- 3 files changed, 426 deletions(-) delete mode 100644 pkgs/desktops/plasma-5/startkde/default.nix delete mode 100755 pkgs/desktops/plasma-5/startkde/startkde.sh diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index a9b3f178132..a828ba0fe7b 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -139,7 +139,6 @@ let polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; powerdevil = callPackage ./powerdevil.nix {}; sddm-kcm = callPackage ./sddm-kcm.nix {}; - startkde = callPackage ./startkde {}; systemsettings = callPackage ./systemsettings.nix {}; }; in diff --git a/pkgs/desktops/plasma-5/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix deleted file mode 100644 index 3b04c037073..00000000000 --- a/pkgs/desktops/plasma-5/startkde/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenv, lib, runCommand, substituteAll, dbus, gnugrep, gnused, kconfig, - kinit, kservice, plasma-desktop, plasma-workspace, xmessage, xprop, xrdb, - xsetroot, qttools, -}: - -let - - inherit (lib) getBin getLib; - - script = substituteAll { - src = ./startkde.sh; - inherit (stdenv) shell; - kbuildsycoca5 = "${getBin kservice}/bin/kbuildsycoca5"; - sed = "${getBin gnused}/bin/sed"; - kcheckrunning = "${getBin plasma-workspace}/bin/kcheckrunning"; - xmessage = "${getBin xmessage}/bin/xmessage"; - kstartupconfig5 = "${getBin plasma-workspace}/bin/kstartupconfig5"; - kapplymousetheme = "${getBin plasma-desktop}/bin/kapplymousetheme"; - xsetroot = "${getBin xsetroot}/bin/xsetroot"; - xrdb = "${getBin xrdb}/bin/xrdb"; - ksplashqml = "${getBin plasma-workspace}/bin/ksplashqml"; - qdbus = "${getBin qttools}/bin/qdbus"; - xprop = "${getBin xprop}/bin/xprop"; - qtpaths = "${getBin qttools}/bin/qtpaths"; - dbus_update_activation_environment = "${getBin dbus}/bin/dbus-update-activation-environment"; - start_kdeinit_wrapper = "${getLib kinit}/lib/libexec/kf5/start_kdeinit_wrapper"; - kwrapper5 = "${getBin kinit}/bin/kwrapper5"; - ksmserver = "${getBin plasma-workspace}/bin/ksmserver"; - kreadconfig5 = "${getBin kconfig}/bin/kreadconfig5"; - kdeinit5_shutdown = "${getBin kinit}/bin/kdeinit5_shutdown"; - }; - -in - -runCommand "startkde.sh" -{ preferLocalBuild = true; allowSubstitutes = false; } -'' - cp ${script} $out - chmod +x $out -'' diff --git a/pkgs/desktops/plasma-5/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh deleted file mode 100755 index f8b4f4844e2..00000000000 --- a/pkgs/desktops/plasma-5/startkde/startkde.sh +++ /dev/null @@ -1,384 +0,0 @@ -#!@shell@ - -@kbuildsycoca5@ - -# Set the default GTK 2 theme -if ! [ -e $HOME/.gtkrc-2.0 ] \ - && [ -e /run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc ]; then - cat >$HOME/.gtkrc-2.0 <$HOME/.config/gtk-3.0/settings.ini <$configDir/kcminputrc <$configDir/startupconfigkeys <$plasmalocalerc <$kdeglobalsfile <&2 - -# Make sure that D-Bus is running -if @qdbus@ >/dev/null 2>/dev/null; then - : # ok -else - echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" - exit 1 -fi - -# Mark that full KDE session is running (e.g. Konqueror preloading works only -# with full KDE running). The KDE_FULL_SESSION property can be detected by -# any X client connected to the same X session, even if not launched -# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION -# however guarantees that the application is launched in the same environment -# like the KDE session and that e.g. KDE utilities/libraries are available. -# KDE_FULL_SESSION property is also only available since KDE 3.5.5. -# The matching tests are: -# For $KDE_FULL_SESSION: -# if test -n "$KDE_FULL_SESSION"; then ... whatever -# For KDE_FULL_SESSION property: -# xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null -# if test $? -eq 0; then ... whatever -# -# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid -# of the user running the KDE session. It should be rarely needed (e.g. -# after sudo to prevent desktop-wide functionality in the new user's kded). -# -# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number. -# Note that this didn't exist in KDE3, which can be detected by its absense and -# the presence of KDE_FULL_SESSION. -# -KDE_FULL_SESSION=true -export KDE_FULL_SESSION -@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - -KDE_SESSION_VERSION=5 -export KDE_SESSION_VERSION -@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - -KDE_SESSION_UID=$(id -ru) -export KDE_SESSION_UID - -XDG_CURRENT_DESKTOP=KDE -export XDG_CURRENT_DESKTOP - -# Source scripts found in /plasma-workspace/env/*.sh -# (where correspond to the system and user's configuration -# directories, as identified by Qt's qtpaths, e.g. $HOME/.config -# and /etc/xdg/ on Linux) -# -# This is where you can define environment variables that will be available to -# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` -# or eval `gpg-agent --daemon`. -# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script -# -# (see end of this file). -# For anything else (that doesn't set env vars, or that needs a window manager), -# better use the Autostart folder. - -IFS=":" read -r -a scriptpath <<< $(@qtpaths@ --paths GenericConfigLocation) -# Add /env/ to the directory to locate the scripts to be sourced -for prefix in "${scriptpath[@]}"; do - for file in "$prefix"/plasma-workspace/env/*.sh; do - test -r "$file" && . "$file" || true - done -done - -# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -@dbus_update_activation_environment@ --systemd --all -if test $? -ne 0; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@ -geometry 500x100 "Could not sync environment to dbus." - exit 1 -fi - -# We set LD_BIND_NOW to increase the efficiency of kdeinit. -# kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup -if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation." - exit 1 -fi - -@qdbus@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit - -# finally, give the session control to the session manager -# see kdebase/ksmserver for the description of the rest of the startup sequence -# if the KDEWM environment variable has been set, then it will be used as KDE's -# window manager instead of kwin. -# if KDEWM is not set, ksmserver will ensure kwin is started. -# kwrapper5 is used to reduce startup time and memory usage -# kwrapper5 does not return useful error codes such as the exit code of ksmserver. -# We only check for 255 which means that the ksmserver process could not be -# started, any problems thereafter, e.g. ksmserver failing to initialize, -# will remain undetected. -test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" -# If the session should be locked from the start (locked autologin), -# lock now and do the rest of the KDE startup underneath the locker. -KSMSERVEROPTIONS="" -test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" -@kwrapper5@ @ksmserver@ $KDEWM $KSMSERVEROPTIONS -if test $? -eq 255; then - # Startup error - echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation." -fi - -wait_drkonqi=$(@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - -if test x"$wait_drkonqi"x = x"true"x ; then - # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=$(kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900) - wait_drkonqi_counter=0 - while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way - @qdbus@ | grep 'org.kde.drkonqi-' | while read address ; do - @qdbus@ "$address" "/MainApplication" "quit" - done - break - fi - done -fi - -echo 'startkde: Shutting down...' 1>&2 -# just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - -# Clean up -@kdeinit5_shutdown@ - -unset KDE_FULL_SESSION -@xprop@ -root -remove KDE_FULL_SESSION -unset KDE_SESSION_VERSION -@xprop@ -root -remove KDE_SESSION_VERSION -unset KDE_SESSION_UID - -echo 'startkde: Done.' 1>&2 From e40233e13695dc11c7ee67df6c751ff81a2e173b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 19 Oct 2017 14:54:59 +0200 Subject: [PATCH 1425/2806] scons: 2.5.1 -> 3.0.0 "SCons release 3.0.0 now available from the download page at SourceForge. This release should be used instead of 2.5.1. This release fixes several issues. TThis will be the first release to support Python versions earlier than 2.7 as well as 3.5+." "NOTE: This is a major release. You should expect that some targets may rebuild when upgrading. Significant changes in some python action signatures. Also switching between PY 2.7 and PY 3.5, 3.6 will cause rebuilds." --- .../tools/build-managers/scons/common.nix | 32 +++++++++++++++++++ .../tools/build-managers/scons/default.nix | 32 +++++-------------- .../build-managers/scons/default.upstream | 10 ------ .../scons/print-statements.patch | 13 ++++++++ pkgs/top-level/all-packages.nix | 4 ++- 5 files changed, 56 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/tools/build-managers/scons/common.nix delete mode 100644 pkgs/development/tools/build-managers/scons/default.upstream create mode 100644 pkgs/development/tools/build-managers/scons/print-statements.patch diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix new file mode 100644 index 00000000000..de36925368d --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -0,0 +1,32 @@ +{ version, sha256 }: + +{ stdenv, fetchurl, fetchpatch, python2Packages }: + +let name = "scons"; +in python2Packages.buildPythonApplication { + name = "${name}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; + inherit sha256; + }; + + # Fix a regression in 3.0.0 (causes build errors for some packages) + patches = stdenv.lib.optional (version == "3.0.0") ./print-statements.patch; + + meta = with stdenv.lib; { + homepage = http://scons.org/; + description = "An improved, cross-platform substitute for Make"; + license = licenses.mit; + longDescription = '' + SCons is an Open Source software construction tool. Think of + SCons as an improved, cross-platform substitute for the classic + Make utility with integrated functionality similar to + autoconf/automake and compiler caches such as ccache. In short, + SCons is an easier, more reliable and faster way to build + software. + ''; + platforms = platforms.all; + maintainers = [ primeos ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 1b2a8220361..8e40777815c 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,30 +1,14 @@ -{stdenv, fetchurl, python2Packages}: +{ callPackage, stdenv }: let - name = "scons"; - version = "2.5.1"; -in python2Packages.buildPythonApplication { - name = "${name}-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; + mkScons = args: callPackage (import ./common.nix args) { }; +in { + scons_2_5_1 = mkScons { + version = "2.5.1"; sha256 = "1wji1z9jdkhnmm99apx6fhld9cs52rr56aigniyrcsmlwy52298b"; }; - # No tests - doCheck = false; - - meta = { - homepage = http://scons.org/; - description = "An improved, cross-platform substitute for Make"; - license = stdenv.lib.licenses.mit; - longDescription = '' - SCons is an Open Source software construction tool. Think of - SCons as an improved, cross-platform substitute for the classic - Make utility with integrated functionality similar to - autoconf/automake and compiler caches such as ccache. In short, - SCons is an easier, more reliable and faster way to build - software. - ''; - platforms = stdenv.lib.platforms.all; + scons_3_0_0 = mkScons { + version = "3.0.0"; + sha256 = "05jjykllk4icnq6gfrkgkbc4ggxm7983q6r33mrhpilqbd02ylqg"; }; } diff --git a/pkgs/development/tools/build-managers/scons/default.upstream b/pkgs/development/tools/build-managers/scons/default.upstream deleted file mode 100644 index f9dae2818c8..00000000000 --- a/pkgs/development/tools/build-managers/scons/default.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url http://sourceforge.net/projects/scons/files/scons/ -SF_version_dir -version_link '[.]tar[.]gz/download$' -SF_redirect -ensure_hash - -do_overwrite() { - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/development/tools/build-managers/scons/print-statements.patch b/pkgs/development/tools/build-managers/scons/print-statements.patch new file mode 100644 index 00000000000..a963bf78aba --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/print-statements.patch @@ -0,0 +1,13 @@ +diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py +index 558e28f9..8fea9c4d 100644 +--- src/engine/SCons/Script/SConscript.py ++++ src/engine/SCons/Script/SConscript.py +@@ -5,8 +5,6 @@ + + """ + +-from __future__ import print_function +- + # + # __COPYRIGHT__ + # diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ced90b2d0f..1b362df2e59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7536,7 +7536,9 @@ with pkgs; selendroid = callPackage ../development/tools/selenium/selendroid { }; - scons = callPackage ../development/tools/build-managers/scons { }; + sconsPackages = callPackage ../development/tools/build-managers/scons { }; + scons = sconsPackages.scons_3_0_0; + scons_2_5_1 = sconsPackages.scons_2_5_1; sbt = callPackage ../development/tools/build-managers/sbt { }; sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; From 90435ba0602867007f6085098c81bf34a5006f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Oct 2017 18:13:15 +0200 Subject: [PATCH 1426/2806] Revert "wt: fixup build by using older boost again" This reverts commit 9f2409096b53658bc51ebfdbb6c03cc9d3f3840f. Now it's fixed by update 38b94d1f1f7. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f6b8aa48ec..e3e400f6e92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10971,9 +10971,7 @@ with pkgs; wiredtiger = callPackage ../development/libraries/wiredtiger { }; - wt = callPackage ../development/libraries/wt { - boost = boost160; # 165: error: invalid conversion from 'const char*'... - }; + wt = callPackage ../development/libraries/wt { }; wxGTK = wxGTK28; From c3263fcaa1a18d44a4191b08deeeb59a55071c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Oct 2017 18:16:40 +0200 Subject: [PATCH 1427/2806] wt: put version into name, cleanup whitespace The style is now closer to what's usual in nixpkgs. --- pkgs/development/libraries/wt/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 8dc6db03bc3..3adf4f1497f 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu, - pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl, - pcre }: +{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu +, pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl +, pcre +}: stdenv.mkDerivation rec { - name = "wt"; + name = "wt-${version}"; version = "4.0.0"; src = fetchFromGitHub { owner = "kdeforche"; - repo = name; + repo = "wt"; rev = version; sha256 = "1451xxvnx6mlvxg0jxlr1mfv5v18h2214kijk5kacilqashfc43i"; }; @@ -16,9 +17,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost doxygen qt48Full libharu - pango fcgi firebird libmysql postgresql graphicsmagick glew - openssl pcre ]; + buildInputs = [ + cmake boost doxygen qt48Full libharu + pango fcgi firebird libmysql postgresql graphicsmagick glew + openssl pcre + ]; cmakeFlags = [ "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.webtoolkit.eu/wt; description = "C++ library for developing web applications"; - platforms = platforms.linux ; + platforms = platforms.linux; license = licenses.gpl2; maintainers = [ maintainers.juliendehos ]; }; From 83fdd2699c5352416b4b97cb306d5039f2ad5ec2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 20 Oct 2017 18:36:46 +0200 Subject: [PATCH 1428/2806] eudev: 3.2.1 -> 3.2.4 --- pkgs/os-specific/linux/eudev/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 091a0d4b46f..67ce39ddbd3 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchurl, pkgconfig, glib, gperf, utillinux}: +{stdenv, fetchurl, pkgconfig, glib, gperf, utillinux, kmod}: let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.1"; + version = "3.2.4"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"; + sha256 = "1vbg2k5mngyxdcdw4jkkzxbwdgrcr643hkby1whz7x91kg4g9p6x"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib gperf utillinux + glib gperf utillinux kmod ]; in stdenv.mkDerivation { @@ -21,11 +21,6 @@ stdenv.mkDerivation { inherit (s) url sha256; }; patches = [ - (fetchurl { - # for new gperf - url = "https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60.patch"; - sha256 = "097pjmgq243mz3vfxndwmm37prmacgq2f4r4gb47whfkbd6syqcw"; - }) ]; configureFlags = [ From 7867b508817f1acfe3a524ed93ac83cb45e87720 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 20 Oct 2017 19:30:28 +0300 Subject: [PATCH 1429/2806] nixos/pam: add swaylock (#29919) --- nixos/modules/security/pam.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index ede4ace5ed0..1e8ca4f9022 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -521,6 +521,7 @@ in ftp = {}; i3lock = {}; i3lock-color = {}; + swaylock = {}; screen = {}; vlock = {}; xlock = {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b362df2e59..a886757e030 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15025,6 +15025,7 @@ with pkgs; wlc = callPackage ../development/libraries/wlc { }; orbment = callPackage ../applications/window-managers/orbment { }; sway = callPackage ../applications/window-managers/sway { }; + swaylock = callPackage ../applications/window-managers/sway { }; swc = callPackage ../development/libraries/swc { }; wld = callPackage ../development/libraries/wld { }; From ea35bc94bf0efd28e39cf4e8212f7df5b6e78aba Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 7 Oct 2017 17:27:46 +0200 Subject: [PATCH 1430/2806] nixos/ecryptfs: init Currently, ecryptfs support is coupled to `security.pam.enableEcryptfs`, but one might want to use ecryptfs without enabling the PAM functionality. This commit splits it out into a `boot.supportedFilesystems` switch. --- nixos/modules/module-list.nix | 1 + nixos/modules/security/pam.nix | 10 ++++------ nixos/modules/tasks/filesystems/ecryptfs.nix | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 nixos/modules/tasks/filesystems/ecryptfs.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e67e6ae32b9..6f00a97dd3f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -696,6 +696,7 @@ ./tasks/filesystems/bcachefs.nix ./tasks/filesystems/btrfs.nix ./tasks/filesystems/cifs.nix + ./tasks/filesystems/ecryptfs.nix ./tasks/filesystems/exfat.nix ./tasks/filesystems/ext.nix ./tasks/filesystems/f2fs.nix diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 1e8ca4f9022..5ded36329f3 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -486,8 +486,9 @@ in ++ optionals config.krb5.enable [pam_krb5 pam_ccreds] ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ] ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ] - ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ] - ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ]; + ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]; + + boot.supportedFilesystems = optionals config.security.pam.enableEcryptfs [ "ecryptfs" ]; security.wrappers = { unix_chkpwd = { @@ -495,10 +496,7 @@ in owner = "root"; setuid = true; }; - } // (if config.security.pam.enableEcryptfs then { - "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; - "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; - } else {}); + }; environment.etc = mapAttrsToList (n: v: makePAMService v) config.security.pam.services; diff --git a/nixos/modules/tasks/filesystems/ecryptfs.nix b/nixos/modules/tasks/filesystems/ecryptfs.nix new file mode 100644 index 00000000000..12a407cabbf --- /dev/null +++ b/nixos/modules/tasks/filesystems/ecryptfs.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: +# TODO: make ecryptfs work in initramfs? + +with lib; + +{ + config = mkIf (any (fs: fs == "ecryptfs") config.boot.supportedFilesystems) { + system.fsPackages = [ pkgs.ecryptfs ]; + security.wrappers = { + "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; + "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; + }; + }; +} From ddc41d7c6dd2f7f6d6a11ea47cd1b49f8915c442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Oct 2017 19:08:10 +0200 Subject: [PATCH 1431/2806] zanshin: fixup build by using older boost again 160 seems a popular version in nixpkgs. --- 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 e3e400f6e92..ab062fd2bda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17450,6 +17450,7 @@ with pkgs; zanshin = libsForQt5.callPackage ../applications/office/zanshin { inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; inherit (kdeFrameworks) krunner kwallet; + boost = boost160; }; zathura = callPackage ../applications/misc/zathura { From fd0e61a5dbe392ec73b5abf59ae270fa5d6eef3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Oct 2017 19:20:09 +0200 Subject: [PATCH 1432/2806] vowpalwabbit: fixup build by using older boost again 160 seems a popular version in nixpkgs. --- pkgs/top-level/python-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index daee60ccec4..b27147e18b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -95,7 +95,10 @@ in { setuptools = callPackage ../development/python-modules/setuptools { }; - vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { pythonPackages = self; }; + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { + pythonPackages = self; + boost = pkgs.boost160; + }; acoustics = callPackage ../development/python-modules/acoustics { }; From 7008e531bf46672b4d13229325c753761e5141e0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 20 Oct 2017 13:05:48 -0500 Subject: [PATCH 1433/2806] vim-plugins: Add zig-vim --- pkgs/misc/vim-plugins/default.nix | 10 ++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index adc2a6104e7..90502188e5f 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2550,4 +2550,14 @@ rec { }; + zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "zig-vim-2017-10-17"; + src = fetchgit { + url = "https://github.com/zig-lang/zig.vim"; + rev = "6059db59f61b517f5d65303b61f03324e01fdc2f"; + sha256 = "0w3pa63s0r6h6w1iqmc444qrsc99xcccwapd6nyh3gb72z228d7z"; + }; + dependencies = []; + + }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index acde3cf2e5b..442464a16e7 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -161,6 +161,7 @@ "github:zah/nim.vim" "github:zchee/deoplete-go" "github:zchee/deoplete-jedi" +"github:zig-lang/zig.vim" "goyo" "gruvbox" "matchit.zip" From 86b8e28bc147e1585ffe84063bdfb546afc24f9a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 20 Oct 2017 11:49:45 -0700 Subject: [PATCH 1434/2806] startkde was removed by 0cd1b028174fe250c071c735be231db881fe964f --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a886757e030..42d2354eb5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18279,7 +18279,7 @@ with pkgs; kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace - plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm startkde + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings; ### SCIENCE From dab7ecc0542c024f9725216edfbddefafc910413 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Fri, 20 Oct 2017 22:59:31 +0300 Subject: [PATCH 1435/2806] nixos-generate-config: lessen priority for cpuFreqGovernor (#30221) In particular, it conflicts with `services.tlp.enable` option. There exists workaround: ``` powerManagement.cpuFreqGovernor = lib.mkForce null; services.tlp.enable = true; ``` But should it? --- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 926d1e3133f..c0df2977856 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -103,7 +103,7 @@ if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") { foreach $e (@desired_governors) { if (index($governors, $e) != -1) { - last if (push @attrs, "powerManagement.cpuFreqGovernor = \"$e\";"); + last if (push @attrs, "powerManagement.cpuFreqGovernor = lib.mkDefault \"$e\";"); } } } From 75a536459a45689680e1169ca0a2dda8d30d9589 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Fri, 20 Oct 2017 22:12:17 +0200 Subject: [PATCH 1436/2806] dub: 1.1.0 -> 1.4.1 (#28396) - gcc not needed at all as dependency - other D compilers can be used instead of dmd, so it's not good to use it as a runtime dependency. - Adding checkPhase (disabled for now because network access is limited in sandbox mode) - Improve package description. --- .../tools/build-managers/dub/default.nix | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 7f178babf32..007ce5b07cd 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,27 +1,53 @@ -{ stdenv, fetchFromGitHub, curl, dmd, gcc }: +{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: stdenv.mkDerivation rec { name = "dub-${version}"; - version = "1.1.0"; + version = "1.5.0"; src = fetchFromGitHub { - sha256 = "1smzlfs5gjmrlghccdgn04qzy5b8l0xm8y2virayb2adrwqviscm"; - rev = "v${version}"; + owner = "dlang"; repo = "dub"; - owner = "D-Programming-Language"; + rev = "v${version}"; + sha256 = "0kmirx4ijhzirjwdqmnwqhngg38zdaydpvny2p0yj3afqgkj6vq5"; }; - buildInputs = [ curl ]; - propagatedBuildInputs = [ gcc dmd ]; - - buildPhase = '' + postPatch = '' # Avoid that the version file is overwritten substituteInPlace build.sh \ --replace source/dub/version_.d /dev/null - patchShebangs ./build.sh + + substituteInPlace build.sh \ + --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + + patchShebangs build.sh + patchShebangs test + + # Remove unittest which is not working for now (upstream already fixed: https://github.com/dlang/dub/issues/1224) + rm test/interactive-remove.sh + + # Fix test as long as there is no upstream solution. (see https://github.com/dlang/dub/pull/1227) + substituteInPlace test/issue884-init-defer-file-creation.sh \ + --replace "< /dev/stdin" "<(while :; do sleep 1; done)" \ + --replace "sleep 1" "" + ''; + + nativeBuildInputs = [ dmd libevent rsync ]; + buildInputs = [ curl ]; + + buildPhase = '' + export DMD=${dmd.out}/bin/dmd ./build.sh ''; + doCheck = false; + + checkPhase = '' + export DUB=$PWD/bin/dub + export DC=${dmd.out}/bin/dmd + export HOME=$TMP + ./test/run-unittest.sh + ''; + installPhase = '' mkdir $out mkdir $out/bin @@ -29,9 +55,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Build tool for D projects"; + description = "Package and build manager for D applications and libraries"; homepage = http://code.dlang.org/; license = licenses.mit; + maintainers = with maintainers; [ ThomasMader ]; platforms = platforms.unix; }; } From 916c0a69f82457acae9e8161d018a76ab57e079d Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Fri, 20 Oct 2017 22:14:41 +0200 Subject: [PATCH 1437/2806] biboumi: init at 6.1 (#30193) * biboumi: init at 6.1 TODO: integrate config in NixOS * biboumi: remove external buildtime dep - fetch catch.hpp in a reproducible way - add maintainer - enable tests - remove git dep - enable parallel building - add pandoc dep for man page - nitpicks * biboumi: refine substitutions - only CMakeLists.txt has to be patched regarding /etc/biboumi - substitute /bin/kill in systemd service file - prepare for configuring policy_directory in a future cfg file --- pkgs/servers/xmpp/biboumi/catch.patch | 30 ++++++++++++++++++ pkgs/servers/xmpp/biboumi/default.nix | 44 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 76 insertions(+) create mode 100644 pkgs/servers/xmpp/biboumi/catch.patch create mode 100644 pkgs/servers/xmpp/biboumi/default.nix diff --git a/pkgs/servers/xmpp/biboumi/catch.patch b/pkgs/servers/xmpp/biboumi/catch.patch new file mode 100644 index 00000000000..05cf534ecfe --- /dev/null +++ b/pkgs/servers/xmpp/biboumi/catch.patch @@ -0,0 +1,30 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -273,27 +273,6 @@ foreach(file ${source_all}) + endforeach() + + # +-## Add a rule to download the catch unit test framework +-# +-include(ExternalProject) +-ExternalProject_Add(catch +- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git" +- PREFIX "external" +- UPDATE_COMMAND "" +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +- ) +-set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE) +-ExternalProject_Get_Property(catch SOURCE_DIR) +-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp) +- target_include_directories(test_suite +- PUBLIC "${SOURCE_DIR}/include/" +- ) +- add_dependencies(test_suite catch) +-endif() +- +-# + ## Add some custom rules to launch the tests + # + add_custom_target(check COMMAND "test_suite" diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix new file mode 100644 index 00000000000..e59aaa9116c --- /dev/null +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, + libiconv, botan2, systemd, pkgconfig, udns, pandoc, procps } : + +stdenv.mkDerivation rec { + name = "biboumi-${version}"; + version = "6.1"; + + src = fetchurl { + url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz"; + sha256 = "1la1n502v2wyfm0vl8v4m0hbigkkjchi21446n9mb203fz1cvr77"; + }; + + louiz_catch = fetchgit { + url = https://lab.louiz.org/louiz/Catch.git; + rev = "35f510545d55a831372d3113747bf1314ff4f2ef"; + sha256 = "1l5b32sgr9zc2hlfr445hwwxv18sh3cn5q1xmvf588z6jyf88g2g"; + }; + + patches = [ ./catch.patch ]; + + nativeBuildInputs = [ cmake pkgconfig pandoc ]; + buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd + udns procps ]; + + inherit procps; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi + substituteInPlace unit/biboumi.service.cmake --replace /bin/kill $procps/bin/kill + cp $louiz_catch/single_include/catch.hpp tests/ + # echo "policy_directory=$out/etc/biboumi" >> conf/biboumi.cfg + # TODO include conf/biboumi.cfg as example somewhere + ''; + + enableParallelBuilding = true; + doCheck = true; + + meta = with stdenv.lib; { + description = "Modern XMPP IRC gateway"; + platforms = platforms.unix; + homepage = https://lab.louiz.org/louiz/biboumi; + license = licenses.zlib; + maintainers = [ maintainers.woffs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42d2354eb5e..9825a527820 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11481,6 +11481,8 @@ with pkgs; inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; }; + biboumi = callPackage ../servers/xmpp/biboumi { }; + elasticmq = callPackage ../servers/elasticmq { }; eventstore = callPackage ../servers/nosql/eventstore { From 1d317bd84a13f73f0f05346dca6c048896aa91d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Oct 2017 23:50:27 +0200 Subject: [PATCH 1438/2806] scons: fix meta eval --- pkgs/development/tools/build-managers/scons/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index de36925368d..d3842a39f18 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -27,6 +27,6 @@ in python2Packages.buildPythonApplication { software. ''; platforms = platforms.all; - maintainers = [ primeos ]; + maintainers = [ maintainers.primeos ]; }; } From 0f0d11074f9678a4e0160352ce3e8b49ad9f446f Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Fri, 20 Oct 2017 20:24:34 -0400 Subject: [PATCH 1439/2806] webkitgtk 2.4: fixup build by using older icu again --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d70d61113b..8a4db99090a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8613,6 +8613,9 @@ with pkgs; withIcu = true; withGraphite2 = true; }; + harfbuzz-icu-58 = harfbuzz-icu.override { + icu = icu58; + }; hawknl = callPackage ../development/libraries/hawknl { }; @@ -10929,7 +10932,7 @@ with pkgs; webkitgtk = webkitgtk216x; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { - harfbuzz = harfbuzz-icu; + harfbuzz = harfbuzz-icu-58; gst-plugins-base = gst_all_1.gst-plugins-base; inherit (darwin) libobjc; }; From 4a8116ce5db9f517ed3d3f7ddbae499fc17c3b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sat, 21 Oct 2017 03:03:49 +0200 Subject: [PATCH 1440/2806] yubico-piv-tool: 1.3.0 -> 1.4.4 --- pkgs/tools/misc/yubico-piv-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index c01e419ab23..29e527fe862 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.3.0"; + name = "yubico-piv-tool-1.4.4"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "0l9lkzwi2227y5y02i5g1d701bmlyaj8lffv72jks1w4mkh7q7qh"; + sha256 = "0s9pib3g4lmxw9rjjd5h3ad401150kb1wqrzf8w1bq79g0zsq3mb"; }; nativeBuildInputs = [ pkgconfig ]; From 24eb66569527ec84eb35cd80ce407f2106c3a368 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 21 Oct 2017 02:27:09 -0500 Subject: [PATCH 1441/2806] cmake: setup CMAKE_FRAMEWORK_PATH This tells cmake how to find macOS frameworks. Fixes #26197 --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index bf876e81cda..331f907ae61 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -84,6 +84,9 @@ makeCmakeFindLibs(){ -L*) export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}" ;; + -F*) + export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag:2}" + ;; -isystem) isystem_seen=1 ;; From bc2aaeb75caae20ececbb34d8abea789e94af3b1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 21 Oct 2017 07:30:22 +0000 Subject: [PATCH 1442/2806] tixati: unfree license --- pkgs/applications/networking/p2p/tixati/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 76034e6f735..d37f5293ef8 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Torrent client"; homepage = http://www.tixati.com; - license = licenses.free; + license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ volth ]; }; From 525e1216265ebdb039f54cfa3ae24db7c6c5168a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 21 Oct 2017 10:05:33 +0200 Subject: [PATCH 1443/2806] xorg.libXfont: 1.5.2 -> 1.5.3 It fixes CVE-2017-{13720,13722} but it's apparently very low-impact. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b2b238997b9..4161df6ae8b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -848,11 +848,11 @@ let }) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (mkDerivation "libXfont" { - name = "libXfont-1.5.2"; + name = "libXfont-1.5.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2; - sha256 = "0w8d07bkmjiarkx09579bl8zsq903mn8javc7qpi0ix4ink5x502"; + url = mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2; + sha256 = "1l4k3i3xzqdmaszykh6bb2ah78p6c3z7fak7xzgq2d38s87w31db"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 42cee12843c..526785ae8fb 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 -mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2 +mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 From 96b339fbc93899b42a4b897d0db9854397d90159 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 20 Oct 2017 18:16:05 +0100 Subject: [PATCH 1444/2806] buildkite-agent: 2.1.13 -> 2.6.6 Build the package from source Re-organise the module a bit to allow custom version of the package --- .../buildkite-agent.nix | 47 +++++++++++----- .../buildkite-agent/default.nix | 54 ++++++++++--------- 2 files changed, 65 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 267bc16862c..b6d61f6c68b 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -9,9 +9,8 @@ let token="${cfg.token}" name="${cfg.name}" meta-data="${cfg.meta-data}" - hooks-path="${pkgs.buildkite-agent}/share/hooks" - build-path="/var/lib/buildkite-agent/builds" - bootstrap-script="${pkgs.buildkite-agent}/share/bootstrap.sh" + hooks-path="${cfg.package}/share/hooks" + build-path="${cfg.dataDir}" ''; in @@ -20,6 +19,26 @@ in services.buildkite-agent = { enable = mkEnableOption "buildkite-agent"; + package = mkOption { + default = pkgs.buildkite-agent; + defaultText = "pkgs.buildkite-agent"; + description = "Which buildkite-agent derivation to use"; + type = types.package; + }; + + dataDir = mkOption { + default = "/var/lib/buildkite-agent"; + description = "The workdir for the agent"; + type = types.str; + }; + + runtimePackages = mkOption { + default = [ pkgs.nix ]; + defaultText = "[ pkgs.nix ]"; + description = "Add programs to the buildkite-agent environment"; + type = types.listOf types.package; + }; + token = mkOption { type = types.str; description = '' @@ -62,27 +81,31 @@ in config = mkIf config.services.buildkite-agent.enable { users.extraUsers.buildkite-agent = { name = "buildkite-agent"; - home = "/var/lib/buildkite-agent"; + home = cfg.dataDir; createHome = true; description = "Buildkite agent user"; }; - environment.systemPackages = [ pkgs.buildkite-agent ]; + environment.systemPackages = [ cfg.package ]; systemd.services.buildkite-agent = { description = "Buildkite Agent"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - environment.HOME = "/var/lib/buildkite-agent"; + path = cfg.runtimePackages; + environment = config.networking.proxy.envVars // { + HOME = cfg.dataDir; + NIX_REMOTE = "daemon"; + }; preStart = '' - ${pkgs.coreutils}/bin/mkdir -m 0700 -p /var/lib/buildkite-agent/.ssh + ${pkgs.coreutils}/bin/mkdir -m 0700 -p ${cfg.dataDir}/.ssh - echo "${cfg.openssh.privateKey}" > /var/lib/buildkite-agent/.ssh/id_rsa - ${pkgs.coreutils}/bin/chmod 600 /var/lib/buildkite-agent/.ssh/id_rsa + echo "${cfg.openssh.privateKey}" > ${cfg.dataDir}/.ssh/id_rsa + ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa - echo "${cfg.openssh.publicKey}" > /var/lib/buildkite-agent/.ssh/id_rsa.pub - ${pkgs.coreutils}/bin/chmod 600 /var/lib/buildkite-agent/.ssh/id_rsa.pub - ''; + echo "${cfg.openssh.publicKey}" > ${cfg.dataDir}/.ssh/id_rsa.pub + ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa.pub + ''; serviceConfig = { ExecStart = "${pkgs.buildkite-agent}/bin/buildkite-agent start --config ${configFile}"; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 10d4a3f0f28..46cee51e0e6 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,32 +1,38 @@ -{ stdenv, fetchurl, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: - -stdenv.mkDerivation rec { - version = "2.1.13"; +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: +let + version = "2.6.6"; + goPackagePath = "github.com/buildkite/agent"; +in +buildGoPackage { name = "buildkite-agent-${version}"; - dontBuild = true; - src = fetchurl { - url = "https://github.com/buildkite/agent/releases/download/v${version}/buildkite-agent-linux-386-${version}.tar.gz"; - sha256 = "bd40c2ba37b3b54b875241a32b62190a4cf4c15e2513c573f1626a3ca35c8657"; + inherit goPackagePath; + + src = fetchFromGitHub { + owner = "buildkite"; + repo = "agent"; + rev = "v${version}"; + sha256 = "0rpi63mfzlm39517l4xjcka3m4dnfjzwvpi0i1rpf1z2288cnkyx"; }; nativeBuildInputs = [ makeWrapper ]; - sourceRoot = "."; - installPhase = '' - install -Dt "$out/bin/" buildkite-agent - mkdir -p $out/share - mv hooks bootstrap.sh $out/share/ + postInstall = '' + # Install bootstrap.sh + mkdir -p $bin/libexec/buildkite-agent + cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $bin/libexec/buildkite-agent + sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $bin/libexec/buildkite-agent/bootstrap.sh + + # Fix binary name + mv $bin/bin/{agent,buildkite-agent} + + # These are runtime dependencies + wrapProgram $bin/bin/buildkite-agent \ + --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' \ + --set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh ''; - postFixup = '' - substituteInPlace $out/share/bootstrap.sh \ - --replace "#!/bin/bash" "#!$(type -P bash)" - wrapProgram $out/bin/buildkite-agent \ - --set PATH '"${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}:$PATH"' - ''; - - meta = { + meta = with stdenv.lib; { description = "Build runner for buildkite.com"; longDescription = '' The buildkite-agent is a small, reliable, and cross-platform build runner @@ -36,8 +42,8 @@ stdenv.mkDerivation rec { and uploading the job's artifacts. ''; homepage = https://buildkite.com/docs/agent; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.pawelpacana ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ pawelpacana zimbatm ]; + platforms = platforms.linux; }; } From 3338985aab3af2793a2b81473ee98d292a1ed806 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sat, 14 Oct 2017 00:28:39 +0200 Subject: [PATCH 1445/2806] nixos/munin: Create MUNIN_PLUGSTATE dir to fix munin_stats plugin --- nixos/modules/services/monitoring/munin.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 723b04dc0fe..0ec201a0eb1 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -193,6 +193,9 @@ in }; }; + # munin_stats plugin breaks as of 2.0.33 when this doesn't exist + systemd.tmpfiles.rules = [ "d /var/run/munin 0755 munin munin -" ]; + }) (mkIf cronCfg.enable { systemd.timers.munin-cron = { From 43f94ff5a9bba9608b078e3ff9c74d66d3ab01f1 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sat, 14 Oct 2017 00:38:32 +0200 Subject: [PATCH 1446/2806] nixos/munin: move munin-cron to systemd.tmpfiles to match with munin-node. --- nixos/modules/services/monitoring/munin.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 0ec201a0eb1..cc6d51f0ef1 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -215,9 +215,11 @@ in }; }; - system.activationScripts.munin-cron = stringAfter [ "users" "groups" ] '' - mkdir -p /var/{run,log,www,lib}/munin - chown -R munin:munin /var/{run,log,www,lib}/munin - ''; + systemd.tmpfiles.rules = [ + "d /var/run/munin 0755 munin munin -" + "d /var/log/munin 0755 munin munin -" + "d /var/www/munin 0755 munin munin -" + "d /var/lib/munin 0755 munin munin -" + ]; })]; } From 8870d1a67da3c70dd37448d2e3190696f560a3bf Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sat, 21 Oct 2017 14:22:52 +1300 Subject: [PATCH 1447/2806] r-modules: Fix a number of popular R packages The R V8 package still depends on V8 3.14 so this is also included. --- pkgs/development/libraries/v8/3.14.nix | 86 +++++++++++++++++++++ pkgs/development/r-modules/default.nix | 102 +++++++++++++++++++++++-- pkgs/top-level/all-packages.nix | 7 ++ 3 files changed, 188 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/v8/3.14.nix diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix new file mode 100644 index 00000000000..9112079a90e --- /dev/null +++ b/pkgs/development/libraries/v8/3.14.nix @@ -0,0 +1,86 @@ +# This old version of V8 is still needed for the R V8 module +{ stdenv, callPackage, fetchFromGitHub, gyp, readline, python, which, icu, ... }: + +assert readline != null; + +with stdenv.lib; +let + version = "3.14.5.10"; + sha256 = "08vhl84166x13b3cbx8y0g99yqx772zd33gawsa1nxqkyrykql6k"; + + arch = if stdenv.is64bit then "x64" else "ia32"; + +in +stdenv.mkDerivation rec { + name = "v8-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = "${version}"; + inherit sha256; + }; + patchPhase = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 + sed -i 's,#!/usr/bin/python,#!${python}/bin/python,' build/gyp_v8 + ''; + + configurePhase = '' + PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ + build/gyp_v8 \ + -f make \ + --generator-output="out" \ + -Dflock_index=0 \ + -Dv8_enable_i18n_support=1 \ + -Duse_system_icu=1 \ + -Dconsole=readline \ + -Dcomponent=shared_library \ + -Dv8_target_arch=${arch} + ''; + + nativeBuildInputs = [ which ]; + buildInputs = [ readline python icu ]; + + # http://code.google.com/p/v8/issues/detail?id=2149 + NIX_CFLAGS_COMPILE = concatStringsSep " " [ + "-Wno-error=strict-overflow" + "-Wno-unused-local-typedefs" + "-Wno-aggressive-loop-optimizations" + ]; + + buildFlags = [ + "LINK=g++" + "-C out" + "builddir=$(CURDIR)/Release" + "BUILDTYPE=Release" + ]; + + postPatch = stdenv.lib.optionalString (!stdenv.cc.isClang) '' + sed -i build/standalone.gyp -e 's,-Wno-format-pedantic,,g' + ''; + + enableParallelBuilding = true; + + installPhase = '' + install -vD out/Release/d8 "$out/bin/d8" + ${if stdenv.system == "x86_64-darwin" then '' + install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" + '' else '' + install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" + ''} + cp -vr include "$out/" + ''; + + postFixup = if stdenv.isDarwin then '' + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + '' else null; + + meta = with stdenv.lib; { + description = "Google's open source JavaScript engine"; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 3de25dd1478..7629e28dfd5 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -253,6 +253,7 @@ let fftwtools = [ pkgs.fftw.dev ]; Formula = [ pkgs.gmp ]; geoCount = [ pkgs.gsl_1 ]; + gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; git2r = [ pkgs.zlib.dev pkgs.openssl.dev ]; GLAD = [ pkgs.gsl_1 ]; glpkAPI = [ pkgs.gmp pkgs.glpk ]; @@ -260,32 +261,37 @@ let graphscan = [ pkgs.gsl_1 ]; gsl = [ pkgs.gsl_1 ]; h5 = [ pkgs.hdf5-cpp pkgs.which ]; + haven = [ pkgs.libiconv ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; imager = [ pkgs.x11 ]; iBMQ = [ pkgs.gsl_1 ]; - igraph = [ pkgs.gmp ]; + igraph = [ pkgs.gmp pkgs.libxml2.dev ]; JavaGD = [ pkgs.jdk ]; jpeg = [ pkgs.libjpeg.dev ]; KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; libamtrack = [ pkgs.gsl_1 ]; + magick = [ pkgs.imagemagick.dev ]; mixcat = [ pkgs.gsl_1 ]; mvabund = [ pkgs.gsl_1 ]; mwaved = [ pkgs.fftw.dev ]; ncdf4 = [ pkgs.netcdf ]; nloptr = [ pkgs.nlopt ]; - openssl = [ pkgs.openssl.dev ]; + odbc = [ pkgs.unixODBC ]; + openssl = [ pkgs.openssl pkgs.openssl.dev ]; outbreaker = [ pkgs.gsl_1 ]; pander = [ pkgs.pandoc pkgs.which ]; pbdMPI = [ pkgs.openmpi ]; pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; pbdZMQ = [ pkgs.which ]; + pdftools = [ pkgs.poppler.dev ]; PKI = [ pkgs.openssl.dev ]; png = [ pkgs.libpng.dev ]; PopGenome = [ pkgs.zlib.dev ]; proj4 = [ pkgs.proj ]; + protolite = [ pkgs.protobuf ]; qtbase = [ pkgs.qt4 ]; qtpaint = [ pkgs.qt4 ]; R2GUESS = [ pkgs.gsl_1 ]; @@ -293,6 +299,7 @@ let RAppArmor = [ pkgs.libapparmor ]; rapportools = [ pkgs.which ]; rapport = [ pkgs.which ]; + readxl = [ pkgs.libiconv ]; rbamtools = [ pkgs.zlib.dev ]; rcdd = [ pkgs.gmp.dev ]; RcppCNPy = [ pkgs.zlib.dev ]; @@ -315,14 +322,15 @@ let rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.mysql.lib ]; + RMySQL = [ pkgs.zlib pkgs.mysql.lib pkgs.mariadb pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; + rpanel = [ pkgs.bwidget ]; rpg = [ pkgs.postgresql ]; rphast = [ pkgs.pcre.dev pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; Rpoppler = [ pkgs.poppler ]; - RPostgreSQL = [ pkgs.postgresql ]; + RPostgreSQL = [ pkgs.postgresql pkgs.postgresql ]; RProtoBuf = [ pkgs.protobuf ]; rPython = [ pkgs.python ]; RSclient = [ pkgs.openssl.dev ]; @@ -331,6 +339,7 @@ let rtfbs = [ pkgs.zlib pkgs.pcre.dev pkgs.bzip2 pkgs.gzip pkgs.readline ]; rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; + RSymphony = [ pkgs.symphony ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; rzmq = [ pkgs.zeromq3 ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; @@ -338,6 +347,7 @@ let seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; seqinr = [ pkgs.zlib.dev ]; seqminer = [ pkgs.zlib.dev pkgs.bzip2 ]; + sf = [ pkgs.gdal pkgs.proj pkgs.geos ]; showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ]; simplexreg = [ pkgs.gsl_1 ]; SOD = [ pkgs.opencl-headers ]; @@ -349,12 +359,13 @@ let survSNP = [ pkgs.gsl_1 ]; sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ]; TAQMNGR = [ pkgs.zlib.dev ]; + tesseract = [ pkgs.tesseract pkgs.leptonica ]; tiff = [ pkgs.libtiff.dev ]; TKF = [ pkgs.gsl_1 ]; tkrplot = [ pkgs.xorg.libX11 pkgs.tk.dev ]; topicmodels = [ pkgs.gsl_1 ]; udunits2 = [ pkgs.udunits pkgs.expat ]; - V8 = [ pkgs.v8 ]; + V8 = [ pkgs.v8_3_14 ]; VBLPCM = [ pkgs.gsl_1 ]; VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ]; WhopGenome = [ pkgs.zlib.dev ]; @@ -401,12 +412,20 @@ let chebpol = [ pkgs.pkgconfig ]; fftw = [ pkgs.pkgconfig ]; geoCount = [ pkgs.pkgconfig ]; + gdtools = [ pkgs.pkgconfig ]; kza = [ pkgs.pkgconfig ]; + magick = [ pkgs.pkgconfig ]; mwaved = [ pkgs.pkgconfig ]; + odbc = [ pkgs.pkgconfig ]; + openssl = [ pkgs.pkgconfig ]; + pdftools = [ pkgs.pkgconfig ]; + sf = [ pkgs.pkgconfig ]; showtext = [ pkgs.pkgconfig ]; spate = [ pkgs.pkgconfig ]; stringi = [ pkgs.pkgconfig ]; + sys = [ pkgs.libapparmor ]; sysfonts = [ pkgs.pkgconfig ]; + tesseract = [ pkgs.pkgconfig ]; Cairo = [ pkgs.pkgconfig ]; Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; qtutils = [ pkgs.qt4 ]; @@ -782,8 +801,10 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - patches = [ ./patches/RMySQL.patch ]; MYSQL_DIR="${pkgs.mysql.lib}"; + preConfigure = '' + patchShebangs configure + ''; }); devEMF = old.devEMF.overrideDerivation (attrs: { @@ -818,6 +839,9 @@ let openssl = old.openssl.overrideDerivation (attrs: { OPENSSL_INCLUDES = "${pkgs.openssl.dev}/include"; + preConfigure = '' + sed -i.bak 's|^\( *PKG_LIBS_VERSIONED=\).*$|\1$PKG_LIBS|' configure + ''; }); Rserve = old.Rserve.overrideDerivation (attrs: { @@ -835,7 +859,71 @@ let }); V8 = old.V8.overrideDerivation (attrs: { - preConfigure = "export V8_INCLUDES=${pkgs.v8}/include"; + preConfigure = '' + export INCLUDE_DIR=${pkgs.v8_3_14}/include + export LIB_DIR=${pkgs.v8_3_14}/lib + patchShebangs configure + ''; + }); + + acs = old.acs.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + gdtools = old.gdtools.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + NIX_LDFLAGS = "-lfontconfig -lfreetype"; + }); + + magick = old.magick.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + protolite = old.protolite.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + rpanel = old.rpanel.overrideDerivation (attrs: { + preConfigure = '' + export TCLLIBPATH="${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}" + ''; + TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"; + }); + + OpenMx = old.OpenMx.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + odbc = old.odbc.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + x13binary = old.x13binary.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + geojsonio = old.geojsonio.overrideDerivation (attrs: { + preConfigure = '' + export SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt + ''; + }); + + rstan = old.rstan.overrideDerivation (attrs: { + NIX_CFLAGS_COMPILE = "${attrs.NIX_CFLAGS_COMPILE} -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION"; }); }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c38ee66735e..b5174e360bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10858,6 +10858,13 @@ with pkgs; gnutls = gnutls; }); + # 3.14 is needed for R V8 module in ../development/r-modules/default.nix + v8_3_14 = callPackage ../development/libraries/v8/3.14.nix { + inherit (python2Packages) python gyp; + cctools = darwin.cctools; + stdenv = overrideCC stdenv gcc5; + }; + v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (python2Packages) python gyp; cctools = darwin.cctools; From 2d8b952786b7352ca9c454eec1df0df26a41b1e7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 20 Oct 2017 17:32:30 +0200 Subject: [PATCH 1448/2806] gns3Packages.{server,gui}Preview: 2.1.0rc2 -> 2.1.0rc3 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 5aa1649ff5f..bee3062a5a2 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.0.3"; - previewVersion = "2.1.0rc2"; + previewVersion = "2.1.0rc3"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -16,7 +16,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "1frfhys5s5lnqzk216y3wj2pli5g3b5imfzcmddxdcibksx13i17"; + sha256Hash = "0yc5lr01xb7lk4dsrwx79mimbr91vldpvqbrx37j3kym6p5m84cn"; }; serverStable = mkServer { @@ -25,6 +25,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "0vm4hir8yqj7xhykgg3x5rv1nj1qq6sg19sjj7r5w60brrlsw7v9"; + sha256Hash = "1lac88d9cmlhrwmlvxv1sk86600rwznw3lpsm440bax6qbdfcis3"; }; } From bb6629977d05ed0db0ac98e993d2be9e49514fb3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Oct 2017 07:51:10 +0000 Subject: [PATCH 1449/2806] ocamlPackages.zed: 1.4 -> 1.5 --- .../development/ocaml-modules/zed/default.nix | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 72ff8e4c049..85977792b4d 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, jbuilder }: -stdenv.mkDerivation rec { - version = "1.4"; +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then + { + version = "1.5"; + sha256 = "1nq884cxl1k4daa549bk7bxarwivbpp51k4blbiwyxwfhs29xgfr"; + buildInputs = [ jbuilder ]; + extra = { + buildPhase = "jbuilder build -p zed"; + inherit (jbuilder) installPhase; }; + } else { + version = "1.4"; + sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; + buildInputs = []; + extra = { createFindlibDestdir = true; }; + } +; in + +stdenv.mkDerivation (rec { + inherit (param) version; name = "ocaml-zed-${version}"; src = fetchzip { url = "https://github.com/diml/zed/archive/${version}.tar.gz"; - sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild react ]; + buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs; - propagatedBuildInputs = [ camomile ]; - - createFindlibDestdir = true; + propagatedBuildInputs = [ react camomile ]; meta = { description = "Abstract engine for text edition in OCaml"; @@ -31,4 +46,4 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.gal_bolle ]; }; -} +} // param.extra) From 2f540c31a2f0af391483ed9b1f8d0c9701f6f2fc Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sat, 21 Oct 2017 10:14:21 +0100 Subject: [PATCH 1450/2806] Added joncojonathan to maintainers Motivation for change: I'm working on things more, so figured it was wise. --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 832e22bf031..4bb12dcfcc8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -301,6 +301,7 @@ johnramsden = "John Ramsden "; joko = "Ioannis Koutras "; jonafato = "Jon Banafato "; + joncojonathan = "Jonathan Haddock "; jpierre03 = "Jean-Pierre PRUNARET "; jpotier = "Martin Potier "; jraygauthier = "Raymond Gauthier "; From d222538732761107c6f5674f312a15695b6c4166 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Sat, 21 Oct 2017 09:31:10 +0200 Subject: [PATCH 1451/2806] ghcjs: Do not mark as broken This has been fixed in #30214 --- pkgs/development/compilers/ghcjs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index aff9cd9711b..ff989ea22c4 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -2,5 +2,4 @@ bootPkgs.callPackage ./base.nix { inherit bootPkgs; - broken = true; # https://hydra.nixos.org/build/62184741 } From 5034e8a355e91edd794284f9f3ab77416a1ede89 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sat, 21 Oct 2017 08:43:49 +0100 Subject: [PATCH 1452/2806] keepass: 2.36 -> 2.37 Motivation for change: Upgrade to add new features / improvements as listed https://keepass.info/news/n171012_2.37.html. --- pkgs/applications/misc/keepass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index e36fbfa0f3f..49e4711550d 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,11 +8,11 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.36"; + version = "2.37"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "1j6qhy8h3z6higbpq3q9v04amvgbn90yj3kbsvj17azdkffkwzny"; + sha256 = "1wfbpfjng1blzkbjnxsdnny544297bm9869ianbr6l0hrvcgv3qx"; }; sourceRoot = "."; @@ -98,7 +98,7 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; homepage = http://www.keepass.info/; - maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ]; + maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; }; From 53f8adbc86a56275f81ff9ddfd4b826819b037b8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Oct 2017 12:41:36 +0000 Subject: [PATCH 1453/2806] ocamlPackages.omd: 1.3.0 -> 1.3.1 --- pkgs/development/ocaml-modules/omd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index 41d68cdc4c4..874893d6297 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-omd-1.3.0"; + name = "ocaml${ocaml.version}-omd-1.3.1"; src = fetchurl { - url = http://pw374.github.io/distrib/omd/omd-1.3.0.tar.gz; - sha256 = "0d0r6c4s3hq11d0qjc0bc1s84hz7k8nfg5q6g239as8myam4a80w"; + url = "https://github.com/Chris00/omd/releases/download/1.3.1/omd-1.3.1.tar.gz"; + sha256 = "1sgdgzpx96br7npj8mh91cli5mqmzsjpngwm7x4212n3k1d0ivwa"; }; buildInputs = [ ocaml findlib ocamlbuild ]; From 1f2d1ac92b4be88fceb64b4a0eee4847ce987826 Mon Sep 17 00:00:00 2001 From: dywedir Date: Sat, 21 Oct 2017 00:32:37 +0300 Subject: [PATCH 1454/2806] youtube-dl: 2017.10.01 -> 2017.10.20 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index dc5f6fb03c0..ccedec968e4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.10.01"; + version = "2017.10.20"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "047zinsczn6c96fzkarlb29y7sjwyh84nxlpfpa6mi4rn090wkqb"; + sha256 = "0npr8b1xg1dylz717kfllw433h1y16251npzch48lchq69bhm4iy"; }; nativeBuildInputs = [ makeWrapper ]; From c15c012e9fef20aa14ca6b3169704b5bae49b214 Mon Sep 17 00:00:00 2001 From: Rommel Martinez Date: Sat, 21 Oct 2017 10:20:53 +0800 Subject: [PATCH 1455/2806] pell: 0.0.1 -> 0.0.2 --- pkgs/applications/misc/pell/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix index f79d71ca250..ad2ab147340 100644 --- a/pkgs/applications/misc/pell/default.nix +++ b/pkgs/applications/misc/pell/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "pell"; - version = "0.0.1"; + version = "0.0.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; repo = pname; - rev = "3f95341eb9439c7a6be1f3c6366c0552ab8208f0"; - sha256 = "183aj3ys080g2kahl8x8rkhzlsb6h5ls9xm1v2kasfbn1pi5i6nn"; + rev = "ec14de0a9b666433954184167bf3b82cf21193f8"; + sha256 = "0r2gbb4l9rr5x99m62zicknsp1gf9fr124xpyd8ak9izr5hvskn9"; }; installPhase = '' @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/ebzzry/pell; - description = "A simple periodic host monitor using ping"; + description = "A simple host availability monitor"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; From a8b3029c66a2a7862d2745b5345abbc613d6e454 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 21 Oct 2017 00:00:33 +0200 Subject: [PATCH 1456/2806] tmuxinator: 0.9.0 -> 0.10.0 --- pkgs/tools/misc/tmuxinator/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 5bf7dd49143..b41f3890538 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "0.9.0"; - sha256 = "13p8rvf1naknjin1n97370ifyj475lyyh60cbw2v6gczi9rs84p3"; + version = "0.10.0"; + sha256 = "199pq15qknpcafw8ryb9kk1jsrwnncg6k5l9d4n0nmms4knxlqlf"; erubis = buildRubyGem rec { inherit ruby; @@ -27,7 +27,15 @@ buildRubyGem rec { sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; }; - propagatedBuildInputs = [ erubis thor ]; + xdg = buildRubyGem rec { + inherit ruby; + name = "ruby${ruby.version}-${gemName}-${version}"; + gemName = "xdg"; + version = "2.2.3"; + sha256 = "1bn47fdbwxqbdvjcfg86i32hmwm36k0xl876kb85f5da5v84lzmq"; + }; + + propagatedBuildInputs = [ erubis thor xdg ]; meta = with lib; { description = "Manage complex tmux sessions easily"; From c14403567ab394f718014f246d7a7fb4a740cd25 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 20 Oct 2017 23:38:33 +0200 Subject: [PATCH 1457/2806] rofi: 1.4.1 -> 1.4.2 --- pkgs/applications/misc/rofi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 1e8320d75a3..bdf14c03bcc 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.4.2"; name = "rofi-${version}"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz"; - sha256 = "19x11s71q24gjdnsjf1ar6raq1drav7qp3nzjkw8qajpgvjrxwcn"; + sha256 = "0ys7grazqz5hw3nx2393df54ykcd5gw0zn66kik5fvzijpg3qfcx"; }; preConfigure = '' From 2656237ac94971dd7c1b24f9ed1865095dc4908f Mon Sep 17 00:00:00 2001 From: Diego Zamboni Date: Thu, 19 Oct 2017 00:57:13 +0100 Subject: [PATCH 1458/2806] asciidoctor: 1.5.5 -> 1.5.6.1 --- pkgs/tools/typesetting/asciidoctor/Gemfile.lock | 4 ++-- pkgs/tools/typesetting/asciidoctor/gemset.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 34ed4a975a1..25800ed3a1c 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -5,7 +5,7 @@ GEM addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) afm (0.2.2) - asciidoctor (1.5.5) + asciidoctor (1.5.6.1) asciidoctor-bespoke (1.0.0.alpha.1) asciidoctor (>= 1.5.0) slim (~> 3.0.6) @@ -16,7 +16,7 @@ GEM asciidoctor (~> 1.5, >= 1.5.2) htmlentities (~> 4.3) opal (~> 0.6.3) - asciidoctor-pdf (1.5.0.alpha.13) + asciidoctor-pdf (1.5.0.alpha.16) asciidoctor (>= 1.5.0) prawn (>= 1.3.0, < 3.0.0) prawn-icon (= 1.2.0) diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index c436d6f9751..43011b22b76 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -26,10 +26,10 @@ asciidoctor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0kj2lls8f83nlhfkdkmbf7k5q9c9kk1cc15b1a4dy6arx4yzmvw7"; + sha256 = "c4371c419306d69152809eb896c291ca09969dc26ca34be36f4eab82914fceca"; type = "gem"; }; - version = "1.5.5"; + version = "1.5.6.1"; }; asciidoctor-bespoke = { source = { @@ -58,10 +58,10 @@ asciidoctor-pdf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0lp1q1yxy4y9k3znxxgj6pl0cbymz0yk5hsif73sg2bnpk62id9i"; + sha256 = "0f6b2a1533577dfba218de5dd886771447e4d1cb670b81d2c3bf3a180e6029a1"; type = "gem"; }; - version = "1.5.0.alpha.13"; + version = "1.5.0.alpha.16"; }; concurrent-ruby = { source = { @@ -287,4 +287,4 @@ }; version = "1.4.0"; }; -} \ No newline at end of file +} From f0a0f02b226be1f81bb6181d073ce3c2e59d8ee3 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Fri, 20 Oct 2017 15:02:15 +0400 Subject: [PATCH 1459/2806] chromium: 61.0.3163.100 -> 62.0.3202.62 Also updated most of patches according to their state in Gentoo repository, deleted ones that are not applicable anymore. --- .../networking/browsers/chromium/common.nix | 14 +-- .../chromium/patches/chromium-atk-r1.patch | 11 --- .../chromium/patches/chromium-gcc-r1.patch | 14 --- .../chromium/patches/chromium-gcc5-r1.patch | 66 ------------- .../chromium/patches/chromium-gcc5-r2.patch | 36 ------- .../chromium/patches/chromium-gcc5-r3.patch | 98 +++++++++++++++++++ .../chromium/patches/chromium-gcc5-r4.patch | 98 +++++++++++++++++++ .../patches/chromium-gn-bootstrap-r14.patch | 27 ----- .../patches/chromium-gn-bootstrap-r19.patch | 10 -- .../patches/chromium-sysroot-r1.patch | 14 --- .../chromium/patches/constexpr-fix.patch | 98 +++++++++++++++++++ .../browsers/chromium/upstream-info.nix | 18 ++-- 12 files changed, 306 insertions(+), 198 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f6f9a829c2d..63483b4da71 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -133,22 +133,14 @@ let # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags - ++ optionals (versionRange "61" "62") [ - ./patches/chromium-gn-bootstrap-r14.patch - ./patches/chromium-gcc-r1.patch - ./patches/chromium-atk-r1.patch - ./patches/chromium-gcc5-r1.patch - ] ++ optionals (versionRange "62" "63") [ ./patches/chromium-gn-bootstrap-r17.patch - ./patches/chromium-gcc5-r2.patch + ./patches/chromium-gcc5-r3.patch ./patches/chromium-glibc2.26-r1.patch ] ++ optionals (versionAtLeast version "63") [ - ./patches/chromium-gn-bootstrap-r19.patch - ./patches/chromium-gcc5-r2.patch - ./patches/chromium-glibc2.26-r1.patch - ./patches/chromium-sysroot-r1.patch + ./patches/chromium-gcc5-r4.patch + ./patches/constexpr-fix.patch ] ++ optional enableWideVine ./patches/widevine.patch; diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch deleted file mode 100644 index 602be1e3ba7..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000 -+++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000 -@@ -571,7 +571,7 @@ - // it's best to leave this out rather than break people's builds: - #if defined(ATK_CHECK_VERSION) - #if ATK_CHECK_VERSION(2, 16, 0) -- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY); -+ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY); - #endif - #endif - break; \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch deleted file mode 100644 index 036d57b601d..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h -index 99f230ce7e9a..de2415d402f5 100644 ---- a/base/numerics/safe_math_shared_impl.h -+++ b/base/numerics/safe_math_shared_impl.h -@@ -21,8 +21,7 @@ - #if !defined(__native_client__) && \ - ((defined(__clang__) && \ - ((__clang_major__ > 3) || \ -- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ -- (defined(__GNUC__) && __GNUC__ >= 5)) -+ (__clang_major__ == 3 && __clang_minor__ >= 4)))) - #include "base/numerics/safe_math_clang_gcc_impl.h" - #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) - #else \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch deleted file mode 100644 index 8d2886fbfa9..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/chrome/browser/devtools/devtools_file_system_indexer.cc -+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc -@@ -34,7 +34,6 @@ using base::TimeDelta; - using base::TimeTicks; - using content::BrowserThread; - using std::map; --using std::set; - using std::string; - using std::vector; - -@@ -191,7 +190,7 @@ vector Index::Search(const string& query) { - if (trigram != kUndefinedTrigram) - trigrams.push_back(trigram); - } -- set file_ids; -+ std::set file_ids; - bool first = true; - vector::const_iterator it = trigrams.begin(); - for (; it != trigrams.end(); ++it) { -@@ -203,7 +202,7 @@ vector Index::Search(const string& query) { - first = false; - continue; - } -- set intersection = base::STLSetIntersection >( -+ std::set intersection = base::STLSetIntersection >( - file_ids, index_[trigram]); - file_ids.swap(intersection); - } -diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -index 94bb9161ec85..e40c6387f72e 100644 ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include -+#include - #include - #include - \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch deleted file mode 100644 index f2be2d5b8ae..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include -+#include - #include - #include - diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch new file mode 100644 index 00000000000..7605df6b145 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch @@ -0,0 +1,98 @@ +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 ++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include ++#include + #include + #include + +--- a/gpu/ipc/common/mailbox_struct_traits.h ++++ b/gpu/ipc/common/mailbox_struct_traits.h +@@ -15,7 +15,7 @@ namespace mojo { + template <> + struct StructTraits { + static base::span name(const gpu::Mailbox& mailbox) { +- return mailbox.name; ++ return base::make_span(mailbox.name); + } + static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); + }; +--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h ++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h +@@ -134,7 +134,7 @@ struct StructTraits { + static base::span matrix(const cc::FilterOperation& operation) { + if (operation.type() != cc::FilterOperation::COLOR_MATRIX) + return base::span(); +- return operation.matrix(); ++ return base::make_span(operation.matrix()); + } + + static base::span shape( +--- a/services/viz/public/cpp/compositing/quads_struct_traits.h ++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h +@@ -284,7 +284,7 @@ + + static base::span vertex_opacity(const cc::DrawQuad& input) { + const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input); +- return quad->vertex_opacity; ++ return base::make_span(quad->vertex_opacity); + } + + static bool y_flipped(const cc::DrawQuad& input) { +--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp ++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp +@@ -480,7 +480,7 @@ WebString AccessControlErrorString( + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch new file mode 100644 index 00000000000..cb978d58a06 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch @@ -0,0 +1,98 @@ +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 ++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include ++#include + #include + #include + +--- a/gpu/ipc/common/mailbox_struct_traits.h ++++ b/gpu/ipc/common/mailbox_struct_traits.h +@@ -15,7 +15,7 @@ namespace mojo { + template <> + struct StructTraits { + static base::span name(const gpu::Mailbox& mailbox) { +- return mailbox.name; ++ return base::make_span(mailbox.name); + } + static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); + }; +--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h ++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h +@@ -134,7 +134,7 @@ struct StructTraits { + static base::span matrix(const cc::FilterOperation& operation) { + if (operation.type() != cc::FilterOperation::COLOR_MATRIX) + return base::span(); +- return operation.matrix(); ++ return base::make_span(operation.matrix()); + } + + static base::span shape( +--- a/services/viz/public/cpp/compositing/quads_struct_traits.h ++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h +@@ -303,7 +303,7 @@ struct StructTraits { + static base::span vertex_opacity(const viz::DrawQuad& input) { + const viz::TextureDrawQuad* quad = + viz::TextureDrawQuad::MaterialCast(&input); +- return quad->vertex_opacity; ++ return base::make_span(quad->vertex_opacity); + } + + static bool y_flipped(const viz::DrawQuad& input) { +--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp ++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp +@@ -480,7 +480,7 @@ WebString AccessControlErrorString( + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch deleted file mode 100644 index 62426715366..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685 -Author: Pawel Hajdan, Jr -Date: Wed Jul 26 21:51:54 2017 +0000 - - wip - -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 1390560f8e37..ff2ae57c46b0 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/metrics/histogram_base.cc', - 'base/metrics/histogram_functions.cc', - 'base/metrics/histogram_samples.cc', -+ 'base/metrics/histogram_snapshot_manager.cc', - 'base/metrics/metrics_hashes.cc', - 'base/metrics/persistent_histogram_allocator.cc', - 'base/metrics/persistent_memory_allocator.cc', -@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/trace_event/heap_profiler_allocation_context_tracker.cc', - 'base/trace_event/heap_profiler_allocation_register.cc', - 'base/trace_event/heap_profiler_event_filter.cc', -- 'base/trace_event/heap_profiler_event_writer.cc', -+ 'base/trace_event/heap_profiler_heap_dump_writer.cc', - 'base/trace_event/heap_profiler_serialization_state.cc', - 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', - 'base/trace_event/heap_profiler_type_name_deduplicator.cc', \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch deleted file mode 100644 index 999fdb7eda7..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -576,7 +576,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/trace_event/trace_log.cc', - 'base/trace_event/trace_log_constants.cc', - 'base/trace_event/tracing_agent.cc', -- 'base/tracked_objects.cc', - 'base/unguessable_token.cc', - 'base/value_iterators.cc', - 'base/values.cc', diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch deleted file mode 100644 index b5ff0d8cba1..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/chrome/installer/BUILD.gn -+++ b/chrome/installer/BUILD.gn -@@ -3,9 +3,10 @@ - # found in the LICENSE file. - - import("//build/config/chrome_build.gni") -+import("//build/config/sysroot.gni") - - declare_args() { -- enable_linux_installer = is_linux && !is_component_build -+ enable_linux_installer = is_linux && !is_component_build && use_sysroot - } - - # Meta-target that forwards to the installer of the correct type (if any). diff --git a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch new file mode 100644 index 00000000000..9f187752ea6 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch @@ -0,0 +1,98 @@ +From aab2cc3a20af9ebe9ddb8dfd15089f131f95817f Mon Sep 17 00:00:00 2001 +From: Tomas Popela +Date: Fri, 20 Oct 2017 14:06:42 +0200 +Subject: [PATCH] Fix the build of base/numerics with GCC + +Initialize the uninitialized variables where the build is failing. + +BUG=776705 + +Change-Id: I5782e18086a752b3676f8738930bf0553f3f97ad +--- + base/numerics/checked_math_impl.h | 6 +++--- + base/numerics/clamped_math_impl.h | 10 +++++----- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h +index 2926b37b5e..e083389ebf 100644 +--- a/base/numerics/checked_math_impl.h ++++ b/base/numerics/checked_math_impl.h +@@ -67,7 +67,7 @@ struct CheckedAddOp::value) { + presult = static_cast(x) + static_cast(y); +@@ -127,7 +127,7 @@ struct CheckedSubOp::value) { + presult = static_cast(x) - static_cast(y); +@@ -183,7 +183,7 @@ struct CheckedMulOp::is_supported) { + // The fast op may be available with the promoted type. +diff --git a/base/numerics/clamped_math_impl.h b/base/numerics/clamped_math_impl.h +index 7b5e4346f2..303a7e945a 100644 +--- a/base/numerics/clamped_math_impl.h ++++ b/base/numerics/clamped_math_impl.h +@@ -87,7 +87,7 @@ struct ClampedAddOp(IsValueNegative(y)); +- V result; ++ V result = {}; + return BASE_NUMERICS_LIKELY((CheckedAddOp::Do(x, y, &result))) + ? result + : saturated; +@@ -114,7 +114,7 @@ struct ClampedSubOp(!IsValueNegative(y)); +- V result; ++ V result = {}; + return BASE_NUMERICS_LIKELY((CheckedSubOp::Do(x, y, &result))) + ? result + : saturated; +@@ -136,7 +136,7 @@ struct ClampedMulOp::is_supported) + return ClampedMulFastOp::template Do(x, y); + +- V result; ++ V result = {}; + const V saturated = + CommonMaxOrMin(IsValueNegative(x) ^ IsValueNegative(y)); + return BASE_NUMERICS_LIKELY((CheckedMulOp::Do(x, y, &result))) +@@ -156,7 +156,7 @@ struct ClampedDivOp::type; + template + static constexpr V Do(T x, U y) { +- V result; ++ V result = {}; + if (BASE_NUMERICS_LIKELY((CheckedDivOp::Do(x, y, &result)))) + return result; + // Saturation goes to max, min, or NaN (if x is zero). +@@ -176,7 +176,7 @@ struct ClampedModOp::type; + template + static constexpr V Do(T x, U y) { +- V result; ++ V result = {}; + return BASE_NUMERICS_LIKELY((CheckedModOp::Do(x, y, &result))) + ? result + : x; +-- +2.14.2 + diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index af4c30b431f..5fe20b9a981 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 = "0c8qn2i7iygl3kgrdwwd8h3l5j8hg66dw99qgr618cgca1b4im68"; - sha256bin64 = "04mfg18zpx19ha0mrlwx2aabn0vhl08n9c60hazivmw99pzlg8dn"; - version = "62.0.3202.29"; + sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; + sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq"; + version = "62.0.3202.62"; }; dev = { - sha256 = "1zd7rid626fglbyrp7c6517jldhgfk3vjn357vhlhy6pgj1ydrrn"; - sha256bin64 = "0hqb5prf0ags4bnla6skyi5vmkrazhd8n3ri4ijhbqjbb536bfpb"; - version = "63.0.3218.0"; + sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb"; + sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv"; + version = "63.0.3239.9"; }; stable = { - sha256 = "06r89jim9cq87668ya8wwk69hh17rl04cj94nb9c28v6mj69cda1"; - sha256bin64 = "1cm9snw29nkzq4bafqgi6fd0gqcc3jp60y6vfsrf9k4dvdard2sv"; - version = "61.0.3163.100"; + sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; + sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq"; + version = "62.0.3202.62"; }; } From ab4f4f8baa91e406d18263b7b97eae45e8738276 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sat, 21 Oct 2017 15:14:50 +0200 Subject: [PATCH 1460/2806] et: 2017-03-04 -> 0.1 --- pkgs/applications/misc/et/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index 4a77423bea8..40631b0a0db 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -2,23 +2,18 @@ stdenv.mkDerivation rec { name = "et-${version}"; - version = "2017-03-04"; + version = "0.1"; src = fetchFromGitHub { owner = "geistesk"; repo = "et"; - rev = "151e9b6bc0d2d4f45bda8ced740ee99d0f2012f6"; - sha256 = "1a1jdnzmal05k506bbvzlwsj2f3kql6l5xc1gdabm79y6vaf4r7s"; + rev = "${version}"; + sha256 = "1d2hq6p1y2ynk0a3l35lwbm1fcl9kg7rpjcin8bx4xcdpbw42y94"; }; buildInputs = [ libnotify gdk_pixbuf ]; nativeBuildInputs = [ pkgconfig ]; - prePatch = '' - substituteInPlace Makefile \ - --replace ' = gcc' ' ?= gcc' - ''; - installPhase = '' mkdir -p $out/bin cp et $out/bin @@ -26,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Minimal libnotify-based (egg) timer for GNU/Linux"; + description = "Minimal libnotify-based (egg) timer"; homepage = https://github.com/geistesk/et; license = licenses.gpl3; platforms = platforms.unix; From a86fe917b947acf18cf8c630c55f877389fa6fad Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 21 Oct 2017 17:11:02 +0300 Subject: [PATCH 1461/2806] bazel_0_4: try to fix on Darwin First round of fixes -- let's see how Hydra reacts. --- pkgs/development/tools/build-managers/bazel/0.4.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index 0b25623511a..870882a84cc 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -38,6 +38,13 @@ stdenv.mkDerivation rec { for f in $(grep -l -r '/usr/bin/env'); do substituteInPlace "$f" --replace '/usr/bin/env' '${coreutils}/bin/env' done + '' + lib.optionalString stdenv.isDarwin '' + sed -i 's,/usr/bin/xcrun clang,clang,g' \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + src/tools/xcode/xcrunwrapper/xcrunwrapper.sh + sed -i 's/"xcrun", "clang"/"clang"/g' tools/osx/xcode_configure.bzl ''; buildInputs = [ From 0ce09afcfa092e5ddb462023d0cbc9424a70c4b6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 21 Oct 2017 18:21:52 +0300 Subject: [PATCH 1462/2806] bazel_0_4: additonal fix for Darwin --- pkgs/development/tools/build-managers/bazel/0.4.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index 870882a84cc..f8c1f01d446 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { src/tools/xcode/realpath/BUILD \ src/tools/xcode/stdredirect/BUILD \ src/tools/xcode/xcrunwrapper/xcrunwrapper.sh + sed -i 's,/usr/bin/xcrun "''${TOOLNAME}","''${TOOLNAME}",g' \ + src/tools/xcode/xcrunwrapper/xcrunwrapper.sh sed -i 's/"xcrun", "clang"/"clang"/g' tools/osx/xcode_configure.bzl ''; From 2d7705f8d4a91a8735041268f972a7bc8d05f48b Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sat, 21 Oct 2017 18:09:06 +0200 Subject: [PATCH 1463/2806] haskellPackages.amqp-utils: fix dependencies --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ba5ef0348ab..a439edecf0d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -969,4 +969,8 @@ self: super: { # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; + # depends on amqp >= 0.17 + amqp-utils = super.amqp-utils.override { + amqp = dontCheck super.amqp_0_18_1; + }; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f7a3019d3ea..7e286926af0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2850,7 +2850,6 @@ dont-distribute-packages: AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - amqp-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] analyze-client: [ i686-linux, x86_64-linux, x86_64-darwin ] anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ] From 835201e8141f16167ef02ca62335e65d7042a673 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 19 Oct 2017 23:51:45 -0400 Subject: [PATCH 1464/2806] zig: init at 0.1.1 --- pkgs/development/compilers/zig/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/zig/default.nix diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix new file mode 100644 index 00000000000..6f0c6d19e45 --- /dev/null +++ b/pkgs/development/compilers/zig/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, llvmPackages_5, llvm_5 }: + +stdenv.mkDerivation rec { + version = "0.1.1"; + name = "zig-${version}"; + + src = fetchFromGitHub { + owner = "zig-lang"; + repo = "zig"; + rev = "${version}"; + sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; + }; + + buildInputs = [ cmake llvmPackages_5.clang-unwrapped llvm_5 ]; + + cmakeFlags = [ + "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" + "-DZIG_LIBC_LIB_DIR=${stdenv.cc.libc}/lib" + "-DCMAKE_BUILD_TYPE=Release" + "-DZIG_EACH_LIB_RPATH=On" + ]; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o)) -DZIG_DYNAMIC_LINKER=$(cc -print-file-name=ld-linux-x86-64.so.2)" + ''; + + meta = with stdenv.lib; { + description = "Programming languaged designed for robustness, optimality, and clarity"; + homepage = http://ziglang.org/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.andrewrk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bef03ff836..0d39ff0d8e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7717,7 +7717,6 @@ with pkgs; inherit (python3Packages) fetchPypi buildPythonApplication lxml typed-ast; }; - ### DEVELOPMENT / LIBRARIES a52dec = callPackage ../development/libraries/a52dec { }; @@ -11098,6 +11097,8 @@ with pkgs; czmq = czmq3; }; + zig = callPackage ../development/compilers/zig {}; + zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; From b023332cdf99c3591dc5b0b5912987cc8921f1cd Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 21 Oct 2017 19:17:28 +0200 Subject: [PATCH 1465/2806] librepo: 1.7.20 -> 1.8.1 --- pkgs/tools/package-management/librepo/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 99a5013e217..622d095d461 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,21 +1,16 @@ { stdenv, fetchFromGitHub, cmake, python2, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }: stdenv.mkDerivation rec { - version = "1.7.20"; + version = "1.8.1"; name = "librepo-${version}"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "librepo"; - rev = name; - sha256 = "17fgj2wifn2qxmh1p285fbwys0xbvwbnmxsdfvqyr5njpyl2s99h"; + rev = version; + sha256 = "11rypnxjgsc2klyg294ndxy1cyp0nyk00zpjhcvqkhp58vvkkv12"; }; - patchPhase = '' - substituteInPlace librepo/python/python2/CMakeLists.txt \ - --replace ' ''${PYTHON_INSTALL_DIR}' " $out/lib/python2.7/site-packages" - ''; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python2 expat glib pcre openssl curl check attr gpgme ]; @@ -25,9 +20,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; + homepage = https://rpm-software-management.github.io/librepo/; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; }; } - From 4c449e03b72ce44cd60bea6731d9c28a022119b4 Mon Sep 17 00:00:00 2001 From: Daniel Kuehn Date: Mon, 2 Oct 2017 16:55:26 +0200 Subject: [PATCH 1466/2806] sudo: Add optional dependency to SSSD, enabled by setting withSssd to true --- pkgs/tools/security/sudo/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 6f662206350..1b32ad71007 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, coreutils, pam, groff +{ stdenv, fetchurl, coreutils, pam, groff, sssd , sendmailPath ? "/run/wrappers/bin/sendmail" , withInsults ? false +, withSssd ? false }: stdenv.mkDerivation rec { @@ -30,6 +31,9 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional withInsults [ "--with-insults" "--with-all-insults" + ] ++ stdenv.lib.optional withSssd [ + "--with-sssd" + "--with-sssd-lib=${sssd}/lib" ]; configureFlagsArray = [ From eafcfaf62c103604cf6bde9d38b54b9426d0244e Mon Sep 17 00:00:00 2001 From: Daniel Kuehn Date: Mon, 2 Oct 2017 16:57:17 +0200 Subject: [PATCH 1467/2806] sssd: Add optional bindings for building sssd library that sudo can use to fetch sudoers rules from SSSD --- pkgs/os-specific/linux/sssd/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index ea49f9e4029..834476da0ca 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -3,7 +3,8 @@ python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, docbook_xml_xslt, ldap, systemd, nspr, check, cmocka, uid_wrapper, - nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson }: + nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson + , withSudo ? false }: let docbookFiles = "${pkgs.docbook_xml_xslt}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; @@ -41,6 +42,8 @@ stdenv.mkDerivation rec { --with-ldb-lib-dir=$out/modules/ldb --with-nscd=${glibc.bin}/sbin/nscd ) + '' + stdenv.lib.optionalString withSudo '' + configureFlagsArray+=("--with-sudo") ''; enableParallelBuilding = true; From a1d6716252ff73d2738bbc91fccf0c3ba60a1461 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 21 Oct 2017 18:15:47 +0200 Subject: [PATCH 1468/2806] putty: 0.67 -> 0.70 + use stable src URL and add a mirror --- .../networking/remote/putty/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 6b765a0c9f1..4c1ddcef5cc 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, ncurses, gtk2, pkgconfig, autoconf, automake, perl, halibut, libtool }: +{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool +, gtk2, halibut, ncurses, perl }: stdenv.mkDerivation rec { - version = "0.67"; + version = "0.70"; name = "putty-${version}"; src = fetchurl { - url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz"; - sha256 = "0isak6dy5vmfzf9ckcq6jvhgrn3xfmfcmziaa7g2jqm4x1c286c0"; + urls = [ + "https://the.earth.li/~sgtatham/putty/${version}/${name}.tar.gz" + "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${name}.tar.gz" + ]; + sha256 = "1gmhwwj1y7b5hgkrkxpf4jddjpk9l5832zq5ibhsiicndsfs92mv"; }; preConfigure = '' @@ -19,8 +23,9 @@ stdenv.mkDerivation rec { cd unix ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 ncurses autoconf automake perl halibut libtool ]; + nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; + buildInputs = [ gtk2 ncurses ]; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A Free Telnet/SSH Client"; From a0221824fbaa2af305680fc12a630c1a78d99071 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 21 Oct 2017 21:35:07 +0200 Subject: [PATCH 1469/2806] nvme-cli: 0.9 -> 1.4 --- pkgs/os-specific/linux/nvme-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 94fc9ca05e7..7912c67aa0b 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 = "0.9"; + version = "1.4"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "16n0gg1zx4fgadcq94kx6bgysqw60jvybjwynk7mj3fzdbvzrqyh"; + sha256 = "00jrr1mya9wkapiapph3nch3kpqas6vlc8kl8dbrjjfb5hg35gqf"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; description = "NVM-Express user space tooling for Linux"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ tavyc ]; + maintainers = with maintainers; [ primeos tavyc ]; }; } From 57b27f2867758110e03911a2821194735f537062 Mon Sep 17 00:00:00 2001 From: Jacob Mitchell Date: Sat, 21 Oct 2017 13:34:39 -0700 Subject: [PATCH 1470/2806] vault: 0.8.1 -> 0.8.3 --- pkgs/tools/security/vault/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 7ca4d8bd1c1..bfb0dd11b8e 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,13 +9,13 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "19y688nvi0vr7cdnaa5sy2m65xicjwi5qgkgzyjvb7r3zb0dnli1"; + sha256 = "1dcmqbcdkj42614am2invb6wf8v29z4sp4d354a4d83rwhyb0qly"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; @@ -27,6 +27,8 @@ in stdenv.mkDerivation rec { mkdir -p src/github.com/hashicorp ln -s $(pwd) src/github.com/hashicorp/vault + mkdir -p .git/hooks + GOPATH=$(pwd) make ''; From 34621ab9cee8ad0c509e48f5dabeb62a43364da3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 21 Oct 2017 23:44:15 +0300 Subject: [PATCH 1471/2806] nixos/tests: Fix typo (grafama -> grafana) --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 3016b1ef944..d5f59a524e0 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -256,7 +256,7 @@ in rec { tests.gocd-server = callTest tests/gocd-server.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {}; - tests.grafama = callTest tests/grafana.nix {}; + tests.grafana = callTest tests/grafana.nix {}; tests.graphite = callTest tests/graphite.nix {}; tests.hardened = callTest tests/hardened.nix { }; tests.hibernate = callTest tests/hibernate.nix {}; From 2f3786e7ef1b246988136089b63d922f627aa7bc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 21 Oct 2017 23:45:37 +0300 Subject: [PATCH 1472/2806] nixos/tests/gitolite: Don't build during evaluation Noticed in https://hydra.nixos.org/jobset/nixos/release-17.09#tabs-errors: ```` hydra-eval-jobs returned exit code 1: building path(s) '/nix/store/wxcbjli7m98yymnxrxkf6pigr7a05zad-id_ed25519.pub' building '/nix/store/gyig2d7cry98647h0grfilq26cpc1wy8-id_ed25519.pub.drv'... ```` Issue #29774 --- nixos/tests/gitolite.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix index 643ea4ff03e..4b4e081acc5 100644 --- a/nixos/tests/gitolite.nix +++ b/nixos/tests/gitolite.nix @@ -11,7 +11,7 @@ let -----END OPENSSH PRIVATE KEY----- ''; - adminPublicKey = pkgs.writeText "id_ed25519.pub" '' + adminPublicKey = '' ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7urFhAA90BTpGuEHeWWTY3W/g9PBxXNxfWhfbrm4Le root@client ''; @@ -62,7 +62,7 @@ in { services.gitolite = { enable = true; - adminPubkey = builtins.readFile adminPublicKey; + adminPubkey = adminPublicKey; }; services.openssh.enable = true; }; From 18d286b6c9fb97434e8ef1a555fdc0b646335ef6 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Sat, 21 Oct 2017 22:29:45 +0100 Subject: [PATCH 1473/2806] plymouth: try to remove more references in themes --- nixos/modules/system/boot/plymouth.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index d45b1686c1e..595cb1a4f00 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -97,12 +97,26 @@ in moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)" mkdir -p $out/lib/plymouth/renderers - cp ${plymouth}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth + # module might come from a theme + cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers mkdir -p $out/share/plymouth/themes cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth - cp -r ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} $out/share/plymouth/themes + + # copy themes into working directory for patching + mkdir themes + # use -L to copy the directories proper, not the symlinks to them + cp -r -L ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} themes + + # patch out any attempted references to the theme or plymouth's themes directory + chmod -R +w themes + find themes -type f | while read file + do + sed -i "s,/nix/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file + done + + cp -r themes/* $out/share/plymouth/themes cp ${cfg.logo} $out/share/plymouth/logo.png ''; From d96b0ac7f78a5c2b676cc2b5f36a417021ad9188 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Sat, 21 Oct 2017 06:24:37 +0100 Subject: [PATCH 1474/2806] geoclue2: fix typo --- nixos/modules/services/desktops/geoclue2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index 0e041fdbfbc..c5a000d5c6a 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -17,7 +17,7 @@ with lib; default = false; description = '' Whether to enable GeoClue 2 daemon, a DBus service - that provides location informationfor accessing. + that provides location information for accessing. ''; }; From 2ac89a612c90378bb0acb4d9d939bf3f8822da42 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Sat, 21 Oct 2017 06:14:40 +0100 Subject: [PATCH 1475/2806] redshift: allow using geoclue2 loation provider --- nixos/modules/services/x11/redshift.nix | 44 +++++++++++++++++++++---- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 992709ed000..30d853841ea 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -19,18 +19,31 @@ in { }; latitude = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; description = '' Your current latitude, between - -90.0 and 90.0. + -90.0 and 90.0. Must be provided + along with longitude. ''; }; longitude = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; description = '' Your current longitude, between - between -180.0 and 180.0. + between -180.0 and 180.0. Must be + provided along with latitude. + ''; + }; + + provider = mkOption { + type = types.enum [ "manual" "geoclue2" ]; + default = "manual"; + description = '' + The location provider to use for determining your location. If set to + manual you must also provide latitude/longitude. ''; }; @@ -93,14 +106,33 @@ in { }; config = mkIf cfg.enable { - systemd.user.services.redshift = { + assertions = [ + { + assertion = + if cfg.provider == "manual" + then (cfg.latitude != null && cfg.longitude != null) + else (cfg.latitude == null && cfg.longitude == null); + message = "Latitude and longitude must be provided together, and with provider set to null."; + } + ]; + + services.geoclue2.enable = mkIf (cfg.provider == "geoclue2") true; + + systemd.user.services.redshift = + let + providerString = + if cfg.provider == "manual" + then "${cfg.latitude}:${cfg.longitude}" + else cfg.provider; + in + { description = "Redshift colour temperature adjuster"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; serviceConfig = { ExecStart = '' ${cfg.package}/bin/redshift \ - -l ${cfg.latitude}:${cfg.longitude} \ + -l ${providerString} \ -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \ -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \ ${lib.strings.concatStringsSep " " cfg.extraOptions} From e6a199b95d5bb24485c7b8eb7f2c51cadebaa558 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Sat, 21 Oct 2017 22:31:21 +0100 Subject: [PATCH 1476/2806] plasma5: set default theme for plymouth --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index d7e72c4a7ae..a9cff5c9c37 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -193,6 +193,11 @@ in theme = "breeze"; }; + boot.plymouth = { + theme = mkDefault "breeze"; + themePackages = mkDefault [ pkgs.breeze-plymouth ]; + }; + security.pam.services.kde = { allowNullPassword = true; }; # Doing these one by one seems silly, but we currently lack a better From 255130b3402af52612d98664894a9fbf957aefca Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 21 Oct 2017 23:57:45 +0200 Subject: [PATCH 1477/2806] bro: 2.5.1 -> 2.5.2 --- pkgs/applications/networking/ids/bro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index f3962811a8a..7ae3e8c7361 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -2,11 +2,11 @@ , geoip, gperftools, python, swig }: stdenv.mkDerivation rec { - name = "bro-2.5.1"; + name = "bro-2.5.2"; src = fetchurl { url = "http://www.bro.org/downloads/${name}.tar.gz"; - sha256 = "04cmm0vs8q31mgaq3pxybjk834py3ji16qp4qcir7vjbhq1fav1c"; + sha256 = "0w5rynw278nl6pdl5s7gsmxjwkl6z1g5pcm6byg930k26yyb35db"; }; nativeBuildInputs = [ cmake flex bison file ]; From c2709fe832bbaa714c6d97d7475a32ca34b1cc99 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sat, 21 Oct 2017 17:58:38 +0100 Subject: [PATCH 1478/2806] deja-dup: 36.1 -> 36.3 Motivation for change: Latest version which includes some bug fixes. --- pkgs/applications/backup/deja-dup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 4d3a9a385d6..c330aeb0092 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "deja-dup-${version}"; - version = "36.1"; + version = "36.3"; src = fetchurl { url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz"; - sha256 = "1s48k2sxrpwkzp37s4x7934lyg5194c47nv9ks15rksd5s0alnld"; + sha256 = "08pwybzp7ynfcf0vqxfc3p8ir4gnzcv4v4cq5bwidbff9crklhrc"; }; patches = [ @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ''; homepage = https://launchpad.net/deja-dup; license = with licenses; gpl3; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar joncojonathan ]; platforms = with platforms; linux; }; } From 26535474642aea4416b9565b3e4d50a94ef95b3a Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 21 Oct 2017 17:23:24 +0200 Subject: [PATCH 1479/2806] shaarli-material: 0.8.3 -> 0.9.1 --- pkgs/servers/web-apps/shaarli/material-theme.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index 369fecda47a..9831d7dabce 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "shaarli-material-${version}"; - version = "0.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "kalvn"; repo = "Shaarli-Material"; rev = "v${version}"; - sha256 = "0ivq35183r5vyzvf47sgxwdxllmvhd5w9w75xgyp3kbw2na4yrmr"; + sha256 = "0x8d9425n3jrwzsyxclbxfspvi91v1klq8r3m6wcj81kys7vmzgh"; }; patchPhase = '' From 6321999eaf3d6366ef49c72c980b2ca8ea2eff13 Mon Sep 17 00:00:00 2001 From: Heitham Omar Date: Sat, 21 Oct 2017 16:05:30 +0100 Subject: [PATCH 1480/2806] gnome-themes-standard: 3.22.1 -> 3.22.3 --- pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix index a5ccd23b9fc..dcda746c8dd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-themes-standard-3.22.1"; + name = "gnome-themes-standard-3.22.3"; src = fetchurl { - url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.1.tar.xz; - sha256 = "90f6f4e79eaa42e424fa35144cdbcb5db93db56e73200ac045742ba320febb54"; + url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.3.tar.xz; + sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"; }; } From 70f844a4200d03f7191cc96ae27f3499e253d187 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 21 Oct 2017 11:43:08 +0200 Subject: [PATCH 1481/2806] shaarli: 0.9.1 -> 0.9.2 --- pkgs/servers/web-apps/shaarli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 711b1282b80..a74221cfbd3 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "10arm3sm9dbzi97x1mjh46r5f6zii4f1w8nl0zfw3knbapab8xv5"; + sha256 = "07wn5pg7pkya8d4k2khp2jyvkdkmm5431fj1k0m1i5k65yyvfqzr"; }; outputs = [ "out" "doc" ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "The personal, minimalist, super-fast, database free, bookmarking service"; license = licenses.gpl3Plus; homepage = https://github.com/shaarli/Shaarli; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ schneefux ]; platforms = platforms.all; }; } From b6a2ff1e792e641316e8eac115feeb026ed57b22 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Oct 2017 00:02:40 +0200 Subject: [PATCH 1482/2806] homebank: 5.1.5 -> 5.1.6 --- 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 65a7c9730e9..1d90e8be282 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.5"; + name = "homebank-5.1.6"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "03rkl4bvi1cmb8rqyvmhxhg63bdmb3nzqa3firfimsbphm3x6gsw"; + sha256 = "1q4h890g6a6pm6kfiavbq9sbpsnap0f854sja2y5q3x0j0ay2q98"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; From 7d8e1c358bc9c41851f1862c72820e96eba8d20b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Oct 2017 00:04:56 +0200 Subject: [PATCH 1483/2806] zim: 0.67-rc2 -> 0.67 --- pkgs/applications/office/zim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 18c4514c4de..48b278cc1df 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python2Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.67-rc2"; + version = "0.67"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "0l4q2dfnvyn0jr1lggf8g7515q4z7qr1lnmy0lsyhjf477ldszqf"; + sha256 = "1gdbzy9qyzj3rn9fsl0ss7lbk9kyka99656bphx2dah694yyyz5k"; }; propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; From 941014ffff1bfe1e7e7379ba673755e336b9b418 Mon Sep 17 00:00:00 2001 From: Ryan Bernstein Date: Sat, 21 Oct 2017 16:20:41 -0400 Subject: [PATCH 1484/2806] bowtie2: init at 2.3.3.1 --- .../science/biology/bowtie2/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/science/biology/bowtie2/default.nix diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix new file mode 100644 index 00000000000..05a85cafedf --- /dev/null +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, zlib, tbb }: + +stdenv.mkDerivation rec { + pname = "bowtie2"; + version = "2.3.3.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "BenLangmead"; + repo = pname; + rev = "v${version}"; + sha256 = "1pcyks76bnnkq6h0gqjw4fkdddjjnw7k5ibim7ajkbvfw58a99y0"; + }; + + buildInputs = [ zlib tbb ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; + license = licenses.gpl3; + homepage = http://bowtie-bio.sf.net/bowtie2; + maintainers = with maintainers; [ rybern ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ff3da0c13e..2a961dd1ce0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -762,6 +762,8 @@ with pkgs; bootchart = callPackage ../tools/system/bootchart { }; + bowtie2 = callPackage ../applications/science/biology/bowtie2 { }; + boxfs = callPackage ../tools/filesystems/boxfs { }; brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); From c047df3317be1e413216f50fe229c8dfe8ee6e68 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sat, 21 Oct 2017 14:09:33 +0200 Subject: [PATCH 1485/2806] iprange: 1.0.3 -> 1.0.4 --- pkgs/applications/networking/firehol/iprange.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix index d1f3ad69687..bb245928f07 100644 --- a/pkgs/applications/networking/firehol/iprange.nix +++ b/pkgs/applications/networking/firehol/iprange.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iprange-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "https://github.com/firehol/iprange/releases/download/v${version}/iprange-${version}.tar.xz"; - sha256 = "0lwgl5ybrhsv43llq3kgdjpvgyfl43f3nxm0g8a8cd7zmn754bg2"; + sha256 = "0rymw4ydn09dng34q4g5111706fyppzs2gd5br76frgvfj4x2f71"; }; meta = with stdenv.lib; { From 54dbe1d1b400c325179b2b9cd866669cdc7a1dd8 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sat, 21 Oct 2017 14:09:44 +0200 Subject: [PATCH 1486/2806] firehol: 3.1.4 -> 3.1.5 --- pkgs/applications/networking/firehol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 0f1928fff2b..cf41ca1b0b3 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "firehol-${version}"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "firehol"; repo = "firehol"; rev = "v${version}"; - sha256 = "121kjq5149r11k58lr9mkqns2k8jbdbjg2k93v8v7axhng6js7s9"; + sha256 = "15cy1zxfpprma2zkmhj61zzhmw1pfnyhln7pca5lzvr1ifn2d0y0"; }; patches = [ From f0fd8e34e7e2d8cba7d027521c0008f485e2c161 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sat, 21 Oct 2017 12:48:49 +0200 Subject: [PATCH 1487/2806] sent: 0.2 -> 1 Update sent to current version, adding farbfeld-dependency, updating license and URL --- pkgs/applications/misc/sent/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index c6430af5560..24e76500a6a 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, libpng, libX11, libXft +{ stdenv, fetchurl, farbfeld, libX11, libXft , patches ? [] }: stdenv.mkDerivation rec { - name = "sent-0.2"; + name = "sent-1"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "0xhh752hwaa26k4q6wvrb9jnpbnylss2aw6z11j7l9rav7wn3fak"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; + sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv"; }; - buildInputs = [ libpng libX11 libXft ]; + buildInputs = [ farbfeld libX11 libXft ]; + + # unpacking doesn't create a directory + sourceRoot = "."; inherit patches; @@ -17,8 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple plaintext presentation tool"; - homepage = http://tools.suckless.org/sent/; - license = licenses.mit; + homepage = https://tools.suckless.org/sent/; + license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; From 0966f8282a22bb38d301db22e198954eacb90d52 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Sat, 21 Oct 2017 23:03:34 +0100 Subject: [PATCH 1488/2806] plasma5: use mkDefault for a few options that users might want to set --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index b9498b1627f..685a93d952b 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -175,7 +175,7 @@ in serif = [ "Noto Serif" ]; }; - programs.ssh.askPassword = "${plasma5.ksshaskpass.out}/bin/ksshaskpass"; + programs.ssh.askPassword = mkDefault "${plasma5.ksshaskpass.out}/bin/ksshaskpass"; # Enable helpful DBus services. services.udisks2.enable = true; @@ -190,7 +190,7 @@ in ]; services.xserver.displayManager.sddm = { - theme = "breeze"; + theme = mkDefault "breeze"; }; security.pam.services.kde = { allowNullPassword = true; }; From 1e56016cb986c3c40ebf0b235b32b2e857d4ea03 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 21 Oct 2017 12:18:15 +0800 Subject: [PATCH 1489/2806] firefox-beta-bin: 57.0b6 -> 57.0b10 --- .../browsers/firefox-bin/beta_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index e8b84c7ee9d..94f3237abbc 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b6"; + version = "57.0b10"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ach/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ach/firefox-57.0b10.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3c6a528013d0fd7f002990a095e1b1c3e1e01f82444d2a53f73544c4ad4e0aad62e49af561f90b8d0fd983e7f3e515e57f14e8b9c01ed625eb90db348d5f6b50"; + sha512 = "11ddaea89af1e10184a30e691bbac711928b3e9319dd28d208a6ac7338d56ade9a096f1301eeddc1ddd591a9fa58d3b3fcd248ad6232e6a0622440a7b41a5038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/af/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/af/firefox-57.0b10.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "f8ef0a994e3ad04a02f86f381020be2087674f56ca747be529bbf6bcfab03da221305767a1b056240524e473a986ac7987485bd3a94a21d2030e561eb16fd1ee"; + sha512 = "f725a89d99adbd3d11c85b8354b1bccd423e51aa08c26c0f593433e794ea30d01034bad710010f263fa98afc5cb020dd0f3020b7a99fcc78b0a1e0c809bdadf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/an/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/an/firefox-57.0b10.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "4df60570c8c7352fa1e9a0520c795947db6f03a7c757a8a554b2072fefb36bc2636c15ae58fc7bb28ec5e8aa471fda26c91c7e8aec06013407419e9522144c9f"; + sha512 = "0bcb5fecc974373ad5fec8ad4eee4c8647e6cf0cfbc5590238d8b369cb3ffa8ad048c67a9b1bc5dd4feb900011f79e521fd9adc7c5c74c32d837b20a651c4a6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ar/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ar/firefox-57.0b10.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8908830c2bf333d6d008cb900b97132abe26d84c4cbd4e0d281ce2d4cb211eab4241139836e5b39bcb8f48012254d8d5a06b227b1ecbdadc6539899bce1326f1"; + sha512 = "a2a9659b085cd47174913bb481c61c6df24e702ce4e03040d5280a64a985bf302b5163c9e9edafab59599144a2ff804d8fee275d7ef5d3bb2480de299126a34b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/as/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/as/firefox-57.0b10.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "28773583524bb22de708ddd9341192b631674b644ec639122661c25feaba70ccacdcbd77efed9997e490ccf59882fa9f5f5f3010a62f361fda2808ca73061276"; + sha512 = "c1289cd1e7675f804842486b79a9bbf9ce4845ddf8d625a00f614b84cb8331b111677b802dd74a2a908363c4ba175276b3816ee3b8cb77ca4c560e9c578fbc17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ast/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ast/firefox-57.0b10.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "7510a259f3ef4bcc38163b7ccf2f090cd4a4cad1133bd2d961470116d0f0bb34d41087a40d744cd31207afab1f5299049558657d02f4f0f23a3c99a98d752624"; + sha512 = "23b316a187c409317939c4208fcc75c473eaa18c5063ade7aa8df7f70919f9a3942c8bb306abc2a012915eb2cd153ed5dca024cef39397a7c7ab604f1d0e2271"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/az/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/az/firefox-57.0b10.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8282183bc02bd7d4bad0cd9d74956634dc0db8988245caf1eb89f16d596d78a6ec00739065b38cb399dc93b113d35eef5cf1188a2a9c78256d002cfeb87114d7"; + sha512 = "24e5f8868e89aba56366e62cf9cccafe7c284c44425b4a29ee8882715401d62a296395b14552e7fe34ab4983e1f6c7c87fa356f4d351fc7ca73652f8d006a6f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/be/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/be/firefox-57.0b10.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6440aa65e05ddbddf4629051be4b05bbb030317c241fe51de08d8d11c003fc094808a532192651d874b6ad7e6d8f89aab66485442839b34df22189fa89ee8efe"; + sha512 = "361e1923bb59f21bd5fa16d3b94f487cc8da241914369cef925b838da63391e865061ce160390dc79b862e99b50a4e7a01178ac6c21e05aea7190b2dfa35bbd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bg/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bg/firefox-57.0b10.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "9489b8125e992f213c06583e6b4205d9195091824ff39b5b171896be2766c834261f648c34edc992da72bf1c4609e92224a119402913b4e8298edbe94159a860"; + sha512 = "506f933b1871e0a9913aacb0c79dcdf432dee6546190f08b48087ce9e292a90ebe9cda2bf047645e47d6faaeb93c0274322a908d928273b63c4a258f02b21a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bn-BD/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bn-BD/firefox-57.0b10.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "22db87e53116fc8db9b2c917dcd2416f0a14e19eef5834ce58cc141a4123b51e97e9d29f222c341f30180905e9e261d1f634579d8efde4db221ea78fa82cae32"; + sha512 = "805fde6efde1f6d452315b3df401a4d65cf5a807bf8528ada41c1005817c0bfd2cb924b5fd9d34bec131e4a2c0aedb7d059e49d58af6d4b68ffd29844b7ae05b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bn-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bn-IN/firefox-57.0b10.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "91800665d44a074cdd56333722ce3d1da54c4df40a9a964f63ff6153bd077e452008097f6bd678635d2ea16e30491ed960f60a473d7f95fa2ad35c9e717e6bc8"; + sha512 = "ac964e94f4a3dbb93f812712961439af7d7db6db4fdc3e054d17b99bae605658db40c974c58aa566f455cb4965b5d5bd378d03270b7237783adddb2bfb5ef7e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/br/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/br/firefox-57.0b10.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b95dba3b94b48d63b1954ac4983bb6d736777630899c60a84dce07d3f55843c23bb7af7215eee081cb3432c705700dc4e4df3665b329d0e5cd9e691e7da9bfe6"; + sha512 = "f6d30d417c0eb2fecdbb31821b8414e318e2a3f042489fbcaf96faef544005d7fb32c3c02fc2bdc2633acf7c7b76b8c24fba966c8539d6d3e9e928c2cdb3b1d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bs/firefox-57.0b10.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "cc656b07f6cd1a2783fae5e09e9ba4e0abd3ba3b29649e8d496511564075a8dc442206b8f2955aa0f5ddf36329c6b184278204e9398eda210b51774091341be8"; + sha512 = "fc04a70c597082726b6b01759eb79d844a05d9bd0beff12b3802e9708b710cbc72b71f830ff561bccfd901116d8cad44384e7661695f0b6df00f6b1d8d2025c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ca/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ca/firefox-57.0b10.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "c61f7f062989d10372bb79664ee94d5ae59e89ddd69d5eebaa3da7c3c639ba7c50a3f9608144e76a40befdda32c87ba5d32e14eaa0b98130fbf7d6b8ffdecad9"; + sha512 = "fd0bec7ae04fa945556ccc01cae9a3848c2cceb3ebd40f56a83ce3269b943b1dcb42c0de000bf20395e34277aab258f19c9d9678da6f4b9a59932ba6a904abec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cak/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/cak/firefox-57.0b10.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f2b5db704e668fe3e8e97aacea1663a2849eec0ea527b5107927c5710d95bc8a8d89f73a23f53b430fd24cd19b5c7c0e4a6ae34d71aabfa87b5a743e760dc0a6"; + sha512 = "5a22e5b260919d9d85976be09947fdd74b29d5821ed0110857c9f94997b2c54572c95568a87d115dfd049eac358c8cf7bcc6b41de92d278cea5de87468274b50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/cs/firefox-57.0b10.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "104f7498bcde823ea1f28e79e2be25acfefc5f9cd4755ef5332f160e15a63ba54ccb713a69c694027f2e99ce0e1b7ab07134c6bcc8a4d3caf8b10241ae27d3b1"; + sha512 = "deb041e2adee7dc7467b1fdd302545bee1ee6b08a03a9bf3c030096ae0507f0956c32f64c6731be95782ca4b6835e8066ee384bfc9c08e35f2aa386d3fb84cab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cy/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/cy/firefox-57.0b10.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "dbf802eaca0fb11a5453cbbea4f050ae7fcc5081712cd9fcf3ce9b04a1e042dd4bc1ca721d82abafe26b9d6cb5bbea41ff6b58252bd52651ea5fbca580cad479"; + sha512 = "b837d159b13fa448cf13737e163d2202904b25dbef9bfd43c8f0f0e96e4ec7e65196885bb93575682c5c29267f07b07471e2861ae3cbd2f732d611dbec4dbb24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/da/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/da/firefox-57.0b10.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4dad1125de1f8010b3b30fd1ec84e26317046d5579c7841bf3bde480c059f088ca3dcf6e2b4a7843f1cd086798e28dcc95a6dfbf533919f456e2d6af062279e6"; + sha512 = "c341351d5693518d22ea1ff2f1a46ac187c933355e8e106b446b8a200a0eea6ed108d582917f99cd4f9dd2f376216b0e773c87485eba56e4b7ed8957a4c19fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/de/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/de/firefox-57.0b10.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "dcba94836bc0f0409992e33d65814cca86811bb6ba6695a082a8b109ff153a0d12e36b6d2ad2d62ee9b588a68315f40420efa7c2b70ee667900fba470f01cdba"; + sha512 = "e39b6dd52fa1eb10ad46e3cb54dc13a79722bdc5fa7a2addaae10a9ad1417b548767bb589a23efb8b5e0188f3a086f39de24c9e7a652882414533c439db219a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/dsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/dsb/firefox-57.0b10.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4bcc69f67901776a153f7b2bdd22d3dc7c23246a616095579008d4c2c2798ec09985488ae0c870e2c794aa553b687e95a56f262f9a5568b1712e04ef3dc884b6"; + sha512 = "37f858da1b528071b22ee1c3e3cfba6d20f54cb89397f844e648c9962b3f3a32a610012c0b51b12e2fdf9539cac8e7dd9c1f629d5dd840c401fab9982b1f8d32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/el/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/el/firefox-57.0b10.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "2cd4d4ebc3099761a4f3aac6edebd662b4e4397e276e2fa1afa8b0acf6ff2d9367ff7f27909350b5ad8bda3a309a73d46375d46fe8c986b35c209859b79da4fd"; + sha512 = "db560a967583e6913226c08baa44d1be12a6c7d158e260b7dece52703a5e46e62e8773699e27cbfdf14076b34094284099ef077ea7cef03cdf51707b32ff1d48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-GB/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/en-GB/firefox-57.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "86812a5b80bbe2845f628e9b02cfa037077f9a9bd39e292dbe8857437498ef48dd5576ff98f70765ce342faa55459c0df7ec57810c4491c5fcf1f874c02f6382"; + sha512 = "40f67b3ac7c3a3e557b60d6edd57d2754256f2776818c25846aa55b5a7048cfb1e775cac44b2c5459038454cbe0c544b796fa0c86e751866a011fdb4c79ffa9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-US/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/en-US/firefox-57.0b10.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "27d107999a86f31451ef4086d62a6449088619625b46c599869564cf0bd4484ba13c92c8a368afa1111039a81c01f8f49cc3a270680822638f8c73c3d088683b"; + sha512 = "03762f3354ced1aba8c0ac09d04cbb4d796fd63ba659ff0fd8ec50f9b63658cf3e009eb4e3965b91872feb43d6c15d2b853a49f3c69d9310a81b8c9f1756bba3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-ZA/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/en-ZA/firefox-57.0b10.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "0fa620dfc562e187fe799251d98c7caaec3021f5317f4bb31a78ffd9fd9501461d17cd66e0d47080e91cc2fa7247c1a1de8731896ad0daa8f891585d894a294c"; + sha512 = "b83a44cb172247d81943ada3526f4151ffe2c4245bca7f0243ddae8d136dcc988f02c7d6aa7dd5088717575431cafa66d9f15fee78a7f6d1529cff6a86c6defa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/eo/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/eo/firefox-57.0b10.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "3a07022582140f4a25992c5e0e93ae2d0f695c5a258a98c6f2b1d3edee41248b9eee3e655084d61b21a7c32b29dc03f4bbf5e605365a2d077d9b5ca069cbc2a4"; + sha512 = "fd6228801a9f4d09bf3de655603bd152c4799eecfc43a1701bf29f54d64be5228cf0a0644b1501ca68d445a0154e539574e16cd294aeaf24d7e4edf1a55c6ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-AR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-AR/firefox-57.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "bb5f9b65b6d92654761d99911afa9d10dd1adb2a80140f6c1beaf5e014cf46929512af716c1fc8c01bc7f13baa5b924252a11a71b916d3945c1d28ce52686019"; + sha512 = "e6527adc411f6fff1e2ccba4adc156db94f8a62b26c7453cf667434a30966db2bc06267d84a5760578d1c79b0f7f24751effc45e65f56cfc6651fb90213b40e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-CL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-CL/firefox-57.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "6f7df550a90d2d8fa9b8417ae4bcad8158b544c3a49f240a0be4b0bdd350b92ba1c7cf99edddfda85d4d702693f52dce2ef053ef985001b5cd0899302087b21b"; + sha512 = "47414369c504526d19d952157b14410f820c9cd08b7f026ec07ca10933efe3ae88463fd98cf8d04c1bc9c1b4b194fd4ddc0cb1b8973b658d31da5e13878ad92d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-ES/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-ES/firefox-57.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "d472091717f237a163db30be066589bcc1c0b2b72aee751dbad0e47557fc92075c29b2c65336961fbd91e3292307be0366a89220888f3ddf966a29ec1f2c765a"; + sha512 = "d1931cd9a0206384d10dbc1b2438a581fc466952657a82d8d46558981363f0c615c86ce06c285ea9c50949bb7ed1980de16a78cab95877a048152748a44a3a4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-MX/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-MX/firefox-57.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "ebf9eebe47cdec6ec2beae0d6edf48295089c7ee5aa1ead26e0ddb45fef583aa5be3941c4bf4c27b4fd7504f141a34342f674c6e15beb086f6994e8e3fe45ccc"; + sha512 = "e5befcb9749d65b3386140e15ba0dc16c72ea9d5036cf324d833ffe1fde79727adb45a7c2d23306dc023caffd533609bc50ae99e91c1a4bad255c9d27c09deed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/et/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/et/firefox-57.0b10.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "818c7c4cd486988496f50d5c5a4a56a12ac8538113549433f11aeeb33242d7337f144413e27920cdf2029fcdbc9a2b9a47a9dc7d92fd67f2066ec5b742b6c625"; + sha512 = "65160be903f009d4704e8f2d36d7e95e83bb8a70d7368b78673f576ababcaf813297af794086a980928c721c9222f4f5d4882fe92b2e1376c65ca0031a7dfc1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/eu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/eu/firefox-57.0b10.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "781df02d0977a9e50ff01e214e2ba3bda27fc9052119d0b03989304d2db13009583e7d6fe32a9d502eaff1abbfb81c55658c3682e4f59c6da78ab16b59e3bcbe"; + sha512 = "a434cae9cee1a4625bacef653bb4681df4ee9b149319092f10dcb69365e4fd259258c70af8340ee1c3e689a656f683afb2c8c135c970323e1fba06f53ec2aa24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fa/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fa/firefox-57.0b10.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "8e10c6d61d145a1dce790dc55691091b514749fd7565c41d1f5aec6a863814fa5a7b4d012068682dead8f87e4c1813787bc724438018393f5989f9dc49a1275c"; + sha512 = "94faccd5a129d7e7043b78b03c9988d7fd1385ce12e05d97fe98c3df1def44e175219874ca8d38257f0053fa350fba4abe3bcb072498fdf8e4ee971ca6f47a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ff/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ff/firefox-57.0b10.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "1429a4d627e655edc245c375cff00e39b4cc42176e1141e49e9bf5eb2a9564de88a0915795bb94dc842d44e0de1aea28601c30fbe14bee0b210e15384c958c34"; + sha512 = "7c0b7ebdf42f70929a6b04e9d710b228f85c0646d8fc89ea9b967c66c62555a68582c8017e55cffac2e29e1659b4789e6704594652d4570a9013836a544dbf85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fi/firefox-57.0b10.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "65e1034b856a51dd6e21a7c21436a7f2ebd6794d6eea8f0631161feed5c06c34725e99473bfe9d169ef963632cd4aae72ceba24b658369f3da6f1f34017baf1a"; + sha512 = "f6edf2f09d3c4b8fbe8af896ea32040a7d27b7ef22cd08c78fe4fa8e15c15c47e23db734440e73bc88a2f3527193955b685b0178b132b1c91595509dad94a6ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fr/firefox-57.0b10.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "9369f1ada09541a46745d66722884b3eae920f79673763cdce587a56d36515d6a9c799775791d587dbe5cb33d683b87194996134cf530d20bd3509d09f62546f"; + sha512 = "468a21a47102e9d508e17e5d4f612ad528cd2b0de03c3744e185a7c988f6db77370d2e08fdeab1282bdcaf35b32ad8a3530f338f7040d33d48a1df7ef616196d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fy-NL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fy-NL/firefox-57.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "e765ec0dee9ae728274c594906dc57124582006f0d2c1bcb671d2d85812a5656ee99955f00d262095664b9bfce9e664c62f2b8dd61cf08fa4e460f68b8b6da69"; + sha512 = "a440f43d36e623de0af15d0f1eae1fdb0b533146524d30ff7256a257047e10c7b73ae3448b6ff70e033898cba58e178e03d2895f9873694dff7ae95d897b3a82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ga-IE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ga-IE/firefox-57.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "32e409050d2d45cf2d8eefc7c55c62c89c4e510b7d69806ccd3b8dcd7b68f58abc75eaeecc7c899fce832daaa3954acafb1d7e35d1e70f62a10f78dd4dfb7712"; + sha512 = "d6291fbc6a0190922164b5ce61f8b2b27d0db272b5eb3e01d230f7128198e131b07521d78e0ba5904285682fd0bf6f700637feaa0d45ae54d258b225fa141feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gd/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gd/firefox-57.0b10.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "5b2418a12844bbf5943e57891a31ac7f95bc214a4708fdaccde772890bab94be88251cdb4a13b031623c396767e6386b5741f9bb46a6878ea28c380f91a28963"; + sha512 = "636d2a8931f60687d93a94b937a57cf3047149c6809a865345da76023ba692d4e2b070a8bf35706aae030fbf7bef470d4b853ce9485e2ff456012e27edc8c063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gl/firefox-57.0b10.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e45193079948904b1900bcde30128aa8e1aa29d7ca70269dd1ad73e55d9dc7a1f6b18d9c31a6b93fd13c84ecc7d8f6c474e41831434cf3455783597857f4cb34"; + sha512 = "b32f50d930fade62a185adf90a35356de33d7a377b15f80b52fad10b737d66561db04177d7c1b3e4c5a26f213355af8a9d553a6eea9eb9ab4aa44e9b557a0480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gn/firefox-57.0b10.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e062ae0ce3458bf95cfa37ba439d7da7f19d612240f9a23363cfe0724d264c48ec50826e4ef959fa22d7a211e964a9dca8eb23281fddc8069af267b015c9ad20"; + sha512 = "dcca8976607b4f0cc67190cb57b4a5147a7e73c4f60c6334c89657a20ac1b583f33041d430d5582717883c398a6dda40889f9fac543ea2d08f67fddef84ad4f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gu-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gu-IN/firefox-57.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "42e641fa032601903d34652996c08c6e74b1bb44bb2b579a20edcd064dc668739b4e4b8b973d571cd3ee5818bc99667e5f8114d8744de0043141c205c6ad320f"; + sha512 = "367e8cff652fa85bc546f095f9079dcc7b95c86db32379b6303188de62d396be65caacc9e602b21ea87abcc1cb7b588fb9aee280518bffe1e72d4223b7c5f224"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/he/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/he/firefox-57.0b10.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "1303b9dea95512a85112097a2b1871d6415acb2134bc538e27fdbf5af005f3ea5da58c813aa2d02242636bb1211943dcb8c62f47593b9cd2846c26d0f8f93d3c"; + sha512 = "f63a6c97b577d1d4c7970a496dd7ceda7672563f477cbe3b378ce2f7d24a96d8f9ed80f99bf6b28547ed8b2bddb6f8f788eff9bbf52bc4b4b8ec744fe9d8bd00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hi-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hi-IN/firefox-57.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "d8300d7678b5989884bce54fd7969c758eae4c7503aa25855279a3a24c3fe3c95097e4aee2a4e29c86e53c833be973571fa496290754d7da001cc6712fa11d2e"; + sha512 = "7ec57ba1fef3c771a057a156f9779cf168ddb33530ad1644bbec09431965dbf94e4b0933df500dfd271ee28288f0639ac36bbc80cd49b7d1e051a317c10cfcfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hr/firefox-57.0b10.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f6b7ef155300dd782ff5acd35202e42c64eac06d1eb623e3fddcfe60bdddd098649e477c7260d22f787591a54486ccae54d915ecb20ab114f05f88305bd4e099"; + sha512 = "d50c0c5e6e512d25c3724dcacff7a86fb14a5402aa9fc44247a162c8b5cb470cd4df747650fb40f6a40c5793590d77efcc72c1983a9cb1b0b5c75173b63474a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hsb/firefox-57.0b10.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "00e30546e596c8d2c06f57de0125e7f366356e4ecd4ec4c499120e459492b45965fe95ee9698e98bcb1272249b0c99240765f5b2cc98099403585b644add4a04"; + sha512 = "3282b44db976ced30fc26ae7dbd7c6ac0c76711a3c759ed7be22f6d7c19065860998d779f5bdf569fe73a35b28a247db6223e8a3da7585cba15142e6b1f65e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hu/firefox-57.0b10.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "6fa2b613d550edc2ce3328b020d868474e1a523b6aefdbe94a84b7d38800a81abea2ce177217aef88703672293ae2083ed7b0f278265b83430f8f2bc6c3aeacb"; + sha512 = "6cceeea7200eaf8fc7d73778021ee2522d84cc5499985d629aa8f81c24af540482420808d2f418d7e64fb211a3dbece0764a18652369f708fa6f444bad008e79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hy-AM/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hy-AM/firefox-57.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "14d31727a1ad12438ea4883c15c073bd76a4158a5eba874530068afef9e1f2ce017ff0733eaaaa27f1296b00276aab3875129ce01aaf98a148df6677875f3954"; + sha512 = "a4c01b86a8a0b5fff08190ac19d5cf338debe053d8499b3db44c96db92c41bd0c20e2d8a86cd9e0389e50999199b979e9b1a827cb79c58068a4b7b1b65c41366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/id/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/id/firefox-57.0b10.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "aa8d47e406e391111958419b45bf88150dcb945d2f3dbcad901a641e1c2008eb25538c987ca3c8ea3b55c8c62c3adba7987c0cedd997cefd8ccd74e77c3e9a55"; + sha512 = "e52e79a57239b145724d400e28af0fdc77b469f8c5b1c5d2cefd3409543c52bd135e165023d22de2af24563e4777a1e19c2a1cca41067e175c108d34140d6be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/is/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/is/firefox-57.0b10.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "18c714e424abb23d48e449a58ff883414e5426c1c8a0f1e54f3f0f0eb4759e94f33facc6d919299c2fe5f4db62bf6daba166576debdfea6be1456b5749494e89"; + sha512 = "6f7d50cdb623fe0097f1fead84b96d97abe548e46cd2c9617d6e285ae6474593d3d75739fda803770ee269277698c46857242feeefd63aaea78264ba18395d46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/it/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/it/firefox-57.0b10.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "2da3a75200238e35a69622585da79cf31379e9a3386388c087a7706b6deae76db56ca0eb6f63d02689c79fa8cb8ec9a08dd3c304c203c5de64a8da3401f25a3b"; + sha512 = "b765aaed36acd834687196992488b169d72239254a1ce7569f469537f681197b2c95b5f7fa409da3270b86d0e1e05fed3d23ada8d80c0dcaa995840ccf3cd79f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ja/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ja/firefox-57.0b10.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "5656c13478d3bdfc8fa0d1e01335f1d6c49bcd3ddd85a5a786b97418adaaa1a64632b7b8c1e5a6cc72431dbf128e4e3d81508fbc5fa6cb0d79f2f79b58778bb3"; + sha512 = "26227fe542adeb789d9ad3a75e27cf2dec2f393af8d1ae1f1f39dbe2bc81f4bf233bfb2f9db22c23dc07226a7a3f2d29d4bad633959476e7973910e0c238b649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ka/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ka/firefox-57.0b10.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "1a8b488bfa87ef950453c9479943e41fdbe8c26051d68af06d341c0a555e84abf390b50d16b8a99b0d3799182a5781c4808bfece4e055e0b3a834f9b81a4c416"; + sha512 = "5b55ef6f8ebc2184be952f4a7d83cb714bc2afb3f52c7369e92007c4e8151c6a46ac9d02c9559632b820acadc52ae243a5927abeb6f678797e56f64ad8c270c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kab/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/kab/firefox-57.0b10.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "23ef286dcb57f552268aeb5ca01368bb6f5541812a0cfae1e88161b522b3097e86be3ad93a26f51618dd818f6a6014eb96352f75a952de5aa76f7a94d9a466e7"; + sha512 = "4fd51f54876d8ed1e23c73e36bd3e862541ae7c18269736f89f8c5190840a3daecb4b2e0347805854324753f2312ae66c67584c8722b9047f5da39cf96fdfa1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/kk/firefox-57.0b10.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "f2324279d127b6a626114edb1f947e45073ee99751c960bba06cb02dc71ef2e32554be8d85756c7f76947dbab0af00969222b0bf25d896562e4e0d8ee832b959"; + sha512 = "4014e1882473d52a05fdae5550a52800af16f31689c4fae47d530a4be228c2cb59b0ce23dcb2cf96e1a23b153de2f5b766208c422d0ea7bb54faac1dea6da6ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/km/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/km/firefox-57.0b10.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2a4a1b22e6d3aeb61e1a3e7446feff92fb85873862f02d4b201952c99dddf67fcab219e69681df29429d6603468c83ded93af90fee938b5eefe8fc2cc58d17bf"; + sha512 = "67c0a62b308b707fde6a4499e3ff48ba010cff2cf5eb084712e5795b0e6be7eeefb4d65fb65a471de1e734fef990271185a303bb143c6ab0bb223c596bf54dab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/kn/firefox-57.0b10.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ab1a4fd00b09dc73c971be1cca674408f5474ea7da77b4da8fb692c046a0ecb69743912ad47313efdd6ea9338e338f4093904e42cda125f67be13f281e7841f5"; + sha512 = "f8a6759bf2ee73209bb8abf65c0acff57959791b946e82e42e2ee4011f67192797e5f66575ca492b82239df8a444ea5adc544d1de0cd407ae1f67385c2a20e29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ko/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ko/firefox-57.0b10.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "76482e0199dfde34f0fbd5a32ea79875285331a65f1270246bf8b413dc72f07b8bfea7b6a721005189107c8f2baf54f5b4c2aa5e9008e7ab70ca5c5f3bf2656a"; + sha512 = "dc0b12e24ed0f68ad22e386eef6f2c3184aa23210d9b2f208185db76788ca8d54342476830adddc3aa0e7139e678046fafeb1fb331207ab0e5298b77a52a11cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lij/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/lij/firefox-57.0b10.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "bdc30b4a4ce2fb4a4f0a761066ea17cd30fe0d4c682f7b5ae4a4a9d6f220e9aca7a918f69a2fbca85adec8eb95d4c5c664e8958caa73d57d79152549f03e4bff"; + sha512 = "8bcb2fbb9689bcd73903cfd7582f5421d6c4eeaf0feb95079ce8c6c008e120110b981aa638d831030e20696b062b251d0be552c1867431fc6ae5220f38a0a75c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lt/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/lt/firefox-57.0b10.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "afcb9b001e0751530d179dd3f797240d72a31a51263ff91b8ba055a90b474958b62cf7a7142ff43a84e2d7c3388feefc13232f818a96d82bf58d6d2a39c52db1"; + sha512 = "7299042c6a29d70b38dffdc5b1d842e841bd3e7ab70a57ecbcc0d4c75ca087606aab1a73680e1566401112123cdde3d4a7f0908b7f54ff0c82fa66ea16579454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lv/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/lv/firefox-57.0b10.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "75c712b5df622308e113ec2dc04d513b911f15d180ceff0439b2bef9304c9ff359ecb895945b5328579906eb5d0e2fff6f1fa2698a085d104ecdb19d06727341"; + sha512 = "3173dca01bc34c51ac775b70424a78f1bf5cc7edde3fb30f43eb67c4d73b6ca70bef28438683115906ae45bca731be3cbfed4d8b21dad255f15bc5d9141a458b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mai/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/mai/firefox-57.0b10.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "e2e0654d8f43062fb173dc4782b83641c2e9a5d5aeff4e0bfa38293956f321d7410eb9c5e2a5e17992d6895575fe5f1c94956cb67ad6a4571673a093b44b84bc"; + sha512 = "a185b31c33b3a7a120d7bd6e9b7236b7f2c8fc080ad4607ed0c25b451716ecb26dcc36ce6970722b76e9025826964ccfaa93ddc75aa4656174fe25f13665d3f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/mk/firefox-57.0b10.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7eb2cec4b09a6204986c6a71333d5b08802617a0ee29f1bbca52c8a268c27456904e518128d15f74fcec0cdb040f5696c365669d0a8f1653740cfb2a25815161"; + sha512 = "269ed71e11458ddf930b701a0b1ca6477723790868381188ae30bfff6bf310048d931a792050b18bb914809e48f867b1274cb25f3d19613a2b1875fe048ec554"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ml/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ml/firefox-57.0b10.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "cb7f5fa2d2b1650ec24969c25fb2d42dcf2f478b2f7a4ff48aa2afd2a08b07ca2fde842c830bee2c3f6de588fd83c3970ca965dc62677400c43beca6472fdfa3"; + sha512 = "e39c80c81520e5d00a7d1e1ad94a1f4480c3d791f412673b7c3a1443d03e830802cfc1fff581eebbb986d83e1b38fb6b144cbcec30e60ad124692884cdf4b2be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/mr/firefox-57.0b10.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b67631b0ac97123053b5e941df3b833ae3881b8a37d1c25e18ca962a04f2a600ee23257561a5a7b69bd37948b480cbe75b610313d67f1a3ea0c64b36ccb1b0d9"; + sha512 = "0996deb736677c9b3b3cc9e192835f3760103b868f6a449df4675ea8eae812f5ff9d2f4fd33a3dd8be9a13ea44e383cfa1de4d5982fb63475fe0d709ff48f8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ms/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ms/firefox-57.0b10.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "614fb7f03b2fca659575600c2d7bceee35e4066f0c16cd3d88364b2b4c36fc6261161d5ece691ae8230767d5af4302d84d6e24ecc2786ef7f500547c8d039850"; + sha512 = "612d8e6c21116190c15a1ef945f179450bb6667d4e83268c51e88a150efcc5acd9b04ffd1d80eeea13e65d3bc3fd9c925bf0f19738ef542187be913c9396de4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/my/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/my/firefox-57.0b10.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "e568525fa0151e5188a325d695fad47af3e2f59b15ce4075d27c6e6b16b387e86cd94d03dd5207c675cb0f7a4fa95d3f7e67248876391259d858277cb5ab339e"; + sha512 = "5824bc5759c9223c68c888ae9fbb2393f8d6b02f7a12f48918dd6b331abd2fae043474999d55864cae75d12fe55e29fdb94ccc4ad716c0fd780d0f63fcca974d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nb-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/nb-NO/firefox-57.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a7008a0e2da4d0a273d0fa9b9a7fb1c873570227536600820df353deab63b7fd3eca438e0647e73a9e93207fdd66513c051e91949f83f6af4a064f50392eef27"; + sha512 = "111c1ec84ebcd06c1563e2f74ad28a9461044a4c75ec66e0f9d0b497305041e94176ea1eadf9f202e1ed35eeee7c81328debf3de9f9d32984d20ecaf007a0237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/nl/firefox-57.0b10.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "380d4d0381cbcd9eeab57a1eb0d7b90a73d0c163c825033d3f7c65412ac418a7dcdc07ec0a10131035f4d02a9ce37133b4514ef953dc5bdac3f0d415149b4364"; + sha512 = "635bf72cd6b18e82cadd8268bb97301bc3d82f6720ea6a33aaacdb671e01447ea348cda0351236600f226e673884f6f2d495bdcebc3a0a87a5d389d82b2f4715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nn-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/nn-NO/firefox-57.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "60d9157c1add1064b9f5d3d0873a36fa7a29f9f19da6b0da83385db86798ea645ca98162a63a43f4eaafa8b79a8c19cc2e547e08b3c06da8c36c077993fa8faf"; + sha512 = "03f0b9bad6ef0f1fdd1507733c6a059ba35350f33cb8c636b7acff4239f5e1e5b86acf1a29cf8b5edf102c4a20a7af4ed5f4026e44dc56f5dd97d08715d7410f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/or/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/or/firefox-57.0b10.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "0ab3abff83d0d992c929ead73e2a2de174475b386559395a2256d40e7ce8c4c6bd48d59bd2f3e343b12c2c31c2fe2febe5c4baf658fb38a9dc4bce2106c8d159"; + sha512 = "a9506ab8cdf3adcffab1406c895ea229c97ab515b5b866f19eed43cbdec8bf877eb22fbb3d29ec429b9624e4f8a962a13a5da033a87bed8f9e67b0f83fbc1348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pa-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pa-IN/firefox-57.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "29d743e8f90568a1f4f4a1e0988c9f5f598dceb589ea4a6366d9793c4e78e650c0c5f8caf0a30c5839d5226c0788c40e5e128c027554b33e33f883a65504ac6d"; + sha512 = "b0eeddc8b3b421fb7b4215b146d644c1541a05f928258bed17991a0bf7c91eb5d64d834dd1ce4ecbc7735fb6fe104558a4a41592d4a284cfd7166ac015177bc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pl/firefox-57.0b10.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "7738550ad840a14871da75c913816f9c7d27dd5037c3a8a6ade0415094c28e2f1a00c6b92dace368284ffb0f859131f1894da3b0ba720442dfecd6ed67bd3b3a"; + sha512 = "c3c1094cb2e7f4698da8d05ff85bdf6fa127ad91c07af13f9139dd9f36a99d542edf5b58b7ced08b8af277e9b5748d085468eab6ca45c9770461d2e0621d243e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pt-BR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pt-BR/firefox-57.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "0a738deb89fed9c4faecde5412bba4bba9c83829f31ad79253265fbcb7d5e479160729ba537935c2f88d29b987cb984f338dc6232489938d22333da49aedbec5"; + sha512 = "e80d2810f3f77d090a1b11bfb808ec6e159134e52838cfabda83e31164049fec54c2a6142be127eb745c79413955d5ffb59a314b26b3c38b5c18b10f8a2fc714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pt-PT/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pt-PT/firefox-57.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d51ce8adfb710e8061abae49b47a580278936b819be2d438833ebdd81bfc1d7cf631acf13c4837ef3134be6b9dc31b5f08714d7f37271faa5116d3fd2d4c7937"; + sha512 = "357959313de47ee9637e1b492d88f92e340b22f7ab1c512df483fd31aba55e83265feac6cc0ef9698b1e08c9070384bf94b1c54f9fcc613aa87b81f307baa37e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/rm/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/rm/firefox-57.0b10.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "bc2f9d3cb33474c330c637a8e5001d3fe427172ac9ecee4a9ed2f612cdf0f4e6e8213f5a4f01d964e8326b6ed713de5a6d4470fa87685487800f29485727ce8c"; + sha512 = "fb45631df64eb1796627cbf3fbf4f0748d145e05fb0cf1fcf3136dda89efe3b0b1e54d7bb346c275d8ccb1ab3d30aff343021d26a218e15aa8d5b052cd598794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ro/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ro/firefox-57.0b10.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "66e25774ab24a48988bd8963d089c375f8bc48d73ca104bc83df36c1ee8da7d1c46831dce2539fd447e956a2378060999b53e60a9cd7dcf5dc780ae3aef21648"; + sha512 = "394ab7b62ef980390d278a297dbfaa2730dc3211e537959ecb7110c6b061aa434f647a0457619a6239c01d9e08f97fb53ebf925d7f47fb582919b7bee812829f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ru/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ru/firefox-57.0b10.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "0b3548eaeadceb0f15dc0d9ff198feb2fe94be579be3ebb77026894a3dd6aef6c4be36b32cc0876795fece91ce96fd6233ab12bb85aac415e5368c8f00dd97fc"; + sha512 = "462e706c702be21109cf11ee275ec2683e448fddd99861461aed3e1aaec307d526f692adb8b09d3a813adeb86a3b80fc5c561ef56275593b6ab8145fbc11694e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/si/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/si/firefox-57.0b10.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a77772ce7197a9878cdd1f9fdfe9bedd21984bac5846a81ef9e1d08fa64da6bb8dbc80b758b0aceff58e3a97f0aa4446e9f82126430c56690a87363fb65b02f6"; + sha512 = "0fb26e2d6700998d199cd743252d981bcb119562f10c63de589a8bdc81759d593070c1b6e961230d9203f5d4a4a25fb96bf88eb58a29654de41e2d5130bcb574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sk/firefox-57.0b10.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "a9ae3d06e954d07da9cb3312e0f567593952e9b8cd8597a42f5fbfa80009f8ff79f3bb502e2032402c62ba3dfd10887a7314406d25301e5c00ff653af5fa3046"; + sha512 = "fa35b0c5722c237b06e2d9954256c4cd84fc8752d2705e429b21c3800ea6a163b598281b29347596ec30d9fe7c706fc3de0e075519a65221eb459dc671b6f541"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sl/firefox-57.0b10.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6b63b681bffdfe6942ed11a1483c7072f5d8322a513a2a6a8caf45cafa3e8f1bd750ef9db3a48ceccc49ba281dcd57655805a483a52325d542607511afb1c6bb"; + sha512 = "7ae6a7676cf281e773de163eda410c19497b5c099f675328a7a75882e3326c7734c0ed12ae224be368b922b8f207667962de5024281de1291d1cbc59a19f6c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/son/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/son/firefox-57.0b10.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "121e67c39bbc546aa06f409cc62699a3c7f43307a11140c0ed57f5daa009be92e527fc5a8eccba7311fefe650baede394c0e0ecd01e2adecf783439536caec72"; + sha512 = "e548b454499f0067c03758af8d32aab3ad50e6e9625abec2220af11052e056de965686ea9ae6bda2b4aa88e49aad9d5388b39aba77ef00ef6a1b91cb36caaab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sq/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sq/firefox-57.0b10.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6e4db28b27bb6991faa10703b07dd251a53d9f30b27a9bb6f640c491a05059c6706f13363557d455d5529281d8797620272eda189da74c0f449d03bac8973b96"; + sha512 = "15ad7a9f7a08f257d3db1ef1e454cfeb9fb82dee05e4d12a4c6e6711c5ff1640fe5a5e0638340429778ec135eec3003518fc6e739372fe2055be2003e3b795df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sr/firefox-57.0b10.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "eb2d92f3470e97f54b70fb12b87e2b0653664ea0f7a59e93f85a907564dc9619a639d6ce418e1ab90e8c40676e37463d9e4ecc29c07d810500186bc1c234e6e2"; + sha512 = "9175b246684ef4377045302c0ba7389e45d6d90673739b6be4fee7d7ebc582e69607c0417c311aa924fea0e94c685cefa35fa764b5c033885868829b087892f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sv-SE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sv-SE/firefox-57.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "faad39482bc2ee50ab66ab8172097860cbdf7d5d81270bce700af8300896b4d30d1b9ff4737ca0841015058ff42fd1ff16db68672109e64edd67d6f0592add7e"; + sha512 = "661e508900ed982749ad961283d82b1430ae9f81f352109986b918f68e07d60760469c17ac831fe8dfc5f249d9096bb800ac4319e9be123f772d3a414ebe1630"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ta/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ta/firefox-57.0b10.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "ac0cd929bfd9dd5e112077194601e1d70d40b86b0c8fb347be8edcd30b4d622974ea7580709f6502627f0cfb99eee465a615b9899e38d427181a567e47593e20"; + sha512 = "586ba071cf1ae05dfd71f42a2be169bba5229edd25aaa9f3f40660f9984c204387a325fbee2763775f340b459d1ffb79f0f2cbd9bec5a07db9f184e1218349de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/te/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/te/firefox-57.0b10.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "7c45aa88117399629b0985d4f64e503c63e116e05acffcdad18c05cde84556d359834ea1c478a0585bcbd8838d23c1ca9ee117cb3fddd2957a10acfc243f5e70"; + sha512 = "8c5eae33d036a6cab73f680992428134dfd78bfe18aa9b0c28d4a9b145c23b9087179fc377728b870749fc3b5899cae3f961cc4ea079830c2571ca49514093a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/th/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/th/firefox-57.0b10.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "fae97f4b0dad5a0e474be35ebb9ff2195a94e5d11512697a41fa45cfe1f131816283107110f723de319f2d4e9bdb7a311e7d72cf02eb4eed325b10e7067f95e1"; + sha512 = "cdc0460ff16406f5c3368c07ded2fa131db8ac0b3aff4fdaaff76b326b34484a66e898c857e95b645477915f34a4fd14f07aee883085923e20beeb20d26761ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/tr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/tr/firefox-57.0b10.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "a54215a44aec2972d55ec698b44144bed15174aceb445c0710b3e3e5cfb8539784e1ad6c98317a1f1a585f7601d33d28a4d65936ab9bae219ccf42c3d0e98a33"; + sha512 = "0b9cd2192131817f012117cf721064f073fe6e36cb282ec4473102403501507c282bad16494c8590e63788395db3fe584746e1f8c67de76b14cd78a0547ff9d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/uk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/uk/firefox-57.0b10.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "10098291464cbd4e48caebdf9b95bb30f4df61a0cd5e617c6fb09b22cd0aa46eb214e3f2b19bce14c9bb703deedcd7b22fc2d25f780759c955a65d1bdacb2603"; + sha512 = "92f64f9df846f1113732a94a4b613f33580f7e6ea084b3eb4039428040b175b573a9a847f62e9cfd443aca556b0088a1ad5904e08f56e3c6827d6959c18acf36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ur/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ur/firefox-57.0b10.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "5d40e66225e097eac31889c1f5ffe8389ba3a3f159956cf6f0083ae40decd1141d306805cb51e79b69de84c73b84858121d40b0244b645efcae1b791cbc788ed"; + sha512 = "68078ed247e3896fec7ae1233194d5ffae3aa18ada09243ea00ed0ec0037f9d26cbf62b87d5563ce34d5d6b0b1b117de15255ef91787fe5db2be67365bd206fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/uz/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/uz/firefox-57.0b10.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "d3a6e6310dfba8182cb529ef96c650a5344065be61569a56f310e23bc443c500af99d0e61092867c0ea94fbc65d63af2e94bb077dd8a5d0dbe1dca1aff1f6183"; + sha512 = "8ac6ff11ab3d1e351b3a84c5cb12a6e822ed7c57878e286a68189edd1ad432369befddbeae535825db3ca4570d25c89fc3be7eb8a97af1a4737cc13d6aece918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/vi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/vi/firefox-57.0b10.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fc4a085b72e31a92d9ed708eb02b42d3bba1d2d747b50891e4fce5e1b24578ac0637eb46c6a99cae7d81911cb2d6987659465e1168beb4fb27a0e128cdc06d7b"; + sha512 = "2c4a73c0ba10334fa5beeec9682ec716a82662b84a371f4e5943f5e2daa3bf225029ce2ccec82c6b024f18c3f6e68a763545a30147be954f187660ddc45c701b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/xh/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/xh/firefox-57.0b10.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "57f6cf74ca703f00d29a5c1f11223728c6f9e06bd25696effa69b155820d839680f29033dee1294ee71a2a658f35482fa05c4840a812a8aec8c9b052882b8fbf"; + sha512 = "16972b57c56d028be0c64c91809aa99bf7bbc62944f966c868c5624d1e0683a865212cee6c0e940d5f755b32f7b8ee34d6d8747324e1000e3f7b72ddcdee11a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/zh-CN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/zh-CN/firefox-57.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "52f2c50c3d65a2edaf033d313a4e2221c074cd76f1d89ccfd1101b9deb363fadf15acb9a795604c343e55ec11fa61705559d7f71134c71726b92801df348f677"; + sha512 = "7fcff685808bae83933b16a9c3512c466e63c0dc3d9ecbced5c8ef4a02f031d0574e12059086b2cdfc89628e23e6954bf687eba620d47ace390d1648d66ab26d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/zh-TW/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/zh-TW/firefox-57.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0f22ee573b8ca0a041373c33588496d1717eeab134210dc9cc23c951fecdfd319a10ccca18329543f969445bf261bbecb1b6de6a1223101bd50af8a1244a9475"; + sha512 = "58a9fb93f1481193586a6b80af25dae35749584a9b1ef2529cf4f5732f0d4e10ad98c7d3fb5496a64d113050b451ffed25a8f726104ac4c92fe0ada73003a06c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ach/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ach/firefox-57.0b10.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "0c474ecba92d8c6132a1bb484702db6f9cb34c9503babcc9f339cfbd97f03cbf6f9e51a4b7b7a69efa6cc9acffc648a0912d2ab92753d6e00ff9bc92667f263c"; + sha512 = "9dd0661ca1901626478449f30ec6718f359c810d9f85a06abda0df4eaf0c3ed8b84f7a5924ac80c1f6a9b4be8cb964572dd1224f2643ed9381b7fdb7b13e5ac8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/af/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/af/firefox-57.0b10.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "68e0875f2aa221d639067c2479cc949a6bec5a8097efdb20452b9c6c9ca1c781570405356775c05c02939f04ce4a4ff23a84ffc1eefd5c213a37d6ed7da64fd4"; + sha512 = "c86e56ef1f5eb4872fd0ebda3703b3c5e6e365628bcb45a42404bae8ded8574580683e557f8c16943d23caad60df3528882b19323d0589b56dbd12e4a5e534c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/an/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/an/firefox-57.0b10.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "c5c95b2bb6822d80dbb83277d9efcc7e750581a7d46295257802c760dec6016dbd79c9d90767c2bc75842775ddb489b6cacdf3e7e66d63dc19f6c310fcbf0b97"; + sha512 = "ff9495dcef2ec58650e1373b0fa2741cd61d90926618bda08058d92f23d7f8fe86862b62986ef2d18603d2f38af7f4247e7537e17d37d66c430c44bc8c1a3ea6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ar/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ar/firefox-57.0b10.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7a86badfad03dbb4198d2cdc287c502c54df2a8eab6be487211b3c4372b0d8d82104fdd136f84a3f6b265225f639b12f3b23f3378ac0fe185919cde202a9e542"; + sha512 = "7f66d056000ab52143843cdb6cb4b1ea0ab393dba611f14a5cad0c111e6ec78890950d8f287f7d1b8c167a88efb38de302b100cb833f28fd5c54d7435d103566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/as/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/as/firefox-57.0b10.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "1fde68d53458c0916f49be591c5bd744b7a3e3b4dcdbc0118ccfad103c357d5317e8d1fa7419cc1ffd48deee4ba196a2a41d9f8429c53be444fbcc5a8385bcf7"; + sha512 = "7a73fa66a1d6d00790d0438233ac75e740f5bbf3fc824e87d6d0c003f6a6307437f01049ec414f7e655b371de59a0c8e84a9bcdafca53192bb08e0f155f12bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ast/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ast/firefox-57.0b10.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "721e9822c9638299ffdb39eafc1f2b485d862acfc6bb0ecb02563433fefa4a081845d31b75586984b1b7db768815dd5823a8ee8c0d22b655be13c15f3c840e53"; + sha512 = "bd7d6d9c0aca3e2636e74dcbec5614da134b29f13908e230abb209fc9765445a4f701761fec8de43f71e7229b5f984cb1888d10a17d8f8d94b657f9ad0e56f52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/az/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/az/firefox-57.0b10.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "99afed4563ad52bb2573c66a974cd47688a5f951635cd28c85ce745d8b846473adf488ededc22d0737b6406e98c6f2de6c828434b9637e57f0b9973997241691"; + sha512 = "15a2d4d6d80979cd26b383e61957a5848974971d43a3bbbba2059bd16164231131a64b7c8be4d83d684daf3cac0b5898c64883766574b92af07663a9307dcd71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/be/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/be/firefox-57.0b10.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "6e7e0306dfff0bdcc4af40a63c8003b7e06bf8e555129cccd88ee0a1d726f5e914a30980548d69db28b2df16fcaca3e9e88f4b7b1bf672e0048fb1c27d00da44"; + sha512 = "ed3bafbd2719ea2829f6fe4400a12d28f0e7ff3206f5869de60996a097b6a7a876dbb50b65352b3a8b7adc246f8255e8a9c5deed40fe8f6f7f4f640b79385738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bg/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bg/firefox-57.0b10.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "5772a034ba84844656c8d93286a514e49608e5fc1a2546d9b70631562e0c3da79f57cc36be1a4aec72f9ddfd187017db588bfc63af3142afc92ca331b23f32e8"; + sha512 = "2cf11489bfbe182768e5c7f3848df7bd4f07a4d5858d854e80ee26e258f7de631f5b4aad3b375075619defbc404fded93bcbc6769798342eac5af0ba0094237d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bn-BD/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bn-BD/firefox-57.0b10.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "6334057dd3661daa8434c1e3069b7a4e143fb148db821900b9f7c71f152777f77741c7dc720ef6f1513e4402abe83d51bb580354fc3355393b75488aa8969d64"; + sha512 = "26913074c0e0de2269f26409ee2518a6f3fcad7d42f535c0ff415361ced91f57785636b4553d7838549b9772173323fae02808cd1646c080c5a3d44dc054438f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bn-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bn-IN/firefox-57.0b10.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e73a7fa1b76cf4fc112319fa09685edb2a64a3048afcf4ca4f6fb278a9a10a7571fd8566968d7e9b1a86fbe4e262d9be5c8052a6a2a31097e2aa16a3657848f6"; + sha512 = "c85729aa0ded6f03c590c309bd502bb8bc86ba0e90a369c32ca11dccc938504f8590e93d932dd6a31409ad5d6237832002b132c008f0ff6695a415257d4cc5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/br/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/br/firefox-57.0b10.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6f52057beeb18dbaa99e2762ffbdef7f3da69cc1ec4801fbfbae4c3f8fa12619faa0086dc21abd92c656d7117022f241a70be18798e93bd33eb8ef9625070ed4"; + sha512 = "458459e0ea0323d32ea256c1b1678a315acefeca0286a0b05f9e39cf9ac1f89cbae69d8717ebb8e227204bc78d72e023a08789059c7cb0fe0883db5395894a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bs/firefox-57.0b10.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "0069bf5b9c5499d3e5424b9043ac5f61ce6d9cb34ddb329a40d30482bdb79d1a0db4f00b14409690af4f0b9afca9f87cf65daee313da6343bae5e8684c1de266"; + sha512 = "3640842fced020ed3216c2711c0276bf563519d3b4f68a942b20b2cdd7a2a3d50c0247bf440d915a6c1d3af2b4d9662badcb37e9b12f23e3e5c02a4d91610711"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ca/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ca/firefox-57.0b10.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "0cb95a2b288f7042c1f6767feb1cab88d345e0f0298f3fbe3385e58c5466bdfb59a2c28683deb3a8fc3f4936dc991486295b1a920d1bc09df96cb77f58ecc4ca"; + sha512 = "60848bd684c2e7fa5c67fd6c1dcd8467d39b6dde9e7121f5cef26e3225e155641fda7c68745ed02e2d1e3ed91dab3c813771254940ffe6dde4b77a1e206af350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cak/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/cak/firefox-57.0b10.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "4b9ad14926a3c952ce3dc5aafc1a04036c6ec45a7a68835f512221ddef13d67c6473d40fc0993cdafa6d8ba6927910c20c089b331233b1b6f493c048770d7e53"; + sha512 = "a95f74d3ad5cc7e1c58b6b6762104c59eb0d0ce4a9bcd08967b32204c259bf71bd567cda8cfa019bc62d5c46439359f53d85fc8e07da7c8e5cefc571e13ddd35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/cs/firefox-57.0b10.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e7e748aaecb30b7ada664474f8b2f2f9a3632d58b195f895094de2d4ecc5952948cb688dce1a151cb2e3832bdae335ef74017241d29400d237c828369bb9c392"; + sha512 = "ba510c00e7903187943560bc468d90a6b723fe6c0887777157efd33b2e97e1274f36948db092e0d1b6b28e9c0abb7f67d900b3137cf94e310996945f955a439c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cy/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/cy/firefox-57.0b10.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4799a27cb22216e9ab2f8b2c18b18edb6eeb101995e804d78e86a1c79738f8c9a6cae0a3ae2caa1b1b104d4eed2218560c80d0be53b3e453419e576ea3eb5312"; + sha512 = "7f2541b14108d922e0a32b28a7ce3abde63c2b365ee16114fd280d8984f69f83d31d33f7fa243896ffc84f46b070be231816f7c2394e6c6a8e2ffc8330670b02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/da/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/da/firefox-57.0b10.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "fd26938de7e4df391edfbaca4b7d536bd3ef96ff53d85bb26b62fc8e9e1ebdaa344d69856a217f004ccb0a2a9f5aa18eded9f62f5ca4196ac07d845a80f74043"; + sha512 = "7221ae31d54e85fe9cf6b58f6eace9f1ac8ddd37ee43f7f29409eb82f4c09fcb8c1ffae3cfc92f515a426ea200911c92a784312ca5573a4fd3aa3793e3bf5fd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/de/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/de/firefox-57.0b10.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "bd753ea3bbfc389028316f76784bb0e4216777e34606b415bbcb6efe45095536bc5e45d6bce6bdb632cd59a3d99df18abb4579219d6fb1745ab81ad32c9d3939"; + sha512 = "b592f17e95b28224f58d2cbc41baa4dbc2bf7fc631a0a7a21aaa5a357ffd8813fbe15932f9338641f431838e5db745eb580ce1443b62fd000f552a9851af8030"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/dsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/dsb/firefox-57.0b10.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c5f8ee1bb7de2db1a6310b49c951749a0779f14fb3dba73fa4e925b69c7c6740330578e7762a796bb313c43ef3cd9175441e7494ccea719d1e904a7d06aa4947"; + sha512 = "2d0e0f0efd3d4b842f8b8511d44e194efcc7fcd9512b361174f097287ee40784377985e516a1c87cc26a7f691b6e9c7c38e8805608993de437008f343d8755c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/el/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/el/firefox-57.0b10.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "20d34d89e99653649766cd6f7ca49c0cecda2b0af76654fd077fc8287c730c49fc1050f7e30095a0d83e16a4f64e1c78e9a9119048d57f531968044d9ae50295"; + sha512 = "0a9ebb584ec52aa22ce51b18a92c8be2d29a916795a52060ac1663e4bd892006a464e2c2a99bb89a4d16796591fd0b452c2a114b42a99502317081c659c12037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-GB/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/en-GB/firefox-57.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "543c4cc7ae137bccd1e4f765ae9c4422605a584d939ab919d481e761d29cefebfa664e63ae1c40b78b12da9cc185a887480c93b5af64449a4b321ebedc81abf0"; + sha512 = "eaf2bc3bdd55114fe5226d877c9cc9d5f5f78f07363327995271d863286b6534e0d9ba9cefc6efcdf7fb1ec1091e943ff9bfa41b7090be4365ebb6a7dde35c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-US/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/en-US/firefox-57.0b10.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "e678f84ff6b82c989217f1c911a0d3c1e923785a8f0f65afaa4689bfe44a591d3b20066c93b5ab3c594e3330056435c5df86e1bec47c5d9ce6de0dfc68c65192"; + sha512 = "7a937c9fa67ee0d7bfd7bdd6d504cdc81c4afd6642a2d9888489845376c1975fb5e1129a9f0b55d5000d400f79049365e6a1433d0e8ca9cc2d7ddf3fe312b7a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-ZA/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/en-ZA/firefox-57.0b10.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "117868c399d9f41bea55441fadae9f6b7af7dcba2f6063a05ca7f2bf8f9197814f9314fec06cd63f3976cf389ef2f3c6425fb0890fd08cb036e8612c68f02ca7"; + sha512 = "ef75b4bcd4eb37349058ea9020ecb7bbdbde2873d3f15a01e9b727e4fbb58c32f09112fa1947b38b6343a004e0c2a45336f99f8534afe736120e7c92dff0e080"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/eo/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/eo/firefox-57.0b10.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e2f496ccc935fe978d05675e1152e518bb1c7a4b3cd393dd8d30a2f93cd586953df027d06c108f3531e9228c25844e7fd83d81a7caadfdec11f1bb5fb7dfa3de"; + sha512 = "9ae6501dc2bb47de897aa61a633048279cba4a9545a3250a58cd9688ee546857a7c5c69e661d78b595051f76e7afb9de60ba929c68468bbd568f76c848a2fba5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-AR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-AR/firefox-57.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d56dd6fc221ec085864c50fefb57a8b4a5c11d6dad5bc5a3a24ed2b968eda816ec1fff83b00bf89e5fec2272467147ab5a6e14b5e6f5f0be25b5550aba908870"; + sha512 = "19dc4c760481997aa9554a101263030ed1a322ddd0b2e4fa743f4b572305dd6cc69fc27b2196e586308c96c73dde8e5f155f1aa0f8f0239cfe64113b12586943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-CL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-CL/firefox-57.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ecbb9f624aaca6a02762ad0c0c15b9b6e4732efea4bdfe90f3557e4b242cdfece657d4bd71a369901b4866a36e6a95534d237f661c897c5375cb627d371ad3b9"; + sha512 = "0be6855e33910446d0216eb96a258e65db60dbb5820805c63cb4202c76adb25180c4fc343dec78cc3ac6030b476a77c87441343884e97013cb439daac45c84ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-ES/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-ES/firefox-57.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "2112e809b6109d9367f9257a24b0c4b66add2c63ca456647712e9ef4ff04ea0c38990e334381c4b822789b86b4bd9949e68ea323b95d626f1a5deebace4286d7"; + sha512 = "83164bef1ba1790ca2b9ffbdc89362e1f8b9c3d42aea938567841cf12b59f02bf30ecb3146a596b83715277bedeb8fc15b9f07ae1e34c9eb75cf7d464c7c2de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-MX/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-MX/firefox-57.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4291992b179e7d2c07d38b7bb0c41b6b78007929a535f6689e3cee287cbb11662c6e94e9e1d64dd20efa5e8b5f3d5df5f554d196d1e6a8606ea53dad2157093e"; + sha512 = "4a404f137b9d736d275672bb38eb7231d5d95f3538df3a320f573ba8d6a9e68ca8e02d3b89fe3a36ec08fc30dfafc9b57eb744f8bba25663b16575dfda5b4d3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/et/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/et/firefox-57.0b10.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "bc2cfa0b6729b1bba629db9bfaddeaf1e15ba6820ccf694ba2b468700b047e22ec8d8aad47a032af514e602023bbc45a9c94e80ca251b6f70fb5aa832491637c"; + sha512 = "e86f05f93c3e1e1c388f72248d79ab5d382610af3e2a23387a816cb76e3a670c22a3363d88187f83807d1d28b182775696d03c92869867217abe5bfa2561dfe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/eu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/eu/firefox-57.0b10.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f0021641ac2079869d698650bba26f3c3d9a265defbe17fbf27f7cbaa7be2ca76f37ba4e03f3adad453d093ddf768155df5ee53774dcc47cc4fa79eca3cbf613"; + sha512 = "fc93e9d91a7a9408f7e950b873630526ed2012849e7735bdfb4c63d7ac95bce3dc11327538845d58f83b70014095bf1e48f12bc29741a3b56462147fec244ce4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fa/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fa/firefox-57.0b10.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "169d6be0a9e344353976f16c860e8fdd68b75ab94800926ba63e6efb108c6af9116d18f48485d462ce441f2bb1d484a934756ca16d5f365c9280ff0f1894f832"; + sha512 = "241df02aa26144dbf6f22ea9b6c8a7de4fd5e86ba7999db5cf23be9e409172c565466686a8901525dc514e322a445ca9b9c0b367d2a0569edb13a2dc3d66c7cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ff/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ff/firefox-57.0b10.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "798be99da60a0ca0582b98dc3dd4e3f9c152e0f85f82a0f14adb7029905a206a801339d2565bac19c4acccdbb4617cc7d9f5b36df0497c3f33ca3f76c9fbb520"; + sha512 = "03f5240e53c36e847dd23b007f9b419bdf238a03b92678d702d0d13059516a306eb15f45c9469def50baf35dc43f420c924744d0ba862a614ad7d9860fe6cbed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fi/firefox-57.0b10.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "8659e136e27aea77acc9c73b679dfe0ed8c93176b70b69783b46828806ba41c3fb2f9e5b4679dcc554d7896c74589a86d8c9b35fa521ca84f051062f884fd501"; + sha512 = "f30ef14edaf8df27cff44349a34eab0fc45c90fdbb091bcffa6da89d7142be85f40d471a040b7d6340f03754e49c9c30e072b3800ea9133b194e5566cb87fa61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fr/firefox-57.0b10.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "effc8f5ff352e6690ed32fe5ccf0c47d136c43a083fe8223687e6c0526a772b9120a15d3418cda8a061d1964260a9d203c552dd0f5a030f0431e62dc8304f8a8"; + sha512 = "121e98383848129538fc9fd82d49c9aa7238576e89f639c1886a9c3fe23a9b01a084eeb398791bb584b09dc9efbdc803d2574177276cf74b0581e7aea194f684"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fy-NL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fy-NL/firefox-57.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "bff1f5d37a33d863fba0dab07d29fdf963c7be207cae27ad15c08657627896597c96bb6311aaedb8ce797e7d5adb3a7918512ef611836bdb0c083005d534a1c3"; + sha512 = "88879caa704f3169d548aba70392cf4a733c6ed49a32b6e34f0b25a40edfdabb37f7bbd2881fecd2028169477fc779a438f81a140dcc89ffa4fb70c0bb0fc17a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ga-IE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ga-IE/firefox-57.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a27f0f158d2384207448016e0f9a3a9752388303772b5765707b6dfe936f66890705849b490e00c8330254f872813da064639e666e4122cd1b6d8978ddaf87fa"; + sha512 = "9cbd9f42540e1a1d35f6de300a1e4946ce1331010b1089d8a6f366896cb732775c8ecb312fdf9a32488b3d27c4dafb0453a9c525b341b98142cded87f351c9ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gd/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gd/firefox-57.0b10.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "d1ba5363a6629dbc62cbc9671ad8920a1c29ac9f23ac22c42af085ad862aa924d650a6349f5ae8ea1ecfd8a285205e48d7701a0ee72b16fb7c64aad4d30d497f"; + sha512 = "fa51ec9542d3c53d571045c6ab0afa49e880dd1aa5cebf831cbea3f780dc71d462b13f790438053e926828c53675eb6b0933fd7bac6605254c69570e415e6bb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gl/firefox-57.0b10.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f6c5c318369dad3651d0e65c79ccf7f3dffada3b6ba93455069aefd6b2346e3fdb630821146d1067ef64199e6ce737101caed5e474344a1e62780304c12dfe3c"; + sha512 = "c5ba307b857b02a9ddc61ce8d342e8c7b95a6cbf81b8849746a0020da4a3abce1953d2818940deb4e853c2aafdf1b12fcb8bf04de04d5f07334a9428f8accc6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gn/firefox-57.0b10.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "bd40bd6294cecaf72be721def4e26a0a5b6056e561a0980f2945202f77bb44dfbfad339f246f73159a83a4abd46732fd59916408c922dcd7232318147f321ee4"; + sha512 = "5547e86e15715271a1ea6f00dba37a6d82c8c51cd4ee619d7f31e70462aebace55a52ad00bba0720d7f90d7d8d37cf1254281e283dadb1d37d6362e4bc4c7c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gu-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gu-IN/firefox-57.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "6d679736a588fd52af304764277c50466e296dab724654f928888d615b7a11254a96ac60b5350d2d35d4d6d534a4d94b684afc90c52fc1942a3521907c009eed"; + sha512 = "d9283d7ed1b8e5fa3becac5db518fc49a9503d11b88f58ecbea2b8b623a9c6b2837a0a08f682453d476445397cc9b8ac3a6fdf29de74368fdb0ded9ff1e52e2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/he/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/he/firefox-57.0b10.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "0c45ac0a18279e10ac6864f917ebb98fb1e199cf14ef5cab1cccf333c0f7daa29ef8784bf55faae82fb7b9ea2d53384415e84a166ffc13c0ed0928834372cdb1"; + sha512 = "f95b7982911b1412828131ab5ee151a5e88ee6710c77779c761dd25051ec7eeee930c1d6693d51d7bebe281e489a7e66123c5e40a707645b569b340621becd74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hi-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hi-IN/firefox-57.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "d021986f8d7cd98910a1ba7f1b057f5dd20b3c3ae652876be69e948f29c03515e417953a4c091511beca1a06d7fcf1df8dcacba4f32653601b0fdc1fc619d5f3"; + sha512 = "ddfa3141ad4e8fb3f6ca55f207a477de4f410795257866db7709986c8615e3e919fb6409ff4557ae658f33cbe2f7b19a1c282e4125b1ea084142d2effd002546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hr/firefox-57.0b10.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e112cf30bb21c7c30dcacd6fc214863070b4a3395fd02701e3914a4a2bfed59d82234b5f1f1e22fee9824e8a731f0afba52be71c468f2323982fbd6408d558c6"; + sha512 = "46a460c41d038dde02dc1a3d60e2eb75310239cebdf58559ecb7213f2cf65d97de4e46f24dfe63ca8256b0507f20a9301aea527d8af6020e141fd62d94a3732d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hsb/firefox-57.0b10.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "f648acd408ceb7637851ddf05b3174dd7a1a201dd07856138025a22a181e17904d15f357cfc2d3bca0a027c7f43baa0891d347a65d0b80f1869ff1c951021400"; + sha512 = "a9b3bfeb32b632b716e9a849da4507f3620363bb25daad44451d6b4115260b91dc35cdc313d15f39abf9f53d3df30a80d16c90514c473f4341e2168fc7f08d5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hu/firefox-57.0b10.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "3b8418ee8dfd195db7826a476613b47dd4ddb6e8b2b372f85e68a588ee13de89e89c3fc2e233f144c2199b75f7d18b245c4402f111f301b44be5c75f1eec262c"; + sha512 = "7a6fb1b9e0adadf7e0a7bd6f2c85ca0b71c0daef2373a3cfe5221c3af730862d5146aebc46911cc1de5dbe3abd279fc3405a216d7b58354706eaf103544ead46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hy-AM/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hy-AM/firefox-57.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a7be85d807202a0abf9704b43707a1bba75bd45f60e0d5e1cdeecfd1c2a0e932dfa0e16142e411ae2cbd8c3446a14c04766e50cc3ce8586a641c3f897172671d"; + sha512 = "9dad05aebf522b930533216a11621c599c8a232608c3d275763680463da2a9d1747632548825742f3dff4efc59e7badb04b306add7e63cf03cadbf619c29ef4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/id/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/id/firefox-57.0b10.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "eb1dd05c6c09998b020e21e344c0ac3303bf7fccfc65a0d73b6bdd3d7d371507a6b3fbf0814d621944d5b9ce57cb4e19379ef317e6151416a9f6cd1286825be8"; + sha512 = "a1fcdce6da2346c79a93a964b36d1abd9c79d7528622dc591a244855b8d3fc66194f8e16caf7d1f2085cd4fa2c6b223e20c0c78b10222bbc08868831607bfdf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/is/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/is/firefox-57.0b10.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "bdbb17aa801fea8a3e70ae75d197872a35114ef7a49c7ee56cf95763e26e2bb44a815563b2fe9e630843543599812015224c6634646915864ecfcadfed9ac978"; + sha512 = "8cfe06869122f5c03e650807a449b125d5694b7d0c6febe761d7f2779fa16af5190a4deecb497578564ed10bfe375a634f1b50eeddcf25d896af35ece936e1c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/it/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/it/firefox-57.0b10.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "915552b680051884db4a177ff17e19515352ef90ef4ae88b39abdda5db955bfc34cb92c65ac8ec4ff4a5ab69baccc42a91b3b079c0a58a93587468277d620da3"; + sha512 = "ece3ee07a11fa6ddc6479a3627b0fd77b083820244c216cdadba3554f3f3d63ae7ddab351b48b6168da5bf741aedc62fd8f294b4cde98aa32bd5ed2a3ccb93be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ja/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ja/firefox-57.0b10.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "1b3ab8420f3f18731385942f1e8012096708c49d7dd1614ee1439b80f5a742ec0fc481a55295d6f6989da4346940c58503fb67d13eb71dabfd332f84fb99c524"; + sha512 = "313b186761211111e357d87afbbfdb76c48f57b397b434d4ebf9ccc30d675a2c5b8b177b0325fb7ecce0796b5e5c5342e7cccb716217e11f5bcd8dd5a4b67d1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ka/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ka/firefox-57.0b10.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "7d20045d38c471aa368401f0e65f31c08744953c96d15aedbcf306ee3d0b7e01a80ed0a6e207115565ab2bf1400312e9e7a8da1048af299f9b74c9e99ca5dffa"; + sha512 = "a02e9fb44ad5c373f95e8c3f4f880e10c2ed594f5d200a6c3f37bae4aed9135de510607291061e18fa954f98e15314c112b60587fb70bbaec2eb5b4cc7f2d7a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kab/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/kab/firefox-57.0b10.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7364dcdabe219ba4f72355e74d9e8be9bd5a08990910190753df3a6de346964558e17840367780e61b1647d507ebb204ea11beea703586aeca2145bb8a9cf9f1"; + sha512 = "5a621e60fff68f07d97cd8be0cb4dccee7723eeda74a3520d70e819c844eccc3f5a06234718e4e4b2e48e6aa417d4adb977e2d4a88471e9a54538d7852832215"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/kk/firefox-57.0b10.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "12c3c49f0f9d80cd03a32fbc20f329fa7c34cbadc1ae625946a567b1b17b53fe1149ff92e6b5be22c5949a65024f9b24693a865a38bd8b458203329025fbeba9"; + sha512 = "3ec65e3fb9e9c4d1e77501341cbaa83b2822fdb44d4fbd18ad7777a39ad98ce0a36f0166ab10cc53e2c55833572feabf3f5a7b4c47e75439b376d7e457748594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/km/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/km/firefox-57.0b10.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "808673a5345e56c6206f116fa3b9319de2fd3bb4560884236dbdd133de03e4b065059066ba6d6490a16bd6d2dfc5007f5ec00149b2cdade6fe91034fe4b2f9b4"; + sha512 = "c3fdd47cbb311ec76b2ff1e48094e5e4797d7bd92db4eda142fc18fb01ed9810c78c9b25efe277fabe2626e9ce7ca5a61727aeb7096dc246ebf389214903a6ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/kn/firefox-57.0b10.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "15f0103356a44255c523db8c5dd6703997b18ff0a965beac32324180c631bcc3c57de1ce65f1ba98820af1c4c2c0db293333eef71b33e3806dafd654223cbf0a"; + sha512 = "15efbaec5edabedc7161c2c914257835fdb6c5a6ee9a7249fdcc2242ae60d415ec539a2862342060023f081318cb8806ca655e5fcded9068956e2008a8c5a2e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ko/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ko/firefox-57.0b10.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "fb8803093663addd2137bb336277bea3ff021dbfee15ec29da92ec92eea62c714f7a23248bf3804b276b58f82985eb34e28da64be6eea516aed32842ed621406"; + sha512 = "f6a77588d8409ce88f82e7b37cbc4def38ecbdd87e2d79915b3c3cf5441f4115c7d85844b19623cba9ac628fd37de9741dc709c8680c792dc3bbed3f89cac0b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lij/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/lij/firefox-57.0b10.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "161085ad5441331f70de49afac1d4d22ba7de31259d8675a828b36eadd36a0cfa97a800881a99fd3f8fe8a11e03b57d0aa7e4dbd15948457760f25cce0b76278"; + sha512 = "a0b8b995897dbb8bce215022d611169fa1bef4cadd0e347c36b3cc025715e8224f4b3684094586bd04e6a4461572a1d8261ad193addfe6f4524c106177d3c8e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lt/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/lt/firefox-57.0b10.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f5cc1ca615966721bad7e1c440621d9a09c1589ca0aca4b755aa8818c958b0e9f5e2b496aade5927dc0e7061c566794022a1ca38dd07a79683e38902afe124d9"; + sha512 = "d47509d0c2b18d00f867658befcb63d14c786f5e94d2c40ab93e78014330cce5a441edc42735157cc8bff5033246f0e0aeaeb99011b782f98baf1331a383f899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lv/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/lv/firefox-57.0b10.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f1ebc2d348dd8dd908b84351f51403b069c3b531134289c03240746927a46830dd47a54b15235ae86dc2cd5aa01d2c3bc94bc9b3efe45d35e8c4bc7123839852"; + sha512 = "ec3aaf962aa5e7a935ac3da0f79ee74a3dd0e42f3141d339f728b503cd723972f7c87cbaf7c79471ef716343c28acefee9d905c121f872fccde7fc1da83345d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mai/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/mai/firefox-57.0b10.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b6facd8e1d5ec870468ff024f4e6d454dd45e35561d5c4f3cd1c58e025c2868922d1b44a2f7520c82eb5911b7a887c98a614e7785f6ed052ecffb0039720b649"; + sha512 = "33bab56345c4a4fb95297549d5e365eaf1eae617510d951a5c80a3970e37fe855f86ffe7ec6344bf444aacc68fe0e4c0e04478ccb4f5b4f3f40de371ea1de3bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/mk/firefox-57.0b10.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "dd08da071d273041c6e442938d0957a0eed3b19b228c8e83ed4f38cbd481aec8759fd65639cedb2de8f698a79ac6b803dad3e9939fc30a327222a651034dbbe0"; + sha512 = "6218a4c6a176690245173c10a5d46139a43a09fe0e7de30fee8416aa2554bf4140b9e754e27a2861b5d4693697aaf065febc9f441bd5fc84c622966d104f536e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ml/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ml/firefox-57.0b10.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "be151a11954741b6fabf0c083f708f2063aaef2ca6ed3c63eb887c48e3e1d7599dcca4de4af946251a01bfd5e4c9d32f85fad749c1d345879ed54b829eac3f4e"; + sha512 = "4da4580be951839aa1dc9fa9e927677f964424e91431442b36784476be3ae342a0ae724ecedfd63be7e8e6e6e83977fa9146e0df0c70d409b4ddd0b6aab4aa6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/mr/firefox-57.0b10.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "75b069efe46f4d47434cb1f0c12fa19d51138e383ac1aebf83d4e2261942b7eee769b1a1a29a9b4e28450382d47206a8649b12fbb470c9a594141062f5e2528c"; + sha512 = "e6ac8fe111b31c64ae7e118ead56ab136bc199d2d0bc83f128128c1a9044bc8d7e9dca148f717bc5d015a746bcebbb2c2cbd8aa7905bceb30aae2ffda0f2cbf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ms/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ms/firefox-57.0b10.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "77858037401e6a92662f488cce07849f4074c084c9b2b3b30652d3555efd11c20beb2ad1ea927ecdc8daa368f89b02aeae4db7579b7dbd89b5fcf91a82197aa2"; + sha512 = "701922f348cf2d8a853a34a6d08c947198a85f96d972a1a3d1968045f097fe503df84c4c0bb8c8a16ffa5afa729d26a8026f06809aff6724d3e2fd54899cc3cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/my/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/my/firefox-57.0b10.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "3ce9fd601346a4552d9ea7da3a3c8048ff72e1f18577b8eab156adb1b8e174e686866f52369108d1351520354fc6bf6af2ed9e3f1fa6e64255948cae9bcbe068"; + sha512 = "b68ec863d9229da9c619ea924d182cee4a76d8cb9aaaad35c64ea31d4e03d46d025536d32408210abe6dd662398fe2b194b25b1a7b8ed52c77c99850582f01ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nb-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/nb-NO/firefox-57.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "24a72fda7378ab7a6ddbc4cc1a0cc8a37af81cd75516858cd5a8f659e14b2528937c846252d44f379a08f7d041509b829c29857dce37f247d5bf810208cda144"; + sha512 = "4c9ef671abb97fb49e3ce5f0d0dcea9f268566e7cb9a1650bedf8bd42648d92f45a0d70f2d5433e58cbe6c8796e67a9e443ab711e42543a45551653747d8dee1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/nl/firefox-57.0b10.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0d826036fd6dd68b787b748e34e7bf304b4233fc5203bde7581b771725ac3144c6aaa2d50fe854d01999b44a5e064c63247ddd02dba351cc6c89fd4facf70720"; + sha512 = "b51c079046412cdab0ada80205ceffa55c3b9e20f65f8378216b78797137b39fcc3ff9f6bdd15513de97f3d07c59afd1d803304e265f4f38e4118dbcaa20f422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nn-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/nn-NO/firefox-57.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "606aff032cc8fcb7d1739e1d6adfe3d2b05f1a0de6b5613269c5a3c2410976542bf2faa9105f122abc5d8891aba51f69b2fcd4d8dbd88b43112e37bb532131b1"; + sha512 = "3336e336d5baee973887a11836f3253c80134fdbfa218a4cb8902bc7f1909bd40bed217818d2fb8f6bcca6274a67ddcdf6ee71926c36dbde7e5fbb76294c1bd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/or/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/or/firefox-57.0b10.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "974eb2e7fd4ef1e93dd96a36199afa518a421fb3fbc59780bbd815014a84533cde3a76908af3f051f3be7eda8dbaf6041750faa44d264385f33169130b5a4174"; + sha512 = "44f8bf97e5e86e069a628cad3a3eacc98a9a9e271fd4732b313cfa60f8fd38f8f565fc476d6d18a2fde63f2a7298231613aa470db9426b65b9d2fe10af1c1121"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pa-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pa-IN/firefox-57.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "d6136d9049d9d19025c7c47c9268f1a93a5ee96bfa993078b3488ad23a9e29fc00c9450ba97e25608b7ae27d84cc3b40dfe50016db83658be6bc300b3be7cf04"; + sha512 = "37ae29a99719c6ede4e813f6e1f3646e69876ec5462c513dbce7f8c2f07c779ab10edec532cc7cb4177e53db13712e87863bdc8108c6975f56d1ac2323e85e33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pl/firefox-57.0b10.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "5aec655cce588bde2465b5d827a3d8966e588ca083bbbb452a2a6f3c3366478ae565a4f9162fd0d5045beed76f3aebfd3f44233e46275eb0a53e33efb079d1a1"; + sha512 = "848a83da8419827903cefbbbea9872fb8bb35f4baa484fdd596985afab9b18017e8ba465bb10c9090e82fe6d25fa839109302338bd51e93127620d8a178ef026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pt-BR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pt-BR/firefox-57.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "40663403f97dd5a89d1853c7cd5ac0f48c761c23c6823314cdb7e821f83e1ff48f7eb3cb123784d55b7771dcbc6a2c2c4ce3e691642d25685817eede03947bde"; + sha512 = "e3f17dff2ca325516e16a834fbf7a312dd5204a56762ae81c0aab154ec515075bcd9cd003771ea6b5addd5d063d4d2ae74116509d12fa6468bce49727ddbbfb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pt-PT/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pt-PT/firefox-57.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "46600e098ee503aaecf43e161a54ba0b60c79bbbd61de65f391937de3659af2520c013ad7360b9ab1e3aaada63ad371667bbb5633e46f8942410ecbb22cf4f66"; + sha512 = "40bba3f30c76964e1524f5740bc1bae353b6c3c3db1baa5b6031bc025280caa482f8e85e146bac1eab22fd95a2624d08101a2cb93c40aa57beb165aa448a721d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/rm/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/rm/firefox-57.0b10.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "23e08b80859f6482fd8fad3d2a43961fb12a44827b5fa149c006508d3778ca0a3e307522e777535ec693ef365b0e2957344ac26a18bf05381c69f9dca509a9f6"; + sha512 = "a72d7922cd2adfc9a08c997c29e03ad4135ecd5403ef044331e8e08032fc7d5fcba32d43745b2eda22a2ea062c6e9a470dbafbdb15831fa270220191bf07e2be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ro/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ro/firefox-57.0b10.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "54433c53212ad816d27fcc176f45242d275cca2e84fe68f985404471929c2907e95002a85f9c6141f8cf494bf6844940081e44e8046ede30ed6dee0b72a9eb68"; + sha512 = "5cc76ffa6e74ae54e1b49777e431c88d60df8d2e62cd7facc452ae4e186af66cd1c59720633f69f8340bca0900be2441aac0b10b58757d2835638ae554853a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ru/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ru/firefox-57.0b10.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ee04e06bcf36056a876e9c4eb2e1d130b6b882653aa7ff1a313e4a21054741a7fe46a8f74ef179abd52b03d02fb4af94e4b7cdbaa885a4c1f019636c2b4cc02f"; + sha512 = "4cedb1b7b31be69c2e47ac6ec5a5d8d46fbf052130e7a7b3f12b3439fae293498cee78d972c2eb3e3fcb97a080a70318cad43eec82c3a06d7ed4bd2362d9d38e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/si/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/si/firefox-57.0b10.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "0cb344cb274b27088af5d7ed41c76db40bec19c11abbbc421bf9efc7acd303156efdc5cdf8140bb022bd9607932fb636e678bdad16e8ea0b8f9a929be68ee081"; + sha512 = "46855faed2fe0c27f821e61aa58e418eb926deb48142b44e9cd529b5023e11d3d37fdfd6c52d3fb7ef93361eb71cc4776941f9459c03041bc806f37e75f9c7b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sk/firefox-57.0b10.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "23a5f4c49993cc8727583028b1bd982845482261b793d50b8ce8779d3a4351549eb046ca35cac2d7edb6f3b40deddf077f6964d3e4a56837649fe86670452988"; + sha512 = "784e6a4f0ebffda6d53f66d8294e5e044dbf74230738d260c685dbc1d0ce8ef594383f41a658b3144c1b5ab8217389377387e5f6bf4c5b13590e7284be0c96e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sl/firefox-57.0b10.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7052a71800b2a5a3f9ed89db3638f30207da4f55887f4ce65c722dc326ad42663051384f195611cab20f86855a5b2289bf9c5fe2fc3c78c740afdc5a435f4b3f"; + sha512 = "a9423053a6ae8443b1fbabbfbf6e1cfb04b2cb8bd7ec5d020fb54000547ffc9e58fbf977897a0ccae2f27170b9180446a1812c37b47b04cc5475a72d2e39eb27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/son/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/son/firefox-57.0b10.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "6eea9ccac2c6100d7d7c9f80af4cca596cc4e3a0f3128beb22c7414ce0ef8a8e9f5aeb9e22c9fc8cf30db93eebe065e80d835d2927325fdc7af9b359e7b55b89"; + sha512 = "ffb5061b2852c7e0ae89a4d251dbf681c45f7fc150d92e00a7fa9f358b2b7c63b7ee5963db473b53412aab5d50418e59ea666b1e0b423730522002aed39f1384"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sq/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sq/firefox-57.0b10.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "049cb4f60f812673bf912b7ac06e440e40bbcc90f42fbd3e12f5d7ac08bd5e4a4897a435a1481201762d9fd4b99db954e838385953d9f458b80f86ce66b02ff1"; + sha512 = "77a7f68fc2aa93bb95419a2a17a8b2b2f3deaeefe33e061eca09e2cb1f938a6639603eb9936c967fc8af01461ae485362b6bba2e8b34cae4d4c146b5adc372c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sr/firefox-57.0b10.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "fb7db4165ff21463fd798246f18f7b9337b167c67e54d521d3d7e5bb5433b5cfaeeddf57619cea4079e852573bf109c57554cf574615232de86cb5ca922263ad"; + sha512 = "28c5c3bc8d57fdb2c76ec1c40cbe2a96ac1e7bdc734b23410b16e0950a26d082372edaf29f784c4cb55db6f3f34bb2f96cfefd3ddef72b703d4cfa7c43d8782c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sv-SE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sv-SE/firefox-57.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c8dbf8652a5a4be2325ef28a43e5cb8b464fcd552d62ca5241b072b9450ceb54d70bf5ac30e1136d03dca58410107c7d70f11539a7b712e3e2cf0da43c33eb75"; + sha512 = "b4998b2f2ac1b77353bdd91d9b580d5ca9e2bda1d90fa0306493e31e57b16e4cc3f32e88e7ced1d6b3f486b256344ea689163c422ca3fede581b902e45b73cb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ta/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ta/firefox-57.0b10.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "66f1d6cd06e96d8835404446becc6f38516f43562d56a66991f1a73ff9915e0dff9ec31611e89c5596154a2c4b582d84bed30186691353ddaed914244575a27e"; + sha512 = "79a6f7cd615ac1a3cbc2989d8b59aa390bce485826b44338edad92f151f345f9a9e5a59a20e36215962010c36dab6ef0200880d6433dd00c2e301b9f63c6283a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/te/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/te/firefox-57.0b10.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "aebf87f18e27e8acaa0c8956e7f90bd88da408aa266aa96285ef0d3fd85d3f25751eeeaae58e86948d4ff8abf295babc23e3d3a021e50d7c1329b2712306f64e"; + sha512 = "057b4eb4109f9d73e401d06502028be4875684136edd3f0b474ccb4b95629ce0f1d84aab08abe1382b5bc241842eb2a5d540202def12c4ee9bcde6eb940bc9c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/th/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/th/firefox-57.0b10.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ff444997ab3a90cd5c4afd83a95d25c0d4d04d9dc82451bb8d33209433287cc4c31dd9f7887635ef4553776fe1be7407bac4a1fe7e5603679d209afa6717e2b5"; + sha512 = "20bb176c481ef473787f6cbb848a5a7f3d0610d6e24ade116d60565f2afe632c71651378850d144b20a1884562f87792a5609bbdae03a9120830fcfe4aafe983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/tr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/tr/firefox-57.0b10.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "8d5c1cb8ec1123cbf79cf156b54c86c28101078bed678b41dc996f42cad0b9d1fbbd83b02970a90f265e3839c2aecc9641d7231375146917b671411b02c913ea"; + sha512 = "ed1b30e3264b75dad2b44be7021ca98f6212b7286d1bb35e72f8bbcc6d2a260ebaf1971c403994e91df3cdb21e82991cc13e60788ebfc729a6a9bc74a51313f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/uk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/uk/firefox-57.0b10.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "452eb08a1fbd0c27a382707c8417717c3728aadf5eec774fc3a020d46f4bc598ada9ace6ce49661f14398ae5b618491c070b52cd4d5fb3cd304ad2946a870757"; + sha512 = "26ca1bd905fd7c3a888dd8d094bfe5eb33056ed156857331b2b03de7474528ed2c05c0c75246c8e20f81ac9cb943ac2b67d0db671bb8589a584b29ea8d6a59de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ur/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ur/firefox-57.0b10.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "379362f6fa4162fbed19994490183200ad4af8603ae0f8809637953332b811cd754027636f9cb49b5e5b851057320b5f936d09d1193930c6b400098dbf5440f7"; + sha512 = "301a4658a3f5833afc05222667202cc4ad8314e4539a2cc138bfdde954842b8ccbc0c2ec12822a2715de5f4e2bbfb089b5e1b3fea3b74de04277be2937454839"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/uz/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/uz/firefox-57.0b10.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ff457ccd5f435de9b03208a285d1c0e6ea942ff61592e26fa61e4946df1efec988f9f1d94091618c7b5d0b223c45ccf67773e4513445ee96bd1cf1e354034986"; + sha512 = "81f3851e88fcfd329b48ee44c812c72f58f6ebebc45f0aea2075d1138e27406eed4cf6ee4cfaaebceb812c9d6f5ecaf0196b32a8e06d2b5b10221ab271a8901c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/vi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/vi/firefox-57.0b10.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "848ec90aa86f0761587082720b607c4b3c463300dbe2b97d7a59eb4eecae3263016a3dbcae2e92baff971ab2c4180f6a68abad52f3f74f72c0dc99d9865a0e25"; + sha512 = "f8d0458f10009b623241b69084402ed0e52ee191c9076c659d341a5574cd52f0acf18eb9e89bcbe25ff398704354f19ae516bd6b0e068c6850e64ea5d44176d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/xh/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/xh/firefox-57.0b10.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "f0b0d4f81021010cefbb2734859eb771d0943d8bee301064d11e222c625bda65f12a322e066a363a1215514cf6ef7eb601bc22959a6e1fa9f29ef8da0c02bc89"; + sha512 = "8d0e01339e7f1ee17f932a0db799d4f8b05eb588513deef38624077da061d9240f28aab5b43bdb029081b7b2936a94bb4c519044f57e9058965cfb32b71bc44c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/zh-CN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/zh-CN/firefox-57.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0ca9911452654086037a09bb49aa7b5b200f42c40af7b94ecb55ba527518587cd5f345c88295cb43d9df8391a0f975cd35945416dd48057dbe8d4138cc3ef37e"; + sha512 = "1420ad33af75efd58c57e4376ea1d755945d2bba0cf65a6f8d33a3d22662418a76baf1911557886fe85e4263ae2212ad0587eb9ea9ea5fee19d6d24ad7833680"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/zh-TW/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/zh-TW/firefox-57.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c643582dbc92145a9ade0d8763c8f30e1fc0fe3b9cb55dc6e1b88dae3001a3dc4b05eeabbe9b0fc040fd37f30f2d8cb07dbb7fa801d55a8e273bbd61eab69261"; + sha512 = "a42937bbd8fee40d58752c8347d5138181da11342fa533e6941b39302547e828c84242d8c953cb101acadada555ffd14ffe4c17d97ae22fe062fcead384df57b"; } ]; } From e4f5477b6cc7ff815a6868962d13fb8b10864560 Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Sat, 21 Oct 2017 16:28:15 +0300 Subject: [PATCH 1490/2806] nodejs: 6.11.1 -> 6.11.4 --- pkgs/development/web/nodejs/v6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 9419b59e921..58cfc9af9fc 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -10,10 +10,10 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "6.11.1"; + version = "6.11.4"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "6f6655b85919aa54cb045a6d69a226849802fcc26491d0db4ce59873e41cc2b8"; + sha256 = "0l6lmid8wfvvbq391x0k19crs63zf6kkcln79fn3d088wcsh8bsc"; }; }) From 794ecdd8b88b225b58fc4f4b88828d63f047a80e Mon Sep 17 00:00:00 2001 From: Clemens Lutz Date: Fri, 20 Oct 2017 22:35:30 +0200 Subject: [PATCH 1491/2806] makemkv: 1.10.6 -> 1.10.7 --- pkgs/applications/video/makemkv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index d4cf4b6c420..ae7625d1972 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.10.6"; + ver = "1.10.7"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "99d68e4e0166c9a4e2dce6638e19cbe312b5981f6e1811ed0987578ceefac3e3"; + sha256 = "2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235"; + sha256 = "be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654"; }; nativeBuildInputs = [ pkgconfig ]; From 5121b67b12edb3c4e0570ca64f97c67096aa2dc4 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 22 Oct 2017 00:13:11 +0200 Subject: [PATCH 1492/2806] nsjail: git-2015-08-10 -> 2.1 --- pkgs/tools/security/nsjail/default.nix | 37 +++++++++++++------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index 3e4ddcd880e..a9763b07b71 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -1,30 +1,31 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub, autoconf, pkgconfig, libtool +, bison, flex, libnl, protobuf, protobufc }: stdenv.mkDerivation rec { - name = "nsjail-git-2015-08-10"; + name = "nsjail-${version}"; + version = "2.1"; - src = fetchgit { - url = https://github.com/google/nsjail; - rev = "8b951e6c2827386786cde4a124cd1846d25b9404"; - sha256 = "02bmwd48l6ngp0nc65flw395mpj66brx3808d5xd19qn5524lnni"; + src = fetchFromGitHub { + owner = "google"; + repo = "nsjail"; + rev = version; + fetchSubmodules = true; + sha256 = "1wkhy86d0vgzngdvv593yhcghjh63chb8s67v891zll6bwgwg5h2"; }; + nativeBuildInputs = [ autoconf libtool pkgconfig ]; + buildInputs = [ bison flex libnl protobuf protobufc ]; + installPhase = '' mkdir -p $out/bin cp nsjail $out/bin ''; - meta = { - description = '' - A light-weight process isolation tool, making use of Linux namespaces - and seccomp-bpf syscall filters - ''; - homepage = http://google.github.io/nsjail; - - license = stdenv.lib.licenses.apsl20; - - maintainers = [ stdenv.lib.maintainers.bosu ]; - - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters"; + homepage = http://nsjail.com/; + license = licenses.apsl20; + maintainers = [ maintainers.bosu ]; + platforms = platforms.linux; }; } From 582afac3cb2c5893bb83a6517c69d2b153be1ac9 Mon Sep 17 00:00:00 2001 From: dywedir Date: Sat, 21 Oct 2017 00:40:08 +0300 Subject: [PATCH 1493/2806] fzy: 0.7 -> 0.9 --- pkgs/tools/misc/fzy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 66f02bcc7bc..f1b049ba2ce 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fzy-${version}"; - version = "0.7"; + version = "0.9"; src = fetchFromGitHub { owner = "jhawthorn"; repo = "fzy"; rev = version; - sha256 = "11sc92j9fx23byxv5y4rq0jxp55vc9mrn5hx9lb162vdrl8a4222"; + sha256 = "1f1sh88ivdgnqaqha5ircfd9vb0xmss976qns022n0ddb91k5ka6"; }; makeFlags = "PREFIX=$(out)"; From e458c44c2b7b2815104d4bf9894a08a41ae0cf6d Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Fri, 20 Oct 2017 17:34:32 +0200 Subject: [PATCH 1494/2806] szip: 2.1 -> 2.1.1 Version bump because version 2.1 is now unavailable on the official source, replaced by version 2.1.1. --- pkgs/development/libraries/szip/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 2ad2ed55d7c..b74c58a2e38 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "szip-2.1"; +stdenv.mkDerivation rec { + name = "szip-${version}"; + version = "2.1.1"; src = fetchurl { - url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz; - sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8"; + url = "ftp://ftp.hdfgroup.org/lib-external/szip/${version}/src/szip-${version}.tar.gz"; + sha256 = "1a8415a7xifagb22aq9dmy7b2s5l0y6diany3b4qigylw6adlzc9"; }; meta = { From cc048f0b4524c78676c8efe8fe02a1bdbff696cb Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 01:35:14 +0300 Subject: [PATCH 1495/2806] audit: 2.7.7 -> 2.8.1 --- pkgs/os-specific/linux/audit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 725c788dd1a..7bec6cadcfc 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -6,11 +6,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.7.7"; + name = "audit-2.8.1"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "1vvqw5xgirap0jdmajw7l3pq563aycvy3hlqvj3k2cac8i4jbqlq"; + sha256 = "0v1vng43fjsh158zb5k5d81ngn4p4jmj1247m27pk0bfzy9dxv0v"; }; outputs = [ "bin" "dev" "out" "man" ]; From 89e5c3b700a11af93855bf9f6d392f61cf37bda1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 01:35:34 +0300 Subject: [PATCH 1496/2806] devicemapper: 2.02.173 -> 2.02.175 --- pkgs/os-specific/linux/lvm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index b7fa8e140e2..1a36c669577 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -2,7 +2,7 @@ , thin-provisioning-tools, enable_dmeventd ? false }: let - version = "2.02.173"; + version = "2.02.175"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "0r4dx87z7ggxmxligdzz43chgfrwn9lyj7vaz63z97h0gs61dfff"; + sha256 = "0n95cc2b0jb0fh2pd9jyg9ww7lyzpia9n9sryw9f4aq8dpna7dsd"; }; configureFlags = [ From 462fe501227876aa00467ec491ca201b56dbd219 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 01:35:49 +0300 Subject: [PATCH 1497/2806] e2fsprogs: 1.43.4 -> 1.43.7 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 7c3ab92fa88..22dc9e74723 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.43.4"; + name = "e2fsprogs-1.43.7"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d"; + sha256 = "1i51w5l45zhz3i98k92xbbvkqklvjrvw3zvqky3gk9cdmqp5y0w7"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; From ff9186374567ec30e44925d281eb8c51c06d7d3b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 01:36:07 +0300 Subject: [PATCH 1498/2806] gnu-efi: 3.0.5 -> 3.0.6 --- pkgs/development/libraries/gnu-efi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index e3b345b31ee..6691928c021 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnu-efi-${version}"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; - sha256 = "08hb2gpzcj5p743wcagm0j2m4gh100xv12llpbjc13zi2icwv3xx"; + sha256 = "149cyadpn2jm4zxfn1qmpm520iqssp9p07d650rs5ghgv015jl91"; }; buildInputs = [ pciutils ]; From 3ad02bb1fb8316fcd8c251564d45e6b891ec1168 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 01:36:15 +0300 Subject: [PATCH 1499/2806] less: 487 -> 520 --- pkgs/tools/misc/less/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index b3370a3cab1..49796c5f229 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, lessSecure ? false }: stdenv.mkDerivation rec { - name = "less-487"; + name = "less-520"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "01i7n6jaxwmww3pasy3hg38zc6x7jw0w05mqqvh6caqbrdaq9p7k"; + sha256 = "12wh0j07971j53v7irfcv0vkb7wpi7f83jll4mwjy92wc27fm2bv"; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. From d0631d444509dbe7d790deaa9226420f110fb055 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 01:36:25 +0300 Subject: [PATCH 1500/2806] libbsd: 0.8.5 -> 0.8.6 --- pkgs/development/libraries/libbsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 5e906c7ac5d..c73096d1eeb 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libbsd-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0a2vq0xdhs3yyj91b0612f19fakg7a9xlqy2f993128kyhjd0ivn"; + sha256 = "11wnkzims5grprvhb1ssmq9pc2lcgh2r2rk8gwgz36ply6fvyzs6"; }; # darwin changes configure.ac which means we need to regenerate From 7b4db5da18b6ed3e00b0433ddb46f724b63dfa63 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 01:40:00 +0300 Subject: [PATCH 1501/2806] utillinux: 2.30 -> 2.30.2 --- pkgs/os-specific/linux/util-linux/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 8e16a3165f6..3d4309b7177 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -5,23 +5,18 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); majorVersion = "2.30"; - patchVersion = ""; + patchVersion = "2"; - fstrimPatch = fetchpatch { - url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=155d48f590a50bb5dc265162ff2f9a971daed543"; - sha256 = "1wj0fj3iwaimr6p8wxg6l2i1hjyrfgcwcxziyxqz8acxba7k6zxh"; - }; in stdenv.mkDerivation rec { name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "13d0ax8bcapga8phj2nclx86w57ddqxbr98ajibpzjq6d7zs8262"; + sha256 = "1p494mwd8v6p6mpmmjybkc7bz1qwp9x4cdi8hdvp2nwvkr4fanvv"; }; patches = [ ./rtcwake-search-PATH-for-shutdown.patch - fstrimPatch ]; outputs = [ "bin" "dev" "out" "man" ]; From 1b2cc71e686122644b8efe926f241eafbb045e2a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 22 Oct 2017 04:09:17 +0300 Subject: [PATCH 1502/2806] cura: build with Qt 5.6 Workaround https://github.com/Ultimaker/Cura/issues/2596 --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a961dd1ce0..dfacf209926 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16522,7 +16522,7 @@ with pkgs; curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = qt5.callPackage ../applications/misc/cura { }; + cura = qt56.callPackage ../applications/misc/cura { }; curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b27147e18b5..c73ca736a97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -256,6 +256,10 @@ in { pythonPackages = self; }; + pyqt56 = pkgs.libsForQt56.callPackage ../development/python-modules/pyqt/5.x.nix { + pythonPackages = self; + }; + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; @@ -26536,7 +26540,10 @@ EOF twilio = callPackage ../development/python-modules/twilio { }; - uranium = callPackage ../development/python-modules/uranium { }; + uranium = callPackage ../development/python-modules/uranium { + # https://github.com/Ultimaker/Cura/issues/2596 + pyqt5 = self.pyqt56; + }; vine = callPackage ../development/python-modules/vine { }; From 3264001a9d05a3c472a41b4bd1b93f2b96e48a26 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 21 Oct 2017 04:12:01 +0300 Subject: [PATCH 1503/2806] python.pkgs.python-utils: init at 2.2.0 --- .../python-modules/python-utils/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/python-utils/default.nix diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix new file mode 100644 index 00000000000..6acd0934f47 --- /dev/null +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: + +buildPythonPackage rec { + name = "python-utils-${version}"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "WoLpH"; + repo = "python-utils"; + rev = "v${version}"; + sha256 = "1i3q9frai08nvrcmh4dg4rr0grncm68w2c097z5g1mfwdf9sv7df"; + }; + + checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; + + checkPhase = '' + rm nix_run_setup.py + py.test + ''; + + propagatedBuildInputs = [ six ]; + + meta = with lib; { + description = "Module with some convenient utilities"; + homepage = "https://github.com/WoLpH/python-utils"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c73ca736a97..b0fd00118d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -282,6 +282,8 @@ in { python-stdnum = callPackage ../development/python-modules/python-stdnum { }; + python-utils = callPackage ../development/python-modules/python-utils { }; + pytimeparse = callPackage ../development/python-modules/pytimeparse { }; PyWebDAV = callPackage ../development/python-modules/pywebdav { }; From 5ba9411d02bcff1292fe8da27d3648a556b217e1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 21 Oct 2017 04:12:30 +0300 Subject: [PATCH 1504/2806] python.pkgs.numpy-stl: init at 2.3.2 --- .../python-modules/numpy-stl/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/numpy-stl/default.nix diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix new file mode 100644 index 00000000000..835e39cc43e --- /dev/null +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytestrunner, python-utils, enum34 }: + +buildPythonPackage rec { + pname = "numpy-stl"; + name = "${pname}-${version}"; + version = "2.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w3f9yhw4mg88drqnn17gaqxbx941p3hg0rn8fsqrf5ry56h93k2"; + }; + + checkInputs = [ pytest pytestrunner ]; + + checkPhase = "py.test"; + + propagatedBuildInputs = [ cython numpy nine python-utils enum34 ]; + + meta = with lib; { + description = "Library to make reading, writing and modifying both binary and ascii STL files easy"; + homepage = "https://github.com/WoLpH/numpy-stl/"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0fd00118d1..7b4c6cad647 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13348,6 +13348,8 @@ in { }; }; + numpy-stl = callPackage ../development/python-modules/numpy-stl { }; + numtraits = buildPythonPackage rec { pname = "numtraits"; version = "0.2"; From 6c5184fff782b1792d2577b071c2e33087530a13 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 21 Oct 2017 04:14:01 +0300 Subject: [PATCH 1505/2806] python.pkgs.libarcus: 2.6.1 -> 3.0.3 --- pkgs/development/python-modules/libarcus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 47110ffe3ba..789beaa2384 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -7,13 +7,13 @@ else stdenv.mkDerivation rec { pname = "libarcus"; name = "${pname}-${version}"; - version = "2.6.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "1arh0gkwcjv0j3arh1w04gbwkn5glrs7gbli0b1ak7dalnicmn7c"; + sha256 = "05dpd6nx32nws0ghsm365wlsb8hg2s3v9fqcmdk11biwfhnr6rjw"; }; propagatedBuildInputs = [ sip protobuf ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Communication library between internal components for Ultimaker software"; - homepage = https://github.com/Ultimaker/libArcus; + homepage = "https://github.com/Ultimaker/libArcus"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; From c3f8fb3cd78ce8dc776d929f752edc8ca54bf727 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 21 Oct 2017 04:14:39 +0300 Subject: [PATCH 1506/2806] python.pkgs.uranium: 2.6.1 -> 3.0.3 --- pkgs/development/python-modules/uranium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 36b8711d7c1..2e4a232f1f1 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -5,7 +5,7 @@ then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - version = "2.6.1"; + version = "3.0.3"; pname = "uranium"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1682xwxf6xs1d1cfv1s7xnabqv58jjdb6szz8624b3k9rsj5l2yq"; + sha256 = "1pyzpcdb6kb0basvhgpjdiws8x0bwl71k7nkf3j3s9wk1dvyw824"; }; buildInputs = [ python gettext ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = https://github.com/Ultimaker/Uranium; + homepage = "https://github.com/Ultimaker/Uranium"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; From a5091226bd000d80cb1c81a0bc7591f6747fdebc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 21 Oct 2017 04:14:52 +0300 Subject: [PATCH 1507/2806] curaengine: 2.6.1 -> 3.0.3 --- pkgs/applications/misc/curaengine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index ce7109dd6fc..575889ad2c6 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "2.6.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1vixxxpwrprcrma0v5ckjvcy45pj32rkf5pk4w7rans9k2ig66ic"; + sha256 = "0x1ss3hppw6062rmmxh0dpnm5cg6r2mp01k0nxyw5riiljj59ydy"; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; - homepage = https://github.com/Ultimaker/CuraEngine; + homepage = "https://github.com/Ultimaker/CuraEngine"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; From 6d86fcb86de75a307684cf2e6b8a518bd458427c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 21 Oct 2017 04:15:00 +0300 Subject: [PATCH 1508/2806] cura: 2.6.1 -> 3.0.3 --- pkgs/applications/misc/cura/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 3fb66907295..1012f187497 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,18 +1,18 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, curaengine }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols, curaengine }: mkDerivation rec { name = "cura-${version}"; - version = "2.6.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "03rsw6nafg3y9if2dlnzsj6c9x3x7cv6gs4a1w84jaq4p1f8fcsd"; + sha256 = "0ks8bb3mif6kyvb01ddhpn1c2l31s8fxivi70kmpm743sqv4kjaa"; }; - buildInputs = [ qtbase ]; - propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ]; + buildInputs = [ qtbase qtquickcontrols ]; + propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ]; @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = https://github.com/Ultimaker/Cura; + homepage = "https://github.com/Ultimaker/Cura"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; From db4b872d53eb98051a366d89eca32f278a6abd95 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Oct 2017 11:15:56 +0200 Subject: [PATCH 1509/2806] remove unused pythonPackages.requests_1 --- pkgs/top-level/python-packages.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b4c6cad647..65210b2e055 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18313,22 +18313,6 @@ in { }; }; - # Remove before release of 17.09 - requests_1 = buildPythonPackage rec { - name = "requests-1.2.3"; - disabled = !pythonOlder "3.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/requests/${name}.tar.gz"; - sha256 = "156bf3ec27ba9ec7e0cf8fbe02808718099d218de403eb64a714d73ba1a29ab1"; - }; - - meta = { - description = "An Apache2 licensed HTTP library, written in Python, for human beings"; - homepage = http://docs.python-requests.org/en/latest/; - }; - }; - requests2 = throw "requests2 has been deprecated. Use requests instead."; # use requests, not requests_2 From ba563450dc82321edf5b9ff53fd46a01baf6584b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Oct 2017 11:30:43 +0200 Subject: [PATCH 1510/2806] vimpc: 0.09.0 -> 0.09.1 --- pkgs/applications/audio/vimpc/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 0270fb24d9e..37ccbb1425f 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -2,14 +2,16 @@ , taglib }: stdenv.mkDerivation rec { - version = "0.09.0"; + version = "0.09.1"; name = "vimpc-${version}"; src = fetchFromGitHub { owner = "boysetsfrog"; repo = "vimpc"; - rev = "v${version}"; - sha256 = "1z9yx2pz84lyng1ig9y4z6pdalwxb80ig7nnzhqfy3pl36hq6shi"; + # Using commit-hash as there is not tag available + # https://github.com/boysetsfrog/vimpc/issues/70 + rev = "63556da6b94ab27d7e3f542399f5e0975a5812ba"; + sha256 = "1495a702df4nja8mlxq98mkbic2zv88sjiinimf9qddrfb38jxk6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 3c32c4151d50381ce0bec484b1de854370a7401b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Oct 2017 11:36:04 +0200 Subject: [PATCH 1511/2806] unibilium: 1.2.0 -> 1.2.1 --- pkgs/development/libraries/unibilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 4742e217013..53207f85541 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "unibilium-${version}"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mauke"; repo = "unibilium"; rev = "v${version}"; - sha256 = "1qsw19irg70l29j7qv403f32l4rrzn53w7881a6h874j9gisl51s"; + sha256 = "11mbfijdrvbmdlmxs8j4vij78ki0vna89yg3r9n9g1i6j45hiq2r"; }; makeFlags = [ "PREFIX=$(out)" ] From f94d6f7f54951416c938cc6a6a638e62d1c57895 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Oct 2017 11:41:23 +0200 Subject: [PATCH 1512/2806] pdf2djvu: 0.9.5 -> 0.9.7 --- 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 708bf46bbb0..e4613802892 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.5"; + version = "0.9.7"; name = "pdf2djvu-${version}"; src = fetchurl { url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; - sha256 = "0fr8b44rsqll2m6qnh9id1lfc980k7rj3aq975mwba4y57rwnlnc"; + sha256 = "1h92f9prx69wz9h57lncxj8ddh2xg6q7hjhlqqzzf30k59il4zcy"; }; nativeBuildInputs = [ pkgconfig ]; From 922e747f587a52471b2922254718a06294483886 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 22 Oct 2017 14:09:28 +0200 Subject: [PATCH 1513/2806] gitAndTools.git-extras: 4.2.0 -> 4.4.0 --- .../git-and-tools/git-extras/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index f8ac8c385e6..abd9013b6b0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "git-extras-${version}"; - version = "4.2.0"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0pr2vf5rajkwjm45zvnwkc13kvk3kyr18axxvmm8drsqdkr8lrjk"; + sha256 = "0vb8syyr5nbvmkj5g4rb1p8rqxb2hyl25gbyf4rd0b972d7iihhn"; }; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; - makeFlags = "DESTDIR=$(out) PREFIX="; + installFlags = [ "DESTDIR=$(out) PREFIX=" ]; meta = with stdenv.lib; { homepage = https://github.com/tj/git-extras; From d1c8c04ea6b2f09b3062301d1a91f6e5d9af7fb6 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 22 Oct 2017 14:12:19 +0200 Subject: [PATCH 1514/2806] git-lfs: 2.3.3 -> 2.3.4 --- pkgs/applications/version-management/git-lfs/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 0463081fa4b..5c2e99d8e3f 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.3.3"; - rev = "c9d3beb098254f067680a5ccbb8742387f81d82e"; + version = "2.3.4"; goPackagePath = "github.com/git-lfs/git-lfs"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1hzpzbm46f45vh5liijpyppfcmr7wycnsa09vmilq0wm341ivnsf"; + sha256 = "0fv1ly9577jrjwx91jqfql740rwp06chl4y37pcpl72nc08jvcw7"; }; preBuild = '' From 414720709bd11d6919007fdb99e3036645f7eff2 Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Sat, 21 Oct 2017 11:15:25 +0200 Subject: [PATCH 1515/2806] gitlab-module: fix hooks links for older repositories --- nixos/modules/services/misc/gitlab.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 14c184c3d68..1399a36ffee 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -632,6 +632,11 @@ in { touch "${cfg.statePath}/db-seeded" fi + # The gitlab:shell:create_hooks task seems broken for fixing links + # so we instead delete all the hooks and create them anew + rm ${cfg.statePath}/repositories/**/*.git/hooks + ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production + # Change permissions in the last step because some of the # intermediary scripts like to create directories as root. chown -R ${cfg.user}:${cfg.group} ${cfg.statePath} From 38a66bb033234e4d012a4e12443f7fe44e2f0306 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 18 Oct 2017 13:48:34 +0200 Subject: [PATCH 1516/2806] prometheus-node-exporter: 0.14.0 -> 0.15.0 --- pkgs/servers/monitoring/prometheus/node-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 2d2fb26324c..8b70ad423e9 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "node_exporter-${version}"; - version = "0.14.0"; + version = "0.15.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "0rm43jjqv7crfahl973swi4warqmqnmv740cg800yvzvnlp37kl4"; + sha256 = "0v1m6m9fmlw66s9v50y2rfr5kbpb9mxbwpcab4cmgcjs1y7wcn49"; }; # FIXME: megacli test fails From 0f0f0cbc6fb11f8537c3fe293a8451174106274c Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 20 Oct 2017 22:16:06 +0200 Subject: [PATCH 1517/2806] prometheus-node-exporter service: update for new arguments handling The behaviour have changed again. Listed collectors are now enabled in addition to the default one. Also run as DynmicUser instead of user nobody as the exporter doesn't need any state. --- .../services/monitoring/prometheus/node-exporter.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix index b5b852438d7..cacfb67ef06 100644 --- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -33,7 +33,7 @@ in { default = []; example = ''[ "systemd" ]''; description = '' - Collectors to enable. Only collectors explicitly listed here will be enabled. + Collectors to enable. The collectors listed here are enabled in addition to the default ones. ''; }; @@ -64,13 +64,12 @@ in { wantedBy = [ "multi-user.target" ]; script = '' exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \ - ${optionalString (cfg.enabledCollectors != []) - ''-collectors.enabled ${concatStringsSep "," cfg.enabledCollectors}''} \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatMapStrings (x: "--collector." + x + " ") cfg.enabledCollectors} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; serviceConfig = { - User = "nobody"; + DynamicUser = true; Restart = "always"; PrivateTmp = true; WorkingDirectory = /tmp; From a89b28f8b7e3281074ca29beca332a5aea598bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Sun, 22 Oct 2017 14:09:38 +0200 Subject: [PATCH 1518/2806] nixos/gitlab: fix startup script The preStart script used a hardcoded "git" user instead of the cfg value. --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 1399a36ffee..740cbc141b5 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -646,7 +646,7 @@ in { chmod -R ug-s ${cfg.statePath}/repositories find ${cfg.statePath}/repositories -type d -print0 | xargs -0 chmod g+s chmod 770 ${cfg.statePath}/uploads - chown -R git ${cfg.statePath}/uploads + chown -R ${cfg.user} ${cfg.statePath}/uploads find ${cfg.statePath}/uploads -type f -exec chmod 0644 {} \; find ${cfg.statePath}/uploads -type d -not -path ${cfg.statePath}/uploads -exec chmod 0770 {} \; ''; From d6e423c400b22959c090e7b2be0d47641a84dd1c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 22 Oct 2017 06:48:10 +0000 Subject: [PATCH 1519/2806] ocamlPackages.merlin: 3.0.2 -> 3.0.3 --- pkgs/development/tools/ocaml/merlin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index a6252a5c729..3d5a13c7e0c 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchzip, ocaml, findlib, yojson, lib +{ stdenv, fetchzip, ocaml, findlib, yojson , withEmacsMode ? false, emacs }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.0.2"; + version = "3.0.3"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "0lcgafs5ip8vhvrp1d7yv6mzjsirmayd83cj4wwq6zxcrl7yv4x8"; + sha256 = "19gz9vcdna84xcm2b53m6b5g4c7ppb61j05fnvry3shvjiz2p58p"; }; buildInputs = [ ocaml findlib yojson ] From 4e0a95294bd935a9fb1d18cb8a8dd9525ac41671 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 22 Oct 2017 10:21:34 +0000 Subject: [PATCH 1520/2806] gringo: use scons version 2 Using version 3 breaks some OCaml packages (namely ppx_deriving_yojson). --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfacf209926..bfb50c82969 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1103,7 +1103,7 @@ with pkgs; gosu = callPackage ../tools/misc/gosu { }; - gringo = callPackage ../tools/misc/gringo { }; + gringo = callPackage ../tools/misc/gringo { scons = scons_2_5_1; }; gti = callPackage ../tools/misc/gti { }; From ad5b75dd715100496999b3642d5cc8815f739535 Mon Sep 17 00:00:00 2001 From: Erick Gonzalez Date: Sun, 22 Oct 2017 10:25:37 +0200 Subject: [PATCH 1521/2806] strongSwan: Enable EAP Radius plugin for remote authentication of dial in ipsec clients --- pkgs/tools/networking/strongswan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 641e1238872..7ef278e359c 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "--enable-eap-sim" "--enable-eap-sim-file" "--enable-eap-simaka-pseudonym" "--enable-eap-simaka-reauth" "--enable-eap-identity" "--enable-eap-md5" "--enable-eap-gtc" "--enable-eap-aka" "--enable-eap-aka-3gpp2" - "--enable-eap-mschapv2" "--enable-xauth-eap" "--enable-ext-auth" + "--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth" "--enable-forecast" "--enable-connmark" "--enable-acert" "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ] From ff562459ccbf61fa47c79bad59d8d0aad38f3bb3 Mon Sep 17 00:00:00 2001 From: Martin Potier Date: Sun, 22 Oct 2017 10:27:26 +0300 Subject: [PATCH 1522/2806] nixos/libreswan: add missing runtime dependencies --- nixos/modules/services/networking/libreswan.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index e7a6c565f4f..280158b89f6 100644 --- a/nixos/modules/services/networking/libreswan.nix +++ b/nixos/modules/services/networking/libreswan.nix @@ -17,7 +17,7 @@ let else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str; indent = str: concatStrings (concatMap (s: [" " (trim [" " "\t"] s) "\n"]) (splitString "\n" str)); configText = indent (toString cfg.configSetup); - connectionText = concatStrings (mapAttrsToList (n: v: + connectionText = concatStrings (mapAttrsToList (n: v: '' conn ${n} ${indent v} @@ -27,7 +27,7 @@ let '' config setup ${configText} - + ${connectionText} ''; @@ -93,6 +93,9 @@ in "${pkgs.libreswan}" "${pkgs.iproute}" "${pkgs.procps}" + "${pkgs.nssTools}" + "${pkgs.iptables}" + "${pkgs.nettools}" ]; wants = [ "network-online.target" ]; From 3c48a1e06dc334c2229e441e0b96ecac709ac08c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 22 Oct 2017 06:13:09 +0200 Subject: [PATCH 1523/2806] nixos/services.nginx: Fix globalRedirect example Virtual host globalRedirect attribute accepts a hostname not a URL https://github.com/NixOS/nixpkgs/blob/09a9a472ee783b40c2a3dd287bbe9d3c60f8fc58/nixos/modules/services/web-servers/nginx/default.nix#L167 --- nixos/modules/services/web-servers/nginx/vhost-options.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 8a04e07eeea..801601aafd9 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -142,10 +142,10 @@ with lib; globalRedirect = mkOption { type = types.nullOr types.str; default = null; - example = http://newserver.example.org/; + example = "newserver.example.org"; description = '' If set, all requests for this host are redirected permanently to - the given URL. + the given hostname. ''; }; From 9ba279f0c89be0d7b089a036ad729a5f7b221858 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 21 Oct 2017 20:44:17 -0400 Subject: [PATCH 1524/2806] elpa-packages: 2017-10-21 --- .../editors/emacs-modes/elpa-generated.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index ac716ad0552..a2fc324a618 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -201,10 +201,10 @@ }) {}; auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auto-correct"; - version = "1.1.1"; + version = "1.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auto-correct-1.1.1.el"; - sha256 = "141dp4r6v6qs1a58z2qmsyr3pfgp3xji0sqg3fn91q2x4dkvqfzl"; + url = "https://elpa.gnu.org/packages/auto-correct-1.1.3.el"; + sha256 = "09r58p8na1ai2v9zllb92lvsjlq2jfzwvj0ipck1py0i4xfsm7aq"; }; packageRequires = []; meta = { @@ -241,10 +241,10 @@ }) {}; beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "beacon"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/beacon-1.3.2.el"; - sha256 = "0ldja8xrrninm588f27bhxvp0b12cngazyz688lkxvwx28cpqb7n"; + url = "https://elpa.gnu.org/packages/beacon-1.3.3.el"; + sha256 = "10r4fpf8pcf1qn5ncpm5g7skzba749mrc1ggykq92jlha3q98s02"; }; packageRequires = [ seq ]; meta = { @@ -945,10 +945,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.2.4"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.2.4.tar"; - sha256 = "013sdzpix9mc7d99mmpqv0r80zr50l1c7jld09p6767f86j6vahi"; + url = "https://elpa.gnu.org/packages/gnorb-1.3.0.tar"; + sha256 = "0c256473llp7ahl1wbm6m236cj2lhp9ms1clmxpsfv51ds27ljqv"; }; packageRequires = [ cl-lib ]; meta = { From fb2ad5327d4b40d7f9f6fe56f7c70a5f38a4c763 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 21 Oct 2017 20:45:29 -0400 Subject: [PATCH 1525/2806] melpa-stable-packages: 2017-10-21 --- .../emacs-modes/melpa-stable-generated.nix | 230 +++++++++++------- 1 file changed, 136 insertions(+), 94 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 455b391d056..22c98d88ed2 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1736,8 +1736,8 @@ src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "c36eff71af1299cc85c5b6fde3ed15eff8a5bd06"; - sha256 = "0dwzb7ix4zia6yzm2m1f0lp8hvv4sv3vvlcbnkmng1anjfmmdrn6"; + rev = "5d25972192cd34553997ba193c09eab093a2b870"; + sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2662,12 +2662,12 @@ beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "beacon"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "Malabarba"; repo = "beacon"; - rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b"; - sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn"; + rev = "729338b02a0e331a4faf475da9f54771a3470106"; + sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; @@ -4667,12 +4667,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.10.0pre2"; + version = "3.10.0pre3"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "4d04ede10c451ce9a53e8bc34e0d64ab167ad9f9"; - sha256 = "1ayc9zm7ll58ykdmyzilml17hapq7gc6ssmjr645sbcj3w70ba71"; + rev = "319622a49fb300cd8a7efd8378421a32204510de"; + sha256 = "19n0s0kd051xh3av9nd5ncpccx6bmvay6115g0kqgmi8wbw7587q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5786,12 +5786,12 @@ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copy-file-on-save"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487"; - sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9"; + rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84"; + sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; @@ -5930,6 +5930,27 @@ license = lib.licenses.free; }; }) {}; + counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-etags"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "counsel-etags"; + rev = "5d7b51ce7806bbe7e1f75077b4dde2ac17a53c5d"; + sha256 = "0v3b3gs4jy8cqkvchnakwpws3a0igiklchb9q3754lnmk8784dn8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; + sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0"; + name = "counsel-etags"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-etags"; + license = lib.licenses.free; + }; + }) {}; counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-gtags"; @@ -7854,8 +7875,8 @@ version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "023d2edde61d"; - sha256 = "1izhlafsbxfav4jvl7bqg188d71895r1sqacxsblvcld8c0brsqp"; + rev = "9e446540a794"; + sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -8039,12 +8060,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "2.0.13"; + version = "2.0.15"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "0269de80c97c80134c2fd6127de24dd2c25e5d8e"; - sha256 = "1rwwhr5wsvbv06l6cv3mi6g4ka24a6zqxgdx6mi1y3mxj08vmn0f"; + rev = "0b55c207c6552223857de03bf8aec8be3344ed26"; + sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -10840,12 +10861,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62"; - sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20"; + rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a"; + sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -13722,12 +13743,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "1.9.10"; + version = "1.9.11"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "71435fdd100712d6894d8d72a5667b250a0d8eb7"; - sha256 = "1c718gfms4zhzj06zmzdw71q6vhbf7mh3cgvq9vf8bnlv910p832"; + rev = "5504550605354146842c8f5c34482ece778b7b31"; + sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -14255,12 +14276,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "0.1.5"; + version = "0.2"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "f315677e3d35951021e1f10cc7b4f629814a13f0"; - sha256 = "1k2583dnj9did2pnd3ma4rfrd2n6r83yjccf403sgxzi1p054yl4"; + rev = "e04050f81106029c342deb7adbfc67b2a888ec58"; + sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -18169,12 +18190,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "a6a01cd4688fc9264fd36c279c0249f16704132b"; - sha256 = "0b6g9j76zd5wdqg4xkw34a6sijf8jsdvnnr7hbix7zf8cxrr2gqr"; + rev = "4ab1372c252847c316f8978a81e2fe92ff79579e"; + sha256 = "1kykbb1sil5cycfa5aj8dhsxc5yrx1641i2np5kwdjid6ahdlz5r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -18337,12 +18358,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "5.2.3"; + version = "5.2.4"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "abe2933e3d1f82e4eecfba11ffed27f7f52ca469"; - sha256 = "12f1mmkapjf5l6ka3k09s4i3qg5pk1cr0mv182657n0rvdn041d4"; + rev = "e18ec3f55e288883f8042065190572e91651733d"; + sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -19531,22 +19552,22 @@ license = lib.licenses.free; }; }) {}; - indium = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "0.28"; + version = "1.0"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "83ad172b96bb011bb705add136a7571b08f6c4c2"; - sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l"; + rev = "db3b727c9deedcf9afa13e07cd25734cbf7305a2"; + sha256 = "1cm6zm8d7rywvlhzf1vpblqb1kgn6c7bwk9q2mjz7f5gdcsx1jp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; name = "indium"; }; - packageRequires = []; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/indium"; license = lib.licenses.free; @@ -19806,12 +19827,12 @@ intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "intellij-theme"; - version = "1.2"; + version = "1.3"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-intellij-theme"; - rev = "2bbabe3f2f87716b10ccdfcacbf51016ecc32d54"; - sha256 = "0b3615lbm8fv4svv3g72dz62h9rv18m68b656lwl2ba9sn465rsl"; + rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606"; + sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; @@ -19932,12 +19953,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "72e1e73f3c9da2ad04286e13bfc8fc401626b7a9"; - sha256 = "155wvzsmhb8vz30jcd3xj91z74268pq7szax7jwd725ndx6x7ny8"; + rev = "78b06aa2df5251adaabb6c749febc1f1bd2ad605"; + sha256 = "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -20497,12 +20518,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "37def86f6e46742ddd5e774778d1c208e7942e0e"; - sha256 = "0w92r1lk2xb9lqjnqkxp2zv8rmf71kqyvq4mhaxvz36gm19rz1yd"; + rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09"; + sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -21932,12 +21953,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.18.0"; + version = "2.18.1"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "619a1b35b9a8151703421e2716ea0409162a4b84"; - sha256 = "0dakcsdn6pax0q6wdvg23fg327nk35z3lzk2vlvc76780d0fi85h"; + rev = "145d21d65b5469e682ef464ae8f4e0e3d8c0f04b"; + sha256 = "1h188cprka13bd1prfj1w86m5z8c1nfaz4dw18g88jf6b0gyazhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -22911,12 +22932,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "3c15edd8ddfb29a5151182983392ee831826d9d0"; - sha256 = "1a17csrp7ni4if8l5bvxb2024fav28vjii1qqym3gcalw0jg6ink"; + rev = "d714219aeb388ded88582c47940f2c6febae333c"; + sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -25342,12 +25363,12 @@ omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-kill"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-kill.el"; - rev = "192d51d843c6581d593a4eb01f1b49ad59d206cf"; - sha256 = "0n24rhzl1zhlkdkjigsczyc0z3yrihz9qnn1icrk6nkms107qbnn"; + rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea"; + sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; @@ -27073,12 +27094,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "022406066891d7a0f1fe8e2f1ddd7741dcf0accb"; - sha256 = "1yybx9psjydbrrbdp7fpp4pih8jxflvl3wz9k489hvp6p0nffapp"; + rev = "4b4585264a28152f2eda0f7e5ceed132f9d23e16"; + sha256 = "1k3lv4qqkp87piwlwl3gahac1zpjzv397f65g4khbpby2kgg8dpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -27115,12 +27136,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "0.2.3"; + version = "0.3.1"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "37d7a0d3d633542de02b4c415b1931ae93dd8ff6"; - sha256 = "09vgv82ws53wgd1inyin8y3v2yixg74w6bnr7awry4jmxbb15kz8"; + rev = "16cf5d595644ee4e05b05b351e0c4fdd5df0ac44"; + sha256 = "1n5xbgwv9x2b9zmv7nw0x64qbll4ycjf2dp09rdj3m4bmcg2gv42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -28182,12 +28203,12 @@ phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phan"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phan.el"; - rev = "4e3528f490e77d3aa6d81729b30b569434ef679f"; - sha256 = "1aif1hshwpzi353k2gcpwk9s76jlmz3s5dyf357qfv14b5ddhw6l"; + rev = "17b44a62580272bcf5ee91fb58098292e9de6f83"; + sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan"; @@ -29487,22 +29508,22 @@ license = lib.licenses.free; }; }) {}; - pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "2f22d9c2e3ebb0230cee8836c5f5186e05a038dd"; - sha256 = "1fvq1vx7sg3dqc9zcqbsp0iq1y7c2cjag0ng3snssyj0qh8q6ib1"; + rev = "96718f802dad3acd5a3f770b1452b81e39f77d92"; + sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85"; name = "pug-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/pug-mode"; license = lib.licenses.free; @@ -30411,6 +30432,27 @@ license = lib.licenses.free; }; }) {}; + reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "reason-mode"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "reasonml-editor"; + repo = "reason-mode"; + rev = "6b53815a0405be1f364a082d22fe5c900409a01a"; + sha256 = "1433bgakbfyf5d5vq69rwj4zg1h0xwjy9qsryvd9r1ssax2hzi7r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode"; + sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr"; + name = "reason-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/reason-mode"; + license = lib.licenses.free; + }; + }) {}; rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebecca-theme"; @@ -31987,12 +32029,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "979b021077655ca38749a60c9752c0817e8fd93e"; - sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl"; + rev = "55df581cdb3cfaf9ebf9c54d8849f8f5775cf74b"; + sha256 = "1s59v6fnyzvgnbjcd1gpll4xp8316dqmdpi77382w0vjfcrsvbih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -35093,12 +35135,12 @@ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tickscript-mode"; - version = "0.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "msherry"; repo = "tickscript-mode"; - rev = "e0184d7f954ce8d2d2ff4d34610658b0ce88859c"; - sha256 = "08ydrg3z3kvb54kxzlhiljrwil8681akp1lihkiplxdvrvg24934"; + rev = "eb6eafee2df253a0f1356f260cc7f435ab68aea2"; + sha256 = "04pd1dvvs914f98yaq5n0nv1jbjr2sjgi3a288vpismrmxfybcch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; @@ -35323,12 +35365,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.11.7"; + version = "1.11.8"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "fa064dfba2e98c23f2c79639347adcb601590df3"; - sha256 = "0ma55scqng5bmijyaz1q6lcl3w2b68dkvri5191kl19qgddcpg37"; + rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd"; + sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; @@ -35344,12 +35386,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.11.7"; + version = "1.11.8"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "fa064dfba2e98c23f2c79639347adcb601590df3"; - sha256 = "0ma55scqng5bmijyaz1q6lcl3w2b68dkvri5191kl19qgddcpg37"; + rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd"; + sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -35365,12 +35407,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.11.7"; + version = "1.11.8"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "fa064dfba2e98c23f2c79639347adcb601590df3"; - sha256 = "0ma55scqng5bmijyaz1q6lcl3w2b68dkvri5191kl19qgddcpg37"; + rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd"; + sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -35467,22 +35509,22 @@ license = lib.licenses.free; }; }) {}; - tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "2.0.10"; + version = "2.1.0"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "93b9c6cdba3a8f333cc817c3822fc76b71ff4dcd"; - sha256 = "14l0y7gahbz1l4ag5nvswj7cl4skchvzr6r7zc1a5k000skdmv69"; + rev = "64537bc753094b2adc2e3e97625fa9c0a01f9ae6"; + sha256 = "03d0n49p6d77p221majmbh0gjyrmh2z4cb2l2vi5xxfwc1fsxzmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q"; name = "tuareg"; }; - packageRequires = []; + packageRequires = [ caml ]; meta = { homepage = "https://melpa.org/#/tuareg"; license = lib.licenses.free; @@ -36736,12 +36778,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "77e6154ece15ffcc58db80dca48fe342376831aa"; - sha256 = "0zj1hhz7m0fxaj03aqjfd6jhcg2khi87l6742miwkdxxggwhdijj"; + rev = "aed3e00b6332a068d53ce482f5139a95c3dcd245"; + sha256 = "1p4sgn0rh8a5f0f6f1njq329zwgs6yp8j3zqs0yfz4kaikw1xw10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -37219,11 +37261,11 @@ wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wisp-mode"; - version = "0.9.6"; + version = "0.9.7"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "b56ca38c1447"; - sha256 = "10vn8i1ndyn2211ddy0z8vyv6y4myh2wd3xsk5nwx7qjlhkpjg6p"; + rev = "7633b2a5133f"; + sha256 = "0j6j9wkmq95dhx5cr3z2gpx5mvsqsgissp2060ij252ijc3l9k4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; From 5f8bbb96f89e0c52be17a12d60bdd851080d1355 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 21 Oct 2017 20:46:09 -0400 Subject: [PATCH 1526/2806] melpa-packages: 2017-10-21 --- .../editors/emacs-modes/melpa-generated.nix | 974 ++++++++++-------- 1 file changed, 519 insertions(+), 455 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 75db0db4fe5..8c17823105e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -127,12 +127,12 @@ abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abc-mode"; - version = "20171001.403"; + version = "20171020.319"; src = fetchFromGitHub { owner = "mkjunker"; repo = "abc-mode"; - rev = "161de34bc9e13bb094da0e99233b496a16f890fd"; - sha256 = "0dqn2y6afn36jry2lb96v8w6hwlzcln3d314j5n4sl4lh5ba2s5f"; + rev = "238deedeb6c90df168045552eb463cfae9e1f88f"; + sha256 = "1wkjdvsav2x9zsl25h87iyfl6r0md86i2gmxqhvf63acxqgrgb2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaee9dc5de06747374f311d86a550d3cc15beed1/recipes/abc-mode"; @@ -740,8 +740,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "6ba48256ec1b7b5aa31204c75e29a3eb7e284478"; - sha256 = "16nnywf0pakn1r6674aw9qr7iyjd46d54drmilr8d5hb3cj2fyqc"; + rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; + sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -757,12 +757,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20171014.1920"; + version = "20171017.422"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "6ba48256ec1b7b5aa31204c75e29a3eb7e284478"; - sha256 = "16nnywf0pakn1r6674aw9qr7iyjd46d54drmilr8d5hb3cj2fyqc"; + rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; + sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -803,8 +803,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; - sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -2463,12 +2463,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20171014.2048"; + version = "20171019.916"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "c36eff71af1299cc85c5b6fde3ed15eff8a5bd06"; - sha256 = "0dwzb7ix4zia6yzm2m1f0lp8hvv4sv3vvlcbnkmng1anjfmmdrn6"; + rev = "5d25972192cd34553997ba193c09eab093a2b870"; + sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -3974,12 +3974,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20171004.925"; + version = "20171018.937"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "dfb7d8eb4cb1e037e5a460b514b907306f8b845b"; - sha256 = "157jbkzh0g7mmx94mj36lx137gzhzb9sqxjnjaissqn571p9ykay"; + rev = "b583c34750044ad0da511341c44332ed94995520"; + sha256 = "138q2gj32sxx69vmxbc4wcihph38g9ychak7q7sy2zziqwip1nlb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4037,11 +4037,11 @@ axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; - version = "20161120.1200"; + version = "20171021.822"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "110e20a7a86c"; - sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm"; + rev = "f99f1eb2af8a"; + sha256 = "1n4rrvq95bhhirak72wccwsd6822p38mvyyrrkgjz8ah1xfvfm1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment"; @@ -4378,11 +4378,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20171011.1939"; + version = "20171017.817"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/bbdb.git"; - rev = "bd06080d37237584cd7a30c9969712be350ba7bd"; - sha256 = "1hjijyw5hfgnla0ms53ksd2nfdiv55y1828qkiirm9yz14iv5bq8"; + rev = "339aa15f20e1f542db97a3f3d2d65a61ce5c0e93"; + sha256 = "00782y1vas8rd9g30jqhnc24bsqsy5c31qn85ipi1vc8lrbyfcg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; @@ -4545,12 +4545,12 @@ beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "beacon"; - version = "20170404.906"; + version = "20171017.1540"; src = fetchFromGitHub { owner = "Malabarba"; repo = "beacon"; - rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b"; - sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn"; + rev = "729338b02a0e331a4faf475da9f54771a3470106"; + sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; @@ -5616,12 +5616,12 @@ browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "browse-kill-ring"; - version = "20160125.9"; + version = "20171016.1312"; src = fetchFromGitHub { owner = "browse-kill-ring"; repo = "browse-kill-ring"; - rev = "c7df6c8f5fe1e82d17b23da6d43a038784721d10"; - sha256 = "0sndzhza9k4vcf70fzxsyzrfryaz92lm1y7bbb0dx10m65qljpbi"; + rev = "b746d01c888262e81d76f8949869cf9e02759b6a"; + sha256 = "177vbziv65jb3xla713iblng04m0f7hdq5d4hf0jaxn7pzm61n0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring"; @@ -6140,12 +6140,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20171015.555"; + version = "20171020.527"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "ae606fc37efcde89de926b662109a6d89743cc5c"; - sha256 = "0yy0jjw2qg94z3fbhhfl1arlf6gdw3q248i51l41x9bnr3klr09a"; + rev = "62c416a534a1b0c2acf1cababc49c435d4e33ea7"; + sha256 = "140cwm0jirmq3b9xwcqf3hfy38xsbq0z8jnzbgblwf31zpzgj6qp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6581,12 +6581,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "20170930.722"; + version = "20171020.1013"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "d229144189dc033b52477610853a034397378c4c"; - sha256 = "139nx7spvxjrnm4hivsbz68ihyf4p5swizgggs169k1gs76rw566"; + rev = "09e545e159c5166ae374ab505f4c1b66fb3ec6fd"; + sha256 = "00m9zd2dnv9bsg6y3imk6nj992zjsy1zf3ylg67iw6x88v01pvji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -6962,8 +6962,8 @@ src = fetchFromGitHub { owner = "anler"; repo = "centered-window-mode"; - rev = "c46af782ada0d4062d7de5cbbdc7c7471fdd0d15"; - sha256 = "1xbfmanimq0ql61lzxx74jf4kj1g9imzgwiy1498mhbdbw295fg0"; + rev = "6f9e873f5a98f356cee41367f2eaf1f5f5cd96fc"; + sha256 = "0ih41g9haypr2ifi26kihwx2zfnzjh8n2898w2ljn7xzbd0nkx8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode"; @@ -7046,8 +7046,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "7aa23462d29322e75af0d1434c80ce88c17b70eb"; - sha256 = "04n36c997dvbh5wbkq7rrrw9qd8vdzkwac7qbid3v51ic7mpzxy3"; + rev = "51b4a9aed3d18eb7b27e1580807ffacf5abd3bc2"; + sha256 = "1g9wg331fr578sgdz9c7qk27aphi2ryddib0sqdk9wsc5h41cfmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7945,12 +7945,12 @@ clean-aindent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clean-aindent-mode"; - version = "20150816.2029"; + version = "20171017.1343"; src = fetchFromGitHub { owner = "pmarinov"; repo = "clean-aindent-mode"; - rev = "78d917761b7f47f41dd1452e5a6fd783115913c9"; - sha256 = "01jh561gpicw3wf8nvmw0ggc08gjg8zfzvqhjidpjn6sk4za9fhb"; + rev = "a97bcae8f43a9ff64e95473e4ef0d8bafe829211"; + sha256 = "07dgx09j6nn5dl9vpqfcs5yqm79kza3h3r1lb7r09wpkmrg0c2cr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee9dac7c10e652f026643620418dfea9237a0d23/recipes/clean-aindent-mode"; @@ -8318,8 +8318,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "35f5d71b196b1a4b147a56a82b723d0383cb7282"; - sha256 = "11im686bjh97vm67325zkm7q8mzd575s0rl7r8kd0kz837gywbh6"; + rev = "05b6f053eeb56cb8301361bb84f9fe1371a53818"; + sha256 = "1vpa5k2f0ixgy2wzly420ywhrri07nvmimns6xkydilkqpp5mk1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8339,8 +8339,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "35f5d71b196b1a4b147a56a82b723d0383cb7282"; - sha256 = "11im686bjh97vm67325zkm7q8mzd575s0rl7r8kd0kz837gywbh6"; + rev = "05b6f053eeb56cb8301361bb84f9fe1371a53818"; + sha256 = "1vpa5k2f0ixgy2wzly420ywhrri07nvmimns6xkydilkqpp5mk1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8545,12 +8545,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170922.231"; + version = "20171017.608"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "37950c45f6a61383c70286bbecea305e6f1daf51"; - sha256 = "1si544nsjzwbikv3m17x2k4l0cnjrshpld28fzfhjv336p9jw25q"; + rev = "cfdf8522159882a3e07bfa1f648b07d807afb650"; + sha256 = "0wiv1bqgf3szg9dkdhccbxk28xgz07jdmfpfp24wic6dpny2vzjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8570,8 +8570,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "386f7c6e98a6ed2bb64915670b28aa7e95b517a6"; - sha256 = "1kxpgkmp5n51ysqzidx1mc3ciqmadm5s0yazq9la5kb8sm4rmh45"; + rev = "3e0441d87735241eb496b22bb8856bb29575b941"; + sha256 = "07q91k9fim3w646mfhwvj3ai56xkycs22izqlvz34ldlwysnx68q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9322,12 +9322,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20171006.1442"; + version = "20171017.1638"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "d033112748440e772f0173b28356e956ce57d8a0"; - sha256 = "0qabdz95wa4gqag212gcfys4kpnvdcv0kmq2kiwc6znyp6xicnd1"; + rev = "66e43a3a3388c3af3dd851ba0a1f48dcb6efb1ae"; + sha256 = "0wm1qrwmhzs3vphk6hbi288rvc66gznis5kfj25d86ilq4fvawsf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9901,6 +9901,27 @@ license = lib.licenses.free; }; }) {}; + company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: + melpaBuild { + pname = "company-lsp"; + version = "20171019.2235"; + src = fetchFromGitHub { + owner = "tigersoldier"; + repo = "company-lsp"; + rev = "2e32d6141370e0736644928a8dbd7812b89c717e"; + sha256 = "0fyl2bkn289f3b6150kyg6civair659c2pg13ng6x5vn3pih5agk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; + sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l"; + name = "company-lsp"; + }; + packageRequires = [ company emacs lsp-mode s ]; + meta = { + homepage = "https://melpa.org/#/company-lsp"; + license = lib.licenses.free; + }; + }) {}; company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }: melpaBuild { pname = "company-lua"; @@ -9925,12 +9946,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "20170804.1202"; + version = "20171016.814"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4"; - sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2"; + rev = "3481f03ebb6a613ff85b71ca8edd2d5842c49012"; + sha256 = "0nbnqgl2jly1n5nx20hr2i84r2shxjb3axv2p597b5kw2bdbsva5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -10013,8 +10034,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "6ba48256ec1b7b5aa31204c75e29a3eb7e284478"; - sha256 = "16nnywf0pakn1r6674aw9qr7iyjd46d54drmilr8d5hb3cj2fyqc"; + rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; + sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10030,12 +10051,12 @@ company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-plsense"; - version = "20171001.1200"; + version = "20171016.1013"; src = fetchFromGitHub { owner = "CeleritasCelery"; repo = "company-plsense"; - rev = "8a72677fcd7f8abef4fb1f046b6b424d5482aadd"; - sha256 = "02b7pfrz5k31bfq23m71hq8pzxsl2w43wjxaqx154g2bb8wkfdkr"; + rev = "68dd1ca0a0837990a2e6c2e36f6b10fdf4a9bb6d"; + sha256 = "07bqm1bg91r3vchy2q2pk3npngqfb73fh0b7mp1g9fj11h25mjfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense"; @@ -10166,8 +10187,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; - sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10666,12 +10687,12 @@ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copy-file-on-save"; - version = "20170817.2319"; + version = "20171019.347"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487"; - sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9"; + rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84"; + sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; @@ -10792,12 +10813,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20171010.105"; + version = "20171017.1029"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f7470feef4880a735495c5013465efffd049270d"; - sha256 = "13b05yzqppcm5lp3ryhhv5gp031nrvh0vc59hv7fyisw48byv3i7"; + rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; + sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10810,22 +10831,22 @@ license = lib.licenses.free; }; }) {}; - counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-bbdb"; - version = "20171013.1925"; + version = "20171016.1545"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-bbdb"; - rev = "f95e4812cd17e5f8069c9209241396780d414680"; - sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73"; + rev = "298b48cb9e1186347fbcaf1ba354efa5fe2d7556"; + sha256 = "137iv77j9a7mxsfrjxk4fpbaxw964pk4yj15609wijfcwgdjprwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; name = "counsel-bbdb"; }; - packageRequires = []; + packageRequires = [ emacs ivy ]; meta = { homepage = "https://melpa.org/#/counsel-bbdb"; license = lib.licenses.free; @@ -10852,6 +10873,27 @@ license = lib.licenses.free; }; }) {}; + counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-etags"; + version = "20171020.2305"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "counsel-etags"; + rev = "5d7b51ce7806bbe7e1f75077b4dde2ac17a53c5d"; + sha256 = "0v3b3gs4jy8cqkvchnakwpws3a0igiklchb9q3754lnmk8784dn8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; + sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0"; + name = "counsel-etags"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-etags"; + license = lib.licenses.free; + }; + }) {}; counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-gtags"; @@ -11762,8 +11804,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "01e9ff8856f92ad6b76950a41a375bc9c2f91fda"; - sha256 = "05xc8d1h60kskvbj3c659f8379qjvgf4fc4bij8r4dwg0iv3l93m"; + rev = "d31160f49f8d8dfe0287181830303f42ab2a12d5"; + sha256 = "05aggv2fzdnhpygkyabp8j2wg8m6zbn0bn8wqrgcybjr2dyp57mx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11905,12 +11947,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20171012.530"; + version = "20171018.624"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "d6cef9977c52f87233344c9dd1789392b77d16b7"; - sha256 = "0x7z6rrym5n3q42ij7sgk9s1b3jpk7p4153bkwskmgmsapvqc93k"; + rev = "d6e225cf5548ab67340697c2ba3a2a0f4149936a"; + sha256 = "0ll3h6ckmcagvsa0d02jymac95c3x79kgs4pi8dlly28rr7qa6b4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11926,12 +11968,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20171016.103"; + version = "20171021.1009"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "7bf175598de1cd13f02d984199ce55411dd36722"; - sha256 = "0b0g6p61fqiifhx02mppz77kr45m509ggi90nsqa0rimkg5y4nya"; + rev = "cdea9409920ed8e4739af39b9a6f4e6dd8e8c50f"; + sha256 = "1ncbrq38ivybqlwm57aqcqjhz8bs99i9aa28012v1s6l5qbnxgks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12133,22 +12175,22 @@ license = lib.licenses.free; }; }) {}; - dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dart-mode"; - version = "20170525.1236"; + version = "20171018.1115"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "9b11e8fb63549ee3700fb53e92e4ce2cb302c971"; - sha256 = "1cp0qmnhnp57vihn343jz14kxm1rwn5b004q9yjlbv1am389rr12"; + rev = "570e58c28b7f70923dfb507496468b227d5905c2"; + sha256 = "18zsqgdafphwj98jqiaaih0p0qy43z5i7d9ybsmy6b3d2qykbrwv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla"; name = "dart-mode"; }; - packageRequires = [ cl-lib dash flycheck ]; + packageRequires = [ cl-lib dash emacs flycheck s ]; meta = { homepage = "https://melpa.org/#/dart-mode"; license = lib.licenses.free; @@ -13147,8 +13189,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; - sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13168,8 +13210,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; - sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13294,8 +13336,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; - sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13315,8 +13357,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; - sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13441,8 +13483,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; - sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13462,8 +13504,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; - sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13504,8 +13546,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; - sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13525,8 +13567,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; - sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13588,8 +13630,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0d06f4860718671016df871cbd4ddf90e3deb50f"; - sha256 = "1jnnd0fj4sly7xi2qznmkxvjszhw3hx00m6yhkk7ws2nny41694r"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -13651,8 +13693,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "diredfl"; - rev = "45e9c46f58c655694758d4986b9195c8bb40ddf3"; - sha256 = "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z"; + rev = "085eabf2e70590ec8e31c1e66931d652d8eab432"; + sha256 = "19gjs90ai6fv4q7rhssrgc45d9g4frg680p1jgmbxzrd9jdy013w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; @@ -13815,12 +13857,12 @@ disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disaster"; - version = "20171011.2058"; + version = "20171016.1452"; src = fetchFromGitHub { owner = "jart"; repo = "disaster"; - rev = "3bbb15c9b974cd1d2ed2319e7bfa9792ae40968f"; - sha256 = "1bd2lz7jbx9yyni1yqfsxmlmhkrd8nds9wdzc0fcj7jp48qrdcjg"; + rev = "10a785facc60d89d78e0d5177985ab1af1741bb4"; + sha256 = "0iz43jdkh5qdllqdchliys84gn9bpj6688rpc4jnycp64141m6cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4654b3646b96f967e2c75440e664a417cd0f517/recipes/disaster"; @@ -14557,12 +14599,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20171010.1752"; + version = "20171017.1649"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "71b28384477397d38fcef15fe7d220844b175e61"; - sha256 = "0y5d3fl7xsn585qcm976fdg8ym5vggxz06kkm976bkfrplkd1gpy"; + rev = "d91f72b83ec22f1620372574582e163f921e6796"; + sha256 = "1ykl835k0s5nkb6343yk4gyk7hdx4l96jnfa84vdq74x2asidfs1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15438,12 +15480,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20171015.212"; + version = "20171020.503"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "621f8f0b4243d6525367c5eb500417b2d784aa61"; - sha256 = "0s5372njks9bmxy23iw84hinsmlw45rhr70nrzgn5bnhskc8ycmv"; + rev = "0b55c207c6552223857de03bf8aec8be3344ed26"; + sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16305,12 +16347,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20171003.817"; + version = "20171020.1157"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "e0e3fac0c41e8cf4efa2fea6dbb49d3ad80d6153"; - sha256 = "11zw1gqzxzim6y6yrbbbsmmyadpagqk5f79vmx8ly0x1ivk87ldn"; + rev = "4909b176dcab9c762048dd654032722002e0f4ff"; + sha256 = "0dr2xarq5irzq095hag6scwimqsp21866iaxjy27rygzgwp5g794"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16378,12 +16420,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170810.221"; + version = "20171019.1304"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "72adcdfb5d12d49429a1c655f0b02fe657445c4f"; - sha256 = "1y10xzvmxqj61r0sq3hcd6zq6x2ird1z54draaa0wpafgq8610g9"; + rev = "bd5e3f334044c8b33e2a0a2e0d8767aa6f0e03b8"; + sha256 = "1pyvpsi4krbmdx2739nnw5g71x3y209xwjl5a7xqbczy9qqxs18n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -17975,11 +18017,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20171011.1158"; + version = "20171020.1349"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "175e5af5250503c12a395f5559923d2b9367aae3"; - sha256 = "182q09g73161h557chddfg2qmbbz5vmnw2mnn96p962whi35n4aw"; + rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d"; + sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18247,12 +18289,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20170709.207"; + version = "20171018.744"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "5bdf3ccc728ca2db734a686f9d4893c57ed59d90"; - sha256 = "0nxf35b8mblzl3yqq9h2lpr3q6r89pqljyglxm38aid2f5mjnlvx"; + rev = "001c3adcc521223f6b53a2243635528b2cb7f7e8"; + sha256 = "0hsrlzx8bslzhpipryxxqrdaiw66cgak14p8v47l0ylvwmxxqn13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -19110,8 +19152,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "41765cc89a82fd28159b492c2156b6418e6dd8b8"; - sha256 = "0qsmkgpgwfh65zcrk6xnbd3469k6m0fcwsrhrz5v5y4lx61847z6"; + rev = "4b8255e9217c293f84a1e96b3ae8034d089e815b"; + sha256 = "1nyya11mpvw0k6gvz90iqsxj65w3c5y72k9rf60171gy1rplsbib"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19525,12 +19567,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20170914.1955"; + version = "20171020.2207"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "7581c109673c40aceff278cd524273f50ffe170d"; - sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h"; + rev = "9b1a49853909c4fae95d32bb9a68cace471c161e"; + sha256 = "03sr68mfi52ajqb6d9k3lpcrapjkqx9yynpfwin9y2328pmriaib"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -20407,12 +20449,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20171011.655"; + version = "20171016.740"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "f282263af448a87d2f51b9a1fda3c3942d2c025f"; - sha256 = "1iayfdmxf8mxi8chwdc06rzqpr30f7v85vwgzlff7vm0bvz51hdb"; + rev = "4777cd784953f5e38d76edf458e050605de45bcc"; + sha256 = "1mmkgpmb69c908yx9k7rgs4zvm1cf554bkqiqppkc92ml9gipfk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -20596,12 +20638,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20170613.510"; + version = "20171018.722"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "91c96e6ffdc6e7d5e49fd9b0ffb7df8794f0f2db"; - sha256 = "1nwibif8syk5dfygzcafsbh41gaxaps187zxdv75z2hbdbvqx1l3"; + rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a"; + sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -21414,12 +21456,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20171014.1848"; + version = "20171021.457"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "7c98104de8008c04b4f8c54829089396622c080f"; - sha256 = "0ylh58sqhh0zmapcp53hq889cc16rrpm4d74ms4a3b7wv5kyai6c"; + rev = "d20ba97e36dfb8d6965e9f43768a5fdea752da96"; + sha256 = "0am1l6b26sjdf06gnfd78qvgy5jif6r2lqrfvypb6spv4j62xy5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -22958,12 +23000,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20171009.1145"; + version = "20171019.835"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "cfe02c0b2f0ad09ff0555583b5cf43125f549108"; - sha256 = "1l1dc58y5wya3ml4rzzkkq7j2cg3nb1lfqfp9n0g9zv8qgnh46j1"; + rev = "ed41c2f1f7f97d866d379ee3f5d6f3d9f7847357"; + sha256 = "1cjg14f44m2j3inxzzvbv3gyrpgaf93sl3wivagq5cjngh68w23a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23189,12 +23231,12 @@ flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-color-mode-line"; - version = "20170929.1513"; + version = "20171020.2128"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-color-mode-line"; - rev = "19947b81ddce6df4f10d3facb7c047538036a9df"; - sha256 = "197knp91qx5y3kqbmnm4mcx61w73yr9xkvidvp96mfjzlldbjaz3"; + rev = "157b1edd79b44c26ef18862160e0ab50db27352e"; + sha256 = "0lrk2b6xa12zcv18z4j1lpl7b36sl7saz14warxc1fw3p7dr4hm4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line"; @@ -23525,12 +23567,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20170604.811"; + version = "20171018.327"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "a249e60803b1e423c67e40462229646cc77fcb68"; - sha256 = "04xghj1l4fnfhl139k3s6q7fhln946gx8ak7l6ys7rz23iizbx4q"; + rev = "2e21ec3c4eacdc100b1a45e97884350f53b832d3"; + sha256 = "0ijazydkz9lwxbnsvanpv3202k35a4knipp08inlw3pm3k16p3mj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -23966,12 +24008,12 @@ flycheck-plantuml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, plantuml-mode }: melpaBuild { pname = "flycheck-plantuml"; - version = "20161122.219"; + version = "20171017.1811"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-plantuml"; - rev = "f1628d589991c3d51965db0f14866b1202374eea"; - sha256 = "1j66y4qps1wjdagr36kgqgz1w8zcmwnpwcvgwn4gkif34n96s78l"; + rev = "183be89e1dbba0b38237dd198dff600e0790309d"; + sha256 = "1fbdbpwrlkvbgv693ndr3zamkf3gp28v94jg911fsav8bk08f6pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/65f050860a0efda8cf472c2945b79a0a57651556/recipes/flycheck-plantuml"; @@ -24138,8 +24180,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; - sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24260,12 +24302,12 @@ flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; - version = "20170729.1411"; + version = "20171020.348"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "flycheck-tip"; - rev = "cbdff9a574fab1222ed50d7c1359ffb820f30934"; - sha256 = "0ic9cdsi30mx5ldrbzc2i9y4q69fpa9s19zrdk10i3wxs6mmgl8l"; + rev = "9b0072d92e6b4a52834bf5a34120a0f5e1c8c2fd"; + sha256 = "1adcxz2chy0qcv5z79hhj05gdzk4l0jijy5iy9nd3sg8sclxf6nq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip"; @@ -25877,12 +25919,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20170918.842"; + version = "20171021.431"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "71435fdd100712d6894d8d72a5667b250a0d8eb7"; - sha256 = "1c718gfms4zhzj06zmzdw71q6vhbf7mh3cgvq9vf8bnlv910p832"; + rev = "5504550605354146842c8f5c34482ece778b7b31"; + sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -25906,12 +25948,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20171013.1920"; + version = "20171018.847"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "85fe74f211a234b59e0da9fad7c6b3f039346287"; - sha256 = "1ywy0hx3aadzaia7bb18gkfz5agbq4kczh1mk5mbxmczmlc7xj3h"; + rev = "98647eb56be24e27cf6abd210dac8c6299cd977f"; + sha256 = "1dhk9h7gf0hc8w9sdcgk89cbcjlxf4w7hn235rxd6iz7m4n28jzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -25939,8 +25981,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "dc001f9a34dba13a109310ac9b82903448e5007f"; - sha256 = "1sjzbnlp7kgzl33pkyaz9qpa902jgwygqxirs7w479jmvjkz1ci2"; + rev = "021e595c589f45e8444e2d049d1300ce7811baa2"; + sha256 = "1k7fkwfgnai33mrdh3wkqmm00cyydkb13j04zmxiwg3w6q4sx3a9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26061,12 +26103,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20170714.1430"; + version = "20171018.1049"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "0035b08ca445fb0dab3bb342a441d9ecd1b7b02c"; - sha256 = "0hkpjwil08321bkp2hwy85jpg8xbzjrqsnraa1aw91dm90fj0wh6"; + rev = "18a1d0228b28d8abb4c0fcb4af6d9815de19be07"; + sha256 = "186915xday81bqxdpwp5h5cylmlyflk9s1w3x3ajr2wzp2q3arfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26546,8 +26588,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "0d13786a4cc413cf12de0ace9ba6f43ddd7a032b"; - sha256 = "1i6xjnkhkx406lia4f8qgyn27x20ridxkd4199wmdlf2w44fvpac"; + rev = "06515c44830788254602af90118de07ae2effb12"; + sha256 = "1ymjq9nsqzf8vhrzniwqzszwbdlq5y2nmr8pgbwhmh3bvfbpj7ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -26668,12 +26710,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20171014.2102"; + version = "20171019.944"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "571b1323061fac806b376b8214642d48988e272c"; - sha256 = "14fwbvxrvfcn85xxk6wbaz2khdxix271xxf1daqygbhzj6j0h0jf"; + rev = "e04050f81106029c342deb7adbfc67b2a888ec58"; + sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -26861,8 +26903,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b4038b74cad1a3f3773b6ba08cd5e4f5e5c7847f"; - sha256 = "1c39m0cq5r671v2lcxq9p1zi8qh1rs9q61rpzf5pixib0ciyij28"; + rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; + sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28436,8 +28478,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "911d9f4a7e3020578f4609860d7e5ede422a8f28"; - sha256 = "0x2wx34gvz4dab7gyzs1992pf1f8zl5s5n1q1b4ps1d4ralglq1d"; + rev = "ec88ff999b47a5adcd1b09cc8b49c793af337964"; + sha256 = "0bmbia1h85d8nsl2gk6wfi0fxij0d8ha56f2h9kk2swv3w5yg1d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -28709,8 +28751,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "dee49fa3694c5aff05e4b340b0686772f65c1fe1"; - sha256 = "05kfklvgdn4wj1b0273i7qlwx19f8kk1b44s6np2mb7wy1rvazyp"; + rev = "b729d2e8e0270dea62f10a63be34c021d123e41b"; + sha256 = "187fkjpsvq1gyxsgnbvxi4z62hv773ii1lxna3vfz4rqjzcjgxh4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29932,12 +29974,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170907.903"; + version = "20171020.2109"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "9ced44c934e9d02dc41ab2f47686cc041f7ae5f5"; - sha256 = "1j10irax6h67wz76zlbhkylmmn4qnb9padwld9fk43n98cismbix"; + rev = "19fe60b9d07b6a29a529bb58addf91fec5392416"; + sha256 = "1x0vi50ibch57099ifzslyl6icw603bv2lasbrspz2w87qqg59mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30203,12 +30245,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20171015.2155"; + version = "20171019.2338"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "ba422033ec8142af5a9f18cff266f322737d7ef7"; - sha256 = "1gyyacylzfxq12nn6sgm6vnfs0apd2nlz0p6cfxis0ams31zrvhn"; + rev = "e98a4279135d5d7f4a2fec06c7e7c8b1a1fcacf2"; + sha256 = "075dvbfv5f36r1br7w17i6nhj1vxdnv3c0x2p28rgk5mv10bdpl2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30833,12 +30875,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20171015.2334"; + version = "20171020.1124"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "ba422033ec8142af5a9f18cff266f322737d7ef7"; - sha256 = "1gyyacylzfxq12nn6sgm6vnfs0apd2nlz0p6cfxis0ams31zrvhn"; + rev = "e98a4279135d5d7f4a2fec06c7e7c8b1a1fcacf2"; + sha256 = "075dvbfv5f36r1br7w17i6nhj1vxdnv3c0x2p28rgk5mv10bdpl2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30896,12 +30938,12 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "20170913.345"; + version = "20171017.342"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "3d215210191c61b775f7f63f3f5306ddfefc7e33"; - sha256 = "1vnkvlyg6br0a5a002il4fr0r819kl7nsff6l1zbiay75sgnj93d"; + rev = "2551469fb7faa1b7fdcbbcc3b143fdc8cab1ae66"; + sha256 = "1jmn6hyvi5y6zxbyddak6b3wxhck4w6mvi2fn7gnh04qvac2mb45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; @@ -32748,8 +32790,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; - sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33227,12 +33269,12 @@ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "20171015.528"; + version = "20171016.1437"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "3068b0229383bf18a88cd0b59694d611077cd58d"; - sha256 = "19l16zqg66y55bq6y8myv2iqcf5y604znf252j35prl12i0jiix4"; + rev = "3e08b24e9eabbb17535d39b087895c04cbcd5c1f"; + sha256 = "17i4q307rdpgpw76m6brf6vis1znfwfqzhfcb181zgf2gam620hb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -33479,12 +33521,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "20170706.552"; + version = "20171017.1103"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "98ba6d3d7744d536aee714e1284ffecfe8f590cc"; - sha256 = "1y8jj0xgj6hqqshcfr406216bpni5sj0bh9q52ds9mn5plmh4asa"; + rev = "cd65d149b8910edfa5536eeda26988aabcfd511a"; + sha256 = "0746wn62vwgnn4hg8ag0hq80hv7lwv929pjk5cccqqz4s0kp0c80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -33902,8 +33944,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "e7068cfc0ac506690ba2237381dae15f617875be"; - sha256 = "1lcwq3694kvfixzdwilfnpm3gsyvm7c70jq2208c1y520f2n002c"; + rev = "e18ec3f55e288883f8042065190572e91651733d"; + sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34129,12 +34171,12 @@ hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-sentence"; - version = "20171007.755"; + version = "20171018.819"; src = fetchFromGitHub { owner = "milkypostman"; repo = "hl-sentence"; - rev = "10cead52cb4da5dccfe30ba6756c11973d8ea094"; - sha256 = "1kl38jzgws5mw67yzg4055988sza36sdd8bq1dw68p9wi6kqpdqw"; + rev = "86ae38d3103bd20da5485cbdd59dfbd396c45ee4"; + sha256 = "1rzc74ckj06qs8kq2bd1cgqvgjd2qc3zxmk7bvgg6dy2m9nj52cm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence"; @@ -34442,12 +34484,12 @@ ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20161015.1945"; + version = "20171020.1146"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "8b9281611c49335e97f2b644e34aa07a47dc4b2a"; - sha256 = "1pnsrirbh901qzqals6p2bbf28g2xn2zminwzj2x02cj49vfyqsz"; + rev = "9d659f04b44f416676e6a002728d9a16afc9bd96"; + sha256 = "190vzs0pqcm120nv7959ri3v5qha5hnx4lgfby08wyl4973xncf4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -34568,12 +34610,12 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "20161211.1019"; + version = "20171017.141"; src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "1f7bd7290e4698ac0b26b911fde7727fcb609bc7"; - sha256 = "1cy1100qzdpkk7kcr54262jgc4zl9jqn66v51g72kmhc90ayj8bh"; + rev = "a0b55cba65a225df8d9e17a3ac448ce9e8ec962d"; + sha256 = "0k23xz34ksd6n9xa8anbpvx07fymflyxdggy2is2kp0vqg66pv5q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -34757,12 +34799,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20171015.1420"; + version = "20171021.30"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "0898d352551c93b258eb863d4ab540cd00c76a53"; - sha256 = "0b11plipm4l6cc963kdcb2hc9n0jac8y2kgxrlz5y5cp0xaf7gk5"; + rev = "903dfb4b1f46495d7a8a83fd62142c9e0dda3a03"; + sha256 = "0v5a4xbzj3gbncwy05azahznh4fgj92f0vdz23l626w446cndz0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -36138,12 +36180,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20171013.1300"; + version = "20171018.432"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "0119deb750c9b91b644867eef187606fed84eecc"; - sha256 = "1n3llb682cxfsfrsn0qpanaz83jcrxnhg5dsc8schgyqn4wnsgvb"; + rev = "db3b727c9deedcf9afa13e07cd25734cbf7305a2"; + sha256 = "1cm6zm8d7rywvlhzf1vpblqb1kgn6c7bwk9q2mjz7f5gdcsx1jp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -36578,12 +36620,12 @@ intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "intellij-theme"; - version = "20170905.941"; + version = "20171017.715"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-intellij-theme"; - rev = "2bbabe3f2f87716b10ccdfcacbf51016ecc32d54"; - sha256 = "0b3615lbm8fv4svv3g72dz62h9rv18m68b656lwl2ba9sn465rsl"; + rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606"; + sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; @@ -36641,12 +36683,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170926.911"; + version = "20171020.1447"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "2d3c04ce523674e79f9339189a79e6841e1fa587"; - sha256 = "1dgdbfxhhcda7hn9njvsjygn59rdx9wv9cgpj3aysll52zri8lh3"; + rev = "55b17bc6b9cf1e8621a210fd07de6177e55d1334"; + sha256 = "0zx6p1i3sy771hp4n3dkfgypwrrr35qpa71hlhs5zrcn17xka9jg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -36935,12 +36977,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20171002.1130"; + version = "20171018.1550"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "a571167eca2533343f523f0c9ee3886de2d7b917"; - sha256 = "1jh2w800dgadmc1xgxrhmbs8i7bz4xh0h5bdrambnwl173ca23pf"; + rev = "78b06aa2df5251adaabb6c749febc1f1bd2ad605"; + sha256 = "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -37208,12 +37250,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20171011.1055"; + version = "20171021.207"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f7470feef4880a735495c5013465efffd049270d"; - sha256 = "13b05yzqppcm5lp3ryhhv5gp031nrvh0vc59hv7fyisw48byv3i7"; + rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; + sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37338,8 +37380,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f7470feef4880a735495c5013465efffd049270d"; - sha256 = "13b05yzqppcm5lp3ryhhv5gp031nrvh0vc59hv7fyisw48byv3i7"; + rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; + sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37464,8 +37506,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; - sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -37586,12 +37628,12 @@ j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "j-mode"; - version = "20170911.823"; + version = "20171017.1813"; src = fetchFromGitHub { owner = "zellio"; repo = "j-mode"; - rev = "cf27446120c779f90aeb0b14aae24d55d2a4fe36"; - sha256 = "1f61finp605k7bii7g0gm92vpjrl5q3w28nykc0w95lm36hmg7qv"; + rev = "96154937120028f24ee4933904ce4240c87f387e"; + sha256 = "0mni4wk9kn1iq9vyl7v7akjsb566sgm2vwwsc4sk2mf4x7g9m2rs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode"; @@ -38382,12 +38424,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "20171014.911"; + version = "20171019.2142"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "37def86f6e46742ddd5e774778d1c208e7942e0e"; - sha256 = "0w92r1lk2xb9lqjnqkxp2zv8rmf71kqyvq4mhaxvz36gm19rz1yd"; + rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09"; + sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -38863,12 +38905,12 @@ julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-repl"; - version = "20171005.123"; + version = "20171018.443"; src = fetchFromGitHub { owner = "tpapp"; repo = "julia-repl"; - rev = "2c5d681ddd3bc6018c394f797cb01add805ed573"; - sha256 = "0l8asipch5pfk90jzifw0jxwhsfq9kam8msxlxscvhfj7wphc038"; + rev = "fbee2f5995a7781576b7a3b9f0707ea1e7ead2c5"; + sha256 = "18vqw0sz1ifhd6hpa5am9z2qykqz1dxwav65v8vgl6hrrbnkfzbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; @@ -39222,8 +39264,8 @@ src = fetchFromGitHub { owner = "ogdenwebb"; repo = "kaolin-theme"; - rev = "2521473512e31d9592b38927c65ca1e6291cb22d"; - sha256 = "1ya5yl8m5m7c99kyikd1dqbzfqh40w9aj1l9fpvzdnma7v9sshnd"; + rev = "b0808035ab7bb9b5b03a0f80dfb01141beeac75d"; + sha256 = "15bklknvd3x3n75shwis4j9gjfpwms37vaxvwd2bym3m1kx8kh2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; @@ -39726,8 +39768,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "70840e22fe16bd085946f1a5580849f16e62ff0a"; - sha256 = "0acqqaw4a6xsi75ys0v9ngndxxscdglh81j8jhgabz0rbzf8mkyf"; + rev = "1f4fdb290b9ff6f3a0694cc0cdad56e78a9490bb"; + sha256 = "0cmhsnc20x3n2njs16w6ng3s1csc8pp3k00p6ibigbbs06hd0v7l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41052,12 +41094,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20171014.17"; + version = "20171017.1052"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "883019f755f875f9ab7ee5a1347be8510dd1c98c"; - sha256 = "178qw1946mp3aw65iaj1dh4x97i95ln3rpzj6qqsqdasmzvf1744"; + rev = "d70db0d6cfae3c030167389828219b9c9ac88248"; + sha256 = "1jrcrlnn0k814wqw2dyzjhcc7q4k95pp7apcmfzv7zk5jwf5p0xk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -41371,8 +41413,8 @@ src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "619a1b35b9a8151703421e2716ea0409162a4b84"; - sha256 = "0dakcsdn6pax0q6wdvg23fg327nk35z3lzk2vlvc76780d0fi85h"; + rev = "145d21d65b5469e682ef464ae8f4e0e3d8c0f04b"; + sha256 = "1h188cprka13bd1prfj1w86m5z8c1nfaz4dw18g88jf6b0gyazhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -41475,8 +41517,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "ddb14f8532dc5b64fa4b83d54eb3625077751be7"; - sha256 = "0vsqsj9q0px4wyjxswmwx21dc99h5nybl1zf2p33jz3hj2spcdc3"; + rev = "7f2ed036912341ef20004385cf71d053a3cb156f"; + sha256 = "1kzzh5sybp9y47xzc4mirk4b6lcf736sxvi91rvf8fm5gp075sq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -41886,22 +41928,22 @@ license = lib.licenses.free; }; }) {}; - lsp-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, lsp-mode, melpaBuild }: + lsp-go = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-go"; - version = "20170709.1021"; + version = "20171021.336"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-go"; - rev = "d3ff1fdf5c5e735d5beebff3b0bbbdd3432fbfdf"; - sha256 = "08kasnkg7v0haqrhd2r6dn094vcdhygc1v9nx3lhlfd1sq84m7qh"; + rev = "d270b7c0bd893fdc73a97763e07706830756cad2"; + sha256 = "0i9l56dmkxcycn9a2ddj1zwa9cmzb5lpj6qn5x1k9q9yfk9hsc6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go"; sha256 = "1yg21qqlf8ma734vaz6xrfym2058gvx7llsqy94fbbg1fg61c32c"; name = "lsp-go"; }; - packageRequires = [ go-mode lsp-mode ]; + packageRequires = [ lsp-mode ]; meta = { homepage = "https://melpa.org/#/lsp-go"; license = lib.licenses.free; @@ -41910,12 +41952,12 @@ lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-haskell"; - version = "20171010.2245"; + version = "20171021.330"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "87ddaed885bdfc4ef0b92d6c608bd19161bc41b2"; - sha256 = "18j5hc7iv8q84c444bq3ggxg06k3vrxk6y72pc4s8b2k1gpba28x"; + rev = "16ca9fa975e64e840e062485ed30e4b297d72424"; + sha256 = "03zrk3h76hpacrqw7lchjbslh0lg081jqkgf9n5nhxj2jg60v3vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -41931,12 +41973,12 @@ lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-java"; - version = "20170522.633"; + version = "20171021.330"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "350c48ff4bde3c19b02b14ee519cd6ac7514d94c"; - sha256 = "07392bkq5b1jymplxm76yskyf2d55s4hd46zf890jxrjzybk0ffp"; + rev = "c3aefd421535e63929bef25cd341e893572abb18"; + sha256 = "1mr3pd1744dmx0mk0advnf3d8l8axjmxkik7lqzwvv1rl7x734wx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java"; @@ -41973,12 +42015,12 @@ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-javascript-typescript"; - version = "20171011.904"; + version = "20171021.253"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "2339bca13cd5e13f7954991653402c6bba330bd2"; - sha256 = "1jcrdbmalkyw2nm3bdd18aa98hj0vwzawbrvilr0xyhwlbgkfim9"; + rev = "c349da788f77b60f7e8ec8917054e97b8f41bc70"; + sha256 = "1b6lskd57p3c1dfz0c4pn80ksdq7vysjlbk3ja0az1nyxczmn44q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -41994,12 +42036,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20171014.913"; + version = "20171021.234"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "5acfc65929e7eab517f3ee8bf19407fa0ad2c32a"; - sha256 = "0mzlkrzh9dyd2a423rm3x4hkqr154bvy6snig992rjwrz568ln1k"; + rev = "e67ecf89b3878f8d5d079af3ce2b57933aeb1765"; + sha256 = "12ms4zl8j3s9nbqqasmglhnagxrpf8cjplagv2dakdlq7zllr8ri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42015,12 +42057,12 @@ lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-python"; - version = "20170430.443"; + version = "20171021.254"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-python"; - rev = "7057d3797ecfafab21f3365fd55ba14d44b278ec"; - sha256 = "1gw8zfxd9chln8z8sdxy9xjzs74q5zbhsgl9zc3sl8d0ml027qar"; + rev = "5acea5f921dc396ea092ee253ec01b45dee3cbfd"; + sha256 = "0nz0n7k0i0h77fn8w0d49b4pkljw7l15hzvjym16jh4gr1n098ar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; @@ -42033,22 +42075,22 @@ license = lib.licenses.free; }; }) {}; - lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }: + lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-rust"; - version = "20170829.142"; + version = "20171021.241"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "613a379e8cf62597181c72b3e4a69893852c60a6"; - sha256 = "19p8cw38kmj0kjw0kknicd8zva9f7vai9rjk3xbli5cwpmwvizy8"; + rev = "da4877ea682e46d6d6bb0077be5d00269f4c14e8"; + sha256 = "1miql5v987k6hgxxq0fqzj20al9y3qg79a5pi9d3y4yvzznidhpa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28"; name = "lsp-rust"; }; - packageRequires = [ lsp-mode rust-mode ]; + packageRequires = [ lsp-mode ]; meta = { homepage = "https://melpa.org/#/lsp-rust"; license = lib.licenses.free; @@ -42372,12 +42414,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20171015.2104"; + version = "20171021.1158"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b4038b74cad1a3f3773b6ba08cd5e4f5e5c7847f"; - sha256 = "1c39m0cq5r671v2lcxq9p1zi8qh1rs9q61rpzf5pixib0ciyij28"; + rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; + sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42589,12 +42631,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20171014.202"; + version = "20171020.1153"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b4038b74cad1a3f3773b6ba08cd5e4f5e5c7847f"; - sha256 = "1c39m0cq5r671v2lcxq9p1zi8qh1rs9q61rpzf5pixib0ciyij28"; + rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; + sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -42715,12 +42757,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20171012.2051"; + version = "20171021.1302"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "1ca114322c928bf07bf9e57058abe12c91cc96c1"; - sha256 = "0k1m81cr1nydmkbns9f91nfikp9dgwgv9yp95yfsq55xay3virxp"; + rev = "e5f33e46032deb381ec67832451a6c69cfdcb1e2"; + sha256 = "05s6cfsgxpqb6gvx6n4qdz5fznd87x7k26lz7ad0v7ky461any7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -42883,12 +42925,12 @@ makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "makefile-executor"; - version = "20170913.56"; + version = "20171017.438"; src = fetchFromGitHub { owner = "thiderman"; repo = "makefile-executor.el"; - rev = "90872c2e2ab05da7e8a9dd195fc696b4388c0f35"; - sha256 = "03505bzrlz8jxp5fda5zqn58860xbhhz5xy33wvnh1w9632ljdg9"; + rev = "a950438c93dc2fdcb867ac25174c773deda95aff"; + sha256 = "1vpa24k8gm9zr8mpam76k1wbzc1zama5s5ch1f8c1h539l8i8cl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor"; @@ -43248,12 +43290,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20171015.1901"; + version = "20171021.1428"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "9614c2135023fa443c03161fa8fb18f20fb7268d"; - sha256 = "19c7r643fw0gcavr68j3skcn67ldj16053inwx0ziy3s13s917xj"; + rev = "df31e2e82bf88655ed895c4a372e28e3a3569353"; + sha256 = "179wa75kzr0k8kjgk4z5iq5v2c8zbg7c6ii21fq35kyikkp5n8n3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -43444,12 +43486,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "20171014.1332"; + version = "20171018.932"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "3c15edd8ddfb29a5151182983392ee831826d9d0"; - sha256 = "1a17csrp7ni4if8l5bvxb2024fav28vjii1qqym3gcalw0jg6ink"; + rev = "406ea2f60c7e4aeafd384b8d6696d726b3d8f611"; + sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -44722,12 +44764,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20170813.1957"; + version = "20171016.903"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "ce9e42adf9333c68967597c17272b3a3c7564cea"; - sha256 = "1cl4ncmynhrvmllbkkwnw3064vw93xalk4zzy4bpb2zf74vwl1gy"; + rev = "0f74ecf500f833f7f959187a375dacdd33d4d569"; + sha256 = "03ixygw28hzn00136747mv2r3vii3n0gif1wqgg3k7ajh7c45f5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -46820,12 +46862,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20170830.2113"; + version = "20171021.1054"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "bc3af5a44f4272a8afa6e6c09f95f1cdd205c70e"; - sha256 = "1spyz9n1p6n4npm6j4ngr89n7y2f33kp2xj6jwvd4y4340g62m49"; + rev = "fd1af9030443a49d333956afc36491936aa930fe"; + sha256 = "010jr43xbwr2rfgcvjgb522ms92d0945svlngfdhkjq66bnl41a5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -46866,8 +46908,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "887eccf1fdd91d50c4761bba79b5cf329a280ffb"; - sha256 = "1bzf4sy3r5n7prxh4ifgh1q2n2zy2zh6brn0n5d955syi2fl1aji"; + rev = "e234a7bdb6c42f4539c0ab09b624f191287c2c10"; + sha256 = "01hsabhvp1yilzdss3mkvrskkvxw41xxch6lkwlcrr6h5f70szi2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -47051,12 +47093,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170906.558"; + version = "20171015.2358"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2"; - sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g"; + rev = "79c18c7efffd80446d81201b4c7dd92dde6cac3a"; + sha256 = "1xganpzb7sy5dlazjzrx9cif1r1n8lf3za0jwlq806w7601g5nym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -47261,8 +47303,8 @@ version = "20170927.415"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "ab8b40f7e350c0661dda5b9d52041150ed339a39"; - sha256 = "06s4988wmrr025434hamzplamw0knghkiny38q5pxnazbmq2q14p"; + rev = "d6929040a4828cf17fb1a4f4d49b95816a5e7b7c"; + sha256 = "1scgmw52ny6wwwdl7hcr3cw84ag2hrrvik6ppp16pfyzv58ywyw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47422,15 +47464,15 @@ license = lib.licenses.free; }; }) {}; - nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree }: + nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree, which-key }: melpaBuild { pname = "nu-mode"; - version = "20171012.1501"; + version = "20171021.1508"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "fbecd9cd2e3d03ef1838de64be9d68937681e1bd"; - sha256 = "1nygzgjyv95sz1ps9wy1vxsv2r0zj3063m3z3n2b6ybxw2a8hqc9"; + rev = "161f41f67b3fb10c2e3025670485a2dde24ab54b"; + sha256 = "0bqc0v4q222lx39axys2yfcfby6a5mcllnmpr3jdgsgagdhxxk05"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -47443,6 +47485,7 @@ help-fns-plus transpose-frame undo-tree + which-key ]; meta = { homepage = "https://melpa.org/#/nu-mode"; @@ -47725,11 +47768,11 @@ ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-axiom"; - version = "20161122.1222"; + version = "20171021.1448"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "110e20a7a86c"; - sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm"; + rev = "fdb3336941b9"; + sha256 = "0adi26fj1rgcjis5xspbcrdzb98d3fd693pxv9311ffsxkpfsl9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom"; @@ -48039,12 +48082,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20171008.1733"; + version = "20171021.839"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "4a181127000e43dd520e600880b49607747d8f08"; - sha256 = "01gfj11pd97xp02bdal3c9wy77ha1dcym1ddrbpzkvck2ja1s6ib"; + rev = "c93d26342c28d1ba01ab46406f7f277128d85e6d"; + sha256 = "08p7sm40s0sb4cplh92krp18jkjm62m5wsivcpzyln7ambb9ml3y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -48165,12 +48208,12 @@ ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-php"; - version = "20170819.245"; + version = "20171017.2206"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-php"; - rev = "ffbda1f7df86778e3209ffeef832433f0eb25a69"; - sha256 = "00ca5m6rmrxzy1aldmavv7f5i4pjfcyivrlgv2ri6dm8amvbk72r"; + rev = "c281c1e17f0fd7de4adb6c3e6029dc2bd76beca1"; + sha256 = "1c0967cpimmr5j7ymr4654y62f615dfrv1h3385i7n57jsvqr6bs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php"; @@ -48652,8 +48695,8 @@ src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c"; - sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; + rev = "002e047d848beb0e0b77538f0674dd171efc9d66"; + sha256 = "1al44f7nrh4jbx4vdpbps92pk6px0my43b24brinck186j8d7vc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -48795,12 +48838,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20171015.730"; + version = "20171017.210"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "df2477e92e19414d28c72ebd14e2dfbdc4c662fd"; - sha256 = "0l5cadnl1a3fk66c0l7ciw55p6djjbvlc4qgc2k527zh62z1ch1h"; + rev = "4c8b62f54ec4151cf8b48a7e1f904d3b4a7d73d6"; + sha256 = "06hyn8mmi7ikgwpyds17z35rjwxrlwjkvv1dmjcp4jirnqbp9lmk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -48837,12 +48880,12 @@ omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-kill"; - version = "20171012.1113"; + version = "20171016.1440"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-kill.el"; - rev = "d14f71eb1783078d2d9090509167d09088463189"; - sha256 = "0bjq2zz19yjcr1f21d5bvbf5npjzf6dksfxmn39dqj4v4h3nn1wg"; + rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea"; + sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; @@ -50105,12 +50148,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20170527.2154"; + version = "20171017.2015"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "4d8bda9b5207175ecd3ae647ebec42b3546efd49"; - sha256 = "0877klmy48ad0rpy7azd4xbm9d07wrhr3g96sixx35wgp216kvlm"; + rev = "ff048833113bac1ee67284826a6c3a4cd70793b4"; + sha256 = "071z37sv6fw1dggi2ckphb1srzvanwnmy0xbsa3b2pfpv4yvvdhm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -50130,8 +50173,8 @@ src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "cda1980b013afabd299e7a2294517897f6442d98"; - sha256 = "1y6idbp74vrr3g0r10n09znky8ih94kzf5fyil47sjkqyzzmpk3s"; + rev = "06402de02461338503bf034ceca44c3a5a898778"; + sha256 = "1myrxs1s51vpv3a47fbprsh4b17ylglxqv2nak5i1g2834plhpgv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -50706,12 +50749,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 = "20171011.1421"; + version = "20171019.724"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "86367a1f2306bec25206696ad0429a2b7cc32655"; - sha256 = "0vvw1djr6ihwrbv9b7dxgdy4rnwczvw9x6jqg34jnnb1zqr88q6l"; + rev = "3c022af9adb6ff96edcc2f11ebf20cfd576df702"; + sha256 = "0qsiclmg9vm1svgr8m4yj0dwwvrvga1qaa6bzdhkw71s0r931sl2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51242,12 +51285,12 @@ org2ctex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org2ctex"; - version = "20171016.158"; + version = "20171016.2343"; src = fetchFromGitHub { owner = "tumashu"; repo = "org2ctex"; - rev = "c5ea6d92e3ecc311123954bee2e45830fd873d41"; - sha256 = "01xy6nzib4c0ldn7s8kk155xzm1sribhs5695b3vhsp951h9pjhl"; + rev = "1b74aa9cf45de224ffd6aa9b93f0debddc2b48bc"; + sha256 = "17qkz3ja87hhq41hvlxvdzqipmi1gn38khd00dshsxhk5hg7i99a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f77fe537ca8ee2ddb6e3efe71f3b3c560c52c7d/recipes/org2ctex"; @@ -52049,12 +52092,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "20171003.327"; + version = "20171020.1659"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "c12467d1c6a2a3f89e1e271c44e29eb5409ed9df"; - sha256 = "0qlnxqzc3xw12w62kgjmmkvm2l25z4rjz77dnl4y15pqrjl4ljak"; + rev = "a93d1833533c3589dbba62dcdfd13f99881e0fad"; + sha256 = "1iqdsp70h98qwfah91w9rj9j29952zkr6q261mrfy4c43jvghvln"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -52112,12 +52155,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20171011.137"; + version = "20171019.936"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "daed39f8953d3ec8c089ec4178b2b82f8b2d57f5"; - sha256 = "1c0msmk835sn02bc6llsv7nmza89r2fwhwg03pkmanaz5n3gr016"; + rev = "d0e8a5d7505ebdd55074a3ecd6ca467931b98454"; + sha256 = "1r39bllndh44jjsj4j0h8sqmz8a3xkwlp6cj9d7jvp640s8wddim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -52553,12 +52596,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20171013.1125"; + version = "20171020.1419"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "2ee54b5f869770a30a2aa35cda743d669c16b20d"; - sha256 = "0az23kzy82fahqdijqfag3kiwnyn8sp8d58mhv6pg04r994a5z81"; + rev = "e4d174870ea40275a8bc35996416326cf28051f9"; + sha256 = "00p7hrcb2ivk6sjxqccbpswjsk5rj02nyd29d2nd6b8r3fskskzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -52739,22 +52782,22 @@ license = lib.licenses.free; }; }) {}; - page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + page-break-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "page-break-lines"; - version = "20170829.157"; + version = "20171020.108"; src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "c82759f267a81a07ed7aafffbbbfaa3e94941b59"; - sha256 = "17kly423l5fyqzmhbxqwd9fvn191bzq6pn3ng1ynla51cg47zskl"; + rev = "ae1c0065984429c7364a667abb9180e80134c4c0"; + sha256 = "1j2fw5p5cwyxpb3clym59jbma06r7la83n62xmz0q1z41llmwx4j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines"; sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1"; name = "page-break-lines"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/page-break-lines"; license = lib.licenses.free; @@ -54271,12 +54314,12 @@ phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phan"; - version = "20170205.604"; + version = "20171017.2045"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phan.el"; - rev = "6442663bf7618bc614b6c47b0ad7bc591c68f947"; - sha256 = "0s38vbnsbpazca0jsahjmms7qgq74gsvfn2zkrfkhx9y8cpfxrrb"; + rev = "17b44a62580272bcf5ee91fb58098292e9de6f83"; + sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan"; @@ -54586,12 +54629,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20171014.1455"; + version = "20171018.1236"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "2fc32548955c0aaf862f578259763149a8cc816e"; - sha256 = "09fhsiavxhbvxkzdjnv18ryb8i44ya8bpjjgfy7j998nvinvx63r"; + rev = "0e87a708fb0cf7bb5ad88baf08bd60e061e8b63c"; + sha256 = "13676hca2mdfawc61g3hp1m56wv45i37g8gxhjb3mvjyjrb10rkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -57009,8 +57052,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "f850188e6e1021b4fe21ecb0aca548a54c272ce5"; - sha256 = "1ydf4fl75byx01r9r7ga555hw0i61bg2bqckigmv26nyajkqsd5a"; + rev = "b189389e2f2ca01dd534a8e9ba3ac38ea45cdba6"; + sha256 = "1yr4073qf6br07azrmhy9xk8zq9zlalbmldjsrkbf7k5r59217jg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -57183,12 +57226,12 @@ pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20171007.1642"; + version = "20171018.829"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "971ccf8d380965a5268e499a8c8785f2fcdef6f4"; - sha256 = "1zrs94vcp7yjz929x51243jf0lifb8kbxdzr3slkc5wbni5c5jk3"; + rev = "96718f802dad3acd5a3f770b1452b81e39f77d92"; + sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -57204,12 +57247,12 @@ pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pulseaudio-control"; - version = "20171004.428"; + version = "20171019.2026"; src = fetchFromGitHub { owner = "flexibeast"; repo = "pulseaudio-control"; - rev = "f542adc0585e7890c11e478bf193ef6f3b1f6eac"; - sha256 = "1h0li679pz683bsnbv08g8sr2q8slh12lad0v7qhyig1if3yh63w"; + rev = "30b47a785c5f5ee44ae98d522ab541c9ea310b35"; + sha256 = "0ik06rvgz6gj86ijd6jjpivd37wv5lwszqvcvhskvg68in0ybfg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control"; @@ -59221,6 +59264,27 @@ license = lib.licenses.free; }; }) {}; + reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "reason-mode"; + version = "20171015.1140"; + src = fetchFromGitHub { + owner = "reasonml-editor"; + repo = "reason-mode"; + rev = "ee67917db828af02c97e18b0747725a16c3a0708"; + sha256 = "1vk00a06i2p344q5k3py38z967gsnhcix00m5k6z1vhlvd0r4m00"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode"; + sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr"; + name = "reason-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/reason-mode"; + license = lib.licenses.free; + }; + }) {}; rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebecca-theme"; @@ -60168,12 +60232,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20170930.653"; + version = "20171018.1317"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "1a4ebe8bf2e1052a1a8dde3dcbfedb802ca070fb"; - sha256 = "1lpb22ggw17d8bx2gjmaxqk5rbf64gh8llvf9shl18r813d3srrb"; + rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14"; + sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -60609,12 +60673,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20171010.1544"; + version = "20171019.1334"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d776fbfadfd0f9ad8244f741154a28fa31f5fe82"; - sha256 = "12wdpxqs52w8hnpqipbya1sf5vx7k407ya3allcb68bhpfq7qzc7"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -60840,12 +60904,12 @@ ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }: melpaBuild { pname = "ruby-test-mode"; - version = "20171006.944"; + version = "20171016.931"; src = fetchFromGitHub { owner = "r0man"; repo = "ruby-test-mode"; - rev = "9a686e6e18ac2d56be41020ed9d0814cdfe86330"; - sha256 = "02m0kaw86p6qmn6jxcq6vqbbp2v57b2dnj75fqai1dz2f521dh0g"; + rev = "87f6d770f8d2326c8d36099aeee5d577f3e2af69"; + sha256 = "0qiwc2h5hyh6np16a2gfcchbnyh7v5wnzd8idr64cmd9blg3jh8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode"; @@ -61411,8 +61475,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "aaa3eca9dead0205a2c101e36aea42f4e0de98e1"; - sha256 = "0yn4gpnc7nyix8q2xcq885bpxcdi7n70wcvw7in3h6kfixd3g0ls"; + rev = "bc00974cdcbf0366123fe2dc38253b1ba345dee0"; + sha256 = "0pd7w92z50xpr4vj2xnzm2bmz91728l0k1jr9my9hbpxss89xnvh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -62371,12 +62435,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "20170213.1534"; + version = "20171018.1120"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "979b021077655ca38749a60c9752c0817e8fd93e"; - sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl"; + rev = "0cee957bc0bfbdee5ea3f3e430e94cdcd87ed0c3"; + sha256 = "18zhrn18asbpanmlgasy271gfh6qywr947fx2svxz5b1w40hhyr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -63463,12 +63527,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20171011.1945"; + version = "20171017.822"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "1d4436d3e6e0689fd30aad01a8667a1743c000bf"; - sha256 = "1k6ymjdcl1sipf3xswx4cw3bbhpfnp4sr9yi3iivi8i3kdai84dr"; + rev = "c8f4c3312b574b8f4cd5ddaaa6ec7710893a9ff0"; + sha256 = "01aibrnkzyi40b7bfz5wfl34wwjil4nylg6llkhrmzc6mfqabnjy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -64197,12 +64261,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20171015.1259"; + version = "20171021.718"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "d73e18fc6ac4f76736ce046df4a7d95147f6cf66"; - sha256 = "0dqi8f4x8ni7d0k15jp7wnnl97ip5kgzw8p17z3hrhj4v19wvmr3"; + rev = "cdd10bc259fe7303e40efd8a6a05c7e43d12a242"; + sha256 = "0ybbbqnbnp1w4lksgjxjf9iccrvi012ihlq3az1c6k6ck18cmadb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -65149,12 +65213,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170918.1246"; + version = "20171020.531"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "7900aca87f9d96bd6ebaa62886e4ab135bf449b3"; - sha256 = "0kai39mqx0i2b46vcf5g2la8q65sp1pb8vnzfjwzv0qip4p9fd62"; + rev = "0a5a745c209daafc0e60b8db92993802a9c05fb8"; + sha256 = "1wnf0jwdavkpv3xz2mni7n29qfp60i28530hmaimlk8mnhb2x94k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -65841,12 +65905,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170926.315"; + version = "20171018.303"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "5e0403c93694243643a2b812313718d86955f0db"; - sha256 = "0an0zafnacrg2yvpkmiwrw7hbgsw8pb6m2y80ldp2gxbxl2i5rx0"; + rev = "2226edb5fc91ab766177b82e578dbcc5c7e55554"; + sha256 = "0b2jq0s56mbl051313wyn1fpk3j5n819y1q6dcv8z7sa5zxsq7hm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -66532,12 +66596,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20171012.1200"; + version = "20171016.1420"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "cfc56a9ed853258c3880c34d87debf920d53dcdc"; - sha256 = "0mqgkvx9wsk53cbj2qdr2s8ja30q3p1rnrf74q3j5q9x2mkzgymj"; + rev = "345e00569333095eb24e61239a80b0f0c77b2d11"; + sha256 = "0npqvhnfmrx7jq1slz489rh2l4rnfhqhbi6ybdzw5rism8r3jqwb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -66574,12 +66638,12 @@ sunburn-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunburn-theme"; - version = "20171014.8"; + version = "20171021.1407"; src = fetchFromGitHub { owner = "mvarela"; repo = "Sunburn-Theme"; - rev = "8b6f3d6a5d44ae2d87d0022203ecfb33e0b76f78"; - sha256 = "0ip2pw5h8z19qvk768vxhjs6xrz876rl3nw7bmlxy0wb1ffd38s5"; + rev = "566280a981097b89b19c4bba921f568c77212db6"; + sha256 = "08a3js02zxqgxrk4afr2n39jf34pnv9mwiykysbhf560blq8gha2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme"; @@ -66893,8 +66957,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f7470feef4880a735495c5013465efffd049270d"; - sha256 = "13b05yzqppcm5lp3ryhhv5gp031nrvh0vc59hv7fyisw48byv3i7"; + rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; + sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67895,12 +67959,12 @@ term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-manager"; - version = "20170903.1212"; + version = "20171020.141"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f4291eae7a18d7f1737c71c609f50398b1a962b3"; - sha256 = "0brvpayi7bigcri95958w0zin84dpqw80rqg047p07mc8833nkqg"; + rev = "13a0f1637a1f075d70211ccb8162e63a18a474da"; + sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; @@ -67983,8 +68047,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f4291eae7a18d7f1737c71c609f50398b1a962b3"; - sha256 = "0brvpayi7bigcri95958w0zin84dpqw80rqg047p07mc8833nkqg"; + rev = "13a0f1637a1f075d70211ccb8162e63a18a474da"; + sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; @@ -68529,8 +68593,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "8b8a8efea13d1c97f856053af0a5c0e6a8a76354"; - sha256 = "0m2965iga7acl21015ny2d7zcckfr06ncc681vb2yffss5jjjpj9"; + rev = "54ce558ba80905d124b82727d196f6d58964b74c"; + sha256 = "060fqxwmqra2wxi22250lnkfgs98b0kps8wn0lmqjkqnh6pqy7qi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -68567,12 +68631,12 @@ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tickscript-mode"; - version = "20171014.247"; + version = "20171020.1330"; src = fetchFromGitHub { owner = "msherry"; repo = "tickscript-mode"; - rev = "5ae2c36746e83f1aaba4285e80af2e499f6e4317"; - sha256 = "1yk0garmwxrdz4600hw5i5ds6rnl9qyl6jplywhxys8amv35zs7k"; + rev = "67400136647342b714c5f693c358f2bd671fe49c"; + sha256 = "0c3vap37rnr11cvwmgcamx4vl4z4bfmxj7w8hybxcrvs6wnjw20b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; @@ -69484,12 +69548,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20171014.737"; + version = "20171021.615"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "22fb1fa2b1c53863157871ce860dfb1a7d0d593b"; - sha256 = "094yiafilr0bg22jx00ixzhlyfhwjivvf9avp6c127fky2z2snc5"; + rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; + sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; @@ -69509,8 +69573,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "22fb1fa2b1c53863157871ce860dfb1a7d0d593b"; - sha256 = "094yiafilr0bg22jx00ixzhlyfhwjivvf9avp6c127fky2z2snc5"; + rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; + sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -69530,8 +69594,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "22fb1fa2b1c53863157871ce860dfb1a7d0d593b"; - sha256 = "094yiafilr0bg22jx00ixzhlyfhwjivvf9avp6c127fky2z2snc5"; + rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; + sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -69734,12 +69798,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20171010.1111"; + version = "20171016.910"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "20de81c91b02f799be4203d11707f68a0c8e900e"; - sha256 = "0hrzsfdn717dlj2kss3qxqgyn3gdzlsvdvhwjhw3yixgxkr08hzq"; + rev = "64537bc753094b2adc2e3e97625fa9c0a01f9ae6"; + sha256 = "03d0n49p6d77p221majmbh0gjyrmh2z4cb2l2vi5xxfwc1fsxzmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -70007,12 +70071,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20170831.619"; + version = "20171017.1128"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "0f41709e1525403767bd4889cb913900c68448dd"; - sha256 = "038fya0gd3vy5rpf2b4ynksc1alb8va0zw7flh4y4azrmgmpxwi0"; + rev = "30391a518a1d41d5c534a30850a50b0974132aec"; + sha256 = "1msslh5zj1mi74fg8wc1kzpxjq0g6s9ms66332r2ykwqzsw1iz7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -71046,12 +71110,12 @@ vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-fossil"; - version = "20171008.1303"; + version = "20171018.2216"; src = fetchFromGitHub { owner = "venks1"; repo = "emacs-fossil"; - rev = "7bb3121ccd89f1533c6b91d5f952755b358eb0eb"; - sha256 = "1x2x59k3qxna32a8fjqb0vs6bykynii3i8qnlj770dn6drmnzlfd"; + rev = "abdb5487831e641c291c0dcb3848f539ca11f400"; + sha256 = "024bf8cjf3srz0zrxk90c63yz9v525m83znb2fscwa1fwvnnpqkn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil"; @@ -71319,12 +71383,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20170928.822"; + version = "20171021.1257"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "d4178edf27cfd54a473d10d5adfa819c748dc801"; - sha256 = "1cxfgb068sdlyr8i8r6hi0jm5capbsc58zrh5g7jyknya7z02ajp"; + rev = "3c5b181a32df5d7defa58a7a19021fa16d3670f9"; + sha256 = "17zakj614vrkyy2y3a1mdkqaa3p7r77zhg8wdaqapwiq36f5gcc1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -71969,12 +72033,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20170916.37"; + version = "20171019.550"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "0249c9b12dcd13df709441edff3c7fcc4efcb198"; - sha256 = "1xcxg24jwazkvc5afnqnmqisql6cr1brsmbb754a70a0r374965r"; + rev = "15a8ca7a28d086066d148ca8bfbd454e32cc5f77"; + sha256 = "1a7xm3x8zyax6crrj8fj932yicwds12774znv991yggjzw5kcwcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -72200,12 +72264,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20171002.1316"; + version = "20171017.1214"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "c15743454d0de944e5872a2ac4c9111d8cd61940"; - sha256 = "13hndf7ldw6nb2jkr3x1yxj374j2m116q0xl74ihk32vf8kb8j2a"; + rev = "4754211f44e9fe1389e4378553ad538460282225"; + sha256 = "0c1p8srr1zacpp697rwy83rjz51yhgff9w1sb4cv9wi5yzfsic56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -72326,12 +72390,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20170612.1352"; + version = "20171021.1419"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "655a364fb1a6c9f3d49a0bbaf338bbf492b5b4d1"; - sha256 = "11dqcch0fcxkqnnfzk9hxmimxckimpj74fz7rx3b7bvkmrh9snyy"; + rev = "bf082078fdfcefa38a4397f56c0366cf14c05600"; + sha256 = "104fzirvpp9c5h4gpb99j8i8j1imb3mr6zxh8gr42g38rg2y1nh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -72998,12 +73062,12 @@ window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: melpaBuild { pname = "window-purpose"; - version = "20170920.15"; + version = "20171018.821"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "44d31e373ce95d133c560169eb225d2c16a32b7b"; - sha256 = "0wpndc2p4pcq1z07r659pxv0db1g6hqkgdivjs5dxc75sb3mrrmw"; + rev = "2b8059256a90caf578ca5ba62205ca7f0d67a740"; + sha256 = "1pv5sjsvm3xmhfbf0j2581ifp7yykgzhd8bml9cav242r1m2dnh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; @@ -73148,8 +73212,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "4d41c0814bbc"; - sha256 = "1xy9a27qdl7hm7x2gbhxql63paxi16441rczl2i8ps032l4ffdnj"; + rev = "7633b2a5133f"; + sha256 = "0j6j9wkmq95dhx5cr3z2gpx5mvsqsgissp2060ij252ijc3l9k4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -73774,12 +73838,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20171014.2157"; + version = "20171021.39"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "4e8a74278dd9ed7095519d0b6ceaa5c7250061e6"; - sha256 = "06v50xyi7cyrjhix3a27k7plsnvlaj7ndwlfyqcvyv2bxa3js325"; + rev = "2aa7ba860e72329a96395aeef1206e2adc637cf6"; + sha256 = "0vjlc5cs56g1d1gzww7cmkyf8mzgr630xg1krlhz4bb73c538k1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -74450,8 +74514,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "18ee56bd687238be2bb6834062be3f04d9e9a283"; - sha256 = "13a6qy22jwyxrlcxw2xmqw3dckzlkxa84babdwrgpdx7kx4hqa5h"; + rev = "011bcb8e2f27b333b3300d7bcab3f52d70020e45"; + sha256 = "1gkls80rbj1hnima1fnbxnrz42qjqc55shdpiphzmdyv9hmw8vvf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -75335,12 +75399,12 @@ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom"; - version = "20171014.811"; + version = "20171018.1314"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "d36b9b5892615c3937f4a4d4bd9242f870c4bc50"; - sha256 = "0x1w35i4ckmaiqc88gdpnw6585adh851lw1wnyj4kgskdvvvz5f9"; + rev = "dc6747c754622ed88eeac896f18845681c90cae0"; + sha256 = "1innar1xrjlh8pvq3gj903xrlpkr8qwjbr60k7zi7wd2r6lqd7h0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; From 380bb673d46fbdcca42515d5a1a04c7385ff681f Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 22 Oct 2017 16:06:34 +0200 Subject: [PATCH 1527/2806] vrb: init at 0.5.1 --- pkgs/development/libraries/vrb/default.nix | 34 +++++++++++++++++++ .../libraries/vrb/removed_options.patch | 13 +++++++ .../vrb/unused-but-set-variable.patch | 19 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 68 insertions(+) create mode 100644 pkgs/development/libraries/vrb/default.nix create mode 100644 pkgs/development/libraries/vrb/removed_options.patch create mode 100644 pkgs/development/libraries/vrb/unused-but-set-variable.patch diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix new file mode 100644 index 00000000000..4f72cc138ac --- /dev/null +++ b/pkgs/development/libraries/vrb/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "vrb-${version}"; + version = "0.5.1"; + + src = fetchurl { + url = "http://vrb.sourceforge.net/download/${name}.tar.bz2"; + sha256 = "d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f"; + }; + + patches = [ + ./removed_options.patch + ./unused-but-set-variable.patch + ]; + + postPatch = '' + patchShebangs configure + ''; + + postInstall = '' + mkdir -p $out/share/man/man3 + cp -p vrb/man/man3/*.3 $out/share/man/man3/ + ''; + + meta = with stdenv.lib; { + description = "A virtual ring buffer library written in C"; + license = licenses.lgpl21; + homepage = http://vrb.sourceforge.net/; + maintainers = [ maintainers.bobvanderlinden ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/libraries/vrb/removed_options.patch b/pkgs/development/libraries/vrb/removed_options.patch new file mode 100644 index 00000000000..eda88e75184 --- /dev/null +++ b/pkgs/development/libraries/vrb/removed_options.patch @@ -0,0 +1,13 @@ +--- a/configure 2010-10-05 16:32:59.000000000 +0200 ++++ b/configure 2010-10-05 16:33:08.000000000 +0200 +@@ -341,8 +341,8 @@ + pgm_warn=( "${pgm_warn[@]}" -Winline ) + fi + +-lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables ) +-pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables ) ++lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions ) ++pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions ) + + lib_cp_opt=( -pipe ) + pgm_cp_opt=( -pipe ) diff --git a/pkgs/development/libraries/vrb/unused-but-set-variable.patch b/pkgs/development/libraries/vrb/unused-but-set-variable.patch new file mode 100644 index 00000000000..43429255e8c --- /dev/null +++ b/pkgs/development/libraries/vrb/unused-but-set-variable.patch @@ -0,0 +1,19 @@ +--- a/vrb/src/bin/vbuf.c1 2011-06-13 22:14:24.000000000 +0200 ++++ b/vrb/src/bin/vbuf.c 2011-06-13 22:14:43.000000000 +0200 +@@ -426,7 +426,6 @@ + int opt_progress ; + int output_fd ; + int poll_time ; +- int poll_num ; + int poll_write ; + int poll_read ; + +@@ -861,7 +860,7 @@ + poll_time = display_time - get_time_ms(); + if ( poll_time < 0 ) poll_time = 0; + } +- poll_num = poll( poll_list, 2, poll_time ); ++ poll( poll_list, 2, poll_time ); + + //----------------------- + // Check for poll events. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 677357e4782..ef9b46699c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10898,6 +10898,8 @@ with pkgs; vmime = callPackage ../development/libraries/vmime { }; + vrb = callPackage ../development/libraries/vrb { }; + vrpn = callPackage ../development/libraries/vrpn { }; vsqlite = callPackage ../development/libraries/vsqlite { }; From c7dec7a4b8aaf045e041bcbd1530e100baaca3c9 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 20 Oct 2017 11:03:23 +0200 Subject: [PATCH 1528/2806] aria2: 1.32.0 -> 1.33.0 --- pkgs/tools/networking/aria2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 8e37b85275d..079beedcc07 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.32.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "098ahj7nyf5c70221aq5q3aqllb94frz9lzig8rkhqfsa4mmslg5"; + sha256 = "07i9wrj7bs9770ppx943zgn8j9zvffxg2pib4w5ljxapqldhwrsq"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 97c5dfc55efc6307a091ea70a03b1495c1f193fd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 22 Oct 2017 06:18:32 +0000 Subject: [PATCH 1529/2806] ocamlPackages.yojson: 1.2.3 -> 1.3.3 --- pkgs/development/ocaml-modules/yojson/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index ab949f4f1f2..2ce2faa7e8d 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -1,15 +1,22 @@ { stdenv, fetchzip, ocaml, findlib, cppo, easy-format, biniou }: let pname = "yojson"; - version = "1.2.3"; + param = + if stdenv.lib.versionAtLeast ocaml.version "4.01" then { + version = "1.3.3"; + sha256 = "02l11facbr6bxrxq95vrcp1dxapp02kv7g4gq8rm62pb3dj5c6g7"; + } else { + version = "1.2.3"; + sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; + }; in stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${param.version}"; src = fetchzip { - url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz"; - sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; + url = "https://github.com/mjambon/${pname}/archive/v${param.version}.tar.gz"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ]; From 2cc79e95f8c7fe66bb5fbdd5d7d8b35a29f4e02e Mon Sep 17 00:00:00 2001 From: b123400 Date: Sun, 22 Oct 2017 23:45:16 +0900 Subject: [PATCH 1530/2806] buildNodePackage: fix issue with impure version handling (#30577) --- pkgs/development/web/nodejs/build-node-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 679716d33c7..5ce324e7a60 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -145,7 +145,7 @@ let function replaceImpureVersionSpec(versionSpec) { var parsedUrl = url.parse(versionSpec); - if(versionSpec == "latest" || versionSpec == "unstable" || + if(versionSpec == "" || versionSpec == "latest" || versionSpec == "unstable" || versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/' || /^[^/]+\/[^/]+$/.test(versionSpec)) return '*'; else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" || From 5c779de4a1ca775f835d9e1c252a445ecb723797 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Thu, 19 Oct 2017 12:15:38 +0200 Subject: [PATCH 1531/2806] pythonPackages.phonenumbers: 8.8.2 -> 8.8.4 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 5f54fb12ec2..9fb16bb0302 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.8.2"; + version = "8.8.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0xwis5hvp2wmnzqxax8896vhyb3q2fs9l9ilvyr44jdh3342dxpx"; + sha256 = "01kim7mwgm97wysclhyxcwvd2a8ifinaidkskglx7b2k0r7ji5sj"; }; meta = { From d61a58caeacea07140f969781d6e34e16571f20f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 20 Oct 2017 20:37:36 +0200 Subject: [PATCH 1532/2806] iniparser: 3.1 -> 4.0 --- .../libraries/iniparser/default.nix | 24 ++++++++++++------- .../libraries/iniparser/no-usr.patch | 15 ++++++------ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 256d7cbdc87..a09bcd6f039 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,18 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: let inherit (stdenv.lib) optional; -in -stdenv.mkDerivation rec{ - name = "iniparser-3.1"; - src = fetchurl { - url = "${meta.homepage}/iniparser-3.1.tar.gz"; - sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; +in stdenv.mkDerivation rec { + name = "iniparser-${version}"; + version = "4.0"; + + src = fetchFromGitHub { + owner = "ndevilla"; + repo = "iniparser"; + rev = "v${version}"; + sha256 = "0339qa0qxa5z02xjcs5my8v91v0r9jm4piswrl1sa29kwyxgv5nb"; }; patches = ./no-usr.patch; + doCheck = true; + preCheck = "patchShebangs test/make-tests.sh"; + # TODO: Build dylib on Darwin buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) ++ [ "CC=cc" ]; @@ -23,7 +29,7 @@ stdenv.mkDerivation rec{ cp src/*.h $out/include mkdir -p $out/share/doc/${name} - for i in AUTHORS INSTALL LICENSE README; do + for i in AUTHORS INSTALL LICENSE README.md; do bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; done; cp -r html $out/share/doc/${name} @@ -36,7 +42,7 @@ stdenv.mkDerivation rec{ ''); meta = { - homepage = http://ndevilla.free.fr/iniparser; + inherit (src.meta) homepage; description = "Free standalone ini file parsing library"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/iniparser/no-usr.patch b/pkgs/development/libraries/iniparser/no-usr.patch index 28be099b8ee..a3c568cdde4 100644 --- a/pkgs/development/libraries/iniparser/no-usr.patch +++ b/pkgs/development/libraries/iniparser/no-usr.patch @@ -1,14 +1,13 @@ -diff -urN iniparser3.0b.orig/Makefile iniparser3.0b/Makefile ---- iniparser3.0b.orig/Makefile 2008-01-16 19:56:08.000000000 +0100 -+++ iniparser3.0b/Makefile 2008-01-16 19:56:49.000000000 +0100 -@@ -11,8 +11,8 @@ +--- a/Makefile 2017-10-20 20:30:41.494608284 +0200 ++++ b/Makefile 2017-10-20 20:33:22.279212026 +0200 +@@ -20,8 +20,8 @@ ARFLAGS = rcv SHLD = ${CC} ${CFLAGS} --LDSHFLAGS = -shared -Wl,-Bsymbolic -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib --LDFLAGS = -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib +-LDSHFLAGS = -shared -Wl,-Bsymbolic +-LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib +LDSHFLAGS = -shared +LDFLAGS = - # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX) - # RANLIB = ranlib + # .so.0 is for version 3.x, .so.1 is 4.x + SO_TARGET ?= libiniparser.so.1 From c81563771985a19f9c44bca267b66374fba1b11f Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 22 Oct 2017 16:05:02 +0100 Subject: [PATCH 1533/2806] irssi: 1.0.4 -> 1.0.5 Security update, see https://irssi.org/security/irssi_sa_2017_10.txt. --- pkgs/applications/networking/irc/irssi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index a2ad7e4d7b2..75c4f9ac5c9 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.0.5"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "1a7f9g3hlccqlf9xj1csbxw4wgl6jfywg2xvkir6ww5viagkbzs8"; + sha256 = "1lasb8flic4qc1sd3pvfg9aig5skcxlyx6iy9bk73147r8vzaq75"; }; nativeBuildInputs = [ pkgconfig ]; From 909fd5ecfae44960ea5439e436b99042d966c726 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 20 Oct 2017 09:28:57 -0400 Subject: [PATCH 1534/2806] kubernetes: 1.7.8 -> 1.7.9 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index cff68c5227a..e8686ade590 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -18,13 +18,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1xfvfdn04wn7ldmr5ypnyi99gsrgz1w8l02jnvyalpdnjbj73b89"; + sha256 = "0lxagvv8mysw6n0vp5vsccl87b628dgsjrf298dx2dqx7wn7zjgi"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From a4833730c409ee10003a47ba4ddff00c98a35f0e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 18:19:03 +0300 Subject: [PATCH 1535/2806] cntk: Disable parallel building https://hydra.nixos.org/build/62781346 --- pkgs/applications/science/math/cntk/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 80a5f6f032b..89ed0582b37 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -87,7 +87,8 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - enableParallelBuilding = true; + # on 2.2: fatal error: tensorboard/tensorboard.pb.h: No such file or directory + enableParallelBuilding = false; meta = with lib; { homepage = "https://github.com/Microsoft/CNTK"; From 94e88d6baece38e7d4ede621e6bf11fb73eccf92 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 18:23:32 +0300 Subject: [PATCH 1536/2806] collectd: Fix build after LVM2 upgrade --- pkgs/tools/system/collectd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 6f4b94f826d..ddfd8cbbc01 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x"; }; + # on 5.7.2: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl libdbi libgcrypt libmemcached From c1105ad9b4b0e2c3e048e3cbed5b2bad4c7eefbb Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Sun, 22 Oct 2017 11:46:33 -0400 Subject: [PATCH 1537/2806] keepassx-community: 2.2.1 -> 2.2.2 --- pkgs/applications/misc/keepassx/community.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 5de202f8f73..0444b1d96d2 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassx-community-${version}"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1g9qz81i7rsfywl03bwl3cg7q91vp24519b91y5liiyrqrq0zx94"; + sha256 = "01pqpa3vzk2q1vrj2lqayr7a3nzpnj176yhnqbrwlm3s9rga4wzn"; }; cmakeFlags = [ From f906d6d18e87f4e2ee8a47d4f6040c77fd6c7f1e Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Sat, 21 Oct 2017 22:38:46 -0400 Subject: [PATCH 1538/2806] python36: 3.6.2 -> 3.6.3 --- pkgs/development/interpreters/python/cpython/3.6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 127c093501c..1614159a7ef 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "2"; + minorVersion = "3"; 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 = "1ab4vlpdax1ihpiyiwchlgsk36apl4kgdw271wvl9l8ywhxpfacj"; + sha256 = "1nl1raaagr4car787a2hmjv2dw6gqny53xfd6wisbgx4r5kxk9yd"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; From 460c3f425e865414207de75eebf34ba80cca5b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sun, 22 Oct 2017 18:36:16 +0200 Subject: [PATCH 1539/2806] calibre: 3.9.0 -> 3.10.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 6569c892057..ab106f6dcd9 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.9.0"; + version = "3.10.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0zsf1czw8bz41nk9f55vxwncf0chxdflyhjj2khw9da67ph6yknx"; + sha256 = "01vb5xjis9ldva7rg1f720lwys5frkj00z8x7cajqwxliilhvais"; }; patches = [ From 28494e96f0193f888d294b185f2432a59e07fb91 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 21:00:23 +0300 Subject: [PATCH 1540/2806] falkon: Disable parallel building https://hydra.nixos.org/build/62778325 --- pkgs/applications/networking/browsers/falkon/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 715fefe17d8..b2067effb96 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; - enableParallelBuilding = true; + # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm' + enableParallelBuilding = false; meta = with stdenv.lib; { description = "QtWebEngine based cross-platform web browser"; From c529454c60c3d053b950e941f515eb0f74cc7a48 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 22 Oct 2017 14:35:32 -0400 Subject: [PATCH 1541/2806] linux: 4.9.57 -> 4.9.58 --- 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 8a1ad7ca9dd..e1f3fe63ea0 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.57"; + version = "4.9.58"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19lndirbyryx0qdwqqhn1g4rng7d79rk4sra5lpa2d3axia0a8q9"; + sha256 = "19r1ybrfqjh2cmpvljd94cwag34kly7pzih2j5m4nr49hsi153vl"; }; } // (args.argsOverride or {})) From 69ebd73571b4fb959381712519e33a067db2f2ea Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 22 Oct 2017 14:35:49 -0400 Subject: [PATCH 1542/2806] linux: 4.13.8 -> 4.13.9 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index ee1aa79f540..77d137f9453 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.8"; + version = "4.13.9"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "09zl4gpw9j4xn6p78s6ba6qjjxpsy8whhvn19wnjhr9w4al8rrk4"; + sha256 = "13ra6psp6w3rf5vzmvhg88v2nh8zq20xl0r92728b8x9vgj1bp51"; }; } // (args.argsOverride or {})) From e9aa686d3b5932ef957f66c0a74e87d7ae51e50a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 22 Oct 2017 14:41:01 -0400 Subject: [PATCH 1543/2806] linux-copperhead: 4.13.8.a -> 4.13.9.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 0c9c05312ba..a93e4a96119 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.13.8"; + version = "4.13.9"; revision = "a"; - sha256 = "1yjam6ni32f9p7c1x2q12vi9fc9v10g1w35pr4p7qgs12zx8dy27"; + sha256 = "0v2ki1vgmg8yifnflbhryrv7pxvyf0157ysngc1n1hcqyypq4sji"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 917bd0bfbc52f548e306fd4adf8e8459cd5203ea Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 21:57:59 +0300 Subject: [PATCH 1544/2806] souffle: Disable parallel building https://hydra.nixos.org/build/62750790 --- pkgs/development/compilers/souffle/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 217b2aecd33..c56ea8cc649 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; - enableParallelBuilding = true; + # in 1.0.0: parser.hh:40:0: error: unterminated #ifndef + enableParallelBuilding = false; # See https://github.com/souffle-lang/souffle/issues/176 hardeningDisable = [ "fortify" ]; From ba4cefe4ae70cfb9121281f508ed5d9fa9dbc662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rostislav=20Bene=C5=A1?= Date: Sun, 8 Oct 2017 21:42:22 +0200 Subject: [PATCH 1545/2806] aspell: added new patch data-dirs-from-nix-profiles.patch Aspell will search for dictionaries in all nix profiles even when used as library. Setting data-dir or dict-dir in ASPELL_CONF will disable this behavior. --- .../libraries/aspell/aspell-with-dicts.nix | 4 ++ .../aspell/data-dirs-from-nix-profiles.patch | 38 +++++++++++++++++++ pkgs/development/libraries/aspell/default.nix | 27 ++----------- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 49 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/pkgs/development/libraries/aspell/aspell-with-dicts.nix index 0739ad333df..fd5ccf9696c 100644 --- a/pkgs/development/libraries/aspell/aspell-with-dicts.nix +++ b/pkgs/development/libraries/aspell/aspell-with-dicts.nix @@ -1,5 +1,9 @@ # Create a derivation that contains aspell and selected dictionaries. # Composition is done using `pkgs.buildEnv`. +# Beware of that `ASPELL_CONF` used by this derivation is not always +# respected by libaspell (#28815) and in some cases, when used as +# dependency by another derivation, the passed dictionaries will be +# missing. However, invoking aspell directly should be fine. { aspell , aspellDicts diff --git a/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch b/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch new file mode 100644 index 00000000000..c19827ba93e --- /dev/null +++ b/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch @@ -0,0 +1,38 @@ +diff --git a/common/info.cpp b/common/info.cpp +index 8291cc7..6216326 100644 +--- a/common/info.cpp ++++ b/common/info.cpp +@@ -36,6 +36,7 @@ + #include "strtonum.hpp" + #include "lock.hpp" + #include "string_map.hpp" ++#include "file_util.hpp" + + #include "gettext.h" + +@@ -495,6 +496,25 @@ namespace acommon { + lst.clear(); + lst.add(config->retrieve("data-dir")); + lst.add(config->retrieve("dict-dir")); ++ if (config->lookup("data-dir") == NULL && config->lookup("dict-dir") == NULL) { ++ const char* cprofiles = getenv("NIX_PROFILES"); ++ if (cprofiles != NULL) { ++ char* profiles = strdup(cprofiles); ++ char* profile = profiles; ++ char* end = profile; ++ while (*end != '\0') { ++ if (*end == ' ') { ++ *end = '\0'; ++ lst.add(add_possible_dir(profile, "lib/aspell")); ++ profile = ++end; ++ } else { ++ ++end; ++ } ++ } ++ lst.add(add_possible_dir(profile, "lib/aspell")); ++ free(profiles); ++ } ++ } + } + + DictExt::DictExt(ModuleInfo * m, const char * e) diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index e69bbe0d2f2..0f6f5e8dd14 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, perl}: +{stdenv, fetchurl, perl +, searchNixProfiles ? true}: stdenv.mkDerivation rec { name = "aspell-0.60.6.1"; @@ -10,6 +11,8 @@ stdenv.mkDerivation rec { patchPhase = '' patch interfaces/cc/aspell.h < ${./clang.patch} + '' + stdenv.lib.optionalString searchNixProfiles '' + patch -p1 < ${./data-dirs-from-nix-profiles.patch} ''; buildInputs = [ perl ]; @@ -23,28 +26,6 @@ stdenv.mkDerivation rec { ); ''; - postInstall = '' - local prog="$out/bin/aspell" - local hidden="$out/bin/.aspell-wrapped" - mv "$prog" "$hidden" - cat > "$prog" < Date: Sun, 22 Oct 2017 13:58:28 +0200 Subject: [PATCH 1546/2806] libcap: already patch Make.Rules in prePatch Make.Rules gets already included during compilation, so set paths before invoking make. This fixes wrong paths in libcap.pc. --- pkgs/os-specific/linux/libcap/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 1cc8ab60d75..17cd40e427b 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -30,9 +30,8 @@ stdenv.mkDerivation rec { # ensure capsh can find bash in $PATH substituteInPlace progs/capsh.c --replace execve execvpe - ''; - preInstall = '' + # set prefixes substituteInPlace Make.Rules \ --replace 'prefix=/usr' "prefix=$lib" \ --replace 'exec_prefix=' "exec_prefix=$out" \ From 89720d851aafe7be2aafc129fd729941a4db18af Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 20 Oct 2017 16:29:00 -0700 Subject: [PATCH 1547/2806] coqPackages_8_7: New expression, but don't make it the default yet --- pkgs/applications/science/logic/coq/default.nix | 1 + pkgs/development/coq-modules/QuickChick/default.nix | 6 ++++++ pkgs/development/coq-modules/coq-ext-lib/default.nix | 1 + pkgs/development/coq-modules/coquelicot/default.nix | 1 + pkgs/development/coq-modules/dpdgraph/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 3 ++- 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index ded8749f10d..cdfd035c713 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -20,6 +20,7 @@ let "8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4"; "8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l"; "8.7+beta2" = "1r274m44z774xigvj43g211ms9z9bwgyp1g43rvq4fswb3gzxc4b"; + "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 1ce559b325e..688182f4e5e 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -19,6 +19,12 @@ let param = rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a"; sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9"; }; + + "8.7" = { + version = "20170616"; + rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a"; + sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9"; + }; }."${coq.coq-version}" ; in diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index ed9312b5c57..5ebf0792277 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,6 +5,7 @@ let param = "8.4" = { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; }; "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; + "8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; }."${coq.coq-version}"; in diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 6f58c387586..84f95d4ddea 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -16,6 +16,7 @@ let param = "8.4" = v2_1_1; "8.5" = v3_0_1; "8.6" = v3_0_1; + "8.7" = v3_0_1; }."${coq.coq-version}"; in stdenv.mkDerivation { diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 65be1f4e066..aec3828f323 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,6 +1,11 @@ { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }: let param = { + "8.7" = { + version = "0.6.1"; + rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; + sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9"; + }; "8.6" = { version = "0.6.1"; rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfb50c82969..e9245531d19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18544,7 +18544,7 @@ with pkgs; }; coq_8_6 = callPackage ../applications/science/logic/coq {}; coq_8_7 = callPackage ../applications/science/logic/coq { - version = "8.7+beta2"; + version = "8.7.0"; }; coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; @@ -18604,6 +18604,7 @@ with pkgs; coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4; coqPackages_8_5 = mkCoqPackages coqPackages_8_5 coq_8_5; coqPackages_8_6 = mkCoqPackages coqPackages_8_6 coq_8_6; + coqPackages_8_7 = mkCoqPackages coqPackages_8_7 coq_8_7; coqPackages = coqPackages_8_6; coq = coqPackages.coq; From 4ace0daa21c69b80ff896b497c55ba0db06eace8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 22 Oct 2017 20:48:18 +0000 Subject: [PATCH 1548/2806] =?UTF-8?q?coqPackages.fiat=5FHEAD:=20mark=20as?= =?UTF-8?q?=20broken=20with=20Coq=20=E2=89=A5=208.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/fiat/HEAD.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index fe9f3307b7a..dc411763da5 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; + broken = stdenv.lib.versionAtLeast coq.coq-version "8.6"; }; } From 5711bfdefb6daa5185d690d9cf7133a3fae61c95 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 22 Oct 2017 21:09:19 +0100 Subject: [PATCH 1549/2806] torcs: fix build with gcc6 --- pkgs/games/torcs/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 1ea94a5d2ce..e7c1c38fd15 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchpatch, fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, bash, makeWrapper }: @@ -10,7 +10,14 @@ stdenv.mkDerivation rec { sha256 = "0kdq0sc7dsfzlr0ggbxggcbkivc6yp30nqwjwcaxg9295s3b06wa"; }; - patchPhase = '' + patches = [ + (fetchpatch { + url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/gcc6-isnan.patch"; + sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876"; + }) + ]; + + postPatch = '' sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; From ce0684a81a2596a9a2b4a3072f7cb5ca01961bb7 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 22 Oct 2017 21:09:46 +0100 Subject: [PATCH 1550/2806] torcs: re-enable -Wformat hardening --- pkgs/games/torcs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index e7c1c38fd15..3a4b8bdb021 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/gcc6-isnan.patch"; sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876"; }) + (fetchpatch { + url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/format-argument.patch"; + sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja"; + }) ]; postPatch = '' @@ -28,8 +32,6 @@ stdenv.mkDerivation rec { installTargets = "install datainstall"; - hardeningDisable = [ "format" ]; - postInstall = '' wrapProgram $out/bin/torcs \ --prefix LD_LIBRARY_PATH : ${mesa}/lib From a94d014149173c1a2b1c005ed3e22bd86413d643 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 22 Oct 2017 21:10:49 +0100 Subject: [PATCH 1551/2806] torcs: clean up compiler warnings --- pkgs/games/torcs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 3a4b8bdb021..1b6ad5b34c3 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/format-argument.patch"; sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja"; }) + (fetchpatch { + url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/glibc-default-source.patch"; + sha256 = "0k4hgpddnhv68mdc9ics7ah8q54j60g394d7zmcmzg6l3bjd9pyp"; + }) ]; postPatch = '' From 4068703502cb2948d09bc419d19e25b1e18502e2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 23 Oct 2017 00:30:10 +0300 Subject: [PATCH 1552/2806] x42-plugins: Hack to attempt fixing the perpetual build problem Since basically forever, it randomly fails with do not know how to unpack source archive /nix/store/d821jkm8bgkdcv924nk7qr1q06l9is35-x42-plugins-20170428.tar.xz on Hydra. https://hydra.nixos.org/build/62793688 --- pkgs/applications/audio/x42-plugins/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 2b509d8db60..0c151697e89 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -12,7 +12,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver]; + buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; + + # Don't remove this. The default fails with 'do not know how to unpack source archive' + # every now and then on Hydra. No idea why. + unpackPhase = '' + tar xf $src + sourceRoot=$(echo x42-plugins-*) + chmod -R u+w $sourceRoot + ''; makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ]; From fe41e1763153583fc956876872d27da9e017db41 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 22 Oct 2017 22:14:38 +0000 Subject: [PATCH 1553/2806] ocamlPackages.merlin: fix homepage URL --- pkgs/development/tools/ocaml/merlin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 3d5a13c7e0c..904e070e511 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; - homepage = http://the-lambda-church.github.io/merlin/; + homepage = "https://github.com/ocaml/merlin"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; }; From 97d02a78f049dc3287089b11b00d560f3253a554 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 22 Oct 2017 22:19:28 +0000 Subject: [PATCH 1554/2806] 0ad: fix homepage URL --- pkgs/games/0ad/data.nix | 2 +- pkgs/games/0ad/game.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index f61b8bc1dcf..2c6abd7972f 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source game of ancient warfare -- data files"; - homepage = https://wildfiregames.com/0ad/; + homepage = "https://play0ad.com/"; license = licenses.cc-by-sa-30; platforms = platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index c1b69eb3120..a056f5880a4 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source game of ancient warfare"; - homepage = https://wildfiregames.com/0ad/; + homepage = "https://play0ad.com/"; license = with licenses; [ gpl2 lgpl21 mit cc-by-sa-30 licenses.zlib # otherwise masked by pkgs.zlib From 1d6eaac764120c3498080275091bb6649144abb9 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 4 Oct 2017 17:40:01 +0100 Subject: [PATCH 1555/2806] rust: remove beta and nightly releases nixpkgs is for stable software. If you want beta and nightly, use the nixpkgs-mozilla overlay. --- pkgs/development/compilers/rust/beta.nix | 40 ------------------- pkgs/development/compilers/rust/nightly.nix | 37 ----------------- .../development/compilers/rust/nightlyBin.nix | 23 ----------- .../patches/disable-lockfile-check-beta.patch | 25 ------------ .../disable-lockfile-check-nightly.patch | 25 ------------ pkgs/top-level/all-packages.nix | 32 +++------------ 6 files changed, 6 insertions(+), 176 deletions(-) delete mode 100644 pkgs/development/compilers/rust/beta.nix delete mode 100644 pkgs/development/compilers/rust/nightly.nix delete mode 100644 pkgs/development/compilers/rust/nightlyBin.nix delete mode 100644 pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch delete mode 100644 pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix deleted file mode 100644 index 876c54a298b..00000000000 --- a/pkgs/development/compilers/rust/beta.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl -, targets ? [] -, targetToolchains ? [] -, targetPatches ? [] -}: - -let - rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); -in -rec { - rustc = callPackage ./rustc.nix { - inherit llvm targets targetPatches targetToolchains rustPlatform; - - version = "beta-2017-05-27"; - - configureFlags = [ "--release-channel=beta" ]; - - src = fetchurl { - url = "https://static.rust-lang.org/dist/2017-05-27/rustc-beta-src.tar.gz"; - sha256 = "9f3f92efef7fb2b4bf38e57e4ff1f416dc221880b90841c4bdaee350801c0b57"; - }; - - patches = [ - ./patches/darwin-disable-fragile-tcp-tests.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - - doCheck = false; - broken = true; - }; - - cargo = callPackage ./cargo.nix rec { - version = "0.18.0"; - srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666"; - srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; - depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; - - inherit rustc; # the rustc that will be wrapped by cargo - inherit rustPlatform; # used to build cargo - }; -} diff --git a/pkgs/development/compilers/rust/nightly.nix b/pkgs/development/compilers/rust/nightly.nix deleted file mode 100644 index 37a234ea129..00000000000 --- a/pkgs/development/compilers/rust/nightly.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, callPackage, rustPlatform, llvm, fetchurl -, targets ? [] -, targetToolchains ? [] -, targetPatches ? [] -}: - -rec { - rustc = callPackage ./rustc.nix { - inherit llvm targets targetPatches targetToolchains rustPlatform; - - version = "nightly-2017-05-30"; - - configureFlags = [ "--release-channel=nightly" ]; - - src = fetchurl { - url = "https://static.rust-lang.org/dist/2017-05-30/rustc-nightly-src.tar.gz"; - sha256 = "90ce76db56a93f1b4532f2e62bbf12c243c4d156662b0d80c25319211ee7d0e0"; - }; - - patches = [ - ./patches/darwin-disable-fragile-tcp-tests.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - - doCheck = false; - broken = true; - }; - - cargo = callPackage ./cargo.nix rec { - version = "0.18.0"; - srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666"; - srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; - depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; - - inherit rustc; # the rustc that will be wrapped by cargo - inherit rustPlatform; # used to build cargo - }; -} diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix deleted file mode 100644 index af06835c5de..00000000000 --- a/pkgs/development/compilers/rust/nightlyBin.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl }: - -let - platform = if stdenv.system == "x86_64-linux" - then "x86_64-unknown-linux-gnu" - else throw "missing bootstrap url for platform ${stdenv.system}"; - - bootstrapHash = - if stdenv.system == "x86_64-linux" - then "0svlm4bxsdhdn4jsv46f278kid23a9w978q2137qrba4xnyb06kf" - else throw "missing bootstrap hash for platform ${stdenv.system}"; - - src = fetchurl { - url = "https://static.rust-lang.org/dist/${version}/rust-nightly-${platform}.tar.gz"; - sha256 = bootstrapHash; - }; - - version = "2017-06-26"; -in import ./binaryBuild.nix - { inherit stdenv fetchurl makeWrapper cacert zlib buildRustPackage curl; - inherit version src platform; - versionType = "nightly"; - } diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch deleted file mode 100644 index a6fe3413fd2..00000000000 --- a/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5702d7cdb2bed7ac3af3c01087b181da35f6e108 Mon Sep 17 00:00:00 2001 -From: joachim schiele -Date: Thu, 24 Nov 2016 22:25:48 +0100 -Subject: [PATCH 2/2] asdf - ---- - src/tools/tidy/src/main.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs -index cabaee5..685df94 100644 ---- a/src/tools/tidy/src/main.rs -+++ b/src/tools/tidy/src/main.rs -@@ -48,7 +48,7 @@ fn main() { - errors::check(&path, &mut bad); - cargo::check(&path, &mut bad); - features::check(&path, &mut bad); -- cargo_lock::check(&path, &mut bad); -+ //cargo_lock::check(&path, &mut bad); - pal::check(&path, &mut bad); - - if bad { --- -2.10.0 - diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch deleted file mode 100644 index c89d22dcb1e..00000000000 --- a/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ac204f8be95cdb2350a1dd893641e38528aaf01d Mon Sep 17 00:00:00 2001 -From: joachim schiele -Date: Fri, 25 Nov 2016 02:17:02 +0100 -Subject: [PATCH] asdf - ---- - src/tools/tidy/src/main.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs -index cb11fe2..c9b7d2a 100644 ---- a/src/tools/tidy/src/main.rs -+++ b/src/tools/tidy/src/main.rs -@@ -45,7 +45,7 @@ fn main() { - bins::check(&path, &mut bad); - style::check(&path, &mut bad); - errors::check(&path, &mut bad); -- cargo::check(&path, &mut bad); -+ //cargo::check(&path, &mut bad); - features::check(&path, &mut bad); - pal::check(&path, &mut bad); - --- -2.10.0 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab2d1dd75c0..4ed1c957756 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6175,34 +6175,12 @@ with pkgs; inherit (darwin) apple_sdk; }; + # For beta and nightly releases use the nixpkgs-mozilla overlay + rust = callPackage ../development/compilers/rust { }; + inherit (rust) cargo rustc; + rustRegistry = callPackage ./rust-packages.nix { }; - rust = rustStable; - rustStable = callPackage ../development/compilers/rust { - inherit (llvmPackages_4) llvm; - }; - rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {})); - - rustNightly = rustBeta; - - # rust support in nixpkgs isn't yet well maintained enough for us to - # pretend to support nightlies in a meaningful way. - - # rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix { - # rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); - # })); - - rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix { - buildRustPackage = callPackage ../build-support/rust { - rust = rustNightlyBin; - }; - }); - - cargo = rust.cargo; - rustc = rust.rustc; - - cargo-edit = callPackage ../tools/package-management/cargo-edit { }; - rustPlatform = recurseIntoAttrs (makeRustPlatform rust); makeRustPlatform = rust: lib.fix (self: @@ -6224,6 +6202,8 @@ with pkgs; }); + cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + rainicorn = callPackage ../development/tools/rust/rainicorn { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; From e30e2010277da6814c6828b199c778774b3ba00a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sat, 7 Oct 2017 00:12:22 +0200 Subject: [PATCH 1556/2806] rust: unbreak building with bundled LLVM --- pkgs/development/compilers/rust/rustc.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 73d78319b8c..6eb160add26 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -48,15 +48,18 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] ++ [ "--enable-vendor" "--disable-locked-deps" ] - ++ [ "--enable-llvm-link-shared" ] # ++ [ "--jemalloc-root=${jemalloc}/lib" ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ] + ++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ] ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; patches = patches ++ targetPatches; + # the rust build system complains that nix alters the checksums + dontFixLibtool = true; + passthru.target = target; postPatch = '' From 7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 4 Oct 2017 17:41:16 +0100 Subject: [PATCH 1557/2806] rust: 1.17.0 -> 1.20.0 simplify the boostrap hashes a bit build with bundled llvm: the rust project has forked the llvm compiler to solve some issues. With pkgs.llvm the test suite fails. See https://github.com/rust-lang/rust/pull/43026 And PR #30088 --- pkgs/development/compilers/rust/bootstrap.nix | 30 +++++++--------- pkgs/development/compilers/rust/cargo.nix | 4 +-- pkgs/development/compilers/rust/default.nix | 13 +++---- .../compilers/rust/print-hashes.sh | 34 +++++++++++-------- 4 files changed, 42 insertions(+), 39 deletions(-) diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index ad49b130570..fbcac09fc45 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -1,6 +1,18 @@ { stdenv, fetchurl, makeWrapper, cacert, zlib, curl }: let + # Note: the version MUST be one version prior to the version we're + # building + version = "1.19.0"; + + # fetch hashes by running `print-hashes.sh 1.19.0` + hashes = { + i686-unknown-linux-gnu = "657b78f3c1a1b4412e12f7278e20cc318022fa276a58f0d38a0d15b515e39713"; + x86_64-unknown-linux-gnu = "30ff67884464d32f6bbbde4387e7557db98868e87fb2afbb77c9b7716e3bff09"; + i686-apple-darwin = "bdfd2189245dc5764c9f26bdba1429c2bf9d57477d8e6e3f0ba42ea0dc63edeb"; + x86_64-apple-darwin = "5c668fb60a3ba3e97dc2cb8967fc4bb9422b629155284dcb89f94d116bb17820"; + }; + platform = if stdenv.system == "i686-linux" then "i686-unknown-linux-gnu" @@ -12,27 +24,11 @@ let then "x86_64-apple-darwin" else throw "missing bootstrap url for platform ${stdenv.system}"; - # fetch hashes by patching print-hashes.sh to not use the "$DATE" variable - # then running `print-hashes.sh 1.16.0` - bootstrapHash = - if stdenv.system == "i686-linux" - then "b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5" - else if stdenv.system == "x86_64-linux" - then "48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd" - else if stdenv.system == "i686-darwin" - then "26356b14164354725bd0351e8084f9b164abab134fb05cddb7758af35aad2065" - else if stdenv.system == "x86_64-darwin" - then "2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926" - else throw "missing bootstrap hash for platform ${stdenv.system}"; - src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; - sha256 = bootstrapHash; + sha256 = hashes."${platform}"; }; - # Note: the version MUST be one version prior to the version we're - # building - version = "1.16.0"; in import ./binaryBuild.nix { inherit stdenv fetchurl makeWrapper cacert zlib curl; buildRustPackage = null; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 97977ba3ed3..2df843faf93 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 -, version, srcRev, srcSha, depsSha256 +, version, srcSha, depsSha256 , patches ? []}: rustPlatform.buildRustPackage rec { @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://github.com/rust-lang/cargo"; - rev = srcRev; + rev = version; sha256 = srcSha; }; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 0d7e26e06f4..2544cca4336 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,17 +6,19 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.17.0"; + version = "1.20.0"; in rec { rustc = callPackage ./rustc.nix { inherit llvm targets targetPatches targetToolchains rustPlatform version; + forceBundledLLVM = true; + configureFlags = [ "--release-channel=stable" ]; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87"; + sha256 = "0542y4rnzlsrricai130mqyxl8r6rd991frb4qsnwb27yigqg91a"; }; patches = [ @@ -26,10 +28,9 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.18.0"; - srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666"; - srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; - depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; + version = "0.21.1"; + srcSha = "a64iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; + depsSha256 = "amrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index da52ac37ab3..f3d094d65a8 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -euo pipefail # All rust-related downloads can be found at # https://static.rust-lang.org/dist/index.html. To find the date on @@ -6,25 +7,30 @@ # file, e.g. # https://static.rust-lang.org/dist/channel-rust-beta-date.txt -PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin" -BASEURL="https://static.rust-lang.org/dist" -DATE=$1 -VERSION=$2 +PLATFORMS=( + i686-unknown-linux-gnu + x86_64-unknown-linux-gnu + i686-apple-darwin + x86_64-apple-darwin +) +BASEURL=https://static.rust-lang.org/dist +VERSION=${1:-} +DATE=${2:-} -if [[ -z $DATE ]] -then - echo "No date supplied" - exit -1 -fi - -if [[ -z $VERSION ]] +if [[ -z $VERSION ]] then echo "No version supplied" exit -1 fi -for PLATFORM in $PLATFORMS +if [[ -n $DATE ]] +then + BASEURL=$BASEURL/$DATE +fi + +for PLATFORM in "${PLATFORMS[@]}" do - URL="$BASEURL/$DATE/rust-$VERSION-$PLATFORM.tar.gz.sha256" - curl $URL + URL="$BASEURL/rust-$VERSION-$PLATFORM.tar.gz.sha256" + SHA256=$(curl -sSfL $URL | cut -d ' ' -f 1) + echo "$PLATFORM = \"$SHA256\";" done From d170c2ceadde34a1ee4844fe59d876351331b707 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 8 Oct 2017 19:26:40 +0100 Subject: [PATCH 1558/2806] cargo: use fetchFromGitHub --- pkgs/development/compilers/rust/cargo.nix | 9 +++++---- pkgs/development/compilers/rust/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2df843faf93..2f1cf07c3b8 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib +{ stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 , version, srcSha, depsSha256 , patches ? []}: @@ -7,9 +7,10 @@ rustPlatform.buildRustPackage rec { name = "cargo-${version}"; inherit version; - src = fetchgit { - url = "https://github.com/rust-lang/cargo"; - rev = version; + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "cargo"; + rev = version; sha256 = srcSha; }; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 2544cca4336..122bda0f70b 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -29,8 +29,8 @@ rec { cargo = callPackage ./cargo.nix rec { version = "0.21.1"; - srcSha = "a64iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; - depsSha256 = "amrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; + srcSha = "1nz7sz7rzc6i1c0nzf6kmnmaq1l3hgrg19s589q7k309r6m7p7f7"; + depsSha256 = "0pzfn1zjgklr0fw9zi9sxrwr08q3wcvdl9ybxrk3ld7ps5h9wmsi"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo From 5f8cf0048ea089fa73d17512fc4f9f0f0644e225 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sat, 5 Aug 2017 15:38:48 +0100 Subject: [PATCH 1559/2806] rust: update cargo builder to fetch registry dynamically MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The biggest benefit is that we no longer have to update the registry package. This means that just about any cargo package can be built by nix. No longer does `cargo update` need to be feared because it will update to packages newer then what is available in nixpkgs. Instead of fetching the cargo registry this bundles all the source code into a "vendor/" folder. This also uses the new --frozen and --locked flags which is nice. Currently cargo-vendor only provides binaries for Linux and macOS 64-bit. This can be solved by building it for the other architectures and uploading it somewhere (like the NixOS cache). This also has the downside that it requires a change to everyone's deps hash. And if the old one is used because it was cached it will fail to build as it will attempt to use the old version. For this reason the attribute has been renamed to `cargoSha256`. Authors: * Kevin Cox * Jörg Thalheim * zimbatm --- doc/languages-frameworks/rust.md | 21 +- pkgs/applications/altcoins/ethabi.nix | 2 +- pkgs/applications/altcoins/ethrun.nix | 3 +- .../altcoins/zcash/librustzcash/default.nix | 2 +- pkgs/applications/misc/alacritty/default.nix | 3 +- .../networking/cluster/habitat/default.nix | 3 +- .../networking/dyndns/cfdyndns/default.nix | 2 +- .../git-and-tools/git-dit/default.nix | 2 +- .../version-management/pijul/default.nix | 2 +- .../window-managers/way-cooler/default.nix | 3 +- .../window-managers/wtftw/default.nix | 3 +- pkgs/build-support/rust/cargo-vendor.nix | 32 +++ pkgs/build-support/rust/default.nix | 89 ++------ pkgs/build-support/rust/fetch-cargo-deps | 209 ------------------ pkgs/build-support/rust/fetchcargo.nix | 25 ++- pkgs/development/compilers/rust/cargo.nix | 4 +- pkgs/development/compilers/rust/default.nix | 4 +- ...ests-libstd-net-tcp-on-Darwin-Linux.patch} | 31 ++- pkgs/development/misc/loc/default.nix | 8 +- pkgs/development/tools/clog-cli/default.nix | 2 +- pkgs/development/tools/git-series/default.nix | 18 +- pkgs/development/tools/misc/tokei/default.nix | 3 +- pkgs/development/tools/rq/default.nix | 2 +- .../tools/rust/bindgen/default.nix | 2 +- pkgs/development/tools/rust/racer/default.nix | 2 +- .../development/tools/rust/racerd/default.nix | 2 +- .../tools/rust/rainicorn/default.nix | 3 +- .../tools/rust/rustfmt/default.nix | 2 +- .../development/tools/rust/rustup/default.nix | 2 +- pkgs/misc/tw-rs/default.nix | 2 +- pkgs/shells/ion/default.nix | 2 +- pkgs/tools/admin/intecture/agent.nix | 2 +- pkgs/tools/admin/intecture/auth.nix | 2 +- pkgs/tools/admin/intecture/cli.nix | 2 +- .../filesystems/btrfs-dedupe/default.nix | 2 +- pkgs/tools/misc/exa/default.nix | 2 +- pkgs/tools/misc/fd/default.nix | 2 +- pkgs/tools/misc/heatseeker/default.nix | 2 +- .../package-management/cargo-edit/default.nix | 3 +- .../package-management/nix-index/default.nix | 2 +- pkgs/tools/text/ripgrep/default.nix | 2 +- pkgs/tools/text/staccato/default.nix | 3 +- pkgs/tools/text/xsv/default.nix | 2 +- pkgs/tools/typesetting/tectonic/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/rust-packages.nix | 46 ---- 47 files changed, 167 insertions(+), 400 deletions(-) create mode 100644 pkgs/build-support/rust/cargo-vendor.nix delete mode 100755 pkgs/build-support/rust/fetch-cargo-deps rename pkgs/development/compilers/rust/patches/{darwin-disable-fragile-tcp-tests.patch => 0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch} (55%) delete mode 100644 pkgs/top-level/rust-packages.nix diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index 481b76fb78f..276b5496fbb 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -9,16 +9,15 @@ date: 2017-03-05 To install the rust compiler and cargo put ``` -rustStable.rustc -rustStable.cargo +rust ``` -into the `environment.systemPackages` or bring them into scope with -`nix-shell -p rustStable.rustc -p rustStable.cargo`. +into the `environment.systemPackages` or bring them into +scope with `nix-shell -p rust`. -There are also `rustBeta` and `rustNightly` package sets available. -These are not updated very regularly. For daily builds use either rustup from -nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay). +For daily builds (beta and nightly) use either rustup from +nixpkgs or use the [Rust nightlies +overlay](#using-the-rust-nightlies-overlay). ## Packaging Rust applications @@ -38,7 +37,7 @@ buildRustPackage rec { sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj"; }; - depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; + cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; meta = with stdenv.lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; @@ -50,7 +49,7 @@ buildRustPackage rec { } ``` -`buildRustPackage` requires a `depsSha256` attribute which is computed over +`buildRustPackage` requires a `cargoSha256` attribute which is computed over all crate sources of this package. Currently it is obtained by inserting a fake checksum into the expression and building the package once. The correct checksum can be then take from the failed build. @@ -76,11 +75,11 @@ in the `~/.config/nixpkgs/overlays` directory. The latest version can be installed with the following command: - $ nix-env -Ai nixos.rustChannels.stable.rust + $ nix-env -Ai nixos.latest.rustChannels.stable.rust Or using the attribute with nix-shell: - $ nix-shell -p nixos.rustChannels.stable.rust + $ nix-shell -p nixos.latest.rustChannels.stable.rust To install the beta or nightly channel, "stable" should be substituted by "nightly" or "beta", or diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix index c584dd65ebb..e8fb1c49828 100644 --- a/pkgs/applications/altcoins/ethabi.nix +++ b/pkgs/applications/altcoins/ethabi.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd"; }; - depsSha256 = "1n4rxipna307r4xppb2iaads7kpa3yjv99fimvpn8l0f999ir2rz"; + cargoSha256 = "0i9617qwc6d4jvlbydwk03rcsnyvxzpbn2ms10ds4r6x7jy2a4sy"; cargoBuildFlags = ["--features cli"]; diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix index f61a5884fd4..2a8c37610db 100644 --- a/pkgs/applications/altcoins/ethrun.nix +++ b/pkgs/applications/altcoins/ethrun.nix @@ -13,12 +13,13 @@ buildRustPackage rec { sha256 = "1w651g4p2mc4ljp20l8lwvfx3l3fzyp6gf2izr85vyb1wjbaccqn"; }; - depsSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1knq"; + cargoSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1kn0"; meta = { description = "Directly run Ethereum bytecode"; homepage = https://github.com/dapphub/ethrun/; maintainers = [stdenv.lib.maintainers.dbrock]; + broken = true; # mark temporary as broken inherit version; }; } diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/altcoins/zcash/librustzcash/default.nix index 2b2094c8401..b89582c09e6 100644 --- a/pkgs/applications/altcoins/zcash/librustzcash/default.nix +++ b/pkgs/applications/altcoins/zcash/librustzcash/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c"; }; - depsSha256 = "02qx8zdhmj7rmhqqq5q9428x9mlrjxxcnn4yhnygz9gfgvada2hx"; + cargoSha256 = "1b0kal53ggcr59hbrsdj8fifjycahrmzwq677n9h3fywv4r237m6"; installPhase = '' mkdir -p $out/lib diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 411705e6a6a..77466fba653 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -38,7 +38,7 @@ buildRustPackage rec { sha256 = "0h37x12r33xwz9vf1n8y24c0ph5w17lhkpfi5q6lbpgidvbs6fyx"; }; - depsSha256 = "05gkl2zg546i2pm0gx11s56f7dk72qpm39kml1d2myj81s0vyb5z"; + cargoSha256 = "0w3j92kd27pny37pfvlv6qsnbb1lgphmfbhvvng0z96r2b1wjviz"; buildInputs = [ cmake @@ -69,6 +69,7 @@ buildRustPackage rec { dontPatchELF = true; meta = with stdenv.lib; { + broken = true; description = "GPU-accelerated terminal emulator"; homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 60531261140..1656e5a09a6 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1"; }; - depsSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9py"; + cargoSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9p0"; buildInputs = [ libsodium libarchive openssl ]; @@ -35,5 +35,6 @@ buildRustPackage rec { license = licenses.asl20; maintainers = [ maintainers.rushmorem ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + broken = true; # mark temporary as broken due git dependencies }; } diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index a79404e77c8..d1eeaa48bb7 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -12,7 +12,7 @@ buildRustPackage rec { sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b"; }; - depsSha256 = "0whs3fgmpb6g1mjajs3qs9g613x5dal4x6ghzzkpl73a9pgydkpn"; + cargoSha256 = "0k9d6pxsb4gvkqs00g71c1nnz773iccg4vajgn33qdym6m6qsjwy"; buildInputs = [ makeWrapper openssl ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index d68430714de..6fb9f5e36f1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -23,7 +23,7 @@ buildRustPackage rec { sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2"; }; - depsSha256 = "1z2n3z5wkh5z5vc976yscq77fgjszwzwlrp7g17hmsbhzx6x170h"; + cargoSha256 = "08zbvjwjdpv2sbj6mh73py82inhs18jvmh8m9k4l94fcz6ykgqwr"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index a5479a6c6a8..36c7c3c5885 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -18,7 +18,7 @@ buildRustPackage rec { doCheck = false; - depsSha256 = "1qzzpnkyw1bn5fnj06c80f7985v1q0rqcphrrrkpbi33lg5mzgbv"; + cargoSha256 = "0r69vghjd6b30v0qjsipyv56n92iwvyxmllrnwjzjf5pzhhjl7sy"; meta = with stdenv.lib; { description = "A distributed version control system"; diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix index d9d84e83430..75c9e6ecf8c 100755 --- a/pkgs/applications/window-managers/way-cooler/default.nix +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -14,13 +14,14 @@ buildRustPackage rec { sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb"; }; - depsSha256 = "1k5xbw2zhm5z650mxdbxixr90im53wlpjdvq2pbnx2snqm84idlc"; + cargoSha256 = "06qivlybmmc49ksv4232sm1r4hp923xsq4c2ksa4i2azdzc1csdc"; buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ]; nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { + broken = true; description = "Customizable Wayland compositor (window manager)"; longDescription = '' Way Cooler is a customizable tiling window manager written in Rust diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index 598bd23c164..a4eff26d88c 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl"; }; - depsSha256 = "0z7h8ybh2db3xl8qxbzby5lncdaijixzmbn1j8a45lbky1xiix71"; + cargoSha256 = "0z92ml84b5652zgwzn08a8vvxksaa54jql66sfpdz1mvjwhgdmvn"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXinerama libX11 ]; @@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { + broken = true; description = "A tiling window manager in Rust"; homepage = https://github.com/Kintaro/wtftw; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/build-support/rust/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor.nix new file mode 100644 index 00000000000..6b50f8b83e7 --- /dev/null +++ b/pkgs/build-support/rust/cargo-vendor.nix @@ -0,0 +1,32 @@ +{ fetchurl, stdenv }: +let + inherit (stdenv) system; + + version = "0.1.12"; + + hashes = { + x86_64-linux = "1hxlavcxy374yypfamlkygjg662lhll8j434qcvdawkvlidg5ii5"; + x86_64-darwin = "1jkvhh710gwjnnjx59kaplx2ncfvkx9agfa76rr94sbjqq4igddm"; + }; + hash = hashes. ${system} or (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}; + +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/default.nix b/pkgs/build-support/rust/default.nix index 36130289fba..2b32da11d1c 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,10 +1,14 @@ -{ stdenv, callPackage, path, cacert, git, rust, rustRegistry }: - +{ fetchurl, stdenv, path, cacert, git, rust }: let - rustRegistry' = rustRegistry; + cargoVendor = import ./cargo-vendor.nix { + inherit fetchurl stdenv; + }; + + fetchcargo = import ./fetchcargo.nix { + inherit stdenv cacert git rust cargoVendor; + }; in -{ name, depsSha256 -, rustRegistry ? rustRegistry' +{ name, cargoSha256 , src ? null , srcs ? null , sourceRoot ? null @@ -18,17 +22,13 @@ in let lib = stdenv.lib; - fetchDeps = import ./fetchcargo.nix { - inherit stdenv cacert git rust rustRegistry; - }; - - cargoDeps = fetchDeps { + cargoDeps = fetchcargo { inherit name src srcs sourceRoot cargoUpdateHook; - sha256 = depsSha256; + sha256 = cargoSha256; }; in stdenv.mkDerivation (args // { - inherit cargoDeps rustRegistry; + inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; @@ -43,71 +43,24 @@ in stdenv.mkDerivation (args // { postUnpack = '' eval "$cargoDepsHook" - echo "Using cargo deps from $cargoDeps" + mkdir .cargo + cat >.cargo/config <<-EOF + [source.crates-io] + registry = 'https://github.com/rust-lang/crates.io-index' + replace-with = 'vendored-sources' - cp -a "$cargoDeps" deps - chmod +w deps -R - - # It's OK to use /dev/null as the URL because by the time we do this, cargo - # won't attempt to update the registry anymore, so the URL is more or less - # irrelevant - - cat < deps/config - [registry] - index = "file:///dev/null" + [source.vendored-sources] + directory = '$cargoDeps' EOF - export CARGO_HOME="$(realpath deps)" export RUST_LOG=${logLevel} export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt - - # Let's find out which $indexHash cargo uses for file:///dev/null - (cd $sourceRoot && cargo fetch &>/dev/null) || true - cd deps - indexHash="$(basename $(echo registry/index/*))" - - echo "Using indexHash '$indexHash'" - - rm -rf -- "registry/cache/$indexHash" \ - "registry/index/$indexHash" - - mv registry/cache/HASH "registry/cache/$indexHash" - - echo "Using rust registry from $rustRegistry" - ln -s "$rustRegistry" "registry/index/$indexHash" - - # Retrieved the Cargo.lock file which we saved during the fetch - cd .. - mv deps/Cargo.lock $sourceRoot/ - - ( - cd $sourceRoot - - cargo fetch - cargo clean - ) '' + (args.postUnpack or ""); - prePatch = '' - # Patch registry dependencies, using the scripts in $patchRegistryDeps - ( - set -euo pipefail - - cd $NIX_BUILD_TOP/deps/registry/src/* - - for script in $patchRegistryDeps/*; do - # Run in a subshell so that directory changes and shell options don't - # affect any following commands - - ( . $script) - done - ) - '' + (args.prePatch or ""); - buildPhase = with builtins; args.buildPhase or '' runHook preBuild echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}" - cargo build --release ${concatStringsSep " " cargoBuildFlags} + cargo build --release --frozen ${concatStringsSep " " cargoBuildFlags} runHook postBuild ''; @@ -126,4 +79,6 @@ in stdenv.mkDerivation (args // { find target/release -maxdepth 1 -executable -exec cp "{}" $out/bin \; runHook postInstall ''; + + passthru = { inherit cargoDeps; }; }) diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps deleted file mode 100755 index 3c7e034364f..00000000000 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ /dev/null @@ -1,209 +0,0 @@ -# copied from libgit2 source code 'repo-template.h' -makeGitTemplate() { - local target="$1" - mkdir -p -m777 "$target/info" "$target/pack" "$target/objects" "$target/refs" - mkdir -p -m777 "$target/refs/heads" "$target/refs/tags" "$target/objects/info" "$target/objects/pack" - cat <<'EOF' > "$target/description" -Unnamed repository; edit this file 'description' to name the repository. -EOF - chmod 666 "$target/description" - cat <<'EOF' > "$target/info/exclude" -# File patterns to ignore; see `git help ignore` for more information. -# Lines that start with '#' are comments. -EOF -} - -fetchCargoDeps() { - src=$(realpath $1) - out=$(realpath $2) - - echo "Fetching $src to $out" - - mkdir $out - - # Configure git template dir to make libgit2 more deterministic - # - # Without a template dir, libgit2 defaults to /usr/share/git-core/templates, - # which can vary between systems if sandboxed builds aren't used. - # - # Note: we explictly set --tmpdir for mktemp here to make it more friendly - # for nix-shell users, where $TMPDIR is not necessarily set to NIX_BUILD_TOP - echo "Setting up git templatedir" - export GIT_TEMPLATE_DIR="$(mktemp -d --tmpdir=$NIX_BUILD_TOP git-template.XXX)" - makeGitTemplate "$GIT_TEMPLATE_DIR" - export XDG_CONFIG_HOME="$(mktemp -d --tmpdir=$NIX_BUILD_TOP home.XXX)" - mkdir -p $XDG_CONFIG_HOME/git - cat < $XDG_CONFIG_HOME/git/config -[init] - templatedir = $GIT_TEMPLATE_DIR -EOF - - # Configure cargo to fetch from a local copy of the crates.io registry - - echo "Using rust registry from $rustRegistry" - - cat < $out/config -[registry] -index = "file://$rustRegistry" -EOF - - export CARGO_HOME=$out - cd $src - - if [[ ! -f Cargo.lock ]]; then - echo - echo "ERROR: The Cargo.lock file doesn't exist" - echo - echo "Cargo.lock is needed to make sure that depsSha256 doesn't change" - echo "when the registry is updated." - echo - - exit 1 - fi - - # We need to do the following string replacement so that 'cargo fetch' - # doesn't ignore the versions specified in Cargo.lock - substituteInPlace Cargo.lock \ - --replace "registry+https://github.com/rust-lang/crates.io-index" \ - "registry+file://$rustRegistry" - - # Do any possible 'cargo update -p --precise ' ad-hoc updates - eval "$cargoUpdateHook" - - # Do the fetch - cargo fetch --verbose - - # Now that we have fetched everything, let's make the output deterministic - - # Cargo uses the following directory structure for fetched data, where - # $indexHash is a hash of the registry index URL: - # - # - # /config: - # - # Cargo config file. We'll delete this because it's not deterministic, - # and instead recreate it just before running 'cargo build'. - # - # /registry/cache/$indexHash/: - # - # This is where tarballs of registry package dependencies are kept - # We'll need to keep this, but make sure $indexHash is a fixed name. - # - # /registry/index/$indexHash/: - # - # A copy of the registry index is kept here. We can delete this, and - # instead, just before running 'cargo build', we'll symlink this - # directory to our static copy of the registry in the Nix store. - # - # /registry/src/$indexHash/{pkgName-pkgVersion}/: - # - # Here cargo keeps extracted sources of the cached tarballs. - # We'll just delete this because cargo will re-populate them from the - # tarballs. - # - # /git/db/{domain-hash}/: - # - # Here cargo keeps the `.git` directories of git dependencies. - # We'll need to keep these, but make them deterministic. - # - # /git/checkouts/{domain-hash}/{branchName}/: - # - # Here cargo keeps checked-out sources of the git dependencies. - # We can delete this, because cargo will re-populate them from the above - # `.git` directories. - # - # Let's start - - # Remove cargo config file, which points to the ever-changing registry - rm $out/config - - # Save the Cargo.lock file into the output, so that we don't have to do another - # 'cargo update' during the build (which would try to access the network) for - # any ad-hoc package updates (through $cargoUpdateHook). - # - # We need to replace the rustRegistry URL with something deterministic. - # Since the URL won't actually be accessed anymore, it's fine to use /dev/null. - - substituteInPlace Cargo.lock \ - --replace "registry+file://$rustRegistry" \ - "registry+file:///dev/null" - mv Cargo.lock $out/ - - - # Let's replace $indexHash with something more deterministic - mv $out/registry/cache/* $out/registry/cache/HASH - - # The registry index changes all the time, so it's not deterministic - # We'll symlink it before running 'cargo build' - rm -rf $out/registry/index/* - - # Make git DBs deterministic - # TODO: test with git submodules - [[ ! -d $out/git/checkouts ]] || (cd $out/git/checkouts && for name in *; do - revs="" - cd "$out/git/checkouts/$name" - while read dir; do - # extract substring: [dir = "./xxx/yyy/.git"] => [branch = "xxx/yyy"] - branch="${dir:2:$((${#dir}-7))}" - - cd "$out/git/checkouts/$name/$branch" - rev="$(git rev-parse HEAD)" - revs="$rev $revs" - done < <(find . -type d -name .git -print) - - echo "List of revs to keep for git db $name: $revs" - - ( - # The following code was adapted from nix-prefetch-git - - cd "$out/git/db/$name" - - export GIT_DIR=. - - # Remove all remote branches - git branch -r | while read branch; do - git branch -rD "$branch" >&2 - done - - # Remove all tags - git tag | while read tag; do - git tag -d "$tag" >&2 - done - - # Remove all local branches - branchrefs=() - eval "$(git for-each-ref --shell --format='branchrefs+=(%(refname))' refs/heads/)" - - for branchref in "${branchrefs[@]}"; do - git update-ref -d "$branchref" >&2 - done - - # Create ad-hoc branches for the revs we need - echo "$revs" | while read -d " " rev; do - echo "Creating git branch b_$rev $rev" - git branch b_$rev $rev - done - - # Remove files that have timestamps or otherwise have non-deterministic - # properties. - rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config - - # Do a full repack. Must run single-threaded, or else we lose determinism. - git config pack.threads 1 - git repack -A -d -f - rm -f config - - # Garbage collect unreferenced objects. - git gc --prune=all - ) - done) - - # Remove unneeded outputs - [[ ! -d $out/registry/src ]] || rm -rf $out/registry/src - [[ ! -d $out/git/checkouts ]] || rm -rf $out/git/checkouts - - # XXX: provide some debugging output to see find out why we are seeing - # sporadic hash mismatches - find $out ! -type f - find $out -type f -exec sha256sum {} + -} diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 0c9625e5140..9b3ba530339 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,19 +1,30 @@ -{ stdenv, cacert, git, rust, rustRegistry }: +{ stdenv, cacert, git, rust, cargoVendor }: { name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }: - stdenv.mkDerivation { - name = "${name}-fetch"; - buildInputs = [ rust.cargo rust.rustc git ]; - inherit src srcs sourceRoot rustRegistry cargoUpdateHook; + name = "${name}-vendor"; + buildInputs = [ cacert cargoVendor git rust.cargo ]; + inherit src srcs sourceRoot; phases = "unpackPhase installPhase"; installPhase = '' - source ${./fetch-cargo-deps} + if [[ ! -f Cargo.lock ]]; then + echo + echo "ERROR: The Cargo.lock file doesn't exist" + echo + echo "Cargo.lock is needed to make sure that cargoSha256 doesn't change" + echo "when the registry is updated." + echo + + exit 1 + fi export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + export CARGO_HOME=$(mktemp -d cargo-home.XXX) - fetchCargoDeps . "$out" + cargo vendor + + cp -ar vendor $out ''; outputHashAlgo = "sha256"; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2f1cf07c3b8..ec890b3bf7a 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 -, version, srcSha, depsSha256 +, version, srcSha, cargoSha256 , patches ? []}: rustPlatform.buildRustPackage rec { @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = srcSha; }; - inherit depsSha256; + inherit cargoSha256; inherit patches; passthru.rustc = rustc; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 122bda0f70b..73788189af3 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -22,7 +22,7 @@ rec { }; patches = [ - ./patches/darwin-disable-fragile-tcp-tests.patch + ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; }; @@ -30,7 +30,7 @@ rec { cargo = callPackage ./cargo.nix rec { version = "0.21.1"; srcSha = "1nz7sz7rzc6i1c0nzf6kmnmaq1l3hgrg19s589q7k309r6m7p7f7"; - depsSha256 = "0pzfn1zjgklr0fw9zi9sxrwr08q3wcvdl9ybxrk3ld7ps5h9wmsi"; + cargoSha256 = "02gdh71jkhmr17q5gam079ig5dvpw1fms3v6k5h2bg3fclw7kkrs"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch b/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch similarity index 55% rename from pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch rename to pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch index da550f0327d..f55d0badb82 100644 --- a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch +++ b/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch @@ -1,17 +1,18 @@ -From 1d8a91d5b09cb762fe890d04bfb61b9eefd0624a Mon Sep 17 00:00:00 2001 -From: Moritz Ulrich -Date: Sun, 8 Jan 2017 10:28:17 +0100 -Subject: [PATCH] Disable libstd::net::tcp::{ttl, timeouts} on Darwin +From 26d3b70abec1adf773522643b31ce9c03439916a Mon Sep 17 00:00:00 2001 +From: Joerg Thalheim +Date: Tue, 10 Oct 2017 00:40:20 +0100 +Subject: [PATCH] Disable fragile tests libstd::net::tcp on Darwin/Linux +Signed-off-by: Joerg Thalheim --- - src/libstd/net/tcp.rs | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + src/libstd/net/tcp.rs | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs -index 0e7c5b0671..d42fd26267 100644 +index 8d1e7882e5..2c223fb315 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs -@@ -551,6 +551,7 @@ mod tests { +@@ -949,6 +949,7 @@ mod tests { }) } @@ -19,7 +20,7 @@ index 0e7c5b0671..d42fd26267 100644 #[test] fn write_close() { each_ip(&mut |addr| { -@@ -1022,7 +1023,10 @@ mod tests { +@@ -1421,7 +1422,10 @@ mod tests { // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code // no longer has rounding errors. @@ -31,7 +32,7 @@ index 0e7c5b0671..d42fd26267 100644 #[test] fn timeouts() { let addr = next_test_ip4(); -@@ -1101,6 +1105,7 @@ mod tests { +@@ -1500,6 +1504,7 @@ mod tests { assert_eq!(false, t!(stream.nodelay())); } @@ -39,6 +40,14 @@ index 0e7c5b0671..d42fd26267 100644 #[test] fn ttl() { let ttl = 100; +@@ -1568,6 +1573,7 @@ mod tests { + }) + } + ++ #[cfg_attr(target_os = "linux", ignore)] + #[test] + fn connect_timeout_unroutable() { + // this IP is unroutable, so connections should always time out, -- -2.11.0 +2.14.2 diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 681e6fcc528..fd5796276f7 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -3,17 +3,17 @@ with rustPlatform; buildRustPackage rec { - version = "0.3.4"; + version = "2017-06-23"; name = "loc-${version}"; src = fetchFromGitHub { owner = "cgag"; repo = "loc"; - rev = "9f3590f6299a1be3560f00de7f4f8bef61a02642"; - sha256 = "0dga8prwnnmsa616jh64wzic957ff0491xghm0bjlns35ajc8lif"; + rev = "bbea575f56879ef614d57a42a6b79fd45b9a8b38"; + sha256 = "0agyhi55rh248fmlsip4fi1iw4xv3433q7bcb2lpjfnjpzxxlvfn"; }; - depsSha256 = "1xcfhbnz208dk7xb748v8kv28zbhyr7wqg9gsgbiw3lnvc2a3nn6"; + cargoSha256 = "0f3i8av9g19r2nhr9m8ca8s23kq294c5kqyvx155l6p76r7a9kvb"; meta = { homepage = http://github.com/cgag/loc; diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index f64ead3e107..1cd8f7757f9 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; }; - depsSha256 = "0gkg3bxx7nxsvff33n7pif731djfvlzk0msia27h0wq0mazq7kw3"; + cargoSha256 = "1pi8fh6vz6m5hr38wm0v0hxp1yxm1ma8yzish3b78zkv8f90kmv0"; meta = { description = "Generate changelogs from local git metadata"; diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index b792cfe8c99..44120ad023a 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }: with rustPlatform; @@ -13,14 +13,24 @@ buildRustPackage rec { sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; }; - depsSha256 = "1xypk9ck7znca0nqm61m5ngpz6q7c0wydlpwxq4mnkd1np27xn53"; + cargoSha256 = "06w864f73kijq24xzljfaf47d97aqyg4md3crzbq8hns157m3sv2"; + + cargoDepsHook = '' + ( + cd ${name}-src + # see https://github.com/git-series/git-series/pull/56 + patch -p1 < ${fetchpatch { + url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch"; + sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0"; + }} + ) + ''; nativeBuildInputs = [ cmake pkgconfig perl ]; buildInputs = [ openssl zlib ]; postBuild = '' - mkdir -p "$out/man/man1" - cp "$src/git-series.1" "$out/man/man1" + install -D "$src/git-series.1" "$out/man/man1/git-series.1" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index c0a56648db9..b44548c8ffd 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1bzs3mr6f9bna39b9ddwwq0raas07nbn106mnq3widxg59i0gxhd"; }; - depsSha256 = "1cz93mrpxmyrza0ipdyg2a6mynl66plpsb446wxnmmy7y7zd6xbf"; + cargoSha256 = "0y0rkxhkv31v5sa0425dwskd80i6srwbqhqkrw1g1kbmbs9y0vxz"; installPhase = '' mkdir -p $out/bin @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { + broken = true; description = "Count code, quickly"; homepage = https://github.com/Aaronepower/tokei; license = licenses.mit; diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index eef8b660c41..ca2aea2399f 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "066f6sdy0vrp113wlg18q9p0clyrg9iqbj17ly0yn8dxr5iar002"; }; - depsSha256 = "138h0q2a2gghfjpwfi11zw4rkipvmglb7srqz56ibbw2xliid2wl"; + cargoSha256 = "0c4awm1d87b396d3g3mp1md5p92i5a64a9jdawpr8mwjd0bly05m"; buildInputs = [ llvmPackages.clang-unwrapped v8 ]; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 78a327c9ea1..1240e7cc38f 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" ''; - depsSha256 = "06b5zyw9p7h73h30c1nlnwjb0zmkfx52wqsl9b14y9hx51g9bw0r"; + cargoSha256 = "128skg31lc9v8i7ghfb3wyiazivqfvzhi1mvmjcl0gkx1hi5006v"; doCheck = false; # A test fails because it can't find standard headers in NixOS diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 89c384eb6ec..57b685e946d 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "06k50f2vj2w08afh3nrlhs0amcvw2i45bhfwr70sgs395xicjswp"; }; - depsSha256 = "1gywnjbjl9jalbq6wkfmbczav4qbhgw2h8lyxkyppnhw9y4j0nc1"; + cargoSha256 = "1w5imxyqlyv24dvzncq6dy01zn2x8p1aciyvzh8ac1x1wdjcacjc"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index b2340e01c1a..f3cb4e78950 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -14,7 +14,7 @@ buildRustPackage rec { doCheck = false; - depsSha256 = "0db18m0vxzvg821gb5g8njhlnxw7im81m089i4982n8hmnhm1497"; + cargoSha256 = "1h7hm7vkk1grah6pn5ydfi5pzc2kd48lh2kxim5jlvrxhd2dingg"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix index b6cbeb88402..370318d1ff2 100644 --- a/pkgs/development/tools/rust/rainicorn/default.nix +++ b/pkgs/development/tools/rust/rainicorn/default.nix @@ -13,9 +13,10 @@ buildRustPackage rec { sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01"; }; - depsSha256 = "1ckrf77s1glrqi0gvrv9wqmip4i97dk0arn0iz87jg4q2wfss85k"; + cargoSha256 = "14kd25mw6m20blqcr221cclcqxw0j229zxq8hsaay6q7jgv0c7a0"; meta = with stdenv.lib; { + broken = true; description = "Rust IDEs. parse-analysis"; homepage = https://github.com/RustDT/Rainicorn; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 0e3802a214f..b8585dace54 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "12l3ff0s0pzhcf5jbs8wqawjk4jghhhz8j6dq1n5201yvny12jlr"; }; - depsSha256 = "1nnb2lpzjf6hv1a7cw3cbkc22fb54rsp6h87wzmqi4hsy1csff7a"; + cargoSha256 = "0gppki9mgx99xipapg36ydwk1bplygnz6sbyzbg46vhn10iggfwm"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 59cdf443f4a..65599ad8d18 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { name = "rustup-${version}"; version = "1.3.0"; - depsSha256 = "078hssgffgpakv735p1xg60kic151r2dvpdr9sipb63lwqr4dxfb"; + cargoSha256 = "1yd7k0jpx78p5bp6iyzgbyj7pjz8vyjg9g7fmf1bl60jsbdpgv3g"; src = fetchFromGitHub { owner = "rust-lang-nursery"; diff --git a/pkgs/misc/tw-rs/default.nix b/pkgs/misc/tw-rs/default.nix index 2459e157a90..37a609db036 100644 --- a/pkgs/misc/tw-rs/default.nix +++ b/pkgs/misc/tw-rs/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ perl zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin curl; - depsSha256 = "1lg1jh6f9w28i94vaj62r859g6raalxmxabvw7av6sqr0hr56p05"; + cargoSha256 = "0c3324b7z77kiwc6whbppfmrli254fr1nyd0vpsxvpc0av3279jg"; meta = with stdenv.lib; { description = "Twitter command-line interface written in rust"; diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 4ab03b31fb9..b7e42370125 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "0c2haw9qiwysyp1xj6qla8d6zpsdlygagzh86sk04c2b4ssyaca3"; }; - depsSha256 = "0w2jgbrcx57js8ihzs5acp6b1niw1c7khdxrv14y3z9mmm9j55hs"; + cargoSha256 = "0ydi44710as0bb442zryzx30nk4mscdw3gsahwprnsvvaril33rn"; meta = with stdenv.lib; { description = "Modern system shell with simple (and powerful) syntax"; diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 4024ab9b91f..2b663cd3bce 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj"; }; - depsSha256 = "1n57i9wkak76ram748mwq0dn32d041ajd31laqc13c76pp29agrp"; + cargoSha256 = "1fcl2nnplcic729cmvall2k7wf3jdm7dspvlbxji99bn813ackig"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index c4678c8d4b7..759230c6a29 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2"; }; - depsSha256 = "0wzr8hk63gh3nm8f7dbzwj8pgc3cm8p8mr2q7bbgvri1a5i83sfb"; + cargoSha256 = "0q3mrcvl1yyrx4a88kanjlfcx6slf7r79i0dh4w81sj6gp07sssm"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index e98b62bd0ea..a4ac74e9f2d 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq"; }; - depsSha256 = "0nax7h7f5qgalgxsfidrxrv1ybl5xvrpc1k7xc1kmaf955gqmc46"; + cargoSha256 = "0qwbgwxrjc0dvjbpqa59jixy5nq7lng2c1z91rw48qc91v7fa664"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix index 4c22268a1c8..d2a82dc357b 100644 --- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix +++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix @@ -12,7 +12,7 @@ buildRustPackage rec { sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp"; }; - depsSha256 = "04jlz7nzsmg86i73w75i8rmlbk635xrg8m1dfac8h17dwb29yj6a"; + cargoSha256 = "0dmn9bccicxhqcj9zrsxxp0vb5ma12a1hs9brpc22n4g1qy4yzcn"; buildInputs = [ lzo zlib ]; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 488f7482b15..cb77edf0d29 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -6,7 +6,7 @@ buildRustPackage rec { name = "exa-${version}"; version = "0.8.0"; - depsSha256 = "0yz41prkjs5rmvdhr9k58a52l7hvwy5mfg8rcpsq4ybgf601lja2"; + cargoSha256 = "08zzn3a32xfjkmpawcjppn1mr26ws3iv40cckiz8ldz4qc8y9gdh"; src = fetchFromGitHub { owner = "ogham"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 07d8a661d7b..54d17e6f64c 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv"; }; - depsSha256 = "17fjlmdwp8582dvv68b5h3zzvmd71yd9sw9xalyrrww46h7fd84g"; + cargoSha256 = "1v9wg4dq4c7i85bkdhd79bj8gx7200z6np05wsyj2ycbv97p095j"; meta = { description = "A simple, fast and user-friendly alternative to find"; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 499b4a87bc4..e7ddcf572ae 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7"; }; - depsSha256 = "05mj84a5k65ai492grwg03c3wq6ardhs114bv951fgysc9rs07p5"; + cargoSha256 = "0kqkzjd90v19qvl3iv1vv2fi8h0z75b0yn0z5jq8w4m94fvh0p95"; # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 4a34e62322d..ecb0708eb30 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -15,7 +15,7 @@ buildRustPackage rec { buildInputs = [ zlib openssl ]; - depsSha256 = "1v7ir56j6biximnnhyvadd98azcj3i5hc8aky0am2nf0swq0jimq"; + cargoSha256 = "1m4yb7472g1n900dh3xqvdcywk3v01slj3bkk7bk7a9p5x1kyjfn"; meta = with stdenv.lib; { description = "A utility for managing cargo dependencies from the command line"; @@ -23,5 +23,6 @@ buildRustPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ jb55 ]; platforms = platforms.all; + broken = true; }; } diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 70cd83b87a3..df5a39d6a03 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -12,7 +12,7 @@ buildRustPackage rec { rev = "v${version}"; sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5"; }; - depsSha256 = "0v145fi9bfiwvsdy7hz9lw4m2f2j8sxvixfzmjwfnq4klm51c8yl"; + cargoSha256 = "0cxdrzjmqq3ywdh0f5mzkcf50hbbgd3bak4398v2ls5gy5s9fcz2"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl curl]; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 8ddfa7d7be4..0d1c60dc694 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "1cnvwxbznmsn1gand8hhy5zadax5p67lvm46fkj1a1s89f158w3a"; }; - depsSha256 = "1kx9xazhj93xa3cnys39wwr84qqjqrlsbbi5ih71vxppskdpvd6m"; + cargoSha256 = "00y2vdnrg02clqin9pg57s9micrp66f6y49wq89cmykrfg3r8cwf"; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix index 34e1413150f..973585abc81 100644 --- a/pkgs/tools/text/staccato/default.nix +++ b/pkgs/tools/text/staccato/default.nix @@ -11,9 +11,10 @@ rustPlatform.buildRustPackage rec { sha256 = "1zbd1gx0ik2r7bavcid776j37g6rzd3f6cs94kq1qar4gyf1gqjm"; }; - depsSha256 = "1gwfkh3ck8n3zcy43ch2mnc28a6y10p3srhnx9dh8gwnwbpb733c"; + cargoSha256 = "074mfyanwdykg6wci2ia63wcnnyik741g8n624pac215sg4i95h7"; meta = { + broken = true; description = "A command line program that lets you compute statistics from values from a file or standard input"; longDescription = '' Staccato (`st` for short) is a command line program that lets you diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index db84eac4a23..23f172f4ebe 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "0z1z3b6nzaid510jaikkawvpmv4kjphzz84p0hppq6vcp5jy00s2"; }; - depsSha256 = "13hy835871zxdnakwsr4bjm4krahlz4aqk5lh0rw78avfla89q9q"; + cargoSha256 = "0pdzh2xr40dgwravh3i58g602bpszj6c8inggzgmq2kfk8ck6rgj"; meta = with stdenv.lib; { description = "A fast CSV toolkit written in Rust"; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index f6c3be63e03..3fdebd19f3c 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0k5vkn112bjwh4wnxryzqz79dlja64k7s105mf3yaik136hqnmqv"; }; - depsSha256 = "1vxvkh1v9x6j4ggbh6sysi5i3089hrs0mjbp910a1jljiav7l8nj"; + cargoSha256 = "03bqhgz8c4ipdkd3g448bcrr6d188h87vskcfcc3mqlcxg77b8q5"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9de63505831..20d9ba83354 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -130,7 +130,6 @@ mapAliases (rec { robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; - rustUnstable = rustNightly; # added 2016-11-29 rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ed1c957756..f2e6cb87013 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6179,8 +6179,6 @@ with pkgs; rust = callPackage ../development/compilers/rust { }; inherit (rust) cargo rustc; - rustRegistry = callPackage ./rust-packages.nix { }; - rustPlatform = recurseIntoAttrs (makeRustPlatform rust); makeRustPlatform = rust: lib.fix (self: diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix deleted file mode 100644 index 92230993d58..00000000000 --- a/pkgs/top-level/rust-packages.nix +++ /dev/null @@ -1,46 +0,0 @@ -# This file defines the source of Rust / cargo's crates registry -# -# buildRustPackage will automatically download dependencies from the registry -# version that we define here. If you're having problems downloading / finding -# a Rust library, try updating this to a newer commit. - -{ stdenv, fetchFromGitHub, git }: - -stdenv.mkDerivation { - name = "rustRegistry-2017-10-08"; - - src = fetchFromGitHub { - owner = "rust-lang"; - repo = "crates.io-index"; - rev = "78ab44cf22c2ce5d40e562ffc7df7ab10ac12b86"; - sha256 = "0fa3l3px6b89ap63h40bhn2x50zf5j65jrgbb7j103j0cdayk2l0"; - }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' - # For some reason, cargo doesn't like fetchgit's git repositories, not even - # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone - # the repository (tested with registry rev - # 965b634156cc5c6f10c7a458392bfd6f27436e7e), failing with the message: - # - # "Target OID for the reference doesn't exist on the repository" - # - # So we'll just have to create a new git repository from scratch with the - # contents downloaded with fetchgit... - - mkdir -p $out - - cp -r ./* $out/ - - cd $out - - git="${git}/bin/git" - - $git init - $git config --local user.email "example@example.com" - $git config --local user.name "example" - $git add . - $git commit --quiet -m 'Rust registry commit' - - touch $out/touch . "$out/.cargo-index-lock" - ''; -} From 6bbce42fe7909fc0096f27be2f7958cf53f6ac17 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 19 Oct 2017 22:29:28 +0000 Subject: [PATCH 1560/2806] cargo: 0.21.1 -> 0.22.0 --- pkgs/development/compilers/rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 73788189af3..c42c958b170 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -28,9 +28,9 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.21.1"; - srcSha = "1nz7sz7rzc6i1c0nzf6kmnmaq1l3hgrg19s589q7k309r6m7p7f7"; - cargoSha256 = "02gdh71jkhmr17q5gam079ig5dvpw1fms3v6k5h2bg3fclw7kkrs"; + version = "0.22.0"; + srcSha = "0x9pm73hkkd1hq4qrmz8iv91djgpdsxzwll7jari0h77vpwajmw4"; + cargoSha256 = "0xd0rb8gcqy6xngsx9l30jg3fqrcwccgv904ksqs9c4d44hga0gd"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo From c918020ed9ae90a67a0682b4383e64bf1a7cc276 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Sun, 22 Oct 2017 14:56:26 -0600 Subject: [PATCH 1561/2806] picat: add meta.maintainers --- lib/maintainers.nix | 1 + pkgs/development/compilers/picat/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4bb12dcfcc8..244bd64bbef 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -176,6 +176,7 @@ dupgit = "Olivier Delhomme "; dywedir = "Vladyslav M. "; e-user = "Alexander Kahl "; + earldouglas = "James Earl Douglas "; ebzzry = "Rommel Martinez "; edanaher = "Evan Danaher "; edef = "edef "; diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index e86f3869e49..8ee904a6ed6 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation { homepage = http://picat-lang.org/; license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.earldouglas ]; }; } From 7562ed51f6ff4b73cffb73f0431c117308a74a39 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Sun, 22 Oct 2017 14:50:43 -0600 Subject: [PATCH 1562/2806] avian: add meta.maintainers --- lib/maintainers.nix | 1 + pkgs/development/compilers/avian/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4bb12dcfcc8..244bd64bbef 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -176,6 +176,7 @@ dupgit = "Olivier Delhomme "; dywedir = "Vladyslav M. "; e-user = "Alexander Kahl "; + earldouglas = "James Earl Douglas "; ebzzry = "Rommel Martinez "; edanaher = "Evan Danaher "; edef = "edef "; diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix index c2a2b93fc0c..3d58e75200c 100644 --- a/pkgs/development/compilers/avian/default.nix +++ b/pkgs/development/compilers/avian/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = https://readytalk.github.io/avian/; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.earldouglas ]; }; } From 6daba7788495e810c1936a51f74c8cedd4f92791 Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Tue, 17 Oct 2017 13:22:07 +0200 Subject: [PATCH 1563/2806] pythonPackages.meliae: init at 0.4.0 --- .../python-modules/meliae/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/meliae/default.nix diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix new file mode 100644 index 00000000000..a52d695ac81 --- /dev/null +++ b/pkgs/development/python-modules/meliae/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, cython +, isPy3k +, simplejson +}: + +buildPythonPackage rec { + pname = "meliae"; + version = "0.4.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "16gcgjzcjlbfarwlj18fn089bz34kzfw8varbzxsi9ma0amijrcp"; + }; + + disabled = isPy3k; + + doCheck = true; + + checkPhase = '' + python setup.py build_ext -i + python run_tests.py + ''; + + checkInputs = [ simplejson ]; + + propagatedBuildInputs = [ cython ]; + + meta = with stdenv.lib; { + description = "Python Memory Usage Analyzer"; + homepage = http://launchpad.net/meliae; + license = licenses.gpl3; + maintainers = with maintainers; [ xvapx ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c2b10003ca..5eae6afd86a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11650,6 +11650,8 @@ in { }; }; + meliae = callPackage ../development/python-modules/meliae {}; + memcached = buildPythonPackage rec { name = "memcached-1.51"; From 562f8313e0a6acaa5d99f689150cd71d04707605 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 22 Oct 2017 21:46:40 -0400 Subject: [PATCH 1564/2806] ipget: init at 0.2.5 --- .../applications/networking/ipget/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/networking/ipget/default.nix diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix new file mode 100644 index 00000000000..23c9d7df812 --- /dev/null +++ b/pkgs/applications/networking/ipget/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: + +buildGoPackage rec { + name = "ipget-${version}"; + version = "0.2.5"; + rev = "v${version}"; + + goPackagePath = "github.com/ipfs/ipget"; + + extraSrcPaths = [ + (fetchgx { + inherit name src; + sha256 = "1d4w8zl5mcppn3d4bl7qdkiqlf8gi3z2a62nygx17bqpa3da8cf3"; + }) + ]; + + goDeps = ../../../tools/package-management/gx/deps.nix; + + src = fetchFromGitHub { + owner = "ipfs"; + repo = "ipget"; + inherit rev; + sha256 = "0a8yxqhl469ipiznrgkp3yi1xz3xzcbpx60wabqppq8hccrdiybk"; + }; + + meta = with stdenv.lib; { + description = "Retrieve files over IPFS and save them locally"; + homepage = https://ipfs.io/; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c38ee66735e..7aec468907a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2717,6 +2717,8 @@ with pkgs; ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; + ipget = callPackage ../applications/networking/ipget { }; + ipmitool = callPackage ../tools/system/ipmitool { static = false; }; From fd3bb2589555c2c6f63251b977fdc655bd7d9c9b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 23 Oct 2017 09:52:38 +0800 Subject: [PATCH 1565/2806] dropbox: 36.4.22 -> 37.4.29 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 0972cc759ab..89a473f0cd0 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,10 +24,10 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "36.4.22"; + version = "37.4.29"; sha256 = { - "x86_64-linux" = "0hhnigwxqmr00zmlysc1y1k4bzrdrcabcnw44bniarwa2l4fw0v0"; - "i686-linux" = "15l7m33b0qlz8m6h7kh1fkxs37dq8jqy04b3qf693ns7wb5l0sqm"; + "x86_64-linux" = "0ymy8gb57bjq2mq35n52q2viww6am7wy0vskyvypliicggga8iaj"; + "i686-linux" = "0a7zir6x7z3ad71fj1iljc2l6x09f4wi40jfaiinf8ykx85cldw6"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = { From 9af922ac7860d4bb138c69afc237f377764caf6b Mon Sep 17 00:00:00 2001 From: dywedir Date: Mon, 23 Oct 2017 11:01:52 +0300 Subject: [PATCH 1566/2806] ripgrep: 0.6.0 -> 0.7.1 --- pkgs/tools/text/ripgrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 0d1c60dc694..9a93ec2d767 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = "${version}"; - sha256 = "1cnvwxbznmsn1gand8hhy5zadax5p67lvm46fkj1a1s89f158w3a"; + sha256 = "0z3f83vhy464k93bc55i9lr6z41163q96if938p9ndhx2q3a20ql"; }; - cargoSha256 = "00y2vdnrg02clqin9pg57s9micrp66f6y49wq89cmykrfg3r8cwf"; + cargoSha256 = "1d6s01gmyfzb0vdf7flq6nvlapwcgbj0mzcprzyg4nj5gjkvznrn"; preFixup = '' mkdir -p "$out/man/man1" From 3983d79dc2f2d59c4a946857973151af6c15333a Mon Sep 17 00:00:00 2001 From: dywedir Date: Mon, 23 Oct 2017 11:12:38 +0300 Subject: [PATCH 1567/2806] ion: 1.0.3 -> 1.0.5 --- pkgs/shells/ion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index b7e42370125..1333bfd873f 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ion-${version}"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "redox-os"; repo = "ion"; rev = version; - sha256 = "0c2haw9qiwysyp1xj6qla8d6zpsdlygagzh86sk04c2b4ssyaca3"; + sha256 = "0i0acl5nw254mw8dbfmb4792rr71is98a5wg32yylfnlrk7zlf8z"; }; - cargoSha256 = "0ydi44710as0bb442zryzx30nk4mscdw3gsahwprnsvvaril33rn"; + cargoSha256 = "0ffp6r5jqyf9j8jd77vbvc6l3xm09ipbraj6av6iciw1sxskib33"; meta = with stdenv.lib; { description = "Modern system shell with simple (and powerful) syntax"; From f1f7296885109b8c126acf47915ebc678beaf8a2 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 23 Oct 2017 10:23:34 +0200 Subject: [PATCH 1568/2806] cargo: fix darwin build --- pkgs/development/compilers/rust/cargo.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index ec890b3bf7a..5225e95b1e1 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib -, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 +, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin , version, srcSha, cargoSha256 , patches ? []}: @@ -21,7 +21,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + # FIXME: Use impure version of CoreFoundation because of missing symbols. + # CFURLSetResourcePropertyForKey is defined in the headers but there's no + # corresponding implementation in the sources from opensource.apple.com. + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1; From f73ad01afb7693290bcbb9667d84e2e12862a950 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 23 Oct 2017 11:04:40 +0100 Subject: [PATCH 1569/2806] nodePackages.web-ext: init at 2.2.2 --- .../node-packages/node-packages-v4.nix | 786 +- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 6310 +++++++++++------ 3 files changed, 4680 insertions(+), 2417 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 88a3d669b37..c6ef2bdfe8c 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -130,13 +130,13 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "abbrev-1.1.0" = { + "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"; - sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f"; + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; "archy-1.0.0" = { @@ -1741,13 +1741,13 @@ let sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; }; }; - "request-2.82.0" = { + "request-2.83.0" = { name = "request"; packageName = "request"; - version = "2.82.0"; + version = "2.83.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.82.0.tgz"; - sha512 = "079947pnxi0h8jdiv5wb64rj3gnq4a02dfj47c41wsdi3g6pp1v3yfg3m1rphib7igf6vkisrgjq16vc4fq916fc870wzckdizal1gx"; + url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; + sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; }; }; "rimraf-2.6.2" = { @@ -2119,13 +2119,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-5.2.2" = { + "ajv-5.2.4" = { name = "ajv"; packageName = "ajv"; - version = "5.2.2"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz"; - sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.2.4.tgz"; + sha1 = "3daf9a8b67221299fdae8d82d117ed8e6c80244b"; }; }; "har-schema-2.0.0" = { @@ -2398,31 +2398,31 @@ let sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; }; }; - "express-4.15.4" = { + "express-4.16.2" = { name = "express"; packageName = "express"; - version = "4.15.4"; + version = "4.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.4.tgz"; - sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1"; + url = "https://registry.npmjs.org/express/-/express-4.16.2.tgz"; + sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"; }; }; - "rc-1.2.1" = { + "rc-1.2.2" = { name = "rc"; packageName = "rc"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz"; - sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz"; + sha1 = "d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"; }; }; - "serve-favicon-2.4.4" = { + "serve-favicon-2.4.5" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.4.tgz"; - sha1 = "412ddd74965151c9f74c0828f35d50c5250210de"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz"; + sha512 = "2gn8a5l0hh655cxq2cvvar6k1hl8cpmagplavx6svjiz9kmi968nwbzhpc2fvpcpmsfqb8s5jjq0gvn8vwwc2lx3cj57ckbcf3prcdk"; }; }; "strong-data-uri-1.0.4" = { @@ -2983,6 +2983,15 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; + "body-parser-1.18.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; + sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; + }; + }; "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; @@ -3019,15 +3028,6 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "debug-2.6.8" = { - name = "debug"; - packageName = "debug"; - version = "2.6.8"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"; - sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; - }; - }; "depd-1.1.1" = { name = "depd"; packageName = "depd"; @@ -3064,22 +3064,22 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "finalhandler-1.0.6" = { + "finalhandler-1.1.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz"; - sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; + sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; }; }; - "fresh-0.5.0" = { + "fresh-0.5.2" = { name = "fresh"; packageName = "fresh"; - version = "0.5.0"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz"; - sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; "merge-descriptors-1.0.1" = { @@ -3127,22 +3127,13 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-1.1.5" = { + "proxy-addr-2.0.2" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "1.1.5"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; - sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; - }; - }; - "qs-6.5.0" = { - name = "qs"; - packageName = "qs"; - version = "6.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; - sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz"; + sha1 = "6571504f47bb988ec8180253f85dd7e14952bdec"; }; }; "range-parser-1.2.0" = { @@ -3154,31 +3145,31 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "send-0.15.4" = { + "send-0.16.1" = { name = "send"; packageName = "send"; - version = "0.15.4"; + version = "0.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.4.tgz"; - sha1 = "985faa3e284b0273c793364a35c6737bd93905b9"; + url = "https://registry.npmjs.org/send/-/send-0.16.1.tgz"; + sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j"; }; }; - "serve-static-1.12.4" = { + "serve-static-1.13.1" = { name = "serve-static"; packageName = "serve-static"; - version = "1.12.4"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz"; - sha1 = "9b6aa98eeb7253c4eedc4c1f6fdbca609901a961"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz"; + sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5"; }; }; - "setprototypeof-1.0.3" = { + "setprototypeof-1.1.0" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; - sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; }; }; "statuses-1.3.1" = { @@ -3199,22 +3190,22 @@ let sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; }; }; - "utils-merge-1.0.0" = { + "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; }; }; - "vary-1.1.1" = { + "vary-1.1.2" = { name = "vary"; packageName = "vary"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz"; - sha1 = "67535ebb694c1d52257457984665323f587e8d37"; + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; "negotiator-0.6.1" = { @@ -3226,6 +3217,51 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "http-errors-1.6.2" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; + sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; + }; + }; + "iconv-lite-0.4.19" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.19"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; + sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; + }; + }; + "raw-body-2.3.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; + sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; + }; + }; + "setprototypeof-1.0.3" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; + sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + }; + }; "unpipe-1.0.0" = { name = "unpipe"; packageName = "unpipe"; @@ -3253,13 +3289,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "ipaddr.js-1.4.0" = { + "ipaddr.js-1.5.2" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.4.0"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; - sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz"; + sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0"; }; }; "destroy-1.0.4" = { @@ -3271,22 +3307,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.6.2" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; - sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; - }; - }; - "mime-1.3.4" = { + "mime-1.4.1" = { name = "mime"; packageName = "mime"; - version = "1.3.4"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; + sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; }; }; "media-typer-0.3.0" = { @@ -3316,15 +3343,6 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "fresh-0.5.1" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.1.tgz"; - sha1 = "c3a08bcec0fcdcc223edf3b23eb327f1f9fcbf5c"; - }; - }; "truncate-1.0.5" = { name = "truncate"; packageName = "truncate"; @@ -3649,22 +3667,13 @@ let sha1 = "5de60415bda071bb37127854c864f41b23254539"; }; }; - "aproba-1.1.2" = { - name = "aproba"; - packageName = "aproba"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz"; - sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6"; - }; - }; - "bluebird-3.5.0" = { + "bluebird-3.5.1" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz"; - sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; + sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; }; }; "cacache-9.2.9" = { @@ -3694,6 +3703,15 @@ let sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; }; }; + "cli-table2-0.2.0" = { + name = "cli-table2"; + packageName = "cli-table2"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz"; + sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; + }; + }; "cmd-shim-2.0.2" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -3784,6 +3802,15 @@ let sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a"; }; }; + "is-cidr-1.0.0" = { + name = "is-cidr"; + packageName = "is-cidr"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-cidr/-/is-cidr-1.0.0.tgz"; + sha1 = "fb5aacf659255310359da32cae03e40c6a1c2afc"; + }; + }; "lazy-property-1.0.0" = { name = "lazy-property"; packageName = "lazy-property"; @@ -3937,22 +3964,31 @@ let sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460"; }; }; - "npm-packlist-1.1.9" = { + "npm-packlist-1.1.10" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.9.tgz"; - sha512 = "1d1l5hasnw67hczgcwbc8534n1hgvx87hin1yr14yz70b4yzp06gfrj97lhh0qfmk5p1lqfrzajhs5wywx98hj75g00mqmir54050gm"; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; + sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; }; }; - "npm-registry-client-8.4.0" = { + "npm-profile-2.0.5" = { + name = "npm-profile"; + packageName = "npm-profile"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-profile/-/npm-profile-2.0.5.tgz"; + sha512 = "2325avpmbzxl4vi1hxnxv96rw9j0y712ym3mph3hrsvgq4p8d0yh44vnja22plnw9vplskcx661j2spzqka65zsszzngvwm806skfdl"; + }; + }; + "npm-registry-client-8.5.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz"; - sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz"; + sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn"; }; }; "npm-user-validate-1.0.0" = { @@ -3973,13 +4009,13 @@ let sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; - "pacote-6.0.2" = { + "pacote-6.0.4" = { name = "pacote"; packageName = "pacote"; - version = "6.0.2"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-6.0.2.tgz"; - sha512 = "2721b5lapgglck02ikkhxgkmg5gs1l8ld712ixb94d86zrspvzn3z81678kcpqvpvs7a0ykgganm9nb1p2668zss7cdib5z6jrg7j9y"; + url = "https://registry.npmjs.org/pacote/-/pacote-6.0.4.tgz"; + sha512 = "36bx0mnsvm3fvq0vbcl05j6fsjf4v4gks1hlxqyga0jxz491cis9y38j8q9cmmfdfbx9xaz3n3h93h0ik4bkn82rb3nz2413wk7xfxi"; }; }; "path-is-inside-1.0.2" = { @@ -4000,6 +4036,33 @@ let sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; + "qrcode-terminal-0.11.0" = { + name = "qrcode-terminal"; + packageName = "qrcode-terminal"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz"; + sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e"; + }; + }; + "query-string-5.0.0" = { + name = "query-string"; + packageName = "query-string"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-5.0.0.tgz"; + sha1 = "fbdf7004b4d2aff792f9871981b7a2794f555947"; + }; + }; + "qw-1.0.1" = { + name = "qw"; + packageName = "qw"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qw/-/qw-1.0.1.tgz"; + sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4"; + }; + }; "read-1.0.7" = { name = "read"; packageName = "read"; @@ -4108,13 +4171,13 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; - "tar-4.0.1" = { + "tar-4.0.2" = { name = "tar"; packageName = "tar"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.0.1.tgz"; - sha512 = "3j6x1q724j4y32xqgmnafwr0063xlr4bw5ra92zsar6iyqikcfy02lpc98h4ss75vxywza639m3b9cps9z4xdlr2cpy6g5kyvxm86jw"; + url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz"; + sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2"; }; }; "text-table-0.2.0" = { @@ -4261,6 +4324,15 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; + "colors-1.1.2" = { + name = "colors"; + packageName = "colors"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + }; + }; "wcwidth-1.0.1" = { name = "wcwidth"; packageName = "wcwidth"; @@ -4297,6 +4369,15 @@ let sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; + "cidr-regex-1.0.6" = { + name = "cidr-regex"; + packageName = "cidr-regex"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cidr-regex/-/cidr-regex-1.0.6.tgz"; + sha1 = "74abfd619df370b9d54ab14475568e97dd64c0c1"; + }; + }; "dotenv-4.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -4693,13 +4774,13 @@ let sha1 = "1b671c619940abcaeac0ad0e3a3c164be760993b"; }; }; - "stream-each-1.2.0" = { + "stream-each-1.2.2" = { name = "stream-each"; packageName = "stream-each"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz"; - sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991"; + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz"; + sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; }; }; "typedarray-0.0.6" = { @@ -4747,13 +4828,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "ignore-walk-3.0.0" = { + "ignore-walk-3.0.1" = { name = "ignore-walk"; packageName = "ignore-walk"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.0.tgz"; - sha512 = "0ly2gpx2q4zi46dbnwhp2g329vfhqrbfh1piy5hvgfzpasbq61ymaxg64qsxiqx6qqv396m0ad7abs3q3sv702w42xfli8qpm1yp8dl"; + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; + sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; }; }; "npm-bundled-1.0.3" = { @@ -4774,33 +4855,6 @@ let sha512 = "1s6fqfsr7ksyfp0mwzlcf9rwpg74y29p67jkc8h89zy915rjsy5f85ik1659gd0y48z7lbnf3mg9c27drk74qycj446rlykim3zkw14"; }; }; - "npm-pick-manifest-1.0.4" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; - sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h"; - }; - }; - "promise-retry-1.1.1" = { - name = "promise-retry"; - packageName = "promise-retry"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz"; - sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; - }; - }; - "protoduck-4.0.0" = { - name = "protoduck"; - packageName = "protoduck"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz"; - sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e"; - }; - }; "agentkeepalive-3.3.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; @@ -4810,13 +4864,13 @@ let sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p"; }; }; - "http-cache-semantics-3.7.3" = { + "http-cache-semantics-3.8.0" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "3.7.3"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.7.3.tgz"; - sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72"; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.0.tgz"; + sha512 = "258k0vff4wrszl7vnpv4c67zc5qk0mnl8banhp8znianmahxv1y55lpz0877jicsw1k0y8g0glz4my71dd9y3ywzpingfvb2xy0ar0w"; }; }; "http-proxy-agent-2.0.0" = { @@ -4846,6 +4900,15 @@ let sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw"; }; }; + "promise-retry-1.1.1" = { + name = "promise-retry"; + packageName = "promise-retry"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz"; + sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; + }; + }; "socks-proxy-agent-3.0.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -4909,13 +4972,13 @@ let sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967"; }; }; - "iconv-lite-0.4.19" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.19"; + "err-code-1.1.2" = { + name = "err-code"; + packageName = "err-code"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; + url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz"; + sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; }; }; "socks-1.1.10" = { @@ -4945,13 +5008,22 @@ let sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; }; }; - "err-code-1.1.2" = { - name = "err-code"; - packageName = "err-code"; - version = "1.1.2"; + "npm-pick-manifest-1.0.4" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz"; - sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; + sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h"; + }; + }; + "protoduck-4.0.0" = { + name = "protoduck"; + packageName = "protoduck"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz"; + sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e"; }; }; "genfun-4.0.1" = { @@ -4963,6 +5035,24 @@ let sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"; }; }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "strict-uri-encode-1.1.0" = { + name = "strict-uri-encode"; + packageName = "strict-uri-encode"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + }; + }; "mute-stream-0.0.7" = { name = "mute-stream"; packageName = "mute-stream"; @@ -5017,13 +5107,13 @@ let sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; }; }; - "minizlib-1.0.3" = { + "minizlib-1.0.4" = { name = "minizlib"; packageName = "minizlib"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz"; - sha1 = "d5c1abf77be154619952e253336eccab9b2a32f5"; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz"; + sha512 = "1lxpa3mkdc94i0d7b2ivilcky0gnmnxv5csmigzacb5gl2cz7rz4ciikq1r5an1simk86f61whwzyi5d8gic85w55q19d09sbv19pmh"; }; }; "yallist-3.0.2" = { @@ -5044,13 +5134,13 @@ let sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; }; }; - "boxen-1.2.1" = { + "boxen-1.2.2" = { name = "boxen"; packageName = "boxen"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz"; - sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz"; + sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5"; }; }; "configstore-3.1.1" = { @@ -5116,13 +5206,13 @@ let sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; }; }; - "chalk-2.1.0" = { + "chalk-2.2.0" = { name = "chalk"; packageName = "chalk"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; - sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz"; + sha512 = "3vfffivwlp2hr7dwh84lvayba94a98ddhb8dwkv14magmfdj1n895880sik7liqv4xgnvvpr2v5jsm1gzl1fypl7nl9dpa6d3zhq4yh"; }; }; "cli-boxes-1.0.0" = { @@ -5161,13 +5251,13 @@ let sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; }; }; - "supports-color-4.4.0" = { + "supports-color-4.5.0" = { name = "supports-color"; packageName = "supports-color"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; - sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; + sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; }; }; "color-convert-1.9.0" = { @@ -5206,13 +5296,13 @@ let sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm"; }; }; - "make-dir-1.0.0" = { + "make-dir-1.1.0" = { name = "make-dir"; packageName = "make-dir"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz"; - sha1 = "97a011751e91dd87cfadef58832ebb04936de978"; + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz"; + sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh"; }; }; "unique-string-1.0.0" = { @@ -5233,6 +5323,15 @@ let sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; "crypto-random-string-1.0.0" = { name = "crypto-random-string"; packageName = "crypto-random-string"; @@ -5413,15 +5512,6 @@ let sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; }; }; - "colors-1.1.2" = { - name = "colors"; - packageName = "colors"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; - }; - }; "fields-0.1.24" = { name = "fields"; packageName = "fields"; @@ -5969,7 +6059,7 @@ in sources."grunt-known-options-1.1.0" (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" ]; }) sources."resolve-1.1.7" @@ -6507,7 +6597,7 @@ in }) (sources."nopt-3.0.6" // { dependencies = [ - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" ]; }) (sources."npmlog-4.1.2" // { @@ -6562,7 +6652,7 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."request-2.82.0" // { + (sources."request-2.83.0" // { dependencies = [ sources."aws-sign2-0.7.0" sources."aws4-1.6.0" @@ -6581,7 +6671,7 @@ in }) (sources."har-validator-5.0.3" // { dependencies = [ - (sources."ajv-5.2.2" // { + (sources."ajv-5.2.4" // { dependencies = [ sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -6874,7 +6964,7 @@ in sources."ms-2.0.0" ]; }) - (sources."express-4.15.4" // { + (sources."express-4.16.2" // { dependencies = [ (sources."accepts-1.3.4" // { dependencies = [ @@ -6887,30 +6977,37 @@ in ]; }) sources."array-flatten-1.1.1" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."bytes-3.0.0" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."inherits-2.0.3" + sources."setprototypeof-1.0.3" + ]; + }) + sources."iconv-lite-0.4.19" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."unpipe-1.0.0" + ]; + }) + ]; + }) sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - (sources."debug-2.6.8" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."finalhandler-1.0.6" // { + (sources."finalhandler-1.1.0" // { dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) sources."unpipe-1.0.0" ]; }) - sources."fresh-0.5.0" + sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" (sources."on-finished-2.3.0" // { @@ -6920,28 +7017,30 @@ in }) sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" - (sources."proxy-addr-1.1.5" // { + (sources."proxy-addr-2.0.2" // { dependencies = [ sources."forwarded-0.1.2" - sources."ipaddr.js-1.4.0" + sources."ipaddr.js-1.5.2" ]; }) - sources."qs-6.5.0" + sources."qs-6.5.1" sources."range-parser-1.2.0" - (sources."send-0.15.4" // { + sources."safe-buffer-5.1.1" + (sources."send-0.16.1" // { dependencies = [ sources."destroy-1.0.4" (sources."http-errors-1.6.2" // { dependencies = [ sources."inherits-2.0.3" + sources."setprototypeof-1.0.3" ]; }) - sources."mime-1.3.4" + sources."mime-1.4.1" sources."ms-2.0.0" ]; }) - sources."serve-static-1.12.4" - sources."setprototypeof-1.0.3" + sources."serve-static-1.13.1" + sources."setprototypeof-1.1.0" sources."statuses-1.3.1" (sources."type-is-1.6.15" // { dependencies = [ @@ -6953,8 +7052,8 @@ in }) ]; }) - sources."utils-merge-1.0.0" - sources."vary-1.1.1" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" ]; }) (sources."glob-5.0.15" // { @@ -6983,7 +7082,7 @@ in ]; }) sources."path-is-absolute-1.0.1" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."deep-extend-0.4.2" sources."ini-1.3.4" @@ -6992,10 +7091,10 @@ in ]; }) sources."semver-4.3.6" - (sources."serve-favicon-2.4.4" // { + (sources."serve-favicon-2.4.5" // { dependencies = [ sources."etag-1.8.1" - sources."fresh-0.5.1" + sources."fresh-0.5.2" sources."ms-2.0.0" sources."parseurl-1.3.2" sources."safe-buffer-5.1.1" @@ -7018,7 +7117,7 @@ in }) (sources."nopt-4.0.1" // { dependencies = [ - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" @@ -7264,7 +7363,7 @@ in }) (sources."nopt-4.0.1" // { dependencies = [ - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" @@ -7575,7 +7674,7 @@ in }) (sources."nopt-4.0.1" // { dependencies = [ - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" (sources."osenv-0.1.4" // { dependencies = [ sources."os-homedir-1.0.2" @@ -7630,7 +7729,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."deep-extend-0.4.2" sources."ini-1.3.4" @@ -7831,10 +7930,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.4.2"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.4.2.tgz"; - sha512 = "28m9zjiynb24b8bxikdaya27j87am88x1y8l70pvmh9fk3pfq0y6xvqjmpy72ld4csnz9s1hik1ff8a19sx6pyi8f5ar27b044cp8hp"; + url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz"; + sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik"; }; dependencies = [ (sources."JSONStream-1.3.1" // { @@ -7843,13 +7942,13 @@ in sources."through-2.3.8" ]; }) - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."ansi-regex-3.0.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."archy-1.0.0" - sources."bluebird-3.5.0" + sources."bluebird-3.5.1" (sources."cacache-9.2.9" // { dependencies = [ sources."y18n-3.2.1" @@ -7857,6 +7956,27 @@ in }) sources."call-limit-1.1.0" sources."chownr-1.0.1" + (sources."cli-table2-0.2.0" // { + dependencies = [ + sources."lodash-3.10.1" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + ]; + }) + sources."colors-1.1.2" + ]; + }) sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { dependencies = [ @@ -7918,6 +8038,11 @@ in sources."promzard-0.3.0" ]; }) + (sources."is-cidr-1.0.0" // { + dependencies = [ + sources."cidr-regex-1.0.6" + ]; + }) sources."lazy-property-1.0.0" (sources."libnpx-9.6.0" // { dependencies = [ @@ -8081,7 +8206,7 @@ in }) sources."pump-1.0.2" sources."pumpify-1.3.5" - (sources."stream-each-1.2.0" // { + (sources."stream-each-1.2.2" // { dependencies = [ sources."stream-shift-1.0.0" ]; @@ -8140,9 +8265,9 @@ in sources."npm-install-checks-3.0.0" sources."npm-lifecycle-1.0.3" sources."npm-package-arg-5.1.2" - (sources."npm-packlist-1.1.9" // { + (sources."npm-packlist-1.1.10" // { dependencies = [ - (sources."ignore-walk-3.0.0" // { + (sources."ignore-walk-3.0.1" // { dependencies = [ (sources."minimatch-3.0.4" // { dependencies = [ @@ -8159,7 +8284,95 @@ in sources."npm-bundled-1.0.3" ]; }) - (sources."npm-registry-client-8.4.0" // { + (sources."npm-profile-2.0.5" // { + dependencies = [ + (sources."make-fetch-happen-2.5.0" // { + dependencies = [ + (sources."agentkeepalive-3.3.0" // { + dependencies = [ + (sources."humanize-ms-1.2.1" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + ]; + }) + sources."http-cache-semantics-3.8.0" + (sources."http-proxy-agent-2.0.0" // { + dependencies = [ + (sources."agent-base-4.1.1" // { + dependencies = [ + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) + ]; + }) + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + ]; + }) + (sources."https-proxy-agent-2.1.0" // { + dependencies = [ + (sources."agent-base-4.1.1" // { + dependencies = [ + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) + ]; + }) + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + ]; + }) + (sources."node-fetch-npm-2.0.2" // { + dependencies = [ + (sources."encoding-0.1.12" // { + dependencies = [ + sources."iconv-lite-0.4.19" + ]; + }) + sources."json-parse-better-errors-1.0.1" + ]; + }) + (sources."promise-retry-1.1.1" // { + dependencies = [ + sources."err-code-1.1.2" + ]; + }) + (sources."socks-proxy-agent-3.0.1" // { + dependencies = [ + (sources."agent-base-4.1.1" // { + dependencies = [ + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) + ]; + }) + (sources."socks-1.1.10" // { + dependencies = [ + sources."ip-1.1.5" + sources."smart-buffer-1.1.15" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."npm-registry-client-8.5.0" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ @@ -8210,7 +8423,7 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."pacote-6.0.2" // { + (sources."pacote-6.0.4" // { dependencies = [ (sources."make-fetch-happen-2.5.0" // { dependencies = [ @@ -8223,7 +8436,7 @@ in }) ]; }) - sources."http-cache-semantics-3.7.3" + sources."http-cache-semantics-3.8.0" (sources."http-proxy-agent-2.0.0" // { dependencies = [ (sources."agent-base-4.1.1" // { @@ -8316,6 +8529,15 @@ in }) sources."path-is-inside-1.0.2" sources."promise-inflight-1.0.1" + sources."qrcode-terminal-0.11.0" + (sources."query-string-5.0.0" // { + dependencies = [ + sources."decode-uri-component-0.2.0" + sources."object-assign-4.1.1" + sources."strict-uri-encode-1.1.0" + ]; + }) + sources."qw-1.0.1" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.7" @@ -8343,9 +8565,9 @@ in sources."util-deprecate-1.0.2" ]; }) - (sources."request-2.81.0" // { + (sources."request-2.83.0" // { dependencies = [ - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { @@ -8355,16 +8577,18 @@ in }) sources."extend-3.0.1" sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { + (sources."form-data-2.3.1" // { dependencies = [ sources."asynckit-0.4.0" ]; }) - (sources."har-validator-4.2.1" // { + (sources."har-validator-5.0.3" // { dependencies = [ - (sources."ajv-4.11.8" // { + (sources."ajv-5.2.4" // { dependencies = [ sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" (sources."json-stable-stringify-1.0.1" // { dependencies = [ sources."jsonify-0.0.0" @@ -8372,23 +8596,26 @@ in }) ]; }) - sources."har-schema-1.0.5" + sources."har-schema-2.0.0" ]; }) - (sources."hawk-3.1.3" // { + (sources."hawk-6.0.2" // { dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.0.2" ]; }) - (sources."http-signature-1.1.1" // { + (sources."http-signature-1.2.0" // { dependencies = [ - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" (sources."jsprim-1.4.1" // { dependencies = [ - sources."assert-plus-1.0.0" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" (sources."verror-1.10.0" // { @@ -8401,7 +8628,6 @@ in (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" - sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.7" sources."jsbn-0.1.1" @@ -8421,8 +8647,8 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.3" // { dependencies = [ @@ -8461,10 +8687,10 @@ in }) sources."ssri-4.1.6" sources."strip-ansi-4.0.0" - (sources."tar-4.0.1" // { + (sources."tar-4.0.2" // { dependencies = [ sources."minipass-2.2.1" - sources."minizlib-1.0.3" + sources."minizlib-1.0.4" sources."yallist-3.0.2" ]; }) @@ -8479,11 +8705,11 @@ in sources."unpipe-1.0.0" (sources."update-notifier-2.2.0" // { dependencies = [ - (sources."boxen-1.2.1" // { + (sources."boxen-1.2.2" // { dependencies = [ sources."ansi-align-2.0.0" sources."camelcase-4.1.0" - (sources."chalk-2.1.0" // { + (sources."chalk-2.2.0" // { dependencies = [ (sources."ansi-styles-3.2.0" // { dependencies = [ @@ -8495,7 +8721,7 @@ in ]; }) sources."escape-string-regexp-1.0.5" - (sources."supports-color-4.4.0" // { + (sources."supports-color-4.5.0" // { dependencies = [ sources."has-flag-2.0.0" ]; @@ -8580,9 +8806,9 @@ in sources."is-obj-1.0.1" ]; }) - (sources."make-dir-1.0.0" // { + (sources."make-dir-1.1.0" // { dependencies = [ - sources."pify-2.3.0" + sources."pify-3.0.0" ]; }) (sources."unique-string-1.0.0" // { @@ -8622,7 +8848,7 @@ in }) (sources."registry-auth-token-3.3.1" // { dependencies = [ - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."deep-extend-0.4.2" sources."minimist-1.2.0" @@ -8633,7 +8859,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."deep-extend-0.4.2" sources."minimist-1.2.0" diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 192df9f87fc..7ea7ce2d3ed 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -82,6 +82,7 @@ , "ungit" , "webdrvr" , "webpack" +, "web-ext" , "wring" , "yarn" , "yo" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index bd4a3e5abcc..ebf116fed73 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -310,13 +310,13 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "private-0.1.7" = { + "private-0.1.8" = { name = "private"; packageName = "private"; - version = "0.1.7"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; - sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; + url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; + sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; }; }; "slash-1.0.0" = { @@ -1390,31 +1390,31 @@ let sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21"; }; }; - "moment-2.18.1" = { + "moment-2.19.1" = { name = "moment"; packageName = "moment"; - version = "2.18.1"; + version = "2.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; - sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; + url = "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz"; + sha1 = "56da1a2d1cbf01d38b7e1afc31c10bcfa1929167"; }; }; - "ms-rest-2.2.2" = { + "ms-rest-2.2.3" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.2.tgz"; - sha1 = "be191c4fbdff2e208bda440933436af80e7425b9"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.3.tgz"; + sha1 = "f4f244de6282d9644504a50d11ac7f7cfb01b867"; }; }; - "ms-rest-azure-2.3.3" = { + "ms-rest-azure-2.4.1" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.3.3"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.3.3.tgz"; - sha1 = "99016e430fb70a4e936191d3b35fc8b91327b337"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.4.1.tgz"; + sha1 = "0d5501449a3318c0cf5e10d4bb0494977989b967"; }; }; "node-forge-0.6.23" = { @@ -2020,31 +2020,31 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "@types/node-8.0.30" = { + "@types/node-8.0.46" = { name = "@types/node"; packageName = "@types/node"; - version = "8.0.30"; + version = "8.0.46"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.0.30.tgz"; - sha512 = "0y4jg8faga3jb33fjpyyriyg7r1cpp1cjm0nc6pjixm96naqmxnhq7bkxfm8489rdcifw6mc265a933cyihwdb9n88xhyynf0djv911"; + url = "https://registry.npmjs.org/@types/node/-/node-8.0.46.tgz"; + sha512 = "0bmyn8y1ifdybpbvvr9r1m473d789767c3yc5vj96jh2na04a4mbf7abvgkrq9cly0390sf6dql3xklvhv6hjl408gq49gr8vi0y6dd"; }; }; - "@types/request-2.0.3" = { + "@types/request-2.0.6" = { name = "@types/request"; packageName = "@types/request"; - version = "2.0.3"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.0.3.tgz"; - sha512 = "3q87vjfkg7p6mwr6yn9y7f6c87klvd81wqi7vq86cn5cvfd4j3i1pvykjc1qhp4jmggl54a2r5zxcbv5qk0psg1w021qis0ak4fg2vh"; + url = "https://registry.npmjs.org/@types/request/-/request-2.0.6.tgz"; + sha512 = "13hi2wdyaa8iypfbfhf051n1jjbkqzywy7sh2hy1w605q5jy2hfc0sr684jpxa7hwfigck8n5gv72f9icb9m31k866nny90r69l1xgk"; }; }; - "@types/uuid-3.4.2" = { + "@types/uuid-3.4.3" = { name = "@types/uuid"; packageName = "@types/uuid"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.2.tgz"; - sha512 = "2k89p1xsllidfwgic0qklzdp1lpvyzw22z7xlphii062jm6rh58xajz11r4lby49kghc5zrmmqrsi1mkmzm6ix8x3rhcrj1rnixhykx"; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz"; + sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; }; }; "is-buffer-1.1.5" = { @@ -2065,6 +2065,15 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; + "moment-2.18.1" = { + name = "moment"; + packageName = "moment"; + version = "2.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; + sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; + }; + }; "@types/form-data-2.2.0" = { name = "@types/form-data"; packageName = "@types/form-data"; @@ -2146,13 +2155,13 @@ let sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; }; }; - "i-0.3.5" = { + "i-0.3.6" = { name = "i"; packageName = "i"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/i/-/i-0.3.5.tgz"; - sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5"; + url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz"; + sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; "ncp-0.4.2" = { @@ -3397,13 +3406,13 @@ let sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; }; }; - "q-1.5.0" = { + "q-1.5.1" = { name = "q"; packageName = "q"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.5.0.tgz"; - sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"; + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; }; }; "rimraf-2.2.8" = { @@ -3451,22 +3460,22 @@ let sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; }; }; - "browserify-zlib-0.1.4" = { + "browserify-zlib-0.2.0" = { name = "browserify-zlib"; packageName = "browserify-zlib"; - version = "0.1.4"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; - sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; }; }; - "buffer-5.0.7" = { + "buffer-5.0.8" = { name = "buffer"; packageName = "buffer"; - version = "5.0.7"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.7.tgz"; - sha512 = "2p32xxvhb1b3dp3hjy1ga0iajddqfxqi25wx44lhd94jjry1g758zywadx6hq04c8zsrcnmjyjrlymxrfmgyxib837jd93rd1fqgrrm"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.8.tgz"; + sha512 = "0capij8lgps5fzc5hikkkdsn58lmzfdpni7v2m0ham5r67q24kln1spwz4dnk3nh6zkiqmgz0cqnq591pms1pkkv8prvksd2m1f6yy5"; }; }; "cached-path-relative-1.0.1" = { @@ -3613,13 +3622,13 @@ let sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; }; }; - "os-browserify-0.1.2" = { + "os-browserify-0.3.0" = { name = "os-browserify"; packageName = "os-browserify"; - version = "0.1.2"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; - sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; }; "parents-1.0.1" = { @@ -3847,13 +3856,13 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "pako-0.2.9" = { + "pako-1.0.6" = { name = "pako"; packageName = "pako"; - version = "0.2.9"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; - sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; + url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; + sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; }; }; "base64-js-1.2.1" = { @@ -3964,13 +3973,13 @@ let sha512 = "293m4ffiafbjg0b99a2k78wiffmlwc2v7cigrn5l3n7555x7qxyr34sp0s4p713vwlaf0ny5n57iysgkz08slld3hzw8ci1a2gxjgpi"; }; }; - "browserify-aes-1.0.8" = { + "browserify-aes-1.1.1" = { name = "browserify-aes"; packageName = "browserify-aes"; - version = "1.0.8"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz"; - sha512 = "1skrqw93dd41n99j90srrpzd0rkcb144xl1m4f420fz0cj1p6f34fnznlr7ymiby1yj8b595qziqmi433fqd1g2lkjn9d6g7wwqr02r"; + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz"; + sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah"; }; }; "browserify-des-1.0.0" = { @@ -4117,13 +4126,13 @@ let sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; }; }; - "sha.js-2.4.8" = { + "sha.js-2.4.9" = { name = "sha.js"; packageName = "sha.js"; - version = "2.4.8"; + version = "2.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"; - sha1 = "37068c2c476b6baf402d14a49c67f597921f634f"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz"; + sha512 = "3l96mlw71zgkmfm9madd3jcndrpm2fm4jz2q5gz9mbm27mdg89hsbrg22pfl32ha76xa3pza83m2mc3b47pnq19mz3j6vkasn9dxk0v"; }; }; "hash-base-2.0.2" = { @@ -4135,13 +4144,13 @@ let sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; }; }; - "miller-rabin-4.0.0" = { + "miller-rabin-4.0.1" = { name = "miller-rabin"; packageName = "miller-rabin"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz"; - sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"; + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; }; }; "function-bind-1.1.1" = { @@ -4405,13 +4414,13 @@ let sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; }; }; - "mime-1.4.0" = { + "mime-1.4.1" = { name = "mime"; packageName = "mime"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz"; - sha512 = "14lm9narafxlaar57v4mv7qqgg0v56isjyb3kxmbgj0p1zcrjwj9qz6im8nzwvr16vga071f5dl11mcgraz4cwnd8209ygvzqpa3l4z"; + url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; + sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; }; }; "peerflix-0.34.0" = { @@ -5557,13 +5566,13 @@ let sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61"; }; }; - "ipaddr.js-1.5.2" = { + "ipaddr.js-1.5.4" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz"; - sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.4.tgz"; + sha1 = "962263d9d26132956fc5c630b638a30d3cdffc14"; }; }; "get-browser-rtc-1.0.2" = { @@ -5935,22 +5944,22 @@ let sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; }; }; - "cordova-common-2.0.3" = { + "cordova-common-2.1.1" = { name = "cordova-common"; packageName = "cordova-common"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.3.tgz"; - sha1 = "2214ee04ae1c2ec012a52c7c185313e341a6fb38"; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.1.1.tgz"; + sha1 = "e3a16a4f3d29a8e2b523128ac65478aca9ea1749"; }; }; - "cordova-lib-7.0.1" = { + "cordova-lib-7.1.0" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-7.0.1.tgz"; - sha1 = "31cbb90daeb66a67a7d3091636ce729a22a4f7ff"; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-7.1.0.tgz"; + sha1 = "f15aa0eda0e06e8c7e423a218404d59ec50f8594"; }; }; "editor-1.0.0" = { @@ -6205,31 +6214,31 @@ let sha1 = "55282493ab396d9303f72febbaf2f978fa764cd2"; }; }; - "cordova-fetch-1.1.0" = { + "cordova-fetch-1.2.0" = { name = "cordova-fetch"; packageName = "cordova-fetch"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.1.0.tgz"; - sha1 = "1549f9ff4e6345f3c6fb6bd6523e8b19311a7b54"; + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.2.0.tgz"; + sha1 = "e32ea33f5834d68585a3f4946295c3ffe71f8060"; }; }; - "cordova-js-4.2.1" = { + "cordova-js-4.2.2" = { name = "cordova-js"; packageName = "cordova-js"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.1.tgz"; - sha1 = "01ca186e14e63b01cb6d24e469750e481a038355"; + url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.2.tgz"; + sha1 = "a7eb20911e6a59f15ac64e7db6ec543df31c2f92"; }; }; - "cordova-serve-1.0.1" = { + "cordova-serve-2.0.0" = { name = "cordova-serve"; packageName = "cordova-serve"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.1.tgz"; - sha1 = "895c7fb4bbe630fa1c89feaf6d74779cbff66da7"; + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.0.tgz"; + sha1 = "d7834b83b186607e2b8f1943e073c0633360ea43"; }; }; "dep-graph-1.1.0" = { @@ -6313,15 +6322,6 @@ let sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; - "semver-5.3.0" = { - name = "semver"; - packageName = "semver"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; - }; - }; "shelljs-0.3.0" = { name = "shelljs"; packageName = "shelljs"; @@ -6412,6 +6412,24 @@ let sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; }; }; + "cordova-common-2.0.3" = { + name = "cordova-common"; + packageName = "cordova-common"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.3.tgz"; + sha1 = "2214ee04ae1c2ec012a52c7c185313e341a6fb38"; + }; + }; + "cordova-fetch-1.1.0" = { + name = "cordova-fetch"; + packageName = "cordova-fetch"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.1.0.tgz"; + sha1 = "1549f9ff4e6345f3c6fb6bd6523e8b19311a7b54"; + }; + }; "dependency-ls-1.1.1" = { name = "dependency-ls"; packageName = "dependency-ls"; @@ -6466,49 +6484,58 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "browserify-13.3.0" = { + "browserify-14.4.0" = { name = "browserify"; packageName = "browserify"; - version = "13.3.0"; + version = "14.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; - sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz"; + sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9"; }; }; - "buffer-4.9.1" = { - name = "buffer"; - packageName = "buffer"; - version = "4.9.1"; + "browserify-zlib-0.1.4" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; + sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "https-browserify-0.0.1" = { - name = "https-browserify"; - packageName = "https-browserify"; - version = "0.0.1"; + "os-browserify-0.1.2" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; - sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; + sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; }; }; - "compression-1.7.0" = { + "pako-0.2.9" = { + name = "pako"; + packageName = "pako"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; + sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; + }; + }; + "compression-1.7.1" = { name = "compression"; packageName = "compression"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz"; - sha1 = "030c9f198f1643a057d776a738e922da4373012d"; + url = "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz"; + sha1 = "eff2603efc2e22cf86f35d2eb93589f9875373db"; }; }; - "express-4.15.4" = { + "express-4.16.2" = { name = "express"; packageName = "express"; - version = "4.15.4"; + version = "4.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.4.tgz"; - sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1"; + url = "https://registry.npmjs.org/express/-/express-4.16.2.tgz"; + sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"; }; }; "accepts-1.3.4" = { @@ -6520,31 +6547,22 @@ let sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; }; }; - "bytes-2.5.0" = { + "bytes-3.0.0" = { name = "bytes"; packageName = "bytes"; - version = "2.5.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz"; - sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"; + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "compressible-2.0.11" = { + "compressible-2.0.12" = { name = "compressible"; packageName = "compressible"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.11.tgz"; - sha1 = "16718a75de283ed8e604041625a2064586797d8a"; - }; - }; - "debug-2.6.8" = { - name = "debug"; - packageName = "debug"; - version = "2.6.8"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"; - sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz"; + sha1 = "c59a5c99db76767e9876500e271ef63b3493bd66"; }; }; "on-headers-1.0.1" = { @@ -6556,13 +6574,13 @@ let sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; }; }; - "vary-1.1.1" = { + "vary-1.1.2" = { name = "vary"; packageName = "vary"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz"; - sha1 = "67535ebb694c1d52257457984665323f587e8d37"; + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; "negotiator-0.6.1" = { @@ -6583,6 +6601,15 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; + "body-parser-1.18.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; + sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; + }; + }; "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; @@ -6655,22 +6682,22 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "finalhandler-1.0.6" = { + "finalhandler-1.1.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz"; - sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; + sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; }; }; - "fresh-0.5.0" = { + "fresh-0.5.2" = { name = "fresh"; packageName = "fresh"; - version = "0.5.0"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz"; - sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; "merge-descriptors-1.0.1" = { @@ -6718,49 +6745,49 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-1.1.5" = { + "proxy-addr-2.0.2" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "1.1.5"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; - sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz"; + sha1 = "6571504f47bb988ec8180253f85dd7e14952bdec"; }; }; - "qs-6.5.0" = { + "qs-6.5.1" = { name = "qs"; packageName = "qs"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; - sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; + sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; - "send-0.15.4" = { + "send-0.16.1" = { name = "send"; packageName = "send"; - version = "0.15.4"; + version = "0.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.4.tgz"; - sha1 = "985faa3e284b0273c793364a35c6737bd93905b9"; + url = "https://registry.npmjs.org/send/-/send-0.16.1.tgz"; + sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j"; }; }; - "serve-static-1.12.4" = { + "serve-static-1.13.1" = { name = "serve-static"; packageName = "serve-static"; - version = "1.12.4"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz"; - sha1 = "9b6aa98eeb7253c4eedc4c1f6fdbca609901a961"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz"; + sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5"; }; }; - "setprototypeof-1.0.3" = { + "setprototypeof-1.1.0" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; - sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; }; }; "statuses-1.3.1" = { @@ -6781,13 +6808,49 @@ let sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; }; }; - "utils-merge-1.0.0" = { + "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "http-errors-1.6.2" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; + sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; + }; + }; + "iconv-lite-0.4.19" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.19"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; + sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; + }; + }; + "raw-body-2.3.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; + sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; + }; + }; + "setprototypeof-1.0.3" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; + sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; }; }; "unpipe-1.0.0" = { @@ -6817,13 +6880,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "ipaddr.js-1.4.0" = { + "ipaddr.js-1.5.2" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.4.0"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; - sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz"; + sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0"; }; }; "destroy-1.0.4" = { @@ -6835,24 +6898,6 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.6.2" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; - sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; - }; - }; - "mime-1.3.4" = { - name = "mime"; - packageName = "mime"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -6925,13 +6970,13 @@ let sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; - "abbrev-1.1.0" = { + "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"; - sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f"; + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; "abbrev-1.0.9" = { @@ -7402,6 +7447,15 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; "npm-package-arg-4.2.1" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -7951,13 +8005,13 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; - "rc-1.2.1" = { + "rc-1.2.2" = { name = "rc"; packageName = "rc"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz"; - sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz"; + sha1 = "d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"; }; }; "strip-json-comments-2.0.1" = { @@ -8312,6 +8366,15 @@ let sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; }; }; + "utils-merge-1.0.0" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + }; "negotiator-0.5.3" = { name = "negotiator"; packageName = "negotiator"; @@ -8465,13 +8528,13 @@ let sha1 = "0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"; }; }; - "http-parser-js-0.4.8" = { + "http-parser-js-0.4.9" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.4.8"; + version = "0.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.8.tgz"; - sha512 = "26g8b2fsa644qxadhgjjwlmzmik345a543f8rlg842j8l7g0sz8vhbf7vsxz047hk6qw0c7a1rfq222xjn2ckclsbqz5z9sv3vyjqcf"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz"; + sha1 = "ea1a04fb64adff0242e9974f297dd4c3cad271e1"; }; }; "websocket-extensions-0.1.2" = { @@ -9080,13 +9143,13 @@ let sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3"; }; }; - "split2-2.1.1" = { + "split2-2.2.0" = { name = "split2"; packageName = "split2"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz"; - sha1 = "7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"; + url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz"; + sha512 = "1plzy1n554n2gwfpavi4azb4y45dm2mwj7dq8ma99yg1z55xcdxmkibsfhsh1h19qgsrcamm0ha5qi2c3has6skvx4bix5p67czc1j4"; }; }; "murl-0.4.1" = { @@ -9116,22 +9179,31 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.122.0" = { + "aws-sdk-2.138.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.122.0"; + version = "2.138.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.122.0.tgz"; - sha1 = "d40980fdb24a07db166de91cb8813f0dc640d7c6"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.138.0.tgz"; + sha1 = "acb923132b51fafe8a464aa757f65d61ac30bd77"; }; }; - "request-2.82.0" = { + "request-2.83.0" = { name = "request"; packageName = "request"; - version = "2.82.0"; + version = "2.83.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.82.0.tgz"; - sha512 = "079947pnxi0h8jdiv5wb64rj3gnq4a02dfj47c41wsdi3g6pp1v3yfg3m1rphib7igf6vkisrgjq16vc4fq916fc870wzckdizal1gx"; + url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; + sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + }; + }; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; "crypto-browserify-1.0.9" = { @@ -9251,15 +9323,6 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "qs-6.5.1" = { - name = "qs"; - packageName = "qs"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; - }; - }; "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; @@ -9269,13 +9332,13 @@ let sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; - "ajv-5.2.2" = { + "ajv-5.2.4" = { name = "ajv"; packageName = "ajv"; - version = "5.2.2"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz"; - sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.2.4.tgz"; + sha1 = "3daf9a8b67221299fdae8d82d117ed8e6c80244b"; }; }; "har-schema-2.0.0" = { @@ -9386,13 +9449,13 @@ let sha1 = "51b17574fc682588e2dd295cfa6e6aa109eab5ee"; }; }; - "conf-1.3.0" = { + "conf-1.3.1" = { name = "conf"; packageName = "conf"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-1.3.0.tgz"; - sha512 = "21wa83v253mikyav1r639cnmycyribfhr6d4kzmzhgcs8l1ahn6mb37lmr3wnzjrca53f52w30p5ccxhm58zh1lmr01naf0kb3fc2qh"; + url = "https://registry.npmjs.org/conf/-/conf-1.3.1.tgz"; + sha512 = "0s33rz07rq4r5kf3bgza6gz4157ph97cm2dh8ws0mj7b924prjaqwbsnljx61pvzkl3db82z51i2k41dpg0hqw6srhkx9qx4nb1yrs8"; }; }; "got-7.1.0" = { @@ -9575,13 +9638,13 @@ let sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; }; }; - "make-dir-1.0.0" = { + "make-dir-1.1.0" = { name = "make-dir"; packageName = "make-dir"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz"; - sha1 = "97a011751e91dd87cfadef58832ebb04936de978"; + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz"; + sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh"; }; }; "pkg-up-2.0.0" = { @@ -9602,6 +9665,15 @@ let sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; }; }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; "find-up-2.1.0" = { name = "find-up"; packageName = "find-up"; @@ -9863,13 +9935,13 @@ let sha1 = "898508da2226f380df904728456849c1501a4b0d"; }; }; - "chalk-2.1.0" = { + "chalk-2.2.0" = { name = "chalk"; packageName = "chalk"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; - sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz"; + sha512 = "3vfffivwlp2hr7dwh84lvayba94a98ddhb8dwkv14magmfdj1n895880sik7liqv4xgnvvpr2v5jsm1gzl1fypl7nl9dpa6d3zhq4yh"; }; }; "indent-string-3.2.0" = { @@ -9899,22 +9971,22 @@ let sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; - "log-update-2.1.0" = { + "log-update-2.2.0" = { name = "log-update"; packageName = "log-update"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-2.1.0.tgz"; - sha1 = "ea37258b5354edb02e73b29190016c87d1c87141"; + url = "https://registry.npmjs.org/log-update/-/log-update-2.2.0.tgz"; + sha1 = "e1b034d4325e3436c9df1aa7fd9c9c243bfb9198"; }; }; - "prop-types-15.5.10" = { + "prop-types-15.6.0" = { name = "prop-types"; packageName = "prop-types"; - version = "15.5.10"; + version = "15.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz"; - sha1 = "2797dfc3126182e3a95e3dfbb2e893ddd7456154"; + url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz"; + sha1 = "ceaf083022fc46b4a35f69e13ef75aed0d639856"; }; }; "ansi-styles-3.2.0" = { @@ -9926,13 +9998,13 @@ let sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; }; }; - "supports-color-4.4.0" = { + "supports-color-4.5.0" = { name = "supports-color"; packageName = "supports-color"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; - sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; + sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; }; }; "color-convert-1.9.0" = { @@ -9962,13 +10034,13 @@ let sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; - "ansi-escapes-2.0.0" = { + "ansi-escapes-3.0.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz"; - sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b"; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; + sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; }; }; "cli-cursor-2.1.0" = { @@ -10043,13 +10115,13 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; - "fbjs-0.8.15" = { + "fbjs-0.8.16" = { name = "fbjs"; packageName = "fbjs"; - version = "0.8.15"; + version = "0.8.16"; src = fetchurl { - url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.15.tgz"; - sha1 = "4f0695fdfcc16c37c0b07facec8cb4c4091685b9"; + url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz"; + sha1 = "5e67432f550dc41b572bf55847b8aca64e5337db"; }; }; "core-js-1.2.7" = { @@ -10079,13 +10151,13 @@ let sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; }; }; - "ua-parser-js-0.7.14" = { + "ua-parser-js-0.7.17" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.14"; + version = "0.7.17"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz"; - sha1 = "110d53fa4c3f326c121292bbeac904d2e03387ca"; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz"; + sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr"; }; }; "node-fetch-1.7.3" = { @@ -10115,15 +10187,6 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "iconv-lite-0.4.19" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; - }; - }; "unicode-emoji-modifier-base-1.0.0" = { name = "unicode-emoji-modifier-base"; packageName = "unicode-emoji-modifier-base"; @@ -10133,13 +10196,13 @@ let sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; }; }; - "debug-3.0.1" = { + "debug-3.1.0" = { name = "debug"; packageName = "debug"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz"; - sha512 = "3rnqa9m5ma6whhiailgppfhnm4gkv4brw9619yvxz59di3g306svl7na9qj6n9l887ra3fgr80b0xij0vjvfwpbk9zvpags5plmqxga"; + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; }; }; "doctrine-2.0.0" = { @@ -10205,13 +10268,13 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "ignore-3.3.5" = { + "ignore-3.3.6" = { name = "ignore"; packageName = "ignore"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz"; - sha512 = "07qdg1b3fwg8b7zwq83rljcx2h0ybq8s43h5xkvsr252qij7ib2gcjamqsb25zv1nvxm94yrvf4fl41s1kyms8zhr86cspwcbggvc94"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.6.tgz"; + sha512 = "2bv6fgfnwzivrdak4qc7bxfydydg6qqv9nynyqc9bpj2fq57m5ac4asylrl5m5n67nq8bxx86vrv97b8r9zq9g0vrd9y6ck28vndg0y"; }; }; "inquirer-3.3.0" = { @@ -10295,13 +10358,13 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "table-4.0.1" = { + "table-4.0.2" = { name = "table"; packageName = "table"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.1.tgz"; - sha1 = "a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"; + url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz"; + sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai"; }; }; "esrecurse-4.2.0" = { @@ -10331,13 +10394,13 @@ let sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; }; }; - "flat-cache-1.2.2" = { + "flat-cache-1.3.0" = { name = "flat-cache"; packageName = "flat-cache"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz"; - sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96"; + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz"; + sha1 = "d3030b32b38154f4e3b7e9c709f490f7ef97c481"; }; }; "circular-json-0.3.3" = { @@ -10421,15 +10484,6 @@ let sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; }; }; - "ansi-escapes-3.0.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; - sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; - }; - }; "cli-width-2.2.0" = { name = "cli-width"; packageName = "cli-width"; @@ -10610,40 +10664,31 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.11.8" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; - }; - }; - "ajv-keywords-1.5.1" = { + "ajv-keywords-2.1.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "1.5.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; - sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz"; + sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"; }; }; - "slice-ansi-0.0.4" = { + "slice-ansi-1.0.0" = { name = "slice-ansi"; packageName = "slice-ansi"; - version = "0.0.4"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; - sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz"; + sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; - "eslint-4.7.2" = { + "eslint-4.9.0" = { name = "eslint"; packageName = "eslint"; - version = "4.7.2"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.7.2.tgz"; - sha1 = "ff6f5f5193848a27ee9b627be3e73fb9cb5e662e"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz"; + sha1 = "76879d274068261b191fe0f2f56c74c2f4208e8b"; }; }; "supports-color-3.2.3" = { @@ -10664,15 +10709,6 @@ let sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; }; }; - "log-update-1.0.2" = { - name = "log-update"; - packageName = "log-update"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; - sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; - }; - }; "ora-1.3.0" = { name = "ora"; packageName = "ora"; @@ -10682,22 +10718,13 @@ let sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a"; }; }; - "phantomjs-prebuilt-2.1.15" = { - name = "phantomjs-prebuilt"; - packageName = "phantomjs-prebuilt"; - version = "2.1.15"; + "puppeteer-0.11.0" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.15.tgz"; - sha1 = "20f86e82d3349c505917527745b7a411e08b3903"; - }; - }; - "promise-phantom-3.1.6" = { - name = "promise-phantom"; - packageName = "promise-phantom"; - version = "3.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz"; - sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-0.11.0.tgz"; + sha512 = "3rfwg87lk6wc7vyansvzg9qpxlkix62l5mway31pxflgcadf475n8zm866gbcq7wxyffy0nx4hrlkhd1fchbn2i0zw6x122lmijx3zy"; }; }; "zen-observable-0.5.2" = { @@ -10709,13 +10736,13 @@ let sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf"; }; }; - "cli-spinners-1.0.1" = { + "cli-spinners-1.1.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.1.tgz"; - sha1 = "2675321c100f195b02877ac499e9911fa34b9783"; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz"; + sha1 = "f1847b168844d917a671eb9d147e3df497c90d06"; }; }; "log-symbols-1.0.2" = { @@ -10727,15 +10754,6 @@ let sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; }; }; - "es6-promise-4.0.5" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz"; - sha1 = "7882f30adde5b240ccfa7f7d78c548330951ae42"; - }; - }; "extract-zip-1.6.5" = { name = "extract-zip"; packageName = "extract-zip"; @@ -10745,49 +10763,31 @@ let sha1 = "99a06735b6ea20ea9b705d779acffcc87cff0440"; }; }; - "fs-extra-1.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; + "https-proxy-agent-2.1.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz"; + sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w"; + }; + }; + "proxy-from-env-1.0.0" = { + name = "proxy-from-env"; + packageName = "proxy-from-env"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; - sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; + url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; + sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; }; }; - "hasha-2.2.0" = { - name = "hasha"; - packageName = "hasha"; - version = "2.2.0"; + "ws-3.2.0" = { + name = "ws"; + packageName = "ws"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; - sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; - }; - }; - "kew-0.7.0" = { - name = "kew"; - packageName = "kew"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; - sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; - }; - }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; - }; - }; - "request-progress-2.0.1" = { - name = "request-progress"; - packageName = "request-progress"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; - sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; + url = "https://registry.npmjs.org/ws/-/ws-3.2.0.tgz"; + sha512 = "1bj83dg7c5sca2v9cpzz4m83y9mm8icldvpk2c9sq3216cr6cn7qvfwhw9hq881nq7pii3xxbg8lz6g2p6223ililwkzzp68ndbfd45"; }; }; "debug-2.2.0" = { @@ -10844,76 +10844,40 @@ let sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; + "agent-base-4.1.1" = { + name = "agent-base"; + packageName = "agent-base"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz"; + sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9"; }; }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; }; }; - "qs-6.4.0" = { - name = "qs"; - packageName = "qs"; - version = "6.4.0"; + "es6-promise-4.1.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; + sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r"; }; }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; - }; - }; - "throttleit-1.0.0" = { - name = "throttleit"; - packageName = "throttleit"; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; - }; - }; - "mkpath-1.0.0" = { - name = "mkpath"; - packageName = "mkpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz"; - sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; - }; - }; - "node-phantom-simple-2.2.4" = { - name = "node-phantom-simple"; - packageName = "node-phantom-simple"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz"; - sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; - }; - }; - "tmp-0.0.31" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf"; }; }; "glob-3.2.11" = { @@ -11465,6 +11429,15 @@ let sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; }; }; + "request-2.81.0" = { + name = "request"; + packageName = "request"; + version = "2.81.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + }; + }; "tar-pack-3.4.0" = { name = "tar-pack"; packageName = "tar-pack"; @@ -11528,6 +11501,51 @@ let sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; }; }; + "har-validator-4.2.1" = { + name = "har-validator"; + packageName = "har-validator"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + }; + }; + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "qs-6.4.0" = { + name = "qs"; + packageName = "qs"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; + "ajv-4.11.8" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + }; + }; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + }; + }; "event-stream-0.5.3" = { name = "event-stream"; packageName = "event-stream"; @@ -11618,22 +11636,22 @@ let sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; }; }; - "minilog-2.0.8" = { + "minilog-3.1.0" = { name = "minilog"; packageName = "minilog"; - version = "2.0.8"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/minilog/-/minilog-2.0.8.tgz"; - sha1 = "21ffdc429be2b50cb361df990a40a7731288e935"; + url = "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz"; + sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675"; }; }; - "simple-git-1.77.0" = { + "simple-git-1.80.1" = { name = "simple-git"; packageName = "simple-git"; - version = "1.77.0"; + version = "1.80.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.77.0.tgz"; - sha1 = "526537470b946e5f6f93d103ef54b46949600939"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.80.1.tgz"; + sha1 = "48104cb4ac72576937853e1afd1eeffdc97acb29"; }; }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { @@ -11646,13 +11664,13 @@ let sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; }; }; - "microee-0.0.2" = { + "microee-0.0.6" = { name = "microee"; packageName = "microee"; - version = "0.0.2"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/microee/-/microee-0.0.2.tgz"; - sha1 = "72e80d477075e5e799470f5defea96d1dd121587"; + url = "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz"; + sha1 = "a12bdb0103681e8b126a9b071eba4c467c78fffe"; }; }; "findup-sync-0.3.0" = { @@ -12987,22 +13005,22 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "@ionic/cli-utils-1.12.0" = { + "@ionic/cli-utils-1.13.1" = { name = "@ionic/cli-utils"; packageName = "@ionic/cli-utils"; - version = "1.12.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.12.0.tgz"; - sha512 = "15fk5kfp3wsi3yjpdj2hybb45g6i4i8xjadianbjlcfy8jh3zn4riavafawy76jwbn7i72yzd2yq9mwzimzqgypgpnyi254mwlykgrp"; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.13.1.tgz"; + sha512 = "0smk0gdbf976vrvp6n8yvcp1idyh5gp16810wyafah3hx4zgrmw3ni0xnq0a0m1lq914b9c5cfcw8hr5m94fb54381r62r684kr7b5g"; }; }; - "@ionic/discover-0.3.1" = { + "@ionic/discover-0.3.3" = { name = "@ionic/discover"; packageName = "@ionic/discover"; - version = "0.3.1"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.1.tgz"; - sha512 = "35246ajg70xdrv5r5ln20m3b3h8gqa7gvmcraalmr5nk7pkmrldfr8cyscm9zrqpzpsjbbs2h2vdy0nh0ghlnyhiywry8ivxn7agk90"; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.3.tgz"; + sha512 = "3brs0chjqyz8drf7i6w67bmzxgvi88pb54m6qz3ml1wc3j42hgby7x0rjzwzdhkyx5573vbr91ias805gff1piyn7x7nq0c4568zj65"; }; }; "opn-5.1.0" = { @@ -13023,31 +13041,22 @@ let sha1 = "b9a386361c17ae3a21736ef0599405c9a8c5dc5e"; }; }; - "tslib-1.7.1" = { + "tslib-1.8.0" = { name = "tslib"; packageName = "tslib"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz"; - sha1 = "bc8004164691923a79fe8378bbeb3da2017538ec"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz"; + sha512 = "0k910mhnraax4m75hvgb3f2mhfj6yrsqn7fmyqm2sx137f1kqpz8icww9zhlmqka5pfi8hvprd0wcyflim0nvh7jb14yksjj9crcqna"; }; }; - "archiver-2.0.3" = { + "archiver-2.1.0" = { name = "archiver"; packageName = "archiver"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-2.0.3.tgz"; - sha1 = "b4360bb584af1437991942716f21d7c523d1dbbd"; - }; - }; - "body-parser-1.18.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; - sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; + url = "https://registry.npmjs.org/archiver/-/archiver-2.1.0.tgz"; + sha1 = "d2df2e8d5773a82c1dcce925ccc41450ea999afd"; }; }; "ci-info-1.1.1" = { @@ -13068,13 +13077,13 @@ let sha1 = "ec7ea50c78564cd36c9d5ec18f66329fade27829"; }; }; - "diff-3.3.1" = { + "diff-3.4.0" = { name = "diff"; packageName = "diff"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz"; - sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; + url = "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz"; + sha512 = "1qawya1qhgy4q0bgx0s9ryfz70ddrgyj33rdnnppzszi7x31iir66y7v89kc82lr7prkafrax9sa6w5ssxykqmcf1xw291864qnx5a2"; }; }; "elementtree-0.1.7" = { @@ -13113,31 +13122,22 @@ let sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56"; }; }; - "slice-ansi-1.0.0" = { - name = "slice-ansi"; - packageName = "slice-ansi"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz"; - sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; - }; - }; - "ssh-config-1.1.2" = { + "ssh-config-1.1.3" = { name = "ssh-config"; packageName = "ssh-config"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.2.tgz"; - sha1 = "ae65590f276b8e259ec814551f7667c141f817e9"; + url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.3.tgz"; + sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c"; }; }; - "superagent-3.6.0" = { + "superagent-3.7.0" = { name = "superagent"; packageName = "superagent"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-3.6.0.tgz"; - sha512 = "3n51bpsm3bf5x3z8jf9ylnffxgyrfwgi2v5ii78d1vgzs5f2km3928pcqzw2j331q4y19dj96npb134f2ry2ad8qlawp8z8cvi2wsx1"; + url = "https://registry.npmjs.org/superagent/-/superagent-3.7.0.tgz"; + sha512 = "0dv80576bgsb7mq2mh3f0jgik6wnrki1ml5n8c2r21g4ql72z683fn7v63bxkf20s9ihh39gr1sqaadhpkj3yvnc5wbqv4dxv26pjzz"; }; }; "tiny-lr-1.0.5" = { @@ -13149,15 +13149,6 @@ let sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32"; }; }; - "ws-3.2.0" = { - name = "ws"; - packageName = "ws"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-3.2.0.tgz"; - sha512 = "1bj83dg7c5sca2v9cpzz4m83y9mm8icldvpk2c9sq3216cr6cn7qvfwhw9hq881nq7pii3xxbg8lz6g2p6223ililwkzzp68ndbfd45"; - }; - }; "archiver-utils-1.3.0" = { name = "archiver-utils"; packageName = "archiver-utils"; @@ -13185,15 +13176,6 @@ let sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"; }; }; - "walkdir-0.0.11" = { - name = "walkdir"; - packageName = "walkdir"; - version = "0.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz"; - sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532"; - }; - }; "lazystream-1.0.0" = { name = "lazystream"; packageName = "lazystream"; @@ -13203,13 +13185,13 @@ let sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; }; }; - "compress-commons-1.2.0" = { + "compress-commons-1.2.2" = { name = "compress-commons"; packageName = "compress-commons"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.0.tgz"; - sha1 = "58587092ef20d37cb58baf000112c9278ff73b9f"; + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz"; + sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; "crc32-stream-2.0.0" = { @@ -13221,31 +13203,22 @@ let sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"; }; }; - "crc-3.4.4" = { + "crc-3.5.0" = { name = "crc"; packageName = "crc"; - version = "3.4.4"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; - sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; + url = "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz"; + sha1 = "98b8ba7d489665ba3979f59b21381374101a1964"; }; }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; + "statuses-1.4.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; - }; - }; - "raw-body-2.3.2" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; - sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; + url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; + sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; }; }; "sax-1.1.4" = { @@ -13410,15 +13383,6 @@ let sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; }; }; - "async-limiter-1.0.0" = { - name = "async-limiter"; - packageName = "async-limiter"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; - sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf"; - }; - }; "netmask-1.0.6" = { name = "netmask"; packageName = "netmask"; @@ -13464,13 +13428,13 @@ let sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; }; }; - "handlebars-4.0.10" = { + "handlebars-4.0.11" = { name = "handlebars"; packageName = "handlebars"; - version = "4.0.10"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz"; - sha1 = "3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; + sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; }; }; "estraverse-1.9.3" = { @@ -13491,13 +13455,13 @@ let sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; }; }; - "@reactivex/rxjs-5.4.3" = { + "@reactivex/rxjs-5.5.0" = { name = "@reactivex/rxjs"; packageName = "@reactivex/rxjs"; - version = "5.4.3"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.3.tgz"; - sha512 = "20pswi06vxjrv64d6i7z1zcsml98fma05a3xbyaycyfn7xmhbg8zwhnswx9pd03hrlxr4ypgikjgr65a0kkycjcyw9819gffaw95jvm"; + url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.5.0.tgz"; + sha512 = "3r28zxbg2644s5bc09s7bjngpgs5ws56r4j5vq7sk370zyl8vppri090phfblsmqnpv5y1hfb6qlb8j19mb8i2qzqvyqyzx98xd10jr"; }; }; "chai-4.1.2" = { @@ -13518,13 +13482,13 @@ let sha512 = "1lf4xj5gc7gxbqjx1pmshsddaqah4zlvzm1r4rbrf4rsgjgf2zj9lx8rccgy0y7ps7wv2i1wf259dwd6mj8aaryxdpfryi2rb2glckb"; }; }; - "fast-json-patch-2.0.5" = { + "fast-json-patch-2.0.6" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.5.tgz"; - sha1 = "a712e829be69ab707514440c5404bdd9b0d3c609"; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.6.tgz"; + sha1 = "86fff8f8662391aa819722864d632e603e6ee605"; }; }; "iterare-0.0.8" = { @@ -13554,13 +13518,13 @@ let sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; }; }; - "object-hash-1.1.8" = { + "object-hash-1.2.0" = { name = "object-hash"; packageName = "object-hash"; - version = "1.1.8"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-1.1.8.tgz"; - sha1 = "28a659cf987d96a4dabe7860289f3b5326c4a03c"; + url = "https://registry.npmjs.org/object-hash/-/object-hash-1.2.0.tgz"; + sha512 = "19310wpjhfybr8gslg93qybbsrf3fjlmdgsgvn7d9yim1nmpcgjn5az280w4p8spvhq1djly7naa9434166gcmbavv0xirg75gmcr5j"; }; }; "opentracing-0.14.1" = { @@ -13590,22 +13554,22 @@ let sha1 = "d75153cb383846318b7a39a8d9292bb4db4e9c30"; }; }; - "typescript-2.3.4" = { + "typescript-2.4.2" = { name = "typescript"; packageName = "typescript"; - version = "2.3.4"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz"; - sha1 = "3d38321828231e434f287514959c37a82b629f42"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz"; + sha1 = "f8395f85d459276067c988aa41837a8f82870844"; }; }; - "vscode-jsonrpc-3.4.0" = { + "vscode-jsonrpc-3.4.1" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.4.0.tgz"; - sha1 = "aa95ac583bf31d80f725d57c27c09f4c2cfe9fa9"; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.4.1.tgz"; + sha1 = "e2e0b9e121f71a2b5448058a34a3aef8376a5e91"; }; }; "vscode-languageserver-3.4.3" = { @@ -13779,13 +13743,13 @@ let sha1 = "11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"; }; }; - "vscode-languageserver-protocol-3.4.2" = { + "vscode-languageserver-protocol-3.4.4" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.4.2"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.4.2.tgz"; - sha512 = "1vm846vq0y63gjxgjnng6zd4196yjx212rmzjr1ljwmkrgb2f1llgpc13ly1b1zsg6v1zjzj473i0dql50sykxwm5vdzaavl28knl6r"; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.4.4.tgz"; + sha1 = "0387bb49bd0f805e9048c695997dbd430d6eca28"; }; }; "when-3.4.6" = { @@ -13815,13 +13779,13 @@ let sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s"; }; }; - "bluebird-3.5.0" = { + "bluebird-3.5.1" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz"; - sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; + sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; }; }; "lru-cache-3.2.0" = { @@ -13851,13 +13815,13 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "path-loader-1.0.2" = { + "path-loader-1.0.4" = { name = "path-loader"; packageName = "path-loader"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.2.tgz"; - sha1 = "cd5c73e7e39a91011be148d6bfdd8a85bb931ef9"; + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz"; + sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk"; }; }; "uri-js-3.0.2" = { @@ -13932,22 +13896,22 @@ let sha1 = "9ade105df8aa573692d1221622b85414fbf4fa96"; }; }; - "method-override-2.3.9" = { + "method-override-2.3.10" = { name = "method-override"; packageName = "method-override"; - version = "2.3.9"; + version = "2.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.9.tgz"; - sha1 = "bd151f2ce34cf01a76ca400ab95c012b102d8f71"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz"; + sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"; }; }; - "morgan-1.8.2" = { + "morgan-1.9.0" = { name = "morgan"; packageName = "morgan"; - version = "1.8.2"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.8.2.tgz"; - sha1 = "784ac7734e4a453a9c6e6e8680a9329275c8b687"; + url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz"; + sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051"; }; }; "please-upgrade-node-3.0.1" = { @@ -14031,6 +13995,15 @@ let sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; }; }; + "basic-auth-2.0.0" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz"; + sha1 = "015db3f353e02e56377755f962742e8981e7bbba"; + }; + }; "boxen-0.6.0" = { name = "boxen"; packageName = "boxen"; @@ -14364,6 +14337,15 @@ let sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; }; }; + "tmp-0.0.31" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; + sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; + }; + }; "useragent-2.2.1" = { name = "useragent"; packageName = "useragent"; @@ -14373,13 +14355,13 @@ let sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; }; }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; + "finalhandler-1.0.6" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz"; + sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f"; }; }; "custom-event-1.0.1" = { @@ -15183,6 +15165,15 @@ let sha1 = "765e7607c8055452bba6f0b052595350986036de"; }; }; + "mime-1.3.4" = { + name = "mime"; + packageName = "mime"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + }; "statuses-1.2.1" = { name = "statuses"; packageName = "statuses"; @@ -15273,22 +15264,22 @@ let sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf"; }; }; - "conventional-changelog-cli-1.3.3" = { + "conventional-changelog-cli-1.3.4" = { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.3.tgz"; - sha512 = "1ihqjs3rh8v1g78l7k5bhp8c9qizmc5xzy9m8i2vvff1aa0jaxlzrpcvscvddxfx7mw1cgdgdqf9wqc12grfixi2bbb8wwx11f07fyr"; + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.4.tgz"; + sha512 = "19sf25mfb7bg5c2dxm409isgy0l82khqviy1grzd48spdgbp2mfm01g4qm4qfwak05142k26mvhd0ds7iw2yynxwvmf4zsx9n5pbh3g"; }; }; - "conventional-recommended-bump-1.0.1" = { + "conventional-recommended-bump-1.0.2" = { name = "conventional-recommended-bump"; packageName = "conventional-recommended-bump"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.1.tgz"; - sha512 = "0cn224cp4qa787r0gkxg66f8m3s6l4nimfi2hm9mi5b0fh1365nqcipq3p5g1l82lkz6xdc9ihv46pvrx7gr8l0lh563dvh8bqw8nnq"; + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.2.tgz"; + sha512 = "1fnli57xfi29zij20i1ps8q1rdrh1awq5ca128gc87y604h8434y8sykhw8mx2lq5ncabmal7p8cld9gjph3x30lr5gky8wgfyh8blh"; }; }; "dedent-0.7.0" = { @@ -15399,13 +15390,13 @@ let sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9"; }; }; - "write-json-file-2.2.0" = { + "write-json-file-2.3.0" = { name = "write-json-file"; packageName = "write-json-file"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.2.0.tgz"; - sha1 = "51862506bbb3b619eefab7859f1fd6c6d0530876"; + url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz"; + sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f"; }; }; "write-pkg-3.1.0" = { @@ -15435,13 +15426,13 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "conventional-changelog-1.1.5" = { + "conventional-changelog-1.1.6" = { name = "conventional-changelog"; packageName = "conventional-changelog"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.5.tgz"; - sha512 = "3iwdmfgds5827b1sf3lv05i5hxkwr0m3327vdn8wlr2l13j9v5p8nc8ycjif6cdyykz4ziijz63j031drql411a8ip5s4v0g24k8hqd"; + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz"; + sha512 = "2ffx29rhcisbh01fd2vqwpkgqc25im5g0zrna5lh0dawsc3rh6ckz8p629wvw24xk26z7h6kh08i73zwffn056d6bgmchaqn8013901"; }; }; "tempfile-1.1.1" = { @@ -15453,13 +15444,13 @@ let sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; }; }; - "conventional-changelog-angular-1.5.0" = { + "conventional-changelog-angular-1.5.1" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.0.tgz"; - sha512 = "1adk6b8bghfbfhb0ra4rma0ym0ws6k74k1cafvkcf14izfl34g2b4cns9nyb1w5jxa7nkcqzjcc1q42ldd4l7dqd65mjx3hzr4jmp8s"; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz"; + sha512 = "14c5dfbhxpdrladq6cqml7q0ya3swqv2abyd0gjyhrjlbfqigg002p5pw2807sf5g8v5nl28p5qpzha1rvb35l3v28wr9w758zyfy02"; }; }; "conventional-changelog-atom-0.1.1" = { @@ -15480,22 +15471,22 @@ let sha512 = "3b5q7575vplhqxypaq7jzwkmn3pys0kln0gk9grr6il64c2swappb2vj4s5ly5w5whww5vnvg7qi7r9cbha8dwr8w7d0ab8qbvxhild"; }; }; - "conventional-changelog-core-1.9.1" = { + "conventional-changelog-core-1.9.2" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.1.tgz"; - sha512 = "2nmgnplgql55fplnnba0s53mf8893qpp2a7r7ml740lx4f5gh3hknwgca32n3ag7m9h0s7ipaj921y56kdmx46v3axc6dmywd4ip38n"; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz"; + sha512 = "0pya0kpddr0dw5i6rv0dx1p3kwbxiwn3rlf80phv5blrsxw4s7mzq02m9d4iya8gbk27938y9pqyzika2nis6sg17jnlafsllcfixig"; }; }; - "conventional-changelog-ember-0.2.7" = { + "conventional-changelog-ember-0.2.8" = { name = "conventional-changelog-ember"; packageName = "conventional-changelog-ember"; - version = "0.2.7"; + version = "0.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.7.tgz"; - sha512 = "092v9z574yp59rna4m9kjav5fif1avlvgrnqh5wvyb4a45gkax8d2z7hvcqvpg4jf48xg3jh7qb0a7bvsz348fzxw6wya2wwpv6ygay"; + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz"; + sha512 = "0k0s4ry497xk0xgmviy70l51b7sdrq74qw55mffc2jhivfnb92b638whriapgkj2j75y5m8h726nck2hys6dl2svbv9kxyjiz922sxj"; }; }; "conventional-changelog-eslint-0.2.0" = { @@ -15615,13 +15606,13 @@ let sha1 = "5282659dae2107145a11126112ad3216ec5fa65f"; }; }; - "git-semver-tags-1.2.1" = { + "git-semver-tags-1.2.2" = { name = "git-semver-tags"; packageName = "git-semver-tags"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz"; - sha512 = "16mn1j3vray2l88lrl57pkaxz3bvv4ahnx3qr6r3hkdjarzqn1d8w99n44mn39y4kdmcva1z6annx92h06r870yq05382f76jvv2p3w"; + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.2.tgz"; + sha512 = "2fmj7x594d4xc7jkpbya2bhn0ysjdpslbajip0jz2is360vp29wlf3ycs193g2gxl7cw5ykb62gm93z1ywbfl49x4k0y1fakji0s4ky"; }; }; "conventional-commits-filter-1.0.0" = { @@ -15678,13 +15669,13 @@ let sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; }; }; - "text-extensions-1.6.0" = { + "text-extensions-1.7.0" = { name = "text-extensions"; packageName = "text-extensions"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.6.0.tgz"; - sha512 = "2n3ivf9yag189fhh8wsncxhdsnq28zg6lnp91cwndbn4iygj2vxs39afdcvcyrfmhsjpqwy6qnjdhp1ylq8ka6q10cfcvmbbph38qsk"; + url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz"; + sha512 = "015f82dnl58mcjf4c86lxlf2j66nhvnif56475x720bl73pkx3pvds7g2njz19ksbmbqag25rl4wij1xb6yd3in9cd4bpxn79wdk980"; }; }; "parse-github-repo-url-1.4.1" = { @@ -16056,13 +16047,13 @@ let sha1 = "183d2d81cf2b8e4de1b91bab73a13ef5c6c16581"; }; }; - "socket.io-2.0.3" = { + "socket.io-2.0.4" = { name = "socket.io"; packageName = "socket.io"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.3.tgz"; - sha1 = "4359f06a24933ae6bd087798af78c680eae345e3"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; + sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; }; "linkify-it-2.0.3" = { @@ -16128,13 +16119,13 @@ let sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; }; }; - "engine.io-3.1.1" = { + "engine.io-3.1.3" = { name = "engine.io"; packageName = "engine.io"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.1.tgz"; - sha1 = "08051ffb951907a3267e72e0bcb3d0f377e4660b"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.3.tgz"; + sha1 = "7aecf71bf8a310f9fa21461999c4fcc035f8a877"; }; }; "socket.io-adapter-1.1.1" = { @@ -16146,13 +16137,13 @@ let sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; }; }; - "socket.io-client-2.0.3" = { + "socket.io-client-2.0.4" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.3.tgz"; - sha1 = "6caf4aff9f85b19fd91b6ce13d69adb564f8873b"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz"; + sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; }; }; "socket.io-parser-3.1.2" = { @@ -16200,13 +16191,22 @@ let sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; }; }; - "engine.io-client-3.1.1" = { + "engine.io-client-3.1.3" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.1.tgz"; - sha1 = "415a9852badb14fa008fa3ef1e31608db6761325"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.3.tgz"; + sha1 = "d705e48985dfe8b54a98c9f77052b8b08258be05"; + }; + }; + "xmlhttprequest-ssl-1.5.4" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz"; + sha1 = "04f560915724b389088715cc0ed7813e9677bf57"; }; }; "connect-3.5.1" = { @@ -16236,22 +16236,13 @@ let sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31"; }; }; - "send-0.15.6" = { - name = "send"; - packageName = "send"; - version = "0.15.6"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.6.tgz"; - sha1 = "20f23a9c925b762ab82705fe2f9db252ace47e34"; - }; - }; - "serve-index-1.9.0" = { + "serve-index-1.9.1" = { name = "serve-index"; packageName = "serve-index"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.0.tgz"; - sha1 = "d2b280fc560d616ee81b48bf0fa82abed2485ce7"; + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; }; }; "finalhandler-0.5.1" = { @@ -16299,15 +16290,6 @@ let sha1 = "1c0824150481bc7a01d49e98f1ec668d82412f3b"; }; }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; - }; - }; "batch-0.6.1" = { name = "batch"; packageName = "batch"; @@ -16443,31 +16425,22 @@ let sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; }; }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; - }; - }; - "diff-3.2.0" = { + "diff-3.3.1" = { name = "diff"; packageName = "diff"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; - sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; + url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz"; + sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; }; }; - "growl-1.9.2" = { + "growl-1.10.3" = { name = "growl"; packageName = "growl"; - version = "1.9.2"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; - sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; + url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; + sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; }; }; "he-1.1.1" = { @@ -16479,31 +16452,13 @@ let sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; - "lodash.create-3.1.1" = { - name = "lodash.create"; - packageName = "lodash.create"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz"; - sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7"; - }; - }; - "supports-color-3.1.2" = { + "supports-color-4.4.0" = { name = "supports-color"; packageName = "supports-color"; - version = "3.1.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; - sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; - }; - }; - "lodash._basecreate-3.0.3" = { - name = "lodash._basecreate"; - packageName = "lodash._basecreate"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz"; - sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; + sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; }; }; "json-refs-2.1.7" = { @@ -16614,13 +16569,13 @@ let sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; }; }; - "minizlib-1.0.3" = { + "minizlib-1.0.4" = { name = "minizlib"; packageName = "minizlib"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz"; - sha1 = "d5c1abf77be154619952e253336eccab9b2a32f5"; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz"; + sha512 = "1lxpa3mkdc94i0d7b2ivilcky0gnmnxv5csmigzacb5gl2cz7rz4ciikq1r5an1simk86f61whwzyi5d8gic85w55q19d09sbv19pmh"; }; }; "yallist-3.0.2" = { @@ -16677,13 +16632,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "serve-favicon-2.4.4" = { + "serve-favicon-2.4.5" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.4.tgz"; - sha1 = "412ddd74965151c9f74c0828f35d50c5250210de"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz"; + sha512 = "2gn8a5l0hh655cxq2cvvar6k1hl8cpmagplavx6svjiz9kmi968nwbzhpc2fvpcpmsfqb8s5jjq0gvn8vwwc2lx3cj57ckbcf3prcdk"; }; }; "strong-data-uri-1.0.4" = { @@ -16794,15 +16749,6 @@ let sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; }; }; - "fresh-0.5.1" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.1.tgz"; - sha1 = "c3a08bcec0fcdcc223edf3b23eb327f1f9fcbf5c"; - }; - }; "truncate-1.0.5" = { name = "truncate"; packageName = "truncate"; @@ -16875,13 +16821,13 @@ let sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; }; }; - "update-notifier-2.2.0" = { + "update-notifier-2.3.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; - sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz"; + sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; }; }; "nopt-1.0.10" = { @@ -16893,13 +16839,13 @@ let sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; }; - "boxen-1.2.1" = { + "boxen-1.2.2" = { name = "boxen"; packageName = "boxen"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz"; - sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz"; + sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5"; }; }; "configstore-3.1.1" = { @@ -16920,6 +16866,15 @@ let sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; }; }; + "is-installed-globally-0.1.0" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; + sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; + }; + }; "latest-version-3.1.0" = { name = "latest-version"; packageName = "latest-version"; @@ -16974,6 +16929,15 @@ let sha1 = "a230f64f568310e1498009940790ec99545bca7e"; }; }; + "global-dirs-0.1.0" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.0.tgz"; + sha1 = "10d34039e0df04272e262cf24224f7209434df4f"; + }; + }; "package-json-4.0.1" = { name = "package-json"; packageName = "package-json"; @@ -17073,6 +17037,15 @@ let sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a"; }; }; + "fs-extra-1.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; + sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; + }; + }; "fs.notify-0.0.4" = { name = "fs.notify"; packageName = "fs.notify"; @@ -17460,6 +17433,24 @@ let sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; }; }; + "fresh-0.5.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz"; + sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"; + }; + }; + "proxy-addr-1.1.5" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; + sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; + }; + }; "send-0.15.3" = { name = "send"; packageName = "send"; @@ -17478,6 +17469,24 @@ let sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; }; }; + "ipaddr.js-1.4.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; + sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; + }; + }; + "crc-3.4.4" = { + name = "crc"; + packageName = "crc"; + version = "3.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; + }; + }; "debug-2.6.3" = { name = "debug"; packageName = "debug"; @@ -17685,6 +17694,15 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; "feedparser-1.1.3" = { name = "feedparser"; packageName = "feedparser"; @@ -18522,15 +18540,6 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "aproba-1.1.2" = { - name = "aproba"; - packageName = "aproba"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz"; - sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6"; - }; - }; "cacache-9.2.9" = { name = "cacache"; packageName = "cacache"; @@ -18549,6 +18558,24 @@ let sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"; }; }; + "cli-table2-0.2.0" = { + name = "cli-table2"; + packageName = "cli-table2"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz"; + sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; + }; + }; + "is-cidr-1.0.0" = { + name = "is-cidr"; + packageName = "is-cidr"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-cidr/-/is-cidr-1.0.0.tgz"; + sha1 = "fb5aacf659255310359da32cae03e40c6a1c2afc"; + }; + }; "lazy-property-1.0.0" = { name = "lazy-property"; packageName = "lazy-property"; @@ -18657,13 +18684,31 @@ let sha512 = "0iapgirmdb46ia3apm6fsb9qv9c0hi4k9jflrxlgnrm0jhliqgas49lmpz06xafncx1sxgjngl0fw3gr472c7kapzdvpivf0fp5miqa"; }; }; - "npm-packlist-1.1.9" = { + "npm-packlist-1.1.10" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.9.tgz"; - sha512 = "1d1l5hasnw67hczgcwbc8534n1hgvx87hin1yr14yz70b4yzp06gfrj97lhh0qfmk5p1lqfrzajhs5wywx98hj75g00mqmir54050gm"; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; + sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; + }; + }; + "npm-profile-2.0.5" = { + name = "npm-profile"; + packageName = "npm-profile"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-profile/-/npm-profile-2.0.5.tgz"; + sha512 = "2325avpmbzxl4vi1hxnxv96rw9j0y712ym3mph3hrsvgq4p8d0yh44vnja22plnw9vplskcx661j2spzqka65zsszzngvwm806skfdl"; + }; + }; + "npm-registry-client-8.5.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "8.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz"; + sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn"; }; }; "npm-user-validate-1.0.0" = { @@ -18684,13 +18729,13 @@ let sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; - "pacote-6.0.2" = { + "pacote-6.0.4" = { name = "pacote"; packageName = "pacote"; - version = "6.0.2"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-6.0.2.tgz"; - sha512 = "2721b5lapgglck02ikkhxgkmg5gs1l8ld712ixb94d86zrspvzn3z81678kcpqvpvs7a0ykgganm9nb1p2668zss7cdib5z6jrg7j9y"; + url = "https://registry.npmjs.org/pacote/-/pacote-6.0.4.tgz"; + sha512 = "36bx0mnsvm3fvq0vbcl05j6fsjf4v4gks1hlxqyga0jxz491cis9y38j8q9cmmfdfbx9xaz3n3h93h0ik4bkn82rb3nz2413wk7xfxi"; }; }; "promise-inflight-1.0.1" = { @@ -18702,6 +18747,33 @@ let sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; + "qrcode-terminal-0.11.0" = { + name = "qrcode-terminal"; + packageName = "qrcode-terminal"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz"; + sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e"; + }; + }; + "query-string-5.0.0" = { + name = "query-string"; + packageName = "query-string"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-5.0.0.tgz"; + sha1 = "fbdf7004b4d2aff792f9871981b7a2794f555947"; + }; + }; + "qw-1.0.1" = { + name = "qw"; + packageName = "qw"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qw/-/qw-1.0.1.tgz"; + sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4"; + }; + }; "read-package-tree-5.1.6" = { name = "read-package-tree"; packageName = "read-package-tree"; @@ -18720,13 +18792,13 @@ let sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; }; }; - "tar-4.0.1" = { + "tar-4.0.2" = { name = "tar"; packageName = "tar"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.0.1.tgz"; - sha512 = "3j6x1q724j4y32xqgmnafwr0063xlr4bw5ra92zsar6iyqikcfy02lpc98h4ss75vxywza639m3b9cps9z4xdlr2cpy6g5kyvxm86jw"; + url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz"; + sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2"; }; }; "unique-filename-1.1.0" = { @@ -18738,6 +18810,15 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; + "update-notifier-2.2.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; + sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; + }; + }; "worker-farm-1.5.0" = { name = "worker-farm"; packageName = "worker-farm"; @@ -18783,6 +18864,15 @@ let sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093"; }; }; + "cidr-regex-1.0.6" = { + name = "cidr-regex"; + packageName = "cidr-regex"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cidr-regex/-/cidr-regex-1.0.6.tgz"; + sha1 = "74abfd619df370b9d54ab14475568e97dd64c0c1"; + }; + }; "dotenv-4.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -18828,13 +18918,13 @@ let sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; }; }; - "stream-each-1.2.0" = { + "stream-each-1.2.2" = { name = "stream-each"; packageName = "stream-each"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz"; - sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991"; + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz"; + sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; }; }; "cyclist-0.2.2" = { @@ -18864,13 +18954,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "ignore-walk-3.0.0" = { + "ignore-walk-3.0.1" = { name = "ignore-walk"; packageName = "ignore-walk"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.0.tgz"; - sha512 = "0ly2gpx2q4zi46dbnwhp2g329vfhqrbfh1piy5hvgfzpasbq61ymaxg64qsxiqx6qqv396m0ad7abs3q3sv702w42xfli8qpm1yp8dl"; + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; + sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; }; }; "npm-bundled-1.0.3" = { @@ -18891,33 +18981,6 @@ let sha512 = "1s6fqfsr7ksyfp0mwzlcf9rwpg74y29p67jkc8h89zy915rjsy5f85ik1659gd0y48z7lbnf3mg9c27drk74qycj446rlykim3zkw14"; }; }; - "npm-pick-manifest-1.0.4" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; - sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h"; - }; - }; - "promise-retry-1.1.1" = { - name = "promise-retry"; - packageName = "promise-retry"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz"; - sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; - }; - }; - "protoduck-4.0.0" = { - name = "protoduck"; - packageName = "protoduck"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz"; - sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e"; - }; - }; "agentkeepalive-3.3.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; @@ -18927,13 +18990,13 @@ let sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p"; }; }; - "http-cache-semantics-3.7.3" = { + "http-cache-semantics-3.8.0" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "3.7.3"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.7.3.tgz"; - sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72"; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.0.tgz"; + sha512 = "258k0vff4wrszl7vnpv4c67zc5qk0mnl8banhp8znianmahxv1y55lpz0877jicsw1k0y8g0glz4my71dd9y3ywzpingfvb2xy0ar0w"; }; }; "http-proxy-agent-2.0.0" = { @@ -18945,15 +19008,6 @@ let sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; }; }; - "https-proxy-agent-2.1.0" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz"; - sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w"; - }; - }; "node-fetch-npm-2.0.2" = { name = "node-fetch-npm"; packageName = "node-fetch-npm"; @@ -18963,6 +19017,15 @@ let sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw"; }; }; + "promise-retry-1.1.1" = { + name = "promise-retry"; + packageName = "promise-retry"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz"; + sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; + }; + }; "socks-proxy-agent-3.0.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -18981,31 +19044,13 @@ let sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; }; }; - "agent-base-4.1.1" = { - name = "agent-base"; - packageName = "agent-base"; - version = "4.1.1"; + "err-code-1.1.2" = { + name = "err-code"; + packageName = "err-code"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz"; - sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9"; - }; - }; - "es6-promisify-5.0.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; - }; - }; - "es6-promise-4.1.1" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; - sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r"; + url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz"; + sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; }; }; "socks-1.1.10" = { @@ -19026,13 +19071,22 @@ let sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; }; }; - "err-code-1.1.2" = { - name = "err-code"; - packageName = "err-code"; - version = "1.1.2"; + "npm-pick-manifest-1.0.4" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz"; - sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; + sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h"; + }; + }; + "protoduck-4.0.0" = { + name = "protoduck"; + packageName = "protoduck"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz"; + sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e"; }; }; "genfun-4.0.1" = { @@ -19044,6 +19098,24 @@ let sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"; }; }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "strict-uri-encode-1.1.0" = { + name = "strict-uri-encode"; + packageName = "strict-uri-encode"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + }; + }; "stream-iterate-1.2.0" = { name = "stream-iterate"; packageName = "stream-iterate"; @@ -19269,15 +19341,6 @@ let sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea"; }; }; - "require-dir-0.3.2" = { - name = "require-dir"; - packageName = "require-dir"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.2.tgz"; - sha1 = "c1d5c75e9fbffde9f2e6b33e383db4f594b5a6a9"; - }; - }; "semver-utils-1.1.1" = { name = "semver-utils"; packageName = "semver-utils"; @@ -19287,13 +19350,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.41.1" = { + "snyk-1.45.0" = { name = "snyk"; packageName = "snyk"; - version = "1.41.1"; + version = "1.45.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.41.1.tgz"; - sha1 = "34ac2239337f4fbfa4192b10f2d4d67bf6d117cf"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.45.0.tgz"; + sha1 = "890eae8b1c14ff8ff1be25388702cb585df86834"; }; }; "spawn-please-0.3.0" = { @@ -19413,22 +19476,22 @@ let sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; }; }; - "es5-ext-0.10.30" = { + "es5-ext-0.10.35" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.30"; + version = "0.10.35"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz"; - sha1 = "7141a16836697dbabfaaaeee41495ce29f52c939"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz"; + sha1 = "18ee858ce6a3c45c7d79e91c15fcca9ec568494f"; }; }; - "es6-iterator-2.0.1" = { + "es6-iterator-2.0.3" = { name = "es6-iterator"; packageName = "es6-iterator"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz"; - sha1 = "8e319c9f0453bf575d374940a655920e59ca5512"; + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; }; }; "form-data-2.0.0" = { @@ -19476,22 +19539,22 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-go-plugin-1.2.1" = { + "snyk-go-plugin-1.3.7" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.2.1"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.2.1.tgz"; - sha512 = "3fvzskjkhljbpcha1z2bk9ca96bcyqc1hb8i2fz7ck71bmfvq9q1wxq1rmp981zmmxvag6igdxsxcq8nrc5igq5s452qr8x9b2g6s9a"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.3.7.tgz"; + sha512 = "0i5dcqyyfmb0caz9fa3qaqx7k1f79qyd9y6jn031c75647y8hmk265w6ynkpz8gkv7cn4w6cznrm5q436vg4wgs1ahqd5xrwkhsbxp4"; }; }; - "snyk-gradle-plugin-1.1.2" = { + "snyk-gradle-plugin-1.2.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.1.2.tgz"; - sha512 = "17xbvmgijgmbpr01mq7z5hhbi9yjwj7mffmfngi8jbva19yggcns4srn18wh8bya0bb0hsjzj5g1lkzc6ndn1vyx95kfkqv6yrs9diq"; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz"; + sha512 = "1b2bxvwl2v4prlj942i4jkz4mahgp39j7lvy91jzv00nsk59l76b1icn48zj4zk84s00jil3pnxnfzsclhcc612d70s4wwi3x2hrrqn"; }; }; "snyk-module-1.8.1" = { @@ -19503,13 +19566,13 @@ let sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; }; }; - "snyk-mvn-plugin-1.0.3" = { + "snyk-mvn-plugin-1.1.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.3.tgz"; - sha512 = "3p1ji20lrwfgq8gv8br38nk8l5sklhpvmgdcp9il01f22pzclaqnvrh8pcihkq5x74rifhcra6kqjz057i0mmrk8p3w3yq8gikqgz7l"; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.0.tgz"; + sha512 = "3ar9rk77y39sydnriw6k9p5s15qpv1in81365l0yjbvn6qis7v4na98xfibsmfnnkjyblnd5qs2q1j6fabdfx4g2x5yi7ld6hdm6r3r"; }; }; "snyk-policy-1.7.1" = { @@ -19521,13 +19584,13 @@ let sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; }; }; - "snyk-python-plugin-1.2.4" = { + "snyk-python-plugin-1.4.0" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.2.4"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.4.tgz"; - sha512 = "3n3rsr3cfa5jib3vlhwh6q60a6v7plc6gqwvylkc0q2yn99cb9syxkddzg0122apg98f10g2sy3y8mmsxyi7wpzklmhqmflv7q7dsiq"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.4.0.tgz"; + sha512 = "3ayb4vqwvz9srv07xfrzwwni6aabbxmmxq8gx55qkzbc7x912k7cvd4r8v96ij8ck45r89xhm2j60knmjhv6xj1gm2x9vhz20s325vk"; }; }; "snyk-recursive-readdir-2.0.0" = { @@ -19557,13 +19620,13 @@ let sha1 = "13743a058437dff890baaf437c333c966a743cb6"; }; }; - "snyk-sbt-plugin-1.1.1" = { + "snyk-sbt-plugin-1.2.0" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.1.1.tgz"; - sha512 = "38hp4kdx53qwknznqzi3j2y8i7hcwbmpbn6rk2lyszg4aly2dqvphk2hs8msij6s20lr884l8wkvc6rw9qpid8cqm75inl7wa2c5an0"; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.0.tgz"; + sha512 = "002ibp199wy3pk8dldcfr83njcrgx7hk1c802hwa9skky7jw5c4infnaj9aignghi2l1w44p3cjk3xwbcrryldj3hh63vbyzpryg3qz"; }; }; "snyk-tree-1.0.0" = { @@ -19782,58 +19845,22 @@ let sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; - "async-2.4.1" = { - name = "async"; - packageName = "async"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz"; - sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"; - }; - }; - "lokijs-1.4.3" = { + "lokijs-1.5.0" = { name = "lokijs"; packageName = "lokijs"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lokijs/-/lokijs-1.4.3.tgz"; - sha1 = "f2a47ba8d6991c92d6da6a5b35be79b674453abb"; + url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.0.tgz"; + sha1 = "99e403d6a89e47e11ed0c5d499fb55a0603d5efc"; }; }; - "vscode-jsonrpc-3.2.0" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.2.0.tgz"; - sha1 = "c92b946ac385c8b41439b842b6bd07d517b64a7d"; - }; - }; - "vscode-languageclient-3.2.2" = { + "vscode-languageclient-3.4.5" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "3.2.2"; + version = "3.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.2.2.tgz"; - sha1 = "7843839614aa099f172b4e5f8967d42b58d77f0d"; - }; - }; - "vscode-languageserver-3.2.2" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.2.2.tgz"; - sha1 = "9a7b66e1252838ea51a0061145089a2b88a9516a"; - }; - }; - "vscode-languageserver-types-3.2.0" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.2.0.tgz"; - sha1 = "8874ed92dbfa66df5fb0e2bf73f614cf9483be8f"; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.4.5.tgz"; + sha1 = "6230072ab0772085d09b48f99b79e7c421ddfbb7"; }; }; "babybird-0.0.1" = { @@ -20443,13 +20470,13 @@ let sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917"; }; }; - "connect-multiparty-2.0.0" = { + "connect-multiparty-2.1.0" = { name = "connect-multiparty"; packageName = "connect-multiparty"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.0.0.tgz"; - sha1 = "57a7b61cc7b31b6eef4a62878d60d771b23699ab"; + url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.1.0.tgz"; + sha512 = "2im4bqk3xwxwilkg8gli3pblmalbhsd4wl5w10p63bvl0jd3m0qp5by840k5s7dr8wi0krixp2297bn76v38dwgznja4h4wp6my3g0c"; }; }; "socket.io-1.7.4" = { @@ -20515,6 +20542,24 @@ let sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; }; }; + "hasha-2.2.0" = { + name = "hasha"; + packageName = "hasha"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; + sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; + }; + }; + "kew-0.7.0" = { + name = "kew"; + packageName = "kew"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; + sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; + }; + }; "request-2.67.0" = { name = "request"; packageName = "request"; @@ -20524,6 +20569,15 @@ let sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; }; }; + "request-progress-2.0.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; + sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; + }; + }; "concat-stream-1.5.0" = { name = "concat-stream"; packageName = "concat-stream"; @@ -20560,6 +20614,24 @@ let sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; }; }; + "throttleit-1.0.0" = { + name = "throttleit"; + packageName = "throttleit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; + sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; + }; + }; + "browserify-13.3.0" = { + name = "browserify"; + packageName = "browserify"; + version = "13.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; + }; + }; "browserify-incremental-3.1.1" = { name = "browserify-incremental"; packageName = "browserify-incremental"; @@ -20605,6 +20677,15 @@ let sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac"; }; }; + "https-browserify-0.0.1" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; + sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + }; + }; "JSONStream-0.10.0" = { name = "JSONStream"; packageName = "JSONStream"; @@ -21002,22 +21083,31 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; - "args-3.0.4" = { + "args-3.0.7" = { name = "args"; packageName = "args"; - version = "3.0.4"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/args/-/args-3.0.4.tgz"; - sha512 = "2441a84bwxxm0zcn133ngf0aj1f8jidgfsvm40wa8ap98lkzyzv8fppfsl1dhxpni70mpgl8yik9anc2vrgh1n1immkhw3z6727r9ll"; + url = "https://registry.npmjs.org/args/-/args-3.0.7.tgz"; + sha512 = "1qi9fsw42grlhv4aj7v42xikvicr5657809syvp4dca33fjzzr1h7x1q9zwhclpyb879g6bgb2yd4i2iasnpmxn8ng1dcnq85yg001r"; }; }; - "basic-auth-2.0.0" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "2.0.0"; + "boxen-1.2.1" = { + name = "boxen"; + packageName = "boxen"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz"; - sha1 = "015db3f353e02e56377755f962742e8981e7bbba"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz"; + sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d"; + }; + }; + "chalk-2.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; + sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; }; }; "detect-port-1.2.1" = { @@ -21038,6 +21128,15 @@ let sha1 = "fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"; }; }; + "handlebars-4.0.10" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz"; + sha1 = "3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"; + }; + }; "micro-9.0.0" = { name = "micro"; packageName = "micro"; @@ -21065,6 +21164,15 @@ let sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp"; }; }; + "openssl-self-signed-certificate-1.1.6" = { + name = "openssl-self-signed-certificate"; + packageName = "openssl-self-signed-certificate"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz"; + sha1 = "9d3a4776b1a57e9847350392114ad2f915a83dd4"; + }; + }; "path-type-3.0.0" = { name = "path-type"; packageName = "path-type"; @@ -21074,33 +21182,6 @@ let sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; }; }; - "chalk-2.0.1" = { - name = "chalk"; - packageName = "chalk"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"; - sha512 = "398mvhli8dvcn53xaqllyjzp19z8gh3j75fvp4gv5njnnkhsikx3byfb6lx432pl0073hn75prc8gb0ysbf65bnzlcbq5iy89f8b7rj"; - }; - }; - "pkginfo-0.4.0" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz"; - sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65"; - }; - }; - "address-1.0.3" = { - name = "address"; - packageName = "address"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz"; - sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng"; - }; - }; "mri-1.1.0" = { name = "mri"; packageName = "mri"; @@ -21110,22 +21191,22 @@ let sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a"; }; }; - "pify-3.0.0" = { - name = "pify"; - packageName = "pify"; - version = "3.0.0"; + "address-1.0.3" = { + name = "address"; + packageName = "address"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz"; + sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng"; }; }; - "express-5.0.0-alpha.5" = { + "express-5.0.0-alpha.6" = { name = "express"; packageName = "express"; - version = "5.0.0-alpha.5"; + version = "5.0.0-alpha.6"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.5.tgz"; - sha1 = "e37423a8d82826fb915c7dd166e2900bfa3552e6"; + url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.6.tgz"; + sha1 = "85dc44d7e90d4809041407f388f239b5bd2f681e"; }; }; "express-json5-0.1.0" = { @@ -21209,40 +21290,40 @@ let sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; }; }; - "debug-2.6.1" = { - name = "debug"; - packageName = "debug"; - version = "2.6.1"; + "qs-6.5.0" = { + name = "qs"; + packageName = "qs"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; - sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; + sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby"; }; }; - "router-1.3.1" = { + "router-1.3.2" = { name = "router"; packageName = "router"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.3.1.tgz"; - sha1 = "e59ef64fafc22194a196986834d887058d76af47"; + url = "https://registry.npmjs.org/router/-/router-1.3.2.tgz"; + sha1 = "bfaa16888a5283d5ee40d999da7a9fa15296a60c"; }; }; - "send-0.15.1" = { + "send-0.15.6" = { name = "send"; packageName = "send"; - version = "0.15.1"; + version = "0.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.1.tgz"; - sha1 = "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f"; + url = "https://registry.npmjs.org/send/-/send-0.15.6.tgz"; + sha1 = "20f23a9c925b762ab82705fe2f9db252ace47e34"; }; }; - "serve-static-1.12.1" = { + "serve-static-1.12.6" = { name = "serve-static"; packageName = "serve-static"; - version = "1.12.1"; + version = "1.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz"; - sha1 = "7443a965e3ced647aceb5639fa06bf4d1bbe0039"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz"; + sha1 = "b973773f63449934da54e5beba5e31d9f4211577"; }; }; "raw-body-1.3.4" = { @@ -21515,13 +21596,13 @@ let sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "csv-parse-1.2.3" = { + "csv-parse-1.3.3" = { name = "csv-parse"; packageName = "csv-parse"; - version = "1.2.3"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.3.tgz"; - sha512 = "2gjf255jzzbvfv1ib97ahsjqcw53i1w42725cbynvkvdqvfkvfimrjbf3c1bdzbrxp1mad9znzb3d63a29b2adlrz7jkjsx43i5z3nq"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.3.3.tgz"; + sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; }; }; "stream-transform-0.1.2" = { @@ -21803,6 +21884,15 @@ let sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3"; }; }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; "promise-finally-3.0.0" = { name = "promise-finally"; packageName = "promise-finally"; @@ -21911,13 +22001,13 @@ let sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de"; }; }; - "typescript-2.5.2" = { + "typescript-2.5.3" = { name = "typescript"; packageName = "typescript"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz"; - sha1 = "038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz"; + sha512 = "3mhb4cnf07q9jnz7r8iy06iwsq32byfvn4z3f6bbbw2sknnppa4q2v5vm12bxix8lwvbdhhqhdvkr0v1bhdb0zkxf90pqcjrm1d5lm6"; }; }; "zip-object-0.1.0" = { @@ -21974,13 +22064,22 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; - "blueimp-md5-2.8.0" = { + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + }; + }; + "blueimp-md5-2.10.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.8.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.8.0.tgz"; - sha512 = "3k2jkipyh7gdwg827wlnjaq8zj2wajj8c9c7p2il6qzbk16565fwl2dr6jjp0b2fv7lichvxzpl933ixazf2j3i0pq91fh2g7imhcv7"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz"; + sha512 = "18r5wdrfrrjip7xipgxyg673njbfkj46hkswp4bmb5n7zx6gmajrashp6w32rkvhanymnx6rd7mrlqgzm68ksd89sy5x9gd5qx58hqj"; }; }; "color-2.0.0" = { @@ -22001,22 +22100,31 @@ let sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2"; }; }; - "diff2html-2.3.0" = { + "diff2html-2.3.2" = { name = "diff2html"; packageName = "diff2html"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.0.tgz"; - sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580"; + url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.2.tgz"; + sha1 = "1c5864266d437148bc66fdd66d4ad750102d7fed"; }; }; - "express-session-1.15.5" = { + "express-4.15.5" = { + name = "express"; + packageName = "express"; + version = "4.15.5"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.15.5.tgz"; + sha1 = "670235ca9598890a5ae8170b83db722b842ed927"; + }; + }; + "express-session-1.15.6" = { name = "express-session"; packageName = "express-session"; - version = "1.15.5"; + version = "1.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.5.tgz"; - sha512 = "0xr0b4wp67nzril9h59g1ag2siwazl9kkfy45cq317w0x9q6apr82i9hvqrmjpp9zfvzfidz0vvd1pczsa7namwsdwk1anp9zl74584"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz"; + sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg"; }; }; "forever-monitor-1.1.0" = { @@ -22082,13 +22190,13 @@ let sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; }; }; - "npm-4.6.1" = { + "npm-5.4.2" = { name = "npm"; packageName = "npm"; - version = "4.6.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz"; - sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646"; + url = "https://registry.npmjs.org/npm/-/npm-5.4.2.tgz"; + sha512 = "28m9zjiynb24b8bxikdaya27j87am88x1y8l70pvmh9fk3pfq0y6xvqjmpy72ld4csnz9s1hik1ff8a19sx6pyi8f5ar27b044cp8hp"; }; }; "octicons-3.5.0" = { @@ -22118,15 +22226,6 @@ let sha512 = "136ylazswrblh2b1kc29xsmzk3i3bhm6vcirl1zb60fv9h0nf3hipz7qm91vs6my1lry00xrzpy1x96y51siciwwq7k3fs0ynl2j6m4"; }; }; - "serve-static-1.12.6" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.12.6"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz"; - sha1 = "b973773f63449934da54e5beba5e31d9f4211577"; - }; - }; "signals-1.0.0" = { name = "signals"; packageName = "signals"; @@ -22163,6 +22262,15 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; + "yargs-9.0.1" = { + name = "yargs"; + packageName = "yargs"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz"; + sha1 = "52acc23feecac34042078ee78c0c007f5085db4c"; + }; + }; "color-string-1.5.2" = { name = "color-string"; packageName = "color-string"; @@ -22325,49 +22433,13 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "hosted-git-info-2.4.2" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.4.2"; + "aproba-1.1.2" = { + name = "aproba"; + packageName = "aproba"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; - sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; - }; - }; - "npm-registry-client-8.1.1" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz"; - sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf"; - }; - }; - "readable-stream-2.2.11" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz"; - sha512 = "3sn0n3ncghvdrhy082cysiswswps9d5824ppjkl7gl1z1r6f11ij6z9nvs3l8gbp7vys1kgamrnikas3azjh7dwaqi1j4haffpkxvw7"; - }; - }; - "update-notifier-2.1.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz"; - sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9"; - }; - }; - "lazy-req-2.0.0" = { - name = "lazy-req"; - packageName = "lazy-req"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz"; - sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz"; + sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6"; }; }; "lsmod-1.0.0" = { @@ -22460,15 +22532,6 @@ let sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; }; }; - "ajv-keywords-2.1.0" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz"; - sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"; - }; - }; "enhanced-resolve-3.4.1" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -22631,6 +22694,1095 @@ let sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93"; }; }; + "addons-linter-0.27.0" = { + name = "addons-linter"; + packageName = "addons-linter"; + version = "0.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.27.0.tgz"; + sha512 = "1pj51znvw4qfcji454ykz9iwh33jkws8dq78aavxzjjyibsssamdlsw01j81v4xy93w33d4ckq72r3nn8v9q34vh19izb7s05hqhw4y"; + }; + }; + "babel-polyfill-6.20.0" = { + name = "babel-polyfill"; + packageName = "babel-polyfill"; + version = "6.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.20.0.tgz"; + sha1 = "de4a371006139e20990aac0be367d398331204e7"; + }; + }; + "babel-runtime-6.25.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz"; + sha1 = "33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"; + }; + }; + "bunyan-1.8.10" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.10"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz"; + sha1 = "201fedd26c7080b632f416072f53a90b9a52981c"; + }; + }; + "debounce-1.0.2" = { + name = "debounce"; + packageName = "debounce"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debounce/-/debounce-1.0.2.tgz"; + sha1 = "503cc674d8d7f737099664fb75ddbd36b9626dc6"; + }; + }; + "es6-error-4.0.2" = { + name = "es6-error"; + packageName = "es6-error"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.2.tgz"; + sha1 = "eec5c726eacef51b7f6b73c20db6e1b13b069c98"; + }; + }; + "event-to-promise-0.8.0" = { + name = "event-to-promise"; + packageName = "event-to-promise"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/event-to-promise/-/event-to-promise-0.8.0.tgz"; + sha1 = "4b84f11772b6f25f7752fc74d971531ac6f5b626"; + }; + }; + "firefox-profile-0.5.0" = { + name = "firefox-profile"; + packageName = "firefox-profile"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-0.5.0.tgz"; + sha1 = "036de91fe3ff218d9ed8252d924f49bca0b672bd"; + }; + }; + "fx-runner-1.0.8" = { + name = "fx-runner"; + packageName = "fx-runner"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.8.tgz"; + sha1 = "5ced3b04a8d51d634de20d1480f0dc5dd8325dec"; + }; + }; + "git-rev-sync-1.9.1" = { + name = "git-rev-sync"; + packageName = "git-rev-sync"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-1.9.1.tgz"; + sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; + }; + }; + "mz-2.6.0" = { + name = "mz"; + packageName = "mz"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.6.0.tgz"; + sha1 = "c8b8521d958df0a4f2768025db69c719ee4ef1ce"; + }; + }; + "node-firefox-connect-1.2.0" = { + name = "node-firefox-connect"; + packageName = "node-firefox-connect"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-firefox-connect/-/node-firefox-connect-1.2.0.tgz"; + sha1 = "42403848313240c98514ef14b3302816fe3b84e1"; + }; + }; + "node-notifier-5.1.2" = { + name = "node-notifier"; + packageName = "node-notifier"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.1.2.tgz"; + sha1 = "2fa9e12605fa10009d44549d6fcd8a63dde0e4ff"; + }; + }; + "regenerator-runtime-0.10.5" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; + sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; + }; + }; + "sign-addon-0.2.1" = { + name = "sign-addon"; + packageName = "sign-addon"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.2.1.tgz"; + sha1 = "0172bdd9fdee7bdc636f3833b6977a556c75388e"; + }; + }; + "source-map-support-0.5.0" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz"; + sha512 = "3nwgpximc17yn0lfg8658fxkm2hwbpvnbx5x1g0qgqvjm3vzld96rh1gf6iw1srbkicp0m825sq92r9bnj2r2gl8ys0f7fzivf0sjmx"; + }; + }; + "stream-to-promise-2.2.0" = { + name = "stream-to-promise"; + packageName = "stream-to-promise"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-2.2.0.tgz"; + sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f"; + }; + }; + "tmp-0.0.30" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz"; + sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed"; + }; + }; + "watchpack-1.3.0" = { + name = "watchpack"; + packageName = "watchpack"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.0.tgz"; + sha1 = "5164d4faabb88dcf277f17c8a3b16bfd3da8bee3"; + }; + }; + "zip-dir-1.0.2" = { + name = "zip-dir"; + packageName = "zip-dir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/zip-dir/-/zip-dir-1.0.2.tgz"; + sha1 = "253f907aead62a21acd8721d8b88032b2411c051"; + }; + }; + "ajv-5.2.3" = { + name = "ajv"; + packageName = "ajv"; + version = "5.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz"; + sha1 = "c06f598778c44c6b161abafe3466b81ad1814ed2"; + }; + }; + "cheerio-1.0.0-rc.2" = { + name = "cheerio"; + packageName = "cheerio"; + version = "1.0.0-rc.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz"; + sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"; + }; + }; + "common-tags-1.4.0" = { + name = "common-tags"; + packageName = "common-tags"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz"; + sha1 = "1187be4f3d4cf0c0427d43f74eef1f73501614c0"; + }; + }; + "crx-parser-0.1.2" = { + name = "crx-parser"; + packageName = "crx-parser"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crx-parser/-/crx-parser-0.1.2.tgz"; + sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d"; + }; + }; + "doctoc-1.3.0" = { + name = "doctoc"; + packageName = "doctoc"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.0.tgz"; + sha1 = "7f0839851dd58c808a2cae55d9504e012d08ee30"; + }; + }; + "dispensary-0.10.19" = { + name = "dispensary"; + packageName = "dispensary"; + version = "0.10.19"; + src = fetchurl { + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.10.19.tgz"; + sha1 = "457993df5f4a7e03f6fa00ec8ac4f8b21bebab69"; + }; + }; + "eslint-4.8.0" = { + name = "eslint"; + packageName = "eslint"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-4.8.0.tgz"; + sha1 = "229ef0e354e0e61d837c7a80fdfba825e199815e"; + }; + }; + "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { + name = "eslint-plugin-no-unsafe-innerhtml"; + packageName = "eslint-plugin-no-unsafe-innerhtml"; + version = "1.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-no-unsafe-innerhtml/-/eslint-plugin-no-unsafe-innerhtml-1.0.16.tgz"; + sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; + }; + }; + "first-chunk-stream-2.0.0" = { + name = "first-chunk-stream"; + packageName = "first-chunk-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; + sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; + }; + }; + "jed-1.1.1" = { + name = "jed"; + packageName = "jed"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz"; + sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; + }; + }; + "pino-4.8.0" = { + name = "pino"; + packageName = "pino"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-4.8.0.tgz"; + sha1 = "ffe37684233ebf33ffa58140d7fb5c1f7e170ecd"; + }; + }; + "postcss-6.0.11" = { + name = "postcss"; + packageName = "postcss"; + version = "6.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz"; + sha512 = "1raf6rg2rp67ql9bgihz0b0laxjakl84aqf428a7d370fcq5hzfnb4gj7gkyqx5zafw6h9y1b5c666k0acjxh34n1mhlifd777wij8f"; + }; + }; + "relaxed-json-1.0.1" = { + name = "relaxed-json"; + packageName = "relaxed-json"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/relaxed-json/-/relaxed-json-1.0.1.tgz"; + sha1 = "7c8d4aa2f095704cd020e32e8099bcae103f0bd4"; + }; + }; + "strip-bom-stream-3.0.0" = { + name = "strip-bom-stream"; + packageName = "strip-bom-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz"; + sha1 = "956bcc5d84430f69256a90ed823765cd858e159c"; + }; + }; + "whatwg-url-6.3.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.3.0.tgz"; + sha512 = "01m395qx0wag7d63id97v2d86ifpw677f42lys2k6bipw4n9kmwngghsb7la19impgkrg3n4ihyk3j7963rhfgd7b066a4qk09s3kxc"; + }; + }; + "yauzl-2.8.0" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz"; + sha1 = "79450aff22b2a9c5a41ef54e02db907ccfbf9ee2"; + }; + }; + "parse5-3.0.2" = { + name = "parse5"; + packageName = "parse5"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz"; + sha1 = "05eff57f0ef4577fb144a79f8b9a967a6cc44510"; + }; + }; + "@types/node-6.0.90" = { + name = "@types/node"; + packageName = "@types/node"; + version = "6.0.90"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz"; + sha512 = "2q3rymdpikk7mc1rlmv8r1n0rlw856xmw64dx65mi90khgn1plppcsal3jvcbbhc527f06fh2wk9yargn2mlmgxxibhdvv2ax2hcymm"; + }; + }; + "anchor-markdown-header-0.5.7" = { + name = "anchor-markdown-header"; + packageName = "anchor-markdown-header"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz"; + sha1 = "045063d76e6a1f9cd327a57a0126aa0fdec371a7"; + }; + }; + "markdown-to-ast-3.4.0" = { + name = "markdown-to-ast"; + packageName = "markdown-to-ast"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-to-ast/-/markdown-to-ast-3.4.0.tgz"; + sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; + }; + }; + "update-section-0.3.3" = { + name = "update-section"; + packageName = "update-section"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz"; + sha1 = "458f17820d37820dc60e20b86d94391b00123158"; + }; + }; + "emoji-regex-6.1.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz"; + sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932"; + }; + }; + "remark-5.1.0" = { + name = "remark"; + packageName = "remark"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark/-/remark-5.1.0.tgz"; + sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c"; + }; + }; + "structured-source-3.0.2" = { + name = "structured-source"; + packageName = "structured-source"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/structured-source/-/structured-source-3.0.2.tgz"; + sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5"; + }; + }; + "traverse-0.6.6" = { + name = "traverse"; + packageName = "traverse"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; + sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + }; + }; + "remark-parse-1.1.0" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz"; + sha1 = "c3ca10f9a8da04615c28f09aa4e304510526ec21"; + }; + }; + "remark-stringify-1.1.0" = { + name = "remark-stringify"; + packageName = "remark-stringify"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz"; + sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"; + }; + }; + "unified-4.2.1" = { + name = "unified"; + packageName = "unified"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-4.2.1.tgz"; + sha1 = "76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e"; + }; + }; + "collapse-white-space-1.0.3" = { + name = "collapse-white-space"; + packageName = "collapse-white-space"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz"; + sha1 = "4b906f670e5a963a87b76b0e1689643341b6023c"; + }; + }; + "parse-entities-1.1.1" = { + name = "parse-entities"; + packageName = "parse-entities"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz"; + sha1 = "8112d88471319f27abae4d64964b122fe4e1b890"; + }; + }; + "trim-0.0.1" = { + name = "trim"; + packageName = "trim"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; + sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; + }; + }; + "trim-trailing-lines-1.1.0" = { + name = "trim-trailing-lines"; + packageName = "trim-trailing-lines"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz"; + sha1 = "7aefbb7808df9d669f6da2e438cac8c46ada7684"; + }; + }; + "unherit-1.1.0" = { + name = "unherit"; + packageName = "unherit"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz"; + sha1 = "6b9aaedfbf73df1756ad9e316dd981885840cd7d"; + }; + }; + "unist-util-remove-position-1.1.1" = { + name = "unist-util-remove-position"; + packageName = "unist-util-remove-position"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz"; + sha1 = "5a85c1555fc1ba0c101b86707d15e50fa4c871bb"; + }; + }; + "vfile-location-2.0.2" = { + name = "vfile-location"; + packageName = "vfile-location"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz"; + sha1 = "d3675c59c877498e492b4756ff65e4af1a752255"; + }; + }; + "character-entities-1.2.1" = { + name = "character-entities"; + packageName = "character-entities"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz"; + sha1 = "f76871be5ef66ddb7f8f8e3478ecc374c27d6dca"; + }; + }; + "character-entities-legacy-1.1.1" = { + name = "character-entities-legacy"; + packageName = "character-entities-legacy"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz"; + sha1 = "f40779df1a101872bb510a3d295e1fccf147202f"; + }; + }; + "character-reference-invalid-1.1.1" = { + name = "character-reference-invalid"; + packageName = "character-reference-invalid"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz"; + sha1 = "942835f750e4ec61a308e60c2ef8cc1011202efc"; + }; + }; + "is-alphanumerical-1.0.1" = { + name = "is-alphanumerical"; + packageName = "is-alphanumerical"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz"; + sha1 = "dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b"; + }; + }; + "is-decimal-1.0.1" = { + name = "is-decimal"; + packageName = "is-decimal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz"; + sha1 = "f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82"; + }; + }; + "is-hexadecimal-1.0.1" = { + name = "is-hexadecimal"; + packageName = "is-hexadecimal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz"; + sha1 = "6e084bbc92061fbb0971ec58b6ce6d404e24da69"; + }; + }; + "is-alphabetical-1.0.1" = { + name = "is-alphabetical"; + packageName = "is-alphabetical"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz"; + sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08"; + }; + }; + "unist-util-visit-1.1.3" = { + name = "unist-util-visit"; + packageName = "unist-util-visit"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.1.3.tgz"; + sha1 = "ec268e731b9d277a79a5b5aa0643990e405d600b"; + }; + }; + "ccount-1.0.2" = { + name = "ccount"; + packageName = "ccount"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz"; + sha1 = "53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89"; + }; + }; + "longest-streak-1.0.0" = { + name = "longest-streak"; + packageName = "longest-streak"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz"; + sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965"; + }; + }; + "markdown-table-0.4.0" = { + name = "markdown-table"; + packageName = "markdown-table"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz"; + sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; + }; + }; + "stringify-entities-1.3.1" = { + name = "stringify-entities"; + packageName = "stringify-entities"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz"; + sha1 = "b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c"; + }; + }; + "character-entities-html4-1.1.1" = { + name = "character-entities-html4"; + packageName = "character-entities-html4"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz"; + sha1 = "359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50"; + }; + }; + "bail-1.0.2" = { + name = "bail"; + packageName = "bail"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz"; + sha1 = "f7d6c1731630a9f9f0d4d35ed1f962e2074a1764"; + }; + }; + "trough-1.0.1" = { + name = "trough"; + packageName = "trough"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz"; + sha1 = "a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"; + }; + }; + "vfile-1.4.0" = { + name = "vfile"; + packageName = "vfile"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz"; + sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7"; + }; + }; + "boundary-1.0.1" = { + name = "boundary"; + packageName = "boundary"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boundary/-/boundary-1.0.1.tgz"; + sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; + }; + }; + "array-from-2.1.1" = { + name = "array-from"; + packageName = "array-from"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"; + sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"; + }; + }; + "natural-compare-lite-1.4.0" = { + name = "natural-compare-lite"; + packageName = "natural-compare-lite"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"; + sha1 = "17b09581988979fddafe0201e931ba933c96cbb4"; + }; + }; + "eslint-3.19.0" = { + name = "eslint"; + packageName = "eslint"; + version = "3.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; + sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; + }; + }; + "inquirer-0.12.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; + sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; + }; + }; + "pluralize-1.2.1" = { + name = "pluralize"; + packageName = "pluralize"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; + sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; + }; + }; + "table-3.8.3" = { + name = "table"; + packageName = "table"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; + sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; + }; + }; + "ajv-keywords-1.5.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; + sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; + }; + }; + "slice-ansi-0.0.4" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; + sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + }; + }; + "fast-json-parse-1.0.3" = { + name = "fast-json-parse"; + packageName = "fast-json-parse"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz"; + sha512 = "01vq6bwp36yjvywlw5jniq4ainn8jrwxsab76bv02j77ky26qm99097g7x6j8dqrjrhfgd0vs9q6nh2milhsnsk9529s42njilsq58m"; + }; + }; + "fast-safe-stringify-1.2.0" = { + name = "fast-safe-stringify"; + packageName = "fast-safe-stringify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.0.tgz"; + sha1 = "ebd42666fd18fe4f2ba4f0d295065f3f85cade96"; + }; + }; + "flatstr-1.0.5" = { + name = "flatstr"; + packageName = "flatstr"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.5.tgz"; + sha1 = "5b451b08cbd48e2eac54a2bbe0bf46165aa14be3"; + }; + }; + "quick-format-unescaped-1.1.1" = { + name = "quick-format-unescaped"; + packageName = "quick-format-unescaped"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.1.tgz"; + sha1 = "e77555ef3e66e105d4039e13ef79201284fee916"; + }; + }; + "strip-bom-buf-1.0.0" = { + name = "strip-bom-buf"; + packageName = "strip-bom-buf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz"; + sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572"; + }; + }; + "lodash.sortby-4.7.0" = { + name = "lodash.sortby"; + packageName = "lodash.sortby"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + }; + }; + "tr46-1.0.1" = { + name = "tr46"; + packageName = "tr46"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; + sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; + }; + }; + "webidl-conversions-4.0.2" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; + sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1"; + }; + }; + "archiver-1.3.0" = { + name = "archiver"; + packageName = "archiver"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz"; + sha1 = "4f2194d6d8f99df3f531e6881f14f15d55faaf22"; + }; + }; + "fs-extra-2.1.2" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; + sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; + }; + }; + "jetpack-id-1.0.0" = { + name = "jetpack-id"; + packageName = "jetpack-id"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jetpack-id/-/jetpack-id-1.0.0.tgz"; + sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6"; + }; + }; + "walkdir-0.0.11" = { + name = "walkdir"; + packageName = "walkdir"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz"; + sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532"; + }; + }; + "when-3.7.7" = { + name = "when"; + packageName = "when"; + version = "3.7.7"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz"; + sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; + }; + }; + "which-1.2.4" = { + name = "which"; + packageName = "which"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.2.4.tgz"; + sha1 = "1557f96080604e5b11b3599eb9f45b50a9efd722"; + }; + }; + "winreg-0.0.12" = { + name = "winreg"; + packageName = "winreg"; + version = "0.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/winreg/-/winreg-0.0.12.tgz"; + sha1 = "07105554ba1a9d08979251d129475bffae3006b7"; + }; + }; + "is-absolute-0.1.7" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"; + sha1 = "847491119fccb5fb436217cc737f7faad50f603f"; + }; + }; + "isexe-1.1.2" = { + name = "isexe"; + packageName = "isexe"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; + sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + }; + }; + "is-relative-0.1.3" = { + name = "is-relative"; + packageName = "is-relative"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"; + sha1 = "905fee8ae86f45b3ec614bc3c15c869df0876e82"; + }; + }; + "shelljs-0.7.7" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.7.7"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; + sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; + }; + }; + "es6-promise-2.3.0" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"; + sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; + }; + }; + "firefox-client-0.3.0" = { + name = "firefox-client"; + packageName = "firefox-client"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/firefox-client/-/firefox-client-0.3.0.tgz"; + sha1 = "3794460f6eb6afcf41376addcbc7462e24a4cd8b"; + }; + }; + "colors-0.5.1" = { + name = "colors"; + packageName = "colors"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; + sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; + }; + }; + "js-select-0.6.0" = { + name = "js-select"; + packageName = "js-select"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-select/-/js-select-0.6.0.tgz"; + sha1 = "c284e22824d5927aec962dcdf247174aefb0d190"; + }; + }; + "traverse-0.4.6" = { + name = "traverse"; + packageName = "traverse"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.4.6.tgz"; + sha1 = "d04b2280e4c792a5815429ef7b8b60c64c9ccc34"; + }; + }; + "JSONSelect-0.2.1" = { + name = "JSONSelect"; + packageName = "JSONSelect"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONSelect/-/JSONSelect-0.2.1.tgz"; + sha1 = "415418a526d33fe31d74b4defa3c836d485ec203"; + }; + }; + "growly-1.3.0" = { + name = "growly"; + packageName = "growly"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"; + sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; + }; + }; + "shellwords-0.1.1" = { + name = "shellwords"; + packageName = "shellwords"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"; + sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w"; + }; + }; + "babel-polyfill-6.16.0" = { + name = "babel-polyfill"; + packageName = "babel-polyfill"; + version = "6.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz"; + sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; + }; + }; + "deepcopy-0.6.3" = { + name = "deepcopy"; + packageName = "deepcopy"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deepcopy/-/deepcopy-0.6.3.tgz"; + sha1 = "634780f2f8656ab771af8fa8431ed1ccee55c7b0"; + }; + }; + "es6-error-4.0.0" = { + name = "es6-error"; + packageName = "es6-error"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.0.tgz"; + sha1 = "f094c7041f662599bb12720da059d6b9c7ff0f40"; + }; + }; + "jsonwebtoken-7.1.9" = { + name = "jsonwebtoken"; + packageName = "jsonwebtoken"; + version = "7.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz"; + sha1 = "847804e5258bec5a9499a8dc4a5e7a3bae08d58a"; + }; + }; + "mz-2.5.0" = { + name = "mz"; + packageName = "mz"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.5.0.tgz"; + sha1 = "2859025df03d46b57bb317174b196477ce64cec1"; + }; + }; + "source-map-support-0.4.6" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.6.tgz"; + sha1 = "32552aa64b458392a85eab3b0b5ee61527167aeb"; + }; + }; + "regenerator-runtime-0.9.6" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"; + sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; + }; + }; + "joi-6.10.1" = { + name = "joi"; + packageName = "joi"; + version = "6.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz"; + sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06"; + }; + }; + "lodash.once-4.1.1" = { + name = "lodash.once"; + packageName = "lodash.once"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; + sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; + }; + }; + "topo-1.1.0" = { + name = "topo"; + packageName = "topo"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz"; + sha1 = "e9d751615d1bb87dc865db182fa1ca0a5ef536d5"; + }; + }; + "isemail-1.2.0" = { + name = "isemail"; + packageName = "isemail"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz"; + sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a"; + }; + }; + "end-of-stream-1.1.0" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; + sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; + }; + }; + "stream-to-array-2.3.0" = { + name = "stream-to-array"; + packageName = "stream-to-array"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz"; + sha1 = "bbf6b39f5f43ec30bc71babcb37557acecf34353"; + }; + }; + "jszip-2.6.1" = { + name = "jszip"; + packageName = "jszip"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz"; + sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; + }; + }; "cli-list-0.2.0" = { name = "cli-list"; packageName = "cli-list"; @@ -22748,13 +23900,13 @@ let sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; }; }; - "yeoman-environment-2.0.3" = { + "yeoman-environment-2.0.5" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.3.tgz"; - sha512 = "3b2r95zvq77x2g2gc56l9wnd48f68qa4nkdd2yc9k04ikjwrx83ac4innjiysccdk9f0ng25a0bzxf7fs576jmjc5ww01mklrfbb1gd"; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.5.tgz"; + sha512 = "3kfwj39dplgp9w79zmk9p5hm4dfw21304srx68f0hzxhak45iql4j8gzxj4l3q9p4jcmwf25ar0ak4sm57rzx46bv4z2f3q3vybpxgb"; }; }; "yosay-2.0.1" = { @@ -23036,6 +24188,15 @@ let sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; }; }; + "log-symbols-2.1.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz"; + sha512 = "36h090zjf2rfivlbhl50iymid2wggwncngy539cylicpdwrc3jvyqpxs2mmmybqjir313xs70vliczq511zypjx8jphvm006fpqpdyc"; + }; + }; "mem-fs-1.1.3" = { name = "mem-fs"; packageName = "mem-fs"; @@ -23081,15 +24242,6 @@ let sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca"; }; }; - "first-chunk-stream-2.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; - sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; - }; - }; "pad-component-0.0.1" = { name = "pad-component"; packageName = "pad-component"; @@ -23114,10 +24266,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.10.5"; + version = "1.10.7"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.10.5.tgz"; - sha1 = "60d75b6b4d9094846ada57d18892a50b8c140b8c"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.10.7.tgz"; + sha1 = "48e37cfbbd1bae96fba40bbffdd542577d981637"; }; dependencies = [ sources."async-2.5.0" @@ -23162,7 +24314,7 @@ in sources."json5-0.5.1" sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."private-0.1.7" + sources."private-0.1.8" sources."slash-1.0.0" sources."chalk-1.1.3" sources."esutils-2.0.2" @@ -23433,11 +24585,16 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.18.1" - sources."ms-rest-2.2.2" - (sources."ms-rest-azure-2.3.3" // { + sources."moment-2.19.1" + (sources."ms-rest-2.2.3" // { dependencies = [ - sources."async-0.2.7" + sources."moment-2.18.1" + ]; + }) + (sources."ms-rest-azure-2.4.1" // { + dependencies = [ + sources."async-2.5.0" + sources."moment-2.18.1" ]; }) sources."node-forge-0.6.23" @@ -23535,12 +24692,13 @@ in sources."has-color-0.1.7" sources."ansi-styles-1.0.0" sources."strip-ansi-0.1.1" - sources."@types/node-8.0.30" - sources."@types/request-2.0.3" - sources."@types/uuid-3.4.2" + sources."@types/node-8.0.46" + sources."@types/request-2.0.6" + sources."@types/uuid-3.4.3" sources."is-buffer-1.1.5" sources."is-stream-1.1.0" sources."@types/form-data-2.2.0" + sources."lodash-4.17.4" sources."debug-0.7.4" sources."q-0.9.7" sources."pkginfo-0.4.1" @@ -23551,7 +24709,7 @@ in ]; }) sources."deep-equal-1.0.1" - sources."i-0.3.5" + sources."i-0.3.6" sources."mkdirp-0.5.1" sources."ncp-0.4.2" sources."rimraf-2.6.2" @@ -23602,7 +24760,6 @@ in sources."tough-cookie-2.3.3" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."lodash-4.17.4" sources."is-my-json-valid-2.16.1" sources."pinkie-promise-2.0.1" sources."escape-string-regexp-1.0.5" @@ -23704,7 +24861,7 @@ in version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz"; - sha1 = "nlzr17lidjf72s60vcsnqpjxgnnsn32s"; + sha1 = "5a0cabad7d5d5e6c35dbc068719c6c919e903fb5"; }; dependencies = [ sources."argparse-1.0.4" @@ -23812,7 +24969,7 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."q-1.5.0" + sources."q-1.5.1" sources."debug-2.6.9" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -23833,10 +24990,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.4.0"; + version = "14.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz"; - sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz"; + sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; }; dependencies = [ sources."JSONStream-1.3.1" @@ -23847,8 +25004,8 @@ in sources."resolve-1.1.7" ]; }) - sources."browserify-zlib-0.1.4" - sources."buffer-5.0.7" + sources."browserify-zlib-0.2.0" + sources."buffer-5.0.8" sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -23876,7 +25033,7 @@ in ]; }) sources."module-deps-4.1.1" - sources."os-browserify-0.1.2" + sources."os-browserify-0.3.0" sources."parents-1.0.1" sources."path-browserify-0.0.0" sources."process-0.11.10" @@ -23915,7 +25072,7 @@ in sources."inline-source-map-0.6.2" sources."lodash.memoize-3.0.4" sources."source-map-0.5.7" - sources."pako-0.2.9" + sources."pako-1.0.6" sources."base64-js-1.2.1" sources."ieee754-1.1.8" sources."typedarray-0.0.6" @@ -23933,7 +25090,7 @@ in sources."pbkdf2-3.0.14" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" - sources."browserify-aes-1.0.8" + sources."browserify-aes-1.1.1" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.3" sources."buffer-xor-1.0.3" @@ -23957,8 +25114,8 @@ in sources."hash-base-2.0.2" ]; }) - sources."sha.js-2.4.8" - sources."miller-rabin-4.0.0" + sources."sha.js-2.4.9" + sources."miller-rabin-4.0.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.4" @@ -24017,7 +25174,7 @@ in sources."got-1.2.2" sources."internal-ip-1.2.0" sources."keypress-0.2.1" - sources."mime-1.4.0" + sources."mime-1.4.1" sources."minimist-1.2.0" sources."peerflix-0.34.0" (sources."playerui-1.2.0" // { @@ -24309,7 +25466,7 @@ in sources."ultron-1.0.2" ]; }) - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.5.4" sources."get-browser-rtc-1.0.2" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" @@ -24387,24 +25544,23 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-7.0.1.tgz"; - sha1 = "69fd054300ce5105b092f67a1b286e80c4e88b9d"; + url = "https://registry.npmjs.org/cordova/-/cordova-7.1.0.tgz"; + sha1 = "559f5394e64145c9b6dd81800feb658d5087b096"; }; dependencies = [ sources."configstore-2.1.0" - (sources."cordova-common-2.0.3" // { + (sources."cordova-common-2.1.1" // { dependencies = [ - sources."q-1.5.0" + sources."q-1.5.1" ]; }) - (sources."cordova-lib-7.0.1" // { + (sources."cordova-lib-7.1.0" // { dependencies = [ sources."glob-7.1.1" sources."nopt-4.0.1" sources."plist-2.0.1" - sources."semver-5.3.0" sources."shelljs-0.3.0" sources."base64-js-1.1.2" sources."xmlbuilder-8.2.2" @@ -24467,22 +25623,31 @@ in sources."aliasify-2.1.0" (sources."cordova-create-1.1.1" // { dependencies = [ + (sources."cordova-common-2.0.3" // { + dependencies = [ + sources."q-1.5.1" + sources."shelljs-0.5.3" + ]; + }) + (sources."cordova-fetch-1.1.0" // { + dependencies = [ + sources."q-1.5.1" + sources."shelljs-0.7.8" + ]; + }) sources."shelljs-0.3.0" + sources."glob-7.1.2" ]; }) - (sources."cordova-fetch-1.1.0" // { + (sources."cordova-fetch-1.2.0" // { dependencies = [ - sources."q-1.5.0" + sources."q-1.5.1" sources."shelljs-0.7.8" sources."glob-7.1.2" ]; }) - sources."cordova-js-4.2.1" - (sources."cordova-serve-1.0.1" // { - dependencies = [ - sources."q-1.5.0" - ]; - }) + sources."cordova-js-4.2.2" + sources."cordova-serve-2.0.0" (sources."dep-graph-1.1.0" // { dependencies = [ sources."underscore-1.2.1" @@ -24513,6 +25678,7 @@ in sources."validate-npm-package-name-2.2.2" sources."write-file-atomic-1.1.4" sources."isarray-1.0.0" + sources."string_decoder-0.10.31" sources."qs-6.2.3" sources."builtins-0.0.7" ]; @@ -24552,7 +25718,7 @@ in sources."fs.realpath-1.0.0" sources."resolve-1.4.0" sources."path-parse-1.0.5" - (sources."browserify-13.3.0" // { + (sources."browserify-14.4.0" // { dependencies = [ sources."glob-7.1.2" ]; @@ -24566,10 +25732,9 @@ in ]; }) sources."browserify-zlib-0.1.4" - (sources."buffer-4.9.1" // { + (sources."buffer-5.0.8" // { dependencies = [ sources."base64-js-1.2.1" - sources."isarray-1.0.0" ]; }) sources."cached-path-relative-1.0.1" @@ -24577,6 +25742,7 @@ in dependencies = [ sources."readable-stream-2.0.6" sources."isarray-1.0.0" + sources."string_decoder-0.10.31" ]; }) sources."console-browserify-1.1.0" @@ -24589,7 +25755,7 @@ in sources."events-1.1.1" sources."has-1.0.1" sources."htmlescape-1.1.1" - sources."https-browserify-0.0.1" + sources."https-browserify-1.0.0" sources."insert-module-globals-7.0.1" sources."labeled-stream-splicer-2.0.0" sources."module-deps-4.1.1" @@ -24603,14 +25769,13 @@ in (sources."readable-stream-2.3.3" // { dependencies = [ sources."isarray-1.0.0" - sources."string_decoder-1.0.3" ]; }) sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" sources."stream-http-2.7.2" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.3" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" @@ -24658,7 +25823,7 @@ in sources."pbkdf2-3.0.14" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" - sources."browserify-aes-1.0.8" + sources."browserify-aes-1.1.1" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.3" sources."buffer-xor-1.0.3" @@ -24682,8 +25847,8 @@ in sources."hash-base-2.0.2" ]; }) - sources."sha.js-2.4.8" - sources."miller-rabin-4.0.0" + sources."sha.js-2.4.9" + sources."miller-rabin-4.0.1" sources."function-bind-1.1.1" sources."is-buffer-1.1.5" sources."lexical-scope-1.2.0" @@ -24710,8 +25875,9 @@ in sources."querystring-0.2.0" sources."indexof-0.0.1" sources."chalk-1.1.3" - sources."compression-1.7.0" - sources."express-4.15.4" + sources."compression-1.7.1" + sources."express-4.16.2" + sources."open-0.0.5" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -24719,16 +25885,17 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."accepts-1.3.4" - sources."bytes-2.5.0" - sources."compressible-2.0.11" - sources."debug-2.6.8" + sources."bytes-3.0.0" + sources."compressible-2.0.12" + sources."debug-2.6.9" sources."on-headers-1.0.1" - sources."vary-1.1.1" + sources."vary-1.1.2" sources."mime-types-2.1.17" sources."negotiator-0.6.1" sources."mime-db-1.30.0" sources."ms-2.0.0" sources."array-flatten-1.1.1" + sources."body-parser-1.18.2" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" @@ -24737,33 +25904,35 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."finalhandler-1.0.6" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."fresh-0.5.0" + sources."finalhandler-1.1.0" + sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.5" - sources."qs-6.5.0" + sources."proxy-addr-2.0.2" + sources."qs-6.5.1" sources."range-parser-1.2.0" - sources."send-0.15.4" - sources."serve-static-1.12.4" - sources."setprototypeof-1.0.3" + sources."send-0.16.1" + sources."serve-static-1.13.1" + sources."setprototypeof-1.1.0" sources."statuses-1.3.1" sources."type-is-1.6.15" - sources."utils-merge-1.0.0" + sources."utils-merge-1.0.1" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) + sources."iconv-lite-0.4.19" + sources."raw-body-2.3.2" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.2" - sources."ipaddr.js-1.4.0" + sources."ipaddr.js-1.5.2" sources."destroy-1.0.4" - sources."http-errors-1.6.2" - sources."mime-1.3.4" + sources."mime-1.4.1" sources."media-typer-0.3.0" sources."npm-package-arg-5.1.2" sources."promzard-0.3.0" @@ -24786,7 +25955,7 @@ in sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" sources."builtins-1.0.3" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."archy-1.0.0" @@ -24869,6 +26038,7 @@ in dependencies = [ sources."readable-stream-2.0.6" sources."isarray-1.0.0" + sources."string_decoder-0.10.31" ]; }) sources."caseless-0.11.0" @@ -25001,7 +26171,7 @@ in sources."timed-out-2.0.0" sources."end-of-stream-1.4.0" sources."stream-shift-1.0.0" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -25013,6 +26183,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Cordova command line interface tool"; + homepage = "https://github.com/apache/cordova-cli#readme"; license = "Apache-2.0"; }; production = true; @@ -25153,7 +26324,7 @@ in sources."eventemitter3-0.1.6" sources."better-curry-1.6.0" sources."websocket-driver-0.7.0" - sources."http-parser-js-0.4.8" + sources."http-parser-js-0.4.9" sources."websocket-extensions-0.1.2" (sources."native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" // { dependencies = [ @@ -25248,7 +26419,7 @@ in (sources."ndjson-1.5.0" // { dependencies = [ sources."minimist-1.2.0" - sources."split2-2.1.1" + sources."split2-2.2.0" sources."through2-2.0.3" sources."readable-stream-2.3.3" sources."isarray-1.0.0" @@ -25280,7 +26451,7 @@ in sources."jsonparse-0.0.5" sources."through-2.3.8" sources."object-assign-4.1.1" - sources."vary-1.1.1" + sources."vary-1.1.2" sources."once-1.4.0" sources."wrappy-1.0.2" sources."inherits-2.0.3" @@ -25361,14 +26532,10 @@ in sources."JSONStream-1.3.1" sources."async-2.5.0" sources."aws4-1.6.0" - sources."aws-sdk-2.122.0" + sources."aws-sdk-2.138.0" sources."ini-1.3.4" sources."optimist-0.6.1" - (sources."request-2.82.0" // { - dependencies = [ - sources."uuid-3.1.0" - ]; - }) + sources."request-2.83.0" sources."jsonparse-1.3.1" sources."through-2.3.8" sources."lodash-4.17.4" @@ -25379,7 +26546,7 @@ in sources."querystring-0.2.0" sources."sax-1.2.1" sources."url-0.10.3" - sources."uuid-3.0.1" + sources."uuid-3.1.0" sources."xml2js-0.4.17" sources."xmlbuilder-4.2.1" sources."base64-js-1.2.1" @@ -25414,7 +26581,7 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -25464,15 +26631,15 @@ in dependencies = [ sources."auto-bind-1.1.0" sources."clipboardy-1.1.4" - sources."conf-1.3.0" + sources."conf-1.3.1" sources."got-7.1.0" sources."has-ansi-3.0.0" sources."import-jsx-1.3.0" (sources."ink-0.3.1" // { dependencies = [ - sources."chalk-2.1.0" + sources."chalk-2.2.0" sources."ansi-styles-3.2.0" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" ]; }) sources."ink-text-input-1.1.1" @@ -25502,11 +26669,11 @@ in sources."path-key-2.0.1" sources."dot-prop-4.2.0" sources."env-paths-1.0.0" - sources."make-dir-1.0.0" + sources."make-dir-1.1.0" sources."pkg-up-2.0.0" sources."write-file-atomic-2.3.0" sources."is-obj-1.0.1" - sources."pify-2.3.0" + sources."pify-3.0.0" sources."find-up-2.1.0" sources."locate-path-2.0.0" sources."p-locate-2.0.0" @@ -25555,7 +26722,7 @@ in sources."lodash-4.17.4" sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."private-0.1.7" + sources."private-0.1.8" sources."slash-1.0.0" sources."source-map-0.5.7" (sources."chalk-1.1.3" // { @@ -25605,12 +26772,12 @@ in sources."indent-string-3.2.0" sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" - sources."log-update-2.1.0" - sources."prop-types-15.5.10" + sources."log-update-2.2.0" + sources."prop-types-15.6.0" sources."color-convert-1.9.0" sources."color-name-1.1.3" sources."has-flag-2.0.0" - sources."ansi-escapes-2.0.0" + sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" (sources."wrap-ansi-3.0.1" // { dependencies = [ @@ -25626,16 +26793,16 @@ in ]; }) sources."is-fullwidth-code-point-2.0.0" - (sources."fbjs-0.8.15" // { + (sources."fbjs-0.8.16" // { dependencies = [ sources."core-js-1.2.7" ]; }) - sources."isomorphic-fetch-2.2.1" sources."object-assign-4.1.1" + sources."isomorphic-fetch-2.2.1" sources."promise-7.3.1" sources."setimmediate-1.0.5" - sources."ua-parser-js-0.7.14" + sources."ua-parser-js-0.7.17" sources."node-fetch-1.7.3" sources."whatwg-fetch-2.0.3" sources."encoding-0.1.12" @@ -25672,8 +26839,16 @@ in sources."read-pkg-1.1.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" - sources."load-json-file-1.1.0" - sources."path-type-1.1.0" + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."parse-json-2.2.0" sources."strip-bom-2.0.0" sources."error-ex-1.3.1" @@ -25694,28 +26869,28 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.7.2"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.7.2.tgz"; - sha1 = "ff6f5f5193848a27ee9b627be3e73fb9cb5e662e"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz"; + sha1 = "76879d274068261b191fe0f2f56c74c2f4208e8b"; }; dependencies = [ - sources."ajv-5.2.2" + sources."ajv-5.2.4" (sources."babel-code-frame-6.26.0" // { dependencies = [ sources."chalk-1.1.3" sources."strip-ansi-3.0.1" ]; }) - (sources."chalk-2.1.0" // { + (sources."chalk-2.2.0" // { dependencies = [ sources."ansi-styles-3.2.0" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" ]; }) sources."concat-stream-1.6.0" sources."cross-spawn-5.1.0" - sources."debug-3.0.1" + sources."debug-3.1.0" sources."doctrine-2.0.0" sources."eslint-scope-3.7.1" sources."espree-3.5.1" @@ -25726,7 +26901,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-9.18.0" - sources."ignore-3.3.5" + sources."ignore-3.3.6" sources."imurmurhash-0.1.4" sources."inquirer-3.3.0" sources."is-resolvable-1.0.0" @@ -25749,13 +26924,7 @@ in ]; }) sources."strip-json-comments-2.0.1" - (sources."table-4.0.1" // { - dependencies = [ - sources."ajv-4.11.8" - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - ]; - }) + sources."table-4.0.2" sources."text-table-0.2.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -25794,7 +26963,7 @@ in sources."acorn-3.3.0" ]; }) - sources."flat-cache-1.2.2" + sources."flat-cache-1.3.0" sources."circular-json-0.3.3" sources."del-2.2.2" sources."graceful-fs-4.1.11" @@ -25853,13 +27022,13 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."ajv-keywords-1.5.1" - sources."slice-ansi-0.0.4" + sources."ajv-keywords-2.1.0" + sources."slice-ansi-1.0.0" ]; buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; - homepage = http://eslint.org/; + homepage = https://eslint.org/; license = "MIT"; }; production = true; @@ -25878,12 +27047,12 @@ in sources."supports-color-2.0.0" ]; }) - (sources."eslint-4.7.2" // { + (sources."eslint-4.9.0" // { dependencies = [ - sources."chalk-2.1.0" + sources."chalk-2.2.0" sources."strip-ansi-4.0.0" sources."ansi-styles-3.2.0" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" sources."ansi-regex-3.0.0" ]; }) @@ -25899,11 +27068,11 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."ansi-regex-2.1.1" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."babel-code-frame-6.26.0" sources."concat-stream-1.6.0" sources."cross-spawn-5.1.0" - sources."debug-3.0.1" + sources."debug-3.1.0" sources."doctrine-2.0.0" sources."eslint-scope-3.7.1" sources."espree-3.5.1" @@ -25914,14 +27083,14 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-9.18.0" - sources."ignore-3.3.5" + sources."ignore-3.3.6" sources."imurmurhash-0.1.4" (sources."inquirer-3.3.0" // { dependencies = [ - sources."chalk-2.1.0" + sources."chalk-2.2.0" sources."strip-ansi-4.0.0" sources."ansi-styles-3.2.0" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" sources."ansi-regex-3.0.0" ]; }) @@ -25939,9 +27108,11 @@ in sources."require-uncached-1.0.3" sources."semver-5.4.1" sources."strip-json-comments-2.0.1" - (sources."table-4.0.1" // { + (sources."table-4.0.2" // { dependencies = [ - sources."ajv-4.11.8" + sources."chalk-2.2.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" ]; }) sources."text-table-0.2.0" @@ -25977,7 +27148,7 @@ in sources."acorn-3.3.0" ]; }) - sources."flat-cache-1.2.2" + sources."flat-cache-1.3.0" sources."circular-json-0.3.3" sources."del-2.2.2" sources."graceful-fs-4.1.11" @@ -26038,8 +27209,8 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."ajv-keywords-1.5.1" - sources."slice-ansi-0.0.4" + sources."ajv-keywords-2.1.0" + sources."slice-ansi-1.0.0" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."fast-levenshtein-2.0.6" @@ -26071,36 +27242,43 @@ in fast-cli = nodeEnv.buildNodePackage { name = "fast-cli"; packageName = "fast-cli"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-cli/-/fast-cli-1.0.0.tgz"; - sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; + url = "https://registry.npmjs.org/fast-cli/-/fast-cli-2.0.0.tgz"; + sha512 = "261zykpcgv0r96yd3qck2g2a990psma49p37kdk1xgic657pv1jnp9n9js90hqv58spgmww85kig9bd7b05lyxagz4d8nm5algyc00x"; }; dependencies = [ - sources."chalk-1.1.3" - sources."log-update-1.0.2" + sources."chalk-2.2.0" + sources."log-update-2.2.0" sources."meow-3.7.0" (sources."ora-1.3.0" // { dependencies = [ - sources."cli-cursor-2.1.0" - sources."restore-cursor-2.0.0" - sources."onetime-2.0.1" + sources."chalk-1.1.3" + sources."ansi-styles-2.2.1" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" ]; }) - sources."phantomjs-prebuilt-2.1.15" - sources."promise-phantom-3.1.6" + sources."puppeteer-0.11.0" sources."zen-observable-0.5.2" - sources."ansi-styles-2.2.1" + sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" + sources."supports-color-4.5.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."ansi-escapes-3.0.0" + sources."cli-cursor-2.1.0" + sources."wrap-ansi-3.0.1" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" + sources."signal-exit-3.0.2" + sources."mimic-fn-1.1.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."ansi-regex-3.0.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -26113,7 +27291,6 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" @@ -26143,20 +27320,36 @@ in sources."is-finite-1.0.2" sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" - sources."cli-spinners-1.0.1" - sources."log-symbols-1.0.2" - sources."mimic-fn-1.1.0" - sources."es6-promise-4.0.5" - sources."extract-zip-1.6.5" - sources."fs-extra-1.0.0" - sources."hasha-2.2.0" - sources."kew-0.7.0" - sources."progress-1.1.8" - sources."request-2.81.0" - sources."request-progress-2.0.1" - sources."which-1.2.14" + sources."cli-spinners-1.1.0" + (sources."log-symbols-1.0.2" // { + dependencies = [ + sources."chalk-1.1.3" + sources."ansi-styles-2.2.1" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + ]; + }) + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."debug-2.6.9" + (sources."extract-zip-1.6.5" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) + sources."https-proxy-agent-2.1.0" + sources."mime-1.4.1" + sources."progress-2.0.0" + sources."proxy-from-env-1.0.0" + sources."rimraf-2.6.2" + sources."ws-3.2.0" + sources."ms-2.0.0" sources."concat-stream-1.6.0" - sources."debug-2.2.0" (sources."mkdirp-0.5.0" // { dependencies = [ sources."minimist-0.0.8" @@ -26172,85 +27365,23 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."ms-0.7.1" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" - sources."is-stream-1.1.0" - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.17" - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.3" - sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" - sources."co-4.6.0" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.30.0" - sources."punycode-1.4.1" - sources."throttleit-1.0.0" - sources."isexe-2.0.0" - sources."mkpath-1.0.0" - sources."node-phantom-simple-2.2.4" - sources."tmp-0.0.31" - sources."os-tmpdir-1.0.2" + sources."agent-base-4.1.1" + sources."es6-promisify-5.0.0" + sources."es6-promise-4.1.1" + sources."glob-7.1.2" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."async-limiter-1.0.0" + sources."ultron-1.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -26421,7 +27552,7 @@ in }) sources."nopt-4.0.1" sources."npmlog-4.1.2" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -26432,7 +27563,7 @@ in sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -26550,7 +27681,7 @@ in sources."defined-0.0.0" sources."through-2.3.8" sources."resumer-0.0.0" - sources."i-0.3.5" + sources."i-0.3.6" sources."ncp-0.4.2" ]; buildInputs = globalBuildInputs; @@ -26564,19 +27695,19 @@ in git-run = nodeEnv.buildNodePackage { name = "git-run"; packageName = "git-run"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/git-run/-/git-run-0.5.4.tgz"; - sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4"; + url = "https://registry.npmjs.org/git-run/-/git-run-0.5.5.tgz"; + sha512 = "0j00v2mkrqla05ynq3cziyh4vslsshbkxdyqbzzg2vkg3if0ln0klsf5hck457pxksqky9gcsybc73c2sf6hgf910wzz5yljlxc5b7g"; }; dependencies = [ sources."async-2.5.0" sources."lodash.groupby-4.6.0" - sources."minilog-2.0.8" - sources."simple-git-1.77.0" + sources."minilog-3.1.0" + sources."simple-git-1.80.1" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" sources."lodash-4.17.4" - sources."microee-0.0.2" + sources."microee-0.0.6" sources."debug-2.6.9" sources."ms-2.0.0" ]; @@ -26627,7 +27758,7 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -27069,33 +28200,33 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "3.12.0"; + version = "3.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-3.12.0.tgz"; - sha512 = "0x1177vl5qkcwx2fw8nbg227ymhzx80pfjxpiw4xdhfrmqdzrlfz38kk8z1x6ifvg9mij2m8ws6wvjczpp2shqdqmgjibg3xkabsrbb"; + url = "https://registry.npmjs.org/ionic/-/ionic-3.13.2.tgz"; + sha512 = "2wd7s9cn0x8ig8dpajdk40ssym0byplr6qv8gd2ppb96r4cyhmx519k8m0skdzdir02d5ady9hbaz90jcfl4j1zfzibjjwr9g8rddb1"; }; dependencies = [ - sources."@ionic/cli-utils-1.12.0" - sources."@ionic/discover-0.3.1" - sources."chalk-2.1.0" + sources."@ionic/cli-utils-1.13.1" + sources."@ionic/discover-0.3.3" + sources."chalk-2.2.0" sources."opn-5.1.0" sources."os-name-2.0.1" sources."rimraf-2.6.2" sources."semver-5.4.1" - sources."tslib-1.7.1" - sources."archiver-2.0.3" + sources."tslib-1.8.0" + sources."archiver-2.1.0" sources."basic-auth-1.1.0" sources."body-parser-1.18.2" sources."chokidar-1.7.0" sources."ci-info-1.1.1" sources."cross-spawn-5.1.0" sources."dargs-5.1.0" - sources."diff-3.3.1" + sources."diff-3.4.0" sources."elementtree-0.1.7" - (sources."express-4.15.4" // { + (sources."express-4.16.2" // { dependencies = [ - sources."debug-2.6.8" - sources."qs-6.5.0" + sources."setprototypeof-1.1.0" + sources."statuses-1.3.1" ]; }) sources."inquirer-3.3.0" @@ -27109,7 +28240,7 @@ in sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."ssh-config-1.1.2" + sources."ssh-config-1.1.3" (sources."string-width-2.1.1" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -27120,9 +28251,10 @@ in sources."ansi-regex-3.0.0" ]; }) - (sources."superagent-3.6.0" // { + (sources."superagent-3.7.0" // { dependencies = [ - sources."mime-1.4.0" + sources."debug-3.1.0" + sources."form-data-2.3.1" ]; }) sources."tar-2.2.1" @@ -27137,7 +28269,6 @@ in sources."readable-stream-2.3.3" sources."tar-stream-1.5.4" sources."zip-stream-1.2.0" - sources."walkdir-0.0.11" sources."graceful-fs-4.1.11" sources."lazystream-1.0.0" sources."normalize-path-2.1.1" @@ -27161,9 +28292,9 @@ in sources."bl-1.2.1" sources."end-of-stream-1.4.0" sources."xtend-4.0.1" - sources."compress-commons-1.2.0" + sources."compress-commons-1.2.2" sources."crc32-stream-2.0.0" - sources."crc-3.4.4" + sources."crc-3.5.0" sources."bytes-3.0.0" sources."content-type-1.0.4" sources."debug-2.6.9" @@ -27176,7 +28307,7 @@ in sources."type-is-1.6.15" sources."ms-2.0.0" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -27239,7 +28370,7 @@ in }) sources."nopt-4.0.1" sources."npmlog-4.1.2" - sources."rc-1.2.1" + sources."rc-1.2.2" (sources."request-2.81.0" // { dependencies = [ sources."qs-6.4.0" @@ -27247,7 +28378,7 @@ in }) sources."hawk-3.1.3" sources."tar-pack-3.4.0" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -27359,27 +28490,31 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."finalhandler-1.0.6" - sources."fresh-0.5.0" + (sources."finalhandler-1.1.0" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) + sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.5" + sources."proxy-addr-2.0.2" sources."range-parser-1.2.0" - (sources."send-0.15.4" // { + (sources."send-0.16.1" // { dependencies = [ - sources."debug-2.6.8" + sources."statuses-1.3.1" ]; }) - sources."serve-static-1.12.4" - sources."utils-merge-1.0.0" - sources."vary-1.1.1" + sources."serve-static-1.13.1" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" sources."negotiator-0.6.1" sources."forwarded-0.1.2" - sources."ipaddr.js-1.4.0" + sources."ipaddr.js-1.5.2" sources."destroy-1.0.4" - sources."mime-1.3.4" + sources."mime-1.4.1" sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" @@ -27427,13 +28562,13 @@ in sources."safe-json-parse-1.0.1" sources."string-template-0.2.1" sources."websocket-driver-0.7.0" - sources."http-parser-js-0.4.8" + sources."http-parser-js-0.4.9" sources."websocket-extensions-0.1.2" sources."async-limiter-1.0.0" sources."ultron-1.1.0" sources."netmask-1.0.6" sources."ansi-styles-3.2.0" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" sources."color-convert-1.9.0" sources."color-name-1.1.3" sources."has-flag-2.0.0" @@ -27479,7 +28614,7 @@ in sources."escodegen-1.8.1" sources."esprima-2.7.3" sources."glob-5.0.15" - (sources."handlebars-4.0.10" // { + (sources."handlebars-4.0.11" // { dependencies = [ sources."source-map-0.4.4" ]; @@ -27563,18 +28698,18 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.3.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.3.1.tgz"; - sha1 = "b7db14bee9db6497788e2f5a7d49db2b7a2e1891"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.2.tgz"; + sha512 = "2vlp1rxalykzb0qwn4sv1pk58ph37nhaqqgnih83i39msplqh826dvbdd4j1791hl2almpj9g1snhdfy89cyn8y86bz7bcbr9mh6aih"; }; dependencies = [ - sources."@reactivex/rxjs-5.4.3" + sources."@reactivex/rxjs-5.5.0" sources."chai-4.1.2" sources."chai-as-promised-7.1.1" - sources."chalk-2.1.0" + sources."chalk-2.2.0" sources."commander-2.11.0" - sources."fast-json-patch-2.0.5" + sources."fast-json-patch-2.0.6" sources."glob-7.1.2" sources."iterare-0.0.8" (sources."jaeger-client-3.5.3" // { @@ -27584,12 +28719,12 @@ in }) sources."lodash-4.17.4" sources."mz-2.7.0" - sources."object-hash-1.1.8" + sources."object-hash-1.2.0" sources."opentracing-0.14.1" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" - sources."typescript-2.3.4" - sources."vscode-jsonrpc-3.4.0" + sources."typescript-2.4.2" + sources."vscode-jsonrpc-3.4.1" sources."vscode-languageserver-3.4.3" sources."vscode-languageserver-types-3.4.0" sources."symbol-observable-1.0.4" @@ -27601,7 +28736,7 @@ in sources."type-detect-4.0.3" sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" sources."color-convert-1.9.0" sources."color-name-1.1.3" sources."has-flag-2.0.0" @@ -27630,7 +28765,7 @@ in sources."thenify-all-1.6.0" sources."thenify-3.3.0" sources."vscode-uri-1.0.1" - sources."vscode-languageserver-protocol-3.4.2" + sources."vscode-languageserver-protocol-3.4.4" ]; buildInputs = globalBuildInputs; meta = { @@ -27728,10 +28863,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.3.tgz"; - sha512 = "18pcdycadk2ijyxsgl2kr14hzf75cwp4va0laidqls6haq3h0laj6f7kbbl27mwicqxi3zdin1c34w20ag1ikpm830nffdlif86qgwr"; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.4.tgz"; + sha512 = "0m3jydg8rd5is3021z595lfrm9qc6398r2nppar8xvx5m0y4q9dlac7hmm7rkyffn3ss5fn8s5zmz7d4fw1bi8q1z4lz5s8x61zb1g9"; }; dependencies = [ sources."config-chain-1.1.11" @@ -27740,14 +28875,14 @@ in sources."nopt-3.0.6" sources."proto-list-1.2.4" sources."ini-1.3.4" - sources."bluebird-3.5.0" + sources."bluebird-3.5.1" sources."commander-2.11.0" sources."lru-cache-3.2.0" sources."semver-5.4.1" sources."sigmund-1.0.1" sources."pseudomap-1.0.2" sources."minimist-0.0.8" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -27799,10 +28934,10 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.0.tgz"; - sha1 = "1b52b826691862b4873224bc1d07a2060645663c"; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.2.tgz"; + sha512 = "0m7az6dvfn65fbak1y42663yxkachpj1fyyxxpdhkpny3bbsmgn0hpp8fb5sllmzbfyqspkqh1icpqb14pbsfnbsj7w665xmnj4a9g5"; }; dependencies = [ sources."commander-2.11.0" @@ -27810,21 +28945,21 @@ in sources."js-yaml-3.10.0" sources."lodash-4.17.4" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.2" + sources."path-loader-1.0.4" sources."slash-1.0.0" sources."uri-js-3.0.2" sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" - sources."superagent-3.6.0" + sources."superagent-3.7.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" - sources."debug-2.6.9" + sources."debug-3.1.0" sources."extend-3.0.1" sources."form-data-2.3.1" sources."formidable-1.1.1" sources."methods-1.1.2" - sources."mime-1.4.0" + sources."mime-1.4.1" sources."qs-6.5.1" sources."readable-stream-2.3.3" sources."ms-2.0.0" @@ -27861,19 +28996,14 @@ in dependencies = [ sources."body-parser-1.18.2" sources."chalk-1.1.3" - (sources."compression-1.7.0" // { - dependencies = [ - sources."bytes-2.5.0" - sources."debug-2.6.8" - ]; - }) + sources."compression-1.7.1" sources."connect-pause-0.1.1" sources."cors-2.8.4" sources."errorhandler-1.5.0" - (sources."express-4.15.4" // { + (sources."express-4.16.2" // { dependencies = [ - sources."debug-2.6.8" - sources."qs-6.5.0" + sources."setprototypeof-1.1.0" + sources."statuses-1.3.1" ]; }) (sources."express-urlrewrite-1.2.0" // { @@ -27885,20 +29015,12 @@ in sources."lodash-4.17.4" sources."lodash-id-0.13.0" sources."lowdb-0.15.5" - (sources."method-override-2.3.9" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) - (sources."morgan-1.8.2" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."method-override-2.3.10" + sources."morgan-1.9.0" sources."object-assign-4.1.1" sources."please-upgrade-node-3.0.1" sources."pluralize-3.1.0" - sources."request-2.82.0" + sources."request-2.83.0" sources."server-destroy-1.0.1" sources."shortid-2.2.8" sources."update-notifier-1.0.3" @@ -27920,7 +29042,7 @@ in sources."ms-2.0.0" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -27933,10 +29055,10 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."accepts-1.3.4" - sources."compressible-2.0.11" + sources."compressible-2.0.12" sources."on-headers-1.0.1" sources."safe-buffer-5.1.1" - sources."vary-1.1.1" + sources."vary-1.1.2" sources."negotiator-0.6.1" sources."escape-html-1.0.3" sources."array-flatten-1.1.1" @@ -27945,31 +29067,35 @@ in sources."cookie-signature-1.0.6" sources."encodeurl-1.0.1" sources."etag-1.8.1" - sources."finalhandler-1.0.6" - sources."fresh-0.5.0" + (sources."finalhandler-1.1.0" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) + sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.5" + sources."proxy-addr-2.0.2" sources."range-parser-1.2.0" - (sources."send-0.15.4" // { + (sources."send-0.16.1" // { dependencies = [ - sources."debug-2.6.8" + sources."statuses-1.3.1" ]; }) - sources."serve-static-1.12.4" - sources."utils-merge-1.0.0" + sources."serve-static-1.13.1" + sources."utils-merge-1.0.1" sources."forwarded-0.1.2" - sources."ipaddr.js-1.4.0" + sources."ipaddr.js-1.5.2" sources."destroy-1.0.4" - sources."mime-1.3.4" + sources."mime-1.4.1" sources."isarray-0.0.1" sources."jju-1.3.0" sources."graceful-fs-4.1.11" sources."is-promise-2.1.0" sources."steno-0.4.4" - sources."basic-auth-1.1.0" + sources."basic-auth-2.0.0" sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" @@ -27991,7 +29117,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -28084,7 +29210,7 @@ in sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."prepend-http-1.0.4" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -28165,7 +29291,7 @@ in sha512 = "0g4s1b3k1485yxia2b8703zyw8dxjz9npijnkapv7q9jfw1piyaa2p4hsyqiajnc4n1djri6xk76q6y0jw0n9y7a5d4g6p1f26436lk"; }; dependencies = [ - sources."bluebird-3.5.0" + sources."bluebird-3.5.1" sources."body-parser-1.18.2" sources."chokidar-1.7.0" sources."colors-1.1.2" @@ -28199,7 +29325,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."mime-1.4.0" + sources."mime-1.4.1" sources."minimatch-3.0.4" sources."optimist-0.6.1" sources."qjobs-1.1.5" @@ -28229,7 +29355,7 @@ in sources."ms-2.0.0" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -28297,7 +29423,7 @@ in sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.1.2" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -28312,7 +29438,7 @@ in sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -28404,7 +29530,11 @@ in sources."once-1.4.0" sources."uid-number-0.0.6" sources."wrappy-1.0.2" - sources."finalhandler-1.0.6" + (sources."finalhandler-1.0.6" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) sources."parseurl-1.3.2" sources."utils-merge-1.0.1" sources."encodeurl-1.0.1" @@ -28563,10 +29693,10 @@ in }) sources."finalhandler-0.4.0" sources."http-errors-1.3.1" - (sources."method-override-2.3.9" // { + (sources."method-override-2.3.10" // { dependencies = [ - sources."debug-2.6.8" - sources."vary-1.1.1" + sources."debug-2.6.9" + sources."vary-1.1.2" sources."ms-2.0.0" ]; }) @@ -28611,7 +29741,7 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."accepts-1.2.13" - sources."compressible-2.0.11" + sources."compressible-2.0.12" sources."mime-types-2.1.17" sources."negotiator-0.5.3" sources."mime-db-1.30.0" @@ -28624,7 +29754,7 @@ in sources."crc-3.3.0" sources."base64-url-1.2.1" sources."inherits-2.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."readable-stream-1.1.14" sources."stream-counter-0.2.0" sources."core-util-is-1.0.2" @@ -28657,19 +29787,19 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.2.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.2.0.tgz"; - sha512 = "1dcq9rq01bw9g2yqljwf4lmp7x9wzn5bq8yy2x0sjxc9xdr024924ay6a52grjc0lymqs8rj6320kr4xm438qc4xy4yp2xg9crjh82f"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.4.0.tgz"; + sha512 = "0w40hmc0gkfhxzk4pfzd3wdiqb36jwr6g0ppmlp8zll9fj55sc63lm0yp3y3192gpwv5izwh4rd8qk97z2f41akp8lqb17f8d5hi6l6"; }; dependencies = [ sources."async-1.5.2" - sources."chalk-2.1.0" + sources."chalk-2.2.0" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" sources."command-join-2.0.0" - sources."conventional-changelog-cli-1.3.3" - sources."conventional-recommended-bump-1.0.1" + sources."conventional-changelog-cli-1.3.4" + sources."conventional-recommended-bump-1.0.2" sources."dedent-0.7.0" sources."execa-0.8.0" sources."find-up-2.1.0" @@ -28679,6 +29809,7 @@ in sources."glob-parent-3.1.0" sources."globby-6.1.0" sources."graceful-fs-4.1.11" + sources."hosted-git-info-2.5.0" (sources."inquirer-3.3.0" // { dependencies = [ sources."strip-ansi-4.0.0" @@ -28720,12 +29851,12 @@ in ]; }) sources."write-file-atomic-2.3.0" - sources."write-json-file-2.2.0" - (sources."write-pkg-3.1.0" // { + (sources."write-json-file-2.3.0" // { dependencies = [ - sources."sort-keys-2.0.0" + sources."pify-3.0.0" ]; }) + sources."write-pkg-3.1.0" (sources."yargs-8.0.2" // { dependencies = [ sources."camelcase-4.1.0" @@ -28740,7 +29871,7 @@ in }) sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" sources."color-convert-1.9.0" sources."color-name-1.1.3" sources."has-flag-2.0.0" @@ -28752,30 +29883,30 @@ in sources."defaults-1.0.3" sources."clone-1.0.2" sources."add-stream-1.0.0" - sources."conventional-changelog-1.1.5" + sources."conventional-changelog-1.1.6" (sources."meow-3.7.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."tempfile-1.1.1" - sources."conventional-changelog-angular-1.5.0" + sources."conventional-changelog-angular-1.5.1" sources."conventional-changelog-atom-0.1.1" sources."conventional-changelog-codemirror-0.2.0" - (sources."conventional-changelog-core-1.9.1" // { + (sources."conventional-changelog-core-1.9.2" // { dependencies = [ sources."read-pkg-1.1.0" sources."load-json-file-1.1.0" ]; }) - sources."conventional-changelog-ember-0.2.7" + sources."conventional-changelog-ember-0.2.8" sources."conventional-changelog-eslint-0.2.0" sources."conventional-changelog-express-0.2.0" sources."conventional-changelog-jquery-0.1.0" sources."conventional-changelog-jscs-0.1.0" sources."conventional-changelog-jshint-0.2.0" sources."compare-func-1.3.2" - sources."q-1.5.0" + sources."q-1.5.1" sources."array-ify-1.0.0" sources."dot-prop-3.0.0" sources."is-obj-1.0.1" @@ -28785,7 +29916,7 @@ in sources."get-pkg-repo-1.4.0" sources."git-raw-commits-1.2.0" sources."git-remote-origin-url-2.0.0" - sources."git-semver-tags-1.2.1" + sources."git-semver-tags-1.2.2" sources."normalize-package-data-2.4.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -28797,7 +29928,7 @@ in }) sources."through2-2.0.3" sources."conventional-commits-filter-1.0.0" - sources."handlebars-4.0.10" + sources."handlebars-4.0.11" sources."json-stringify-safe-5.0.1" sources."split-1.0.1" sources."is-subset-0.1.1" @@ -28832,13 +29963,12 @@ in sources."through-2.3.8" sources."JSONStream-1.3.1" sources."is-text-path-1.0.1" - sources."split2-2.1.1" + sources."split2-2.2.0" sources."trim-off-newlines-1.0.1" sources."jsonparse-1.3.1" - sources."text-extensions-1.6.0" + sources."text-extensions-1.7.0" sources."get-stdin-4.0.1" sources."parse-github-repo-url-1.4.1" - sources."hosted-git-info-2.5.0" sources."dargs-4.1.0" sources."lodash.template-4.4.0" sources."number-is-nan-1.0.1" @@ -28965,12 +30095,16 @@ in sources."code-point-at-1.1.0" sources."byline-5.0.0" sources."duplexer-0.1.1" - sources."moment-2.18.1" - sources."make-dir-1.0.0" + sources."moment-2.19.1" + (sources."make-dir-1.1.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."temp-dir-1.0.0" sources."imurmurhash-0.1.4" sources."detect-indent-5.0.0" - sources."sort-keys-1.1.2" + sources."sort-keys-2.0.0" sources."is-plain-obj-1.1.0" sources."get-caller-file-1.0.2" (sources."os-locale-2.1.0" // { @@ -29157,10 +30291,10 @@ in dependencies = [ sources."body-parser-1.18.2" sources."chokidar-1.7.0" - (sources."express-4.15.4" // { + (sources."express-4.16.2" // { dependencies = [ - sources."debug-2.6.8" - sources."qs-6.5.0" + sources."setprototypeof-1.1.0" + sources."statuses-1.3.1" ]; }) sources."markdown-it-8.4.0" @@ -29169,7 +30303,7 @@ in sources."markdown-it-task-checkbox-1.0.4" sources."minimist-1.2.0" sources."opn-5.1.0" - (sources."request-2.82.0" // { + (sources."request-2.83.0" // { dependencies = [ sources."aws-sign2-0.7.0" sources."form-data-2.3.1" @@ -29177,7 +30311,7 @@ in sources."hawk-6.0.2" sources."http-signature-1.2.0" sources."performance-now-2.1.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" @@ -29190,7 +30324,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."socket.io-2.0.3" + sources."socket.io-2.0.4" sources."bytes-3.0.0" sources."content-type-1.0.4" sources."debug-2.6.9" @@ -29204,7 +30338,7 @@ in sources."ms-2.0.0" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -29287,13 +30421,13 @@ in }) sources."nopt-4.0.1" sources."npmlog-4.1.2" - sources."rc-1.2.1" + sources."rc-1.2.2" sources."hawk-3.1.3" sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -29396,27 +30530,31 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."finalhandler-1.0.6" - sources."fresh-0.5.0" + (sources."finalhandler-1.1.0" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) + sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.5" + sources."proxy-addr-2.0.2" sources."range-parser-1.2.0" - (sources."send-0.15.4" // { + (sources."send-0.16.1" // { dependencies = [ - sources."debug-2.6.8" + sources."statuses-1.3.1" ]; }) - sources."serve-static-1.12.4" - sources."utils-merge-1.0.0" - sources."vary-1.1.1" + sources."serve-static-1.13.1" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" sources."negotiator-0.6.1" sources."forwarded-0.1.2" - sources."ipaddr.js-1.4.0" + sources."ipaddr.js-1.5.2" sources."destroy-1.0.4" - sources."mime-1.3.4" + sources."mime-1.4.1" sources."argparse-1.0.9" sources."entities-1.1.1" sources."linkify-it-2.0.3" @@ -29430,13 +30568,13 @@ in sources."is-wsl-1.1.0" sources."fast-deep-equal-1.0.0" sources."json-schema-traverse-0.3.1" - (sources."engine.io-3.1.1" // { + (sources."engine.io-3.1.3" // { dependencies = [ sources."accepts-1.3.3" ]; }) sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.3" + sources."socket.io-client-2.0.4" (sources."socket.io-parser-3.1.2" // { dependencies = [ sources."isarray-2.0.1" @@ -29463,7 +30601,7 @@ in sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - sources."engine.io-client-3.1.1" + sources."engine.io-client-3.1.3" sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."object-component-0.0.3" @@ -29471,8 +30609,7 @@ in sources."parseuri-0.0.5" sources."to-array-0.1.4" sources."component-inherit-0.0.3" - sources."parsejson-0.0.3" - sources."xmlhttprequest-ssl-1.5.3" + sources."xmlhttprequest-ssl-1.5.4" sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" @@ -29506,20 +30643,12 @@ in sources."event-stream-3.3.4" sources."faye-websocket-0.11.1" sources."http-auth-3.1.3" - (sources."morgan-1.8.2" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."morgan-1.9.0" sources."object-assign-4.1.1" sources."opn-5.1.0" sources."proxy-middleware-0.15.0" - sources."send-0.15.6" - (sources."serve-index-1.9.0" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."send-0.16.1" + sources."serve-index-1.9.1" sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -29589,7 +30718,7 @@ in sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.1.2" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -29601,7 +30730,7 @@ in sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -29713,7 +30842,7 @@ in sources."statuses-1.3.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" - sources."vary-1.1.1" + sources."vary-1.1.2" sources."through-2.3.8" sources."duplexer-0.1.1" sources."from-0.1.7" @@ -29722,13 +30851,13 @@ in sources."split-0.3.3" sources."stream-combiner-0.0.4" sources."websocket-driver-0.7.0" - sources."http-parser-js-0.4.8" + sources."http-parser-js-0.4.9" sources."websocket-extensions-0.1.2" sources."apache-crypt-1.2.1" sources."apache-md5-1.1.2" sources."bcryptjs-2.4.3" sources."unix-crypt-td-js-1.0.0" - sources."basic-auth-1.1.0" + sources."basic-auth-2.0.0" sources."depd-1.1.1" sources."on-headers-1.0.1" sources."is-wsl-1.1.0" @@ -29737,7 +30866,7 @@ in sources."etag-1.8.1" sources."fresh-0.5.2" sources."http-errors-1.6.2" - sources."mime-1.3.4" + sources."mime-1.4.1" sources."range-parser-1.2.0" sources."setprototypeof-1.0.3" sources."accepts-1.3.4" @@ -29790,25 +30919,22 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "3.5.3"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz"; - sha512 = "093v1508xiyy2l0fp2c0rv9qc0jdhi4hz2xil2zyawjvcmag11scslkkyzv2cqwhh24b7ijhbhr3jbyidamgkhiccnn29ac9p9xmagz"; + url = "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz"; + sha512 = "07hbr2w894az0s1hi6lglls00nwb941ymwm580q4917kwcmsg3ngagqf9cfxyjdwwivm956dpwzsrkbk4i7a404i56w1y809a3fdw3s"; }; dependencies = [ sources."browser-stdout-1.3.0" - sources."commander-2.9.0" - sources."debug-2.6.8" - sources."diff-3.2.0" + sources."commander-2.11.0" + sources."debug-3.1.0" + sources."diff-3.3.1" sources."escape-string-regexp-1.0.5" - sources."glob-7.1.1" - sources."growl-1.9.2" + sources."glob-7.1.2" + sources."growl-1.10.3" sources."he-1.1.1" - sources."json3-3.3.2" - sources."lodash.create-3.1.1" sources."mkdirp-0.5.1" - sources."supports-color-3.1.2" - sources."graceful-readlink-1.0.1" + sources."supports-color-4.4.0" sources."ms-2.0.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -29820,16 +30946,8 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."lodash._baseassign-3.2.0" - sources."lodash._basecreate-3.0.3" - sources."lodash._isiterateecall-3.0.9" - sources."lodash._basecopy-3.0.1" - sources."lodash.keys-3.1.2" - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" sources."minimist-0.0.8" - sources."has-flag-1.0.0" + sources."has-flag-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -29856,19 +30974,19 @@ in sources."sprintf-js-1.0.3" sources."graphlib-2.1.1" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.2" + sources."path-loader-1.0.4" sources."slash-1.0.0" sources."uri-js-3.0.2" sources."lodash-4.17.4" - sources."superagent-3.6.0" + sources."superagent-3.7.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" - sources."debug-2.6.9" + sources."debug-3.1.0" sources."extend-3.0.1" sources."form-data-2.3.1" sources."formidable-1.1.1" sources."methods-1.1.2" - sources."mime-1.4.0" + sources."mime-1.4.1" sources."qs-6.5.1" sources."readable-stream-2.3.3" sources."ms-2.0.0" @@ -29896,10 +31014,10 @@ in nijs = nodeEnv.buildNodePackage { name = "nijs"; packageName = "nijs"; - version = "0.0.24"; + version = "0.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/nijs/-/nijs-0.0.24.tgz"; - sha1 = "6581de112f5810c9930d5fcdf772f67787e797eb"; + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; + sha1 = "04b035cb530d46859d1018839a518c029133f676"; }; dependencies = [ sources."optparse-1.0.5" @@ -29947,7 +31065,7 @@ in sources."normalize-package-data-2.4.0" sources."npm-package-arg-5.1.2" sources."once-1.4.0" - sources."request-2.82.0" + sources."request-2.83.0" sources."retry-0.10.1" sources."slide-1.1.6" sources."ssri-4.1.6" @@ -29997,7 +31115,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -30050,9 +31168,9 @@ in sources."uid-number-0.0.5" sources."proto-list-1.2.4" sources."minimist-0.0.8" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."minipass-2.2.1" - sources."minizlib-1.0.3" + sources."minizlib-1.0.4" sources."yallist-3.0.2" sources."rimraf-2.2.8" (sources."fs-extra-0.6.4" // { @@ -30090,7 +31208,7 @@ in sources."nopt-3.0.6" sources."npmlog-4.1.2" sources."osenv-0.1.4" - sources."request-2.82.0" + sources."request-2.83.0" sources."rimraf-2.6.2" sources."semver-5.3.0" sources."tar-2.2.1" @@ -30105,7 +31223,7 @@ in sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."minimist-0.0.8" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" sources."gauge-2.7.4" @@ -30154,7 +31272,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -30207,20 +31325,12 @@ in sources."async-0.9.2" sources."biased-opener-0.2.8" sources."debug-2.6.9" - (sources."express-4.15.4" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) + sources."express-4.16.2" sources."glob-5.0.15" sources."path-is-absolute-1.0.1" - sources."rc-1.2.1" + sources."rc-1.2.2" sources."semver-4.3.6" - (sources."serve-favicon-2.4.4" // { - dependencies = [ - sources."fresh-0.5.1" - ]; - }) + sources."serve-favicon-2.4.5" sources."strong-data-uri-1.0.4" sources."v8-debug-1.0.1" sources."v8-profiler-5.7.0" @@ -30306,6 +31416,7 @@ in sources."ms-2.0.0" sources."accepts-1.3.4" sources."array-flatten-1.1.1" + sources."body-parser-1.18.2" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" @@ -30314,38 +31425,42 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."finalhandler-1.0.6" - sources."fresh-0.5.0" + sources."finalhandler-1.1.0" + sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.5" - sources."qs-6.5.0" + sources."proxy-addr-2.0.2" + sources."qs-6.5.1" sources."range-parser-1.2.0" - (sources."send-0.15.4" // { - dependencies = [ - sources."debug-2.6.8" - ]; - }) - sources."serve-static-1.12.4" - sources."setprototypeof-1.0.3" + sources."safe-buffer-5.1.1" + sources."send-0.16.1" + sources."serve-static-1.13.1" + sources."setprototypeof-1.1.0" sources."statuses-1.3.1" sources."type-is-1.6.15" - sources."utils-merge-1.0.0" - sources."vary-1.1.1" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" sources."mime-types-2.1.17" sources."negotiator-0.6.1" sources."mime-db-1.30.0" + sources."bytes-3.0.0" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) + sources."iconv-lite-0.4.19" + sources."raw-body-2.3.2" + sources."inherits-2.0.3" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.2" - sources."ipaddr.js-1.4.0" + sources."ipaddr.js-1.5.2" sources."destroy-1.0.4" - sources."http-errors-1.6.2" - sources."mime-1.3.4" - sources."inherits-2.0.3" + sources."mime-1.4.1" sources."media-typer-0.3.0" sources."inflight-1.0.6" sources."minimatch-3.0.4" @@ -30357,7 +31472,6 @@ in sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."safe-buffer-5.1.1" sources."truncate-1.0.5" sources."nan-2.7.0" (sources."node-pre-gyp-0.6.38" // { @@ -30382,7 +31496,7 @@ in sources."glob-7.1.2" ]; }) - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" sources."gauge-2.7.4" @@ -30499,7 +31613,7 @@ in sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.1.2" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -30511,7 +31625,7 @@ in sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -30656,7 +31770,7 @@ in ]; }) sources."undefsafe-0.0.3" - sources."update-notifier-2.2.0" + sources."update-notifier-2.3.0" sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -30722,7 +31836,7 @@ in sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.1.2" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -30734,7 +31848,7 @@ in sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -30855,23 +31969,18 @@ in sources."pause-stream-0.0.11" sources."split-0.3.3" sources."stream-combiner-0.0.4" - (sources."boxen-1.2.1" // { + (sources."boxen-1.2.2" // { dependencies = [ - sources."chalk-2.1.0" sources."string-width-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" ]; }) - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-2.2.0" sources."configstore-3.1.1" sources."import-lazy-2.1.0" + sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."latest-version-3.1.0" sources."semver-diff-2.1.0" @@ -30888,12 +31997,6 @@ in sources."cli-boxes-1.0.0" sources."term-size-1.2.0" sources."widest-line-1.0.0" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.4.0" - sources."color-convert-1.9.0" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" sources."execa-0.7.0" sources."cross-spawn-5.1.0" sources."get-stream-3.0.0" @@ -30909,15 +32012,23 @@ in sources."shebang-regex-1.0.0" sources."isexe-2.0.0" sources."path-key-2.0.1" - sources."has-ansi-2.0.0" + sources."ansi-styles-3.2.0" + sources."escape-string-regexp-1.0.5" + sources."supports-color-4.5.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" sources."dot-prop-4.2.0" - sources."make-dir-1.0.0" + sources."make-dir-1.1.0" sources."unique-string-1.0.0" sources."write-file-atomic-2.3.0" sources."is-obj-1.0.1" - sources."pify-2.3.0" + sources."pify-3.0.0" sources."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" + sources."global-dirs-0.1.0" + sources."is-path-inside-1.0.0" + sources."path-is-inside-1.0.2" sources."package-json-4.0.1" sources."got-6.7.1" sources."registry-auth-token-3.3.1" @@ -30959,7 +32070,11 @@ in sources."cookie-parser-1.4.3" sources."cors-2.8.3" sources."cron-1.2.1" - sources."express-4.15.3" + (sources."express-4.15.3" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) (sources."express-session-1.15.2" // { dependencies = [ sources."debug-2.6.3" @@ -31004,7 +32119,7 @@ in sources."node-red-node-email-0.1.24" (sources."node-red-node-twitter-0.1.11" // { dependencies = [ - sources."request-2.82.0" + sources."request-2.83.0" sources."aws-sign2-0.7.0" sources."caseless-0.12.0" sources."form-data-2.3.1" @@ -31038,7 +32153,7 @@ in sources."ms-2.0.0" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."mime-types-2.1.17" sources."mime-db-1.30.0" @@ -31077,9 +32192,9 @@ in sources."util-deprecate-1.0.2" sources."cookie-signature-1.0.6" sources."object-assign-4.1.1" - sources."vary-1.1.1" + sources."vary-1.1.2" sources."moment-timezone-0.5.13" - sources."moment-2.18.1" + sources."moment-2.19.1" sources."accepts-1.3.4" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" @@ -31089,6 +32204,7 @@ in (sources."finalhandler-1.0.6" // { dependencies = [ sources."debug-2.6.9" + sources."statuses-1.3.1" ]; }) sources."fresh-0.5.0" @@ -31098,7 +32214,11 @@ in sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - sources."send-0.15.3" + (sources."send-0.15.3" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) sources."serve-static-1.12.3" sources."utils-merge-1.0.0" sources."negotiator-0.6.1" @@ -31130,7 +32250,7 @@ in sources."mqtt-packet-5.4.0" sources."pump-1.0.2" sources."reinterval-1.1.0" - sources."split2-2.1.1" + sources."split2-2.2.0" (sources."websocket-stream-5.0.1" // { dependencies = [ sources."ws-3.2.0" @@ -31199,7 +32319,7 @@ in ]; }) sources."streamsearch-0.1.2" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."uid2-0.0.3" sources."passport-strategy-1.0.0" sources."pause-0.0.1" @@ -31349,7 +32469,7 @@ in sources."performance-now-2.1.0" sources."uuid-3.1.0" sources."asynckit-0.4.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -31358,7 +32478,7 @@ in (sources."node-pre-gyp-0.6.36" // { dependencies = [ sources."nopt-4.0.1" - sources."request-2.82.0" + sources."request-2.83.0" sources."aws-sign2-0.7.0" sources."caseless-0.12.0" sources."form-data-2.3.1" @@ -31379,7 +32499,7 @@ in ]; }) sources."npmlog-4.1.2" - sources."rc-1.2.1" + sources."rc-1.2.2" sources."rimraf-2.6.2" sources."tar-2.2.1" sources."tar-pack-3.4.0" @@ -31469,7 +32589,7 @@ in sources."methods-0.0.1" sources."send-0.1.0" sources."cookie-signature-1.0.1" - (sources."debug-3.0.1" // { + (sources."debug-3.1.0" // { dependencies = [ sources."ms-2.0.0" ]; @@ -31544,23 +32664,24 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.4.2"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.4.2.tgz"; - sha512 = "28m9zjiynb24b8bxikdaya27j87am88x1y8l70pvmh9fk3pfq0y6xvqjmpy72ld4csnz9s1hik1ff8a19sx6pyi8f5ar27b044cp8hp"; + url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz"; + sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik"; }; dependencies = [ sources."JSONStream-1.3.1" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."ansi-regex-3.0.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" - sources."aproba-1.1.2" + sources."aproba-1.2.0" sources."archy-1.0.0" - sources."bluebird-3.5.0" + sources."bluebird-3.5.1" sources."cacache-9.2.9" sources."call-limit-1.1.0" sources."chownr-1.0.1" + sources."cli-table2-0.2.0" sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { dependencies = [ @@ -31583,6 +32704,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.4" sources."init-package-json-1.10.1" + sources."is-cidr-1.0.0" sources."lazy-property-1.0.0" sources."libnpx-9.6.0" sources."lockfile-1.0.3" @@ -31609,23 +32731,27 @@ in sources."npm-install-checks-3.0.0" sources."npm-lifecycle-1.0.3" sources."npm-package-arg-5.1.2" - sources."npm-packlist-1.1.9" - sources."npm-registry-client-8.4.0" + sources."npm-packlist-1.1.10" + sources."npm-profile-2.0.5" + sources."npm-registry-client-8.5.0" sources."npm-user-validate-1.0.0" sources."npmlog-4.1.2" sources."once-1.4.0" sources."opener-1.4.3" sources."osenv-0.1.4" - sources."pacote-6.0.2" + sources."pacote-6.0.4" sources."path-is-inside-1.0.2" sources."promise-inflight-1.0.1" + sources."qrcode-terminal-0.11.0" + sources."query-string-5.0.0" + sources."qw-1.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" sources."read-package-json-2.0.12" sources."read-package-tree-5.1.6" sources."readable-stream-2.3.3" - sources."request-2.81.0" + sources."request-2.83.0" sources."retry-0.10.1" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -31643,7 +32769,7 @@ in }) sources."ssri-4.1.6" sources."strip-ansi-4.0.0" - (sources."tar-4.0.1" // { + (sources."tar-4.0.2" // { dependencies = [ sources."yallist-3.0.2" ]; @@ -31673,6 +32799,17 @@ in sources."jsonparse-1.3.1" sources."through-2.3.8" sources."y18n-3.2.1" + sources."lodash-3.10.1" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."colors-1.1.2" + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."clone-1.0.2" @@ -31685,12 +32822,17 @@ in sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."promzard-0.3.0" + sources."cidr-regex-1.0.6" sources."dotenv-4.0.0" - sources."yargs-8.0.2" + (sources."yargs-8.0.2" // { + dependencies = [ + sources."string-width-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + ]; + }) sources."camelcase-4.1.0" (sources."cliui-3.2.0" // { dependencies = [ - sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."ansi-regex-2.1.1" ]; @@ -31702,23 +32844,14 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."set-blocking-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) sources."which-module-2.0.0" sources."yargs-parser-7.0.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ - sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."ansi-regex-2.1.1" ]; }) - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.1" sources."execa-0.7.0" sources."lcid-1.0.0" sources."mem-1.1.0" @@ -31759,7 +32892,7 @@ in sources."parallel-transform-1.1.0" sources."pump-1.0.2" sources."pumpify-1.3.5" - sources."stream-each-1.2.0" + sources."stream-each-1.2.2" sources."through2-2.0.3" sources."typedarray-0.0.6" sources."stream-shift-1.0.0" @@ -31772,37 +32905,15 @@ in sources."block-stream-0.0.9" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" - sources."ignore-walk-3.0.0" + sources."ignore-walk-3.0.1" sources."npm-bundled-1.0.3" - sources."are-we-there-yet-1.1.4" - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."ansi-regex-2.1.1" - ]; - }) - sources."delegates-1.0.0" - sources."object-assign-4.1.1" - (sources."wide-align-1.1.2" // { - dependencies = [ - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."ansi-regex-2.1.1" - ]; - }) - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" sources."make-fetch-happen-2.5.0" - sources."npm-pick-manifest-1.0.4" - sources."promise-retry-1.1.1" - sources."protoduck-4.0.0" sources."agentkeepalive-3.3.0" - sources."http-cache-semantics-3.7.3" + sources."http-cache-semantics-3.8.0" sources."http-proxy-agent-2.0.0" sources."https-proxy-agent-2.1.0" sources."node-fetch-npm-2.0.2" + sources."promise-retry-1.1.1" sources."socks-proxy-agent-3.0.1" sources."humanize-ms-1.2.1" sources."ms-2.0.0" @@ -31813,11 +32924,28 @@ in sources."encoding-0.1.12" sources."json-parse-better-errors-1.0.1" sources."iconv-lite-0.4.19" + sources."err-code-1.1.2" sources."socks-1.1.10" sources."ip-1.1.5" sources."smart-buffer-1.1.15" - sources."err-code-1.1.2" + sources."are-we-there-yet-1.1.4" + sources."console-control-strings-1.1.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."delegates-1.0.0" + sources."object-assign-4.1.1" + sources."wide-align-1.1.2" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."npm-pick-manifest-1.0.4" + sources."protoduck-4.0.0" sources."genfun-4.0.1" + sources."decode-uri-component-0.2.0" + sources."strict-uri-encode-1.1.0" sources."mute-stream-0.0.7" sources."util-extend-1.0.3" sources."slash-1.0.0" @@ -31826,66 +32954,52 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."mime-types-2.1.17" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" + sources."performance-now-2.1.0" + sources."qs-6.5.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" + sources."ajv-5.2.4" + sources."har-schema-2.0.0" sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" + sources."boom-5.2.0" ]; }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."asn1-0.2.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" + sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" @@ -31898,11 +33012,13 @@ in sources."yallist-3.0.2" ]; }) - sources."minizlib-1.0.3" + sources."minizlib-1.0.4" sources."unique-slug-2.0.0" - (sources."boxen-1.2.1" // { + (sources."boxen-1.2.2" // { dependencies = [ - sources."chalk-2.1.0" + sources."chalk-2.2.0" + sources."string-width-2.1.1" + sources."is-fullwidth-code-point-2.0.0" ]; }) (sources."chalk-1.1.3" // { @@ -31919,19 +33035,18 @@ in sources."latest-version-3.1.0" sources."semver-diff-2.1.0" sources."xdg-basedir-3.0.0" - sources."ansi-align-2.0.0" - sources."cli-boxes-1.0.0" - sources."term-size-1.2.0" - (sources."widest-line-1.0.0" // { + (sources."ansi-align-2.0.0" // { dependencies = [ - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."ansi-regex-2.1.1" + sources."string-width-2.1.1" + sources."is-fullwidth-code-point-2.0.0" ]; }) + sources."cli-boxes-1.0.0" + sources."term-size-1.2.0" + sources."widest-line-1.0.0" sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" sources."color-convert-1.9.0" sources."color-name-1.1.3" sources."has-flag-2.0.0" @@ -31941,7 +33056,11 @@ in ]; }) sources."dot-prop-4.2.0" - sources."make-dir-1.0.0" + (sources."make-dir-1.1.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."unique-string-1.0.0" sources."is-obj-1.0.1" sources."crypto-random-string-1.0.0" @@ -31959,7 +33078,7 @@ in sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" sources."prepend-http-1.0.4" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -32022,7 +33141,7 @@ in sources."coffee-script-1.12.7" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."request-2.82.0" + sources."request-2.83.0" sources."graceful-fs-2.0.3" sources."slide-1.1.6" sources."chownr-0.0.2" @@ -32055,7 +33174,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -32127,7 +33246,7 @@ in sources."nopt-2.2.1" sources."ini-1.1.0" sources."proto-list-1.2.4" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."block-stream-0.0.9" (sources."fstream-0.1.31" // { dependencies = [ @@ -32157,13 +33276,13 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.12.1"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.12.1.tgz"; - sha512 = "2p62mjf7a9bjycq3x1jbp3vsvn8ww3ccrfx96syp7p19bzgg58q80didz4ygwn8cf1xxiyqhr3v3mwi7v9v90gnb8lsas4yz62z55ac"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.13.0.tgz"; + sha512 = "3gqr04g6asacfpr7bmz0mqn3mga6vyq106wmjiyz7p4z1m58ia6zk3541s35hpf5g6wmkv52pmal8wnzxair9286jsr722lxrnn78f2"; }; dependencies = [ - sources."bluebird-3.5.0" + sources."bluebird-3.5.1" sources."chalk-1.1.3" sources."cint-8.2.1" sources."cli-table-0.3.1" @@ -32184,10 +33303,9 @@ in sources."semver-4.3.6" ]; }) - sources."require-dir-0.3.2" sources."semver-5.4.1" sources."semver-utils-1.1.1" - (sources."snyk-1.41.1" // { + (sources."snyk-1.45.0" // { dependencies = [ sources."update-notifier-0.5.0" sources."latest-version-1.0.1" @@ -32199,23 +33317,20 @@ in ]; }) sources."spawn-please-0.3.0" - (sources."update-notifier-2.2.0" // { + (sources."update-notifier-2.3.0" // { dependencies = [ - (sources."boxen-1.2.1" // { - dependencies = [ - sources."chalk-2.1.0" - ]; - }) + sources."boxen-1.2.2" + sources."chalk-2.2.0" sources."configstore-3.1.1" sources."latest-version-3.1.0" sources."xdg-basedir-3.0.0" sources."camelcase-4.1.0" sources."string-width-2.1.1" - sources."ansi-styles-3.2.0" - sources."supports-color-4.4.0" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" sources."dot-prop-4.2.0" sources."write-file-atomic-2.3.0" sources."package-json-4.0.1" @@ -32373,8 +33488,8 @@ in sources."es6-symbol-3.1.1" sources."ms-2.0.0" sources."d-1.0.0" - sources."es5-ext-0.10.30" - sources."es6-iterator-2.0.1" + sources."es5-ext-0.10.35" + sources."es6-iterator-2.0.3" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" (sources."concat-stream-1.6.0" // { @@ -32492,12 +33607,12 @@ in sources."open-0.0.5" sources."os-name-1.0.3" sources."snyk-config-1.0.1" - sources."snyk-go-plugin-1.2.1" - sources."snyk-gradle-plugin-1.1.2" + sources."snyk-go-plugin-1.3.7" + sources."snyk-gradle-plugin-1.2.0" sources."snyk-module-1.8.1" - sources."snyk-mvn-plugin-1.0.3" + sources."snyk-mvn-plugin-1.1.0" sources."snyk-policy-1.7.1" - sources."snyk-python-plugin-1.2.4" + sources."snyk-python-plugin-1.4.0" (sources."snyk-recursive-readdir-2.0.0" // { dependencies = [ sources."minimatch-3.0.2" @@ -32509,7 +33624,7 @@ in sources."minimist-1.2.0" ]; }) - sources."snyk-sbt-plugin-1.1.1" + sources."snyk-sbt-plugin-1.2.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.2.0" (sources."tempfile-1.1.1" // { @@ -32563,6 +33678,7 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" + sources."graphlib-2.1.1" sources."toml-2.3.3" sources."clone-deep-0.3.0" sources."for-own-1.0.0" @@ -32629,7 +33745,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."prepend-http-1.0.4" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -32669,6 +33785,7 @@ in sources."stream-shift-1.0.0" sources."querystring-0.2.0" sources."import-lazy-2.1.0" + sources."is-installed-globally-0.1.0" (sources."ansi-align-2.0.0" // { dependencies = [ sources."string-width-2.1.1" @@ -32679,9 +33796,6 @@ in }) sources."cli-boxes-1.0.0" sources."term-size-1.2.0" - sources."color-convert-1.9.0" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" sources."execa-0.7.0" sources."cross-spawn-5.1.0" sources."get-stream-3.0.0" @@ -32691,9 +33805,18 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."path-key-2.0.1" - sources."make-dir-1.0.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + (sources."make-dir-1.1.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."unique-string-1.0.0" sources."crypto-random-string-1.0.0" + sources."global-dirs-0.1.0" + sources."is-path-inside-1.0.0" sources."duplexer3-0.1.4" ]; buildInputs = globalBuildInputs; @@ -32707,21 +33830,21 @@ in ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.0.tgz"; - sha512 = "32glgr9c42bz2yp3k7kff9skkvrm1zrvcvv2pkifjmzbl3kca3bmapgz598jdm64hi3y0jbby4s90bv8838q40ni5lfh35863c57i0n"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.1.tgz"; + sha512 = "05wpkgddw5r99fm8082l7sm48yd4xi2892w95fbsqhvy81xas0v2z8k9c7s09m7bvw3hn8rhl7c7cdwf4xafzphwax8zx5w22prpp15"; }; dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" sources."glob-7.1.2" sources."lodash-4.17.4" - sources."lokijs-1.4.3" + sources."lokijs-1.5.0" sources."pegjs-0.10.0" - sources."vscode-jsonrpc-3.2.0" - sources."vscode-languageclient-3.2.2" - sources."vscode-languageserver-3.2.2" - sources."vscode-languageserver-types-3.2.0" + sources."vscode-jsonrpc-3.4.1" + sources."vscode-languageclient-3.4.5" + sources."vscode-languageserver-3.4.3" + sources."vscode-languageserver-types-3.4.0" sources."vscode-uri-1.0.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -32733,6 +33856,7 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" + sources."vscode-languageserver-protocol-3.4.4" ]; buildInputs = globalBuildInputs; meta = { @@ -32758,34 +33882,26 @@ in sources."content-type-1.0.4" ]; }) - (sources."compression-1.7.0" // { - dependencies = [ - sources."bytes-2.5.0" - sources."debug-2.6.8" - ]; - }) + sources."compression-1.7.1" sources."connect-busboy-0.0.2" sources."content-type-git+https://github.com/wikimedia/content-type.git#master" sources."core-js-2.5.1" sources."diff-1.4.0" sources."domino-1.0.29" sources."entities-1.1.1" - (sources."express-4.15.4" // { + (sources."express-4.16.2" // { dependencies = [ sources."content-type-1.0.4" - sources."debug-2.6.8" - (sources."finalhandler-1.0.6" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."qs-6.5.0" + sources."finalhandler-1.1.0" + sources."setprototypeof-1.1.0" + sources."statuses-1.3.1" ]; }) sources."express-handlebars-3.0.0" (sources."finalhandler-0.5.1" // { dependencies = [ sources."debug-2.2.0" + sources."statuses-1.3.1" sources."ms-0.7.1" ]; }) @@ -32795,13 +33911,9 @@ in sources."node-uuid-1.4.8" sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" sources."prfun-2.1.4" - sources."request-2.82.0" + sources."request-2.83.0" sources."semver-5.4.1" - (sources."serve-favicon-2.4.4" // { - dependencies = [ - sources."fresh-0.5.1" - ]; - }) + sources."serve-favicon-2.4.5" (sources."service-runner-2.3.0" // { dependencies = [ sources."yargs-7.1.0" @@ -32832,17 +33944,17 @@ in sources."ms-2.0.0" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" sources."mime-types-2.1.17" sources."mime-db-1.30.0" sources."accepts-1.3.4" - sources."compressible-2.0.11" + sources."compressible-2.0.12" sources."on-headers-1.0.1" sources."safe-buffer-5.1.1" - sources."vary-1.1.1" + sources."vary-1.1.2" sources."busboy-0.2.14" sources."dicer-0.2.5" sources."readable-stream-1.1.14" @@ -32857,27 +33969,27 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."fresh-0.5.0" + sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.5" + sources."proxy-addr-2.0.2" sources."range-parser-1.2.0" - (sources."send-0.15.4" // { + (sources."send-0.16.1" // { dependencies = [ - sources."debug-2.6.8" + sources."statuses-1.3.1" ]; }) - sources."serve-static-1.12.4" - sources."utils-merge-1.0.0" + sources."serve-static-1.13.1" + sources."utils-merge-1.0.1" sources."forwarded-0.1.2" - sources."ipaddr.js-1.4.0" + sources."ipaddr.js-1.5.2" sources."destroy-1.0.4" - sources."mime-1.3.4" + sources."mime-1.4.1" sources."glob-6.0.4" sources."graceful-fs-4.1.11" - (sources."handlebars-4.0.10" // { + (sources."handlebars-4.0.11" // { dependencies = [ sources."async-1.5.2" ]; @@ -32948,7 +34060,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -32977,7 +34089,7 @@ in sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" - sources."bluebird-3.5.0" + sources."bluebird-3.5.1" sources."bunyan-1.8.12" sources."bunyan-syslog-udp-0.1.0" sources."gelf-stream-1.1.1" @@ -32993,7 +34105,7 @@ in sources."dtrace-provider-0.8.5" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" - sources."moment-2.18.1" + sources."moment-2.19.1" sources."nan-2.7.0" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -33117,7 +34229,7 @@ in ]; }) sources."keypress-0.2.1" - sources."mime-1.4.0" + sources."mime-1.4.1" sources."network-address-1.1.2" sources."numeral-1.5.6" sources."open-0.0.5" @@ -33133,7 +34245,7 @@ in }) sources."pump-1.0.2" sources."range-parser-1.2.0" - sources."rc-1.2.1" + sources."rc-1.2.2" (sources."torrent-stream-1.0.3" // { dependencies = [ sources."end-of-stream-0.1.5" @@ -33365,7 +34477,7 @@ in sources."ultron-1.0.2" ]; }) - sources."ipaddr.js-1.5.2" + sources."ipaddr.js-1.5.4" sources."get-browser-rtc-1.0.2" sources."ultron-1.1.0" sources."addr-to-ip-port-1.4.2" @@ -33388,7 +34500,7 @@ in sha1 = "1848fdc14036f013af7489a39e8a5f0f9da48b87"; }; dependencies = [ - sources."connect-multiparty-2.0.0" + sources."connect-multiparty-2.1.0" (sources."express-3.21.2" // { dependencies = [ sources."range-parser-1.0.3" @@ -33415,7 +34527,7 @@ in sources."fluent-ffmpeg-2.1.2" sources."multiparty-4.1.3" sources."on-finished-2.3.0" - sources."qs-4.0.0" + sources."qs-6.5.1" sources."type-is-1.6.15" sources."fd-slicer-1.0.1" sources."pend-1.2.0" @@ -33427,6 +34539,7 @@ in (sources."connect-2.30.2" // { dependencies = [ sources."multiparty-3.3.2" + sources."qs-4.0.0" ]; }) sources."content-disposition-0.5.0" @@ -33453,7 +34566,11 @@ in sources."utils-merge-1.0.0" sources."vary-1.0.1" sources."basic-auth-connect-1.0.0" - sources."body-parser-1.13.3" + (sources."body-parser-1.13.3" // { + dependencies = [ + sources."qs-4.0.0" + ]; + }) sources."bytes-2.1.0" sources."cookie-parser-1.3.5" sources."compression-1.5.2" @@ -33473,10 +34590,10 @@ in }) sources."finalhandler-0.4.0" sources."http-errors-1.3.1" - (sources."method-override-2.3.9" // { + (sources."method-override-2.3.10" // { dependencies = [ - sources."debug-2.6.8" - sources."vary-1.1.1" + sources."debug-2.6.9" + sources."vary-1.1.2" sources."ms-2.0.0" ]; }) @@ -33517,7 +34634,7 @@ in }) sources."unpipe-1.0.0" sources."accepts-1.2.13" - sources."compressible-2.0.11" + sources."compressible-2.0.12" sources."negotiator-0.5.3" sources."ms-0.7.1" sources."csrf-3.0.6" @@ -33528,7 +34645,7 @@ in sources."crc-3.3.0" sources."base64-url-1.2.1" sources."inherits-2.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."readable-stream-1.1.14" sources."stream-counter-0.2.0" sources."core-util-is-1.0.2" @@ -33884,10 +35001,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.7.0"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.7.0.tgz"; - sha512 = "1ib30g1a6lq7pn1ajpmvajs3y4q94yb0xz53zp1s6gbbmihfn1zr8imp8vydlmh1cj41s2ymdkddq8hfq7mlr9caji83c9x87fw11lh"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.7.4.tgz"; + sha1 = "5e8624ae9363c80f95ec644584ecdf55d74f93fa"; }; buildInputs = globalBuildInputs; meta = { @@ -34040,7 +35157,7 @@ in sources."pbkdf2-3.0.14" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" - sources."browserify-aes-1.0.8" + sources."browserify-aes-1.1.1" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.3" sources."buffer-xor-1.0.3" @@ -34064,8 +35181,8 @@ in sources."hash-base-2.0.2" ]; }) - sources."sha.js-2.4.8" - sources."miller-rabin-4.0.0" + sources."sha.js-2.4.9" + sources."miller-rabin-4.0.1" sources."function-bind-1.1.1" sources."is-buffer-1.1.5" sources."lexical-scope-1.2.0" @@ -34103,7 +35220,7 @@ in ]; }) sources."colors-1.1.2" - sources."mime-1.4.0" + sources."mime-1.4.1" sources."mute-stream-0.0.7" sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" @@ -34172,7 +35289,7 @@ in }) sources."nopt-4.0.1" sources."npmlog-4.1.2" - sources."rc-1.2.1" + sources."rc-1.2.2" sources."request-2.81.0" sources."hawk-3.1.3" sources."semver-5.4.1" @@ -34182,7 +35299,7 @@ in sources."rimraf-2.6.2" ]; }) - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."are-we-there-yet-1.1.4" @@ -34308,8 +35425,8 @@ in sources."graceful-fs-4.1.11" sources."iconv-lite-0.4.19" sources."mkdirp-0.5.1" - sources."private-0.1.7" - sources."q-1.5.0" + sources."private-0.1.8" + sources."q-1.5.1" sources."recast-0.11.23" sources."acorn-4.0.13" sources."defined-1.0.0" @@ -34388,7 +35505,7 @@ in sources."methods-0.1.0" sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-3.0.1" + sources."debug-3.1.0" sources."qs-0.6.5" sources."bytes-0.2.1" sources."pause-0.0.1" @@ -34409,7 +35526,7 @@ in sources."request-2.9.203" (sources."openid-2.0.6" // { dependencies = [ - sources."request-2.82.0" + sources."request-2.83.0" sources."qs-6.5.1" ]; }) @@ -34440,7 +35557,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -34496,19 +35613,15 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.1.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.1.0.tgz"; - sha512 = "3hrp79lvglwci8nbyxqwy38f27xfa2axsb5nzqy6hsg4sjs1fpn0va22zv01jgdxjqs9lhpisc47y5aidd699mnrxpvp787gsgvx8ic"; + url = "https://registry.npmjs.org/serve/-/serve-6.3.1.tgz"; + sha512 = "3zimikqfpvw7vhrp8qaf1pk3wk9idqpa72jvla68f9skcyrl9027ksgb851y251fzxmklxzymipy42gf9m7vnp8jjvya4gwng7mmr6n"; }; dependencies = [ - (sources."args-3.0.4" // { - dependencies = [ - sources."chalk-2.0.1" - ]; - }) + sources."args-3.0.7" sources."basic-auth-2.0.0" - sources."bluebird-3.5.0" + sources."bluebird-3.5.1" sources."boxen-1.2.1" sources."chalk-2.1.0" (sources."clipboardy-1.1.4" // { @@ -34526,32 +35639,19 @@ in sources."micro-compress-1.0.0" sources."mime-types-2.1.17" sources."node-version-1.1.0" + sources."openssl-self-signed-certificate-1.1.6" sources."opn-5.1.0" sources."path-type-3.0.0" - (sources."send-0.15.4" // { + (sources."send-0.16.1" // { dependencies = [ - sources."debug-2.6.8" - ]; - }) - (sources."update-notifier-2.2.0" // { - dependencies = [ - sources."chalk-1.1.3" - sources."ansi-styles-2.2.1" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" + sources."statuses-1.3.1" ]; }) + sources."update-notifier-2.3.0" sources."camelcase-4.1.0" - sources."minimist-1.2.0" - sources."pkginfo-0.4.0" + sources."mri-1.1.0" + sources."pkginfo-0.4.1" sources."string-similarity-1.2.0" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.4.0" - sources."color-convert-1.9.0" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" sources."lodash-4.17.4" sources."safe-buffer-5.1.1" sources."ansi-align-2.0.0" @@ -34587,6 +35687,12 @@ in sources."path-key-2.0.1" sources."code-point-at-1.1.0" sources."number-is-nan-1.0.1" + sources."ansi-styles-3.2.0" + sources."escape-string-regexp-1.0.5" + sources."supports-color-4.5.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" sources."address-1.0.3" sources."debug-2.6.9" sources."ms-2.0.0" @@ -34594,11 +35700,7 @@ in sources."jsonfile-4.0.0" sources."universalify-0.1.1" sources."async-1.5.2" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) + sources."optimist-0.6.1" sources."source-map-0.4.4" (sources."uglify-js-2.8.29" // { dependencies = [ @@ -34606,6 +35708,7 @@ in ]; }) sources."wordwrap-0.0.3" + sources."minimist-0.0.10" sources."amdefine-1.0.1" (sources."yargs-3.10.0" // { dependencies = [ @@ -34629,7 +35732,6 @@ in sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" sources."media-typer-0.3.0" - sources."mri-1.1.0" sources."raw-body-2.3.2" sources."bytes-3.0.0" sources."http-errors-1.6.2" @@ -34638,17 +35740,12 @@ in sources."depd-1.1.1" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" - (sources."compression-1.7.0" // { - dependencies = [ - sources."bytes-2.5.0" - sources."debug-2.6.8" - ]; - }) + sources."statuses-1.4.0" + sources."compression-1.7.1" sources."accepts-1.3.4" - sources."compressible-2.0.11" + sources."compressible-2.0.12" sources."on-headers-1.0.1" - sources."vary-1.1.1" + sources."vary-1.1.2" sources."negotiator-0.6.1" sources."mime-db-1.30.0" sources."is-wsl-1.1.0" @@ -34657,33 +35754,29 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."fresh-0.5.0" - sources."mime-1.3.4" + sources."fresh-0.5.2" + sources."mime-1.4.1" sources."on-finished-2.3.0" sources."range-parser-1.2.0" sources."ee-first-1.1.1" sources."configstore-3.1.1" sources."import-lazy-2.1.0" + sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."latest-version-3.1.0" sources."semver-diff-2.1.0" sources."xdg-basedir-3.0.0" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) sources."dot-prop-4.2.0" - (sources."make-dir-1.0.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."make-dir-1.1.0" sources."unique-string-1.0.0" sources."write-file-atomic-2.3.0" sources."is-obj-1.0.1" sources."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" + sources."global-dirs-0.1.0" + sources."is-path-inside-1.0.0" + sources."ini-1.3.4" + sources."path-is-inside-1.0.2" sources."package-json-4.0.1" sources."got-6.7.1" sources."registry-auth-token-3.3.1" @@ -34699,9 +35792,12 @@ in sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" sources."prepend-http-1.0.4" - sources."rc-1.2.1" + (sources."rc-1.2.2" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."deep-extend-0.4.2" - sources."ini-1.3.4" sources."strip-json-comments-2.0.1" ]; buildInputs = globalBuildInputs; @@ -34721,29 +35817,25 @@ in sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ - sources."express-5.0.0-alpha.5" + sources."express-5.0.0-alpha.6" sources."express-json5-0.1.0" (sources."body-parser-1.18.2" // { dependencies = [ sources."bytes-3.0.0" - sources."debug-2.6.9" sources."iconv-lite-0.4.19" sources."qs-6.5.1" sources."raw-body-2.3.2" - sources."ms-2.0.0" ]; }) - (sources."compression-1.7.0" // { + (sources."compression-1.7.1" // { dependencies = [ - sources."bytes-2.5.0" - sources."debug-2.6.8" - sources."ms-2.0.0" + sources."bytes-3.0.0" ]; }) sources."commander-2.11.0" sources."js-yaml-3.10.0" sources."cookies-0.7.1" - (sources."request-2.82.0" // { + (sources."request-2.83.0" // { dependencies = [ sources."qs-6.5.1" ]; @@ -34776,18 +35868,13 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."debug-2.6.1" + sources."debug-2.6.9" sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."finalhandler-1.0.6" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."fresh-0.5.0" + sources."finalhandler-1.0.6" + sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" @@ -34795,25 +35882,25 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" - sources."qs-6.4.0" + sources."qs-6.5.0" sources."range-parser-1.2.0" - (sources."router-1.3.1" // { + (sources."router-1.3.2" // { dependencies = [ - sources."debug-2.6.8" - sources."ms-2.0.0" + sources."setprototypeof-1.1.0" + sources."utils-merge-1.0.1" ]; }) - sources."send-0.15.1" - sources."serve-static-1.12.1" + sources."send-0.15.6" + sources."serve-static-1.12.6" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."type-is-1.6.15" sources."utils-merge-1.0.0" - sources."vary-1.1.1" + sources."vary-1.1.2" sources."mime-types-2.1.17" sources."negotiator-0.6.1" sources."mime-db-1.30.0" - sources."ms-0.7.2" + sources."ms-2.0.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.2" @@ -34824,7 +35911,7 @@ in sources."raw-body-1.3.4" sources."bytes-1.0.0" sources."iconv-lite-0.4.8" - sources."compressible-2.0.11" + sources."compressible-2.0.12" sources."on-headers-1.0.1" sources."safe-buffer-5.1.1" sources."argparse-1.0.9" @@ -34852,7 +35939,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -34887,7 +35974,7 @@ in sources."dtrace-provider-0.8.5" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" - sources."moment-2.18.1" + sources."moment-2.19.1" sources."nan-2.7.0" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -35048,14 +36135,14 @@ in sources."extsprintf-1.0.0" ]; }) - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."backoff-2.5.0" sources."csv-0.4.6" sources."escape-regexp-component-1.0.2" sources."formidable-1.1.1" sources."http-signature-0.11.0" sources."keep-alive-agent-0.0.1" - sources."mime-1.4.0" + sources."mime-1.4.1" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" sources."once-1.4.0" @@ -35071,7 +36158,7 @@ in sources."dtrace-provider-0.6.0" sources."precond-0.2.3" sources."csv-generate-0.0.6" - sources."csv-parse-1.2.3" + sources."csv-parse-1.3.3" sources."stream-transform-0.1.2" sources."csv-stringify-0.0.8" sources."asn1-0.1.11" @@ -35142,7 +36229,7 @@ in dependencies = [ sources."css-parse-1.7.0" sources."mkdirp-0.5.1" - sources."debug-3.0.1" + sources."debug-3.1.0" sources."sax-0.5.8" sources."glob-7.0.6" sources."source-map-0.1.43" @@ -35184,7 +36271,7 @@ in sources."whet.extend-0.9.9" sources."mkdirp-0.5.1" sources."csso-2.3.2" - sources."q-1.5.0" + sources."q-1.5.1" sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" @@ -35255,10 +36342,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz"; - sha1 = "038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz"; + sha512 = "3mhb4cnf07q9jnz7r8iy06iwsq32byfvn4z3f6bbbw2sknnppa4q2v5vm12bxix8lwvbdhhqhdvkr0v1bhdb0zkxf90pqcjrm1d5lm6"; }; buildInputs = globalBuildInputs; meta = { @@ -35278,7 +36365,7 @@ in }; dependencies = [ sources."archy-1.0.0" - sources."bluebird-3.5.0" + sources."bluebird-3.5.1" sources."chalk-1.1.3" sources."cli-truncate-1.1.0" sources."columnify-1.5.4" @@ -35289,7 +36376,13 @@ in sources."minimist-1.2.0" sources."promise-finally-3.0.0" sources."typings-core-2.3.3" - sources."update-notifier-2.2.0" + (sources."update-notifier-2.3.0" // { + dependencies = [ + sources."chalk-2.2.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + ]; + }) sources."wordwrap-1.0.0" sources."xtend-4.0.1" sources."ansi-styles-2.2.1" @@ -35337,7 +36430,7 @@ in sources."popsicle-retry-3.2.1" sources."popsicle-rewrite-1.0.0" sources."popsicle-status-2.0.1" - sources."rc-1.2.1" + sources."rc-1.2.2" sources."rimraf-2.6.2" sources."sort-keys-1.1.2" sources."string-template-1.0.0" @@ -35345,15 +36438,15 @@ in sources."thenify-3.3.0" sources."throat-3.2.0" sources."touch-1.0.0" - sources."typescript-2.5.2" + sources."typescript-2.5.3" sources."zip-object-0.1.0" sources."dot-prop-4.2.0" - sources."make-dir-1.0.0" + sources."make-dir-1.1.0" sources."unique-string-1.0.0" sources."write-file-atomic-2.3.0" sources."xdg-basedir-3.0.0" sources."is-obj-1.0.1" - sources."pify-2.3.0" + sources."pify-3.0.0" sources."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" sources."signal-exit-3.0.2" @@ -35408,15 +36501,16 @@ in sources."concat-map-0.0.1" sources."is-plain-obj-1.1.0" sources."nopt-1.0.10" - sources."abbrev-1.1.0" - (sources."boxen-1.2.1" // { + sources."abbrev-1.1.1" + (sources."boxen-1.2.2" // { dependencies = [ - sources."chalk-2.1.0" + sources."chalk-2.2.0" sources."ansi-styles-3.2.0" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" ]; }) sources."import-lazy-2.1.0" + sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."latest-version-3.1.0" sources."semver-diff-2.1.0" @@ -35450,6 +36544,9 @@ in sources."path-key-2.0.1" sources."code-point-at-1.1.0" sources."number-is-nan-1.0.1" + sources."global-dirs-0.1.0" + sources."is-path-inside-1.0.0" + sources."path-is-inside-1.0.2" (sources."package-json-4.0.1" // { dependencies = [ sources."semver-5.4.1" @@ -35480,14 +36577,14 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.1.1"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.1.tgz"; - sha512 = "324ss2wqxsz86ih8hy14lkaqaq32kck3mkka79nj7v3bk9288c9a1x7pc88na5g17ch83qvg9j5hwlzl7v72crl5c01dz9d92cfkc3z"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.5.tgz"; + sha512 = "1fgrmz71wwy21h9m0vg1f0hd9g4c5gdj1xa87cfcl920plwpv90ps0kkafs6xhgbvxl2a9bqmjz8k6sdp96x9hf9cap0r66pwxsaamm"; }; dependencies = [ sources."commander-2.11.0" - sources."source-map-0.5.7" + sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; meta = { @@ -35500,36 +36597,35 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.29"; + version = "1.1.33"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.29.tgz"; - sha1 = "4376943f1924f90f294f5f17ae56bda852cb1643"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.33.tgz"; + sha1 = "f5b42a9e36e6d236060df399ece5bd14066cf716"; }; dependencies = [ sources."async-2.5.0" - sources."bluebird-3.5.0" - sources."blueimp-md5-2.8.0" - sources."body-parser-1.17.2" + sources."bluebird-3.5.1" + sources."blueimp-md5-2.10.0" + sources."body-parser-1.18.2" sources."color-2.0.0" sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" - sources."diff2html-2.3.0" - (sources."express-4.15.4" // { + sources."diff2html-2.3.2" + (sources."express-4.15.5" // { dependencies = [ - sources."debug-2.6.8" sources."qs-6.5.0" - sources."serve-static-1.12.4" + sources."statuses-1.3.1" ]; }) - (sources."express-session-1.15.5" // { + (sources."express-session-1.15.6" // { dependencies = [ - sources."debug-2.6.8" + sources."utils-merge-1.0.1" ]; }) sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.3.5" + sources."ignore-3.3.6" sources."just-detect-adblock-1.0.0" (sources."keen.io-0.1.3" // { dependencies = [ @@ -35550,20 +36646,14 @@ in }) sources."moment-2.18.1" sources."node-cache-4.1.1" - (sources."npm-4.6.1" // { + (sources."npm-5.4.2" // { dependencies = [ + sources."lru-cache-4.1.1" sources."nopt-4.0.1" - sources."npm-registry-client-8.1.1" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."request-2.81.0" - sources."semver-5.3.0" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - (sources."string_decoder-1.0.3" // { - dependencies = [ - sources."safe-buffer-5.1.1" - ]; - }) + sources."string_decoder-1.0.3" sources."combined-stream-1.0.5" sources."extend-3.0.1" sources."forever-agent-0.6.1" @@ -35571,6 +36661,7 @@ in sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" + sources."qs-6.4.0" sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" @@ -35581,7 +36672,7 @@ in }) (sources."npm-registry-client-8.4.0" // { dependencies = [ - sources."request-2.82.0" + sources."request-2.83.0" sources."aws-sign2-0.7.0" sources."combined-stream-1.0.5" sources."extend-3.0.1" @@ -35593,11 +36684,9 @@ in sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" sources."performance-now-2.1.0" - sources."qs-6.5.1" sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" sources."delayed-stream-1.0.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" @@ -35622,23 +36711,17 @@ in sources."uuid-3.0.0" ]; }) - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."rimraf-2.6.2" sources."semver-5.4.1" - (sources."serve-static-1.12.6" // { - dependencies = [ - sources."send-0.15.6" - sources."debug-2.6.9" - sources."fresh-0.5.2" - ]; - }) + sources."serve-static-1.12.6" sources."signals-1.0.0" sources."snapsvg-0.5.1" - sources."socket.io-2.0.3" + sources."socket.io-2.0.4" (sources."superagent-3.5.2" // { dependencies = [ sources."component-emitter-1.2.1" @@ -35664,28 +36747,21 @@ in sources."colors-1.0.3" ]; }) - (sources."yargs-8.0.2" // { - dependencies = [ - sources."string-width-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" - ]; - }) - sources."bytes-2.4.0" + sources."yargs-9.0.1" + sources."bytes-3.0.0" sources."content-type-1.0.4" - sources."debug-2.6.7" + sources."debug-2.6.9" sources."depd-1.1.1" sources."http-errors-1.6.2" - sources."iconv-lite-0.4.15" + sources."iconv-lite-0.4.19" sources."on-finished-2.3.0" - sources."qs-6.4.0" - sources."raw-body-2.2.0" + sources."qs-6.5.1" + sources."raw-body-2.3.2" sources."type-is-1.6.15" sources."ms-2.0.0" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" @@ -35698,7 +36774,7 @@ in sources."is-arrayish-0.3.1" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."diff-3.3.1" + sources."diff-3.4.0" (sources."hogan.js-3.0.2" // { dependencies = [ sources."mkdirp-0.3.0" @@ -35706,7 +36782,7 @@ in }) sources."whatwg-fetch-2.0.3" sources."nopt-1.0.10" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."accepts-1.3.4" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" @@ -35715,23 +36791,23 @@ in sources."etag-1.8.1" (sources."finalhandler-1.0.6" // { dependencies = [ - sources."debug-2.6.9" + sources."statuses-1.3.1" ]; }) - sources."fresh-0.5.0" + sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - (sources."send-0.15.4" // { + (sources."send-0.15.6" // { dependencies = [ - sources."debug-2.6.8" + sources."statuses-1.3.1" ]; }) sources."utils-merge-1.0.0" - sources."vary-1.1.1" + sources."vary-1.1.2" sources."negotiator-0.6.1" sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" @@ -35806,7 +36882,7 @@ in sources."cryptiles-0.1.3" sources."sntp-0.1.4" sources."deep-equal-1.0.1" - sources."i-0.3.5" + sources."i-0.3.6" sources."ncp-0.4.2" sources."lru-cache-1.0.6" (sources."event-stream-0.5.3" // { @@ -35830,17 +36906,27 @@ in sources."string_decoder-0.10.31" sources."clone-2.1.1" sources."JSONStream-1.3.1" - sources."ansi-regex-2.1.1" + sources."ansi-regex-3.0.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.1.2" sources."archy-1.0.0" - sources."asap-2.0.6" + (sources."cacache-9.2.9" // { + dependencies = [ + sources."lru-cache-4.1.1" + ]; + }) sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" - sources."columnify-1.5.4" + (sources."columnify-1.5.4" // { + dependencies = [ + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) sources."config-chain-1.1.11" + sources."detect-indent-5.0.0" sources."dezalgo-1.0.3" sources."editor-1.0.0" sources."fs-vacuum-1.2.10" @@ -35851,8 +36937,6 @@ in sources."string_decoder-1.0.3" ]; }) - sources."fstream-1.0.11" - sources."fstream-npm-1.2.1" (sources."glob-7.1.2" // { dependencies = [ sources."minimatch-3.0.4" @@ -35860,17 +36944,23 @@ in }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."init-package-json-1.10.1" sources."lazy-property-1.0.0" + (sources."libnpx-9.6.0" // { + dependencies = [ + sources."yargs-8.0.2" + ]; + }) sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.5.0" sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" + sources."meant-1.0.1" sources."mississippi-1.3.0" sources."move-concurrently-1.0.1" (sources."node-gyp-3.6.2" // { @@ -35878,26 +36968,35 @@ in sources."minimatch-3.0.4" sources."nopt-3.0.6" sources."semver-5.3.0" + sources."tar-2.2.1" ]; }) - sources."normalize-git-url-3.0.2" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" - sources."npm-package-arg-4.2.1" - sources."npm-user-validate-0.1.5" - sources."npmlog-4.0.2" + sources."npm-lifecycle-1.0.3" + sources."npm-package-arg-5.1.2" + sources."npm-packlist-1.1.10" + sources."npm-user-validate-1.0.0" + sources."npmlog-4.1.2" sources."once-1.4.0" sources."opener-1.4.3" sources."osenv-0.1.4" + (sources."pacote-6.0.4" // { + dependencies = [ + sources."lru-cache-4.1.1" + sources."minimatch-3.0.4" + ]; + }) sources."path-is-inside-1.0.2" + sources."promise-inflight-1.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" sources."read-package-json-2.0.12" sources."read-package-tree-5.1.6" - sources."realize-package-specifier-3.0.3" sources."retry-0.10.1" + sources."safe-buffer-5.1.1" (sources."sha-2.0.1" // { dependencies = [ sources."readable-stream-2.3.3" @@ -35913,18 +37012,24 @@ in sources."readable-stream-1.1.14" ]; }) - sources."strip-ansi-3.0.1" - sources."tar-2.2.1" + sources."ssri-4.1.6" + sources."strip-ansi-4.0.0" + (sources."tar-4.0.2" // { + dependencies = [ + sources."yallist-3.0.2" + ]; + }) sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unique-filename-1.1.0" - sources."update-notifier-2.1.0" - sources."uuid-3.0.1" + sources."update-notifier-2.2.0" + sources."uuid-3.1.0" sources."validate-npm-package-name-3.0.0" - sources."which-1.2.14" + sources."which-1.3.0" + sources."worker-farm-1.5.0" sources."wrappy-1.0.2" - sources."write-file-atomic-1.3.4" + sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -35937,6 +37042,9 @@ in sources."validate-npm-package-license-3.0.1" sources."jsonparse-1.3.1" sources."through-2.3.8" + sources."y18n-3.2.1" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" sources."wcwidth-1.0.1" (sources."defaults-1.0.3" // { dependencies = [ @@ -35944,20 +37052,83 @@ in ]; }) sources."proto-list-1.2.4" + sources."asap-2.0.6" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" sources."util-deprecate-1.0.2" - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) + sources."fs.realpath-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."fs.realpath-1.0.0" - sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" + sources."dotenv-4.0.0" + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + sources."os-locale-2.1.0" + sources."read-pkg-up-2.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."which-module-2.0.0" + sources."yargs-parser-7.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."execa-0.7.0" + sources."lcid-1.0.0" + sources."mem-1.1.0" + (sources."cross-spawn-5.1.0" // { + dependencies = [ + sources."lru-cache-4.1.1" + ]; + }) + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" + sources."strip-eof-1.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."path-key-2.0.1" + sources."invert-kv-1.0.0" + sources."mimic-fn-1.1.0" + sources."find-up-2.1.0" + sources."read-pkg-2.0.0" + sources."locate-path-2.0.0" + sources."p-locate-2.0.0" + sources."path-exists-3.0.0" + sources."p-limit-1.1.0" + sources."load-json-file-2.0.0" + sources."path-type-2.0.0" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-3.0.0" + (sources."error-ex-1.3.1" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" (sources."concat-stream-1.6.0" // { @@ -35998,7 +37169,7 @@ in }) sources."pump-1.0.2" sources."pumpify-1.3.5" - sources."stream-each-1.2.0" + sources."stream-each-1.2.2" (sources."through2-2.0.3" // { dependencies = [ sources."readable-stream-2.3.3" @@ -36012,8 +37183,16 @@ in sources."xtend-4.0.1" sources."copy-concurrently-1.0.5" sources."run-queue-1.0.3" + sources."fstream-1.0.11" + sources."block-stream-0.0.9" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" + (sources."ignore-walk-3.0.1" // { + dependencies = [ + sources."minimatch-3.0.4" + ]; + }) + sources."npm-bundled-1.0.3" (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."readable-stream-2.3.3" @@ -36022,20 +37201,50 @@ in ]; }) sources."console-control-strings-1.1.0" - sources."gauge-2.7.4" - sources."set-blocking-2.0.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) sources."delegates-1.0.0" sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - sources."string-width-1.0.2" - sources."wide-align-1.1.2" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.1" + (sources."wide-align-1.1.2" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) sources."os-tmpdir-1.0.2" + (sources."make-fetch-happen-2.5.0" // { + dependencies = [ + sources."lru-cache-4.1.1" + ]; + }) + sources."npm-pick-manifest-1.0.4" + sources."promise-retry-1.1.1" + sources."protoduck-4.0.0" + sources."agentkeepalive-3.3.0" + sources."http-cache-semantics-3.8.0" + sources."http-proxy-agent-2.0.0" + sources."https-proxy-agent-2.1.0" + sources."node-fetch-npm-2.0.2" + sources."socks-proxy-agent-3.0.1" + sources."humanize-ms-1.2.1" + sources."agent-base-4.1.1" + sources."es6-promisify-5.0.0" + sources."es6-promise-4.1.1" + sources."encoding-0.1.12" + sources."json-parse-better-errors-1.0.1" + sources."socks-1.1.10" + sources."ip-1.1.5" + sources."smart-buffer-1.1.15" + sources."err-code-1.1.2" + sources."genfun-4.0.1" sources."mute-stream-0.0.7" sources."util-extend-1.0.3" - sources."json-parse-better-errors-1.0.1" sources."slash-1.0.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -36094,71 +37303,59 @@ in sources."string_decoder-1.0.3" ]; }) - sources."block-stream-0.0.9" - sources."unique-slug-2.0.0" - (sources."boxen-1.2.1" // { + (sources."minipass-2.2.1" // { dependencies = [ - sources."chalk-2.1.0" - sources."string-width-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" + sources."yallist-3.0.2" + ]; + }) + sources."minizlib-1.0.4" + sources."unique-slug-2.0.0" + (sources."boxen-1.2.2" // { + dependencies = [ + sources."chalk-2.2.0" ]; }) (sources."chalk-1.1.3" // { dependencies = [ sources."ansi-styles-2.2.1" + sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" ]; }) - (sources."configstore-3.1.1" // { - dependencies = [ - sources."write-file-atomic-2.3.0" - ]; - }) + sources."configstore-3.1.1" + sources."import-lazy-2.1.0" sources."is-npm-1.0.0" sources."latest-version-3.1.0" - sources."lazy-req-2.0.0" sources."semver-diff-2.1.0" sources."xdg-basedir-3.0.0" - (sources."ansi-align-2.0.0" // { - dependencies = [ - sources."string-width-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" - ]; - }) - sources."camelcase-4.1.0" + sources."ansi-align-2.0.0" sources."cli-boxes-1.0.0" sources."term-size-1.2.0" - sources."widest-line-1.0.0" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.4.0" - sources."has-flag-2.0.0" - sources."execa-0.7.0" - (sources."cross-spawn-5.1.0" // { + (sources."widest-line-1.0.0" // { dependencies = [ - sources."lru-cache-4.1.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."ansi-styles-3.2.0" + sources."escape-string-regexp-1.0.5" + sources."supports-color-4.5.0" + sources."has-flag-2.0.0" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" ]; }) - sources."get-stream-3.0.0" - sources."is-stream-1.1.0" - sources."npm-run-path-2.0.2" - sources."p-finally-1.0.0" - sources."strip-eof-1.0.0" - sources."shebang-command-1.2.0" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."shebang-regex-1.0.0" - sources."path-key-2.0.1" - sources."has-ansi-2.0.0" sources."dot-prop-4.2.0" - sources."make-dir-1.0.0" + (sources."make-dir-1.1.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."unique-string-1.0.0" sources."is-obj-1.0.1" - sources."pify-2.3.0" sources."crypto-random-string-1.0.0" sources."package-json-4.0.1" sources."got-6.7.1" @@ -36176,10 +37373,11 @@ in sources."prepend-http-1.0.4" sources."builtins-1.0.3" sources."isexe-2.0.0" + sources."errno-0.1.4" + sources."prr-0.0.0" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."ssri-4.1.6" sources."fast-deep-equal-1.0.0" sources."json-schema-traverse-0.3.1" sources."passport-strategy-1.0.0" @@ -36188,13 +37386,13 @@ in sources."deep-extend-0.4.2" sources."strip-json-comments-2.0.1" sources."eve-0.5.4" - (sources."engine.io-3.1.1" // { + (sources."engine.io-3.1.3" // { dependencies = [ sources."accepts-1.3.3" ]; }) sources."socket.io-adapter-1.1.1" - (sources."socket.io-client-2.0.3" // { + (sources."socket.io-client-2.0.4" // { dependencies = [ sources."component-emitter-1.2.1" ]; @@ -36225,7 +37423,7 @@ in sources."ultron-1.1.0" sources."backo2-1.0.2" sources."component-bind-1.0.0" - (sources."engine.io-client-3.1.1" // { + (sources."engine.io-client-3.1.3" // { dependencies = [ sources."component-emitter-1.2.1" ]; @@ -36237,47 +37435,16 @@ in sources."parseuri-0.0.5" sources."to-array-0.1.4" sources."component-inherit-0.0.3" - sources."parsejson-0.0.3" - sources."xmlhttprequest-ssl-1.5.3" + sources."xmlhttprequest-ssl-1.5.4" sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" - sources."cliui-3.2.0" - sources."decamelize-1.2.0" - sources."get-caller-file-1.0.2" - sources."os-locale-2.1.0" - sources."read-pkg-up-2.0.0" - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."which-module-2.0.0" - sources."y18n-3.2.1" - sources."yargs-parser-7.0.0" - sources."wrap-ansi-2.1.0" - sources."lcid-1.0.0" - sources."mem-1.1.0" - sources."invert-kv-1.0.0" - sources."mimic-fn-1.1.0" - sources."find-up-2.1.0" - sources."read-pkg-2.0.0" - sources."locate-path-2.0.0" - sources."p-locate-2.0.0" - sources."path-exists-3.0.0" - sources."p-limit-1.1.0" - sources."load-json-file-2.0.0" - sources."path-type-2.0.0" - sources."parse-json-2.2.0" - sources."strip-bom-3.0.0" - (sources."error-ex-1.3.1" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) ]; buildInputs = globalBuildInputs; meta = { description = "Git made easy"; homepage = "https://github.com/FredrikNoren/ungit#readme"; - license = "MIT"; + license = "SEE LICENSE IN LICENSE.md"; }; production = true; }; @@ -36314,7 +37481,7 @@ in sources."ini-1.1.0" sources."proto-list-1.2.4" sources."wrappy-1.0.2" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" (sources."extract-zip-1.5.0" // { dependencies = [ sources."mkdirp-0.5.0" @@ -36445,10 +37612,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "3.6.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz"; - sha512 = "12fzgy04c0gwlpr5bn66q92kbnv8wn4sm6xd2mmhc3dwq0fkrl2h1pmad3wh56x8zia8v7s4jcwxndhv8pb9d0y7s7skl0n7pfd7h9s"; + url = "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz"; + sha512 = "1pjbfhy4mpjb68hg0k70iz51c13yq6biln5wyb3jg8ddbgc3qwhnqgxvd19if6sihd10yc42yrj50p451qkgd4wmy2p5a0cddcwp5g5"; }; dependencies = [ sources."acorn-5.1.2" @@ -36457,7 +37624,7 @@ in sources."acorn-4.0.13" ]; }) - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."ajv-keywords-2.1.0" sources."async-2.5.0" sources."enhanced-resolve-3.4.1" @@ -36475,7 +37642,7 @@ in ]; }) sources."source-map-0.5.7" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" sources."tapable-0.2.8" sources."uglifyjs-webpack-plugin-0.4.6" sources."watchpack-1.4.0" @@ -36507,8 +37674,8 @@ in sources."esrecurse-4.2.0" sources."estraverse-4.2.0" sources."d-1.0.0" - sources."es5-ext-0.10.30" - sources."es6-iterator-2.0.1" + sources."es5-ext-0.10.35" + sources."es6-iterator-2.0.3" sources."es6-set-0.1.5" sources."es6-symbol-3.1.1" sources."event-emitter-0.3.5" @@ -36567,7 +37734,7 @@ in sources."pbkdf2-3.0.14" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" - sources."browserify-aes-1.0.8" + sources."browserify-aes-1.1.1" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.3" sources."buffer-xor-1.0.3" @@ -36590,8 +37757,8 @@ in sources."hash-base-2.0.2" ]; }) - sources."sha.js-2.4.8" - sources."miller-rabin-4.0.0" + sources."sha.js-2.4.9" + sources."miller-rabin-4.0.1" sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" sources."xtend-4.0.1" @@ -36675,7 +37842,7 @@ in sources."node-pre-gyp-0.6.38" sources."nopt-4.0.1" sources."npmlog-4.1.2" - (sources."rc-1.2.1" // { + (sources."rc-1.2.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -36686,7 +37853,7 @@ in sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" - sources."abbrev-1.1.0" + sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -36847,6 +38014,839 @@ in }; production = true; }; + web-ext = nodeEnv.buildNodePackage { + name = "web-ext"; + packageName = "web-ext"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.2.2.tgz"; + sha1 = "5c54be1d5b2e9da3092f5f03ef55d6db372c37e1"; + }; + dependencies = [ + (sources."addons-linter-0.27.0" // { + dependencies = [ + sources."yargs-8.0.2" + ]; + }) + sources."babel-polyfill-6.20.0" + sources."babel-runtime-6.25.0" + sources."bunyan-1.8.10" + sources."camelcase-4.1.0" + sources."debounce-1.0.2" + sources."decamelize-1.2.0" + sources."es6-error-4.0.2" + sources."es6-promisify-5.0.0" + sources."event-to-promise-0.8.0" + (sources."firefox-profile-0.5.0" // { + dependencies = [ + sources."async-2.1.5" + ]; + }) + (sources."fx-runner-1.0.8" // { + dependencies = [ + sources."commander-2.9.0" + sources."lodash-3.10.1" + sources."which-1.2.4" + sources."isexe-1.1.2" + ]; + }) + (sources."git-rev-sync-1.9.1" // { + dependencies = [ + sources."shelljs-0.7.7" + ]; + }) + sources."minimatch-3.0.4" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."mz-2.6.0" + (sources."node-firefox-connect-1.2.0" // { + dependencies = [ + sources."es6-promise-2.3.0" + ]; + }) + sources."open-0.0.5" + sources."node-notifier-5.1.2" + sources."parse-json-2.2.0" + sources."regenerator-runtime-0.10.5" + sources."require-uncached-1.0.3" + (sources."sign-addon-0.2.1" // { + dependencies = [ + sources."babel-polyfill-6.16.0" + sources."es6-error-4.0.0" + sources."mz-2.5.0" + sources."request-2.79.0" + sources."source-map-support-0.4.6" + sources."regenerator-runtime-0.9.6" + sources."aws-sign2-0.6.0" + sources."caseless-0.11.0" + sources."form-data-2.1.4" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."qs-6.3.2" + sources."tunnel-agent-0.4.3" + sources."chalk-1.1.3" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + ]; + }) + (sources."source-map-support-0.5.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."stream-to-promise-2.2.0" // { + dependencies = [ + sources."end-of-stream-1.1.0" + sources."once-1.3.3" + ]; + }) + sources."tmp-0.0.30" + sources."watchpack-1.3.0" + (sources."update-notifier-2.2.0" // { + dependencies = [ + sources."chalk-1.1.3" + ]; + }) + (sources."yargs-6.6.0" // { + dependencies = [ + sources."camelcase-3.0.0" + sources."os-locale-1.4.0" + sources."read-pkg-up-1.0.1" + sources."string-width-1.0.2" + sources."which-module-1.0.0" + sources."yargs-parser-4.2.1" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."strip-bom-2.0.0" + ]; + }) + (sources."zip-dir-1.0.2" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) + sources."ajv-5.2.3" + (sources."babel-register-6.26.0" // { + dependencies = [ + sources."babel-runtime-6.26.0" + sources."source-map-support-0.4.18" + sources."regenerator-runtime-0.11.0" + ]; + }) + (sources."chalk-2.1.0" // { + dependencies = [ + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + ]; + }) + sources."cheerio-1.0.0-rc.2" + sources."columnify-1.5.4" + sources."common-tags-1.4.0" + sources."crx-parser-0.1.2" + sources."doctoc-1.3.0" + (sources."dispensary-0.10.19" // { + dependencies = [ + sources."yargs-9.0.1" + ]; + }) + (sources."eslint-4.8.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { + dependencies = [ + sources."eslint-3.19.0" + sources."chalk-1.1.3" + sources."inquirer-0.12.0" + sources."pluralize-1.2.1" + sources."progress-1.1.8" + (sources."table-3.8.3" // { + dependencies = [ + sources."string-width-2.1.1" + ]; + }) + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."figures-1.7.0" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."string-width-1.0.2" + sources."restore-cursor-1.0.1" + sources."onetime-1.1.0" + sources."ajv-4.11.8" + sources."ajv-keywords-1.5.1" + sources."slice-ansi-0.0.4" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + sources."esprima-3.1.3" + sources."first-chunk-stream-2.0.0" + sources."jed-1.1.1" + sources."pino-4.8.0" + (sources."postcss-6.0.11" // { + dependencies = [ + sources."supports-color-4.5.0" + ]; + }) + (sources."relaxed-json-1.0.1" // { + dependencies = [ + sources."chalk-1.1.3" + ]; + }) + sources."semver-5.4.1" + sources."strip-bom-stream-3.0.0" + sources."whatwg-url-6.3.0" + sources."xmldom-0.1.27" + sources."yauzl-2.8.0" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" + (sources."babel-core-6.26.0" // { + dependencies = [ + sources."babel-runtime-6.26.0" + sources."regenerator-runtime-0.11.0" + ]; + }) + sources."core-js-2.5.1" + sources."home-or-tmp-2.0.0" + sources."lodash-4.17.4" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."chalk-1.1.3" + ]; + }) + (sources."babel-generator-6.26.0" // { + dependencies = [ + sources."babel-runtime-6.26.0" + sources."regenerator-runtime-0.11.0" + ]; + }) + sources."babel-helpers-6.24.1" + sources."babel-messages-6.23.0" + (sources."babel-template-6.26.0" // { + dependencies = [ + sources."babel-runtime-6.26.0" + sources."regenerator-runtime-0.11.0" + ]; + }) + (sources."babel-traverse-6.26.0" // { + dependencies = [ + sources."babel-runtime-6.26.0" + sources."regenerator-runtime-0.11.0" + ]; + }) + (sources."babel-types-6.26.0" // { + dependencies = [ + sources."babel-runtime-6.26.0" + sources."regenerator-runtime-0.11.0" + ]; + }) + sources."babylon-6.18.0" + sources."convert-source-map-1.5.0" + sources."debug-2.6.9" + sources."json5-0.5.1" + sources."path-is-absolute-1.0.1" + sources."private-0.1.8" + sources."slash-1.0.0" + sources."source-map-0.5.7" + sources."esutils-2.0.2" + sources."js-tokens-3.0.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."detect-indent-4.0.0" + sources."jsesc-1.3.0" + sources."trim-right-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."globals-9.18.0" + sources."invariant-2.2.2" + sources."loose-envify-1.3.1" + sources."to-fast-properties-1.0.3" + sources."ms-2.0.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."css-select-1.2.0" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."entities-1.1.1" + sources."htmlparser2-3.9.2" + sources."parse5-3.0.2" + sources."css-what-2.1.0" + sources."domutils-1.5.1" + sources."boolbase-1.0.0" + sources."nth-check-1.0.1" + sources."domelementtype-1.3.0" + sources."domhandler-2.4.1" + sources."inherits-2.0.3" + sources."readable-stream-2.3.3" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."@types/node-6.0.90" + sources."wcwidth-1.0.1" + sources."defaults-1.0.3" + sources."clone-1.0.2" + sources."anchor-markdown-header-0.5.7" + sources."markdown-to-ast-3.4.0" + sources."minimist-1.2.0" + sources."underscore-1.8.3" + sources."update-section-0.3.3" + sources."emoji-regex-6.1.3" + sources."remark-5.1.0" + sources."structured-source-3.0.2" + sources."traverse-0.6.6" + sources."remark-parse-1.1.0" + sources."remark-stringify-1.1.0" + sources."unified-4.2.1" + sources."collapse-white-space-1.0.3" + sources."extend-3.0.1" + sources."parse-entities-1.1.1" + sources."repeat-string-1.6.1" + sources."trim-0.0.1" + sources."trim-trailing-lines-1.1.0" + sources."unherit-1.1.0" + sources."unist-util-remove-position-1.1.1" + sources."vfile-location-2.0.2" + sources."character-entities-1.2.1" + sources."character-entities-legacy-1.1.1" + sources."character-reference-invalid-1.1.1" + sources."is-alphanumerical-1.0.1" + sources."is-decimal-1.0.1" + sources."is-hexadecimal-1.0.1" + sources."is-alphabetical-1.0.1" + sources."xtend-4.0.1" + sources."unist-util-visit-1.1.3" + sources."ccount-1.0.2" + sources."longest-streak-1.0.0" + sources."markdown-table-0.4.0" + sources."stringify-entities-1.3.1" + sources."character-entities-html4-1.1.1" + sources."bail-1.0.2" + sources."has-1.0.1" + sources."once-1.4.0" + sources."trough-1.0.1" + sources."vfile-1.4.0" + sources."function-bind-1.1.1" + sources."wrappy-1.0.2" + sources."boundary-1.0.1" + sources."array-from-2.1.1" + sources."async-2.5.0" + sources."natural-compare-lite-1.4.0" + sources."request-2.83.0" + sources."sha.js-2.4.9" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.17" + sources."oauth-sign-0.8.2" + sources."performance-now-2.1.0" + sources."qs-6.5.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."har-schema-2.0.0" + sources."hoek-4.2.0" + sources."boom-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."sntp-2.0.2" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."asn1-0.2.3" + sources."dashdash-1.14.1" + sources."getpass-0.1.7" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.30.0" + sources."punycode-1.4.1" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."get-caller-file-1.0.2" + sources."os-locale-2.1.0" + sources."read-pkg-up-2.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + sources."which-module-2.0.0" + sources."y18n-3.2.1" + sources."yargs-parser-7.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."execa-0.7.0" + sources."lcid-1.0.0" + sources."mem-1.1.0" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" + sources."strip-eof-1.0.0" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.3.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" + sources."path-key-2.0.1" + sources."invert-kv-1.0.0" + sources."mimic-fn-1.1.0" + sources."find-up-2.1.0" + sources."read-pkg-2.0.0" + sources."locate-path-2.0.0" + sources."p-locate-2.0.0" + sources."path-exists-3.0.0" + sources."p-limit-1.1.0" + sources."load-json-file-2.0.0" + sources."normalize-package-data-2.4.0" + sources."path-type-2.0.0" + sources."graceful-fs-4.1.11" + sources."pify-2.3.0" + sources."strip-bom-3.0.0" + sources."hosted-git-info-2.5.0" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."concat-stream-1.6.0" + sources."doctrine-2.0.0" + sources."eslint-scope-3.7.1" + sources."espree-3.5.1" + sources."esquery-1.0.0" + sources."estraverse-4.2.0" + sources."file-entry-cache-2.0.0" + sources."functional-red-black-tree-1.0.1" + sources."glob-7.1.2" + sources."ignore-3.3.6" + sources."imurmurhash-0.1.4" + (sources."inquirer-3.3.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + sources."is-resolvable-1.0.0" + (sources."js-yaml-3.10.0" // { + dependencies = [ + sources."esprima-4.0.0" + ]; + }) + sources."levn-0.3.0" + sources."natural-compare-1.4.0" + sources."optionator-0.8.2" + sources."path-is-inside-1.0.2" + sources."pluralize-7.0.0" + sources."progress-2.0.0" + sources."strip-json-comments-2.0.1" + sources."table-4.0.2" + sources."text-table-0.2.0" + sources."typedarray-0.0.6" + sources."esrecurse-4.2.0" + sources."object-assign-4.1.1" + sources."acorn-5.1.2" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) + sources."flat-cache-1.3.0" + sources."circular-json-0.3.3" + sources."del-2.2.2" + sources."write-0.2.1" + sources."globby-5.0.0" + sources."is-path-cwd-1.0.0" + sources."is-path-in-cwd-1.0.0" + sources."pinkie-promise-2.0.1" + sources."rimraf-2.6.2" + sources."array-union-1.0.2" + sources."arrify-1.0.1" + sources."array-uniq-1.0.3" + sources."is-path-inside-1.0.0" + sources."pinkie-2.0.4" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."ansi-escapes-3.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + (sources."external-editor-2.0.5" // { + dependencies = [ + sources."tmp-0.0.33" + ]; + }) + sources."figures-2.0.0" + sources."mute-stream-0.0.7" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."through-2.3.8" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" + sources."iconv-lite-0.4.19" + sources."jschardet-1.5.1" + sources."is-promise-2.1.0" + sources."tryit-1.0.3" + sources."argparse-1.0.9" + sources."sprintf-js-1.0.3" + sources."prelude-ls-1.1.2" + sources."type-check-0.3.2" + sources."deep-is-0.1.3" + sources."wordwrap-1.0.0" + sources."fast-levenshtein-2.0.6" + sources."ajv-keywords-2.1.0" + (sources."slice-ansi-1.0.0" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."escope-3.6.0" + sources."is-my-json-valid-2.16.1" + sources."shelljs-0.7.8" + sources."user-home-2.0.0" + sources."es6-map-0.1.5" + sources."es6-weak-map-2.0.2" + sources."d-1.0.0" + sources."es5-ext-0.10.35" + sources."es6-iterator-2.0.3" + sources."es6-set-0.1.5" + sources."es6-symbol-3.1.1" + sources."event-emitter-0.3.5" + (sources."readline2-1.0.1" // { + dependencies = [ + sources."mute-stream-0.0.5" + ]; + }) + sources."exit-hook-1.1.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.1" + sources."is-property-1.0.2" + sources."interpret-1.0.4" + sources."rechoir-0.6.2" + sources."resolve-1.4.0" + sources."path-parse-1.0.5" + sources."fast-json-parse-1.0.3" + sources."fast-safe-stringify-1.2.0" + sources."flatstr-1.0.5" + sources."pump-1.0.2" + sources."quick-format-unescaped-1.1.1" + sources."split2-2.2.0" + sources."end-of-stream-1.4.0" + sources."through2-2.0.3" + sources."commander-2.11.0" + sources."strip-bom-buf-1.0.0" + sources."is-utf8-0.2.1" + sources."lodash.sortby-4.7.0" + (sources."tr46-1.0.1" // { + dependencies = [ + sources."punycode-2.1.0" + ]; + }) + sources."webidl-conversions-4.0.2" + sources."fd-slicer-1.0.1" + sources."buffer-crc32-0.2.13" + sources."pend-1.2.0" + sources."dtrace-provider-0.8.5" + (sources."mv-2.1.1" // { + dependencies = [ + sources."rimraf-2.4.5" + sources."glob-6.0.4" + ]; + }) + sources."safe-json-stringify-1.0.4" + sources."moment-2.19.1" + sources."nan-2.7.0" + sources."ncp-2.0.0" + sources."es6-promise-4.1.1" + sources."adm-zip-0.4.7" + sources."archiver-1.3.0" + sources."fs-extra-2.1.2" + sources."ini-1.3.4" + sources."jetpack-id-1.0.0" + sources."lazystream-1.0.0" + sources."xml2js-0.4.19" + sources."archiver-utils-1.3.0" + sources."tar-stream-1.5.4" + sources."zip-stream-1.2.0" + sources."walkdir-0.0.11" + sources."normalize-path-2.1.1" + sources."remove-trailing-separator-1.1.0" + sources."bl-1.2.1" + sources."compress-commons-1.2.2" + sources."crc32-stream-2.0.0" + sources."crc-3.5.0" + sources."jsonfile-2.4.0" + sources."sax-1.2.4" + sources."xmlbuilder-9.0.4" + sources."shell-quote-1.6.1" + sources."spawn-sync-1.0.15" + sources."when-3.7.7" + sources."winreg-0.0.12" + sources."graceful-readlink-1.0.1" + sources."array-filter-0.0.1" + sources."array-reduce-0.0.0" + sources."array-map-0.0.0" + sources."os-shim-0.1.3" + sources."is-absolute-0.1.7" + sources."is-relative-0.1.3" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."any-promise-1.3.0" + sources."thenify-all-1.6.0" + sources."thenify-3.3.0" + sources."firefox-client-0.3.0" + sources."colors-0.5.1" + (sources."js-select-0.6.0" // { + dependencies = [ + sources."traverse-0.4.6" + ]; + }) + sources."JSONSelect-0.2.1" + sources."growly-1.3.0" + sources."shellwords-0.1.1" + sources."error-ex-1.3.1" + sources."is-arrayish-0.2.1" + sources."caller-path-0.1.0" + sources."resolve-from-1.0.1" + sources."callsites-0.2.0" + sources."deepcopy-0.6.3" + (sources."jsonwebtoken-7.1.9" // { + dependencies = [ + sources."ms-0.7.3" + ]; + }) + (sources."joi-6.10.1" // { + dependencies = [ + sources."hoek-2.16.3" + ]; + }) + sources."jws-3.1.4" + sources."lodash.once-4.1.1" + (sources."topo-1.1.0" // { + dependencies = [ + sources."hoek-2.16.3" + ]; + }) + sources."isemail-1.2.0" + sources."base64url-2.0.0" + sources."jwa-1.1.5" + sources."buffer-equal-constant-time-1.0.1" + sources."ecdsa-sig-formatter-1.0.9" + sources."stream-to-array-2.3.0" + sources."chokidar-1.7.0" + sources."anymatch-1.3.2" + sources."async-each-1.0.1" + sources."glob-parent-2.0.0" + sources."is-binary-path-1.0.1" + sources."is-glob-2.0.1" + sources."readdirp-2.1.0" + sources."fsevents-1.1.2" + sources."micromatch-2.3.11" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.1" + sources."is-extglob-1.0.0" + sources."kind-of-3.2.2" + sources."object.omit-2.0.1" + sources."parse-glob-3.0.4" + sources."regex-cache-0.4.4" + sources."arr-flatten-1.1.0" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."is-buffer-1.1.5" + sources."is-posix-bracket-0.1.1" + sources."for-own-0.1.5" + sources."is-extendable-0.1.1" + sources."for-in-1.0.2" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."binary-extensions-1.10.0" + sources."set-immediate-shim-1.0.1" + (sources."node-pre-gyp-0.6.38" // { + dependencies = [ + sources."request-2.81.0" + sources."hawk-3.1.3" + sources."aws-sign2-0.6.0" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" + sources."http-signature-1.1.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."assert-plus-0.2.0" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + sources."nopt-4.0.1" + sources."npmlog-4.1.2" + sources."rc-1.2.2" + sources."tar-2.2.1" + sources."tar-pack-3.4.0" + sources."abbrev-1.1.1" + sources."osenv-0.1.4" + sources."are-we-there-yet-1.1.4" + sources."console-control-strings-1.1.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."delegates-1.0.0" + sources."aproba-1.2.0" + sources."has-unicode-2.0.1" + (sources."wide-align-1.1.2" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."deep-extend-0.4.2" + sources."block-stream-0.0.9" + sources."fstream-1.0.11" + sources."fstream-ignore-1.0.5" + sources."uid-number-0.0.6" + sources."boxen-1.2.2" + sources."configstore-3.1.1" + sources."import-lazy-2.1.0" + sources."is-npm-1.0.0" + sources."latest-version-3.1.0" + sources."semver-diff-2.1.0" + sources."xdg-basedir-3.0.0" + sources."ansi-align-2.0.0" + sources."cli-boxes-1.0.0" + sources."term-size-1.2.0" + (sources."widest-line-1.0.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."dot-prop-4.2.0" + (sources."make-dir-1.1.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."unique-string-1.0.0" + sources."write-file-atomic-2.3.0" + sources."is-obj-1.0.1" + sources."crypto-random-string-1.0.0" + sources."package-json-4.0.1" + sources."got-6.7.1" + sources."registry-auth-token-3.3.1" + sources."registry-url-3.1.0" + sources."create-error-class-3.0.2" + sources."duplexer3-0.1.4" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."lowercase-keys-1.0.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."prepend-http-1.0.4" + sources."jszip-2.6.1" + sources."pako-1.0.6" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A command line tool to help build, run, and test web extensions"; + homepage = https://github.com/mozilla/web-ext; + license = "MPL-2.0"; + }; + production = true; + }; wring = nodeEnv.buildNodePackage { name = "wring"; packageName = "wring"; @@ -36866,10 +38866,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.0.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.0.2.tgz"; - sha1 = "d1b8f4b6d3b0684e86f63a072ac630995b8b7b0a"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.2.1.tgz"; + sha1 = "0d628dc01438881a1663a6f83cbf7ac5db7a75fc"; }; buildInputs = globalBuildInputs; meta = { @@ -36899,10 +38899,10 @@ in sources."humanize-string-1.0.1" (sources."inquirer-3.3.0" // { dependencies = [ - sources."chalk-2.1.0" + sources."chalk-2.2.0" sources."strip-ansi-4.0.0" sources."ansi-styles-3.2.0" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" sources."ansi-regex-3.0.0" ]; }) @@ -36956,6 +38956,7 @@ in sources."read-pkg-2.0.0" sources."load-json-file-2.0.0" sources."path-type-2.0.0" + sources."pify-2.3.0" sources."strip-bom-3.0.0" ]; }) @@ -36978,7 +38979,13 @@ in ]; }) sources."titleize-1.0.0" - sources."update-notifier-2.2.0" + (sources."update-notifier-2.3.0" // { + dependencies = [ + sources."chalk-2.2.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + ]; + }) sources."user-home-2.0.0" (sources."yeoman-character-1.1.0" // { dependencies = [ @@ -36987,7 +38994,15 @@ in ]; }) sources."yeoman-doctor-2.1.0" - sources."yeoman-environment-2.0.3" + (sources."yeoman-environment-2.0.5" // { + dependencies = [ + sources."chalk-2.2.0" + sources."debug-3.1.0" + sources."log-symbols-2.1.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.5.0" + ]; + }) (sources."yosay-2.0.1" // { dependencies = [ sources."ansi-styles-3.2.0" @@ -37001,12 +39016,12 @@ in sources."ansi-regex-2.1.1" sources."dot-prop-4.2.0" sources."graceful-fs-4.1.11" - sources."make-dir-1.0.0" + sources."make-dir-1.1.0" sources."unique-string-1.0.0" sources."write-file-atomic-2.3.0" sources."xdg-basedir-3.0.0" sources."is-obj-1.0.1" - sources."pify-2.3.0" + sources."pify-3.0.0" sources."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" sources."signal-exit-3.0.2" @@ -37025,11 +39040,12 @@ in (sources."passwd-user-2.1.0" // { dependencies = [ sources."execa-0.4.0" + sources."pify-2.3.0" sources."npm-run-path-1.0.0" sources."path-key-1.0.0" ]; }) - sources."rc-1.2.1" + sources."rc-1.2.2" sources."get-stream-3.0.0" sources."is-stream-1.1.0" sources."npm-run-path-2.0.2" @@ -37087,7 +39103,7 @@ in sources."is-fullwidth-code-point-2.0.0" sources."lodash.debounce-3.1.1" sources."os-name-1.0.3" - sources."request-2.82.0" + sources."request-2.83.0" sources."tough-cookie-2.3.3" sources."uuid-3.1.0" (sources."mkdirp-0.5.1" // { @@ -37134,7 +39150,7 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.2" + sources."ajv-5.2.4" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -37190,8 +39206,16 @@ in sources."path-exists-2.1.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" - sources."load-json-file-1.1.0" - sources."path-type-1.1.0" + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."parse-json-2.2.0" sources."strip-bom-2.0.0" sources."error-ex-1.3.1" @@ -37245,15 +39269,16 @@ in sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - (sources."boxen-1.2.1" // { + (sources."boxen-1.2.2" // { dependencies = [ sources."camelcase-4.1.0" - sources."chalk-2.1.0" + sources."chalk-2.2.0" sources."ansi-styles-3.2.0" - sources."supports-color-4.4.0" + sources."supports-color-4.5.0" ]; }) sources."import-lazy-2.1.0" + sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" (sources."latest-version-3.1.0" // { dependencies = [ @@ -37274,6 +39299,9 @@ in sources."is-fullwidth-code-point-1.0.0" ]; }) + sources."global-dirs-0.1.0" + sources."is-path-inside-1.0.0" + sources."path-is-inside-1.0.2" (sources."bin-version-check-2.1.0" // { dependencies = [ sources."semver-4.3.6" @@ -37299,8 +39327,12 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."diff-3.3.1" - sources."globby-6.1.0" + sources."diff-3.4.0" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."grouped-queue-0.3.3" sources."is-scoped-1.0.0" sources."mem-fs-1.1.3" @@ -37314,7 +39346,11 @@ in sources."scoped-regex-1.0.0" sources."through2-2.0.3" sources."vinyl-1.2.0" - sources."vinyl-file-2.0.0" + (sources."vinyl-file-2.0.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."xtend-4.0.1" sources."clone-1.0.2" sources."clone-stats-0.0.1" @@ -37338,4 +39374,4 @@ in }; production = true; }; -} +} \ No newline at end of file From acbe3a869c15a94c89f409f81b3e9cfc89d7f3a3 Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Mon, 23 Oct 2017 18:49:58 +0800 Subject: [PATCH 1570/2806] git-crypt: add runtime dependencies to PATH git-crypt won't work if git and git-crypt are not in PATH. This surfaced after dbb8958. Test like this: ``` PATH= $(nix-build --no-out-link '' --attr git-crypt)/bin/git-crypt unlock ``` --- .../version-management/git-and-tools/git-crypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 98cce617833..0d6b206cb4a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, gnupg1compat, makeWrapper }: +{ fetchFromGitHub, git, gnupg1compat, makeWrapper, openssl, stdenv }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' make install PREFIX=$out - wrapProgram $out/bin/* --prefix PATH : ${gnupg1compat}/bin + wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg1compat}/bin ''; meta = with stdenv.lib; { From 3ee70f64f0df0fdb281b7277fb6b9420e756647e Mon Sep 17 00:00:00 2001 From: Emanuele Peruffo Date: Mon, 23 Oct 2017 13:35:47 +0200 Subject: [PATCH 1571/2806] libreoffice: add Italian language Added the Italian language to the list of supported languages for Nix. --- pkgs/applications/office/libreoffice/default.nix | 2 +- pkgs/applications/office/libreoffice/still.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 830692f08eb..830ae68fd1b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas , defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme -, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ] +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] , withHelp ? true , kdeIntegration ? false }: diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index dfe6e947080..a3991b8b35c 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas , defaultIconTheme, glib, ncurses -, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ] +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] , withHelp ? true , kdeIntegration ? false }: @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { # It also seems not to mention libdl explicitly in some places. NIX_LDFLAGS = "-lcups -ldl"; - # For some reason librdf_redland sometimes refers to rasqal.h instead + # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; From 7144f88c482df8baf1d045f47f8f8d1ed9090175 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Mon, 23 Oct 2017 13:59:37 +0200 Subject: [PATCH 1572/2806] open-vm-tools: Fix rebooting on NixOS --- pkgs/applications/virtualization/open-vm-tools/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index bc280823a3c..c7f8ea696b5 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -36,6 +36,9 @@ stdenv.mkDerivation rec { # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. sed 1i'#include ' -i lib/wiper/wiperPosix.c + + # Make reboot work, shutdown is not in /sbin on NixOS + sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c ''; configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ] From 9bd930560292209b569158a0a591b59108dd4dd9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Oct 2017 08:33:11 -0400 Subject: [PATCH 1573/2806] curl: 7.56.0 -> 7.56.1 --- 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 c01dbbaa3a7..d67b34371fe 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.56.0"; + name = "curl-7.56.1"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1pvr2bqfhk46bzq2x2hskmnq3wc8qxlps7apm9q1qiixb9ra8q6y"; + sha256 = "142zidvlmrz31yx480nrhh47hl01d7jbaagin23pspl7cw1ng515"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From 124e462455bd2d980fde2461b41fabdb9387b3d1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Oct 2017 08:46:15 -0400 Subject: [PATCH 1574/2806] git: 2.14.2 -> 2.14.3 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 51f523305d1..b3c642de9b2 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.14.2"; + version = "2.14.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "18f70gfzwqd210806hmf94blcd7yv5h9ka6xqkpd2jhijqwp5sah"; + sha256 = "078m0za5gyzcah5iaxdwx663yvdp8byvjc8rpzjzcrr4sl6rcc2k"; }; hardeningDisable = [ "format" ]; From 4ea79d3f365c90ab22b66cb499a2a0532f9469ef Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Oct 2017 08:49:39 -0400 Subject: [PATCH 1575/2806] linux: 4.14-rc5 -> 4.14-rc6 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index fe5cd8989de..3a8d82cdb26 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc5"; - modDirVersion = "4.14.0-rc5"; + version = "4.14-rc6"; + modDirVersion = "4.14.0-rc6"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1y383vw79jhpr15s919xwzxif2y8zbiwa64sg2aan075xfhzijp8"; + sha256 = "0gmxrf4jmw8xl5gx487chyx94yas7rva5jbkczm9iw9sw0c8gwcb"; }; # Should the testing kernels ever be built on Hydra? From 2cbfe0a5dbc37cb7d12dc20075019f1e08bcc00e Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Mon, 23 Oct 2017 19:52:44 +0700 Subject: [PATCH 1576/2806] maintainers: add xzfc --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4bb12dcfcc8..1054fd851af 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -671,6 +671,7 @@ xnwdd = "Guillermo NWDD "; xvapx = "Marti Serra "; xwvvvvwx = "David Terry "; + xzfc = "Albert Safin "; yarr = "Dmitry V. "; yegortimoshenko = "Yegor Timoshenko "; yochai = "Yochai "; From bed5bb1f5e9c315070759ef2952d7b1ab1816132 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Oct 2017 15:12:39 +0200 Subject: [PATCH 1577/2806] fix eval cc @zimbatm (https://nix-cache.s3.amazonaws.com/log/iyn9cwk0kymi4mzva0dzpqwnzm3cg4a4-nixpkgs-tarball-18.03pre118395.891c3721ed.drv) --- 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 5225e95b1e1..682e85ce867 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -56,6 +56,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 = platforms.linux ++ platforms.darwin; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } From 7b3a61af73fad347d52af7f950cddf6ca36fdcdb Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 23 Oct 2017 14:53:14 +0200 Subject: [PATCH 1578/2806] gogland: fix debugger --- pkgs/applications/editors/jetbrains/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b18b27d9c2c..41ad3164d6a 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -78,7 +78,7 @@ let }); buildGogland = { name, version, src, license, description, wmClass, update-channel }: - (mkJetBrainsProduct { + lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Gogland"; meta = with stdenv.lib; { @@ -93,6 +93,13 @@ let maintainers = [ maintainers.miltador ]; platforms = platforms.linux; }; + }) (attrs: { + postFixup = (attrs.postFixup or "") + '' + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter $interp $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + + chmod +x $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + ''; }); buildIdea = { name, version, src, license, description, wmClass, update-channel }: From ab409e01c9013a8e929ec2542645607f77a99663 Mon Sep 17 00:00:00 2001 From: fusion809 Date: Mon, 23 Oct 2017 23:34:56 +1000 Subject: [PATCH 1579/2806] Bumping to 1.2.0 Per #30719 I am bumping to version 1.2.0. --- pkgs/applications/editors/notepadqq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index 9b3896e32d6..6d1bba8c4d5 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }: +{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit}: let - version = "0.53.0"; + version = "1.2.0"; in stdenv.mkDerivation { name = "notepadqq-${version}"; src = fetchgit { url = "https://github.com/notepadqq/notepadqq.git"; - rev = "3b0751277fb268ec72b466b37d0f0977c536bc1b"; - sha256 = "0hw94mn2xg2r58afvz1xg990jinv9aa33942zgwq54qwj61r93hi"; + rev = "ab074d30e02d49e0fe6957c1523e7fed239aff7d"; + sha256 = "0j8vqsdw314qpk5lrgccm9n7gbyr14ac3s65sl1qn87pxhrz1hpg"; fetchSubmodules = true; }; From acf1ae02dcaee644704a12866c434eee2a6a5a65 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 23:43:56 +0300 Subject: [PATCH 1580/2806] libx86: Supports only x86 In theory it builds for 32-bit ARM but the result probably doesn't work in a meaningful manner... --- pkgs/development/libraries/libx86/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index 162d284f402..d73d67a39cf 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html makeFlags = [ "DESTDIR=$(out)" - ] ++ stdenv.lib.optional (stdenv.isx86_64 || stdenv.isArm) "BACKEND=x86emu"; + ] ++ stdenv.lib.optional (!stdenv.isi686) "BACKEND=x86emu"; preBuild = '' sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Real-mode x86 code emulator"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux ++ freebsd ++ netbsd; + platforms = [ "x86_64-linux" "i686-linux" ]; license = licenses.mit; }; } From 681c8006f5ea89f949880b6bc05d29a5422c6320 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Oct 2017 23:45:00 +0300 Subject: [PATCH 1581/2806] read-edid: Only depend on libx86 on x86 --- pkgs/os-specific/linux/read-edid/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix index fdf2c4c9f12..3e57bbc11bd 100644 --- a/pkgs/os-specific/linux/read-edid/default.nix +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libx86 }: +{ stdenv, lib, fetchurl, cmake, libx86 }: stdenv.mkDerivation rec { name = "read-edid-${version}"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7"; }; - buildInputs = [ cmake libx86 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86; + + cmakeFlags = [ "-DCLASSICBUILD=${if stdenv.isi686 || stdenv.isx86_64 then "ON" else "OFF"}" ]; patchPhase = '' substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE' From 90729600a8b2dec50c4d0e9cf3d86f1b1e8becad Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Mon, 23 Oct 2017 19:29:16 +0700 Subject: [PATCH 1582/2806] xpointerbarrier: init at 17.10 --- pkgs/tools/X11/xpointerbarrier/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/X11/xpointerbarrier/default.nix diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix new file mode 100644 index 00000000000..5eb1faafe2e --- /dev/null +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -0,0 +1,24 @@ +{ stdenv, xorg, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "xpointerbarrier-${version}"; + version = "17.10"; + + src = fetchFromGitHub { + owner = "vain"; + repo = "xpointerbarrier"; + rev = "v${version}"; + sha256 = "0p4qc7ggndf74d2xdf38659prx3r3lfi5jc8nmqx52c9fqdshcrk"; + }; + + buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ]; + + makeFlags = "prefix=$(out)"; + + meta = { + homepage = https://github.com/vain/xpointerbarrier; + description = "Create X11 pointer barriers around your working area"; + license = stdenv.lib.licenses.mit; + maintainers = stdenv.lib.maintainers.xzfc; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 409913757f9..f469744ee7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17331,6 +17331,8 @@ with pkgs; xpdf = libsForQt5.callPackage ../applications/misc/xpdf { }; + xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {}; + xkb_switch = callPackage ../tools/X11/xkb-switch { }; xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; From 61089ddceec7d05a05efd4db9bbdf4b45d102b9c Mon Sep 17 00:00:00 2001 From: joachim schiele Date: Wed, 13 Sep 2017 12:13:08 +0200 Subject: [PATCH 1583/2806] opendkim: automated key generation (no manual changes for service initialization required anymore) --- nixos/modules/rename.nix | 3 +++ nixos/modules/services/mail/opendkim.nix | 26 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index b1b3f67a41d..f30cbe427f0 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -112,6 +112,9 @@ with lib; (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]) + # opendkim + (mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ]) + # XBMC (mkRenamedOptionModule [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]) (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]) diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index f065208ddfc..59a8373843a 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -8,10 +8,12 @@ let defaultSock = "local:/run/opendkim/opendkim.sock"; + keyFile = "${cfg.keyPath}/${cfg.selector}.private"; + args = [ "-f" "-l" "-p" cfg.socket "-d" cfg.domains - "-k" cfg.keyFile + "-k" keyFile "-s" cfg.selector ] ++ optionals (cfg.configFile != null) [ "-x" cfg.configFile ]; @@ -57,9 +59,13 @@ in { ''; }; - keyFile = mkOption { + keyPath = mkOption { type = types.path; - description = "Secret key file used for signing messages."; + description = '' + The path that opendkim should put its generated private keys into. + The DNS settings will be found in this directory with the name selector.txt. + ''; + default = "/var/lib/opendkim/keys"; }; selector = mkOption { @@ -100,11 +106,25 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -p "${cfg.keyPath}" + cd "${cfg.keyPath}" + if ! test -f ${cfg.selector}.private; then + ${pkgs.opendkim}/bin/opendkim-genkey -s ${cfg.selector} -d all-domains-generic-key + echo "Generated OpenDKIM key! Please update your DNS settings:\n" + echo "-------------------------------------------------------------" + cat ${cfg.selector}.txt + echo "-------------------------------------------------------------" + fi + chown ${cfg.user}:${cfg.group} ${cfg.selector}.private + ''; + serviceConfig = { ExecStart = "${pkgs.opendkim}/bin/opendkim ${escapeShellArgs args}"; User = cfg.user; Group = cfg.group; RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim"; + PermissionsStartOnly = true; }; }; From 02f4079fce5d7914c5ffe443fa2cf27b89f439e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Oct 2017 17:18:10 +0200 Subject: [PATCH 1584/2806] LTS Haskell 9.10 --- .../configuration-hackage2nix.yaml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7e286926af0..8de2749004e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.9 + # LTS Haskell 9.10 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -801,7 +801,7 @@ default-package-overrides: - gitson ==0.5.2 - gi-webkit ==3.0.14 - gl ==0.8.0 - - glabrous ==0.3.2 + - glabrous ==0.3.3 - glaze ==0.3.0.1 - glazier ==0.11.0.1 - glazier-pipes ==0.1.5.1 @@ -998,7 +998,7 @@ default-package-overrides: - hasmin ==0.3.3 - hasql ==0.19.18.2 - hasql-migration ==0.1.3 - - hasql-pool ==0.4.1 + - hasql-pool ==0.4.2.1 - hasql-transaction ==0.5.1 - hastache ==0.6.1 - hasty-hamiltonian ==1.3.0 @@ -1024,7 +1024,7 @@ default-package-overrides: - hebrew-time ==0.1.1 - hedgehog ==0.5 - hedgehog-quickcheck ==0.1 - - hedis ==0.9.9 + - hedis ==0.9.10 - here ==1.2.11 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.0 @@ -1248,7 +1248,7 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.1.1 - jailbreak-cabal ==1.3.2 - - javascript-extras ==0.3.1.0 + - javascript-extras ==0.3.2.0 - jmacro ==0.6.14 - jmacro-rpc ==0.3.2 - jmacro-rpc-happstack ==0.3.2 @@ -1271,7 +1271,7 @@ default-package-overrides: - jwt ==0.7.2 - kan-extensions ==5.0.2 - kansas-comet ==0.4 - - katip ==0.5.0.3 + - katip ==0.5.1.0 - kawhi ==0.3.0 - kdt ==0.2.4 - keter ==1.4.3.2 @@ -1490,7 +1490,7 @@ default-package-overrides: - mysql ==0.1.4 - mysql-haskell ==0.8.0.0 - mysql-haskell-openssl ==0.8.0.0 - - mysql-simple ==0.4.3 + - mysql-simple ==0.4.4 - nagios-check ==0.3.2 - names-th ==0.2.0.3 - nano-erl ==0.1.0.1 @@ -1638,7 +1638,7 @@ default-package-overrides: - persistent-redis ==2.5.2 - persistent-refs ==0.4 - persistent-sqlite ==2.6.2 - - persistent-template ==2.5.2 + - persistent-template ==2.5.3 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 - phantom-state ==0.2.1.2 @@ -1649,13 +1649,13 @@ default-package-overrides: - pinboard ==0.9.12.5 - pinch ==0.3.2.0 - pinchot ==0.24.0.0 - - pipes ==4.3.5 + - pipes ==4.3.6 - pipes-attoparsec ==0.5.1.5 - pipes-bytestring ==2.1.6 - pipes-cacophony ==0.5.0 - pipes-category ==0.2.0.1 - pipes-concurrency ==2.0.8 - - pipes-extras ==1.0.11 + - pipes-extras ==1.0.12 - pipes-fluid ==0.5.0.3 - pipes-group ==1.0.8 - pipes-misc ==0.3.0.0 @@ -1716,7 +1716,7 @@ default-package-overrides: - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - pretty-show ==1.6.13 - - pretty-simple ==2.0.0.0 + - pretty-simple ==2.0.1.0 - pretty-types ==0.2.3.1 - primes ==0.2.1.0 - primitive ==0.6.2.0 @@ -1752,7 +1752,7 @@ default-package-overrides: - publicsuffix ==0.20170508 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript-bridge ==0.11.0.0 + - purescript-bridge ==0.11.1.0 - pusher-http-haskell ==1.2.0.1 - pwstore-fast ==2.4.4 - QuasiText ==0.1.2.6 @@ -2096,7 +2096,7 @@ default-package-overrides: - tar ==0.5.0.3 - tar-conduit ==0.1.1 - tardis ==0.4.1.0 - - tasty ==0.11.2.5 + - tasty ==0.11.3 - tasty-ant-xml ==1.1.0 - tasty-auto ==0.2.0.0 - tasty-dejafu ==0.6.0.0 @@ -2283,7 +2283,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.4.3.1 - unix-time ==0.3.7 - - unliftio ==0.1.0.0 + - unliftio ==0.1.1.0 - unliftio-core ==0.1.0.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.8.0 @@ -2325,7 +2325,7 @@ default-package-overrides: - verbosity ==0.2.3.0 - versions ==3.1.1 - vhd ==0.2.2 - - ViennaRNAParser ==1.3.2 + - ViennaRNAParser ==1.3.3 - viewprof ==0.0.0.10 - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 From 714edcad24af38534958543cd5c6bf7d123da4a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Oct 2017 03:00:34 +0200 Subject: [PATCH 1585/2806] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.6-11-g74d58ee from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4932dd52cbb0f9bb843dfffcac595c5c0a0d61c5. --- .../haskell-modules/hackage-packages.nix | 1402 +++++++++++++---- 1 file changed, 1076 insertions(+), 326 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a59b296b8f3..b9b9e75c859 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -280,8 +280,8 @@ self: { }: mkDerivation { pname = "ADPfusionSet"; - version = "0.0.0.1"; - sha256 = "0prhxzvg489z2s77djay7airflfdgvvxx2d262gj7yz6945l6nyb"; + version = "0.0.0.2"; + sha256 = "05ziz4liywh2kawi4nk7ldh65k3yn3zcbmqk0vs9vy3jc2niyk7g"; libraryHaskellDepends = [ ADPfusion base bits containers DPutils mmorph mtl OrderedBits primitive PrimitiveArray QuickCheck strict template-haskell @@ -6503,8 +6503,8 @@ self: { }: mkDerivation { pname = "Gifcurry"; - version = "2.2.0.0"; - sha256 = "19f5prpnf3c3ga85ad1s1q5nl78n67iva5cwppkqklc15w0ad3rs"; + version = "2.3.0.0"; + sha256 = "1xwmkr68x7mmmimx8kp2fjrfkg02fmsm0wzy93fqsdbs5vi1jqch"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -10280,6 +10280,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "IPv6DB_0_2_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger + , hedis, hspec, http-client, http-types, IPv6Addr, mtl + , optparse-applicative, text, unordered-containers, vector, wai + , wai-logger, warp + }: + mkDerivation { + pname = "IPv6DB"; + version = "0.2.3"; + sha256 = "0j51v7y475wdrhjwrqrmlh6574l032vh7zsdhxqx723f7iswjimf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring fast-logger hedis http-types IPv6Addr mtl + optparse-applicative text unordered-containers vector wai + wai-logger warp + ]; + testHaskellDepends = [ + aeson base hspec http-client http-types vector + ]; + homepage = "http://ipv6db.cybervisible.com"; + description = "A RESTful Web Service for IPv6-related data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IcoGrid" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -18283,14 +18313,14 @@ self: { }: mkDerivation { pname = "ViennaRNAParser"; - version = "1.3.2"; - sha256 = "0i581xpg9qmqw2pbkqj82xv8p0c9x12a7k9h3gq3vvkplkqlvzys"; + version = "1.3.3"; + sha256 = "1zmfzdp28g9mz99yp2kv98g745a2p4cls4553izcbc5q0v8l3sby"; libraryHaskellDepends = [ base parsec ParsecTools process transformers ]; testHaskellDepends = [ base hspec parsec ]; description = "Libary for parsing ViennaRNA package output"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }) {}; "Villefort" = callPackage @@ -21289,7 +21319,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_2_2_0" = callPackage + "aeson_1_2_3_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable @@ -21301,8 +21331,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.2.2.0"; - sha256 = "1ziwbwy2zkms3sknrq2iz6h0hdd372qvrsjrbnyknxx2p4cfr7hg"; + version = "1.2.3.0"; + sha256 = "1gwwqpbj6j93nlm6rvhdmvs0sq8rn17cwpyw7wdphanwjn9cdkda"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text @@ -26059,37 +26089,36 @@ self: { "api-tools" = callPackage ({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base - , base64-bytestring, bytestring, Cabal, case-insensitive - , containers, deepseq, happy, lens, old-locale, QuickCheck - , regex-compat-tdfa, safe, safecopy, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, time - , unordered-containers, vector + , base16-bytestring, base64-bytestring, binary, bytestring, Cabal + , case-insensitive, cborg, containers, deepseq, happy, lens + , QuickCheck, regex-compat-tdfa, safe, safecopy, scientific + , serialise, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, unordered-containers, vector }: mkDerivation { pname = "api-tools"; - version = "0.5.2"; - sha256 = "0pd2kaii40isbnc1rgh0zkm2abrljipmq27nlgz3zbldbm1l5xw6"; - revision = "1"; - editedCabalFile = "0mmay0si68ib7slc044fjxcsylg2499gn6i2migfi0v07qdc3na3"; + version = "0.8.0.1"; + sha256 = "19a2g5rym3cydbdb9b6x0rm7xdw2m5ckqdzb02yblx9pv045nfzx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty array attoparsec base base64-bytestring - bytestring Cabal case-insensitive containers deepseq lens - old-locale QuickCheck regex-compat-tdfa safe safecopy - template-haskell text time unordered-containers vector + aeson aeson-pretty array attoparsec base base16-bytestring + base64-bytestring binary bytestring Cabal case-insensitive cborg + containers deepseq lens QuickCheck regex-compat-tdfa safe safecopy + scientific serialise template-haskell text time + unordered-containers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring - bytestring case-insensitive containers lens old-locale QuickCheck - regex-compat-tdfa safe safecopy template-haskell text time - unordered-containers vector + bytestring case-insensitive cborg containers deepseq lens + QuickCheck regex-compat-tdfa safe safecopy serialise + template-haskell text time unordered-containers vector ]; testHaskellDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring - bytestring Cabal case-insensitive containers lens old-locale - QuickCheck regex-compat-tdfa safe safecopy tasty tasty-hunit + bytestring Cabal case-insensitive cborg containers lens QuickCheck + regex-compat-tdfa safe safecopy serialise tasty tasty-hunit tasty-quickcheck template-haskell text time unordered-containers vector ]; @@ -31381,6 +31410,8 @@ self: { pname = "basement"; version = "0.0.3"; sha256 = "06jwanjdd3dw2n6i1c77513abin113f90nsj9vals8krgvq8jnr7"; + revision = "1"; + editedCabalFile = "1abv3p6y527vfg69y8fxvmgfi0mrrcvr1gvi9f0hvnq7vc2zs6jw"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell-foundation/foundation"; description = "Foundation scrap box of array & string"; @@ -34636,17 +34667,20 @@ self: { }) {inherit (pkgs) gmp;}; "bitset-word8" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck - , template-haskell, th-lift-instances + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , hspec, QuickCheck, template-haskell, th-lift-instances, vector }: mkDerivation { pname = "bitset-word8"; - version = "0.1.0.1"; - sha256 = "1lsjaxv7858r5xl8a0lffghlmj3w853ndmmfybki7cfwcqr3mhk2"; + version = "0.1.1.0"; + sha256 = "01lvkz6j925pfbh5ik1imxjpf8idvm7bxpp63jxmslsz7pnyvs8l"; libraryHaskellDepends = [ - base bytestring containers template-haskell th-lift-instances + base containers template-haskell th-lift-instances ]; testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq vector + ]; homepage = "https://github.com/nshimaza/bitset-word8#readme"; description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP"; license = stdenv.lib.licenses.mit; @@ -34976,6 +35010,8 @@ self: { pname = "blank-canvas"; version = "0.6.1"; sha256 = "06jsbqbd67hyb1k2yv0iqn11rhqhycl1c9afrnmwh05bic9wsdf6"; + revision = "1"; + editedCabalFile = "16r1hhdk592da4xpzhscn7zcxczla4vmr2klj968wgnrx8ky5kqy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour @@ -38260,8 +38296,8 @@ self: { ({ mkDerivation, base, c2hs }: mkDerivation { pname = "c2hs-extra"; - version = "0.1.0.0"; - sha256 = "0gcbapdxcdv0bfyh5j4575kx23ygz7mpbir9rcdar5dvp9aslbzj"; + version = "0.1.0.1"; + sha256 = "1vasv9gwsvb3l5faka11rs0rr0h0gwif76bkk49n9pvxskqla9sk"; libraryHaskellDepends = [ base ]; libraryToolDepends = [ c2hs ]; homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; @@ -42019,17 +42055,16 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "chart-unit_0_5_3" = callPackage + "chart-unit_0_5_4" = callPackage ({ mkDerivation, base, colour, containers, data-default - , diagrams-lib, diagrams-rasterific, diagrams-svg, foldl - , formatting, lens, linear, mwc-probability, mwc-random, numhask - , numhask-range, palette, primitive, protolude, SVGFonts, tasty - , tasty-hspec, tdigest, text + , diagrams-lib, diagrams-svg, foldl, formatting, lens, linear + , mwc-probability, mwc-random, numhask, numhask-range, palette + , primitive, protolude, SVGFonts, tasty, tasty-hspec, tdigest, text }: mkDerivation { pname = "chart-unit"; - version = "0.5.3"; - sha256 = "0kr57pv63xlx2xnc0cj0da1bc5cf8icnw81lbndrdxh126si50k5"; + version = "0.5.4"; + sha256 = "1zyfh713sr8bhyn6v2la52xzyq7frg0igwxhfl8ym8l7nhxrrby7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42037,9 +42072,8 @@ self: { lens linear numhask numhask-range palette SVGFonts text ]; executableHaskellDepends = [ - base containers diagrams-lib diagrams-rasterific diagrams-svg foldl - formatting lens mwc-probability mwc-random numhask primitive - protolude tdigest text + base containers diagrams-lib diagrams-svg foldl formatting lens + mwc-probability mwc-random numhask primitive protolude tdigest text ]; testHaskellDepends = [ base numhask tasty tasty-hspec text ]; homepage = "https://github.com/tonyday567/chart-unit"; @@ -42348,22 +42382,22 @@ self: { ({ mkDerivation, base, bytestring, containers, diff-parse , directory, file-embed, filepath, github, hlint, hspec , hspec-megaparsec, interpolatedstring-perl6, megaparsec - , monad-parallel, optparse-applicative, QuickCheck, quickcheck-text - , range, temporary, text + , monad-parallel, optparse-applicative, process, QuickCheck + , quickcheck-text, range, temporary, text }: mkDerivation { pname = "checkmate"; - version = "0.2.1"; - sha256 = "0ks073hppsafbg4cy021yc6pnp0p5gm15qr1067a0w0sny5z81z3"; + version = "0.3.0"; + sha256 = "0yqinjpc65flh50kb2jax10lrmcbp8lcy36ivrya180wdfvlcm0n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers diff-parse directory filepath megaparsec + base containers diff-parse directory filepath github megaparsec monad-parallel range text ]; executableHaskellDepends = [ - base diff-parse directory filepath github megaparsec - optparse-applicative range text + base diff-parse directory filepath megaparsec optparse-applicative + process range text ]; testHaskellDepends = [ base bytestring diff-parse directory file-embed filepath hlint @@ -47934,6 +47968,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-extra_1_2_0" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , bytestring-builder, conduit, criterion, directory, exceptions + , filepath, hspec, monad-control, network, primitive, process + , QuickCheck, resourcet, stm, streaming-commons, text, transformers + , transformers-base + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.2.0"; + sha256 = "0f13r6ypch3px7qfh6a2qj2y5yhdzwy53v0f6bxyc9xl0hxf49yq"; + libraryHaskellDepends = [ + async attoparsec base blaze-builder bytestring conduit directory + exceptions filepath monad-control network primitive process + resourcet stm streaming-commons text transformers transformers-base + ]; + testHaskellDepends = [ + async attoparsec base blaze-builder bytestring bytestring-builder + conduit directory exceptions hspec process QuickCheck resourcet stm + streaming-commons text transformers transformers-base + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring bytestring-builder conduit criterion + 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 @@ -52638,8 +52703,8 @@ self: { ({ mkDerivation, base, hspec, text }: mkDerivation { pname = "currencies"; - version = "0.1.1.0"; - sha256 = "07mkzn12rwlgfv7l0b507sqhl2hw56clmj6sfj0cmdyq9i75lj55"; + version = "0.1.1.1"; + sha256 = "1w0b7wp3kz8iqm25s28w131g923pysp9s1p7ll7df5wr64fh53nm"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hspec text ]; homepage = "https://github.com/alx741/currencies#readme"; @@ -59526,10 +59591,8 @@ self: { }: mkDerivation { pname = "discrimination"; - version = "0.2.1"; - sha256 = "1krcpv1vp8wa4kdlg3ikx895vf96czkw0i3sczw8vyascczs8cdl"; - revision = "3"; - editedCabalFile = "1g0dixgjmdc1hr7b9w57rm7agp3419bd2akv9wysghmsvf3j7893"; + version = "0.3"; + sha256 = "18scvjb4vj1y9mwhanr8h73bs80h1d23m2vrixm48riyg22v5m6n"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-prim hashable primitive profunctors promises semigroups transformers @@ -59608,10 +59671,8 @@ self: { }: mkDerivation { pname = "diskhash"; - version = "0.0.1.2"; - sha256 = "10fmh48xndy3bs1aphm9y9rh8lax4spyysr675d69gabhxm3qcvb"; - revision = "1"; - editedCabalFile = "10kck6rz2x0c0vnzr916qy9ss5aq6fr2jq7c8mpking3668j3ann"; + version = "0.0.2.1"; + sha256 = "1kgjwcggi33jw1k1s462cya6hydcz7ka9pkqk2lgdcxwlw9fy9kb"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring directory HUnit QuickCheck test-framework @@ -60904,6 +60965,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "doctemplates_0_2_1" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, hspec, parsec, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "doctemplates"; + version = "0.2.1"; + sha256 = "1bfs2kl5j5al2w2y4qpbn68p0xsnb65r7h51l356kpkzc326646p"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers parsec + scientific text unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec text ]; + homepage = "https://github.com/jgm/doctemplates#readme"; + description = "Pandoc-style document templates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process @@ -62868,6 +62950,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eap" = callPackage + ({ mkDerivation, base, binary, bytestring }: + mkDerivation { + pname = "eap"; + version = "0.1.0.0"; + sha256 = "118nayxnc8xwyhx622wvgr3l35v90481j50m43x2zfkwish23dir"; + libraryHaskellDepends = [ base binary bytestring ]; + homepage = "https://github.com/erickg/eap#readme"; + description = "Extensible Authentication Protocol (EAP)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "earclipper" = callPackage ({ mkDerivation, base, filepath, hspec }: mkDerivation { @@ -63742,6 +63836,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "either_4_5" = callPackage + ({ mkDerivation, base, bifunctors, exceptions, free, mmorph + , monad-control, MonadRandom, mtl, profunctors, semigroupoids + , semigroups, transformers, transformers-base + }: + mkDerivation { + pname = "either"; + version = "4.5"; + sha256 = "1mzj86pbplgs3h7a49j3rk22s5cbw06wmd992gdm6harm15hzyzc"; + libraryHaskellDepends = [ + base bifunctors exceptions free mmorph monad-control MonadRandom + mtl profunctors semigroupoids semigroups transformers + transformers-base + ]; + homepage = "http://github.com/ekmett/either/"; + description = "An either monad transformer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "either-list-functions" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -63835,22 +63949,17 @@ self: { }) {}; "ekg-cloudwatch" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-cloudwatch - , amazonka-core, base, bytestring, ekg-core, hspec, lens, resourcet - , semigroups, text, time, unordered-containers + ({ mkDerivation, amazonka, amazonka-cloudwatch, amazonka-core, base + , bytestring, ekg-core, lens, resourcet, semigroups, text, time + , unordered-containers }: mkDerivation { pname = "ekg-cloudwatch"; - version = "0.0.1.5"; - sha256 = "1k3g6rq0kpslyqajcmw7cymd0pq89kfklpfs59kc4ksv27569zfm"; + version = "0.0.1.6"; + sha256 = "038l510n8h1v97j6wqyrlmrz7i7hwyllj4nvw2m3ccrvbfpdky59"; libraryHaskellDepends = [ - aeson amazonka amazonka-cloudwatch amazonka-core base bytestring - ekg-core lens resourcet semigroups text time unordered-containers - ]; - testHaskellDepends = [ - aeson amazonka amazonka-cloudwatch amazonka-core base bytestring - ekg-core hspec lens resourcet semigroups text time - unordered-containers + amazonka amazonka-cloudwatch amazonka-core base bytestring ekg-core + lens resourcet semigroups text time unordered-containers ]; homepage = "https://github.com/sellerlabs/ekg-cloudwatch#readme"; description = "An ekg backend for Amazon Cloudwatch"; @@ -71721,8 +71830,8 @@ self: { }: mkDerivation { pname = "fluid-idl"; - version = "0.0.0"; - sha256 = "1j1j0sr9sw0ksdjcpcyf6w89drszqd3848lv7hb5rjp59aapnpv8"; + version = "0.0.1"; + sha256 = "1mqswhsvyycxa7c7c92jag6rsp0dbkdm8bwjv6pcr92w293ycrv2"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async monad-control monad-logger mtl random safe-exceptions scientific @@ -71752,6 +71861,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fluid-idl-scotty" = callPackage + ({ mkDerivation, aeson, base, fluid-idl, mtl, scotty, text, wai }: + mkDerivation { + pname = "fluid-idl-scotty"; + version = "0.0.0"; + sha256 = "11wi8qgw7i7m6ilcmmjk2ynvi66h8pcr83kbyi9vji3s6js2szf4"; + libraryHaskellDepends = [ + aeson base fluid-idl mtl scotty text wai + ]; + description = "Scotty server add-on for Fluid"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fluidsynth" = callPackage ({ mkDerivation, base, bindings-DSL, containers, directory , fluidsynth @@ -71965,7 +72087,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foldl_1_3_2" = callPackage + "foldl_1_3_3" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, hashable, mwc-random, primitive , profunctors, semigroups, text, transformers, unordered-containers @@ -71973,8 +72095,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.3.2"; - sha256 = "1z3xjz4khs2kr3mqkbh7dz4kd6gkdk2r67wjkvrxnmp533aqh90n"; + version = "1.3.3"; + sha256 = "18gzis64sa7ifclaz3n10j2lkh4ikvbakrkz2kkipjddafidvsr3"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroups text transformers @@ -73353,6 +73475,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "freelude" = callPackage + ({ mkDerivation, array, base, containers, doctest, indextype + , transformers + }: + mkDerivation { + pname = "freelude"; + version = "0.1.0.1"; + sha256 = "0a16vbm17dvvfk9wp8y9df8qypy14vld4yq20hh273p2cdxx5p2n"; + libraryHaskellDepends = [ + array base containers indextype transformers + ]; + testHaskellDepends = [ + array base containers doctest indextype transformers + ]; + homepage = "https://github.com/clintonmead/freelude#readme"; + description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "freenect" = callPackage ({ mkDerivation, base, freenect, freenect_sync, libfreenect, vector }: @@ -77503,6 +77644,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_5_5" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty + , tasty-hunit, template-haskell + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.5.5"; + sha256 = "1dr0568hfxrjhvpgl624zghnvinfg7wwn9x36lrnxr4cl7najqk5"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra integer-gmp + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, equational-reasoning, ghc , ghc-tcplugins-extra, presburger, reflection @@ -78833,23 +78992,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ginger_0_7_1_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, filepath - , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , utf8-string, vector + "ginger_0_7_2_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , data-default, filepath, http-types, mtl, parsec, safe, scientific + , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "ginger"; - version = "0.7.1.0"; - sha256 = "0022qv80dkjns825361laaksccay56q6zmcrbhjrc4j25nys29n8"; + version = "0.7.2.0"; + sha256 = "1xgczxqqd4ml8ifcyr45nrgbqn5a40nrbkvzbn4r4djpivnsrk0k"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring data-default filepath http-types mtl parsec - safe scientific text time transformers unordered-containers - utf8-string vector + aeson aeson-pretty base bytestring data-default filepath http-types + mtl parsec safe scientific text time transformers + unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson base bytestring data-default text transformers @@ -79045,8 +79204,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20171003"; - sha256 = "0fyyad5fbdacwyg8b1m6fp1qqkdhp1hgp5r1isivmxfbk15xgvai"; + version = "6.20171018"; + sha256 = "17armwygz44wphv6hqpyjggh4ybarhy3a2ypnsrc1ifhpq3rf15d"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -79484,6 +79643,8 @@ self: { pname = "github"; version = "0.17.0"; sha256 = "1w9r40c2wjzlc503g30br6dwq213b2q6qap4r1nlk13z9r57c9mk"; + revision = "1"; + editedCabalFile = "183a17k7mgnq7x7pc9hg51692vq0n8v7qp9s5rvzkbdk4gl4kcn8"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -79570,6 +79731,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-release_1_0_7" = 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.0.7"; + sha256 = "17v9rpl6nljf2xa16s3zi6dr8w8385pxdsa1ksyzn84kpq58kdn9"; + 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 @@ -80037,8 +80220,8 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "0.3.2"; - sha256 = "0zyv16gyfjq9mz826zq9q5kqz73y7cp7cbz2cbvb11adbci4pj1r"; + version = "0.3.3"; + sha256 = "10g1daxf29vdm62l5fyah3lh7sh9q00yvv3xa7wpzhnm6k2liadn"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -83778,15 +83961,16 @@ self: { "graphite" = callPackage ({ mkDerivation, base, bytestring, cassava, containers, criterion , deepseq, graphviz, hashable, hspec, process, QuickCheck, random - , unordered-containers, vector + , semigroups, text, unordered-containers, vector }: mkDerivation { pname = "graphite"; - version = "0.9.0.0"; - sha256 = "0s252k5syfkvrvg7amabkzmlvcr4ms2cv1ykli55gfslyzi7809n"; + version = "0.9.5.1"; + sha256 = "0sb8ixz91bcyzylhjk7d44c62gcl1xkfc5vc60sx1z0944f06l1h"; libraryHaskellDepends = [ base bytestring cassava containers deepseq graphviz hashable - process QuickCheck random unordered-containers vector + process QuickCheck random semigroups text unordered-containers + vector ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -86737,6 +86921,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hackernews_1_3_0_0" = callPackage + ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls + , http-types, QuickCheck, quickcheck-instances, servant + , servant-client, string-conversions, text + }: + mkDerivation { + pname = "hackernews"; + version = "1.3.0.0"; + sha256 = "184hf3lwp275dyq5n2szr1mwp5zpa22x48wqddy9c3clxc7lv535"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base http-client http-types QuickCheck quickcheck-instances + servant servant-client string-conversions text + ]; + executableHaskellDepends = [ base http-client http-client-tls ]; + testHaskellDepends = [ + aeson base hspec http-client http-client-tls QuickCheck + quickcheck-instances + ]; + description = "API for Hacker News"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hackertyper" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -87304,6 +87513,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hailgun_0_4_1_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, email-validate + , exceptions, filepath, http-client, http-client-tls, http-types + , tagsoup, text, time, transformers + }: + mkDerivation { + pname = "hailgun"; + version = "0.4.1.6"; + sha256 = "0hkz666vd02iknkxv0l60l3ara0yaszc6583sry0shk2cd74lv06"; + libraryHaskellDepends = [ + aeson base bytestring email-validate exceptions filepath + http-client http-client-tls http-types tagsoup text time + transformers + ]; + homepage = "https://bitbucket.org/robertmassaioli/hailgun"; + description = "Mailgun REST api interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hailgun-send" = callPackage ({ mkDerivation, base, bytestring, configurator, hailgun, text }: mkDerivation { @@ -89743,6 +89972,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hash-tree" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , cryptonite, hspec, memory, QuickCheck + }: + mkDerivation { + pname = "hash-tree"; + version = "0.0.0"; + sha256 = "0nxnjpwd6cw5m064jmgylscxfc5xhhm0abzdknprasmh6ln4525j"; + libraryHaskellDepends = [ + base bytestring containers cryptonite memory + ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers cryptonite hspec + memory QuickCheck + ]; + description = "Merkle Hash Tree"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hashable" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework @@ -93228,6 +93476,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasmin_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, directory, doctest, doctest-discover, gitrev, hopfli + , hspec, hspec-attoparsec, matrix, mtl, numbers + , optparse-applicative, parsers, QuickCheck, text + }: + mkDerivation { + pname = "hasmin"; + version = "1.0"; + sha256 = "1a512s1fd472agy2pv9qizp61jrz1jzdpxla3213y6wsahi9wdnm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers matrix mtl numbers parsers + text + ]; + executableHaskellDepends = [ + attoparsec base bytestring containers gitrev hopfli matrix mtl + numbers optparse-applicative parsers text + ]; + testHaskellDepends = [ + attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion directory text ]; + homepage = "https://github.com/contivero/hasmin#readme"; + description = "CSS Minifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasparql-client" = callPackage ({ mkDerivation, base, HTTP, monads-fd, network, xml }: mkDerivation { @@ -93458,18 +93737,6 @@ self: { }) {}; "hasql-pool" = callPackage - ({ mkDerivation, base-prelude, hasql, resource-pool, time }: - mkDerivation { - pname = "hasql-pool"; - version = "0.4.1"; - sha256 = "03f6g6bnp7ipfdy01grnzcl3z9zsvn4ahv64cfdn16c911ddsvyc"; - libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; - homepage = "https://github.com/nikita-volkov/hasql-pool"; - description = "A pool of connections for Hasql"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql-pool_0_4_2_1" = callPackage ({ mkDerivation, base-prelude, hasql, resource-pool, time }: mkDerivation { pname = "hasql-pool"; @@ -93479,7 +93746,6 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-pool"; description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-postgres" = callPackage @@ -95296,8 +95562,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.9.9"; - sha256 = "1va4lk0pjf3hcw4ap3s35c1slpbrb898g9x01az7g1xgwxq4y2jl"; + version = "0.9.10"; + sha256 = "1z8vl3ql5nyl4jg3pzghsbi1ld9a047zbwz6fgzgk1lvspa0pcd3"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq mtl network resource-pool scanner stm text time unordered-containers vector @@ -95312,6 +95578,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_9_11" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, HUnit, mtl, network, resource-pool, scanner + , slave-thread, stm, test-framework, test-framework-hunit, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "hedis"; + version = "0.9.11"; + sha256 = "1ya5jpf57zs66hqvr58xyj0k7jq5cmdci1yxzwj19cag1wfq47rb"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq mtl network + resource-pool scanner stm text time unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring HUnit mtl slave-thread stm test-framework + test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + homepage = "https://github.com/informatikr/hedis"; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -96065,6 +96356,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "herms" = callPackage + ({ mkDerivation, ansi-terminal, base, brick, directory, microlens + , microlens-th, optparse-applicative, semigroups, split, vty + }: + mkDerivation { + pname = "herms"; + version = "1.8.1.2"; + sha256 = "1avyf8xz4wkv6xijg3wrj0398wy5jcwlp50iil1z8jdlfwh72f18"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + ansi-terminal base brick directory microlens microlens-th + optparse-applicative semigroups split vty + ]; + homepage = "https://github.com/JackKiefer/herms"; + description = "A command-line manager for delicious kitchen recipes"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hero-club-five-tenets" = callPackage ({ mkDerivation, base, random, text }: mkDerivation { @@ -97775,8 +98086,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "5.2.3"; - sha256 = "1wjcgkgqcvr1q0b7dckhg12ai6zgmvvnv2b3zgfkyqy1h9qhj7wk"; + version = "5.2.4.1"; + sha256 = "0m35gd2r49cnaxsn9k82g8arj5pz66glsijlji2g77psd9a3flff"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -101871,7 +102182,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hpio_0_9_0_0" = callPackage + "hpio_0_9_0_2" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , doctest, exceptions, filepath, hlint, hspec, monad-control , monad-logger, mtl, optparse-applicative, protolude, QuickCheck @@ -101879,8 +102190,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.9.0.0"; - sha256 = "1j69y396k08af6pvxj0l1687fdfknsyv3xhy7lhhibglv6nskg48"; + version = "0.9.0.2"; + sha256 = "0jxmmch6y897rk02rql4rs82qmdj3r3xpbsrv75sgc2mb09cx2zy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104444,15 +104755,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_1;}; - "hslua_0_9_1" = callPackage + "hslua_0_9_2" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, fail , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "0.9.1"; - sha256 = "037w7s0fjji54wa5hl8rarf4c655ybzw4p1jzfy41k6qhwnk4i5i"; + version = "0.9.2"; + sha256 = "1n1fw2ak3xk4llv3d3bbpcayjd6h2a83n06i96m2k30lzanbg0ys"; configureFlags = [ "-fsystem-lua" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text @@ -107720,6 +108031,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-types_0_10" = callPackage + ({ mkDerivation, array, base, blaze-builder, bytestring + , case-insensitive, doctest, hspec, QuickCheck + , quickcheck-instances, text + }: + mkDerivation { + pname = "http-types"; + version = "0.10"; + sha256 = "1bim98ax7yqhwmq7d5zr7ii5vkx9xjsdqp6wm2ww56lzry1d8i1q"; + libraryHaskellDepends = [ + array base blaze-builder bytestring case-insensitive text + ]; + testHaskellDepends = [ + base blaze-builder bytestring doctest hspec QuickCheck + quickcheck-instances text + ]; + homepage = "https://github.com/aristidb/http-types"; + description = "Generic HTTP types for Haskell (for both client and server code)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-wget" = callPackage ({ mkDerivation, base, failure, process, transformers }: mkDerivation { @@ -112269,8 +112602,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "indextype"; - version = "0.3.0.0"; - sha256 = "06z4976dy45xyg511bw3nfsfa2lb7m0b081lqpw8q3gmfgrwm66f"; + version = "0.3.0.1"; + sha256 = "1v2jly7sn54bfz0swa9835l15f8r78zj6wqd8kavzwx00ini443i"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A series of type families and constraints for \"indexable\" types"; @@ -114004,19 +114337,21 @@ self: { "ip" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , doctest, hashable, HUnit, primitive, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, vector + , doctest, hashable, HUnit, primitive, QuickCheck + , quickcheck-classes, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vector }: mkDerivation { pname = "ip"; - version = "0.9.3"; - sha256 = "0r8kxdxh08plmal9q2i098hlgxvii67ylprzwqzrwa1i9qlcv7v6"; + version = "1.1.0"; + sha256 = "0a5dc019jmkx77kk3jmgvk79ffigam38fanjwajaqsxy5ysp5xyf"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; testHaskellDepends = [ - attoparsec base bytestring doctest HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text + attoparsec base bytestring doctest HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text ]; benchmarkHaskellDepends = [ attoparsec base bytestring criterion text @@ -115769,23 +116104,6 @@ self: { }) {}; "javascript-extras" = callPackage - ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }: - mkDerivation { - pname = "javascript-extras"; - version = "0.3.1.0"; - sha256 = "05y7343ybgbaydckgssb22c789bawvk6x95vbrarzf3m5brlgw7a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq ghcjs-base-stub parallel text - ]; - executableHaskellDepends = [ base ghcjs-base-stub ]; - homepage = "https://github.com/louispan/javascript-extras#readme"; - description = "Extra javascript functions when using GHCJS"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "javascript-extras_0_3_2_0" = callPackage ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }: mkDerivation { pname = "javascript-extras"; @@ -115800,7 +116118,6 @@ self: { homepage = "https://github.com/louispan/javascript-extras#readme"; description = "Extra javascript functions when using GHCJS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "javasf" = callPackage @@ -118124,8 +118441,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.5.0.3"; - sha256 = "18gpj6h9h90nvpb0fb1ns2ygzip4r0v7hna4q1d6gmz88j28s66a"; + version = "0.5.1.0"; + sha256 = "1jcvjia4r6x2fwsyq0f038y63fr673r2jh4gm1xfn6qxis7im68n"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -118148,43 +118465,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katip_0_5_0_4" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.5.0.4"; - sha256 = "1plxvljhcpdws78fx36v2wn2s7vzbmf1h7rq00yf9680fvcyaq8y"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - homepage = "https://github.com/Soostone/katip"; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, bytestring , containers, criterion, deepseq, enclosed-exceptions, exceptions @@ -118217,6 +118497,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip-syslog" = callPackage + ({ mkDerivation, aeson, base, bytestring, hsyslog, katip + , string-conv, text + }: + mkDerivation { + pname = "katip-syslog"; + version = "0.1.0.0"; + sha256 = "0fj6c0rzs2v5ng3gsc9qlk5ksszh2dpmi378ydxxcrjjzkz3ng6c"; + libraryHaskellDepends = [ + aeson base bytestring hsyslog katip string-conv text + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/iconnect/katip-syslog#readme"; + description = "Syslog Katip Scribe"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "katt" = callPackage ({ mkDerivation, aeson, base, bytestring, ConfigFile, containers , directory, errors, filepath, lens, mtl, parsec, text, url, wreq @@ -126466,6 +126763,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "localize" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-default + , directory, filepath, Glob, haskell-gettext, mtl, setlocale, text + , text-format-heavy, time, transformers + }: + mkDerivation { + pname = "localize"; + version = "0.2.0.0"; + sha256 = "1c0y3blyr36qrbqwnrb802h7nl6m3qzch4ivzajjan9xj5cbbswh"; + libraryHaskellDepends = [ + base binary bytestring containers data-default directory filepath + Glob haskell-gettext mtl setlocale text text-format-heavy time + transformers + ]; + description = "GNU Gettext-based messages localization library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "located" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -126690,6 +127005,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-domain_0_12" = callPackage + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, distributive, doctest, generic-deriving + , hashable, semigroupoids, semigroups, simple-reflect, vector + }: + mkDerivation { + pname = "log-domain"; + version = "0.12"; + sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq distributive hashable + semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + homepage = "http://github.com/ekmett/log-domain/"; + description = "Log-domain arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, fast-logger , time @@ -126786,8 +127124,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.3.3"; - sha256 = "1r7x9fsnaqzs7d3a5kvbaqyhvha8yddb6z5856bqcfk3wflqpcas"; + version = "1.4.0"; + sha256 = "07yb19bwx8n697fird3952nn1a9d4cqbf8wcxmlji41brznhgbkz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128255,10 +128593,8 @@ self: { }: mkDerivation { pname = "lxd-client-config"; - version = "0.1.0.0"; - sha256 = "0cvjfdi2dkysprqy4975x6nxpmk6ppwr8i345hqjwrcahz7hv6i8"; - revision = "1"; - editedCabalFile = "0i2fpnvdnld5qpybf7szcanvrla917rfak0r7fk1wk4yk09lsyl4"; + version = "0.1.0.1"; + sha256 = "1kxg42hrgq5w38v1zsq8v9x0ky83c02k8rx2qcyazh7bkg4m4f4h"; libraryHaskellDepends = [ aeson base containers directory filepath text yaml ]; @@ -128764,8 +129100,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "2.4.2.22"; - sha256 = "1wg2lph25s0lz4ac1jvzy8vsizkyr7pcdq2cc8wxjj2z7f5k2yia"; + version = "3.0.0.1"; + sha256 = "0zh935qpaq3w0qdijbmpyf71yvjigygks7ryxfcw9q9hivypvxgj"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory file-embed process ]; @@ -134299,8 +134635,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "14ki66l60la1mmm544vvzn930liaygj6zrql10nr192shf3v0cx3"; - revision = "5"; - editedCabalFile = "1w12fd8jy7infcgahlg9zim518vvb2g3j0s2w6qdql86i629xjdg"; + revision = "6"; + editedCabalFile = "0xnh69yfpgz1i43x2695gyrxar1582m02cwrzmvfymzvvqbkcwld"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -134340,6 +134676,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-journal_0_8_0" = callPackage + ({ mkDerivation, base, either, monad-control, mtl, transformers + , transformers-base + }: + mkDerivation { + pname = "monad-journal"; + version = "0.8.0"; + sha256 = "0l78flvvvhpk2zcb39ax0qjqpidi8ydnc3ipnh4vy63c8w02w39n"; + libraryHaskellDepends = [ + base either monad-control mtl transformers transformers-base + ]; + homepage = "http://github.com/phaazon/monad-journal"; + description = "Pure logger typeclass and monad transformer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-levels" = callPackage ({ mkDerivation, base, constraints, transformers , transformers-compat @@ -137901,14 +138254,21 @@ self: { }) {}; "mxnet" = callPackage - ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }: + ({ mkDerivation, base, c2hs, c2hs-extra, mxnet, pretty, tasty + , tasty-hunit, template-haskell, unordered-containers, vector + }: mkDerivation { pname = "mxnet"; - version = "0.1.0.1"; - sha256 = "03migg97ly6ld2w1nszz7rmirr0adfhsj75678mlf3rzxf5zh1wl"; - libraryHaskellDepends = [ base c2hs-extra ]; + version = "0.2.0.0"; + sha256 = "05zz149gzsvchllwwn659kqissj6ymdi7kdjx5d7mx7liabf04ij"; + revision = "1"; + editedCabalFile = "0z8kjn1808k5pdrgx0mncppzzv5hw01r7h8s54iv8kz57qfqhcpm"; + libraryHaskellDepends = [ + base c2hs-extra pretty template-haskell unordered-containers vector + ]; librarySystemDepends = [ mxnet ]; libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base tasty tasty-hunit vector ]; homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; description = "MXNet interface in Haskell"; license = stdenv.lib.licenses.mit; @@ -137919,8 +138279,8 @@ self: { ({ mkDerivation, base, mxnet }: mkDerivation { pname = "mxnet-examples"; - version = "0.1.0.0"; - sha256 = "1gzpx33v0xaarpyl4v5x9ydacnc3p4xcxcwj2b8rsh4vzmsv2z0l"; + version = "0.2.0.0"; + sha256 = "0mxwn6wcwiv0z618rffws2z59l5yh929lxwlhgyifzw3sm0h1kxw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mxnet ]; @@ -138189,8 +138549,8 @@ self: { }: mkDerivation { pname = "mysql-simple"; - version = "0.4.3"; - sha256 = "12zryyrjkrglp0r8ra3kcmyksq8g864c5nfxa5d7w3rn9532lzjj"; + version = "0.4.4"; + sha256 = "1rrwhc9szdsn1wm5y510kyj0cfhavw01j61vywf96yw57132y75m"; libraryHaskellDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual bytestring mysql old-locale pcre-light text time @@ -141257,15 +141617,18 @@ self: { "nix-derivation" = callPackage ({ mkDerivation, attoparsec, base, containers, criterion, deepseq - , QuickCheck, system-filepath, text, vector + , pretty-show, QuickCheck, system-filepath, text, vector }: mkDerivation { pname = "nix-derivation"; - version = "1.0.0"; - sha256 = "1qx37nk5fg7kqvy9pfvf1jhn9cyr8rkfgz4hm3xy8m92l0rprfw4"; + version = "1.0.1"; + sha256 = "1z36ihzcnll6vpvv8hr95j9vx0j69v7nir6bxgd6wmidpzigkdmc"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base containers deepseq system-filepath text vector ]; + executableHaskellDepends = [ attoparsec base pretty-show text ]; testHaskellDepends = [ attoparsec base QuickCheck system-filepath text vector ]; @@ -143024,6 +143387,8 @@ self: { pname = "objective"; version = "1.1.1"; sha256 = "0d36v2w8f9g68zh2cdf8hnkzdafv0z6np895ak610n8bkxvqxlbs"; + revision = "1"; + editedCabalFile = "0p1w5zabfqqksyxxv880f6d27rl2vx9101vvflkxwhyfw0az6zin"; libraryHaskellDepends = [ base containers either exceptions free hashable monad-skeleton mtl profunctors template-haskell transformers transformers-compat @@ -145793,6 +146158,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "packer-messagepack" = callPackage + ({ mkDerivation, base, bytestring, containers, hedgehog, packer + , safe-exceptions, text, unliftio + }: + mkDerivation { + pname = "packer-messagepack"; + version = "0.2.0.0"; + sha256 = "1alilaj2gk7pwdl7cpds7s0b35w9dnrbrff55sqdx2n1dyrxn62h"; + libraryHaskellDepends = [ + base bytestring containers packer safe-exceptions text unliftio + ]; + testHaskellDepends = [ + base bytestring containers hedgehog packer safe-exceptions text + ]; + homepage = "https://github.com/mtesseract/packer-messagepack#readme"; + description = "MessagePack Serialization an Deserialization for Packer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "packman" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, directory , ghc-prim, primitive, QuickCheck @@ -147828,28 +148212,39 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, doctest, hedgehog, partial-semigroup-test }: + ({ mkDerivation, base, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.1.0.1"; - sha256 = "1bkm2hsngw8z77zsgxlrqdfzh8hk0hbsr42cjc4c8v84npr1lh7f"; + version = "0.2.0.1"; + sha256 = "0k3b66wlhi280wk3q5ilmcn93m4rch1ily8f3z79lpxjjlraz7lw"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base doctest hedgehog partial-semigroup-test - ]; - homepage = "https://github.com/chris-martin/partial-semigroup#readme"; + testHaskellDepends = [ base hedgehog ]; + homepage = "https://github.com/chris-martin/partial-semigroup"; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; }) {}; - "partial-semigroup-test" = callPackage + "partial-semigroup-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { - pname = "partial-semigroup-test"; - version = "0.1.0.1"; - sha256 = "1346056kzswfa3bakhfh24y07a2sj2qa5cq5npzf01n99x08jvgz"; + pname = "partial-semigroup-hedgehog"; + version = "0.2.0.1"; + sha256 = "1c4rbf1x6llgprx0rgil71z3306ky9x59sl8db1z6hg9ykriv4n2"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; - homepage = "https://github.com/chris-martin/partial-semigroup#readme"; + homepage = "https://github.com/chris-martin/partial-semigroup"; + description = "Property testing for partial semigroups using Hedgehog"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "partial-semigroup-test" = callPackage + ({ mkDerivation, partial-semigroup-hedgehog }: + mkDerivation { + pname = "partial-semigroup-test"; + version = "0.2.0.1"; + sha256 = "1cdlwjq7bbbq7yz5flzjkj0kp5s991nwsjq52xiqhmlzbim598s4"; + libraryHaskellDepends = [ partial-semigroup-hedgehog ]; + doHaddock = false; + homepage = "https://github.com/chris-martin/partial-semigroup"; description = "Testing utilities for the partial-semigroup package"; license = stdenv.lib.licenses.asl20; }) {}; @@ -149412,6 +149807,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-record_0_6_0_0" = callPackage + ({ mkDerivation, array, base, containers, dlist, names-th + , product-isomorphic, quickcheck-simple, template-haskell + , th-data-compat, transformers + }: + mkDerivation { + pname = "persistable-record"; + version = "0.6.0.0"; + sha256 = "097h8hx0si5mbi7c8l0mnwwzj166hn2vlfpgkkys17jxr8h6h31x"; + libraryHaskellDepends = [ + array base containers dlist names-th product-isomorphic + template-haskell th-data-compat transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, HDBC , persistable-record, relational-query-HDBC, text-postgresql @@ -149664,7 +150079,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql-haskell_0_3_4" = callPackage + "persistent-mysql-haskell_0_3_4_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-control, monad-logger, mysql-haskell, network , persistent, persistent-template, resource-pool, resourcet, text @@ -149672,8 +150087,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.3.4"; - sha256 = "1g1i71zpnwbngw56fn7in06k79v4pa5lcq4vk606p8aqyhf4xgfp"; + version = "0.3.4.1"; + sha256 = "0w80z2098rh3svxncyaa4jrqdcdgzrfrzq4p981g34cs7kysfmn2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149867,32 +150282,6 @@ self: { }) {}; "persistent-template" = 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.2"; - sha256 = "04a0ifjidy7lv5ip0dipjgsvr3h9kkw37z03s5kaxyaqh405nsfy"; - revision = "1"; - editedCabalFile = "0jhcanaz680knzc45g594fa68ihh7mkkrhlyaxnj6rjwbrcwjp9x"; - 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; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-template_2_5_3" = 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 @@ -149913,7 +150302,6 @@ self: { 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 ]; }) {}; @@ -150881,6 +151269,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pinboard_0_9_12_6" = 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pinch" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text @@ -151004,8 +151419,8 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.3.5"; - sha256 = "1s158p7d14lxk34yh7x0b44g3m57pq096p6k0fg19g7jkl8jcd7p"; + version = "4.3.6"; + sha256 = "0nwap7bjwv6q0jis1j452r1zgfl4pfdip4lzs047r8zh75cvc5h8"; libraryHaskellDepends = [ base exceptions mmorph mtl semigroups transformers void ]; @@ -151448,8 +151863,8 @@ self: { }: mkDerivation { pname = "pipes-extras"; - version = "1.0.11"; - sha256 = "0hllsd5jk88fv59bqiqksk52iwmqm7835fchzqmavgdsrib0nlmi"; + version = "1.0.12"; + sha256 = "0sr7n0p8nwsyp52dybq3lgswz353jc239hysqlxhlsa4hh1l5q61"; libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -154606,23 +155021,23 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, auto-update, base , base64-bytestring, bytestring, configurator, containers , contravariant, either, hasql, hasql-pool, heredoc, hspec - , hspec-wai, hspec-wai-json, http-types, jwt, lens, lens-aeson - , optparse-applicative, postgresql-libpq, protolude, retry, stm - , stm-containers, stringsearch, text, time, transformers, unix - , unordered-containers, wai, wai-app-static, wai-extra - , wai-websockets, warp, websockets + , hspec-wai, hspec-wai-json, http-types, jose, jwt, lens + , lens-aeson, optparse-applicative, postgresql-libpq, protolude + , retry, stm, stm-containers, stringsearch, text, time + , transformers, unix, unordered-containers, wai, wai-app-static + , wai-extra, wai-websockets, warp, websockets }: mkDerivation { pname = "postgrest-ws"; - version = "0.4.0.0"; - sha256 = "0wimvx66lzp0p5apymbxcj5f4d10wx8n7gpqslkvwi7c09p453l6"; + version = "0.4.1.0"; + sha256 = "0i1bri8a0k7x9m47736ykdq46xpx0hhy8lp3qz1b1xfswmj3hhjg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring contravariant either hasql hasql-pool - http-types jwt lens lens-aeson postgresql-libpq protolude retry stm - stm-containers stringsearch text time unordered-containers wai - wai-websockets websockets + http-types jose jwt lens lens-aeson postgresql-libpq protolude + retry stm stm-containers stringsearch text time + unordered-containers wai wai-websockets websockets ]; executableHaskellDepends = [ ansi-wl-pprint auto-update base base64-bytestring bytestring @@ -154632,7 +155047,8 @@ self: { ]; testHaskellDepends = [ aeson base containers hasql hasql-pool hspec hspec-wai - hspec-wai-json http-types protolude stm wai-extra + hspec-wai-json http-types protolude stm unordered-containers + wai-extra ]; homepage = "https://github.com/diogob/postgrest-ws#readme"; description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; @@ -155606,8 +156022,8 @@ self: { }: mkDerivation { pname = "pretty-simple"; - version = "2.0.0.0"; - sha256 = "1gkghnp3fpcksfkvxsvg3979499y7vb73qp8fgvs7fv2m5rzqjz6"; + version = "2.0.1.0"; + sha256 = "0a72kns4ydh22q1kwbljknrbgcpvh9l4jx16fm2s3hkkw9fivl27"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158430,8 +158846,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.11.0.0"; - sha256 = "0y2qli86ac12xr54vxdfqa3wadxajn6s266y9vpd7lahsnhjwkvf"; + version = "0.11.1.0"; + sha256 = "0syx11yzan1m86skjlxwv17ickplbiamkhbf2xsif0w0216whbvx"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -159094,8 +159510,8 @@ self: { }: mkDerivation { pname = "qm-interpolated-string"; - version = "0.1.1.0"; - sha256 = "1fidkdn4smbv4ybc881168401gfq2l19qfb7w0bvki93jqqajhs1"; + version = "0.2.1.0"; + sha256 = "09qzlhrzhv0hcc7m8qwfh64nprf3wq4x9lrcdnqpqw2airh5cbn3"; libraryHaskellDepends = [ base bytestring haskell-src-meta template-haskell text ]; @@ -159610,6 +160026,21 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "quickcheck-classes" = callPackage + ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck }: + mkDerivation { + pname = "quickcheck-classes"; + version = "0.1"; + sha256 = "0fjr4fagl9wblw6998675pljhgwr554kxfahpjfk46kiknghqic1"; + libraryHaskellDepends = [ + aeson base prim-array primitive QuickCheck + ]; + testHaskellDepends = [ aeson base primitive QuickCheck ]; + homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; + description = "QuickCheck common typeclasses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -160463,6 +160894,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "radius" = callPackage + ({ mkDerivation, base, binary, bytestring, iproute, pretty-hex }: + mkDerivation { + pname = "radius"; + version = "0.2.0.0"; + sha256 = "1arch1d93yijbm7r9a9ggjj7wzy7rk0immj5g8frczrbp0xpgmzy"; + libraryHaskellDepends = [ + base binary bytestring iproute pretty-hex + ]; + homepage = "https://github.com/erickg/radius#readme"; + description = "Remote Authentication Dial In User Service (RADIUS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "radix" = callPackage ({ mkDerivation, base, filepath }: mkDerivation { @@ -161561,6 +162006,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel_0_3_6" = 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.6"; + sha256 = "04d93i7044zpax9hhx1xyipc8lliyn5z1xgq7k0011yzdsd8w31s"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -162144,18 +162609,19 @@ self: { "reactive-balsa" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, containers , data-accessor, data-accessor-transformers, event-list - , extensible-exceptions, midi, midi-alsa, non-negative, random - , reactive-banana, reactive-midyim, transformers, utility-ht + , extensible-exceptions, midi, midi-alsa, non-empty, non-negative + , random, reactive-banana-bunch, reactive-midyim, transformers + , utility-ht }: mkDerivation { pname = "reactive-balsa"; - version = "0.3"; - sha256 = "1h7whcms8idfgpz1x645b725a598ppxhdb72sx2s84r64vn8ila0"; + version = "0.4"; + sha256 = "0cmk386wjs6i7bnmawz0kcpm4sx5xa2ms9xhjisg83xhmacvqg7h"; libraryHaskellDepends = [ alsa-core alsa-seq base containers data-accessor data-accessor-transformers event-list extensible-exceptions midi - midi-alsa non-negative random reactive-banana reactive-midyim - transformers utility-ht + midi-alsa non-empty non-negative random reactive-banana-bunch + reactive-midyim transformers utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; @@ -162185,6 +162651,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reactive-banana-bunch" = callPackage + ({ mkDerivation, base, non-empty, reactive-banana, transformers + , utility-ht + }: + mkDerivation { + pname = "reactive-banana-bunch"; + version = "1.0"; + sha256 = "11lfbf5gn8friwgkmm3vl3b3hqfxm1vww0a3aq9949irvrplajzn"; + libraryHaskellDepends = [ + base non-empty reactive-banana transformers utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/reactive-banana-bunch/"; + description = "Extend reactive-banana to multiple events per time point"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reactive-banana-gi-gtk" = callPackage ({ mkDerivation, base, gi-gtk, haskell-gi-base, reactive-banana , text, transformers @@ -162330,17 +162812,17 @@ self: { "reactive-jack" = callPackage ({ mkDerivation, base, containers, data-accessor, event-list , explicit-exception, extensible-exceptions, jack, midi - , non-negative, random, reactive-banana, reactive-midyim + , non-negative, random, reactive-banana-bunch, reactive-midyim , transformers, utility-ht }: mkDerivation { pname = "reactive-jack"; - version = "0.3"; - sha256 = "0p34s8kj17yy1sngicgzkc1jh17azj543jv7c8a5ks0jm7nrqjy9"; + version = "0.4"; + sha256 = "13j51qg9ph4vq5v4z94q8i5lfd8sr3v6ln1740g24v90j28gh87i"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception - extensible-exceptions jack midi non-negative random reactive-banana - reactive-midyim transformers utility-ht + extensible-exceptions jack midi non-negative random + reactive-banana-bunch reactive-midyim transformers utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana and JACK"; @@ -162351,15 +162833,16 @@ self: { "reactive-midyim" = callPackage ({ mkDerivation, base, containers, data-accessor , data-accessor-transformers, event-list, midi, non-negative - , random, reactive-banana, transformers, utility-ht + , random, reactive-banana-bunch, transformers, utility-ht }: mkDerivation { pname = "reactive-midyim"; - version = "0.3"; - sha256 = "09cgapzkggjl2drii3kv8yjhz0ck2cy5v8ikss9gyjaj0dljs7nx"; + version = "0.4"; + sha256 = "0aq3iaq3l4wcdixa09q9na2n4l92nkzikjbma3mxl4d6gklhcvhy"; libraryHaskellDepends = [ base containers data-accessor data-accessor-transformers event-list - midi non-negative random reactive-banana transformers utility-ht + midi non-negative random reactive-banana-bunch transformers + utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana"; @@ -164684,6 +165167,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_10_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-reify-compat, time, time-locale-compat, transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.10.0.0"; + sha256 = "0a5gqfi0ns1gh1p2csv63m2b0psyq8dl3wzxrvj07p4gqq0m36gb"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text th-reify-compat + time time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers product-isomorphic quickcheck-simple transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, relational-query @@ -164704,6 +165211,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query-HDBC_0_6_5_0" = callPackage + ({ mkDerivation, base, containers, convertible, dlist, HDBC + , HDBC-session, names-th, persistable-record, product-isomorphic + , relational-query, relational-schemas, template-haskell + , th-data-compat, transformers + }: + mkDerivation { + pname = "relational-query-HDBC"; + version = "0.6.5.0"; + sha256 = "0d609xbxxanvggv5lqf7lwfrzzmw6k46b212g5kv19p9v5bx6k7c"; + libraryHaskellDepends = [ + base containers convertible dlist HDBC HDBC-session names-th + persistable-record product-isomorphic relational-query + relational-schemas template-haskell th-data-compat transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "HDBC instance of relational-query and typed query interface for HDBC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-record" = callPackage ({ mkDerivation, base, persistable-record , persistable-types-HDBC-pg, relational-query @@ -164722,6 +165250,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-record_0_2_0_0" = callPackage + ({ mkDerivation, base, persistable-record + , persistable-types-HDBC-pg, product-isomorphic, relational-query + , relational-query-HDBC + }: + mkDerivation { + pname = "relational-record"; + version = "0.2.0.0"; + sha256 = "0qbkpli2bdzwpp13sqxsk8li6hczvs6k0yybrbgwyjdrqnha09d3"; + libraryHaskellDepends = [ + base persistable-record persistable-types-HDBC-pg + product-isomorphic relational-query relational-query-HDBC + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Meta package of Relational Record"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 , persistable-record, relational-query, relational-query-HDBC @@ -164761,6 +165308,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-schemas_0_1_5_0" = callPackage + ({ mkDerivation, base, bytestring, containers, relational-query + , template-haskell, time + }: + mkDerivation { + pname = "relational-schemas"; + version = "0.1.5.0"; + sha256 = "0q76z6bcr27x2anqfgh7gkms7m2dk6xz0i7p0czcq64x2hy7cjnz"; + libraryHaskellDepends = [ + base bytestring containers relational-query template-haskell time + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "RDBMSs' schema templates for relational-query"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relative-date" = callPackage ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time }: @@ -165848,6 +166412,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "resolv" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring + , containers, directory, filepath, tasty, tasty-hunit + }: + mkDerivation { + pname = "resolv"; + version = "0.1.1.0"; + sha256 = "03k0r57q93y3iv3g62zpjhh5a647v3g9imn3z9jr1vnj5gracyh5"; + libraryHaskellDepends = [ + base base16-bytestring binary bytestring containers + ]; + testHaskellDepends = [ + base bytestring directory filepath tasty tasty-hunit + ]; + homepage = "http://github.com/hvr/resolv"; + description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "resolve" = callPackage ({ mkDerivation, attoparsec, attoparsec-binary, base, bv , bytestring, hashable, hashmap, hslogger, iproute, network, parsec @@ -166048,6 +166631,8 @@ self: { pname = "rest-client"; version = "0.5.1.1"; sha256 = "0qzn56bj821l9gcxyq6lcgwfa2444igiqczajybrnyy8yb4j792x"; + revision = "1"; + editedCabalFile = "1q7ad9lhlszbmdv5r9zzqj9c3rh9x5hlrl4dyb4wb0xf0v3bj3kx"; libraryHaskellDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-client http-conduit http-types hxt hxt-pickle-utils @@ -166220,6 +166805,8 @@ self: { pname = "rest-wai"; version = "0.2.0.1"; sha256 = "00hd7i28p5diy00m18yi6f2jp5cxbvb9s2fv24phakjsp2vmw81q"; + revision = "1"; + editedCabalFile = "1j2n7bypgjajwsaahvp50cdwrl7y0nbv67bd3kfdq03yvz5s1py3"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers http-types mime-types mtl rest-core text unordered-containers wai @@ -167215,6 +167802,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rng-utils_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, hedgehog, random + , tasty, tasty-hedgehog + }: + mkDerivation { + pname = "rng-utils"; + version = "0.3.0"; + sha256 = "1fj6x5ihjsbw1cypdifccv2nkbx5gvax9aclypanlv5fw2qsr1h8"; + libraryHaskellDepends = [ base bytestring random ]; + testHaskellDepends = [ + base bytestring hedgehog tasty tasty-hedgehog + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://bitbucket.org/soostone/rng-utils"; + description = "RNG within an IORef for convenient concurrent use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "robin" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, fsnotify , hdaemonize, lens, lifted-base, monad-control, mtl, process @@ -168980,6 +169586,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sajson" = callPackage + ({ mkDerivation, aeson, base, bytestring, criterion, hspec + , QuickCheck, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "sajson"; + version = "0.1.0.0"; + sha256 = "0979skxh82s0q56smp8vlg0cj1k7qj1y37ivksl3spw9dspbpcs1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring scientific text unordered-containers vector + ]; + executableHaskellDepends = [ aeson base bytestring criterion ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck scientific text + unordered-containers vector + ]; + homepage = "https://github.com/kccqzy/haskell-sajson#readme"; + description = "Fast JSON parsing powered by Chad Austin's sajson library"; + license = stdenv.lib.licenses.mit; + }) {}; + "saltine" = callPackage ({ mkDerivation, base, bytestring, libsodium, profunctors , QuickCheck, test-framework, test-framework-quickcheck2 @@ -169523,6 +170152,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "savage" = callPackage + ({ mkDerivation, base, random, tf-random }: + mkDerivation { + pname = "savage"; + version = "1.0.0"; + sha256 = "0njnj1191k90882k957kkgdmb5sfzakk79gmpsa0hvdkdx6fskaz"; + libraryHaskellDepends = [ base random tf-random ]; + homepage = "https://github.com/chessai/savage"; + description = "Re-exported random generators from QuickCheck"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "say" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, temporary , text, transformers @@ -170380,8 +171021,8 @@ self: { pname = "scotty"; version = "0.11.0"; sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; - revision = "5"; - editedCabalFile = "10p4hqsprxzh3j5w64xvbwv6lyc03r1d98mahbwyqs4ayz3ysxmf"; + revision = "6"; + editedCabalFile = "040jqfmaqy6g8hv903kjsd1bx4sr7pxsispj314gsdy8i7cb2n50"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class fail http-types monad-control mtl nats network @@ -171756,8 +172397,8 @@ self: { }: mkDerivation { pname = "semiring-num"; - version = "1.6.0.0"; - sha256 = "0c12pg87y0ndpkmfpvl921495920fv4gx8i23hmvcq6nim9yy1ir"; + version = "1.6.0.1"; + sha256 = "1l9j59r0ph34fqkjw1gdf3yzyzk8p6362cznixzx6qnhphbkqjsi"; libraryHaskellDepends = [ base containers deepseq hashable log-domain scientific template-haskell time unordered-containers vector @@ -173557,8 +174198,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.3.0"; - sha256 = "1spqwfg1y0qajs5nl92gxif1qicgr4s8y0knkp9q76gvag1dyfng"; + version = "0.0.3.1"; + sha256 = "0ylpw1px56y08h6kl1dbn7xwwwv0abzk7llfs3dkjb9xmhh990ks"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -173584,8 +174225,8 @@ self: { }: mkDerivation { pname = "servant-rawm"; - version = "0.2.0.1"; - sha256 = "1cd94qyv8qbsl6nab0nv7j10wjqa1q1fpsm7pxlp15wzvkp60kk2"; + version = "0.2.0.2"; + sha256 = "0nkwi6jxwx8hwsf7fazvr9xffjsy99y4pb3ikw27f8ag8dx8frm2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173891,6 +174532,8 @@ self: { pname = "servant-swagger"; version = "1.1.3.1"; sha256 = "0n5vvrxg1lllkm385g0jd2j5bsr21bcibwn5szdpn6r5yh2mvn78"; + revision = "1"; + editedCabalFile = "1bx68rcz4whjw3pqm40aiqpfigcgg9dkgjdlggry2iv81s0415xf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers @@ -173916,6 +174559,8 @@ self: { pname = "servant-swagger-ui"; version = "0.2.4.3.0.20"; sha256 = "18qp908s0kjcz6dlvj2031kr8qjnzrgh2v92mdg4lwa1j7ddf0xn"; + revision = "1"; + editedCabalFile = "1wsbb9zaq5qv39hrymy1cma581337rbvqlm7y24jwfvk4vafs3fp"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -174280,6 +174925,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servius_1_2_0_3" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-html, bytestring + , http-types, markdown, shakespeare, text, wai, wai-app-static + }: + mkDerivation { + pname = "servius"; + version = "1.2.0.3"; + sha256 = "1w330lvkikbsv92g398kmnlw71wym6l080d8xsdfdx2wwl0iyqj7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base blaze-builder blaze-html bytestring http-types markdown + shakespeare text wai wai-app-static + ]; + homepage = "http://github.com/snoyberg/servius#readme"; + description = "Warp web server with template rendering"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ses-html" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, byteable , bytestring, cryptohash, HsOpenSSL, http-streams, tagsoup, time @@ -176029,8 +176694,8 @@ self: { ({ mkDerivation, base, bytestring, hsI2C, time, transformers }: mkDerivation { pname = "si-clock"; - version = "0.1.1"; - sha256 = "1wcw3ws1125lpazar5934v93y76shdl279ll02z8911d3hcx0vh5"; + version = "0.1.3"; + sha256 = "0s2d1liaknk5qhh41pi3508m3dz9k0ljl5fc2v1vs6ckv4sd9fjr"; libraryHaskellDepends = [ base bytestring hsI2C time transformers ]; @@ -182372,6 +183037,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ssh-tunnel" = callPackage + ({ mkDerivation, base, foldl, http-client, managed, text + , transformers, turtle, uuid + }: + mkDerivation { + pname = "ssh-tunnel"; + version = "1.0.0.0"; + sha256 = "1yc2whzyrb0na9risf5q72ll304fh94rraik78ma6g27pjh2yvqx"; + revision = "1"; + editedCabalFile = "16h6n2p2v4ijhfap0ym7qidls9sc55jipnxn79g9i90jfsixc7m9"; + libraryHaskellDepends = [ + base foldl http-client managed text transformers turtle uuid + ]; + homepage = "https://github.com/Teaspot-Studio/ssh-tunnel#readme"; + description = "Proxy http-client via ssh tunnel"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sshd-lint" = callPackage ({ mkDerivation, base, containers, hspec, keyword-args , nagios-check, parsec @@ -183241,6 +183924,26 @@ self: { license = "unknown"; }) {}; + "stagen" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default + , directory, filemanip, lucid, markdown, mtl, optparse-applicative + , parallel, parsec, text + }: + mkDerivation { + pname = "stagen"; + version = "0.0.0"; + sha256 = "17hvijrkc0lczppp8c73n8drjghn7mmwhdai0m4rilga3vminw7r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html bytestring data-default directory filemanip + lucid markdown mtl optparse-applicative parallel parsec text + ]; + executableHaskellDepends = [ base ]; + description = "Static site generator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "standalone-derive-topdown" = callPackage ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { @@ -185900,15 +186603,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "strive_4_0_0" = callPackage + "strive_4_0_1" = 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 = "4.0.0"; - sha256 = "11z7xxq8157pgpp48argcik0l2323lvjf2rxn01rdk7sx5gby9mh"; + version = "4.0.1"; + sha256 = "1bws8z9ky5zryzy7njllm2f7lddbncb1rxz2ngq6kqcdnc14ph2v"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -187033,8 +187736,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.3"; - sha256 = "008k36ica9l6k77729mvcmgjdjayn47q468wn20bcb7anc04sijn"; + version = "0.0.1.4"; + sha256 = "177aipxcycs79kh5vdkgq5rj8n0mixy374mxaggfp959i28rx164"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -189626,8 +190329,8 @@ self: { }: mkDerivation { pname = "tasty"; - version = "0.11.2.5"; - sha256 = "09qg2ssack4y3vy5dppjpprvg7gss970a0nfv0rq2m87gw5r3i1h"; + version = "0.11.3"; + sha256 = "1g5394akq4j7y93b7cqwqf9lacqh2k21rrj6srbnh2sg97ng7j1b"; libraryHaskellDepends = [ ansi-terminal async base clock containers deepseq mtl optparse-applicative regex-tdfa stm tagged unbounded-delays unix @@ -190797,6 +191500,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "template-toolkit" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , mtl, parsec, pcre-utils, regex-pcre-builtin, scientific, text + , unordered-containers, uri-encode + }: + mkDerivation { + pname = "template-toolkit"; + version = "0.1.0.1"; + sha256 = "1xbc4azsa7q90g2fpp16djy3zkfimsr31a9sjan3gygny0dx2mgg"; + libraryHaskellDepends = [ + aeson base bytestring containers directory mtl parsec pcre-utils + regex-pcre-builtin scientific text unordered-containers uri-encode + ]; + homepage = "https://github.com/kobargh/template-toolkit"; + description = "Template Toolkit implementation for Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "template-yj" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { @@ -192268,8 +192989,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.3.0"; - sha256 = "1cv6j0g3x7xw6ivfs9x2hdv063jsa2739zc6x8fya9540l8d4hys"; + version = "0.1.4.0"; + sha256 = "1kmiksxzvd99d762n4vgrx90awsdy0s3gm1a5s73r9yd79pajq5n"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -196352,6 +197073,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "torsor" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "torsor"; + version = "0.1"; + sha256 = "173dn2n24xdlyymw5hqd6qd1r6h65bqrhpkcl49kccxr10xgb8vm"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/andrewthad/torsor#readme"; + description = "Torsor Typeclass"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tostring" = callPackage ({ mkDerivation, base, case-insensitive, text, utf8-string }: mkDerivation { @@ -197335,6 +198068,8 @@ self: { pname = "tree-diff"; version = "0"; sha256 = "1xiwnq1rrbkzarz5ylnq0p8xk3ldjg7cj7cbmdalr1507qg7wdn7"; + revision = "1"; + editedCabalFile = "0gclbdb5pa2f7fzkqyqdhdq57v55w6w0nx9khn9piih1zw6qlnqh"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring @@ -201662,23 +202397,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath - , monad-logger, resourcet, transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.1.0.0"; - sha256 = "053swazav18rrmlwskrgnw99wn7j7wznaadjmsf8nmzk13qzn18i"; - libraryHaskellDepends = [ - async base deepseq directory filepath monad-logger resourcet - transformers unix unliftio-core - ]; - homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio#readme"; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_1_1_0" = callPackage ({ mkDerivation, async, base, deepseq, directory, filepath , monad-logger, resourcet, transformers, unix, unliftio-core }: @@ -201693,7 +202411,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 @@ -206692,8 +207409,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.1"; sha256 = "0xaksnb1lzbw6rj62l4x9jpx40c1l2c33x5cb5vqk08g84zz3dg0"; - revision = "2"; - editedCabalFile = "1yd82xgdmxzjh8vf3bln7ccbr6qiwn6inp9w32lqsgc354ivgrn9"; + revision = "3"; + editedCabalFile = "1k6wvqwckccxdvpfi0cinw7pw907rigvgcsj5mib4wxpfwpg5cam"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups @@ -211213,6 +211930,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xgboost-haskell" = callPackage + ({ mkDerivation, base, foundation, xgboost }: + mkDerivation { + pname = "xgboost-haskell"; + version = "0.1.0.0"; + sha256 = "11n4qhv3w172lyixy9syx8rf45yj4aywac5svf1r1w9grqkyf18b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base foundation ]; + executableHaskellDepends = [ base foundation ]; + executableSystemDepends = [ xgboost ]; + homepage = "https://github.com/sighingnow/xgboost-haskell#readme"; + description = "XGBoost library for Haskell"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) xgboost;}; + "xhaskell-library" = callPackage ({ mkDerivation, base, bytestring, containers, ghc-prim, mtl , parsec, regex-base @@ -211427,6 +212160,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xleb" = callPackage + ({ mkDerivation, base, containers, mtl, pretty-show, xml }: + mkDerivation { + pname = "xleb"; + version = "0.1.0"; + sha256 = "15nsfnvca9x5z0pcmv949ni2avi7gi159vmx5hw99jxzm0ql5shb"; + revision = "1"; + editedCabalFile = "0258818bvkhviqgxa6srm5rvhqw2kiik4i590h0431vjs5c12k72"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers mtl xml ]; + executableHaskellDepends = [ base pretty-show xml ]; + homepage = "https://github.com/aisamanra/xleb"; + description = "A simple monadic language for parsing XML structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xls" = callPackage ({ mkDerivation, base, conduit, filepath, getopt-generics , resourcet, transformers @@ -212208,15 +212958,15 @@ self: { }: mkDerivation { pname = "xmlhtml"; - version = "0.2.5"; - sha256 = "0760gankqpb9ljh5plj8kzfpixh4lq02p8d4h1j0bb6vhxg107df"; + version = "0.2.5.1"; + sha256 = "1m8jiadx7s990xxdw03ac43c4vxa391kgci77axqx6bkai2yak8k"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers ]; testHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring - bytestring-builder directory hspec HUnit text + bytestring-builder containers directory hspec HUnit text ]; homepage = "https://github.com/snapframework/xmlhtml"; description = "XML parser and renderer with HTML 5 quirks mode"; From 25eb5eecb7b124e1ab59fb54e48e12b0b73ab04e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Oct 2017 09:53:07 +0200 Subject: [PATCH 1586/2806] haskell-fluid-idl-scotty: disable broken build --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a439edecf0d..1ea0e208e29 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -968,6 +968,7 @@ self: super: { # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; + fluid-idl-scotty = markBroken super.fluid-idl-scotty; # depends on amqp >= 0.17 amqp-utils = super.amqp-utils.override { From 895b4ef59b53ef39409b02b49c9999bc0d369d97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Oct 2017 17:21:09 +0200 Subject: [PATCH 1587/2806] liquidhaskell: use latest aeson --- 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 1ea0e208e29..1aa063447e5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -892,7 +892,7 @@ self: super: { tailfile-hinotify = dontCheck super.tailfile-hinotify; # build liquidhaskell with the proper (new) aeson version - liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_2_0; }; + liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_3_0; }; # Test suite fails: https://github.com/lymar/hastache/issues/46. # Don't install internal mkReadme tool. From d559edc277cdcbcfb7b095e97e65efdfaad5424e Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 21 Oct 2017 20:42:20 -0400 Subject: [PATCH 1588/2806] git-annex: update sha --- 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 1aa063447e5..f0ee15468a6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -98,7 +98,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "0ky3avbda1avccalkh7ifjnll37cjjmdyypw9m1glsrzgzmr5lbr"; + sha256 = "1143qcsljp66v0xvq2a2nqji24890rnmxcmwnxw8xj818gqk0p3m"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From 131b7c28906426f0a31427ec4f07602bdcb072cc Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 23 Oct 2017 15:56:56 +0200 Subject: [PATCH 1589/2806] screen: 4.6.1 -> 4.6.2 See http://lists.gnu.org/archive/html/info-gnu/2017-10/msg00006.html for release information --- pkgs/tools/misc/screen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 6ef042abb15..156db640acd 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "screen-${version}"; - version = "4.6.1"; + version = "4.6.2"; src = fetchurl { url = "mirror://gnu/screen/${name}.tar.gz"; - sha256 = "0r3wpfxnr5kw73b8ndja26jk03nfbks06iyfmgb5aqb2rdkazadb"; + sha256 = "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v"; }; configureFlags= [ From c62686fb4340462c2d8957f8598025f0d034d984 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Oct 2017 16:20:27 +0800 Subject: [PATCH 1590/2806] kde-frameworks: 5.38 -> 5.39 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 608 +++++++++--------- 2 files changed, 309 insertions(+), 301 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 9f212c422f4..0e0372ad7ac 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.38/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.39/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 0672e48aba2..3a8ed594655 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,603 +3,611 @@ { attica = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/attica-5.38.0.tar.xz"; - sha256 = "12smdcd7lcyjqiw0bsk3lwivrl6cvmiqv5cqaw0gz8flhvk29w96"; - name = "attica-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/attica-5.39.0.tar.xz"; + sha256 = "15972518n4g65k391imkcsjikfsfhx8livdm6n0whag0aiz55haf"; + name = "attica-5.39.0.tar.xz"; }; }; baloo = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/baloo-5.38.0.tar.xz"; - sha256 = "14522akyxg36lclfblp65xai95i9hiydqjhkmfkadjbq82wm9s9i"; - name = "baloo-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/baloo-5.39.0.tar.xz"; + sha256 = "06y8mv7v9y7syz04x0zicdm628k6za3p366xrzwafc43m159wyms"; + name = "baloo-5.39.0.tar.xz"; }; }; bluez-qt = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/bluez-qt-5.38.0.tar.xz"; - sha256 = "0hanmygp4smbvczxn4dj997z3bln32p017z0r26z89m2p0b2ylwv"; - name = "bluez-qt-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/bluez-qt-5.39.0.tar.xz"; + sha256 = "0j0072q0zc9hdpjbkqciqv18pwpdij74qrjph7whh66csjkr5ad1"; + name = "bluez-qt-5.39.0.tar.xz"; }; }; breeze-icons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/breeze-icons-5.38.0.tar.xz"; - sha256 = "09afi6c4h31ycs6aa85lqbmn392zi532zf8fp7ll43xxjv9isac9"; - name = "breeze-icons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/breeze-icons-5.39.0.tar.xz"; + sha256 = "132bpgma1lqhrly48zz1f8jyg5z5pvnn1wnqxz6psvqhipw7fh5x"; + name = "breeze-icons-5.39.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/extra-cmake-modules-5.38.0.tar.xz"; - sha256 = "0ci3vdzdbcrbnxpqvf4hcwcrzz1ijhifp8b99wh3k53rinnai231"; - name = "extra-cmake-modules-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/extra-cmake-modules-5.39.0.tar.xz"; + sha256 = "1ldwzx2bzlzw7r31w8zy08j4cn9q7d1kszc5jb22zhfqpvbkc1dq"; + name = "extra-cmake-modules-5.39.0.tar.xz"; }; }; frameworkintegration = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/frameworkintegration-5.38.0.tar.xz"; - sha256 = "0w1n3czgsnnmaqwypy3mpci8s4ppv9030zxw7ka7rsvwgkpqijq8"; - name = "frameworkintegration-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/frameworkintegration-5.39.0.tar.xz"; + sha256 = "136s8chyiac30czicqgkrc4abgm7c8b2ppnqwv9ngxpx7nsjgd2h"; + name = "frameworkintegration-5.39.0.tar.xz"; }; }; kactivities = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kactivities-5.38.0.tar.xz"; - sha256 = "0grm0cilc80g5ih2hqhwgwm35mlfnrs343j6ixkd9s0mflv2b798"; - name = "kactivities-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kactivities-5.39.0.tar.xz"; + sha256 = "0nkc1p7n6yvybcib6aqmnz08hwn3ryj1f9wbkiimgs0svr00sslq"; + name = "kactivities-5.39.0.tar.xz"; }; }; kactivities-stats = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kactivities-stats-5.38.0.tar.xz"; - sha256 = "0s57iz04n3m4fpqrqflda6vpk4l1mnf0nyz1iyza382fb375afd2"; - name = "kactivities-stats-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kactivities-stats-5.39.0.tar.xz"; + sha256 = "18ghfqggwf38rmb1lkbv8ggxx71cp6ba3882kp5ccb7wwih51qcy"; + name = "kactivities-stats-5.39.0.tar.xz"; }; }; kapidox = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kapidox-5.38.0.tar.xz"; - sha256 = "1j4k75lhqdnsxmgyvblla0627qvgabxivw6limfdb3rdpmqdxj76"; - name = "kapidox-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kapidox-5.39.0.tar.xz"; + sha256 = "12nmsa1cg5amyawfxywlg8qsl01idi0jacrd8jzmvdj5m8sisw6n"; + name = "kapidox-5.39.0.tar.xz"; }; }; karchive = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/karchive-5.38.0.tar.xz"; - sha256 = "0n5nxd3v9ljjff0r6k4xrvy5hj057b7c7jzcq258harl359d8m4k"; - name = "karchive-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/karchive-5.39.0.tar.xz"; + sha256 = "0rb8vr6lg8vx4f07swvlsyrxy4gj21aqfffk0cvhlsdz94j1phrw"; + name = "karchive-5.39.0.tar.xz"; }; }; kauth = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kauth-5.38.0.tar.xz"; - sha256 = "12nyfbilz4v4b2i5x191iph3jj4lcpw7z1rh0xrv5y1v7dczk6i7"; - name = "kauth-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kauth-5.39.0.tar.xz"; + sha256 = "08bjxvv22y199skx4l9m8az165wz7inqqx7s8b7p5cjms4bvi15i"; + name = "kauth-5.39.0.tar.xz"; }; }; kbookmarks = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kbookmarks-5.38.0.tar.xz"; - sha256 = "0s230mcwmrg0qpz42sg804m96j2xpnwj4bdp0mfv08x3jasqpbrq"; - name = "kbookmarks-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kbookmarks-5.39.0.tar.xz"; + sha256 = "1xfabyc7hxmi1p0wqld0va5pl6bfwh50px4mvpxbnjdna6anw6z5"; + name = "kbookmarks-5.39.0.tar.xz"; }; }; kcmutils = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcmutils-5.38.0.tar.xz"; - sha256 = "0n6f2xvl5v8fwfxpdl6la1hb01dh4h1pcdrf05nn60v0rqg9f58b"; - name = "kcmutils-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcmutils-5.39.0.tar.xz"; + sha256 = "1cz4haj83j59szl16r0mfh4zx93szrwkmb9mq2r21v46c8k5ldw0"; + name = "kcmutils-5.39.0.tar.xz"; }; }; kcodecs = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcodecs-5.38.0.tar.xz"; - sha256 = "0cnxhaj5jk7f3j9q4hzphc3nm3vdaqwy9xab5d4nvn1kv8vjv8ii"; - name = "kcodecs-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcodecs-5.39.0.tar.xz"; + sha256 = "1q0l88nfbxgdy5lpm5xbcs749n9jyxhq7xsgqpf9c8irc7c1gw7f"; + name = "kcodecs-5.39.0.tar.xz"; }; }; kcompletion = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcompletion-5.38.0.tar.xz"; - sha256 = "0f955w67wrk15rdmglrk7k0xc5i6kah12bpb078xhzlyfackg52w"; - name = "kcompletion-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcompletion-5.39.0.tar.xz"; + sha256 = "09jdc4pn7yjb7nagic38xiqdpv9fy4f2f4c1a5ynbli7x1r6l7ms"; + name = "kcompletion-5.39.0.tar.xz"; }; }; kconfig = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kconfig-5.38.0.tar.xz"; - sha256 = "0fi428dsr6qpa9336wcfic6hyix6l2p9s135w00qzdwhdkr4lx3r"; - name = "kconfig-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kconfig-5.39.0.tar.xz"; + sha256 = "011i48f07470igqqcz4hychbw0q85p0bh5dykpla4zwdldllsl1w"; + name = "kconfig-5.39.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kconfigwidgets-5.38.0.tar.xz"; - sha256 = "0w319d94wxn90dbbdfw5zrn2ddnv9vb7wldkpvvycq7yxrhsfw0x"; - name = "kconfigwidgets-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kconfigwidgets-5.39.0.tar.xz"; + sha256 = "1i6cniqsmn9sds8nj7bcsnbmlkq9m1yjwvr45mhal9rkhaas4xzw"; + name = "kconfigwidgets-5.39.0.tar.xz"; }; }; kcoreaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcoreaddons-5.38.0.tar.xz"; - sha256 = "1m3mn9fhllwcidzji2l26k5yxzrqkbyjdly04nh3s5rf823dvqwv"; - name = "kcoreaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcoreaddons-5.39.0.tar.xz"; + sha256 = "0qskv44siykyn8iiq99llibw3bk499ry7r3i8abx4ljjl717cvlz"; + name = "kcoreaddons-5.39.0.tar.xz"; }; }; kcrash = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcrash-5.38.0.tar.xz"; - sha256 = "1a8hvyhwa112wx4ldadlrxpyda6qpial387j07dr1jq1cnzr0p11"; - name = "kcrash-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcrash-5.39.0.tar.xz"; + sha256 = "1fv32l50h9rlc5s9iplyljcsrscivgdy2baghq7hbcs58xrjf1ws"; + name = "kcrash-5.39.0.tar.xz"; }; }; kdbusaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdbusaddons-5.38.0.tar.xz"; - sha256 = "1mw9sl82y2aj7l2xj1skrbxbyv55br60h6f61r4f1mqcaxaqj7qw"; - name = "kdbusaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdbusaddons-5.39.0.tar.xz"; + sha256 = "0hp85995n3193dvvdv48hv59b66dzd9p4iwnx2dmj797lghpnir3"; + name = "kdbusaddons-5.39.0.tar.xz"; }; }; kdeclarative = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdeclarative-5.38.0.tar.xz"; - sha256 = "1966sxzhdkzi2lwg5ixhrx0yg10plbvn9lsjgnj9crghaajsnf4b"; - name = "kdeclarative-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdeclarative-5.39.0.tar.xz"; + sha256 = "1l8wnyfz6qjqmcpdzavsb6m1r3ay1b2r186myymsyknr80yr2d7p"; + name = "kdeclarative-5.39.0.tar.xz"; }; }; kded = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kded-5.38.0.tar.xz"; - sha256 = "0xsjzj5jx4wsrq5fnbv6raqlr11shz20p2mvypf5wfvq2c1vb5lb"; - name = "kded-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kded-5.39.0.tar.xz"; + sha256 = "0jv4ghl2gzfdkhk1in3vx39kigvpprvcb9xlzc5506mpfjc38ga5"; + name = "kded-5.39.0.tar.xz"; }; }; kdelibs4support = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kdelibs4support-5.38.0.tar.xz"; - sha256 = "06vlgziy212pwm4z9r8rbfa9ziwx3nkihy9b25m13gbh60baqapp"; - name = "kdelibs4support-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kdelibs4support-5.39.0.tar.xz"; + sha256 = "03xjzhdvs497sk9bpz79crxlzwff198ivj4n5f0mwmnqc0100dfp"; + name = "kdelibs4support-5.39.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdesignerplugin-5.38.0.tar.xz"; - sha256 = "0rivjxgsxvsgk24lnzsqpzqr7m1i1faqnbby3rnkw2059z28l0y6"; - name = "kdesignerplugin-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdesignerplugin-5.39.0.tar.xz"; + sha256 = "1b7rn66wsyn9aipgvfmn2pq18g0zdjxb469126dj18fahg2k777f"; + name = "kdesignerplugin-5.39.0.tar.xz"; }; }; kdesu = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdesu-5.38.0.tar.xz"; - sha256 = "1c9j2zih7r0jph41kzxnxpri9snphm1k4w4rs1q6zawwz8a5kcr5"; - name = "kdesu-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdesu-5.39.0.tar.xz"; + sha256 = "03avzhs6a0p3cjv4kk9vavf6f64ffgs3pzhbdkfr76fh58h1v6wx"; + name = "kdesu-5.39.0.tar.xz"; }; }; kdewebkit = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdewebkit-5.38.0.tar.xz"; - sha256 = "1cncbjkgrbrnvwx3izjqh9hqiw9bg6aqaq09f8bdryvr8537b0zf"; - name = "kdewebkit-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdewebkit-5.39.0.tar.xz"; + sha256 = "05f0l3zw8cnvyavwwijwy5jx8dairhdbvg6ynpn7r5l10vawcf6x"; + name = "kdewebkit-5.39.0.tar.xz"; }; }; kdnssd = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdnssd-5.38.0.tar.xz"; - sha256 = "101gygxrq2m3yfz6j0ldspib3pm3jjvqz505j3h15zj59qcwqw0x"; - name = "kdnssd-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdnssd-5.39.0.tar.xz"; + sha256 = "1c8d1wwr0hkdkgnq4k7lgkqwm1pj676i09l1kas256rzz6dcyl75"; + name = "kdnssd-5.39.0.tar.xz"; }; }; kdoctools = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdoctools-5.38.0.tar.xz"; - sha256 = "0fbv7i1930rl496psny7nfiixvsnaq535h1zggwkwv6i9dh7wpy9"; - name = "kdoctools-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdoctools-5.39.0.tar.xz"; + sha256 = "17g4kf7mbjjxhii4nbhfpmhjs1q23mlh0d3fqyxxhm3pp02jg8ap"; + name = "kdoctools-5.39.0.tar.xz"; }; }; kemoticons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kemoticons-5.38.0.tar.xz"; - sha256 = "1c0991yd8jx2diy5ynl11h5qqyapn1dsir2gy04y8m90h944vdd5"; - name = "kemoticons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kemoticons-5.39.0.tar.xz"; + sha256 = "132gs69v43ms117ibdqmnhbyzzs5by76pfz7bd2zqwl4mq94hpgh"; + name = "kemoticons-5.39.0.tar.xz"; }; }; kfilemetadata = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kfilemetadata-5.38.0.tar.xz"; - sha256 = "1815r9lx99h9kzbk67bfk41jya3y2hsi112fsgpv3m4mg028pklm"; - name = "kfilemetadata-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kfilemetadata-5.39.0.tar.xz"; + sha256 = "1mcxphjpayyq7v16b6c3zhb6c9vn67495xywfb9y8ysma1cdpshg"; + name = "kfilemetadata-5.39.0.tar.xz"; }; }; kglobalaccel = { - version = "5.38.1"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kglobalaccel-5.38.1.tar.xz"; - sha256 = "0si3bxxa6wj008j6rr6a1ljnsbmim4z0pqyx1z48ih4qamcfpkin"; - name = "kglobalaccel-5.38.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kglobalaccel-5.39.0.tar.xz"; + sha256 = "0wcbnwfi98cx8f99a2mcz2kg7mggz3hipfxv9s8ks6c80865kar1"; + name = "kglobalaccel-5.39.0.tar.xz"; }; }; kguiaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kguiaddons-5.38.0.tar.xz"; - sha256 = "1jks0hwn665hlypl0qfhi5r0prqzrg1gv4skc88zp1kgx05kb9h1"; - name = "kguiaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kguiaddons-5.39.0.tar.xz"; + sha256 = "1az9i5bg7xd7kv7ajq8j8jab7zly683gyi90rmk54vfnn6igbq3f"; + name = "kguiaddons-5.39.0.tar.xz"; }; }; khtml = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/khtml-5.38.0.tar.xz"; - sha256 = "0fa61va3dbwml40y4scxks223swlb8vf5730wr7rijl91lz1adgy"; - name = "khtml-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/khtml-5.39.0.tar.xz"; + sha256 = "097nbwv8ba48xmrga62j1irlkkc0l0f3971fp7225pzh1g3cg152"; + name = "khtml-5.39.0.tar.xz"; }; }; ki18n = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/ki18n-5.38.0.tar.xz"; - sha256 = "0z9arj2s4fn04vavl6ad3avl1p5yr3mgr2n802lmvy2wlqicy314"; - name = "ki18n-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/ki18n-5.39.0.tar.xz"; + sha256 = "1985qgihrch37b5gf7qw33bazahm3xb5v2nj43k6vdjxfg1clcay"; + name = "ki18n-5.39.0.tar.xz"; }; }; kiconthemes = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kiconthemes-5.38.0.tar.xz"; - sha256 = "01xa30r2cx312vbmz2c3x8vvna1cqb6fx91cjp4aivp9q4jwaz9a"; - name = "kiconthemes-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kiconthemes-5.39.0.tar.xz"; + sha256 = "1k4r263zz54497dgqaw9a74wqdklq4w353mc0g905k2g8arh7p9f"; + name = "kiconthemes-5.39.0.tar.xz"; }; }; kidletime = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kidletime-5.38.0.tar.xz"; - sha256 = "1i91w9hcb2k5n9qz8q7k2z44z9ss7r9i2zsg9vnl8am7dqqhmlsv"; - name = "kidletime-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kidletime-5.39.0.tar.xz"; + sha256 = "01h5pcr5kn11jby0zsz6igiwzf31hzip7h63dcsa8h67li4sibd8"; + name = "kidletime-5.39.0.tar.xz"; }; }; kimageformats = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kimageformats-5.38.0.tar.xz"; - sha256 = "0q78shcwgczdm5ylhbp9fnq70w3hqzkbynp2vpyyg5pjaam8xjlp"; - name = "kimageformats-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kimageformats-5.39.0.tar.xz"; + sha256 = "1mnfdsxqnqdzhw3as77n1f1ddxpmab4slqlpwi4ih55xmgl85455"; + name = "kimageformats-5.39.0.tar.xz"; }; }; kinit = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kinit-5.38.0.tar.xz"; - sha256 = "0k4i0zrwkz088vjkk7d7whwhkrjvqqhdigspzf58d1laryiy0jdf"; - name = "kinit-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kinit-5.39.0.tar.xz"; + sha256 = "0a2wl1vhsbb2x1cjd3wz7j3bp9kz1pxfc6mml7gpnq70qgk8hsn2"; + name = "kinit-5.39.0.tar.xz"; }; }; kio = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kio-5.38.0.tar.xz"; - sha256 = "15qmr2ghrj7pgqxrgpvhdp9g5vaap9mzlmry6ayph75m1afb4fpl"; - name = "kio-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kio-5.39.0.tar.xz"; + sha256 = "091g4dbnals6c5wrj3xh3ws29wszysmb9ksyvyqf3d1lp9dfmjwn"; + name = "kio-5.39.0.tar.xz"; }; }; kirigami2 = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kirigami2-5.38.0.tar.xz"; - sha256 = "18k41j5ijmgmzgl2rv4ac0bnxlax3505zi1nmqm8bkdpznhfr13c"; - name = "kirigami2-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kirigami2-5.39.0.tar.xz"; + sha256 = "0spgylk4yjy74rs5d5b28qv72qz5ra9j3wfmk6vx2b6cvf1fw517"; + name = "kirigami2-5.39.0.tar.xz"; }; }; kitemmodels = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kitemmodels-5.38.0.tar.xz"; - sha256 = "0s20in4jjd2pvv9bn79lvgqqlf806hw014icp51f5hfknrhpdyjc"; - name = "kitemmodels-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kitemmodels-5.39.0.tar.xz"; + sha256 = "1bn0k0ya2phix6fyv8ax800ahncrkdzikz0sa3xrw5bq3iz1x6k9"; + name = "kitemmodels-5.39.0.tar.xz"; }; }; kitemviews = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kitemviews-5.38.0.tar.xz"; - sha256 = "0ldi8qzs2sbhz8l57nshjrnwhjl9mhw90kcqw71cldp41wm0pps6"; - name = "kitemviews-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kitemviews-5.39.0.tar.xz"; + sha256 = "0pl899d1lz1dymdbq70485a8332z9i3s38dxnxv3cdwbla3xlsfh"; + name = "kitemviews-5.39.0.tar.xz"; }; }; kjobwidgets = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kjobwidgets-5.38.0.tar.xz"; - sha256 = "0vp6nc73c9788nrib742k9nzqbx4m8m77ipqh9dnnkx4ggrhsd55"; - name = "kjobwidgets-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kjobwidgets-5.39.0.tar.xz"; + sha256 = "1z26555pkirdkfw8c9j1a863pqybklryfa30v3a59a0m9v2jdzfc"; + name = "kjobwidgets-5.39.0.tar.xz"; }; }; kjs = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kjs-5.38.0.tar.xz"; - sha256 = "0diw580k5kyv60bqhnxhqinlrn0b3p3n89iy0kdgjgnr6197fwy1"; - name = "kjs-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kjs-5.39.0.tar.xz"; + sha256 = "0fkn308l6drj7pa94niqhcn2pqv7da7da5lq1nk8q6zlyg4nbcrn"; + name = "kjs-5.39.0.tar.xz"; }; }; kjsembed = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kjsembed-5.38.0.tar.xz"; - sha256 = "0nb07n54208gnmag7h3dhc8hri2s83ln1c9wq6c0xw7jchaz9z8a"; - name = "kjsembed-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kjsembed-5.39.0.tar.xz"; + sha256 = "1i3qyxr409x82nqyck4qva63maxa2vvi07i0yxm6zqx5lvm9gkgb"; + name = "kjsembed-5.39.0.tar.xz"; }; }; kmediaplayer = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kmediaplayer-5.38.0.tar.xz"; - sha256 = "1qb2g8j871gf38i2dk2j9ags848fa3kqdjl3l4924hf28az0g736"; - name = "kmediaplayer-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kmediaplayer-5.39.0.tar.xz"; + sha256 = "09ysw11br4k26bq6rvzcws2g565336p3gjkz4fxc8w2g3ma527p1"; + name = "kmediaplayer-5.39.0.tar.xz"; }; }; knewstuff = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/knewstuff-5.38.0.tar.xz"; - sha256 = "1l4cmfcsljg7v5l6341fxcp7c7i615l8351l941dwcmw4yng0lj0"; - name = "knewstuff-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/knewstuff-5.39.0.tar.xz"; + sha256 = "1amflv96ybd6dqkc1chmz6d5crrl4dcq07fwsalxzx9mgr0z499r"; + name = "knewstuff-5.39.0.tar.xz"; }; }; knotifications = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/knotifications-5.38.0.tar.xz"; - sha256 = "1jvmv2hi3dbf0bd2b61l9s5lb1dx2rjl9z7pw1fb5j20910k6zgd"; - name = "knotifications-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/knotifications-5.39.0.tar.xz"; + sha256 = "0f38ca090p291d114fg3jz25lhwz7vad7s60ql4x3xwmdgaaw7dj"; + name = "knotifications-5.39.0.tar.xz"; }; }; knotifyconfig = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/knotifyconfig-5.38.0.tar.xz"; - sha256 = "05hgglm6ypbaplxr43632zh5fmgsz6543110169k9fbjnczyhcyk"; - name = "knotifyconfig-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/knotifyconfig-5.39.0.tar.xz"; + sha256 = "09nk6sr6sp9a85lj4x9ac0ir4s5ac08835927b95d7m4ap2dbxrb"; + name = "knotifyconfig-5.39.0.tar.xz"; }; }; kpackage = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kpackage-5.38.0.tar.xz"; - sha256 = "0v4j3kqgg52rlmdxmd98aqw0hk7i2xqsw9mhhxfs9c7vm1x05sxn"; - name = "kpackage-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kpackage-5.39.0.tar.xz"; + sha256 = "1ibppkg9m77p0dcpfshcd891vlxcfgx6rk205gq6d5qxyqizygki"; + name = "kpackage-5.39.0.tar.xz"; }; }; kparts = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kparts-5.38.0.tar.xz"; - sha256 = "19ba749pwnb7xvmr7lryn6z53zb49hqn0xq4j9fmbic95nh039zp"; - name = "kparts-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kparts-5.39.0.tar.xz"; + sha256 = "1r32jf2qbhqdjih9ff4n0ajd6s1cdncpq367mp5am31fz1jv3sr6"; + name = "kparts-5.39.0.tar.xz"; }; }; kpeople = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kpeople-5.38.0.tar.xz"; - sha256 = "0yd29436bgfw6jjjr9n38hx8561mrlgl5vynci6ng9bx1jflay0x"; - name = "kpeople-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kpeople-5.39.0.tar.xz"; + sha256 = "1s78dld3zlldhpk66s08v34zwi1k5ghivzbi7ab290sgrjc9afar"; + name = "kpeople-5.39.0.tar.xz"; }; }; kplotting = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kplotting-5.38.0.tar.xz"; - sha256 = "1hvfqm6i5fsyssb51w3yybsil8h9cbqgd2n8k0wnz99m8xifzn72"; - name = "kplotting-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kplotting-5.39.0.tar.xz"; + sha256 = "1diy1f23n6pih0s91kv1bp4mnnypnjl3pmi1xqni1v2cfwy0mnba"; + name = "kplotting-5.39.0.tar.xz"; }; }; kpty = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kpty-5.38.0.tar.xz"; - sha256 = "0cgh8hixrplgc280652jlvk8ibcddmjvflwb0gjawd9iq7lcb66y"; - name = "kpty-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kpty-5.39.0.tar.xz"; + sha256 = "02h6dg3w3k58d1ydzyz6mhd1y5gds3k64wdsb84fnpxvlw46dlhn"; + name = "kpty-5.39.0.tar.xz"; }; }; kross = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kross-5.38.0.tar.xz"; - sha256 = "1dccg214cqpyn3nninalpknglfmchz2k1fk4rlgq53wf4n6w23b7"; - name = "kross-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kross-5.39.0.tar.xz"; + sha256 = "1gh9gicr7ba8y3c0r7qpw2fj651fbbrhsy8gps8yll71axhxqvfh"; + name = "kross-5.39.0.tar.xz"; }; }; krunner = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/krunner-5.38.0.tar.xz"; - sha256 = "16fhl5zm8scyxk83mpkavvzkn23qgzcblg315jy6klr5bz9jxgcm"; - name = "krunner-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/krunner-5.39.0.tar.xz"; + sha256 = "0gxs9z8mlb3s615ccrgkwyxww4jly48d8fkay33zwjaanqhkhgfl"; + name = "krunner-5.39.0.tar.xz"; }; }; kservice = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kservice-5.38.0.tar.xz"; - sha256 = "0zaamvxhfx4xdy2m8spyhi0hdv6p0fn5hqn9pyi5l8xdixnwjc9d"; - name = "kservice-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kservice-5.39.0.tar.xz"; + sha256 = "0abz878yc8yir7iv5scn55d0g2nljnzhr9c81wa6ggjsw0h077hl"; + name = "kservice-5.39.0.tar.xz"; }; }; ktexteditor = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/ktexteditor-5.38.0.tar.xz"; - sha256 = "195ygv1j4wfvly31g22wxz9sshhqyi1yyf2mv1v63d9ci88v7rri"; - name = "ktexteditor-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/ktexteditor-5.39.0.tar.xz"; + sha256 = "1bk5wlvzjmfv7g9ab77asn055jp647zj69mfx2z3lvxb69swdnf5"; + name = "ktexteditor-5.39.0.tar.xz"; }; }; ktextwidgets = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/ktextwidgets-5.38.0.tar.xz"; - sha256 = "120jxab8w1vhqcckda51r0x2pmfb2qd2h6inhivl72c4m5x89w7f"; - name = "ktextwidgets-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/ktextwidgets-5.39.0.tar.xz"; + sha256 = "0p6h165y03ir7qdf50kc77iq9plgvx39c8pz9dalvscvx42d2jaq"; + name = "ktextwidgets-5.39.0.tar.xz"; }; }; kunitconversion = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kunitconversion-5.38.0.tar.xz"; - sha256 = "10k0xfb11r7l1bdnlanqgdwwx8wrs8bmnswb2y85xxr7wwsqnlvc"; - name = "kunitconversion-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kunitconversion-5.39.0.tar.xz"; + sha256 = "04r1b2nc6vi56nfh6glhhd3d9v0ywxn2waibryjbszwrr39yhlzv"; + name = "kunitconversion-5.39.0.tar.xz"; }; }; kwallet = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwallet-5.38.0.tar.xz"; - sha256 = "1qysdj4nmkxywj7bzqdc78ifnqjnkrz9qbp4a49acpng2y4zw1nw"; - name = "kwallet-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwallet-5.39.0.tar.xz"; + sha256 = "1vlz9y3r1n6w7q9is60jsl9f7bm1djckdi9ibgzanwsp4k5ab0sz"; + name = "kwallet-5.39.0.tar.xz"; }; }; kwayland = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwayland-5.38.0.tar.xz"; - sha256 = "0gd58nvyc39waj7vv2c68r59qqpv0jppm95548j2p924w48syjj0"; - name = "kwayland-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwayland-5.39.0.tar.xz"; + sha256 = "0a9hi47nrsspkak88c9f6ind2i7q69zjmrgr5n7xsa4zxznwhx6x"; + name = "kwayland-5.39.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwidgetsaddons-5.38.0.tar.xz"; - sha256 = "1yh48qxdqz3rk020wr897vkzsi4nhh37lxbg6211xrlirn0lzvj5"; - name = "kwidgetsaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwidgetsaddons-5.39.0.tar.xz"; + sha256 = "1d0d3ags15vr7ck031m6n5n3hw347siskzhb8rsgzghn6xnmbfdb"; + name = "kwidgetsaddons-5.39.0.tar.xz"; }; }; kwindowsystem = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwindowsystem-5.38.0.tar.xz"; - sha256 = "02xrin8lshvqkw12d0692z40h3g61f4crh28jcmi5zqlaxiyn5ic"; - name = "kwindowsystem-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwindowsystem-5.39.0.tar.xz"; + sha256 = "1dys70va4h00ixxgxv52wbg8wi3jgsqckaikjqr34fzrmjh1lxqp"; + name = "kwindowsystem-5.39.0.tar.xz"; }; }; kxmlgui = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kxmlgui-5.38.0.tar.xz"; - sha256 = "12cmyhm05nkr9xj7cpnqihrlndfqn1kjkzhcn1ywj20y1gd3mxv4"; - name = "kxmlgui-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kxmlgui-5.39.0.tar.xz"; + sha256 = "0zwy11rh3yphl2346hmcahajxkgmrnfz1m8pd3vlnjs175dwz115"; + name = "kxmlgui-5.39.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kxmlrpcclient-5.38.0.tar.xz"; - sha256 = "0g9ah59h8vq68yg4pfdbqx44xrs856wrr181rsdbsizj0qj3hyaa"; - name = "kxmlrpcclient-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kxmlrpcclient-5.39.0.tar.xz"; + sha256 = "1j4a1n3ydln62m98h5p5lxlg1i7k5vzxb4f9kxkvzhw5gfpy78zs"; + name = "kxmlrpcclient-5.39.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/modemmanager-qt-5.38.0.tar.xz"; - sha256 = "18ham8lrxblywc634n49237js5y5k6qgjf5zrjc8gzapn934l89w"; - name = "modemmanager-qt-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/modemmanager-qt-5.39.0.tar.xz"; + sha256 = "0gdsp1017yjcfbq2jny7jz5rv7y4cavps5pfvg7zmylx0v057zk7"; + name = "modemmanager-qt-5.39.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/networkmanager-qt-5.38.0.tar.xz"; - sha256 = "10d28nrkppmmfl9pwq2hkrvi461acf29djdzala4l37mp4dwvbf8"; - name = "networkmanager-qt-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/networkmanager-qt-5.39.0.tar.xz"; + sha256 = "1jksv0zsdmkrid2f1m92fxw3gl6crcjaw43v5zra8h2m394iyr81"; + name = "networkmanager-qt-5.39.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/oxygen-icons5-5.38.0.tar.xz"; - sha256 = "0fk97r3br5myqpnfalz67l5hkamxc5vc5swa68wpg1xih6jc3iid"; - name = "oxygen-icons5-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/oxygen-icons5-5.39.0.tar.xz"; + sha256 = "1k1rns0fz5gvfnfwg60lrcw885cqmn814nzql9jvk07340w29s98"; + name = "oxygen-icons5-5.39.0.tar.xz"; }; }; plasma-framework = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/plasma-framework-5.38.0.tar.xz"; - sha256 = "1dvhqfi34v44h0wj0m68k477hmx53x9zsf4mh03xq164w1yz68sg"; - name = "plasma-framework-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/plasma-framework-5.39.0.tar.xz"; + sha256 = "1gaxk9mzwlyld09gqk29y3shvi6a1g1q3l849a9kl1hd07gr53x3"; + name = "plasma-framework-5.39.0.tar.xz"; }; }; prison = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/prison-5.38.0.tar.xz"; - sha256 = "0prj3z6s3aighmk4qarfljca7j9cy7ypvgh8rv5di3jb2v4nbg4m"; - name = "prison-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/prison-5.39.0.tar.xz"; + sha256 = "1b0ji341xcamrd19z54r2nkm8cglbr4qfxyxmqzn8yc6icfl61nv"; + name = "prison-5.39.0.tar.xz"; + }; + }; + qqc2-desktop-style = { + version = "5.39.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.39/qqc2-desktop-style-5.39.0.tar.xz"; + sha256 = "1q8ihhrnk2dh6bbmwkz822l5vv15y11qaj7gig1lf7xw5nr1i27v"; + name = "qqc2-desktop-style-5.39.0.tar.xz"; }; }; solid = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/solid-5.38.0.tar.xz"; - sha256 = "1b3c5drx4m1x4ai0ziz0yan16a5s3ghf0py37mb92qyimq586lhh"; - name = "solid-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/solid-5.39.0.tar.xz"; + sha256 = "19bl7hzg1fya613vqhdxllh09csm6amrndnhfqnx90w4gb31p36r"; + name = "solid-5.39.0.tar.xz"; }; }; sonnet = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/sonnet-5.38.0.tar.xz"; - sha256 = "1355p88swnk828gsbnm3v4gryffnwbzjcdq49k8jwywzb65bnwxa"; - name = "sonnet-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/sonnet-5.39.0.tar.xz"; + sha256 = "1b5bfjbpb6l3c9j9k42shhnz9lqqxk2g607qx9ni0n2pr7w2p7w1"; + name = "sonnet-5.39.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/syntax-highlighting-5.38.0.tar.xz"; - sha256 = "101ng0l3jfg8x9bns9z38jk3iayijwcb299kf860vfy0nki8gf6l"; - name = "syntax-highlighting-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/syntax-highlighting-5.39.0.tar.xz"; + sha256 = "0b8sdkh9dqmqk3x48d25v4qhrqph0mv76v47skhvls9jspw7kzdc"; + name = "syntax-highlighting-5.39.0.tar.xz"; }; }; threadweaver = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/threadweaver-5.38.0.tar.xz"; - sha256 = "1d89l9lknc1q25cz9r8iwc1a102q788mj01ghnl6ydss65rclvfv"; - name = "threadweaver-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/threadweaver-5.39.0.tar.xz"; + sha256 = "101bk8rzdysb3vi3vbbkh2s7sb1dhnsa8ncdvdsxqyyaya9ns4aw"; + name = "threadweaver-5.39.0.tar.xz"; }; }; } From 6aeaadfb8a83cf318521af224a7fb60366c9db85 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Oct 2017 16:20:40 +0800 Subject: [PATCH 1591/2806] kwindowsystem: add missing dependencies --- .../libraries/kde-frameworks/kwindowsystem/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index ffad3b1a7fd..c075adf0294 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, copyPathsToStore, extra-cmake-modules, + libpthreadstubs, libXdmcp, qtbase, qttools, qtx11extras }: @@ -11,7 +12,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttools qtx11extras ]; + buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); preConfigure = '' From 70b3fbde6e32d781c160156feffddbed6e6240d0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Oct 2017 10:28:01 +0800 Subject: [PATCH 1592/2806] falkon: broken for now --- pkgs/applications/networking/browsers/falkon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index b2067effb96..9356794bb5d 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + broken = true; }; } From c41d794ecbdb56c9c576a1a7f59386d63ec48aed Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Oct 2017 14:42:00 +0800 Subject: [PATCH 1593/2806] digikam: minor cleanups --- pkgs/applications/graphics/digikam/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 44ee807fe98..a62940ff703 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -33,8 +33,8 @@ , liblqr1 , libqtav , libusb1 -, mesa , marble +, mesa , mysql , opencv3 , pcre @@ -53,11 +53,11 @@ mkDerivation rec { version = "5.7.0"; src = fetchurl { - url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; + url = "mirror://kde/stable/digikam/${name}.tar.xz"; sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; }; - nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ bison diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab2d1dd75c0..13de557985c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17613,7 +17613,6 @@ with pkgs; digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; inherit (kdeApplications) kcalcore; - boost = boost160; }; displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; From cf90441dea468632d640dc5e9c1fbdce397e53b5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 22 Oct 2017 12:31:26 +0800 Subject: [PATCH 1594/2806] ktexteditor: fix indenters --- pkgs/development/libraries/kde-frameworks/ktexteditor.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 9e88c0a99fc..7fc11b1505c 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, fetchpatch, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols @@ -14,4 +14,9 @@ mkDerivation { qtxmlpatterns sonnet syntax-highlighting qtquickcontrols ]; propagatedBuildInputs = [ kparts ]; + patches = [ (fetchpatch { + url = "https://cgit.kde.org/ktexteditor.git/patch/?id=aeebeadb5f5955995c17de56cf83ba7166a132dd"; + sha256 = "10a61w1qyw3czffl06xgccgd3yycz7s0hpg2vj0a24v05jhqiigf"; + name = "ktextedtor_fix_indenters.patch"; + })]; } From a3dde9d13dab999352d5eb4781fc4e768492f997 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Tue, 10 Oct 2017 18:34:30 +0100 Subject: [PATCH 1595/2806] freeimage: fix CVE-2015-0852 & CVE-2016-5684 --- pkgs/development/libraries/freeimage/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 6ee7670fc29..a2f47da7aaf 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, darwin }: +{ stdenv, fetchpatch, fetchurl, unzip, darwin }: stdenv.mkDerivation { name = "freeimage-3.17.0"; @@ -8,6 +8,17 @@ stdenv.mkDerivation { sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; + patches = [ + (fetchpatch { + url = "https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches/Fix-CVE-2015-0852.patch"; + sha256 = "0qkb96mvvhji75gz7dma3vj2b71smp96z3kl2ydj6skvnw6slnmc"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches/Fix-CVE-2016-5684.patch"; + sha256 = "18g5ckrvqfjcldis7zf7hmfl8b3mgnc6akd6x3cdq8c5j7l1y98f"; + }) + ]; + buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; prePatch = if stdenv.isDarwin From c522aaafde483a7c0127eab008b1274de8fd4fda Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Mon, 23 Oct 2017 11:57:20 -0400 Subject: [PATCH 1596/2806] nixos/postfix: allow dollar parameters in lists (#30612) --- nixos/doc/manual/release-notes/rl-1803.xml | 8 +++++++- nixos/modules/services/mail/postfix.nix | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 47522fe3cc9..6fa14b55386 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -55,7 +55,13 @@ following incompatible changes: - + + Dollar signs in options under are + passed verbatim to Postfix, which will interpret them as the beginning of + a parameter expression. This was already true for string-valued options + in the previous release, but not for list-valued options. If you need to + pass literal dollar signs through Postfix, double them. + diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index ad4e5814984..2185484827d 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -28,7 +28,7 @@ let mainCf = let escape = replaceStrings ["$"] ["$$"]; - mkList = items: "\n " + concatMapStringsSep "\n " escape items; + mkList = items: "\n " + concatStringsSep "\n " items; mkVal = value: if isList value then mkList value else " " + (if value == true then "yes" From c9e08b578b0a75c378bc69939e5bcb0de8f307fa Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Mon, 23 Oct 2017 17:41:45 +0200 Subject: [PATCH 1597/2806] awesomebump-4.0 -> 5.1 --- .../graphics/awesomebump/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index f1958ca35be..0666788e3e3 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,26 +1,37 @@ -{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }: +{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }: stdenv.mkDerivation { - name = "awesomebump-4.0"; + name = "awesomebump-5.1"; src = fetchurl { - url = https://github.com/kmkolasinski/AwesomeBump/archive/Linuxv4.0.tar.gz; - sha256 = "1rp4m4y2ld49hibzwqwy214cbiin80i882d9l0y1znknkdcclxf2"; + url = https://github.com/kmkolasinski/AwesomeBump/archive/Winx32v5.1.tar.gz; + sha256 = "04s0jj9gfw1rfr82ga2vw6x1jy00ca9p9s3hh31q3k5h6vg5ailn"; }; - setSourceRoot = "sourceRoot=$(echo */Sources)"; + buildInputs = [ qtbase qtscript qtdeclarative flex bison gnutar ]; - nativeBuildInputs = [ makeWrapper qmake ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ qmake makeWrapper ]; - enableParallelBuilding = true; + buildPhase = '' + cd Sources/utils/QtnProperty + tar xf "${fetchurl { url = "https://github.com/kmkolasinski/QtnProperty/archive/00e1a9a7cdf6fa84d1b0a35efe752bc2e4a6be1f.tar.gz"; sha256 = "0fdny0khm6jb5816d5xsijp26xrkz2ksz8w9pv1x4hf32l48s9yn"; } }" + mv QtnProperty-*/* . + rm -r QtnProperty-* + alias + $QMAKE Property.pro -r TOP_SRC_DIR=$(pwd) + make + cd ../../../ + $QMAKE + make + cp -vr workdir/`cat workdir/current`/bin/AwesomeBump Bin + ''; installPhase = '' d=$out/libexec/AwesomeBump mkdir -p $d $out/bin - cp AwesomeBump $d/ - cp -prd ../Bin/Configs ../Bin/Core $d/ + cp Bin/AwesomeBump $d/ + cp -prd Bin/Configs Bin/Core $d/ # AwesomeBump expects to find Core and Configs in its current # directory. From a15cb742b9675c0d8e7932ff4cabfbaf467b7383 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Mon, 23 Oct 2017 17:54:26 +0100 Subject: [PATCH 1598/2806] marp: 0.0.10 -> 0.0.11 --- pkgs/applications/office/marp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 0e53d58a083..c5dc9198740 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marp-${version}"; - version = "0.0.10"; + version = "0.0.11"; src = fetchurl { url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "0x4qldbyvq88cs12znxv33bb0nxr3wxcwhyr97pkjrjc2cn7nphx"; + sha256 = "06kka6kxrj35w23n34in6ks3vax9arl756jg720jhfy14vavyk0f"; }; sourceRoot = "."; From 26122b368a446ca54144faa6ff0ff4d2c5559658 Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 23 Oct 2017 17:53:11 +0100 Subject: [PATCH 1599/2806] citrix_receiver: refactor so older versions can still be installed Version 13.4.0 is the latest version that doesn't suffer from the bug described at https://discussions.citrix.com/topic/385459-ssl-error-with-135-works-with-134/page-2#entry1977735 As a result, upgrades to 13.5.0, 13.6.0 and 13.7.0 were postponed. However some users aren't affected by this big. This enables everyone to download the version that suits their needs. Related to: #23975, #27664, #30029 --- .../remote/citrix-receiver/default.nix | 301 ++++++++++-------- pkgs/top-level/all-packages.nix | 8 +- 2 files changed, 180 insertions(+), 129 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 0645e9cb606..f6be80e4a1d 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , requireFile , makeWrapper , libredirect @@ -22,154 +23,198 @@ , alsaLib , libidn , zlib +, version ? null }: -let versionRec = { major = "13"; minor = "7"; patch = "0"; }; -in stdenv.mkDerivation rec { - name = "citrix-receiver-${version}"; - version = with versionRec; "${major}.${minor}.${patch}"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; +let + versionInfo = { + "13.4.0" = rec { + major = "13"; + minor = "4"; + patch = "0"; + x64hash = "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb"; + x86hash = "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l"; + x64suffix = "10109380"; + x86suffix = x64suffix; + homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-4.html; + }; - prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; + "13.5.0" = rec { + major = "13"; + minor = "5"; + patch = "0"; + x64hash = "1r24mhkpcc0z95n597p07fz92pd1b8qqzp2z6w07rmb9wb8mpd4x"; + x86hash = "0pwxshlryzhkl86cj9ryybm54alhzjx0gpp67fnvdn5r64wy1nd1"; + x64suffix = "10185126"; + x86suffix = x64suffix; + homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-5.html; + }; - src = with versionRec; requireFile rec { - name = - if stdenv.is64bit - then "${prefixWithBitness}-${version}.10276927.tar.gz" - else "${prefixWithBitness}-${version}.10276925.tar.gz"; - sha256 = - if stdenv.is64bit - then "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91" - else "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6"; - message = '' - In order to use Citrix Receiver, you need to comply with the Citrix EULA and download - the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: + "13.6.0" = rec { + major = "13"; + minor = "6"; + patch = "0"; + x64hash = "6e423be41d5bb8186bcca3fbb4ede54dc3f00b8d2aeb216ae4aabffef9310d34"; + x86hash = "0ba3eba208b37844904d540b3011075ed5cecf429a0ab6c6cd52f2d0fd841ad2"; + x64suffix = "10243651"; + x86suffix = x64suffix; + homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-136.html; + }; - ${homepage} - - (if you do not find version ${version} there, try at - https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-${major}-${minor}.html - or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux") - - Once you have downloaded the file, please use the following command and re-run the - installation: - - nix-prefetch-url file://\$PWD/${name} - ''; + "13.7.0" = { + major = "13"; + minor = "7"; + patch = "0"; + x64hash = "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91"; + x86hash = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6"; + homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # Fix when updating version + x64suffix = "10276927"; + x86suffix = "10276925"; + }; }; - phases = [ "unpackPhase" "installPhase" ]; + citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }: + stdenv.mkDerivation rec { + name = "citrix-receiver-${version}"; + version = "${major}.${minor}.${patch}"; + inherit homepage; - sourceRoot = "."; + prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; - buildInputs = [ - makeWrapper - busybox - file - gtk2 - gdk_pixbuf - ]; + src = requireFile rec { + name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz"; + sha256 = if stdenv.is64bit then x64hash else x86hash; + message = '' + In order to use Citrix Receiver, you need to comply with the Citrix EULA and download + the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: - libPath = stdenv.lib.makeLibraryPath [ - glib - gtk2 - atk - gdk_pixbuf - cairo - pango - gnome3.dconf - xlibs.libX11 - xlibs.libXext - xlibs.libXrender - xlibs.libXinerama - xlibs.libXfixes - libpng12 - libidn - zlib - gtk_engines - freetype - fontconfig - alsaLib - stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null) - ]; + ${homepage} - desktopItem = makeDesktopItem { - name = "wfica"; - desktopName = "Citrix Receiver"; - genericName = "Citrix Receiver"; - exec = "wfica"; - icon = "wfica"; - comment = "Connect to remote Citrix server"; - categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; - mimeType = "application/x-ica"; - }; + (if you do not find version ${version} there, try at + https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/ + or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux") - installPhase = '' - export ICAInstDir="$out/opt/citrix-icaclient" + Once you have downloaded the file, please use the following command and re-run the + installation: - sed -i \ - -e 's,^main_install_menu$,install_ICA_client,g' \ - -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \ - -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \ - -e 's,/bin/true,true,g' \ - ./${prefixWithBitness}/hinst + nix-prefetch-url file://\$PWD/${name} + ''; + }; - # Run the installer... - ./${prefixWithBitness}/hinst CDROM "`pwd`" + phases = [ "unpackPhase" "installPhase" ]; - echo "Deleting broken links..." - for link in `find $ICAInstDir -type l ` - do - [ -f "$link" ] || rm -v "$link" - done + sourceRoot = "."; - echo "Expanding certificates..." - # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates - pushd "$ICAInstDir/keystore/cacerts" - awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt - popd + buildInputs = [ + makeWrapper + busybox + file + gtk2 + gdk_pixbuf + ]; - echo "Patching executables..." - find $ICAInstDir -type f -exec file {} \; | - grep 'ELF.*executable' | - cut -f 1 -d : | - while read f - do - echo "Patching ELF intrepreter and rpath for $f" - chmod u+w "$f" - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$ICAInstDir:$libPath" "$f" - done + libPath = stdenv.lib.makeLibraryPath [ + glib + gtk2 + atk + gdk_pixbuf + cairo + pango + gnome3.dconf + xlibs.libX11 + xlibs.libXext + xlibs.libXrender + xlibs.libXinerama + xlibs.libXfixes + libpng12 + libidn + zlib + gtk_engines + freetype + fontconfig + alsaLib + stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null) + ]; - echo "Wrapping wfica..." - mkdir "$out/bin" + desktopItem = makeDesktopItem { + name = "wfica"; + desktopName = "Citrix Receiver"; + genericName = "Citrix Receiver"; + exec = "wfica"; + icon = "wfica"; + comment = "Connect to remote Citrix server"; + categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; + mimeType = "application/x-ica"; + }; - makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ - --add-flags "-icaroot $ICAInstDir" \ - --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set LD_LIBRARY_PATH "$libPath" \ - --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone" + installPhase = '' + export ICAInstDir="$out/opt/citrix-icaclient" - echo "We arbitrarily set the timezone to UTC. No known consequences at this point." - echo UTC > "$ICAInstDir/timezone" + sed -i \ + -e 's,^main_install_menu$,install_ICA_client,g' \ + -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \ + -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \ + -e 's,/bin/true,true,g' \ + ./${prefixWithBitness}/hinst - echo "Installing desktop item..." - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications + # Run the installer... + ./${prefixWithBitness}/hinst CDROM "`pwd`" - # We introduce a dependency on the source file so that it need not be redownloaded everytime - echo $src >> "$out/share/nix_dependencies.pin" - ''; + echo "Deleting broken links..." + for link in `find $ICAInstDir -type l ` + do + [ -f "$link" ] || rm -v "$link" + done - meta = with stdenv.lib; { - license = stdenv.lib.licenses.unfree; - homepage = homepage; - description = "Citrix Receiver"; - maintainers = with maintainers; [ obadz a1russell ]; - platforms = platforms.linux; - }; -} + echo "Expanding certificates..." + # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates + pushd "$ICAInstDir/keystore/cacerts" + awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt + popd + + echo "Patching executables..." + find $ICAInstDir -type f -exec file {} \; | + grep 'ELF.*executable' | + cut -f 1 -d : | + while read f + do + echo "Patching ELF intrepreter and rpath for $f" + chmod u+w "$f" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$ICAInstDir:$libPath" "$f" + done + + echo "Wrapping wfica..." + mkdir "$out/bin" + + makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ + --add-flags "-icaroot $ICAInstDir" \ + --set ICAROOT "$ICAInstDir" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set LD_LIBRARY_PATH "$libPath" \ + --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone" + + echo "We arbitrarily set the timezone to UTC. No known consequences at this point." + echo UTC > "$ICAInstDir/timezone" + + echo "Installing desktop item..." + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + + # We introduce a dependency on the source file so that it need not be redownloaded everytime + echo $src >> "$out/share/nix_dependencies.pin" + ''; + + meta = with stdenv.lib; { + license = stdenv.lib.licenses.unfree; + inherit homepage; + description = "Citrix Receiver"; + maintainers = with maintainers; [ obadz a1russell ]; + platforms = platforms.linux; + }; + }; + +in citrixReceiverForVersion (lib.getAttr version versionInfo) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88914330b34..74ef6e0f3f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1398,7 +1398,13 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; - citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; + # Use Citrix Receiver 13.4.0 below if you get "A network error occured (SSL error 4)" + # See https://discussions.citrix.com/topic/385459-ssl-error-with-135-works-with-134/?p=1977735 + citrix_receiver = hiPrio citrix_receiver_13_7_0; + citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; }; + citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; }; + citrix_receiver_13_5_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.5.0"; }; + citrix_receiver_13_4_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.4.0"; }; citra = libsForQt5.callPackage ../misc/emulators/citra { }; From a798a434d18ded919b1a826304b1920b0e25437c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 23 Oct 2017 19:21:16 +0200 Subject: [PATCH 1600/2806] perl-AnyEvent-I3: 0.16 -> 0.17 --- 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 9f1423c65c1..21e3dab32f8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -156,10 +156,10 @@ let self = _self // overrides; _self = with self; { }; AnyEventI3 = buildPerlPackage rec { - name = "AnyEvent-I3-0.16"; + name = "AnyEvent-I3-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; - sha256 = "1qwva5vmmn929l6k9wzhp4h80ad4qm4m1g2dyv4nlas624003hig"; + sha256 = "5382c984c9f138395f29f0c00af81aa0c8f4b765582055c73ede4b13f04a6d63"; }; propagatedBuildInputs = [ AnyEvent JSONXS ]; meta = { From 0204936c2105aa6ab3b24c3c31ca667827cdbb5e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 23 Oct 2017 19:22:12 +0200 Subject: [PATCH 1601/2806] perl-AnyEvent: 7.08 -> 7.14 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 21e3dab32f8..71f43709d27 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -119,14 +119,14 @@ let self = _self // overrides; _self = with self; { }; AnyEvent = buildPerlPackage rec { - name = "AnyEvent-7.08"; + name = "AnyEvent-7.14"; src = fetchurl { url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; - sha256 = "16nnqzxy5baiar6gxnq5w296mmjgijcn1jq8rp867nksph03mxz8"; + sha256 = "539358d225bad34b4a64f5217f8c2a707b15e3a28c74120c9dd2270c7cca7d2a"; }; + buildInputs = [ CanaryStability ]; meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; From 499195347fc512ac15b6d9a53676362e539170a1 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 23 Oct 2017 19:22:39 +0200 Subject: [PATCH 1602/2806] perl-AnyEvent-RabbitMQ: 1.15 -> 1.19 --- pkgs/top-level/perl-packages.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 71f43709d27..eb32ded2cd2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -168,19 +168,17 @@ let self = _self // overrides; _self = with self; { }; }; - AnyEventRabbitMQ = buildPerlPackage { - name = "AnyEvent-RabbitMQ-1.15"; + AnyEventRabbitMQ = buildPerlPackage rec { + name = "AnyEvent-RabbitMQ-1.19"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/AnyEvent-RabbitMQ-1.15.tar.gz; - sha256 = "fda292dfaae10f6d99aafc46831ce507153b58368e3eb2617bbb3f749605805a"; + url = "mirror://cpan/authors/id/D/DL/DLAMBLEY/${name}.tar.gz"; + sha256 = "a440ec2fa5a4018ad44739baaa9601cc460ad497282e89110ba8e3cf23312f0a"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; meta = { description = "An asynchronous and multi channel Perl AMQP client"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; From 3bf2a5168a8f018a038603ecaa55b4ecbcefa633 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 23 Oct 2017 19:23:10 +0200 Subject: [PATCH 1603/2806] perl-Term-ProgressBar: 2.14 -> 2.21 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eb32ded2cd2..bb191f45bd2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13110,11 +13110,11 @@ let self = _self // overrides; _self = with self; { }; }; - TermProgressBar = buildPerlPackage { - name = "Term-ProgressBar-2.14"; + TermProgressBar = buildPerlPackage rec { + name = "Term-ProgressBar-2.21"; src = fetchurl { - url = mirror://cpan/authors/id/S/SZ/SZABGAB/Term-ProgressBar-2.14.tar.gz; - sha256 = "18cj7mzbis9xk0v32g2700vq9b4p9v5msk02mglf244cj77bflf6"; + url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz"; + sha256 = "66994f1a6ca94d8d92e3efac406142fb0d05033360c0acce2599862db9c30e44"; }; buildInputs = [ CaptureTiny TestException ]; propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; From 68e05a361d4fa0f71e98fae69882e670dfa4dd48 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 23 Oct 2017 19:17:40 +0200 Subject: [PATCH 1604/2806] haskell: ghcjs packages: fix build of fail --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 0f17f5ce707..bd35c1cb3ae 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -68,6 +68,9 @@ self: super: ## OTHER PACKAGES + # haddock throws the error: No input file(s). + fail = dontHaddock super.fail; + cereal = addBuildDepend super.cereal [ self.fail ]; entropy = overrideCabal super.entropy (old: { From d2f9dc4a3b79c575618b09f239c0ec3e26a371d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Oct 2017 20:11:14 +0200 Subject: [PATCH 1605/2806] haskell-ltk: fix build by providing haskell-gi-overloading-0.0 Closes https://github.com/NixOS/nixpkgs/pull/30462. --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f0ee15468a6..2b050dd613f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -971,7 +971,9 @@ self: super: { fluid-idl-scotty = markBroken super.fluid-idl-scotty; # depends on amqp >= 0.17 - amqp-utils = super.amqp-utils.override { - amqp = dontCheck super.amqp_0_18_1; - }; + amqp-utils = super.amqp-utils.override { amqp = dontCheck super.amqp_0_18_1; }; + + # Build with gi overloading feature disabled. + ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; }); + } From c42e772a625f9fc55c5541feebacd086ebd40130 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 23 Oct 2017 20:25:51 +0200 Subject: [PATCH 1606/2806] hevea: 2.29 -> 2.31 --- pkgs/tools/typesetting/hevea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index ed6e741b3f9..e125c8e7f2f 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.29"; + name = "hevea-2.31"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "1i7qkar6gjpsxqgdm90xxgp15z7gfyja0rn62n23a9aahc0hpgq6"; + sha256 = "15xrnnqlacz8dpr09h7jgijm65wss99rmy9mb1zmapplmwhavmzv"; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; From e2e5979a1e2124157677e67e6a3eec11fccf30c5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Oct 2017 14:43:28 -0400 Subject: [PATCH 1607/2806] ammonite: 1.0.2 -> 1.0.3 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 46a213f219d..f0a9837ce48 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.0.2"; + version = "1.0.3"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "11xn84q947qrf0p2p37pyx9nphl6542jbdan3mjcmdi4p29qgds8"; + sha256 = "0pa60fy5skx781hwspaskisv8zx0sfddkvprgmwkhfdpz892srwm"; }; propagatedBuildInputs = [ jre ] ; From 4c81e9a926f4e372c0070b8060848f09d44395d6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 23 Oct 2017 20:56:08 +0200 Subject: [PATCH 1608/2806] libfilezilla: 0.10.1 -> 0.11.0 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 3981f94a47d..5447e7d8b54 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.10.1"; + version = "0.11.0"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "1yi9db0hpxh3giyjhkbz7ajmf95qw27xdvh3xvw208zri5k575x0"; + sha256 = "1l4yhw269dyarqb2spqhycxzzyfn8pj4qh9vfycdw1c93hj6fx6c"; }; meta = with stdenv.lib; { From 740c4fe4afc5917fb9f170dc0815c7b3b1e25223 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 23 Oct 2017 20:56:24 +0200 Subject: [PATCH 1609/2806] filezilla: 3.27.1 -> 3.28.0 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index a7d32494912..86b4a1fd6ea 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.27.1"; in +let version = "3.28.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "14lsplbp9fy7lk6cpwi3aj6jskz4j82h67x0fik82z1bns0zm2a3"; + sha256 = "1dxzmpqrb3a29ln9vx10n438w5i649729vy911sm92bwn2p235p4"; }; configureFlags = [ From 4b756e48738dc0775dacb6b97280a17799d66147 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Mon, 9 Oct 2017 20:22:34 +0100 Subject: [PATCH 1610/2806] foomatic-filters: fix CVE-2015-8327 & CVE-2015-8560 --- pkgs/misc/drivers/foomatic-filters/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 799b14dec1d..d6ac4fd6a03 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, cups, dbus, enscript }: +{ stdenv, fetchpatch, fetchurl, pkgconfig, perl, cups, dbus, enscript }: stdenv.mkDerivation rec { name = "foomatic-filters-4.0.17"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ perl cups dbus enscript ]; + patches = [ + # for CVE-2015-8327 & CVE-2015-8560 + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/foomatic-filters.git/plain/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch"; + sha256 = "055nwi3sjf578nk40bqsch3wx8m2h65hdih0wmxflb6l0hwkq4p4"; + }) + ]; + preConfigure = '' substituteInPlace foomaticrip.c --replace /bin/bash /bin/sh From 6af0de6478a7028b6fd73fbd44cacf0c13c7be99 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 23 Oct 2017 22:16:36 +0200 Subject: [PATCH 1611/2806] imagemagick: 6.9.9-15 -> 6.9.9-20 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d01bfa1d950..35e4fb989b3 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-15"; - sha256 = "0bxgdc1qiyvag6a2iiqcbwp4ak0m1mzi9qhs51fbrvv6syy12m6c"; + version = "6.9.9-20"; + sha256 = "1pz8clmhnq26vdsp1j21czq3nfbvrmfdz30k7na7w4vh7wqxsrx1"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. From bb493911516b812d5e03567836fb049c2ee02608 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 23 Oct 2017 22:16:57 +0200 Subject: [PATCH 1612/2806] imagemagick7: 7.0.7-4 -> 7.0.7-8 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index a70a67d548f..f2046f0d912 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-4"; - sha256 = "074w4jm5s98b8dxwjl8lljvdhmm3mbg1ikgjy1mw3c1sb08z3nc8"; + version = "7.0.7-8"; + sha256 = "0h2jbaxrxrmdcr5crf1d93sc60v4zfqrrl3w79md6h11wf57ksbp"; patches = []; }; in From 63f7456f6ac63ec03268eb85766153cdb9b6d444 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 23 Oct 2017 16:22:16 -0400 Subject: [PATCH 1613/2806] amazon-image: make derivation name configurable I'm getting dozens of nixos-disk-image entries in my store and it's getting hard to track :) --- nixos/maintainers/scripts/ec2/amazon-image.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index d76fb644d02..2e67edf8ee3 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -9,6 +9,12 @@ in { imports = [ ../../../modules/virtualisation/amazon-image.nix ]; options.amazonImage = { + name = mkOption { + type = types.str; + description = "The name of the generated derivation"; + default = "nixos-disk-image"; + }; + contents = mkOption { example = literalExample '' [ { source = pkgs.memtest86 + "/memtest.bin"; @@ -38,7 +44,7 @@ in { config.system.build.amazonImage = import ../../../lib/make-disk-image.nix { inherit lib config; - inherit (cfg) contents format; + inherit (cfg) contents format name; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package partitioned = config.ec2.hvm; diskSize = cfg.sizeMB; From 62b467a07d35fe0bc93d776382a45b393c626d6c Mon Sep 17 00:00:00 2001 From: mimadrid Date: Mon, 23 Oct 2017 22:34:44 +0200 Subject: [PATCH 1614/2806] gthumb: 3.5.1 -> 3.5.3 --- pkgs/applications/graphics/gthumb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 93894d0c6cb..d9e0f42e53e 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "gthumb"; - version = "${major}.1"; + version = "${major}.3"; major = "3.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "1hxnjskrq57d5ycn2fyif7363n1bav931pkjvq1fr2r4yrj0d202"; + sha256 = "0hka1b3l8mf94zsk7jff87wsb8bz4pj5pixjrs0w2j8jbsa9sggk"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; From 41df85dd1ba51abe225670ce39b2c7b30fb75da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= Date: Mon, 23 Oct 2017 08:53:32 +0200 Subject: [PATCH 1615/2806] coqPackages.QuickChick: remove support for coq 8.7 coqPackages_8_7.QuickChick won't build since Coq 8.7.0 is not yet supported upstream. --- pkgs/development/coq-modules/QuickChick/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 688182f4e5e..af509dee29c 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -20,11 +20,6 @@ let param = sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9"; }; - "8.7" = { - version = "20170616"; - rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a"; - sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9"; - }; }."${coq.coq-version}" ; in From 2c39cb9f40c397576ee61c1f8f922eff80707ce0 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Mon, 23 Oct 2017 15:35:39 -0600 Subject: [PATCH 1616/2806] jenkins: 2.85 -> 2.86 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 1c5950a04c2..de0321109d7 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.85"; + version = "2.86"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0z8rv6fxsvnw71f8s711n9s60r8jd43bigy9rqz5805k3xa68whr"; + sha256 = "198fcj2wkz8qxawk3mq29kwl51pxlbd7ivndcpvdvg42g0caqyi0"; }; buildCommand = '' From 25ea55046d8b823779b1cd6628654876913fc706 Mon Sep 17 00:00:00 2001 From: jammerful Date: Mon, 23 Oct 2017 18:54:26 -0400 Subject: [PATCH 1617/2806] makeself: 2.2.0 -> 2.3.1 --- pkgs/applications/misc/makeself/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 361ced02b7e..8a752bbaf86 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "makeself-2.2.0"; + version = "2.3.1"; + name = "makeself-${version}"; - src = fetchgit { - url = "https://github.com/megastep/makeself.git"; - rev = "b836b9281ae99abe1865608b065551da56c80719"; - sha256 = "f7c97f0f8ad8128f2f1b54383319f2cc44cbb05b60ced222784debdf326f23ad"; + src = fetchFromGitHub { + owner = "megastep"; + repo = "makeself"; + rev = "release-${version}"; + sha256 = "01r7vb9vyb99s3g5cw0c04s1ahcingynk3ki17wknlk2asjrbc4p"; }; patchPhase = '' From 43277b558669d433243ce812d716daf077246f97 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 24 Oct 2017 00:52:27 +0200 Subject: [PATCH 1618/2806] cockroachdb: v1.0.5 -> v1.1.1 --- pkgs/servers/sql/cockroachdb/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index a6442b97647..88738188f57 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoPackage, fetchurl, cmake, xz, which }: +{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf }: buildGoPackage rec { name = "cockroach-${version}"; - version = "v1.0.5"; + version = "v1.1.1"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-${version}.src.tgz"; - sha256 = "0jjl6zb8pyxws3i020h98vdr217railca8h6n3xijkvcqy9dj8wa"; + sha256 = "0d2nlm291k4x7hqi0kh76j6pj8b1dwbdww5f95brf0a9bl1n7qxr"; }; - buildInputs = [ cmake xz which ]; + nativeBuildInputs = [ cmake xz which autoconf ]; buildPhase = '' From cf84d2ff788ed0eba50d95a33b586e84b4a2b2e8 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 24 Oct 2017 01:45:57 +0200 Subject: [PATCH 1619/2806] cockroachdb: enable build on darwin --- pkgs/servers/sql/cockroachdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 88738188f57..3594cf5c7b0 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -38,7 +38,7 @@ buildGoPackage rec { homepage = https://www.cockroachlabs.com; description = "A scalable, survivable, strongly-consistent SQL database"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.rushmorem ]; }; } From cccee1ddb7fc34e3ee4e549cdcc4e07d34a0f9f6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 Apr 2017 20:23:22 +0800 Subject: [PATCH 1620/2806] minuet: init at 17.08.1 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/minuet.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/minuet.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 2053d183ff1..8f84044a1b1 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -142,6 +142,7 @@ let marble = callPackage ./marble.nix {}; mbox-importer = callPackage ./mbox-importer.nix {}; messagelib = callPackage ./messagelib.nix {}; + minuet = callPackage ./minuet.nix {}; okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; pimcommon = callPackage ./pimcommon.nix {}; diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix new file mode 100644 index 00000000000..fd628a7aacf --- /dev/null +++ b/pkgs/applications/kde/minuet.nix @@ -0,0 +1,22 @@ +{ mkDerivation +, lib, extra-cmake-modules +, drumstick, fluidsynth +, kcoreaddons, kcrash, kdoctools +, qtquickcontrols2, qtsvg, qttools +}: + +mkDerivation { + name = "minuet"; + meta = with lib; { + license = with licenses; [ lgpl21 gpl3 ]; + maintainers = with maintainers; [ peterhoeg ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + drumstick fluidsynth + kcoreaddons kcrash + qtquickcontrols2 qtsvg qttools + ]; + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74ef6e0f3f2..510509d144e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15244,7 +15244,7 @@ with pkgs; akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole - kontact korganizer krfb kwalletmanager marble okteta okular spectacle; + kontact korganizer krfb kwalletmanager marble minuet okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; From 5ddea062e269c124346c8d2c6cee1eac1aa36bfd Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 23 Oct 2017 23:23:23 -0700 Subject: [PATCH 1621/2806] ffmpeg: 3.3.4 -> 3.4 ffmpeg_3 bumped to 3.4, and 3.3.4 removed from the tree --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/{3.3.nix => 3.4.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/ffmpeg/{3.3.nix => 3.4.nix} (69%) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 275389b7b8b..11d365159f8 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -231,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.3.4"; + version = "3.4"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "0mx9dvad3lkyhvsrblf280x2bz6dxajya1ylnspbdzldj0dpxfcq"; + sha256 = "1vzvpx8ixy8m44f8qwp833hv253hpghybgzbc4n8b3div3j0dvmf"; }; patchPhase = ''patchShebangs . diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.4.nix similarity index 69% rename from pkgs/development/libraries/ffmpeg/3.3.nix rename to pkgs/development/libraries/ffmpeg/3.4.nix index 3218461258d..513654e98f7 100644 --- a/pkgs/development/libraries/ffmpeg/3.3.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.3.4"; - sha256 = "0zmczggi95fbsq9nz33mpln1y3p1gqniqc4x5smp871idhkykxay"; + branch = "3.4"; + sha256 = "0pn8g3ab937ahslqd41crk0g4j4fh7kwimsrlfc0rl0pc3z132ax"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 510509d144e..a5c7e0af075 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8098,14 +8098,14 @@ with pkgs; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_3_3 = callPackage ../development/libraries/ffmpeg/3.3.nix { + ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; ffmpeg_2 = ffmpeg_2_8; - ffmpeg_3 = ffmpeg_3_3; + ffmpeg_3 = ffmpeg_3_4; ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { From 83d7fe0f0d062f19500b9befd1338ff2a13d8535 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 23 Oct 2017 23:24:15 -0700 Subject: [PATCH 1622/2806] wineUnstable: 2.18 -> 2.19 staging and winetricks updated as well --- pkgs/misc/emulators/wine/sources.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index fb384aee746..2eb7b722e82 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -32,23 +32,23 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.18"; + version = "2.19"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "0l2gmk6g4c5ds29iqcvpmh5g8jdz6g6id7xkgiqps5bqk09322cz"; + sha256 = "15b0lvs456zjh5wwkhs9wh1ycih12ragk6170hnrrbkmk3k32wa8"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "02rh2lvx7sd8d6nhgpfq9crjh495k4k7i3wmgigs4m5rlip363s8"; + sha256 = "16jps0x4srxnpdy3vxygvspz7qpd09i83c6j6kg8vv4qkna2lswi"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; }; winetricks = fetchFromGitHub rec { - version = "20170823"; - sha256 = "15kjic39nl3z4g9l9galwkajl108fxfwaa0d9nssp54wg6villwx"; + version = "20171018"; + sha256 = "0qlnxyaydpqx87kfyrkkmwg0jv9dfh3mkq27g224a8v1kf9z3r3h"; owner = "Winetricks"; repo = "winetricks"; rev = version; From 5fe5afe8ee15ac06c83bd4ff446421d998f35831 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 24 Oct 2017 08:42:26 +0200 Subject: [PATCH 1623/2806] clasp-common-lisp: init at 0.4.99.20170801 --- pkgs/development/compilers/clasp/default.nix | 74 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/compilers/clasp/default.nix diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix new file mode 100644 index 00000000000..6bfb71a9627 --- /dev/null +++ b/pkgs/development/compilers/clasp/default.nix @@ -0,0 +1,74 @@ +{stdenv, fetchFromGitHub + , llvmPackages + , cmake, boehmgc, gmp, zlib, ncurses, boost + , waf, python, git, sbcl +}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "clasp"; + version = "0.4.99.20170801"; + + src = fetchFromGitHub { + owner = "drmeister"; + repo = "clasp"; + rev = "525ce1cffff39311e3e7df6d0b71fa267779bdf5"; + sha256 = "1jqya04wybgxnski341p5sycy2gysxad0s5q8d59z0f6ckj3v8k1"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake python git sbcl ]; + + buildInputs = with llvmPackages; ( + builtins.map (x: stdenv.lib.overrideDerivation x + (x: {NIX_CFLAGS_COMPILE= (x.NIX_CFLAGS_COMPILE or "") + " -frtti"; })) + [ llvm clang clang-unwrapped clang ]) ++ + [ + gmp zlib ncurses + boost boehmgc + (boost.override {enableStatic = true; enableShared = false;}) + (stdenv.lib.overrideDerivation boehmgc + (x: {configureFlags = (x.configureFlags or []) ++ ["--enable-static"];})) + ]; + + NIX_CFLAGS_COMPILE = " -frtti "; + + configurePhase = '' + runHook preConfigure + + export CXX=clang++ + export CC=clang + + echo " + INSTALL_PATH_PREFIX = '$out' + " | sed -e 's/^ *//' > wscript.config + + python ./waf configure update_submodules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + python ./waf build_cboehm + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + python ./waf install_cboehm + + runHook postInstall + ''; + + meta = { + inherit version; + description = ''A Common Lisp implementation based on LLVM with C++ integration''; + license = stdenv.lib.licenses.lgpl21Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/drmeister/clasp"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5c7e0af075..8a0280bcdf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5418,6 +5418,8 @@ with pkgs; clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; + clasp-common-lisp = callPackage ../development/compilers/clasp {}; + clean = callPackage ../development/compilers/clean { }; closurecompiler = callPackage ../development/compilers/closure { }; From aadbef00bd083fe59977205b2fc330cf17d09e6f Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 24 Oct 2017 03:00:07 -0400 Subject: [PATCH 1624/2806] callCabal2nix: Don't rebuild unchanged cabal file (Fixed #23880) --- .../haskell-modules/make-package-set.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index d84167008d9..c234ff3e780 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -144,7 +144,22 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callHackage = name: version: self.callPackage (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; }); + callCabal2nix = name: src: args: if builtins.typeOf src != "path" + then self.callPackage (haskellSrc2nix { inherit name src; }) args + else + # When `src` is a Nix path literal, only use `cabal2nix` on + # the cabal file, so that the "import-from-derivation" is only + # recomputed when the cabal file changes, and so your source + # code isn't duplicated into the nix store on every change. + # This can only be done when `src` is a Nix path literal + # because that is the only kind of source that + # `builtins.filterSource` works on. But this filtering isn't + # usually important on other kinds of sources, like + # `fetchFromGitHub`. + overrideCabal (self.callPackage (haskellSrc2nix { + inherit name; + src = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src; + }) args) (_: { inherit src; }); # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet # Given a set whose values are either paths or version strings, produces From 770bedbc204a8b696b43110f54eca98201207697 Mon Sep 17 00:00:00 2001 From: Alex Vorobiev Date: Mon, 23 Oct 2017 20:51:14 -0500 Subject: [PATCH 1625/2806] meritous: init at 1.4 --- lib/maintainers.nix | 1 + pkgs/games/meritous/default.nix | 40 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 pkgs/games/meritous/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4bb12dcfcc8..a44dc3d4da0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -31,6 +31,7 @@ ak = "Alexander Kjeldaas "; akaWolf = "Artjom Vejsel "; akc = "Anders Claesson "; + alexvorobiev = "Alex Vorobiev Date: Tue, 24 Oct 2017 16:56:06 +0900 Subject: [PATCH 1626/2806] msmtp: compiles with keyring support by default (#30584) * msmtp: compiles with keyring support by default As it is recommended by msmtp http://msmtp.sourceforge.net/doc/msmtp.html#Authentication --- pkgs/applications/networking/msmtp/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 85e5abdc9b6..1a409fc885a 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, autoreconfHook, pkgconfig , openssl, netcat-gnu, gnutls, gsasl, libidn, Security +, withKeyring ? true, libsecret ? null , systemd ? null }: let @@ -20,7 +21,9 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl gnutls gsasl libidn ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ stdenv.lib.optional stdenv.isDarwin Security + ++ stdenv.lib.optional withKeyring libsecret; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = From 87bd0494ba41b86e24cfba011425346814b3a9af Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 24 Oct 2017 10:25:17 +0800 Subject: [PATCH 1627/2806] krdc: init at 17.08.1 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/krdc.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/krdc.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8f84044a1b1..6e10afe637b 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -124,6 +124,7 @@ let korganizer = callPackage ./korganizer.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; + krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; ktnef = callPackage ./ktnef.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix new file mode 100644 index 00000000000..87204c1fe9f --- /dev/null +++ b/pkgs/applications/kde/krdc.nix @@ -0,0 +1,25 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, makeWrapper, + kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons, + libvncserver, freerdp +}: + +mkDerivation { + name = "krdc"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; + buildInputs = [ + kcmutils kcompletion kconfig kdnssd knotifyconfig kwallet kwidgetsaddons + freerdp libvncserver + ]; + postFixup = '' + wrapProgram $out/bin/krdc \ + --prefix PATH : ${lib.makeBinPath [ freerdp ]} + ''; + meta = with lib; { + homepage = http://www.kde.org; + license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 170a487f768..f4d920ee651 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15248,7 +15248,7 @@ with pkgs; akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole - kontact korganizer krfb kwalletmanager marble minuet okteta okular spectacle; + kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; From b752a9e43356d69666ec6e1a3a7b5d92248b906e Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Tue, 24 Oct 2017 10:48:19 +0200 Subject: [PATCH 1628/2806] graylog: 2.3.1 -> 2.3.2 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 516e27dee7f..11cbd87024f 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.3.2"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1zms24w4lnisjqgkj4a8cmnmlvpsqjl1sab5k99dyknq7b31x0sd"; + sha256 = "0mzrhzbyblspia3qp85hvv5kdc7v3aird02q2pxrxbwca6wjlxcs"; }; dontBuild = true; From 707b6b12cc0b0399d1fe1c83b9110a4bab16b861 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 24 Oct 2017 17:14:24 +0800 Subject: [PATCH 1629/2806] minicom: 2.7 -> 2.7.1 --- pkgs/tools/misc/minicom/default.nix | 52 +++++++----- .../minicom/xminicom_terminal_paths.patch | 79 +++++++++++++++++++ 2 files changed, 112 insertions(+), 19 deletions(-) create mode 100644 pkgs/tools/misc/minicom/xminicom_terminal_paths.patch diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index d731e856790..5796f6335c0 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,32 +1,46 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig +, ncurses }: stdenv.mkDerivation rec { - name = "minicom-2.7"; + name = "minicom-2.7.1"; src = fetchurl { - url = "http://alioth.debian.org/frs/download.php/file/3977/${name}.tar.gz"; - sha256 = "1x04m4k7c71j5cnhzpjrbz43dd96k4mpkd0l87v5skrgp1isdhws"; + url = "https://alioth.debian.org/frs/download.php/latestfile/3/${name}.tar.gz"; + sha256 = "1wa1l36fa4npd21xa9nz60yrqwkk5cq713fa3p5v0zk7g9mq6bsk"; }; - buildInputs = [ncurses]; + buildInputs = [ ncurses ]; - configureFlags = [ "--sysconfdir=/etc" "--enable-lock-dir=/var/lock" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - preConfigure = + enableParallelBuilding = true; + + configureFlags = [ + "--sysconfdir=/etc" + "--enable-lock-dir=/var/lock" + ]; + + patches = [ ./xminicom_terminal_paths.patch ]; + + preConfigure = '' # Have `configure' assume that the lock directory exists. - '' sed -i "configure" -e's/test -d \$UUCPLOCK/true/g' - ''; + substituteInPlace configure \ + --replace 'test -d $UUCPLOCK' true - meta = { + substituteInPlace src/rwconf.c \ + --replace /usr/bin/ascii-xfr $out/bin/ascii-xfr + ''; + + meta = with stdenv.lib; { description = "Modem control and terminal emulation program"; - homepage = http://alioth.debian.org/projects/minicom/; - - longDescription = - '' Minicom is a menu driven communications program. It emulates ANSI - and VT102 terminals. It has a dialing directory and auto zmodem - download. - ''; - - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + homepage = https://alioth.debian.org/projects/minicom/; + license = licenses.gpl2; + longDescription = '' + Minicom is a menu driven communications program. It emulates ANSI + and VT102 terminals. It has a dialing directory and auto zmodem + download. + ''; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch b/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch new file mode 100644 index 00000000000..18535253d9f --- /dev/null +++ b/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch @@ -0,0 +1,79 @@ +diff --git a/src/xminicom b/src/xminicom +index a59aa08..cef153b 100755 +--- a/src/xminicom ++++ b/src/xminicom +@@ -7,57 +7,39 @@ + # + # version $Id: xminicom,v 1.4 2008-06-09 20:48:35 al-guest Exp $ + +-findcmd() +-{ +- IFS=: +- for i in $PATH +- do +- if [ -x $i\/$1 ] +- then +- result=$i\/$1 +- IFS= +- return 0 +- fi +- done +- result= +- IFS= +- return 1 ++findcmd() { ++ result=$(command -v $1) + } + +-if findcmd x-terminal-emulator +-then ++if findcmd x-terminal-emulator ; then + exec $result -T minicom -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" + exit 1 + fi + +-if findcmd color_xterm +-then ++if findcmd konsole ; then ++ exec $result -T minicom -geometry 80x25 -e minicom -m -c on "$@" ++ exit 1 ++fi ++ ++if findcmd gnome-terminal ; then ++ exec $result -T minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" ++ exit 1 ++fi ++ ++if findcmd color_xterm ; then + exec $result -T minicom -bg black -fg grey -n minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" + exit 1 + fi + +-if findcmd rxvt +-then ++if findcmd rxvt ; then + exec $result -bg black -fg grey -n minicom -T minicom -sl 0 -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" + exit 1 + fi + +-if findcmd kterm +-then ++if findcmd xterm ; then + exec $result -T minicom -n minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" + exit 1 + fi + +-if findcmd xterm +-then +- if [ -f /etc/debian_version ] +- then +- exec $result -T minicom -n minicom -bg black -fg grey -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" +- else +- exec $result -T minicom -n minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi" +- fi +- exit 1 +-fi +- +-echo "xminicom: rxvt, color_xterm or xterm NOT found!" 1>&2 ++echo "xminicom: konsole, gnome-terminal, rxvt, color_xterm or xterm NOT found!" 1>&2 + exit 1 From f6f0b7ac5d10b40962c5e8048dd1df59af8e59bc Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 24 Oct 2017 11:29:17 +0100 Subject: [PATCH 1630/2806] awesomebump: do not override qmake build phases then all the hacks are not necessary --- .../graphics/awesomebump/default.nix | 68 ++++++++++--------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index 0666788e3e3..f190b421b05 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,47 +1,49 @@ -{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }: +{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }: -stdenv.mkDerivation { - name = "awesomebump-5.1"; - src = fetchurl { - url = https://github.com/kmkolasinski/AwesomeBump/archive/Winx32v5.1.tar.gz; - sha256 = "04s0jj9gfw1rfr82ga2vw6x1jy00ca9p9s3hh31q3k5h6vg5ailn"; +let + version = "5.1"; + + src = fetchgit { + url = "https://github.com/kmkolasinski/AwesomeBump.git"; + rev = "Winx32v${version}"; + sha256 = "1c8b9jki0v8kzkvsvyv7q1w3s7j40br6ph15hh2xi0a1mpwckq56"; + fetchSubmodules = true; }; - buildInputs = [ qtbase qtscript qtdeclarative flex bison gnutar ]; + qtnproperty = stdenv.mkDerivation { + name = "qtnproperty"; + inherit src; + sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; + buildInputs = [ qtscript qtbase qtdeclarative ]; + nativeBuildInputs = [ qmake flex bison ]; + postInstall = '' + install -D bin-linux/QtnPEG $out/bin/QtnPEG + ''; + }; +in stdenv.mkDerivation rec { + name = "awesomebump-${version}"; + + inherit src; + + buildInputs = [ qtbase qtscript qtdeclarative ]; nativeBuildInputs = [ qmake makeWrapper ]; - buildPhase = '' - cd Sources/utils/QtnProperty - tar xf "${fetchurl { url = "https://github.com/kmkolasinski/QtnProperty/archive/00e1a9a7cdf6fa84d1b0a35efe752bc2e4a6be1f.tar.gz"; sha256 = "0fdny0khm6jb5816d5xsijp26xrkz2ksz8w9pv1x4hf32l48s9yn"; } }" - mv QtnProperty-*/* . - rm -r QtnProperty-* - alias - $QMAKE Property.pro -r TOP_SRC_DIR=$(pwd) - make - cd ../../../ - $QMAKE - make - cp -vr workdir/`cat workdir/current`/bin/AwesomeBump Bin + preBuild = '' + ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG ''; - installPhase = - '' - d=$out/libexec/AwesomeBump - mkdir -p $d $out/bin - cp Bin/AwesomeBump $d/ - cp -prd Bin/Configs Bin/Core $d/ + postInstall = '' + d=$out/libexec/AwesomeBump - # AwesomeBump expects to find Core and Configs in its current - # directory. - makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \ + mkdir -p $d + cp -vr workdir/`cat workdir/current`/bin/AwesomeBump $d/ + cp -prd Bin/Configs Bin/Core $d/ + + # AwesomeBump expects to find Core and Configs in its current directory. + makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \ --run "cd $d" - ''; - - # RPATH in /tmp hack - preFixup = '' - rm -r $NIX_BUILD_TOP/__nix_qt5__ ''; meta = { From 4663bfa40e48f2e4ed9de1ffb31a37dc45ef19c0 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 20 Oct 2017 18:36:37 +0200 Subject: [PATCH 1631/2806] opencv: 3.2.0 -> 3.3.0 Release notes: https://opencv.org/opencv-3-3.html The contrib module cnn_3dobj is disabled because it fails to build. The contrib module dnn_modern is disabled because it causes: https://github.com/opencv/opencv_contrib/issues/823 --- pkgs/development/libraries/opencv/3.x.nix | 196 ++++++++++++++-------- 1 file changed, 123 insertions(+), 73 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index ecb7bf78b20..e6cb75d3b3d 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, cmake, pkgconfig, unzip, zlib +{ lib, stdenv +, fetchurl, fetchFromGitHub +, cmake, pkgconfig, unzip, zlib, pcre, hdf5, protobuf +, config , enableJPEG ? true, libjpeg , enablePNG ? true, libpng @@ -6,93 +9,129 @@ , enableWebP ? true, libwebp , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableJPEG2K ? true, jasper +, enableEigen ? true, eigen +, enableOpenblas ? true, openblas + +, enableCuda ? (config.cudaSupport or false), cudatoolkit , enableIpp ? false -, enableContrib ? false, protobuf +, enableContrib ? false #, caffe, glog, boost, google-gflags , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 -, enableEigen ? true, eigen -, enableOpenblas ? true, openblas -, enableCuda ? false, cudatoolkit , enableTesseract ? false, tesseract, leptonica +, enableDocs ? false, doxygen, graphviz-nox + , AVFoundation, Cocoa, QTKit }: let - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "0f59g0dvhp5xg1xa3r4lp351a7x0k03i77ylgcf69ns3y47qd16p"; + sha256 = "0266kg337wij9rz602z5088jn2fq56aqpxxflf0fbh28kygchvk4"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj"; - }; - - # This fixes the build on macOS. - # See: https://github.com/opencv/opencv_contrib/pull/926 - contribOSXFix = fetchpatch { - url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch"; - sha256 = "11dsq8dwh1k6f7zglbc26xwsjw184ggf2531mhf7v77kd72k19fm"; + sha256 = "0qxdvzdszzlpsya1pn4d2r9z4j98isxrgk15a2wwa3dqjmgv880d"; }; # Contrib must be built in order to enable Tesseract support: buildContrib = enableContrib || enableTesseract; - vggFiles = fetchFromGitHub { - owner = "opencv"; - repo = "opencv_3rdparty"; - rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"; - sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy"; + # See opencv/3rdparty/ippicv/ippicv.cmake + ippicv = { + src = fetchFromGitHub { + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "a62e20676a60ee0ad6581e217fe7e4bada3b95db"; + sha256 = "04idycc479l7fidj6r107sv65iszndswm287ms3nh896jbpbaxbv"; + } + "/ippicv"; + files = let name = platform : "ippicv_2017u2_${platform}_20170418.tgz"; in + if stdenv.system == "x86_64-linux" then + { ${name "lnx_intel64"} = "87cbdeb627415d8e4bc811156289fa3a"; } + else if stdenv.system == "i686-linux" then + { ${name "lnx_ia32"} = "f2cece00d802d4dea86df52ed095257e"; } + else if stdenv.system == "x86_64-darwin" then + { ${name "mac_intel64"} = "0c25953c99dbb499ff502485a9356d8d"; } + else + throw "ICV is not available for this platform (or not yet supported by this package)"; + dst = ".cache/ippicv"; }; - bootdescFiles = fetchFromGitHub { - owner = "opencv"; - repo = "opencv_3rdparty"; - rev = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"; - sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62"; + # See opencv_contrib/modules/xfeatures2d/cmake/download_vgg.cmake + vgg = { + src = fetchFromGitHub { + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"; + sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy"; + }; + files = { + "vgg_generated_48.i" = "e8d0dcd54d1bcfdc29203d011a797179"; + "vgg_generated_64.i" = "7126a5d9a8884ebca5aea5d63d677225"; + "vgg_generated_80.i" = "7cd47228edec52b6d82f46511af325c5"; + "vgg_generated_120.i" = "151805e03568c9f490a5e3a872777b75"; + }; + dst = ".cache/xfeatures2d/vgg"; + }; + + # See opencv_contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake + boostdesc = { + src = fetchFromGitHub { + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"; + sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62"; + }; + files = { + "boostdesc_bgm.i" = "0ea90e7a8f3f7876d450e4149c97c74f"; + "boostdesc_bgm_bi.i" = "232c966b13651bd0e46a1497b0852191"; + "boostdesc_bgm_hd.i" = "324426a24fa56ad9c5b8e3e0b3e5303e"; + "boostdesc_binboost_064.i" = "202e1b3e9fec871b04da31f7f016679f"; + "boostdesc_binboost_128.i" = "98ea99d399965c03d555cef3ea502a0b"; + "boostdesc_binboost_256.i" = "e6dcfa9f647779eb1ce446a8d759b6ea"; + "boostdesc_lbgm.i" = "0ae0675534aa318d9668f2a179c2a052"; + }; + dst = ".cache/xfeatures2d/boostdesc"; + }; + + installExtraFiles = extra : with lib; '' + mkdir -p "${extra.dst}" + '' + concatStrings (mapAttrsToList (name : md5 : '' + ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" + '') extra.files); + + # See opencv_contrib/modules/dnn_modern/CMakeLists.txt + tinyDnn = rec { + src = fetchurl { + url = "https://github.com/tiny-dnn/tiny-dnn/archive/${name}"; + sha256 = "12x1b984cn0psn6kz1fy75zljgzqvkdyjy8i292adfnyqpl1rip2"; + }; + name = "v1.0.0a3.tar.gz"; + md5 = "adb1c512e09ca2c7a6faef36f9c53e59"; + dst = ".cache/tiny_dnn"; }; opencvFlag = name: enabled: "-DWITH_${name}=${if enabled then "ON" else "OFF"}"; + in stdenv.mkDerivation rec { name = "opencv-${version}"; inherit version src; - postUnpack = - (lib.optionalString buildContrib '' - cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" - - # This fixes the build on macOS. - patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}" - - for name in vgg_generated_48.i \ - vgg_generated_64.i \ - vgg_generated_80.i \ - vgg_generated_120.i; do - ln -s "${vggFiles}/$name" "$NIX_BUILD_TOP/opencv_contrib/xfeatures2d/src/$name" - done - - for name in boostdesc_bgm.i \ - boostdesc_bgm_bi.i \ - boostdesc_bgm_hd.i \ - boostdesc_binboost_064.i \ - boostdesc_binboost_128.i \ - boostdesc_binboost_256.i \ - boostdesc_lbgm.i; do - ln -s "${bootdescFiles}/$name" "$NIX_BUILD_TOP/opencv_contrib/xfeatures2d/src/$name" - done - ''); + postUnpack = lib.optionalString buildContrib '' + cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" + ''; # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) @@ -105,29 +144,19 @@ stdenv.mkDerivation rec { ''; preConfigure = - (let version = "20151201"; - md5 = "808b791a6eac9ed78d32a7666804320e"; - sha256 = "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3"; - rev = "81a676001ca8075ada498583e4166079e5744668"; - platform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux" - else throw "ICV is not available for this platform (or not yet supported by this package)"; - name = "ippicv_${platform}_${version}.tgz"; - ippicv = fetchurl { - url = "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${rev}/ippicv/${name}"; - inherit sha256; - }; - dir = "3rdparty/ippicv/downloads/${platform}-${md5}"; - in lib.optionalString enableIpp '' - mkdir -p "${dir}" - ln -s "${ippicv}" "${dir}/${name}" - '' - ) + - (lib.optionalString buildContrib '' + installExtraFiles ippicv + ( + lib.optionalString buildContrib '' cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib") + + ${installExtraFiles vgg} + ${installExtraFiles boostdesc} + + mkdir -p "${tinyDnn.dst}" + ln -s "${tinyDnn.src}" "${tinyDnn.dst}/${tinyDnn.md5}-${tinyDnn.name}" ''); buildInputs = - [ zlib ] + [ zlib pcre hdf5 protobuf ] ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 @@ -146,8 +175,13 @@ stdenv.mkDerivation rec { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableCuda cudatoolkit - ++ lib.optional buildContrib protobuf - ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]; + + # These are only needed for the currently disabled + # cnn_3dobj and dnn_modern modules + # ++ lib.optionals buildContrib [ caffe glog boost google-gflags ] + + ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ] + ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -156,7 +190,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ - "-DWITH_IPP=${if enableIpp then "ON" else "OFF"} -DWITH_OPENMP=ON" + "-DBUILD_PROTOBUF=OFF" + "-DPROTOBUF_UPDATE_FILES=ON" + "-DWITH_OPENMP=ON" + (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) (opencvFlag "JASPER" enableJPEG2K) (opencvFlag "WEBP" enableWebP) @@ -168,11 +205,24 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" - ] ++ lib.optional buildContrib "-DBUILD_PROTOBUF=off" + ] ++ lib.optionals buildContrib [ + # the cnn_3dobj module fails to build + "-DBUILD_opencv_cnn_3dobj=OFF" + + # the dnn_modern module causes: + # https://github.com/opencv/opencv_contrib/issues/823 + # + # On OS X its dependency tiny-dnn-1.0.0a3 also fails to build. + "-DBUILD_opencv_dnn_modern=OFF" + ] ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"]; enableParallelBuilding = true; + postBuild = lib.optionalString enableDocs '' + make doxygen + ''; + hardeningDisable = [ "bindnow" "relro" ]; passthru = lib.optionalAttrs enablePython { pythonPath = []; }; @@ -181,7 +231,7 @@ stdenv.mkDerivation rec { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [viric mdaiter]; + maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } From 5072f4792e890c809a43763c8e0b283a22ee0c14 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 13:03:20 +0200 Subject: [PATCH 1632/2806] db{48,53,60,62}: add patch to fix CVE-2017-10140 --- .../db/CVE-2017-10140-4.8-cwd-db_config.patch | 11 +++++++++++ .../libraries/db/CVE-2017-10140-cwd-db_config.patch | 11 +++++++++++ pkgs/development/libraries/db/db-4.8.nix | 2 +- pkgs/development/libraries/db/db-5.3.nix | 2 +- pkgs/development/libraries/db/db-6.0.nix | 2 +- pkgs/development/libraries/db/db-6.2.nix | 2 +- 6 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch create mode 100644 pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch diff --git a/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch b/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch new file mode 100644 index 00000000000..ed916fcf4d1 --- /dev/null +++ b/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch @@ -0,0 +1,11 @@ +--- a/env/env_open.c.old 2017-06-26 10:32:11.011419981 +0200 ++++ b/env/env_open.c 2017-06-26 10:32:46.893721233 +0200 +@@ -473,7 +473,7 @@ + env->db_mode = mode == 0 ? DB_MODE_660 : mode; + + /* Read the DB_CONFIG file. */ +- if ((ret = __env_read_db_config(env)) != 0) ++ if (env->db_home != NULL && (ret = __env_read_db_config(env)) != 0) + return (ret); + + /* diff --git a/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch b/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch new file mode 100644 index 00000000000..652e962bbe1 --- /dev/null +++ b/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch @@ -0,0 +1,11 @@ +--- db-5.3.28/src/env/env_open.c.old 2017-06-26 10:32:11.011419981 +0200 ++++ db-5.3.28/src/env/env_open.c 2017-06-26 10:32:46.893721233 +0200 +@@ -473,7 +473,7 @@ + env->db_mode = mode == 0 ? DB_MODE_660 : mode; + + /* Read the DB_CONFIG file. */ +- if ((ret = __env_read_db_config(env)) != 0) ++ if (env->db_home != NULL && (ret = __env_read_db_config(env)) != 0) + return (ret); + + /* diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index bce91e5a940..76e30e921ba 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -3,7 +3,7 @@ import ./generic.nix (args // rec { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; - extraPatches = [ ./clang-4.8.patch ]; + extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ]; drvArgs.hardeningDisable = [ "format" ]; drvArgs.doCheck = false; diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 066eca4e63d..7894e4c7326 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,5 +3,5 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - extraPatches = [ ./clang-5.3.patch ]; + extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index b7c5667b883..bafca3bd52d 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -4,5 +4,5 @@ import ./generic.nix (args // rec { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; - extraPatches = [ ./clang-6.0.patch ]; + extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index f897e3744af..96f7668aa90 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -4,5 +4,5 @@ import ./generic.nix (args // rec { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; license = stdenv.lib.licenses.agpl3; - extraPatches = [ ./clang-6.0.patch ]; + extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) From f269f319856f41ae562bf91a44e612d22f1e5f88 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 11:05:14 +0200 Subject: [PATCH 1633/2806] lame: 3.99.5 -> 3.100 for multiple CVEs Fixes CVE-2017-9410, CVE-2017-9411, CVE-2017-9412. --- pkgs/development/libraries/lame/default.nix | 8 ++--- pkgs/development/libraries/lame/gcc-4.9.patch | 33 ------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/libraries/lame/gcc-4.9.patch diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index b324494faff..8ad7cb95a5d 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -23,15 +23,13 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lame-${version}"; - version = "3.99.5"; + version = "3.100"; src = fetchurl { url = "mirror://sourceforge/lame/${name}.tar.gz"; - sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14"; + sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx"; }; - patches = [ ./gcc-4.9.patch ]; - outputs = [ "out" "lib" "doc" ]; # a small single header outputMan = "out"; @@ -61,7 +59,7 @@ stdenv.mkDerivation rec { description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = http://lame.sourceforge.net; license = licenses.lgpl2; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ codyopel fpletz ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/lame/gcc-4.9.patch b/pkgs/development/libraries/lame/gcc-4.9.patch deleted file mode 100644 index 59f8e00e4a8..00000000000 --- a/pkgs/development/libraries/lame/gcc-4.9.patch +++ /dev/null @@ -1,33 +0,0 @@ -fix sse optimizations build on 32-bit with gcc 4.9 -http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=351af417bae0d09bd5a3753d1237f03adf591933 - -xmm_quantize_sub.c: In function 'init_xrpow_core_sse': -xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W -psabi] - const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]); - ^ -In file included from xmm_quantize_sub.c:37:0: -/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch - _mm_loadu_ps (float const *__P) - ^ -xmm_quantize_sub.c:65:18: error: called from here - const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]); - ^ ---- lame/libmp3lame/vector/xmm_quantize_sub.c.orig 2014-06-08 12:16:19.455468042 -0700 -+++ lame/libmp3lame/vector/xmm_quantize_sub.c 2014-06-08 12:16:09.592356980 -0700 -@@ -35,6 +35,7 @@ - #ifdef HAVE_XMMINTRIN_H - - #include -+#pragma GCC target("sse") - - typedef union { - int32_t _i_32[4]; /* unions are initialized by its first member */ -@@ -124,6 +125,7 @@ - } - - -+#pragma GCC target("sse2") - void - fht_SSE2(FLOAT * fz, int n) - { From aebae6c20850ea1c29d2dad9d29b4db6c09e317c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 10:58:16 +0200 Subject: [PATCH 1634/2806] webkitgtk: 2.16.6 -> 2.18.1 for multiple CVEs See https://webkitgtk.org/security/WSA-2017-0008.html --- pkgs/desktops/gnome-3/default.nix | 3 +-- .../libraries/webkitgtk/{2.16.nix => 2.18.nix} | 13 +++++-------- .../development/libraries/wxwidgets/3.0/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 6 +++--- 4 files changed, 12 insertions(+), 16 deletions(-) rename pkgs/development/libraries/webkitgtk/{2.16.nix => 2.18.nix} (88%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 10e5f97c38f..585f79ddea6 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2 + inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -56,7 +56,6 @@ let gtkmm = gtkmm3; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - webkitgtk = webkitgtk216x; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.18.nix similarity index 88% rename from pkgs/development/libraries/webkitgtk/2.16.nix rename to pkgs/development/libraries/webkitgtk/2.18.nix index d6999353414..e1b520eb10b 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -4,7 +4,7 @@ , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit , libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base +, gst-plugins-base, gst-plugins-bad }: assert enableGeoLocation -> geoclue2 != null; @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.16.6"; + version = "2.18.1"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw"; + sha256 = "15fp7szmkpannx7avsynf0nv3y343qwq0fvq3rz2m2mw5wq7pnww"; }; # see if we can clean this up.... @@ -77,10 +77,7 @@ stdenv.mkDerivation rec { "-DENABLE_GTKDOC=OFF" ]; - # XXX: WebKit2 missing include path for gst-plugins-base. - # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" - + (optionalString stdenv.isDarwin " -lintl"); + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; nativeBuildInputs = [ cmake perl python2 ruby bison gperf @@ -90,7 +87,7 @@ stdenv.mkDerivation rec { buildInputs = libintlOrEmpty ++ [ gtk2 libwebp enchant libnotify gnutls pcre nettle libidn libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core ] ++ optional enableGeoLocation geoclue2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) ++ optionals stdenv.isDarwin [ libedit readline mesa ] diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 35300ed9419..2375de4b1bf 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -3,13 +3,13 @@ , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null; with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation { [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa mesa_glu - ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfb50c82969..057f878dedc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10948,7 +10948,7 @@ with pkgs; wcslib = callPackage ../development/libraries/wcslib { }; - webkitgtk = webkitgtk216x; + webkitgtk = webkitgtk218x; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu; @@ -10956,9 +10956,9 @@ with pkgs; inherit (darwin) libobjc; }; - webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix { + webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.16.nix { harfbuzz = harfbuzz-icu; - gst-plugins-base = gst_all_1.gst-plugins-base; + inherit (gst_all_1) gst-plugins-base gst-plugins-bad; }; webkitgtk217x = callPackage ../development/libraries/webkitgtk/2.17.nix { From 658335d6a88b623ab926dea99425e2716afa7f4e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 11:06:29 +0200 Subject: [PATCH 1635/2806] cdrdao: does not build with lame 3.100 --- pkgs/tools/cd-dvd/cdrdao/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 3b8040e2b91..25d94593f5e 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lame, libvorbis, libmad, pkgconfig, libao}: +{stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}: stdenv.mkDerivation { name = "cdrdao-1.2.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { makeFlags = "RM=rm LN=ln MV=mv"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lame libvorbis libmad libao ]; + buildInputs = [ libvorbis libmad libao ]; hardeningDisable = [ "format" ]; From 30c739f7a1ba0b176cf6805f97248c804012a046 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Tue, 24 Oct 2017 13:32:34 +0200 Subject: [PATCH 1636/2806] pptp: correct reference to ${iproute}/bin/ip A reference to /bin/ip was left hanging, causing failure when establishing a connection caused pptp to try and manipulate roots. --- pkgs/tools/networking/pptp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index c2c41d92acb..6185f66b80e 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { patchPhase = '' sed -e 's/install -o root/install/' -i Makefile - sed -e 's,/bin/ip,${iproute}/sbin/ip,' -i routing.c ''; preConfigure = '' - makeFlagsArray=( PPPD=${ppp}/sbin/pppd BINDIR=$out/sbin \ - MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp ) + makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ + BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ + PPPDIR=$out/etc/ppp ) ''; nativeBuildInputs = [ perl which ]; From 5715f276da428b17200e922003731cf89a4620d4 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Mon, 23 Oct 2017 23:10:06 +0200 Subject: [PATCH 1637/2806] shotwell: 0.26.2 -> 0.27.0 --- pkgs/applications/graphics/shotwell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 3f31b86fe49..a3be867d6ed 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { version = "${major}.${minor}"; - major = "0.26"; - minor = "2"; + major = "0.27"; + minor = "0"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "0frjqa6nmh025clwnb74z2rzbdq65wjcp2lf9csgcbkpahyjhrag"; + sha256 = "03vwp314kckr67p7shrysqpr95hc3326lk3bv40g11i9clsik1a2"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; From 826258889e0611298a4fded1e7712e7de6af2680 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 10:55:01 +0200 Subject: [PATCH 1638/2806] webkitgtk217x: remove, unused --- pkgs/development/libraries/webkitgtk/2.17.nix | 108 ------------------ pkgs/top-level/all-packages.nix | 5 - 2 files changed, 113 deletions(-) delete mode 100644 pkgs/development/libraries/webkitgtk/2.17.nix diff --git a/pkgs/development/libraries/webkitgtk/2.17.nix b/pkgs/development/libraries/webkitgtk/2.17.nix deleted file mode 100644 index fc0e13436bc..00000000000 --- a/pkgs/development/libraries/webkitgtk/2.17.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake -, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls -, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit -, libidn, libedit, readline, mesa, libintlOrEmpty -, enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base, gst-plugins-bad -}: - -assert enableGeoLocation -> geoclue2 != null; - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; - version = "2.17.91"; - - meta = { - description = "Web content rendering engine, GTK+ port"; - homepage = http://webkitgtk.org/; - license = licenses.bsd2; - platforms = with platforms; linux ++ darwin; - hydraPlatforms = []; - maintainers = with maintainers; [ ]; - }; - - postConfigure = optionalString stdenv.isDarwin '' - substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \ - --replace "../../lib/libWTFGTK.a" "" - substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ - --replace "../../lib/libbmalloc.a" "" - sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \ - Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \ - Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \ - Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \ - Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \ - Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \ - Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \ - Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt - substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ - --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a" - ''; - - src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0f158gqb2lvv3v5z6s7gjgwms69fgsjkd8whfks8cq6cybiy9y37"; - }; - - # see if we can clean this up.... - - patches = [ - ./finding-harfbuzz-icu.patch - ./gstreamergl-2.17.patch - ] ++ optionals stdenv.isDarwin [ - ./PR-152650-2.patch - ./PR-153138.patch - ./PR-157554.patch - ./PR-157574.patch - ]; - - cmakeFlags = [ - "-DPORT=GTK" - "-DUSE_LIBHYPHEN=0" - ] - ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" - ++ optionals stdenv.isDarwin [ - "-DUSE_SYSTEM_MALLOC=ON" - "-DUSE_ACCELERATE=0" - "-DENABLE_INTROSPECTION=ON" - "-DENABLE_MINIBROWSER=OFF" - "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - "-DENABLE_MINIBROWSER=OFF" - "-DENABLE_VIDEO=ON" - "-DENABLE_QUARTZ_TARGET=ON" - "-DENABLE_X11_TARGET=OFF" - "-DENABLE_OPENGL=OFF" - "-DENABLE_WEB_AUDIO=OFF" - "-DENABLE_WEBGL=OFF" - "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" - "-DENABLE_GTKDOC=OFF" - ]; - - # XXX: WebKit2 missing include path for gst-plugins-base. - # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0" - + (optionalString stdenv.isDarwin " -lintl"); - - nativeBuildInputs = [ - cmake perl python2 ruby bison gperf sqlite - pkgconfig gettext gobjectIntrospection - ]; - - buildInputs = libintlOrEmpty ++ [ - gtk2 libwebp enchant libnotify gnutls pcre nettle libidn - libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core - ] ++ optional enableGeoLocation geoclue2 - ++ (with xlibs; [ libXdmcp libXt libXtst ]) - ++ optionals stdenv.isDarwin [ libedit readline mesa ] - ++ optional stdenv.isLinux wayland; - - propagatedBuildInputs = [ - libsoup gtk3 - ]; - - enableParallelBuilding = true; - - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4d920ee651..cf0bb3f9224 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10956,11 +10956,6 @@ with pkgs; gst-plugins-base = gst_all_1.gst-plugins-base; }; - webkitgtk217x = callPackage ../development/libraries/webkitgtk/2.17.nix { - harfbuzz = harfbuzz-icu; - gst-plugins-base = gst_all_1.gst-plugins-base; - }; - webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { withGtk2 = true; enableIntrospection = false; From 8e5a5904c1be7ec104aedc6991e85369d785c81b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 20 Oct 2017 00:58:02 +0200 Subject: [PATCH 1639/2806] prometheus-blackbox-exporter: 0.9.1 -> 0.10.0 --- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 6521408580d..c5aa7f91bd6 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.9.1"; + version = "0.10.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "03sc1h8jfxaw7c5d6lkj6x653zhxhh0v29n6db3319nsfx00nrag"; + sha256 = "0xxlmg6yin63pghlvjj8amf0h5plnichvcrmcq67bffhz6d792gc"; }; meta = with stdenv.lib; { From de917326a902e6adbe7a966ee4351010520575bf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 20 Oct 2017 01:55:56 +0200 Subject: [PATCH 1640/2806] atlassian-crowd service: run crowd in foreground --- nixos/modules/services/web-apps/atlassian/crowd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index b54c91d7de9..2a5f0804638 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -142,7 +142,7 @@ in ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml ''; - script = "${pkg}/start_crowd.sh"; + script = "${pkg}/start_crowd.sh -fg"; serviceConfig = { User = cfg.user; From 9cad02ce6b26837a9498df833baaec2363110d28 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 20 Oct 2017 00:56:17 +0200 Subject: [PATCH 1641/2806] journalbeat: set argv0 in wrapper --- pkgs/tools/system/journalbeat/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index 5d60f4c7c5c..b914ffaa0cb 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -15,6 +15,7 @@ in buildGoPackage rec { postInstall = '' wrapProgram $bin/bin/journalbeat \ + --argv0 journalbeat \ --prefix LD_LIBRARY_PATH : ${libPath} ''; From 422fd6a2aa5f346e43090cacb846214cb005d2e5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 13:21:33 +0200 Subject: [PATCH 1642/2806] prometheus: 1.7.2 -> 1.8.1 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 08ee6b4e88a..46c02c6bb95 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "prometheus-${version}"; - version = "1.7.2"; + version = "1.8.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "0a2qlcx4p6mwgff9hc2h3sm1glh6syb38jfxabsx2clmj0gq2dq1"; + sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4"; }; docheck = true; From 17a069276faec303d173aa5ef23cf95ea5233690 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 12:27:20 +0200 Subject: [PATCH 1643/2806] libvirt: 3.6.0 -> 3.8.0 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 86e858e569c..ff72cc84d26 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "0gcyql5dp6j370kvik9hjhxirrg89m7l1q52yq0g75h7jpv9fb1s"; + sha256 = "1y83z4jb2by6ara0nw4sivh7svqcrw97yfhqwdscxl4y10saisvk"; }; patches = [ ./build-on-bsd.patch ]; From b4d1c8898ef80db2a878055f08c38e3e2ebbd3d9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 13:10:42 +0200 Subject: [PATCH 1644/2806] sks: build with default db version --- pkgs/servers/sks/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index 1d3b04565c8..fe4029db1c1 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl, camlp4 }: +{ stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }: stdenv.mkDerivation rec { name = "sks-${version}"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; }; - buildInputs = [ ocaml zlib db48 perl camlp4 ]; + buildInputs = [ ocaml zlib db perl camlp4 ]; makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; preConfigure = '' cp Makefile.local.unused Makefile.local sed -i \ - -e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \ + -e "s:^LIBDB=.*$:LIBDB=-ldb:g" \ Makefile.local ''; @@ -27,8 +27,7 @@ stdenv.mkDerivation rec { checkPhase = "./sks unit_test"; meta = with stdenv.lib; { - description = "An OpenPGP keyserver whose goal is to provide easy to - deploy, decentralized, and highly reliable synchronization"; + description = "An easily deployable & decentralized OpenPGP keyserver"; longDescription = '' SKS is an OpenPGP keyserver whose goal is to provide easy to deploy, decentralized, and highly reliable synchronization. That means that a key @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos fpletz ]; }; } From a203fd2a57e828bcf567928ff41361fc52bc8e9b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 13:25:16 +0200 Subject: [PATCH 1645/2806] SDL_image: add patch to fix CVE-2017-2887 --- pkgs/development/libraries/SDL_image/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 62af47807cc..55a4058fe56 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: +{ stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: stdenv.mkDerivation rec { name = "SDL_image-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-2887"; + url = "https://hg.libsdl.org/SDL_image/raw-diff/318484db0705/IMG_xcf.c"; + sha256 = "140dyszz9hkpgwjdiwp1b7jdd8f8l5d862xdaf3ml4cimga1h5kv"; + }) + ]; + buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ]; meta = with stdenv.lib; { From 97b23fc9755e284399b62f5c162be6d3ab872dad Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 13:52:51 +0200 Subject: [PATCH 1646/2806] softhsm: 2.2.0 -> 2.3.0 --- pkgs/tools/security/softhsm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 42b6024fb21..6caf88973a6 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "softhsm-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "https://dist.opendnssec.org/source/${name}.tar.gz"; - sha256 = "1xw53zkv5xb9pxa8q84kh505yd6pkavxd12x2fjgqi6s12p2hsgb"; + sha256 = "09y1ladg7j0j5n780b1hdzwd2g2b5j5c54pfs7bzjviskb409mjy"; }; configureFlags = [ From 2f5038535280c06d14ba4efa05b8bef94b3d385c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 14:16:12 +0200 Subject: [PATCH 1647/2806] botanUnstable: remove, unused --- pkgs/development/libraries/botan/unstable.nix | 9 --------- pkgs/development/libraries/botan/unstable.upstream | 10 ---------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 20 deletions(-) delete mode 100644 pkgs/development/libraries/botan/unstable.nix delete mode 100644 pkgs/development/libraries/botan/unstable.upstream diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix deleted file mode 100644 index 6ae151dcc64..00000000000 --- a/pkgs/development/libraries/botan/unstable.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - baseVersion = "1.11"; - revision = "34"; - sha256 = "05hzffp0dxac7414a84z0fgv980cnfx55ch2y4vpg5nvin7m9bar"; - openssl = null; - postPatch = "sed '1i#include ' -i src/tests/test_bigint.cpp"; -}) diff --git a/pkgs/development/libraries/botan/unstable.upstream b/pkgs/development/libraries/botan/unstable.upstream deleted file mode 100644 index c03bc7a6c3b..00000000000 --- a/pkgs/development/libraries/botan/unstable.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url http://botan.randombit.net/download.html -version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$' -ensure_version -attribute_name botanUnstable -do_overwrite(){ - ensure_hash - set_var_value sha256 $CURRENT_HASH - set_var_value baseVersion ${CURRENT_VERSION%.*} - set_var_value revision ${CURRENT_VERSION##*.} -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf0bb3f9224..d1d5a5ae30c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7818,7 +7818,6 @@ with pkgs; botan = callPackage ../development/libraries/botan { }; botan2 = callPackage ../development/libraries/botan/2.0.nix { }; - botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; box2d = callPackage ../development/libraries/box2d { }; From acc8d160f0c8a4f7a7c6d8f3b6f5856ee735acbb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 14:19:16 +0200 Subject: [PATCH 1648/2806] botan2: 2.0.1 -> 2.3.0 for CVE-2017-14737 --- pkgs/development/libraries/botan/2.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index 8d87f119157..dec08d17177 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -1,9 +1,9 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "2.0"; - revision = "1"; - sha256 = "02sf6qghgs1lmprx715dnyll1rmqcjb9q6s50n20li8idlqysf51"; + baseVersion = "2.3"; + revision = "0"; + sha256 = "0z6lwv28hxnfkhd4s03cb4cdm1621bsswc2h88z4qslqwpz71y9r"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; From d72ae07c24bbeaccb0b959f539dafdd39bfad60b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 14:19:38 +0200 Subject: [PATCH 1649/2806] botan: 1.10.15 -> 1.10.17 for CVE-2017-14737 --- pkgs/development/libraries/botan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index f2971cc47be..04652aa013a 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; - revision = "15"; - sha256 = "1zkhmggzxjla2iwaiyrx5161yxckrzszmy9yghjlpnhg8zyqzk60"; + revision = "17"; + sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8"; extraConfigureFlags = "--with-gnump"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt From a502a95616b6704cc73d05a63f0f2f8596de7991 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 14:20:00 +0200 Subject: [PATCH 1650/2806] kea: build with botan2 --- pkgs/tools/networking/kea/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index e1829bcaf7d..68fb72ff7d9 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan, log4cplus +{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus , boost, python3, postgresql, mysql, gmp, bzip2 }: stdenv.mkDerivation rec { @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" - "--with-botan-config=${botan}/bin/botan-config-1.10" "--with-dhcp-pgsql=${postgresql}/bin/pg_config" "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config" ]; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ openssl log4cplus boost python3 mysql.client - botan gmp bzip2 + botan2 gmp bzip2 ]; enableParallelBuilding = true; From 322fa6b06cfbe66ef1bc12b1bfd5fd37d63cbf87 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 14:32:33 +0200 Subject: [PATCH 1651/2806] wireshark: 2.4.1 -> 2.4.2 for multiple CVEs Fixes CVE-2017-15192, CVE-2017-15193, CVE-2017-15191, CVE-2017-15190, CVE-2017-15189. See https://www.wireshark.org/docs/relnotes/wireshark-2.4.2.html. --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 4844c83cd14..2ed87c71a90 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.1"; + version = "2.4.2"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1k8zj44pkb2ny2x46f100y7cxddm1kh0zh7f6qggm78gn7wvrp82"; + sha256 = "0zglapd3sz08p2z9x8a5va3jnz17b3n5a1bskf7f2dgx6m3v5b6i"; }; cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; From 646a77739b23425cc17126714992d14626222b56 Mon Sep 17 00:00:00 2001 From: Yellow Ghost Date: Tue, 24 Oct 2017 02:57:58 +0200 Subject: [PATCH 1652/2806] notify-desktop: init at 0.2.0 notify-desktop package added improved code synopsis --- lib/maintainers.nix | 1 + pkgs/tools/misc/notify-desktop/default.nix | 33 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/notify-desktop/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a44dc3d4da0..6a6dc1fe336 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -674,6 +674,7 @@ xwvvvvwx = "David Terry "; yarr = "Dmitry V. "; yegortimoshenko = "Yegor Timoshenko "; + ylwghst = "Burim Augustin Berisa "; yochai = "Yochai "; yorickvp = "Yorick van Pelt "; yuriaisaka = "Yuri Aisaka "; diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix new file mode 100644 index 00000000000..661f4f4f435 --- /dev/null +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, dbus, pkgconfig }: + +stdenv.mkDerivation rec { + name = "notify-desktop"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "nowrep"; + repo = "notify-desktop"; + rev = "9863919fb4ce7820810ac14a09a46ee73c3d56cc"; + sha256 = "1brcvl2fx0yzxj9mc8hzfl32zdka1f1bxpzsclcsjplyakyinr1a"; + }; + + buildInputs = [ dbus pkgconfig ]; + + installPhase = '' + mkdir -p $out/bin + install -m 755 bin/notify-desktop $out/bin/notify-desktop + ''; + + meta = with stdenv.lib; { + description = "Little application that lets you send desktop notifications with one command"; + longDescription = '' + It's basically clone of notify-send from libnotify, + but it supports reusing notifications on screen by passing its ID. + It also does not use any external dependencies (except from libdbus of course). + ''; + homepage = "https://github.com/nowrep/notify-desktop"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ ylwghst ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1d5a5ae30c..046d5035319 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3572,6 +3572,8 @@ with pkgs; nixbot = callPackage ../tools/misc/nixbot {}; + notify-desktop = callPackage ../tools/misc/notify-desktop {}; + nkf = callPackage ../tools/text/nkf {}; nlopt = callPackage ../development/libraries/nlopt { octave = null; }; From 38c04e691ce90ea12f68107bec47057915903f02 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Oct 2017 12:51:38 +0200 Subject: [PATCH 1653/2806] python.pkgs.jupyter_core: own file, enable tests --- .../python-modules/jupyter_core/default.nix | 38 +++++++++++++++++++ .../tests_respect_pythonpath.patch | 24 ++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------ 3 files changed, 63 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/jupyter_core/default.nix create mode 100644 pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix new file mode 100644 index 00000000000..4db36cf7b37 --- /dev/null +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -0,0 +1,38 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, ipython +, traitlets +, glibcLocales +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "jupyter_core"; + version = "4.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40"; + }; + + buildInputs = [ pytest mock glibcLocales ]; + propagatedBuildInputs = [ ipython traitlets ]; + + patches = [ ./tests_respect_pythonpath.patch ]; + + checkPhase = '' + mkdir tmp + HOME=tmp TMPDIR=tmp LC_ALL=en_US.utf8 py.test + ''; + + meta = with lib; { + description = "Jupyter core package. A base package on which Jupyter projects rely"; + homepage = http://jupyter.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh globin ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch new file mode 100644 index 00000000000..61415b756ab --- /dev/null +++ b/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch @@ -0,0 +1,24 @@ +--- a/jupyter_core/tests/test_command.py 2016-09-13 15:22:49.000000000 +0200 ++++ b/jupyter_core/tests/test_command.py 2017-10-23 12:49:27.489527705 +0200 +@@ -113,7 +113,10 @@ + witness = a.join(witness_cmd) + witness.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")')) + witness.chmod(0o700) +- out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': ''}) ++ out = check_output( ++ [sys.executable, str(jupyter), 'witness'], ++ env={'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']} ++ ) + assert b'WITNESS' in out + + +@@ -136,5 +139,8 @@ + witness_b.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")')) + witness_b.chmod(0o700) + +- out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': str(b)}) ++ out = check_output( ++ [sys.executable, str(jupyter), 'witness'], ++ env={'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']} ++ ) + assert b'WITNESS A' in out diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65210b2e055..d2a4d8e2424 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10798,32 +10798,7 @@ in { jupyter_client = callPackage ../development/python-modules/jupyter_client { }; - jupyter_core = buildPythonPackage rec { - version = "4.3.0"; - name = "jupyter_core-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jupyter_core/${name}.tar.gz"; - sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40"; - }; - - buildInputs = with self; [ pytest mock ]; - propagatedBuildInputs = with self; [ ipython traitlets]; - - checkPhase = '' - py.test - ''; - - # Several tests fail due to being in a chroot - doCheck = false; - - meta = { - description = "Jupyter core package. A base package on which Jupyter projects rely"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + jupyter_core = callPackage ../development/python-modules/jupyter_core { }; jsonpath_rw = buildPythonPackage rec { name = "jsonpath-rw-${version}"; From 817b7bb3491dc0931bd508a57fcca57c67121ac0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Oct 2017 13:36:22 +0200 Subject: [PATCH 1654/2806] python.pkgs.nose_warnings_filters: init at 0.1.5 --- .../nose_warnings_filters/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/nose_warnings_filters/default.nix diff --git a/pkgs/development/python-modules/nose_warnings_filters/default.nix b/pkgs/development/python-modules/nose_warnings_filters/default.nix new file mode 100644 index 00000000000..db53a34a57f --- /dev/null +++ b/pkgs/development/python-modules/nose_warnings_filters/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, nose +}: + +buildPythonPackage rec { + pname = "nose_warnings_filters"; + version = "0.1.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "17dvfqfy2fm7a5cmiffw2dc3064kpx72fn5mlw01skm2rhn5nv25"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ nose ]; + + checkPhase = '' + nosetests -v + ''; + + meta = { + description = "Allow injecting warning filters during nosetest"; + homepage = https://github.com/Carreau/nose_warnings_filters; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2a4d8e2424..80bb80586dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13124,6 +13124,8 @@ in { buildInputs = with self; [ nose ]; }; + nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { }; + notebook = callPackage ../development/python-modules/notebook { }; notify = pkgs.stdenv.mkDerivation (rec { From c581dbfab342e3aac00b7d69b5dfcfe08bcdc6f7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Oct 2017 13:40:02 +0200 Subject: [PATCH 1655/2806] python.pkgs.notebook: 5.0.0 -> 5.2.0 --- .../python-modules/notebook/default.nix | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 3a24c5566bf..c30e6e5e77d 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , fetchPypi , nose +, nose_warnings_filters , glibcLocales -, isPy27 +, isPy3k , mock , jinja2 , tornado @@ -21,32 +22,39 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.0.0"; + version = "5.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1cea3bbbd03c8e5842a1403347a8cc8134486b3ce081a2e5b1952a00ea66ed54"; + sha256 = "1sh3jkkmjzv17c3r8ii3kfhpxi6dkjk846b2lfy71g9qwqdcvbvz"; }; - LC_ALL = "en_US.UTF-8"; + LC_ALL = "en_US.utf8"; - buildInputs = [nose glibcLocales] ++ lib.optionals isPy27 [mock]; + buildInputs = [ nose glibcLocales ] + ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); - propagatedBuildInputs = [jinja2 tornado ipython_genutils traitlets jupyter_core - jupyter_client nbformat nbconvert ipykernel terminado requests pexpect ]; + propagatedBuildInputs = [ + jinja2 tornado ipython_genutils traitlets jupyter_core + jupyter_client nbformat nbconvert ipykernel terminado requests pexpect + ]; + # disable warning_filters + preCheck = lib.optionalString (!isPy3k) '' + echo "" > setup.cfg + cat setup.cfg + ''; checkPhase = '' - nosetests -v + runHook preCheck + mkdir tmp + HOME=tmp nosetests -v ''; - # Certain tests fail due to being in a chroot. - # PermissionError - doCheck = false; meta = { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; homepage = http://jupyter.org/; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh globin ]; }; -} \ No newline at end of file +} From b10a98cee748aa6474451969144c073ab77ea2a7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Oct 2017 13:49:03 +0200 Subject: [PATCH 1656/2806] python.pkgs.nbformat: enable tests --- pkgs/development/python-modules/nbformat/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 6f637bae891..71a140e5325 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -19,18 +19,21 @@ buildPythonPackage rec { inherit pname version; sha256 = "f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402"; }; - LC_ALL="en_US.UTF-8"; + + LC_ALL="en_US.utf8"; checkInputs = [ pytest glibcLocales ]; propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core ]; - # Failing tests and permission issues - doCheck = false; + preCheck = '' + mkdir tmp + export HOME=tmp + ''; meta = { description = "The Jupyter Notebook format"; homepage = http://jupyter.org/; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh globin ]; }; } From 62ca1c2dab3ebec9dad25492f7274ea262fdbce0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Oct 2017 14:54:17 +0200 Subject: [PATCH 1657/2806] mistune: 0.7.1 -> 0.7.4, own file --- .../python-modules/mistune/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/mistune/default.nix diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix new file mode 100644 index 00000000000..14aef5b00d1 --- /dev/null +++ b/pkgs/development/python-modules/mistune/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + pname = "mistune"; + version = "0.7.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0byj9jg9ly7karf5sb1aqcw7avaim9sxl8ws7yw7p1fibjgsy5w5"; + }; + + buildInputs = [ nose ]; + + meta = with lib; { + description = "The fastest markdown parser in pure Python"; + homepage = https://github.com/lepture/mistune; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80bb80586dc..9653bb42a23 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11875,23 +11875,7 @@ in { }; }; - mistune = buildPythonPackage rec { - version = "0.7.1"; - name = "mistune-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mistune/${name}.tar.gz"; - sha256 = "6076dedf768348927d991f4371e5a799c6a0158b16091df08ee85ee231d929a7"; - }; - - buildInputs = with self; [nose]; - - meta = { - description = "The fastest markdown parser in pure Python"; - homepage = https://github.com/lepture/mistune; - license = licenses.bsd3; - }; - }; + mistune = callPackage ../development/python-modules/mistune { }; brotlipy = buildPythonPackage rec { name = "brotlipy-${version}"; From 54a83423f015fc4a8682d76fdc97c3cb16da11dc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Oct 2017 14:53:43 +0200 Subject: [PATCH 1658/2806] nbconvert: 5.2.1 -> 5.3.1, enable tests --- .../python-modules/nbconvert/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 881895ba6ba..d04e5c5eccb 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pytest , nose +, glibcLocales , entrypoints , bleach , mistune @@ -21,15 +22,15 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "5.2.1"; + version = "5.3.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9ed68ec7fe90a8672b43795b29ea91cc75ea355c83debc83ebd12171521ec274"; + sha256 = "1f9dkvpx186xjm4xab0qbph588mncp4vqk3fmxrsnqs43mks9c8j"; }; - checkInputs = [ nose pytest ]; + checkInputs = [ nose pytest glibcLocales ]; propagatedBuildInputs = [ entrypoints bleach mistune jinja2 pygments traitlets testpath @@ -37,16 +38,14 @@ buildPythonPackage rec { ]; checkPhase = '' - nosetests -v + mkdir tmp + LC_ALL=en_US.utf8 HOME=`realpath tmp` py.test -v ''; - # PermissionError. Likely due to being in a chroot - doCheck = false; - meta = { description = "Converting Jupyter Notebooks"; homepage = http://jupyter.org/; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh globin ]; }; } From 160685725eac9adcc061a49f72cb3e7cd72d4e50 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Tue, 24 Oct 2017 09:42:22 -0400 Subject: [PATCH 1659/2806] haskell-packages: fix all-cabal-hashes component lookup Previously, if a package name in a later component was a substring of a package name in an earlier component, the earlier component would be selected due to a partial-name match. This commit prevents partial matches. --- pkgs/development/haskell-modules/make-package-set.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index c234ff3e780..ebfe44dd25a 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -122,7 +122,7 @@ let '' set +o pipefail for component in ${all-cabal-hashes}/*; do - if ls $component | grep -q ${name}; then + if ls $component | grep -q "^${name}$"; then echo "builtins.storePath $component" > $out exit 0 fi From 0bb7a1b82ac8d5597619eabcb43ec4f12eb457f4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 16:06:11 +0200 Subject: [PATCH 1660/2806] webkitgtk: fix evaluation --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 046d5035319..6998f3a82c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17327,7 +17327,6 @@ with pkgs; gconf = gnome2.GConf; inherit (gnome2) libglade scrollkeeper; gtkhtml = gnome2.gtkhtml4; - webkitgtk = webkitgtk217x; python = python27; }; From 0f0fcf84ce962cbcc7dfee255f91cba926159705 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 16:06:51 +0200 Subject: [PATCH 1661/2806] nginx: 1.12.1 -> 1.12.2 --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index aa03d6162dd..7bd74c3a332 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.12.1"; - sha256 = "1yvnmj7vlykrqdi6amkvs63lva6qkxd98sqv0a8hz8w5ci1bz4w7"; + version = "1.12.2"; + sha256 = "05h4rwja7170z0l979yjghy9i9ichllwhicylzpmmyyml6fkfprh"; }) From 4d92b5fb928d090b1faee93e2811f9c7f68085f4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 16:08:22 +0200 Subject: [PATCH 1662/2806] webkitgtk218x: fix evaluation --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88dd4d49fcf..9f6b1445298 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10952,7 +10952,7 @@ with pkgs; inherit (darwin) libobjc; }; - webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.16.nix { + webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix { harfbuzz = harfbuzz-icu; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; }; From 8a28d840e995a1914b3224d47020bb5d6a396aca Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 24 Oct 2017 22:49:35 +0800 Subject: [PATCH 1663/2806] keditbookmarks: init at 17.08.1 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/keditbookmarks.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/keditbookmarks.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 6e10afe637b..54a834cba00 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -101,6 +101,7 @@ let kdepim-runtime = callPackage ./kdepim-runtime.nix {}; kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; + keditbookmarks = callPackage ./keditbookmarks.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; kholidays = callPackage ./kholidays.nix {}; diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix new file mode 100644 index 00000000000..57741c03ad5 --- /dev/null +++ b/pkgs/applications/kde/keditbookmarks.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kio, kparts, kwindowsystem +}: + +mkDerivation { + name = "keditbookmarks"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kio kparts kwindowsystem ]; + meta = with lib; { + homepage = http://www.kde.org; + license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6998f3a82c0..b9f2653d2e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15242,7 +15242,7 @@ with pkgs; inherit (kdeApplications) akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b - kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf + kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf keditbookmarks kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle; From 4936e3114132b8b8701bb67a01357aeeeb7ec7ee Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sat, 21 Oct 2017 11:21:24 +0200 Subject: [PATCH 1664/2806] pulsemixer: init at 1.3.0-license --- pkgs/tools/audio/pulsemixer/default.nix | 36 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/audio/pulsemixer/default.nix diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/tools/audio/pulsemixer/default.nix new file mode 100644 index 00000000000..f07bf7d3fc5 --- /dev/null +++ b/pkgs/tools/audio/pulsemixer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, python3, libpulseaudio }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "pulsemixer"; + version = "1.3.0-license"; + + src = fetchFromGitHub { + owner = "GeorgeFilipkin"; + repo = pname; + rev = version; + sha256 = "186xbzyn35w2j58l68mccj0cnf0wxj93zb7s0r26zj4cppwszn90"; + }; + + inherit libpulseaudio; + + buildInputs = [ python3 ]; + + installPhase = '' + mkdir -p $out/bin + install pulsemixer $out/bin/ + ''; + + postFixup = '' + substituteInPlace "$out/bin/pulsemixer" \ + --replace "libpulse.so.0" "$libpulseaudio/lib/libpulse.so.0" + ''; + + meta = with stdenv.lib; { + description = "Cli and curses mixer for pulseaudio"; + homepage = https://github.com/GeorgeFilipkin/pulsemixer; + license = licenses.mit; + maintainers = [ maintainers.woffs ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9f2653d2e6..10a3de883ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3557,6 +3557,8 @@ with pkgs; pnmixer = callPackage ../tools/audio/pnmixer { }; + pulsemixer = callPackage ../tools/audio/pulsemixer { }; + pwsafe = callPackage ../applications/misc/pwsafe { wxGTK = wxGTK30; }; From 5a07d169bfdcb6477a2bbe86cd84c8fc1a6f3d98 Mon Sep 17 00:00:00 2001 From: Eli Flanagan Date: Mon, 23 Oct 2017 13:15:59 -0400 Subject: [PATCH 1665/2806] apache-httpd: 2.4.28 -> 2.4.29 --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 93fe205a8f9..25097a31416 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.28"; + version = "2.4.29"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666"; + sha256 = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00"; }; # FIXME: -dev depends on -doc From cf8e966e00f3e378ebe152908a22dfad0fba4eec Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Mon, 23 Oct 2017 13:54:30 +1300 Subject: [PATCH 1666/2806] lastpass-cli: 1.1.1 -> 1.2.1 --- pkgs/tools/security/lastpass-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index e4042239905..ce59ddca7c0 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "lastpass-cli-${version}"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "lastpass"; repo = "lastpass-cli"; rev = "v${version}"; - sha256 = "1slqrv877c1bhivgd2i9cr1lsd72371dpz6a3h6s56l3qbyk28sa"; + sha256 = "0nrsrd5cqyv2zydzzl1vryrnj1p0x17cx1rmrp4kmzh83bzgcfvv"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 0967f0e858dd8eaca73278d98ccd7b7fc848cc82 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Tue, 24 Oct 2017 17:51:31 +0200 Subject: [PATCH 1667/2806] sqlite: 3.20.0 -> 3.20.1 --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 6dc09ddd39f..4a10f912883 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.20.0"; + name = "sqlite-3.20.1"; src = fetchurl { - url = "http://sqlite.org/2017/sqlite-autoconf-3200000.tar.gz"; - sha256 = "1876dapm1xx5aqd2d8l7ymmkd2z9rybh99rp5f5rd4zz57vcc51q"; + url = "http://sqlite.org/2017/sqlite-autoconf-3200100.tar.gz"; + sha256 = "0hh7jnxfwvs2qlvmjwrgkvxb8sk4x8hj04m54fq9h1xw55dmjrpc"; }; outputs = [ "bin" "dev" "out" ]; From b5a0015004b70fe53d7ea6828b5cc6e9b8b9993f Mon Sep 17 00:00:00 2001 From: mimadrid Date: Tue, 24 Oct 2017 17:50:36 +0200 Subject: [PATCH 1668/2806] sqlite3_analyzer: 3.20.0 -> 3.20.1 --- pkgs/development/libraries/sqlite/sqlite3_analyzer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix index f6a96df3eb6..d971587ee6e 100644 --- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix +++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, tcl }: stdenv.mkDerivation { - name = "sqlite3_analyzer-3.20.0"; + name = "sqlite3_analyzer-3.20.1"; src = fetchurl { - url = "https://www.sqlite.org/2017/sqlite-src-3200000.zip"; - sha256 = "1vjbc5i95wildrdfzalrsgai1ziz4m4gbah4wm8qc4jxm1vqwdab"; + url = "https://www.sqlite.org/2017/sqlite-src-3200100.zip"; + sha256 = "0aicmapa99141hjncyxwg66ndhr16nwpbqy27x79fg1ikzhwlnv6"; }; nativeBuildInputs = [ unzip ]; From 9b7bf9cd912541c1fac78eb5f27d6e853ac6808c Mon Sep 17 00:00:00 2001 From: mimadrid Date: Tue, 24 Oct 2017 17:57:42 +0200 Subject: [PATCH 1669/2806] rofi-pass: 1.5.1 -> 1.5.2 --- pkgs/tools/security/pass/rofi-pass.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 44bc40d9591..919ad9791a2 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; rev = version; - sha256 = "1qv1yphfy2zmiibc92kq1m0k8plal5wcb6jymc3ks2wrl4v98iy4"; + sha256 = "1sc4b1g2z7402akk96rqbnwjd66n6qn046ihpwxdb03bv2qahiap"; }; buildInputs = [ makeWrapper ]; From 35bf3b80724f884e1b25d5df614fc55c67216df3 Mon Sep 17 00:00:00 2001 From: Renaud Date: Tue, 24 Oct 2017 20:05:31 +0200 Subject: [PATCH 1670/2806] apktool: 2.2.4 -> 2.3.0 --- pkgs/development/tools/apktool/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 555cb313a62..158de9226c6 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"; - sha256 = "0l9jxa393a52iiawh93v31vr1y6z2bwg6dqhpivqd6y0vip1h7qz"; + urls = [ + "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" + "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" + ]; + sha256 = "b724c158ec99dbad723024e259fd73e5135c40d652a3c599cec6ade9264a568e"; }; phases = [ "installPhase" ]; @@ -25,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for reverse engineering Android apk files"; - homepage = https://code.google.com/p/android-apktool/; + homepage = https://ibotpeaches.github.io/Apktool/; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = with platforms; unix; From 3f013b806b4e9db1c6d8190d1bf6189d80ba736d Mon Sep 17 00:00:00 2001 From: Erlend Pedersen Date: Tue, 24 Oct 2017 19:57:08 +0200 Subject: [PATCH 1671/2806] plymouth service: fix symlink to defaults Symlink for plymouthd.defaults was pointing to nonexisting target because of a spelling error. --- nixos/modules/system/boot/plymouth.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index d45b1686c1e..0938d22a45b 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -72,7 +72,7 @@ in environment.systemPackages = [ plymouth ]; environment.etc."plymouth/plymouthd.conf".source = configFile; - environment.etc."plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouth.defaults"; + environment.etc."plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults"; environment.etc."plymouth/logo.png".source = cfg.logo; environment.etc."plymouth/themes".source = "${themesEnv}/share/plymouth/themes"; # XXX: Needed because we supply a different set of plugins in initrd. From 77c130083a75dfc4375d50bddb2420f232be651b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 24 Oct 2017 16:23:02 -0200 Subject: [PATCH 1672/2806] efl: 1.20.4 -> 1.20.5 --- pkgs/desktops/enlightenment/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index d011012e010..be648bf6699 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.20.4"; + version = "1.20.5"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "1jxha61gsil6hs9zb72zsyh3gmdipvfnlc9v3palb2bm0b23aq9i"; + sha256 = "07624c71l9d1jx1zvdhwkr1bgb1n7i0i5hyg6579zdwl3jw6jpns"; }; nativeBuildInputs = [ pkgconfig ]; From 21fd20f91ca210e6f217430e890e86d045618f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 24 Oct 2017 16:27:50 -0200 Subject: [PATCH 1673/2806] elementary-icon-theme: 4.3.0 -> 4.3.1 --- pkgs/data/icons/elementary-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 75ea3360919..77d29d52507 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.3.0"; + version = "4.3.1"; package-name = "elementary-icon-theme"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; - sha256 = "1gg7znfgyj4zxsa741psc67nyixi27q9ghjklz0337r4cwmcwn1g"; + sha256 = "1rp22igvnx71l94j5a6px142329djhk2psm1wfgbhdxbj23hw9kb"; }; dontBuild = true; From a76a3cab010f7a46ceaf67d0c561327de75c3256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 24 Oct 2017 16:34:08 -0200 Subject: [PATCH 1674/2806] avfs: 1.0.4 -> 1.0.5 --- pkgs/tools/filesystems/avfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index f1faf69ed58..3f596947f88 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "avfs-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; - sha256 = "005iw01ppjslfzbbx52dhmp1f7a8d071s5pxvjlk11zdv4h22rbb"; + sha256 = "0xh1wpd8z3m5jmmv24fg4pvqhpnhygs2385qn5473hwk84gnpkp5"; }; nativeBuildInputs = [ pkgconfig ]; From f402c3aa78f0d6ad21fac8ef9dea288dcccabc3e Mon Sep 17 00:00:00 2001 From: Emanuele Peruffo Date: Tue, 24 Oct 2017 21:12:01 +0200 Subject: [PATCH 1675/2806] robo3t: change .desktop name Gnome does not permit to add the application to favorites if the .desktop name is different than the binary name. See https://unix.stackexchange.com/questions/58824/how-do-i-add-eclipse-to-my-gnome-shell-favorites. --- pkgs/applications/misc/robo3t/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 5ebb2b1189a..fc7ff484239 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; desktopItem = makeDesktopItem { - name = "Robo3T"; + name = "robo3t"; exec = "robo3t"; icon = icon; comment = "Query GUI for mongodb"; From 1e32c3ee358118f429b8ab6acf23adb8bb27786b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 24 Oct 2017 21:31:53 +0200 Subject: [PATCH 1676/2806] freeimage: fetchpatch -> fetchurl These aren't generated patches, so there's no benefit in fetchpatch. /cc #30729. --- .../libraries/freeimage/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index a2f47da7aaf..157f9f3936e 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, unzip, darwin }: +{ stdenv, fetchurl, unzip, darwin }: stdenv.mkDerivation { name = "freeimage-3.17.0"; @@ -8,14 +8,16 @@ stdenv.mkDerivation { sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; - patches = [ - (fetchpatch { - url = "https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches/Fix-CVE-2015-0852.patch"; - sha256 = "0qkb96mvvhji75gz7dma3vj2b71smp96z3kl2ydj6skvnw6slnmc"; + patches = let + patchURL = https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches; + in [ + (fetchurl { + url = patchURL + "/Fix-CVE-2015-0852.patch"; + sha256 = "1vxdck4i5qi5j6i3cjja0gfy79mmbf0lq2qdrnqdsl4kclbvw2c8"; }) - (fetchpatch { - url = "https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches/Fix-CVE-2016-5684.patch"; - sha256 = "18g5ckrvqfjcldis7zf7hmfl8b3mgnc6akd6x3cdq8c5j7l1y98f"; + (fetchurl { + url = patchURL + "/Fix-CVE-2016-5684.patch"; + sha256 = "14ffgqbnwg28r6sjvm3z89zbnnm9ghbc81hdhrzxlyk3vwvd6cw3"; }) ]; From 2fd11b762f0ae55a1f2879672d0e6688b4c24d61 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 24 Oct 2017 22:31:06 +0200 Subject: [PATCH 1677/2806] nixos/elasticsearch: Do not try to run sysctl if running in container, since it fails --- nixos/modules/services/search/elasticsearch.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 2ea22a94594..c51dd5d9465 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -174,11 +174,13 @@ in { LimitNOFILE = "1024000"; }; preStart = '' - # Only set vm.max_map_count if lower than ES required minimum - # This avoids conflict if configured via boot.kernel.sysctl - if [ `${pkgs.procps}/bin/sysctl -n vm.max_map_count` -lt 262144 ]; then - ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144 - fi + ${optionalString (!config.boot.isContainer) '' + # Only set vm.max_map_count if lower than ES required minimum + # This avoids conflict if configured via boot.kernel.sysctl + if [ `${pkgs.procps}/bin/sysctl -n vm.max_map_count` -lt 262144 ]; then + ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144 + fi + ''} mkdir -m 0700 -p ${cfg.dataDir} From fd29f6685f47d5b114156fec4493f5e40adf7e1a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 27 Sep 2017 03:00:23 +0300 Subject: [PATCH 1678/2806] qt5, plasma-5: Make 'bin' output the first one Stay consistent with other multiple output packages. --- pkgs/desktops/plasma-5/breeze-qt5.nix | 2 +- pkgs/desktops/plasma-5/khotkeys.nix | 2 +- pkgs/desktops/plasma-5/kwin/default.nix | 2 +- pkgs/desktops/plasma-5/libksysguard/default.nix | 2 +- pkgs/desktops/plasma-5/oxygen.nix | 2 +- pkgs/desktops/plasma-5/plasma-workspace/default.nix | 2 +- pkgs/desktops/plasma-5/systemsettings.nix | 2 +- pkgs/development/libraries/kde-frameworks/default.nix | 2 +- pkgs/development/libraries/libplist/default.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtbase/default.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtcharts.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtlocation.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtsensors.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtsvg.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qttools/default.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtwayland.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix | 2 +- pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index c0e55dec76d..1448bb40d78 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -15,6 +15,6 @@ mkDerivation { kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative qtx11extras ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; } diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index 77f1002c08a..77763c5e203 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -12,6 +12,6 @@ mkDerivation { kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui plasma-framework plasma-workspace qtx11extras ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; enableParallelBuilding = false; } diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 09708b65487..f31294e00d6 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -28,7 +28,7 @@ mkDerivation { kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"'' diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 4e88cd3df0e..0f9fe40d73c 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -17,5 +17,5 @@ mkDerivation { kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras qtwebkit ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 97421191d90..1b1f34f17b5 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -14,5 +14,5 @@ mkDerivation { ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative qtx11extras ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 6fc6ef6d9e1..0e98b095e89 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -33,7 +33,7 @@ mkDerivation { qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; cmakeFlags = [ "-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage" diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 954a8f9f45b..4c449aa2703 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -13,5 +13,5 @@ mkDerivation { kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 kactivities kactivities-stats kirigami2 ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index de99503131c..2bf10737ab0 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -78,7 +78,7 @@ let inherit (args) name; inherit (srcs."${name}") src version; - outputs = args.outputs or [ "out" "dev" "bin" ]; + outputs = args.outputs or [ "bin" "dev" "out" ]; hasBin = lib.elem "bin" outputs; hasDev = lib.elem "dev" outputs; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 98853d08cfe..d8ebc2e83a6 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { passthru.swig = swig2; - outputs = ["out" "dev" "bin" "py"]; + outputs = ["bin" "dev" "out" "py"]; postFixup = '' moveToOutput "lib/${python.libPrefix}" "$py" diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index b7f9b3eb42e..d63936c561c 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { [ bison flex gperf lndir perl pkgconfig python2 which ] ++ lib.optional (!stdenv.isDarwin) patchelf; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) diff --git a/pkgs/development/libraries/qt-5/5.9/qtcharts.nix b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix index 58e197d504f..afc09e3eeb5 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtcharts.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix @@ -3,7 +3,7 @@ qtSubmodule { name = "qtcharts"; qtInputs = [ qtbase qtdeclarative ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; postInstall = '' moveToOutput "$qtQmlPrefix" "$bin" ''; diff --git a/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix index 1c10535c785..8153f0d4078 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix @@ -3,7 +3,7 @@ qtSubmodule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; postInstall = '' moveToOutput "$qtQmlPrefix" "$bin" ''; diff --git a/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix index cc665334885..39b4d35ef36 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix @@ -7,7 +7,7 @@ qtSubmodule { patches = copyPathsToStore (readPathsFromFile ./. ./series); qtInputs = [ qtbase qtsvg qtxmlpatterns ]; nativeBuildInputs = [ python2 ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\"" diff --git a/pkgs/development/libraries/qt-5/5.9/qtlocation.nix b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix index 6270bc577cf..f883fd4ff40 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix @@ -3,7 +3,7 @@ qtSubmodule { name = "qtlocation"; qtInputs = [ qtbase qtmultimedia ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; postInstall = '' moveToOutput "$qtPluginPrefix" "$bin" moveToOutput "$qtQmlPrefix" "$bin" diff --git a/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix index 4fe9c90232a..1c728b036ad 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix @@ -11,7 +11,7 @@ qtSubmodule { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gstreamer gst-plugins-base libpulseaudio] ++ optional (stdenv.isLinux) alsaLib; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc"; postInstall = '' diff --git a/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix index 1a52d1802ce..37d7d59f815 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix @@ -3,7 +3,7 @@ qtSubmodule { name = "qtquickcontrols2"; qtInputs = [ qtdeclarative ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; postInstall = '' moveToOutput "$qtQmlPrefix" "$bin" ''; diff --git a/pkgs/development/libraries/qt-5/5.9/qtsensors.nix b/pkgs/development/libraries/qt-5/5.9/qtsensors.nix index 75829d3f0aa..4127d00b769 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtsensors.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtsensors.nix @@ -5,7 +5,7 @@ with stdenv.lib; qtSubmodule { name = "qtsensors"; qtInputs = [ qtbase qtdeclarative ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; postInstall = '' moveToOutput "$qtPluginPrefix" "$bin" moveToOutput "$qtQmlPrefix" "$bin" diff --git a/pkgs/development/libraries/qt-5/5.9/qtsvg.nix b/pkgs/development/libraries/qt-5/5.9/qtsvg.nix index 0e21cf89340..ce419731dfa 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtsvg.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtsvg.nix @@ -3,7 +3,7 @@ qtSubmodule { name = "qtsvg"; qtInputs = [ qtbase ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; postInstall = '' moveToOutput "$qtPluginPrefix" "$bin" ''; diff --git a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix index 012e8bca75d..38d8f1ebe64 100644 --- a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; qtSubmodule { name = "qttools"; qtInputs = [ qtbase ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; patches = copyPathsToStore (readPathsFromFile ./. ./series); # qmake moves all binaries to $dev in preFixup postFixup = '' diff --git a/pkgs/development/libraries/qt-5/5.9/qtwayland.nix b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix index 3e5deea7ec1..8b3072c5534 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix @@ -5,7 +5,7 @@ qtSubmodule { qtInputs = [ qtbase qtquickcontrols ]; buildInputs = [ wayland ]; nativeBuildInputs = [ pkgconfig ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; postInstall = '' moveToOutput "$qtPluginPrefix" "$bin" moveToOutput "$qtQmlPrefix" "$bin" diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix index 50a539dbe72..e6a2d74e714 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix @@ -3,7 +3,7 @@ qtSubmodule { name = "qtwebchannel"; qtInputs = [ qtbase qtdeclarative ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; postInstall = '' moveToOutput "$qtQmlPrefix" "$bin" ''; diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix index c0b9aa83e19..58716f65738 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix @@ -25,7 +25,7 @@ qtSubmodule { bison coreutils flex git gperf ninja pkgconfig python2 which ]; doCheck = true; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix index 925adce75a9..888c1fb6534 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix @@ -3,7 +3,7 @@ qtSubmodule { name = "qtwebsockets"; qtInputs = [ qtbase qtdeclarative ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; postInstall = '' moveToOutput "$qtQmlPrefix" "$bin" ''; From c384ad46b83af5afabdea73cf13164fde352d1e7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 27 Sep 2017 03:10:16 +0300 Subject: [PATCH 1679/2806] qtbase: Make some output references more explicit --- pkgs/development/qtcreator/default.nix | 2 +- pkgs/games/qgo/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 494b5ec30e6..fdf1745f9f2 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; preBuild = optional withDocumentation '' - ln -s ${qtbase}/$qtDocPrefix $NIX_QT5_TMP/share + ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share ''; postInstall = '' diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index dea0fe547da..4848d1a3e21 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { # libQt5XcbQpa is a platform plugin dependency and doesn't get linked patchelf --add-needed libQt5XcbQpa.so.5 $out/bin/qgo wrapProgram $out/bin/qgo \ - --set QT_QPA_PLATFORM_PLUGIN_PATH "${qt56.qtbase}/lib/qt-5.6/plugins/platforms/" + --set QT_QPA_PLATFORM_PLUGIN_PATH "${stdenv.lib.getBin qt56.qtbase}/lib/qt-5.6/plugins/platforms/" ''; } From dc75fb694c143711608559cc52f341d12c05cd86 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 27 Sep 2017 03:31:42 +0300 Subject: [PATCH 1680/2806] xca: Remove unnecessary substituteInPlace Builds fine without. --- pkgs/applications/misc/xca/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 80ecbdeba77..2d2c2e2bff2 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -20,12 +20,6 @@ mkDerivation rec { configureFlags = [ "CXXFLAGS=-std=c++11" ]; - preBuild = '' - substituteInPlace Local.mak \ - --replace ${qtbase}/bin/moc ${qtbase.dev}/bin/moc \ - --replace ${qtbase}/bin/uic ${qtbase.dev}/bin/uic - ''; - meta = with lib; { description = "Interface for managing asymetric keys like RSA or DSA"; homepage = http://xca.sourceforge.net/; From b89022f2c534033bf7bbad9c7c41fb191ab1c69c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 27 Sep 2017 03:47:44 +0300 Subject: [PATCH 1681/2806] kdevelop5: Use makeBinPath --- pkgs/applications/editors/kdevelop5/kdevelop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 9efe6a44716..1a164ec08de 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -39,7 +39,7 @@ mkDerivation rec { postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. - wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin" + wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}" # Fix the (now wrapped) kdevelop! to find things in right places: # - Make KDEV_BASEDIR point to bin directory of kdevplatform. From 9e0b37944bfa09914663b2ba8c4acfa230061275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 24 Oct 2017 23:09:33 +0200 Subject: [PATCH 1682/2806] obs-studio: 20.0.1 -> 20.1.0 + support more features --- pkgs/applications/video/obs-studio/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 3707f32c9d3..5d82a8c5d09 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -4,17 +4,20 @@ , fdk_aac , ffmpeg , jansson +, libjack2 , libxkbcommon , libpthreadstubs , libXdmcp , qtbase , qtx11extras +, speex , libv4l , x264 , curl , xorg , makeWrapper , pkgconfig +, vlc , alsaSupport ? false , alsaLib @@ -26,13 +29,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "20.0.1"; + version = "20.1.0"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "1f701rh4w88ba48b50y16fvmzzsyv4y5nv30mrx3pb2ni7wyanld"; + sha256 = "1366nl301rhz8cfbq89ixiq1hdxdn8iimz9xyln274anghz02sbr"; }; patches = [ ./find-xcb.patch ]; @@ -45,13 +48,16 @@ in stdenv.mkDerivation rec { fdk_aac ffmpeg jansson + libjack2 libv4l libxkbcommon libpthreadstubs libXdmcp qtbase qtx11extras + speex x264 + vlc makeWrapper ] ++ optional alsaSupport alsaLib From 8ee94216d37e4205a0eb3bb6387cb234b8f2ab0d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 3 Oct 2017 08:41:44 +0100 Subject: [PATCH 1683/2806] bcc: 0.3.0 -> 0.4.0 --- pkgs/os-specific/linux/bcc/default.nix | 34 ++++++++++++-------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index bade98dc411..2b9c3113a79 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,39 +1,37 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages_39, kernel, - flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: +{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages_5, kernel +, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.4.0"; name = "bcc-${version}"; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "19lkqmilfjmj7bnhxlacd0waa5db8gf4lng12fy2zgji0d77vm1d"; + sha256 = "106ri3yhjhp3dgsjb05y4j6va153d5nqln3zjdz6qfz87svak0rw"; }; - # llvm 4.0 leads to segmentation faults, this will be fixed in llvm 5.0 - # https://github.com/iovisor/bcc/issues/1276#issuecomment-319888478 - buildInputs = [ makeWrapper cmake llvmPackages_39.llvm llvmPackages_39.clang-unwrapped kernel - flex bison elfutils python pythonPackages.netaddr luajit netperf iperf + buildInputs = [ + llvmPackages_5.llvm llvmPackages_5.clang-unwrapped kernel + elfutils python pythonPackages.netaddr luajit netperf iperf ]; - cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules -DBCC_KERNEL_HAS_SOURCE_DIR=1"; + nativeBuildInputs = [ makeWrapper cmake flex bison ]; postInstall = '' mkdir -p $out/bin $out/share - rm -r $out/share/bcc/tools/{old,doc/CMakeLists.txt} + rm -r $out/share/bcc/tools/old mv $out/share/bcc/tools/doc $out/share mv $out/share/bcc/man $out/share/ - for f in $out/share/bcc/tools\/*; do - if [ -x $f ]; then - ln -s $f $out/bin/$(basename $f) - wrapProgram $f \ - --prefix LD_LIBRARY_PATH : $out/lib \ - --prefix PYTHONPATH : $out/lib/python2.7/site-packages \ - --prefix PYTHONPATH : ${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages - fi + find $out/share/bcc/tools -type f -executable -print0 | \ + while IFS= read -r -d $'\0' f; do + pythonLibs="$out/lib/python2.7/site-packages:${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages" + rm $out/bin/$(basename $f) + makeWrapper $f $out/bin/$(basename $f) \ + --prefix LD_LIBRARY_PATH : $out/lib \ + --prefix PYTHONPATH : "$pythonLibs" done ''; From 59382564ff325e797335b75c61326d7ebf66a9d7 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 24 Oct 2017 22:20:11 +0100 Subject: [PATCH 1684/2806] bcc: fix install --- pkgs/os-specific/linux/bcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 2b9c3113a79..37c8c6841f6 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { find $out/share/bcc/tools -type f -executable -print0 | \ while IFS= read -r -d $'\0' f; do pythonLibs="$out/lib/python2.7/site-packages:${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages" - rm $out/bin/$(basename $f) + rm -f $out/bin/$(basename $f) makeWrapper $f $out/bin/$(basename $f) \ --prefix LD_LIBRARY_PATH : $out/lib \ --prefix PYTHONPATH : "$pythonLibs" From 8b56d8e62123f011cff90f142bdd6da24b995e8c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 25 Oct 2017 00:40:31 +0300 Subject: [PATCH 1685/2806] Revert "vc: Broken on i686" Not broken This reverts commit c58c1f3b501731e3289fdae387b1c875c4e9cc8e. --- pkgs/development/libraries/vc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 6a72feed73f..1dbbcf798c9 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Library for multiprecision complex arithmetic with exact rounding"; homepage = https://github.com/VcDevel/Vc; license = licenses.bsd3; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; } From 6b1b8487df4cf740441dfb652bc13e0e9f4757e3 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Tue, 24 Oct 2017 08:57:53 +0200 Subject: [PATCH 1686/2806] dotnet-sdk : init at 2.0.3 --- lib/maintainers.nix | 1 + .../compilers/dotnet/sdk/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 56 insertions(+) create mode 100644 pkgs/development/compilers/dotnet/sdk/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4bb12dcfcc8..37c2d30f5d2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -329,6 +329,7 @@ kragniz = "Louis Taylor "; kristoff3r = "Kristoffer Søholm "; ktosiek = "Tomasz Kontusz "; + kuznero = "Roman Kuznetsov "; lassulus = "Lassulus "; layus = "Guillaume Maudoux "; ldesgoui = "Lucas Desgouilles "; diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix new file mode 100644 index 00000000000..e7cb7495c90 --- /dev/null +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchurl +, libunwind +, openssl +, icu +, libuuid +, zlib +, curl +, patchelf +}: + +let + rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ]; +in + stdenv.mkDerivation rec { + version = "2.0.3"; + name = "dotnet-sdk-${version}"; + + src = fetchurl { + url = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.3-servicing-007037/dotnet-sdk-2.0.3-servicing-007037-linux-x64.tar.gz"; + sha256 = "0kqk1f0vfdfyb9mp7d4y83airkxyixmxb7lrx0h0hym2a9661ch8"; + }; + + unpackPhase = "tar xvzf $src"; + + buildPhase = '' + runHook preBuild + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./dotnet + patchelf --set-rpath "${rpath}" ./dotnet + find -type f -name "*.so" -exec patchelf --set-rpath "${rpath}" {} \; + echo -n "dotnet-sdk version: " + ./dotnet --version + runHook postBuild + ''; + + dontPatchELF = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp -r ./ $out + ln -s $out/dotnet $out/bin/dotnet + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = https://dotnet.github.io/; + description = ".NET Core SDK 2.0.2 with .NET Core 2.0.0"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ kuznero ]; + license = licenses.mit; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a0280bcdf4..936a5441033 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -118,6 +118,8 @@ with pkgs; dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { }; + dotnet-sdk = callPackage ../development/compilers/dotnet/sdk/default.nix { }; + dispad = callPackage ../tools/X11/dispad { }; vsenv = callPackage ../build-support/vsenv { From 4737ee09e216ac50631278f2f49387333543f547 Mon Sep 17 00:00:00 2001 From: Tom Doggett Date: Tue, 24 Oct 2017 16:09:29 -0700 Subject: [PATCH 1687/2806] rtv: 1.18.0 -> 1.19.0 Updated version and GitHub SHA for the most recent version. --- 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 7e16da68f47..02af4c28d59 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.18.0"; + version = "1.19.0"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "00d2s29sp68hw8ljjmzn5dc5ly2s3c7qf0azwizgd3b40zlfgzcg"; + sha256 = "19rnw9cac06ns10vqn2cj0v61ycrj9g1ysa3hncamwxxibmkycp7"; }; # Tests try to access network From c1addcdffaa9d8712a3d12d548952cb78fb06d64 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 25 Oct 2017 01:40:29 +0100 Subject: [PATCH 1688/2806] xf86-video-intel: 2017-04-18 -> 2017-10-19 --- pkgs/servers/x11/xorg/overrides.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c27f6a29e9c..fa22717b035 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -563,11 +563,11 @@ in xf86videointel = attrs: attrs // { # the update script only works with released tarballs :-/ - name = "xf86-video-intel-2017-04-18"; + name = "xf86-video-intel-2017-10-19"; src = args.fetchurl { url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/" - + "c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz"; - sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8"; + + "4798e18b2b2c8b0a05dc967e6140fd9962bc1a73.tar.gz"; + sha256 = "1zpgbibfpdassswfj68zwhhfpvd2p80rpxw92bis6lv81ssknwby"; }; buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros]; From 698894a50d08ed59bf8665fd732a1bed415863a5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Oct 2017 00:54:38 +0000 Subject: [PATCH 1689/2806] ocamlPackages.wasm: 0.13 -> 1.0 --- pkgs/development/ocaml-modules/wasm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 03ea4a29330..5fe0e2abc19 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-wasm-${version}"; - version = "0.13"; + version = "1.0"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "spec"; rev = "v${version}"; - sha256 = "0l67w1dmhgzrhmw3pw2w35h54imax0zdpa9yyqppzzbagxgn87kn"; + sha256 = "0r0wj31s2yg4vn4hyw2afc8wp8b0k3q130yiypwq3dlvfxrr70m6"; }; buildInputs = [ ocaml findlib ocamlbuild ]; From 31b2e70f8d60e133e7e3bbdbdb42d270f396f338 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 24 Oct 2017 19:10:16 -0400 Subject: [PATCH 1690/2806] root_numpy: init at 4.7.3 --- .../python-modules/root_numpy/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/root_numpy/default.nix diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix new file mode 100644 index 00000000000..008bafae9d7 --- /dev/null +++ b/pkgs/development/python-modules/root_numpy/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root }: + +buildPythonPackage rec { + pname = "root_numpy"; + version = "4.7.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vy6mqmkddfv46yc4hp43fvaisn3yw92ryaw031k841hhj73q0xg"; + }; + + disabled = isPy3k; # blocked by #27649 + + propagatedBuildInputs = [ numpy root ]; + + meta = with lib; { + homepage = http://scikit-hep.org/root_numpy; + license = licenses.bsd3; + description = "The interface between ROOT and NumPy"; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b27147e18b5..d42454dc043 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18919,6 +18919,8 @@ in { }; }; + root_numpy = callPackage ../development/python-modules/root_numpy { }; + rootpy = buildPythonPackage rec { version = "0.9.0"; name = "rootpy-${version}"; From 9356779fb325cfbf54433d0b29de8da2e4b019b7 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Thu, 5 Oct 2017 16:41:27 +0200 Subject: [PATCH 1691/2806] Point coreclr to 2.0.0 release --- pkgs/development/compilers/coreclr/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index b619bf6ce20..6d4e611a37e 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -12,19 +12,20 @@ , lttng-ust , liburcu , libuuid +, libkrb5 , ed , debug ? false }: stdenv.mkDerivation rec { name = "coreclr-${version}"; - version = "1.0.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "dotnet"; repo = "coreclr"; rev = "v${version}"; - sha256 = "1wpig71q0kh2yrq162d32x00zlwrrs1wymkgijh49cqkn4cwkh91"; + sha256 = "16z58ix8kmk8csfy5qsqz8z30czhrap2vb8s8vdflmbcfnq31jcw"; }; buildInputs = [ @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { lttng-ust liburcu libuuid + libkrb5 ed ]; @@ -73,7 +75,9 @@ stdenv.mkDerivation rec { ]; buildPhase = '' + # set -x ./build.sh $BuildArch $BuildType + # set +x # Try to make some sensible hierarchy out of the output pushd bin/Product/Linux.$BuildArch.$BuildType From 71202f81aacd9c86b38e23af3c9eff7d100f956c Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Thu, 5 Oct 2017 23:58:38 +0200 Subject: [PATCH 1692/2806] Remove old patches --- pkgs/development/compilers/coreclr/default.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 6d4e611a37e..ca0df6f3644 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -47,22 +47,8 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - # Prevent clang-3.5 (rather than just clang) from being selected as the compiler as that's - # not wrapped - # substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$" - patchShebangs build.sh patchShebangs src/pal/tools/gen-buildsys-clang.sh - - # See https://github.com/dotnet/coreclr/issues/7573#issuecomment-253081323 - ed -v ./src/pal/src/include/pal/palinternal.h << EOF - /^#undef memcpy - -1 - d - +1 - d - w - EOF ''; BuildArch = if stdenv.is64bit then "x64" else "x86"; From 856995d8cacd687f3dcf952d8f12107ca87d8155 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 6 Oct 2017 13:41:29 +0100 Subject: [PATCH 1693/2806] coreclr: mark as not broken --- pkgs/development/compilers/coreclr/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index ca0df6f3644..6429a51ed4d 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -61,9 +61,7 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - # set -x ./build.sh $BuildArch $BuildType - # set +x # Try to make some sensible hierarchy out of the output pushd bin/Product/Linux.$BuildArch.$BuildType @@ -92,6 +90,5 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ obadz ]; license = stdenv.lib.licenses.mit; - broken = true; # CoreCLR has proven to be very difficult to package. PRs welcome if someone wants to shave that yak. }; } From e7fc83f1a6259adc4728cb5d487b8265af42380d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 6 Oct 2017 14:52:08 +0100 Subject: [PATCH 1694/2806] coreclr: cleanup build --- .../development/compilers/coreclr/default.nix | 47 +++++++------------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 6429a51ed4d..b4ea2046085 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -13,7 +13,6 @@ , liburcu , libuuid , libkrb5 -, ed , debug ? false }: @@ -43,52 +42,42 @@ stdenv.mkDerivation rec { liburcu libuuid libkrb5 - ed ]; configurePhase = '' - patchShebangs build.sh - patchShebangs src/pal/tools/gen-buildsys-clang.sh + # override to avoid cmake running + patchShebangs . ''; BuildArch = if stdenv.is64bit then "x64" else "x86"; BuildType = if debug then "Debug" else "Release"; - hardeningDisable = [ "strictoverflow" "format" ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=unused-result" "-Wno-error=delete-non-virtual-dtor" - "-Wno-error=null-dereference" + hardeningDisable = [ + "strictoverflow" + "format" ]; buildPhase = '' - ./build.sh $BuildArch $BuildType - - # Try to make some sensible hierarchy out of the output - pushd bin/Product/Linux.$BuildArch.$BuildType - mkdir lib2 - mv *.so *.so.dbg lib2 - mv bin lib3 - mkdir lib4 - mv Loader lib4 - mv inc include - mv gcinfo include - mkdir bin - mkdir -p share/doc - mv sosdocsunix.txt share/doc - for f in * ; do test -f $f && mv -v $f bin; done - popd + runHook preBuild + ./build.sh $BuildArch Release + runHook postBuild ''; installPhase = '' - mkdir -p $out - cp -rv bin/Product/Linux.$BuildArch.$BuildType/* $out + runHook preInstall + mkdir -p $out/share/dotnet $out/bin + cp -r bin/Product/Linux.$BuildArch.$BuildType/* $out/share/dotnet + for cmd in coreconsole corerun createdump crossgen ilasm ildasm mcs superpmi; do + ln -s $out/share/dotnet/$cmd $out/bin/$cmd + done + runHook postInstall ''; - meta = { + meta = with stdenv.lib; { homepage = http://dotnet.github.io/core/; description = ".NET is a general purpose development platform"; platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - license = stdenv.lib.licenses.mit; + maintainers = with maintainers; [ obadz ]; + license = licenses.mit; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31cc09c62f1..19c0c5c5b9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13177,7 +13177,9 @@ with pkgs; comic-relief = callPackage ../data/fonts/comic-relief {}; - coreclr = callPackage ../development/compilers/coreclr { }; + coreclr = callPackage ../development/compilers/coreclr { + debug = config.coreclr.debug or false; + }; corefonts = callPackage ../data/fonts/corefonts { }; From f743e5f12734e15b916c7ffda4890a7bd24ff487 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Sun, 8 Oct 2017 22:22:07 +0200 Subject: [PATCH 1695/2806] Change coreclr package maintainer --- pkgs/development/compilers/coreclr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index b4ea2046085..77218018cd8 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { homepage = http://dotnet.github.io/core/; description = ".NET is a general purpose development platform"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ obadz ]; + maintainers = with maintainers; [ kuznero ]; license = licenses.mit; }; } From d855091fb38b6774085ff1281d1e5ee575146810 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Tue, 10 Oct 2017 00:58:11 +0200 Subject: [PATCH 1696/2806] Use build type parameter --- pkgs/development/compilers/coreclr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 77218018cd8..592eaf38d87 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ./build.sh $BuildArch Release + ./build.sh $BuildArch $BuildType runHook postBuild ''; From d22e4dc63fee98c9319f33e392aa51bd3f31b4b4 Mon Sep 17 00:00:00 2001 From: zraexy Date: Tue, 24 Oct 2017 22:19:24 -0800 Subject: [PATCH 1697/2806] zanshin: don't use stdenv --- pkgs/applications/office/zanshin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 021e7f87eee..2130e64a2a3 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,5 +1,5 @@ { - stdenv, + mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, qtbase, boost, @@ -7,7 +7,7 @@ krunner, kwallet }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "zanshin"; version = "0.4.1"; name = "${pname}-${version}"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { krunner kwallet ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A powerful yet simple application to manage your day to day actions, getting your mind like water"; homepage = https://zanshin.kde.org/; maintainers = with maintainers; [ zraexy ]; From 4432eb0de56b02133633cae01e7ebeb23a75e449 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 25 Oct 2017 09:11:16 +0100 Subject: [PATCH 1698/2806] cockroachdb: install bash completion into .bin --- pkgs/servers/sql/cockroachdb/default.nix | 41 ++++++++++++------------ 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 3594cf5c7b0..be9a02031ff 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -2,37 +2,36 @@ buildGoPackage rec { name = "cockroach-${version}"; - version = "v1.1.1"; + version = "1.1.1"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { - url = "https://binaries.cockroachdb.com/cockroach-${version}.src.tgz"; + url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; sha256 = "0d2nlm291k4x7hqi0kh76j6pj8b1dwbdww5f95brf0a9bl1n7qxr"; }; nativeBuildInputs = [ cmake xz which autoconf ]; - buildPhase = - '' - cd $NIX_BUILD_TOP/go/src/${goPackagePath} - patchShebangs ./ - make buildoss - cd src/${goPackagePath} - for asset in man autocomplete; do - ./cockroach gen $asset - done - ''; + buildPhase = '' + runHook preBuild + cd $NIX_BUILD_TOP/go/src/${goPackagePath} + patchShebangs . + make buildoss + cd src/${goPackagePath} + for asset in man autocomplete; do + ./cockroach gen $asset + done + runHook postBuild + ''; - installPhase = - '' - mkdir -p $bin/{bin,share} - mv cockroach $bin/bin/ - mv man $bin/share/ - - mkdir -p $out/share/bash-completion/completions - mv cockroach.bash $out/share/bash-completion/completions - ''; + installPhase = '' + runHook preInstall + install -D cockroach $bin/bin/cockroach + install -D cockroach.bash $bin/share/bash-completion/completions/cockroach.bash + cp -r man $bin/share/man + runHook postInstall + ''; meta = with stdenv.lib; { homepage = https://www.cockroachlabs.com; From 30721a280f8c8520b61740b9ba6709115fe704a9 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Wed, 25 Oct 2017 10:26:13 +0200 Subject: [PATCH 1699/2806] phpPackages.couchbase: remove warnings on php startup Removes following warnings: [cb,WARN] (pcbc/ext L:418) igbinary serializer is not found [cb,WARN] (pcbc/ext L:425) zlib compressor is not found --- pkgs/top-level/php-packages.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5e6192bf673..960de37332f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -33,7 +33,7 @@ let name = "couchbase-${version}"; version = "2.3.4"; - buildInputs = [ pkgs.libcouchbase pcs ]; + buildInputs = [ pkgs.libcouchbase pkgs.zlib igbinary pcs ]; src = pkgs.fetchFromGitHub { owner = "couchbase"; @@ -57,10 +57,31 @@ let if test -r $i/include/libcouchbase/couchbase.h; then LIBCOUCHBASE_DIR=$i AC_MSG_RESULT(found in $i) + @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \ + igbinary_inc_path="$phpincludedir" + elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then + igbinary_inc_path="$phpincludedir" + + elif test -f "${igbinary.dev}/include/ext/igbinary/igbinary.h"; then + + igbinary_inc_path="${igbinary.dev}/include" + fi + if test "$igbinary_inc_path" = ""; then + AC_MSG_WARN([Cannot find igbinary.h]) '') ]; }; + igbinary = buildPecl { + name = "igbinary-2.0.4"; + + configureFlags = [ "--enable-igbinary" ]; + + makeFlags = [ "phpincludedir=$(dev)/include" ]; + + outputs = [ "out" "dev" ]; + + sha256 = "0a55l4f0bgbf3f6sh34njd14niwagg829gfkvb8n5fs69xqab67d"; + }; + imagick = buildPecl { name = "imagick-3.4.3RC1"; sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh"; From 3cb89a81b7e80e7a6e8deb7f35518ad4705c49b8 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Oct 2017 10:36:30 +0200 Subject: [PATCH 1700/2806] vuze: init at 5750 (#30557) --- .../networking/p2p/vuze/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/networking/p2p/vuze/default.nix diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix new file mode 100644 index 00000000000..8725d5263fe --- /dev/null +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }: + +stdenv.mkDerivation rec { + name = "vuze-${version}"; + version = "5750"; + + src = fetchsvn { + url = "http://svn.vuze.com/public/client/tags/RELEASE_${version}"; + sha256 = "07w6ipyiy8hi88d6yxbbf3vkv26mj7dcz9yr8141hb2ig03v0h0p"; + }; + + buildInputs = [ makeWrapper jdk ant ]; + + buildPhase = "ant"; + + installPhase = '' + install -D dist/Vuze_0000-00.jar $out/share/java/Vuze_${version}-00.jar + makeWrapper ${jre}/bin/java $out/bin/vuze \ + --add-flags "-Xmx256m -Djava.library.path=${swt}/lib -cp $out/share/java/Vuze_${version}-00.jar:${swt}/jars/swt.jar org.gudy.azureus2.ui.swt.Main" + ''; + + meta = with stdenv.lib; { + description = "Torrent client"; + homepage = http://www.vuze.com; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ volth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db04906c52..cd6553cc16d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17025,6 +17025,8 @@ with pkgs; vue = callPackage ../applications/misc/vue { }; + vuze = callPackage ../applications/networking/p2p/vuze { }; + vwm = callPackage ../applications/window-managers/vwm { }; vym = callPackage ../applications/misc/vym { }; From 0ddc8a303bec3df0e0a6c8f4e47d49134dedd72a Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 25 Oct 2017 10:08:37 +0100 Subject: [PATCH 1701/2806] nixos manual: suggest nixos-help as well Part of improving #30760: users on a serial console can't switch ttys, so providing another method to access the manual is useful. --- nixos/doc/manual/installation/installing.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 8c37643c08f..94d8e9d2e1a 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -16,7 +16,8 @@ hardware. The NixOS manual is available on virtual console 8 - (press Alt+F8 to access). + (press Alt+F8 to access) or by running nixos-help. + You get logged in as root (with empty password). From b2c5075e8ad442a8a2b42979ea9351e35dc647fe Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 25 Oct 2017 10:13:33 +0100 Subject: [PATCH 1702/2806] nixos-manual service: show nixos-help option Part of improving accessibility (#30760). Makes the manual easier to access e.g. on serial consoles. --- nixos/modules/services/misc/nixos-manual.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 515864ec2e2..41cadb4a6de 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -135,8 +135,9 @@ in }; }; - services.mingetty.helpLine = mkIf cfg.showManual - "\nPress for the NixOS manual."; + services.mingetty.helpLine = "\nRun `nixos-help` " + + lib.optionalString cfg.showManual "or press " + + "for the NixOS manual."; }; From d78854517256e10f561062b5f7a293a8c337aef5 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 25 Oct 2017 13:55:00 +0200 Subject: [PATCH 1703/2806] geolite-legacy: 2017-09-17 -> 2017-10-25 --- pkgs/data/misc/geolite-legacy/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 0522de227aa..eaebc3aff26 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -12,22 +12,22 @@ stdenv.mkDerivation rec { srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" - "04akk0jczvki8rdvz6z6v5s26ds0m27953lzvp3v0fsg7rl08q5n"; + "1xqxlnxxk8grqr0nr9vaf5r6z5bcdbadh83qhzr6jvhs20s37lsl"; srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz" - "0i0885vvj0s5sysyafvk8pc8gr3znh7gmiy8rp4iiai7qnbylb7y"; + "0g3am25jmhm3r51hvz9lknkrnzj98hxdxav2cvrhz6b7wndgyspk"; srcGeoLiteCity = fetchDB "GeoLiteCity.dat.gz" - "1yqxqfndnsvqc3hrs0nm6nvs0wp8jh9phs0yzrn48rlb9agcb8gj"; + "1syw19gx2mpqz9ypkaq2gh712bv60a7rf56afzd3qzkmgf6rw1qr"; srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" - "05grm006r723l9zm7pdmwwycc658ni858hcrcf5mysv0hmc3wqb2"; + "0ihbqm1f5b9qb68i73ghmk30b6i2n53fmmhv2wadja5zcdpkhdvk"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" - "1gpvsqvq9z9pg9zfn86i50fb481llfyn79r1jwddwfflp1qqfrrv"; + "0adddsk0g9a3xaa0f8qx12s07n31wvirymjzrhnsg66i2qlm0h34"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" - "0nmhz82dn9clm5w2y6z861ifj7i761spy1p1zcam93046cdpqqaa"; + "1qar0vdlpk3razq83l5fzb54zihs2sma8xgngpql8njfgby0w825"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; From 07a6ae404adfca0da4d747d491c0949ac9349dd5 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 25 Oct 2017 21:12:46 +0900 Subject: [PATCH 1704/2806] firefox-bin: 56.0.1 -> 56.0.2 --- .../browsers/firefox-bin/release_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 095d4fbd946..1dd7f67c090 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,955 +1,955 @@ { - version = "56.0.1"; + version = "56.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ach/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ach/firefox-56.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "8c6f9261a614b353e20b2b4a07f21eae8aa86cde092544ca924c5501bed8b4c26d8a1dcc2abd91c57704ba3c99b43014483c8f58a0aba2e0d515d8de2df93682"; + sha512 = "1488a8d46bcd28b1f70d3338361adc2a7c1c38fb418884d6e0741a269e40be49c1e0d9424fd910c37cd18df2354e02e6f95d26beada0216f71d02f6b1ed08cd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/af/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/af/firefox-56.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "826b056547856e7a18b7e352123462491850d10699cd33b9dac696cbe3112aea3fc445db77f1f10392ac56f400967f9b4de6433d9d24f3e756b1edffa72259cb"; + sha512 = "f04bae02532785fae3cb95a0c8f9708b3ce86a30dd9b560c14c5a58a9f5af1be014a36127933b9b7dcd450f116597ffac1d8dcd1bb1b0d8318197201d1577900"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/an/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/an/firefox-56.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7bc420dbea0fd02c1ba03b6e4f8b17a9bf053dbebc2a9a91a07a725299f0b976eaeff55f3918a7dfd30828d47d02e266e3eebdbd4a431a5fbff9e066d6065604"; + sha512 = "11920a51c909a6ed72cff80dfcbd90f5133e264a2725fbf48df8c27264271c6f24e1f0ab2233e37d458e8fd7f1415b4bd999a270575508c0205fe46d96e8c394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ar/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ar/firefox-56.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2dd2226eb5318e42d54a03eb51c0929b18431661e567ad8524a1229445ac399e2dabd63e4abde3af5eeeca6ffbccae37c38b31f5a35c6828de297538216310b9"; + sha512 = "e9200a8808be69271e10158ad77e87672478e31d4941448f612beb5ab7fc83a23f809eb928e64c4ee4399c6f59f994ac23ee67181c0ba1fc22991281a377c5a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/as/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/as/firefox-56.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "5616393b8a26383b24113f6b14c95dc96a9d1ec5778995325e48284e1299a4eceb4715e2488570c1ccbac3f38c286efb65afeb128d3489320dfebb86d32fd6a1"; + sha512 = "a3c8711dbdfbc0633df658dc1b5b740f216ed3127b37f255a3aa13b6240c42bfc23fb08dbc9006bc6a3832d58c0aa30a0351d4fdbf6cfdb18875abacbd5b2c76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ast/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ast/firefox-56.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "84105f28470ca3b173ef7d569942243f206e8d438e76166ed0ddd9b4d08e3d725447d44a846132a9fdefcfb35a869f0d765732e9662b4513f3da0aee8fdc93ce"; + sha512 = "4202d5cd25cd33b169560d3a7fae3a999a692ab5caf3ff9695f20337931c940c4583d20549c60e345cc0b2e23e16094379241c766ed7d089f103c7e0065b0153"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/az/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/az/firefox-56.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "05c402cd86b8b133487e012f1abb4ccab4a90756415fa9f7421e8a50482bf2fa853034d4f779120b6d8fb9c124df2f16b9a4ef65d3eb38698db90d612da58f12"; + sha512 = "3414600e12fb48b1055149799c3e5659ffe97e7bf53962db89de3f35c9b82072a307e42a11e4e0d14f12e471d8ca965974ffd3401035bb3619f6036cb77184f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/be/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/be/firefox-56.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "fa1135d28c23475a0184336067bbcfcdf7b707b5424896b9a0766fefc92a8f5fafd4e50ed0064f8e4acf698738672b089c284fb427ab6db2ffce63baadbce3d9"; + sha512 = "eca58b4e948394d04a55bf0efa4a200d4cb3111aa3e45ee915389faeae78b9a70357f43baaafb81b57df0170a82c972cd991c05dd5825a41aec12adeb0c7d57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bg/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bg/firefox-56.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d470db1e995fa104b7504cd9f4b3f86851b130f5743235848a12725b294e4bf5a66327b93a0e6ebaeb8273711033a8b69f9493ed48b3c09c3dfa4899e8f09148"; + sha512 = "4632a66be47c512451f3c36be34240ae3d9ff86d42dd03a65a9a360c71457085984560c53671af531e22877939f8aab298b623f822b696659413b9b27d12a00b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bn-BD/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bn-BD/firefox-56.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "4c2c612bafd1cc5db227d98e215e261546368391b2d3a5f13992f0704790a3bc0768b664fcb913418a31c97ff3f04019057634becbe62e357a8ceea48d31c28e"; + sha512 = "08a0c899b12159d0e253d0937e1efbf1d2197e724d243f7feae09d0ec97891c6d2d2e8c26ac0a473fb62d274f612b4231d8ce31fc3b411ca24e35b302aa3a2ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bn-IN/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bn-IN/firefox-56.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "776dc919081b9ba8de3613614654371b34ae1e31134bce63afe8fb05eea9133cc27e8214ff41046708bc5d812e9046605ffbbbfe8740ab795d908dd714c93cc7"; + sha512 = "37947b6d1a55847c9fc94e7d20b90b5367453450c6e572179e4be7459e6c6b926f2f6528c10cad168ee1b8ec9f7643f5b46a4602aefdad77911d2fa0b661b7f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/br/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/br/firefox-56.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "17d0fd5524a52ce8a81acc3799235e2e6cda905df6b40f70dbc837353fba96a4304a46078f887825f381adc6f5b0c519c71d2ac2fc848a7a5e96bf55d37e2cbd"; + sha512 = "8464ccfc3f56786e0614449b82a79b4ac4cbffa6860050e09e9c179b2ac95109d8f016cab4c847c70d2d897c15979b9d53691431d3cf505948437aa439301e8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bs/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bs/firefox-56.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "667a7384d89e1ef3b1dede6a6c362104957937352e49406852e6be76e615b1d093e6a8db700e9658cad7e56297d56e46baa0cf0fdb2188ef9d744e44683ee30b"; + sha512 = "090697aa8355450f2f8329cc7d1c33ae9490cee06597c14c8a14b699b448b989565d96cf6c6a06e1ebed9485adc283f6a3480c190de17d6a4400377f4938bc8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ca/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ca/firefox-56.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "32f87cd6f5bfc8b9dbf10ab1339bc525b80ba50e24881797cb244b7b7079fe25a28ba6934cd7534802baa3e672b9b78ba36b973b264c1d00988669491b23b5e5"; + sha512 = "c898dcad4eedd480968a2404206e94a46937092bcb35377a75b291aee92a5e8250c84698ab43cd509f4f87899be0aa16e060c13ae0a2a561355faa400678f19c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/cak/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/cak/firefox-56.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "ec9cc56a2cd7b4a9f9849124df9179184facccab1abe062b0e5f05410704562bef4dde4bfef5ed10187b5f1edf86033b5f94b077d8d48169e037c3b17514f038"; + sha512 = "e05d885e2e1ec9396a6d6d204bd5e94af6e5a02e534b57c5cadcf39e30c7753fb57e05507b2fce5600ca9d815d0be332eac0b3e5d53aa8f0fac1813aef375575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/cs/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/cs/firefox-56.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "cdf3b7123c4b69d22f2aee8dcc816833ed876fbca1e0c0995180a170d7859fc10344384ca4c8150e6d0334978e5123371df2da3ef2d726eb39792307d76150ed"; + sha512 = "a1d7615ce0369274e6109e1b7915c926863554863b8703838b145c662213fc0e2229117de511cd2a35b08cfd3870f480660e45a2cd72f8c65acd800698d951c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/cy/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/cy/firefox-56.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2d9e04aa36cfb0c05359a9d51706cd759dde52901d80f68601d3f7beaa06419432a3026c1c4b4a098d31253ec871df227d69ba9c79ddbd282a229376d2789774"; + sha512 = "c4d3b5825a7e27f0ef77001e793de91abce40fc39e2a8743fce3273ba616915b1be6b50223220fca91e3ece47bb3b125965ea50b4d728316865699a7d1c30c15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/da/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/da/firefox-56.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "1e8dc3f4deb5d87d8c2b89c32311062c5c5fd2e374af249e84c247d438f0a3fae53f97e0134ab9a778a84a7f49ee3f44cbbb5057212cce95bc4e977fbf205095"; + sha512 = "13f28b2d0b7043d50156f452abf0786a86f98d63b844a481d3425d6f8ea3f926d5911ef0407f7585929478adc0cc6a538df92f0f8715686cf5b5596b91d55796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/de/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/de/firefox-56.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "0acba4c4c7905eba03d6752e4de2b901716e0050d896359cf7821ebb4dd197f80d5b261b1c7c6838ac6da663063b134990a7cd785fc13ac1928f78e9de926d29"; + sha512 = "fde8ace2a67dc8966eb25c0b7eaa6417114999d9f5969d8a846c76c203e6452e91d86639c3419d7dbaf628c4aa79efc3b9bb62b3582e141aba6f674e89f395f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/dsb/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/dsb/firefox-56.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "de51364f0b3fa5f9075ffb50613cd274685a6a9ffd9f665a658da352caab4268e6e1e1458b8c6158c6f511184f6546c0c7fb8f78eac36de6b514104e6bb543c1"; + sha512 = "5ddc2d792d4fb555b5623ca8a7b214cd3f1e3279fb1b7f261641ebc2268a659ac9b6620a306cad19f7443c87279dd1908fa15d13eea2efcb0e8bfb036680f367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/el/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/el/firefox-56.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "0c5292a67bf838f975eddfddf27da2cf54905479a2a88ea8e558161a491cd681f137d2f147f875e449e06ee99685b96aaf73214813cd7c9dacfe425340a8a850"; + sha512 = "d0d22198853cb65fb48eb15d7fd709a8f377de92f39491d53859df7372740eb34b731de6f83bd9511e51ab80ab2d1c98f9e7ef52249265728038c9bbfc9d15b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/en-GB/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/en-GB/firefox-56.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "83fbd797a7a798985b8413228f99cf18ee7904295070fd46e00dc960e72a7a59106cbc1e1f92d613070a7ebc91912f41dcdcf1c36a537b26612d11110ee05db3"; + sha512 = "a628f43bc48ea39e921363c820e59d8000890a550032a7fdf0e536ea912ce53055946591af6fb5028af58845297861e76fff9d6d75a888fab44052f4a392dbe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/en-US/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/en-US/firefox-56.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "45f14c5c4d707b10b3e1803950389486a59543ab408d449f19f04718f50e17c29c00d51a48edf7cdaf05dc5b7037dd221e3902c3c4c64fa2ffaa97346ecfd87c"; + sha512 = "0aa78818b8eeb8033554b970c31835efb6eb5c9c12d313b0bdfeef8d54136830a66b78acc96cbdd99e8505a078fee84f4ed1dbb315b45471987c8fc6c52dd08c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/en-ZA/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/en-ZA/firefox-56.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "c863347c33335f480cceef6d3461cb44940f87816c7c0d9ddfcc2f1f0722333100acf766105eb97210796e0389df4374b8b0f99c0e4da021e8ecc605ea64b914"; + sha512 = "2bf77e13acda72da29302b1107b744a9977019bb58e2795e42feb60a363f2156738a9992172f263c12a70258e5c336534255a44daa52b1ffcc81923dc2d12c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/eo/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/eo/firefox-56.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e0f322497f5b5dbb274926ba65106437a054e524b7819b5adb134a4af7b67eec58ea5c5d0e098569c96cf842fd91e06901e31240459a309c62cb87f9d1f7ecb2"; + sha512 = "67f3d380000c6901d6a3f35de6c49392deb209702619ba54ff4a6f1299685d7bad556e659116153a9b2bd84af0c683a558431e9b20b66cbac7b32172efaa123c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-AR/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-AR/firefox-56.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a11866faa165e7c14f0a932681b1cbb4139b733225eb7e3fee7eb952a7c7fc8eb20ea2ce06e1201ce4a6e26835587bad025fec89366ec013de7a5e5c417df498"; + sha512 = "1dbe15c98158091d8b58e16e35a8edc7e4f9c2519d36d20e973ac1e89e10de7f5d8797f4c282f8bffc386d58aeeb7ed51432dae853c439a54ee5729b918c6e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-CL/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-CL/firefox-56.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "07cef4339fcba4a24f9fe8023f78809f7d7d2fc5bad3ded7ee7d54776ec9aee0b4409664ac342cb75a309f3426111e9c0278e61feeacdaf9779647bac2fe7bf9"; + sha512 = "e6cbbdb9e2cbcac69d678932836bed72c9268ebffbb7d85003de6e71578aa980248173bef5468e28473422060ef57f8a18bd973d92685a13cd77976f6b75ca7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-ES/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-ES/firefox-56.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e3416bc824c1d342f50bb275f94c5a70b91877fda49d8efab2691e739e6cc8dc69d6c8b7da42227b28942e8fe235fb9cf56de52e1f2b3d34a3bf6e6cd37e74ec"; + sha512 = "610cf7f14595edc7b7c99740ae284382be2d5e3f9a0cc505705392eb9cd9cfad732ee7dc7cbc6be74f9056b12762d51e6ccd74db17545dd2e92b8276a37a0ae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-MX/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-MX/firefox-56.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "647dcdd35334f37ba558ba5b31ac984f0a48181387704932445a216ad4bb9e1941f93424d36be4dba6ceb4d42a2dcbff15b011f07eb342c413003fb91be00a8e"; + sha512 = "a4c4e98c2af1bc272cabc444184bb8fadd6645e3fc99a3423581d3ea7ebe59429d2e7be5235e0c62ee9ce46380a997a32269f1b851aaf128c133846a22b1f7cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/et/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/et/firefox-56.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "09bfbbdc62edc88417211067f4a73772605eb650d689be07df028dac9366dd268891f4ee8cf8f122fd109339739caa6be1a6eca1d35b1240bb89a763427316ef"; + sha512 = "ccc077554338fb011d5e64ee198d61abd16f750c834aa59abf90146b66801d2c7069ac294abdea824d5511976a5ab5d4c0f00af9cfa01f28ffba9d58b50958cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/eu/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/eu/firefox-56.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "41c99bc9d6047b5a05ad564aac31e217cee3db42e66f6f5bc442034e3210b0732c8bb3d64600eacd16719360242c1991957d81cd0d24218535dfefee0b1397d2"; + sha512 = "7a15e0a070cfbfa03592702afc28e75fac4de34b4568fa78b516d9330bac6fe9f909cfbe3b77dc7aefe24543e7e5cc719c4af69431487b27ca6672aaf26c693a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fa/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fa/firefox-56.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "16c8a8cfb2d87d6ad84180074d78790fe1edd59cf443638606b17178a453a810e78a3f8a393ce730ab65d31688ad0e0ded0b25012f0b74baade3bf6d2fe34788"; + sha512 = "652641ab4d7df5fc2f519bea1daf6503d17f36f6772bbaf511e99ac8d5907d9797f2d01291a31c8517076a34fb7b4c60eec817ea4e3c86903dcd84b559bb0ed3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ff/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ff/firefox-56.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "b56c8672b0004958277471e1fd7b97fe0fbf180ca4f272a90cabf7b5aeeb534845bf6d0086cb7ccf0ee61170a310f0db9a782cbf4e660034cc978179f7d0d343"; + sha512 = "b988505e4ade02ebf594692ec66d9946da91261a386ae484d5171dc42e992ac18bed1e7982cbcb9508364f3f9a656c267c7bb05912eb51f14f0ab68507393175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fi/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fi/firefox-56.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "206429b73399333fbb9e787132157a51096989e3cfc9cfcf2573ab5dc12de2d0d8b73fcbeeec6c08535ef4fa179899677a7beadaf698f661e3960a1e05edd617"; + sha512 = "7d19b048d6c09f87b4b3419a53c5b25e5e2c17db13c830c13b79d536a2425833cb4b55271e878466b4558ed95f43a68db05f86812411b0926df38addcf2f0c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fr/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fr/firefox-56.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "837bbb752d18c6697c8fb357d228b9cb24eacd2b4f9d7ee58959639d165d06de585602ef30391a5110a4711a0c2ab8e104395cbe20a5671da67d3cf90947f73a"; + sha512 = "42cecceb791e7275e140fb9087702a0e6b55dc4b693d206112199545c9aa1411ea222a58de12a1d0d705a6332496090fb6fb208a91ed02f88b5c2111cbbdfc96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fy-NL/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fy-NL/firefox-56.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "1d4fc9621b08e34c6dbc19c016a4ebfc503aba17d9f69d6d281a2937eeaef8dce4b6cc0ca7d5d39392f487c9d19556bc175bbfed798e946bc81325f111f45dec"; + sha512 = "53f9d33b8f7eb6ba590a5096e23176b373bd8359ad209c9052add4ddf112d9b4374f3a0be0d83b0cdb679f07cea3d553b2649a6b03f0f09150b63719d7d54092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ga-IE/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ga-IE/firefox-56.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "41f88d1026df2521498c5f78c5bb12cd4e91620c87966429bf26b23cbaf872c2aa3e0ba5fedff05458b8e885901e5978c260537a865964672f0bc558e615b769"; + sha512 = "f405c2609cb06538647776e7294121995f9b5a1e49ac4bca52c52fc772d6cb3f54d67f983becfed2284f8d283074f1a5e6b1ca91b5c188a53131f653c6f44560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gd/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gd/firefox-56.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "67ec86420e978b7f30e3ceeab403e3901c50c5ed3baa4958e2e36cbd4db95645198c2df81ac9f68160342a09b882b21c397210a82eeb6c1243264e404e9b9fb7"; + sha512 = "9307cd40b64fc2a3daab44fb01b61aaf55989ed86cbfae47d47d4fd2556de9de0176aa976f3e85f5904e7e19d0c0ea06df3682144c3c418381c38e5196316ded"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gl/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gl/firefox-56.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "81d2149fa9f1ba4f1b69c8f2973ba1f127f64f4bfeeea0dcb5451dc88f3b681f7ccee5fcae9bc8b7c1d36f85f000cd4210b54c360694d909f0cb66728553a0fa"; + sha512 = "077d3329036e67877aafe852719c6efa9a9b35580de0f66ab2f01757d4a8a114067f2ea78e78fac6cba8a96cb0e2865c3faed830b68624a23d3c63339c31f40d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gn/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gn/firefox-56.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "93b576f861273b96bba97eea33598d421f0251a847e853f1506fca08d094922ff445ebc36468fa457181359afcf4a7e1f185057c2cad6826376e03a6b996c8d7"; + sha512 = "aa35ce7696847882ffba9db3ffc63c8ca827bc70902ad86716bbbed1d1e9bf8cbaa89a7795cbc430e7adab0987ced12ae950bfd395267bd440b8b5d94d9e9349"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gu-IN/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gu-IN/firefox-56.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c377fc5936257a8cbce11206b0668bae64c32693161472a2e568da00c662739873b2b409cdedf041efc7bc47956219c746c05c0e95654c2e4b553b384e40ca24"; + sha512 = "15d0e2275e4d411ab1bc82f04e6d0d70e49e61a46f1360fa3594669b526f1ea546d1e95268484bc36361dc7c2af8202fd41b40601fdc9cfed42a5920a7040f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/he/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/he/firefox-56.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "9d82c000a8a09f69c9daf8f04cacec5a9c333da22f42600259d75aee7e8ebb57f76854921b34f5de078caf03edccacb59831ccf9f8b3a885842fdd1e42761b83"; + sha512 = "d193df19e352f9ee34af4069e1296f4ec36cb92528ba2ec090aff1bd5d781d071fc7887ae7abbdb302bb1f98b736a3bc06fdf96ee70c36abb2a005fbfd108165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hi-IN/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hi-IN/firefox-56.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "1bf8c4f4252ccae9bdeb6201e631ee178c9c33c17661f680a5688138ce875f05b17618935247dd614a99c8b4c59355300160efe3dce3ed4dc672ec1ebe301a21"; + sha512 = "749bab51a40077f180f37876fd2418ef228275976d15b533c45c1c3054e112754f58a7f16244b9b9036f3a9d6b0dafe66d4cade45960450f98fc17866e8c0949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hr/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hr/firefox-56.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "67db04beb477b841f50125957f1354c597a4e02adfe3a95e0e177bbe436fb103ff99a68a384e8431894669cca72eb27f3250f7547696771eb9dbacfc6ea9d39d"; + sha512 = "6e2c09245f5d317d60ca51601f3a75f6f873407f64b778fc9a27bb446830a7c4b067860c5dfba5bc7d33e03ef57fc2ab9a6ce58e05fec55b13728e9561a915e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hsb/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hsb/firefox-56.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1e3420c4003335e238df8b2d1f1e8116f4aa6f134140f0c4201bc1641c854a716d5845b1cde494e9d7fa8842bbf8a6075e5cf0e06fa7c6e5730429e4543df2c0"; + sha512 = "a485e38f7de4cb83b28a518028853d2166ef61a3dcbfbb519f308bed16b849ab6b1d2f7658c43d7f103ffb773beeb28eec2d599f11607ff7e1d465a39e519804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hu/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hu/firefox-56.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "81935ef98b9b92db81f2ee3cb32bc081890c6e72c5fad4fbf601e9fbdddf85983f4c2d39d4b3a75f01137e3864bce1deb029bc6d7e1c2fb3927f40c7e06e6232"; + sha512 = "7092c3791312583d7984f36c132700a9e7233948d6769ed5e179ab334297904ab8125ddcb675193d8fc201506a46e35e36860c339d1824513b266412d3393e68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hy-AM/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hy-AM/firefox-56.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "2505aa2f68de27a09a24bf1323a6bfb30eb35a60d4abb97451f5fe749d4a47a199a5f8ff8071beff19c9074627d68f5a3ad014694b6799c2a318b9547996b6a1"; + sha512 = "50b0858fcf05524bbf54af6f2d1f0f283e20b73c79037aace88af7168d2854f65aa74db95d01b8c97937fdd76070ce113cf44af9b749c47ac07253192ea21745"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/id/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/id/firefox-56.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "ae6d762a66edca161f9e4a547b3ca99b34f727961fc5ab7a57885d3b9ab78a0c0d1ef6b80fbf15451ad06b9f59d7bde4dbaffebadfa51bd8f89c7107da7296f7"; + sha512 = "dfbf714329453c41833b3ccada9184e6c016038e9a07b351ad6ef191c760f74b7ac45981f7ecee6a1e2de1a37ac64cb116fc7cfd6973a4d111fd5c58f8eaecae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/is/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/is/firefox-56.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "91cdf41d9433d20cb737833a006f7b0e3408de9dc80d689f14d4c8c2cb1ee1cfbdb37196ec8cfc68e6ebf56d53b437917ecd9d18f935aaae5f4cddb7ab277d94"; + sha512 = "694b5c1a45f98550cf9ab4253ff536b8d6fd00232255e18f7920cdddca1dfc2ea4a5348baaedb4dea671d09ea4afd57ea6c116963776875a2aa92401d8f92bd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/it/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/it/firefox-56.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "5d051cc24c2cd5811b0a6738902a232718d3a6458b372fe9ed7923a15b18329607e93f062b4ec08fff4eb270adefaf9e39498e22522c102ea23b1d0a50bf3f7f"; + sha512 = "cb313f84266093ca3c959ab40391df4ce8f5d0975ce190090d97b4db4ab7402b9ebbf0b34b7281ce44d7e8d8fe989c86515f757aed66a7f356045ad953876b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ja/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ja/firefox-56.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "796535836414b3f676c0e037f03cda49feabcee5bda2bda64130d569881fc5da7eb6040ea5a534a7f8685720801fc0cc9196f7d7d4225315929198598995e239"; + sha512 = "e09e2cf8686aef0d96eb4bccff75694dc799247b35ff4cfefdf8b0ddf650224138994ee9a6904ba4634837883b64317ea90dcf791481b7eb9ada9d978479de2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ka/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ka/firefox-56.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "d597a777779ecda47c588208ff350512282af7b933a599014f65b8c7777f68baec93eebbce982e3d77fb42d77b26d533d63c67d2a96a5d4024b1f595a28c2204"; + sha512 = "21d1920ab8a21ef93d74e47ad4d6dae81a721867dcdbf2205b0e2c09c13d0850525cda123cd2f38a418f9127204e8f31baaf49f0a0bf76e43d9b5e916e2f0d52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/kab/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/kab/firefox-56.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "2c60fbaaef100c38d4d95f986289d9cfdf4abb739aa3320a882d218b949d7e293d2b8cb52380cc4991a7115d12eddc9439d6894d862a631c6e3b274680cdc1bd"; + sha512 = "4e7cfa3a7786158df33605e2c516c29019adb90f1fbf783ddc539acc43784920859936a29d55583c2a2ba4c464ffe062c9780bc6da2f4a2bfea3848b1f27ea2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/kk/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/kk/firefox-56.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "aa8e9255072a1154dfb4230effc9ad6649b02931c24ef4ce8e979fe4bfd9c350aa9dba39a7d0b866e11e96be29e0fd7a15f8f7ff9708ce26e430491453b49c23"; + sha512 = "8cf851ad7a4d13655f63f83c136b87aab6b002ca4865601098694cde08a85a2fea8d6b2a9f68560f52fb8f70f964ba3ba5d68491de92cae7396027d3efedad17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/km/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/km/firefox-56.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "e5c38d3ce0adc014510f5557577a2bdeca238f9675f2cad90e42b4ee15bbc2315cd869ec4d3a6fa380203491699d1402f5aa59c1c8cd8cdb15caeedfbb7b7590"; + sha512 = "d1d73336758269c7de6741ad88e8d4428030fe8f48cea98f931ab35d8df96f3b2924eec09a32ce16759de3156d8434c7818bb70a0534be297da86a4d46d5f712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/kn/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/kn/firefox-56.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ec5bd88e09660e6b3e02fa34bd3f8f5b81be7a6dbadf55e56256535ddfeb5734aab85ac47d16a14c41ca8b0b66b697c50250178ed341347a6763ee2009173610"; + sha512 = "bb05c04ab39115420a912efd25de8fa3c68eed6402313ec8a52115631d62560752f8d0aed51413d8e4aab7ea0020065c5d17e93f9f5408911b95c3ae84e3fa4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ko/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ko/firefox-56.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "33f6b9850a1f2d5f6d363b5830305c498c50eb705b552301d34988e9a446d2b438e83ab29cac45fd1be3c7be016a0eaa631aeeedf4742de4f27957c02a804491"; + sha512 = "9714993754262e9a39d8c29e515b019bdaf94b77e7965ac374df415a524d5ba1ef1fe74be56c4629ba3065c256e108ee7f03fb0f1ee847eb9746b6887f530da3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/lij/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/lij/firefox-56.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "77d2cfa449fc522f314749aa3a0850591efe4862bbb9a8e9dc1abb9d99c2b16439f7845aff9686d201bd23c88725212d28b1837fe1f2b20aea3c78525a8e1ef2"; + sha512 = "eb9ec79213968585b9578da6aa939a62aad98c58575c69ed7f81baa2a1b2c5f0ad5b0854d24ab1b5ddeaedbf2d71cae5c8f68b6c1f509a4bfb89fb158c7985ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/lt/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/lt/firefox-56.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "6a7c041f241fb6302e7c67b0a920ff613170b716e02258def0c87fe9332a69318f962797ffed9ead3a60b8a951f517f07f201053ff4ff4dace188d737bcdbd0a"; + sha512 = "b1ed129e96fe0e27363bb1f26163fa3c4acd973dbd43f52f92ee7b1682a3761e9858c70c39216e3ad847759b4d5584399dcbf4756034029c9ceaa4168f8f52ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/lv/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/lv/firefox-56.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "ef9166f0826ebcbac5352e48a1ecd23a0d88b6dd1ce2d5ec24b0b71326e03a7b4b175eee299aa620862aca9000a00e98472e1a605d214616933512e73a439808"; + sha512 = "83055b9a4fd2218696988ad248b041f352884bd3522bcbcf8933bcc44f31c7fdea6a6c7e4c8160b6ced6ac6ac2fd34a120708667e543cf5f6c2dfdafeba882b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/mai/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/mai/firefox-56.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "291aafdbc820b39b7473192a3781b96ec2fa3ddfd378c27674e18a24eda51b6aa112df86a68b6cde6c922c9567449d75942d470b09399424517cc818418b7219"; + sha512 = "349fb2d38a82a7cbf561cfb92fd439a9dc6114656d9f6e63e810bdda434840db43fece5d14488ecf50fa07bd4beb2adbb1b13092d6eeaddfc691961f901f793f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/mk/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/mk/firefox-56.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "9224e087bbd6b49630023dc92ae752e62cf0a9e4169dac65b07acc8dfe143b333f8840875da4b5f3ce119ee31987721c0cb8088c202cf42d6d24c773c1406415"; + sha512 = "48b67c7e258169c58ff476b6af1b4a07cc3b8f52e3f74cf3f039453679aba943305c3e7ebab589abf6db7520f1ea096c55397f748f896947e9057719dcedd5f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ml/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ml/firefox-56.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "e8fe9fda9253b20f898314839e8f70e3011fd3bc6d1a08c762c38363066452f854c530ada25bd5417a3f6eb0ea4ffac525bc5b0bd67b6e6eddca35c8eac9a6d9"; + sha512 = "30520236e653bef324badb0e4acb63ec9f027ff5c8fed22e256d609791c8c0d923e7b55b1ed69d66a1c6a554f271c9ebf1086ebd8b818c683d2499f6b41e6800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/mr/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/mr/firefox-56.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "07ee71ab15cea520c5c1403be55a7f09eede71787f9a404bdd18882935112a7cf423850df7b5c5afd3e595b2bd3af053858a9bbc6f152583ecd03adb0cb56dd5"; + sha512 = "04bfb26407b529d15880c5b4fc1c20fbd87ec5818d1713fd93241f055eb6206de2ba80e6ed2589e292ec1aa325ceaf891424477c435bd8a353aebb9606e6e05b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ms/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ms/firefox-56.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ef839f697bb37a81f988d28d6195b33f7aa92b1f0c67cb40b04ef3820a2f86f024a34e964f4f2ce8bfd81cb2695e6875d8d72aa426db447c6e65c1a277eb1379"; + sha512 = "18c4ff0297dfbf69aa376d21afb3a870c8d121749ad88fd361aec35b426386e3659a7bda48caa030a2ef8f5c4d591c54ec205d22fde27b2eb3343eca9e48e289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/my/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/my/firefox-56.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "06e24ae1c4d86ed2677d776037378e5f50b3481f7e96cb0e32369574fb2a04c5d572c7478ba2054f3929a0714aa960c8d9ebc8d7b9559d7f294c31c775e9b70d"; + sha512 = "09a61232686acb110da288d5e473b6c28ba0f01ff1a17338ddfc10efa7b60a6400a5c29f81da113655285f63be7fc673b68fb390888046b29752f73461d1dd42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/nb-NO/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/nb-NO/firefox-56.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c2384749c1121cf7b184e49fb7ce535a2387ea32285ad52f63afa6a02746c556459f61d7f19a60552e63958aa9541c81bffe13c6a96f71c598bc4501bfa4024d"; + sha512 = "ec583cd909bbdfc85b6cb59573e34d5299283328fad02f0ff69392e969ed2c5064a7349dbbeaebb0b87fbacdfb28b2919502b2a5e2a2ea288c6097e82d25c47d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/nl/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/nl/firefox-56.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b207a5f091f556dae81fe4d35a14e39ddb1eba9fe9ac4440d7335eaef561466f14d843d91fb8a312379a0c7ff039a763fd041088031cb48761aec6f58f681fbd"; + sha512 = "7254a36511c7f1e1fe1f6fce9eed847482238ac178f6c8730edde61c86395fb0bd4938ab0e2ddec77ec2d22d9a1c0e69c2e00a5040acce25cf5aa5cf79cc087f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/nn-NO/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/nn-NO/firefox-56.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e5a6e1ecef59fae002c4605e7c838e00ccf6fa232427c42a29cf27f1bb4db7c84d4c4aa70eae84b5ad40eed109de11270d02574101eaf690a212b219448cf273"; + sha512 = "545f40ffd96bbd6c285994888d9a8f4622a7075e5f306effe5b4430a7aad69f670b91167e7b5cc0196250fb330d133fb1787df041f77ada58c14f16fa7340741"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/or/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/or/firefox-56.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f259f88c0e4669c4d174fd011493883811042ecb4b4752c7c69dce61d7c6c28267428327f891c2eede911667807b6554373e8f2dcb8ba9e2f3d90472aa2ec960"; + sha512 = "c76e512c201c27fc39347950ab4fdbc14bfbe6e3ed8fb7d7893119222edb02c56ff313a3263e14418c319a75236c74f74ad5aabf51e4867d9ba0123476b0e7d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pa-IN/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pa-IN/firefox-56.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "cdc2cdd6902c86eab3098514b2b676db6d8a323d3b78b2da6104fe1be17cc15b3d38d5fdd1692a87521d6afce8c8bb8e0f78bb7d291145ebc05b5a76d47e34b1"; + sha512 = "336598460b71d9e019ffd190b7839887a6cc1db01625c182c1d483ef5bd2593534ba5c34b1cf424ec689b36295263cfaa2aff7275f7900fedd544b8f2f5f0d0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pl/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pl/firefox-56.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "edc50ffc298fc92100faf0b529716e14dfed8e41965e3b4a8d040bb90a526309bbf52c60d8d8cb816e0db99bf09401b27602cbf0e7e947e3ecbdf61f5c53be59"; + sha512 = "d2a955085b4f3f7d7c44553932aad0d7f943656d173fd10024993e59fe97be38c60e8dbf9350f43ff91fb4a27f6fc849a3951f1f790238b642b418267eca0e50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pt-BR/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pt-BR/firefox-56.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "9da419264035792c3e9f601bd9198e77e0fae17a7ff2e34b6322667cd95bb79ba064a59b6336ef33571f6cb5f721a7f4f35e1f9ccc94e68196c310a683410846"; + sha512 = "06eaafd16dd5d9cfd960c1f485de6d41409a50a25ba79e792a9d377f69665be62a36754e7d4e570840a63c6e877e6459d35bc503751b6cbf29481444ad098738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pt-PT/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pt-PT/firefox-56.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "b151504acc244ad3b80c2dd7ec87fc04682e06bb53338bc39aae164ba1a279c316eb84e33d1b41f4261135c39f0a0830a7f74f5ad7d0d3b9ea0bb458d628a9a5"; + sha512 = "8f3641797eb0053525278af741254d380b51679d1f7caf262bd519fff72ec0cf0242d03c65e94e758076dd7c5420a8eb8c5563cdecab1313b57556411c12c59a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/rm/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/rm/firefox-56.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "480b46a34d36fc03107af64caa5c6f0cff95021cdd094e7c0641f28938f5f21aab8e50b8985e0b42c3cec2650dd4c9538df93570afbffa399241ca8b757c2ad0"; + sha512 = "00b426505507935c4664437e6ad159acd272d99d6a674611add7466a8e0f1689d2f557d09cbab1604ef1b45fab4dbb814049cd6a806e0515b7a9633a434c4003"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ro/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ro/firefox-56.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "3d257170a028575739fea107cdd55a39bce7c534244b4701716e0ae8930e79f04a9fad14c5123c1799fc7ff0d1e98b563e338621408c7e9fed1fd1b84c72a930"; + sha512 = "17f8ede2c98f5496e8ec3027fd6b35c2a3d8b4c3b3644bb6f2120ee75ad3aded59497df34a91f355fd00ed0f0f08cbf0ee7d22905c9eafdaca73a4dc4f67ee71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ru/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ru/firefox-56.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "954853d2f0adf078eb840b02be69500b0abe8d76947d1e71dc48492473492e3c3162b1dacfb1089397e2a4985af4ec71b57a01d86fa7cc3f22515aa5f772dd04"; + sha512 = "706da80de603e54843631225b4a4a5a8e1c3ad3277230cbfc0aae932cc87858935b6ad4472f6aef366be5dd06eb7e87abcdfd6958740d0f3c61ef89d46863ad7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/si/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/si/firefox-56.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "3cadc96524cb58a02aea721a7ae54fd81e660faddebeaa7f2a1b498fc5fc4341ea04093743270121af5757bbe9f6e80c9dead96c03a3e576b530ed3ad4edf7df"; + sha512 = "5c4fb75c7fdf6c1af7e20b724abd3590ee5a891374dad9ca52a4a3f66a8be094be1e7ea7f7fef492ce507cf02a17432c593cbd7419de653f81e247003b52e4c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sk/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sk/firefox-56.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b800b287c876bc0512295ea2f797e0c330604a9bb9ea5d8ba37b23f79d78701721bf98a329bd58c157d7e8866352fbf9a9508e0959ebbec2f05eef6534eb9c72"; + sha512 = "5c72b34e74d7df2dc939d34ed82199232c985ad3125e8244785c081637f43a1b9cc0aa788b881d6749ff64749ac1cbf19a62aea078e5cb972bffc48e28c452fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sl/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sl/firefox-56.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3a672e005fea767d6af13691c2799d95ec7ea6004e889119624d01d02643bd73a2ae7c6a2b7c96b80572366ea54b77a4d83aa02370a884f18e86e6633f774a9f"; + sha512 = "f205e1b81d3fa145cfbc960ef97161af098b2607059f0279d94b24dc26fc06172891da20c5f6630b120216033486df19fd866a29182ddb16a176fa7605e45a77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/son/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/son/firefox-56.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "01a506d12757586c61a100755d2610686f2623c9ec7c60bcd1908fa02b16ac129ad0be7d38a43de1cb7fb402860a55595f87ff6b16e80360f26832dbf2c897bd"; + sha512 = "789ba111b0ee5843fc2296430bed5d609476666e4b7b7981e18323f0651c8f3882e45b972f13540d5cb72f7c1c3700ee70c293936b2cd2758c0dc4f8f7ecd70e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sq/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sq/firefox-56.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "e5ea656718a965bb86d826a1989bae6c20f3722f3d7a2b2937fdca06422133b94fc0845c7dcf7577527399b8ef6e78c13e4f37c3109061dfe62ae12f4338c27e"; + sha512 = "2e899d0223dcaa283941e50ae6bfd866a6ac26f3451a76c482379ecb886c6d13ea5084fc2127300473f4fc1f6ce36b4167cd2811971e89c27a950e2dbd753619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sr/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sr/firefox-56.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "c436c4df233230f0cc848bb29e36c2715d7d6bef09bcf3fee60e35277b2dfbaf5d0556507c5853daffd823c7ac3af47e9733746302e98cd55c5a45eb68477fa2"; + sha512 = "a50e3c6cb8b0b4b2ab4201b613a0aa0d6c2b8d5b1ea934736681415aba3d2a8a9d4c4dca16b5bb479e0273137ab3b30315b5b2077907adb114bba07da9a413e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sv-SE/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sv-SE/firefox-56.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "62f2e7154161ab18902e107d83d437fbab65de3195e49ed009eafbfe2a4f82bc1960f4343c52121edd8c36a57200fd5a6468706bbdbeac9b60416988964e548b"; + sha512 = "5a81f87d54f0b6bed0372dff02461bf85b6d29045c1e1cf57ccf625fc79ad02831a00d64ad3e3506f2c98b64efd8257a9955653efa14510ce2a56df2eadb5102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ta/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ta/firefox-56.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "3c125c9c03646ab80a65a5f84b14c5a2cdd0419cfa0356fc1f28a77b3df463653d369e9aafafeb90a4281333f9ce270097a6aef6b25ad4408312360fc751f5ac"; + sha512 = "d486a95034ae5671ab0c65992a0bd4d53cc015f3a89a7c90a7aa2534bc98823428daadf2c72ce891fdf9fa84a6492c61a0ffdb36ca28e05060a020989b3c9f7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/te/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/te/firefox-56.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "4642cd96dc68b059b6790ad1313f499126d0b68fad49fdc369f7c70b3ecdaceec3fb4572dcac0f75a415566b6de04ac6086dba1c57e8d5db4f5c360ff5b8bdb5"; + sha512 = "22b04c05ee13140cab8196e218d6d2756fd8b108d0511ebb15d19260a20b3a153bac792bd7ce153d816139429fb1039ead270e80196aae801db9e0ff65c37b93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/th/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/th/firefox-56.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "593768af7dc80b1a5850c493f80f2c538fa76e1b5d3b288d74c6be2bb3736cab29a6a1f68902074b0a3c3813eb29f0b461dcf0130ad7fa4f620917a8c1e2b738"; + sha512 = "a57bcad31e7682742756cb1b53eb4cd31d531305b0e7bf51ff49c1eb6be0e0c1a9ad054056cc5afde2f4fdf4e4094a558fa0fccb1d2e763dc841708e21c91eda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/tr/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/tr/firefox-56.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "8314f255717a1dd56949075a8ac915e816d7647c39027ac636f79bbc2f6d7b9d1bb593a1ce03a9feb1ba41d4cf2a9613a9e64a42db448813b874fd0906267b2b"; + sha512 = "af694bb0faec36e3406f238f9726179ca6f2c5273f46a689f36f32d4b8baccdd69ce096446f0e09c88c065d86bb23058edc4900a96a2d14ed583c83eb0b86e61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/uk/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/uk/firefox-56.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "bf6ab16560f18a8e2eecc010f6838839561c0255beb6fcdd9a13767a34edffbce58fa2911ef13f5d6767cf19c96e0df520d6682d3441bf860d0654357bdc8f83"; + sha512 = "8aca0e9be3162dbcd8e9cdcb67cd8eba77bda79f140f5d7aa06902e78d2e3933d5e4e3d0419cc665800505321c55b29d1714d72ed95978dabe39442f35ab2c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ur/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ur/firefox-56.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "0a6f44415b465597fc58bda25f371da6cf7f31718a310c96ce1f1096c75f627391e62d10086d6816d64e4199ab0d971f1fb8759f6509967f0a7f79d8b6b08f16"; + sha512 = "effca2a2cab3972c2f521ec435c6fe1a5830cf7ad51e6fa3e533841961d55a6ef23ba96057fd82f5b9e34ef4e6936c5a18359969c6d25165267f7c8ae10b5d76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/uz/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/uz/firefox-56.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "57b40355881e13373f3d122585c6e7fbe48ebcf86bbaaa78756e75c669d359b1948a5a42715d32ad4cb9569008be271e15ea2f8a998dfd15f7db36ef92453386"; + sha512 = "6521181bbb32ad0edab639465842d29442871697f22ff566e30959213f34750ee2b77f48ef862b1e60fcb348309c0e2d7211f77005391d6455ec160d113823aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/vi/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/vi/firefox-56.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3f16a785a361dad4e395882cd2a72bb8dacd5c58c47b75d18d9406602a0b23ef227788652656398de09278f9fbb52dc61b7a9c649d5382a1fac663510f228a71"; + sha512 = "fd4de5b14e6855f68a7a5e6fbf8f3def7bc81d8e63f26c98af0e06143f9f8b50375dd24c9f0104c7ca62a916f3921160f1326a862763fdc37205abe8f91e4db9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/xh/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/xh/firefox-56.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e2792d9bc89033739104f8c14111dd07c28dc49be4ffa820ccdf88023d93ab7598f1b954183ee3abbb47b78ba05e596dbc7f458cc7c77cda91bae64ce561e5cd"; + sha512 = "5a7fc7aede910ddffe3f15815091469b558b5a94dea2a1961442ebe3afe206825d182143a971c6603257760d959c133329418f319a3138833ac6e3a21ad29d81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/zh-CN/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/zh-CN/firefox-56.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "6ed90f1a4b157484c4f1fd0a171d948afbf2af06ec8141ce34285c521861f2bd3c3ca231feb4b8b69146c84bfcc83a675b4b69f1889476844d3cfb4626dcea6a"; + sha512 = "8080545c283f17964bdd08a10160633568dbbb3bed79e320f738a4fc1b01c67996d9f286faecf6327df7d28926186a80ef29f8ca1bce4cf049939282858e87af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/zh-TW/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/zh-TW/firefox-56.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "e953cbc61b8b30de35dcb73407f817651fad295633ae52d299d6205668c49ed4e432ca2e5c8bdf411317c3dda1c4d71a3472cbccba94489573f96c42c09e6345"; + sha512 = "d5d4dd2ec14a5982ed77306cd257f76710e5d4191f0f30dc57150c5c6f6f37ad8fbf5521dc81fe66df8d22e70a7bc7e0f9d621f6ef82e8b3c3f7c831eba7c360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ach/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ach/firefox-56.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "386e84934aad44376173c7ce27e732e81612d231a4e527f4765cc7cfc1843badffc8caa1526cecfc546507f2e370fe55a85c6cf55b9b750d98a70514301c4da8"; + sha512 = "bbad76abb597478e4e7b7cd5bfc6a94b430fcfa5565eb8e4a2acfd01cb5502a883e0823df78567879010126fcebc193e44dee74773fff9a0c66a0adac13d5234"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/af/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/af/firefox-56.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "708c0012276f2473853efda705cb982d809edcdd300a08c105eb848be95efda784720bd2042f7d352c3b6ad96f5a63f53a70b98c9db29dbd93f14ce40f44390c"; + sha512 = "0dba3b898cf46397336dacb56c2e7e14584ff5da95e0217516697c1b028a1b62a5f62c3875e41e5cecb9f1e1e1008103cdd2f46ee2038f0553459c65d703f094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/an/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/an/firefox-56.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "630d51145d27671fc739bf8ed45286bcd3884a0afc15f39c837fa213f0fe9bfd0213e6d8269fdd1887844bf07302ccf2bd8cce38e7f7d4f2f706486487736561"; + sha512 = "f5c7086004df5fa239d2f845bbba19ef7f2a1bfc2d81a42147aed859dc6f94fd0df134eef155b1a55899c2c8e4610d5384e51619e3dfd874b1010dbc5568f7a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ar/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ar/firefox-56.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "07a668a25ab4faac23a4a2adfef2b6482261b22cbaccd4121a510af96958443e4ae35d6e83bac15ee0e64aafdf5a5d4e4c21cded777ec65f0c333f9474cab397"; + sha512 = "710f15ee9fec1cbe7fbed9482c4f4593043626a90be783b63b923cff1bb51417f03240f0feaa605f42a0c0c1984b0a643f3924a1f6ba7f32abd1a4539de13fe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/as/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/as/firefox-56.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "46263df53558751c587f1e6f6c4a9f3fe5c4833d3c984fb507f7bece693da7d85298a85a21eff38527a81cb1f24f6cd1c8292ebd280238f70e076a4da7748e95"; + sha512 = "39b2c110d3eadff569de5a11e32fd1bd487c2318eac97c7a5add79d7734754141c788e5d90a3ad1936e204bee386d082f5af6ef75931b07a682e06ca2300407e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ast/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ast/firefox-56.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "92daf3ec9160505501af044b1122a544f6a6e744ed262b5e7e9fa7d1d303e68dcfe7333970b97df9add69d8dcd4b29f8bbe1dfa47301ee16da677486c73d8e77"; + sha512 = "d064c858258404e8facba40daf6b033d7a99caea2405d369d4cb8864f5baad9ace9ca808a7ed3f5c6a87553e3ffe654c6a34d081e4948a76df9a743099af1638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/az/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/az/firefox-56.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "d8bfe731b8d80ccdd85f3f389fadd76fae2691ef2b02527cb96f2bead142e35fc74f7a904d62e25672eeabc51ba746e18fae70876c8c86efb22b05fe9137593f"; + sha512 = "fab2a1283b4f2588c44f5866f2dd8ecff3b9fe22e32bdacfcd825aa8994bd70f6067331946cbec755831bc13de2f97e82685d684a68012b33ee4f1de7e1c9165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/be/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/be/firefox-56.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "8a27be65f3e5c586411534990cb948e995e69dc0d6f7cb52afc13c47b42e42507771e3665da57ad86ee5ae532130fd176b10cd17770cab7b2ea50b0121b35ab4"; + sha512 = "d366fce83eceea67e3fee81d4dbfd607f2afd2ece13125ee0334e23e238fb2cb7bd2f6071abfa3103284aa035cb1d85c3613674709321dc073a5a7f02999b16c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bg/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bg/firefox-56.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2c2136346ca821f96300c59705ff077d9b3fccc097bb0da9732554b07278064d92a9238ee0a99cbbed354dcd13422b65334b03ec4a0bd0656b61e5bc8a1ed51d"; + sha512 = "3c2cf88be4ad5862cd04fa81fefa2334aa20221fd3ce1ac505bbee2be6adf84e9fcc78db6818d5f7013ad9f3c72ca9a8da71eb98e9a39127d0be85025125bf10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bn-BD/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bn-BD/firefox-56.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "8c53e006d3d7cec66d5fba1eeb1ff8c0beda661f1033b2e648ff84f6a41e9496d08d90763c0356e5cf9139c699851b878bc1ee3f1f40aabd3d26a42d17554395"; + sha512 = "4af8e284f17919064ad630e32d0c0fddb0ca2d12ae5134c4d3354dcd23a7677d7e4a6223958f1097b47cfdb78afc81909b118130aca94ed491038786289c3842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bn-IN/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bn-IN/firefox-56.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "696a769b55ed6beac2d7f61248deecdad88b85b048c6fea3bd8da1a7cadc792eaeef816ab83b184b0c65b3bae315bc7acc96e8415c69b4d92e50f40f96621471"; + sha512 = "5ccd06a65c6c164bfa5fe766a6644fbfcf3852daef8a0d052e446ef78d20c96bb738f62556d83c6c4f72a107f2038636f3db7a4b34c58d456938d13634122841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/br/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/br/firefox-56.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "3eff8fe64026f8d337ac279193aed4f79320c35d4f5269900517c21bde2075595ad1b4afc68e05f64c8993517e832d1c34e39fc60d5eb6d1b1b6184fa912c416"; + sha512 = "8ce3cbbaf04799ea97bc4721572b90f82d8de839d2787925d45045571d46f6f7a97f0e6a42c484e486e01e78e937425eaf9a1ac26d74fb7fca173510dfb43313"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bs/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bs/firefox-56.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "b964f5d6540f4d70f50cf0ac3858539f58ac50b691758568a5dceb3045b7acef99af65f9d1873f01a7e633b101ee37cdfd8382ea35c8719d35e5a89006883570"; + sha512 = "0eaca44c8f3bda580d58d26d089dab50d232553d3218226e5476b470501dc6d53ad8351043f14686ef77f4534d69d3df9af67fad99d702314c187ac22e15bb78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ca/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ca/firefox-56.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "309ad23f3b042434c3c0779d59838c920063e64734d42075581ed3aab88de947e5fe2d74dab5ee17feb1462fa7125dee6b114087cae68fdd6c402207f248d1ca"; + sha512 = "810d5d81cbf07a2c62beacd97d1ad602a492d1d0a2ecbaa9cdd328f17fdb98657cccc1764cad9ac1bc71624c9f217c02cb8d3c48f6a7f5b0872e02f6418e75c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/cak/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/cak/firefox-56.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "9454a093f4fbb2466fa63a565461f209783f24919c970e95ccb25d8c9b56260fcabbdd9bcb6ca5fa4a1e1098fef4fe50882e923954363c83cc3536f98f95e078"; + sha512 = "14df3c2cab46957dcca106999948b00edc2b570a06aed6091d8c544aa838e7993ed655e8baa41d0c84cab68bf2758816b8216af8bd2789fafe7fc1a0d1741acc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/cs/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/cs/firefox-56.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b487d98f8f060d34164d78ca77d7e3f28cad212c2c9a8788a6f8f13939a8fba5bd6501765e0bcfeb3c57ce82076187cd158cead63f06b27657018e9b1c63ec6d"; + sha512 = "baac4efbaeba22c651b625becd24867ccf39acdb744559e1b113811b35503eb5deaf2249565d936983d88f382135bdd28fcbf518c79203fae29730f962b2bcc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/cy/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/cy/firefox-56.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3a3fe1ceb21e39bc5ae1f7a33afbdaef00a3fa2e713a8bb094c7ccdb4d724ea3a09907d427f55cefad987482f91db48e8e988b6847132ef2083c65851a95eb88"; + sha512 = "ec2687e49101b76c787dedb4c21d886195a0a14aa5e653bb335675c300ae2c69f1cc07d71dd70145c1c52f6dff47d8e75bf9b7006f8e861b86b97df07e4667f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/da/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/da/firefox-56.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "c9a9073ba8fe937853feddb194c1168e188aa22fc8cecfce619c0eebc6168feea1b18201bb5cc5bd0ae758b2468dc99444a6c2bd3f248814218af5777e848853"; + sha512 = "c0f9e29b66ed0eb7c47e1fc633a5dd3793d2f843827c2b37f51e48cccccd909031855c0f1d0acb8f3e796a0f74f847b019f01a207261c9c043a8ea6b2c4d3fe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/de/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/de/firefox-56.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "12f5dd9ba04c6986e2764663648e34dbb21f8008919d6834acada2d6c6d409de4d12df026612ad6945be11836ef7db325e6e39e75fef38bd4eba95655e4f3c0d"; + sha512 = "6d079b71b7743c6cdf7f11e0768c122a957ecee5e8ca7094b0b71fda937560480de8222440e160e1b9a4987f4615347dcfd445fa7819efb32ae2985b3f106ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/dsb/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/dsb/firefox-56.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "7e77a0af3a68facd2147d315f8fb0af7ba3defb712b15b1e21591ae2574d7881ceb8fce934b7ad4fe7ed341e5db6697cfcf5b901069771c8475359b4551a24b4"; + sha512 = "701205540952a95e43b6b45e517f7013f04ecf4565e1fb8eb2d856b590b7249cc9f212c10c711350f030ec4197e53037da812aca15af7429a1376a9f354dbb12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/el/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/el/firefox-56.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "7e577a58a549b67c2c9d1d85750d2f371b1b280555efcf48d16a4ec931f51474a14a424887abbb2de09bc182553d394777496b7abcf34226e63cf43cc4c874cb"; + sha512 = "41bee5f59c100d6a5d66ff509286c3c694ed7de2d576a33d9ba1b555c44b75e1174344841f017b6ff86e467d9b5ae1e0318eac3a87dab36bfde8300fd8ffd71e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/en-GB/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/en-GB/firefox-56.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b7c892f50bdc51e9fde38cef564edc44190adce6b8b36a1d5a301b5677b8ca46b68a31b5caef490e691320e76e8f712ecd7e9d963effca203464a2396345f380"; + sha512 = "35d159cd9eb069eebe84919cc2c29a2b962ebc62a28b0e6d8913e9dc98405b86f5433def34d14bc6da1eaf7cebd778ea1074e91f09a183c661768ac9bf306451"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/en-US/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/en-US/firefox-56.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "52eb7a5344c457535c263c68a6e3b4714a513bf0c3fd5f8796e8bcd0ef9d86346a7757afaf8193a8de41635b88dcb8d5b666dba86e92f75ce267f14c8adcd356"; + sha512 = "8bd6cb9e4762f4f5085a790ac1235a88e5b6610d4dc1e34c5bae13a3219b05a35f57b40483b6078ae93d60467ed728d75dce2355c913530974aa47884595a8e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/en-ZA/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/en-ZA/firefox-56.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "4a086746611b98886a83759f546738c814577698f92b4d443bc4f0da0f1a8f5956461839bb7c3cf662d9c7386ce8d0828572abe96d17d490ced06257b311bc14"; + sha512 = "5fa8d2f8186c35d8e6a01e90cf763e35b9a8f99b272bc6dc9d87f80b8ba252b48d0e51e8a60bdb0aafde34dd50c1be374844c87a79917e2b521db1eda4f60a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/eo/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/eo/firefox-56.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "b65e271afc2cc1da1c9f3b9a6cfc00f6b1dd5e63043ab9c1f17eab024603869269d55efc4bcd713cd8a860f0b79fd77dc21e165e7d8690a720e7faf1c804cded"; + sha512 = "7beca78e35798d3f0f24c8c87e2e464aa2cead0fb64d5c0ae4a93caa831da4509ffaaf0cc84d0624d389f7f846a6033ef067b2d2c7c5b7be2b276dfc0f2012d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-AR/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-AR/firefox-56.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "bce196c4e86e0d2dbdcf42f4ef7d876c5afa1b407513a294c98e052ba9c320a4155ef1d41d67fc6ae089e3a57e5402c1fa7092b1efe47f95765d44ee519163d2"; + sha512 = "80110dc1761d36c02ba6d42e11b104c54056fba3b00788398f09ad83444968700487af348ac1d275ec0f303b63264fd0b4782fea02021dee63be044163a2c9da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-CL/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-CL/firefox-56.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9de7fb8363a8f4c632694de52b86ddf467427e64f4e92fb00c7001b8fa6df8b23ff43d77b74a4277cc1ebede986fbe4d387cf694ba82e35db0f4578382cfe77c"; + sha512 = "64c69b812b0fed858aae85f17baa5acabcacbdcf494c164575bdfe18fce25cd26afa8d843003785883fdf3ada347d42cee3f2379692d81cedf841fe1605b47fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-ES/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-ES/firefox-56.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "9516ec93d60e4b5c6067148d9b9da6b40defba7cd1fe72d4a1b44bd59bc4f0d503dd6a29151aa14404b32d3cd3a95daf05660853ebb3d484845452c852362140"; + sha512 = "40ff4bc3cd70c2891825a6f68dcd356291957c45d064537fdcc95119235a7764fdb786d586504db1b6fcd92c010ea4559162344d69ccb085883634c4376e0170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-MX/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-MX/firefox-56.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "8d4e0b0f9ad6b3875317e3e7fc0f249b239e1816a4dc335d444433b521460ad16a0374851caee132e58eba3b46005c5a294fb84774ca56084df108d861dbc335"; + sha512 = "2a05d20aab08a4f8745f93f011b1e1ecbef0920ef80204802c8dab7290ece35d4f351b68c1f417de3d547bd26523bb05cf62dba3d118c21a56b4e2f06433e4bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/et/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/et/firefox-56.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "ef60fa3a4c2933dff4fba6d8bf3f8f79faca16768802fccb4e1ce161bad315acd78abc09f998fc516683fd72fe9187b6a523961210d8629a2efa4f1102469322"; + sha512 = "8a18de633eeb34b34c198c28b03914bf885cebe4e3ce15874b4fd99609d5931e703b82683450ab36ef732c99b974c0bb9d757717a3acf51c5567400a8a712e9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/eu/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/eu/firefox-56.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "3bf28fe5886583c920da5ba845899674ed06586ac0b36ca353bd40cac4de2ff76d833da55b5d96c45d87e9ae66c33017a20817d4f2761a152750767b6957ae11"; + sha512 = "795683399a11c7e2ffb33566be6e087c8e499f2d7a8511aa36268a5c3372e1cfffa7f6b23402dcd40ea384f4231167fa3408d680e6de1cbb0a0371f2e477c6af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fa/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fa/firefox-56.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "c56e142399445b45322a68cef53cecb063a37d24a697509da1333de4817ce1870a18e76745c113b6c3689fae28ec66f60806f478d2e88d2e213e31115558403b"; + sha512 = "dcf0c1f5d58826d05d7eef3a7dc9f50590dba939d1ae3f4f1509be246ea1dc7c1c65b5cd642368ca0857db5c31311112d3770f1144c2319c29a4dd93dc1bdbf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ff/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ff/firefox-56.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "7f868d56a29ef7d03be1fbce98ae4bf7af96db7f7bc4f1729e7d5f0758bdb2e0d0471c3f46046fd21937dd410bf0ae822dc035ebdd27b1f8df3b92032ac5ffff"; + sha512 = "ccb5d1924c730ec816442fc4627680c1638464c42865252834572b7f0c6b163c773750a9885f711b523c119c11cee2049374fe61beb7115bd2ae51d3b7f6beca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fi/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fi/firefox-56.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "449a103aedbb4596afc4a8b2ddfba5d9885756c7fa6983c25fb609ff3e280a83af4e28b04279b8f5243b46f366b8808b3e6d43286eeb60415d662ebe487e1c03"; + sha512 = "e3422e1f91a9009e2bf29cb034a2ed001c3c2b32db7af4b55414a5db4979e8b7ab4ce415ba23c015e4fa86ff7c87bea8dc7e4d9372c4680923c24068cf0b9ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fr/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fr/firefox-56.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "c171d03ca2b067236087978b86c4e69f6253f1b73b34b198607c4f501893d0fe9baddbcdb28ce033fa796982a8a08885cad361dea673dc572594edfa49c906ec"; + sha512 = "22fbf62da966b0f922bbc549eac956b74de8057c5acc4d6278f32c643268b809ecc117eb623ec937adb26be78e1f081f1e0eba025597937a613b0ddca085385d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fy-NL/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fy-NL/firefox-56.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "8592c501f694fcbc478670f892bc239e0a7ec152ff386d418d8852cd7489b94665f7bbaccce6bb43ecc376525f23417c6ff7899ab1c30d4276d9b4495612f930"; + sha512 = "20439b3d0826fb166bf928a1b9e509d570b342ff3449a9c6ba5c402537b766ca75522f65cb5f1670b147038a98a5e7fe4d2aaecdd93e1c2b8c6db2d7dd83cdbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ga-IE/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ga-IE/firefox-56.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "5e9b9fc017bda23d0a0336054fd5f8e04abc7fcd4c2bd165d27e01e76053ef19e074b83cb547949212c49c3efbfc2c620b0df3841fe46efcd4e269da4bdeff09"; + sha512 = "00ece6e619eb647a4ee6643f8f174309b81ffe25c1b491610d0dd25fd3b294db79270cb2791d9818d5629206dac1a003859bf6dfcbbc180650c1ea1c7203c512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gd/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gd/firefox-56.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "500d0360a5b6310f6616343fbfa4ffc5d6dab8e16f99ce1963d7818d9b4fa99c5d93e6d062b9a27ce6b495c0cb6152bf9bd10c677a4a15c912a563ac20066283"; + sha512 = "c20d2cf4fe1748cedd3ea3c38d2b7bfdc72dfdb57009b47146bb0e01ddeae03bc48ed20e4f86c489044da8f06af7e3f67bc07c9149da346f142aef1eddd79a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gl/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gl/firefox-56.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "8cf6391df871e5d8eba58ffdccb4bcc40f97310b880603fb6633053d5b6332b347bc0819b281fed6c0370c15cab63aa78cad92a0791fc7b694ea327c5d265ca5"; + sha512 = "bf06db4a9871174d59fa5d53bd854fd0c3fcbb48e27614e626860fb4e2c248fc65be7047396b4c002c978bf8eb39ecb94d3cda0b80f583aa84aff16acfb4e6e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gn/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gn/firefox-56.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "23d7ea2d103190f5b6052d06e92fbd56b410301bd2546d55b56d797e02f2d3591d6d9009b8d9b6527219e0ea118811b01b9b97dc85ce9ee6cfd4952e0d442197"; + sha512 = "a7c89f53425a614ce8ed10a7cb5f78a4da581f088ebdd9a7b685779bbeaf1daa26879442c0569b7370f7db38f1db90a894ad22af094653b9cf337bdb5efa403b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gu-IN/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gu-IN/firefox-56.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "14234d0cab5c8e90385616d7d97b9e9107e4681469cf85fb21b8e4dea052d66fdd99b71b2da3e948cff4a5419f2c609c7b92b03883cb8eb86524f84a137d4c10"; + sha512 = "5beab230f4b7eddc9c7c1818e732a5a3dc3f182112ad8b0149534e6a2a4a948f02e3c8de1a0c4d8512c050a0897abf1f89b52cb085b71426015051510eb03e41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/he/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/he/firefox-56.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "d2bd55a5ce635e0355a9639d9f4299b078f30a7a3111df5904c45f7c2751075adf9ae6096fed8e5344d96468f1e3f7eb0a40077609a26636d8071dd2d75cc910"; + sha512 = "d5250c04dfd43b154d9a4b2f56912bae0a65c8eda8c393440659ed341d4371ddb543c75ddf254da96bcfbc873ff9d5d685701b0842e80b4e134f1631b7cfe7b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hi-IN/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hi-IN/firefox-56.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "634fb324bb4df03e5ecdff8c01ac0cc108b42269652ec76606ba47a5b90d3f9a6ff7cc28c1d1fe0995ab5e36c6124ab10351059f369a0b4e91627aaedb49080c"; + sha512 = "e3e8a6e5376f566190d9f25527eeae195d54d91c3d213a1d20464c2da197678a31de74030fde8c365b91ac032a711e57ce7a2d4a84a087800bc0c1db16d188a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hr/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hr/firefox-56.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "dfb13315937377347bb8d8804bbbbd1402525739be2b21f01536c04c210d9e4cf6bfb6e1e9a64b4b04bc8001066d0bdbf74873e55cafb2e5008c0e6302c7d967"; + sha512 = "44d5ee009da2735a042510c197e810116d13d82cf4662c34c44b651890065e4f0a8d1cf515c0a39bb9444764ee8312200e17887786cf5f970f4f02a07a9803fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hsb/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hsb/firefox-56.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4a5df6642eb981bdc27dc3473dd6e267d605e3ac9df350aa13d82350d2e58be6f0bae314371532922fcc9c8d4086678cb744c2502b38305d99c0c6cb010e8146"; + sha512 = "5e0388ca340c6273bdef0b2b616c0788de6f0535fc6b25fa1b5c74008bb06b42e8a086655361248716f0d1ef001d27da4ee336bc3ae6851ba282915071ed071f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hu/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hu/firefox-56.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "39d9c881d9ff91cb5458a307d04a21e74ab57d653b08b81303f5a0cf72002b128894e6be4f4d1101df4004f2481fad4c6f63d3fe771d5e7dff31a9428f840522"; + sha512 = "04bba88955f56737153409553fe52d66bea6d2b0f22d0da520fe40d706d3463ec19c9462b6245a4e6346aa1cfcce583b49efa8089c8db329e4756b1c5875404f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hy-AM/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hy-AM/firefox-56.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0d4e2486577213e7a390d2f4b2d48b54e693748c19fb01c021e356ccf186db25e976324bb589da5040f394a4c5463f4c6f71c691ffcc900644e9996d01ff7cc3"; + sha512 = "e4515485db9d85291028c06bbe19aff4fa894a7b82d1f826cf2cca91bdf08586009bbbe7b8f4df6f6a20a7a931f8ecad4fda970e01af7ec4f68574b3e99889ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/id/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/id/firefox-56.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4c60276f146358a9de2b6c98cd54e0a10c9ae19ca20c2f4e5a6f86b0ca7f9b180604b58e085fda97be9e9457b3f7a1d36ce05ae2010e8a9b5a782679152cc4ae"; + sha512 = "5cc82fbd44b61cb1d48c7b51c91874de20b42b3249efb1b34cb69720a39e08dc52d814efe73be13d1f0a25be9640dbce5fcabcc83a212f1e0e887ebe47a9b7f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/is/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/is/firefox-56.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0c0ad6ed37d5ba059cda0fdf8c8cfbbdb3cb671a81c434d76feda7572d5f71ed4e05884d583d6ffc9a168f8176fabcf1de030d19f018a28e24a341bfe6ac5dd6"; + sha512 = "65d1236d88ef3ea9f4f9b8f86d59dbc4e2dc2522e5485542dff2d747989e7013f8ff1b7cacea00514bd3510ccc145b0a96224d48947b0fd916bd0742354e958a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/it/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/it/firefox-56.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "80f9a72be17b90f7e81650246c6338bba58ddfeaf911e1f9b3b81137751b32ff90e2945cf700850a72951c582f2a6b1c2e20b024fc5589d0316f583e1c3040d8"; + sha512 = "cad3506e98ec810aec450755090217b85145ac0b4bd2faacba35d1051a5a5419f0b8ea2d497040c6f05579875a2f727938be5f964dd6d5d2973cd681ba6a8716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ja/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ja/firefox-56.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f4af35418ef0e77dd7deff58041775097ffdbffd98c0b6b8da5da672535db33caf30648aad020e3be360232105020fbdaa254bbb141166fbc4065446c828a915"; + sha512 = "fc8f6a902b8151479f427f58464acb8bed25dab2ddaa5ad21703cd79f74867c829b9b6838d0fc35f6471d6b0e59f005158bf80946ab8b3abbff9f71e13b10fcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ka/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ka/firefox-56.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "11f32a5b7a6b0e96728154769a71cc47741f7791610c327acf6e3e9929b09dc0d37feffa00d95d220e0fbed6c7daf4cc040bca86e3368523583f3b15affba9f5"; + sha512 = "783043bf2a638a5280a72dafcf96b7a4d2870dc91d07e85f7fe4fae7f66dea60def9ed5fac28b7923c5ab3328aea1c9eca38967f3daec57e5de53f501d6c7ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/kab/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/kab/firefox-56.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "80ed0a4fa480e89c8925c810bb80f1e43b8f26ed5fef4a8f641081ca59437b6069cca82f27d4437016c1767df00c307d48325a76dccf77d1cb434eecbdb41184"; + sha512 = "605761315426f05a5cd138804c205ed4e1c6d9ec8e78480f97f2f46e48ab4e040be237086af4dc63fa198ce9364972151d819e7de3add8243426c162b107454d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/kk/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/kk/firefox-56.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "639eac112c2a1471d4178304371996314c4eef6567fb205b586bb3e1eb94f87e30e7b10e81027a620a4def25c5e71412f6ba6fa00414d38843873df80745811b"; + sha512 = "ce10569378e0b8b6f77da7534fd60a613a3bfc64726e2c7ce22042439d69e4f6819164029d8ef6e691031d263a0033c42e0921124286dc04afa7c81353b5645a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/km/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/km/firefox-56.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "f6c535a31dda743fa54985b5eeb97e3091243434923ebb75ed75ffb62350133f068251a17e1b2172ddc92dd3520e7d29af7276bfdc711760df855e850d6bcb5b"; + sha512 = "e4ef8fc7ad18550ca93f679ec79b4a8e16cc34379ed52917dddcb7bcbdbeb6b82cff2dd16c31001dbe8232bf49cec6eb605ddba059f71c109079e4fea679c81c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/kn/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/kn/firefox-56.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "07b371373494feca79ccba78df2706a9442a6d7ed743e8bdd94619ae1f0c814f66776d4d7f37fdc98a1d157d71a2d22450b5c3d6a39a84a15b63fd9911639f15"; + sha512 = "9e841f2b2161feebc643956f92b3562db4842528b37180e0ba5d4c1357b6a23d11fed6a2a00f0b252d609a5a43a15dfad21b97e3ce012dc9f30dfc20ba23549d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ko/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ko/firefox-56.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a39ef1b093a707f1e6e1bd7bfd9affe4684b19bfba33a88e81f51040bb7bde29e9c4ed12a7d49c30959f9a0201a5504fbb3e8300cf738767739d93d92553651c"; + sha512 = "d5fd6d0826d7a28b69f05cf620cfd45f66223fca21f2642228a4e3475623c34bc4d57bfef513348e96dfee1b7c5b47e994147b7004dfb5efc60d8261aa278651"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/lij/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/lij/firefox-56.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9b4636d1520d94b5955e3f3feeb2aa91463f4e7bfae4cd63e102ff29a6ddbca091e7c27a45b31e14db00b3c2e3b49fff32abd7edbe5cbe6447a4544aadef9f20"; + sha512 = "150f06608d1f7942277e30f7ba5dbd046dd826152183e30cef8438a7ffefa4297b4476e5fd4c4a2b4f376a1e8f1fe11381df36d41c6705e0ff1f14dd4b90fdd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/lt/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/lt/firefox-56.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "8196df53989aae3ad1ad326ae85b9e24d717e2668b28958e7478a40408aa12dfdebc0df77bee73b7d7bb60ff593d45e650b772b71c17446d38875c2157b61918"; + sha512 = "47fc24786499a5eb770a9d949df4f7b6a0726e7f74a45fb767aaa30e1535d30583e5353223bc3cecafa89284626a5ea03c2633d1a264ec044e51b001b598ee91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/lv/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/lv/firefox-56.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "288f37186f690c21e858cd89c0cffd0dacf1ae8a93b0c3edc9ef9a6438733dbd03f0418c14d9a779723acbbbe4c37a8f587d6ee64375de8d5b1a966df7962b0c"; + sha512 = "3863b8bbfe87f6ae9787f009a7c3694454d410140a138693ad1419185f398c6d2b5f74111484cc97b5c61217d3af904ceb876efc16d03238901c858840f69338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/mai/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/mai/firefox-56.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "5eee203c914db080e4809df94156f2d431f68c9bab5664c854cb66306e566ca6a45c4b6d683e7e543ceddc91d60964959b661d0a2da9b26f9b461a2e099a37f7"; + sha512 = "7a0a97c9ed2ba31e05eb33790f53e1d9d2d4752ed7c556bf7af74b76828d0de2ff36b89a9e4e77fbb8dae5198b142a62e09465210e62c0d23c4fe93fa726ffbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/mk/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/mk/firefox-56.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a5ad175c42bf938100b75012732053724edc1940e8ee759e2c248f8c394f5a23f3ec7964ffa282702a6d2eb5831c618457f823490b01c21723e4101b53a29024"; + sha512 = "9328d9a5151b6833f594f4ca8c523797a4f75d11f9c5f77cbcfddd7c99f6c3e792903c26d059f4025fd9d5b5e76175d52214963e541b5f01c6f3abdcb667873f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ml/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ml/firefox-56.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "dd45c351fc34dfc331c4ef9b475ed119dad87ea97be0d33dcafd013a3dfcc6b3975b4305fb4e3734a54b5378ebb8b354b7e91a4d89673f12c5b13ea4adab3287"; + sha512 = "53a52a6e4999f116158c2043b2dace9711946ae2ed2638189c38af9677f70afe2b0e2434054b12ac34da531e40d58673b8be78b7dd6b7ef090b1fc8c26d16d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/mr/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/mr/firefox-56.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "19e6fb31009faed74fde46a969af17090629e5d32963cfc3e041ca0e77fcda09987b96fc109e8a399127794aec531d13a3406309bf84c29c27d8f8f3423de194"; + sha512 = "90ff4ce1a1fb75fcfc0a2d5a38df9a095108b83cf3e6958793c962683668f5ec95c72274cc330e7bff616a313d1c267b3b55cc7be231f0bcbbb58764dee5e06e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ms/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ms/firefox-56.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "f34afc4cdfe9fe3d9c2836bbf0588fb39fa11c5b07a4acaddcd3ae44fb9c427f97b49b5579fe84b71b5f64ac3449fa8da9aff89de7395cf65c55b860d1148109"; + sha512 = "cd5c44219bea96b2b1d02dbfd80ed6b84fb40b19d1d0c170716484ddd6e07acda961b824631235f9f300017531e02e12433c39d90799acc2725bdd93cfc524b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/my/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/my/firefox-56.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f10f83c008ae871a53598232c6e1a524a21efd9eb669639d16229e340713a6959c0fedd01179c40cb91dccf33af2dc0e21c58ae901aea63d9c334e0a96d9f7a1"; + sha512 = "f9f17da2d15b9f9850b97762b6cd6a7981ef9a64afcf659b280c23f6bc7c741e73537191dbdec90f89fae8ac7a552fac90039820b227b59ebeb197dd6ea63fac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/nb-NO/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/nb-NO/firefox-56.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0d09dbc8d16648108560f4a45d93b5ebf0ab008e920d060e5cf031cb3c734ac4e0bc0510daca96f016dd729f759a66b6c0ba856256110a47c015511bb203f732"; + sha512 = "61875cea3c200d84a65f2cdbdacd438d6b9437d27f62f903b2f46735c2be5a36385bd2276572244da64ae77be785b268a54db9590c2d375e8205b87b0b859d0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/nl/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/nl/firefox-56.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4413018700d0040be812f9082e9502fdb56db522a06df336b9a070189c7ef0938a5d830a9072db3bb5e721d25a9a63d3b5105222ff6a808d3dc6fccb1ef193f5"; + sha512 = "a769956109ce7867b7cab41720051afafc32fd9579b23fe2c2e79e389cc193b7f8521cf27e5e3be805fe3b7347f2f0ccb552e46e140391c800b66bae515f61da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/nn-NO/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/nn-NO/firefox-56.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "07a6fa48cee70d0cc97b6f6928e70b37be4e9de05e800a95aa1bcb733239129791568a11d75e1e2a647c6e08cb3ecec02979bf75b487ffc54fd11b46fc4d8a3f"; + sha512 = "84d13b0ecdfd3db9b8b72266a5a3a5fd300170cfb00aa116c006cf29a123d3e6ec87594125dee9f28a5c4a5effadb3a9a5c0ecfdafb32a221a72c043b28e958f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/or/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/or/firefox-56.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "4dd3449deedca5a13a26e05a6d13a3d4e2e414f9997f4873668daa03d09873e674ea98f79c98c48fbab86c9a3f32820f8e17eb1fc6111e5bc1ce73da5584eaed"; + sha512 = "61a95eb0ab54afa990a809d53039d887e477633462226de9c41f77474fcbbb85ba8ff253f0399cb1fe9a545c38d0a63e03669d34f5e0d34c94d781490c6235d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pa-IN/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pa-IN/firefox-56.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "b09bcd351a39c9c9cae213f18cd3ec49af8dd7d203a37f0ece99b54d7ad81aa711fc54b1b772502bcc071fa18a0a7f6af8d99b62bdc00437a0ef667d459426b1"; + sha512 = "f27f374a770dee7b91751993b15e86c818a8c4d6758b3e9498e14f81fd7b3a5fb0397b99e87b2a4f95141d4ad788c120d32a94f37a70b5aa30b6d64dd7c92c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pl/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pl/firefox-56.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "910f5f8b9b34b20b4ed86f444c905171d23f459cc4a37f6fc700d5386a22758b51ffd8a9b3f747fe339f4be3a4967318c0bfb6f618c0602e8daf2369b6f95f07"; + sha512 = "ace6225fefc5149ade7ac1bc30992847529183c6aa903220ad2b366c0e233b9304322cf0fa546891d9ee040c3cc6e8d3ee769f0290130aafefbb2a4606c48fe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pt-BR/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pt-BR/firefox-56.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ea5b6fcde8864aad6a3e005e5cd46e9e4c26b6de1b1bca8490e10ed2f7c7bbf44d93105c64c280327485b3537ca1354e8ea2749328a536a06fd0e34b70990ee9"; + sha512 = "84876999b3f0717f34212d01014b2a3b2a4f95e73e7364fa53ad5366030df5c7dea65da6a468f7017f25a22dd659f314cae9ddf0167f413eacd2eb6e7ffd3501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pt-PT/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pt-PT/firefox-56.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "4bf071edcbd35a2b556d3593a70df66024f871a49abf32812c2e25cf3a9fb466ae87e6a958a5299c54972c68807b8154995eb7bc268bdb8cfffe32cd80f96b88"; + sha512 = "5d720a2d2bd56d6dcff128c267815a6c65af5f34011965f04ea1b789ed2e0a6b03cf682bdc9e3e1cd4a69aec45191eae32c7ed1e1d905b3c288dd68cd7f2e8c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/rm/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/rm/firefox-56.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "7dfe47e52cc71504cd1f4682bfed645a1fa1b622cf75f07cb650f8c42863cc9b5cb0d4b10c74e1e075c95155df8a52a08ddd4b13da45fc99e4c453a0c46845f4"; + sha512 = "9a0e915233bd0465fb8d336b1c54ac330d7d994d51018d9b28877f45d8c22a2d7f6ce0ad0d308967ff09789e7870c2954b570a552ed050e6ba3566b2b1f6743e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ro/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ro/firefox-56.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "25fc42b92545f9219bd4d1502bd05b3ab848b590118fbc9d44dde00cd64e033016aba7eb2918de1d5a80e307b9743cd508567f076bc3de1eec2af966b126f574"; + sha512 = "dfde4ed0df604a0c62b177b3c6579236d75568551b9c522ea128fa3117ef2ded531a7b83982e618dc111620de9eec47931a89429b56a5a6b301433f325b1d695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ru/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ru/firefox-56.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "fdb9d2c7fd6708231b2b5b617a7d89698d77167a53e21cea7bd0da47b32bdfb5858e8c74c616e7265cac7095652829eb26e73d91c0949c3a11f238637bba56d0"; + sha512 = "82011e90e588f6e1bd75fa9caf388ca928615ad21424c4f3ed4dde363a8ae90e96f520b8bafa66922a921ab81571f31582a695c10a29f9b57156e5113495eda4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/si/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/si/firefox-56.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "60663c3a8e66d416015dcb80b01eb991b28f7e0715a24d1fa3f1725bacd7d02360eaec1b7e75257a06cfc8bb9a7a960d654e52a9a128490df5c1821514388d94"; + sha512 = "d9e1618815b1ab5f166a4d11c3744dc89ead59b1fff58bd2ae866074fa31cac52204ca086f5ada9466103e7a3d97feeb777f4eef65a706c15c27db322298cc51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sk/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sk/firefox-56.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "c0774271d098dc55be6154d2f687b4dc0018b359a4fab9a073818f0333c9a513a4f5934aa33948d40f59f10f79812741206eca43804ef3e1c9bba5a386355db0"; + sha512 = "93e44d8a94ed21c314a932e37acbfc7431231cec2660fc8301263e928000a4be6ff43966c0394587d5d1a0434a9467dfa87416c1554797d457ab835c8b12e39a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sl/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sl/firefox-56.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "8a87e18213b70b0e25ba89fded209d2d0782f844f492fdf8f0d3beaa35d3c67ed3a537418c14c2e68ee3b20fd829475bfa763ccadad0b4ff06046dd0127927ca"; + sha512 = "810bc5d5a2cc55de6360cbd0837d1f301c3e02757f5607abb93e7bb0155a1a4a724b175a4e837580ff28c2329d861ce4440e3787237395b41abd03872da6d2c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/son/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/son/firefox-56.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "bd84d6da25363521111b7dbe1153cfdc1b17a5eced2ade76a841c60cbe11a00d274b9a556f5320698a1ee846faaad5ceb42bd79e0164e14efadcf31796244bf3"; + sha512 = "9f5596fb8f6b341cbdc7a9989d4c1cb3a177228c478028d5d1463224dbbb0ed9a234a5c900760fad64428a5c44602d410032f1c7d60afb24ee23165995739c4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sq/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sq/firefox-56.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "955f7b8b8bc497325dfdfea24264c6784907f86340cdec78ffa01a79a10bd58154341960f0e6fcdc1504d9b5cd7d44b7b3ef9be348695b47089701a7e1c832b3"; + sha512 = "53c3ccd14572fea76a4e0fd7bd25c3dab69b7f0c920c4bd880124f127dd95815500917368f6930b2869338bc8010224bc0f8d5fb4fa52e8349ef99c6ef01ea94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sr/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sr/firefox-56.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "85562676547412364aa8043b9e4cada72b46e078628686fddab5444c7a8d5fd8d363d0429efa67478d290cc1671b52948095a75566e98993f49c04cda3f20881"; + sha512 = "6dfe740e959ec3e9fc3276d47f21fccf7f7c1c316b8b597fd2820a9928d62eda046701fda74c5ffc2c661f15cfe5e96f1677ca8ea36746925becddf4cd514d8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sv-SE/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sv-SE/firefox-56.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "4a7aae7ae216e3db74f2f77bb747e06f69abbda483e2cb59bf7906e23b18b612461e08b5360abadec61ccb5ad39d536453376db35dd130df5d5173807a9ecc06"; + sha512 = "7cfab1450c3524cd9201eb9b99620dad1941c03ffe5f428f444e688d87d76d348185870e5bfd6d123dd6b3a45ac5687ed4e405bd541b07060952806c9df1d437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ta/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ta/firefox-56.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "510eec52d5d41e3ac7e7759d78e572ce2b7d7235d39e3cd01925dbc43c71f46d6b90493db27a45f6a36a50089173f70a301591b00ade07372ee08a2fcdeba2f2"; + sha512 = "6542059db48fddfbe40b57fd14ceab40481f9452e8450c3ca3708a9eabf480750b908526a7ea9d52dd085825ca9f6ebd1220718c7ac686628ca6eb3e460e830e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/te/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/te/firefox-56.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8c0936ccc1a92126573495e5747f6739c0995fb7280e686b31fa62e6c2c7a6527aba36c9ec1043cb5a3244fac368c899b9ac5afa30b0d121fbe97d1a9a41d7ae"; + sha512 = "a455b8b07ef4525d99901eaffd475d172bd78b45322b300ca9281f4be3394d6bd4e86ee6c0b09dfc68ec78497accd892c1008d9744408e71840137554f683fa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/th/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/th/firefox-56.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ca7f55274ff6171f297904d9be0451294cfdf9fef93bccf51f8880e3b69237daa9058de6f8e272b754d85fedbd69144cb1337b653f47029a212fbc938bcca9b3"; + sha512 = "b9096450cacc6c959a4cba831f85bde93c99f78eb0840296522f294edd4d671ab51a6426901630dd950687557cc66499188d2fb255cdeda1683baa6c05a97248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/tr/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/tr/firefox-56.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b82558a077b562b485984d3864966135d5be8fd27a1b266d59beb4e2f1cc556b40d29133c63f3666eaf22f7eeb174fdf4f16e0e0804ae73a68e57f16f5d900aa"; + sha512 = "ab70b6887618fff2be785a46a886acce9daa2a7729016aba55e0b20dfae5bfbf6c2a6489956f2e753d8ee6984096d11551dd3b742933bd85bdadce0d2ebc10ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/uk/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/uk/firefox-56.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7f291c45f4b5569b3cac12f91538073a1c4e52be473c2e6b9c7974dfddaf85696c78f3b08849d960f1fbbac7d6f750d1e1cfd22993daeca1ebb2cbe3c98b0002"; + sha512 = "14c81a64dd663e5244cee0846a36d0bdbd75c1abbf6155cf96f3eae999a9c487dbf4326ed1a7bc5f9cba7ad8fe40c5acf1e44a6811611195043e62bbc1350d0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ur/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ur/firefox-56.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "733a8362e3abe0b7cd6fa94bec4dec3f317ccb08cece1c495ef712f0764f732878880a3cb5b90c54fa67bbf9531b1e4ceb8cf888e3b505f955252ee7f9e46390"; + sha512 = "9b8d3387406d36a299716eceed02ea5e61456b3ff5f51071ca4411873fc2904713c7e7719d92199b112476aa27d477e818a696d406edf1b09502f66ec5359e58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/uz/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/uz/firefox-56.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d5e35145dc54462297e48fe8f4ef1e743ee9b164c9cf45604f293cd2d1433908ef26b3460d961669472c061a2572c655beee9d9c44ecadb153e1ad5bcc161e97"; + sha512 = "22ba14001b2b19362c9a89911152154c72212e557ea557f8092287d3f3e56d2b7d532557ec4725338f54926a990a866a3c1ce5765740593cfccfa909c5ade974"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/vi/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/vi/firefox-56.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "428950b7fb6152de6fe8beb1b1e8f42a5d0d112b20be1a502fed6534441c4fb3fdf2e30b45e71f2d463aa622657ef3784730204af8e853de0847a68332450144"; + sha512 = "a21554b9e20b626896e3af8032911a9fdd67fa459bd20f068c2e7d6682187ecfd613c53616e048360786e786f77eb63d52dbee3553abc2ce58da5bc00b567168"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/xh/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/xh/firefox-56.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "6127dac54537eb2fcc689acb20ce1ecfa8c8ace6f9c62b6f096b2bb4d9c7d47a70fedb9891afc1f5e0ec286ae8d04e677ab833e6fa534a8f8d4a728977624694"; + sha512 = "751a8257df614c570c215c8888e593de84182087c3bf1c339b573872d3289498fcb05290cb6f819eb4f691a239291d475a26a05fcf2d98e2f4bf99088846a7d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/zh-CN/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/zh-CN/firefox-56.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "648ba81769c529476ef7a5875a518ce5aeb49466af86b5d07e411adf7abbab4f90134ae994e3009dd62767aee0376973b08247c8222bfc6359e4cff6b8a19918"; + sha512 = "49fd08071f5bdc5ad425ea3be8cb6526342bebfa648c75f735982266d2e7aef0bcea23b492a70b1c99cdd6c38e934146d222b28ce136d22e9f45366a99328c49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/zh-TW/firefox-56.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/zh-TW/firefox-56.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "230ea83c02b46c856f35ff15c6e9ece08e55b4407dc9e65411e92e1f6a8db15fadc3da44ae8a610b9ab96bf29a052c1d42a8b75d7346d242e8a9135b62e5ab09"; + sha512 = "09c61ea179a2b8331eae57dd3f435edf72d9b3afdc2892953ef3ce80d7f96ee59258e984d1d70e96d9994affac2062a5c552d4236027a38c4dd6c2e5dfab8eec"; } ]; } From d06ce428fe72028bce2b0bf3adaa0371cb9ba78f Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 25 Oct 2017 21:12:58 +0900 Subject: [PATCH 1705/2806] firefox: 56.0.1 -> 56.0.2 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d9c55bb8768..4d48545c58c 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 = "56.0.1"; + version = "56.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "6a07de6bfb71ccdef04b0f2ced720e309d037dd89fe983178ac59ea972147360552e2b8e33d8caa476008cabf53a99003807b0e817150b7a39e0bc143d82b88f"; + sha512 = "35f81e8163a254b7e134fc073acbcff63aa1025b9c6392377650a8f2d0a5f0c77211adb0ae3d8ac85f036bb387246934b8847f14a03fceb7fcbc5b3cf94c9392"; }; patches = From 6dbed5c2dbab886f1695b636958acd2cf288628e Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 25 Oct 2017 21:13:01 +0900 Subject: [PATCH 1706/2806] firefox-esr: 52.4.0esr -> 52.4.1esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4d48545c58c..56641c7ad9a 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -32,10 +32,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.4.0esr"; + version = "52.4.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "be3be7f9dbf4bd0344d5d76f26d1a5090bb012154d25833d5cd58e5e707c080515b42ed751e1f7e58b15b96939d7da634cafb6e8aa9bb1627ff420836b802183"; + sha512 = "d80c7219548391d8a47b6e404662ea41e6acfa264a67d69365e76dd8943077e388ab24b030850919f8fc6681c11486bdbaaf170d441c861f4a12cedbe08955ab"; }; meta = firefox.meta // { From 5939af52b32c01edca7ad4c363b627970db3e04e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Oct 2017 14:27:59 +0200 Subject: [PATCH 1707/2806] pathsFromGraph: Remove obsolete printManifest feature --- pkgs/build-support/kernel/paths-from-graph.pl | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/pkgs/build-support/kernel/paths-from-graph.pl index 9a199a2b304..747e1edec81 100644 --- a/pkgs/build-support/kernel/paths-from-graph.pl +++ b/pkgs/build-support/kernel/paths-from-graph.pl @@ -1,8 +1,6 @@ # Parses a /nix/store/*-closure file and prints # various information. # By default, the nodes in the graph are printed to stdout. -# If the environment variable printManifest is set, -# then the graph is written as a manifest. # If printRegistration is set, then the graph is written # as a registration file for a manifest is written # in the `nix-store --load-db' format. @@ -46,26 +44,7 @@ foreach my $graph (@ARGV) { } -if ($ENV{"printManifest"} eq "1") { - print "version {\n"; - print " ManifestVersion: 3\n"; - print "}\n"; - - foreach my $storePath (sort (keys %storePaths)) { - my $base = basename $storePath; - print "localPath {\n"; - print " StorePath: $storePath\n"; - print " CopyFrom: /tmp/inst-store/$base\n"; - print " References: "; - foreach my $ref (@{$refs{$storePath}}) { - print "$ref "; - } - print "\n"; - print "}\n"; - } -} - -elsif ($ENV{"printRegistration"} eq "1") { +if ($ENV{"printRegistration"} eq "1") { # This is the format used by `nix-store --register-validity # --hash-given' / `nix-store --load-db'. foreach my $storePath (sort (keys %storePaths)) { From 8f349a3bf3cc9a2a4733a25d66cd06309bb4d586 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Oct 2017 15:35:45 +0200 Subject: [PATCH 1708/2806] Add function closureInfo to replace pathsFromGraph Unlike pathsFromGraph, on Nix 1.12, this function produces a registration file containing correct NAR hash/size information. https://hydra.nixos.org/build/62832723 --- nixos/modules/virtualisation/qemu-vm.nix | 12 +----- pkgs/build-support/closure-info.nix | 55 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 pkgs/build-support/closure-info.nix diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a17e2c9ca47..3c89ca68113 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -92,7 +92,7 @@ let -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ - -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \ + -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \ ''} \ $extraDisks \ ${qemuGraphics} \ @@ -102,15 +102,7 @@ let ''; - regInfo = pkgs.runCommand "reginfo" - { exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB; - buildInputs = [ pkgs.perl ]; - preferLocalBuild = true; - } - '' - printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out - ''; + regInfo = pkgs.closureInfo { rootPaths = config.virtualisation.pathsInNixDB; }; # Generate a hard disk image containing a /boot partition and GRUB diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix new file mode 100644 index 00000000000..f1b0930cdcf --- /dev/null +++ b/pkgs/build-support/closure-info.nix @@ -0,0 +1,55 @@ +# This derivation builds two files containing information about the +# closure of 'rootPaths': $out/store-paths contains the paths in the +# closure, and $out/registration contains a file suitable for use with +# "nix-store --load-db" and "nix-store --register-validity +# --hash-given". + +{ stdenv, coreutils, jq, perl, pathsFromGraph }: + +{ rootPaths }: + +if builtins.langVersion >= 5 then + + # Nix >= 1.12: Include NAR hash / size info. + + stdenv.mkDerivation { + name = "closure-info"; + + __structuredAttrs = true; + + exportReferencesGraph.closure = rootPaths; + + PATH = "${coreutils}/bin:${jq}/bin"; + + builder = builtins.toFile "builder" + '' + if [ -e .attrs.sh ]; then . .attrs.sh; fi + + out=''${outputs[out]} + + mkdir $out + + jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration + jq -r .closure[].path < .attrs.json > $out/store-paths + ''; + } + +else + + # Nix < 1.12 + + stdenv.mkDerivation { + name = "closure-info"; + + exportReferencesGraph = + map (x: [("closure-" + baseNameOf x) x]) rootPaths; + + buildInputs = [ perl ]; + + buildCommand = + '' + mkdir $out + printRegistration=1 perl ${pathsFromGraph} closure-* > $out/registration + perl ${pathsFromGraph} closure-* > $out/store-paths + ''; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57d4ee6c3f5..ccc11caee71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -305,6 +305,8 @@ with pkgs; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; + closureInfo = callPackage ../build-support/closure-info.nix { }; + setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; singularity-tools = callPackage ../build-support/singularity-tools { }; From 9211249031bb77b35e0d90237fccd88e1b064aeb Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 25 Oct 2017 22:00:50 +0900 Subject: [PATCH 1709/2806] flashplayer: 27.0.0.170 -> 27.0.0.183 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index f7cbf518732..639425477c9 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "27.0.0.170"; + version = "27.0.0.183"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "191gqgpsl5dl39m04mm5bkkbv5m5npg91anbwsvzb29cs2yqq95m"; + sha256 = "012fhsjfp71vaarjhi3dd4qpb41n4510zmid38hl2hsjz7qrj5aj"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 5034053a734..8e24a3fb619 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "27.0.0.170"; + version = "27.0.0.183"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "018dx7vpl8ha5c7wlcvh422ll5f0zb9cb77cmylbai84dwb9wrvg" + "1qn9hm9c303jihksfc8sb5yjpcasj711s66lhqlqmj5hd0r8bzya" else - "09qd15khv914xcr9c4vy770mm33bl6szfy334ddb5gv6dh6h2gd8" + "19d0d4fn2p2wvh27gshybgc4xpjp0ibgm2gg8g0jzrvbc3cqdz0j" else if arch == "x86_64" then - "0hyc25ygxrp8k0w1xmg5wx1d2l959glc23bjswf30agwlpyn2rwn" + "0df8lbbvr226k9z6p2jwxandjb6yy0bqz5kaz79hpj0dwkiqwax1" else - "1jsq8lgs4jvplwkkb2pngnr7vq9xv9knajk2247qpraq51fq2vd0"; + "0vs63rlra5ccm24j908zrcxhffjlmvjr6pb2bb7a4fmnfjrk4idf"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 9d64827df4a..cf00f303e99 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "27.0.0.170"; + version = "27.0.0.183"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1mz1sxg9wvkgpcwmvbgn1s8x01lx9vkm7wbldfn66j230yrx2mlh" + "0vf28qdhb1ly5w3hhy3n20r4nyvwsxj5csb969s0r328nf1xaflj" else - "1ysdl7j7d9fqy509wz0gq2sray08j1v3bv9zwd6nzplgd60qdrva"; + "0jqbnbpdrmxh2jnai0bv4c8jzsvqmcnhsp1hzaygsvp0ri4vncs8"; }; nativeBuildInputs = [ unzip ]; From 8327e434c4026c134c354fa0fad8a19845ebeacc Mon Sep 17 00:00:00 2001 From: CrazedProgrammer Date: Wed, 25 Oct 2017 15:56:52 +0200 Subject: [PATCH 1710/2806] astah-community: init at 7.2.0 (#30691) * astah-community: init at 7.2.0 * astah-community: nitpicks --- .../graphics/astah-community/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/applications/graphics/astah-community/default.nix diff --git a/pkgs/applications/graphics/astah-community/default.nix b/pkgs/applications/graphics/astah-community/default.nix new file mode 100644 index 00000000000..72d367d8fea --- /dev/null +++ b/pkgs/applications/graphics/astah-community/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, unzip, jre }: + +let + + name = "astah-community"; + version = "7.2.0"; + postfix = "1ff236"; + desktopIcon = fetchurl { + name = "${name}.png"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.png?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87"; + sha256 = "0knlknwfqqnhg63sxxpia5ykn397id31gzr956wnn6yjj58k3ckm"; + }; + mimeXml = fetchurl { + name = "${name}.xml"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.xml?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87"; + sha256 = "096n2r14ddm97r32i4sbp7v4qdmwn9sxy7lwphcx1nydppb0m97b"; + }; + desktopItem = makeDesktopItem { + name = name; + exec = "astah %U"; + icon = "${desktopIcon}"; + comment = "Lightweight, easy-to-use, and free UML2.x modeler"; + desktopName = "Astah* Community"; + genericName = "Astah* Community"; + mimeType = "application/x-astah"; + categories = "Application;Development;"; + extraEntries = "NoDisplay=false"; + }; + +in + +stdenv.mkDerivation { + name = "${name}-${version}"; + + src = fetchurl { + url = "http://cdn.change-vision.com/files/${name}-${stdenv.lib.replaceStrings ["."] ["_"] version}-${postfix}.zip"; + sha256 = "1lkl30jdjiarvh2ap9rjabvrq9qhrlmfrasv3vvkag22y9w4l499"; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share} + cp -r . $out/share/astah + cp -r ${desktopItem}/share/applications $out/share/applications + + install -D ${desktopIcon} $out/share/pixmaps/${name}.png + install -D ${mimeXml} $out/share/mime/packages/${name}.xml + + makeWrapper ${jre}/bin/java $out/bin/astah \ + --add-flags "-jar $out/share/astah/astah-community.jar" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Lightweight, easy-to-use, and free UML2.x modeler"; + homepage = http://astah.net/editions/community; + license = licenses.unfree; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccc11caee71..35d8ac61632 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13709,6 +13709,8 @@ with pkgs; aseprite = callPackage ../applications/editors/aseprite { }; + astah-community = callPackage ../applications/graphics/astah-community { }; + astroid = callPackage ../applications/networking/mailreaders/astroid { }; audacious = callPackage ../applications/audio/audacious { }; From c29f701db8f7a06fc98aeba27af924a4c7b8ef5b Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Wed, 25 Oct 2017 16:10:57 +0200 Subject: [PATCH 1711/2806] pypi2nix: 1.8.0 -> 1.8.1 (#30792) * pypi2nix: 1.8.0 -> 1.8.1 * pypi2nix: use fetchFromGitHub --- pkgs/development/tools/pypi2nix/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index e6c2467bc8a..5bcbacff4b9 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, pythonPackages, zip, makeWrapper, nix, nix-prefetch-git +{ stdenv, fetchFromGitHub, fetchurl, pythonPackages, zip, makeWrapper, nix, nix-prefetch-git , nix-prefetch-hg }: let - version = "1.8.0"; + version = "1.8.1"; - src = fetchurl { - url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz"; - sha256 = "133sjx8r1jdb5gi3caawa9m7v496jv4id2c3zqnx8hria22425za"; + src = fetchFromGitHub { + owner = "garbas"; + repo = "pypi2nix"; + rev = "v${version}"; + sha256 = "039a2ys7ijzi2sa2haa6a8lbhncvd1wfsi6gcy9vm02gi31ghzyb"; }; click = fetchurl { From 9e1ef99fc22a7ed3cf9eef7c6696421c32a7329d Mon Sep 17 00:00:00 2001 From: zraexy Date: Wed, 25 Oct 2017 06:57:43 -0800 Subject: [PATCH 1712/2806] kmplayer: fix desktop file exec --- pkgs/applications/video/kmplayer/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index f0d7fa35370..88055f2a824 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -21,6 +21,11 @@ mkDerivation rec { ./no-docs.patch # Don't build docs due to errors (kdelibs4support propagates kdoctools) ]; + postPatch = '' + sed -i src/kmplayer.desktop \ + -e "s,^Exec.*,Exec=$out/bin/kmplayer -qwindowtitle %c %i %U," + ''; + nativeBuildInputs = [ extra-cmake-modules makeWrapper ]; buildInputs = [ From 159019b70507e4486f2bad750d283d7139dbb366 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 17:16:11 +0200 Subject: [PATCH 1713/2806] redis: 4.0.1 -> 4.0.2 --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 436023428ff..60f132799fc 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.2"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "14bm8lkhylc93r4dgl7kkzzpw2xq7gr6w6h80n3jazqnx5mcsj90"; + sha256 = "04s8cgvwjj1979s3hg8zkwc9pyn3jkjpz5zidp87kfcipifr385i"; }; buildInputs = [ lua ]; From b3dc24c8c8c99df484d826ec104d3c77fdbfa92d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Oct 2017 18:15:12 +0200 Subject: [PATCH 1714/2806] qemu: 2.9.1 -> 2.10.1 --- pkgs/applications/virtualization/qemu/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7b78db64fe6..cb0f772ada3 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -18,7 +18,8 @@ with stdenv.lib; let - version = "2.9.1"; + version = "2.10.1"; + sha256 = "1a3bjr0ygx4r2qd4nx5jf77jhh4xis3zga27lfryn0b4ap3hn14f"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "1340hh4jvhvi97yqck408wi8aagnhzq1311ih0fq9bp4ddlk03sd"; + inherit sha256; }; buildInputs = From 63bbada520fff237adf97dd5c846371df4e06c64 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 25 Oct 2017 17:49:40 +0200 Subject: [PATCH 1715/2806] prometheus-node-exporter service: run as nobody again Using DynamicUser breaks the systemd and logind collectors. cc #30535 --- .../modules/services/monitoring/prometheus/node-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix index cacfb67ef06..d464ec8a7f5 100644 --- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -69,8 +69,8 @@ in { ${concatStringsSep " \\\n " cfg.extraFlags} ''; serviceConfig = { - DynamicUser = true; - Restart = "always"; + User = "nobody"; + Restart = "always"; PrivateTmp = true; WorkingDirectory = /tmp; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; From 863f4f91e6dc5e704426800e8973594fe2d4a7da Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Oct 2017 23:59:59 +0800 Subject: [PATCH 1716/2806] firefox-beta-bin: 57.0b10 -> 57.0b11 --- .../browsers/firefox-bin/beta_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 94f3237abbc..b66d3192fb3 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b10"; + version = "57.0b11"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ach/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ach/firefox-57.0b11.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "11ddaea89af1e10184a30e691bbac711928b3e9319dd28d208a6ac7338d56ade9a096f1301eeddc1ddd591a9fa58d3b3fcd248ad6232e6a0622440a7b41a5038"; + sha512 = "298e523e55916ea7c6fb31ad383aaa6eeb582440aca98519d6abc3e44201b60f3e382be7947dd434b47e13f7e2d2c88b62009bbb4298a7085d0512307d37b4ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/af/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/af/firefox-57.0b11.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "f725a89d99adbd3d11c85b8354b1bccd423e51aa08c26c0f593433e794ea30d01034bad710010f263fa98afc5cb020dd0f3020b7a99fcc78b0a1e0c809bdadf2"; + sha512 = "00e31d736101e3cd5c8f1b999f9b4342369bce56c061271e952022459e80ea8b77ca356cdf28ff0255bf09984caa059ee0e62a2dc0f2cb31f1156224e7eaa4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/an/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/an/firefox-57.0b11.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "0bcb5fecc974373ad5fec8ad4eee4c8647e6cf0cfbc5590238d8b369cb3ffa8ad048c67a9b1bc5dd4feb900011f79e521fd9adc7c5c74c32d837b20a651c4a6c"; + sha512 = "7dec20660dbd4bf0a88742b58f4282d10b8f8778aa8b8b2b7847485039fe266b2ae4dcdc76ff1a37a516d2f0c16a2db2c2fbbab1e79d6eb8a79c63561da2539c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ar/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ar/firefox-57.0b11.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "a2a9659b085cd47174913bb481c61c6df24e702ce4e03040d5280a64a985bf302b5163c9e9edafab59599144a2ff804d8fee275d7ef5d3bb2480de299126a34b"; + sha512 = "05e8c1271f5e3f297e927bd08ef3308d57067d18116b98010c3cb2025e7b0a9ca608d046cd592a4afa3949b9a3244127a44ad90e89ce4b651397e95f5bd4a29e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/as/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/as/firefox-57.0b11.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "c1289cd1e7675f804842486b79a9bbf9ce4845ddf8d625a00f614b84cb8331b111677b802dd74a2a908363c4ba175276b3816ee3b8cb77ca4c560e9c578fbc17"; + sha512 = "fc2986315e7514e51be8ab082be42be9b7f7f878c0c1d7cbdf36f3d7b5dccf59a39ea44329c3aa9afdd7118a29706308118c89937dfdd3d8f6109f8722c5646d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ast/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ast/firefox-57.0b11.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "23b316a187c409317939c4208fcc75c473eaa18c5063ade7aa8df7f70919f9a3942c8bb306abc2a012915eb2cd153ed5dca024cef39397a7c7ab604f1d0e2271"; + sha512 = "8dc4d3aa8935b61f90b21a059a97a6ffbaa90f13aeeb204b7eb28dd0ea33b899934ab162b7ba8ea00cd3c341d0f61de30ae2b3af052cd420246a891a2d902563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/az/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/az/firefox-57.0b11.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "24e5f8868e89aba56366e62cf9cccafe7c284c44425b4a29ee8882715401d62a296395b14552e7fe34ab4983e1f6c7c87fa356f4d351fc7ca73652f8d006a6f2"; + sha512 = "9fb126c09f39b6c943fcc30636b19e3b566cb5fd78b1ce68ae78b1c94d68198bfd391bdab6474ce7d616ddb114b5ff7bf54caabed94e2e3dc4557c95832e1c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/be/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/be/firefox-57.0b11.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "361e1923bb59f21bd5fa16d3b94f487cc8da241914369cef925b838da63391e865061ce160390dc79b862e99b50a4e7a01178ac6c21e05aea7190b2dfa35bbd4"; + sha512 = "ba5250a70bf92c555f87fe2376c6c415678e5d065ae7c0fdcfe613a53119173a7231f5c711dc1451cb6fdd77a94c5077c98019f0441f0f0ecb97ec16aed8bffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bg/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bg/firefox-57.0b11.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "506f933b1871e0a9913aacb0c79dcdf432dee6546190f08b48087ce9e292a90ebe9cda2bf047645e47d6faaeb93c0274322a908d928273b63c4a258f02b21a7d"; + sha512 = "aa38dca42bb1ed7472e10db04e4346918c7d495c24d484a9182c8b1651d1ae2f68188d12f133581a6b1a7463f559320283ab0877b2c51a1b93edb195706a1ed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bn-BD/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bn-BD/firefox-57.0b11.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "805fde6efde1f6d452315b3df401a4d65cf5a807bf8528ada41c1005817c0bfd2cb924b5fd9d34bec131e4a2c0aedb7d059e49d58af6d4b68ffd29844b7ae05b"; + sha512 = "11ba74486259041c06dc0c806c6b21332fbddfc525eaadd9a6eb37b1a8498bf25bd34b42155f642c8daa840040dbaeebb0721b541239656df4fe518d1cba3aab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bn-IN/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bn-IN/firefox-57.0b11.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ac964e94f4a3dbb93f812712961439af7d7db6db4fdc3e054d17b99bae605658db40c974c58aa566f455cb4965b5d5bd378d03270b7237783adddb2bfb5ef7e5"; + sha512 = "25ae74c773a9d525497c9d0c7d3e14cafe490fc8dbcd363f7daa102bbddafe06c4999f84847545da5c8dd974528613a5c6e1468b323f60eb0e3ba79e360b88a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/br/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/br/firefox-57.0b11.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f6d30d417c0eb2fecdbb31821b8414e318e2a3f042489fbcaf96faef544005d7fb32c3c02fc2bdc2633acf7c7b76b8c24fba966c8539d6d3e9e928c2cdb3b1d9"; + sha512 = "4f3dc389261f384238fc622d5ab1059cca0a5a4eb02daad0233bac7addd118bfc2c4c95a5bf5b7cf66053b049bc3150358593eafeb5026be47d676db212aeece"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bs/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bs/firefox-57.0b11.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fc04a70c597082726b6b01759eb79d844a05d9bd0beff12b3802e9708b710cbc72b71f830ff561bccfd901116d8cad44384e7661695f0b6df00f6b1d8d2025c6"; + sha512 = "91b13a19dacd457db11f78955bad518c2e590433ee1951e2951566f6609293da7195940de7daf97004021ae5229e887bc3c52832be21ae514c6a4afff3a365ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ca/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ca/firefox-57.0b11.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "fd0bec7ae04fa945556ccc01cae9a3848c2cceb3ebd40f56a83ce3269b943b1dcb42c0de000bf20395e34277aab258f19c9d9678da6f4b9a59932ba6a904abec"; + sha512 = "037eb9153e9f05a0c9cb2d80f39ae08ad8d425f349753ae2113e6a98a96950c6ddf3784fe2859383a5ed8a7450de02e6c2d344e20b851923c91576ad0d2de9b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/cak/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cak/firefox-57.0b11.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5a22e5b260919d9d85976be09947fdd74b29d5821ed0110857c9f94997b2c54572c95568a87d115dfd049eac358c8cf7bcc6b41de92d278cea5de87468274b50"; + sha512 = "990d5f8637d4386e698cfa070118ef1e39d77065a54ff8293460caecf319707402e1f043c3ae9a46a7a58e2ddeabc312708cde361709835453a22d7826a46d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/cs/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cs/firefox-57.0b11.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "deb041e2adee7dc7467b1fdd302545bee1ee6b08a03a9bf3c030096ae0507f0956c32f64c6731be95782ca4b6835e8066ee384bfc9c08e35f2aa386d3fb84cab"; + sha512 = "50422d5a16c205e10c1657eacad657403836ebeb5c1de656e12c4ad7b65776f0377faf55c6ea5b586be8f8694ee5952c289257d119aa3fae1860d5565f89643f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/cy/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cy/firefox-57.0b11.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "b837d159b13fa448cf13737e163d2202904b25dbef9bfd43c8f0f0e96e4ec7e65196885bb93575682c5c29267f07b07471e2861ae3cbd2f732d611dbec4dbb24"; + sha512 = "a78d86f637729089f5cf86778032c8093f07b03974a32444b1866f25a286b7e903630f3e836ef12a4c9df6025037885b0140a39680ffa6e6473f023fa3153155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/da/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/da/firefox-57.0b11.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c341351d5693518d22ea1ff2f1a46ac187c933355e8e106b446b8a200a0eea6ed108d582917f99cd4f9dd2f376216b0e773c87485eba56e4b7ed8957a4c19fbb"; + sha512 = "50eaa3e29c322af80df70c3a52df53698c984187b8f8db86cf922fb38d61bea65dda2ecb6d6889a2f1a07c5f8b0d6026590d37c71df74068df0403f91998a584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/de/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/de/firefox-57.0b11.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e39b6dd52fa1eb10ad46e3cb54dc13a79722bdc5fa7a2addaae10a9ad1417b548767bb589a23efb8b5e0188f3a086f39de24c9e7a652882414533c439db219a4"; + sha512 = "213227706f35dca646f3938044387aa42097d131cb6a2f361ec5d114f2c78b37b2298d9de3b289cd504c6559f37758324cdd7e59e5535caf3f8b8c8d71e701f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/dsb/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/dsb/firefox-57.0b11.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "37f858da1b528071b22ee1c3e3cfba6d20f54cb89397f844e648c9962b3f3a32a610012c0b51b12e2fdf9539cac8e7dd9c1f629d5dd840c401fab9982b1f8d32"; + sha512 = "67406fe340fdd8107a36755bc75b05560540421cb1000b47d89a6492c38c0904dda5ba17686ec01e1f77a0f8b6a52878042a9f0d999766847eed54fcea0ee470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/el/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/el/firefox-57.0b11.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "db560a967583e6913226c08baa44d1be12a6c7d158e260b7dece52703a5e46e62e8773699e27cbfdf14076b34094284099ef077ea7cef03cdf51707b32ff1d48"; + sha512 = "60a67bb618aba13377c10e3d798fc370e633070c30d50e7180244667449308ceea4571e7a997c80af80ad027e27074f6b3fc670e5253f6159ed10653f8abd798"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/en-GB/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-GB/firefox-57.0b11.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "40f67b3ac7c3a3e557b60d6edd57d2754256f2776818c25846aa55b5a7048cfb1e775cac44b2c5459038454cbe0c544b796fa0c86e751866a011fdb4c79ffa9b"; + sha512 = "4bed5620eb52e080379044e3785a318e131387181748414367b02a5b6dd2a4dcf43b55a794d9add241b5a438a79ecf1cfc15eeeb82d6c188baf18914d722542f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/en-US/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-US/firefox-57.0b11.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "03762f3354ced1aba8c0ac09d04cbb4d796fd63ba659ff0fd8ec50f9b63658cf3e009eb4e3965b91872feb43d6c15d2b853a49f3c69d9310a81b8c9f1756bba3"; + sha512 = "85d751cfc31fbc330292aebc1fe8e7563d726a91242708b85104dde6a8043726e647628ee084b71c3f922eb0d40cbd7e1381a9a1b47aaf641edbd7401f3ec24a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/en-ZA/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-ZA/firefox-57.0b11.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "b83a44cb172247d81943ada3526f4151ffe2c4245bca7f0243ddae8d136dcc988f02c7d6aa7dd5088717575431cafa66d9f15fee78a7f6d1529cff6a86c6defa"; + sha512 = "ebf2cc4e016e3623e2cda742d468fb0ebf0b6ff05c90d32e9eb5bad131fbbe12c46e667a21d1f446eca897ee65a8ec7ebd59b56951cf12e5ee44ce89e7bc147e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/eo/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/eo/firefox-57.0b11.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "fd6228801a9f4d09bf3de655603bd152c4799eecfc43a1701bf29f54d64be5228cf0a0644b1501ca68d445a0154e539574e16cd294aeaf24d7e4edf1a55c6ef6"; + sha512 = "e3719652420eb97abe0097aed9736370dd55c572e7745f862d4b031fc84e84611f0c08bf8a2b7fc830a6759ff73183b02269dd7cd1b9eee5076e7d26155c77f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-AR/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-AR/firefox-57.0b11.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e6527adc411f6fff1e2ccba4adc156db94f8a62b26c7453cf667434a30966db2bc06267d84a5760578d1c79b0f7f24751effc45e65f56cfc6651fb90213b40e7"; + sha512 = "4cc08c7b8b242d671ec85dc46761f546479d2e207628d68de4186ac48b619013ba39005ce3b67ea08eee6df8ac46effececc83c8fe5cb2f184d9d56d36f98f41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-CL/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-CL/firefox-57.0b11.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "47414369c504526d19d952157b14410f820c9cd08b7f026ec07ca10933efe3ae88463fd98cf8d04c1bc9c1b4b194fd4ddc0cb1b8973b658d31da5e13878ad92d"; + sha512 = "5c6f753e119198ef1633a1a7039199f00c891d43ee5b49b95a4a1e8d5d20ada55ae03ef30e380fa50de4b777d4ad9dd5aa8bde9d0186265a6af9d7c277858ebf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-ES/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-ES/firefox-57.0b11.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "d1931cd9a0206384d10dbc1b2438a581fc466952657a82d8d46558981363f0c615c86ce06c285ea9c50949bb7ed1980de16a78cab95877a048152748a44a3a4c"; + sha512 = "702ec0d89777a6a9c4a54a9542a0d2e89b352643eb5854db83600a7a93ca41b5d811de21d1de1f33c976b9ce5b19492d2fed12be1f570aa66dd09d21aebdcc5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-MX/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-MX/firefox-57.0b11.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "e5befcb9749d65b3386140e15ba0dc16c72ea9d5036cf324d833ffe1fde79727adb45a7c2d23306dc023caffd533609bc50ae99e91c1a4bad255c9d27c09deed"; + sha512 = "2066be080187a297a2156d9953de0b9c38ff4c18e509f56884f596e37ef21e4a832bd0644f4e2df872d22a6fe3925b72b0548187d64e88974cfd50f9f1c18c54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/et/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/et/firefox-57.0b11.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "65160be903f009d4704e8f2d36d7e95e83bb8a70d7368b78673f576ababcaf813297af794086a980928c721c9222f4f5d4882fe92b2e1376c65ca0031a7dfc1b"; + sha512 = "0ec67c6a1186fb686f67075dbe1f07b34f2a0f45d3631b7f6b3a144b7d6ac89bc7d34bf98088826cbd908aa05a38a410fbe32135203595e604483f465d4f8af1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/eu/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/eu/firefox-57.0b11.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a434cae9cee1a4625bacef653bb4681df4ee9b149319092f10dcb69365e4fd259258c70af8340ee1c3e689a656f683afb2c8c135c970323e1fba06f53ec2aa24"; + sha512 = "2da25d33b6fff7bb463b65a866ec5bc89a39886e66022dc9b0ce7752d962cf3852158f1ef79bf4df0d7587729e295637b9c27c99840e3f2dc0ebaf6cbdc7a3c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fa/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fa/firefox-57.0b11.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "94faccd5a129d7e7043b78b03c9988d7fd1385ce12e05d97fe98c3df1def44e175219874ca8d38257f0053fa350fba4abe3bcb072498fdf8e4ee971ca6f47a2d"; + sha512 = "d3e17c82f7020af45b50215f39d78826a5072dd94be5bf3cdd61ed7f67a45593765efd7f65b071ec3b00be86f90ed65f15bd6a5bc2a4906c2eed9b0cac23ee6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ff/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ff/firefox-57.0b11.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "7c0b7ebdf42f70929a6b04e9d710b228f85c0646d8fc89ea9b967c66c62555a68582c8017e55cffac2e29e1659b4789e6704594652d4570a9013836a544dbf85"; + sha512 = "2a17680f7a595a35aff6f2a6a25eb9aeb8497ed7ab2cd2cf95e1894ea29cf99fd3c222144e3a0feee660cf0fc31d21c54d572483544267c8bc5312f0b31b9c3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fi/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fi/firefox-57.0b11.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "f6edf2f09d3c4b8fbe8af896ea32040a7d27b7ef22cd08c78fe4fa8e15c15c47e23db734440e73bc88a2f3527193955b685b0178b132b1c91595509dad94a6ee"; + sha512 = "a54e8c300ff17a0b2f1124b5c637fc2b07f47761b5df71e219a8bb77b21f67542b19ab6051bca5c542cd30bd3517817fb5f44250990d683a997a6f9d925f6b93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fr/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fr/firefox-57.0b11.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "468a21a47102e9d508e17e5d4f612ad528cd2b0de03c3744e185a7c988f6db77370d2e08fdeab1282bdcaf35b32ad8a3530f338f7040d33d48a1df7ef616196d"; + sha512 = "50a58b205bd0d7ecddeeb4011ac9c499b35b32659f567cf27954561dac91b6bbc2a79e37e19b1fec07aa7459dc114d4cb8641847118fe50efd7d6c98e66a6203"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fy-NL/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fy-NL/firefox-57.0b11.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a440f43d36e623de0af15d0f1eae1fdb0b533146524d30ff7256a257047e10c7b73ae3448b6ff70e033898cba58e178e03d2895f9873694dff7ae95d897b3a82"; + sha512 = "22025a263c986be90ab5dc05138c2a8b58108bd39de83fe8266969cc1742358c2cd0730315904a1a35adcab94bd499e8d688d65920c346c28f76b650395838d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ga-IE/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ga-IE/firefox-57.0b11.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d6291fbc6a0190922164b5ce61f8b2b27d0db272b5eb3e01d230f7128198e131b07521d78e0ba5904285682fd0bf6f700637feaa0d45ae54d258b225fa141feb"; + sha512 = "a1fd88907a14be9eda4e392762dcdcb009701baeac908a4cce664c8dce3c6957cc889add929b26fb48e592001c2e6e1f34ced9bbe137b0ceb7d230dbbc102f3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gd/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gd/firefox-57.0b11.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "636d2a8931f60687d93a94b937a57cf3047149c6809a865345da76023ba692d4e2b070a8bf35706aae030fbf7bef470d4b853ce9485e2ff456012e27edc8c063"; + sha512 = "eb8331550bb43251a5d66c5f108568de1fed964a8360cccb9426b6d163f47764d34c79224026c058aefb2a526475c6b406fc1717a588a61c65d73098f217df8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gl/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gl/firefox-57.0b11.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "b32f50d930fade62a185adf90a35356de33d7a377b15f80b52fad10b737d66561db04177d7c1b3e4c5a26f213355af8a9d553a6eea9eb9ab4aa44e9b557a0480"; + sha512 = "e7326fbe2c6b9e10a3fae76d27ec0de8856f9aef95a31db1ae5481ea43d895ccb220337b68deaf8a76fd110d6d1f74209dd27e8726ced57a635befb8e27c0e7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gn/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gn/firefox-57.0b11.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "dcca8976607b4f0cc67190cb57b4a5147a7e73c4f60c6334c89657a20ac1b583f33041d430d5582717883c398a6dda40889f9fac543ea2d08f67fddef84ad4f4"; + sha512 = "cb81a34ee5f87636b5519c9804f65d714c5ea4406a05c465c5ee2bc29381e8235a1788111dacc78066e420f2583f004b3dc4841df9aeef848dc7a48accb3c9c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gu-IN/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gu-IN/firefox-57.0b11.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "367e8cff652fa85bc546f095f9079dcc7b95c86db32379b6303188de62d396be65caacc9e602b21ea87abcc1cb7b588fb9aee280518bffe1e72d4223b7c5f224"; + sha512 = "e26a80e9aa0e72892d79d0cbbee8473208342d3bd966cb034fbabfa6c3e844490184089ead6dddcd2f655c1577b66da239a24a636a651a8ad7951478e3dced9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/he/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/he/firefox-57.0b11.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "f63a6c97b577d1d4c7970a496dd7ceda7672563f477cbe3b378ce2f7d24a96d8f9ed80f99bf6b28547ed8b2bddb6f8f788eff9bbf52bc4b4b8ec744fe9d8bd00"; + sha512 = "13814b3b670a92013c08dbc8e37169fe758e378db0ac464f9b1d061ef5ba48063a1bc9284686317f4fb5b791a133b773bfda4db2ca25a154da258b81e2ba7bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hi-IN/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hi-IN/firefox-57.0b11.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7ec57ba1fef3c771a057a156f9779cf168ddb33530ad1644bbec09431965dbf94e4b0933df500dfd271ee28288f0639ac36bbc80cd49b7d1e051a317c10cfcfe"; + sha512 = "51f0fd4d50751559e0590340da3f3561f3526792965aa9cd86ba2b83866ac3342b5b4b225da2f2a2724b937c7ea00ea16881f27c8bee3deacebaeabdcc446c3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hr/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hr/firefox-57.0b11.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "d50c0c5e6e512d25c3724dcacff7a86fb14a5402aa9fc44247a162c8b5cb470cd4df747650fb40f6a40c5793590d77efcc72c1983a9cb1b0b5c75173b63474a8"; + sha512 = "fe9febf45bb0b79c131868a16a4139a7e885923eadd8ec07f0aa5262e66c06c5c188d4e6b8b4d6164bb32195f27330abc199b79a8d2a524fe4699f9c02ed66be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hsb/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hsb/firefox-57.0b11.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "3282b44db976ced30fc26ae7dbd7c6ac0c76711a3c759ed7be22f6d7c19065860998d779f5bdf569fe73a35b28a247db6223e8a3da7585cba15142e6b1f65e74"; + sha512 = "fbfaa755ed9ea1f86f1f27216fa6925957b3fc48ae847534ad289361722e8c70e28beb83b9b30a447c0acc06703fd2642c652a88ec8ddd215dc3538ea0baa819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hu/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hu/firefox-57.0b11.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "6cceeea7200eaf8fc7d73778021ee2522d84cc5499985d629aa8f81c24af540482420808d2f418d7e64fb211a3dbece0764a18652369f708fa6f444bad008e79"; + sha512 = "b51b7ef5f2b0ed15796abffc299bf633af897393b17d12b2cd6dce5bcd6fb9165c2ee001b44eb89b91e68e616b2265b1fa307d90e68e35c34f425254a0135dab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hy-AM/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hy-AM/firefox-57.0b11.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "a4c01b86a8a0b5fff08190ac19d5cf338debe053d8499b3db44c96db92c41bd0c20e2d8a86cd9e0389e50999199b979e9b1a827cb79c58068a4b7b1b65c41366"; + sha512 = "b2f781a77542c754185bd4f3aa040eb0d0aabbd773f27a422db87c8cb0cb60d1173c5e32e02886f608e03f2ef8ff84dc8a3cab7d55305fc36d9b11b96ec11485"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/id/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/id/firefox-57.0b11.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e52e79a57239b145724d400e28af0fdc77b469f8c5b1c5d2cefd3409543c52bd135e165023d22de2af24563e4777a1e19c2a1cca41067e175c108d34140d6be6"; + sha512 = "6e251aa02c0ec21272cf8bc4bbccc9e8d3b1d512a0a1bc90ea90e4d3844fd90c03989b102d9129348ced8734a40576b2dd294e8a85422e215b01b025e48180d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/is/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/is/firefox-57.0b11.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "6f7d50cdb623fe0097f1fead84b96d97abe548e46cd2c9617d6e285ae6474593d3d75739fda803770ee269277698c46857242feeefd63aaea78264ba18395d46"; + sha512 = "5fe16a677f6413b0229c67b46e7831fadc0a9ef04395ea7c928d1149fc262cb9f28bf3c40b7d57eec09fd821a37286177a19f1a608a062b84ab9d82897560994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/it/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/it/firefox-57.0b11.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "b765aaed36acd834687196992488b169d72239254a1ce7569f469537f681197b2c95b5f7fa409da3270b86d0e1e05fed3d23ada8d80c0dcaa995840ccf3cd79f"; + sha512 = "f0ed83b63ea8df081f9110b5e8a5f848e9b4e89ff5ad7ee685f9792fa4438cdceae34b0e1bf265454f966f6a6f9d00bf47d665e6553c3c786bf48f4fbceefe4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ja/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ja/firefox-57.0b11.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "26227fe542adeb789d9ad3a75e27cf2dec2f393af8d1ae1f1f39dbe2bc81f4bf233bfb2f9db22c23dc07226a7a3f2d29d4bad633959476e7973910e0c238b649"; + sha512 = "8e9d0e446bd4b46b267001f1d24563ff5eb064bcb72be2ff30f42834d91658664e96683d680ec03fb62b8ae3f5e6d68b4a18800d6f4fe1b93692b1e4ab7258e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ka/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ka/firefox-57.0b11.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5b55ef6f8ebc2184be952f4a7d83cb714bc2afb3f52c7369e92007c4e8151c6a46ac9d02c9559632b820acadc52ae243a5927abeb6f678797e56f64ad8c270c0"; + sha512 = "b557a2da452b41685e4ef61dbacd8a4563c4016b16946e197eeb60f39523dce87942f38659047a284ba2f8dc78ebd4ce5d377a86d54366e0f0c49176e29b3255"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/kab/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kab/firefox-57.0b11.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4fd51f54876d8ed1e23c73e36bd3e862541ae7c18269736f89f8c5190840a3daecb4b2e0347805854324753f2312ae66c67584c8722b9047f5da39cf96fdfa1e"; + sha512 = "cab2e7df696e67a290aadeba8553e65880156f33b4cc57feedc971517496e8a8beb2ada6f8dcf4fd963a034cae4bcdc03bd970c6a9b27af720f64ce1aa9bf8b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/kk/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kk/firefox-57.0b11.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "4014e1882473d52a05fdae5550a52800af16f31689c4fae47d530a4be228c2cb59b0ce23dcb2cf96e1a23b153de2f5b766208c422d0ea7bb54faac1dea6da6ee"; + sha512 = "ea92799a2896013796459e8b8e3f5cbb8e2da528eda74091d22c93fad5791d8669d8f092842090ed5ccfb9ee39e7c09b44502c752d29a956b5e9cbc793ff74d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/km/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/km/firefox-57.0b11.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "67c0a62b308b707fde6a4499e3ff48ba010cff2cf5eb084712e5795b0e6be7eeefb4d65fb65a471de1e734fef990271185a303bb143c6ab0bb223c596bf54dab"; + sha512 = "76f3d509693148cc94949a786697a6bd3bdda894bc4692715e33397e24aba446d94f9e364e159c4504bc0317adba5388ccdf3698f1226cb0bfa6bee2f00fb4e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/kn/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kn/firefox-57.0b11.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "f8a6759bf2ee73209bb8abf65c0acff57959791b946e82e42e2ee4011f67192797e5f66575ca492b82239df8a444ea5adc544d1de0cd407ae1f67385c2a20e29"; + sha512 = "3de7da4fa42a74b0187dec9b28cea76e3ca1bf80827f374bdf895461477a67478761c2059572da14c1e5660586a07239ed22d066e548c5271ab563713a3e0ef4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ko/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ko/firefox-57.0b11.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "dc0b12e24ed0f68ad22e386eef6f2c3184aa23210d9b2f208185db76788ca8d54342476830adddc3aa0e7139e678046fafeb1fb331207ab0e5298b77a52a11cf"; + sha512 = "fbe8b5a9a196a08f56408f57eaab71e3bb7ffec53bc05c4db0bfde4478267975aac5b876923c915a0a182d54fc1bc99f6361117fe659cc9e998e98f3a9aa122e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/lij/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lij/firefox-57.0b11.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "8bcb2fbb9689bcd73903cfd7582f5421d6c4eeaf0feb95079ce8c6c008e120110b981aa638d831030e20696b062b251d0be552c1867431fc6ae5220f38a0a75c"; + sha512 = "031ec2684ac7aee9a02e7aba789707b8aa6937fea27e191612b7cac6b0aa7bdf996c3f3cac1379d7ccce0a53701238f4379d691f29e2d4ad4c5b27a518d1d2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/lt/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lt/firefox-57.0b11.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7299042c6a29d70b38dffdc5b1d842e841bd3e7ab70a57ecbcc0d4c75ca087606aab1a73680e1566401112123cdde3d4a7f0908b7f54ff0c82fa66ea16579454"; + sha512 = "ab056e37c0159b7b62e4d20e6fac5de190c3e7b53919bfc29cadad90c664c800e233abae58d1e7c1b8ded76af6da7603ea187da6510bac904bc2d32f9f37feda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/lv/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lv/firefox-57.0b11.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3173dca01bc34c51ac775b70424a78f1bf5cc7edde3fb30f43eb67c4d73b6ca70bef28438683115906ae45bca731be3cbfed4d8b21dad255f15bc5d9141a458b"; + sha512 = "c4a498bd7832c9ee93d0d98730c962176775b347e95241e0e307a97e8d53fc21dd943143e880f994d81d4fe15a7d24a480a07ed41efc10d1f816549c5b37ebac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/mai/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mai/firefox-57.0b11.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "a185b31c33b3a7a120d7bd6e9b7236b7f2c8fc080ad4607ed0c25b451716ecb26dcc36ce6970722b76e9025826964ccfaa93ddc75aa4656174fe25f13665d3f8"; + sha512 = "81f85952c2966471f4c74fe7092b7b614f33130ca19c74842084aecc6b53f8dc975d05ff0d9e7a8d692096e1f9cf2a49576bb9d4625904ae1074c5e0476e4bf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/mk/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mk/firefox-57.0b11.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "269ed71e11458ddf930b701a0b1ca6477723790868381188ae30bfff6bf310048d931a792050b18bb914809e48f867b1274cb25f3d19613a2b1875fe048ec554"; + sha512 = "c9ddf832f7da91e15ce16fa46777e2458ade47c68dbc0c5a368e5e2b8a26682487449e51ee46057724c422ced2715754a4b5f459f6598e342ac0d553f2fba267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ml/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ml/firefox-57.0b11.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "e39c80c81520e5d00a7d1e1ad94a1f4480c3d791f412673b7c3a1443d03e830802cfc1fff581eebbb986d83e1b38fb6b144cbcec30e60ad124692884cdf4b2be"; + sha512 = "55b8c4e2152fadd17d21ae060532ad078dc83f92c383058d1ea979dfaafbea58f9c7c7d5852688f619c6332a8ffaa37e2bbea47517f4bee71af5696a21593611"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/mr/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mr/firefox-57.0b11.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "0996deb736677c9b3b3cc9e192835f3760103b868f6a449df4675ea8eae812f5ff9d2f4fd33a3dd8be9a13ea44e383cfa1de4d5982fb63475fe0d709ff48f8fa"; + sha512 = "713455cb6defd82c93ef80d92803923bc5049014b2409f1903056e0c04c2316a5606c9fcd13e96c9aed79224e24ee491e24ab31366a22c5ea74b55c556cca2a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ms/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ms/firefox-57.0b11.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "612d8e6c21116190c15a1ef945f179450bb6667d4e83268c51e88a150efcc5acd9b04ffd1d80eeea13e65d3bc3fd9c925bf0f19738ef542187be913c9396de4a"; + sha512 = "53402320cf458dd250bcbd967381df5d5901fd62fb34943b18f86137f338e96d5b7175698d57ed3169ba138fe303c21365baaa56cd40dbe05717a82bb14d4c26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/my/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/my/firefox-57.0b11.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "5824bc5759c9223c68c888ae9fbb2393f8d6b02f7a12f48918dd6b331abd2fae043474999d55864cae75d12fe55e29fdb94ccc4ad716c0fd780d0f63fcca974d"; + sha512 = "92b06c4aff57149610269474dcf242e58e0a9676a04a01e843bdb71cffbd24f222d0f65bc73751cc0807c6efd84149e7d241687c66413f76f75031edadce60d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/nb-NO/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nb-NO/firefox-57.0b11.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "111c1ec84ebcd06c1563e2f74ad28a9461044a4c75ec66e0f9d0b497305041e94176ea1eadf9f202e1ed35eeee7c81328debf3de9f9d32984d20ecaf007a0237"; + sha512 = "52d82c8194062ec95b06f8956b52f7ef47df60436c40f3ae00358cec47034ebbc61fb2f0cb27a93dc96afd3aea5e3c7e8ebb92268f7fab01ae21d78d45f15994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/nl/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nl/firefox-57.0b11.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "635bf72cd6b18e82cadd8268bb97301bc3d82f6720ea6a33aaacdb671e01447ea348cda0351236600f226e673884f6f2d495bdcebc3a0a87a5d389d82b2f4715"; + sha512 = "75689e5e642b82e97f734b3997984d805794b9ee07a44314a6cdbfa36f7caef3840f02daa13cd1338ed8bb435aea59c14b634e269211cba3b31babbf594f8f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/nn-NO/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nn-NO/firefox-57.0b11.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "03f0b9bad6ef0f1fdd1507733c6a059ba35350f33cb8c636b7acff4239f5e1e5b86acf1a29cf8b5edf102c4a20a7af4ed5f4026e44dc56f5dd97d08715d7410f"; + sha512 = "5000b5497707614d74210aa372697c38db2997fa1fdced45e885de3838abdddde402e4282f32517e2b75f25b8d21d03149ec9621affe2e84f3dc34aac5ade534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/or/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/or/firefox-57.0b11.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "a9506ab8cdf3adcffab1406c895ea229c97ab515b5b866f19eed43cbdec8bf877eb22fbb3d29ec429b9624e4f8a962a13a5da033a87bed8f9e67b0f83fbc1348"; + sha512 = "123b0de9d2fea6509566df36fd2c2d0e540fada2b226e824c914cfd02ad964b37c34c3d1846aae0fe13e8bed1b01b267cb396a25f9bab1db9a6b0db420addf11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pa-IN/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pa-IN/firefox-57.0b11.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "b0eeddc8b3b421fb7b4215b146d644c1541a05f928258bed17991a0bf7c91eb5d64d834dd1ce4ecbc7735fb6fe104558a4a41592d4a284cfd7166ac015177bc3"; + sha512 = "38618f7df36e1044bbcc32d50e6158e47a0e98cb171d03082a1874b990722d535f2dc4c8df5177475ae8c33bad9407ad480925158e6f74077a977c5abeb4b4ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pl/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pl/firefox-57.0b11.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "c3c1094cb2e7f4698da8d05ff85bdf6fa127ad91c07af13f9139dd9f36a99d542edf5b58b7ced08b8af277e9b5748d085468eab6ca45c9770461d2e0621d243e"; + sha512 = "54b384c63c0c017898ab5df66ccf5176c6d69c1a55c3470d3f16fb2e654854da802d4c15206f7419e26572871b09c700e6caa8cb1d85ecfccc364796d8595824"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pt-BR/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pt-BR/firefox-57.0b11.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e80d2810f3f77d090a1b11bfb808ec6e159134e52838cfabda83e31164049fec54c2a6142be127eb745c79413955d5ffb59a314b26b3c38b5c18b10f8a2fc714"; + sha512 = "11c908bd35ded6e5dbf4df7c518534fe321cddcc1de9ae55db4ec1557ed9df5228e085c5947117ecb50fffd7af3365455e8ba6c98dfb587c8edfb53fa7a330a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pt-PT/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pt-PT/firefox-57.0b11.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "357959313de47ee9637e1b492d88f92e340b22f7ab1c512df483fd31aba55e83265feac6cc0ef9698b1e08c9070384bf94b1c54f9fcc613aa87b81f307baa37e"; + sha512 = "54d9dcdcda3cc5cbacdb4bf6d5e697a0f1ed257ac8650573655485342db89fdb7ec6b98675d7255b600f76284a510b11e53c6bc9a2896d2f3656f2420f252ebc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/rm/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/rm/firefox-57.0b11.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "fb45631df64eb1796627cbf3fbf4f0748d145e05fb0cf1fcf3136dda89efe3b0b1e54d7bb346c275d8ccb1ab3d30aff343021d26a218e15aa8d5b052cd598794"; + sha512 = "9f5565b6692fdb5fc7c9004261f4b1bf2b6b51e75fd6397018f2c5eb8699cfe93eed15e9564ab89ea3f643898ea55c98245ff8da713e479477356de645c87da7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ro/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ro/firefox-57.0b11.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "394ab7b62ef980390d278a297dbfaa2730dc3211e537959ecb7110c6b061aa434f647a0457619a6239c01d9e08f97fb53ebf925d7f47fb582919b7bee812829f"; + sha512 = "402afbb1552668d7efe27faa3895ef8f2edac40a389d5694de04a0b74f01087659503e46cc9c49c57c35dee3f8079943efc2d655b3f8eb3fff3281d4ea6972aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ru/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ru/firefox-57.0b11.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "462e706c702be21109cf11ee275ec2683e448fddd99861461aed3e1aaec307d526f692adb8b09d3a813adeb86a3b80fc5c561ef56275593b6ab8145fbc11694e"; + sha512 = "fea3a0c0192a5c74cc47c8355f7b78500cf20a0c1deccb2adc3e3639404f07cbd9edfce9960a1e84a41887e1175e2643af6d2c6027f3aabcc840226f2940c153"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/si/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/si/firefox-57.0b11.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0fb26e2d6700998d199cd743252d981bcb119562f10c63de589a8bdc81759d593070c1b6e961230d9203f5d4a4a25fb96bf88eb58a29654de41e2d5130bcb574"; + sha512 = "b57c8c5327d6393b841f0d4b1b327a5816560a7ad2744182bf99cab8a333b3fb833c14cc0587d1111529876e89b9de24005084967b327c3376543e0284223ebd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sk/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sk/firefox-57.0b11.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "fa35b0c5722c237b06e2d9954256c4cd84fc8752d2705e429b21c3800ea6a163b598281b29347596ec30d9fe7c706fc3de0e075519a65221eb459dc671b6f541"; + sha512 = "221ee97c377002033a46564d8707308ab9c730eccb9dea3c93fa03d9f952cccab745298a8cc6ca4eba11fd171c92ffc159ce8fc004e9cb4710ff3553781635d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sl/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sl/firefox-57.0b11.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "7ae6a7676cf281e773de163eda410c19497b5c099f675328a7a75882e3326c7734c0ed12ae224be368b922b8f207667962de5024281de1291d1cbc59a19f6c4e"; + sha512 = "c9264bccf0c5c9c02c674349e641330e3a2a55807fd44d964c1bb50622597958278ce22c64e10ba5bdb3623d14d283ce91d61385bf0e58bd784e46f5e81b10ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/son/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/son/firefox-57.0b11.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e548b454499f0067c03758af8d32aab3ad50e6e9625abec2220af11052e056de965686ea9ae6bda2b4aa88e49aad9d5388b39aba77ef00ef6a1b91cb36caaab2"; + sha512 = "e0c93706e7ebf5e054beee0827fedf620b10b3c41140bb999e722cd5dbf8c9227d478ee689fdc88d77bf85b9e41414dbdf33017ac26b3d026ffea3d3cfe94415"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sq/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sq/firefox-57.0b11.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "15ad7a9f7a08f257d3db1ef1e454cfeb9fb82dee05e4d12a4c6e6711c5ff1640fe5a5e0638340429778ec135eec3003518fc6e739372fe2055be2003e3b795df"; + sha512 = "faad9344981f9b9a4f978a53156825bc49c88084ebeb0cf14a950a11f7d0468e3fa00a3306f48d58c18c8ae0622299b3abd428390863101678cc4ad146094451"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sr/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sr/firefox-57.0b11.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "9175b246684ef4377045302c0ba7389e45d6d90673739b6be4fee7d7ebc582e69607c0417c311aa924fea0e94c685cefa35fa764b5c033885868829b087892f0"; + sha512 = "cb8926a04f9c5563821ede2bca7e409ebe14c4f00c90c0edc5afa6668f9eac9e2225412cd8ec8cdbc530bc0c4988e5ab82d6a659cc19c127fb5db70d1fa898fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sv-SE/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sv-SE/firefox-57.0b11.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "661e508900ed982749ad961283d82b1430ae9f81f352109986b918f68e07d60760469c17ac831fe8dfc5f249d9096bb800ac4319e9be123f772d3a414ebe1630"; + sha512 = "e20c6b93249abb71c3550623603c2a20e1ef4eff5530c1b3971f1190f00ac60539a54d17cbe8964fa91d7edc377e16c54970901077526f3964521c3aff0dea68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ta/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ta/firefox-57.0b11.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "586ba071cf1ae05dfd71f42a2be169bba5229edd25aaa9f3f40660f9984c204387a325fbee2763775f340b459d1ffb79f0f2cbd9bec5a07db9f184e1218349de"; + sha512 = "1cd968168f9b496046c0a10fc75bb0265deb964644098afe118f0d56f8bdc5dd038f23f78e94fe8f5585ab27f2bfbf85beb9771ca93ab9049e8d7947dd99d83d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/te/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/te/firefox-57.0b11.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "8c5eae33d036a6cab73f680992428134dfd78bfe18aa9b0c28d4a9b145c23b9087179fc377728b870749fc3b5899cae3f961cc4ea079830c2571ca49514093a4"; + sha512 = "b7270f188b747ef0a833c29e9155bc58d1bbf38b9e97bc8a073df70b026751bf303b424ceb295746b3529775b8eaf0d9e3112970b5fad9673adbe435af9cf16a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/th/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/th/firefox-57.0b11.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "cdc0460ff16406f5c3368c07ded2fa131db8ac0b3aff4fdaaff76b326b34484a66e898c857e95b645477915f34a4fd14f07aee883085923e20beeb20d26761ef"; + sha512 = "9dd0b419c71e6f8229973ce0738bd69247488786c1be9818930d24ba9506f40eef6fb9e4ab56b38136149755b217e8353eb07d3bbf11a673d34c485d4672b967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/tr/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/tr/firefox-57.0b11.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "0b9cd2192131817f012117cf721064f073fe6e36cb282ec4473102403501507c282bad16494c8590e63788395db3fe584746e1f8c67de76b14cd78a0547ff9d5"; + sha512 = "de7b9bd2cc817662a7975ff95bc34773f940d2b2a491b85df4bc3d19dc02dee75cb6305e9fc2441e3dd3d9ab746ae2de6d8984187f7276f988354a447a6096be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/uk/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/uk/firefox-57.0b11.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "92f64f9df846f1113732a94a4b613f33580f7e6ea084b3eb4039428040b175b573a9a847f62e9cfd443aca556b0088a1ad5904e08f56e3c6827d6959c18acf36"; + sha512 = "13ee663e62cd68b92083b001b2a3753e4c5a6c15aa5e1187c01e6cad8692a6f53b6e25cbb0d294a62a3986421bcfdafc8bb82dc167118c213e9f4939bc991ad7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ur/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ur/firefox-57.0b11.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "68078ed247e3896fec7ae1233194d5ffae3aa18ada09243ea00ed0ec0037f9d26cbf62b87d5563ce34d5d6b0b1b117de15255ef91787fe5db2be67365bd206fa"; + sha512 = "d913ddbf3e10f048226f3fdb5e8524e2599b236379e6def3786789b767e9359ef2d47e2ea025a508467d7c47101b922150866984d91dfc41d525876b72ed4549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/uz/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/uz/firefox-57.0b11.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "8ac6ff11ab3d1e351b3a84c5cb12a6e822ed7c57878e286a68189edd1ad432369befddbeae535825db3ca4570d25c89fc3be7eb8a97af1a4737cc13d6aece918"; + sha512 = "107db43aa14f63c0b7ff4fa4bfd43b0343b657c3791fe29b07812af2c810bbc5343eeb90cd43028259c40dc79b0a763cd770b1f4954bdbadffa598bf0885ce83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/vi/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/vi/firefox-57.0b11.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "2c4a73c0ba10334fa5beeec9682ec716a82662b84a371f4e5943f5e2daa3bf225029ce2ccec82c6b024f18c3f6e68a763545a30147be954f187660ddc45c701b"; + sha512 = "851f0e5fd8d057a3d55807ad8cd215dc378dcbe71b4c416bd8b88d0f0cfdd9d4febd7e93dd562affa0890d6aef9818970773f95ed76fa136c034459eecd977d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/xh/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/xh/firefox-57.0b11.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "16972b57c56d028be0c64c91809aa99bf7bbc62944f966c868c5624d1e0683a865212cee6c0e940d5f755b32f7b8ee34d6d8747324e1000e3f7b72ddcdee11a4"; + sha512 = "195e35390839059a49e6c4ae03c1d6d4f085f7cff5b1c7963455bf73904303946c0926158a0bff4024c03be96b9570eb0e18c19ffb42081609f5812cbcc2e941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/zh-CN/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/zh-CN/firefox-57.0b11.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "7fcff685808bae83933b16a9c3512c466e63c0dc3d9ecbced5c8ef4a02f031d0574e12059086b2cdfc89628e23e6954bf687eba620d47ace390d1648d66ab26d"; + sha512 = "2ceb83e0e1182c756ccf30ca95f252ed8e81d293f2c33cc2d325bc091fccae183bf3e75dec67bf6f497b257d4037d8715b12b540bac95427289ea0baa2bdabcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/zh-TW/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/zh-TW/firefox-57.0b11.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "58a9fb93f1481193586a6b80af25dae35749584a9b1ef2529cf4f5732f0d4e10ad98c7d3fb5496a64d113050b451ffed25a8f726104ac4c92fe0ada73003a06c"; + sha512 = "44597eb5fa3eb073a04a5fa36d92055ae9bff41049e4c8c3762ce2166d8af5974bb232ae244830d32d51a56e132cee3afee55f23704d389be78bc48063aef1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ach/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ach/firefox-57.0b11.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9dd0661ca1901626478449f30ec6718f359c810d9f85a06abda0df4eaf0c3ed8b84f7a5924ac80c1f6a9b4be8cb964572dd1224f2643ed9381b7fdb7b13e5ac8"; + sha512 = "9809327388821a5aaea4e8c4d85b61608f677c2af3842108b27d3786dacfb36ea82eb29458a7acf9337eea51f6f850c4ac0398dc67fb503d5fcc3cbbbfecfef3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/af/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/af/firefox-57.0b11.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "c86e56ef1f5eb4872fd0ebda3703b3c5e6e365628bcb45a42404bae8ded8574580683e557f8c16943d23caad60df3528882b19323d0589b56dbd12e4a5e534c4"; + sha512 = "7bbb60c0bc784c4e58b2537b47e7b4b7ebcbf0a4fd63ab6db8ee0ddc1948ba9117c08baed37e5743ea90d28395dbf4df0bc512aa8bafcd810ac4e2b11ea220c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/an/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/an/firefox-57.0b11.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ff9495dcef2ec58650e1373b0fa2741cd61d90926618bda08058d92f23d7f8fe86862b62986ef2d18603d2f38af7f4247e7537e17d37d66c430c44bc8c1a3ea6"; + sha512 = "d2dcadaee4456e112edaaca783c91e9c78246aa742835a3d4cd074c612bbe1b85b28ecac222550eb920f09a96249e36bcb49a274c28352a6896d8beebbcbfbd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ar/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ar/firefox-57.0b11.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7f66d056000ab52143843cdb6cb4b1ea0ab393dba611f14a5cad0c111e6ec78890950d8f287f7d1b8c167a88efb38de302b100cb833f28fd5c54d7435d103566"; + sha512 = "c993eda8d34a3b5f656a7d4cf616f820bb2230a734df6c2f0b4270d5403e8d6d23bd4bf003ae9b115acd1f7925d46b89c3cccc9345ddc7f9d73a269e3c243431"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/as/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/as/firefox-57.0b11.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "7a73fa66a1d6d00790d0438233ac75e740f5bbf3fc824e87d6d0c003f6a6307437f01049ec414f7e655b371de59a0c8e84a9bcdafca53192bb08e0f155f12bbe"; + sha512 = "5112aa43ee870c3fd8f13378a4159977cf4dae3b1792ef983325a0d1f0134f377e6e4c473b27406f2722c138309a1af175f4bc9ff4e37f08696abf4b8f001fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ast/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ast/firefox-57.0b11.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "bd7d6d9c0aca3e2636e74dcbec5614da134b29f13908e230abb209fc9765445a4f701761fec8de43f71e7229b5f984cb1888d10a17d8f8d94b657f9ad0e56f52"; + sha512 = "cb7fa643c742ac1062f34acb1498a7e903dde4c8b685ba48b997cf0247aa70157ce2317b5e25660748294757f0d0fde7d08dddd6581726c8f33db1cef3767878"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/az/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/az/firefox-57.0b11.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "15a2d4d6d80979cd26b383e61957a5848974971d43a3bbbba2059bd16164231131a64b7c8be4d83d684daf3cac0b5898c64883766574b92af07663a9307dcd71"; + sha512 = "267fe9b5398ec432e684efed10624819eee7a1729c8480a4acd616cf4dc988295c069a62f6e3f2936a9e822f45fc459d8aee2d94549fc77d3f2fdc6a23aa9ec6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/be/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/be/firefox-57.0b11.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ed3bafbd2719ea2829f6fe4400a12d28f0e7ff3206f5869de60996a097b6a7a876dbb50b65352b3a8b7adc246f8255e8a9c5deed40fe8f6f7f4f640b79385738"; + sha512 = "35977b89eed0a7e7401bad75eb20e7acd07ea52ac252ffb73a464f7d7c7f44fdb9dd6bfd1418324cf8834165825ebde256704e7822734077a68c0a3ceecb8b56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bg/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bg/firefox-57.0b11.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2cf11489bfbe182768e5c7f3848df7bd4f07a4d5858d854e80ee26e258f7de631f5b4aad3b375075619defbc404fded93bcbc6769798342eac5af0ba0094237d"; + sha512 = "dabb67aad05867acd8fc5226f1adc91168f70d68926a7d9e8407feb8795a9fa56121234c639b03cf10cd2ad44f638b6f96003e48977ecd07b8f267c9da10b943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bn-BD/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bn-BD/firefox-57.0b11.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "26913074c0e0de2269f26409ee2518a6f3fcad7d42f535c0ff415361ced91f57785636b4553d7838549b9772173323fae02808cd1646c080c5a3d44dc054438f"; + sha512 = "f6185c2eceae26618c3ddbb09f87cf120f300d8c3642d36b257fc8c6c0fbe7a0d0f0e409b53bf3fceb2158497be91b9dd70e3605a5177d858a115cb4cb065683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bn-IN/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bn-IN/firefox-57.0b11.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "c85729aa0ded6f03c590c309bd502bb8bc86ba0e90a369c32ca11dccc938504f8590e93d932dd6a31409ad5d6237832002b132c008f0ff6695a415257d4cc5fc"; + sha512 = "50730081c97abb504f76f2e4c5bfc42258473b5b1cd4393a09be927156e626ede088f7ee6242ecaf9b641345cb4f28fb9f0a5276bd781882aa047adb4d1281c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/br/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/br/firefox-57.0b11.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "458459e0ea0323d32ea256c1b1678a315acefeca0286a0b05f9e39cf9ac1f89cbae69d8717ebb8e227204bc78d72e023a08789059c7cb0fe0883db5395894a5d"; + sha512 = "6a1cbf642c85abe216854a45d371dd8463c37a3d30a9cc0e7b88aef19baf4695def56c9ff61110868c1359c7b6b082ea9862ab4026fda70ddef05c304f805fe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bs/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bs/firefox-57.0b11.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "3640842fced020ed3216c2711c0276bf563519d3b4f68a942b20b2cdd7a2a3d50c0247bf440d915a6c1d3af2b4d9662badcb37e9b12f23e3e5c02a4d91610711"; + sha512 = "f62dfafbccb28abda10bdda208ff161e5db06eaf4bb3291c4a2149c990ac28a80ff4eaa28bd300c296e349c762c1baade01f5881b8e079e0e690a9c3fdc302b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ca/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ca/firefox-57.0b11.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "60848bd684c2e7fa5c67fd6c1dcd8467d39b6dde9e7121f5cef26e3225e155641fda7c68745ed02e2d1e3ed91dab3c813771254940ffe6dde4b77a1e206af350"; + sha512 = "990e3c75c387050c728bb6fb2dff2040e53b0ecdd73fba6ed27c6c66206597fd2ac099d561ba8a9cae1875ff38628a562143dd5802c7ab67221e2837de4ee0e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/cak/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cak/firefox-57.0b11.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "a95f74d3ad5cc7e1c58b6b6762104c59eb0d0ce4a9bcd08967b32204c259bf71bd567cda8cfa019bc62d5c46439359f53d85fc8e07da7c8e5cefc571e13ddd35"; + sha512 = "698fac4d2a06a5057cb81a57608eea45752e6ab787ce8264e5d3e0a1c11469d1e0b2c97a5ae34ccdce7e6221f6367dc4682154c6b013105750c854c1340252f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/cs/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cs/firefox-57.0b11.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ba510c00e7903187943560bc468d90a6b723fe6c0887777157efd33b2e97e1274f36948db092e0d1b6b28e9c0abb7f67d900b3137cf94e310996945f955a439c"; + sha512 = "ae2e138b886fc3c2350437a57fff8f29a5018b78dc2b31a45dc981ffdf233d6ad11be5df8602cd7de4ff9df6868701b296ee42d1e41922da1db7aa5f1c1dfabb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/cy/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cy/firefox-57.0b11.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7f2541b14108d922e0a32b28a7ce3abde63c2b365ee16114fd280d8984f69f83d31d33f7fa243896ffc84f46b070be231816f7c2394e6c6a8e2ffc8330670b02"; + sha512 = "fff159c8d07c544a8cb66b4cb52ffed3f8975d362c0b69ee83a26490eda68bebdfce45ff71147198a2ee94841deb9115a6a2ced6ff7a583d09c6dad8edc87d99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/da/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/da/firefox-57.0b11.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7221ae31d54e85fe9cf6b58f6eace9f1ac8ddd37ee43f7f29409eb82f4c09fcb8c1ffae3cfc92f515a426ea200911c92a784312ca5573a4fd3aa3793e3bf5fd6"; + sha512 = "32d5bfb5293e1d5346d189638b1e0269fc0d6aa2ebf3e7ca2f018533744d96868eed09797e8222102a6afe66d0b7e2f6ffcae5e72fcd2f249fc66f8af30e5bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/de/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/de/firefox-57.0b11.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "b592f17e95b28224f58d2cbc41baa4dbc2bf7fc631a0a7a21aaa5a357ffd8813fbe15932f9338641f431838e5db745eb580ce1443b62fd000f552a9851af8030"; + sha512 = "63b9b1ef0c83c91406c165034f0429c9c2ecac617d4f69dce40b9d12fd5f0583fb88148f6d14858e21a71ec0f59cc22c18abc296d0c561624d584fe6e6967b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/dsb/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/dsb/firefox-57.0b11.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2d0e0f0efd3d4b842f8b8511d44e194efcc7fcd9512b361174f097287ee40784377985e516a1c87cc26a7f691b6e9c7c38e8805608993de437008f343d8755c8"; + sha512 = "c902b5bfbefeeeccd7b49dfdcff94f3219ab42398ff2e73aa166846b7265b896838754719f1e84d0662660bd03ec14737183e60e653721840cc53b4bbd6d6658"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/el/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/el/firefox-57.0b11.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "0a9ebb584ec52aa22ce51b18a92c8be2d29a916795a52060ac1663e4bd892006a464e2c2a99bb89a4d16796591fd0b452c2a114b42a99502317081c659c12037"; + sha512 = "85b2c08615e034ed9f1aba837bd73564e877f3385e3c3989ce864b1848f79f72e30a5bf06d6b32358a7f296137207a785fb343874fcf551f6f0b98515a52fb14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/en-GB/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-GB/firefox-57.0b11.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "eaf2bc3bdd55114fe5226d877c9cc9d5f5f78f07363327995271d863286b6534e0d9ba9cefc6efcdf7fb1ec1091e943ff9bfa41b7090be4365ebb6a7dde35c6c"; + sha512 = "d14d1d17020b8a79dc580f7f526403e17cf0337fdd567b464097bb3796e752a669208b2a94a0fa4d1834816153230be67ce815bf440e1acb9220c951fe84cfa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/en-US/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-US/firefox-57.0b11.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "7a937c9fa67ee0d7bfd7bdd6d504cdc81c4afd6642a2d9888489845376c1975fb5e1129a9f0b55d5000d400f79049365e6a1433d0e8ca9cc2d7ddf3fe312b7a4"; + sha512 = "fdaef350da4b8eda52c70c613f8c5e6a5c80522d5afc8f6bdd9590c91bfce43d2d2034ea095b377b47f8da65d950fe4c203c2cdfa9bd880d3f6253fcd0b252a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/en-ZA/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-ZA/firefox-57.0b11.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "ef75b4bcd4eb37349058ea9020ecb7bbdbde2873d3f15a01e9b727e4fbb58c32f09112fa1947b38b6343a004e0c2a45336f99f8534afe736120e7c92dff0e080"; + sha512 = "c4ce10a2ad4d8ac8cff1e87a408caba7c1736f84ad2e228b45b7f9d0f87e5c9f6a4adb0a0ade89fa88c54c38a68189f7e203370890eaf69b6bd033b90afda8c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/eo/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/eo/firefox-57.0b11.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "9ae6501dc2bb47de897aa61a633048279cba4a9545a3250a58cd9688ee546857a7c5c69e661d78b595051f76e7afb9de60ba929c68468bbd568f76c848a2fba5"; + sha512 = "37f75ab35b3ecb080dfd7c3b5edb65df950d260edb0156bb09887e8f30f1ef1d66016f6b07eaed0288be1c5c92dcd5c18b88fb0a9e742ced375ecf661a3ff5b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-AR/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-AR/firefox-57.0b11.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "19dc4c760481997aa9554a101263030ed1a322ddd0b2e4fa743f4b572305dd6cc69fc27b2196e586308c96c73dde8e5f155f1aa0f8f0239cfe64113b12586943"; + sha512 = "8f2603e1d4942e6c6d4f7bb5823473a0e44f820805301aa2b0faefca6540f4a8078d43b6b9427e581d9720f6ee47ce4af82113c113753fa7131d6971ec10441e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-CL/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-CL/firefox-57.0b11.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "0be6855e33910446d0216eb96a258e65db60dbb5820805c63cb4202c76adb25180c4fc343dec78cc3ac6030b476a77c87441343884e97013cb439daac45c84ca"; + sha512 = "9a6845eeecb831cbc3d804377ef11ccebe513307a72f4b542968d1851e54679ce202e5c6e5b1b2efc767451a0202737837f564f146862791c53d9880e42a2565"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-ES/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-ES/firefox-57.0b11.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "83164bef1ba1790ca2b9ffbdc89362e1f8b9c3d42aea938567841cf12b59f02bf30ecb3146a596b83715277bedeb8fc15b9f07ae1e34c9eb75cf7d464c7c2de1"; + sha512 = "4d94719060001c3e4fdabb0a08e977079a3ac05d5a5f006d724dc0d6a7bd31646f5603be8236b6cb0ceba10eef64697044cc104bcb10b4308b28fe4883e89167"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-MX/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-MX/firefox-57.0b11.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4a404f137b9d736d275672bb38eb7231d5d95f3538df3a320f573ba8d6a9e68ca8e02d3b89fe3a36ec08fc30dfafc9b57eb744f8bba25663b16575dfda5b4d3c"; + sha512 = "38d46eaf7b40f753b9fd6fdffda3b21c5f4ea9a554488277cf55f97e230911606c98fb4e5b6b188621db24c552236aa67b1ebc880630c74f6c57777c6c0aabc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/et/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/et/firefox-57.0b11.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "e86f05f93c3e1e1c388f72248d79ab5d382610af3e2a23387a816cb76e3a670c22a3363d88187f83807d1d28b182775696d03c92869867217abe5bfa2561dfe7"; + sha512 = "3babcc9f0bf78b491d11d96be70a62b409729180e3ebb0fc97ea0eecfa3caaa2db1f6956f8becd97066d8b7216101804d2fccd249ccea335b92bbbfe12b99d89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/eu/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/eu/firefox-57.0b11.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "fc93e9d91a7a9408f7e950b873630526ed2012849e7735bdfb4c63d7ac95bce3dc11327538845d58f83b70014095bf1e48f12bc29741a3b56462147fec244ce4"; + sha512 = "f2b1b2befbafdfcd2467822b7834c5a03ec380c2876d6641addffc5852453232c350273d310e734e7071d2dbe35c94779eea858ecda49411b6a8520629394c62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fa/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fa/firefox-57.0b11.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "241df02aa26144dbf6f22ea9b6c8a7de4fd5e86ba7999db5cf23be9e409172c565466686a8901525dc514e322a445ca9b9c0b367d2a0569edb13a2dc3d66c7cb"; + sha512 = "05d1bc4004261475c6b806fd2327d2d1f0a1246769cf9de0755ac0cffad99c270064699b5d05cbc9353c5ce77be9810546f59b0d47a0f88c96d6296d4e51a358"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ff/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ff/firefox-57.0b11.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "03f5240e53c36e847dd23b007f9b419bdf238a03b92678d702d0d13059516a306eb15f45c9469def50baf35dc43f420c924744d0ba862a614ad7d9860fe6cbed"; + sha512 = "448fc135f815bf79fbb62e2b4ca799bfae3891f9d1197ec8febb441f2a13dee8405add2c54a12d2eb11fad6eb291d7cacbdc31fd5af1978a253a5672444fd30e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fi/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fi/firefox-57.0b11.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f30ef14edaf8df27cff44349a34eab0fc45c90fdbb091bcffa6da89d7142be85f40d471a040b7d6340f03754e49c9c30e072b3800ea9133b194e5566cb87fa61"; + sha512 = "06f995e53b88f32fadbed3d0b3b22c11117515b2e926b6ce7e9763ec6fa29bea6a05292ad8325368badd4a0a6b3f5ec8c49a147a7f864c238c814c4f53d99082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fr/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fr/firefox-57.0b11.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "121e98383848129538fc9fd82d49c9aa7238576e89f639c1886a9c3fe23a9b01a084eeb398791bb584b09dc9efbdc803d2574177276cf74b0581e7aea194f684"; + sha512 = "dfd06c21d7dd83309f9d6d11fea295bfb1f942e9bfd19a5a1c45b63466eada5ed75b88fab5d4730b13db0522b3a977eb85164cb0c4121242a975462dd9518acf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fy-NL/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fy-NL/firefox-57.0b11.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "88879caa704f3169d548aba70392cf4a733c6ed49a32b6e34f0b25a40edfdabb37f7bbd2881fecd2028169477fc779a438f81a140dcc89ffa4fb70c0bb0fc17a"; + sha512 = "ab381fb599161dd7df10db3a1c93f1e71d96ef1364a59518e1413c17f7a26b524c02ce54a33f8ea54a02829e519f8e8c475b9579b69bea62f44c76e909079e3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ga-IE/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ga-IE/firefox-57.0b11.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "9cbd9f42540e1a1d35f6de300a1e4946ce1331010b1089d8a6f366896cb732775c8ecb312fdf9a32488b3d27c4dafb0453a9c525b341b98142cded87f351c9ba"; + sha512 = "9054ad0c2184063e6c42ac23004c9c63438368c03fdd7bf9bc0610d1a2d4a47b9bc4cf4762a0cafc633ae397c38ff64e050409c5d6fa0ca1ac869d918dae547d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gd/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gd/firefox-57.0b11.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "fa51ec9542d3c53d571045c6ab0afa49e880dd1aa5cebf831cbea3f780dc71d462b13f790438053e926828c53675eb6b0933fd7bac6605254c69570e415e6bb7"; + sha512 = "3844132a9433fbcb107f380200d9b57756820a9a3495c805622b7f3952c59feb8b3599c774d844f57bd38aabe01eeb45cc35d8e06073350f884ddd0a0a18d3fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gl/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gl/firefox-57.0b11.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c5ba307b857b02a9ddc61ce8d342e8c7b95a6cbf81b8849746a0020da4a3abce1953d2818940deb4e853c2aafdf1b12fcb8bf04de04d5f07334a9428f8accc6d"; + sha512 = "2d864cda23c59108866f6e8f473bf98d8c328f24202130d9168ca0588f43a9cc49c8df1ee4872601608cd27422d7243666b5a1dd006ae5ba101773b7334cdc15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gn/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gn/firefox-57.0b11.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "5547e86e15715271a1ea6f00dba37a6d82c8c51cd4ee619d7f31e70462aebace55a52ad00bba0720d7f90d7d8d37cf1254281e283dadb1d37d6362e4bc4c7c4e"; + sha512 = "fb23767c66deed8f0ef97fa5b8044654740b8952bd7b76da9d6074e22c91301fffd3006c5f9c09ee7e7b3ee3001e70b31a6c09a096e3dc73fcb867f15251a553"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gu-IN/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gu-IN/firefox-57.0b11.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "d9283d7ed1b8e5fa3becac5db518fc49a9503d11b88f58ecbea2b8b623a9c6b2837a0a08f682453d476445397cc9b8ac3a6fdf29de74368fdb0ded9ff1e52e2c"; + sha512 = "7e146f4b6c3eb1c96be1d95ce8502aa62b1483befbd7aaf9fb945fdee4e8b8f62088841057bb81d9d5f8d2163b25bf17797d5af5eb6d6f32ee77b0b7b84aecd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/he/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/he/firefox-57.0b11.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f95b7982911b1412828131ab5ee151a5e88ee6710c77779c761dd25051ec7eeee930c1d6693d51d7bebe281e489a7e66123c5e40a707645b569b340621becd74"; + sha512 = "3ecc278918acc5f65c0552f9108bd167a9ed3f55b39b4f3ec41175bf9a1cb1d84e32b57ab208e6c6816cfd66b33b5d2846d5a776a79510c7186e0d5ce6bd25bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hi-IN/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hi-IN/firefox-57.0b11.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "ddfa3141ad4e8fb3f6ca55f207a477de4f410795257866db7709986c8615e3e919fb6409ff4557ae658f33cbe2f7b19a1c282e4125b1ea084142d2effd002546"; + sha512 = "7aac53bb08c527b1c199bfffc5edc25e8d49082dc7df453439775afc07722bb126f95955aec799909818cfdc949efd5a9f987942a4655440c0ac26691a0bfd9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hr/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hr/firefox-57.0b11.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "46a460c41d038dde02dc1a3d60e2eb75310239cebdf58559ecb7213f2cf65d97de4e46f24dfe63ca8256b0507f20a9301aea527d8af6020e141fd62d94a3732d"; + sha512 = "ea03e4f1370fcf59c9022c7f4019484ebaea8e295e2c3ff3ad8f44aad9336ba809cda22fc0f98df2f5ed7ec536ed9ba349d5ee57bea3c4626ba5fcf41fe83be0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hsb/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hsb/firefox-57.0b11.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "a9b3bfeb32b632b716e9a849da4507f3620363bb25daad44451d6b4115260b91dc35cdc313d15f39abf9f53d3df30a80d16c90514c473f4341e2168fc7f08d5f"; + sha512 = "71ee5338b776daa0e9b33834079c94e3e9582b50d7b0e92f64e25546167838852ab606c2c2f9abb1f3480755a653b091e60c97babee00e66d4140600ae4d2612"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hu/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hu/firefox-57.0b11.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "7a6fb1b9e0adadf7e0a7bd6f2c85ca0b71c0daef2373a3cfe5221c3af730862d5146aebc46911cc1de5dbe3abd279fc3405a216d7b58354706eaf103544ead46"; + sha512 = "defae5f9c7164bb5150af1fdd6c0b262fc88c63b9c7ed09753af5a361815ffce9ed43d0d79bad65bdf2e0de775d17660ff0c31a39134f9ebd2b6f60ca4a02d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hy-AM/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hy-AM/firefox-57.0b11.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "9dad05aebf522b930533216a11621c599c8a232608c3d275763680463da2a9d1747632548825742f3dff4efc59e7badb04b306add7e63cf03cadbf619c29ef4e"; + sha512 = "924efdc4e8584d89b60d98117a229c4c9a619b42f0a713b0fbf9fab2ed63b5761a9b5051e7cfa825459cb3d499eb4679363b13a76dee2973ef6b843c7ee9fd9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/id/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/id/firefox-57.0b11.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a1fcdce6da2346c79a93a964b36d1abd9c79d7528622dc591a244855b8d3fc66194f8e16caf7d1f2085cd4fa2c6b223e20c0c78b10222bbc08868831607bfdf3"; + sha512 = "508c42fff4f6ba5e39cf757a1a306c7404e3c133308d6bf4d734f4d2c53fe79998724f861843d2ad76af2dc5482f108ddfa11026b8351a8786d814eacbbf839a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/is/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/is/firefox-57.0b11.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "8cfe06869122f5c03e650807a449b125d5694b7d0c6febe761d7f2779fa16af5190a4deecb497578564ed10bfe375a634f1b50eeddcf25d896af35ece936e1c3"; + sha512 = "9930f784440abd54b53fbe94f7eeb0e26ff2b1e2b16ba30fe1a7d298195db58fc32a25624444df89176072a9344088cbff188b73b9d7fa8e8b571b4390a481b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/it/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/it/firefox-57.0b11.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "ece3ee07a11fa6ddc6479a3627b0fd77b083820244c216cdadba3554f3f3d63ae7ddab351b48b6168da5bf741aedc62fd8f294b4cde98aa32bd5ed2a3ccb93be"; + sha512 = "4bd98c6c17a3cc3f883e7c2cf8a76a5423aeba67c6c22a50befaa8d4efe0e8dab495598e17789dbe078c75aec7e612ce959ef8f82254ccfab460b273456ca50c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ja/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ja/firefox-57.0b11.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "313b186761211111e357d87afbbfdb76c48f57b397b434d4ebf9ccc30d675a2c5b8b177b0325fb7ecce0796b5e5c5342e7cccb716217e11f5bcd8dd5a4b67d1a"; + sha512 = "f034c703ab191fb39fd61859df9ec14040764a8e22502277d11447add96ab3b060931efc4f7dc1277519c47315c40793a7a7b8da161892b13fd433aae4f723dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ka/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ka/firefox-57.0b11.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "a02e9fb44ad5c373f95e8c3f4f880e10c2ed594f5d200a6c3f37bae4aed9135de510607291061e18fa954f98e15314c112b60587fb70bbaec2eb5b4cc7f2d7a2"; + sha512 = "8ed142d84d31914f638daec87ad64cf1aab76e110bc7bc147630df019f1a6cfec8cfffdafa139cdde91a06b65966741aefaeaf3d16c63aeb94c4f2945e04ba8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/kab/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kab/firefox-57.0b11.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "5a621e60fff68f07d97cd8be0cb4dccee7723eeda74a3520d70e819c844eccc3f5a06234718e4e4b2e48e6aa417d4adb977e2d4a88471e9a54538d7852832215"; + sha512 = "435e8dedbc0014ac19a37d0450537d7b9c2d4e7de993644991c58640edbfeeba17c6a59ab5eedaf1318bb8c71cefb5d30adf01528bcbd8e043e0eefa63296be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/kk/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kk/firefox-57.0b11.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "3ec65e3fb9e9c4d1e77501341cbaa83b2822fdb44d4fbd18ad7777a39ad98ce0a36f0166ab10cc53e2c55833572feabf3f5a7b4c47e75439b376d7e457748594"; + sha512 = "3b059e976cc10eb97b10ac4bd9e4dd2b8cbc24b805e23ec125d42ab731c5cc6f97bed8ecf222b1ed3e2c84a422a677cb938239110a38d6e34efa2a9f2472bbfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/km/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/km/firefox-57.0b11.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "c3fdd47cbb311ec76b2ff1e48094e5e4797d7bd92db4eda142fc18fb01ed9810c78c9b25efe277fabe2626e9ce7ca5a61727aeb7096dc246ebf389214903a6ab"; + sha512 = "aacd4ce2f5a8152916b2a9b8f532cdd09c382e0e365de297082e5bc16f6c19136430504bd74e51422db530c66a13af45721c01b5cce3a7b4fa31e08beb852539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/kn/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kn/firefox-57.0b11.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "15efbaec5edabedc7161c2c914257835fdb6c5a6ee9a7249fdcc2242ae60d415ec539a2862342060023f081318cb8806ca655e5fcded9068956e2008a8c5a2e2"; + sha512 = "10993f98c96e83b8010957af8467c4434070ed5b3c52311aa67596621f415d6ef5d7946a6fa5112ad7fdbaea00675bb07f6845c6553774e1a9666716505778ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ko/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ko/firefox-57.0b11.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "f6a77588d8409ce88f82e7b37cbc4def38ecbdd87e2d79915b3c3cf5441f4115c7d85844b19623cba9ac628fd37de9741dc709c8680c792dc3bbed3f89cac0b9"; + sha512 = "c31ea13732f5b2d14f7089d71923287be8fc99bc60db396757f1a8a2936d9ca5aa5f1e2c447cfde0f90683038868dae95eabd55ca16df17742b2f7bbbc89e7be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/lij/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lij/firefox-57.0b11.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a0b8b995897dbb8bce215022d611169fa1bef4cadd0e347c36b3cc025715e8224f4b3684094586bd04e6a4461572a1d8261ad193addfe6f4524c106177d3c8e7"; + sha512 = "b7febb474eb13034eaf9ec555202153562b8dc34cebd0c03d680757c19b2b8fc5f7060e66b115d0080cd3510a56033597409222eb56024ba136d9ab50cfb246e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/lt/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lt/firefox-57.0b11.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "d47509d0c2b18d00f867658befcb63d14c786f5e94d2c40ab93e78014330cce5a441edc42735157cc8bff5033246f0e0aeaeb99011b782f98baf1331a383f899"; + sha512 = "d07c56a82054d1238a8a5678b65efbb88b7807aaefb327eaeaa393218ae280ef4e134d4a3ac28694458470611610e3bde2be68f3df325a496d9f922d985681fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/lv/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lv/firefox-57.0b11.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "ec3aaf962aa5e7a935ac3da0f79ee74a3dd0e42f3141d339f728b503cd723972f7c87cbaf7c79471ef716343c28acefee9d905c121f872fccde7fc1da83345d2"; + sha512 = "fd8adc196bded44b80d6875a0cfc270cd8672a19b8911753a7b62545823262c34381c3e1d72d21af695c273242093b4df45188bf6b07f83ba5a73aa7a8e5e528"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/mai/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mai/firefox-57.0b11.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "33bab56345c4a4fb95297549d5e365eaf1eae617510d951a5c80a3970e37fe855f86ffe7ec6344bf444aacc68fe0e4c0e04478ccb4f5b4f3f40de371ea1de3bb"; + sha512 = "c31e747aa29393f12b4d32131b4a9134f57fcc88235258dabcec99583494832cf61079b8980171be2ea952121f3c5568c42e006e2bb9b1c0e6f6fd05d2204dc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/mk/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mk/firefox-57.0b11.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6218a4c6a176690245173c10a5d46139a43a09fe0e7de30fee8416aa2554bf4140b9e754e27a2861b5d4693697aaf065febc9f441bd5fc84c622966d104f536e"; + sha512 = "3e304e2a82640adfb7d15705ccf740de623995385618a351651005da3bc23edaed3707209594bc2b70a244f0ba86accb80c319ef4f55ba156f5487e694fe37ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ml/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ml/firefox-57.0b11.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "4da4580be951839aa1dc9fa9e927677f964424e91431442b36784476be3ae342a0ae724ecedfd63be7e8e6e6e83977fa9146e0df0c70d409b4ddd0b6aab4aa6d"; + sha512 = "d229529966b0890b78d53e221d2e809d003248e2e42dce182f3f761434da72362181edaa0db9ae255878d01118ccb38921af715a412408e60373a0a76f02b104"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/mr/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mr/firefox-57.0b11.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e6ac8fe111b31c64ae7e118ead56ab136bc199d2d0bc83f128128c1a9044bc8d7e9dca148f717bc5d015a746bcebbb2c2cbd8aa7905bceb30aae2ffda0f2cbf1"; + sha512 = "d8e81fd44be727b8b72cfd5c4852df33f812b6c3fbf09c07a461c00b53bb41fa63a1e2cf9c17dc90ebbd630ef18541d4aea4d9cddf471fc52d9ba10952ec5ad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ms/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ms/firefox-57.0b11.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "701922f348cf2d8a853a34a6d08c947198a85f96d972a1a3d1968045f097fe503df84c4c0bb8c8a16ffa5afa729d26a8026f06809aff6724d3e2fd54899cc3cc"; + sha512 = "e025f2b6a8724eabe4128d9e3567f0817c833a6fb2855b541e6a12208992c2586970b5adc422156bc00fc403714bfdaab762505308931584ed9ab8f9352e1183"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/my/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/my/firefox-57.0b11.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "b68ec863d9229da9c619ea924d182cee4a76d8cb9aaaad35c64ea31d4e03d46d025536d32408210abe6dd662398fe2b194b25b1a7b8ed52c77c99850582f01ab"; + sha512 = "6518b67cc4ffe848a0e79fce56af5f9ba60f3338bad5dc65644d6064b51e1730182f4d6038c4deb64be852fac673229b75cf1fd0d1d7c37db62c830d018824fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/nb-NO/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nb-NO/firefox-57.0b11.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4c9ef671abb97fb49e3ce5f0d0dcea9f268566e7cb9a1650bedf8bd42648d92f45a0d70f2d5433e58cbe6c8796e67a9e443ab711e42543a45551653747d8dee1"; + sha512 = "177f3638d429bc4b5d97796de91c39c3a5712ca3fe5f93d5e1801937d16b80faab94cdd75dd99ec7c6451f55a5a9282195a0deef8f5500833b83dc3ab46ab20c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/nl/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nl/firefox-57.0b11.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b51c079046412cdab0ada80205ceffa55c3b9e20f65f8378216b78797137b39fcc3ff9f6bdd15513de97f3d07c59afd1d803304e265f4f38e4118dbcaa20f422"; + sha512 = "192f7cdededf9424631e96bd88d15fe66b7654cbf09701f361e0083b38106636df68f183aaf3b9a4894e432cf828f429ab5a62ee0b521956eed14e470c909aa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/nn-NO/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nn-NO/firefox-57.0b11.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "3336e336d5baee973887a11836f3253c80134fdbfa218a4cb8902bc7f1909bd40bed217818d2fb8f6bcca6274a67ddcdf6ee71926c36dbde7e5fbb76294c1bd9"; + sha512 = "e1d9ad0238f5fbbbb95d08e01f95a9ba71ec35ed47d0609a49a9f76e9f9008f21932a12b9a342b9ad02fde563dcbe7779d43b9bfbfcfbe7f17c4f59d324808e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/or/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/or/firefox-57.0b11.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "44f8bf97e5e86e069a628cad3a3eacc98a9a9e271fd4732b313cfa60f8fd38f8f565fc476d6d18a2fde63f2a7298231613aa470db9426b65b9d2fe10af1c1121"; + sha512 = "12012e659184136db31cad4448226eb4e70760b9234632c9fa1b71a54b0ca06608de7ffc62ecd018671fcb9ee7c3357ff18b7b5459b395a39eda59d1a44bbaf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pa-IN/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pa-IN/firefox-57.0b11.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "37ae29a99719c6ede4e813f6e1f3646e69876ec5462c513dbce7f8c2f07c779ab10edec532cc7cb4177e53db13712e87863bdc8108c6975f56d1ac2323e85e33"; + sha512 = "cc154c9b0d53ccfd515dacfcde3a55a75c16f542080770927533b9efba8bedb7f46adf0a54772f60ff8395c1e83d0ff602687d7b04998e9d9e0f6c3da2e95142"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pl/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pl/firefox-57.0b11.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "848a83da8419827903cefbbbea9872fb8bb35f4baa484fdd596985afab9b18017e8ba465bb10c9090e82fe6d25fa839109302338bd51e93127620d8a178ef026"; + sha512 = "ffa0cd7b26d4fd48cbbb9b56b60937190dc271cc6f002fd4da11929945d064d4aa59788a756ea4226b15e1856434094e151fb92a96f3ca9d14141fc1bf98d037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pt-BR/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pt-BR/firefox-57.0b11.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e3f17dff2ca325516e16a834fbf7a312dd5204a56762ae81c0aab154ec515075bcd9cd003771ea6b5addd5d063d4d2ae74116509d12fa6468bce49727ddbbfb3"; + sha512 = "6e227b96787f07b9e04632d54ad33ffe17931e787d1e0212a3419bace1cf8fb062178adf6a2ae8d11a851d3de2eae983b086850e8df775c0a33d518dc0306b51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pt-PT/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pt-PT/firefox-57.0b11.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "40bba3f30c76964e1524f5740bc1bae353b6c3c3db1baa5b6031bc025280caa482f8e85e146bac1eab22fd95a2624d08101a2cb93c40aa57beb165aa448a721d"; + sha512 = "fad503b60076143c5941ea7c280212570896aebe39e594e4af4b2c258b387a5489a63be17730e4c31628b96661d8deef7aad6ebd31eafd3bb52f841e4a344a39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/rm/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/rm/firefox-57.0b11.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a72d7922cd2adfc9a08c997c29e03ad4135ecd5403ef044331e8e08032fc7d5fcba32d43745b2eda22a2ea062c6e9a470dbafbdb15831fa270220191bf07e2be"; + sha512 = "737c4cd8234d87f96b1970f1ddead34eb4b109e201f794942bf2ae0603cafefce7b38f2900bea2d08d058766e8d1851d96052ed5f23fa46e351179c9ddae1c91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ro/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ro/firefox-57.0b11.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5cc76ffa6e74ae54e1b49777e431c88d60df8d2e62cd7facc452ae4e186af66cd1c59720633f69f8340bca0900be2441aac0b10b58757d2835638ae554853a66"; + sha512 = "506c842023cd3fd3bc0a6a57abf7b2b822253b0ef4bf2d3f511bb3ce5407d310cc976803f6959b8678899b38ffcda582da21a887d8608fe8d42c46ac70cbf133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ru/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ru/firefox-57.0b11.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "4cedb1b7b31be69c2e47ac6ec5a5d8d46fbf052130e7a7b3f12b3439fae293498cee78d972c2eb3e3fcb97a080a70318cad43eec82c3a06d7ed4bd2362d9d38e"; + sha512 = "94213fe894d4d6222b321aa6d9d37f3cf32f257c0e021f8d6f122c4e8c458f9845ab5abbfcab1b043b4d8aa72f83307081685a63ce7569194fc15e2ea655cd27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/si/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/si/firefox-57.0b11.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "46855faed2fe0c27f821e61aa58e418eb926deb48142b44e9cd529b5023e11d3d37fdfd6c52d3fb7ef93361eb71cc4776941f9459c03041bc806f37e75f9c7b2"; + sha512 = "2174dc7cc1a8e8cf96550199d70e279c85a91671fe1b1a71161aa73acffc8a0c818dee6d0f2c3490384eff4de5175eb6c04cbe04ae92c60da72f5bb987bf60fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sk/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sk/firefox-57.0b11.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "784e6a4f0ebffda6d53f66d8294e5e044dbf74230738d260c685dbc1d0ce8ef594383f41a658b3144c1b5ab8217389377387e5f6bf4c5b13590e7284be0c96e6"; + sha512 = "f9a30f631ea892c1362eb17652213cdb603eddbb0a687f4ccaffe70949b8692e637a35c4d90e27f5f823da59ba01de45f810bce1ac33a0243a5c96f470f13ffd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sl/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sl/firefox-57.0b11.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "a9423053a6ae8443b1fbabbfbf6e1cfb04b2cb8bd7ec5d020fb54000547ffc9e58fbf977897a0ccae2f27170b9180446a1812c37b47b04cc5475a72d2e39eb27"; + sha512 = "abb5746927a53331da0604e4259a97b8d836c489a3c777ebcefb9d3c724503772474a2551c7347c8466e007fd248ca4b96c8e334272c958089abedd60f810a50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/son/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/son/firefox-57.0b11.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "ffb5061b2852c7e0ae89a4d251dbf681c45f7fc150d92e00a7fa9f358b2b7c63b7ee5963db473b53412aab5d50418e59ea666b1e0b423730522002aed39f1384"; + sha512 = "a88ec432a39c197d4b312b8eade6b5b1c27e2909dcf27c309844fddf6a21255a1bfe7f666f3287c6662a0985c75810eaf67bbac20a0b871bdb583da30beebf96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sq/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sq/firefox-57.0b11.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "77a7f68fc2aa93bb95419a2a17a8b2b2f3deaeefe33e061eca09e2cb1f938a6639603eb9936c967fc8af01461ae485362b6bba2e8b34cae4d4c146b5adc372c7"; + sha512 = "32054a108dd8beef5dc9dedfdcddc4b37ec854ce32f65f6f69e1a4506e45931909391182ea61a9eefc4e3bd354027fd6cfda0d71d996906397d833a27b07cc55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sr/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sr/firefox-57.0b11.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "28c5c3bc8d57fdb2c76ec1c40cbe2a96ac1e7bdc734b23410b16e0950a26d082372edaf29f784c4cb55db6f3f34bb2f96cfefd3ddef72b703d4cfa7c43d8782c"; + sha512 = "adc284dba815ef84d2b99b90730d15ebb2a8974601cddbf38053356c8e7464f13d0e1fd764c8dc34e0cba0ca1bae427c2e1ec31bf0553f834d0213426295917b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sv-SE/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sv-SE/firefox-57.0b11.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b4998b2f2ac1b77353bdd91d9b580d5ca9e2bda1d90fa0306493e31e57b16e4cc3f32e88e7ced1d6b3f486b256344ea689163c422ca3fede581b902e45b73cb8"; + sha512 = "51f3a397e95f39fc2da2349b25d625114d02bb0444e56fa09c8246d57a93575ba9cb83479681c73ae1b257269ad9100949829aced4c1567b167dfb5ea680bee4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ta/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ta/firefox-57.0b11.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "79a6f7cd615ac1a3cbc2989d8b59aa390bce485826b44338edad92f151f345f9a9e5a59a20e36215962010c36dab6ef0200880d6433dd00c2e301b9f63c6283a"; + sha512 = "a1a5a458d540be0a5359c15f2a70770b39bf983d1f19a469c8caf1f7c2d61688a2650bfcdfd2d41321788b63d5a900ca1cc36fac4a62b67087182d9c1c3fa84c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/te/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/te/firefox-57.0b11.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "057b4eb4109f9d73e401d06502028be4875684136edd3f0b474ccb4b95629ce0f1d84aab08abe1382b5bc241842eb2a5d540202def12c4ee9bcde6eb940bc9c1"; + sha512 = "a948071e0f1ad4e29483a87765a307a1cc4d2af629125025e71439875144535bf0d6d69be5100a8ec6f5be6b8b9a7c7d10e851486ae41ea5c8517dea932c54e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/th/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/th/firefox-57.0b11.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "20bb176c481ef473787f6cbb848a5a7f3d0610d6e24ade116d60565f2afe632c71651378850d144b20a1884562f87792a5609bbdae03a9120830fcfe4aafe983"; + sha512 = "1340d951f126571e3d3fbdfb91e478ae914aeba9251da35b253a67f62b4148f0e5b9452495a7bf23e918c9fb3ab88db37f4f0fd11f28330957dc23bc65cbfe5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/tr/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/tr/firefox-57.0b11.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "ed1b30e3264b75dad2b44be7021ca98f6212b7286d1bb35e72f8bbcc6d2a260ebaf1971c403994e91df3cdb21e82991cc13e60788ebfc729a6a9bc74a51313f4"; + sha512 = "37e37e3679ffb5ebf93e3e7410c5bc9e1f85fe8bbecc83a7a33dd5b1c7d7f7150ffff3d91fc200f4c378a253627d5dd8ec90f46692b01f72cbf9f48bea84742d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/uk/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/uk/firefox-57.0b11.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "26ca1bd905fd7c3a888dd8d094bfe5eb33056ed156857331b2b03de7474528ed2c05c0c75246c8e20f81ac9cb943ac2b67d0db671bb8589a584b29ea8d6a59de"; + sha512 = "067353b9d466bcff799f6c1ae46a91ffe9150a6c429a117464cf1289433fa2fed6a0f0a6e773f8b27d3618ffae233c7ebd56841f97d3c82b97ed24f038c7e4ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ur/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ur/firefox-57.0b11.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "301a4658a3f5833afc05222667202cc4ad8314e4539a2cc138bfdde954842b8ccbc0c2ec12822a2715de5f4e2bbfb089b5e1b3fea3b74de04277be2937454839"; + sha512 = "a868433b2b18ca92bd6a6b765ec0fe072a44043a12f75ec4bbc16f4dac29577698b1fd7618e5c0876ff14742656263c0bffc2ae5ba0826a55df70c139275f9f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/uz/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/uz/firefox-57.0b11.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "81f3851e88fcfd329b48ee44c812c72f58f6ebebc45f0aea2075d1138e27406eed4cf6ee4cfaaebceb812c9d6f5ecaf0196b32a8e06d2b5b10221ab271a8901c"; + sha512 = "33603cb219121d06a97cc5c62865bdb9ad4f9acd0de6c14ef86acc16d818faf3e21b24f9f497dafd20639b81edbe7affa1fedd7a2aaf99a1a9d137b02e2b77d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/vi/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/vi/firefox-57.0b11.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f8d0458f10009b623241b69084402ed0e52ee191c9076c659d341a5574cd52f0acf18eb9e89bcbe25ff398704354f19ae516bd6b0e068c6850e64ea5d44176d0"; + sha512 = "a841c65cade257e6b5708b3de3c6109004f54a295e6b6fea97e6b3959cb70620844f8a4029dcf908d6fbba1ae71d038cd2adc0724180e22959edadc549bf8d12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/xh/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/xh/firefox-57.0b11.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8d0e01339e7f1ee17f932a0db799d4f8b05eb588513deef38624077da061d9240f28aab5b43bdb029081b7b2936a94bb4c519044f57e9058965cfb32b71bc44c"; + sha512 = "9d8338b04f2d8f43a096049b11b8d359a1a09a22a2074bb0fb4364e8a551976810cef148405fb45800a4d751d2321e4d9492a79549d076a8dad3db33d22dafb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/zh-CN/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/zh-CN/firefox-57.0b11.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "1420ad33af75efd58c57e4376ea1d755945d2bba0cf65a6f8d33a3d22662418a76baf1911557886fe85e4263ae2212ad0587eb9ea9ea5fee19d6d24ad7833680"; + sha512 = "d3f4dab15e4293cff13be4da142169c18b2d672c9af141287c388a31fd1aec4305ce178af1dad6a21fbeef571445cc15ee15c38464bccefb4eae80dbb03177b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/zh-TW/firefox-57.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/zh-TW/firefox-57.0b11.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a42937bbd8fee40d58752c8347d5138181da11342fa533e6941b39302547e828c84242d8c953cb101acadada555ffd14ffe4c17d97ae22fe062fcead384df57b"; + sha512 = "4b82c8291dda948e1f63dcce2c8803c1ed1db862e585612c0c2de96e14c7442c2a845cf896c5fb9492cb4424c05f14ca5a546b30c6491f557c511f936153cac2"; } ]; } From 4d8b163348085e608607d54339bf67a8781d98f7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 26 Oct 2017 00:00:42 +0800 Subject: [PATCH 1717/2806] firefox-devedition-bin: 57.0b8 -> 57.0b11 --- .../firefox-bin/devedition_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 6abdaac0bb7..6b08c3798ba 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b8"; + version = "57.0b11"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ach/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ach/firefox-57.0b11.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "669b52b7784d7d02178ae2e3aef14fc4197705749ecb5eaff197ea71aae90b399811029da527964cc2f428707a29706bb0cc3911fc77db3c5001c994b1a2a770"; + sha512 = "ba86d5610b286bf392c94e7dd5436500fedf033946c34bc56a53b1e9b4e934379e5ac82a989168a1d339b4de0819f273cee48d688899c34cb353f83376201183"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/af/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/af/firefox-57.0b11.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "d2b96148c787bef4db0f0f5c288ebfdcfbd24b43dfbb890b90fb2f490cb08096ee18f990e2e130d5ef78ad8965bd3e719eaaffb9263d7d94e3b6edfc6867e832"; + sha512 = "7cbf2ad3b2775b2edebb6b789896d9c2cf63c6a59272dafd1548c20b6ea592396b9f5b622f09305dce199146a23f98a16c8a8b6835115edded902114aa938be9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/an/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/an/firefox-57.0b11.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "db3f9b3470173b176ab2d91807dba82fdd938a00eb2a8cbfc27ad9fdae6d7ba5f5c6af11b5ad191168d958aa8972a1c2404a190d6a1b4d14e09cf9e366a64152"; + sha512 = "4befe56ebeadccc674cad25d5c58ba8d330b8ca79f7deda3a86314ddf289404b8e167f31e3717ab360c78163940a90361bdbcbf112ae4830eb15f0103ec40442"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ar/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ar/firefox-57.0b11.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "a86f18c7fe63098b56ec160982438bfacc4a7f93ac27f17ff7a34b179419e0d4a98d180517d2f3af621e14567ecda01805b8dec9df4b35eeab137a73f681b56c"; + sha512 = "8aabaa49507ce8036b4c921c78697973e69cfeab9a1091bf830c085f9b8287e41b026bd237590f2e2a89255b4fa4db47e563f726f945d15ac4ae5b790335a2ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/as/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/as/firefox-57.0b11.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "78471fa0e2a27101e919efa371be09175b3216174fe321c5258d6b2e02e35cb1b194da1700a7b4392fda6e66ba5034edf70f5b6cc55164327b1f694afda7abd0"; + sha512 = "68915c8a35cec3b9a2c9afb8f2c8e1cf5db0874c23195241fac7b75d317af0a23f53170d6f9169eeda3210202430c56e9fe47cb0fab434300236186d60d4e04f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ast/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ast/firefox-57.0b11.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "69b7626e236b45549aa11e7fd98ed5dd9be2b705869bff521cf6c4d3834846728682fdbb0848bb3fc9c74a42fd1614327f4875c6161408773bf3e5eb29a61f8c"; + sha512 = "f72a8fcc4cef1522f91e70158541a1328202a7dfeb467662deaf70ca62b049c942e664301f99314c3940b9cdb6bcdb663c3175c81d32c31a4a547954907813d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/az/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/az/firefox-57.0b11.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d41c8f045b2ff59949297c6d6f8ee4316eb6f7da4d17a670e8c53d5a69fd70ff0b518d5bc6bc1704991a72ae2c43d7718a21966fc56ee4bd27e330fb2d411061"; + sha512 = "4246cf3fd34a9824dd61d488966902086b51b68b5895b491cd7c3db81e4cdc0de8f06f74ffc77bedb80e5069e594f49eda524145c2f66c2fa8fc86db8177bfe9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/be/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/be/firefox-57.0b11.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "23e83c6929b13e4738677376832edfc0beae95593f56a18ac359dbbfec0fd9e0280c113f39b53a4b489b5d7a90ec3010bcedc62b5718e5d97905ac402160ae6a"; + sha512 = "9858669e11bbbe6f56bbddc2f3c94f0586a46fa5fbbde2a4439d6aeaff5bd28c9affaebdee4a2903ff1bd29392f10df0ca84a9695065c9dc60e8066627465d0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bg/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bg/firefox-57.0b11.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4319f4c81b740907aee2fc3149a818b5cf031bf6f002d4eeaaa6e96b5232da5accfcc0dc9beae9505e8b34541743f347914adf044248c504a5edb37602df0dd4"; + sha512 = "8e01fe5f5c02e9af5cb06a2f29860e1b7157c44ab10f21060bebb9561c9810d8a779e3c54a585cfeb2ec3647d2312b55263ad3cf5408ea36bd380caefd0a8688"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bn-BD/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bn-BD/firefox-57.0b11.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "62b1b6dc18a418546ae5fc038eb327889ef44344b1abdfda6714f1564a2173af4ad7ae1fddfa0d495e8f32cf740b0e615549c6a2cb17a92cf1db1cc525a7eb86"; + sha512 = "adce1d58ebf4994ddb89db06c79411e7d2bd3b49a8e55f2bfc5a4a9968245973f1b01f30c74a84fb09310dd589076865f2d10b17b418d390ce5ed0898fbb5cc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bn-IN/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bn-IN/firefox-57.0b11.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "c829a39e7666c6211948ee8a41298d42cfbd3a9c76265846462a220a136ebdb387e764655820d6b2835424433a2f94d974072e6c91962a343fb9f5544181bc68"; + sha512 = "23910c2086cade899f596f22d0f9476f5cec5481b90467a90710711eadf54b04a1c1a6455ab741374df64076c633a70ea8b375e2aa280c14a193ab204a4d8609"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/br/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/br/firefox-57.0b11.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c9c9ad941fd32e3bd15e1f84ba27691846cd6730b8f1bbfb70d3eabcdb0820087f22419c1c9efd654687d030f663b87bc1cec512da63bd531c99d67df2a80146"; + sha512 = "31ec45b6ec424202a04287cb97ee24aa45968a41a1dab47cc7411b865dd8d3c9fd6882482d771cbc9e6c0196dec4323fd17ab5e095eb0ac436e2726896aa6a26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bs/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bs/firefox-57.0b11.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "3fb8b36ededdf18a0e73d3656d063eaa9b68448c4130d3887c554cebd81fe523b986bf82c04e7319a8476ba9b8f1165e30b5f556923099c1503951f5a9a912df"; + sha512 = "cb90a2470143abcc536e9f737cd655e2f0c4157088837ce2194213baba6957e34f76a974133be81f201d2db649901f33e3143e4432b5f7d59401c1baa09b5d30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ca/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ca/firefox-57.0b11.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "502087f8485ba252c0f9ff8bb6e33c8981b3139ef032178984053ed39ff7f82f66c95755e72d14855d1a09e9db29b83d2be9cc8750da80a5c7eb641233005336"; + sha512 = "a395e2a36990025b74a7cf2d3f58339e9f98ececedf6371fbbaf8b97afe2ddd0471231c1577044b7b030586c7ab92512aa3a2a51e77532c17678932d4fb69615"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/cak/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cak/firefox-57.0b11.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "d037360832abf0d7545d1e43e7327dc26e8e009cbb9c8c027d1475f04a02262789acb44f41c45dcf5a3171452cb247b14e60f2e2f4d4a0ecddc45990b5a4b27d"; + sha512 = "2e04f7b530ffa28af838974d278a1aade3613df7a17a0b2e5ff8854972a1071f376a2bbc974ea529b392de11662028ad05a4341504e9194a02dd983d8d011991"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/cs/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cs/firefox-57.0b11.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c8d2c9b9347c8b393181ba1021c0f062c711bc2d1316f0512c0374525e3f9e6ea9bcdf8ba5b0466b87493f43ca54c13142528b420df0ca25322b3db68dc1b219"; + sha512 = "1e060e7c001b2bd4b722611b5f2ee7d9be5ec93581bf6fb4c5eefb4188a569716a1855fb175dcb489f12b630133374cd0879a0401027e043e04e0c2d060b4c72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/cy/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cy/firefox-57.0b11.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "8e538100f7707b4ec71318f637af0c880bd411e1d5e2c7dfbd3269e40c5a6360e03c97d28e23b66a91c5dd56b236171566d8f6c75e399deda4e3ec17b8baaae3"; + sha512 = "770b1bb389a356c5e99e371f1a1c7389d45f461a5d18f73685de289dc48f2f1686f39d44b8435133925e21659bda9053bf88f5094a332f69166dda468da40d01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/da/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/da/firefox-57.0b11.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d5c21abf48a38f5eb7c3b2c3d70f051be4fa75f1a939023a2d863fe1d17cf567d4371f82f62343017510092cac061ab74b7aba3a15ded5fe039d1b16352be81a"; + sha512 = "f659f860640b029f0f254154d7f8a21bf011d2025113e701a2894d35acce8f345513c2792b5ec0460921765a73efc5a2d6f5ae52a09d6b6a46d45cf72af769c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/de/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/de/firefox-57.0b11.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "96f6fccff058ea5b4db4b9ec6aa15337788c7ec4b3a9d6af6d63bd2e3342ec4f01f4ab839ea52033322efe0929b683ed73ec31175e82ee2a9a5e18f8c075a81c"; + sha512 = "123f3e65735317da980a57026cbf83b2ca30d8cf07dbf58f7cecab8edf805b05f0ceb2828176e8dd123cc3cfe33028357b53233add467c899d6878c1b2330c07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/dsb/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/dsb/firefox-57.0b11.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4e3e82a2deb88cd2f26a9eb154e94c6f0cdfd1b2dcc2ba67f5a5eb4998cf555e615471b6f9d82a83c4abc36e98235218212eada1dd1bf18ab1660a5e143dd1a6"; + sha512 = "e4f54c55fa7b66ee1bdbfe1b17f839a81c8fde5c5e0c18c9b02f779716c901adb0c01b774a470b0c6bd7971577bd0c29429284fb35402fa6c4ddfc9069d97f27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/el/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/el/firefox-57.0b11.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "29602ee19947e2123758e0f7c3c1a7ab98a113ff87d867f8cf888c0736570fec7461da23f50b1326aac421f8670acb87979b2ccbf22fb6c42da6094010fb3041"; + sha512 = "9fcc084e2ae0d0775d6357d9f3134cb1c60e9ee94be87d15ef90aafe7d74349684093c844c9ccbb648bc36066022762e859d21f179f074ba03ffb8ce7d7cc6c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/en-GB/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-GB/firefox-57.0b11.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "9f8b429a3acc453f143dc36d71e158d0b3473c566790d753a62aff91f9598ce27eea710d6734a205b354d681ea52c4a2ff1c39a6cb1abb2a9c99646718943b96"; + sha512 = "44b834bb9461d69ddc74aea8bdab6ad0c9f9184c5ddee037441b648da869ef584029f6c49119d22f96b43960ed17b96e82e466e42c7660ff990519928eea1aa6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/en-US/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-US/firefox-57.0b11.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "28a8d28566b79b787ca675221ee918dadbd03b839717eb3bb18b8d9a9b8fae036d6e9e84d68450fe9a6976d856e7a8607edbe71563f7fd4217e75f4c3fb5e952"; + sha512 = "d9ecf0ff474a71910b1611c0c8dba01e99b588719024776f27ad468718db5e6c54459da1efd648b31e69f6c3cc2bf87e31b65d5dc7cb373b2f141cfada5a2312"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/en-ZA/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-ZA/firefox-57.0b11.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "63853638b5708931f9d8d3b5b6ca995ecd2bb1a15e26341d2b2dcf588bfe306b14758a97384cb03ff9e55cc84d038c74e6735d2c2250a6656bd77859fb25d830"; + sha512 = "811e666873a3211cbd31fafe3253328782053479caa3f117b27a64364b6d815e9c294f1e0ee08c3394cb9a87e7364a8b5dc2a934b394e119aef0c0ba70c713c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/eo/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/eo/firefox-57.0b11.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "027c169cebcd4a165b4eb7dee9512f7b46dbf0c31a9f45936d2550dcd80188a4cb9d486cea1c9730a4bdecf555039171d14e887edad77d403e8d877ce55ed1e3"; + sha512 = "13513b8f3d288009c16d06dc3cd0505ff66ed3df9d90706c8f48986be9122b3e46b0f2e1d38b2a715f6b043a15575ea05405b8d1564891291afb6bf79d90ce91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-AR/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-AR/firefox-57.0b11.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "fd12bb4da416497eef2ffa824ded23698ac98d83ade117ab758534c1133f3f5b9073d95d84fe2ac518fd4782eaec337d97c60316f0ee1e510f7526cf05c76475"; + sha512 = "d9435c6fd5b6653173c2e32b6c8f88a4673eb4427821d5d0b01fcdd7f21bf93e42b02336325e4d6c295afe09a62d184d8b875eae4eb5337680ac9ed97dd17d3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-CL/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-CL/firefox-57.0b11.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "05c42be62f9855c56163319f5da721cb2dfec9f0a36d380620e2a4310d1fe3d3adb6c67f4974b057488f569fcb3c0ec97fea17147b1f8ee3d30dbaae3f1f3433"; + sha512 = "13623e646ccd100e3c9dbf373de2a039e5fab955c1c0fd1d35f0c20eea6e32aa519eb4a9fe57682c953bf79a7d5a766f4aca45b17c5b00eea403add4ec28a70a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-ES/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-ES/firefox-57.0b11.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "a081e0ab787190d185259456034266fbac06d8732ad10d608a14871070ff82bb7fa86fbeec8c1fd47df4b2f5b4903da1746762f8c105095dbc09552e8894a7b3"; + sha512 = "e1fb2a54cad6acd6ed7937dbb6c606b58261efa73a821ee2bb846d8cb32c2a89a57c52c2e5dfde8cf6571b0d23f6ec516444f9ef563e18c92b1ed60402f69d35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-MX/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-MX/firefox-57.0b11.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "7159d4ccd541bb5fc0128cf0f9e08ae202a4afc9b9a38a88b5d87f7fe456af8e43cc5a95ded085a327060d1a6c9586489ee2387a872a6777f2b207c4cd4a54cc"; + sha512 = "a1b2cacb14ce0f78aa41de552a53dacf04162a69f852cc11930e58ab8dcd5168e860b59310d761a63f2ff8edfec91b7b340316a708e6d2aa61b6321c82df5901"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/et/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/et/firefox-57.0b11.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e76ff5a5d1ed68dede803b3f299ac7e3aa61d6cd40d1863b624c074a1c9c837458cc1b34d78c932e94da7dc5d928c38c645ecfb721d8e8b7edd37b0fc8e3d664"; + sha512 = "6e4ffc6431cf650380344aac96be846a48e0aadae8d089d21784ba9a9944a3a1c9aa4f0d374d59023355d12cec2b38396aba0caf527088e58f6593bf5fd59bed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/eu/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/eu/firefox-57.0b11.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c673d2a1375c371bfe50288f94cd6879ccf290dce7ba5e755109b67fcbdfd96ced5363a129d0bf0ec6490b322a1d90beb8bab62ea6392d0120b0275d8c86254c"; + sha512 = "29fa095b868337dfe531538bcd4b24d16346f19277be1c6ce3e579f9cd696b5134662b58afa0d9089da37f6b312d54d19575c68b0f57a8782d2c6e46f1487d25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fa/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fa/firefox-57.0b11.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "cb9b3fee5334bfb11e53f9fe4c3edbab8e8db8cc916046bc21f6abe6a0a134191f1e9921e89c443376dd76475ca1521f8e7b39550a151a3f25f9bfa6312d2082"; + sha512 = "9f6a5daa3485a1d1194a43da4d8c0d8e740cd36d10effd8dd5360297253ed2c37cd2749ee9e1d4e7446f3c84b8c985ad30128d84abdb4518e442dfc274afe770"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ff/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ff/firefox-57.0b11.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "d8926743a7a15fc7144656ccbf3035ea1ca542421bdfeb0edc0b0a84343236e2cbf19635dcefe68efc44f4afd14697d2a833b9e85e587abb2a65b816cda74d7e"; + sha512 = "a7d8f16d8edc997eb55823b8327bb057bc97bf480bff88c7c67085f601a81744b7a61f0e6364304774950f87686a5bd192937de33feb338a0de1c336d6b9773f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fi/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fi/firefox-57.0b11.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "08b35f12b9182f5a6edf9759e30bdd4b8e8f801e427edbfd53b3c85ddf2f4e28cc7097b1cd08572e79d59a736474353c2bd90dd166eb7f50ca4e713b85f093a3"; + sha512 = "e43a7e74de01d5e6145cb2b1f2757ad9692801701884079ce678768b98777a972e5ca65e037f3b1cc20ddfd7206d7582674104c4601780c02c71afa077e93a37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fr/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fr/firefox-57.0b11.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "71e01d15790d27e6466dadbb55965a9f1e5df6409eba80ed6f429f45eb03bd21b0cdeca0b2a162beaf9435c9b75fab57f7ae3a663c944de297b8ab432baeaa8a"; + sha512 = "ab407a6f84324cc7bf302cfcdbf683f006cb9170a5d23932287392d626f3473a7b717bcfe87e09f8f7a7f7a7563dc61731474c8b4fba5e89df2d34b2b4ca1cfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fy-NL/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fy-NL/firefox-57.0b11.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "c86e34b5d16a2915d3c80fb6c69a444343c8993aa39d4589b899d702c029804f1a790fe093bca608c9d7fb6a3ce1e90a37696ad069b2075067c2000323b17262"; + sha512 = "7f418fa811acddd2dd6b0a7c3c24b47359c1e80485d80812d8e11d6843914fdcb0314b1acc0e2e1a7a6df703df155849f468d2217fe5f99729b7c4e4a1b0f082"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ga-IE/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ga-IE/firefox-57.0b11.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "dc1d58d4b1e480f5dd5883783cb30431fcafdee0612dd1a73585db34a8e42add6a1683b10f3e94765b11637037199eae4517ff416d9db4d12e9126ae07e44a93"; + sha512 = "ed03c7411b9cd7df2cce532481d2336cc296889ee25c23a387f47f920bdc21b477571ae313b6bb3c9967a48bfa025869110b398f1c4249732611fabc8c96110b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gd/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gd/firefox-57.0b11.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "456b1790f10dec64ce6cff08b7629121710870eab2331019071730a9141b72d714a177a4018847cd66db145a1d3eec5c7fe7d64cd950d106e9fac06fa763af2d"; + sha512 = "421c17f1401a02793d8b5d888b7994be9638d3a62f39794f887b6e328a89a8311696ba272eaeab85a9200f9027312aa293796c48749eed8f62a60482e3513b91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gl/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gl/firefox-57.0b11.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "68e62e4ca5a77e7552e0eada7d82910c00032b77160dcd7a5d054951778600f898fcd1aec690c38388c82b485ff988ceea7b71d67b715c28aab8f2ce02abff65"; + sha512 = "970a6175e192046a9bb701bea9a80c83d09d73a7440bde2d94e740ab985808e8934c6b3df1121777b84282becfa4362c5595f977ba2650c235e235f9077e3776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gn/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gn/firefox-57.0b11.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "25a9a5d82c54129f4a995cde97bac927f499fecf451d4bc6124a845c0a210ae51d3f73ea7ada0c7e336b016f8a779d46bd8adcc82a2af7c8b7ce886ace779449"; + sha512 = "0cde258644b323b23e1810b8ea5dcf13dccd14292898d780cd24a1d2488f604d3dda4abf50a9840ca665d02bdb2b6bdb0186f0a434e0a350a71939c7fc7513ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gu-IN/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gu-IN/firefox-57.0b11.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ba8f2cc4b4576f6a9ecd6d7f41a0f36b465a62131041b4ba60171ec86ba9609852af12b1f3b3a96dff5d1a2ce62cbcd9116791db760e5581abb7689c8eaf2380"; + sha512 = "ca20b858dc312f43844d3aaaef8de8f677bbb4409a8412d3d9ba77e0f98805aceeb0513307dafe6425fb9cc8d935f24732558fd68ad3f6d408094fe1db3a46a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/he/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/he/firefox-57.0b11.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4e67737700cf23ee51c5023fb7fe19eecd546eed20eb52ed4402a247c060bae29a3bdbcb5a0ed88024b1c501d03d11f195ae36d265c30abc228434fe0f4d7b69"; + sha512 = "176d427cde28a1f69c90aecba0fb6459fc102d2a10d1be91ec7114643356ed60eab8cb2701802dc3641445bd8b5595ac454dd3b310a8e59f99f6467dd39bf050"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hi-IN/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hi-IN/firefox-57.0b11.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "855db36604b8cf08ec74ae74c36fa3c02b26638d48394d9fdcdc42a6d914b5a214b56e121e26cb28b8cafe1d3488cd153c11a8c717ff36557ea77e31d281187a"; + sha512 = "01bb047e7f5d259da175ec008a562d1a09ac3a327d481bc9604cb754ffd52cca861113b87a5fb6420858cf5a3be262933c8d4d35ec3be4e6c7b6ca98019afa52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hr/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hr/firefox-57.0b11.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "252e9162dd4ebca701425b3c251ca3eaebd6802929049e9087f0e472b60daf645c6a6eebf9d56d2b28dfca97308954e1992c442f2cca5cf21092957af75f03b4"; + sha512 = "d4779d34de6248f911bd52f13fb2b701e3d0d30327d79090175d665e684e9267d7a529635e855c0d4d98c04b668347d6c92fac8e027aa05eb66403757064cec4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hsb/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hsb/firefox-57.0b11.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c554fb601f4764e5518ad78c6c78996b6795926b5a9434cdaa734f88d6debb01b20db6648e3fea77cf02739ca22fdfe2ae953c9c2b26ed5204190f7b05c24eb0"; + sha512 = "c497e1fe9840623adcc29caf6240c84666fde14da86567f20b43901c6f519e52b11f774feaf3990ce3e192da5966ad399cff6bb2618bafb355ec2746040a05bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hu/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hu/firefox-57.0b11.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "f0a3edb3a55fc25f1ba94a5b372f4f7f284f405be03059f86096119f9077450e53e72ce9144ff1ef075d39f3eea291b3aadd9dcb80efbd67af4681aa8f8afe68"; + sha512 = "b3e49356510e4e4cc3eee442b87ee8fb757ac9c6285e5ec89824a9a32ce8af72ffba96874813e2162cc0673f08e206b1b9cbe32d0fa4e7ef87ffafe41bdc7b67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hy-AM/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hy-AM/firefox-57.0b11.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "2f3f9058f7e7b35bfe9b8203d89696f66b2d9e8985bc563161b38333e6f9065a661452aa41d859094788312c59fdae56c67b15ed11279251f888ba92b038321a"; + sha512 = "fc998684acfefbf64c8da70bb01cd76943132701b635763509eb264d04630f34089a306106a70c60638e4747ef08058f7e0a44400fdbd0048e9ab64cf7b8a84c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/id/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/id/firefox-57.0b11.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "100c57b91262c1e7a8ea1c3c4a604c1dbb4b3c3e8c5686c26ce3fbab8c5483e08ea2696b8abd55a19cde310f5b2a41b5327e0c95c5d9daf5c98240cd9cb4b1d5"; + sha512 = "9ab41fb2057d749fe86c9c578bdaca62218e83209cbc5803a8072e26a21bf3496c6f7267c7a01680ef3d7c1f6da5a402920a3bb5e83f76fde9465d9b2635deb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/is/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/is/firefox-57.0b11.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "e57db256ad1555d6d4d0aef0542b3a1bc9dd91a41431a914585bf748b924bf045212435dea6e06e72c04d6a16b9f30f1f99289514044f2ddb0260b5149f76cd5"; + sha512 = "6f6cd48c5122337109e55ba2ac7fe4ac0a0ad0424732414adc7ff3b95f5d5e07cfb603aad0463f006316526b3a07b7270426c8d31b43b530ba27313b609820bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/it/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/it/firefox-57.0b11.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "662038be5e6317a97530fbae53200d4285cc197e37dc0676bbd0ffec6719f594ae4d6190df5e157635ba922fbb4c37865deb4e2931f3604411bd23ead6713036"; + sha512 = "c409812a276eb9491e7e764c215eb0093db7e4863ae3da01fb878c838ebd0d379210924a7cae9b9a58c88eae43c317c54618005e1ab4f9e7c28ef10281d8dbbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ja/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ja/firefox-57.0b11.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a51fda61928771c55d2ba7ea73fe30837bb70e0aae7bfd51403422afa290b7b89ea5450eaf71c93b26b5f16f47bc7295d3ab47c4eba0dc823256609ae7f12a72"; + sha512 = "0325da2fa80de439d878b03635e934ec9445e8f6b48db620ae5de273181578a41b4b94db105f0b0e2567a12039fc2c25d46eb50fa95db4745bce9633d874348b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ka/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ka/firefox-57.0b11.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "936f9794719ca9c25255eecdded55838190f0277a2ee56d1165b066cfa36f517c1c5ffde024791e73f2e7b1cd4172c7fb230f447ae8237f18ed3e4d98d5a765d"; + sha512 = "fb664987b2cfb2806acfed73664425ac73bed0646fd5c55dd40b64f3883c666c40fe7a3e26d3887641055385e1561ab47dc5517ff536fe2f132a6ae0ef0cef19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/kab/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kab/firefox-57.0b11.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "3d26c9892a8bee295156b6f7357acddf3f7ff6785e4e78ef6fb4c3f1a86c0a453b914eb026f0314e36d9713e901684b06359c143995356623d77e35bdc11a8ac"; + sha512 = "a0035b46bf35bc0d79fa2f9f065d0a80447438a56bb7f8653a56ff137a351abcacb0934d7402b70e4eb18da330aa43704d31530fddcaed115b3ab4666fc66468"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/kk/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kk/firefox-57.0b11.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "56b3d70858225aa7b10d711e8fafe34b0c5efa65a7afbdc0aef02bbf6fa0195d4670611f401b541df8be038ed07b202fa53abb421a1d1dbebe0042ecf413d347"; + sha512 = "3a9cbb1fcefaa47f49b7f98a612e019c07b5b838d54709a6f8b70e530665a06cbf7344ba09939e0ab89cb1cfc195a31ef60fc1524fb7d2a0dd88b87776a784b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/km/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/km/firefox-57.0b11.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f3e29ce7109b22c2f4c1c14698907e1bd00e689386b3cc8a3b21c188ae5f902b7820911908cb2d740028d6e0eb44cb87ef30aef585d8bd110008f4d57e2de0d5"; + sha512 = "a681711346e29e9bfd8ac25b0a3b625c1e7eb7a08d502e66bc592fc4188878af0063974cf6dd60cbc9724ab489596561caabe80a91ae89ee0618a5a37c30ddfd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/kn/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kn/firefox-57.0b11.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "cbd3dc1bc3043450ae175703a34790334c2a0be8ed71703db29c1d31aaa0cf0f7facdf26603cb04d423a905e6ee527750f2e3783377d5466eadc9cb818b2fb04"; + sha512 = "7034448aafc92ada6ec4ffd974c9c15b8bcd2104ede74f58853c5e988cf4f4a10147d75e4c96730302a8bcb4a3403304ed6b379d369c2d1ebef7e37ca947e911"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ko/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ko/firefox-57.0b11.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "dab096fd4baf083a9bbe22c6c88fdb0278748e34a32dbf0df947c00d0462788d72860ea88baf84bbd524d808e87cc6d153f24c2bba6ea3400b409abb4459748a"; + sha512 = "14bec92a098c0398f75fcd2caadfd0c817bc5d1293b6cbbd667b76ae6cf4f9585aaafe85741ea297e6d994146586da348b7f576bac8af043f8d1918bccb85fcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/lij/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lij/firefox-57.0b11.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c1b52bff2b4943b790ae5088db20472a5d51f103722894a57b77c607ceacf68901f5bc8eb3eed50b1d5039f878a3763fe9d629437e1e598eab2533302078789d"; + sha512 = "7972f52851eec48e16037fa3fedaa2745be72dff2d147d6eadb1167ad664d7cb2620227d5acd0954a1036c7f55ea8b25f5a1da5cf0bd9e13a81b567208330eda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/lt/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lt/firefox-57.0b11.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "1cead7d21f0e0535de752038aeb1ea9fc620f84de1f7ec3be49293ed9ac2777fe14ead838c47154ee5e123a010ecf51c9f3effd4f23ebf53fde49196fd9e388f"; + sha512 = "cbcd1637e7e9abfa847f9a44c59702adf887da8e109a280eb2e2f41e5624d2c64d3e8c6fd0d7855497ddd89b38f6485464cc6cdf10934d5752ee57f919db0aa8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/lv/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lv/firefox-57.0b11.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "52dd4ac89d587d9a486742fbd95dc9bb62ca87818ee252e5795bcbb94de379edcca472f5d666c2f0d2867f6ac342dd6b1c282829373eea90577e32d791d77d25"; + sha512 = "323b8973ee237d34790c9febc46030ae1386a7038524c67f77c19344b55350a5b921694679761de5049d9b39710e6dc16c829423c969856cc619902cdec9ba4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/mai/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mai/firefox-57.0b11.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "ddb5f557241b070a068e26d0b93b0b1755820af1bb58c2dea47efb131ab94fcbedef5482770ec32153aaf676b86aa08642f1e2994cd747a7019b545be8978747"; + sha512 = "0456dea7409fc7f646b89a86adcbd9769e4191fb9fd2491d9e0a09a05d7a8181ade50ad84c98522c9958437ed53dab24aded457333b5b694ebc5884ec324ad8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/mk/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mk/firefox-57.0b11.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "e15d64801baf977b0ad25e3f36dc5745a649dd435f462161f333c6a6ded6430b49a072622574ca17d1a699f65d809badee2f4e0a51b29fe24d03377cb0cd2497"; + sha512 = "3363dbd1913eff92a40325d61189130ceebec1994e762efc044cbb02539185697b2f4eaeb2627f77920efd84efe6da8f6e6bcb379283422d8dd276b3ac5598e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ml/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ml/firefox-57.0b11.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "7cd72cd4656f84c9bd4a97e4569e1409c483fadb91c4acd94f9b728834646ee006b402f8b608164f6f9bd8bbd76084eeaec75dacabaca94707047a99038082dc"; + sha512 = "a5aa74b8c2cc081fa62d98a4476550f3c570e58da3c6bbb01216da2c290e85adccbcea5410ff48c814ee362b7194ab5f3b0ac1d00bd531726771caa2cd449c6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/mr/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mr/firefox-57.0b11.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "10ea9136e20f2243412b73f5180d08eb0082fe66ecb8e445417db126d0c7a774a9721a1038bdc332751ab87222b3e5c45c89b21afa4aa307be6fbef82c7df9c1"; + sha512 = "3ba3d0a66c560e00bf4531b0dd9c2d0e1bce29f0fc890cc93511fd00298ab06f1268cfbc8ab2d759dffcabd8fae22ddf516e69b1de2b5c18ae8ea9a0313ee35b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ms/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ms/firefox-57.0b11.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ee4bec5b6398a2d6e59d2cd5664fc688d6beccb18c75ee2071052680587829ca80aeb320d7ea23dc687c16b3108ef34b33e62d21683cdf698eb9b572716d6e63"; + sha512 = "5f1275956930a50b91b6ce8641f3616ecdfd12c7ce291b50e616d9dbc92da92863cc26eb3422ffc0210963ca17d3fc621456b0acae41a5891a307c9d32dcb569"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/my/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/my/firefox-57.0b11.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "5a239afefe69f6ea857c225358b7569feaa6c5a8eb8442e6a4e194d9e0c902ad8c4faf1ffeb376f87a3cba0bb624363a34f96f53f6e1831c49e4c5b64ba8d24a"; + sha512 = "5ca368da2411fb199f737c0718876f4f8c44de2f2f738e689c40e55398e29b1ab3cea61e9af463341ef36baa96793b2767f30d268162ac598e5d075719db9f76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/nb-NO/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nb-NO/firefox-57.0b11.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "88e9ee275d203caadaaf271974b6a2173302c855c6c61d59e1f01461477800f0eabbb9c2b181961eb27a253ce4343fca56d4bbaf8efefa4289ec990b9426910f"; + sha512 = "dfde18c2ea0071db8353e36b7b6578701429b7f7c6130f7986443d8d922876e7f6b532c57c987de789167e3e6eca66b523329dddd120f458bf05a703e49aabee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/nl/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nl/firefox-57.0b11.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c04c96ed3922026afa158aad3fb44649f50f1a77afe6b5245b65e852d720f441a86e9d3330cdd0e9115e5f97fb0d641c3fbd924f1e287712245fd19cbbb5cd99"; + sha512 = "9253d483ffc866737a3c5cc2dd22deb6269c31c1c413459860ff7f0f0a2716899fb788ca1b754354e4498ec6ce9488086083071bf13772eaab247131bb33851c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/nn-NO/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nn-NO/firefox-57.0b11.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e8013252993b58910fc2aa0ce907e187e357007499cc93342ae9002490dfb49ddeb51121dd4194b4c12915542e8759b0d30faabe54afb0b32919ef636bcd549b"; + sha512 = "5bf67fd3411a246cbae4eb039e6d8c228df712f6ac8c01fc106feca2f64b77e6088ef9c06e059ae4ccd03477aeea40010c4b3a953216f980973b84934284bf9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/or/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/or/firefox-57.0b11.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f758d21aa24459750cb7d2cc37668d5f92ef372ca72b166c7376cd0a92db907cc79531748deb4e4418bfdba82c6c5f14e8c1e066e90e0cc64707497458f7465a"; + sha512 = "a2e23e8e70733939dd39162864a1fc67a2870eff5b20e9de9ca028d4d619841fa2800fa7e8621c2e7f6cd16056fb58650c249e9214cb6f25fa5348b39a2de4d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pa-IN/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pa-IN/firefox-57.0b11.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "19f701e52912da03b68fd99a7e8d76de25287bd46b97616c37d3b7d2703d19e45dbcc42038742ee4b533482c89b8e70aa807b4b11c38660e5a7b3af0ebf1ec79"; + sha512 = "a87d34b6f50ab7001696b5c64577aab9cf0363f064a601cd527bab7a8181f9e5fd54bf4ed33552959ff0ef8dd8682ebd7b54d7d5de2b63150c852616897f1e57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pl/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pl/firefox-57.0b11.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "01339648c867b7f5daf3932ea54febd2130a86e8ff78db6f00a6dd3a7c3b2b474745548a256d8868107a84c005ff73d395c67b2a4e14ec2d9a5d0873ba5b7b24"; + sha512 = "3c748f22568a34d99a72e7630182d731ba9e46b7659334e4c5105d586d76fc13cc96cd3da7e1bf928be6b71c8e523ddd325abd7f06407845b894273a67716929"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pt-BR/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pt-BR/firefox-57.0b11.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "4c04df5d84d833e5f35be55cfe6f4fb28f74108043065019c11cd8add64fcd0669d47d0925ba8a9f076e83f00ea2b25695c9ff279cbc05dfdb8dd6a821da15a7"; + sha512 = "a2239a7783497818a2c5f3b810c213ca2152fff3ee1cd2d8e57bfcb08f781cd8c588936182645c5eb9281bb41f80be493b119382f59e7fc83808e848a4d9b582"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pt-PT/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pt-PT/firefox-57.0b11.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6a7c1d406c620fce6020941bfad7d7623dbd7372eea45d1c8fec1f7553be33b758ffe88e39af0cef59eec02af9d9dd48e540c9cf8e129e70dd33b006f686f842"; + sha512 = "1e1ca4b80c9defa67221f642c7a79ce8b6ae350b9221269f89b252b6e150ec081780f0c6043ae015216a4986dcee4a515cc26b562c73d6ed2a274f0966f0b279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/rm/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/rm/firefox-57.0b11.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "000b1df519f0fd275f58d2cd30f8c826c01c5c1874c16e3e0faab0fa3edeb66000a5c34794c03b88eff16da0c0bf4212c31b1d6097af00ecb1140e03ba50a694"; + sha512 = "6a598e71a3da18d23bbeba744d6e8bc6b85263fef93d72edfcec66f3bd6b80b48d328e9b3cca90573352ed3a8407a98d0a2e1c61a9a56258b55df0984f21cf2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ro/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ro/firefox-57.0b11.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "6100f64ae76c8c6c370018403bc72479e9d3e0eb28339637d682d1891eb25fdddb9cba9502fdcc278850a957922572b8e451277b21ceb003a896217b69a5d732"; + sha512 = "3ac6ef4b82630b697b239dc972522aaa8d58829be15be41bfc91fec2b7b3fa36a4a24c2b6a0208a13ff2d0d190be3c72cebedf037f4023666c76704f1b2ea0f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ru/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ru/firefox-57.0b11.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ff87b10a51db21299b673b753143be28ad5db9680dfe2aebe9dac65ae88ec5445ca47052c553c626fc5819e42c991ef57d504af05738db2b440e9cdcfee6ca8e"; + sha512 = "4c8122918cc65958504a6b014e3729321f8d440f79605ea22d90dc3c49f4134220c2b4463fe08737854b62a76d8e67461b3c1a41ea9999c78eed95a99bb2c524"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/si/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/si/firefox-57.0b11.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "1d777698daaaab61ed451510ebc905d1b385e4f6f22a32237ff7fba2593173688a4a51fbaa363c8e51a9f957b5efc1c5fe90fef25588c4962184c8749ec00358"; + sha512 = "e915c9acd651036a196f3845e34707a9622e5b49e2ef5614d5426849bfd809c9ab65fa0d80aa9865b7dc3bd9cfe906109b590173c545e84bb2b04d5edd2e943d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sk/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sk/firefox-57.0b11.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "dfaaf1f5e79df8e53b84763542e987f2630d5bd13b4b1b0c73a463fe16029ea8004512e57e8657dcbd00ec3b5f295073327a82fdb8e870ffb84f9edf2c9117c9"; + sha512 = "ab7c52be7a4b0bfbaf8a52b7189407218df48c73aba5d5ddb569f6ebdf67d12c8da014e300045a51d535279571241985a21901c1c9cde9c32eb9cdbf3956ba95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sl/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sl/firefox-57.0b11.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "50ac0f9a58b13c26ed7f2368290fd45aafbe991ed0011295e6b7ffffbe1e3deb35c4952b7f107bf195f9e604029da51d3d0f6d00d94348bc9838540be5cc619a"; + sha512 = "b9cde14b2886aa10b09cc862ac4882eaeae69ae5295625a9db046baf66ef16a76655c23b82d85eb95bed3985d13527c6eb210d006d5808dac0917b3e2a1b94ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/son/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/son/firefox-57.0b11.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "9bbdb11dca6271f8e1dbe5d96704ea63f55d7d778779d8b06206fdfb25ffaff4216d4266a1f463d343220c2badac6462c7af53afba57561b640bfb0681689c07"; + sha512 = "2ba989588f9c294718c6b2cad196a0b4631d3f189a5877ef817ac1b4b2af767531bab7ba1691dae21ceb29fbf63128cc38805db6412ce07af21d179c40ddafc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sq/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sq/firefox-57.0b11.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "31a6b5bccf5a976732bd2cfddc384923221bb59df027b67cf688fa7c81d67682617e7617b4418a42191decd65d46b0c8cc5db5ce4cb47bbf665de248e4291a91"; + sha512 = "07e478a5f07184d5730665b52a3cc162569553d7fc43b37579d4a33bde5b70f8ebf2deab9f6b144b961222fbced4f1fe204865dad46222c94b850ed3600e3a0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sr/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sr/firefox-57.0b11.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "7679aa019569d2dc583dba19165da84e0453de6f26c86e11196f5d25ac1f25b3040b375f7a944ddd3550ff4678783efae2dac7990695d9f805a20773196ff287"; + sha512 = "255f62d5f88214320dc1febe610f547b2bba08817e8eb7ec0c23dbcf5d900f47307aafe63193f93f1a3c1dabff3b7f49130df1cdde940dfdcec521553c4733a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sv-SE/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sv-SE/firefox-57.0b11.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "834a14562bdb8280072daf8ae520296f8ead6278a27048b9cd95b4e31eff83334f7e75369db0febb6b88f333b972eabac94522b1c1dcc1993b51979a9d28da12"; + sha512 = "4fb0f74ed4b7d221dd75c8e767b0f021c8bdda27388392c2b55cafc3ae48757b0bcc506061d59bf430fc2841ccd3aae0cb92627de00809bdd8fd536c860def24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ta/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ta/firefox-57.0b11.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "5d1b2e8c9e5329c0d3dbf73bafade644b797961e0ca91aa0bda65dbcb6ca7a7dccc063cfce29084a3d66016806bbaf643e74e37049b66293151b727f423128de"; + sha512 = "02214d133855b544246c930ac834c4076ba32a2f490deaf9e53cb8ed61ea6d9cf77d04b2ecc41d25eb1cd8dc87515725cb7446e85876b66ffc954d1cc8dc88ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/te/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/te/firefox-57.0b11.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "27dcbc709ff7b203688ada657936428eccad4969875b8416d20963c8aaf146e89dcbc50bd18f343df15c25c89f89078d530f242a0711ea4bad6e74dd83f4e06a"; + sha512 = "94d8bdd506216e56ab6b866b9f9a8158101b961e32e691217e16eddb748533fc39d312415e005f05656b877590487d5a5c340d4cb66f5fc9f7c97d9959206ea9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/th/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/th/firefox-57.0b11.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "b6fc169928f968db1dd0ed6510be4a4bbce447a100df03bd405c1020e74062f1cfbee22aeb737ff1453a22e596d91a14f3cae309d551532aec2ebd1db98668d9"; + sha512 = "305bfebb6a51ce94561a25e19acf82ca4efc3093a8de97ac352dce248140c9eb50212ca11cda550118f6bef6829ef3d6614c4696e09c662cd28b05b6d592f4a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/tr/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/tr/firefox-57.0b11.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "3d139c2ac6efe0de5c4c58e1e029831e93e49ba40831f38fe7e2d88a8a001302971b0d232bdfae49cdc97d5cce422d4fdd9c8ea47e467c16c2ff5465590ab6e2"; + sha512 = "37effb1cc8d59c6b6d556c1c99eef05f5bee3a31e9afe9e606790d1f901c40a20d34099d62ec610a495e9fa7a84060de5203349af4899f9da92f705fd59e9942"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/uk/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/uk/firefox-57.0b11.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "27a75956fe9b4e0a68ee14797b941fab1d2a48e5d78dde9cdae7cfa15395c06268fc9a5b2c9fb7ec52007e7e3662c4b3c5622c41acb8547e362771a4cd6722dd"; + sha512 = "2e7fc820dc9af6da8bc9af01d18c17138676e89d5e5d7e11e1bec938aee7db5d1ae16fa8b4aa03fba85adb4c9a31447fda87369b1b6b4ad7af4d265604ab9c13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ur/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ur/firefox-57.0b11.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b732a652583e99526f2e5d542d09e7f19447683dd30f1674fbcb2b06bf19ada87b66831a0b0e008dfb47be9c581a5981bdc2b6d8642d9c8e40805cfc327578a7"; + sha512 = "1698260ed76ecace3f65063e0e076a37fe4d780743c63512994826138cf43e60a9617c36d514d5b3a349938e7ef7b9e670d7a819cdebdc10ac5ffd00aaed5ca8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/uz/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/uz/firefox-57.0b11.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "8552d4c8d8f39e993c2d35804a9aa00fa39bf294623acbb6362259d8545f5aee1b52b96e5cb8f3d438981da3503b5a31bac008da70c2557ca05d19615efa72ca"; + sha512 = "99da803303a3269bc510fa82e278448e38ea20b73f6dad40682ac4037b23cc6869d2b6bf4f7f07ecc1b18ff3b759ba2ba4e13555a61cc9282bd29651571ec1df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/vi/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/vi/firefox-57.0b11.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6aeae2edd0fbc60f5bb83abd5cafbe860494dab193315fc1154a820e4dcb1ea35b88eedea5a3f5c6aea424e0f662d42c38eb0fcac1ee233158c9dbe16173f954"; + sha512 = "dc967eb9b8f5f53a233212d5c9f05a7304bff7d2d9b8175e4f197eb54ec3c28ff6d8b634033651b20fc98a68e2d585338e6c3b50b9f22e4bfdf9b55096740d9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/xh/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/xh/firefox-57.0b11.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "6824264b337517f497c78f6aa6485606c239588d0729a53a9d9333c836051b7f0f65b852eb10c0abf81c57b166b65d99f09ba0f17b55503c836ad6d9ff82a25e"; + sha512 = "7a47ebc63b02734c2ecf53ea98fa246a3d6612c203c9393cf8958230c583e0150b5da9fa3b315131d21576d6028565ab15eaed509848da850b7dbea65f580637"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/zh-CN/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/zh-CN/firefox-57.0b11.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "9dcffaf3db7f7f4cccbd36f5e77276faaab2808dd5b70058820d9bb932b2e4ea4176a52c6850cd7f46953596d6b157eede8c5f20b6bd304fe2ab8263378e19b6"; + sha512 = "e6c7864bec03ae6ec3f5293373ef5b5ad04f1430cba8433b7e6d4d40ed4c40eb78ae48fd85e954c16a8dc5ad7c95d509cc3892832002ffef3b99dec161b4795c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/zh-TW/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/zh-TW/firefox-57.0b11.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "9ccd29e7a9e2dce5294cceb2932ccfb7219570e570b58be350fe915464e0cafb7c739c86fdcbe8bbdc8f5112a769cc43dfaf44a292bbe821766d30e11075d20f"; + sha512 = "18cc76259b7f9b50d1dad72d76d4e9fbd140df85101a480a078840f22f8f778b90debe246e953591a7c531a64050569cc1162be30c8dd0054602d46b1e3f7ec1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ach/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ach/firefox-57.0b11.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "6c4c5c80365d2b5fb2070528f4072cd6962b7fcbcf4a2444e8af1433c60220a764ed75ba868be95b6f6cb045f76c40903130c354e262e93cb83a94b671cc1243"; + sha512 = "731d0a857e84a66729efc652c0b562d683f12b847df3aacafba14b6b8c9f17a3b6f7c60c40dd68d85ce81c9bd876dddb98e677fd532cc4801769683530948761"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/af/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/af/firefox-57.0b11.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "9d36a15f517f582303ff10ae09c7eb4e709d19a0b98bb9afb6f1a511ec787121676d749c93b46e301ee3a41010c883aa76b1ce5b248c2141086dd4551c4e9887"; + sha512 = "ab2bfa2e51c36e254b9a410fa1b0ad1a5d4f2fe39b3b09c403a923ffaadcf339e71eefdf22dfa67af7a9b4c0ee543c9f507e49f9ec1ff424ec8f741950617ea9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/an/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/an/firefox-57.0b11.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "aecf7149169b784593234906230f632d1d6d56efe37d6d2a060090ee2823f837551fdfbd5944960c05c436bb2768f529ba581ebeb6afca6f1b05a77c3a56f26a"; + sha512 = "61bb9e3e5d8341316888c8c8ac5df92791256181e7873db98e9ac4ccb40524552569c7b028105124c549a3ae2a62c056b310d89a2489a931be6a41d5ffbc291a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ar/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ar/firefox-57.0b11.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1a49d7c9819a35f1bb5012191009efcb9c0738bf949bffc48f78f24e57ae9289129922e9beb850a919d6f7a19a86639d9681e4abd2b0f7ab882e4038a1653bae"; + sha512 = "132fb475429664ae4df2d5d2dc08274c7b8e253fdddec3e6ee2f0d11b5662b11553642dfc3ce69dfb2c1658efd16ed8568c0cab9ad626acf223979306e7132b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/as/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/as/firefox-57.0b11.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "a0309c07f5f8e4ba7283e6d852eb3527145f7e756cb7376acf560a17dd56171269d722b8cfd673ddf8107009c8657daba2c66f48f70c262404e1a349de65abcf"; + sha512 = "86658f39915ab733cee46f19929101c50168f8ce78cb6e61a9d7814830a2eb7c8b7936db858c63beee7e06a94be9043b80975382cc2ae8623198afe8b65226df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ast/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ast/firefox-57.0b11.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a3bb2ab70eccabac6f27df4595dbab2fcb63a0978b6fc1ef965db8d4bf0228eabee91f771c67c5e7b7fc5e322c50c8fb8e35e7b95e5d2e913a0c8f19f8619db8"; + sha512 = "1cd4a682a831772b32b603edb6277b07b3f0de78b33246c2deec2c75a023060f24de2cd6c5ee05b6eaffa20b617fc8f7a6f413f502bd99c39086b689ac817444"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/az/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/az/firefox-57.0b11.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2c17f965753ef834a010e00055120282e003cec20290a90050a6ef9a6b2e134c6553aa33c247cd15962408fa67e654dc50603fc02b04a43a3584c7ade477a9f1"; + sha512 = "45e91932826645df3265152fa3c80fd74ac729f97fdea29059a2e778ea04af1cadb8a0a7df8a8935ee9e70af480762d256888c4fad1be43101eebd95672dcbab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/be/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/be/firefox-57.0b11.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "da69fd5a5e50b870d76754f81c8d492b75c239d44ae36ffb92ce3fa3504b35105c5a08a0c6228041a24d61763c616dca44c2ed2d4cc941fae59d521d6d3ce064"; + sha512 = "a3a7dbc02eb8b3d64c67638a71e53a98a30092e03eac97c382aee8f2aa1cf099493c65aec5ba96aece30deb50bb5cee2f35f1ebbadbf38c93e8f9f9917b79406"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bg/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bg/firefox-57.0b11.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "f85962ffbcb8f01c896cbf56ccabcf9bb6261b0989b40452e0e3e1bd297c31f6ad30d228d2c733498a6cb97c52b468269a4f76892b495a1c19e43f1294ce0830"; + sha512 = "7b52a3bf5a2be9f4de6f609ca11a7f7e9c219a9cb84d503e892e1b51868dfa10e650f6d75aeddbd0edf8fa54b48aa3d3c4852e0e4615efdac78912709b162591"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bn-BD/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bn-BD/firefox-57.0b11.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "dcc23f3fe7df774b752018153161376cd768eed4dd6b3d0842959f5762145a0bcef3e328e77f6cc021c57c95f2d90fa296579565c21c70cc126c29a5e4a43838"; + sha512 = "84c687130785782f9b900249db6d108e160c36dcc90eb2fc10ea9661cc91b19c8da262189e72b3259f987c05dee4e2e83c870cb2b3e3fc21178a4dbc19598981"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bn-IN/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bn-IN/firefox-57.0b11.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e530547e5d30f8a450f84558d65709568615644373c42e3f442b615742c6d0089f52f04fe15baa8d3b8bc9d1bdc95769f64bb0c555c93d26329968e542944e5c"; + sha512 = "3d269322796c2384ddb03ccb07ebc0fc6ca04409d1fadd6c11a1ee436092139929f414ff9c46883379e9c92441189da386723b8ef7dad5f6599b1b522a3984a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/br/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/br/firefox-57.0b11.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7a0e21ec418a344d9df7daf1efc14319ab5b44d22701acfe2d15fc04b32fd2c41aa80c592d4357f6fa531c64b74aac6c6bd7cdf2bfad4f1fb90f91c2c966b932"; + sha512 = "95f77bc8d74e8b6fba6ae6ee59f12cfada50572aae4aba4e3b519290dca20c6ca45111b5b7e58f5fa2a96cba4d35af4ef20dda4b908e607f00ab7c2d7ffe7834"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bs/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bs/firefox-57.0b11.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "e5eee2dd28d47efe3dd629826d90ad7ac496bea3f2a750389cce8bd7c3fb03587d52bffb1885fbe21ea2b1078e97bada39ea839573b9821340a4e23626a845b4"; + sha512 = "0f171ae78a2f5c3939827afd61dae0c96fe3e062a77be6e2de172e5e7b3110e953bc282ae353d1629daf9996798db65a163e4d74e6a727a734753708545a2d0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ca/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ca/firefox-57.0b11.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ee039ecf51f5548615e5af41e3e77be015bdb679f00355601849c826cd18a1ea422a5f9a7bfc0ed9db72a0e321e52148362a79d1515daa9d8980872e04627f26"; + sha512 = "31243cdce440f556b8588b53c29c8a9140b43c9259c6c16c520773b5a5aaee1944a8f29b427d443701924075547d39f8eeb4eb61b683bd467a911cb59d549e91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/cak/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cak/firefox-57.0b11.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "effb915c80355bda7e6d58befda98ff7e92d8cb70af09182f987d3125127a3c06a830fd55976f0d9b0791cfb910aabe7582fe029e0a5e94b3da84b17f797e4f1"; + sha512 = "c8d4bc2e74ba30cdf18b09911c464b026781933d234ab8421c2b41e19753191ffff7fb73a5b77283d372b2e6496edf818e8f9ad4e06faec184370c7b31c9b3d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/cs/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cs/firefox-57.0b11.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "78987c7192835c39caf8ece474f3778bf7b12a20acfedb544bc5a76c41521dee0b9cf240314cf954e6d2f1964e60ea93ae700c63b97260781db03bcc6026d982"; + sha512 = "2b64d4d1e94ad36439fa95ea97915ae920fd4f2c0e749efa7d1367a9298a6e8ef96a177b0c435a96120644f8baddb76492827164add7caca100c80f7d11d3a9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/cy/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cy/firefox-57.0b11.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "822ddc34f737d023e833ba4cc156c4f25ab7715e1b80431cb29226d3427a354f16ffe0b98b571a71b0dcf23f6fa35dfa7a8032ad2ba478a08169d44fc89cb802"; + sha512 = "70accb1975ffeb4fb3de11171c603e2fc5be7f9873a0d584f906e324d7b64a885efa5ec46739575abf97ede95d40299f1d30f5facf36c3073284d79485a701b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/da/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/da/firefox-57.0b11.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "1379fe59e87b8046373810489af69f4c946b6f28569b684c381a8c573044d81141b7fd88893c211404f3f59b66d65365e0d1a33fd7a2e2cd09d8174c6ee6e1cf"; + sha512 = "54d63d2248d253e70fd5d69f8507878cd35bac533b77378cc700df3be14e90d551f9cdb2c5e5ccef570cc8d0a27a827c45166ab5ee8a50376d03c447583a5583"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/de/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/de/firefox-57.0b11.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "dc9cbc7c428704f2f17b50e1b95169e0e922fcefb9d60df73f455384d8cfe37ac56a4e3310de7ec6f29e855ec2f486ebae86544551f91d46f5e7df97566242aa"; + sha512 = "faedb51772813930a29e639bc11d713e484e79fd220ccb0c72b0071d74eeee238f92a337cb8a00c3ea86f1892baa5211e1dfa7a1d102c2869de1743963c176d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/dsb/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/dsb/firefox-57.0b11.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "1a2cf9e55547aa47205a83d3dd95183c3f8aaa9d9005dbd3cb47cf629ee9e240a7564f69ce6b3b51a6f320fabbc3f53665a7e739a75480f7d2ac86d9f21a5145"; + sha512 = "9f409b32ff72b5039481cfe88db1245f1ad626b0f1f8a500d16c24e5b8deacf2188d5a436259e0920667059d090700c4db1997bdf875938da26863a3096fdd95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/el/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/el/firefox-57.0b11.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b48a7bc131cd0206bd4e024575df5557b848b4f1f7734c59e1101d34c5617fcbb740a8fb0e75cfd957f6f84757588087fccf5923b6e5b58cfaa6371a416a2a89"; + sha512 = "069b856c0b4e5b232572bd838ff9fde813c72d14bd731a08ab7acb579f32eed3beb6402ff0669a1789b9e3a486fb76ccae593ac94975828d13350b3a24baa696"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/en-GB/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-GB/firefox-57.0b11.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "2f8b0c7c6fc4525dffc05f2a74b182e93bbedc45f2c44369bc8a00d889c9b50ef5d0a4db842555663cb3b88c65b4177c946930ff747796d3a60eda87800514a1"; + sha512 = "fcb89801772ec01f7863016d82c0f5aa430b90231c7c46fbbc0185246cacbcebf033227fdb90a2395f3c21012bdcddf1e745c1fe3c857add303ee475c2320f9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/en-US/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-US/firefox-57.0b11.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "a37875973326916e2f83f9b5ceb625e3fa3d714d5fb5335d33ae59bf8b196a55a1a9aa24b553ceb6c5048c15eade78e0f1e050f253cf580020a9d24c8227bd74"; + sha512 = "ee3c3048b6644cbeb32ab784834b7f9c8c900d3a68da5d531fe4d7808876013f0990b2329cee04dbc1ca8b5cf3b4b10c39e19659b09d298961f1706024427a78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/en-ZA/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-ZA/firefox-57.0b11.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a35bc33e37b1a2eb9591f2a454c228beddcc1231fba8e7f4dba605b00b93077f031d34ba24da84838dff568fca6fcea686273b75f9c1a09fa3b3cf919dffae8c"; + sha512 = "c31db87c3714bf29e19a25e4791e7d60c140598b7c64d3e47a413bb8ac95ecdfb67e97d6c5491b76ee355ed46bd907b736109bc64930629dbed4adb91ab07aed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/eo/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/eo/firefox-57.0b11.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "f52b1b7a86a6819ecb9b978653113a9ca6200d1e2933998bfcc2d71caa2a3b29cbe44c5585d4aa5725ccb74c4fa1d2bc0e7cd51191122a927ffac7c7c83bb332"; + sha512 = "e84d9ecdbd2f03bb0d6673da736c618dc6b5dc7844384f3e1bb73041d8f7d1b85ac5f8b2cdc9c6a316a931ad34830a3a1873b6f0c517c97eee5d6fd1507b8df2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-AR/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-AR/firefox-57.0b11.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "95e8ba066380a32901f264b1c45905ffed067df81195a717d4d0677b10a54750ddc8946ac8c6528c7919cfd894297ee20f17f4ff3cc765b7946ce246417a24a2"; + sha512 = "d3f4b7711f81707a195e00ad532a5383a9d47d86681e882bdbb5d2d1145035b0d901abee5908daa607d3b6df27fb8eabfb163b6c800a4cae15b2211fd18d8209"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-CL/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-CL/firefox-57.0b11.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "8d90f38a6d7b91ed7e63da154ed4a8030ac8648989b3308590153db8c6506e5bd09e4689aedfe785d113d094d8d3b6321aa448755ab236dc2b6513d6ca5aea99"; + sha512 = "c2d32c0666c7aeb41006720d7d10e55fb8f4f3e0e053ef43f8ef06c2644b79d51a47417cb4d84a7028cdb83d4d74bfee982dcce9e7399ab292f00665f31c7c18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-ES/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-ES/firefox-57.0b11.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "fff2d992821815bf09a9bd0dd00100a0a9798b5a546a17d5bfef05a18506b37f84d643fde0d3de34871eddf1563c89549e53d5c826bab5b069998102df924ca8"; + sha512 = "b3a0e567aaf8defed6cceef8832bc188a4cc47599be7a02b6a63cdea2fabfa5380433b75d48d62d9f4fe8818160239455e7374e6a3958d4853208e4cc7b16e07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-MX/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-MX/firefox-57.0b11.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "048b6037291c13ba355177e0a335d4b48409588612791bd5ed3d43d6d69fadfc6228242339dcdeedcce78e91ac8c6ac366ad1f378e5165576cc48dcdcea0bde4"; + sha512 = "a073552f46c031259bc4f3b05af5a9692ec4b4266d993468900ab912bea88ae0767a2c1e4ec16ccfb33293081f83aae7ce71dc0472efe6340ea62ec65513ea18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/et/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/et/firefox-57.0b11.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "fcef0b940eb21cac6e9c28f4bc13497865539fa24ac7f83fe24fce2e14318f667dfd16c855ab3a7485e9f0f103da60903987a7c6bf275e87a7ecda997775a395"; + sha512 = "b24a6b6a3246685d41a303c56ccbefc4596e6a09a9690f8fb0e522c3d25e3fd2fd087bc99647d4e3035057fd4245e00eee9abf639f06612dc4b7928c4092fad0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/eu/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/eu/firefox-57.0b11.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "781aec0d080a00ff86c56af7c626fefc6351e86f23059791dc026858ea5cd7f18c2ee63832f75590bbbe43d8fb50b525f115471c1481f84f6c201c4161a086bc"; + sha512 = "36cd0b76748edac4a2af813fe1ae06de166501eb765521cd1abf4b05bc55b0460b74e09a45d7e39910b1cf6dc6750848e64e288f27a23466dcb76ed4107da637"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fa/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fa/firefox-57.0b11.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "94d0b6c20048db72df1bac942c348e9f4b7907620507b65ad7e3bbde08a590d10c556f817f2830a8813723f01826c0fbf68925b35a49a4647f3da5dba3cababd"; + sha512 = "66108dc33aa1eaa305ccec598c6539795b06fad7ffc29f5da3576f770f8669345d3856f589bd6fce6eff3c446713b69913d1914946c0fa74d1c9f9dc3322964e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ff/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ff/firefox-57.0b11.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "669d03edde5124cf1d4c6531e65b62c6948afe3a2710f2d16638fe2aaab85108dde864df49ebc34dc628976782770b5413f33b836a76162edca459c85d19e1fa"; + sha512 = "8c8c3cc9224bc4b1aaeba0037c09185ac8e7ca6702e73df125d4103c3bd4e8ed95509c922d81afb25c8704bac08003b44d637d00962c000a56a5370539b780be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fi/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fi/firefox-57.0b11.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "475e298d214356b01938ed692853e982a2dc5b40d15c2b029db81525164444e96a1c537279939ce6c7cab283f535aeb246d28d5d75ecc13750becf16870aba87"; + sha512 = "74642dfdb24453ff4e25ca74abc772ad30bb6072cd81c1e597df1b689b59e64bcf8fb36fcb366be6b3eb5378c5d682460ebd27ffd9ee069f5649a2657138c2cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fr/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fr/firefox-57.0b11.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "81c0f51da6cfa79e6de8cfb422b41a0851bfda2c4bb114f72662bec504f302b8f3fe40067fbc712aebd3281ef256a9d3e5c4c901f5ebc7ea3fcf271094ebf34b"; + sha512 = "e0e555d2e7f31a49124a2e5cdb28dca04ac1d67400ba897df52716dc705f478e0ba6928ec8cadf5e82431c754a1559fa838649f0cc5cab15994d75d86d64a12d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fy-NL/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fy-NL/firefox-57.0b11.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "66f68daf373a3a2a610914f05ec0273e9e5ba795f947e08301bfdea6122cd1684a1fc7c3aae3f40b534dbe24f6cac5ec613aa239fcb5e52af9e231257e04b3c0"; + sha512 = "c6a508bb5fc7e8350a0200da8aa189805d2af1c98bf623327404811205dfbae9365a3e4acb167d5867b48f2c28b9d1ec98edb6e7b9204d31fd0364b763e249e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ga-IE/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ga-IE/firefox-57.0b11.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4fce38ceac5b1186fb0acf5be6d24bc16d246b4a4ba4b7ae37072c3066de7e9d90638e43875fa7d7fd2cb3b5b88e17b1ce8050b8632f4668ee4a2aed2f5ac6a0"; + sha512 = "76235f086a5159d51579d772f223b694660a7c64b3701165f2f11317ab35969a3dbc8f77ced8cbd97cb0219545e10f5165e8786de0fba2a4ff0eaa87a1ee9253"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gd/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gd/firefox-57.0b11.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "40574404c29ad847503d3ced707e7ac21cdaec0fca40dba3e31e27f260ae7faf6da07d3852978e3cc190f3ec2102fc151c723d185f626e01e6a21d13e0ba6008"; + sha512 = "1f0cb2ee88a34caa16865cf9e86744eb5a71c7133bc6735293bcbb5f4ef9aca7f9a3b4f8d1ec353728c3a7332c2804278ea58dcfd02a12328e5b3937e3761f39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gl/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gl/firefox-57.0b11.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "aeb96aaf9da366ce06e7453f09cda9ee62e576c1ea8b492e71ace5a35b5bc8e2c7239efd733ba565c3c91a9c9e48bba40db3c5b3f39c321b4c3ae8cb1a759218"; + sha512 = "3980aa2a37547a8e8c3d4f083cec9f69539ae0388dc342847b09b789f35ba7fc9cb83c5bd3e94eef1d56a7788dbafa0d9fd6aef305043d9a83b24598ddb750d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gn/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gn/firefox-57.0b11.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "f5a2b9dbeb8d128eb15621d087a753769d40f219c8235eccc3074c014eadd041df5d146d7f43fb15e31990dbca4f138e983ca7ffbf4aaf249c9c58aaa3f03591"; + sha512 = "1859234d55f1e5a11be57e4fda90608c40842025b37cd047f5c924071006dadb3933752ce72fd7287c941caf707b14f66159af5a48e34677c017fdce6f1e9a78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gu-IN/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gu-IN/firefox-57.0b11.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "7afac4dd885bafa5cd07ef661f307c0ca30cc2cd65b10d5789090709637d3e744198a3624308cbdf2049899ee4b407934777867c471f2424bcbccb8c025ed40a"; + sha512 = "e8da8d37f6a86522592084e267bb0ab3a2b26159aae08af59369091aed28b071bd3c1413ed80c3c3be4a41ed91ce3ca38a4aa4a4bddbfe924649aa382027bd32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/he/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/he/firefox-57.0b11.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "3b572a06423d16f1b925608d5690d88e6870b0644f12b48abe5f084fec8f90bafd573d2e80b4aa06ddc7dfee3104880f98fca843148124fa15e3b524a80875af"; + sha512 = "6165ba93179ebc019ccaecda1ebe7b68bddacb583ccb417bbc50346ca5fd68f8d882c3723361f8334cf9159567c01adb620ea8dcbf01b7ed03da7d5efedba198"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hi-IN/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hi-IN/firefox-57.0b11.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "734d372db67c55f9992b209a7a36438f04f277fd76be4ae0b04c308dcd538274fc92a9971f1a150b7395341fc42b75dd2073fcbe1ad535e5c373d415a4d7c49f"; + sha512 = "230bf538f7498e9536d3057a6321f41d54b366f1d0debf79360a6ea6fdeeda97895ffd5e4c77c2874c97b5a642e6c5a3d2193270417198a0cb383ea349e01a62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hr/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hr/firefox-57.0b11.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "bea351913f51977add077afcf79dc3595133631ba35c594dbf0bec5811a7483a6e4e25e10b6c24aa176a07e27142a2668e66bb93da4531e0f9d0dcdcb32551e1"; + sha512 = "617c8e4cd572f896b3c0094e74482e8fee5e0e924cc18f06f16e87f217b712de7665c38069be59f22d1b269951157634e11def128e0c5164a119bd23981ba9bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hsb/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hsb/firefox-57.0b11.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8afbf4d5d1beba8dcc3a4ba8e4181cb854e863d8026ffd4b4a56686d8b8007c3e6b68fca9e3a93b11970124a10dfb5ae369fe15971ac96f91759b5c37b1cc7d7"; + sha512 = "da7f1f00ed6b741129dac9a82b5116652e2d0f406d9ea535ece8907e1aea60c9393195882bf59557041c14ebb604456bbdd5514800d7b6a66700558bd256ff6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hu/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hu/firefox-57.0b11.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "e3d08f02d76f701ed6f390998a7a14be1636cbaf30bff79c803708d1b389153acfd392f094e17ef3fa84835b7f73e8de16273ac6dc9950f36b6f5f1ec87ae150"; + sha512 = "d6b2f966aec0e7c529d86916bebdd06a21850f32a436837c9efc4da5bd18ddbfc937697f758796b8e68ff79281b35186620e29bc93dbc885d6f9b135d028519c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hy-AM/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hy-AM/firefox-57.0b11.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "97bf44b70f307d4a513dc51d5227e7a6763ad0d76ed4d835ae29067831ddd91648a3c03dd4837914f32fb2c8d6c3c23ff0f754cdcc51e7ad6f743981e2f4f9f4"; + sha512 = "cc9df9dab12511549daeb011c50c20c563eff9df7ff3ad0b351fa6362cdc35817f9b5c1c204c1e484a82022d6eb4dbb196c78b43a1429a8bcd92bb22e9c757d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/id/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/id/firefox-57.0b11.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "3be0b9be46f1cff625281d30b729016095305bc47af511c6ab9964b7770731d37d956cfffacdf6833c8d30e3ee7357bf4231abcfebabe1a5e9d814e2b1ddbb22"; + sha512 = "1d3027f632f4a7d74adb54da6c15d51af85a6713dbf91c3a01272cee6a4692c4fd130eb66757230ab7e9dd9da7dbeff7c889bb98681fc6cb193b1094d69f31ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/is/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/is/firefox-57.0b11.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e2235cbbfa0ca2c52eda62a9112229dd4e523daea4fdcfc1227cddf69c4f857a433e2cd6f830908ab9fc8660630b873ba4ce269384b89b40bcfb03f024a14873"; + sha512 = "45ca6f394b47890157680d7d0ee58b8ed75de1623491e38b0d31b79fc2940e7fef00cc2a5e7ab7ee7931261c6575122cd7ace209f94a4574e189b1acc0814755"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/it/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/it/firefox-57.0b11.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "1ba58f0668f2890717d18435f7d8d209d523ed368ca06a85514bdaa0ab4c5f822c0dbe4bd398a55bd14d27a7b88b01e557bf76ce00069772f797a8d3265684e4"; + sha512 = "38b002021a2f68dcecbaa745944fec1af41b440615a04eb8ecac30923dba0514db70f505670db35d22fef794f682de03d16fb2e03888cb4e045e3d997ecddbf4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ja/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ja/firefox-57.0b11.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "723427d8af078aa1be6149d1e495385233f8ac8c6c79a80e2ffd3884dcee5a4f0ccbc0fb81bdef787fabba98d3bf40e12e31f93134237354590a9f58704b0080"; + sha512 = "201681b0e830834add6bc3dffe883388fb9ca8e1d5995405224057ac3a2dd044f74c800c48c42bb1f77f493bcbc92c0e10a751b3d5871309455efac26e4c4ef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ka/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ka/firefox-57.0b11.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "7a4aafc51948adceb81d7eed2846320bef587d2b1cf004e75cc2a62c31ada7b02f893a371abbeb2e7a21a51ff39e175610487cb16360736ba601cbbd0dabd412"; + sha512 = "9298bdf3fac725ec59d4d358be141696c4bcb2079e4689da191ef2b52569cffdeee7e6f3454922b784d3ab02a0339eeab4969140457cd4b6e2533c72c740bd71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/kab/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kab/firefox-57.0b11.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "af33b16216c12ffecbb4033c94b8a6225a9ad3d0a6061b0aa417aa118a7123167378c196355788aad853fbe84d87aba7f7a5cf9dac06606d5e4ec576a3e45420"; + sha512 = "65ed8e7902b0a0342f03f95fa0a51fafa5f902b3ba870e3d1fd783b366a0af257a47588981290cd9a0ec369f43aa3e72021122ab9fd8cd46c4eaa69ab726b194"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/kk/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kk/firefox-57.0b11.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "52b2544a46297a5b6286bbf87a1062155bc843f60ca97cdd5dfe39744caffabca5baf221301bc45666e939d2f8df51f9de3a4230dc5d2ea89f89b8cf1a355d96"; + sha512 = "fb3dff8ae89e8b59a74474eddc21dfe5f5e69e7f087731f93d775c092895b38f69b39f66a7298a8b3417ab87bc01b144a5fbe6ea3f7385b395c3a82e2e5df026"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/km/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/km/firefox-57.0b11.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "45344b0494274f8f8d17f39e8d5ff6a76143b426e5c7c3ebd2f1ed01c9a4fbb301e16440358d246c8f3c31f7e3a7dc593ee1b6f5bdbe6b453c32ee2b54307b54"; + sha512 = "3dcd608f361056ae87882d5a28171af8ce24a16184952f0f5abe148cc341e056fa2b9abd583b835026992e60f316952b9d61b9b7920b5e65b50e3b9905517e60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/kn/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kn/firefox-57.0b11.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "80fe5cb4c47b6e4fe6fb374492abaa509c6ee53f535c7a4b8c894c4b0e78dd592617ca19826e31b1b6d053dd8a3e91bfcd20e4f13ed0afd8f91ef1499ba609aa"; + sha512 = "7215efc6c893389fc0137b5bf21a9a7b215fdda0fc556d1f1a1f84169797a4495aff29bb9777978699134aa59653c4e53d57e06ab785c07acb293c37d4cd7962"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ko/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ko/firefox-57.0b11.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "5c87c5fba5a2212a7194bca3e4fcdea1a098690ccc89e376389e41a7f78e5fd0218a1366811cd76e5561c76ed9f75165bc5b0cd99ca7645e3d7a3c11eb67c519"; + sha512 = "144eddbbc7fd3d3cf213cf411ac94707e2fb50cc10e981df169fbedc4c971084fc0e153ffbbc9242184f906bb4d0a412d1447e7b5e5d7136bf10633bf825bbff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/lij/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lij/firefox-57.0b11.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d772ee65fb31f00fd77b7d748a79bd4199711c9853552af47de1d1981a7bc79279240c517e89c830bd8ca1ce7301e285d24d994621ae668f9bf53dd9c8656ea5"; + sha512 = "7a90a94c35a0e1f00e3e55d34227cfa614469017355285cf053fae404807523b3e1a3146d8710b46de7c1296f9cee08bfe0eb0de9a215895ce3bfa99c06dbba5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/lt/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lt/firefox-57.0b11.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f8d3816c6ea946cb96e8dcad1d3c1f0d624a669ef46a48440919ccd9e87c67ac48abf4b7d78119302107eb7ee098a0e344336a4f0a2ffe80d970b238fdf1416b"; + sha512 = "71d61ebc3961011dfe60e5915176d3c361f9809b1953afdad5eca2a3e9b543958eb7bd64ad3f2d64c788ec2478d32fd3da5a172afa4790b06cec7996c4a2c5b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/lv/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lv/firefox-57.0b11.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "0af6cce7117be80b400880d05163d6ac777a6a7d2260c68f51ecfdf30ea8693c0d63c5b69dcc0dec2a3be1767761ad23104aac5bc79ab088c770fb678886790a"; + sha512 = "66af0c13de2bc1c24c2635106bcc482b53f872e937ed9e6ecfbbad3b6b59a0c12d05f18cfa7136d96ffe3991faad3649a45acb8a8e9d92e8ef6e3f0392d3d151"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/mai/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mai/firefox-57.0b11.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "a53ac3a64f7b8158858acb52b33d188c695633dd2f06ab92839aaf98adfa3eb79668de07b7bac006fbbd884b76342608d3100a284ee638c161f2307cf241d3d9"; + sha512 = "fddbd82c7de07c143c4cbb5005a88f595e38c0b6261adb534d8b0fed42233974e09d394a65359155652cf8be5ecf5a47af588f4e8f65ce649efecaca6394be72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/mk/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mk/firefox-57.0b11.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a5732502199793959a3595c080c5f146bac8f445ad11becc841f806c8ea11a37ad8ff9d9fb8815af89f38aadb5e4402cf7473a8be56302d6f99b0468651928f3"; + sha512 = "10f027a08ce2fee653503dcac38f7d9afd9f888d1f904e63252dd1514dca8c471bf071f4ffaff37a9bad50c59eb833b8e5490a840593db3def2ca362cafc85ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ml/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ml/firefox-57.0b11.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "fdde429df1c1328f33fe42e5392cb2322350b508deca1467cc14d4f896a32cbc093b43c33e945ddd9199c146ce16676907e2eb458a981618e0871f54124716ff"; + sha512 = "09f79b235b65c0ecde67f6207459660dad444c28c336e8a6df3cf958fc3eed4bb35f18adcfa61d48298a9c43076577d0edc49963a6b00fc221f69f30f5c69245"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/mr/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mr/firefox-57.0b11.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "874b37e2d93870bbf3ef47e8f70bb881e5ed1b0516c266535e627197ae6f2013a63b3405b673c695973097197596572736dfa97e6e913308e619e4b899c8c516"; + sha512 = "86e1c01e504cde26a044fc2a288e3419785e93d46a6cf9deb2c49cb18e87149a486cf9bc06129c83f1387b7d7c62018930fdac77d4fce98da4fe5b5c78d061c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ms/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ms/firefox-57.0b11.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "f510ae946e97f23ae278da12e67aa293741d145680ae084fa0ec00d02945939b354003e8e08f32929603ba9dd9c54109b2fda957e6d8b20af3e04774e0eecd3c"; + sha512 = "24a7cc19585c510737ccca398f31ac3181df6601f8400187861791a564b13154b825b78427229a9ec97c7441be38f36d4d15510d1b6720b7a29d9e71b7eecf1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/my/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/my/firefox-57.0b11.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c107591dbc83704aec6945ce3758c4c3ce809cbb2c4c1a9ad6ce7efce5f2da5fd1226599a083f0008f597bd108e146bebcd1f2fb5be89b078b7bde07c2391e4e"; + sha512 = "1c3a160af7c960cbd2fe31407acbb93a1e31702460572315dd6c45f6dd6c2efdf419789c638551055e01bd8ed9652a8b4cb76c96b0f509348eeaf7fc548b9b68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/nb-NO/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nb-NO/firefox-57.0b11.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "18b0e51c9c7ea25dbfd083acf5e0b5220866c0becdfa968e9ee4bd5a431e90db48b61b7e11f1b8854812bbd1ca1e089445a1790d3888295f3d8e3fbce21f205c"; + sha512 = "74ed8467b0678c9478c24c15fddcf22b839e0256f5e0f15379d5df8eaea59e928a42637517f6b4ef77b2136bacac8ef1477fc0b97390c20c7c09418ee9ec06b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/nl/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nl/firefox-57.0b11.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "1032fe9f7fab5bcd8358eb7862722c2201654a8bf2f30e6b050771a15a5b5db6d183cd8d467107f6e855943f1e85113d3b8ef8c8db38b41b2445e74230ec4d0b"; + sha512 = "30cb204b285d9f8ee321fada6fd7eb2b490ff8fc1735ed61631e1136648c78a58b06d7e0487543e8f7e99f77d03fba43667a7ca9b9d7e2860b21c1d2f6baaf71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/nn-NO/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nn-NO/firefox-57.0b11.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "448c8bce480ea9893b73f92d4151b30e76a3896044121d4f65bae554aec7f945f6498c97bbd458657a2093a16858f7c889da40761e99ed9b3de2edb83bf6bb29"; + sha512 = "870f52b1388b881a306f13b2ce7483ec1b07e603c5b1e9b5ecdd55263015e3b892d4343b3683e514bf58fd567466ce6d2b7da34a105ca805cb72455a17f0a48d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/or/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/or/firefox-57.0b11.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "530ffadeba0627ed67af234b282c670c52f8dfee77ba6b43f86e97409d67dee0cc1895ddb8b94c076de8280bba1931427064b5a6f3d9e43892e009fa52dd4070"; + sha512 = "6441180343f8ae93b2544981bbfae7b29abfd47d59a8688e3da4f257da5c8cc95d225762c1633442908a4e3a0ebb29159491ef8cf583433913dbefdb39630273"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pa-IN/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pa-IN/firefox-57.0b11.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "bb66b9942c6ec1132b70eb54da3b4d9b918cf44e55e6099571c7df4bfcb670a89c4dd5059cc8402002234bd075643a6d6078a1d8b668a5bac28db3f23e6b388e"; + sha512 = "e9cc4097cb504ae0de523318afa8a5cd9fa7a1cb3348641cfe0538e039a4dc681d53bdb3976116f171018804c641450f3645af1d0d4502b3358bf4a3beb259d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pl/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pl/firefox-57.0b11.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "146afe4d60e53b7da1f02588f9a6e3b2f6b5d8df81b7a9c857a9d071874dec633b59d7a14dfd2f4a82d9be2eaf1999b4ded98c326add899bbcf825b2c660b9ab"; + sha512 = "5a5003b3e04cffe5d76a9badf8f0a8c15c2d00b26be6486b871129c9111b4b53e7aa9cb2b83cf88de9c2928e17c09e548b89bc140889da7134f3195a91983f89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pt-BR/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pt-BR/firefox-57.0b11.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b24382c3a8badbae0d2b1c4814a3247c66031ed8a9044979dc59117b7d2bff99d08cfaa238b6ab470d34a5625723dde668beca6dce7601e7184bc3afc7d07050"; + sha512 = "9478a60bf2d3e2ec7a67a1e49c786664767ddbcb284775ad08750b0bb39a049183ba8e3feb04ec19d6e6aea6666cf280e2d90a7648c15bda1e05f5bc22f8da82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pt-PT/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pt-PT/firefox-57.0b11.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "bdbb14b3bd0bcee1182454b54f1c6193e282b3317e715dbe0e1c5314789aefaca248615c1061582e0b3b901173250926e0eababeb4a640865f00dbeafb40e9df"; + sha512 = "b9703a29b083beb649654e526d0438a388fac253b6d0093c366742504652f88d68993f2641cb62e5c90972b9c7dcfa7d6a2e28ea32bb52d5a6ffceea34d650fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/rm/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/rm/firefox-57.0b11.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "84820d377d569c7bc55060b9c1c17f7a2b37f2ee7b079f76515d2b66cb5bd4860a96f840393a75c01e30a21350ffff22c8c00195c341778188be53c5f0f05828"; + sha512 = "13ea09d2b80c421852b84ec8a2a7513ac5b9d51c0920ebb282a47087e384d15d8b7e7cb01638b4857fc26ac6ac54509f368f85d7b1ec3cd70f0b3e21fea6ebbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ro/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ro/firefox-57.0b11.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "1b00c3f902993a10f764a258c3317c55fa8fb1461a5d88fca8fc24538dc6ccf9e87026410f196900bf2f4d58b2baa725f3c9257d800040b750eb99b7a080e433"; + sha512 = "af210682a5380c324b542244cb74f1a0b39b659d93ad166b01026f55995fd281124cd8a2f5b3bceef85f2f5545972a0199ff9460a7f881fb807842596057f17a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ru/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ru/firefox-57.0b11.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "24b28fbf5031c87ac9051208e931f712fb1edc22edcaf632e7e42e79fcc93a7e75fd336497eeb3ecc1049b0088f75a28f4671f94308feabdf6cefa01490fd26b"; + sha512 = "ba01c0e7a5595fb8dc7a3534640dc87c1baf45e70d45a490605d4f81b897f7633d322be060a575dd75cb89a7e319efbfe15461e7b43893c1956de536d4c05288"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/si/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/si/firefox-57.0b11.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "946a782caa0da5897cdb776b8256b7c1bca6084b73e27075046232e2361e2a402decbafff916ce1196bf12d4ddde73dee4c32bf9fc3af28b6294f7079e744e47"; + sha512 = "42f647309456efa6195cf045c7ba2dae3bcd824884b2a645d6372ea8eb8cd9678076bfd555795acc463bcac550973b317a12500f8fd494ed7ea007c540c2d085"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sk/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sk/firefox-57.0b11.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a61de035d6c3fbd5d2765f66e3cc0b43b55ec570f841fab19ce28949f68121ffa578db01b89c707e62558dd34e4633de03dd5d9050d805a50e2e22ba2d6cbb06"; + sha512 = "ef08e41d68cd1496efbbdae6575e3c0529440b1b2d80b421aef1dd7abd2b383b31fc5091d6949f52d5b9146505d14033779188154705ed2882c1243e893713f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sl/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sl/firefox-57.0b11.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "edfc9a836efd8b1a168f1950e47f26c5eb22d7c3e7faf8c6411171271cc0c6c1b7efdc107aeb154b03506ee6997c7805a9f40cc3bb7953a42b952e803988a2c5"; + sha512 = "0e4aa9a51305c5f03e1e2ab953e600d922493e851d18c83927303b78cb178e0e0759e314fe6889fc7216f4af9dd82afc0288ceaeaaccf562ccc949be05525b86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/son/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/son/firefox-57.0b11.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e13065f25c6212a9f46cec484c4b532e7c8d7e2985b61f00985a6c03d4f579c057332a889280a07f04a8a73010ac9b07214494913f9dbaf23668d5282f1f37c1"; + sha512 = "3fcd85bcd3e85bf0114678a86776b8e7fb8bf0828b27f6e321af17f3b79f0235ee7269e36f7d3262c60f92946866084596d5dbf475cd15c459be3b7b014ccea4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sq/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sq/firefox-57.0b11.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "fb4820cb33efb10211507ff61caedd569fda0d8c59a49de61bd3c6bc1546865084daa0c477ea1b213c6089eea5508b5e11610df81411b5bbccdd10760ba46daa"; + sha512 = "a5b6c3c7918839aedbf87e3eda194dff5bf7e0c3f107b3c71763e731448eccd7aa1671ba43df45bbfa5e29e07d243f5309b1e18858c4dd21278093f37f722804"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sr/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sr/firefox-57.0b11.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "898ca5ad052760db2f4115c7215107ff77295ff56a33e7b9141a491a6a228be88f9c94cf7dab6938c886137ea3aad6e2e4b01db87122c4c05830bdd6a75fc05d"; + sha512 = "9cf631abedc27fb87bbc1fd3c65e748ebdc77169d4529d7cf6bc67266cae322635e1c2d7bdbc42b59c572af2105f5f0604b7eed899eedaec9c251ebfbf0c7507"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sv-SE/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sv-SE/firefox-57.0b11.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "55c6e54b316f4649e99d305bae059ca844ee48052ce4e89aac75fb850a0f5e255fdc1654fabff7d3fa1de88092f940f3c77f7c142096a76184a0bed668cd254f"; + sha512 = "71cb182020a6152af64ce709cf391ee70c18669081599101c34b69ef81bd3eca62024938d6c3fa121289a7e5588b2253ec536b35e7d5ed7d94190e247893b1f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ta/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ta/firefox-57.0b11.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "b90c2da5176a07a25521ad510cd77da9171e57608517c89c5a056294fc5237a967355d66979840672bdafe62324405db0da7dd4d6f25ab7b28b37f44f737a5d0"; + sha512 = "f6298909d8fdd4335d891de594c7f27fe0f181f90c4493c32fdbaa7f8d5ae5190de328b5e8904f99b413b244d14d956d887ab33c19355942d810d56d0700c604"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/te/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/te/firefox-57.0b11.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "86dc71e9df0524ee3219b614154373a473a54f1132ca5c3997125f28cfb3db2710f630a4d614ddfb0765eb58292d33ee328abdbcc8fd8485f79501f68fcb52cd"; + sha512 = "b24f0feacf4a484e6413ada972b1570a76c78f87dbb829f085dadf3a922d87d31d1a50c092bb45508a67267eedf3caca09d0efe10d9c329d2e46671730a30c5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/th/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/th/firefox-57.0b11.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f1a8fdbe928fefb9c7118c3066521cac4dc45819423c687b12576003db9aa318df5a818ed5c56842b3855009974d3fe7a208493614607771813bca29e655be73"; + sha512 = "d063097273e2f4345baf63d9502b3485bae78664d855e0ae1f33ebcbc18d49f4f5af0537bb141796cdc2c3fa35d90a6937303f4a4f54f6277f88456c3779017b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/tr/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/tr/firefox-57.0b11.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "1611f4fc7e935d7e5fe8fe7ec08e7dfce1fc9cc82814d39077d7c4a32913dbaa6307131833da8665bc8c01b248c437f826e10fdf2db8859ce788f39fd4c20d6a"; + sha512 = "c44e4b90c37484ee2050f219c5ea1f37d42ca9a3f683d8aed95cf94c412138c795011960af06d1b51ac7a44fb99f373ed28f0dfb9a8f81edc7e2675defdeca80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/uk/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/uk/firefox-57.0b11.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "271f54090f7e31dc84c4b8298e4db752a12d3eef7b267aac9ec1ed9958baa78cc6178395ff54306b548163acd5428077423ce0cfa5c69449029cb026aa2a8dc5"; + sha512 = "a1fbc8ed8441138e6e70e925598f1a620218d6102386b67f84b32e87b8203fb229a20ab6ac631018a196451be9db93e1cf303e2a4aea9b9c065545b6aafe9083"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ur/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ur/firefox-57.0b11.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "51fa2ee142181727c92fac9044068d28cba20e9c88a1bdac27f2a3b58139ed826a73d7b5a3fff23a0228b964f497e0aec3512a809222fffeec0dce6fa06e4e8d"; + sha512 = "7500eed932e4f892ab0e96e9e43fb0301616204859eea955c7700b7b804f87bd1cdb8ea490330b989c3e191d3d837a777830d02daacb4486cd38b565d4579282"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/uz/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/uz/firefox-57.0b11.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "324696a348ae491f9b3d51a3880a6dec8e78017ac38b613b8c4d405cc7e4a91dcae4191701be821a693eca4d7726b841a0cd8d9e8163a09a5db754896b6526cc"; + sha512 = "2de4ced396b54c9a683dfac862eea893800980bc61d21dcc5a5aba727936f8d7c0c72941068a1e088061fc4a78b8437b10e97f4e41478048fbd702db64a1461a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/vi/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/vi/firefox-57.0b11.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "c118e1695938881be2f7c4dfe34273fcd5d8cd6bfa300758de67b220d0f77c8e2d669af8805717dd5ff42ee37e35e3997a37f023361301816243434fe3930a5a"; + sha512 = "f3fb64b828d8319354630afb4e8239830d471edc4b76e074d8ad30d0802d0d0529abc265183c2b60223fadfedc8189715065d980d15489afa7c297c7ab5c7863"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/xh/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/xh/firefox-57.0b11.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "44ae616c12b08e2a962944af56ad5ff5845dd44f67cbd634451b3ad5bfb254e91b02b4b73b3d131d88ab0ed7240458312187e1744b4409e6b8012a0bbc809eb1"; + sha512 = "447b17edec8fb04b8460b9ce2b5a00aca48ef162288944746bb9a3fe52c1365a01ac51f13d853c27b5071c7d92db7beb6dc73a12dfcafbf9bd1f65a0d3b41214"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/zh-CN/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/zh-CN/firefox-57.0b11.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0f39b59fadc0a1ffb5a34dc99db1b6f0c4cb4b3f839a36643d8ca0fa7eaffbb8e638f9f95f5fdcaee09671c6a28f4fdc14e7123aaf8de51dbe3ad2a69cd83a5e"; + sha512 = "918d2ce4543eefe6c304e51988b1af5e6de3fadbf04585ae45d5344555620619327b858755201f5b300e2e11b7696ccc6d2fff81f965b2f58615426585b128f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/zh-TW/firefox-57.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/zh-TW/firefox-57.0b11.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "57ebfa7473bed8bac3682f74ef66a1235c9be500c5048ecebaf56bd97513bed69a38c69f098296133f842f1243fb46a845816b56ee637764155eb9e36cb59b3d"; + sha512 = "a2fff5569721bbe2455b320f057595c2c26986d26654be00a90f4ce269124a6c7328664287e73472df8fc13c44fd5e42614e992904dd86cb6caa3b0d05145ca0"; } ]; } From d8ef4d510bc80cb073aedf45767777ca8ed6d416 Mon Sep 17 00:00:00 2001 From: Christopher League Date: Wed, 25 Oct 2017 12:02:57 -0400 Subject: [PATCH 1718/2806] perlPackages.IOPager: 0.06 -> 0.39 (for sqitch) --- pkgs/top-level/perl-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bb191f45bd2..0cd34e1a2f5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7153,12 +7153,14 @@ let self = _self // overrides; _self = with self; { }; }; - IOPager = buildPerlPackage { - name = "IO-Pager-0.06"; + IOPager = buildPerlPackage rec { + version = "0.39"; + name = "IO-Pager-${version}"; src = fetchurl { - url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.06.tgz; - sha256 = "0r3af4gyjpy0f7bhs7hy5s7900w0yhbckb2dl3a1x5wpv7hcbkjb"; + url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-${version}.tgz"; + sha256 = "0ksldcw0hydfy9k70i6q6fm1wgbc54kx0lbwlkrszsbd7q72dlfg"; }; + propagatedBuildInputs = [pkgs.utillinux.bin]; # `more` used in tests }; IOPrompt = buildPerlPackage { From c7285c33424338f7ea080ad3c4991eecfd46fd58 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 24 Oct 2017 20:48:43 +0300 Subject: [PATCH 1719/2806] wlc: cleanup --- pkgs/development/libraries/wlc/default.nix | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 95a8603e08c..7fcf4fbbe5f 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,11 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig -, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa -, libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols -, libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig +, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, mesa_noglu +, libX11, dbus_libs, wayland-protocols +, libpthreadstubs, libXdmcp, libXext , withOptionalPackages ? true, zlib, valgrind, doxygen }: -stdenv.mkDerivation rec { +let + # for 0.0.10 + xwaylandPatch = fetchpatch { + url = "https://github.com/Cloudef/wlc/commit/a130f6006560fb8ac02fb59a90ced1659563f9ca.diff"; + sha256 = "0kzcbqklcyg8bganm65di8cif6dpc8bkrsvkjia09kr92lymxm2c"; + }; +in stdenv.mkDerivation rec { name = "wlc-${version}"; version = "0.0.10"; @@ -17,16 +23,21 @@ stdenv.mkDerivation rec { sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k"; }; + patches = [ + xwaylandPatch + ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa - libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols - libpthreadstubs libXau libXdmcp libXext libXxf86vm ] + wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage mesa_noglu + libX11 dbus_libs wayland-protocols + libpthreadstubs libXdmcp libXext ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; doCheck = true; checkTarget = "test"; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A library for making a simple Wayland compositor"; From 8c9dbb2d3927cd703e9e3891ccb9e1f36fa601b5 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 23 Oct 2017 16:17:05 +0300 Subject: [PATCH 1720/2806] gptfdisk: 1.0.1 -> 1.0.3 --- pkgs/tools/system/gptfdisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 0b034819651..f5ab6276c81 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gptfdisk-${version}"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { # http://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; - sha256 = "1izazbyv5n2d81qdym77i8mg9m870hiydmq4d0s51npx5vp8lk46"; + sha256 = "0p0vr67lnqdsgdv2y144xmjqa1a2nijrrd3clc8dc2f46pn5mzc9"; }; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' From e85768b0df74f0474afdcda52c66c8291700f0df Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 23 Oct 2017 16:17:28 +0300 Subject: [PATCH 1721/2806] xfsprogs: 4.11.0 -> 4.13.1 --- pkgs/tools/filesystems/xfsprogs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index eaea921c6f5..3170eb96417 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -2,19 +2,19 @@ let gentooPatch = name: sha256: fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/xfsprogs/files/${name}?id=8293574ab30c85e2965fb2b7dd890b44841b8404"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/xfsprogs/files/${name}?id=f4055adc94e11d182033a71e32f97b357c034aff"; inherit sha256; }; in stdenv.mkDerivation rec { name = "xfsprogs-${version}"; - version = "4.11.0"; + version = "4.13.1"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git"; rev = "refs/tags/v${version}"; - sha256 = "0icliinacg6c3ziaqzyyxfz9jykn80njj9fdv3milhsf81yhnrpn"; + sha256 = "0h4wb8pp8wdcyqpz2ixlghz9yfd2sp9xa20s435g5rfp6ljrh6zb"; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Why is all this garbage needed? Why? Why? patches = [ - (gentooPatch "xfsprogs-4.7.0-sharedlibs.patch" "1s83ihaccmjrw4zm0nbdwqk3jx4wc1rijpsqrg7ir71ln7qknwzz") + (gentooPatch "xfsprogs-4.12.0-sharedlibs.patch" "1i081749x91jvlrw84l4a3r081vqcvn6myqhnqbnfcfhd64h12bq") (gentooPatch "xfsprogs-4.7.0-libxcmd-link.patch" "1lvy1ajzml39a631a7jqficnzsd40bzkca7hkxv1ybiqyp8sf55s") (gentooPatch "xfsprogs-4.9.0-underlinking.patch" "1r7l8jphspy14i43zbfnjrnyrdm4cpgyfchblascxylmans0gci7") ]; From e94887bb11a95337851b67532555a927eae45f85 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 23 Oct 2017 18:27:55 +0300 Subject: [PATCH 1722/2806] fio: 2.99 -> 3.1 --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index e0c3fdfeec5..807169a58f0 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libaio, python, zlib }: let - version = "2.99"; - sha256 = "0fj8fk2w06ahcn35z8pj88sx12yrx1yfd38j6k5aigj4dfj3f3zy"; + version = "3.1"; + sha256 = "09rsfhzpi089cwpg07c8kgvs4d2n77a7mn1vj8iwjjzacs3fbllx"; in stdenv.mkDerivation rec { From 1cea1b66a4f05b8939a7ec2720713fc6024e9d61 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 23 Oct 2017 19:26:19 +0300 Subject: [PATCH 1723/2806] ding-libs: 0.6.0 -> 0.6.1 --- pkgs/tools/misc/ding-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index e5daee11b59..61c8a8370d7 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ding-libs-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "https://fedorahosted.org/released/ding-libs/ding-libs-${version}.tar.gz"; - sha1 = "c8ec86cb93a26e013a13b12a7b0b3fbc1bca16c1"; + sha256 = "1h97mx2jdv4caiz4r7y8rxfsq78fx0k4jjnfp7x2s7xqvqks66d3"; }; enableParallelBuilding = true; From 2351947c574bd05e5d1e4b480b95b71c742767d3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 23 Oct 2017 19:38:02 +0300 Subject: [PATCH 1724/2806] sssd: 1.14.2 -> 1.16.0 --- pkgs/os-specific/linux/sssd/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 834476da0ca..516f0b92df6 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares, +{ stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, - docbook_xml_xslt, ldap, systemd, nspr, check, cmocka, uid_wrapper, + libuuid, docbook_xml_xslt, ldap, systemd, nspr, check, cmocka, uid_wrapper, nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson , withSudo ? false }: @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "sssd-${version}"; - version = "1.14.2"; + version = "1.16.0"; src = fetchurl { url = "https://fedorahosted.org/released/sssd/${name}.tar.gz"; - sha1 = "167b2216c536035175ff041d0449e0a874c68601"; + sha256 = "03wllgbxxz2zv14dcqr8d2xssppi7ibckh0rlky8gvsw6vjsd0f5"; }; # Something is looking for instead of @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - buildInputs = [ augeas dnsutils c-ares cyrus_sasl ding-libs libnl libunistring nss + buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss samba libnfsidmap doxygen python python3 popt talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos cifs_utils glib keyutils dbus fakeroot libxslt libxml2 - ldap systemd nspr check cmocka uid_wrapper + libuuid ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson ]; makeFlags = [ From 17af9f8d4da75d74491b8329dceb425d31ee037f Mon Sep 17 00:00:00 2001 From: mehandes Date: Wed, 25 Oct 2017 18:23:39 +0200 Subject: [PATCH 1725/2806] svgcleaner: init at v0.9.1 Svgcleaner is a tool for fast and safe svg optymalization. --- lib/maintainers.nix | 1 + pkgs/tools/graphics/svgcleaner/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 pkgs/tools/graphics/svgcleaner/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7095b88a34c..f2ab437ab22 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -387,6 +387,7 @@ mcmtroffaes = "Matthias C. M. Troffaes "; mdaiter = "Matthew S. Daiter "; meditans = "Carlo Nucera "; + mehandes = "Matt Deming "; meisternu = "Matt Miemiec "; metabar = "Celine Mercier "; mgdelacroix = "Miguel de la Cruz "; diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix new file mode 100644 index 00000000000..c9be7d48455 --- /dev/null +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +with rustPlatform; + +buildRustPackage rec { + name = "svgcleaner-${version}"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "RazrFalcon"; + repo = "svgcleaner"; + rev = "v${version}"; + sha256 = "0l75a2kqh2syl14pmywrkxhr19fcnfpzjj9gj3503aw0r800g16m"; + }; + + cargoSha256 = "1hl04wqdgspajf2w664i00vgp13yi0sxvjjpfs5vfhm641z3j69y"; + + meta = with stdenv.lib; { + description = "A tool for tidying and optimizing SVGs"; + homepage = "https://github.com/RazrFalcon/svgcleaner"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + maintainer = [ maintainers.mehandes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35d8ac61632..91f97a27dc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4504,6 +4504,8 @@ with pkgs; super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { }; + svgcleaner = callPackage ../tools/graphics/svgcleaner { }; + ssdeep = callPackage ../tools/security/ssdeep { }; ssh-ident = callPackage ../tools/networking/ssh-ident { }; From ad933bb09650311127f139a6d231d7943ee8a1e8 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Wed, 25 Oct 2017 10:11:55 -0700 Subject: [PATCH 1726/2806] postfix: add relayPort option. (#30520) --- nixos/modules/services/mail/postfix.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 2185484827d..1fef9ac6ec9 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -62,7 +62,9 @@ let shlib_directory = false; relayhost = if cfg.lookupMX || cfg.relayHost == "" then cfg.relayHost - else "[${cfg.relayHost}]"; + else + "[${cfg.relayHost}]" + + optionalString (cfg.relayPort != null) ":${toString cfg.relayPort}"; mail_spool_directory = "/var/spool/mail/"; setgid_group = setgidGroup; } @@ -458,6 +460,17 @@ in "; }; + relayPort = mkOption { + type = types.nullOr types.int; + default = null; + example = 587; + description = " + Specify an optional port for outbound mail relay. (Note: + only used if an explicit is + defined.) + "; + }; + lookupMX = mkOption { type = types.bool; default = false; From a3bc5d6ae65a040f3f84215bd7a32a424c1e4029 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 24 Oct 2017 19:10:52 -0400 Subject: [PATCH 1727/2806] rootpy: 0.9.0 -> 1.0.1 --- .../python-modules/rootpy/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/rootpy/default.nix diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix new file mode 100644 index 00000000000..0827786acfc --- /dev/null +++ b/pkgs/development/python-modules/rootpy/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables }: + +buildPythonPackage rec { + pname = "rootpy"; + version = "1.0.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zp2bh87l3f0shiqslbvfmavfdj8m80y8fsrz8rsi5pzqj7zr1bx"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = [ matplotlib numpy root root_numpy tables ]; + + meta = with lib; { + homepage = http://www.rootpy.org; + license = licenses.bsd3; + description = "Pythonic interface to the ROOT framework"; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d42454dc043..0a890b8e90b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18921,25 +18921,7 @@ in { root_numpy = callPackage ../development/python-modules/root_numpy { }; - rootpy = buildPythonPackage rec { - version = "0.9.0"; - name = "rootpy-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rootpy/${name}.tar.gz"; - sha256 = "04alx6afiyahhv816f6zpwnm0sx2jxgqpgqcn6kdw0wnpc9625cr"; - }; - - disabled = isPy3k; - - propagatedBuildInputs = with self; [ pkgs.root numpy matplotlib ]; - - meta = { - homepage = "http://www.rootpy.org"; - license = licenses.gpl3; - description = "Pythonic interface to the ROOT framework"; - }; - }; + rootpy = callPackage ../development/python-modules/rootpy { }; rope = buildPythonPackage rec { version = "0.10.2"; From 6667d021d5cc7e30e99acc2e1af6e63b82d7306f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 25 Oct 2017 20:08:27 +0200 Subject: [PATCH 1728/2806] python.pkgs: remove duplicate file mnemonic We already have pkgs/development/python-modules/mnemonic/default.nix --- pkgs/development/python-modules/mnemonic.nix | 21 -------------------- 1 file changed, 21 deletions(-) delete mode 100644 pkgs/development/python-modules/mnemonic.nix diff --git a/pkgs/development/python-modules/mnemonic.nix b/pkgs/development/python-modules/mnemonic.nix deleted file mode 100644 index 9f71fdb8e74..00000000000 --- a/pkgs/development/python-modules/mnemonic.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, fetchurl, buildPythonPackage, pbkdf2 }: - -buildPythonPackage rec { - pname = "mnemonic"; - version = "0.17"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://pypi/m/${pname}/${name}.tar.gz"; - sha256 = "1hq6xb47jagfqf65iwcrh0065mj3521d2mxmahg7vfraihqyqdjn"; - }; - - propagatedBuildInputs = [ pbkdf2 ]; - - meta = { - description = "Implementation of Bitcoin BIP-0039"; - homepage = https://github.com/trezor/python-mnemonic; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ np ]; - }; -} From ce301ef21a90189fc5d7958a26a5447d486f422d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 25 Oct 2017 18:21:46 +0200 Subject: [PATCH 1729/2806] prometheus-node-exporter service: add disabledCollectors option --- .../services/monitoring/prometheus/node-exporter.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix index d464ec8a7f5..908483037d1 100644 --- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -37,6 +37,15 @@ in { ''; }; + disabledCollectors = mkOption { + type = types.listOf types.str; + default = []; + example = ''[ "timex" ]''; + description = '' + Collectors to disable which are enabled by default. + ''; + }; + extraFlags = mkOption { type = types.listOf types.str; default = []; @@ -64,7 +73,8 @@ in { wantedBy = [ "multi-user.target" ]; script = '' exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \ - ${concatMapStrings (x: "--collector." + x + " ") cfg.enabledCollectors} \ + ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \ + ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; From a26b6c42908d2328aedf61ade188d1d363b95a24 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 25 Oct 2017 20:18:33 +0200 Subject: [PATCH 1730/2806] prometheus-node-exporter service: delete dead code --- nixos/modules/services/monitoring/prometheus/node-exporter.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix index 908483037d1..bad4389ce79 100644 --- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -4,9 +4,6 @@ with lib; let cfg = config.services.prometheus.nodeExporter; - cmdlineArgs = cfg.extraFlags ++ [ - "-web.listen-address=${cfg.listenAddress}" - ]; in { options = { services.prometheus.nodeExporter = { From 8cfbf2be5b74f40dbf88008d3acfbc8789c3ad36 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 24 Oct 2017 18:43:19 +0300 Subject: [PATCH 1731/2806] sway: cleanup --- .../window-managers/sway/default.nix | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 8de87d2e8fd..6227ccd2c9f 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub -, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl -, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs -, pango, cairo, libinput, libcap, xwayland, pam, gdk_pixbuf, libpthreadstubs +, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl +, wayland, wlc, libxkbcommon, pcre, json_c, dbus_libs +, pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs , libXdmcp +, buildDocs ? true }: stdenv.mkDerivation rec { @@ -17,28 +18,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - makeWrapper cmake pkgconfig - asciidoc libxslt docbook_xsl - ]; + cmake pkgconfig + ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ]; buildInputs = [ - wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs - pango cairo libinput libcap xwayland pam gdk_pixbuf libpthreadstubs + wayland wlc libxkbcommon pcre json_c dbus_libs + pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs libXdmcp ]; - patchPhase = '' - sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; - ''; + enableParallelBuilding = true; - makeFlags = "PREFIX=$(out)"; cmakeFlags = "-DVERSION=${version}"; - installPhase = "PREFIX=$out make install"; - - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; - preFixup = '' - wrapProgram $out/bin/sway \ - --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; - ''; meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland"; From e18afa63b7e126445aa96a19d3a556c341d6b442 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Wed, 25 Oct 2017 19:35:00 +0300 Subject: [PATCH 1732/2806] sway module: more options --- nixos/modules/programs/sway.nix | 61 ++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index fc8a06d106a..3591893ff3c 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -1,13 +1,61 @@ { config, pkgs, lib, ... }: with lib; -{ - options.programs.sway.enable = mkEnableOption "sway"; - config = mkIf config.programs.sway.enable { - environment.systemPackages = [ pkgs.sway pkgs.xwayland ]; +let + cfg = config.programs.sway; + sway = pkgs.sway; + + swayWrapped = pkgs.writeScriptBin "sway" '' + #! ${pkgs.stdenv.shell} + ${cfg.extraSessionCommands} + PATH="${sway}/bin:$PATH" + exec ${pkgs.dbus.dbus-launch} --exit-with-session "${sway}/bin/sway" + ''; + swayJoined = pkgs.symlinkJoin { + name = "sway-wrapped"; + paths = [ swayWrapped sway ]; + }; +in +{ + options.programs.sway = { + enable = mkEnableOption "sway"; + + extraSessionCommands = mkOption { + default = ""; + type = types.lines; + example = '' + export XKB_DEFAULT_LAYOUT=us,ru + export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle, + export QT_QPA_PLATFORM=wayland + export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" + ''; + description = '' + Shell commands executed just before sway is started. + ''; + }; + + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs; [ ]; + example = literalExample '' + with pkgs; [ + i3status + xwayland j4-dmenu-desktop dunst + qt5.qtwayland + imagemagick + ] + ''; + description = '' + Extra packages to be installed system wide. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages; security.wrappers.sway = { - source = "${pkgs.sway}/bin/sway"; + source = "${swayJoined}/bin/sway"; capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip"; owner = "root"; group = "sway"; @@ -15,5 +63,8 @@ with lib; }; users.extraGroups.sway = {}; + + hardware.opengl.enable = mkDefault true; + fonts.enableDefaultFonts = mkDefault true; }; } From 18a177a517bcc842b397a36753d15fe5037f7119 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Oct 2017 20:54:19 +0200 Subject: [PATCH 1733/2806] gpodder: build XDG files --- pkgs/applications/audio/gpodder/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index f49962450a0..3d074bf1e19 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -51,6 +51,13 @@ python2Packages.buildPythonApplication rec { feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib ] ++ stdenv.lib.optional ipodSupport libgpod; + preBuild = '' + make PREFIX="$out" \ + share/applications/gpodder-url-handler.desktop \ + share/applications/gpodder.desktop \ + share/dbus-1/services/org.gpodder.service + ''; + checkPhase = '' LC_ALL=C python -m gpodder.unittests ''; From 19fda23a508882064b464ea5a0631ed2b23b2a52 Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Wed, 25 Oct 2017 12:23:52 -0700 Subject: [PATCH 1734/2806] ansible_2_3: 2.3.1.0 -> 2.3.2.0 --- pkgs/tools/admin/ansible/2.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/ansible/2.3.nix b/pkgs/tools/admin/ansible/2.3.nix index 599ea75836c..7330b7d0858 100644 --- a/pkgs/tools/admin/ansible/2.3.nix +++ b/pkgs/tools/admin/ansible/2.3.nix @@ -6,12 +6,12 @@ pythonPackages.buildPythonPackage rec { pname = "ansible"; - version = "2.3.1.0"; + version = "2.3.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "http://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd"; + sha256 = "1sv8666vw6fi93jlgkwd4lxkfn75yqczfvk129zlh8ll4wjv8qq5"; }; prePatch = '' @@ -30,7 +30,7 @@ pythonPackages.buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://www.ansible.com; description = "A simple automation tool"; - license = with licenses; [ gpl3] ; + license = with licenses; [ gpl3 ] ; maintainers = with maintainers; [ jgeerds joamaki From 130c61f8f2cd84de7eb5dc20316eee42e4d1d7f7 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Wed, 25 Oct 2017 22:29:27 +0300 Subject: [PATCH 1735/2806] sway module: better defaults --- nixos/modules/programs/sway.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index 3591893ff3c..2934fba96dd 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -25,10 +25,9 @@ in default = ""; type = types.lines; example = '' - export XKB_DEFAULT_LAYOUT=us,ru + export XKB_DEFAULT_LAYOUT=us,de + export XKB_DEFAULT_VARIANT=,nodeadkeys export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle, - export QT_QPA_PLATFORM=wayland - export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" ''; description = '' Shell commands executed just before sway is started. @@ -37,13 +36,12 @@ in extraPackages = mkOption { type = with types; listOf package; - default = with pkgs; [ ]; + default = with pkgs; [ + i3status xwayland rxvt_unicode dmenu + ]; example = literalExample '' with pkgs; [ - i3status - xwayland j4-dmenu-desktop dunst - qt5.qtwayland - imagemagick + i3status xwayland rxvt_unicode dmenu ] ''; description = '' From a3b11bd05688bce1206459affeb3f1e338ecf1d8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 25 Oct 2017 20:29:38 +0300 Subject: [PATCH 1736/2806] sd-image-armv7l-multiplatform.nix: Document serial consoles used --- .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 1c664e02503..cd5ac292f34 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -27,6 +27,12 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; + # The serial ports listed here are: + # - ttyS0: for Tegra (Jetson TK1) + # - ttymxc0: for i.MX6 (Wandboard) + # - ttyAMA0: for Allwinner (pcDuino3 Nano) and QEMU's -machine virt + # - ttyO0: for OMAP (BeagleBone Black) + # - ttySAC2: for Exynos (ODROID-XU3) boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix From 21f4a5f1b13a79e95a1b7afc9cc8caca831b4721 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 25 Oct 2017 20:30:17 +0300 Subject: [PATCH 1737/2806] sd-image-aarch64.nix: Document serial ports used Also drop boot.consoleLogLevel which already comes from installation-device.nix --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 8d80ceff84e..ec5ac532963 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -27,9 +27,12 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; - # Increase the amount of CMA to ensure the virtual console on the RPi3 works. - boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=tty0"]; - boot.consoleLogLevel = 7; + + # The serial ports listed here are: + # - ttyS0: for Tegra (Jetson TX1) + # - ttyAMA0: for QEMU's -machine virt + # Also increase the amount of CMA to ensure the virtual console on the RPi3 works. + boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; From 0676d691724b2ceebde17377fddf9bc7fcf8f5b0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 25 Oct 2017 22:26:45 +0300 Subject: [PATCH 1738/2806] sd-image-*: Include profiles/base.nix This brings useful goodies like lspci and lsusb that were missing previously. --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 1 + nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 1 + nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index ec5ac532963..c94dc7d4019 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -10,6 +10,7 @@ let in { imports = [ + ../../profiles/base.nix ../../profiles/installation-device.nix ./sd-image.nix ]; diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index cd5ac292f34..880a6bf2e1e 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -10,6 +10,7 @@ let in { imports = [ + ../../profiles/base.nix ../../profiles/installation-device.nix ./sd-image.nix ]; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 3f2970757bd..eb676eae05e 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -10,6 +10,7 @@ let in { imports = [ + ../../profiles/base.nix ../../profiles/installation-device.nix ./sd-image.nix ]; From 6dfbef0ae2f7e31e2821078c1dba1780af1e3863 Mon Sep 17 00:00:00 2001 From: symphorien Date: Wed, 25 Oct 2017 22:00:52 +0200 Subject: [PATCH 1739/2806] nixos/crashdump: fix evaluation. (#30415) The module would fail to evaluate: ```The option value `boot.crashDump.kernelPackages' in ... is not a package.``` Removed the option boot.crashDump.kernelPackage in favor of using boot.kernelPatches which automatically chooses the same kernel version as boot.kernelPackage instead of overriding it. Added option boot.crashDump.reservedMemory to customized crash kernel memory. Changed the default of boot.crashDump.kernelParams as the current one seemed to have no effect. --- nixos/modules/misc/crashdump.nix | 39 +++++++++++++++----------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index 5ef4b7781bd..6e0b49fa9af 100644 --- a/nixos/modules/misc/crashdump.nix +++ b/nixos/modules/misc/crashdump.nix @@ -18,26 +18,23 @@ in default = false; description = '' If enabled, NixOS will set up a kernel that will - boot on crash, and leave the user to a stage1 debug1devices - interactive shell to be able to save the crashed kernel dump. + boot on crash, and leave the user in systemd rescue + to be able to save the crashed kernel dump at + /proc/vmcore. It also activates the NMI watchdog. ''; }; - kernelPackages = mkOption { - type = types.package; - default = pkgs.linuxPackages; - # We don't want to evaluate all of linuxPackages for the manual - # - some of it might not even evaluate correctly. - defaultText = "pkgs.linuxPackages"; - example = literalExample "pkgs.linuxPackages_2_6_25"; + reservedMemory = mkOption { + default = "128M"; description = '' - This will override the boot.kernelPackages, and will add some - kernel configuration parameters for the crash dump to work. + The amount of memory reserved for the crashdump kernel. + If you choose a too high value, dmesg will mention + "crashkernel reservation failed". ''; }; kernelParams = mkOption { type = types.listOf types.str; - default = [ "debug1devices" ]; + default = [ "1" "boot.shell_on_fail" ]; description = '' Parameters that will be passed to the kernel kexec-ed on crash. ''; @@ -51,29 +48,29 @@ in config = mkIf crashdump.enable { boot = { postBootCommands = '' + echo "loading crashdump kernel..."; ${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \ --initrd=/run/current-system/initrd \ - --append="init=$(readlink -f /run/current-system/init) system=$(readlink -f /run/current-system) irqpoll maxcpus=1 reset_devices ${kernelParams}" --reset-vga --console-vga + --reset-vga --console-vga \ + --command-line="systemConfig=$(readlink -f /run/current-system) init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}" ''; kernelParams = [ - "crashkernel=64M" + "crashkernel=${crashdump.reservedMemory}" "nmi_watchdog=panic" "softlockup_panic=1" "idle=poll" ]; - kernelPackages = mkOverride 50 (crashdump.kernelPackages // { - kernel = crashdump.kernelPackages.kernel.override - (attrs: { - extraConfig = (optionalString (attrs ? extraConfig) attrs.extraConfig) + - '' + kernelPatches = [ { + name = "crashdump-config"; + patch = null; + extraConfig = '' CRASH_DUMP y DEBUG_INFO y PROC_VMCORE y LOCKUP_DETECTOR y HARDLOCKUP_DETECTOR y ''; - }); - }); + } ]; }; }; } From 02b15a418a86240ed5f9b61234f8594bab3f7e84 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 18 Oct 2017 23:24:31 +0200 Subject: [PATCH 1740/2806] shmig: init at 2017-07-24 --- .../tools/database/shmig/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/tools/database/shmig/default.nix diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix new file mode 100644 index 00000000000..a397ba69697 --- /dev/null +++ b/pkgs/development/tools/database/shmig/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub +, withMySQL ? false, withPSQL ? false, withSQLite ? false +, mariadb, postgresql, sqlite, gawk, which +, lib +}: + +stdenv.mkDerivation { + name = "shmig-2017-07-24"; + + src = fetchFromGitHub { + owner = "mbucc"; + repo = "shmig"; + rev = "aff54e03d13f8f95b422cf898505490a56152a4a"; + sha256 = "08q94dka5yqkzkis3w7j1q8kc7d3kk7mb2drx8ms59jcqvp847j3"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + patchShebangs . + + substituteInPlace shmig \ + --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb}/bin/mysql"}" \ + --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \ + --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \ + --replace "awk" "${gawk}/bin/awk" \ + --replace "which" "${which}/bin/which" + ''; + + preBuild = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + description = "Minimalistic database migration tool with MySQL, PostgreSQL and SQLite support"; + homepage = "https://github.com/mbucc/shmig"; + license = licenses.bsd3; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9a3674ee6c..5c0ae179474 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6263,6 +6263,8 @@ with pkgs; serpent = callPackage ../development/compilers/serpent { }; + shmig = callPackage ../development/tools/database/shmig { }; + smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = if stdenv.isDarwin then callPackage ../development/compilers/smlnj { } From c564e54f12a0dd279e290202ab61532864dc9c14 Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Wed, 25 Oct 2017 23:03:20 +0200 Subject: [PATCH 1741/2806] kitty: init at 0.4.2 (#30687) * add new application: terminal kitty (opengl, c, python) https://github.com/kovidgoyal/kitty.git * kitty: nitpicks * update kitty 0.4.0 -> 0.4.2, add maintainer --- lib/maintainers.nix | 1 + pkgs/applications/misc/kitty/default.nix | 38 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/applications/misc/kitty/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f2ab437ab22..b71b5d7aa54 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -610,6 +610,7 @@ teh = "Tom Hunger "; telotortium = "Robert Irelan "; teto = "Matthieu Coudron "; + tex = "Milan Svoboda "; thall = "Niclas Thall "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix new file mode 100644 index 00000000000..e1afac735d8 --- /dev/null +++ b/pkgs/applications/misc/kitty/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, glew, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper }: + +with python3Packages; +buildPythonApplication rec { + version = "0.4.2"; + name = "kitty-${version}"; + format = "other"; + + src = fetchFromGitHub { + owner = "kovidgoyal"; + repo = "kitty"; + rev = "v${version}"; + sha256 = "058676r2b83mjggbfc701v3vlviaslf7qciz8sm8lcda82k01wfp"; + }; + + buildInputs = [ glew fontconfig glfw ncurses libunistring ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildPhase = '' + python3 setup.py linux-package + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r linux-package/{bin,share,lib} $out + wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick ]}" + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kovidgoyal/kitty; + description = "A modern, hackable, featureful, OpenGL based terminal emulator"; + license = licenses.gpl3; + maintainers = with maintainers; [ tex ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55b0d5c892a..b89e59463bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15303,6 +15303,8 @@ with pkgs; kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { }; + kitty = callPackage ../applications/misc/kitty { }; + kiwix = callPackage ../applications/misc/kiwix { }; kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; From 1e3995d3ea35f9e4f36bcd18235958759deeb64a Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 26 Oct 2017 00:02:18 +0100 Subject: [PATCH 1742/2806] svgcleaner: add correct license --- pkgs/tools/graphics/svgcleaner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index c9be7d48455..4c7c5f1c385 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -18,8 +18,8 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "A tool for tidying and optimizing SVGs"; homepage = "https://github.com/RazrFalcon/svgcleaner"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + platforms = platforms.all; maintainer = [ maintainers.mehandes ]; }; } From 5e21db46dfe50a55a0bb929342dedbc80beda565 Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Wed, 25 Oct 2017 16:15:44 -0700 Subject: [PATCH 1743/2806] Fixed whitespace. --- pkgs/development/libraries/theft/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 345401dfa76..a0110c5f22b 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -17,9 +17,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; installFlags = [ "PREFIX=$(out)" ]; - postInstall = '' - install -m644 vendor/greatest.h $out/include/ - ''; + postInstall = "install -m644 vendor/greatest.h $out/include/"; meta = { description = "A C library for property-based testing"; From 5114ca05cf90aa05a5a8c5dd26550607c345a079 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Oct 2017 01:43:31 +0200 Subject: [PATCH 1744/2806] unifi: 5.6.18 -> 5.6.19 --- pkgs/servers/unifi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index d0cd8f8085a..9afa7de912d 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.6.18"; + version = "5.6.19"; src = fetchurl { - url = "https://www.ubnt.com/downloads/unifi/${version}-8261dc5066/unifi_sysvinit_all.deb"; - sha256 = "1xcnfmxwzij9qs9l71d3zkmq6q3ci80a8xbmfckb0gz08cvrw5k1"; + url = "https://dl.ubnt.com/unifi/5.6.19/unifi_sysvinit_all.deb"; + sha256 = "05xfm9k5r88j5hg4i80qxixs98rbmrsd1p1cdlczb18105lh5kxx"; }; buildInputs = [ dpkg ]; From 9d74f33416c7610559c7931d4ced37764526785b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Oct 2017 01:43:45 +0200 Subject: [PATCH 1745/2806] mupdf: add patch to fix multiple CVEs Fixes CVE-2017-14685, CVE-2017-14686, CVE-2017-14687, CVE-2017-15587. --- pkgs/applications/misc/mupdf/default.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 61febf5a7ff..a111e76df0c 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -32,6 +32,30 @@ stdenv.mkDerivation rec { url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch"; sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j"; }) + + (fetchurl { + name = "mupdf-1.11-CVE-2017-14685.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=ab1a420613dec93c686acbee2c165274e922f82a"; + sha256 = "120xapwj0af333n3a32ypxk0jmjv2ia476jg8pzsfqk9a5qqkx46"; + }) + + (fetchurl { + name = "mupdf-1.11-CVE-2017-14686.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1"; + sha256 = "0pkn7mfqhmnsyia4rh4mw4q435bzvlc22crqa1bxpaa0gcyky51c"; + }) + + (fetchurl { + name = "mupdf-1.11-CVE-2017-14687.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2b16dbd8f73269cb15ca61ece75cf8d2d196ed28"; + sha256 = "01v41cwrdnz3k32fcadk2gk4knqrm3mavzp6pxhn19nwgmqkshjd"; + }) + + (fetchurl { + name = "mupdf-1.11-CVE-2017-15587.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=82df2631d7d0446b206ea6b434ea609b6c28b0e8"; + sha256 = "04kfww7y0wazg6372g44fa2k5kiiigq4616ihkvmp18rz86903n9"; + }) ]; makeFlags = [ "prefix=$(out)" ]; From 32d6259eec824f7422cc279f9791e6304ca31566 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 26 Oct 2017 01:56:19 +0200 Subject: [PATCH 1746/2806] dnstracer: fix build on darwin --- pkgs/tools/networking/dnstracer/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index bb7c688480f..6d5e826c7d7 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libresolv }: stdenv.mkDerivation rec { version = "1.9"; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { setOutputFlags = false; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ libresolv ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; + meta = with stdenv.lib; { description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data."; homepage = http://www.mavetju.org/unix/general.php; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab2d1dd75c0..f078df76f0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19783,5 +19783,7 @@ with pkgs; duti = callPackage ../os-specific/darwin/duti {}; - dnstracer = callPackage ../tools/networking/dnstracer {}; + dnstracer = callPackage ../tools/networking/dnstracer { + inherit (darwin) libresolv; + }; } From c3d24791f5a4bb57eafa536da3ee270cbc953ea6 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Thu, 26 Oct 2017 11:30:45 +1100 Subject: [PATCH 1747/2806] sbt-extras: init at 77686b3 Fixes #21783 --- .../build-managers/sbt-extras/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/build-managers/sbt-extras/default.nix diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix new file mode 100644 index 00000000000..cd9635ab614 --- /dev/null +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +let + rev = "77686b3dfa20a34270cc52377c8e37c3a461e484"; + version = stdenv.lib.strings.substring 0 7 rev; +in +stdenv.mkDerivation { + name = "sbt-extras-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "paulp"; + repo = "sbt-extras"; + inherit rev; + sha256 = "1bhqigm0clv3i1gvn4gsllywcnwfsa73xvqp8m7pbvn8g7i2ws6x"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + install bin/sbt $out/bin + ''; + + meta = { + description = "A more featureful runner for sbt, the simple/scala/standard build tool"; + homepage = https://github.com/paulp/sbt-extras; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89e59463bd..10e1c8275dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7546,6 +7546,8 @@ with pkgs; sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; simpleBuildTool = sbt; + sbt-extras = callPackage ../development/tools/build-managers/sbt-extras { }; + shallot = callPackage ../tools/misc/shallot { }; shards = callPackage ../development/tools/build-managers/shards { }; From 43d3b9d74c2ea31873ee49854e54b431c754e684 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Oct 2017 22:22:05 +0000 Subject: [PATCH 1748/2806] jbuilder: 1.0+beta12 -> 1.0+beta14 --- pkgs/development/tools/ocaml/jbuilder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index db34450a7a6..bef994f30b7 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchzip, ocaml, opam }: stdenv.mkDerivation { - name = "jbuilder-1.0+beta12"; + name = "jbuilder-1.0+beta14"; src = fetchzip { - url = http://github.com/janestreet/jbuilder/archive/1.0+beta12.tar.gz; - sha256 = "1gqpp1spcya9951mw2kcavam8v0m5s6zc5pjb7bkv5d71si04rlf"; + url = http://github.com/janestreet/jbuilder/archive/1.0+beta14.tar.gz; + sha256 = "0vq4chqp7bm3rd5n6ry1j1ia6xqlz463059ljd1jmawa4dcyilvl"; }; buildInputs = [ ocaml ]; From 10fd7ccfdec698c727f869b6bce48c4109c87a9e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Oct 2017 22:35:19 +0000 Subject: [PATCH 1749/2806] ocamlPackages.ppx_tools: init at 5.1+4.06.0 --- pkgs/development/ocaml-modules/ppx_tools/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 5672300ddab..53d7847acee 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -14,6 +14,9 @@ let param = { "4.05" = { version = "5.0+4.05.0"; sha256 = "1jvvhk6wnkvm7b9zph309ihsc0hyxfpahmxxrq19vx8c674jsdm4"; }; + "4.06" = { + version = "5.1+4.06.0"; + sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; }."${ocaml.meta.branch}"; in stdenv.mkDerivation { From eecfa664c8eb20160114579e60f7d2c3b71a2e3a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Oct 2017 22:48:14 +0000 Subject: [PATCH 1750/2806] ocamlPackages.javalib: 2.3.4 -> 2.3.4 (sic) --- pkgs/development/ocaml-modules/javalib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 6bd98905afa..e0dc2408f13 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { version = "2.3.4"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37153/javalib-2.3.4.tar.bz2"; - sha256 = "081ga3qzx0lkz0wy92qyj6k75k3s79518bvqii2q778hh5wif36f"; + url = "https://gforge.inria.fr/frs/download.php/file/37154/javalib-2.3.4.tar.bz2"; + sha256 = "1ajzbyli5a3y9s8f46913drpxdzlby3i4g3c2fqacmnbyvhpaqb6"; }; buildInputs = [ which ocaml findlib camlp4 ]; From 66b63d2f5a442d642ac2b226d71b4f97bafce5c8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Oct 2017 23:08:35 +0000 Subject: [PATCH 1751/2806] ocamlPackages.ocplib-endian: 0.8 -> 1.0 --- pkgs/development/ocaml-modules/ocplib-endian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index b7d897b3853..084d70a8e79 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, cppo }: -let version = "0.8"; in +let version = "1.0"; in stdenv.mkDerivation { - name = "ocaml-ocplib-endian-${version}"; + name = "ocaml${ocaml.version}-ocplib-endian-${version}"; src = fetchzip { url = "https://github.com/OCamlPro/ocplib-endian/archive/${version}.tar.gz"; - sha256 = "12xjvzw245mj4s02dgi4k2sx5gam7wxi4mbxmz6k18zg64n48yjd"; + sha256 = "0s1ld3kavz892b8awyxyg1mr98h2g61gy9ci5v6yb49bsii6wicw"; }; buildInputs = [ ocaml findlib ocamlbuild cppo ]; From 69516040110334cfafa05a9355626a0bd8190d0d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 26 Oct 2017 07:55:51 +0200 Subject: [PATCH 1752/2806] sshfs: 3.3.0 -> 3.3.1 --- pkgs/tools/filesystems/sshfs-fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index eace7c2783e..7d251d2e00d 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -6,14 +6,14 @@ let inherit (stdenv.lib) optional; rpath = stdenv.lib.makeLibraryPath [ fuse3 glib ]; in stdenv.mkDerivation rec { - version = "3.3.0"; + version = "3.3.1"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "1hn5c0059ppjqygdhvapxm7lrqm5bnpwaxgjylskz04c0vr8nygp"; + sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv"; }; patches = optional buildManPages ./build-man-pages.patch; From 6248220d4e3c43de1ce018362cee00cec416b29c Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 26 Oct 2017 11:30:32 +0200 Subject: [PATCH 1753/2806] nnn: 1.3 -> 1.5 --- pkgs/applications/misc/nnn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index dd27409742f..a2e96593ae2 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,17 +4,17 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.3"; + version = "1.5"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "0w9i9vwyqgsi64b5mk4rhmr5gvnnb24c98321r0j5hb0ghdcp96s"; + sha256 = "10gcbklh0cp12293lzlwcplj0in90p95x4fyvg1smg4cxamkibvn"; }; - configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} nnn.h"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses readline ]; From 0e1b067a6447addc5baeb06687fa7ddc52189ed7 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 26 Oct 2017 11:48:33 +0200 Subject: [PATCH 1754/2806] ncmpcpp: 0.8 -> 0.8.1 --- pkgs/applications/audio/ncmpcpp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 1923377e56a..4452ab23cd5 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.8"; + version = "0.8.1"; src = fetchurl { - url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "0nj6ky805a55acj0w57sbn3vfmmkbqp97rhbi0q9848n10f2l3rg"; + url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; + sha256 = "1zw8d07b2bkssbsybg6jnmpq001w525viajrnz4jvfml3l55gyad"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A featureful ncurses based MPD client inspired by ncmpc"; - homepage = http://ncmpcpp.rybczak.net/; + homepage = https://ncmpcpp.rybczak.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ]; platforms = platforms.all; From ed0f558fb0f61fa49b336f70befd97dc23c021b1 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Thu, 26 Oct 2017 21:10:28 +1100 Subject: [PATCH 1755/2806] uvcdynctrl: init at 0.2 (#30806) * uvcdynctrl: init at 0.3.0 * uvcdynctrl: nitpicks --- pkgs/os-specific/linux/uvcdynctrl/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/os-specific/linux/uvcdynctrl/default.nix diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix new file mode 100644 index 00000000000..1a40ec50c99 --- /dev/null +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }: + +stdenv.mkDerivation rec { + version = "0.3.0"; + name = "uvcdynctrl-${version}"; + + src = fetchFromGitHub { + owner = "cshorler"; + repo = "webcam-tools"; + rev = "bee2ef3c9e350fd859f08cd0e6745871e5f55cb9"; + sha256 = "0s15xxgdx8lnka7vi8llbf6b0j4rhbjl6yp0qxaihysf890xj73s"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libxml2 ]; + + prePatch = '' + substituteInPlace uvcdynctrl/CMakeLists.txt \ + --replace "/etc/udev" "$out/etc/udev" \ + --replace "/lib/udev" "$out/lib/udev" + ''; + + meta = with stdenv.lib; { + description = "A simple interface for devices supported by the linux UVC driver"; + homepage = http://guvcview.sourceforge.net; + license = licenses.gpl3Plus; + maintainers = [ maintainers.puffnfresh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8579cd4a872..e5cfa303bee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17003,6 +17003,8 @@ with pkgs; else null; }; + uvcdynctrl = callPackage ../os-specific/linux/uvcdynctrl { }; + vkeybd = callPackage ../applications/audio/vkeybd {}; vlc = callPackage ../applications/video/vlc { From 8688a5198f474717ad8abc382827a945df76a28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Oct 2017 12:22:11 +0200 Subject: [PATCH 1756/2806] knot-dns: fix kdig +tls sending bad SNI --- pkgs/servers/dns/knot-dns/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 00d1c5c568d..81d6d54df69 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -15,11 +15,19 @@ stdenv.mkDerivation rec { sha256 = "68e04961d0bf6ba193cb7ec658b295c4ff6e60b3754d64bcd77ebdcee0f283fd"; }; - patches = [(fetchpatch { # remove for >= 2.6.1 - name = "kdig-tls.patch"; - url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/b72d5cd032795.diff"; - sha256 = "0ig31rp82j49jh8n3s0dcf5abhh35mcp2k2wii7bh0c60ngb29k6"; - })]; + patches = [ + # remove both for >= 2.6.1 + (fetchpatch { + name = "kdig-tls.patch"; + url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/b72d5cd032795.diff"; + sha256 = "0ig31rp82j49jh8n3s0dcf5abhh35mcp2k2wii7bh0c60ngb29k6"; + }) + (fetchpatch { + name = "kdig-tls-sni.patch"; + url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/2e94ccee671ec70e.diff"; + sha256 = "0psl6650v7g240i8w196v7zxy6j11d0aa6hm11b7vnaimjshgibv"; + }) + ]; outputs = [ "bin" "out" "dev" ]; From 1d1e0920d95af2127d92bfdc9650c673622a8eb0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 26 Oct 2017 18:27:57 +0800 Subject: [PATCH 1757/2806] go: 1.8.4 -> 1.8.5 --- pkgs/development/compilers/go/1.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 838032c9698..538c20bac72 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "0p0m63y39pja3fkj43sdq0qv8kqljkz7d58bf9jbw0rjw2c9ml4a"; + sha256 = "1ab021l3v29ciaxp738cjpbkh1chlsl6928672q3i82anmdzn5m5"; }; # perl is used for testing go vet From df04f0cb63f8df815ec95d284317373a14876b61 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 26 Oct 2017 18:28:08 +0800 Subject: [PATCH 1758/2806] go: 1.9.1 -> 1.9.2 --- pkgs/development/compilers/go/1.9.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index a90985c2525..50fa2d97627 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1p226lgsmiwgcvmiakac9i08304cq5ick23vmsk1vjcsh6dvz9i3"; + sha256 = "07p4ld07r2nml2bsbfb8h51hqilbqyhhdlia99y1gk7ibvhybv8i"; }; # perl is used for testing go vet @@ -123,10 +123,6 @@ stdenv.mkDerivation rec { url = "https://github.com/golang/go/commit/29415eb2b92e78481897c4161ba99f5b09fa6102.patch"; sha256 = "01jkm4b2dazzjnfla7rdd0w2clzplga3zza6ybpmkjkk3i4bp73d"; }) - (fetchpatch { - url = "https://github.com/golang/go/commit/27e80f7c4d8001598367e15a1617fa524bd0fb11.patch"; - sha256 = "1250nrc79jwcagkjqffn5srn78isykvjhvmqhwipwyqb99q85wcz"; - }) ]; postPatch = optionalString stdenv.isDarwin '' From 00a5d6d4d4c7de5f527ae325d3cd747d38a257f7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 26 Oct 2017 12:35:38 +0200 Subject: [PATCH 1759/2806] jabref: fix startup error with gsettings schemas --- pkgs/applications/office/jabref/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index ef21b37b59e..e7b82183454 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }: +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings_desktop_schemas }: stdenv.mkDerivation rec { version = "3.8.1"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { exec = "jabref"; }; - buildInputs = [ makeWrapper jdk ]; + buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings_desktop_schemas ]; - phases = [ "installPhase" ]; + unpackPhase = "#"; installPhase = '' mkdir -p $out/bin $out/share/java $out/share/icons From 000b68c22606fc244456e09c92c83663614a96d9 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 26 Oct 2017 12:16:54 +0200 Subject: [PATCH 1760/2806] git-hub: 0.11.1 -> 1.0.0 --- .../git-and-tools/git-hub/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 9ddcaea497d..4ec83af9160 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchFromGitHub, docutils, python2Packages }: +{ stdenv, fetchFromGitHub, docutils, gitMinimal, python2Packages }: stdenv.mkDerivation rec { name = "git-hub-${version}"; - version = "0.11.1"; + version = "1.0.0"; src = fetchFromGitHub { - sha256 = "15449bqk7nyvbpin5j2hg862cqa7hb4zxkmr8mkqm5hz2jxmxspa"; + sha256 = "07756pidrm4cph3nm90z16imvnylvz3fw4369wrglbdr27filf3x"; rev = "v${version}"; repo = "git-hub"; owner = "sociomantic-tsunami"; }; buildInputs = [ python2Packages.python ]; - nativeBuildInputs = [ python2Packages.docutils ]; + nativeBuildInputs = [ + gitMinimal # Used during build to generate Bash completion. + python2Packages.docutils + ]; postPatch = '' substituteInPlace Makefile --replace rst2man rst2man.py @@ -21,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installFlags = [ "prefix=$(out)" ]; + installFlags = [ "prefix=$(out)" "sysconfdir=$(out)/etc" ]; postInstall = '' # Remove inert ftdetect vim plugin and a README that's a man page subset: From 49e88fbd37d312c2d6de6a7dc0a491623adc3d7d Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 26 Oct 2017 12:56:14 +0200 Subject: [PATCH 1761/2806] grafana: 4.5.2 -> 4.6.0 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 398e75f4fac..f6a4860380b 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.5.2"; + version = "4.6.0"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1sgrnk90hn99c1xq49al5n76j2qqfi7sjc6r2fr00gd7mxzbh1mg"; + sha256 = "0z3981xnx97d1gn6w31kc066kyqksacdjmxbbrsczwn7mprkv6ij"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "19l1abq8qklhsqq1z4mi08c9z139b8gfyay7pwp4xmjxfzpsff64"; + sha256 = "14sk3rb29aa8qfskb1x9lmisn038a7v0rz5jr6x0m21rzc11ripa"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From 4617be781789d396ad20560136dac8670ef9f7f2 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 26 Oct 2017 12:36:02 +0100 Subject: [PATCH 1762/2806] alacritty: 2017-10-17 -> 2017-10-22, remove broken status --- pkgs/applications/misc/alacritty/default.nix | 28 +++++++++----------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 77466fba653..067cb675571 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -1,5 +1,5 @@ { stdenv, - fetchFromGitHub, + fetchgit, rustPlatform, cmake, makeWrapper, @@ -29,16 +29,19 @@ let in buildRustPackage rec { - name = "alacritty-unstable-2017-10-17"; + name = "alacritty-unstable-${version}"; + version = "2017-10-22"; - src = fetchFromGitHub { - owner = "jwilm"; - repo = "alacritty"; - rev = "5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6"; - sha256 = "0h37x12r33xwz9vf1n8y24c0ph5w17lhkpfi5q6lbpgidvbs6fyx"; + # At the moment we cannot handle git dependencies in buildRustPackage. + # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. + src = fetchgit { + url = https://github.com/Mic92/alacritty.git; + rev = "rev-${version}"; + sha256 = "02wvwi72hnqmy12n0b248wzhajni9ipyayz6vnn3ryhnrccrrp7j"; + fetchSubmodules = true; }; - cargoSha256 = "0w3j92kd27pny37pfvlv6qsnbb1lgphmfbhvvng0z96r2b1wjviz"; + cargoSha256 = "14bmm1f7hqh8i4mpb6ljh7szrm4g6mplzpq9zbgjrgxnc01w3s0i"; buildInputs = [ cmake @@ -54,14 +57,10 @@ buildRustPackage rec { installPhase = '' runHook preInstall - mkdir -p $out/bin - for f in $(find target/release -maxdepth 1 -type f); do - cp $f $out/bin - done; + install -D target/release/alacritty $out/bin/alacritty patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty - mkdir -p $out/share/applications - cp Alacritty.desktop $out/share/applications/alacritty.desktop + install -D Alacritty.desktop $out/share/applications/alacritty.desktop runHook postInstall ''; @@ -69,7 +68,6 @@ buildRustPackage rec { dontPatchELF = true; meta = with stdenv.lib; { - broken = true; description = "GPU-accelerated terminal emulator"; homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; From af5a75aeab28f512afc2ee729875020f2cfb80b1 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 26 Oct 2017 14:09:48 +0200 Subject: [PATCH 1763/2806] zam-plugins: 3.8 -> 3.9 --- pkgs/applications/audio/zam-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 6067c5b1c75..f81aad4e2af 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zam-plugins-${version}"; - version = "3.8"; + version = "3.9"; src = fetchgit { url = "https://github.com/zamaudio/zam-plugins.git"; deepClone = true; - rev = "830ab2e9dd1db8cf56d12c71057157e5d8e9fd74"; - sha256 = "1hyly5inis59cvh0r7lyi203h8v5jh84ca9jpaljm53cvw6d93px"; + rev = "4976cf204074c1dfaf344821e83e8d896b35107d"; + sha256 = "1xgwl51sf2hgc5ikcnycyxaw9vy82lrcswn07b6av6i67qclm8f8"; }; nativeBuildInputs = [ pkgconfig ]; From 61efe055e8f68615da96a449d27df1d3aa07fd72 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 26 Oct 2017 14:46:40 +0100 Subject: [PATCH 1764/2806] mysql55: 5.5.57 -> 5.5.58 --- pkgs/servers/sql/mysql/5.5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 6a85d956a0c..28e7824cd42 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.57"; + version = "5.5.58"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "113kynpfj45fffr62xack2657pds8mkhsgg77zj94ksj3qrbvhn1"; + sha256 = "1f890376ld1qapl038sjh2ialdizys3sj96vfn4mqmb1ybx14scv"; }; patches = if stdenv.isCygwin then [ From bbe660417b442ddfc6d2db76e8f60d478e806971 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 26 Oct 2017 14:46:57 +0100 Subject: [PATCH 1765/2806] mysql57: 5.7.19 -> 5.7.20 --- pkgs/servers/sql/mysql/5.7.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 5598a792633..687993e0dc5 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.19"; + version = "5.7.20"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "1c8y54yk756179nx4dgg79dijmjdq5n8l057cnqsg70pjdpyfl9y"; + sha256 = "11v4g3igigv3zvknv67qml8in6fjrbs2vnr3q6bg6f62nydm95sk"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' From 948934864dbf063e742456aa079aa65c0cd7321b Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 26 Oct 2017 02:33:55 +0200 Subject: [PATCH 1766/2806] mpg321: add pkg option to set libao default audio driver Tested manually with "alsa" and "pulse" drivers. --- pkgs/applications/audio/mpg321/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index b68c44278ee..ee0ebf234ce 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -1,4 +1,8 @@ -{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib}: +{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib +# Specify default libao output plugin to use (e.g. "alsa", "pulse" …). +# If null, it will use the libao system default. +, defaultAudio ? null +}: stdenv.mkDerivation rec { name = "mpg321-${version}"; @@ -11,9 +15,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = [ - ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) - ]; + configureFlags = + [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ] + ++ (stdenv.lib.optional (defaultAudio != null) + "--with-default-audio=${defaultAudio}"); buildInputs = [libao libid3tag libmad zlib] ++ stdenv.lib.optional stdenv.isLinux alsaLib; From 8f3a2d699121461a2b359b12e792d32b6083bc2c Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 26 Oct 2017 17:12:42 +0200 Subject: [PATCH 1767/2806] borgbackup: 1.1.0 -> 1.1.1 --- pkgs/tools/backup/borg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4ff61d1ac95..219283de4cc 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.1.0"; + version = "1.1.1"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "0vwyg0b4kxb0rspqwhvgi5c78dzimgkydf03wif27a40qhh1235l"; + sha256 = "0iik5lq349cl87imlwra2pp0j36wjhpn8r1d3778azvvqpyjq2d5"; }; nativeBuildInputs = with python3Packages; [ From 4cacf8699c5c3b38cd2d71271068b9c6654ae2c5 Mon Sep 17 00:00:00 2001 From: Stefan Lau Date: Sun, 15 Oct 2017 11:43:53 +0200 Subject: [PATCH 1768/2806] selendroid: fix selendroid-selenium command --- .../tools/selenium/selendroid/default.nix | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index c2277214951..eac948db9bc 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: with stdenv.lib; - +let + name = "selendroid-standalone-${version}"; + pluginName = "selendroid-grid-plugin-${version}"; + version = "0.11.0"; + srcs = { + jar = fetchurl { + url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar"; + sha256 = "1p6k974pr2634q1g65wx243cxdqhac63x8w2gsmh6vnni0818clk"; + }; + gridPlugin = fetchurl { + url = "https://search.maven.org/remotecontent?filepath=io/selendroid/selendroid-grid-plugin/${version}/${pluginName}.jar"; + sha256 = "1iazmdv2z0k03fa1xlfipwdf3s9j6404kkpfs5xdyy0513ah02a0"; + }; + }; +in stdenv.mkDerivation rec { - name = "selendroid-standalone-${version}"; - version = "0.11.0"; - src = fetchurl { - url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar"; - sha256 = "1p6k974pr2634q1g65wx243cxdqhac63x8w2gsmh6vnni0818clk"; - }; + inherit name; + inherit version; unpackPhase = "true"; @@ -17,17 +27,21 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/lib/selendroid - cp $src $out/share/lib/selendroid/${name}.jar + cp ${srcs.jar} $out/share/lib/selendroid/${name}.jar + cp ${srcs.gridPlugin} $out/share/lib/selendroid/${pluginName}.jar + makeWrapper ${jdk}/bin/java $out/bin/selendroid \ --add-flags "-jar $out/share/lib/selendroid/${name}.jar" makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ --add-flags "-Dfile.encoding=UTF-8" \ - --add-flags "-cp \"$out/share/lib/selendroid/${name}.jar:${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar\"" \ - --add-flags "org.openqa.grid.selenium.GridLauncherV3" + --add-flags "-cp ${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar:$out/share/lib/selendroid/${pluginName}.jar" \ + --add-flags "org.openqa.grid.selenium.GridLauncherV3" \ + --add-flags "-role hub" \ + --add-flags "-capabilityMatcher io.selendroid.grid.SelendroidCapabilityMatcher" ''; meta = { - homepage = https://code.google.com/p/selenium; + homepage = http://selendroid.io/; description = "Test automation for native or hybrid Android apps and the mobile web"; maintainers = with maintainers; [ offline ]; platforms = platforms.all; From e6a3089ec4c7599a8fddd235d550bb30ef9ad261 Mon Sep 17 00:00:00 2001 From: Stefan Lau Date: Sun, 15 Oct 2017 12:28:12 +0200 Subject: [PATCH 1769/2806] selendroid: 0.11.0 -> 0.17.0 --- pkgs/development/tools/selenium/selendroid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index eac948db9bc..dcc3893ee0d 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -4,15 +4,15 @@ with stdenv.lib; let name = "selendroid-standalone-${version}"; pluginName = "selendroid-grid-plugin-${version}"; - version = "0.11.0"; + version = "0.17.0"; srcs = { jar = fetchurl { url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar"; - sha256 = "1p6k974pr2634q1g65wx243cxdqhac63x8w2gsmh6vnni0818clk"; + sha256 = "10lxdsgp711pv8r6dk2aagnbvnn1b25zfqjvz7plc73zqhx1dxvw"; }; gridPlugin = fetchurl { url = "https://search.maven.org/remotecontent?filepath=io/selendroid/selendroid-grid-plugin/${version}/${pluginName}.jar"; - sha256 = "1iazmdv2z0k03fa1xlfipwdf3s9j6404kkpfs5xdyy0513ah02a0"; + sha256 = "1x6cjmp2hpghbgbf8vss0qaj2n4sfl29wp3bc4k1s3hnnpccvz70"; }; }; in From 74a2d53e0d2ae9a5b574a07483dc8aa790a8340e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 26 Oct 2017 17:42:14 +0100 Subject: [PATCH 1770/2806] buildkite-agent service: add bash to the runtimePackages bash is necessary for nix-shell to work properly --- .../services/continuous-integration/buildkite-agent.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index b6d61f6c68b..9c06e1d43bb 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -33,8 +33,8 @@ in }; runtimePackages = mkOption { - default = [ pkgs.nix ]; - defaultText = "[ pkgs.nix ]"; + default = [ pkgs.bash pkgs.nix ]; + defaultText = "[ pkgs.bash pkgs.nix ]"; description = "Add programs to the buildkite-agent environment"; type = types.listOf types.package; }; From daf53c9a102e695d9ca0c2b48b231e8f2517264b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 26 Oct 2017 17:43:17 +0100 Subject: [PATCH 1771/2806] buildRustPackage: allow passthru overrides Don't ignore the passthru that could be passed to the derivation --- pkgs/build-support/rust/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 2b32da11d1c..37ea264a53f 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -80,5 +80,5 @@ in stdenv.mkDerivation (args // { runHook postInstall ''; - passthru = { inherit cargoDeps; }; + passthru = { inherit cargoDeps; } // (args.passthru or {}); }) From 5a64e446ffc5c01c58f066060218dc358fe25e42 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 26 Oct 2017 22:01:11 +0200 Subject: [PATCH 1772/2806] tor: 0.3.1.7 -> 0.3.1.8 Quoth the release notes: > It includes several bugfixes, including a bugfix for a crash issue that had affected relays under memory pressure. It also adds a new directory authority, Bastet. --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 3daf30d2ff0..576189d9a85 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.1.7"; + name = "tor-0.3.1.8"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "13y0v4zfla0vziy9kkahmhrwylv32ianjikcr46mwbxvji4dvx8x"; + sha256 = "18dinpj03d036rashlad16lv7j2hba8gg742z07l37x5c242kxkx"; }; outputs = [ "out" "geoip" ]; From 2b496a80ff6712b6e3e52d852c610ef4a20330de Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 26 Oct 2017 22:03:52 +0200 Subject: [PATCH 1773/2806] tor-browser-bundle-bin: 7.0.7 -> 7.0.8 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 56cab9de5d0..4464d490bc8 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.7"; + version = "7.0.8"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1848j28majbb61r080g6dw0lmh7hbp515iidyjdrpgcwhazzg06j"; + sha256 = "0bi4l4ma40ifsajvjpwv6ixphijqvb7yrci2jcyykh3j41ndfjf2"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "08wvpymmyg16ifz23awnjy0pbva8xh1fdx2i8c1n18x3k12d5r7h"; + sha256 = "182q1gb8jnk92wxr7m977yxcksa8d3zg90qbsja1raym2vhqaf73"; }; }; in From 160e914f502df0740a7e04cd477ae0b9d109da58 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Thu, 26 Oct 2017 22:47:21 +0200 Subject: [PATCH 1774/2806] python-trezor: Move mnemonic dependency to propagatedBuildInputs --- pkgs/development/python-modules/trezor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index c473403f53d..cb4b63ade81 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314"; }; - propagatedBuildInputs = [ protobuf hidapi requests ]; + propagatedBuildInputs = [ protobuf hidapi requests mnemonic ]; - buildInputs = [ ecdsa mnemonic ]; + buildInputs = [ ecdsa ]; # There are no actual tests: "ImportError: No module named tests" doCheck = false; From e61ef03c0203b3230ad2a21e5652cbd820a452d5 Mon Sep 17 00:00:00 2001 From: dywedir Date: Fri, 27 Oct 2017 00:08:49 +0300 Subject: [PATCH 1775/2806] fd: 4.0.0 -> 5.0.0 --- pkgs/tools/misc/fd/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 54d17e6f64c..09debd461dc 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,18 +2,23 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv"; + sha256 = "17y2fr3faaf32lv171ppkgi55v5zxq97jiilsgmjcn00rd9i6v0j"; }; - cargoSha256 = "1v9wg4dq4c7i85bkdhd79bj8gx7200z6np05wsyj2ycbv97p095j"; + cargoSha256 = "17f4plyj6mnz0d9f4ykgbmddsdp6c3f6q4kmgj406p49xsf0jjkc"; - meta = { + preFixup = '' + mkdir -p "$out/man/man1" + cp "$src/doc/fd.1" "$out/man/man1" + ''; + + meta = with stdenv.lib; { description = "A simple, fast and user-friendly alternative to find"; longDescription = '' `fd` is a simple, fast and user-friendly alternative to `find`. @@ -22,7 +27,7 @@ rustPlatform.buildRustPackage rec { it provides sensible (opinionated) defaults for 80% of the use cases. ''; homepage = "https://github.com/sharkdp/fd"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ asl20 /* or */ mit ]; + platforms = platforms.all; }; } From b72fcce2d99364b9a415dd82383e0b797352977b Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Thu, 26 Oct 2017 11:12:29 +1100 Subject: [PATCH 1776/2806] jsawk: init at 1.5-pre --- pkgs/tools/text/jsawk/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/text/jsawk/default.nix diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix new file mode 100644 index 00000000000..46d290b79ff --- /dev/null +++ b/pkgs/tools/text/jsawk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey }: + +stdenv.mkDerivation rec { + name = "jsawk-${version}"; + version = "1.5-pre"; + src = fetchFromGitHub { + owner = "micha"; + repo = "jsawk"; + rev = "5a14c4af3c7b59807701b70a954ecefc6f77e978"; + sha256 = "0z3vdr3c8nvdrrxkjv9b4xg47mdb2hsknxpimw6shgwbigihapyr"; + }; + dontBuild = true; + buildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + cp $src/jsawk $out/bin/ + wrapProgram $out/bin/jsawk \ + --prefix PATH : "${spidermonkey}/bin" + ''; + + meta = { + description = "Jsawk is like awk, but for JSON"; + homepage = https://github.com/micha/jsawk; + license = stdenv.lib.licenses.publicDomain; + maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89e59463bd..da1072f82f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2814,6 +2814,8 @@ with pkgs; jrnl = callPackage ../applications/misc/jrnl { }; + jsawk = callPackage ../tools/text/jsawk { }; + jscoverage = callPackage ../development/tools/misc/jscoverage { }; jsduck = callPackage ../development/tools/jsduck { }; From 21ad5f0ab6e22fc3bf651fcb21b3cb1066ba3e36 Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Fri, 27 Oct 2017 11:09:44 +0800 Subject: [PATCH 1777/2806] fastlane: 2.61.0 -> 2.62.1 --- pkgs/tools/admin/fastlane/Gemfile.lock | 14 +++++++------- pkgs/tools/admin/fastlane/gemset.nix | 24 ++++++++++++------------ pkgs/tools/admin/fastlane/update | 10 ++++++++++ 3 files changed, 29 insertions(+), 19 deletions(-) create mode 100755 pkgs/tools/admin/fastlane/update diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 8f10ee22ddc..93cf658719c 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -24,7 +24,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.61.0) + fastlane (2.62.1) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -65,9 +65,9 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - googleauth (0.5.3) + googleauth (0.6.1) faraday (~> 0.12) - jwt (~> 1.4) + jwt (>= 1.4, < 3.0) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) @@ -78,7 +78,7 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) json (2.1.0) - jwt (1.5.6) + jwt (2.1.0) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -112,21 +112,21 @@ GEM terminal-notifier (1.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-screen (0.5.0) + tty-screen (0.5.1) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.4) unicode-display_width (1.3.0) word_wrap (1.0.0) - xcodeproj (1.5.2) + xcodeproj (1.5.3) CFPropertyList (~> 2.3.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.2.3) xcpretty (0.2.8) rouge (~> 2.0.7) - xcpretty-travis-formatter (0.0.4) + xcpretty-travis-formatter (1.0.0) xcpretty (~> 0.2, >= 0.0.7) PLATFORMS diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index c1285e43496..8e75f76ec35 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -137,10 +137,10 @@ dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n73748vw7y29ycx0rjdg9zvn8xhncq07zq1l4a16n5s82rb14iy"; + sha256 = "1r6ci3rkrzsdk8cbxidzcjv94hbwq7ljwvm5whgxb8lcxcfl696k"; type = "gem"; }; - version = "2.61.0"; + version = "2.62.1"; }; gh_inspector = { source = { @@ -163,10 +163,10 @@ dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; + sha256 = "13laklpf99m3qzq9n3vnc9dblgw7q05n1r16jlxsh4lxlaijr0sf"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.1"; }; highline = { source = { @@ -204,10 +204,10 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; type = "gem"; }; - version = "1.5.6"; + version = "2.1.0"; }; little-plugger = { source = { @@ -393,10 +393,10 @@ tty-screen = { source = { remotes = ["https://rubygems.org"]; - sha256 = "005rpl9l1r9i7wypb4kv057y01fxqvanznx62msx6z451cfjsfn3"; + sha256 = "12qkjwpkgznvhwbywq2y7l5mcq2f4z404b0ip7xm4byg3827lh4h"; type = "gem"; }; - version = "0.5.0"; + version = "0.5.1"; }; uber = { source = { @@ -443,10 +443,10 @@ dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v40167wxhjfczjqp7axvblivrzgbmqldaj9vb15pw45qh6xly51"; + sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.3"; }; xcpretty = { dependencies = ["rouge"]; @@ -461,9 +461,9 @@ dependencies = ["xcpretty"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wn5pcxja1jkc8y5b6s3pks5inc1vmjkq7fqmlbkl39z8l1vdis2"; + sha256 = "15b5c0lxz2blmichfdlabzlbyw5nlh1ci898pxwb661m9bahz3ml"; type = "gem"; }; - version = "0.0.4"; + version = "1.0.0"; }; } \ No newline at end of file diff --git a/pkgs/tools/admin/fastlane/update b/pkgs/tools/admin/fastlane/update new file mode 100755 index 00000000000..22d1e52e297 --- /dev/null +++ b/pkgs/tools/admin/fastlane/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -r ~/.gem +fi From 4c61281b9298a248fdf8264451d1336cfe680028 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 27 Oct 2017 12:15:01 +0800 Subject: [PATCH 1778/2806] nodejs: 4.8.4 -> 4.8.5 --- pkgs/development/web/nodejs/v4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 24832b6b8be..d3ad4d11e4c 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "4.8.4"; + version = "4.8.5"; name = "${baseName}-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "35fe633a48cbe93c79327161d9dc964ac9810f4ceb2ed8628487e6e14a15905b"; + sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4"; }; }) From de8b1b4b7b197d1fccd0e8d36ed0c6349b307174 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 27 Oct 2017 12:15:23 +0800 Subject: [PATCH 1779/2806] nodejs: 6.11.4 -> 6.11.5 --- pkgs/development/web/nodejs/v6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 58cfc9af9fc..e516d9b99b6 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -10,10 +10,10 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "6.11.4"; + version = "6.11.5"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "0l6lmid8wfvvbq391x0k19crs63zf6kkcln79fn3d088wcsh8bsc"; + sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w"; }; }) From c07cf635c8ffdfd5f53fc760f7006412c348845c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 27 Oct 2017 12:17:02 +0800 Subject: [PATCH 1780/2806] nodejs: 8.7.0 -> 8.8.0 --- pkgs/development/web/nodejs/v8.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 560df06b8c5..427de79b33e 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,13 +10,12 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.7.0"; + version = "8.8.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "16mml3cwjnq7yf9yd67d2dybav3nvbnk89fkixs1wz7fd26d05ss"; + sha256 = "1ksfj6h6vwaws52055mg80pm2bslw23kpx3a7ahraa6ngk934kw5"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; }) - From 93cc9b93e01d9095317ecc6167291247e9db3b1d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 27 Oct 2017 12:59:52 +0800 Subject: [PATCH 1781/2806] kmplayer: add missing X dependencies --- pkgs/applications/video/kmplayer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 88055f2a824..44313f9499f 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, makeWrapper, + libpthreadstubs, libXdmcp, qtsvg, qtx11extras, ki18n, kdelibs4support, kio, kmediaplayer, kwidgetsaddons, phonon, cairo, mplayer }: @@ -29,6 +30,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules makeWrapper ]; buildInputs = [ + libpthreadstubs libXdmcp qtsvg qtx11extras ki18n kdelibs4support kio kmediaplayer kwidgetsaddons phonon cairo ]; From 8f17abf29c769e6914ed585e7e56601c58877e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Thu, 12 Oct 2017 04:40:46 +0200 Subject: [PATCH 1782/2806] greg: init at 0.4.7 --- pkgs/applications/audio/greg/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/audio/greg/default.nix diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix new file mode 100644 index 00000000000..e7a23b6f204 --- /dev/null +++ b/pkgs/applications/audio/greg/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +with pythonPackages; buildPythonApplication rec { + pname = "greg"; + version = "0.4.7"; + name = pname + "-" + version; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "manolomartinez"; + repo = pname; + rev = "v" + version; + sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v"; + }; + + buildInputs = with pythonPackages; [ feedparser ]; + propagatedBuildInputs = buildInputs; + + meta = with stdenv.lib; { + homepage = "https://github.com/manolomartinez/greg"; + description = "A command-line podcast aggregator"; + license = licenses.gpl3; + maintainers = with maintainers; [ edwtjo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 067464249bf..44369de2215 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1107,6 +1107,10 @@ with pkgs; gosu = callPackage ../tools/misc/gosu { }; + greg = callPackage ../applications/audio/greg { + pythonPackages = python3Packages; + }; + gringo = callPackage ../tools/misc/gringo { scons = scons_2_5_1; }; gti = callPackage ../tools/misc/gti { }; From 6574d216646ae41c9713aca1c320c47bb01e5a80 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 26 Oct 2017 16:57:42 +0300 Subject: [PATCH 1783/2806] xwayland: enable acceleration with help of glamor --- pkgs/servers/x11/xorg/xwayland.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 28463dc6163..6de53faf771 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -17,6 +17,7 @@ overrideDerivation xorgserver (oldAttrs: { "--disable-xnest" "--disable-xquartz" "--disable-xwin" + "--enable-glamor" "--with-default-font-path=" "--with-xkb-bin-directory=${xkbcomp}/bin" "--with-xkb-path=${xkeyboard_config}/etc/X11/xkb" From 0e4be9e5f07c8688abaf3f06b6976a662b993ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 27 Oct 2017 09:03:03 +0200 Subject: [PATCH 1784/2806] bully: 1.0-22 -> 1.1 --- pkgs/tools/networking/bully/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index 3410d0e2c5c..81dd294d786 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -1,13 +1,15 @@ -{stdenv, fetchFromGitHub, openssl, libpcap}: +{ stdenv, fetchFromGitHub, openssl, libpcap }: stdenv.mkDerivation rec { + name = "bully-${version}"; - version = "1.0-22"; + version = "1.1"; + src = fetchFromGitHub { - sha256 = "0wk9jmcibd03gspnnr2qvfkw57rg94cwmi0kjpy1mgi05s6vlw1y"; - rev = "v${version}"; + sha256 = "1qvbbf72ryd85bp4v62fk93ag2sn25rj7kipgagbv22hnq8yl3zd"; + rev = version; repo = "bully"; - owner = "HorayNarea"; + owner = "aanarchyy"; }; buildInputs = [ openssl libpcap ]; @@ -21,11 +23,11 @@ stdenv.mkDerivation rec { mv bully $out/bin ''; - meta = { + meta = with stdenv.lib; { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; - homepage = https://github.com/Lrs121/bully; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/aanarchyy/bully; + maintainers = with maintainers; [ edwtjo ]; + license = licenses.gpl3; + platforms = platforms.linux; }; } From c70773b35b2df6081bc8faa2839c108555689d28 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 27 Oct 2017 11:05:10 +0200 Subject: [PATCH 1785/2806] android-studio: 2.3.3.0 -> 3.0.0.18 --- pkgs/applications/editors/android-studio/packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 4e834afa9d0..cf63feb860e 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeFontsConf }: +{ stdenv, callPackage, fetchurl, makeFontsConf }: let mkStudio = opts: callPackage (import ./common.nix opts) { fontsConf = makeFontsConf { @@ -6,11 +6,11 @@ let }; }; in rec { - stable = mkStudio rec { + stable = mkStudio { pname = "android-studio"; - version = "2.3.3.0"; - build = "162.4069837"; - sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk"; + version = "3.0.0.18"; # "Android Studio 3.0" + build = "171.4408382"; + sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br"; meta = with stdenv.lib; { description = "The Official IDE for Android (stable version)"; From e4d0173d1f4a140d322b180032a68179ac5c04ad Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 27 Oct 2017 11:05:17 +0200 Subject: [PATCH 1786/2806] android-studio-preview: 3.0.0.17 -> 3.1.0.0 --- pkgs/applications/editors/android-studio/packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index cf63feb860e..6f8440f7b1f 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -25,16 +25,16 @@ in rec { }; }; - preview = mkStudio rec { + preview = mkStudio { pname = "android-studio-preview"; - version = "3.0.0.17"; # "Android Studio 3.0 RC 2" - build = "171.4402976"; - sha256Hash = "18f5cq1dcmyjxaq520kqjac332bpp35pis02yplh6gzp65i4bvvf"; + version = "3.1.0.0"; # "Android Studio 3.1 Canary 1" + build = "171.4415322"; + sha256Hash = "08xgwv6mg2zxys9dqjfz66h60g640ni3snyb89ij0fkmd28rbxgj"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; homepage = https://developer.android.com/studio/preview/index.html; - maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ]; + maintainers = with stdenv.lib.maintainers; [ primeos ]; }; }; } From 669b4c4e1b00128026dd0d763b6ffbea91477417 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 27 Oct 2017 11:32:35 +0200 Subject: [PATCH 1787/2806] pythonPackages.raven: 6.2.0 -> 6.2.1 --- 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 cf670a40c6c..1bbee9a7ea4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7583,11 +7583,11 @@ in { }; raven = buildPythonPackage rec { - name = "raven-6.2.0"; + name = "raven-6.2.1"; src = pkgs.fetchurl { url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "1jmr9kpajfh6fvxbym6fdybmlr14216y0dkbial7ris9pi1pwhf5"; + sha256 = "1zkh8llsfng5viz8cpf9j74v30705hv80vb5g6gha1ij7v60p8y0"; }; # way too many dependencies to run tests From 3e29dd00fc43f585995dc470e7bb9717f6d9f46e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Oct 2017 11:50:31 +0200 Subject: [PATCH 1788/2806] wget: 1.19.1 -> 1.19.2 for multiple CVEs Fixes CVE-2017-13089, CVE-2017-13090. --- pkgs/tools/networking/wget/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 1a260f910e2..b6bbae65e69 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,24 +1,19 @@ { stdenv, fetchurl, gettext, pkgconfig, perl , libidn2, zlib, pcre, libuuid, libiconv -, IOSocketSSL, LWP, python3 +, IOSocketSSL, LWP, python3, lzip , libpsl ? null , openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.19.1"; + name = "wget-1.19.2"; src = fetchurl { - url = "mirror://gnu/wget/${name}.tar.xz"; - sha256 = "1ljcfhbkdsd0zjfm520rbl1ai62fc34i7c45sfj244l8f6b0p58c"; + url = "mirror://gnu/wget/${name}.tar.lz"; + sha256 = "01yzal7xm85543x02bij3capnigr063d6c5vc039f8n5s9d796nm"; }; patches = [ ./remove-runtime-dep-on-openssl-headers.patch - (fetchurl { - name = "CVE-2017-6508"; - url = "http://git.savannah.gnu.org/cgit/wget.git/patch/?id=4d729e322fae359a1aefaafec1144764a54e8ad4"; - sha256 = "14r0c5y3w3gavxp2d9yq8xji82izi5sx0sjv6jpmk6zp6cnr7cjf"; - }) ]; preConfigure = '' @@ -34,7 +29,7 @@ stdenv.mkDerivation rec { export LIBS="-liconv -lintl" ''; - nativeBuildInputs = [ gettext pkgconfig perl ]; + nativeBuildInputs = [ gettext pkgconfig perl lzip ]; buildInputs = [ libidn2 libiconv zlib pcre libuuid ] ++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ] ++ stdenv.lib.optional (openssl != null) openssl From 4c26199ad704f56342526d39aef7cc2ec6e12d10 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Oct 2017 02:23:15 +0200 Subject: [PATCH 1789/2806] SDL2: 2.0.5 -> 2.0.7 for CVE-2017-2888 --- pkgs/development/libraries/SDL2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 877b10f69a3..3216a130f67 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { name = "SDL2-${version}"; - version = "2.0.5"; + version = "2.0.7"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824"; + sha256 = "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf"; }; outputs = [ "out" "dev" ]; From 5feccdc0883476beff328fed368b21d30849704a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Oct 2017 03:20:29 +0200 Subject: [PATCH 1790/2806] SDL2_mixer: 2.0.1 -> 2.0.2 --- pkgs/development/libraries/SDL2_mixer/default.nix | 10 ++++++---- .../libraries/SDL2_mixer/libmodplug.patch | 13 ------------- 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/SDL2_mixer/libmodplug.patch diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index c0fdbf921a6..6eada0c83e5 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -4,19 +4,21 @@ stdenv.mkDerivation rec { name = "SDL2_mixer-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; - sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s"; + sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf"; }; + preAutoreconf = '' + aclocal + ''; + nativeBuildInputs = [ autoreconfHook pkgconfig which ]; propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; - patches = [ ./libmodplug.patch ]; - configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"; diff --git a/pkgs/development/libraries/SDL2_mixer/libmodplug.patch b/pkgs/development/libraries/SDL2_mixer/libmodplug.patch deleted file mode 100644 index 63ed2732ebf..00000000000 --- a/pkgs/development/libraries/SDL2_mixer/libmodplug.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.in b/configure.in -index d511646..77dc3fe 100644 ---- a/configure.in -+++ b/configure.in -@@ -258,7 +258,7 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_modplug = xyes; then - have_libmodplug_lib=yes - ], [dnl - AC_CHECK_HEADER([libmodplug/modplug.h], [have_libmodplug_hdr=yes]) -- AC_CHECK_LIB([modplug], [have_libmodplug_lib=yes]) -+ AC_CHECK_LIB([modplug], [ModPlug_Load], [have_libmodplug_lib=yes]) - ]) - - if test x$have_libmodplug_hdr = xyes -a x$have_libmodplug_lib = xyes; then From bea3425568ddd210360c6c089569426b844f2f61 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Oct 2017 03:23:38 +0200 Subject: [PATCH 1791/2806] SDL2_image: 2.0.1 -> 2.0.2 --- pkgs/development/libraries/SDL2_image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 78e0f4ed972..548f8e686ba 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "SDL2_image-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; - sha256 = "0r3z1l7fdn76qkpy7snpkcjqz8dkv2zp6lsqpq25q4m5xsyaygis"; + sha256 = "1s3ciydixrgv34vlf45ak5syq5nlfaqf19wf162lbz4ixxd0gpvj"; }; buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]; From f5c74a2cae718972e29fb15089750969f8b9a2fb Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 27 Oct 2017 12:38:58 +0200 Subject: [PATCH 1792/2806] perl-File-LibMagic: 1.15 -> 1.16 --- 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 0cd34e1a2f5..c8dc8a59ed2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5535,10 +5535,10 @@ let self = _self // overrides; _self = with self; { }; FileLibMagic = buildPerlPackage rec { - name = "File-LibMagic-1.15"; + name = "File-LibMagic-1.16"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "2c7fb54912caf2c22d06b02d6a88edad970e0f8b017634dc30eec46e53763e84"; + sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60"; }; buildInputs = [ TestFatal pkgs.file ]; makeMakerFlags = "--lib=${pkgs.file}/lib"; From 85e79da31b30a2cca824e3dcbbeb886038ba8d03 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Oct 2017 07:47:56 -0400 Subject: [PATCH 1793/2806] linux: 4.9.58 -> 4.9.59 --- 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 e1f3fe63ea0..72959dd7a9e 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.58"; + version = "4.9.59"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19r1ybrfqjh2cmpvljd94cwag34kly7pzih2j5m4nr49hsi153vl"; + sha256 = "16rj4wg8psh3d47x8disk275nzzv26drvp03hi0r44mxw0lmd53k"; }; } // (args.argsOverride or {})) From 2c373d818d69e72ae7686a15deaafd7ef9b3bd98 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Oct 2017 07:48:05 -0400 Subject: [PATCH 1794/2806] linux: 4.13.9 -> 4.13.10 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 77d137f9453..8d4df067c83 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.9"; + version = "4.13.10"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "13ra6psp6w3rf5vzmvhg88v2nh8zq20xl0r92728b8x9vgj1bp51"; + sha256 = "0c33v0y4hyklhz7i00sjrj2cpn6zlwc7qjj7w2zzxmnr9yn90c6x"; }; } // (args.argsOverride or {})) From eae5dfe134355ee14fff71cb4eff1c8b9d80815f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Oct 2017 08:03:25 -0400 Subject: [PATCH 1795/2806] sbt: 1.0.2 -> 1.0.3 --- pkgs/development/tools/build-managers/sbt/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index e5f68365e42..134aa859091 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, bc }: stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { urls = [ @@ -10,13 +10,18 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "1w1f6nsdq3inxhqhy69mgljfjr51n1v1s8i51gcg11rd2bc67w63"; + sha256 = "041cv25gxqsi3rlglw5d8aqgdzb6y5ak3f52dwqvzrrj854vyx13"; }; patchPhase = '' echo -java-home ${jre.home} >>conf/sbtopts + + substituteInPlace bin/sbt-launch-lib.bash \ + --replace "| bc)" "| ${bc}/bin/bc)" ''; + buildInputs = [ bc ]; + installPhase = '' mkdir -p $out/share/sbt $out/bin cp -ra . $out/share/sbt From a86e48acaec82c8156990e62fba6bf85e0a451b5 Mon Sep 17 00:00:00 2001 From: dywedir Date: Fri, 27 Oct 2017 10:36:40 +0300 Subject: [PATCH 1796/2806] ocamlPackages.topkg: 0.8.1 -> 0.9.1 --- pkgs/development/ocaml-modules/topkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index fa238a84b35..ecd806ecadc 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-topkg-${version}"; - version = "0.8.1"; + version = "0.9.1"; src = fetchurl { url = "http://erratique.ch/software/topkg/releases/topkg-${version}.tbz"; - sha256 = "18rrh6fmf708z7dd30amljmcgaypj3kk49jrmrj68r4wnw8004j8"; + sha256 = "1slrzbmyp81xhgsfwwqs2d6gxzvqx0gcp34rq00h5iblhcq7myx6"; }; nativeBuildInputs = [ opam ]; From 1b2a0e0f45b3265fbf7545d4ec5f758786970692 Mon Sep 17 00:00:00 2001 From: dywedir Date: Fri, 27 Oct 2017 14:14:29 +0300 Subject: [PATCH 1797/2806] ocamlPackages.reason: 2.0.0 -> 3.0.0 --- pkgs/development/compilers/reason/default.nix | 44 ++++++------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index e364f536c88..a4f0442d9d1 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,41 +1,20 @@ { stdenv, makeWrapper, buildOcaml, fetchFromGitHub, ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }: -let - version = "2.0.0"; +buildOcaml rec { + name = "reason"; + version = "3.0.0"; + src = fetchFromGitHub { owner = "facebook"; repo = "reason"; rev = version; - sha256 = "0l3lwfvppplah707rq5nqjav2354lq6d7xfflfigkzhn74hlx6iy"; - }; - meta = with stdenv.lib; { - homepage = https://facebook.github.io/reason/; - description = "Facebook's friendly syntax to OCaml"; - license = licenses.bsd3; - maintainers = [ maintainers.volth ]; + sha256 = "0vj3y9vlm9gqvj9grmb9n487avbrj4q5611m7wv1bsdpndvv96jr"; }; - reason-parser = buildOcaml { - name = "reason-parser"; - inherit version src meta; - sourceRoot = "reason-${version}-src/reason-parser"; + propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; - minimumSupportedOcamlVersion = "4.02"; - - propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; - buildInputs = [ opam topkg ]; - - createFindlibDestdir = true; - - inherit (topkg) installPhase; - }; -in -buildOcaml { - name = "reason"; - inherit version src meta; - - buildInputs = [ makeWrapper opam topkg reason-parser utop ]; + buildInputs = [ makeWrapper opam topkg utop menhir opam topkg ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed @@ -48,10 +27,15 @@ buildOcaml { installPhase = '' ${topkg.installPhase} - wrapProgram $out/bin/reup \ - --prefix PATH : "${opam}/bin" wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH ''; + + meta = with stdenv.lib; { + homepage = https://facebook.github.io/reason/; + description = "Facebook's friendly syntax to OCaml"; + license = licenses.bsd3; + maintainers = [ maintainers.volth ]; + }; } From 7b64943e8b731994eba1bdab48bc3479c5c0500c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 27 Oct 2017 12:05:19 +0800 Subject: [PATCH 1798/2806] util-linux: 2.30.2 -> 2.31 --- pkgs/os-specific/linux/util-linux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 3d4309b7177..f54f3ab311a 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -4,15 +4,15 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); - majorVersion = "2.30"; - patchVersion = "2"; + majorVersion = "2.31"; + patchVersion = ""; in stdenv.mkDerivation rec { name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "1p494mwd8v6p6mpmmjybkc7bz1qwp9x4cdi8hdvp2nwvkr4fanvv"; + sha256 = "12nw108xjhm63sh2n5a0qs33vpvbvb6rln96l9j50p7wykf7rgpr"; }; patches = [ From 3fa77a19efd1a0b2cfaaf064a428c421cf98d2d1 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 27 Oct 2017 15:28:51 +0100 Subject: [PATCH 1799/2806] kanboard: 1.0.46 -> 1.0.48 --- pkgs/applications/misc/kanboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index b37d12c362f..7995c8875b8 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "kanboard-${version}"; - version = "1.0.46"; + version = "1.0.48"; src = fetchzip { - url = "https://kanboard.net/${name}.zip"; - sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a"; + url = "https://github.com/kanboard/kanboard/releases/download/v${version}/${name}.zip"; + sha256 = "0ipyijlfcnfqlz9n20wcnaf9pw404a675x404pm9h2n4ld8x6m5v"; }; dontBuild = true; From 978bba8415072379186ecb9c79a6d59d3dd2fbf4 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 27 Oct 2017 15:38:05 +0100 Subject: [PATCH 1800/2806] autotrace: mark as insecure --- .../graphics/autotrace/default.nix | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index c0ce81b3b42..7af7c8986f2 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -66,5 +66,59 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ hodapp ]; license = licenses.gpl2; + knownVulnerabilities = [ + "CVE-2013-1953" + "CVE-2016-7392" + "CVE-2017-9151" + "CVE-2017-9152" + "CVE-2017-9153" + "CVE-2017-9154" + "CVE-2017-9155" + "CVE-2017-9156" + "CVE-2017-9157" + "CVE-2017-9158" + "CVE-2017-9159" + "CVE-2017-9160" + "CVE-2017-9161" + "CVE-2017-9162" + "CVE-2017-9163" + "CVE-2017-9164" + "CVE-2017-9165" + "CVE-2017-9166" + "CVE-2017-9167" + "CVE-2017-9168" + "CVE-2017-9169" + "CVE-2017-9170" + "CVE-2017-9171" + "CVE-2017-9172" + "CVE-2017-9173" + "CVE-2017-9174" + "CVE-2017-9175" + "CVE-2017-9176" + "CVE-2017-9177" + "CVE-2017-9178" + "CVE-2017-9179" + "CVE-2017-9180" + "CVE-2017-9181" + "CVE-2017-9182" + "CVE-2017-9183" + "CVE-2017-9184" + "CVE-2017-9185" + "CVE-2017-9186" + "CVE-2017-9187" + "CVE-2017-9188" + "CVE-2017-9189" + "CVE-2017-9190" + "CVE-2017-9191" + "CVE-2017-9192" + "CVE-2017-9193" + "CVE-2017-9194" + "CVE-2017-9195" + "CVE-2017-9196" + "CVE-2017-9197" + "CVE-2017-9198" + "CVE-2017-9199" + "CVE-2017-9200" + ]; }; } From f2cc452874aea5f1e0433c71f9303d233b2d8603 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Oct 2017 10:13:03 -0400 Subject: [PATCH 1801/2806] minikube: 0.22.3 -> 0.23.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 32c697ea83a..00ee3a3771e 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.7.5"; + localkube-version = "1.8.0"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "1kn4lwnn961r19hqnkgr13np80zqk2fhp8xkhrvxzq6v6shk7gfz"; + sha256 = "09mv1g9i0d14brvvp2wxgmfqvgp0na5dbm4z76a660q1fxszvgqc"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.22.3"; + version = "0.23.0"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0jcfw0yrd4vqyiyhg15cy2knn2fjw91das8id4famz5gl6dnlm28"; + sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h"; }; # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly From a7449bf4d8d72da1b70708e8a284d3851e96def8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Oct 2017 17:41:47 +0200 Subject: [PATCH 1802/2806] libvirt-python: 3.6.0 -> 3.8.0 This fixes an eval error introduced by 17a069276faec303d173aa5ef23cf95ea5233690. The reason the evaluation fails is because there's an assertion on the version of the Python library in order to be in par with the top-level libvirt package. Signed-off-by: aszlig Cc: @fpletz --- 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 1bbee9a7ea4..5987c77b01c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23982,13 +23982,13 @@ EOF }; libvirt = let - version = "3.6.0"; + version = "3.8.0"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc"; + sha256 = "02spx8kfcsnqwsshd7bk2plyic2lbpwzg16sf3csh0avck5akjsz"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; From 41ba309136a0fecb684a5732a22a8f228263a56e Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 27 Oct 2017 18:06:34 +0200 Subject: [PATCH 1803/2806] gitlab-runner: 10.0.2 -> 10.1.0 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 430e46f2303..44e4f494ff2 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.0.2"; + version = "10.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "14lrc9frigym93ppphmdhwnbhk7xz5drpai3d29gyi1z4xsm1jaq"; + sha256 = "0h8fwqsr8ibd82jxq4pc9p8x7af0i8jyrrsj13p4daqhla0srxr4"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "013bly0xswzkf2kwi2pr2ryd880h63n8pya2ccv4z77hxs80cfmp"; + sha256 = "0bzj8zr6d5ab5bjlbw7q3iwn19ha8fksymrvw6cyzs4qacfsj54w"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0hr964r7bcff74sna0b8w3d2ip0hs441ijlhplh2xzqnzpbvx2jq"; + sha256 = "0knvjmxcscyr6v5b9vvyvm8w6p58a1h6nfcvf13dxp59psm71q00"; }; patches = [ ./fix-shell-path.patch ]; From a924cd2bebf71ac17dc5645246c9d8fe5b02814c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Oct 2017 12:14:54 -0400 Subject: [PATCH 1804/2806] sbt: No need for bc buildInput --- pkgs/development/tools/build-managers/sbt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 134aa859091..4dacfd0568a 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { --replace "| bc)" "| ${bc}/bin/bc)" ''; - buildInputs = [ bc ]; - installPhase = '' mkdir -p $out/share/sbt $out/bin cp -ra . $out/share/sbt From 7ce848309e6d64820af1e96045c5386992e90a4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 25 Oct 2017 20:04:35 +0200 Subject: [PATCH 1805/2806] python.pkgs: updates --- .../python-modules/APScheduler/default.nix | 4 +-- .../python-modules/Cython/default.nix | 4 +-- .../python-modules/MechanicalSoup/default.nix | 18 ++++++++-- .../python-modules/Nikola/default.nix | 4 +-- .../python-modules/aiofiles/default.nix | 4 +-- .../python-modules/aiohttp/default.nix | 4 +-- .../python-modules/alembic/default.nix | 4 +-- .../python-modules/altair/default.nix | 4 +-- .../python-modules/aniso8601/default.nix | 4 +-- .../python-modules/asana/default.nix | 6 ++-- .../python-modules/asn1crypto/default.nix | 4 +-- .../python-modules/astropy/default.nix | 4 +-- .../python-modules/async_timeout/default.nix | 4 +-- .../python-modules/autobahn/default.nix | 4 +-- .../backports_tempfile/default.nix | 35 +++++++++++++++++++ .../backports_weakref/default.nix | 4 +-- .../python-modules/bayespy/default.nix | 4 +-- pkgs/development/python-modules/bcrypt.nix | 4 +-- .../python-modules/bokeh/default.nix | 4 +-- .../python-modules/breathe/default.nix | 4 +-- .../python-modules/buildout-nix/default.nix | 4 +-- .../python-modules/cement/default.nix | 4 +-- .../python-modules/cffi/default.nix | 4 +-- .../python-modules/cheroot/default.nix | 4 +-- .../python-modules/credstash/default.nix | 4 +-- .../python-modules/dask/default.nix | 4 +-- .../python-modules/devpi-common/default.nix | 4 +-- .../python-modules/discogs_client/default.nix | 4 +-- .../python-modules/discordpy/default.nix | 4 +-- .../django-picklefield/default.nix | 4 +-- .../python-modules/django_redis/default.nix | 4 +-- .../python-modules/django_tagging/default.nix | 4 +-- .../djangorestframework/default.nix | 4 +-- .../python-modules/docker_compose.nix | 6 ++-- pkgs/development/python-modules/dulwich.nix | 4 +-- .../python-modules/dyn/default.nix | 4 +-- .../easy-thumbnails/default.nix | 4 +-- .../python-modules/edward/default.nix | 4 +-- .../python-modules/faker/default.nix | 4 +-- .../python-modules/feedgen/default.nix | 7 ++-- .../python-modules/fiona/default.nix | 4 +-- .../python-modules/flake8/default.nix | 4 +-- .../python-modules/folium/default.nix | 4 +-- .../python-modules/fonttools/default.nix | 4 +-- .../python-modules/ftfy/default.nix | 4 +-- .../python-modules/gensim/default.nix | 4 +-- .../python-modules/gpy/default.nix | 4 +-- .../python-modules/hidapi/default.nix | 4 +-- .../python-modules/hieroglyph/default.nix | 4 +-- pkgs/development/python-modules/htmlmin.nix | 4 +-- .../python-modules/httpbin/default.nix | 6 +++- .../python-modules/ipython/default.nix | 4 +-- .../python-modules/ipywidgets/default.nix | 4 +-- .../python-modules/jedi/default.nix | 8 +++-- .../python-modules/joblib/default.nix | 4 +-- .../python-modules/jsbeautifier/default.nix | 4 +-- .../python-modules/keepkey/default.nix | 4 +-- pkgs/development/python-modules/ldap.nix | 4 +-- .../python-modules/ledgerblue/default.nix | 4 +-- .../python-modules/libagent/default.nix | 4 +-- .../python-modules/libtmux/default.nix | 4 +-- .../python-modules/llvmlite/default.nix | 4 +-- .../python-modules/m2r/default.nix | 4 +-- .../python-modules/magic-wormhole/default.nix | 4 +-- .../marshmallow-sqlalchemy/default.nix | 4 +-- .../python-modules/marshmallow/default.nix | 4 +-- .../python-modules/matplotlib/default.nix | 8 ++--- .../python-modules/meliae/default.nix | 4 +-- .../python-modules/mnemonic/default.nix | 4 +-- .../python-modules/multidict/default.nix | 4 +-- .../python-modules/netcdf4/default.nix | 4 +-- pkgs/development/python-modules/nltk.nix | 4 +-- .../python-modules/node-semver/default.nix | 4 +-- .../python-modules/numba/default.nix | 4 +-- .../python-modules/numpy/default.nix | 4 +-- .../python-modules/openpyxl/default.nix | 4 +-- .../python-modules/os-testr/default.nix | 6 ++-- .../python-modules/oslo-config/default.nix | 4 +-- .../python-modules/paramz/default.nix | 4 +-- .../python-modules/parso/default.nix | 25 +++++++++++++ .../python-modules/path.py/default.nix | 4 +-- .../python-modules/pathspec/default.nix | 4 +-- .../python-modules/piexif/default.nix | 4 +-- .../python-modules/pillow/default.nix | 4 +-- .../python-modules/pip-tools/default.nix | 10 +++--- .../python-modules/plaster/default.nix | 4 +-- .../python-modules/plotly/default.nix | 4 +-- .../python-modules/pomegranate/default.nix | 4 +-- .../python-modules/portend/default.nix | 4 +-- .../python-modules/premailer/default.nix | 4 +-- pkgs/development/python-modules/pyaes.nix | 4 +-- .../python-modules/pycryptodomex/default.nix | 4 +-- .../python-modules/pyflakes/default.nix | 4 +-- .../python-modules/pyjwkest/default.nix | 4 +-- .../python-modules/pylint/default.nix | 4 +-- .../python-modules/pyrtlsdr/default.nix | 4 +-- .../python-modules/pytest-asyncio/default.nix | 4 +-- .../python-modules/pytest-xdist/default.nix | 4 +-- .../python-modules/pytest/default.nix | 4 +-- .../python-modules/python-stdnum/default.nix | 4 +-- .../python-modules/relatorio/default.nix | 4 +-- .../python-modules/requests_ntlm/default.nix | 4 +-- .../python-modules/scikitlearn/default.nix | 4 +-- .../python-modules/scipy/default.nix | 9 ++--- .../python-modules/semver/default.nix | 4 +-- .../python-modules/serpy/default.nix | 4 +-- .../python-modules/setuptools/default.nix | 4 +-- .../python-modules/sounddevice/default.nix | 6 ++-- .../python-modules/sphinx/default.nix | 4 +-- .../python-modules/sqlalchemy/default.nix | 4 +-- .../python-modules/sqlmap/default.nix | 4 +-- .../python-modules/stevedore/default.nix | 4 +-- .../python-modules/stripe/default.nix | 4 +-- .../python-modules/tempora/default.nix | 4 +-- .../python-modules/testtools/default.nix | 11 +++--- .../testtools_support_unittest2.patch | 22 ------------ .../python-modules/tqdm/default.nix | 4 +-- .../python-modules/twisted/default.nix | 4 +-- .../python-modules/txaio/default.nix | 4 +-- .../python-modules/typed-ast/default.nix | 4 +-- .../ukpostcodeparser/default.nix | 4 +-- .../python-modules/uritools/default.nix | 4 +-- .../widgetsnbextension/default.nix | 4 +-- .../python-modules/yamllint/default.nix | 4 +-- .../python-modules/yapf/default.nix | 4 +-- .../python-modules/yarl/default.nix | 4 +-- .../python-modules/zeep/default.nix | 9 +++-- .../python-modules/zetup/default.nix | 4 +-- .../python-modules/zodb/default.nix | 4 +-- .../python-modules/zodbpickle/default.nix | 4 +-- .../python-modules/zope_interface/default.nix | 4 +-- pkgs/development/tools/mypy/default.nix | 4 +-- pkgs/top-level/python-packages.nix | 4 +++ 133 files changed, 366 insertions(+), 294 deletions(-) create mode 100644 pkgs/development/python-modules/backports_tempfile/default.nix create mode 100644 pkgs/development/python-modules/parso/default.nix delete mode 100644 pkgs/development/python-modules/testtools/testtools_support_unittest2.patch diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index a556aebc47e..a9b5faf6006 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.3.1"; + version = "3.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b"; + sha256 = "b51118a8ed014104f7e440456dcbd90f2015aea7bcc34c57e307fb34bc746316"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 0513f67e569..e507b89bbbb 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "Cython"; name = "${pname}-${version}"; - version = "0.26.1"; + version = "0.27.2"; src = fetchPypi { inherit pname version; - sha256 = "c2e63c4794161135adafa8aa4a855d6068073f421c83ffacc39369497a189dd5"; + sha256 = "265dacf64ed8c0819f4be9355c39beaa13dc2ad2f85237a2c4e478f5ce644b48"; }; # With Python 2.x on i686-linux or 32-bit ARM this test fails because the diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index a022fd9fc41..56e2cf501ed 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -1,19 +1,31 @@ { fetchPypi, buildPythonPackage, lib -, requests, beautifulsoup4, six }: +, requests, beautifulsoup4, six +, pytestrunner, requests-mock, pytestcov, pytest +}: buildPythonPackage rec { name = "${pname}-${version}"; pname = "MechanicalSoup"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0wh93rml446ipx603n5z5i5bpan46pzliq6sw76d0ms9w7w2658d"; + sha256 = "38a6ca35428196be94f87f8f036ee4a88b1418d1f77e5634ad92acfaa22c28da"; }; + checkInputs = [ pytest pytestrunner requests-mock pytestcov ]; + propagatedBuildInputs = [ requests beautifulsoup4 six ]; + # Requires network + doCheck = false; + + postPatch = '' + # Is in setup_requires but not used in setup.py... + substituteInPlace setup.py --replace "'pytest-runner'," "" + ''; + meta = with lib; { description = "A Python library for automating interaction with websites"; homepage = https://github.com/hickford/MechanicalSoup; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index fe8597f4d48..f281a02d49b 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Nikola"; - version = "7.8.9"; + version = "7.8.10"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -47,7 +47,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c85bf293a245a34057fb55236fc2f2c5d28e9ef1c375889f443bca1d86924df4"; + sha256 = "e242c3d0dd175d95a0baf5268b108081ba160b83ceafec8c9bc2ec0a24a56537"; }; meta = { diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index d1c6e279064..9139c62618a 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "0.3.1"; + version = "0.3.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "6c4936cea65175277183553dbc27d08b286a24ae5bd86f44fbe485dfcf77a14a"; + sha256 = "852a493a877b73e11823bfd4e8e5ef2610d70d12c9eaed961bcd9124d8de8c10"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 72b28d01cea..19e94471c86 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "2.2.5"; + version = "2.3.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "af5bfdd164256118a0a306b3f7046e63207d1f8cba73a67dcc0bd858dcfcd3bc"; + sha256 = "04f58bbcc9ae6f9aec30b9219ae47fa3c31586c77679405720545738ea62236e"; }; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 45bea1fe687..e40e3008563 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "alembic"; - version = "0.9.5"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "8bdcb4babaa16b9a826f8084949cc2665cb328ecf7b89b3224b0ab85bd16fd05"; + sha256 = "042851ebe9efa07be6dc1395b1793b6c1d8964a39b73a0ce1649e2bcd41ea732"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 7e9701906ef..d3cdc0f43f2 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "altair"; - version = "1.2.0"; + version = "1.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n"; + sha256 = "c1303f77f1ba4d632f2958c83c0f457b2b969860b1ac9adfb872aefa1780baa7"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 95eda37d3f2..6e61e84a5d5 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "1.2.1"; + version = "1.3.0"; name = "${pname}-${version}"; meta = with stdenv.lib; { @@ -16,6 +16,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e7ba4f42d3aea75909c79b1f4c4614768b4f13fbb98fc658a7b6061ddb0be47c"; + sha256 = "c3b5246f5601b6ae5671911bc4ee5b3e3fe94752e8afab5ce074d8b1232952f1"; }; } diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 346257db098..41a111c3167 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "asana"; - version = "0.6.2"; + version = "0.6.5"; name = "${pname}-${version}"; meta = { @@ -15,10 +15,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0skai72392n3i1c4bl3hn2kh5lj990qsbasdwkbjdcy6vq57jggf"; + sha256 = "eab8d24c2a4670b541b75da2f4bf5b995fe71559c1338da53ce9039f7b19c9a0"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ requests requests_oauthlib six ]; patchPhase = '' diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index a34879e5596..eedaac50fac 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asn1crypto"; - version = "0.22.0"; + version = "0.23.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a"; + sha256 = "0874981329cfebb366d6584c3d16e913f2a0eb026c9463efcc4aaf42a9d94d70"; }; # No tests included diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index ba73c232c89..12f00be0cb7 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "2.0.1"; + version = "2.0.2"; name = "${pname}-${version}"; doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook. src = fetchPypi { inherit pname version; - sha256 = "25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e"; + sha256 = "4544a422b1173d79b2d65ba74c627f04a5fd8530d97fb604752d657d754e103d"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index 94c2379b0e1..650517d44d9 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -7,13 +7,13 @@ let pname = "async-timeout"; - version = "1.3.0"; + version = "2.0.0"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "f4651f122a9877049930ce31a8422bc202a47937627295fe5e411b2c2083481f"; + sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566"; }; buildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 8d647a9b52e..5a6121aaf7f 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "autobahn"; - version = "17.8.1"; + version = "17.9.3"; src = fetchurl { url = "mirror://pypi/a/${pname}/${name}.tar.gz"; - sha256 = "72b1b1e30bd41d52e7454ef6fe78fe80ebf2341a747616e2cd854a76203a0ec4"; + sha256 = "206a3a579a580ca3ce2532ac12ec52d447135c9ace7c4bf6065b832a7cff25ba"; }; # Upstream claim python2 support, but tests require pytest-asyncio which diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix new file mode 100644 index 00000000000..5a04b6afd67 --- /dev/null +++ b/pkgs/development/python-modules/backports_tempfile/default.nix @@ -0,0 +1,35 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, setuptools_scm +, backports_weakref +}: + +buildPythonPackage rec { + pname = "backports.tempfile"; + version = "1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c648c452e8770d759bdc5a5e2431209be70d25484e1be24876cf2168722c762"; + }; + + buildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ backports_weakref ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + # requires https://pypi.org/project/backports.test.support + doCheck = false; + + meta = { + description = "Backport of new features in Python's tempfile module"; + license = lib.licenses.psfl; + homepage = https://github.com/pjdelport/backports.tempfile; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix index 0528fa405ae..6ad69b80b6d 100644 --- a/pkgs/development/python-modules/backports_weakref/default.nix +++ b/pkgs/development/python-modules/backports_weakref/default.nix @@ -9,10 +9,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "backports.weakref"; - version = "1.0rc1"; + version = "1.0.post1"; src = fetchPypi { inherit pname version; - sha256 = "14i8m3lspykdfpzf50grij3z286j9q8f32f2bnwdicv659qvy4w8"; + sha256 = "bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 9f99708b071..a1b49da34a4 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.10"; + version = "0.5.12"; name = "${pname}-${version}"; # Python 2 not supported and not some old Python 3 because MPL doesn't support @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "01cwd88ri29zy6qpvnqzljkgc44n7a17yijizr73blcnh4dz5n1w"; + sha256 = "9609a3e85f88434a47c8263f40567cd24363d0e10d236354630b670fca313c00"; }; checkInputs = [ pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt.nix index d159ff8fe90..72800d2f6c2 100644 --- a/pkgs/development/python-modules/bcrypt.nix +++ b/pkgs/development/python-modules/bcrypt.nix @@ -4,13 +4,13 @@ with stdenv.lib; buildPythonPackage rec { - version = "3.1.3"; + version = "3.1.4"; pname = "bcrypt"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/b/bcrypt/${name}.tar.gz"; - sha256 = "6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488"; + sha256 = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d"; }; buildInputs = [ pycparser mock pytest py ]; propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index a1ae95e6d5d..61bfe7121cb 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.9"; + version = "0.12.10"; src = fetchPypi { inherit pname version; - sha256 = "00jx3yycy6fziihz45hwj1dsh520h3vmypp28mw0877rxpxl2yxg"; + sha256 = "6465fae82e94223f16584645b38d34a73d95712870f29c0244649c2cbf2c8393"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 6f539f15222..1397dc6876f 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - version = "4.7.2"; + version = "4.7.3"; pname = "breathe"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/b/breathe/${name}.tar.gz"; - sha256 = "dd15efc66d65180e4c994edd15fcb642812ad04ac9c36738b28bf248d7c0be32"; + sha256 = "d0b0e029daba6c3889d15d6c2dd4b0e9d468dc631d41021d0576c1b0dabee302"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index fcb46f4bac1..70c6f3baaf1 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.9.4"; + version = "2.9.5"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "df56cc55735e984510986c633090ad0d64f59d7e42d1aac57ecf04ab183d1053"; + sha256 = "dce840ea379e2ff10bae27465778708704e0a4287cde92eb6c7961f5b0277cfa"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 2ed704e3482..3fbdb500af8 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "cement"; name = "${pname}-${version}"; - version = "2.8.2"; + version = "2.10.2"; src = fetchPypi { inherit pname version; - sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; + sha256 = "d50c5980bf3e2456e515178ba097d16e36be0fbcab7811a60589d22f45b64f55"; }; # Disable test tests since they depend on a memcached server running on diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index cced78c0c6a..5c99e77af56 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,12 +2,12 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.10.0"; + version = "1.11.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1mffyilq4qycm8gs4wkgb18rnqil8a9blqq77chdlshzxc8jkc5k"; + sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index c20cbabe0d6..8447f7fea50 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "cheroot"; - version = "5.5.0"; + version = "5.8.3"; src = fetchPypi { inherit pname version; - sha256 = "1fhyk8lgs2blfx4zjvwsy6f0ynrs5fwnnr3qf07r6c4j3gwlkqsr"; + sha256 = "5c0531fd732700b1fb3e6e7079dc3aefbdf29e9136925633d93f009cb87d70a3"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 9f61018ceab..810a6a7bd8e 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "credstash"; - version = "1.13.3"; + version = "1.13.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1x2dh4rs5sahb8h2xznhq7srcm2zl9ykc72a8iqpq4dz7l9k7x7i"; + sha256 = "676cc03a6143dec260c78aeef09d08a64faf27c411f8a94f6d9338e985879f81"; }; propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b1d39e493b7..c319e6535e9 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.15.2"; + version = "0.15.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "abe6758540fdbc260f14ee71cebc3ab88682e24ff147afa89375b7006f57d3ed"; + sha256 = "cb93b8260f5f854ccf26b52bdc700600a08e6b7527085c7b7d63c04238bab9ea"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 971d53e3ddd..082f2baeceb 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -2,12 +2,12 @@ with pythonPackages;buildPythonPackage rec { pname = "devpi-common"; - version = "3.2.0rc1"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1ws35g1r0j2xccsna4r6fc9a08przfi28kf9hciq3rmd6ndbr9c9"; + sha256 = "d89634a57981ed43cb5dcd25e00c9454ea111189c5ddc08d945b3d5187ada5fd"; }; propagatedBuildInputs = [ requests py ]; diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix index d6891b0e157..ae56fd5f7e5 100644 --- a/pkgs/development/python-modules/discogs_client/default.nix +++ b/pkgs/development/python-modules/discogs_client/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "discogs-client"; - version = "2.2.0"; + version = "2.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1kjm4zyxlkv8cjyd4zl0yslbkmfz4ga9nm3d2glpw3nmvmvajn40"; + sha256 = "9e32b5e45cff41af8025891c71aa3025b3e1895de59b37c11fd203a8af687414"; }; propagatedBuildInputs = [ requests oauthlib ]; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index c9ae73b1661..e11ee54f1a6 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,13 +11,13 @@ let pname = "discord.py"; - version = "0.16.11"; + version = "0.16.12"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "eb3c6faa7d4570cce05533d0742bbcb768629e2b3ba9e1cc79c05833db91ac4d"; + sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108"; }; propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 20a1c3dc221..1b54213e2af 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "django-picklefield"; name = "${pname}-${version}"; - version = "0.3.2"; + version = "1.0.0"; meta = { description = "A pickled object field for Django"; @@ -13,6 +13,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1qlsbp3798ii68ny9zlz2ppkna00jf7i4hmjal3p8433gi18md7s"; + sha256 = "61e3ba7f6df82d8df9e6be3a8c55ef589eb3bf926c3d25d2b7949b07eae78354"; }; } diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 42f2cde8113..5c00ef60417 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -2,12 +2,12 @@ mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; - version = "4.5.0"; + version = "4.8.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "170dbk1wmdg0mxp5m3376zz54dyxmhmhnswrccf0jnny1wqcgpsp"; + sha256 = "5229da5b07ccb8d3e3e9ee098c0b7c03e20eba48634bc456697dd73d62c68b19"; }; doCheck = false; diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix index 6207408e012..b6fcddd528f 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "django-tagging"; - version = "0.4.5"; + version = "0.4.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q"; + sha256 = "210b32af8372b8f68f261fdb7394075669222608d1e6a3bbf2031d59c826eb68"; }; # error: invalid command 'test' diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 648ee019682..62e291306d8 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, django }: buildPythonPackage rec { - version = "3.6.4"; + version = "3.7.1"; pname = "djangorestframework"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "de8ac68b3cf6dd41b98e01dcc92dc0022a5958f096eafc181a17fa975d18ca42"; + sha256 = "305b2c6564ca46d3b558ba21110ed717135c467adf1a6dfd192bd85f4bb04d50"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix index 18d68e4ea5d..91a0c4183c9 100644 --- a/pkgs/development/python-modules/docker_compose.nix +++ b/pkgs/development/python-modules/docker_compose.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchurl, pythonOlder +{ stdenv, buildPythonApplication, fetchPypi, pythonOlder , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests @@ -10,8 +10,8 @@ buildPythonApplication rec { pname = "docker-compose"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg"; }; diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix index bbf43ce615c..778c8c984c8 100644 --- a/pkgs/development/python-modules/dulwich.nix +++ b/pkgs/development/python-modules/dulwich.nix @@ -3,13 +3,13 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.18.2"; + version = "0.18.4"; pname = "dulwich"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/dulwich/${name}.tar.gz"; - sha256 = "284d0000b21ac12f94bcd5eb3d7dcc42da51e5506b9a53a11c615b46da906d9b"; + sha256 = "b4baace48dde5e0a76f37b251c246c7e1829bda0617679f00cbade0e70a5ac5b"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index e4bbe4e071d..881f51b69aa 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "dyn"; - version = "1.6.3"; + version = "1.8.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1xq90fliix5nbv934s3wf2pahmx6m2b9y0kqwn192c76qh7xlzib"; + sha256 = "4ab3cd9a1478674cf2d2aa6740fb0ddf77daaa9ab3e35e5d2bc92f60301f8523"; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 79743f8ac0d..38e201849c1 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; name = "${pname}-${version}"; - version = "2.4.1"; + version = "2.4.2"; meta = { description = "Easy thumbnails for Django"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0w228b6hx8k4r15v7z62hyg99qp6xp4mdkgqs1ah64fyqxp1riaw"; + sha256 = "8cad7ea4fb2b800284e842d8a44f685cbc1968535be04c24a4bbf6e6dbc550c4"; }; propagatedBuildInputs = [ django pillow ]; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index 93ac292282a..d29174209a9 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "edward"; - version = "1.3.3"; + version = "1.3.4"; name = "${pname}-${version}"; disabled = !(isPy27 || pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "104d58321c5040235b3039ae3215c3c7881073e6aa88bb0b8ca1141ca87c4891"; + sha256 = "10d6d7886235f4b9fa4ba401daef87c27937a04d2763f507643d730e51de37b6"; }; # disabled for now due to Tensorflow trying to create files in $HOME: diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 3a2a0a64ce6..02926e0fd74 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,12 +8,12 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.7.18"; + version = "0.8.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "310b20f3c497a777622920dca314d90f774028d49c7ee7ccfa96ca4b9d9bf429"; + sha256 = "3c98dd04bba667ecfddb77fcd0dfd19b376b258d21beeaf5b95578826e275a83"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 9ad28e52baa..e8bdb78f731 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -2,17 +2,18 @@ buildPythonPackage rec { pname = "feedgen"; - version = "0.5.1"; + version = "0.6.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3a344b5e3662e9012d095a081a7f216f188dccf3a8f44ad7882960fef05e6787"; + sha256 = "e5a1f2a8aaed06dae325e6024aa7083e90655c6cbddeb3671249b3895c135762"; }; propagatedBuildInputs = [ dateutil lxml ]; - doCheck = true; + # No tests in archive + doCheck = false; meta = with stdenv.lib; { description = "Python module to generate ATOM feeds, RSS feeds and Podcasts."; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 42e8e423bdd..d53a29d182f 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.7.9"; + version = "1.7.9.post1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1fmdgpfnifaqfqwkfiwkpk19wmpi9avmh8a7jqylqi578jvp3fwi"; + sha256 = "68e8a925b23e3987845c11b0fdd6378fdec4316fe8ba767a935151b6ee1fc607"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index f7f78e709f9..89b554f3e68 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "flake8"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "c20044779ff848f67f89c56a0e4624c04298cd476e25253ac0c36f910a1a11d8"; + sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0"; }; buildInputs = [ pytest mock pytestrunner ]; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 387da64219d..71aabd75d75 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "folium"; - version = "0.3.0"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7729ddd6766b9c5dab17b3709e2387935fd5c655872f1cbab7b7036474415217"; + sha256 = "748944521146d85c6cd6230acf234e885864cd0f42fea3758d655488517e5e6e"; }; postPatch = '' diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index c037decbc87..1dfc22f769b 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.15.1"; + version = "3.17.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8df4b605a28e313f0f9e0a79502caba4150a521347fdbafc063e52fee34912c2"; + sha256 = "1c4f26bf32cd58d5881bfe1f42e5f0a1637a58452a60ae1623999f3ae7da0e24"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index aced6675495..b1ba77ab868 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ftfy"; # latest is 5.1.1, buy spaCy requires 4.4.3 - version = "4.4.3"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; + sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78"; }; propagatedBuildInputs = [ html5lib wcwidth]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 2d953abd53c..ea5fc12e432 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { pname = "gensim"; name = "${pname}-${version}"; - version = "2.3.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "7d0dccc7d2c576e270037949874800b7cfbc86ef081ff981483f612cd18e223f"; + sha256 = "4827012f6f020ac4f4067c2a2a88542391917113faaa417505e1ee8a1e7e2650"; }; propagatedBuildInputs = [ smart_open numpy six scipy diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index 0bdc7247b3d..bc48a7490aa 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "GPy"; - version = "1.7.7"; + version = "1.8.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1b4siirlkqic1lsn9bi9mnp8fpbpw1ijwv0z2i6r2zdrk3d6szs1"; + sha256 = "38c1202f1790952b88c298224139ee5b14d4518e3ddc6186c60db2ece016d8c1"; }; # running tests produces "ImportError: cannot import name 'linalg_cython'" diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 697bc1cd0e3..212fd5c957d 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "hidapi"; - version = "0.7.99.post20"; + version = "0.7.99.post21"; src = fetchPypi { inherit pname version; - sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z"; + sha256 = "e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97"; }; propagatedBuildInputs = [ libusb1 udev cython ]; diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index 9e97e56c134..27d4b8a15b8 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "hieroglyph"; - version = "0.7.1"; + version = "1.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/h/hieroglyph/${name}.tar.gz"; - sha256 = "0rswfk7x6zlj1z8388f153k3zn2h52k5h9b6p57pn7kqagsjilcb"; + sha256 = "8e137f0b1cd60c47b870011089790d3c8ddb74fcf409a75ddf2c7f2516ff337c"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/htmlmin.nix b/pkgs/development/python-modules/htmlmin.nix index 35f86479a4e..2206b3559ba 100644 --- a/pkgs/development/python-modules/htmlmin.nix +++ b/pkgs/development/python-modules/htmlmin.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "htmlmin"; - version = "0.1.10"; + version = "0.1.11"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ca5c5dfbb0fa58562e5cbc8dc026047f6cb431d4333504b11853853be448aa63"; + sha256 = "f27fb96fdddeb1725ee077be532c7bea23288c69d0e996e7798f24fae7a14e5e"; }; # Tests run fine in a normal source checkout, but not when being built by nix. diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 72917fdd771..d11d6b3668f 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -5,7 +5,8 @@ , markupsafe , decorator , itsdangerous -, six }: +, six +}: buildPythonPackage rec { pname = "httpbin"; @@ -19,6 +20,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ]; + # No tests + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/kennethreitz/httpbin; description = "HTTP Request & Response Service"; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index af5bf5c4faa..ac26573f4a7 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "6.1.0"; + version = "6.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5c53e8ee4d4bec27879982b9f3b4aa2d6e3cfd7b26782d250fa117f85bb29814"; + sha256 = "51c158a6c8b899898d1c91c6b51a34110196815cc905f9be0fa5878e19355608"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index ce0aed4964d..14b03e5e282 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.0.0"; + version = "7.0.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "63e454202f72796044e99846881c33767c47fa050735dc1f927657b9cd2b7fcd"; + sha256 = "f98b4c3719097c9d2e6489f303db520b20bd4de3e0b1d6d4f92f81bfe3c2a0c8"; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 5d904ee311f..6cdf784dc3b 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,17 +1,19 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; - version = "0.10.2"; + version = "0.11.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7abb618cac6470ebbd142e59c23daec5e6e063bfcecc8a43a037d2ab57276f4e"; + sha256 = "f6d5973573e76b1fd2ea75f6dcd6445d02d41ff3af5fc61b275b4e323d1dd396"; }; checkInputs = [ pytest glibcLocales tox pytestcov ]; + propagatedBuildInputs = [ parso ]; + checkPhase = '' LC_ALL="en_US.UTF-8" py.test test ''; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index f6ead8c8266..0efd110d1de 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "joblib"; name = "${pname}-${version}"; - version = "0.10.3"; + version = "0.11"; src = fetchPypi { inherit pname version; - sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d"; + sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085"; }; checkInputs = [ nose sphinx numpydoc ]; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index c199b2f50db..47bbdb5d07b 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.6.14"; + version = "1.7.4"; name = "jsbeautifier-1.6.14"; propagatedBuildInputs = [ six ]; @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchurl { url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; - sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2"; + sha256 = "7fc14f279117a55a5e854602f6e8c1cb178c6d83f7cf75e2e9f50678fe11079e"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 3e58e9e3e03..8eba12dfcea 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "keepkey"; - version = "0.7.3"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714"; + sha256 = "95c8d5127919f9fc4bb0120b05f92efc8f526d4a68122ac18e63509571ac45a2"; }; propagatedBuildInputs = [ protobuf hidapi ]; diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix index c67fdcd548f..635308f3760 100644 --- a/pkgs/development/python-modules/ldap.nix +++ b/pkgs/development/python-modules/ldap.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "2.4.41"; + version = "2.4.45"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0"; + sha256 = "824fde180a53772e23edc031c4dd64ac1af4a3eade78f00d9d510937d562f64e"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 0bee4dd47b5..9b2499cd5b2 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ledgerblue"; - version = "0.1.15"; + version = "0.1.16"; src = fetchPypi { inherit pname version; - sha256 = "42cbcd74615576294142d56eb9eaa7e1b67f9dd87eeb24d713336b56e8c01c5c"; + sha256 = "eba56b887339fb5f8582771e4e398df4fa5a017183b908d4f8950588157c1504"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ]; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 5318142fe70..cca10794258 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "libagent"; - version = "0.9.2"; + version = "0.9.5"; src = fetchPypi{ inherit pname version; - sha256 = "d6c6dccc0a7693fc966f5962604a69a800e044ac5add3dd030c34cfd4d64311f"; + sha256 = "982b81c19dc9ee1158dc32fedbe1c36aff2b6872fa0dd42173b639b965ccfb2e"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 2f041f0da4a..b9404ab5ec3 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "libtmux"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "c7407aa4103d40f50f99432bf4dffe0b4591f976956b2dd7ee7bbf53ad138bd9"; + sha256 = "12e5006e59b7d98af5d1a9294f9c8ff2829ac2c1c6ae23dc73c280100b15f485"; }; buildInputs = [ pytest_29 ]; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 5de795f84ef..57deaf3caf3 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llvmlite"; name = "${pname}-${version}"; - version = "0.19.0"; + version = "0.20.0"; disabled = isPyPy; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "fbaeb3d584e0f6bac82a33776e9b5f0b5b4a3415a03edeff5d66f6176f0edbe2"; + sha256 = "b2f174848df16bb9195a07fec102110a06d018da736bd9b3570a54d44c797c29"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 066a9856e50..e493596cfa5 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.11"; + version = "0.1.12"; src = fetchPypi { inherit pname version; - sha256 = "7e69fe9b2752926c33399709e354da3bcca60043c7bf5e727b7126ec3a5db7db"; + sha256 = "adfb86ebb7ff3fcd3ebb27ce8cd6f795c409a13f0c03363e265f17419ce5b9ab"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index cc1e663209e..b21643b4547 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.10.2"; + version = "0.10.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "55a423247faee7a0644d25f37760495978cd494ba0274fefd8cd1fad493954ee"; + sha256 = "48465d58f9c0d729dc586627cf280830e7ed59f9e7999946ae1d763c6b8db999"; }; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index a024d73037f..656f7f44f96 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; name = "${pname}-${version}"; - version = "0.13.1"; + version = "0.13.2"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0082ca2wwc9bymzkp1mr1l5h6rq0k1csv3vcq8ab24x0hdyg5qgk"; + sha256 = "9804ef2829f781f469a06528d107c2a763f109c687266ab8b1f000f9684184ae"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 17325d3204d..afb60801dc9 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "marshmallow"; name = "${pname}-${version}"; - version = "2.13.5"; + version = "2.14.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "048rzdkvnais51xdiy27nail5vxjb4ggw3vd60prn1q11lf16wig"; + sha256 = "09943a460026b9a61c3f4cedd0e5ccfed7cfce3271debd19e3f97df561088718"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 03a03007cf9..345a21ecddf 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pycairo +{ stdenv, fetchurl, python, buildPythonPackage, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 , enableGhostscript ? false, ghostscript ? null, gtk3 @@ -20,13 +20,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "2.0.2"; + version = "2.1.0"; pname = "matplotlib"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1"; + sha256 = "4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype - libpng pkgconfig mock pytz + libpng pkgconfig mock pytz backports_functools_lru_cache ] ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index a52d695ac81..9fa46ce6863 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "meliae"; - version = "0.4.0"; + version = "0.4.0.final.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "16gcgjzcjlbfarwlj18fn089bz34kzfw8varbzxsi9ma0amijrcp"; + sha256 = "976519ab02aaa6a8fb5f596dc4dd9f64fc9510b00e054979566e51c9be7cec99"; }; disabled = isPy3k; diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index 9f71fdb8e74..ad144302417 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "mnemonic"; - version = "0.17"; + version = "0.18"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/${pname}/${name}.tar.gz"; - sha256 = "1hq6xb47jagfqf65iwcrh0065mj3521d2mxmahg7vfraihqyqdjn"; + sha256 = "02a7306a792370f4a0c106c2cf1ce5a0c84b9dbd7e71c6792fdb9ad88a727f1d"; }; propagatedBuildInputs = [ pbkdf2 ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 4141b69f0cd..cf05cbff631 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -8,13 +8,13 @@ let pname = "multidict"; - version = "3.1.3"; + version = "3.3.0"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "875f80a046e7799b40df4b015b8fc5dae91697936872a8d7362c909a02ec6d12"; + sha256 = "e76909da2fad6966281d4e0e4ccfd3c3025699ebcc30806afa09fa1384c3532b"; }; checkInputs = [ pytest psutil ]; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 75b4723b0b5..0ef864d33e2 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "netCDF4"; name = "${pname}-${version}"; - version = "1.2.9"; + version = "1.3.0"; disabled = isPyPy; src = fetchurl { url = "mirror://pypi/n/netCDF4/${name}.tar.gz"; - sha256 = "259edab1f03b1c1b93bdbaa804d50211a0c9d8a15eee4f23988b5685c6c0d2c0"; + sha256 = "1982372aeacc6b36054d90d8cb54ee9506b66b6f44d5cff10e2ffb162aad5476"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk.nix index 302bd89be02..d30e030a049 100644 --- a/pkgs/development/python-modules/nltk.nix +++ b/pkgs/development/python-modules/nltk.nix @@ -1,13 +1,13 @@ { fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }: buildPythonPackage rec { - version = "3.2.4"; + version = "3.2.5"; pname = "nltk"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz"; - sha256 = "8682ae52f5de4f2ba7b77bd78222a38575ad01ef29946214b254dfdf93a3a0eb"; + sha256 = "2661f9971d983db314bbebd51ba770811a362c6597fd0f303bb1d3beadcb4834"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 0bd569fd4ad..8c518f9b7ff 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { name = "${pname}-${version}"; - version = "0.1.1"; + version = "0.2.0"; pname = "node-semver"; buildInputs = [ pytest tox ]; src = fetchPypi { inherit pname version; - sha256 = "1b3xiqgl436q33grbkh4chpfchl8i2dmcpggbb2q4vgv3vjy97p2"; + sha256 = "c32bfc976fd9e003c4a15665e5fe9f337366ba6b60aeb34e4479da9d7bbb0081"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 840df876938..b0d7ae72c95 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "0.34.0"; + version = "0.35.0"; pname = "numba"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "4f86df9212cb2678598e6583973ef1df978f3e3ba497b4dc6f91848887710577"; + sha256 = "11564937757605bee590c5758c73cfe9fd6d569726b56d970316a6228971ecc3"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index ffb74021d8d..2d575d8742a 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "numpy"; - version = "1.13.2"; + version = "1.13.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1fmq8923q91xyjf6fngl0n6jlysryyzx06288b5qdvv97mlfpklh"; + sha256 = "36ee86d5adbabc4fa2643a073f93d5504bdfed37a149a3a49f4dde259f35a750"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index a214af5eab7..9a94848000c 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.4.8"; + version = "2.4.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ee7551efb70648fa8ee569c2b6a6dbbeff390cc94b321da5d508a573b90a4f17"; + sha256 = "95e007f4d121f4fd73f39a6d74a883c75e9fa9d96de91d43c1641c103c3a9b18"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/os-testr/default.nix b/pkgs/development/python-modules/os-testr/default.nix index d97c525b17a..baafc44d10d 100644 --- a/pkgs/development/python-modules/os-testr/default.nix +++ b/pkgs/development/python-modules/os-testr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, python, +{ stdenv, buildPythonPackage, fetchPypi, python, pbr, Babel, testrepository, subunit, testtools, coverage, oslosphinx, oslotest, testscenarios, six, ddt }: @@ -7,8 +7,8 @@ buildPythonPackage rec { pname = "os-testr"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/o/os-testr/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "d8a60bd56c541714a5cab4d1996c8ddfdb5c7c35393d55be617803048c170837"; }; diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index fce8c21284c..de91a507f17 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -3,12 +3,12 @@ debtcollector, rfc3986, pyyaml, oslo-i18n }: buildPythonPackage rec { pname = "oslo.config"; - version = "4.12.0"; + version = "4.13.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1pa9lajsadyq47bmxx12dxlcmnqsqlgnb55hwqas26lgnb2073dx"; + sha256 = "882e5f1dcc0e5b0d7af877b2df0e2692113c5975db8cbbbf0dd3d2b905aefc0b"; }; propagatedBuildInputs = [ pbr six netaddr stevedore debtcollector rfc3986 pyyaml oslo-i18n ]; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 5137485a58f..3d9fd2afaca 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "paramz"; - version = "0.7.4"; + version = "0.8.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1r4mayzp7cb5w1kz45sw65is9j3p60h0yyp8hdhsx393rr4n82nn"; + sha256 = "297e59b48e57e78e15f547b1af8b21ddfd19a6312d70b9dc07c7262711adfed9"; }; propagatedBuildInputs = [ numpy scipy six decorator ]; diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix new file mode 100644 index 00000000000..26617826e12 --- /dev/null +++ b/pkgs/development/python-modules/parso/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "parso"; + version = "0.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "c5279916bb417aa2bf634648ff895cf35dce371d7319744884827bfad06f8d7b"; + }; + + checkInputs = [ pytest ]; + + meta = { + description = "A Python Parser"; + homepage = https://github.com/davidhalter/parso; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index a40635b8d33..cf5c5ee06cd 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "path.py"; - version = "10.3.1"; + version = "10.4"; name = "path.py-${version}"; src = fetchPypi { inherit pname version; - sha256 = "412706be1cd8ab723c77829f9aa0c4d4b7c7b26c7b1be0275a6841c3cb1001e0"; + sha256 = "c63c75777c8a01f7b273c0065a8ea1e3ba0c9b369fa4a2601831e412b2c4881a"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index f3995758521..bf74906d9e5 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.5.3"; + version = "0.5.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "54478a66a360f4ebe4499c9235e4206fca5dec837b8e272d1ce37e0a626cc64d"; + sha256 = "72c495d1bbe76674219e307f6d1c6062f2e1b0b483a5e4886435127d0df3d0d3"; }; meta = { diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index 2c921959852..c4aa8dcf16c 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "piexif"; - version = "1.0.12"; + version = "1.0.13"; # pillow needed for unit tests buildInputs = [ pillow ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "15dvdr7b5xxsbsq5k6kq8h0xnzrkqzc08dzlih48a21x27i02bii"; + sha256 = "1d3dde03bd6298393645bc11d585b67a6ea98fd7e9e1aded6d5d6ec3e4cfbdda"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 9161e8a43b6..4be9c911f71 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -3,12 +3,12 @@ freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11}: buildPythonPackage rec { pname = "Pillow"; - version = "4.2.1"; + version = "4.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0wq0fiw964bj5rdmw66mhbfsjnmb13bcdr42krpk2ig5f1cgc967"; + sha256 = "a97c715d44efd5b4aa8d739b8fad88b93ed79f1b33fc2822d5802043f3b1b527"; }; doCheck = !stdenv.isDarwin && !isPyPy; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 5fa03a18aaa..2c297d8d719 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first, setuptools_scm, glibcLocales }: +{ stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first +, setuptools_scm, glibcLocales, mock }: + buildPythonPackage rec { pname = "pip-tools"; - version = "1.9.0"; + version = "1.10.1"; name = "pip-tools-${version}"; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "0mjdpq2zjn8n4lzn9l2myh4bv0l2f6751k1rdpgdm8k3fargw1h7"; + sha256 = "37b85d69ceed97337aeefb3e52e41fe0884a505c874757a5bbaa58d92b533ce0"; }; LC_ALL = "en_US.UTF-8"; - buildInputs = [ pytest glibcLocales ]; + checkInputs = [ pytest glibcLocales mock ]; propagatedBuildInputs = [ pip click six first setuptools_scm ]; checkPhase = '' diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 9f370a9c0fb..75c0bdc00f1 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "plaster"; - version = "0.5"; + version = "1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0z48pis4qyhyqj3ia82r04diaa153dw66wrpbly06hdzvhw8j0ia"; + sha256 = "8351c7c7efdf33084c1de88dd0f422cbe7342534537b553c49b857b12d98c8c3"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index ac3c4f1d324..2744805a504 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.0.15"; + version = "2.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0ecd16a11778674c63615a590e22f79307801eaf009b399bf7e46c486dec8f99"; + sha256 = "ff6899dc11907b1efb944f79f9583b2e30ba2964bb009145f3580bf30b4d9ee4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 94c3295f029..2884ac9ddc4 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pomegranate"; - version = "0.7.7"; + version = "0.8.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b5b7a6256778fc4097ee77caec28ec845ec1fee3d701f3f26f83860b2d45c453"; + sha256 = "6b03d05bffbe46c674800652cf273a8d338a2e40001b763cd6925aac0b578a43"; }; propagatedBuildInputs = [ numpy scipy cython networkx joblib ]; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index cb418678a99..bd13c63c404 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "portend"; - version = "2.1.2"; + version = "2.2"; buildInputs = [ pytest pytest-sugar pytest-warnings setuptools_scm ]; propagatedBuildInputs = [ tempora ]; src = fetchPypi { inherit pname version; - sha256 = "0dx8b1rn64ymx5s4mdzlw5hz59qi167z7nny36dl75ghlldn41w4"; + sha256 = "bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index f2f8c0f89fd..006b99518a8 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "premailer"; name = "${pname}-${version}"; - version = "3.0.1"; + version = "3.1.1"; meta = { description = "Turns CSS blocks into style attributes "; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0cmlvqx1dvy16k5q5ylmr43nlfpb9k2zl3q7s4kzhf0lml4wqwaf"; + sha256 = "fd07dadc47345f7d44a0587bd65a37c45886f19c44b3ec94904761e4b2d39124"; }; buildInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/pyaes.nix b/pkgs/development/python-modules/pyaes.nix index c2feb2e239c..6104e72a37b 100644 --- a/pkgs/development/python-modules/pyaes.nix +++ b/pkgs/development/python-modules/pyaes.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyaes"; - version = "1.6.0"; + version = "1.6.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0bp9bjqy1n6ij1zb86wz9lqa1dhla8qr1d7w2kxyn7jbj56sbmcw"; + sha256 = "02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 1d1ac67732a..35a7213306f 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; name = "${pname}-${version}"; - version = "3.4.5"; + version = "3.4.7"; meta = { description = "A self-contained cryptographic library for Python"; @@ -13,6 +13,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1n5w5ls5syapmb39kavqgz2sa9pinzx4c9dvwa2147gj0hkh87wj"; + sha256 = "52aa2e540d06d63636e4b5356957c520611e28a88386bad4d18980e4b00e0b5a"; }; } diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index fbb0de6f0ce..b1f1619d910 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "1.5.0"; + version = "1.6.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1x1pcca4a24k4pw8x1c77sgi58cg1wl2k38mp8a25k608pzls3da"; + sha256 = "8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805"; }; buildInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix index 03cea021be8..563c0a09284 100644 --- a/pkgs/development/python-modules/pyjwkest/default.nix +++ b/pkgs/development/python-modules/pyjwkest/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pyjwkest"; name = "${pname}-${version}"; - version = "1.3.2"; + version = "1.4.0"; meta = { description = "Implementation of JWT, JWS, JWE and JWK"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "11rrswsmma3wzi2qnmq929323yc6i9fkjsv8zr7b3vajd72yr49d"; + sha256 = "128e3c81d02993ac4cd7e29ef7aac767d91daa59380e6883ae589092945e4aad"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 8c0fd1b7a8f..afe3bf8e503 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.7.2"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69"; + sha256 = "1f65b3815c3bf7524b845711d54c4242e4057dd93826586620239ecdfe591fb1"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index 274e5b61c14..0d50686f892 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyrtlsdr"; - version = "0.2.5"; + version = "0.2.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "dd041143b68628c713c2227c78c40b0b4a0cb5d08df116f7bdc5f83c529be0e4"; + sha256 = "7942fe2e7821d09206002ea7e820e694094b3f964885123eb6eee1167f39b8da"; }; buildInputs = [ pypandoc pandoc ]; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 605c970cedc..0918b5db1db 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-asyncio"; - version = "0.6.0"; + version = "0.8.0"; disabled = !isPy3k; src = fetchurl { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "e5c6786ece4b3bbb0cca1bf68bf089756a62760e3764dc84eaee39bfab70289b"; + sha256 = "f32804bb58a66e13a3eda11f8942a71b1b6a30466b0d2ffe9214787aab0e172e"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index dc1a31a8922..e993a67c49f 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-xdist"; - version = "1.20.0"; + version = "1.20.1"; src = fetchPypi { inherit pname version; - sha256 = "7924d45c2430191fe3679a58116c74ceea13307d7822c169d65fd59a24b3a4fe"; + sha256 = "433e82f9b34986a4e4b2be38c60e82cca3ac64b7e1b38f4d8e3e118292939712"; }; buildInputs = [ pytest setuptools_scm pytest-forked]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 32ad71de704..42a591e58b6 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -2,7 +2,7 @@ , setuptools_scm }: buildPythonPackage rec { - version = "3.2.1"; + version = "3.2.3"; pname = "pytest"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce"; + sha256 = "27fa6617efc2869d3e969a3e75ec060375bfb28831ade8b5cdd68da3a741dc3c"; }; buildInputs = [ hypothesis setuptools_scm ]; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 8e8fa61e9bc..a78b1ffbee2 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - version = "1.6"; + version = "1.7"; pname = "python-stdnum"; name = "${pname}-${version}"; # Failing tests and dependency issue on Py3k disabled = isPy3k; src = fetchurl { url = "mirror://pypi/p/python-stdnum/${name}.tar.gz"; - sha256 = "157a0aef01b1e846ddd11252dc516637da6b3347e32f0130825b7fae1d8b4655"; + sha256 = "987c25e1047e8742131bcf29dac7a406987adb1463465749e2daaba8cb19d264"; }; meta = { homepage = http://arthurdejong.org/python-stdnum/; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 1010766cf2d..5e1ea8b4642 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "relatorio"; name = "${pname}-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "mirror://pypi/r/relatorio/${name}.tar.gz"; - sha256 = "efd68d96573b15c59c24a8f420ed14210ce51de535a8470d14381f2bed69d845"; + sha256 = "744f1e39313f037a0ab52a154338ece151d83e5442a9278db1f8ce450ce6c2cd"; }; propagatedBuildInputs = [ genshi diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix index c475ff85ff3..51f194a79cf 100644 --- a/pkgs/development/python-modules/requests_ntlm/default.nix +++ b/pkgs/development/python-modules/requests_ntlm/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "requests_ntlm"; - version = "1.0.0"; + version = "1.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0hb689p2jyb867c2wlq5mjkqxgc0jq6lxv3rmhw8rq9qangk3jjk"; + sha256 = "9189c92e8c61ae91402a64b972c4802b2457ce6a799d658256ebf084d5c7eb71"; }; propagatedBuildInputs = [ ntlm-auth requests ]; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index eb669adff45..b2826588a28 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.19.0"; + version = "0.19.1"; name = "${pname}-${version}"; disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "07q261l9145c9xr8b4pcsa08ih1ifhclp05i4xwg43cyamkwpx94"; + sha256 = "5ca0ad32ee04abe0d4ba02c8d89d501b4e5e0304bdf4d45c2e9875a735b323a0"; }; buildInputs = [ nose pillow gfortran glibcLocales ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index f4e4518ef16..df2e569076a 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,16 +1,17 @@ -{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, numpy}: +{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: buildPythonPackage rec { pname = "scipy"; - version = "0.19.1"; + version = "1.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "a19a2ca7a7336495ec180adeaa0dfdcf41e96dbbee90d51c3ed828ba570884e6"; + sha256 = "87ea1f11a0e9ec08c264dc64551d501fa307289460705f6fccd84cbfc7926d10"; }; - buildInputs = [ gfortran nose numpy.blas ]; + checkInputs = [ nose pytest ]; + buildInputs = [ gfortran numpy.blas ]; propagatedBuildInputs = [ numpy ]; # Remove tests because of broken wrapper diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index f2f3069fbf9..9a309d1e3b9 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "semver"; - version = "2.7.8"; + version = "2.7.9"; src = fetchPypi { inherit pname version; - sha256 = "a6212f5c552452e306502ac8476bbca48af62db29c4528fdd91d319d0a44b07b"; + sha256 = "1ffb55fb86a076cf7c161e6b5931f7da59f15abe217e0f24cea96cc8eec50f42"; }; # No tests in archive diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index e2ecbdcb67a..2414b97e94a 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "serpy"; name = "${pname}-${version}"; - version = "0.1.1"; + version = "0.2.0"; meta = { description = "ridiculously fast object serialization"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0r9wn99x9nbqxfancnq9jh3cn83i1b6gc79xj0ipnxixp661yj5i"; + sha256 = "7e62e242321b208362966d5ab32b45df93b1cb88da4ce6260277da060b4f7475"; }; buildInputs = [ flake8 py pyflakes tox ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 1c6fb414a73..818468d0fca 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "36.4.0"; + version = "36.6.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2758b0270fe8ceec42f336ee5b411e60dc8579febc27bb3ba9b794dc7f0239ae"; + sha256 = "62074589522a798da243f47348f38020d55b6c945652e2f2c09d3a96299812b7"; }; buildInputs = [ python wrapPython unzip ]; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 0413366c550..050a59c6e92 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sounddevice"; name = "${pname}-${version}"; - version = "0.3.8"; + version = "0.3.9"; src = fetchPypi { inherit pname version; - sha256 = "dc5ec8534c3831ab133c497721f3aaeed4f5084b0eda842f0c0ada09f2f066dc"; + sha256 = "1c9e833f8c8ccc67c0291c3448b29e9acc548fe56d15ee6f7fdd7037e00319f8"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; prePatch = '' - substituteInPlace sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'" + substituteInPlace src/sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'" ''; meta = { diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index a96a31824f7..e83ab1c724a 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.6.3"; + version = "1.6.5"; src = fetchPypi { inherit pname version; - sha256 = "af8bdb8c714552b77d01d4536e3d6d2879d6cb9d25423d29163d5788e27046e6"; + sha256 = "c6de5dbdbb7a0d7d2757f4389cc00e8f6eb3c49e1772378967a12cfcf2cfe098"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 27a3c4ac2ae..ed1c32df555 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.1.13"; + version = "1.1.14"; src = fetchPypi { inherit pname version; - sha256 = "2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898"; + sha256 = "f1191e29e35b6fe1aef7175a09b1707ebb7bd08d0b17cb0feada76c49e5a2d1e"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index b976524ba69..7156d86bb80 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.1.9"; + version = "1.1.10"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3387ba58383f4e8131f109b40e2b001dec436f38cd9b9b78d38871b8608fdd9e"; + sha256 = "90db96664955c6a576b495c973bd3976b9d4eaffaea205c0343ac7e8f8147cbe"; }; # No tests in archive diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 0625dd851e5..1955320fd26 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "1.25.0"; + version = "1.27.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "c8a373b90487b7a1b52ebaa3ca5059315bf68d9ebe15b2203c2fa675bd7e1e7e"; + sha256 = "236468dae36707069e8b3bdb455e9f1be090b1e6b937f4ac0c56a538d6f50be0"; }; doCheck = false; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 8755a1d4b63..7edfb9c4f0e 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "1.62.1"; + version = "1.70.0"; name = "${pname}-${version}"; # Tests require network connectivity and there's no easy way to disable @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7cc83b8d405a48d8a792640761519c64e373ad3514ea8bb4a9a5128f98b0b679"; + sha256 = "ee77103d2d18fe6369f23c40c93067425c5ed67e08b1a7678e681217e8fa8062"; }; buildInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index a8eba4cb3a0..1ac6c4a54d0 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "tempora"; - version = "1.8"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "1b29d19r8h5my9kzzywi9khn1qzvk3qzp08k0f4rrsa7qks930l4"; + sha256 = "9ea980c63be54f83d2a466fccc6eeef96a409f74c5034764fb328b0d43247e96"; }; doCheck = false; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index d1f3a5feeaa..7b432154b60 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -8,11 +8,15 @@ , unittest2 , traceback2 , isPy3k +, fixtures +, pyrsistent }: +# testtools 2.0.0 and up has a circular run-time dependency on futures + buildPythonPackage rec { pname = "testtools"; - version = "1.8.0"; + version = "1.9.0"; name = "${pname}-${version}"; # Python 2 only judging from SyntaxError @@ -20,12 +24,11 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca"; + sha256 = "b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644"; }; - propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 ]; + propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ]; buildInputs = [ traceback2 ]; - patches = [ ./testtools_support_unittest2.patch ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch b/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch deleted file mode 100644 index 545e5f01ec0..00000000000 --- a/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e600d12980ccb807ba1ca3fb6a4da1d0b89c02f6 Mon Sep 17 00:00:00 2001 -From: Robert Collins -Date: Wed, 1 Jul 2015 15:46:28 +1200 -Subject: [PATCH] Fix tests with unittest2 1.1.0 and higher. - -Change-Id: I4613d47852fbf901819f197f6e388ccaa717b53e ---- - testtools/tests/test_run.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testtools/tests/test_run.py b/testtools/tests/test_run.py -index ead716b..433b6f8 100644 ---- a/testtools/tests/test_run.py -+++ b/testtools/tests/test_run.py -@@ -201,6 +201,7 @@ def test_run_list_failed_import(self): - run.main, ['prog', 'discover', '-l', broken.package.base, '*.py'], out) - self.assertEqual(2, exc.args[0]) - self.assertThat(out.getvalue(), DocTestMatches("""\ -+unittest2.loader._FailedTest.runexample - Failed to import test module: runexample - Traceback (most recent call last): - File ".../loader.py", line ..., in _find_test_path diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index bc6d7c2fba9..95039cc591f 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.15.0"; + version = "4.19.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "6ec1dc74efacf2cda936b4a6cf4082ce224c76763bdec9f17e437c8cfcaa9953"; + sha256 = "7ca803c2ea268c6bdb541e2dac74a3af23cf4bf7b4132a6a78926d255f8c8df1"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 8acbfc91a41..a064a7c98b4 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "Twisted"; name = "${pname}-${version}"; - version = "17.5.0"; + version = "17.9.0"; src = fetchurl { url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; - sha256 = "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i"; + sha256 = "0da1a7e35d5fcae37bc9c7978970b5feb3bc82822155b8654ec63925c05af75c"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ]; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 27ce7a99fa7..b4662c640a3 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "txaio"; - version = "2.8.1"; + version = "2.8.2"; src = fetchPypi { inherit pname version; - sha256 = "fe2e0e4d3a06705f86bbd351fdd1f39dae61755e44162375e024acbf32eafddb"; + sha256 = "484cd6c4cdd3f6081b87188f3b2b9a36e02fba6816e8256917c4f6571b567571"; }; buildInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 481ff67dd97..0a073cca0c5 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,11 +1,11 @@ { buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.0.4"; + version = "1.1.0"; name = "${pname}-${version}"; src = fetchPypi{ inherit pname version; - sha256 = "73f09aac0119f6664a3f471a1ec1c9b719f572bc9212913cea96a78b22c2e96e"; + sha256 = "57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix index d7d56bed881..c0748b6b53b 100644 --- a/pkgs/development/python-modules/ukpostcodeparser/default.nix +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "UkPostcodeParser"; - version = "1.1.1"; + version = "1.1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b7a7ac19d48897637c7aaa2f2970288f1c260e4a99140bf04c6086cf65576c6b"; + sha256 = "930264efa293db80af0103a4fe9c161b06365598d24bb6fe5403f3f57c70530e"; }; doCheck = false; diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index d680c29e224..99b648b0ee1 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "uritools"; name = "uritools-${version}"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "20d7881a947cd3c3bb452e2b541f44acc52febe9c4e3f6d05c55d559fb208c50"; + sha256 = "a7b58a249a851ef5fff1bc513b940653f0d4841a6668e02431c1297f05efeec3"; }; propagatedBuildInputs = [ ipaddress ]; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 80c5abeb47c..760af59918a 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; name = "${pname}-${version}"; - version = "3.0.2"; + version = "3.0.6"; src = fetchPypi { inherit pname version; - sha256 = "e8890d87c80782ee4ea3ed9afffc89a0af8b4ff475d1608d900f728ea55f041c"; + sha256 = "3fbedb4ae0883f48af2397c65a8f9fbf8ed868f1808db70f8aa72f25d391fa9b"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 2923fcaf3eb..859bd62f998 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.8.1"; + version = "1.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "048743567ca9511e19222233ebb53795586a2cede07b79e801577e0a9b4f173c"; + sha256 = "75295a7cbfb3529e02551d4e95c2e3eb85d66292bedcfb463d25d71308065e34"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 4bdfbccadf1..2ded73d5250 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.17.0"; + version = "0.19.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5472f4c95ab9b9fe9f5bf74ece3c986bfafa1f98ad9e1e296d4c35d291c97856"; + sha256 = "701b076a4916e3cfbba345e0297dcd54a02fd0fdcae1f43346f8a043c3bbd052"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 046b749ffa7..1275178d5d0 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -8,12 +8,12 @@ let pname = "yarl"; - version = "0.12.0"; + version = "0.13.0"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "fc0f71ffdce882b4d4b287b0b3a68d9f2557ab14cc2c10ce4df714c42512cbde"; + sha256 = "25fe681a982f2cec567df8abac7cbd2ac27016e4aec89193945cab0643bfdb42"; }; buildInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 0f19e7f4e5d..e00d6c7e24b 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -20,17 +20,18 @@ , pytestcov , requests-mock , testtools +, tornado }: let pname = "zeep"; - version = "2.3.0"; + version = "2.4.0"; in buildPythonPackage { name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b01d81c61d7b7858b7be001615d3c995a371815f5e6902c914fea9beba30b716"; + sha256 = "8631e2735c5f2219eb18ca4f0615ae482455628518508f69c3690dbfb8238aee"; }; propagatedBuildInputs = [ @@ -47,6 +48,10 @@ in buildPythonPackage { # testtools dependency not supported for py3k doCheck = !isPy3k; + checkInputs = [ + tornado + ]; + buildInputs = if isPy3k then [] else [ freezegun mock diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 0c1ece54fb6..c6b5900c627 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "zetup"; - version = "0.2.34"; + version = "0.2.42"; src = fetchPypi { inherit pname version; - sha256 = "0k4lm51b5qjy7yxy3n5z8vc5hlvjcsfsvwjgqzkr0pisysar1kpf"; + sha256 = "6c9e25249f3014ed2162398772ccf1a5e8a4e9e66c74e3c7f6683945a6a3d84c"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index a4855c23865..5a318b5d040 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.2.4"; + version = "5.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1pya0inkkxaqmi14gp796cidf894nz64n603zk670jj9xz0wkhgc"; + sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index f51b30ab51e..9438e8ca54f 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "0.6.0"; + version = "0.7.0"; name = "${pname}-${version}"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665"; + sha256 = "95a247fb17bce980af8d548af70ac5bd1bad22773f242eb8efa24428efa909a8"; }; # fails.. diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 7af2d11e25c..32f756a3cdd 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "4.4.2"; + version = "4.4.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "4e59e427200201f69ef82956ddf9e527891becf5b7cde8ec3ce39e1d0e262eb0"; + sha256 = "d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce"; }; propagatedBuildInputs = [ zope_event ]; diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index 9f568504317..6dc57afb51e 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonApplication rec { name = "${pname}-${version}"; pname = "mypy"; - version = "0.521"; + version = "0.540"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "9d30df20cd937b80cfc6007d75426f27a232789cfa288c63bf9370f2542c9658"; + sha256 = "5d82f51e228a88e5de6ac1d6699dd09e250ce7de217a5ff1256e317266e738ec"; }; propagatedBuildInputs = [ lxml typed-ast ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5987c77b01c..f0a8553dc38 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1191,6 +1191,8 @@ in { }; }; + backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; + backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; babelfish = buildPythonPackage rec { @@ -15101,6 +15103,8 @@ in { }; }; + parso = callPackage ../development/python-modules/parso { }; + partd = buildPythonPackage rec { name = "partd-${version}"; version = "0.3.7"; From 97c7b69e250b4f6d19ce6737815615c38568cee5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 Oct 2017 22:20:20 +0200 Subject: [PATCH 1806/2806] systemd: remove udev attributes --- pkgs/misc/drivers/foo2zjs/default.nix | 2 +- pkgs/os-specific/linux/lvm2/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 14ceb405d68..bfc8271ad65 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "PIXMAPS=$(out)/share/pixmaps" "UDEVBIN=$(out)/bin" "UDEVDIR=$(out)/etc/udev/rules.d" - "UDEVD=${systemd.udev.bin}/sbin/udevd" + "UDEVD=${systemd}/sbin/udevd" "LIBUDEVDIR=$(out)/lib/udev/rules.d" "USBDIR=$(out)/etc/hotplug/usb" "FOODB=$(out)/share/foomatic/db/source" diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 1a36c669577..6382b90f168 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ - --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm + --replace /usr/bin/udevadm ${systemd}/bin/udevadm sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89e59463bd..c5854f1f9f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12956,11 +12956,7 @@ with pkgs; systemd = callPackage ../os-specific/linux/systemd { utillinux = utillinuxMinimal; # break the cyclic dependency - } - // { - udev.bin = systemd; # ${systemd.udev.bin}/bin/udevadm - udev.lib = libudev.out; # ${systemd.udev.lib}/lib/libudev.* - }; + }; # standalone cryptsetup generator for systemd systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; From 0c6afc94bc331a155228dc374b041e2cd5e7c04c Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 27 Oct 2017 22:22:33 +0200 Subject: [PATCH 1807/2806] datefudge: 1.21 => 1.22 --- pkgs/tools/system/datefudge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 13c2938f63b..2c2d778697a 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "datefudge"; - version = "1.2.1"; + version = "1.22"; name = "${pname}-${version}"; src = fetchgit { - sha256 = "0l83kn6c3jr3wzs880zfa64rw81cqjjk55gjxz71rjf2balp64ps"; + sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c"; url = "git://anonscm.debian.org/users/robert/datefudge.git"; - rev = "cd141c63bebe9b579109b2232b5e83db18f222c2"; + rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6"; }; patchPhase = '' From e0d83c66cf8a188854965d21cd08137570e72f1f Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 27 Oct 2017 22:26:09 +0200 Subject: [PATCH 1808/2806] duckmarines: 1.0b => 1.0c --- pkgs/games/duckmarines/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index fc4a006a6a9..b4dca34b11f 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -2,7 +2,7 @@ let pname = "duckmarines"; - version = "1.0b"; + version = "1.0c"; icon = fetchurl { url = "http://tangramgames.dk/img/thumb/duckmarines.png"; From 51babe0fa88ecaec80917ece4e84d9cef39c7eb5 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 27 Oct 2017 23:11:50 +0200 Subject: [PATCH 1809/2806] shotwell: 0.27.0 -> 0.27.1 --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index a3be867d6ed..b0a6f7caf88 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { version = "${major}.${minor}"; major = "0.27"; - minor = "0"; + minor = "1"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "03vwp314kckr67p7shrysqpr95hc3326lk3bv40g11i9clsik1a2"; + sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; From 9711aac642b184a63498dd4bbf8a572721be53c8 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 27 Oct 2017 23:05:12 +0000 Subject: [PATCH 1810/2806] nixUnstable: rename to nix-unstable --- 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 4359682d96a..f41e002a766 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-1.12${suffix}"; + name = "nix-unstable-1.12${suffix}"; suffix = "pre5663_c7af84ce"; src = fetchFromGitHub { owner = "NixOS"; From f8ce957263d4ff2fc910f99511ceb16a20381101 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 13:26:20 -0400 Subject: [PATCH 1811/2806] expat: Don't run tests when cross-compiling --- pkgs/development/libraries/expat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 6533997de2f..77b826acc03 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputMan = "dev"; # tiny page for a dev tool - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; preCheck = '' patchShebangs ./run.sh From bba7c214ff4b4b42733fe197eac323d4d1b7d1aa Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 14:01:40 -0400 Subject: [PATCH 1812/2806] libunistring: Don't run tests when cross-compiling --- pkgs/development/libraries/libunistring/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index c4acc0627af..42376b61f42 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # XXX: There are test failures on non-GNU systems, see # http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html . - doCheck = stdenv ? glibc; + doCheck = (stdenv ? glibc) && (stdenv.hostPlatform == stdenv.buildPlatform); meta = { homepage = http://www.gnu.org/software/libunistring/; From 97c1211f95f13acdc2bd87717924fdceea20804c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 14:13:36 -0400 Subject: [PATCH 1813/2806] libidn: Don't run tests when cross-compiling --- pkgs/development/libraries/libidn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 3de9cf1e0db..df92693de5a 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "info" "devdoc" ]; - doCheck = ! stdenv.isDarwin; + doCheck = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin; hardeningDisable = [ "format" ]; From 6b1a2b3089d4307e10f87618325ce17dc1e6f934 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 15:36:30 -0400 Subject: [PATCH 1814/2806] boehm-gc: Don't run tests when cross-compiling --- pkgs/development/libraries/boehm-gc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index e4311c0a5e9..1ac96e2b4f0 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config"; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; # Don't run the native `strip' when cross-compiling. dontStrip = hostPlatform != buildPlatform; From 99932a894f560d903e65229e157275ec9a5ee94c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 15:39:35 -0400 Subject: [PATCH 1815/2806] gdbm: Don't run tests when cross-compiling --- pkgs/development/libraries/gdbm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index c6313dec90c..3b78225a447 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx"; }; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; # Linking static stubs on cygwin requires correct ordering. # Consider upstreaming this. From 09ce1ebd8fed514147070aa17a95b0b501d8baf5 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 16:54:36 -0400 Subject: [PATCH 1816/2806] libxml2: Don't run tests when cross-compiling --- pkgs/development/libraries/libxml2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 28b6faa436a..bf38a954d60 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin; crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") { # creating the DLL is broken ATM From de347ad65f69557ca27056d707f0414b25bb7575 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 18 Oct 2017 00:48:49 -0400 Subject: [PATCH 1817/2806] lzo: Don't run tests when cross-compiling --- pkgs/development/libraries/lzo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 8739c9d25d5..e8f8a6ab9bb 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; meta = with stdenv.lib; { description = "Real-time data (de)compression library"; From 3ed6239d6bdde9eb1774299d6b921781113865ae Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 26 Oct 2017 21:53:57 -0400 Subject: [PATCH 1818/2806] gnutls: Don't run tests when cross-compiling --- pkgs/development/libraries/gnutls/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 0b633f0a2f1..d2947cd7c6b 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -12,7 +12,8 @@ assert guileBindings -> guile != null; let # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; + doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4" + && stdenv.buildPlatform == stdenv.hostPlatform; in stdenv.mkDerivation { name = "gnutls-${version}"; From 765fbe8f105edae51187c538488d5072b4ac18a7 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Oct 2017 17:05:38 -0400 Subject: [PATCH 1819/2806] libtiff: Don't run testsuite when cross-compiling --- pkgs/development/libraries/libtiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index f43db801f24..ee21f3df7ac 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; From 0c0834f0180bb0ffc577be3cbd4c24540624f9e5 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Oct 2017 17:04:58 -0400 Subject: [PATCH 1820/2806] libjpeg-turbo: Don't run testsuite when cross-compiling --- pkgs/development/libraries/libjpeg-turbo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 1023c8ae505..77f9d999de4 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; checkTarget = "test"; meta = with stdenv.lib; { From 9754285f5bf1ea96397a7ff6acd3c9059f235fd3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 28 Oct 2017 11:20:47 +0800 Subject: [PATCH 1821/2806] neomutt: 20171013 -> 20171027 --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index d9d2f201fdc..4b522518e3f 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -14,14 +14,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20171013"; + version = "20171027"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1"; + sha256 = "0pwc5zdxc9h23658dfkzndfj1ld3ijyvcxmsiv793y3i4dig0s3n"; }; buildInputs = [ From e6061d737b088733ab443e38cf97b6420b1970b7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 28 Oct 2017 03:58:21 +0200 Subject: [PATCH 1822/2806] python.pkgs.nbmerge: init at unstable-2017-10-23 --- .../python-modules/nbmerge/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/nbmerge/default.nix diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix new file mode 100644 index 00000000000..df6c774bfbe --- /dev/null +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nbformat +, nose +}: + +buildPythonPackage rec { + pname = "nbmerge"; + version = "unstable-2017-10-23"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "jbn"; + repo = pname; + rev = "fc0ba95e8422340317358ffec4404235defbc06a"; + sha256 = "1cn550kjadnxc1sx2xy814248fpzrj3lgvrmsbrwmk03vwaa2hmi"; + }; + + propagatedBuildInputs = [ nbformat ]; + checkInputs = [ nose ]; + + checkPhase = '' + patchShebangs . + nosetests -v + PATH=$PATH:$out/bin ./cli_tests.sh + ''; + + meta = { + description = "A tool to merge/concatenate Jupyter (IPython) notebooks"; + inherit (src.meta) homepage; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0a8553dc38..8df85f143bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12702,6 +12702,8 @@ in { nbformat = callPackage ../development/python-modules/nbformat { }; + nbmerge = callPackage ../development/python-modules/nbmerge { }; + nbxmpp = buildPythonPackage rec { name = "nbxmpp-${version}"; version = "0.5.5"; From 2da692dfc17a15cc18e9609889cfc38b991499c6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 27 Oct 2017 12:01:29 +0800 Subject: [PATCH 1823/2806] unbound: 1.6.6 -> 1.6.7 --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index cb462a2cedd..b124352fd7b 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.6"; + version = "1.6.7"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "145kska9a63yf32y3jg91y5ikcmsb7qvbcm7a8k6fgh96gf18awp"; + sha256 = "17qwfmlls0w9kpkya3dlpn44b3kr87wsswzg3gawc13hh8yx8ysf"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB From b972139a59f5647c399afcb71db9929edaec7768 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 17:07:43 +0800 Subject: [PATCH 1824/2806] dpkg: 1.18.24 -> 1.19.0.4 (#30854) * dpkg: 1.18.24 -> 1.19.0.4 * dpkg: just use one substituteInPlace call --- .../tools/package-management/dpkg/default.nix | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 53c39003483..63431e29fac 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: +{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }: stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.24"; + version = "1.19.0.4"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1d6p22vk1b9v16q96mwaz9w2xr4ly28yamkh49md9gq67qfhhlyq"; + sha256 = "02lrwrkl2g1jwj71088rwswx07a1zq1jkq7193lbvy8jj2qnp9lq"; }; configureFlags = [ @@ -31,6 +31,24 @@ stdenv.mkDerivation rec { done ''; + patchPhase = '' + patchShebangs . + + # Dpkg commands sometimes calls out to shell commands + substituteInPlace lib/dpkg/dpkg.h \ + --replace '"dpkg-deb"' \"$out/bin/dpkg-deb\" \ + --replace '"dpkg-split"' \"$out/bin/dpkg-split\" \ + --replace '"dpkg-query"' \"$out/bin/dpkg-query\" \ + --replace '"dpkg-divert"' \"$out/bin/dpkg-divert\" \ + --replace '"dpkg-statoverride"' \"$out/bin/dpkg-statoverride\" \ + --replace '"dpkg-trigger"' \"$out/bin/dpkg-trigger\" \ + --replace '"dpkg"' \"$out/bin/dpkg\" \ + --replace '"debsig-verify"' \"$out/bin/debsig-verify\" \ + --replace '"rm"' \"${coreutils}/bin/rm\" \ + --replace '"cat"' \"${coreutils}/bin/cat\" \ + --replace '"diff"' \"${coreutils}/bin/diff\" + ''; + buildInputs = [ perl zlib bzip2 xz ]; nativeBuildInputs = [ makeWrapper ]; From 9f28f2dd38bbc6b156a4f1798a47b32588611535 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sat, 28 Oct 2017 00:16:39 +0200 Subject: [PATCH 1825/2806] sshlatex: init at 0.7 --- lib/maintainers.nix | 1 + pkgs/tools/typesetting/sshlatex/default.nix | 38 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/tools/typesetting/sshlatex/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b71b5d7aa54..5a9a9428c4e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -268,6 +268,7 @@ htr = "Hugo Tavares Reis "; iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; + iblech = "Ingo Blechschmidt "; igsha = "Igor Sharonov "; ikervagyok = "Balázs Lengyel "; infinisil = "Silvan Mosberger "; diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix new file mode 100644 index 00000000000..bfc1a8eb162 --- /dev/null +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }: + +stdenv.mkDerivation rec { + name = "sshlatex-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "iblech"; + repo = "sshlatex"; + rev = "${version}"; + sha256 = "02h81i8n3skg9jnlfrisyg5bhqicrn6svq64kp20f70p64s3d7ix"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = let + binPath = stdenv.lib.makeBinPath [ openssh perl gnutar bash inotify-tools ]; + in '' + mkdir -p $out/bin + cp sshlatex $out/bin + wrapProgram $out/bin/sshlatex --prefix PATH : "${binPath}" + ''; + + meta = with stdenv.lib; { + description = "A collection of hacks to efficiently run LaTeX via ssh"; + longDescription = '' + sshlatex is a tool which uploads LaTeX source files to a remote, runs + LaTeX there, and streams the resulting PDF file to the local host. + Because sshlatex prestarts LaTeX with the previous run's preamble, + thereby preloading the required LaTeX packages, it is also useful in a + purely local setting. + ''; + homepage = https://github.com/iblech/sshlatex; + license = stdenv.lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus + platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.iblech ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ca4b33ecf3..be0f18ca106 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4486,6 +4486,8 @@ with pkgs; sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; + sshlatex = callPackage ../tools/typesetting/sshlatex { }; + sshuttle = callPackage ../tools/security/sshuttle { }; ssldump = callPackage ../tools/networking/ssldump { }; From 436c8fd28739b20ab3f4448c249c528ba3267034 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 26 Oct 2017 23:42:06 +0200 Subject: [PATCH 1826/2806] 389-ds-base: fix homepage url --- pkgs/servers/ldap/389/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 637b7dd8b92..5ef909a6d09 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { passthru.version = version; meta = with stdenv.lib; { - homepage = https://directory.fedoraproject.org/; + homepage = http://www.port389.org/; description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl2; platforms = platforms.linux; From 817d51aa8f0a4810c15b4b16461e1d3ebca9e6e9 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 26 Oct 2017 23:39:33 +0200 Subject: [PATCH 1827/2806] a2ps: fix homepage url --- pkgs/tools/text/a2ps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index 2535354aa22..f423bd7ea1c 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { (page number, printing date, file name or supplied header), line numbering, symbol substitution as well as pretty printing for a wide range of programming languages. ''; - homepage = http://www.inf.enst.fr/~demaille/a2ps/index.html; + homepage = https://www.gnu.org/software/a2ps/; license = licenses.gpl3Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; From 6fc47b0c58bd631fcdc27b31e8565d8dba6a87fd Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 26 Oct 2017 23:30:19 +0200 Subject: [PATCH 1828/2806] amdapp-sdk: fix homepage url --- pkgs/development/misc/amdapp-sdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index fc2981f7f1f..7775716a712 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support"; - homepage = http://developer.amd.com/tools/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/; + homepage = http://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/; license = licenses.amd; maintainers = [ maintainers.offline ]; platforms = [ "i686-linux" "x86_64-linux" ]; From 19828e85b13b9ab738305b4eee4c4a5472c5d39a Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 26 Oct 2017 23:26:26 +0200 Subject: [PATCH 1829/2806] appstream: fix homepage url --- pkgs/development/libraries/appstream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index d2b605c4f19..b79f274b9c3 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { cmakeFlags = '' -DSTEMMING=off ''; - + meta = with stdenv.lib; { description = "Software metadata handling library"; - homepage = "http://www.freedesktop.org/wiki/Distributions/AppStream/Software/"; + homepage = https://www.freedesktop.org/wiki/Distributions/AppStream/; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications From 01e47d6bb5379cf78c5c72276a88e8219dd829e9 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 26 Oct 2017 23:40:38 +0200 Subject: [PATCH 1830/2806] arp-scan: fix homepage url --- pkgs/tools/misc/arp-scan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index f8adedc7c24..760757190c3 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { Arp-scan is a command-line tool that uses the ARP protocol to discover and fingerprint IP hosts on the local network. ''; - homepage = http://www.nta-monitor.com/tools-resources/security-tools/arp-scan; + homepage = http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; From 06c154386ee245597f6b32c5063bdf3e21720e14 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 12:22:26 +0300 Subject: [PATCH 1831/2806] claws-mail: Split dev output Closure goes 484M -> 469M. --- pkgs/applications/networking/mailreaders/claws-mail/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 01978a4da7e..cccfdbc7560 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { sha256 = "0hlm2jipyr4z6izlrpvabpz4ivh49i13avnm848kr1nv68pkq2cd"; }; + outputs = [ "out" "dev" ]; + patches = [ ./mime.patch ]; hardeningDisable = [ "format" ]; From abf222ad384304ce7477c8556571bc893c8f5a75 Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Sat, 21 Oct 2017 13:33:08 +0200 Subject: [PATCH 1832/2806] libtbb: init at 2018_U1 --- pkgs/development/libraries/libtbb/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/libtbb/default.nix diff --git a/pkgs/development/libraries/libtbb/default.nix b/pkgs/development/libraries/libtbb/default.nix new file mode 100644 index 00000000000..1422f6c5ceb --- /dev/null +++ b/pkgs/development/libraries/libtbb/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, tree }: + +stdenv.mkDerivation rec { + name = "libtbb-${version}"; + version = "2018_U1"; + + src = fetchFromGitHub { + owner = "01org"; + repo = "tbb"; + rev = "${version}"; + sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; + }; + + buildInputs = [ tree ]; + + installPhase = '' + mkdir -p "$out"/usr/include "$out"/lib + install -m755 build/linux_*/*.so* "$out"/lib/ + cp -a include/tbb "$out"/usr/include/ + ''; + + meta = with stdenv.lib; { + homepage = "https://www.threadingbuildingblocks.org/"; + description = "High level abstract threading library"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ dizfer ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0a2fe24a30..8b219f6be7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3119,6 +3119,8 @@ with pkgs; libsrs2 = callPackage ../development/libraries/libsrs2 { }; + libtbb = callPackage ../development/libraries/libtbb { }; + libtermkey = callPackage ../development/libraries/libtermkey { }; libtelnet = callPackage ../development/libraries/libtelnet { }; From 301fc3a33dd02dad3ff2d96f13b0b0b727df72fe Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Sun, 22 Oct 2017 19:05:11 +0200 Subject: [PATCH 1833/2806] maintainers: add dizfer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 5a9a9428c4e..9fb5a64540a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -161,6 +161,7 @@ dgonyeo = "Derek Gonyeo "; dipinhora = "Dipin Hora "; disassembler = "Samuel Leathers "; + dizfer = "David Izquierdo "; dmalikov = "Dmitry Malikov "; DmitryTsygankov = "Dmitry Tsygankov "; dmjio = "David Johnson "; From 38368c42fc06129b7efcb804e25fee16da0319dc Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Sat, 28 Oct 2017 11:17:09 +0200 Subject: [PATCH 1834/2806] steam-runtime-wrapped: add libtbb --- pkgs/games/steam/runtime-wrapped.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 1ec9fc7d5d9..4c3faa07418 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -57,6 +57,7 @@ let glew110 openssl libidn + libtbb # Other things from runtime xlibs.libXinerama From 7dff2c53d4c346df8febf2006c6143097b473236 Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Sat, 28 Oct 2017 11:18:26 +0200 Subject: [PATCH 1835/2806] steam-runtime-wrapped: switch curl to use gnutls --- pkgs/games/steam/runtime-wrapped.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 4c3faa07418..73c010d645f 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -26,7 +26,7 @@ let xlibs.libICE gnome2.GConf freetype - curl + (curl.override { gnutlsSupport = true; sslSupport = false; }) nspr nss fontconfig From b2f199404f84f30dd42e464707e48274a649c9b6 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 26 Oct 2017 17:21:57 +0200 Subject: [PATCH 1836/2806] buku: 3.3.1 -> 3.4 --- pkgs/applications/misc/buku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index a0955dceced..8aa191c0f3c 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { - version = "3.3.1"; + version = "3.4"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1byq8jgv1rb67ygibk0vzgz5ri1il4q4hpg23z5q0ml27fif9hw3"; + sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0"; }; nativeBuildInputs = [ From da3c404e58fad73763b34e1e4a1d798edc15b46b Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Sun, 22 Oct 2017 23:36:30 +0400 Subject: [PATCH 1837/2806] chromium: 62.0.3202.62 -> 62.0.3202.75 also fix beta/dev build - use harfbuzz from sources Unfortunatelly after [0] chromium doesn't support using harfbuzz provided by system while using vendored version of freetype. Disabling usage of separate harfbuzz for now. [0] https://chromium-review.googlesource.com/c/chromium/src/+/696241 --- .../networking/browsers/chromium/common.nix | 10 ++++++++-- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 63483b4da71..42d606ae224 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -60,10 +60,13 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" + "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* # "re2" # fails with linker errors # "ffmpeg" # https://crbug.com/731766 + ] ++ optionals (versionRange "62" "63") [ + "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source ]; opusWithCustomModes = libopus.override { @@ -76,7 +79,10 @@ let libpng libcap xdg_utils yasm minizip libwebp libusb1 re2 zlib - ffmpeg harfbuzz-icu libxslt libxml2 + ffmpeg libxslt libxml2 + ] ++ optionals (versionRange "62" "63") [ + harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source ]; # build paths and release info diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 5fe20b9a981..0cf6df0e5cc 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 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; - sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq"; - version = "62.0.3202.62"; + sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj"; + sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q"; + version = "63.0.3239.18"; }; dev = { - sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb"; - sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv"; - version = "63.0.3239.9"; + sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj"; + sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k"; + version = "63.0.3239.18"; }; stable = { - sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; - sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq"; - version = "62.0.3202.62"; + sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9"; + sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x"; + version = "62.0.3202.75"; }; } From 1adcef7caff0386060d895a31b98a6f610e7b237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 28 Oct 2017 07:48:15 -0200 Subject: [PATCH 1838/2806] e17gtk: 3.22.1 -> 3.22.2 --- pkgs/misc/themes/e17gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix index 3fbb77816d3..f0bb2bf729d 100644 --- a/pkgs/misc/themes/e17gtk/default.nix +++ b/pkgs/misc/themes/e17gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "e17gtk-${version}"; - version = "3.22.1"; + version = "3.22.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "E17gtk"; rev = "V${version}"; - sha256 = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8"; + sha256 = "1qwj1hmdlk8sdqhkrh60p2xg4av1rl0lmipdg5j0i40318pmiml1"; }; installPhase = '' From e730815e38eee3da61bd81e99837c165f9cc529c Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Fri, 27 Oct 2017 21:41:18 +0200 Subject: [PATCH 1839/2806] nodejs: 8.8.0 -> 8.8.1 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 427de79b33e..49cc205c024 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.8.0"; + version = "8.8.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "1ksfj6h6vwaws52055mg80pm2bslw23kpx3a7ahraa6ngk934kw5"; + sha256 = "0ymmhw41n5a81qkxvq7lrssis4y53jh5gxs2k6s2v6brnxxc9qjw"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; From 632b071279c12c4d3e06f1edeaec4e196c1fa425 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Thu, 26 Oct 2017 10:53:23 +0200 Subject: [PATCH 1840/2806] nullmailer: 2.0 -> 2.1 --- pkgs/servers/mail/nullmailer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index be923ff2305..f17f3ed2de7 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -4,12 +4,12 @@ assert tls -> gnutls != null; stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "nullmailer-${version}"; src = fetchurl { url = "http://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; - sha256 = "112ghdln8q9yljc8kp9mc3843mh0fyb4rig2v4q2dzy1l324q3yp"; + sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild"; }; buildInputs = stdenv.lib.optional tls gnutls; From ad1bf413911d732b0677188bb77808ce0d7fe6f4 Mon Sep 17 00:00:00 2001 From: Yuri Aisaka Date: Sat, 28 Oct 2017 20:23:42 +0900 Subject: [PATCH 1841/2806] skktools: init at 1.3.3 (#30778) --- .../inputmethods/skk/skktools/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/inputmethods/skk/skktools/default.nix diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix new file mode 100644 index 00000000000..8661da66b92 --- /dev/null +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }: + +# Note (2017-10-24, yuriaisaka): +# - Version 1.3.3 dates from Jul. 19, 2013. +# - The latest commit to the github repo dates from Mar. 05, 2017 +# - The repo since appears to have become a kitchen sink place to keep +# misc tools to handle SKK dictionaries, and these tools have runtime +# dependencies on a Ruby interpreter etc. +# - We for the moment do not package them to keep the dependencies slim. +# Probably, shall package the newer tools as skktools-extra in the future. +stdenv.mkDerivation rec { + name = "skktools-${version}"; + version = "1.3.3"; + src = fetchFromGitHub { + owner = "skk-dev"; + repo = "skktools"; + rev = "c8816fe720604d4fd79f3552e99e0430ca6f2769"; + sha256 = "11v1i5gkxvfsipigc1w1m16ijzh85drpl694kg6ih4jfam1q4vdh"; + }; + # # See "12.2. Package naming" + # name = "skktools-unstable-${version}"; + # version = "2017-03-05"; + # src = fetchFromGitHub { + # owner = "skk-dev"; + # repo = "skktools"; + # rev = "e14d98e734d2fdff611385c7df65826e94d929db"; + # sha256 = "1k9zxqybl1l5h0a8px2awc920qrdyp1qls50h3kfrj3g65d08aq2"; + # }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gdbm glib ]; + + meta = { + description = "A collection of tools to edit SKK dictionaries"; + longDescription = '' + This package provides a collection of tools to manipulate + (merge, sort etc.) the dictionaries formatted for SKK Japanese + input method. + ''; + homepage = https://github.com/skk-dev/skktools; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b219f6be7c..27a494a1315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1476,6 +1476,8 @@ with pkgs; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; + skktools = callPackage ../tools/inputmethods/skk/skktools { }; + ibus = callPackage ../tools/inputmethods/ibus { inherit (gnome3) dconf glib; }; From 288740ad69526df10cb328cbdde89d23b2f66b1c Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 21 Sep 2017 02:36:39 +0200 Subject: [PATCH 1842/2806] webkitgtk: 2.16.6 -> 2.18.2 remove references to 216x CVE-2017-7087 CVE-2017-7089 CVE-2017-7090 CVE-2017-7091 CVE-2017-7092 CVE-2017-7093 CVE-2017-7095 CVE-2017-7096 CVE-2017-7098 CVE-2017-7100 CVE-2017-7102 CVE-2017-7104 CVE-2017-7107 CVE-2017-7109 CVE-2017-7111 CVE-2017-7117 CVE-2017-7120 closes #29796 --- pkgs/desktops/gnome-3/default.nix | 3 +-- .../libraries/webkitgtk/{2.16.nix => 2.18.nix} | 14 +++++++------- .../libraries/wxwidgets/3.0/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) rename pkgs/development/libraries/webkitgtk/{2.16.nix => 2.18.nix} (89%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 10e5f97c38f..585f79ddea6 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2 + inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -56,7 +56,6 @@ let gtkmm = gtkmm3; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - webkitgtk = webkitgtk216x; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.18.nix similarity index 89% rename from pkgs/development/libraries/webkitgtk/2.16.nix rename to pkgs/development/libraries/webkitgtk/2.18.nix index d6999353414..036dc8f0a54 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -4,7 +4,7 @@ , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit , libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base +, gst-plugins-base, gst-plugins-bad }: assert enableGeoLocation -> geoclue2 != null; @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.16.6"; + version = "2.18.2"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -42,12 +42,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw"; + sha256 = "1ry8zvv6k01g9p7agg326n0ziqpqjxd49h5w1b2is6rjnpqv6k5i"; }; # see if we can clean this up.... - patches = [ ./finding-harfbuzz-icu.patch ] + patches = [ ./finding-harfbuzz-icu.patch ./gstreamergl-2.17.patch ] ++ optionals stdenv.isDarwin [ ./PR-152650-2.patch ./PR-153138.patch @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # XXX: WebKit2 missing include path for gst-plugins-base. # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0" + (optionalString stdenv.isDarwin " -lintl"); nativeBuildInputs = [ @@ -88,9 +88,9 @@ stdenv.mkDerivation rec { ]; buildInputs = libintlOrEmpty ++ [ - gtk2 libwebp enchant libnotify gnutls pcre nettle libidn + gtk2 libwebp enchant libnotify gnutls pcre nettle libidn sqlite libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core + gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core ] ++ optional enableGeoLocation geoclue2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) ++ optionals stdenv.isDarwin [ libedit readline mesa ] diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 35300ed9419..0a4350ed81d 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -3,13 +3,13 @@ , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null; with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation { [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa mesa_glu - ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27a494a1315..925e0f7eac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10968,7 +10968,7 @@ with pkgs; wcslib = callPackage ../development/libraries/wcslib { }; - webkitgtk = webkitgtk216x; + webkitgtk = webkitgtk218x; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu-58; @@ -10976,7 +10976,7 @@ with pkgs; inherit (darwin) libobjc; }; - webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix { + webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; From 43e020ac2fef1376270da1664091b5c493b81bb4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 14:42:47 +0300 Subject: [PATCH 1843/2806] giblib: Split into multiple outputs Or it propagates imlib2.dev. --- pkgs/development/libraries/giblib/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 17847695f97..b166a69043e 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -8,9 +8,25 @@ stdenv.mkDerivation rec { sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; + + preConfigure = '' + configureFlagsArray+=( + --includedir=$dev/include + ) + ''; + buildInputs = [ xlibsWrapper ]; propagatedBuildInputs = [ imlib2 ]; + postFixup = '' + moveToOutput bin/giblib-config "$dev" + + # Doesn't contain useful stuff + rm -rf $out/share/doc + ''; + meta = { homepage = http://linuxbrit.co.uk/giblib/; description = "wrapper library for imlib2, and other stuff"; From 0d6822be2bcb3898f6686eb232a8fc0a87e97348 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 28 Oct 2017 13:52:25 +0200 Subject: [PATCH 1844/2806] Revert "webkitgtk: 2.16.6 -> 2.18.2" This already went to staging, sorry This reverts commit 288740ad69526df10cb328cbdde89d23b2f66b1c. --- pkgs/desktops/gnome-3/default.nix | 3 ++- .../libraries/webkitgtk/{2.18.nix => 2.16.nix} | 14 +++++++------- .../libraries/wxwidgets/3.0/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) rename pkgs/development/libraries/webkitgtk/{2.18.nix => 2.16.nix} (89%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 585f79ddea6..10e5f97c38f 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 + inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2 clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -56,6 +56,7 @@ let gtkmm = gtkmm3; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; + webkitgtk = webkitgtk216x; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.16.nix similarity index 89% rename from pkgs/development/libraries/webkitgtk/2.18.nix rename to pkgs/development/libraries/webkitgtk/2.16.nix index 036dc8f0a54..d6999353414 100644 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -4,7 +4,7 @@ , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit , libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base, gst-plugins-bad +, gst-plugins-base }: assert enableGeoLocation -> geoclue2 != null; @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.18.2"; + version = "2.16.6"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -42,12 +42,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "1ry8zvv6k01g9p7agg326n0ziqpqjxd49h5w1b2is6rjnpqv6k5i"; + sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw"; }; # see if we can clean this up.... - patches = [ ./finding-harfbuzz-icu.patch ./gstreamergl-2.17.patch ] + patches = [ ./finding-harfbuzz-icu.patch ] ++ optionals stdenv.isDarwin [ ./PR-152650-2.patch ./PR-153138.patch @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # XXX: WebKit2 missing include path for gst-plugins-base. # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0" + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" + (optionalString stdenv.isDarwin " -lintl"); nativeBuildInputs = [ @@ -88,9 +88,9 @@ stdenv.mkDerivation rec { ]; buildInputs = libintlOrEmpty ++ [ - gtk2 libwebp enchant libnotify gnutls pcre nettle libidn sqlite + gtk2 libwebp enchant libnotify gnutls pcre nettle libidn libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core + sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core ] ++ optional enableGeoLocation geoclue2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) ++ optionals stdenv.isDarwin [ libedit readline mesa ] diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 0a4350ed81d..35300ed9419 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -3,13 +3,13 @@ , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null; with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation { [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa mesa_glu - ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 925e0f7eac8..27a494a1315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10968,7 +10968,7 @@ with pkgs; wcslib = callPackage ../development/libraries/wcslib { }; - webkitgtk = webkitgtk218x; + webkitgtk = webkitgtk216x; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu-58; @@ -10976,7 +10976,7 @@ with pkgs; inherit (darwin) libobjc; }; - webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix { + webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; From 9812babaef0cc71098568fbb12c6968b726f8cce Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 14:52:52 +0300 Subject: [PATCH 1845/2806] xorg.xf86inputlibinput: Split dev output Closure goes from 160M -> 42M --- pkgs/servers/x11/xorg/overrides.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index fa22717b035..87dfeb3cfa7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -321,8 +321,9 @@ in url = "mirror://xorg/individual/driver/${name}.tar.bz2"; sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; }; + outputs = [ "out" "dev" ]; buildInputs = attrs.buildInputs ++ [ args.libinput ]; - installFlags = "sdkdir=\${out}/include/xorg"; + installFlags = "sdkdir=\${dev}/include/xorg"; }; xf86inputsynaptics = attrs: attrs // { From 65d115dd7decad85a04bea563c6a1b9ff9075adb Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sat, 28 Oct 2017 13:42:50 +0100 Subject: [PATCH 1846/2806] python.pkgs.libagent: add missing unidecode lib --- pkgs/development/python-modules/libagent/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 5318142fe70..84c0a613854 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa -, semver, keepkey, trezor, mnemonic, ledgerblue +, semver, keepkey, trezor, mnemonic, ledgerblue, unidecode }: buildPythonPackage rec { @@ -17,6 +17,10 @@ buildPythonPackage rec { trezor mnemonic ledgerblue ]; + propagatedBuildInputs = [ + unidecode + ]; + meta = with stdenv.lib; { description = "Using hardware wallets as SSH/GPG agent"; homepage = https://github.com/romanz/trezor-agent; From ea8a4a2e431fca881c17cbe57df044cd8e5e8dfc Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 13 Dec 2016 01:38:56 +0100 Subject: [PATCH 1847/2806] dropbox: comment update commands --- pkgs/applications/networking/dropbox/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 89a473f0cd0..06ac05da36d 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -22,6 +22,11 @@ # them with our own. let + ## Prefetch commands to run after update, from this directory: + ## e.g. with Emacs: C-u M-x shell-command + # nix-prefetch-url ../../../../ -A dropbox.src + # nix-prefetch-url ../../../../ -A pkgsi686Linux.dropbox.src + # NOTE: When updating, please also update in current stable, # as older versions stop working version = "37.4.29"; From 5eccf40eb4c0aefab11de880c91f6f3ab12a9c0f Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 16 Aug 2017 09:10:46 +0200 Subject: [PATCH 1848/2806] i2p: 0.9.30 -> 0.9.31 --- 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 e13ada5994c..cf26ec61139 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.30"; + name = "i2p-0.9.31"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "03hrirmah3ba9ygql487jy233nsxkfjyz82mmyppazi0mcgiass1"; + sha256 = "1v2my5jqcj8zidxij34h0lpa533rr6ianzz8yld01sxi6gg41w28"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; From 59b35013bcf22cb9f32372c0019d7b1a0f91b0d8 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 29 Sep 2017 20:40:15 +0200 Subject: [PATCH 1849/2806] imlib2: enable libid3tag support --- pkgs/development/libraries/imlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 8d26cabc9b5..54c70197af4 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig -, freetype +, freetype, libid3tag , x11Support ? true, xlibsWrapper ? null }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z"; }; - buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ] + buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ] ++ optional x11Support xlibsWrapper; nativeBuildInputs = [ pkgconfig ]; From d6ee81e912c5dbfb7db23387c31996b258d0193f Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 28 Jul 2017 12:08:32 +0200 Subject: [PATCH 1850/2806] dwarf-fortress-packages.dwarf-therapist: update for df 43.05 Similar to the LNP, we use Hello71's fork, which features support for the (first 64bit) version 43.05 of Dwarf Fortress. http://dffd.bay12games.com/file.php?id=12762 --- .../dwarf-therapist/default.nix | 33 +++++++++++-------- .../dwarf-therapist/wrapper.nix | 2 +- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index bfdedcdd133..e7ef9a02eb7 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,29 +1,34 @@ -{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }: +{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, cmake, texlive, ninja }: stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "37.0.0"; + version = "37.0.0-Hello71"; src = fetchFromGitHub { - owner = "splintermind"; + ## We use `Hello71`'s fork for 43.05 support + # owner = "splintermind"; + owner = "Hello71"; repo = "Dwarf-Therapist"; - rev = "v${version}"; - sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d"; + rev = "42ccaa71f6077ebdd41543255a360c3470812b97"; + sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz"; }; outputs = [ "out" "layouts" ]; buildInputs = [ qtbase qtdeclarative ]; - nativeBuildInputs = [ texlive qmake ]; + nativeBuildInputs = [ texlive cmake ninja ]; - enableParallelBuilding = false; + configurePhase = '' + cmake -GNinja + ''; - # Move layout files so they cannot be found by Therapist - postInstall = '' - mkdir -p $layouts - mv $out/share/dwarftherapist/memory_layouts/* $layouts - rmdir $out/share/dwarftherapist/memory_layouts - # Useless symlink - rm $out/bin/dwarftherapist + buildPhase = '' + ninja -j$NIX_BUILD_CORES + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./DwarfTherapist $out/bin/DwarfTherapist + cp -r ./share/memory_layouts $layouts ''; meta = with stdenv.lib; { diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index cbc8d31e675..3a1a52d44cd 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -3,7 +3,7 @@ let df = dwarf-fortress-original; dt = dwarf-therapist-original; - inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini"; + inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini"; dfHashFile = "${df}/hash.md5"; in symlinkJoin { From 24ea0938066d53e4f43fb208a5f2ce506c682b38 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 19 Jun 2017 02:48:02 +0200 Subject: [PATCH 1851/2806] dwarf-fortress-packages.soundSense: init 2016-1_196 --- pkgs/games/dwarf-fortress/default.nix | 2 ++ pkgs/games/dwarf-fortress/soundsense.nix | 35 +++++++++++++++++++ pkgs/games/dwarf-fortress/wrapper/default.nix | 11 +++++- .../dwarf-fortress/wrapper/soundSense.in | 10 ++++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/dwarf-fortress/soundsense.nix create mode 100644 pkgs/games/dwarf-fortress/wrapper/soundSense.in diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index d26258081fc..c759c4c60da 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -11,6 +11,8 @@ let inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; }; + soundSense = callPackage ./soundsense.nix { }; + dwarf-fortress-unfuck = callPackage ./unfuck.nix { }; dwarf-fortress = callPackage ./wrapper { diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix new file mode 100644 index 00000000000..c87f42d58c0 --- /dev/null +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchzip, dos2unix +, soundPack ? stdenv.mkDerivation { + name = "soundsense-soundpack"; + src = fetchzip { + url = "http://df.zweistein.cz/soundsense/soundpack.zip"; + sha256 = "0qz0mjkp7wp0gxk3ws2x760awv8c9lkacj2fn9bz3gqqnq262ffa"; + }; + installPhase = '' + cp -r . $out + ''; +}}: + +stdenv.mkDerivation rec { + version = "2016-1_196"; + dfVersion = "0.43.05"; + inherit soundPack; + name = "soundsense-${version}"; + src = fetchzip { + url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip"; + sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk"; + }; + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + nativeBuildInputs = [ dos2unix ]; + buildPhase = '' + dos2unix soundSense.sh + chmod +x soundSense.sh + ''; + installPhase = '' + mkdir $out + cp -R . $out/soundsense + ln -s $out/soundsense/dfhack $out/hack + ln -s $soundPack $out/soundsense/packs + ''; + passthru = { inherit version dfVersion; }; +} diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 15b51631b33..232e0b7b3b5 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll , enableDFHack ? false, dfhack +, enableSoundSense ? false, soundSense, jdk , themes ? {} , theme ? null }: @@ -13,13 +14,14 @@ let # These are in inverse order for first packages to override the next ones. pkgs = lib.optional (theme != null) ptheme ++ lib.optional enableDFHack dfhack + ++ lib.optional enableSoundSense soundSense ++ [ dwarf-fortress-original ]; env = buildEnv { name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}"; paths = pkgs; - pathsToLink = [ "/" "/hack" ]; + pathsToLink = [ "/" "/hack" "/hack/scripts" ]; ignoreCollisions = true; postBuild = lib.optionalString enableDFHack '' @@ -44,6 +46,7 @@ stdenv.mkDerivation rec { runDF = ./dwarf-fortress.in; runDFHack = ./dfhack.in; + runSoundSense = ./soundSense.in; buildCommand = '' mkdir -p $out/bin @@ -57,6 +60,12 @@ stdenv.mkDerivation rec { --subst-var-by stdenv_shell ${stdenv.shell} \ --subst-var dfInit chmod 755 $out/bin/dfhack + '' + lib.optionalString enableSoundSense '' + substitute $runSoundSense $out/bin/soundsense \ + --subst-var-by stdenv_shell ${stdenv.shell} \ + --subst-var-by jre ${jdk.jre} \ + --subst-var dfInit + chmod 755 $out/bin/soundsense ''; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/wrapper/soundSense.in b/pkgs/games/dwarf-fortress/wrapper/soundSense.in new file mode 100644 index 00000000000..28357ed7579 --- /dev/null +++ b/pkgs/games/dwarf-fortress/wrapper/soundSense.in @@ -0,0 +1,10 @@ +#!@stdenv_shell@ -e + +source @dfInit@ + +for p in soundsense/*; do + update_path "$p" +done + +cd "$DF_DIR" +PATH=@jre@/bin exec $DF_DIR/soundsense/soundSense.sh From 85056ee698bdf85dc0db9ca0865dc2b0a2c16ed4 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 1 Oct 2017 21:26:51 +0200 Subject: [PATCH 1852/2806] dwarf-fortress-packages.dfhack: add stoneSense support --- pkgs/games/dwarf-fortress/default.nix | 1 + pkgs/games/dwarf-fortress/dfhack/default.nix | 14 ++++++----- .../dfhack/fix-stonesense.patch | 23 +++++++++++++++++++ .../dwarf-fortress/dfhack/skip-ruby.patch | 10 -------- pkgs/games/dwarf-fortress/stonesense.nix | 15 ++++++++++++ pkgs/games/dwarf-fortress/wrapper/default.nix | 9 ++++++-- pkgs/games/dwarf-fortress/wrapper/dfhack.in | 2 +- 7 files changed, 55 insertions(+), 19 deletions(-) create mode 100644 pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch delete mode 100644 pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch create mode 100644 pkgs/games/dwarf-fortress/stonesense.nix diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index c759c4c60da..bdd55b5aeda 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -12,6 +12,7 @@ let }; soundSense = callPackage ./soundsense.nix { }; + stoneSense = callPackage ./stonesense.nix { }; dwarf-fortress-unfuck = callPackage ./unfuck.nix { }; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 0df91bb8df0..dbb3e7c32e2 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, cmake, writeScriptBin -, perl, XMLLibXML, XMLLibXSLT -, zlib +{ stdenv, lib, fetchgit, cmake, writeScriptBin, callPackage +, perl, XMLLibXML, XMLLibXSLT, zlib +, enableStoneSense ? false, allegro5, mesa }: let @@ -43,11 +43,12 @@ in stdenv.mkDerivation rec { inherit rev sha256; }; - patches = [ ./skip-ruby.patch ]; + patches = [ ./fix-stonesense.patch ]; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ lib.optionals enableStoneSense [ allegro5 mesa ]; preConfigure = '' # Trick build system into believing we have .git @@ -59,7 +60,8 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH" ''; - cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" ]; + cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] + ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; enableParallelBuilding = true; diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch new file mode 100644 index 00000000000..da860cd5562 --- /dev/null +++ b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch @@ -0,0 +1,23 @@ +From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001 +From: Herwig Hochleitner +Date: Sun, 1 Oct 2017 18:01:43 +0200 +Subject: [PATCH] include + +this fixes `GLhandleARB` not being defined +--- + plugins/stonesense/common.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h +index eb36691..ef45389 100644 +--- a/plugins/stonesense/common.h ++++ b/plugins/stonesense/common.h +@@ -31,6 +31,8 @@ using namespace df::enums; + #include + #include + ++#include ++ + // allegro leaks X headers, undef some of it here: + #undef TileShape + #undef None \ No newline at end of file diff --git a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch deleted file mode 100644 index 877f6c3d215..00000000000 --- a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt -index f1ef12ac..0976e18a 100644 ---- a/plugins/ruby/CMakeLists.txt -+++ b/plugins/ruby/CMakeLists.txt -@@ -1,5 +1,5 @@ - # Allow build system to turn off downloading of libruby.so. --OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." ON) -+OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." OFF) - - IF (DOWNLOAD_RUBY) diff --git a/pkgs/games/dwarf-fortress/stonesense.nix b/pkgs/games/dwarf-fortress/stonesense.nix new file mode 100644 index 00000000000..52de513ac8f --- /dev/null +++ b/pkgs/games/dwarf-fortress/stonesense.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "stonesense"; + src = fetchFromGitHub { + owner = "DFHack"; + repo = "stonesense"; + rev = "be793a080e66db1ff79ac284070632ec1a896708"; + sha256 = "1kibqblxp16z75zm48kk59w483933rkg4w339f28fcrbpg4sn92s"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DDFHACK_BUILD_ARCH=64" ]; +} diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 232e0b7b3b5..05e851db6f8 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,11 +1,16 @@ { stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll , enableDFHack ? false, dfhack , enableSoundSense ? false, soundSense, jdk +, enableStoneSense ? false , themes ? {} , theme ? null }: let + dfhack_ = dfhack.override { + inherit enableStoneSense; + }; + ptheme = if builtins.isString theme then builtins.getAttr theme themes @@ -13,7 +18,7 @@ let # These are in inverse order for first packages to override the next ones. pkgs = lib.optional (theme != null) ptheme - ++ lib.optional enableDFHack dfhack + ++ lib.optional enableDFHack dfhack_ ++ lib.optional enableSoundSense soundSense ++ [ dwarf-fortress-original ]; @@ -26,7 +31,7 @@ let postBuild = lib.optionalString enableDFHack '' rm $out/hack/symbols.xml - substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \ + substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \ --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \ $(cat ${dwarf-fortress-original}/hash.md5) ''; diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in index c8d8d287403..4cf884ebed2 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in +++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in @@ -2,7 +2,7 @@ source @dfInit@ -for i in dfhack.init-example dfhack-config/default hack/*; do +for i in dfhack.init-example dfhack-config/default hack/* stonesense/*; do update_path "$i" done From c7bd01c0c927ce7eecc2035c163e16d7d73975f1 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 4 Feb 2017 22:18:59 +0100 Subject: [PATCH 1853/2806] stumpwm-git: 20160617 -> 20170203 --- pkgs/applications/window-managers/stumpwm/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 6d5e53b7088..215b8c38ece 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -23,9 +23,9 @@ let patches = [ ./fix-module-path.patch ]; }; "git" = { - name = "git-20160617"; - rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a"; - sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb"; + name = "git-20170203"; + rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97"; + sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70"; patches = []; }; }.${version}; @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { sbcl lispPackages.clx lispPackages.cl-ppcre + lispPackages.alexandria xdpyinfo ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27a494a1315..b0b88968c82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16624,6 +16624,7 @@ with pkgs; stumpwm-git = stumpwm.override { version = "git"; + inherit sbcl lispPackages; }; sublime = callPackage ../applications/editors/sublime { }; From e05135d80e8cfd34c44ccfae78ab9b765c8af75f Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 1 Apr 2017 04:23:23 +0200 Subject: [PATCH 1854/2806] virtualbox: expose extensionPack in meta This way it can be added to system.extraDependencies to save it from gc --- pkgs/applications/virtualization/virtualbox/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index fbc0cc5ded0..97d3b3c49b5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -197,5 +197,6 @@ in stdenv.mkDerivation { homepage = http://www.virtualbox.org/; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; + inherit extensionPack; }; } From eb3f736afdc3c288a33f35c18d08ad289009b876 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 14 Oct 2016 18:35:18 +0200 Subject: [PATCH 1855/2806] emacsPackages.gn: init 2017-09-21 --- .../editors/emacs-modes/gn/default.nix | 20 +++++++++++++++++++ pkgs/top-level/emacs-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/gn/default.nix diff --git a/pkgs/applications/editors/emacs-modes/gn/default.nix b/pkgs/applications/editors/emacs-modes/gn/default.nix new file mode 100644 index 00000000000..39e7d1abf38 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/gn/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation { + name = "gn-mode-2017-09-21"; + src = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/tools/gn"; + rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36"; + sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866"; + }; + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp/ + cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/ + ''; +} diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index e7c98cc3869..dbddc05a23e 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -307,6 +307,8 @@ let inherit lib; }; + gn = callPackage ../applications/editors/emacs-modes/gn { }; + shorten = melpaBuild rec { pname = "shorten"; version = circe.version; From 4a180dac60e066f52268b69820bafa89dc4ba0d3 Mon Sep 17 00:00:00 2001 From: Jonas Schwabe Date: Sat, 28 Oct 2017 15:35:57 +0200 Subject: [PATCH 1856/2806] gdm: fix restart of display-manager after nixos-rebuild - fix restart of display-manager due to a conflict with getty@tty1 - fixes #21439 --- nixos/modules/services/x11/display-managers/gdm.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 83c5c95dae7..45a67ac040b 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -125,7 +125,6 @@ in "getty@tty1.service" ]; - systemd.services.display-manager.conflicts = [ "getty@tty1.service" ]; systemd.services.display-manager.serviceConfig = { # Restart = "always"; - already defined in xserver.nix KillMode = "mixed"; From 54f8dfda534825ed792631736e64669d855ebee8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Oct 2017 17:57:03 -0400 Subject: [PATCH 1857/2806] xen: Create XSA patch directory --- pkgs/applications/virtualization/xen/4.5.nix | 271 ++---- pkgs/applications/virtualization/xen/4.8.nix | 86 +- .../virtualization/xen/xsa-patches.nix | 774 ++++++++++++++++++ 3 files changed, 844 insertions(+), 287 deletions(-) create mode 100644 pkgs/applications/virtualization/xen/xsa-patches.nix diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 614122a3b24..308913adf89 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -32,13 +32,15 @@ let udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir alsaLib ]; + + xsa = import ./xsa-patches.nix { inherit fetchpatch; }; in callPackage (import ./generic.nix (rec { version = "4.5.5"; src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; + url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2"; }; @@ -183,227 +185,52 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - patches = - [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch - ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch - ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch - (xsaPatch { - name = "190-4.5"; - sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm"; - }) - (xsaPatch { - name = "191-4.6"; - sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg"; - }) - (xsaPatch { - name = "192-4.5"; - sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm"; - }) - (xsaPatch { - name = "193-4.5"; - sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; - }) - (xsaPatch { - name = "195"; - sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7"; - }) - (xsaPatch { - name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject"; - sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; - }) - (xsaPatch { - name = "196-0002-x86-svm-Fix-injection-of-software-interrupts"; - sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; - }) - (xsaPatch { - name = "198"; - sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9"; - }) - (xsaPatch { - name = "200-4.6"; - sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7"; - }) - (xsaPatch { - name = "202-4.6"; - sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; - }) - (xsaPatch { - name = "204-4.5"; - sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; - }) - (xsaPatch { - name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit"; - sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4"; - }) - (xsaPatch { - name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; - sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx"; - }) - (xsaPatch { - name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire"; - sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s"; - }) - (xsaPatch { - name = "206-4.5/0004-oxenstored-remove-some-unused-parameters"; - sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk"; - }) - (xsaPatch { - name = "206-4.5/0005-oxenstored-refactor-request-processing"; - sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv"; - }) - (xsaPatch { - name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio"; - sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg"; - }) - (xsaPatch { - name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat"; - sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz"; - }) - (xsaPatch { - name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict"; - sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g"; - }) - (xsaPatch { - name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti"; - sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b"; - }) - (xsaPatch { - name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0"; - sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj"; - }) - (xsaPatch { - name = "206-4.5/0011-oxenstored-comments-explaining-some-variables"; - sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; - }) - (xsaPatch { - name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit"; - sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8"; - }) - (xsaPatch { - name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit"; - sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl"; - }) - (xsaPatch { - name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-"; - sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb"; - }) - (xsaPatch { - name = "206-4.5/0015-oxenstored-support-commit-history-tracking"; - sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj"; - }) - (xsaPatch { - name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-"; - sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy"; - }) - (xsaPatch { - name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end"; - sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps"; - }) - (xsaPatch { - name = "206-4.5/0018-oxenstored-track-commit-history"; - sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd"; - }) - (xsaPatch { - name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa"; - sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h"; - }) - (xsaPatch { - name = "206-4.5/0020-oxenstored-allow-self-conflicts"; - sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy"; - }) - (xsaPatch { - name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions"; - sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8"; - }) - (xsaPatch { - name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit"; - sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy"; - }) - (xsaPatch { - name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging"; - sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7"; - }) - (xsaPatch { - name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function"; - sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; - }) - (xsaPatch { - name = "207"; - sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; - }) - (xsaPatch { - name = "212"; - sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d"; - }) - (xsaPatch { - name = "213-4.5"; - sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm"; - }) - (xsaPatch { - name = "214"; - sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; - }) - (xsaPatch { - name = "215"; - sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs"; - }) - (xsaPatch { - name = "217-4.5"; - sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4"; - }) - (xsaPatch { - name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures"; - sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq"; - }) - (xsaPatch { - name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race"; - sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k"; - }) - (xsaPatch { - name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry"; - sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc"; - }) - (xsaPatch { - name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses"; - sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2"; - }) - (xsaPatch { - name = "219-4.5"; - sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm"; - }) - (xsaPatch { - name = "220-4.5"; - sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp"; - }) - (xsaPatch { - name = "221"; - sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; - }) - (xsaPatch { - name = "222-1-4.6"; - sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf"; - }) - (xsaPatch { - name = "222-2-4.5"; - sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd"; - }) - (xsaPatch { - name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; - sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h"; - }) - (xsaPatch { - name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to"; - sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq"; - }) - (xsaPatch { - name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m"; - sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08"; - }) - (xsaPatch { - name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; - sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav"; - }) - ]; + patches = with xsa; flatten [ + ./0001-libxl-Spice-image-compression-setting-support-for-up.patch + ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch + ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch + XSA_190 + XSA_191 + XSA_192 + XSA_193 + XSA_195 + XSA_196 + XSA_198 + XSA_200 + XSA_202_45 + XSA_204_45 + XSA_206_45 + XSA_207 + XSA_212 + XSA_213_45 + XSA_214 + XSA_215 + XSA_217_45 + XSA_218_45 + XSA_219_45 + XSA_220_45 + XSA_221 + XSA_222_45 + XSA_223 + XSA_224_45 + XSA_227_45 + XSA_230 + XSA_231_45 + XSA_232 + XSA_233 + XSA_234_45 + XSA_235_45 + XSA_236_45 + XSA_237_45 + XSA_238_45 + XSA_239_45 + XSA_240_45 + XSA_241 + XSA_242 + XSA_243_45 + XSA_244_45 + XSA_245 + ]; # Fix build on Glibc 2.24. NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 3429545557a..259dd72a960 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -27,6 +27,8 @@ let inherit sha256; }); + xsa = import ./xsa-patches.nix { inherit fetchpatch; }; + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir alsaLib @@ -34,11 +36,11 @@ let in callPackage (import ./generic.nix (rec { - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; - sha256 = "158kb1w61jmwxi3fc560s4269hhpxrin9xhm60ljj52njhxias8x"; + url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; + sha256 = "1ydgwbn8ab0s16jrbi3wzaa6j0y3zk0j8pay458qcgayk3qc476b"; }; # Sources needed to build tools and firmwares. @@ -141,68 +143,22 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - patches = - [ (xsaPatch { - name = "213-4.8"; - sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2"; - }) - (xsaPatch { - name = "214"; - sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; - }) - (xsaPatch { - name = "217"; - sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj"; - }) - (xsaPatch { - name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race"; - sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd"; - }) - (xsaPatch { - name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry"; - sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc"; - }) - (xsaPatch { - name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses"; - sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9"; - }) - (xsaPatch { - name = "219-4.8"; - sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq"; - }) - (xsaPatch { - name = "220-4.8"; - sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5"; - }) - (xsaPatch { - name = "221"; - sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; - }) - (xsaPatch { - name = "222-1"; - sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2"; - }) - (xsaPatch { - name = "222-2-4.8"; - sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin"; - }) - (xsaPatch { - name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; - sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4"; - }) - (xsaPatch { - name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to"; - sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck"; - }) - (xsaPatch { - name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m"; - sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2"; - }) - (xsaPatch { - name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; - sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f"; - }) - ]; + patches = with xsa; flatten [ + XSA_231 + XSA_232 + XSA_233 + XSA_234_48 + XSA_236 + XSA_237_48 + XSA_238 + XSA_239 + XSA_240_48 + XSA_241 + XSA_242 + XSA_243_48 + XSA_244 + XSA_245 + ]; # Fix build on Glibc 2.24. NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix new file mode 100644 index 00000000000..fd85c85f22b --- /dev/null +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -0,0 +1,774 @@ +{ fetchpatch }: + +let + xsaPatch = { name , sha256 }: (fetchpatch { + url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; + inherit sha256; + }); +in rec { + # 4.5 + XSA_190 = (xsaPatch { + name = "190-4.5"; + sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm"; + }); + + # 4.5 + XSA_191 = (xsaPatch { + name = "191-4.6"; + sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg"; + }); + + # 4.5 + XSA_192 = (xsaPatch { + name = "192-4.5"; + sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm"; + }); + + # 4.5 + XSA_193 = (xsaPatch { + name = "193-4.5"; + sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; + }); + + # 4.5 + XSA_195 = (xsaPatch { + name = "195"; + sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7"; + }); + + # 4.5 + XSA_196 = [ + (xsaPatch { + name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject"; + sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; + }) + (xsaPatch { + name = "196-0002-x86-svm-Fix-injection-of-software-interrupts"; + sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; + }) + ]; + + # 4.5 + XSA_198 = (xsaPatch { + name = "198"; + sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9"; + }); + + # 4.5 + XSA_200 = (xsaPatch { + name = "200-4.6"; + sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7"; + }); + + # 4.5 + XSA_202_45 = (xsaPatch { + name = "202-4.6"; + sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; + }); + + # 4.8 + XSA_202 = (xsaPatch { + name = "202"; + sha256 = "0j1d5akcjgx8w2c6w6p9znv77fkmps0880m2xgpbgs1ra9grshm1"; + }); + + # 4.8 + XSA_203 = (xsaPatch { + name = "203"; + sha256 = "1s1q7xskvpg87ivwfaiqr0cj3ajdkhkhpmpikfkvq127h8hhmd8j"; + }); + + # 4.5 + XSA_204_45 = (xsaPatch { + name = "204-4.5"; + sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; + }); + + # 4.8 + XSA_204 = (xsaPatch { + name = "204-4.8"; + sha256 = "0rs498s4w2alz3h6jhlr2y0ni630vhggmxbrd1p1p3gcv8p6zzrr"; + }); + + # 4.5 + XSA_206_45 = [ + (xsaPatch { + name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit"; + sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4"; + }) + (xsaPatch { + name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; + sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx"; + }) + (xsaPatch { + name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire"; + sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s"; + }) + (xsaPatch { + name = "206-4.5/0004-oxenstored-remove-some-unused-parameters"; + sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk"; + }) + (xsaPatch { + name = "206-4.5/0005-oxenstored-refactor-request-processing"; + sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv"; + }) + (xsaPatch { + name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio"; + sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg"; + }) + (xsaPatch { + name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat"; + sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz"; + }) + (xsaPatch { + name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict"; + sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g"; + }) + (xsaPatch { + name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti"; + sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b"; + }) + (xsaPatch { + name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0"; + sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj"; + }) + (xsaPatch { + name = "206-4.5/0011-oxenstored-comments-explaining-some-variables"; + sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; + }) + (xsaPatch { + name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit"; + sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8"; + }) + (xsaPatch { + name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit"; + sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl"; + }) + (xsaPatch { + name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-"; + sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb"; + }) + (xsaPatch { + name = "206-4.5/0015-oxenstored-support-commit-history-tracking"; + sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj"; + }) + (xsaPatch { + name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-"; + sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy"; + }) + (xsaPatch { + name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end"; + sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps"; + }) + (xsaPatch { + name = "206-4.5/0018-oxenstored-track-commit-history"; + sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd"; + }) + (xsaPatch { + name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa"; + sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h"; + }) + (xsaPatch { + name = "206-4.5/0020-oxenstored-allow-self-conflicts"; + sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy"; + }) + (xsaPatch { + name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions"; + sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8"; + }) + (xsaPatch { + name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit"; + sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy"; + }) + (xsaPatch { + name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging"; + sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7"; + }) + (xsaPatch { + name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function"; + sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; + }) + ]; + + # 4.8 + XSA_206 = [ + (xsaPatch { + name = "206-4.8/0001-xenstored-apply-a-write-transaction-rate-limit"; + sha256 = "1c81d93i3qx7l38f9af0sd84w5x51zvn262mzl25ilcklql4kzl6"; + }) + (xsaPatch { + name = "206-4.8/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; + sha256 = "0b8iw409wi1x6p0swpnr51lcdlla1lgxjv5f910sj4wl96bca84q"; + }) + (xsaPatch { + name = "206-4.8/0003-oxenstored-comments-explaining-some-variables"; + sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; + }) + (xsaPatch { + name = "206-4.8/0004-oxenstored-handling-of-domain-conflict-credit"; + sha256 = "020rw7hgc0dmhr4admz91kd99b4z1bdpji47nsy1255bjgvwc01k"; + }) + (xsaPatch { + name = "206-4.8/0005-oxenstored-ignore-domains-with-no-conflict-credit"; + sha256 = "1ilhcgyn803bxvfbqv0ihfrh9jfpp0lidkv7i4613f9v9vjm8q0h"; + }) + (xsaPatch { + name = "206-4.8/0006-oxenstored-add-transaction-info-relevant-to-history-"; + sha256 = "1dbd9pzda6hn9wj9pck44dlgz9nxvch3bzgrpaivanww8llxdfzz"; + }) + (xsaPatch { + name = "206-4.8/0007-oxenstored-support-commit-history-tracking"; + sha256 = "1jfr56c22fqkhj6fnv1ha7zsid86zm9l0nihpb8m932xgc4a6h9h"; + }) + (xsaPatch { + name = "206-4.8/0008-oxenstored-only-record-operations-with-side-effects-"; + sha256 = "1y845hj8krjdrirbd2jx4jqgnylwjv7bxnk7474lkld5kdnlbjyf"; + }) + (xsaPatch { + name = "206-4.8/0009-oxenstored-discard-old-commit-history-on-txn-end"; + sha256 = "1lcr9gz2b77x74sr1flfymyyz4xzs04iv88rc1633ibyqxmvk0lx"; + }) + (xsaPatch { + name = "206-4.8/0010-oxenstored-track-commit-history"; + sha256 = "1qwnivak4y038mpby75aaz0y70r0l3yc3hsz6wl5x0b74q6yy0ja"; + }) + (xsaPatch { + name = "206-4.8/0011-oxenstored-blame-the-connection-that-caused-a-transa"; + sha256 = "0p2w5ddyhc6d95dnlxzc5k77j063p02d53ab7m7ijfm7m6gknq8y"; + }) + (xsaPatch { + name = "206-4.8/0012-oxenstored-allow-self-conflicts"; + sha256 = "1571l81m30cbmqm4pk33q33p3dy58sfy2lnkl2wbgl2b3mkk657l"; + }) + (xsaPatch { + name = "206-4.8/0013-oxenstored-do-not-commit-read-only-transactions"; + sha256 = "15985wl635w22dddjyx5l97b5p6m55mzv5ygk7xr0jx7mi192f9x"; + }) + (xsaPatch { + name = "206-4.8/0014-oxenstored-don-t-wake-to-issue-no-conflict-credit"; + sha256 = "08672w4gaf2n3r8xy09h874gh5lg2vnrkjzq6xzvzdhdl092mipw"; + }) + (xsaPatch { + name = "206-4.8/0015-oxenstored-transaction-conflicts-improve-logging"; + sha256 = "0ck98ms0py8wjsc38pbx6222x7n6l90zckfa7m7nnszsyc0sxxad"; + }) + (xsaPatch { + name = "206-4.8/0016-oxenstored-trim-history-in-the-frequent_ops-function"; + sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; + }) + ]; + + # 4.5 - 4.8 + XSA_207 = (xsaPatch { + name = "207"; + sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; + }); + + # 4.8 + XSA_210 = (xsaPatch { + name = "210"; + sha256 = "02mykxqxnsrd0sr4ij022j8y7618wzi2a6j6j761vx8qgmh11xai"; + }); + + # 4.5 - 4.8 + XSA_212 = (xsaPatch { + name = "212"; + sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d"; + }); + + # 4.5 + XSA_213_45 = (xsaPatch { + name = "213-4.5"; + sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm"; + }); + + # 4.8 + XSA_213 = (xsaPatch { + name = "213-4.8"; + sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2"; + }); + + # 4.5 - 4.8 + XSA_214 = (xsaPatch { + name = "214"; + sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; + }); + + # 4.5 + XSA_215 = (xsaPatch { + name = "215"; + sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs"; + }); + + # 4.5 + XSA_217_45 = (xsaPatch { + name = "217-4.5"; + sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4"; + }); + + # 4.6 - 4.8 + XSA_217 = (xsaPatch { + name = "217"; + sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj"; + }); + + # 4.5 + XSA_218_45 = [ + (xsaPatch { + name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures"; + sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq"; + }) + (xsaPatch { + name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race"; + sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k"; + }) + (xsaPatch { + name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry"; + sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc"; + }) + (xsaPatch { + name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses"; + sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2"; + }) + ]; + + # 4.8 + XSA_218 = [ + (xsaPatch { + name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race"; + sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd"; + }) + (xsaPatch { + name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry"; + sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc"; + }) + (xsaPatch { + name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses"; + sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9"; + }) + ]; + + # 4.5 + XSA_219_45 = (xsaPatch { + name = "219-4.5"; + sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm"; + }); + + # 4.8 + XSA_219 = (xsaPatch { + name = "219-4.8"; + sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq"; + }); + + # 4.5 + XSA_220_45 = (xsaPatch { + name = "220-4.5"; + sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp"; + }); + + # 4.8 + XSA_220 = (xsaPatch { + name = "220-4.8"; + sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5"; + }); + + # 4.5 - 4.8 + XSA_221 = (xsaPatch { + name = "221"; + sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; + }); + + # 4.5 + XSA_222_45 = [ + (xsaPatch { + name = "222-1-4.6"; + sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf"; + }) + (xsaPatch { + name = "222-2-4.5"; + sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd"; + }) + ]; + + # 4.8 + XSA_222 = [ + (xsaPatch { + name = "222-1"; + sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2"; + }) + (xsaPatch { + name = "222-2-4.8"; + sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin"; + }) + ]; + + # 4.5 - 4.8 + XSA_223 = (xsaPatch { + name = "223"; + sha256 = "0803gjgcbq9vaz2mq0v5finf1fq8iik1g4hqsjqhjxvspn8l70c5"; + }); + + # 4.5 + XSA_224_45 = [ + (xsaPatch { + name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; + sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h"; + }) + (xsaPatch { + name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to"; + sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq"; + }) + (xsaPatch { + name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m"; + sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08"; + }) + (xsaPatch { + name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; + sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav"; + }) + ]; + + # 4.8 + XSA_224 = [ + (xsaPatch { + name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; + sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4"; + }) + (xsaPatch { + name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to"; + sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck"; + }) + (xsaPatch { + name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m"; + sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2"; + }) + (xsaPatch { + name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; + sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f"; + }) + ]; + + # 4.6 - 4.8 + XSA_225 = (xsaPatch { + name = "225"; + sha256 = "0lcp2bs0r849xnvhrdf8s821v36cqdbzk8lwz6chrjhjalk6ha2g"; + }); + + # 4.5 + XSA_226_45 = [ + (xsaPatch { + name = "226-4.5/0001-gnttab-dont-use-possibly-unbounded-tail-calls"; + sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg"; + }) + (xsaPatch { + name = "226-4.5/0002-gnttab-fix-transitive-grant-handling"; + sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc"; + }) + ]; + + # 4.8 - 4.9 + XSA_226 = [ + (xsaPatch { + name = "226-4.9/0001-gnttab-dont-use-possibly-unbounded-tail-calls"; + sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg"; + }) + (xsaPatch { + name = "226-4.9/0002-gnttab-fix-transitive-grant-handling"; + sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc"; + }) + ]; + + # 4.5 + XSA_227_45 = (xsaPatch { + name = "227-4.5"; + sha256 = "1qfjfisgqm4x98qw54x2qrvgjnvvzizx9p1pjhcnsps9q6g1y3x8"; + }); + + # 4.8 - 4.9 + XSA_227 = (xsaPatch { + name = "227"; + sha256 = "0zdcm43i5n08rh7rrnb0fcssvd4fgawwmizsa16w2ak7pzvgmg94"; + }); + + # 4.8 + XSA_228_48 = (xsaPatch { + name = "228-4.8"; + sha256 = "085pnzwyv0rdb51hv5vhbhwfyxl0wg8sxcm912gjq8z7da5cv10n"; + }); + + # 4.9 + XSA_228 = (xsaPatch { + name = "228"; + sha256 = "0c9nvfpnr5ira7ha3fszhvvh71nsxrvmzrab56xwjhl2dbw2yy23"; + }); + + # 4.5 - 4.9 + XSA_230 = (xsaPatch { + name = "230"; + sha256 = "10x0j7wmzkrwycs1ng89fgjzvzh8vsdd4c5nb68b3j1azdx4ld83"; + }); + + # 4.5 + XSA_231_45 = (xsaPatch { + name = "231-4.5"; + sha256 = "06gwx2f1lg51dfk2b4zxp7wv9c4pxdi87pg2asvmxqc78ir7l5s6"; + }); + + # 4.8 - 4.9 + XSA_231 = (xsaPatch { + name = "231-4.9"; + sha256 = "09r8xxq2fd52wrk6i0y0sk3nbidfg6pzzrkx327hfmdjj76iyz3b"; + }); + + # 4.5 - 4.9 + XSA_232 = (xsaPatch { + name = "232"; + sha256 = "0n6irjpmraa3hbxxm64a1cplc6y6g07x7v2fmlpvn70ql3fs0220"; + }); + + # 4.5 - 4.9 + XSA_233 = (xsaPatch { + name = "233"; + sha256 = "1w3m8349cqav56av63w6jzvlsv4jw5rimwvskr9pq2rcbk2dx8kf"; + }); + + # 4.5 + XSA_234_45 = (xsaPatch { + name = "234-4.5"; + sha256 = "1ji6hbgybb4gbgz5l5fis9midnvjbddzam8d63377rkzdyb3yz9f"; + }); + + # 4.8 + XSA_234_48 = (xsaPatch { + name = "234-4.8"; + sha256 = "08n1pf7z5y67dmay1ap39bi81clgkx82fpmfn7jsh8k4aw94jrsa"; + }); + + # 4.9 + XSA_234 = (xsaPatch { + name = "234-4.9"; + sha256 = "1znmxg432is0virw8321gax8zqq2zcmi2pc5p2j31sixylixsvzx"; + }); + + # 4.5 + XSA_235_45 = (xsaPatch { + name = "235-4.5"; + sha256 = "0hhgnql2gji111020z4wiyzg23wqs6ymanb67rg11p4qad1fp3ff"; + }); + + # 4.8 - 4.9 + XSA_235 = (xsaPatch { + name = "235-4.9"; + sha256 = "1rj4jkmh79wm30jq9f8x65qv3al8l91zc3m5s23q0x6abn3pfb9z"; + }); + + # 4.5 + XSA_236_45 = (xsaPatch { + name = "236-4.5"; + sha256 = "0hcla86x81wykssd2967gblp7fzx61290p4ls4v0hcyxdg2bs2yz"; + }); + + # 4.8 - 4.9 + XSA_236 = (xsaPatch { + name = "236-4.9"; + sha256 = "0vqxy7mgflga05l33j3488fwxmdw3p9yxj4ylhk9n3nw8id72ghq"; + }); + + # 4.5 + XSA_237_45 = [ + (xsaPatch { + name = "237-4.5/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; + sha256 = "0hjxs20jhls4i0iph45a0qpw4znkm04gv74jmwhw84gy4hrhzq3b"; + }) + (xsaPatch { + name = "237-4.5/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; + sha256 = "0ki8nmbc2g1l9wnqsph45a2k4c6dk5s7jvdlxg3zznyiyxjcv8yn"; + }) + (xsaPatch { + name = "237-4.5/0003-x86-MSI-disallow-redundant-enabling"; + sha256 = "1hdz83qrjaqnihz8ji186dypxiblbfpgyb01j9m5alhk4whjqvp1"; + }) + (xsaPatch { + name = "237-4.5/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; + sha256 = "0csdfn9kzn1k94pg3fcwsgqw14wcd4myi1jkcq5alj1fmkhw4wmk"; + }) + (xsaPatch { + name = "237-4.5/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; + sha256 = "14b73rkvbkd1a2gh9kp0zrvv2d3kfwkiv24fg9agh4hrf2w3nx7y"; + }) + ]; + + # 4.8 + XSA_237_48 = [ + (xsaPatch { + name = "237-4.8/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; + sha256 = "0qjisp37lwi2611mp7fbbm1s7m0bx726rrg79dnxs2mj0skw59iv"; + }) + (xsaPatch { + name = "237-4.8/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; + sha256 = "05q1dny13jrqhjfwak7r635mqp9chpibjvn8b7d90japc1nzpq62"; + }) + (xsaPatch { + name = "237-4.8/0003-x86-MSI-disallow-redundant-enabling"; + sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd"; + }) + (xsaPatch { + name = "237-4.8/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; + sha256 = "06nrq0bx3p9ipab2r1why6qm4g32dj0x5q24hfkwc6ih0l9xwf8h"; + }) + (xsaPatch { + name = "237-4.8/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; + sha256 = "1nbg7bjw2hv55gnkhf6chkh35va6brs08acq1d5jxncl6kv0amc1"; + }) + ]; + + # 4.9 + XSA_237 = [ + (xsaPatch { + name = "237-4.9/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; + sha256 = "1cbl24mqxa62h0wgsnrpcs6y6vs53znzj7g8dfsbmf74xwrd4px6"; + }) + (xsaPatch { + name = "237-4.9/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; + sha256 = "0p60148j18b78pxz0dx5ymh1gyrhg2cgmxq0jxmbk090bc4jql35"; + }) + (xsaPatch { + name = "237-4.9/0003-x86-MSI-disallow-redundant-enabling"; + sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd"; + }) + (xsaPatch { + name = "237-4.9/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; + sha256 = "0q95z5641amni53agimnzbspva53p0hz5wl16zaz2yhnjasj5pzr"; + }) + (xsaPatch { + name = "237-4.9/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; + sha256 = "0bnqx9w7ppgx8wxj2zw09z0rkv1jzn3r0bd76cz0r22wz29fsdp2"; + }) + ]; + + # 4.5 + XSA_238_45 = (xsaPatch { + name = "238-4.5"; + sha256 = "1x2fg5vfv5jc084h5gjm6fq0nxjpzvi96px3sqzz4pvsvy4y4i1z"; + }); + + # 4.8 - 4.9 + XSA_238 = (xsaPatch { + name = "238"; + sha256 = "1cbmg1bi5ajh7qbwsl92ynaxw2c3p7i24p3wds81r4n93r0y5dxk"; + }); + + # 4.5 + XSA_239_45 = (xsaPatch { + name = "239-4.5"; + sha256 = "06bi8q3973yajxsdj7pcqarvb56q2gisxdiy0cpbyffbmpkfv3h6"; + }); + + # 4.8 - 4.9 + XSA_239 = (xsaPatch { + name = "239"; + sha256 = "1a9r8j7167s43ds5i7v7mm4y970vjnbhhkrjzpmzlcx8kcz96vh3"; + }); + + # 4.5 + XSA_240_45 = [ + (xsaPatch { + name = "240-4.5/0001-x86-limit-linear-page-table-use-to-a-single-level"; + sha256 = "0pmf10mbnmb88y7mly8s2l0j88cg0ayhkcnmj1zbjrkjmpccv395"; + }) + (xsaPatch { + name = "240-4.5/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; + sha256 = "19f096ra3xndvzkjjasx73p2g25hfkm905px0p3yakwll0qzd029"; + }) + ]; + + # 4.8 + XSA_240_48 = [ + (xsaPatch { + name = "240-4.8/0001-x86-limit-linear-page-table-use-to-a-single-level"; + sha256 = "0m44qhhqk2pdwqg8g28pypqrylq6iw00k9qrzf6qd0iza2y42kgj"; + }) + (xsaPatch { + name = "240-4.8/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; + sha256 = "1jd720wvngj9wq3fprdhakxvqlff0jd8zcx2pd3vsn2qvjbvr2gf"; + }) + ]; + + # 4.9 + XSA_240 = [ + (xsaPatch { + name = "240-4.9/0001-x86-limit-linear-page-table-use-to-a-single-level"; + sha256 = "1759ni80aifakm44g4cc6pnmbcn1xjic8j66fvj0vibm0wqk6xck"; + }) + (xsaPatch { + name = "240-4.9/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; + sha256 = "0g6dpi006p5cjxw5d8h33p0429fdmdm6nqzj0m63ralpqvns3ib5"; + }) + ]; + + # 4.5 - 4.8 + XSA_241 = (xsaPatch { + name = "241-4.8"; + sha256 = "16zb75kzs98f4mdxhbyczk5mbh9dvn6j3yhfafki34x1dfdnq4pj"; + }); + + # 4.9 + XSA_241_49 = (xsaPatch { + name = "241-4.9"; + sha256 = "0xlhin7wkhmlnbp9mqcbq3q4drdwb5la482ja9nwkhi8i867p6wc"; + }); + + # 4.5 - 4.9 + XSA_242 = (xsaPatch { + name = "242-4.9"; + sha256 = "0yx3x0i2wybsm7lzdffxa2mm866bjl4ipbb9vipnw77dyg705zpr"; + }); + + # 4.5 + XSA_243_45 = [ + (xsaPatch { + name = "243-4.6-1"; + sha256 = "1cqanpyysa7px0j645z4jw9yqsvv6cbh7yq1b86ap134axfifcan"; + }) + (xsaPatch { + name = "243-4.5-2"; + sha256 = "0wbcgw4m0nzm2902jnda2020l7bd5adkq8j5myi1zmsfzbq03hwn"; + }) + ]; + + # 4.8 + XSA_243_48 = (xsaPatch { + name = "243-4.8"; + sha256 = "1q60zn55l9wpq45nrxh0av59sjz0jg8pkjm1gkyywkdsgg4fg5z4"; + }); + + # 4.9 + XSA_243 = (xsaPatch { + name = "243"; + sha256 = "06fnbnh9zlsbkqih9ipnb7a8gly54m7lp17d854j1r370ad3c4yg"; + }); + + # 4.5 + XSA_244_45 = (xsaPatch { + name = "244-4.5"; + sha256 = "05ci3vdl1ywfjpzcvsy1k52whxjk8pxzj7dh3r94yqasr56i5v2l"; + }); + + # 4.8 - 4.9 + XSA_244 = (xsaPatch { + name = "244"; + sha256 = "10308xsgmhb0vg6fk0ql8v94zifv6dcv6vkaicryfp405yj2rzkm"; + }); + + # 4.5 - 4.9 + XSA_245 = [ + (xsaPatch { + name = "245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in"; + sha256 = "12brsgbn7xwakalsn10afykgqmx119mqg6vjj3v2b1pnmf4ss0w8"; + }) + (xsaPatch { + name = "245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du"; + sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8"; + }) + ]; +} From 77046bed8a0946dbaace1d38ca49e3d85e3c6894 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 28 Oct 2017 17:39:59 +0300 Subject: [PATCH 1858/2806] cudnn7: 7.0 -> 7.0.3 --- pkgs/development/libraries/science/math/cudnn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index db66d854588..574899d3a89 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -30,16 +30,16 @@ in }; cudnn_cudatoolkit8 = generic rec { - version = "7.0"; + version = "7.0.3"; cudatoolkit = cudatoolkit8; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "19yjdslrslwv5ic4vgpzb0fa0mqbgi6a66b7gc66vdc9n9589398"; + sha256 = "0gzwadxcyirr2zgiikdapnm860x3gcfwfxh5xn3s47zaa03x4kg4"; }; cudnn_cudatoolkit9 = generic rec { - version = "7.0"; + version = "7.0.3"; cudatoolkit = cudatoolkit9; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "1ld5x819vya6p2ppmr7i3lz9ac2y81kssgbzgd0lsign7r2qjapc"; + sha256 = "1ycy413cq9y9yxj20djqv05aarn3qzcy2md3dvvjpvhc269kwn09"; }; } From a71e80db8b9a99d59ad13f2dbce477e3276a2ee1 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sat, 28 Oct 2017 16:22:07 +0200 Subject: [PATCH 1859/2806] nat-traverse: init at 0.7 --- .../tools/networking/nat-traverse/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/networking/nat-traverse/default.nix diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix new file mode 100644 index 00000000000..0972e767758 --- /dev/null +++ b/pkgs/tools/networking/nat-traverse/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, perl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "nat-traverse-${version}"; + version = "0.7"; + + src = fetchurl { + url = "https://www.speicherleck.de/iblech/nat-traverse/nat-traverse-${version}.tar.bz2"; + sha256 = "0knwnqsjwv7sa5wjb863ghabs7s269a73qwkmxpsbngjw9s0j2ih"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp nat-traverse $out/bin + gzip -c nat-traverse.1 > $out/share/man/man1/nat-traverse.1.gz + wrapProgram $out/bin/nat-traverse --prefix PATH : "${stdenv.lib.makeBinPath [ perl ]}" + ''; + + meta = with stdenv.lib; { + description = "NAT gateway traversal utility"; + longDescription = '' + nat-traverse establishes direct connections between nodes which are + behind NAT gateways, i.e. hosts which do not have public IP addresses. + This is done using an UDP NAT traversal technique. Additionally, it's + possible to setup a small VPN by using pppd on top of nat-traverse. + + nat-traverse does not need an external server on the Internet, and it + isn't necessary to reconfigure the involved NAT gateways, either. + nat-traverse works out-of-the-box. + ''; + homepage = https://www.speicherleck.de/iblech/nat-traverse/; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.iblech ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b219f6be7c..d49e89f25a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3458,6 +3458,8 @@ with pkgs; nasty = callPackage ../tools/security/nasty { }; + nat-traverse = callPackage ../tools/networking/nat-traverse { }; + nawk = callPackage ../tools/text/nawk { }; nbd = callPackage ../tools/networking/nbd { }; From 6ce41476599a8a0c06a9d9617767a8536b538d5f Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sat, 28 Oct 2017 21:04:44 +0700 Subject: [PATCH 1860/2806] ahoviewer: 1.4.8 -> 1.4.9 - Add xzfc to maintainers --- pkgs/applications/graphics/ahoviewer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 986e16834f7..2d42a479999 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ahoviewer-${version}"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "ahodesuka"; repo = "ahoviewer"; rev = version; - sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4"; + sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx"; }; enableParallelBuilding = true; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/ahodesuka/ahoviewer; description = "A GTK2 image viewer, manga reader, and booru browser"; - maintainers = [ maintainers.skrzyp ]; + maintainers = with maintainers; [ skrzyp xzfc ]; license = licenses.mit; platforms = platforms.allBut [ "darwin" "cygwin" ]; }; From 036f9ec235da9a7d96d2032e140dfc891c99278d Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 28 Oct 2017 17:39:56 +0200 Subject: [PATCH 1861/2806] ecdsautils: init 0.4.0 --- pkgs/tools/security/ecdsautils/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/security/ecdsautils/default.nix diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix new file mode 100644 index 00000000000..2766c2c07a4 --- /dev/null +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -0,0 +1,24 @@ +{ stdenv, pkgs }: + +stdenv.mkDerivation rec { + version = "0.4.0"; + name = "ecdsautils-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "tcatm"; + repo = "ecdsautils"; + rev = "07538893fb6c2a9539678c45f9dbbf1e4f222b46"; + sha256 = "18sr8x3qiw8s9l5pfi7r9i3ayplz4jqdml75ga9y933vj7vs0k4d"; + }; + + nativeBuildInputs = with pkgs; [ cmake pkgconfig doxygen ]; + buildInputs = with pkgs; [ libuecc ]; + + meta = with stdenv.lib; { + description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; + homepage = https://github.com/tcatm/ecdsautils/; + license = with licenses; [ mit bsd2 ]; + maintainers = with maintainers; [ andir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0b88968c82..a45a9a756e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -574,6 +574,8 @@ with pkgs; dkimpy = pythonPackages.dkimpy; + ecdsautils = callPackage ../tools/security/ecdsautils { }; + elvish = callPackage ../shells/elvish { }; encryptr = callPackage ../tools/security/encryptr { From 274f71e18cb19e4d918a8137519e8fbbcb033375 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Mon, 9 Oct 2017 20:39:36 -0700 Subject: [PATCH 1862/2806] pythonPackages.affinity: init at 0.1.0 --- .../python-modules/affinity/default.nix | 16 ++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/python-modules/affinity/default.nix diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix new file mode 100644 index 00000000000..f2cb2ef6445 --- /dev/null +++ b/pkgs/development/python-modules/affinity/default.nix @@ -0,0 +1,16 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "affinity"; + version = "0.1.0"; + src = fetchPypi { + inherit pname version; + sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6"; + }; + meta = { + description = "control processor affinity on windows and linux"; + homepage = http://cheeseshop.python.org/pypi/affinity; + license = with lib.licenses; [ psfl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a10f4e9830a..6a0573a7f7a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -105,6 +105,8 @@ in { aenum = callPackage ../development/python-modules/aenum { }; + affinity = callPackage ../development/python-modules/affinity { }; + agate = callPackage ../development/python-modules/agate { }; agate-dbf = callPackage ../development/python-modules/agate-dbf { }; From 11d3143f91df02a9c3cc19f6d8fd4f8a283b97a3 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Mon, 9 Oct 2017 20:39:50 -0700 Subject: [PATCH 1863/2806] matrix-synapse: 0.22.1 -> 0.24.1 Also fix use of buildPythonApplication where buildPythonPackage is more appropriate. --- pkgs/servers/matrix-synapse/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c7c33928714..73498e5b884 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,6 +1,6 @@ { lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub }: let - matrix-angular-sdk = pythonPackages.buildPythonApplication rec { + matrix-angular-sdk = pythonPackages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; version = "0.6.8"; @@ -9,7 +9,7 @@ let sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; }; }; - matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec { + matrix-synapse-ldap3 = pythonPackages.buildPythonPackage rec { name = "matrix-synapse-ldap3-${version}"; version = "0.1.2"; @@ -24,24 +24,24 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.22.1"; + version = "0.24.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "06kqqsfqmziff7i99yyxqvkqjm7fwi56abc2vy25g9kqzpdvkay7"; + sha256 = "08w8sawq0nj28dzi9wc4rsg9z2qv528djj4zbcs5c4yc3mylq1nq"; }; patches = [ ./matrix-synapse.patch ]; propagatedBuildInputs = with pythonPackages; [ - blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 + blist canonicaljson daemonize dateutil frozendict pillow pyasn1 pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 psutil msgpack lxml matrix-synapse-ldap3 - phonenumbers jsonschema + phonenumbers jsonschema affinity bcrypt ]; # Checks fail because of Tox. From e76d8af3752bff3b8e0967e9b90601fd04229dff Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Oct 2017 13:42:32 -0400 Subject: [PATCH 1864/2806] linux-copperhead: 4.13.9.a -> 4.13.10.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 a93e4a96119..6ab59a497b6 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.13.9"; + version = "4.13.10"; revision = "a"; - sha256 = "0v2ki1vgmg8yifnflbhryrv7pxvyf0157ysngc1n1hcqyypq4sji"; + sha256 = "0m4yxdcll1zvvvagpjf9s7vw7dmad22qbakhc50as3ixyd7w5ah6"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 5ac01066f20c0dc649eaaf4a64ddca9bcd761a50 Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Thu, 26 Oct 2017 14:53:39 +1100 Subject: [PATCH 1865/2806] gradio: init at 6.0.2 --- lib/maintainers.nix | 1 + ...-install-script-that-hardcodes-paths.patch | 23 ++++++ pkgs/applications/audio/gradio/default.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 98 insertions(+) create mode 100644 pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch create mode 100644 pkgs/applications/audio/gradio/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9fb5a64540a..1bddc33c1d1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -550,6 +550,7 @@ ryneeverett = "Ryne Everett "; rzetterberg = "Richard Zetterberg "; s1lvester = "Markus Silvester "; + samdroid-apps = "Sam Parkinson "; samuelrivas = "Samuel Rivas "; sander = "Sander van der Burg "; sargon = "Daniel Ehlers "; diff --git a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch new file mode 100644 index 00000000000..3a6296baaa6 --- /dev/null +++ b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch @@ -0,0 +1,23 @@ +From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001 +From: Sam Parkinson +Date: Thu, 26 Oct 2017 14:50:13 +1100 +Subject: [PATCH] Remove post-install script that hardcodes paths + +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 25f3e1a..18b43bd 100644 +--- a/meson.build ++++ b/meson.build +@@ -21,4 +21,5 @@ subdir('src') + # subdir('tests') + # TODO: unit tests + +-meson.add_install_script('meson_post_install.sh') ++# This does not work for nixos; it hard-codes paths ++# meson.add_install_script('meson_post_install.sh') +-- +2.14.2 + diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix new file mode 100644 index 00000000000..2f4bde92167 --- /dev/null +++ b/pkgs/applications/audio/gradio/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchFromGitHub, pkgconfig +, gcc +, python3 +, gsettings_desktop_schemas +, desktop_file_utils +, glib +, gtk3 +, intltool +, libsoup +, json_glib +, wrapGAppsHook +, meson +, ninja +, vala +, sqlite +, gst_all_1 +, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] +}: +let + version = "6.0.2"; + +in stdenv.mkDerivation rec { + name = "gradio-${version}"; + + src = fetchFromGitHub { + owner = "haecker-felix"; + repo = "gradio"; + rev = "v${version}"; + sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s"; + }; + + nativeBuildInputs = [ + pkgconfig + + meson + ninja + vala + + python3 + ]; + buildInputs = [ + sqlite + + glib + intltool + libsoup + json_glib + + gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + + wrapGAppsHook + desktop_file_utils + gsettings_desktop_schemas + ] ++ gst_plugins; + + enableParallelBuilding = true; + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ]; + + meta = with stdenv.lib; { + homepage = https://github.com/haecker-felix/gradio; + description = "A GTK3 app for finding and listening to internet radio stations"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.samdroid-apps ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0b88968c82..98bd9178624 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14617,6 +14617,8 @@ with pkgs; rhythmbox = callPackage ../applications/audio/rhythmbox { }; + gradio = callPackage ../applications/audio/gradio { }; + puddletag = callPackage ../applications/audio/puddletag { }; w_scan = callPackage ../applications/video/w_scan { }; From 08e06e7d223d89a9dee247daab7c505b0e0513ee Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 28 Oct 2017 16:30:48 +0200 Subject: [PATCH 1866/2806] borgbackup: add flokli as maintainer --- pkgs/tools/backup/borg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4ff61d1ac95..acd75941524 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -45,6 +45,6 @@ python3Packages.buildPythonApplication rec { homepage = https://borgbackup.github.io/; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx flokli ]; }; } From f3b311af44bee935912f58a38a2344011e3ce78c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 28 Oct 2017 14:13:48 +0200 Subject: [PATCH 1867/2806] borgbackup: fix ssh binary location Otherwise, borg might be unable to find its location --- pkgs/tools/backup/borg/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index acd75941524..7dc6299ef47 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, acl, lz4, openssl }: +{ stdenv, fetchurl, python3Packages, acl, lz4, openssl, openssh }: python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; @@ -27,6 +27,10 @@ python3Packages.buildPythonApplication rec { export BORG_LZ4_PREFIX="${lz4.dev}" ''; + makeWrapperArgs = [ + ''--prefix PATH ':' "${openssh}/bin"'' + ]; + postInstall = '' make -C docs singlehtml mkdir -p $out/share/doc/borg From 443e7bf5f49faebebb7469ead93660b5596fad4d Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sat, 28 Oct 2017 22:42:18 +0200 Subject: [PATCH 1868/2806] maintainers.nix: fix tiny typo --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9fb5a64540a..a68891b0a0e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -66,7 +66,7 @@ aycanirican = "Aycan iRiCAN "; bachp = "Pascal Bach "; badi = "Badi' Abdul-Wahid "; - balajisivaraman = "Balaji Sivaraman"; + balajisivaraman = "Balaji Sivaraman "; barrucadu = "Michael Walker "; basvandijk = "Bas van Dijk "; Baughn = "Svein Ove Aas "; From 4cbf66b578629b1d8f94d570aaafa00b3993644c Mon Sep 17 00:00:00 2001 From: dywedir Date: Sun, 29 Oct 2017 00:42:42 +0300 Subject: [PATCH 1869/2806] rust-bindgen: 0.30.0 -> 0.31.1 --- pkgs/development/tools/rust/bindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 1240e7cc38f..d304560515c 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.30.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "02ic48qng76rvwa54i8zkvqgr8kfsyj3axc08naylzcvwzp84bsf"; + sha256 = "0b0nr42vvxzrykzn11mwk1h9cqn87fh8423wwrs3h8vpk5jqg55i"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" ''; - cargoSha256 = "128skg31lc9v8i7ghfb3wyiazivqfvzhi1mvmjcl0gkx1hi5006v"; + cargoSha256 = "1pjyancb5w9rrxirwx8ghhjbnfcc2r0ha5bfnmlfamj8aaaqdc5w"; doCheck = false; # A test fails because it can't find standard headers in NixOS From 8ac360ed953c2557bd9b7676a1a932d0c878f1dc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 19:15:58 +0300 Subject: [PATCH 1870/2806] libid3tag: Split into multiple outputs --- .../libraries/libid3tag/default.nix | 19 ++++++++++++++----- .../development/libraries/libid3tag/id3tag.pc | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index b03d7643f0f..a153001a960 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,24 +1,33 @@ {stdenv, fetchurl, writeText, zlib, gperf}: stdenv.mkDerivation rec { - version = "0.15.1b"; - name = "libid3tag-${version}"; + version = "0.15.1b"; src = fetchurl { url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz; sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; + propagatedBuildInputs = [ zlib gperf ]; patches = [ ./debian-patches.patch ]; + preConfigure = '' + configureFlagsArray+=( + --includedir=$dev/include + ) + ''; + postInstall = '' - mkdir -p $out/lib/pkgconfig - cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc - substituteInPlace $out/lib/pkgconfig/id3tag.pc \ + mkdir -p $dev/lib/pkgconfig + cp ${./id3tag.pc} $dev/lib/pkgconfig/id3tag.pc + substituteInPlace $dev/lib/pkgconfig/id3tag.pc \ --subst-var-by out $out \ + --subst-var-by dev $dev \ --subst-var-by version "${version}" ''; diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/development/libraries/libid3tag/id3tag.pc index 854f1783cae..e3df7b3f9df 100644 --- a/pkgs/development/libraries/libid3tag/id3tag.pc +++ b/pkgs/development/libraries/libid3tag/id3tag.pc @@ -1,7 +1,7 @@ prefix=@out@ exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${exec_prefix}/include +includedir=@dev@/include Name: libid3tag Description: ID3 tag manipulation library From e5144470632d704778c56a2acc3394ef548d09e6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 19:17:42 +0300 Subject: [PATCH 1871/2806] geoclue2: Split into multiple outputs --- pkgs/development/libraries/geoclue/2.0.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 64d61d64bb6..483ee39c2da 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; @@ -21,6 +23,8 @@ stdenv.mkDerivation rec { dbus dbus_glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; + propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + preConfigure = '' substituteInPlace configure --replace "-Werror" "" ''; @@ -35,7 +39,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + postInstall = '' + sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" + ''; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; From 90e8e0b782ef3bfeb0d75782302612fe0ee63dff Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 19:17:54 +0300 Subject: [PATCH 1872/2806] geoclue: Split into multiple outputs --- pkgs/development/libraries/geoclue/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index f7529000539..ff65ca97eb7 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ]; From b676aa045fc446e9fd49749ef6c3de68401db02b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 29 Oct 2017 01:36:59 +0300 Subject: [PATCH 1873/2806] eaglemode: Mark broken The build just endlessly spams: Say yes, no or always: Use of uninitialized value $ln in pattern match (m//) at make.pl line 626. Use of uninitialized value $ln in pattern match (m//) at make.pl line 629. Use of uninitialized value $ln in pattern match (m//) at make.pl line 632. Use of uninitialized value $ln in pattern match (m//) at make.pl line 636. --- pkgs/applications/misc/eaglemode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 1e5bf8a48ed..d83eb1ed86a 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ viric ]; platforms = platforms.linux; - hydraPlatforms = []; + broken = true; }; } From c9ac187c3c2c6da622578d9168ab9152c7d457c9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Oct 2017 01:48:47 +0300 Subject: [PATCH 1874/2806] tbb: 4.4-u2 -> 2018_U1, merge with libtbb Remove libtbb derivation as a duplicate. --- pkgs/development/libraries/libtbb/default.nix | 30 ------------------- pkgs/development/libraries/tbb/default.nix | 28 ++++++++--------- pkgs/games/steam/runtime-wrapped.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 pkgs/development/libraries/libtbb/default.nix diff --git a/pkgs/development/libraries/libtbb/default.nix b/pkgs/development/libraries/libtbb/default.nix deleted file mode 100644 index 1422f6c5ceb..00000000000 --- a/pkgs/development/libraries/libtbb/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, tree }: - -stdenv.mkDerivation rec { - name = "libtbb-${version}"; - version = "2018_U1"; - - src = fetchFromGitHub { - owner = "01org"; - repo = "tbb"; - rev = "${version}"; - sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; - }; - - buildInputs = [ tree ]; - - installPhase = '' - mkdir -p "$out"/usr/include "$out"/lib - install -m755 build/linux_*/*.so* "$out"/lib/ - cp -a include/tbb "$out"/usr/include/ - ''; - - meta = with stdenv.lib; { - homepage = "https://www.threadingbuildingblocks.org/"; - description = "High level abstract threading library"; - platforms = platforms.unix; - license = licenses.asl20; - maintainers = with maintainers; [ dizfer ]; - }; -} - diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index a8a0d5dc2b3..b8aedd46096 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "tbb-4.4-u2"; +stdenv.mkDerivation rec { + name = "tbb-${version}"; + version = "2018_U1"; - src = fetchurl { - url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20151115oss_src.tgz"; - sha256 = "1fvprkjdxj7529hr1qkzkxkk18mx6zllrpiwglq4k3y1hpyc9m9x"; + src = fetchFromGitHub { + owner = "01org"; + repo = "tbb"; + rev = version; + sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; }; - checkTarget = "test"; - doCheck = false; - installPhase = '' mkdir -p $out/{lib,share/doc} cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ @@ -21,10 +21,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Intel Thread Building Blocks C++ Library"; - homepage = http://threadingbuildingblocks.org/; - license = stdenv.lib.licenses.lgpl3Plus; + homepage = "http://threadingbuildingblocks.org/"; + license = licenses.asl20; longDescription = '' Intel Threading Building Blocks offers a rich and complete approach to expressing parallelism in a C++ program. It is a library that helps you @@ -33,7 +33,7 @@ stdenv.mkDerivation { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ]; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ peti thoughtpolice dizfer ]; }; } diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 73c010d645f..388e5cc3a6c 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -57,7 +57,7 @@ let glew110 openssl libidn - libtbb + tbb # Other things from runtime xlibs.libXinerama diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98bd9178624..eb25d0296c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3121,8 +3121,6 @@ with pkgs; libsrs2 = callPackage ../development/libraries/libsrs2 { }; - libtbb = callPackage ../development/libraries/libtbb { }; - libtermkey = callPackage ../development/libraries/libtermkey { }; libtelnet = callPackage ../development/libraries/libtelnet { }; From a9e5a846db5f4e57a86ace6dccde22944da8af8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= Date: Sun, 29 Oct 2017 01:39:03 +0200 Subject: [PATCH 1875/2806] python: pwntools 3.7.1 -> 3.10.0 Also moved to a seperate module --- .../python-modules/pwntools/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pwntools/default.nix diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix new file mode 100644 index 00000000000..57f7c2c317d --- /dev/null +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, Mako, packaging, pysocks, pygments, ROPGadget +, capstone, paramiko, pip, psutil +, pyelftools, pypandoc, pyserial, dateutil +, requests, tox, pandoc, unicorn, intervaltree }: + +buildPythonPackage rec { + version = "3.10.0"; + pname = "pwntools"; + name = "pwntools-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l8hb30mwxqd1y7r5ihd7kzmjm2mz6m5aiphd3hwzmxkmxbxj8zk"; + }; + + propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ]; + + disabled = isPy3k; + + meta = with stdenv.lib; { + homepage = "http://pwntools.com"; + description = "CTF framework and exploit development library"; + license = licenses.mit; + maintainers = with maintainers; [ bennofs kristoff3r ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30ffa523cbf..e81063a6169 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26396,25 +26396,7 @@ EOF }; }; - pwntools = buildPythonPackage rec { - name = "pwntools-${version}"; - version = "3.7.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pwntools/${name}.tar.gz"; - sha256 = "1c0n97cf3nql3n6sxpbp43x1byhkgfbpbl2b22h8nllgb8n0z9l0"; - }; - propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pkgs.pandoc unicorn intervaltree ]; - - disabled = isPy3k; - - meta = { - homepage = "http://pwntools.com"; - description = "CTF framework and exploit development library"; - license = licenses.mit; - maintainers = with maintainers; [ bennofs ]; - }; - }; + pwntools = callPackage ../development/python-modules/pwntools { }; ROPGadget = callPackage ../development/python-modules/ROPGadget { }; From 7efd5abe4888d6270acd4b2cf6b736d24438cd0f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 29 Oct 2017 01:47:46 +0200 Subject: [PATCH 1876/2806] python-cffi: fix clang build --- pkgs/development/python-modules/cffi/clang.patch | 13 +++++++++++++ pkgs/development/python-modules/cffi/default.nix | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/cffi/clang.patch diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch new file mode 100644 index 00000000000..27674edb58b --- /dev/null +++ b/pkgs/development/python-modules/cffi/clang.patch @@ -0,0 +1,13 @@ +diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py +index a3277b0..0d6e2c3 100644 +--- a/testing/cffi1/test_recompiler.py ++++ b/testing/cffi1/test_recompiler.py +@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False): + char32_t foo_4bytes(char32_t); + """) + lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """ +- #if !defined(__cplusplus) || __cplusplus < 201103L ++ #if !defined(__cplusplus) + typedef uint_least16_t char16_t; + typedef uint_least32_t char32_t; + #endif diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 5c99e77af56..3389a6fd705 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -10,13 +10,15 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; }; + patches = stdenv.lib.optional isPy27 ./clang.patch; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; checkPhase = '' py.test From 2ede55a37b1b6c93cd776ec4032458e656dfd70a Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 29 Oct 2017 02:03:12 +0200 Subject: [PATCH 1877/2806] virtualbox: move extensionPack from meta to passthru --- pkgs/applications/virtualization/virtualbox/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 97d3b3c49b5..4f6da3c7cd9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -190,13 +190,15 @@ in stdenv.mkDerivation { cp -rv out/linux.*/${buildType}/bin/src "$modsrc" ''; - passthru = { inherit version; /* for guest additions */ }; + passthru = { + inherit version; # for guest additions + inherit extensionPack; # for inclusion in profile to prevent gc + }; meta = { description = "PC emulator"; homepage = http://www.virtualbox.org/; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; - inherit extensionPack; }; } From 68b2eeb1cbc1a674c65362ea45f4cdb0c0bf12b4 Mon Sep 17 00:00:00 2001 From: tilpner Date: Sun, 29 Oct 2017 02:04:16 +0200 Subject: [PATCH 1878/2806] chez: 9.4 -> 9.5 --- pkgs/development/compilers/chez/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index e4ceb40cad6..b85d32326a1 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "chez-scheme-${version}"; - version = "9.4-${dver}"; - dver = "20160507"; + version = "9.5-${dver}"; + dver = "20171012"; src = fetchgit { url = "https://github.com/cisco/chezscheme.git"; - rev = "65df1d1f7c37f5b5a93cd7e5b475dda9dbafe03c"; - sha256 = "1b273il3njnn04z55w1hnygvcqllc6p5qg9mcwh10w39fwsd8fbs"; + rev = "adb3b7bb22ddaa1ba91b98b6f4a647427c3a4d9b"; + sha256 = "0hiynf7g0q77ipqxjsqdm2zb0m15bl1hhp615fn3i2hv0qz5a4xr"; fetchSubmodules = true; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { */ patchPhase = '' substituteInPlace ./configure \ - --replace "git submodule init && git submodule update || exit 1" "" + --replace "git submodule init && git submodule update || exit 1" "true" substituteInPlace ./workarea \ --replace "/bin/ln" "${coreutils}/bin/ln" \ From 376f7aa7612d9c63dede4ddd15078f49e9c67eb5 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sun, 29 Oct 2017 12:02:26 +0800 Subject: [PATCH 1879/2806] Update nix-prefetch-git s/understand/understood/ --- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index a180509a326..17962d08acc 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -39,7 +39,7 @@ usage(){ Options: --out path Path where the output would be stored. - --url url Any url understand by 'git clone'. + --url url Any url understood by 'git clone'. --rev ref Any sha1 or references (such as refs/heads/master) --hash h Expected hash. --deepClone Clone the entire repository. From 49e66285b2795433dcf91f05ff884e6cd78bf2f7 Mon Sep 17 00:00:00 2001 From: Evan Wallace Date: Sun, 29 Oct 2017 05:21:30 +0000 Subject: [PATCH 1880/2806] tbb: clang support Added compiler and stdver parameters, to support non-gcc compilers, and enable perfect exception forwarding (std::exception_ptr) on platforms where C++11 is not enabled by default --- pkgs/development/libraries/tbb/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index b8aedd46096..13b1970866e 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: -stdenv.mkDerivation rec { +with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; version = "2018_U1"; @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; }; + makeFlags = concatStringsSep " " ( + optional (compiler != null) "compiler=${compiler}" ++ + optional (stdver != null) "stdver=${stdver}" + ); + installPhase = '' mkdir -p $out/{lib,share/doc} cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; license = licenses.asl20; From 94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 10:12:24 +0100 Subject: [PATCH 1881/2806] Revert "Merge pull request #30913 from LnL7/darwin-cffi" This reverts commit f20a36fcd8feed3671b4c1591dbf4a018eef4cd3, reversing changes made to 15350df8d925a335e9004b6ce7219a6215df41d0. I accidentally pressed the Merge button. --- pkgs/development/python-modules/cffi/clang.patch | 13 ------------- pkgs/development/python-modules/cffi/default.nix | 6 ++---- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/python-modules/cffi/clang.patch diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch deleted file mode 100644 index 27674edb58b..00000000000 --- a/pkgs/development/python-modules/cffi/clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py -index a3277b0..0d6e2c3 100644 ---- a/testing/cffi1/test_recompiler.py -+++ b/testing/cffi1/test_recompiler.py -@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False): - char32_t foo_4bytes(char32_t); - """) - lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """ -- #if !defined(__cplusplus) || __cplusplus < 201103L -+ #if !defined(__cplusplus) - typedef uint_least16_t char16_t; - typedef uint_least32_t char32_t; - #endif diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 3389a6fd705..5c99e77af56 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -10,15 +10,13 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; }; - patches = stdenv.lib.optional isPy27 ./clang.patch; - outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code"; checkPhase = '' py.test From 77d3869f27cca4b47507cb5e1341838cb5575170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 29 Oct 2017 10:18:18 +0100 Subject: [PATCH 1882/2806] colpack: init at 1.0.10 --- .../science/math/colpack/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/science/math/colpack/default.nix diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix new file mode 100644 index 00000000000..29785363b04 --- /dev/null +++ b/pkgs/applications/science/math/colpack/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }: + +stdenv.mkDerivation rec { + + pname = "ColPack"; + version = "1.0.10"; + name = pname + "-" + version; + + src = fetchFromGitHub { + owner = "CSCsw"; + repo = pname; + rev = "v" + version; + sha256 = "1p05vry940mrjp6236c0z83yizmw9pk6ly2lb7d8rpb7j9h03glr"; + }; + + buildInputs = [ autoconf automake gettext libtool ]; + + configurePhase = '' + autoreconf -vif + ./configure --prefix=$out --enable-openmp + ''; + + meta = with stdenv.lib; { + description = "A package comprising of implementations of algorithms for + vertex coloring and derivative computation"; + homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; + license = licenses.lgpl3; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8027db8bfde..042c3888022 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -892,6 +892,8 @@ with pkgs; colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; + colpack = callPackage ../applications/science/math/colpack { }; + consul = callPackage ../servers/consul { }; consul-ui = callPackage ../servers/consul/ui.nix { }; From 9acbfbc7b72f3dbf1afcb64f77602c475a47bd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 29 Oct 2017 10:20:12 +0100 Subject: [PATCH 1883/2806] shogun: init at 6.0.0 --- .../machine-learning/shogun/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/science/machine-learning/shogun/default.nix diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix new file mode 100644 index 00000000000..9d736694cbd --- /dev/null +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig +# data, compression +, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy +# maths +, blas, eigen, nlopt, lp_solve, colpack +# libraries +, libarchive, liblapack, libxml2 +# extra support +, pythonSupport ? true, pythonPackages ? null +, opencvSupport ? false, opencv ? null +}: + +assert pythonSupport -> pythonPackages != null; +assert opencvSupport -> opencv != null; + +stdenv.mkDerivation rec { + + pname = "shogun"; + version = "6.0.0"; + name = pname + "-" + version; + + src = fetchFromGitHub { + owner = pname + "-toolbox"; + repo = pname; + rev = pname + "_" + version; + sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf"; + fetchSubmodules = true; + }; + + CCACHE_DIR=".ccache"; + + buildInputs = with lib; [ + blas bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + protobuf nlopt snappy swig (libarchive.dev) liblapack libxml2 + ] + ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) + ++ optional (opencvSupport) opencv; + + cmakeFlags = with lib; [] + ++ (optional (pythonSupport) "-DPythonModular=ON") + ++ (optional (opencvSupport) "-DOpenCV=ON") + ; + + meta = with stdenv.lib; { + description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; + homepage = "http://shogun-toolbox.org/"; + license = licenses.gpl3; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 042c3888022..596051f4ea7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15808,6 +15808,8 @@ with pkgs; libmlt = mlt; }; + shogun = callPackage ../applications/science/machine-learning/shogun { }; + smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; smtube = libsForQt56.callPackage ../applications/video/smtube {}; From 0767d2984bcfd61e49af8d849e022c33cfb6aad8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 29 Oct 2017 10:23:00 +0100 Subject: [PATCH 1884/2806] nixops: update to 1.5.2 (cherry picked from commit c291a107760888106cf50aa1e54ee4e7c8dd5eb1) --- pkgs/tools/package-management/nixops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 1467faac8e3..daecb8746ea 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0pba9c8ya4hvqmg458p74g69hb06lh0f5bsgw7dsi8pjrcb0624g"; + sha256 = "00y2arc5rffvy6xmx4p6ibpjyc61k8dkiabq7ccwwjgckz1d2dpb"; }; }) From 3f3eb6ca64534c1bfcafe23a78e6cc7a711e7137 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 29 Oct 2017 01:47:46 +0200 Subject: [PATCH 1885/2806] python-cffi: fix clang build --- pkgs/development/python-modules/cffi/clang.patch | 13 +++++++++++++ pkgs/development/python-modules/cffi/default.nix | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/cffi/clang.patch diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch new file mode 100644 index 00000000000..27674edb58b --- /dev/null +++ b/pkgs/development/python-modules/cffi/clang.patch @@ -0,0 +1,13 @@ +diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py +index a3277b0..0d6e2c3 100644 +--- a/testing/cffi1/test_recompiler.py ++++ b/testing/cffi1/test_recompiler.py +@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False): + char32_t foo_4bytes(char32_t); + """) + lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """ +- #if !defined(__cplusplus) || __cplusplus < 201103L ++ #if !defined(__cplusplus) + typedef uint_least16_t char16_t; + typedef uint_least32_t char32_t; + #endif diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 5c99e77af56..b0524b4121a 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -10,13 +10,15 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; }; + patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; checkPhase = '' py.test From f6b0aa8ad5263998ad252f451f80240c89b9f8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 10:59:03 +0100 Subject: [PATCH 1886/2806] pythonPackages.bitstring: 3.1.2 -> 3.1.5 * fetchurl -> fetchPypi * Tests work now * Update homepage --- pkgs/top-level/python-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e81063a6169..c7192b0a415 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1942,19 +1942,19 @@ in { bitstring = buildPythonPackage rec { - name = "bitstring-3.1.2"; + pname = "bitstring"; + version = "3.1.5"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "https://python-bitstring.googlecode.com/files/${name}.zip"; - sha256 = "1i1p3rkj4ad108f23xyib34r4rcy571gy65paml6fk77knh0k66p"; + src = fetchPypi { + inherit pname version; + sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1"; + extension = "zip"; }; - # error: invalid command 'test' - doCheck = false; - meta = { description = "Module for binary data manipulation"; - homepage = https://code.google.com/p/python-bitstring/; + homepage = "https://github.com/scott-griffiths/bitstring"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; From 2e44d576fd5789ca945799e622992ca8afedabce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:05:52 +0100 Subject: [PATCH 1887/2806] pythonPackages.demjson: 1.6 -> 2.2.4 * fetchurl -> fetchPypi * Tests work now. * jsonlint is installed for us by package buildsys. * Disable for python3.6 (build/test error). --- pkgs/top-level/python-packages.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7192b0a415..4cafeab8d40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4853,20 +4853,16 @@ in { demjson = buildPythonPackage rec { - name = "demjson-1.6"; + pname = "demjson"; + version = "2.2.4"; + name = "${pname}-${version}"; + disabled = isPy36; - src = pkgs.fetchurl { - url = "mirror://pypi/d/demjson/${name}.tar.gz"; - sha256 = "0abf7wqqq7rk1sycy47ayn5p93yy7gjq50cb2z69wmik1qqrr60x"; + src = fetchPypi { + inherit pname version; + sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; }; - doCheck = false; # there are no tests - - preFixup = '' - mkdir -p "$out/bin" - cp jsonlint "$out/bin/" - ''; - meta = { description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; homepage = http://deron.meranda.us/python/demjson/; From 235a31b79fdde8b265eca804f4e6f652f710516b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:10:26 +0100 Subject: [PATCH 1888/2806] pythonPackages.pyodbc: 3.0.7 -> 4.0.19 * fetchurl -> fetchPypi * Update homepage (old page still works, but tells user to got to github). --- pkgs/top-level/python-packages.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4cafeab8d40..c5a9ca660ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17079,19 +17079,21 @@ in { pyodbc = buildPythonPackage rec { - name = "pyodbc-3.0.7"; + pname = "pyodbc"; + version = "4.0.19"; + name = "${pname}-${version}"; disabled = isPyPy; # use pypypdbc instead - src = pkgs.fetchurl { - url = "https://pyodbc.googlecode.com/files/${name}.zip"; - sha256 = "0ldkm8xws91j7zbvpqb413hvdz8r66bslr451q3qc0xi8cnmydfq"; + src = fetchPypi { + inherit pname version; + sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg"; }; buildInputs = with self; [ pkgs.libiodbc ]; meta = { description = "Python ODBC module to connect to almost any database"; - homepage = https://code.google.com/p/pyodbc/; + homepage = "https://github.com/mkleehammer/pyodbc"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; From 0b93dbe9d63895e1ba845bc15dcd5f107958097a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:13:57 +0100 Subject: [PATCH 1889/2806] pythonPackages.robotsuite: 1.4.2 -> 2.0.0 * fetchurl -> fetchPypi * Remove commented out doCheck --- pkgs/top-level/python-packages.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5a9ca660ec..b1cc38f5bf7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18807,17 +18807,15 @@ in { robotsuite = buildPythonPackage rec { - version = "1.4.2"; - name = "robotsuite-${version}"; + pname = "robotsuite"; + version = "2.0.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/r/robotsuite/${name}.zip"; - sha256 = "0sw09vrvwv3gzqb6jvhbrz09l6nzzj3i9av34qjddqfwq7cr1bla"; + src = fetchPypi { + inherit pname version; + sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z"; }; - # error: invalid command 'test' - #doCheck = false; - buildInputs = with self; [ unittest2 ]; propagatedBuildInputs = with self; [ robotframework lxml ]; From 335add9e0c187e070e349328f2a2c5cfb992544d Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 29 Oct 2017 09:31:15 +0100 Subject: [PATCH 1890/2806] vdirsyncer: added requests_oauthlib to propagatedBuildInputs vdirsyncer requires `requests_oauthlib` in order to work with google calendar sync services --- pkgs/tools/misc/vdirsyncer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 731a194cc6a..17798057ec3 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -18,6 +18,7 @@ pythonPackages.buildPythonApplication rec { click click-log click-threading requests_toolbelt requests + requests_oauthlib # required for google oauth sync atomicwrites ]; From b1e23a87b18be0077292eefffe660a233fa33123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:40:45 +0100 Subject: [PATCH 1891/2806] pythonPackages.bitstring: move to python-modules/ Easier maintenance when expressions are in separate files. --- .../python-modules/bitstring/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------------ 2 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/bitstring/default.nix diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix new file mode 100644 index 00000000000..f6c56646dcb --- /dev/null +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "bitstring"; + version = "3.1.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1"; + extension = "zip"; + }; + + meta = with stdenv.lib; { + description = "Module for binary data manipulation"; + homepage = "https://github.com/scott-griffiths/bitstring"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1cc38f5bf7..2759ec20121 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1940,26 +1940,7 @@ in { }; }; - - bitstring = buildPythonPackage rec { - pname = "bitstring"; - version = "3.1.5"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1"; - extension = "zip"; - }; - - meta = { - description = "Module for binary data manipulation"; - homepage = "https://github.com/scott-griffiths/bitstring"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + bitstring = callPackage ../development/python-modules/bitstring { }; blaze = callPackage ../development/python-modules/blaze { }; From 013da4ef669359ee0f5e8605870cb618e3579f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:43:27 +0100 Subject: [PATCH 1892/2806] pythonPackages.demjson: move to python-modules/ Easier maintenance when expressions are in separate files. --- .../python-modules/demjson/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------------ 2 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/demjson/default.nix diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix new file mode 100644 index 00000000000..4f5d7a11bd8 --- /dev/null +++ b/pkgs/development/python-modules/demjson/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy36 }: + +buildPythonPackage rec { + pname = "demjson"; + version = "2.2.4"; + name = "${pname}-${version}"; + disabled = isPy36; + + src = fetchPypi { + inherit pname version; + sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; + }; + + meta = with stdenv.lib; { + description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; + homepage = http://deron.meranda.us/python/demjson/; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2759ec20121..b7624cef55e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4832,26 +4832,7 @@ in { }; }; - - demjson = buildPythonPackage rec { - pname = "demjson"; - version = "2.2.4"; - name = "${pname}-${version}"; - disabled = isPy36; - - src = fetchPypi { - inherit pname version; - sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; - }; - - meta = { - description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; - homepage = http://deron.meranda.us/python/demjson/; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; - }; + demjson = callPackage ../development/python-modules/demjson { }; derpconf = self.buildPythonPackage rec { name = "derpconf-0.4.9"; From 7357b369d51dee7e9eadf60d0da88ffb6f1ed6a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:45:46 +0100 Subject: [PATCH 1893/2806] pythonPackages.pyodbc: move to python-modules/ Easier maintenance when expressions are in separate files. --- .../python-modules/pyodbc/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------------ 2 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/pyodbc/default.nix diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix new file mode 100644 index 00000000000..c09e15f4bfb --- /dev/null +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, libiodbc }: + +buildPythonPackage rec { + pname = "pyodbc"; + version = "4.0.19"; + name = "${pname}-${version}"; + disabled = isPyPy; # use pypypdbc instead + + src = fetchPypi { + inherit pname version; + sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg"; + }; + + buildInputs = [ libiodbc ]; + + meta = with stdenv.lib; { + description = "Python ODBC module to connect to almost any database"; + homepage = "https://github.com/mkleehammer/pyodbc"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7624cef55e..da15c8f0073 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17039,28 +17039,7 @@ in { }; }; - - pyodbc = buildPythonPackage rec { - pname = "pyodbc"; - version = "4.0.19"; - name = "${pname}-${version}"; - disabled = isPyPy; # use pypypdbc instead - - src = fetchPypi { - inherit pname version; - sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg"; - }; - - buildInputs = with self; [ pkgs.libiodbc ]; - - meta = { - description = "Python ODBC module to connect to almost any database"; - homepage = "https://github.com/mkleehammer/pyodbc"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + pyodbc = callPackage ../development/python-modules/pyodbc { }; pyocr = callPackage ../development/python-modules/pyocr { }; From 489cdc23fca3562d757295bf9a9b4ee01e45aee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:47:54 +0100 Subject: [PATCH 1894/2806] pythonPackages.robotsuite: move to python-modules/ Easier maintenance when expressions are in separate files. --- .../python-modules/robotsuite/default.nix | 21 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------------ 2 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/robotsuite/default.nix diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix new file mode 100644 index 00000000000..2dd672c0109 --- /dev/null +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, unittest2, robotframework, lxml }: + +buildPythonPackage rec { + pname = "robotsuite"; + version = "2.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z"; + }; + + buildInputs = [ unittest2 ]; + propagatedBuildInputs = [ robotframework lxml ]; + + meta = with stdenv.lib; { + description = "Python unittest test suite for Robot Framework"; + homepage = http://github.com/collective/robotsuite/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da15c8f0073..e3e0d78cb80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18746,27 +18746,7 @@ in { }; }; - - robotsuite = buildPythonPackage rec { - pname = "robotsuite"; - version = "2.0.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z"; - }; - - buildInputs = with self; [ unittest2 ]; - propagatedBuildInputs = with self; [ robotframework lxml ]; - - meta = { - description = "Python unittest test suite for Robot Framework"; - homepage = http://github.com/collective/robotsuite/; - license = licenses.gpl3; - }; - }; - + robotsuite = callPackage ../development/python-modules/robotsuite { }; robotframework-ride = buildPythonPackage rec { version = "1.2.3"; From 208e5c99c46fd9d9f2300931a44cd698edc8d0b9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 29 Oct 2017 11:20:31 +0100 Subject: [PATCH 1895/2806] pyte: init at 0.7.0 --- .../python-modules/pyte/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pyte/default.nix diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix new file mode 100644 index 00000000000..2bd71070581 --- /dev/null +++ b/pkgs/development/python-modules/pyte/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: + +buildPythonPackage rec { + pname = "pyte"; + version = "0.7.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7"; + }; + + propagatedBuildInputs = [ wcwidth ]; + + checkInputs = [ pytest pytestrunner ]; + + # tries to write to os.path.dirname(__file__) in test_input_output + checkPhase = '' + py.test -k "not test_input_output" + ''; + + meta = with stdenv.lib; { + description = "Simple VTXXX-compatible linux terminal emulator"; + homepage = https://github.com/selectel/pyte; + license = licenses.lgpl3; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf670a40c6c..7887cd75754 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12493,6 +12493,8 @@ in { }; }; + pyte = callPackage ../development/python-modules/pyte { }; + graphviz = buildPythonPackage rec { name = "graphviz-${version}"; version = "0.5.2"; From 11bba268fe886968617c20c2c394139e7c92b807 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 29 Oct 2017 11:21:18 +0100 Subject: [PATCH 1896/2806] curtsies: init at 0.2.11 --- .../python-modules/curtsies/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/curtsies/default.nix diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix new file mode 100644 index 00000000000..a1e5f235235 --- /dev/null +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, pytest, wcwidth }: + +buildPythonPackage rec { + pname = "curtsies"; + version = "0.2.11"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc"; + }; + + propagatedBuildInputs = [ blessings wcwidth pyte ]; + + checkInputs = [ nose mock pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Curses-like terminal wrapper, with colored strings!"; + homepage = https://pypi.python.org/pypi/curtsies; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7887cd75754..de92d478c22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3367,6 +3367,8 @@ in { doCheck = false; }; + curtsies = callPackage ../development/python-modules/curtsies { }; + oslo-vmware = buildPythonPackage rec { name = "oslo.vmware-${version}"; version = "1.22.0"; From c463a8e0c5bbc7e18215278d290f4b977eafd473 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 29 Oct 2017 12:12:42 +0100 Subject: [PATCH 1897/2806] urwid: move into separate file, use fetchPypi instead of fetchurl --- .../python-modules/urwid/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------------ 2 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/urwid/default.nix diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix new file mode 100644 index 00000000000..129f4821e87 --- /dev/null +++ b/pkgs/development/python-modules/urwid/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage (rec { + pname = "urwid"; + version = "1.3.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng"; + }; + + meta = with stdenv.lib; { + description = "A full-featured console (xterm et al.) user interface library"; + homepage = http://excess.org/urwid; + repositories.git = git://github.com/wardi/urwid.git; + license = licenses.lgpl21; + maintainers = with maintainers; [ garbas ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de92d478c22..e4e1560f227 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21977,25 +21977,7 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber {}; - urwid = buildPythonPackage (rec { - name = "urwid-1.3.1"; - - # multiple: NameError: name 'evl' is not defined - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/urwid/${name}.tar.gz"; - sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng"; - }; - - meta = { - description = "A full-featured console (xterm et al.) user interface library"; - homepage = http://excess.org/urwid; - repositories.git = git://github.com/wardi/urwid.git; - license = licenses.lgpl21; - maintainers = with maintainers; [ garbas ]; - }; - }); + urwid = callPackage ../development/python-modules/urwid {}; urwidtrees = buildPythonPackage rec { name = "urwidtrees-${rev}"; From 978a9ba0cd649e65cb8abe720570f0e6c9dad7a2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 29 Oct 2017 11:21:40 +0100 Subject: [PATCH 1898/2806] bpython: 0.12 -> 0.17 --- .../python-modules/bpython/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/bpython/default.nix diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix new file mode 100644 index 00000000000..515494b5f93 --- /dev/null +++ b/pkgs/development/python-modules/bpython/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchurl, pygments, greenlet, curtsies, urwid, requests, mock }: + +buildPythonPackage rec { + pname = "bpython"; + version = "0.17"; + name = "${pname}-${version}"; + + # 0.17 is still missing on PyPI, https://github.com/bpython/bpython/issues/706 + src = fetchurl { + url = "https://bpython-interpreter.org/releases/${pname}-${version}.tar.gz"; + sha256 = "13fyyx06645ikvmj9zmkixr12kzk1c3a3f9s9i2rvaczjycn82lz"; + }; + + propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; + + checkInputs = [ mock ]; + + # tests fail: https://github.com/bpython/bpython/issues/712 + doCheck = false; + + meta = with stdenv.lib; { + description = "A fancy curses interface to the Python interactive interpreter"; + homepage = "https://bpython-interpreter.org/"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4e1560f227..f9bcff478e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2078,23 +2078,7 @@ in { }; }; - - bpython = buildPythonPackage rec { - name = "bpython-0.12"; - src = pkgs.fetchurl { - url = "http://www.bpython-interpreter.org/releases/bpython-0.12.tar.gz"; - sha256 = "1ilf58qq7sazmcgg4f1wswbhcn2gb8qbbrpgm6gf0j2lbm60gabl"; - }; - - propagatedBuildInputs = with self; [ pygments ]; - doCheck = false; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + bpython = callPackage ../development/python-modules/bpython {}; bsddb3 = buildPythonPackage rec { name = "bsddb3-${version}"; From dccfe68ade164c6d3242bf1ba24d5482d02fb88e Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Sun, 29 Oct 2017 12:16:03 +0100 Subject: [PATCH 1899/2806] ZODB 5.3.0: fix broken tests Re #30892 --- .../zodb/ZODB-5.3.0-fix-tests.patch | 29 +++++++++++++++++++ .../python-modules/zodb/default.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch diff --git a/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch b/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch new file mode 100644 index 00000000000..b6bcedea91a --- /dev/null +++ b/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch @@ -0,0 +1,29 @@ +Tests are kind of broken in ZODB-5.3.0. Fix setup code and disable one +especially problematic test. + +diff -u ZODB-5.3.0/setup.py ZODB-5.3.0/setup.py +--- ZODB-5.3.0/setup.py 2017-08-30 14:55:10.000000000 +0200 ++++ ZODB-5.3.0/setup.py 2017-10-29 11:34:17.277953730 +0100 +@@ -85,7 +85,10 @@ + mod = __import__( + _modname(dirpath, base, os.path.splitext(filename)[0]), + {}, {}, ['*']) +- _unittests_only(suite, mod.test_suite()) ++ try: ++ _unittests_only(suite, mod.test_suite()) ++ except AttributeError: ++ pass + elif 'tests.py' in filenames: + mod = __import__(_modname(dirpath, base, 'tests'), {}, {}, ['*']) + _unittests_only(suite, mod.test_suite()) +diff -u ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py +--- ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py 2017-08-30 14:55:10.000000000 +0200 ++++ ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py 2017-10-29 11:35:10.348240386 +0100 +@@ -1184,7 +1184,4 @@ + #unittest.makeSuite(Test_do_backup), #TODO + unittest.makeSuite(Test_do_recover), + unittest.makeSuite(Test_do_verify), +- # N.B.: this test take forever to run (~40sec on a fast laptop), +- # *and* it is non-deterministic. +- unittest.makeSuite(MonteCarloTests), + ]) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 5a318b5d040..232acaec506 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -25,6 +25,10 @@ buildPythonPackage rec { sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3"; }; + patches = [ + ./ZODB-5.3.0-fix-tests.patch + ]; + propagatedBuildInputs = [ manuel transaction From dde8ded1efa87b1284bff9301b58ebf771d025f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 12:24:45 +0100 Subject: [PATCH 1900/2806] python.pkgs.ipython_genutils: move expression --- .../ipython_genutils/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/ipython_genutils/default.nix diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix new file mode 100644 index 00000000000..503ccb37d57 --- /dev/null +++ b/pkgs/development/python-modules/ipython_genutils/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, glibcLocales +}: + +buildPythonPackage rec { + pname = "ipython_genutils"; + version = "0.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; + }; + + checkInputs = [ nose glibcLocales ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests + ''; + + meta = { + description = "Vestigial utilities from IPython"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3e0d78cb80..8caf6aaaff9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10503,30 +10503,7 @@ in { ipython_6 = callPackage ../development/python-modules/ipython { }; - ipython_genutils = buildPythonPackage rec { - version = "0.2.0"; - name = "ipython_genutils-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipython_genutils/${name}.tar.gz"; - sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = with self; [ nose pkgs.glibcLocales ]; - - checkPhase = '' - nosetests -v ipython_genutils/tests - ''; - - meta = { - description = "Vestigial utilities from IPython"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; - + ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; ipywidgets = callPackage ../development/python-modules/ipywidgets { }; From 6e5276f0abd34fde52e6750cb041a7fc8fac9365 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 12:27:47 +0100 Subject: [PATCH 1901/2806] python.pkgs.multipledispatch: move expression --- .../multipledispatch/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/multipledispatch/default.nix diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix new file mode 100644 index 00000000000..d1c39210607 --- /dev/null +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "multipledispatch"; + version = "0.4.9"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; + }; + + # No tests in archive + doCheck = false; + + meta = { + homepage = http://github.com/mrocklin/multipledispatch/; + description = "A relatively sane approach to multiple dispatch in Python"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8caf6aaaff9..b1fb4958eea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12163,25 +12163,7 @@ in { propagatedBuildInputs = with self; [ eventlib application gnutls ]; }; - multipledispatch = buildPythonPackage rec { - name = "multipledispatch-${version}"; - version = "0.4.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/multipledispatch/${name}.tar.gz"; - sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; - }; - - # No tests in archive - doCheck = false; - - meta = { - homepage = http://github.com/mrocklin/multipledispatch/; - description = "A relatively sane approach to multiple dispatch in Python"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + multipledispatch = callPackage ../development/python-modules/multipledispatch { }; multiprocess = buildPythonPackage rec { name = "multiprocess-${version}"; From 59d1dc6c58d56af53f388e3b5542603a0889ebd4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 12:31:48 +0100 Subject: [PATCH 1902/2806] python.pkgs.toolz: move expression --- .../python-modules/toolz/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +-------------- 2 files changed, 32 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/toolz/default.nix diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix new file mode 100644 index 00000000000..36b85bce3ac --- /dev/null +++ b/pkgs/development/python-modules/toolz/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec{ + pname = "toolz"; + version = "0.8.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + # https://github.com/pytoolz/toolz/issues/357 + rm toolz/tests/test_serialization.py + nosetests toolz/tests + ''; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1fb4958eea..7245b37c51b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21303,30 +21303,7 @@ in { }; }; - toolz = buildPythonPackage rec{ - name = "toolz-${version}"; - version = "0.8.2"; - - src = pkgs.fetchurl{ - url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; - }; - - buildInputs = with self; [ nose ]; - - checkPhase = '' - # https://github.com/pytoolz/toolz/issues/357 - rm toolz/tests/test_serialization.py - nosetests toolz/tests - ''; - - meta = { - homepage = "http://github.com/pytoolz/toolz/"; - description = "List processing tools and functional utilities"; - license = "licenses.bsd3"; - maintainers = with maintainers; [ fridh ]; - }; - }; + toolz = callPackage ../development/python-modules/toolz { }; tox = buildPythonPackage rec { name = "tox-${version}"; From b4b62e6e65f42e1d5999eb12b4da04817c92b0cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 12:43:45 +0100 Subject: [PATCH 1903/2806] python.pkgs.cytoolz: move expression --- .../python-modules/cytoolz/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +------------- 2 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/cytoolz/default.nix diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix new file mode 100644 index 00000000000..dcb4e9474c3 --- /dev/null +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, nose +, toolz +, python +}: + +buildPythonPackage rec { + pname = "cytoolz"; + version = "0.8.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; + }; + + # Extension types + disabled = isPyPy; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ toolz ]; + + # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 + checkPhase = '' + NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} + ''; + + meta = { + homepage = "http://github.com/pytoolz/cytoolz/"; + description = "Cython implementation of Toolz: High performance functional utilities"; + license = "licenses.bsd3"; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7245b37c51b..868f156ce82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3243,33 +3243,7 @@ in { cython = callPackage ../development/python-modules/Cython { }; - cytoolz = buildPythonPackage rec { - name = "cytoolz-${version}"; - version = "0.8.2"; - - src = pkgs.fetchurl{ - url = "mirror://pypi/c/cytoolz/cytoolz-${version}.tar.gz"; - sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; - }; - - # Extension types - disabled = isPyPy; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ toolz ]; - - # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 - checkPhase = '' - NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} - ''; - - meta = { - homepage = "http://github.com/pytoolz/cytoolz/"; - description = "Cython implementation of Toolz: High performance functional utilities"; - license = "licenses.bsd3"; - maintainers = with maintainers; [ fridh ]; - }; - }; + cytoolz = callPackage ../development/python-modules/cytoolz { }; cryptacular = buildPythonPackage rec { name = "cryptacular-1.4.1"; From 51ade421c4b9a703b8f66fd79fac9ef33e7241f6 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sun, 29 Oct 2017 12:43:47 +0100 Subject: [PATCH 1904/2806] sqlite: 3.20.1 -> 3.21.0 --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 4a10f912883..0625183fb7d 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.20.1"; + name = "sqlite-3.21.0"; src = fetchurl { - url = "http://sqlite.org/2017/sqlite-autoconf-3200100.tar.gz"; - sha256 = "0hh7jnxfwvs2qlvmjwrgkvxb8sk4x8hj04m54fq9h1xw55dmjrpc"; + url = "http://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz"; + sha256 = "1qxvzdjwzw6k0kqjfabj86rnq87xdbwbca7laxxdhnh0fmkm3pfp"; }; outputs = [ "bin" "dev" "out" ]; From 119a58abbe274750dd1ed088626a09e8aaf426a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 12:48:07 +0100 Subject: [PATCH 1905/2806] python.pkgs.datashape: move expression --- .../python-modules/datashape/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------ 2 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/datashape/default.nix diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix new file mode 100644 index 00000000000..81ead843169 --- /dev/null +++ b/pkgs/development/python-modules/datashape/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, mock +, numpy +, multipledispatch +, dateutil +}: + +buildPythonPackage rec { + pname = "datashape"; + version = "0.5.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783"; + }; + + checkInputs = [ pytest mock ]; + propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + + checkPhase = '' + py.test datashape/tests + ''; + + meta = { + homepage = https://github.com/ContinuumIO/datashape; + description = "A data description language"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 868f156ce82..89cb098e9a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4523,29 +4523,7 @@ in { }; }; - datashape = buildPythonPackage rec { - name = "datashape-${version}"; - version = "0.5.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/D/DataShape/${name}.tar.gz"; - sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783"; - }; - - buildInputs = with self; [ pytest mock ]; - propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; - - checkPhase = '' - py.test datashape/tests - ''; - - meta = { - homepage = https://github.com/ContinuumIO/datashape; - description = "A data description language"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; - }; + datashape = callPackage ../development/python-modules/datashape { }; requests-cache = buildPythonPackage (rec { name = "requests-cache-${version}"; From d4bf9684b78141f7310e22dafabbfdbb6fae4f81 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:20:02 +0100 Subject: [PATCH 1906/2806] python.pkgs.odo: move expression --- .../python-modules/odo/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------ 2 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/odo/default.nix diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix new file mode 100644 index 00000000000..73b3f0be150 --- /dev/null +++ b/pkgs/development/python-modules/odo/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, datashape +, numpy +, pandas +, toolz +, multipledispatch +, networkx +}: + +buildPythonPackage rec { + pname = "odo"; + version= "0.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ datashape numpy pandas toolz multipledispatch networkx ]; + + checkPhase = '' + py.test odo/tests + ''; + + meta = { + homepage = https://github.com/ContinuumIO/odo; + description = "Data migration utilities"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89cb098e9a5..39234f5b969 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13453,29 +13453,7 @@ in { }; }; - odo = buildPythonPackage rec { - name = "odo-${version}"; - version= "0.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/odo/${name}.tar.gz"; - sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ datashape numpy pandas toolz multipledispatch networkx ]; - - checkPhase = '' - py.test odo/tests - ''; - - meta = { - homepage = https://github.com/ContinuumIO/odo; - description = "Data migration utilities"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ fridh ]; - }; - }; + odo = callPackage ../development/python-modules/odo { }; offtrac = buildPythonPackage rec { name = "offtrac-0.1.0"; From 16d0a334c86cb580afcca2b13c0c7714c5158bbd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:23:55 +0100 Subject: [PATCH 1907/2806] python.pkgs.pysoundfile: move expression --- .../python-modules/pysoundfile/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------ 2 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/pysoundfile/default.nix diff --git a/pkgs/development/python-modules/pysoundfile/default.nix b/pkgs/development/python-modules/pysoundfile/default.nix new file mode 100644 index 00000000000..fe24f0203f0 --- /dev/null +++ b/pkgs/development/python-modules/pysoundfile/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, numpy +, libsndfile +, cffi +, isPyPy +, stdenv +}: + +buildPythonPackage rec { + pname = "PySoundFile"; + name = "PySoundFile-${version}"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy libsndfile cffi ]; + + meta = { + description = "An audio library based on libsndfile, CFFI and NumPy"; + license = lib.licenses.bsd3; + homepage = https://github.com/bastibe/PySoundFile; + maintainers = with lib.maintainers; [ fridh ]; + }; + + prePatch = '' + substituteInPlace soundfile.py --replace "'sndfile'" "'${libsndfile.out}/lib/libsndfile.so'" + ''; + + # https://github.com/bastibe/PySoundFile/issues/157 + disabled = isPyPy || stdenv.isi686; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39234f5b969..124dc0c3885 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15491,32 +15491,7 @@ in { }; }; - pysoundfile = buildPythonPackage rec { - name = "pysoundfile-${version}"; - version = "0.8.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PySoundFile/PySoundFile-${version}.tar.gz"; - sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ numpy pkgs.libsndfile cffi ]; - - meta = { - description = "An audio library based on libsndfile, CFFI and NumPy"; - license = licenses.bsd3; - homepage = https://github.com/bastibe/PySoundFile; - maintainers = with maintainers; [ fridh ]; - }; - - prePatch = '' - substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile.out}/lib/libsndfile.so'" - ''; - - # https://github.com/bastibe/PySoundFile/issues/157 - disabled = isPyPy || stdenv.isi686; - }; + pysoundfile = callPackage ../development/python-modules/pysoundfile { }; python3pika = buildPythonPackage { name = "python3-pika-0.9.14"; From 7c4c7cde6ef692bce10f1bc11e3ce75efe1076c0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:30:54 +0100 Subject: [PATCH 1908/2806] python.pkgs.seaborn: move expression --- .../python-modules/seaborn/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------- 2 files changed, 35 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/seaborn/default.nix diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix new file mode 100644 index 00000000000..1647e6cfc14 --- /dev/null +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pandas +, matplotlib +}: + +buildPythonPackage rec { + pname = "seaborn"; + version = "0.7.1"; + name = "${pname}-${version}"; + src = fetchPypi { + inherit pname version; + sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ pandas matplotlib ]; + + checkPhase = '' + nosetests -v + ''; + + # Computationally very demanding tests + doCheck = false; + + meta = { + description = "Statisitical data visualization"; + homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 124dc0c3885..0be000b4a8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19133,30 +19133,7 @@ in { }; }; - seaborn = buildPythonPackage rec { - name = "seaborn-0.7.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/seaborn/${name}.tar.gz"; - sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ pandas matplotlib ]; - - checkPhase = '' - nosetests -v - ''; - - # Computationally very demanding tests - doCheck = false; - - meta = { - description = "Statisitical data visualization"; - homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; - license = "BSD"; - maintainers = with maintainers; [ fridh ]; - }; - }; + seaborn = callPackage ../development/python-modules/seaborn { }; selenium = buildPythonPackage rec { name = "selenium-2.52.0"; From bd941043b8656001e927861648639d2caebcd44b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:31:17 +0100 Subject: [PATCH 1909/2806] python.pkgs.traitlets: move expression --- .../python-modules/traitlets/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------- 2 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/traitlets/default.nix diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix new file mode 100644 index 00000000000..c34bb09b794 --- /dev/null +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +, pytest +, mock +, ipython_genutils +, decorator +, enum34 +}: + +buildPythonPackage rec { + pname = "traitlets"; + version = "4.3.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835"; + }; + + checkInputs = [ glibcLocales pytest mock ]; + propagatedBuildInputs = [ ipython_genutils decorator enum34 ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test $out + ''; + + meta = { + description = "Traitlets Python config system"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0be000b4a8d..de491248c45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21026,32 +21026,7 @@ in { testtools = callPackage ../development/python-modules/testtools { }; - traitlets = buildPythonPackage rec { - pname = "traitlets"; - version = "4.3.2"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835"; - }; - - LC_ALL = "en_US.UTF-8"; - - buildInputs = with self; [ pkgs.glibcLocales pytest mock ]; - propagatedBuildInputs = with self; [ipython_genutils decorator enum34]; - - checkPhase = '' - py.test $out - ''; - - meta = { - description = "Traitlets Python config system"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + traitlets = callPackage ../development/python-modules/traitlets { }; python_mimeparse = buildPythonPackage rec { name = "python-mimeparse-${version}"; From b35a257dfd0118d9e018c14cea074c4a04da6497 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:33:54 +0100 Subject: [PATCH 1910/2806] python.pkgs.zipfile36: move expression --- .../python-modules/zipfile36/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +-------------- 2 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/zipfile36/default.nix diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix new file mode 100644 index 00000000000..0915eb002b7 --- /dev/null +++ b/pkgs/development/python-modules/zipfile36/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, isPy3k +, pythonOlder +}: + +buildPythonPackage rec { + pname = "zipfile36"; + version = "0.1.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest test_zipfile.py + ''; + + # Only works with Python 3.x. + # Not supposed to be used with 3.6 and up. + disabled = !(isPy3k && (pythonOlder "3.6")); + + meta = { + description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; + homepage = https://gitlab.com/takluyver/zipfile36; + license = lib.licenses.psfl; + maintainer = lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de491248c45..6ac34955c2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26190,31 +26190,7 @@ EOF zeroconf = callPackage ../development/python-modules/zeroconf { }; - zipfile36 = buildPythonPackage rec { - pname = "zipfile36"; - version = "0.1.3"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest test_zipfile.py - ''; - - # Only works with Python 3.x. - # Not supposed to be used with 3.6 and up. - disabled = !(isPy3k && (pythonOlder "3.6")); - - meta = { - description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; - homepage = https://gitlab.com/takluyver/zipfile36; - license = licenses.psfl; - maintainer = maintainers.fridh; - }; - }; + zipfile36 = callPackage ../development/python-modules/zipfile36 { }; todoist = callPackage ../development/python-modules/todoist { }; From 4ad0e0da320d1281d1a7e2c98ecc139d08396471 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:38:37 +0100 Subject: [PATCH 1911/2806] python.pkgs.nose-exclude: move expression --- .../python-modules/nose-exclude/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/nose-exclude/default.nix diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix new file mode 100644 index 00000000000..d9ec2f85fa2 --- /dev/null +++ b/pkgs/development/python-modules/nose-exclude/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + pname = "nose-exclude"; + version = "0.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = { + license = lib.licenses.lgpl21; + description = "Exclude specific directories from nosetests runs"; + homepage = https://github.com/kgrandis/nose-exclude; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ac34955c2f..9d27d091e93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12862,25 +12862,7 @@ in { }; }; - nose-exclude = buildPythonPackage rec { - name = "nose-exclude-${version}"; - version = "0.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nose-exclude/${name}.tar.gz"; - sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; - }; - - propagatedBuildInputs = with self; [ nose ]; - - meta = { - license = licenses.lgpl21; - description = "Exclude specific directories from nosetests runs"; - homepage = https://github.com/kgrandis/nose-exclude; - maintainers = with maintainers; [ fridh ]; - }; - - }; + nose-exclude = callPackage ../development/python-modules/nose-exclude { }; nose-selecttests = buildPythonPackage rec { version = "0.4"; From 5c2d2cbff321387bbada44ba86f7d422f53b88b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:41:46 +0100 Subject: [PATCH 1912/2806] python.pkgs.numtraits: move expression --- .../python-modules/numtraits/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------- 2 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/numtraits/default.nix diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix new file mode 100644 index 00000000000..858b5ae594a --- /dev/null +++ b/pkgs/development/python-modules/numtraits/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, six +, numpy +, traitlets +}: + +buildPythonPackage rec { + pname = "numtraits"; + version = "0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ six numpy traitlets]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Numerical traits for Python objects"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fridh ]; + homepage = https://github.com/astrofrog/numtraits; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d27d091e93..a80df277045 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13168,30 +13168,7 @@ in { numpy-stl = callPackage ../development/python-modules/numpy-stl { }; - numtraits = buildPythonPackage rec { - pname = "numtraits"; - version = "0.2"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ six numpy traitlets]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Numerical traits for Python objects"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - homepage = https://github.com/astrofrog/numtraits; - }; - }; + numtraits = callPackage ../development/python-modules/numtraits { }; nwdiag = buildPythonPackage rec { name = "nwdiag-1.0.3"; From 416a975f74b965425831e829047f45f7e1502a11 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:44:43 +0100 Subject: [PATCH 1913/2806] python.pkgs.tabulate: move expression --- .../python-modules/tabulate/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +--------------- 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/tabulate/default.nix diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix new file mode 100644 index 00000000000..9ddc2a0e08b --- /dev/null +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + version = "0.7.7"; + pname = "tabulate"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; + }; + + checkInputs = [ nose ]; + + # Tests: cannot import common (relative import). + doCheck = false; + + meta = { + description = "Pretty-print tabular data"; + homepage = https://bitbucket.org/astanin/python-tabulate; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a80df277045..3377c8c4fbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20714,29 +20714,7 @@ in { inherit (pkgs) pkgconfig systemd; }; - tabulate = buildPythonPackage rec { - version = "0.7.7"; - pname = "tabulate"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; - }; - - buildInputs = with self; [ nose ]; - - # Tests: cannot import common (relative import). - doCheck = false; - - meta = { - description = "Pretty-print tabular data"; - homepage = https://bitbucket.org/astanin/python-tabulate; - license = licenses.mit; - maintainers = with maintainers; [ fridh ]; - }; - - }; + tabulate = callPackage ../development/python-modules/tabulate { }; targetcli_fb = buildPythonPackage rec { version = "2.1.fb33"; From a3b1f775332a1fd91b58bd5149409f3da7142dd2 Mon Sep 17 00:00:00 2001 From: Evan Wallace Date: Sun, 29 Oct 2017 12:54:26 +0000 Subject: [PATCH 1914/2806] lua5_3: 5.3.0 -> 5.3.4 Updated to latest upstream version --- pkgs/development/interpreters/lua-5/5.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index c1d313a3656..a512a251313 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "lua-${version}"; luaversion = "5.3"; - version = "${luaversion}.0"; + version = "${luaversion}.4"; src = fetchurl { - url = "http://www.lua.org/ftp/${name}.tar.gz"; - sha256 = "00fv1p6dv4701pyjrlvkrr6ykzxqy9hy1qxzj6qmwlb0ssr5wjmf"; + url = "https://www.lua.org/ftp/${name}.tar.gz"; + sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; }; nativeBuildInputs = [ readline ]; From 67bee16731a5d26fa7d1edf3b922a554b30bbea1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:54:56 +0100 Subject: [PATCH 1915/2806] python.pkgs.recommonmark: move expression --- .../python-modules/recommonmark/default.nix | 32 ++++++++++++++ pkgs/top-level/python-packages.nix | 43 +------------------ 2 files changed, 34 insertions(+), 41 deletions(-) create mode 100644 pkgs/development/python-modules/recommonmark/default.nix diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix new file mode 100644 index 00000000000..e03bd353627 --- /dev/null +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, sphinx +, CommonMark_54 +, docutils +}: + +buildPythonPackage rec { + pname = "recommonmark"; + name = "${pname}-${version}"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d"; + }; + + checkInputs = [ pytest sphinx ]; + propagatedBuildInputs = [ CommonMark_54 docutils ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "A docutils-compatibility bridge to CommonMark"; + homepage = https://github.com/rtfd/recommonmark; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3377c8c4fbb..a6c3e163f83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18049,27 +18049,7 @@ in { # use requests, not requests_2 requests = callPackage ../development/python-modules/requests { }; - requests_download = buildPythonPackage rec { - pname = "requests_download"; - version = "0.1.1"; - name = "${pname}-${version}"; - - format = "wheel"; - - src = pkgs.fetchurl { - url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; - sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; - }; - - propagatedBuildInputs = with self; [ requests ]; - - meta = { - description = "Download files using requests and save them to a target path"; - homepage = https://www.github.com/takluyver/requests_download; - license = licenses.mit; - maintainer = maintainers.fridh; - }; - }; + requests_download = callPackage ../development/python-modules/requests_download { }; requestsexceptions = callPackage ../development/python-modules/requestsexceptions {}; @@ -18194,26 +18174,7 @@ in { rcssmin = callPackage ../development/python-modules/rcssmin { }; - recommonmark = buildPythonPackage rec { - name = "recommonmark-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/recommonmark/${name}.tar.gz"; - sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d"; - }; - - buildInputs = with self; [ pytest sphinx ]; - propagatedBuildInputs = with self; [ CommonMark_54 docutils ]; - - meta = { - description = "A docutils-compatibility bridge to CommonMark"; - homepage = https://github.com/rtfd/recommonmark; - license = licenses.mit; - maintainers = with maintainers; [ fridh ]; - }; - - }; + recommonmark = callPackage ../development/python-modules/recommonmark { }; redis = callPackage ../development/python-modules/redis { }; From 8a77a30bc18761de935bcb58fe1074a048741725 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sun, 29 Oct 2017 00:20:52 +0200 Subject: [PATCH 1916/2806] install documentation: document boot.loader.grub.useOSProber --- nixos/doc/manual/installation/installing.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 94d8e9d2e1a..b0674307a56 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -140,6 +140,11 @@ the GRUB boot loader is to be installed. Without it, NixOS cannot boot. + If there are other operating systems running on the machine before + installing NixOS, the + option can be set to + true to automatically add them to the grub menu. + Another critical option is , specifying the file systems that need to be mounted by NixOS. However, you typically don’t need to set it yourself, because From 1450f6cdb3010c407c6ca0e3aa9dae64edae842a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 15:13:57 +0100 Subject: [PATCH 1917/2806] python.pkgs.requests_download: add missing file, fixes eval --- .../requests_download/default.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/requests_download/default.nix diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix new file mode 100644 index 00000000000..4e2646eb6ab --- /dev/null +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "requests_download"; + version = "0.1.1"; + name = "${pname}-${version}"; + + format = "wheel"; + + #src = pkgs.fetchurl { + # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; + # sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + #}; + + src = fetchPypi { + inherit pname version format; + sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = { + description = "Download files using requests and save them to a target path"; + homepage = https://www.github.com/takluyver/requests_download; + license = lib.licenses.mit; + maintainer = lib.maintainers.fridh; + }; +} \ No newline at end of file From afc66e121d124a2229b56aa37102034136c70f7e Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Sun, 29 Oct 2017 12:27:58 +0100 Subject: [PATCH 1918/2806] vulnix: 1.2.2 -> 1.3.4 The build needs the ZODB fix in PR #30925 to succeed. --- lib/maintainers.nix | 1 + pkgs/tools/security/vulnix/default.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 29b7b589fef..7c3a845c00c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -116,6 +116,7 @@ christopherpoole = "Christopher Mark Poole "; ciil = "Simon Lackerbauer "; ckampka = "Christian Kampka "; + ckauhaus = "Christian Kauhaus "; cko = "Christine Koppelt "; cleverca22 = "Michael Bishop "; cmcdragonkai = "Roger Qiu "; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 1beb2268fc6..c86891d8ccd 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -3,19 +3,15 @@ pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "vulnix"; - version = "1.2.2"; + version = "1.3.4"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1ia9plziwach0bxnlcd33q30kcsf8sv0nf2jc78gsmrqnxjabr12"; + sha256 = "1js1i86pgkkqc9yzp1rck7rmaz79klv4048r9z7v56fam0a6sg05"; }; buildInputs = with pythonPackages; [ flake8 pytest pytestcov ]; - postPatch = '' - sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py - ''; - propagatedBuildInputs = [ nix ] ++ (with pythonPackages; [ @@ -27,12 +23,16 @@ pythonPackages.buildPythonApplication rec { zodb ]); + postPatch = '' + sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py + ''; + checkPhase = "py.test"; meta = with stdenv.lib; { description = "NixOS vulnerability scanner"; homepage = https://github.com/flyingcircusio/vulnix; license = licenses.bsd2; - maintainers = with maintainers; [ plumps ]; + maintainers = with maintainers; [ ckauhaus plumps ]; }; } From 3afcba3e0a92522e42d3243df9235c30de4889e6 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sun, 29 Oct 2017 17:19:18 +0100 Subject: [PATCH 1919/2806] mupdf: correct license meta information The website of MuPDF says that MuPDF is licensed under the terms of the GNU Affero General Public License. However, I didn't see which version of that license they mean. A clear statement that MuPDF is licensed under the terms of AGPL >= 3 is included in the README file of their Git repository: git://git.ghostscript.com/mupdf.git --- pkgs/applications/misc/mupdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a111e76df0c..b50d99466f8 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { homepage = http://mupdf.com; repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; - license = licenses.gpl3Plus; + license = licenses.agpl3Plus; maintainers = with maintainers; [ viric vrthra fpletz ]; platforms = platforms.linux; }; From defebc885019e0219f93ded13d7dc9528fbe77e6 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Sun, 29 Oct 2017 14:10:13 -0400 Subject: [PATCH 1920/2806] corebird: 1.6 -> 1.7.1 Update corebird to the latest release. --- pkgs/applications/networking/corebird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 412335094ff..54fc72fbfae 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -3,14 +3,14 @@ , glib_networking }: stdenv.mkDerivation rec { - version = "1.6"; + version = "1.7.1"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "1bxjlamdy5d2j3xdahmxf6lwc7f6xdfxbzi712ppvh1dwggw654v"; + sha256 = "1g6wkzrl6j0mmgafpv0jpqa906s1x7p5hmiqdgs9qwm7q2wlwrqd"; }; preConfigure = '' From 9e37df185c75a2ba7724ae4ce5ce3c356c1ce225 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Oct 2017 14:42:55 -0400 Subject: [PATCH 1921/2806] fwupd: Remove manual rpath settings now that meson is fixed. Thanks @yegortimoshenko! --- .../tools/build-managers/meson/default.nix | 2 +- .../linux/firmware/fwupd/default.nix | 31 ++----------------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 1c2e726cdc5..8e4c5d4801a 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py ''; - setupHook = ./setup-hook.sh; + setupHook = ./setup-hook.sh; meta = with lib; { homepage = http://mesonbuild.com; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 455defa5823..09ca05484f7 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,30 +1,10 @@ { stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive , libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar -, fwupdate, libgpgerror, libyaml, valgrind, meson, libuuid, pygobject3 -, pillow, ninja, gcab, makeWrapper, glib, gdk_pixbuf +, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3 +, pillow, ninja, gcab }: let version = "0.9.6"; - rpath = stdenv.lib.makeLibraryPath - [ libuuid.out - appstream-glib - glib - libsoup - gdk_pixbuf - libarchive.lib - gcab - sqlite.out - gusb - polkit.out - gpgme - libgpgerror - libelf - efivar - libsmbios - fwupdate - libgudev - "$out" - ]; in stdenv.mkDerivation { name = "fwupd-${version}"; @@ -36,18 +16,13 @@ in [ gtk_doc pkgconfig gobjectIntrospection intltool libgudev polkit appstream-glib gusb sqlite libarchive libsoup docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind - meson gpgme libuuid pygobject3 pillow ninja gcab makeWrapper + meson gpgme libuuid pygobject3 pillow ninja gcab ]; patches = [ ./fix-missing-deps.patch ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${efivar}/include/efivar" ''; mesonFlags = [ "-Denable-colorhug=false" "-Denable-man=false" "-Denable-tests=false" "--localstatedir=/var" "-Denable-doc=false" "-Dwith-bootdir=/boot" ]; - postFixup = '' - for prog in $out/bin/* $out/libexec/fwupd/*; do - wrapProgram "$prog" --prefix LD_LIBRARY_PATH : ${rpath} - done - ''; enableParallelBuilding = true; meta = { license = [ stdenv.lib.licenses.gpl2 ]; From a626aa17b00cd62e31a704daf6acc989629fe74e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 29 Oct 2017 15:42:21 -0400 Subject: [PATCH 1922/2806] lame: 3.99.5 -> 3.100 --- pkgs/development/libraries/lame/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index b324494faff..cc077a78a65 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -23,15 +23,13 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lame-${version}"; - version = "3.99.5"; + version = "3.100"; src = fetchurl { url = "mirror://sourceforge/lame/${name}.tar.gz"; - sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14"; + sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx"; }; - patches = [ ./gcc-4.9.patch ]; - outputs = [ "out" "lib" "doc" ]; # a small single header outputMan = "out"; From e270f158ac2319dddc9a44ae2512c4aba1855a60 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 29 Oct 2017 15:54:18 -0400 Subject: [PATCH 1923/2806] lightdm: 1.22.0 -> 1.24.0 --- pkgs/applications/display-managers/lightdm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 452cb38f126..e82d4c69def 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -7,15 +7,15 @@ with stdenv.lib; let - ver_branch = "1.22"; - version = "1.22.0"; + ver_branch = "1.24"; + version = "1.24.0"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4"; + sha256 = "18j33bm54i8k7ncxcs69zqi4105s62n58jrydqn3ikrb71s9nl6d"; }; nativeBuildInputs = [ pkgconfig intltool ]; From cbe326feb88c380dbee2a9b500fd32a307f71cf6 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Sun, 29 Oct 2017 21:32:40 +0100 Subject: [PATCH 1924/2806] rustup: Patch rustup to patchelf binaries --- .../0001-dynamically-patchelf-binaries.patch | 54 +++++++++++++ .../0001-use-hardcoded-dynamic-linker.patch | 75 ------------------- .../development/tools/rust/rustup/default.nix | 8 +- 3 files changed, 59 insertions(+), 78 deletions(-) create mode 100644 pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch delete mode 100644 pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch new file mode 100644 index 00000000000..4d77cf45d41 --- /dev/null +++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -0,0 +1,54 @@ +From c21cc756b69a5f33c8a7758b746a816f40f55932 Mon Sep 17 00:00:00 2001 +From: Leon Isenberg +Date: Sat, 28 Oct 2017 17:58:17 +0200 +Subject: [PATCH] nix customization: patchelf installed binaries + +--- + src/rustup-dist/src/component/package.rs | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs +index 8aa63db9..4d219826 100644 +--- a/src/rustup-dist/src/component/package.rs ++++ b/src/rustup-dist/src/component/package.rs +@@ -99,7 +99,13 @@ impl Package for DirectoryPackage { + let src_path = root.join(&path); + + match &*part.0 { +- "file" => try!(builder.copy_file(path.clone(), &src_path)), ++ "file" => { ++ try!(builder.copy_file(path.clone(), &src_path)); ++ nix_patchelf_if_needed( ++ &target.prefix().path().join(path.clone()), ++ &src_path, ++ ) ++ } + "dir" => try!(builder.copy_dir(path.clone(), &src_path)), + _ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()), + } +@@ -117,6 +123,22 @@ impl Package for DirectoryPackage { + } + } + ++fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { ++ let is_bin = if let Some(p) = src_path.parent() { ++ p.ends_with("bin") ++ } else { ++ false ++ }; ++ ++ if is_bin { ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-interpreter") ++ .arg("@dynamicLinker@") ++ .arg(dest_path) ++ .output(); ++ } ++} ++ + // On Unix we need to set up the file permissions correctly so + // binaries are executable and directories readable. This shouldn't be + // necessary: the source files *should* have the right permissions, +-- +2.14.1 + diff --git a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch b/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch deleted file mode 100644 index 3b429c1745e..00000000000 --- a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 36c053f37670c6003f9e8dc001741f7c49e9526a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Sat, 15 Apr 2017 20:42:10 +0200 -Subject: [PATCH] use hardcoded dynamic-linker -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - src/rustup-cli/common.rs | 3 ++- - src/rustup/toolchain.rs | 22 ++++++++++++++++++++-- - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs -index 1abf345..21096e7 100644 ---- a/src/rustup-cli/common.rs -+++ b/src/rustup-cli/common.rs -@@ -220,7 +220,8 @@ pub fn rustc_version(toolchain: &Toolchain) -> String { - if toolchain.exists() { - let rustc_path = toolchain.binary_file("rustc"); - if utils::is_file(&rustc_path) { -- let mut cmd = Command::new(&rustc_path); -+ let mut cmd = Command::new("@dynamicLinker@"); -+ cmd.arg(&rustc_path); - cmd.arg("--version"); - toolchain.set_ldpath(&mut cmd); - -diff --git a/src/rustup/toolchain.rs b/src/rustup/toolchain.rs -index dc29c32..212a4ab 100644 ---- a/src/rustup/toolchain.rs -+++ b/src/rustup/toolchain.rs -@@ -315,7 +315,7 @@ impl<'a> Toolchain<'a> { - } - Path::new(&binary) - }; -- let mut cmd = Command::new(&path); -+ let mut cmd = wrap_elf_interpreter(&path); - self.set_env(&mut cmd); - Ok(cmd) - } -@@ -363,7 +363,7 @@ impl<'a> Toolchain<'a> { - } else { - src_file - }; -- let mut cmd = Command::new(exe_path); -+ let mut cmd = wrap_elf_interpreter(exe_path); - self.set_env(&mut cmd); - cmd.env("RUSTUP_TOOLCHAIN", &primary_toolchain.name); - Ok(cmd) -@@ -648,3 +648,21 @@ impl<'a> Toolchain<'a> { - path - } - } -+ -+fn wrap_elf_interpreter>(p: S) -> Command { -+ use std::fs::File; -+ use std::io::Read; -+ let path = Path::new(&p); -+ let is_elf = File::open(path).map(|mut f| { -+ let mut buf = [0; 4]; -+ let _ = f.read(&mut buf); -+ buf == b"\x7fELF"[..] -+ }).unwrap_or(false); -+ if is_elf { -+ let mut cmd = Command::new("@dynamicLinker@"); -+ cmd.arg(&path); -+ cmd -+ } else { -+ Command::new(&path) -+ } -+} --- -2.12.2 - diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 65599ad8d18..3106048e674 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommand +{ stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform , pkgconfig, curl, Security }: @@ -24,9 +24,11 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features no-self-update" ]; patches = lib.optionals stdenv.isLinux [ - (runCommand "0001-use-hardcoded-dynamic-linker.patch" { CC=stdenv.cc; } '' + (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; } '' export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) - substituteAll ${./0001-use-hardcoded-dynamic-linker.patch} $out + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker '') ]; From 9e5ba4eb8b5253c24b56a42fa7606d8c3c7e0678 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Sun, 29 Oct 2017 21:34:15 +0100 Subject: [PATCH 1925/2806] rustup: 1.3.0 -> 2017-10-29 --- pkgs/development/tools/rust/rustup/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 3106048e674..b7065cc5d7d 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,15 +4,15 @@ rustPlatform.buildRustPackage rec { name = "rustup-${version}"; - version = "1.3.0"; + version = "2017-10-29"; - cargoSha256 = "1yd7k0jpx78p5bp6iyzgbyj7pjz8vyjg9g7fmf1bl60jsbdpgv3g"; + cargoSha256 = "1xwxv8y9xjgdmm92ldrn9m9fml2zb5h7qqm7dhw63j6psb3ajqrw"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustup.rs"; - rev = version; - sha256 = "199jlqqidzak7nxmv2nzjzv7zfzy9z7hw6h8d8wf1rbfdwd9l6hs"; + rev = "13c8092507bf646f3ef6a621fe2c5a68212e800f"; + sha256 = "1qd01rjk9qpfzgqs35f5nxrcf00kmf76zwmgj3yzdig9zymjwndg"; }; nativeBuildInputs = [ pkgconfig ]; From 36ff83402aa8d5a06d06140d1a6216e9f5bb6382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:13:52 +0100 Subject: [PATCH 1926/2806] pythonPackages.autopep8: move to python-modules/ --- .../python-modules/autopep8/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +----------------- 2 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/autopep8/default.nix diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix new file mode 100644 index 00000000000..6dc091624c5 --- /dev/null +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, buildPythonPackage, pep8 }: + +buildPythonPackage rec { + name = "autopep8-1.0.4"; + + src = fetchurl { + url = "mirror://pypi/a/autopep8/${name}.tar.gz"; + sha256 = "17lydqm8y9a5qadp6iifxrb5mb0g9fr1vxn5qy1fjpyhazxaw8n1"; + }; + + propagatedBuildInputs = [ pep8 ]; + + # One test fails: + # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) + doCheck = false; + + meta = with stdenv.lib; { + description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; + homepage = https://pypi.python.org/pypi/autopep8/; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7da6d973a81..75ed9bf9cc0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -674,28 +674,7 @@ in { }; }; - autopep8 = buildPythonPackage (rec { - name = "autopep8-1.0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/autopep8/${name}.tar.gz"; - sha256 = "17lydqm8y9a5qadp6iifxrb5mb0g9fr1vxn5qy1fjpyhazxaw8n1"; - }; - - propagatedBuildInputs = with self; [ pep8 ]; - - # One test fails: - # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) - doCheck = false; - - meta = { - description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; - homepage = https://pypi.python.org/pypi/autopep8/; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ bjornfor ]; - }; - }); + autopep8 = callPackage ../development/python-modules/autopep8 { }; av = buildPythonPackage rec { name = "av-${version}"; From 4c0582d47dbed105ca9c7507a4f365a7ae0e8b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:26:15 +0100 Subject: [PATCH 1927/2806] pythonPackages.blockdiag: move to python-modules/ --- .../python-modules/blockdiag/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +---------------- 2 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/blockdiag/default.nix diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix new file mode 100644 index 00000000000..fed6f6e9219 --- /dev/null +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +, pillow, webcolors, funcparserlib +}: + +buildPythonPackage rec { + name = "blockdiag-${version}"; + version = "1.5.3"; + + src = fetchurl { + url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; + sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ pillow webcolors funcparserlib ]; + + # One test fails: + # ... + # FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams) + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75ed9bf9cc0..67ea140586d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2012,33 +2012,7 @@ in { }; }; - - blockdiag = buildPythonPackage rec { - name = "blockdiag-${version}"; - version = "1.5.3"; - - src = pkgs.fetchurl { - url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; - sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f"; - }; - - buildInputs = with self; [ pep8 nose unittest2 docutils ]; - - propagatedBuildInputs = with self; [ pillow webcolors funcparserlib ]; - - # One test fails: - # ... - # FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams) - doCheck = false; - - meta = { - description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + blockdiag = callPackage ../development/python-modules/blockdiag { }; bpython = callPackage ../development/python-modules/bpython {}; From 0bc9f75dc16442abab86abcbab67dfe885378f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:32:12 +0100 Subject: [PATCH 1928/2806] pythonPackages.construct: move to python-modules/ --- .../python-modules/construct/default.nix | 27 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +------------------ 2 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/construct/default.nix diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix new file mode 100644 index 00000000000..1845d7ec94f --- /dev/null +++ b/pkgs/development/python-modules/construct/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }: + +buildPythonPackage rec { + name = "construct-${version}"; + version = "2.8.10"; + + src = fetchFromGitHub { + owner = "construct"; + repo = "construct"; + rev = "v${version}"; + sha256 = "1xfmmc5pihn3ql9f7blrciy06y2bwczqvkbcpvh96dmgqwc3wys3"; + }; + + propagatedBuildInputs = [ six ]; + + # Tests fail with the following error on Python 3.5+ + # TypeError: not all arguments converted during string formatting + doCheck = pythonOlder "3.5"; + + meta = with stdenv.lib; { + description = "Powerful declarative parser (and builder) for binary data"; + homepage = http://construct.readthedocs.org/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67ea140586d..472f84c274d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3044,33 +3044,7 @@ in { confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; - - construct = buildPythonPackage rec { - name = "construct-${version}"; - version = "2.8.10"; - - src = pkgs.fetchFromGitHub { - owner = "construct"; - repo = "construct"; - rev = "v${version}"; - sha256 = "1xfmmc5pihn3ql9f7blrciy06y2bwczqvkbcpvh96dmgqwc3wys3"; - }; - - propagatedBuildInputs = with self; [ six ]; - - # Tests fail with the following error on Python 3.5+ - # TypeError: not all arguments converted during string formatting - doCheck = pythonOlder "3.5"; - - meta = { - description = "Powerful declarative parser (and builder) for binary data"; - homepage = http://construct.readthedocs.org/; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; - + construct = callPackage ../development/python-modules/construct {}; consul = buildPythonPackage (rec { name = "python-consul-0.7.0"; From 95f29282fb57060adc8f7083ad0b4e3348ddf643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:37:00 +0100 Subject: [PATCH 1929/2806] pythonPackages.pycollada: move to python-modules/ --- .../python-modules/pycollada/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +----------------- 2 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/pycollada/default.nix diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix new file mode 100644 index 00000000000..fec32b86aaf --- /dev/null +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }: + +buildPythonPackage rec { + name = "pycollada-0.4.1"; + + src = fetchurl { + url = "mirror://pypi/p/pycollada/${name}.tar.gz"; + sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv"; + }; + + buildInputs = [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]); + + # Some tests fail because they refer to test data files that don't exist + # (upstream packaging issue) + doCheck = false; + + meta = with stdenv.lib; { + description = "Python library for reading and writing collada documents"; + homepage = http://pycollada.github.io/; + license = "BSD"; # they don't specify which BSD variant + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 472f84c274d..bfaae8485a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3643,28 +3643,7 @@ in { cffi = callPackage ../development/python-modules/cffi { }; - pycollada = buildPythonPackage rec { - name = "pycollada-0.4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pycollada/${name}.tar.gz"; - sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv"; - }; - - buildInputs = with self; [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]); - - # Some tests fail because they refer to test data files that don't exist - # (upstream packaging issue) - doCheck = false; - - meta = { - description = "Python library for reading and writing collada documents"; - homepage = http://pycollada.github.io/; - license = "BSD"; # they don't specify which BSD variant - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + pycollada = callPackage ../development/python-modules/pycollada { }; pycontracts = buildPythonPackage rec { version = "1.7.9"; From 34dbc6c01cc0adb64f2e825032ba63e8670c113b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:42:50 +0100 Subject: [PATCH 1930/2806] pythonPackages.dpkt: move to python-modules/ --- .../python-modules/dpkt/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------------- 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/dpkt/default.nix diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix new file mode 100644 index 00000000000..87b5bd6b812 --- /dev/null +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: + +buildPythonPackage rec { + name = "dpkt-1.8"; + disabled = isPy3k; + + src = fetchurl { + url = "https://dpkt.googlecode.com/files/${name}.tar.gz"; + sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; + homepage = https://code.google.com/p/dpkt/; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bfaae8485a3..02b4239349c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4906,26 +4906,7 @@ in { }; }; - dpkt = buildPythonPackage rec { - name = "dpkt-1.8"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "https://dpkt.googlecode.com/files/${name}.tar.gz"; - sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; - homepage = https://code.google.com/p/dpkt/; - license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; - }; + dpkt = callPackage ../development/python-modules/dpkt {}; urllib3 = callPackage ../development/python-modules/urllib3 {}; From 9e76c950a70f0482abe10b9a34ce43edfae5031a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:51:29 +0100 Subject: [PATCH 1931/2806] pythonPackages.gevent: move to python-modules/ --- .../python-modules/gevent/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 35 +----------------- 2 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 pkgs/development/python-modules/gevent/default.nix diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix new file mode 100644 index 00000000000..8a3d3b3d09b --- /dev/null +++ b/pkgs/development/python-modules/gevent/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }: + +buildPythonPackage rec { + name = "gevent-1.1.2"; + + src = fetchurl { + url = "mirror://pypi/g/gevent/${name}.tar.gz"; + sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c"; + }; + + # Why do we have this patch? + postPatch = '' + substituteInPlace libev/ev.c --replace \ + "ecb_inline void ecb_unreachable (void) ecb_noreturn" \ + "ecb_inline ecb_noreturn void ecb_unreachable (void)" + ''; + + buildInputs = [ libev ]; + propagatedBuildInputs = stdenv.lib.optionals (!isPyPy) [ greenlet ]; + + checkPhase = '' + cd greentest + ${python.interpreter} testrunner.py + ''; + + # Bunch of failures. + doCheck = false; + + meta = with stdenv.lib; { + description = "Coroutine-based networking library"; + homepage = http://www.gevent.org/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 02b4239349c..625dfba69aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9445,40 +9445,7 @@ in { }; }; - gevent = buildPythonPackage rec { - name = "gevent-1.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/gevent/${name}.tar.gz"; - sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c"; - }; - - # Why do we have this patch? - postPatch = '' - substituteInPlace libev/ev.c --replace \ - "ecb_inline void ecb_unreachable (void) ecb_noreturn" \ - "ecb_inline ecb_noreturn void ecb_unreachable (void)" - ''; - - buildInputs = with self; [ pkgs.libev ]; - propagatedBuildInputs = with self; optionals (!isPyPy) [ greenlet ]; - - checkPhase = '' - cd greentest - ${python.interpreter} testrunner.py - ''; - - # Bunch of failures. - doCheck = false; - - meta = { - description = "Coroutine-based networking library"; - homepage = http://www.gevent.org/; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + gevent = callPackage ../development/python-modules/gevent { }; geventhttpclient = buildPythonPackage rec { name = "geventhttpclient-${version}"; From afd4a17ee5abada65616b0f3566813c08b7c4376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:22:33 +0100 Subject: [PATCH 1932/2806] pythonPackages.nwdiag: move to python-modules/ --- pkgs/top-level/python-packages.nix | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 625dfba69aa..9b14717bd00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13012,29 +13012,7 @@ in { numtraits = callPackage ../development/python-modules/numtraits { }; - nwdiag = buildPythonPackage rec { - name = "nwdiag-1.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nwdiag/${name}.tar.gz"; - sha256 = "0n7ary1fngxk8bk15vabc8fhnmxlh098piciwaviwn7l4a5q1zys"; - }; - - buildInputs = with self; [ pep8 nose unittest2 docutils ]; - - propagatedBuildInputs = with self; [ blockdiag ]; - - # tests fail - doCheck = false; - - meta = { - description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + nwdiag = callPackage ../development/python-modules/nwdiag { }; dynd = buildPythonPackage rec { version = "0.7.2"; From 6de28d760acec6f664ad5f20d508594cd62a894c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:25:44 +0100 Subject: [PATCH 1933/2806] pythonPackages.Pyro: move to python-modules/ --- .../python-modules/pyro/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------------- 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/pyro/default.nix diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix new file mode 100644 index 00000000000..dbad83bef7e --- /dev/null +++ b/pkgs/development/python-modules/pyro/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: + +buildPythonPackage rec { + name = "Pyro-3.16"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/P/Pyro/${name}.tar.gz"; + sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578"; + }; + + meta = with stdenv.lib; { + description = "Distributed object middleware for Python (IPC/RPC)"; + homepage = http://pythonhosted.org/Pyro/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b14717bd00..6359f3e16d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16818,23 +16818,7 @@ in { }; }); - Pyro = buildPythonPackage (rec { - name = "Pyro-3.16"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/Pyro/${name}.tar.gz"; - sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578"; - }; - - meta = { - description = "Distributed object middleware for Python (IPC/RPC)"; - homepage = http://pythonhosted.org/Pyro/; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; - }); + Pyro = callPackage ../development/python-modules/pyro { }; pyrsistent = buildPythonPackage (rec { name = "pyrsistent-0.11.12"; From 3ab65ef6bf0206a4d9f85ef283dcd90e9d4d2a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:28:59 +0100 Subject: [PATCH 1934/2806] pythonPackages.robomachine: move to python-modules/ --- .../python-modules/robomachine/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +----------------- 2 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/robomachine/default.nix diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix new file mode 100644 index 00000000000..1e7b020cd51 --- /dev/null +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, buildPythonPackage, pyparsing, argparse, robotframework }: + +buildPythonPackage rec { + name = "robomachine-0.6"; + + src = fetchurl { + url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; + sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54"; + }; + + propagatedBuildInputs = [ pyparsing argparse robotframework ]; + + # Remove Windows .bat files + postInstall = '' + rm "$out/bin/"*.bat + ''; + + postPatch = '' + substituteInPlace setup.py --replace "argparse" "" + ''; + + meta = with stdenv.lib; { + description = "Test data generator for Robot Framework"; + homepage = https://github.com/mkorpela/RoboMachine; + license = licenses.asl20; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6359f3e16d8..c110ce8a3a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18246,32 +18246,7 @@ in { restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; - robomachine = buildPythonPackage rec { - name = "robomachine-0.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; - sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54"; - }; - - propagatedBuildInputs = with self; [ pyparsing argparse robotframework ]; - - # Remove Windows .bat files - postInstall = '' - rm "$out/bin/"*.bat - ''; - - postPatch = '' - substituteInPlace setup.py --replace "argparse" "" - ''; - - meta = { - description = "Test data generator for Robot Framework"; - homepage = https://github.com/mkorpela/RoboMachine; - license = licenses.asl20; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + robomachine = callPackage ../development/python-modules/robomachine { }; robotframework = buildPythonPackage rec { version = "3.0.2"; From b6d345c4b0791408ae69d7e34e9f3f4bf5fe5c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:40:13 +0100 Subject: [PATCH 1935/2806] pythonPackages.robotframework: move to python-modules/ --- .../python-modules/robotframework/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------------ 2 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/robotframework/default.nix diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix new file mode 100644 index 00000000000..e0a05eb2e25 --- /dev/null +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: + +buildPythonPackage rec { + version = "3.0.2"; + name = "robotframework-${version}"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/r/robotframework/${name}.tar.gz"; + sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610"; + }; + + meta = with stdenv.lib; { + description = "Generic test automation framework"; + homepage = http://robotframework.org/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c110ce8a3a5..dc8559acd48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18248,25 +18248,7 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; - robotframework = buildPythonPackage rec { - version = "3.0.2"; - name = "robotframework-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/robotframework/${name}.tar.gz"; - sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610"; - }; - - meta = { - description = "Generic test automation framework"; - homepage = http://robotframework.org/; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; - + robotframework = callPackage ../development/python-modules/robotframework { }; robotframework-selenium2library = buildPythonPackage rec { version = "1.6.0"; From fb3973a43e5475c63463fc30fbdbf3e3cecf7c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:43:01 +0100 Subject: [PATCH 1936/2806] pythonPackages.robotframework-ride: move to python-modules/ --- .../robotframework-ride/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +----------------- 2 files changed, 33 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/robotframework-ride/default.nix diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix new file mode 100644 index 00000000000..a9b536fc76e --- /dev/null +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: + +buildPythonPackage rec { + version = "1.2.3"; + name = "robotframework-ride-${version}"; + disabled = isPy3k; + + src = fetchurl { + url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; + sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j"; + }; + + propagatedBuildInputs = [ pygments wxPython ]; + + # ride_postinstall.py checks that needed deps are installed and creates a + # desktop shortcut. We don't really need it and it clutters up bin/ so + # remove it. + postInstall = '' + rm -f "$out/bin/ride_postinstall.py" + ''; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Light-weight and intuitive editor for Robot Framework test case files"; + homepage = https://code.google.com/p/robotframework-ride/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc8559acd48..d20c8fdd3ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18293,36 +18293,7 @@ in { robotsuite = callPackage ../development/python-modules/robotsuite { }; - robotframework-ride = buildPythonPackage rec { - version = "1.2.3"; - name = "robotframework-ride-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; - sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j"; - }; - - propagatedBuildInputs = with self; [ pygments wxPython ]; - - # ride_postinstall.py checks that needed deps are installed and creates a - # desktop shortcut. We don't really need it and it clutters up bin/ so - # remove it. - postInstall = '' - rm -f "$out/bin/ride_postinstall.py" - ''; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Light-weight and intuitive editor for Robot Framework test case files"; - homepage = https://code.google.com/p/robotframework-ride/; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; robotframework-requests = buildPythonPackage rec { version = "0.4.6"; From 628e1b9b4ee59ba992af37c8d8786e1957d07849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:45:15 +0100 Subject: [PATCH 1937/2806] pythonPackages.seqdiag: move to python-modules/ --- .../python-modules/seqdiag/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +---------------- 2 files changed, 30 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/seqdiag/default.nix diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix new file mode 100644 index 00000000000..98a81873a71 --- /dev/null +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +, blockdiag +}: + +buildPythonPackage rec { + name = "seqdiag-0.9.4"; + + src = fetchurl { + url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; + sha256 = "1qa7d0m1wahvmrj95rxkb6128cbwd4w3gy8gbzncls66h46bifiz"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ blockdiag ]; + + # Tests fail: + # ... + # ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/') + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d20c8fdd3ce..0be1c2e484b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18636,31 +18636,7 @@ in { }; }; - seqdiag = buildPythonPackage rec { - name = "seqdiag-0.9.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; - sha256 = "1qa7d0m1wahvmrj95rxkb6128cbwd4w3gy8gbzncls66h46bifiz"; - }; - - buildInputs = with self; [ pep8 nose unittest2 docutils ]; - - propagatedBuildInputs = with self; [ blockdiag ]; - - # Tests fail: - # ... - # ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/') - doCheck = false; - - meta = { - description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + seqdiag = callPackage ../development/python-modules/seqdiag { }; pysendfile = buildPythonPackage rec { name = "pysendfile-${version}"; From 086ad07ed675475916f100e76107d7399f71f78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:47:17 +0100 Subject: [PATCH 1938/2806] pythonPackages.scapy: move to python-modules/ --- .../python-modules/scapy/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------------- 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/scapy/default.nix diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix new file mode 100644 index 00000000000..5241b632f12 --- /dev/null +++ b/pkgs/development/python-modules/scapy/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k, isPyPy }: + +buildPythonPackage rec { + name = "scapy-2.2.0"; + + disabled = isPy3k || isPyPy; + + src = fetchurl { + url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz"; + sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5"; + }; + + meta = with stdenv.lib; { + description = "Powerful interactive network packet manipulation program"; + homepage = http://www.secdev.org/projects/scapy/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0be1c2e484b..452357334cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18693,24 +18693,7 @@ in { sampledata = callPackage ../development/python-modules/sampledata { }; - scapy = buildPythonPackage rec { - name = "scapy-2.2.0"; - - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz"; - sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5"; - }; - - meta = { - description = "Powerful interactive network packet manipulation program"; - homepage = http://www.secdev.org/projects/scapy/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + scapy = callPackage ../development/python-modules/scapy { }; scipy = callPackage ../development/python-modules/scipy { }; From aaa3608b4b2dd1a799bdbc01af993057308edd5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:49:20 +0100 Subject: [PATCH 1939/2806] pythonPackages.pyusb: move to python-modules/ --- .../python-modules/pyusb/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +------------------ 2 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/pyusb/default.nix diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix new file mode 100644 index 00000000000..0651192344a --- /dev/null +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, buildPythonPackage, libusb, libusb1 }: + +buildPythonPackage rec { + name = "pyusb-1.0.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d/PyUSB-1.0.0.tar.gz"; + sha256 = "0s2k4z06fapd5vp1gnrlf8a9sjpc03p9974lzw5k6ky39akzyd2v"; + }; + + # Fix the USB backend library lookup + postPatch = + '' + libusb=${libusb1.out}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary} + test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } + sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py + ''; + + propagatedBuildInputs = [ libusb ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "Python USB access module (wraps libusb 1.0)"; # can use other backends + homepage = http://pyusb.sourceforge.net/; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 452357334cd..2f7e51ee117 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22812,35 +22812,7 @@ EOF unidecode = callPackage ../development/python-modules/unidecode {}; - pyusb = buildPythonPackage rec { - name = "pyusb-1.0.0"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d/PyUSB-1.0.0.tar.gz"; - sha256 = "0s2k4z06fapd5vp1gnrlf8a9sjpc03p9974lzw5k6ky39akzyd2v"; - }; - - # Fix the USB backend library lookup - postPatch = - '' - libusb=${pkgs.libusb1.out}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary} - test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } - sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py - ''; - - propagatedBuildInputs = [ pkgs.libusb ]; - - # No tests included - doCheck = false; - - meta = { - description = "Python USB access module (wraps libusb 1.0)"; # can use other backends - homepage = http://pyusb.sourceforge.net/; - license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor ]; - }; - }; - + pyusb = callPackage ../development/python-modules/pyusb {}; BlinkStick = buildPythonPackage rec { name = "BlinkStick-${version}"; From 05bf2bdba12c7d0870706e1424ffd6a36b26bd84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:51:20 +0100 Subject: [PATCH 1940/2806] pythonPackages.usbtmc: move to python-modules/ --- .../python-modules/usbtmc/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------------ 2 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/usbtmc/default.nix diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix new file mode 100644 index 00000000000..3d1fa3be41f --- /dev/null +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, buildPythonPackage, pyusb }: + +buildPythonPackage rec { + name = "usbtmc-${version}"; + version = "0.6"; + + src = fetchurl { + url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; + sha256 = "1wnw6ndc3s1i8zpbikz5zc40ijvpraqdb0xn8zmqlyn95xxfizw2"; + }; + + propagatedBuildInputs = [ pyusb ]; + + meta = with stdenv.lib; { + description = "Python implementation of the USBTMC instrument control protocol"; + homepage = http://alexforencich.com/wiki/en/python-usbtmc/start; + license = licenses.mit; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f7e51ee117..5b5071cab2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22839,25 +22839,7 @@ EOF }; }; - - usbtmc = buildPythonPackage rec { - name = "usbtmc-${version}"; - version = "0.6"; - - src = pkgs.fetchurl { - url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; - sha256 = "1wnw6ndc3s1i8zpbikz5zc40ijvpraqdb0xn8zmqlyn95xxfizw2"; - }; - - propagatedBuildInputs = with self; [ pyusb ]; - - meta = { - description = "Python implementation of the USBTMC instrument control protocol"; - homepage = http://alexforencich.com/wiki/en/python-usbtmc/start; - license = licenses.mit; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + usbtmc = callPackage ../development/python-modules/usbtmc {}; txgithub = buildPythonPackage rec { name = "${pname}-${version}"; From 140243639529209db37f7c79c8c44dea1db90542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:53:44 +0100 Subject: [PATCH 1941/2806] pythonPackages.pyev: move to python-modules/ --- .../python-modules/pyev/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +------------------ 2 files changed, 30 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/pyev/default.nix diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix new file mode 100644 index 00000000000..db06fedd68c --- /dev/null +++ b/pkgs/development/python-modules/pyev/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, buildPythonPackage, libev }: + +buildPythonPackage rec { + name = "pyev-0.9.0"; + + src = fetchurl { + url = "mirror://pypi/p/pyev/${name}.tar.gz"; + sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; + }; + + buildInputs = [ libev ]; + + libEvSharedLibrary = + if !stdenv.isDarwin + then "${libev}/lib/libev.so.4" + else "${libev}/lib/libev.4.dylib"; + + postPatch = '' + test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; } + sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py + ''; + + meta = with stdenv.lib; { + description = "Python bindings for libev"; + homepage = https://code.google.com/p/pyev/; + license = licenses.gpl3; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b5071cab2d..cb03a13f6e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16274,34 +16274,7 @@ in { }; }; - - pyev = buildPythonPackage rec { - name = "pyev-0.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyev/${name}.tar.gz"; - sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; - }; - - buildInputs = [ pkgs.libev ]; - - libEvSharedLibrary = - if !stdenv.isDarwin - then "${pkgs.libev}/lib/libev.so.4" - else "${pkgs.libev}/lib/libev.4.dylib"; - - postPatch = '' - test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; } - sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py - ''; - - meta = { - description = "Python bindings for libev"; - homepage = https://code.google.com/p/pyev/; - license = licenses.gpl3; - maintainers = [ maintainers.bjornfor ]; - }; - }; + pyev = callPackage ../development/python-modules/pyev { }; pyexcelerator = buildPythonPackage rec { name = "pyexcelerator-${version}"; From adac3e43fd271dbb9c50cd2f9d42588b5b93e9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:57:39 +0100 Subject: [PATCH 1942/2806] pythonPackages.llfuse: move to python-modules/ --- .../python-modules/llfuse/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 ++--------------- 2 files changed, 34 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/llfuse/default.nix diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix new file mode 100644 index 00000000000..7c907d1e5ef --- /dev/null +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, pytest, fuse, attr, which +, contextlib2 +}: + +buildPythonPackage rec { + name = "llfuse-1.0"; + + src = fetchurl { + url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; + sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pytest fuse attr which ]; + + propagatedBuildInputs = [ contextlib2 ]; + + checkPhase = '' + py.test + ''; + + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' + doCheck = false; + + meta = with stdenv.lib; { + description = "Python bindings for the low-level FUSE API"; + homepage = https://code.google.com/p/python-llfuse/; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb03a13f6e0..d83ac0df11b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10938,33 +10938,8 @@ in { livereload = callPackage ../development/python-modules/livereload { }; - llfuse = buildPythonPackage rec { - name = "llfuse-1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; - }; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with self; [ pytest pkgs.fuse pkgs.attr pkgs.which ]; - - propagatedBuildInputs = with self; [ contextlib2 ]; - - checkPhase = '' - py.test - ''; - - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' - doCheck = false; - - meta = { - description = "Python bindings for the low-level FUSE API"; - homepage = https://code.google.com/p/python-llfuse/; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; + llfuse = callPackage ../development/python-modules/llfuse { + fuse = pkgs.fuse; # use "real" fuse, not the python module }; locustio = buildPythonPackage rec { From 41b89d15779c74e9a705841c0bb54f375575ca27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:18:17 +0100 Subject: [PATCH 1943/2806] pythonPackages.autopep8: 1.0.4 -> 1.3.3 The pep8 package is renamed to pycodestyle and autopep8 references the new name. (Also, fetchurl -> fetchPypi.) --- .../python-modules/autopep8/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 6dc091624c5..06ad939cfa8 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, buildPythonPackage, pep8 }: +{ stdenv, fetchPypi, buildPythonPackage, pycodestyle }: buildPythonPackage rec { - name = "autopep8-1.0.4"; + pname = "autopep8"; + version = "1.3.3"; + name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/a/autopep8/${name}.tar.gz"; - sha256 = "17lydqm8y9a5qadp6iifxrb5mb0g9fr1vxn5qy1fjpyhazxaw8n1"; + src = fetchPypi { + inherit pname version; + sha256 = "0c1gl648g2xnz3j0rsp71ld4i32zlglmqjvqf4q8r08jp3zpny7z"; }; - propagatedBuildInputs = [ pep8 ]; + propagatedBuildInputs = [ pycodestyle ]; # One test fails: # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) From 454ad93a358a99e2c1c9dd7c45fd0568f93fad85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:33:18 +0100 Subject: [PATCH 1944/2806] pythonPackages.construct: 2.8.10 -> 2.8.16 --- pkgs/development/python-modules/construct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 1845d7ec94f..9d8e61d1f45 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { name = "construct-${version}"; - version = "2.8.10"; + version = "2.8.16"; src = fetchFromGitHub { owner = "construct"; repo = "construct"; rev = "v${version}"; - sha256 = "1xfmmc5pihn3ql9f7blrciy06y2bwczqvkbcpvh96dmgqwc3wys3"; + sha256 = "0lzz1dy419n254qccch7yx4nkpwd0fsyjhnsnaf6ysgwzqxxv63j"; }; propagatedBuildInputs = [ six ]; From 5065f0f258b4d91a2a05bfbb7695f499e5f76de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:40:37 +0100 Subject: [PATCH 1945/2806] pythonPackages.pycollada: 0.4.1 -> 0.5 * fetchurl -> fetchPypi --- .../development/python-modules/pycollada/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index fec32b86aaf..948d9741bd8 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }: +{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }: buildPythonPackage rec { - name = "pycollada-0.4.1"; + pname = "pycollada"; + version = "0.5"; + name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/p/pycollada/${name}.tar.gz"; - sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv"; + src = fetchPypi { + inherit pname version; + sha256 = "1g96maw2c25l4i3ks51784h33zf7s18vrn6iyz4ca34iy4sl7yq9"; }; buildInputs = [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]); From 4b3f72917269173b8b22e783b2a043496d3ccd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:44:50 +0100 Subject: [PATCH 1946/2806] pythonPackages.dpkt: 1.8 -> 1.9.1 * fetchurl -> fetchPypi * Tests work now. * Package is py3k compatible now. --- pkgs/development/python-modules/dpkt/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index 87b5bd6b812..43c318fc7c3 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, buildPythonPackage, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "dpkt-1.8"; - disabled = isPy3k; + pname = "dpkt"; + version = "1.9.1"; + name = "${pname}-${version}"; - src = fetchurl { - url = "https://dpkt.googlecode.com/files/${name}.tar.gz"; - sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5"; + src = fetchPypi { + inherit pname version; + sha256 = "0rr9ygczhxkfb61778jx0cxs0sq46zwlcj5l3wn6xmd3iy3yx9y6"; }; - # error: invalid command 'test' - doCheck = false; - meta = with stdenv.lib; { description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; homepage = https://code.google.com/p/dpkt/; From 82ababbd833651d319e604091edc4d585f9035e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 16:08:28 +0100 Subject: [PATCH 1947/2806] pythonPackages.pyusb: 1.0.0 -> 1.0.2 Also, fetchurl -> fetchPypi. --- pkgs/development/python-modules/pyusb/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 0651192344a..6ba6794bfd1 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, buildPythonPackage, libusb, libusb1 }: +{ stdenv, fetchPypi, buildPythonPackage, libusb, libusb1 }: buildPythonPackage rec { - name = "pyusb-1.0.0"; + pname = "pyusb"; + version = "1.0.2"; + name = "${pname}-${version}"; - src = fetchurl { - url = "https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d/PyUSB-1.0.0.tar.gz"; - sha256 = "0s2k4z06fapd5vp1gnrlf8a9sjpc03p9974lzw5k6ky39akzyd2v"; + src = fetchPypi { + inherit pname version; + sha256 = "0qkk2jn270jwwl1x26hmdhb14m9kkbrzzwzizdjcl1a29b6756sf"; }; # Fix the USB backend library lookup From ccc1f9a5406688e00100f9594e49a01c10a8dde1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 16:04:38 +0100 Subject: [PATCH 1948/2806] pythonPackages.usbtmc: 0.6 -> 0.8 --- pkgs/development/python-modules/usbtmc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index 3d1fa3be41f..0c684274907 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { name = "usbtmc-${version}"; - version = "0.6"; + version = "0.8"; src = fetchurl { url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; - sha256 = "1wnw6ndc3s1i8zpbikz5zc40ijvpraqdb0xn8zmqlyn95xxfizw2"; + sha256 = "14f4j77ljr45crnjwlp1dqbxwa45s20y2fpq5rg59r60w15al4yw"; }; propagatedBuildInputs = [ pyusb ]; From aa12eddb6c9683145160c4b75604a259478fef54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 22:53:27 +0100 Subject: [PATCH 1949/2806] pythonPackages.nwdiag: unbreak eval Oops, this should have been part of commit afd4a17ee5abada65616b0f3566813c08b7c4376 ("pythonPackages.nwdiag: move to python-modules/"). I noticed 2 seconds to late! --- .../python-modules/nwdiag/default.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/nwdiag/default.nix diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix new file mode 100644 index 00000000000..ebf7ce944c1 --- /dev/null +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +, blockdiag +}: + +buildPythonPackage rec { + name = "nwdiag-1.0.3"; + + src = fetchurl { + url = "mirror://pypi/n/nwdiag/${name}.tar.gz"; + sha256 = "0n7ary1fngxk8bk15vabc8fhnmxlh098piciwaviwn7l4a5q1zys"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ blockdiag ]; + + # tests fail + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} From e697f10fc4e5343c9fc3c253efb910fecb6f84da Mon Sep 17 00:00:00 2001 From: Christopher Singley Date: Sun, 29 Oct 2017 19:28:16 -0500 Subject: [PATCH 1950/2806] PlexPy: init at 1.4.25 --- lib/maintainers.nix | 1 + pkgs/servers/plexpy/default.nix | 41 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/servers/plexpy/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7c3a845c00c..dc2281401e0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -136,6 +136,7 @@ cryptix = "Henry Bubert "; CrystalGamma = "Jona Stubbe "; cstrahan = "Charles Strahan "; + csingley = "Christopher Singley "; cwoac = "Oliver Matthews "; DamienCassou = "Damien Cassou "; danbst = "Danylo Hlynskyi "; diff --git a/pkgs/servers/plexpy/default.nix b/pkgs/servers/plexpy/default.nix new file mode 100644 index 00000000000..2875ecc5240 --- /dev/null +++ b/pkgs/servers/plexpy/default.nix @@ -0,0 +1,41 @@ +{stdenv, fetchFromGitHub, python}: + +stdenv.mkDerivation rec { + version = "1.4.25"; + pname = "plexpy"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "JonnyWong16"; + repo = pname; + rev = "v${version}"; + sha256 = "0a4ynrfamlwkgqil4n61v47p21czxpjdzg0mias4kdjam2nnwnjx"; + }; + + buildPhase = ":"; + + installPhase = '' + mkdir -p $out + cp -R * $out/ + + # Remove superfluous Python checks from main script; + # prepend shebang + echo "#!${python.interpreter}" > $out/PlexPy.py + tail -n +7 PlexPy.py >> $out/PlexPy.py + + mkdir $out/bin + # Can't just symlink to the main script, since it uses __file__ to + # import bundled packages and manage the service + echo "#!/bin/bash" > $out/bin/plexpy + echo "$out/PlexPy.py \$*" >> $out/bin/plexpy + chmod +x $out/bin/plexpy + ''; + + meta = with stdenv.lib; { + description = "A Python based monitoring and tracking tool for Plex Media Server."; + homepage = http://jonnywong16.github.io/plexpy/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ csingley ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 596051f4ea7..762f217fcbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3966,6 +3966,8 @@ with pkgs; plex = callPackage ../servers/plex { enablePlexPass = config.plex.enablePlexPass or false; }; + plexpy = callPackage ../servers/plexpy { python = python2; }; + ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; }; From 95dc36235ce21ab8563f1ba61a5d80e6c2ea9e3b Mon Sep 17 00:00:00 2001 From: Christopher Singley Date: Sun, 29 Oct 2017 19:29:25 -0500 Subject: [PATCH 1951/2806] PlexPy service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/plexpy.nix | 81 ++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 nixos/modules/services/misc/plexpy.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6f00a97dd3f..44bcec5aec2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -328,6 +328,7 @@ ./services/misc/parsoid.nix ./services/misc/phd.nix ./services/misc/plex.nix + ./services/misc/plexpy.nix ./services/misc/pykms.nix ./services/misc/radarr.nix ./services/misc/redmine.nix diff --git a/nixos/modules/services/misc/plexpy.nix b/nixos/modules/services/misc/plexpy.nix new file mode 100644 index 00000000000..df9f1258124 --- /dev/null +++ b/nixos/modules/services/misc/plexpy.nix @@ -0,0 +1,81 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.plexpy; +in +{ + options = { + services.plexpy = { + enable = mkEnableOption "PlexPy Plex Monitor"; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/plexpy"; + description = "The directory where PlexPy stores its data files."; + }; + + configFile = mkOption { + type = types.str; + default = "/var/lib/plexpy/config.ini"; + description = "The location of PlexPy's config file."; + }; + + port = mkOption { + type = types.int; + default = 8181; + description = "TCP port where PlexPy listens."; + }; + + user = mkOption { + type = types.str; + default = "plexpy"; + description = "User account under which PlexPy runs."; + }; + + group = mkOption { + type = types.str; + default = "nogroup"; + description = "Group under which PlexPy runs."; + }; + + package = mkOption { + type = types.package; + default = pkgs.plexpy; + defaultText = "pkgs.plexpy"; + description = '' + The PlexPy package to use. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.plexpy = { + description = "PlexPy Plex Monitor"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + test -d "${cfg.dataDir}" || { + echo "Creating initial PlexPy data directory in \"${cfg.dataDir}\"." + mkdir -p "${cfg.dataDir}" + chown ${cfg.user}:${cfg.group} "${cfg.dataDir}" + } + ''; + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = "true"; + GuessMainPID = "false"; + ExecStart = "${cfg.package}/bin/plexpy --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port} --pidfile ${cfg.dataDir}/plexpy.pid --nolaunch"; + Restart = "on-failure"; + }; + }; + + users.extraUsers = mkIf (cfg.user == "plexpy") { + plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; }; + }; + }; +} From 51e68732f95049a04789a7a021533765d39ce110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= Date: Sun, 22 Oct 2017 22:45:03 +0200 Subject: [PATCH 1952/2806] coqPackages.dpdgraph: remove support for coq 8.7 coqPackages_8_7.dpdgraph won't build since Coq 8.7.0 is not yet supported upstream. --- pkgs/development/coq-modules/dpdgraph/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index aec3828f323..65be1f4e066 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,11 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }: let param = { - "8.7" = { - version = "0.6.1"; - rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; - sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9"; - }; "8.6" = { version = "0.6.1"; rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; From b831d3845f885ebb102ec0d63d4b664fbdfd10f8 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 14:59:04 +0800 Subject: [PATCH 1953/2806] pythonPackages.clientform: Remove package From upstream: This functionality provided by this module is now part of mechanize. I don't intend to make further standalone releases of ClientForm. --- pkgs/top-level/python-packages.nix | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d83ac0df11b..4f7db48b7d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2752,24 +2752,6 @@ in { cligj = callPackage ../development/python-modules/cligj { }; - clientform = buildPythonPackage (rec { - name = "clientform-0.2.10"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/ClientForm/ClientForm-0.2.10.tar.gz"; - sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm"; - }; - - meta = { - homepage = http://wwwsearch.sourceforge.net/ClientForm/; - - license = "bsd"; - - description = "Python module for handling HTML forms on the client side"; - }; - }); - /* There is a project called "closure-linter" on PyPI that is the same as this, but it does not appear to be owned by Google. So we're pulling from Google's GitHub repo instead. */ @@ -11299,7 +11281,7 @@ in { sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl"; }; - propagatedBuildInputs = with self; [ clientform html5lib ]; + propagatedBuildInputs = with self; [ html5lib ]; doCheck = false; From e78864e3b7db45d4b803fb816781ec7ce904aedc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 15:21:17 +0800 Subject: [PATCH 1954/2806] pythonPackages.skype4py: Remove package, not updated in years and no dependent packages --- pkgs/top-level/python-packages.nix | 33 ------------------------------ 1 file changed, 33 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f7db48b7d9..93363593188 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19613,39 +19613,6 @@ in { }; }; - - skype4py = buildPythonPackage (rec { - name = "Skype4Py-1.0.32.0"; - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz; - sha256 = "0cmkrv450wa8v50bng5dflpwkl5c1p9pzysjkb2956w5kvwh6f5b"; - }; - - unpackPhase = '' - tar xf $src - find . -type d -exec chmod +rx {} \; - sourceRoot=`pwd`/`ls -d S*` - ''; - - # error: invalid command 'test' - doCheck = false; - - propagatedBuildInputs = with self; [ pkgs.xorg.libX11 dbus-python pygobject2 ]; - - meta = { - description = "High-level, platform independent Skype API wrapper for Python"; - - # The advertisement says https://developer.skype.com/wiki/Skype4Py - # but that url does not work. This following web page points to the - # download link and has some information about the package. - homepage = http://pypi.python.org/pypi/Skype4Py/1.0.32.0; - broken = true; - license = "BSD"; - }; - }); - smartdc = buildPythonPackage rec { name = "smartdc-0.1.12"; From 892a0005ff299e2dc561376f74af9e56476b71e5 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 15:29:10 +0800 Subject: [PATCH 1955/2806] pythonPackages.pyxattr: 0.5.1 -> 0.6.0 --- .../python-modules/pyxattr/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pyxattr/default.nix diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix new file mode 100644 index 00000000000..558dc37a394 --- /dev/null +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -0,0 +1,26 @@ +{ lib +, pkgs +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "pyxattr"; + version = "0.6.0"; + name = pname + "-" + version; + + src = fetchPypi { + inherit pname version; + sha256 = "1a3fqjlgbzq5hmc3yrnxxxl8nyn3rz2kfn17svbsahaq4gj0xl09"; + }; + + # IOError: [Errno 95] Operation not supported (expected) + doCheck = false; + + buildInputs = with pkgs; [ attr ]; + + meta = with lib; { + description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems"; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93363593188..1e90fb1ae72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17612,25 +17612,7 @@ in { pywinrm = callPackage ../development/python-modules/pywinrm { }; - pyxattr = buildPythonPackage (rec { - name = "pyxattr-0.5.1"; - - src = pkgs.fetchurl { - url = "https://github.com/downloads/iustin/pyxattr/${name}.tar.gz"; - sha256 = "0jmkffik6hdzs7ng8c65bggss2ai40nm59jykswdf5lpd36cxddq"; - }; - - # error: invalid command 'test' - doCheck = false; - - buildInputs = with self; [ pkgs.attr ]; - - meta = { - description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems"; - license = licenses.lgpl21Plus; - }; - }); - + pyxattr = callPackage ../development/python-modules/pyxattr { }; pyaml = buildPythonPackage (rec { name = "pyaml-15.02.1"; From 286ca78bf77dec222137d83f900a67759b04d1f2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 15:43:04 +0800 Subject: [PATCH 1956/2806] pythonPackages.fuse: Move to python-modules --- .../python-modules/python-fuse/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/python-fuse/default.nix diff --git a/pkgs/development/python-modules/python-fuse/default.nix b/pkgs/development/python-modules/python-fuse/default.nix new file mode 100644 index 00000000000..d9debce6aec --- /dev/null +++ b/pkgs/development/python-modules/python-fuse/default.nix @@ -0,0 +1,27 @@ +{ lib +, pkgconfig +, fetchurl +, fuse +, buildPythonPackage +, isPy3k +}: + +buildPythonPackage rec { + baseName = "fuse"; + version = "0.2.1"; + name = "${baseName}-${version}"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; + sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; + + meta = { + description = "Python bindings for FUSE"; + license = lib.licenses.lgpl21; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e90fb1ae72..2d4604e1a74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9253,25 +9253,7 @@ in { }; }; - fuse = buildPythonPackage (rec { - baseName = "fuse"; - version = "0.2.1"; - name = "${baseName}-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; - sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; - }; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with self; [ pkgs.fuse ]; - - meta = { - description = "Python bindings for FUSE"; - license = licenses.lgpl21; - }; - }); + fuse = callPackage ../development/python-modules/python-fuse { }; fusepy = buildPythonPackage rec { name = "fusepy-2.0.4"; From 552922cf538f2ab77c5c950b8abb3bda6a4a8bb2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 15:49:35 +0800 Subject: [PATCH 1957/2806] pythonPackages.pylibacl: 0.5.1 -> 0.5.3 --- .../python-modules/pylibacl/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pylibacl/default.nix diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix new file mode 100644 index 00000000000..97fbe28e50d --- /dev/null +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pkgs +}: + +buildPythonPackage rec { + pname = "pylibacl"; + version = "0.5.3"; + name = pname + "-" + version; + + src = fetchPypi { + inherit pname version; + sha256 = "0c3xw1s5bh6jnsc0wwyxnn6kn6x6rpbmmi05ap1f81fyqlgrzgj0"; + }; + + # ERROR: testExtended (tests.test_acls.AclExtensions) + # IOError: [Errno 0] Error + doCheck = false; + + buildInputs = with pkgs; [ acl ]; + + meta = { + description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them"; + license = lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d4604e1a74..a8e0e704ef5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16986,25 +16986,7 @@ in { }; }; - pylibacl = buildPythonPackage (rec { - name = "pylibacl-0.5.1"; - - src = pkgs.fetchurl { - url = "https://github.com/downloads/iustin/pylibacl/${name}.tar.gz"; - sha256 = "1idks7j9bn62xzsaxkvhl7bdq6ws8kv8aa0wahfh7724qlbbcf1k"; - }; - - # ERROR: testExtended (tests.test_acls.AclExtensions) - # IOError: [Errno 0] Error - doCheck = false; - - buildInputs = with self; [ pkgs.acl ]; - - meta = { - description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them"; - license = licenses.lgpl21Plus; - }; - }); + pylibacl = callPackage ../development/python-modules/pylibacl { }; pyliblo = buildPythonPackage rec { name = "pyliblo-${version}"; From 49a1221562f84ec6e1aa2b41eedeac376defb558 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 19:21:26 +0800 Subject: [PATCH 1958/2806] salut-a-toi: Move pythonPackages dependencies not required by other packages into salut-a-toi derivation --- .../salut-a-toi/default.nix | 20 ++++-- .../salut-a-toi/requirements.nix | 67 +++++++++++++++++++ .../python-modules/pyfeed/default.nix | 23 ------- pkgs/top-level/python-packages.nix | 39 ----------- 4 files changed, 81 insertions(+), 68 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix delete mode 100644 pkgs/development/python-modules/pyfeed/default.nix diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 4f360c831a2..9ff1799ddd2 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -1,7 +1,12 @@ -{stdenv, fetchurl, python27Packages, file }: +{ stdenv, fetchurl, python27Packages, file }: let inherit (python27Packages) python; + requirements = (import ./requirements.nix { + inherit stdenv fetchurl; + pythonPackages = python27Packages; + }); + in stdenv.mkDerivation rec { name = "salut-a-toi"; @@ -13,12 +18,15 @@ in sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d"; }; - buildInputs = with python27Packages; + buildInputs = with python27Packages; [ python twisted urwid wxPython pygobject2 - wokkel dbus-python pyfeed wrapPython setuptools file + dbus-python wrapPython setuptools file pycrypto pyxdg - ]; + ] ++ (with requirements; [ + pyfeed + wokkel + ]); configurePhase = '' sed -i "/use_setuptools/d" setup.py @@ -26,7 +34,7 @@ in sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh - echo 'import wokkel.muc' | python + echo 'import wokkel.muc' | python ''; buildPhase = '' @@ -39,7 +47,7 @@ in for i in "$out/bin"/*; do head -n 1 "$i" | grep -E '[/ ]python( |$)' && { wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}" - } || true + } || true done ''; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix new file mode 100644 index 00000000000..1a681118245 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -0,0 +1,67 @@ +{ fetchurl +, stdenv +, pythonPackages +}: + +let + buildPythonPackage = pythonPackages.buildPythonPackage; + + xe = buildPythonPackage rec { + url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; + name = stdenv.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + homepage = "http://home.blarg.net/~steveha/xe.html"; + description = "XML elements"; + }; + }; + +in { + + pyfeed = (buildPythonPackage rec { + url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; + + name = stdenv.lib.nameFromURL url ".tar"; + + src = fetchurl { + inherit url; + sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; + }; + + propagatedBuildInputs = [ xe ]; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = "http://home.blarg.net/~steveha/pyfeed.html"; + description = "Tools for syndication feeds"; + }; + + }); + + wokkel = buildPythonPackage (rec { + url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; + name = stdenv.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; + }; + + propagatedBuildInputs = with pythonPackages; [twisted dateutil]; + + meta = with stdenv.lib; { + description = "Some (mainly XMPP-related) additions to twisted"; + homepage = "http://wokkel.ik.nu/"; + license = licenses.mit; + }; + }); + +} diff --git a/pkgs/development/python-modules/pyfeed/default.nix b/pkgs/development/python-modules/pyfeed/default.nix deleted file mode 100644 index a1591037fb5..00000000000 --- a/pkgs/development/python-modules/pyfeed/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl -, xe }: - -buildPythonPackage rec { - url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; - - name = stdenv.lib.nameFromURL url ".tar"; - - src = fetchurl { - inherit url; - sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; - }; - - propagatedBuildInputs = [ xe ]; - - # error: invalid command 'test' - doCheck = false; - - meta = with stdenv.lib; { - homepage = "http://home.blarg.net/~steveha/pyfeed.html"; - description = "Tools for syndication feeds"; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8e0e704ef5..1311e0491cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16258,8 +16258,6 @@ in { }; }; - pyfeed = callPackage ../development/python-modules/pyfeed { }; - pyfftw = callPackage ../development/python-modules/pyfftw { }; pyfiglet = callPackage ../development/python-modules/pyfiglet { }; @@ -21547,26 +21545,6 @@ EOF widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; - - wokkel = buildPythonPackage (rec { - url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; - name = nameFromURL url ".tar"; - src = pkgs.fetchurl { - inherit url; - sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; - }; - - disabled = isPy3k; - - propagatedBuildInputs = with self; [twisted dateutil]; - - meta = { - description = "Some (mainly XMPP-related) additions to twisted"; - homepage = "http://wokkel.ik.nu/"; - license = licenses.mit; - }; - }); - magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; wsgiproxy2 = buildPythonPackage rec { @@ -21607,23 +21585,6 @@ EOF propagatedBuildInputs = with self; [ eventlib application ]; }; - xe = buildPythonPackage rec { - url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; - src = pkgs.fetchurl { - inherit url; - sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = "http://home.blarg.net/~steveha/xe.html"; - description = "XML elements"; - }; - }; - xlib = buildPythonPackage (rec { name = "xlib-${version}"; version = "0.17"; From 88683da1157ea23835a83bd4ee864aa882177c72 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 21:27:15 +0800 Subject: [PATCH 1959/2806] pythonpackages.pymacs: Remove package, does not seem to be maintained upstream --- pkgs/top-level/python-packages.nix | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1311e0491cd..05374eb8c54 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17006,29 +17006,6 @@ in { }; }; - pymacs = buildPythonPackage rec { - version = "0.25"; - name = "pymacs-${version}"; - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "https://github.com/pinard/Pymacs/tarball/v${version}"; - name = "${name}.tar.gz"; - sha256 = "1hmy76c5igm95rqbld7gvk0az24smvc8hplfwx2f5rhn6frj3p2i"; - }; - - configurePhase = "make"; - - doCheck = false; - - meta = { - description = "Emacs Lisp to Python interface"; - homepage = http://pymacs.progiciels-bpi.ca; - license = licenses.gpl2; - maintainers = with maintainers; [ goibhniu ]; - }; - }; - pypcap = callPackage ../development/python-modules/pypcap {}; pyplatec = buildPythonPackage rec { From d1144c05ec0e965915cbf18196342d3dc2de9084 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 21:30:42 +0800 Subject: [PATCH 1960/2806] pythonpackages.ropemode: Remove outdated package, far behind upstream --- pkgs/top-level/python-packages.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05374eb8c54..068b85668a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18206,25 +18206,6 @@ in { }; }; - ropemode = buildPythonPackage rec { - version = "0.2"; - name = "ropemode-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/ropemode/${name}.tar.gz"; - sha256 = "0jw6h1wvk6wk0wknqdf7s9pw76m8472jv546lqdd88jbl2scgcjl"; - }; - - propagatedBuildInputs = with self; [ rope ]; - - meta = { - description = "A plugin for performing python refactorings in emacs"; - homepage = http://rope.sf.net; - maintainers = with maintainers; [ goibhniu ]; - license = licenses.gpl2; - }; - }; - ropper = callPackage ../development/python-modules/ropper { }; routes = buildPythonPackage rec { From b9b8efc8123645d21b253fb7210f63ab5dbe9da2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 21:31:30 +0800 Subject: [PATCH 1961/2806] pythonpackages.ropemacs: Remove outdated package, far behind upstream --- pkgs/top-level/python-packages.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 068b85668a4..86db6ec7a28 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18187,25 +18187,6 @@ in { }; }; - ropemacs = buildPythonPackage rec { - version = "0.7"; - name = "ropemacs-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/ropemacs/${name}.tar.gz"; - sha256 = "1x5qf1drcdz9jfiiakc60kzqkb3ahsg9j902c5byf3gjfacdrmqj"; - }; - - propagatedBuildInputs = with self; [ ropemode ]; - - meta = { - description = "A plugin for performing python refactorings in emacs"; - homepage = http://rope.sf.net/ropemacs.html; - maintainers = with maintainers; [ goibhniu ]; - license = licenses.gpl2; - }; - }; - ropper = callPackage ../development/python-modules/ropper { }; routes = buildPythonPackage rec { From 8b8dd0926fe3f5ea8605813056264d4dea32ae06 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 21:33:24 +0800 Subject: [PATCH 1962/2806] pythonpackages.taskcoach: Remove outdated package, far behind upstream --- pkgs/top-level/python-packages.nix | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86db6ec7a28..c3e982e173c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20169,36 +20169,6 @@ in { }; }; - taskcoach = buildPythonPackage rec { - name = "TaskCoach-1.3.22"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/taskcoach/${name}.tar.gz"; - sha256 = "1ddx56bqmh347synhgjq625ijv5hqflr0apxg0nl4jqdsqk1zmxh"; - }; - - propagatedBuildInputs = with self; [ wxPython ]; - - # I don't know why I need to add these libraries. Shouldn't they - # be part of wxPython? - postInstall = '' - libspaths=${with pkgs.xorg; pkgs.lib.makeLibraryPath [ libSM libXScrnSaver ]} - wrapProgram $out/bin/taskcoach.py \ - --prefix LD_LIBRARY_PATH : $libspaths - ''; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://taskcoach.org/; - description = "Todo manager to keep track of personal tasks and todo lists"; - license = licenses.gpl3Plus; - broken = stdenv.isDarwin; - }; - }; - taskw = buildPythonPackage rec { version = "1.0.3"; name = "taskw-${version}"; From e86b3a07d188950f2c46af7c09df9ab16c6f4aed Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 21:43:54 +0800 Subject: [PATCH 1963/2806] pythonpackages.ledger-autosync: Remove outdated package --- pkgs/top-level/python-packages.nix | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c3e982e173c..de172153208 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6186,35 +6186,6 @@ in { }; }; - ledger-autosync = buildPythonPackage rec { - name = "ledger-autosync-${version}"; - version = "0.2.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/l/ledger-autosync/ledger-autosync-${version}.tar.gz"; - sha256 = "f19fa66e656309825887171d84a462e64676b1cc36b62e4dd8679ff63926a469"; - }; - - propagatedBuildInputs = with self; [ ofxclient ]; - - buildInputs = with self; [ - mock - nose - # Used at runtime to translate ofx entries to the ledger - # format. In fact, user could use either ledger or hledger. - pkgs.which - pkgs.ledger ]; - - # Tests are disable since they require hledger and python-ledger - doCheck = false; - - meta = { - homepage = https://gitlab.com/egh/ledger-autosync; - description = "ledger-autosync is a program to pull down transactions from your bank and create ledger transactions for them"; - license = licenses.gpl3; - maintainers = with maintainers; [ lewo ]; - }; - }; - libsexy = callPackage ../development/python-modules/libsexy { libsexy = pkgs.libsexy; }; From e87ffaefc6207ffec6ec4a6b1aeb5e9d255d4fb6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 21:52:26 +0800 Subject: [PATCH 1964/2806] anki: Depend on pythonPackages.beautifulsoup4 instead of pythonPackages.beautifulsoup --- pkgs/games/anki/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index c5bac4db8e5..4a531c07efd 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -7,8 +7,8 @@ }: let - version = "2.0.46"; - inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4; + version = "2.0.47"; + inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup4 httplib2 matplotlib pyqt4; qt4 = pyqt4.qt; in stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "01h51rbnj0r6lmjnn2vzxzaf7mxkc0azmg1v4mvf4pkpsp50a7hr"; }; - pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ] + pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup4 httplib2 ] ++ lib.optional plotsSupport matplotlib; buildInputs = [ python wrapPython lame mplayer libpulseaudio ]; From 12d8140a5197e855cc042db4d12010e0cb53d87b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 21:54:48 +0800 Subject: [PATCH 1965/2806] pythonpackages.python_tvrage: Remove dead package --- pkgs/top-level/python-packages.nix | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de172153208..7cd5731cdca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8993,27 +8993,6 @@ in { pytorch = callPackage ../development/python-modules/pytorch { }; - python_tvrage = buildPythonPackage (rec { - version = "0.4.1"; - name = "tvrage-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-tvrage/python-tvrage-${version}.tar.gz"; - sha256 = "f8a530376c5cf1bc573d1945a8504c3394b228c731a3eff5100c705997a72063"; - }; - - # has mostly networking dependent tests - doCheck = false; - propagatedBuildInputs = with self; [ beautifulsoup ]; - - meta = { - homepage = https://github.com/ckreutzer/python-tvrage; - description = "Client interface for tvrage.com's XML-based api feeds"; - license = licenses.bsd3; - maintainers = with maintainers; [ domenkozar ]; - }; - }); - python2-pythondialog = buildPythonPackage rec { name = "python2-pythondialog-${version}"; version = "3.3.0"; From bb50ae9807be1ca06e801502c3449864ff6bf82a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 22:03:17 +0800 Subject: [PATCH 1966/2806] pythonPackages.beautifulsoup: Move into pyload, no longer depended upon by any packages --- .../networking/pyload/beautifulsoup.nix | 20 +++++++++++++++++++ .../networking/pyload/default.nix | 11 ++++++++-- pkgs/top-level/python-packages.nix | 19 ------------------ 3 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/networking/pyload/beautifulsoup.nix diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix new file mode 100644 index 00000000000..571df924e1f --- /dev/null +++ b/pkgs/applications/networking/pyload/beautifulsoup.nix @@ -0,0 +1,20 @@ +{ pythonPackages, isPy3k, pkgs }: + +pythonPackages.buildPythonPackage rec { + name = "beautifulsoup-3.2.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; + sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + homepage = http://www.crummy.com/software/BeautifulSoup/; + license = "bsd"; + description = "Undemanding HTML/XML parser"; + }; +} diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index f8cd1ab1d00..c331c4f287e 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }: -pythonPackages.buildPythonApplication rec { +{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey +, pkgs }: + +let + beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { + inherit pythonPackages; + }; + +in pythonPackages.buildPythonApplication rec { version = "0.4.9-next"; name = "pyLoad-" + version; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cd5731cdca..1bc50dc0e21 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1253,25 +1253,6 @@ in { }; }; - beautifulsoup = buildPythonPackage (rec { - name = "beautifulsoup-3.2.1"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; - sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://www.crummy.com/software/BeautifulSoup/; - license = "bsd"; - description = "Undemanding HTML/XML parser"; - }; - }); - beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; beaker = buildPythonPackage rec { From ab66d6ea229cb4796628de824d22f342efe51590 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 22:11:23 +0800 Subject: [PATCH 1967/2806] pythonpackages.rtmidi: Remove outdated package --- pkgs/top-level/python-packages.nix | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1bc50dc0e21..c8f33b87715 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7716,30 +7716,6 @@ in { }; - rtmidi = buildPythonPackage rec { - version = "0.3a"; - name = "rtmidi-${version}"; - - src = pkgs.fetchurl { - url = "http://chrisarndt.de/projects/python-rtmidi/download/python-${name}.tar.bz2"; - sha256 = "0d2if633m3kbiricd5hgn1csccd8xab6lnab1bq9prdr9ks9i8h6"; - }; - - preConfigure = '' - sed -i "/use_setuptools/d" setup.py - ''; - - buildInputs = with self; [ pkgs.alsaLib pkgs.libjack2 ]; - - meta = { - description = "A Python wrapper for the RtMidi C++ library written with Cython"; - homepage = http://trac.chrisarndt.de/code/wiki/python-rtmidi; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; - }; - }; - - setuptools-git = buildPythonPackage rec { name = "setuptools-git-${version}"; version = "1.1"; From 1b55fc59228f23ac5aa3d50021332a93ac8c1ad7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 22:13:15 +0800 Subject: [PATCH 1968/2806] pythonpackages.doxypy: Remove outdated package --- pkgs/top-level/python-packages.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c8f33b87715..c256c1d23c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8371,22 +8371,6 @@ in { }; }; - doxypy = buildPythonPackage rec { - name = "doxypy-0.4.2"; - - src = pkgs.fetchurl { - url = "http://code.foosel.org/files/${name}.tar.gz"; - sha256 = "1afmb30zmy7942b53qa5vd3js883wwqqls35n8xfb3rnj0qnll8g"; - }; - - meta = { - homepage = http://code.foosel.org/doxypy; - description = "An input filter for Doxygen"; - }; - - doCheck = false; - }; - dtopt = buildPythonPackage rec { name = "dtopt-0.1"; From 495b099818a88f35f5df9248b34dc72a4793ffa4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 22:31:44 +0800 Subject: [PATCH 1969/2806] pythonpackages.requests_oauth2: Remove dead package --- pkgs/top-level/python-packages.nix | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c256c1d23c3..b5034a80739 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17762,27 +17762,6 @@ in { }; }; - requests_oauth2 = buildPythonPackage rec { - name = "requests-oauth2-0.1.1"; - # python3 does not support relative imports - disabled = isPy3k; - - src = pkgs.fetchurl { - url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz; - sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg"; - }; - - propagatedBuildInputs = with self; [ requests ]; - # no tests in tarball - doCheck = false; - - meta = { - description = "Python's Requests OAuth2 (Open Authentication) plugin"; - homepage = https://github.com/maraujop/requests-oauth2; - }; - }; - - restview = callPackage ../development/python-modules/restview { }; readme = buildPythonPackage rec { From 3fcf9bc9b18e0012d9b668913ca5e8b90c6ea9c2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 22:47:06 +0800 Subject: [PATCH 1970/2806] pythonpackages.googlecl: Remove outdated package (source url dead) --- pkgs/top-level/python-packages.nix | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5034a80739..a8c9f58545d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5635,27 +5635,6 @@ in { google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; - googlecl = buildPythonPackage rec { - version = "0.9.14"; - name = "googlecl-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "https://googlecl.googlecode.com/files/${name}.tar.gz"; - sha256 = "0nnf7xkr780wivr5xnchfcrahlzy9bi2dxcs1w1bh1014jql0iha"; - }; - - meta = { - description = "Brings Google services to the command line"; - homepage = https://code.google.com/p/googlecl/; - license = licenses.asl20; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - - propagatedBuildInputs = with self; [ gdata ]; - }; - gplaycli = buildPythonPackage rec { version = "0.1.2"; name = "gplaycli-${version}"; From 2ca086da827f66980e1cc31f88862918b011a599 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 22:52:43 +0800 Subject: [PATCH 1971/2806] pythonpackages.deform_bootstrap: Remove seemingly dead package --- pkgs/top-level/python-packages.nix | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8c9f58545d..d382e0d5b4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4617,30 +4617,6 @@ in { }; }; - deform_bootstrap = buildPythonPackage rec { - name = "deform_bootstrap-0.2.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/deform_bootstrap/${name}.tar.gz"; - sha256 = "1hgq3vqsfqdmlyahnlc40w13viawhpzqf4jzigsggdb41x545fda"; - }; - - buildInputs = [ self.mock ]; - propagatedBuildInputs = with self; [ deform pyramid ]; - - # demo is removed as it depends on deformdemo - patchPhase = '' - rm -rf deform_bootstrap/demo - ''; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - platforms = platforms.all; - }; - }; - - demjson = callPackage ../development/python-modules/demjson { }; - derpconf = self.buildPythonPackage rec { name = "derpconf-0.4.9"; From 938369861a7fcf9bee1820753a9f8aadf4a52fec Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 22:54:38 +0800 Subject: [PATCH 1972/2806] pythonpackages.trac: Remove outdated package --- pkgs/top-level/python-packages.nix | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d382e0d5b4b..36e7c72b213 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20355,29 +20355,6 @@ in { }; }; - trac = buildPythonPackage { - name = "trac-1.0.1"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz; - sha256 = "1nqa95fcnkpyq4jk6az7l7sqgm3b3pjq3bx1n7y4v3bad5jr1m4x"; - }; - - # couple of failing tests - doCheck = false; - - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - - propagatedBuildInputs = with self; [ genshi ]; - - meta = { - description = "Enhanced wiki and issue tracking system for software development projects"; - - license = "BSD"; - }; - }; - traits = buildPythonPackage rec { name = "traits-${version}"; version = "4.5.0"; From 33a56ef0a68cc06298556d866b24f1f2a8286639 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 22:57:36 +0800 Subject: [PATCH 1973/2806] pythonpackages.redNotebook: Remove outdated package --- pkgs/top-level/python-packages.nix | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36e7c72b213..5e839de2398 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22963,29 +22963,6 @@ EOF }; }; - - redNotebook = buildPythonPackage rec { - name = "rednotebook-1.8.1"; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/rednotebook/${name}.tar.gz"; - sha256 = "00b7s4xpqpxsbzjvjx9qsx5d84m9pvn383c5di1nsfh35pig0rzn"; - }; - - # no tests available - doCheck = false; - - propagatedBuildInputs = with self; [ pygtk pywebkitgtk pyyaml chardet ]; - - meta = { - homepage = http://rednotebook.sourceforge.net/index.html; - description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; - license = licenses.gpl2; - maintainers = with maintainers; [ tstrobel ]; - }; - }; - - uncertainties = callPackage ../development/python-modules/uncertainties { }; funcy = buildPythonPackage rec { From 2170a73d5c3a666790a0cb3bc128801b24c0f4a7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 23:05:21 +0800 Subject: [PATCH 1974/2806] pythonpackages.rtslib_fb: Remove outdated package --- pkgs/top-level/python-packages.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e839de2398..9c0d4d4de31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18225,22 +18225,6 @@ in { }; }; - rtslib_fb = buildPythonPackage rec { - version = "2.1.fb43"; - name = "rtslib-fb-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/agrover/rtslib-fb/archive/v${version}.tar.gz"; - sha256 = "1b59vyy12g6rix9l2fxx0hjiq33shkb79v57gwffs57vh74wc53v"; - }; - - meta = { - description = "A Python object API for managing the Linux LIO kernel target"; - homepage = "https://github.com/agrover/rtslib-fb"; - platforms = platforms.linux; - }; - }; - s3transfer = buildPythonPackage rec { version = "0.1.10"; name = "s3transfer-${version}"; From cb7caad4e96550f5ea88a412c6e9d4f848ae5413 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 23:06:52 +0800 Subject: [PATCH 1975/2806] pythonpackages.targetcli_fb: Remove outdated package --- pkgs/top-level/python-packages.nix | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c0d4d4de31..e4ebf181353 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19957,27 +19957,6 @@ in { tabulate = callPackage ../development/python-modules/tabulate { }; - targetcli_fb = buildPythonPackage rec { - version = "2.1.fb33"; - name = "targetcli-fb-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/agrover/targetcli-fb/archive/v${version}.tar.gz"; - sha256 = "1zcm0agdpf866020b43fl8zyyyzz6r74mn1sz4xpaa0pinpwjk42"; - }; - - propagatedBuildInputs = with self; [ - configshell_fb - rtslib_fb - ]; - - meta = { - description = "A command shell for managing the Linux LIO kernel target"; - homepage = "https://github.com/agrover/targetcli-fb"; - platforms = platforms.linux; - }; - }; - taskw = buildPythonPackage rec { version = "1.0.3"; name = "taskw-${version}"; From 7d6a912bfeeb37f62735c579cc1c8935dee14f3b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 23:08:09 +0800 Subject: [PATCH 1976/2806] pythonpackages.configshell_fb: Remove outdated package --- pkgs/top-level/python-packages.nix | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4ebf181353..72cc1b282d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2981,30 +2981,6 @@ in { }); - configshell_fb = buildPythonPackage rec { - version = "1.1.fb10"; - name = "configshell-fb-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/agrover/configshell-fb/archive/v${version}.tar.gz"; - sha256 = "1dd87xvm98nk3jzybb041gjdahi2z9b53pwqhyxcfj4a91y82ndy"; - }; - - propagatedBuildInputs = with self; [ - pyparsing - urwid - ]; - - # Fails on python 3 due to a None value where a string is expected - doCheck = !isPy3k; - - meta = { - description = "A Python library for building configuration shells"; - homepage = "https://github.com/agrover/configshell-fb"; - platforms = platforms.linux; - }; - }; - confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; construct = callPackage ../development/python-modules/construct {}; From b2de5a9373d890622eb44849626299ca29dd1370 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 23:12:47 +0800 Subject: [PATCH 1977/2806] pythonpackages.nose-selecttests: Remove outdated package --- pkgs/top-level/python-packages.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 72cc1b282d1..a637ef4e218 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12467,23 +12467,6 @@ in { nose-exclude = callPackage ../development/python-modules/nose-exclude { }; - nose-selecttests = buildPythonPackage rec { - version = "0.4"; - name = "nose-selecttests-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nose-selecttests/${name}.zip"; - sha256 = "0lgrfgp3sq8xi8d9grrg0z8jsyk0wl8a3rxw31hb7vdncin5b7n5"; - }; - - propagatedBuildInputs = with self; [ nose ]; - - meta = { - description = "Simple nose plugin that enables developers to run subset of collected tests to spare some waiting time for better things"; - }; - }; - - nose2 = if isPy26 then null else (buildPythonPackage rec { name = "nose2-0.5.0"; src = pkgs.fetchurl { From 98024e2d85ba94eab44db8ee326aa7631ab93861 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 23:14:24 +0800 Subject: [PATCH 1978/2806] pythonpackages.pyramid_debugtoolbar: Remove outdated package --- pkgs/top-level/python-packages.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a637ef4e218..9e467410396 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7080,19 +7080,6 @@ in { }; - pyramid_debugtoolbar = buildPythonPackage rec { - name = "pyramid_debugtoolbar-1.0.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyramid_debugtoolbar/${name}.tar.gz"; - sha256 = "1vnzg1qnnyisv7znxg7pasayfyr3nz7rrs5nqr4fmdgwj9q2pyv0"; - }; - - buildInputs = with self; [ ]; - propagatedBuildInputs = with self; [ pyramid pyramid_mako ]; - }; - - pyramid_mako = buildPythonPackage rec { name = "pyramid_mako-0.3.1"; From 8af79c8adc53909923164cf315913facfe5499ba Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 30 Oct 2017 12:06:07 +0800 Subject: [PATCH 1979/2806] pythonPackages.ofxclient: Depend on beautifulsoup4 instead of beautifulsoup3 --- pkgs/development/python-modules/ofxclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index c7877675530..3b5fa1f531a 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, - ofxhome, ofxparse, beautifulsoup, lxml, keyring + ofxhome, ofxparse, beautifulsoup4, lxml, keyring }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { # ImportError: No module named tests doCheck = false; - propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup lxml keyring ]; + propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup4 lxml keyring ]; meta = with stdenv.lib; { homepage = https://github.com/captin411/ofxclient; From cdbcb19e83fee42d6cceba0fb477dd37e25f63ed Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 31 Oct 2017 01:16:43 +0900 Subject: [PATCH 1980/2806] sxiv: installs .desktop file sxiv won't appear in meus as it has NoDisplay but it can be used to generate the mimetypes. --- pkgs/applications/graphics/sxiv/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 93bb5f151d9..68597a23ca6 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imlib2 giflib libexif ]; + postInstall = '' + mkdir -p $out/share/applications/ + cp -v sxiv.desktop $out/share/applications/ + ''; + meta = { description = "Simple X Image Viewer"; homepage = https://github.com/muennich/sxiv; From b8a7c455f6e5eef0fe6d9d65701816cbf3662f57 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Wed, 25 Oct 2017 21:59:52 +0100 Subject: [PATCH 1981/2806] Fix idrisPackages.with-packages 1. The ln step was failing due to a file already existing 2. gcc was invoked directly which caused failure on OS X. --- pkgs/development/idris-modules/with-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index edcd20c1097..d2b09808ec1 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -10,7 +10,7 @@ installIdrisLib () { if [ -d $1/lib/${idris.name} ]; then - ln -sv $1/lib/${idris.name}/* $out/lib/${idris.name} + ln -fsv $1/lib/${idris.name}/* $out/lib/${idris.name} fi } @@ -34,7 +34,7 @@ ''; buildPhase = '' - gcc -O3 -o idris idris.c + $CC -O3 -o idris idris.c ''; installPhase = '' From 29e80bde404b5ed126fdc2f32e794556506a9cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Mon, 23 Oct 2017 23:27:24 +0200 Subject: [PATCH 1982/2806] nixos/gitlab: fix hard-coded database name --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 740cbc141b5..0dde9ff3c5a 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -619,7 +619,7 @@ in { fi # enable required pg_trgm extension for gitlab - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" + ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" # Always do the db migrations just to be sure the database is up-to-date ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production From 00c03e90038a4935da17fa0d5f5ca9d08fc19676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Mon, 23 Oct 2017 23:48:26 +0200 Subject: [PATCH 1983/2806] nixos/gitlab: fix preStart script --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 0dde9ff3c5a..e0fae335d03 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -634,7 +634,7 @@ in { # The gitlab:shell:create_hooks task seems broken for fixing links # so we instead delete all the hooks and create them anew - rm ${cfg.statePath}/repositories/**/*.git/hooks + rm -f ${cfg.statePath}/repositories/**/*.git/hooks ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production # Change permissions in the last step because some of the From c556c72a2efda33c6ef00ff376bd5596f6eca817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Tue, 24 Oct 2017 00:07:51 +0200 Subject: [PATCH 1984/2806] nixos/gitlab: fix secret generation This line previously produced an error and an empty secret file. --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e0fae335d03..7b2b40e5923 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -572,7 +572,7 @@ in { rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks mkdir -p ${cfg.statePath}/config - tr -dc A-Za-z0-9 < /dev/urandom | head -c 32 > ${cfg.statePath}/config/gitlab_shell_secret + ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret # The uploads directory is hardcoded somewhere deep in rails. It is # symlinked in the gitlab package to /run/gitlab/uploads to make it From dd0cdc2fb4dcc195bb00c5602f0c1da28dbd5282 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 30 Oct 2017 01:08:20 +0000 Subject: [PATCH 1985/2806] ocamlPackages.camlp5: 7.02 -> 7.03 --- pkgs/development/tools/ocaml/camlp5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index e5c79f534b0..0acd70b424a 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-7.02"; + name = "camlp5${if transitional then "_transitional" else ""}-7.03"; src = fetchzip { - url = https://github.com/camlp5/camlp5/archive/rel702.tar.gz; - sha256 = "1m2d55zrgllidhgslvzgmr27f56qzdahz2sv56bvjs3bg7grmhnc"; + url = https://github.com/camlp5/camlp5/archive/rel703.tar.gz; + sha256 = "0bwzhp4qjypfa0x8drp8w434dfixm1nzrm6pcy9s5akpmqvb50a8"; }; buildInputs = [ ocaml ]; From d8987135c264cec552ebca51348a16c63a833fbb Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Mon, 30 Oct 2017 11:17:06 +0000 Subject: [PATCH 1986/2806] types.submodule: Replace a friendly comment by a more gentle one. --- lib/types.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index c48e3b3000c..dd0f31e9d14 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -288,8 +288,17 @@ rec { }).config; getSubOptions = prefix: (evalModules { modules = opts'; inherit prefix; - # FIXME: hack to get shit to evaluate. - args = { name = ""; }; }).options; + # This is a work-around due to the fact that some sub-modules, + # such as the one included in an attribute set, expects a "args" + # attribute to be given to the sub-module. As the option + # evaluation does not have any specific attribute name, we + # provide a default one for the documentation. + # + # This is mandatory as some option declaration might use the + # "name" attribute given as argument of the submodule and use it + # as the default of option declarations. + args.name = ""; + }).options; getSubModules = opts'; substSubModules = m: submodule m; functor = (defaultFunctor name) // { From 70f35a99a4f7d17f8b82105e648efb3de681ab8e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Oct 2017 08:30:29 -0400 Subject: [PATCH 1987/2806] linux: 4.14-rc6 -> 4.14-rc7 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3a8d82cdb26..8c8fd3c9733 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc6"; - modDirVersion = "4.14.0-rc6"; + version = "4.14-rc7"; + modDirVersion = "4.14.0-rc7"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0gmxrf4jmw8xl5gx487chyx94yas7rva5jbkczm9iw9sw0c8gwcb"; + sha256 = "1w7b1sc5dsxcqywsdbwgs92i8jpj7hsnss67yzb58z3bz3hb73m3"; }; # Should the testing kernels ever be built on Hydra? From d266a456ab34b680261fa04bfb78b11a0bfb605f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Oct 2017 08:54:14 -0400 Subject: [PATCH 1988/2806] perl: 5.24.2 -> 5.24.3 --- pkgs/development/interpreters/perl/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 5246c5b0e59..97e395d2a6d 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -116,9 +116,7 @@ let platforms = platforms.all; }; }; - in rec { - perl = perl524; perl522 = common { @@ -127,8 +125,7 @@ in rec { }; perl524 = common { - version = "5.24.2"; - sha256 = "1x4yj814a79lcarwb3ab6bbcb36hvb5n4ph4zg3yb0nabsjfi6v0"; + version = "5.24.3"; + sha256 = "1m2px85kq2fyp2d4rx3bw9kg3car67qfqwrs5vlv96dx0x8rl06b"; }; - } From 7fd58b57b14529f4a0d156360c20895d61becfcc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Oct 2017 09:04:23 -0400 Subject: [PATCH 1989/2806] git: 2.14.3 -> 2.15.0 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b3c642de9b2..6358a340bb6 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.14.3"; + version = "2.15.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "078m0za5gyzcah5iaxdwx663yvdp8byvjc8rpzjzcrr4sl6rcc2k"; + sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h"; }; hardeningDisable = [ "format" ]; From 933060fe19741f3a832e9c2ce4c8404422b8676c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 30 Oct 2017 13:34:58 +0000 Subject: [PATCH 1990/2806] mikutter: mark as broken The package doesn't build anymore /cc @midchildan --- .../networking/instant-messengers/mikutter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 1fa7a2fe7e9..e00468d9a4c 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + broken = true; description = "An extensible Twitter client"; homepage = https://mikutter.hachune.net; maintainers = with maintainers; [ midchildan ]; From 119ebee6a4f66d4e623e058e897bdd5928ba478b Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 30 Oct 2017 13:25:31 +0100 Subject: [PATCH 1991/2806] pcre: 8.40 -> 8.41 (fixes multiple CVEs) --- .../libraries/pcre/CVE-2017-7186.patch | 52 ------------------- pkgs/development/libraries/pcre/default.nix | 6 +-- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/pcre/CVE-2017-7186.patch diff --git a/pkgs/development/libraries/pcre/CVE-2017-7186.patch b/pkgs/development/libraries/pcre/CVE-2017-7186.patch deleted file mode 100644 index e9e1997e47c..00000000000 --- a/pkgs/development/libraries/pcre/CVE-2017-7186.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/pcre_internal.h 2016/05/21 13:34:44 1649 -+++ b/pcre_internal.h 2017/02/24 17:30:30 1688 -@@ -2772,6 +2772,9 @@ - extern const pcre_uint16 PRIV(ucd_stage2)[]; - extern const pcre_uint32 PRIV(ucp_gentype)[]; - extern const pcre_uint32 PRIV(ucp_gbtable)[]; -+#ifdef COMPILE_PCRE32 -+extern const ucd_record PRIV(dummy_ucd_record)[]; -+#endif - #ifdef SUPPORT_JIT - extern const int PRIV(ucp_typerange)[]; - #endif -@@ -2780,9 +2783,15 @@ - /* UCD access macros */ - - #define UCD_BLOCK_SIZE 128 --#define GET_UCD(ch) (PRIV(ucd_records) + \ -+#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ - PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ - UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) -+ -+#ifdef COMPILE_PCRE32 -+#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) -+#else -+#define GET_UCD(ch) REAL_GET_UCD(ch) -+#endif - - #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype - #define UCD_SCRIPT(ch) GET_UCD(ch)->script ---- a/pcre_ucd.c 2014/06/19 07:51:39 1490 -+++ b/pcre_ucd.c 2017/02/24 17:30:30 1688 -@@ -38,6 +38,20 @@ - const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0}; - #else - -+/* If the 32-bit library is run in non-32-bit mode, character values -+greater than 0x10ffff may be encountered. For these we set up a -+special record. */ -+ -+#ifdef COMPILE_PCRE32 -+const ucd_record PRIV(dummy_ucd_record)[] = {{ -+ ucp_Common, /* script */ -+ ucp_Cn, /* type unassigned */ -+ ucp_gbOther, /* grapheme break property */ -+ 0, /* case set */ -+ 0, /* other case */ -+ }}; -+#endif -+ - /* When recompiling tables with a new Unicode version, please check the - types in this structure definition from pcre_internal.h (the actual - field names will be different): diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index d19410f735f..e6055151301 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; let - version = "8.40"; + version = "8.41"; pname = if (variant == null) then "pcre" else if (variant == "cpp") then "pcre-cpp" else variant; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; - sha256 = "1x7lpjn7jhk0n3sdvggxrlrhab8kkfjwl7qix0ypw9nlx8lpmqh0"; + sha256 = "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76"; }; outputs = [ "bin" "dev" "out" "doc" "man" ]; @@ -31,8 +31,6 @@ in stdenv.mkDerivation rec { ] ++ optional (variant != null) "--enable-${variant}"; - patches = [ ./CVE-2017-7186.patch ]; - buildInputs = optional (hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads; doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform; From 367a3e45fd9a7c820871ae82b185f63208e1ccf0 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 30 Oct 2017 14:19:24 +0100 Subject: [PATCH 1992/2806] highlight: 3.39 -> 3.40, fetch src from Github --- pkgs/tools/text/highlight/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 71c5e352b94..275d65e7c37 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, getopt, lua, boost, pkgconfig, gcc }: +{ stdenv, fetchFromGitHub, getopt, lua, boost, pkgconfig, gcc }: with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.39"; + version = "3.40"; - src = fetchurl { - url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "0z8gs69sqlyis4kvl8wwdgzywi199k73kkvn1mf9pf60npvcxwj4"; + src = fetchFromGitHub { + owner = "andre-simon"; + repo = "highlight"; + rev = "${version}"; + sha256 = "0bkywhz4y10qcajimdha1ck5mvn7fsrv3yn8nd6rqbva39gbfmfd"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; @@ -28,6 +30,6 @@ stdenv.mkDerivation rec { description = "Source code highlighting tool"; homepage = http://www.andre-simon.de/doku/highlight/en/highlight.php; platforms = platforms.unix; - maintainers = [ maintainers.ndowens ]; + maintainers = with maintainers; [ ndowens willibutz ]; }; } From d22a1f6abcc2753f34a75d93bd52bbe2b387fcba Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 31 Oct 2017 03:08:36 +0900 Subject: [PATCH 1993/2806] pandas: 0.20.3 -> 0.21.0 Now needs 'moto' to complete tests. --- pkgs/development/python-modules/pandas/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 7bab184bb2a..2cbb67545a0 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -8,6 +8,7 @@ , cython , dateutil , scipy +, moto , numexpr , pytz , xlrd @@ -27,12 +28,12 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.20.3"; + version = "0.21.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a777e07633d83d546c55706420179551c8e01075b53c497dcf8ae4036766bc66"; + sha256 = "0nf50ls2cnlsd2635nyji7l70xc91dw81qg5y01g5sifwwqcpmaw"; }; LC_ALL = "en_US.UTF-8"; @@ -64,6 +65,7 @@ in buildPythonPackage rec { "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" ''; + checkInputs = [ moto ]; checkPhase = '' runHook preCheck '' From da866a6f2969418cb542120372eda5103516b9b3 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Mon, 30 Oct 2017 08:57:54 -0600 Subject: [PATCH 1994/2806] jenkins: 2.86 -> 2.87 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index de0321109d7..e6f01ba5c93 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.86"; + version = "2.87"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "198fcj2wkz8qxawk3mq29kwl51pxlbd7ivndcpvdvg42g0caqyi0"; + sha256 = "1nzs9nn1nr2jav59v1xj39rzmrh1zmwaqnpaiqsll8kixkr9rb8f"; }; buildCommand = '' From abbea503b9e23eae7fa711799e0c63f9080a8ef2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 30 Oct 2017 15:13:09 +0000 Subject: [PATCH 1995/2806] CODEOWNERS: add zimbatm to ruby modules --- .github/CODEOWNERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 124a1d19ecb..00e058eb84b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -34,6 +34,10 @@ pkgs/development/haskell-modules/hoogle.nix @peti pkgs/applications/science/math/R @peti pkgs/development/r-modules @peti +# Ruby +pkgs/development/interpreters/ruby @zimbatm +pkgs/development/ruby-modules @zimbatm + # Darwin-related /pkgs/stdenv/darwin/ @org/darwin-maintainers /pkgs/os-specific/darwin/ @org/darwin-maintainers From 0a46a71a6ec41764b118a24e4cbf1b4bc4be906e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 30 Oct 2017 15:14:24 +0000 Subject: [PATCH 1996/2806] gitAndTools.git-codeowners: init at 0.1.1 --- .../git-and-tools/default.nix | 2 ++ .../git-and-tools/git-codeowners/default.nix | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 82846a564cd..58a9e808923 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -58,6 +58,8 @@ rec { # support for bugzilla git-bz = callPackage ./git-bz { }; + git-codeowners = callPackage ./git-codeowners { }; + git-cola = callPackage ./git-cola { }; git-crypt = callPackage ./git-crypt { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix new file mode 100644 index 00000000000..07e0ce80c5d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix @@ -0,0 +1,21 @@ +{ lib, rustPlatform, fetchFromGitHub }: +rustPlatform.buildRustPackage rec { + name = "git-codeowners-${version}"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "softprops"; + repo = "git-codeowners"; + rev = "v${version}"; + sha256 = "0imxbi6y1165bi2rik0n98v79fkgp8alb615qh41idg1p2krzyy5"; + }; + + cargoSha256 = "0h831rf5vlvpzfm4sr3fvwlc0ys776fqis90y414mczphkxvz437"; + + meta = with lib; { + homepage = "https://github.com/softprops/git-codeowners"; + description = "a git extension to work with CODEOWNERS files"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; +} From 029522249bce9a5e217247a9a961f9931f4a79f1 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 16 Oct 2017 15:09:23 +0200 Subject: [PATCH 1997/2806] gnumake: fix occasional hangs in parallel builds https://savannah.gnu.org/bugs/?49014 https://savannah.gnu.org/bugs/?51159 --- .../build-managers/gnumake/4.2/default.nix | 1 + .../build-managers/gnumake/4.2/pselect.patch | 170 ++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 253aadb86d7..7914d8ebb4f 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for # included Makefiles, don't look in /usr/include and friends. ./impure-dirs.patch + ./pselect.patch ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch new file mode 100644 index 00000000000..5a03acb2f7c --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch @@ -0,0 +1,170 @@ +From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001 +From: Paul Smith +Date: Sat, 3 Jun 2017 16:20:51 -0400 +Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs. + +* posixos.c (set_blocking): Set blocking on a file descriptor. +(jobserver_setup): Set non-blocking on the jobserver read side. +(jobserver_parse_auth): Ditto. +(jobserver_acquire_all): Set blocking to avoid a busy-wait loop. +(jobserver_acquire): If the non-blocking read() returns without +taking a token then try again. +--- + posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 71 insertions(+), 26 deletions(-) + +diff --git posixos.c posixos.c +index e642d7f..dbafa51 100644 +--- posixos.c ++++ posixos.c +@@ -62,6 +62,24 @@ make_job_rfd (void) + #endif + } + ++static void ++set_blocking (int fd, int blocking) ++{ ++ // If we're not using pselect() don't change the blocking ++#ifdef HAVE_PSELECT ++ int flags; ++ EINTRLOOP (flags, fcntl (fd, F_GETFL)); ++ if (flags >= 0) ++ { ++ int r; ++ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK); ++ EINTRLOOP (r, fcntl (fd, F_SETFL, flags)); ++ if (r < 0) ++ pfatal_with_name ("fcntl(O_NONBLOCK)"); ++ } ++#endif ++} ++ + unsigned int + jobserver_setup (int slots) + { +@@ -86,6 +104,9 @@ jobserver_setup (int slots) + pfatal_with_name (_("init jobserver pipe")); + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth) + return 0; + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -169,7 +193,10 @@ jobserver_acquire_all (void) + { + unsigned int tokens = 0; + +- /* Close the write side, so the read() won't hang. */ ++ /* Use blocking reads to wait for all outstanding jobs. */ ++ set_blocking (job_fds[0], 1); ++ ++ /* Close the write side, so the read() won't hang forever. */ + close (job_fds[1]); + job_fds[1] = -1; + +@@ -236,18 +263,12 @@ jobserver_pre_acquire (void) + unsigned int + jobserver_acquire (int timeout) + { +- sigset_t empty; +- fd_set readfds; + struct timespec spec; + struct timespec *specp = NULL; +- int r; +- char intake; ++ sigset_t empty; + + sigemptyset (&empty); + +- FD_ZERO (&readfds); +- FD_SET (job_fds[0], &readfds); +- + if (timeout) + { + /* Alarm after one second (is this too granular?) */ +@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) + specp = &spec; + } + +- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); +- +- if (r == -1) ++ while (1) + { +- /* Better be SIGCHLD. */ +- if (errno != EINTR) +- pfatal_with_name (_("pselect jobs pipe")); +- return 0; +- } ++ fd_set readfds; ++ int r; ++ char intake; + +- if (r == 0) +- /* Timeout. */ +- return 0; ++ FD_ZERO (&readfds); ++ FD_SET (job_fds[0], &readfds); + +- /* The read FD is ready: read it! */ +- EINTRLOOP (r, read (job_fds[0], &intake, 1)); +- if (r < 0) +- pfatal_with_name (_("read jobs pipe")); ++ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); ++ if (r < 0) ++ switch (errno) ++ { ++ case EINTR: ++ /* SIGCHLD will show up as an EINTR. */ ++ return 0; ++ ++ case EBADF: ++ /* Someone closed the jobs pipe. ++ That shouldn't happen but if it does we're done. */ ++ O (fatal, NILF, _("job server shut down")); + +- /* What does it mean if read() returns 0? It shouldn't happen because only +- the master make can reap all the tokens and close the write side...?? */ +- return r > 0; ++ default: ++ pfatal_with_name (_("pselect jobs pipe")); ++ } ++ ++ if (r == 0) ++ /* Timeout. */ ++ return 0; ++ ++ /* The read FD is ready: read it! This is non-blocking. */ ++ EINTRLOOP (r, read (job_fds[0], &intake, 1)); ++ ++ if (r < 0) ++ { ++ /* Someone sniped our token! Try again. */ ++ if (errno == EAGAIN) ++ continue; ++ ++ pfatal_with_name (_("read jobs pipe")); ++ } ++ ++ /* read() should never return 0: only the master make can reap all the ++ tokens and close the write side...?? */ ++ return r > 0; ++ } + } + + #else +-- +cgit v1.0-41-gc330 + From 4a4f6ba41878d514d7c2616c85242ff31a13a06b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 30 Oct 2017 15:20:54 +0000 Subject: [PATCH 1998/2806] CODEOWNERS: fix path matching --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 00e058eb84b..bd24a2e0cab 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -35,8 +35,8 @@ pkgs/applications/science/math/R @peti pkgs/development/r-modules @peti # Ruby -pkgs/development/interpreters/ruby @zimbatm -pkgs/development/ruby-modules @zimbatm +pkgs/development/interpreters/ruby/* @zimbatm +pkgs/development/ruby-modules/* @zimbatm # Darwin-related /pkgs/stdenv/darwin/ @org/darwin-maintainers From febe376f13b7b57de26af5af271ddcb565a25d74 Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Mon, 30 Oct 2017 16:48:26 +0100 Subject: [PATCH 1999/2806] fetchadc: removed It's not being used --- pkgs/build-support/fetchadc/builder.sh | 7 ----- pkgs/build-support/fetchadc/default.nix | 36 ------------------------- pkgs/top-level/all-packages.nix | 9 ------- 3 files changed, 52 deletions(-) delete mode 100644 pkgs/build-support/fetchadc/builder.sh delete mode 100644 pkgs/build-support/fetchadc/default.nix diff --git a/pkgs/build-support/fetchadc/builder.sh b/pkgs/build-support/fetchadc/builder.sh deleted file mode 100644 index ceeaa9213d6..00000000000 --- a/pkgs/build-support/fetchadc/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -loginpage=`curl --insecure -s -L -b cookies.txt "$url"` - -[[ $loginpage =~ form[^\>]+action=\"([^\"]+)\" ]] && loginurl=${BASH_REMATCH[1]} - -curl --insecure -s --output "$out" -L -b cookies.txt --data "appleId=${adc_user}&accountPassword=${adc_pass}" "https://idmsa.apple.com/IDMSWebAuth/${loginurl}" diff --git a/pkgs/build-support/fetchadc/default.nix b/pkgs/build-support/fetchadc/default.nix deleted file mode 100644 index 4d759e6f7f1..00000000000 --- a/pkgs/build-support/fetchadc/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, curl, adc_user, adc_pass }: - -{ # Path to fetch. - path - - # Hash of the downloaded file -, sha256 - -, # Additional curl options needed for the download to succeed. - curlOpts ? "" - -, # Name of the file. If empty, use the basename of `path'. - name ? "" -}: - -stdenv.mkDerivation { - url = "https://developer.apple.com/downloads/download.action?path=${path}"; - - name = if name != "" then name else baseNameOf path; - builder = ./builder.sh; - - buildInputs = [ curl ]; - - meta = { - # Password-guarded files from ADC are certainly unfree, as far as we're concerned! - license = stdenv.lib.licenses.unfree; - }; - - outputHashAlgo = "sha256"; - outputHash = sha256; - outputHashMode = "flat"; - - inherit curlOpts adc_user adc_pass; - - preferLocalBuild = true; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 762f217fcbe..e833d3dec09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -126,15 +126,6 @@ with pkgs; vs = vs90wrapper; }; - fetchadc = callPackage ../build-support/fetchadc { - adc_user = if config ? adc_user - then config.adc_user - else throw "You need an adc_user attribute in your config to download files from Apple Developer Connection"; - adc_pass = if config ? adc_pass - then config.adc_pass - else throw "You need an adc_pass attribute in your config to download files from Apple Developer Connection"; - }; - fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; From a2fe432e2c9262b62d0f853b9965ef08de3408bc Mon Sep 17 00:00:00 2001 From: Kai Harries Date: Sun, 29 Oct 2017 21:15:10 +0100 Subject: [PATCH 2000/2806] gmailieer: init at 0.3 --- .../networking/gmailieer/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/networking/gmailieer/default.nix diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix new file mode 100644 index 00000000000..b3a9634c8a1 --- /dev/null +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "gmailieer"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "gauteh"; + repo = "gmailieer"; + rev = "v${version}"; + sha256 = "1app783gf0p9p196nqsgbyl6s1bp304dfav86fqiq86h1scld787"; + }; + + propagatedBuildInputs = with python3Packages; [ + notmuch + oauth2client + google_api_python_client + tqdm + ]; + + meta = with stdenv.lib; { + description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail"; + longDescription = '' + This program can pull email and labels (and changes to labels) + from your GMail account and store them locally in a maildir with + the labels synchronized with a notmuch database. The changes to + tags in the notmuch database may be pushed back remotely to your + GMail account. + ''; + homepage = https://github.com/gauteh/gmailieer; + repositories.git = https://github.com/gauteh/gmailieer.git; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kaiha ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89e59463bd..f644ee5a527 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12270,6 +12270,8 @@ with pkgs; gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; + gmailieer = callPackage ../applications/networking/gmailieer {}; + gpm = callPackage ../servers/gpm { ncurses = null; # Keep curses disabled for lack of value }; From 821a7a38ea293d4711c20f95cdfb368acc632f9d Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Mon, 30 Oct 2017 16:42:58 +0100 Subject: [PATCH 2001/2806] prometheus-alertmanager: 0.8.0 -> 0.9.1 --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 3ae2a45ca6d..444aa92ec2e 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.8.0"; + version = "0.9.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0bqc58j0nrq7y8nbd927z7x74m8mcd2782cxkqwscpq6d9983qql"; + sha256 = "1lkfj63pp4jf58xmn015r7s42p1wyj6fryihpmdn0k76b0ccwqzj"; }; # Tests exist, but seem to clash with the firewall. From c3255fe8ec326d2c8fe9462d49ed83aa64d3e68f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Oct 2017 17:17:07 +0100 Subject: [PATCH 2002/2806] fetchzip and friends: Set "name" to "source" by default This makes them produce the same store paths as builtins.fetchgit, builtins.fetchTarball etc. See https://github.com/NixOS/nix/commit/65b5f177b5fbb1b0778ede047a13a3cee9c59cfe. --- pkgs/build-support/fetchgit/gitrepotoname.nix | 19 ------------------- pkgs/build-support/fetchzip/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 12 +++++------- 3 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 pkgs/build-support/fetchgit/gitrepotoname.nix diff --git a/pkgs/build-support/fetchgit/gitrepotoname.nix b/pkgs/build-support/fetchgit/gitrepotoname.nix deleted file mode 100644 index 90005b54569..00000000000 --- a/pkgs/build-support/fetchgit/gitrepotoname.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib }: - -let - inherit (lib) removeSuffix hasPrefix removePrefix splitString stringToCharacters concatMapStrings last elem; - - allowedChars = stringToCharacters "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-._?="; - sanitizeStoreName = s: - let - s' = concatMapStrings (c: if elem c allowedChars then c else "") (stringToCharacters s); - s'' = if hasPrefix "." s' then "_${removePrefix "." s'}" else s'; - in - s''; -in - urlOrRepo: rev: - let - repo' = last (splitString ":" (baseNameOf (removeSuffix ".git" (removeSuffix "/" urlOrRepo)))); - rev' = baseNameOf rev; - in - "${sanitizeStoreName repo'}-${sanitizeStoreName rev'}-src" diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 751dba56930..4a5381d71f2 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -11,10 +11,11 @@ stripRoot ? true , url , extraPostFetch ? "" +, name ? "source" , ... } @ args: lib.overrideDerivation (fetchurl ({ - name = args.name or (baseNameOf url); + inherit name; recursiveHash = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69f1dfc88a4..7295ce09c23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -195,10 +195,8 @@ with pkgs; fetchzip = callPackage ../build-support/fetchzip { }; - gitRepoToName = callPackage ../build-support/fetchgit/gitrepotoname.nix { }; - fetchFromGitHub = { - owner, repo, rev, name ? gitRepoToName repo rev, + owner, repo, rev, name ? "source", fetchSubmodules ? false, private ? false, githubBase ? "github.com", varPrefix ? null, ... # For hash agility @@ -231,7 +229,7 @@ with pkgs; in fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; }; fetchFromBitbucket = { - owner, repo, rev, name ? gitRepoToName repo rev, + owner, repo, rev, name ? "source", ... # For hash agility }@args: fetchzip ({ inherit name; @@ -242,7 +240,7 @@ with pkgs; # cgit example, snapshot support is optional in cgit fetchFromSavannah = { - repo, rev, name ? gitRepoToName repo rev, + repo, rev, name ? "source", ... # For hash agility }@args: fetchzip ({ inherit name; @@ -252,7 +250,7 @@ with pkgs; # gitlab example fetchFromGitLab = { - owner, repo, rev, name ? gitRepoToName repo rev, + owner, repo, rev, name ? "source", ... # For hash agility }@args: fetchzip ({ inherit name; @@ -262,7 +260,7 @@ with pkgs; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { - repo, rev, name ? gitRepoToName repo rev, + repo, rev, name ? "source", ... # For hash agility }@args: fetchzip ({ inherit name; From ecdf4f1c51c0b1093b06c17fce29f6778ee6934f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Oct 2017 12:16:49 +0100 Subject: [PATCH 2003/2806] php56: 5.6.31 -> 5.6.32 --- 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 57383fa3412..578b4d41901 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -326,8 +326,8 @@ let in { php56 = generic { - version = "5.6.31"; - sha256 = "03xixkvfp64bqp97p8vlj3hp63bpjw7hc16b7fgm7w35rdlp2fcg"; + version = "5.6.32"; + sha256 = "0lfbmdkvijkm6xc4p9sykv66y8xwhws0vsmka8v5cax4bxx4xr1y"; }; php70 = generic { From 3975f267abc305d4a197fe96c0cf5f49cbfc6d7d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Oct 2017 12:17:06 +0100 Subject: [PATCH 2004/2806] php70: 7.0.24 -> 7.0.25 --- 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 578b4d41901..b72a6886178 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -331,8 +331,8 @@ in { }; php70 = generic { - version = "7.0.24"; - sha256 = "06fgpljz6xpxxkpf4cv9rqz8g504l9ikbw5aq0hqh5sgd611kycv"; + version = "7.0.25"; + sha256 = "09fc2lj447phprvilvq2sb6n0r1snj142f8faphrd896s6b4v8lm"; }; php71 = generic { From f41f5a8f77a09f9629b86d88f6a6b514e416d155 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Oct 2017 12:17:30 +0100 Subject: [PATCH 2005/2806] php71: 7.1.9 -> 7.1.11 --- 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 b72a6886178..be9aab50cb9 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -336,7 +336,7 @@ in { }; php71 = generic { - version = "7.1.9"; - sha256 = "1blvzm2js8mrdbmwks0v6nlb5wj4789ixzmlxm1l8z6xvw8cqk9i"; + version = "7.1.11"; + sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn"; }; } From 517606d1d4872c3b8b1a42796d572a7420fe1489 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Oct 2017 13:55:46 +0100 Subject: [PATCH 2006/2806] Revert "linux_4_4: remove" This reverts commit 9f3f575ab3eb4cd6b5f8de20e6f1a5374fedef2c. Support from upstream has been extended to Feb 2022. --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 14 ++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.4.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix new file mode 100644 index 00000000000..16699dcdf43 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -0,0 +1,18 @@ +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.4.80"; + extraMeta.branch = "4.4"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1hs07k49sbpi8yw2mdwn1967i82x4wn6kg0lbjvv5l1pv3alky1l"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e833d3dec09..6c0f6726450 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12435,6 +12435,19 @@ with pkgs; ]; }; + linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes + kernelPatches.cpu-cgroup-v2."4.4" + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12657,6 +12670,7 @@ with pkgs; linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; + linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_13); # Don't forget to update linuxPackages_latest! From 36be7d3e85fedcac31964e311de9d2d1b087767a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Oct 2017 14:00:14 +0100 Subject: [PATCH 2007/2806] Revert parts of "linux: remove unused kernel patches" This reverts commit 05b8cae9ec88156f46d9b98424643b6208664222 that removed the cgroup v2 patch for the 4.4 kernel. --- .../kernel/cpu-cgroup-v2-patches/4.4.patch | 407 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 408 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch new file mode 100644 index 00000000000..8f2418c9efc --- /dev/null +++ b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch @@ -0,0 +1,407 @@ +commit e7cae741f6d645ac68fe8823ca6ef45dbbf6891b +Author: Tejun Heo +Date: Fri Mar 11 07:31:23 2016 -0500 + + sched: Misc preps for cgroup unified hierarchy interface + + Make the following changes in preparation for the cpu controller + interface implementation for the unified hierarchy. This patch + doesn't cause any functional differences. + + * s/cpu_stats_show()/cpu_cfs_stats_show()/ + + * s/cpu_files/cpu_legacy_files/ + + * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While + at it, remove pointless cpuacct_stat_desc[] array. + + Signed-off-by: Tejun Heo + Cc: Ingo Molnar + Cc: Peter Zijlstra + Cc: Li Zefan + Cc: Johannes Weiner + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 732e993..77f3ddd 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -8512,7 +8512,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) + return ret; + } + +-static int cpu_stats_show(struct seq_file *sf, void *v) ++static int cpu_cfs_stats_show(struct seq_file *sf, void *v) + { + struct task_group *tg = css_tg(seq_css(sf)); + struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; +@@ -8552,7 +8552,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, + } + #endif /* CONFIG_RT_GROUP_SCHED */ + +-static struct cftype cpu_files[] = { ++static struct cftype cpu_legacy_files[] = { + #ifdef CONFIG_FAIR_GROUP_SCHED + { + .name = "shares", +@@ -8573,7 +8573,7 @@ static struct cftype cpu_files[] = { + }, + { + .name = "stat", +- .seq_show = cpu_stats_show, ++ .seq_show = cpu_cfs_stats_show, + }, + #endif + #ifdef CONFIG_RT_GROUP_SCHED +@@ -8599,7 +8599,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { + .fork = cpu_cgroup_fork, + .can_attach = cpu_cgroup_can_attach, + .attach = cpu_cgroup_attach, +- .legacy_cftypes = cpu_files, ++ .legacy_cftypes = cpu_legacy_files, + .early_init = 1, + }; + +diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c +index dd7cbb5..42b2dd5 100644 +--- a/kernel/sched/cpuacct.c ++++ b/kernel/sched/cpuacct.c +@@ -177,36 +177,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V) + return 0; + } + +-static const char * const cpuacct_stat_desc[] = { +- [CPUACCT_STAT_USER] = "user", +- [CPUACCT_STAT_SYSTEM] = "system", +-}; +- +-static int cpuacct_stats_show(struct seq_file *sf, void *v) ++static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp) + { +- struct cpuacct *ca = css_ca(seq_css(sf)); + int cpu; +- s64 val = 0; + ++ *userp = 0; + for_each_online_cpu(cpu) { + struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); +- val += kcpustat->cpustat[CPUTIME_USER]; +- val += kcpustat->cpustat[CPUTIME_NICE]; ++ *userp += kcpustat->cpustat[CPUTIME_USER]; ++ *userp += kcpustat->cpustat[CPUTIME_NICE]; + } +- val = cputime64_to_clock_t(val); +- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val); + +- val = 0; ++ *sysp = 0; + for_each_online_cpu(cpu) { + struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); +- val += kcpustat->cpustat[CPUTIME_SYSTEM]; +- val += kcpustat->cpustat[CPUTIME_IRQ]; +- val += kcpustat->cpustat[CPUTIME_SOFTIRQ]; ++ *sysp += kcpustat->cpustat[CPUTIME_SYSTEM]; ++ *sysp += kcpustat->cpustat[CPUTIME_IRQ]; ++ *sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ]; + } ++} + +- val = cputime64_to_clock_t(val); +- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val); ++static int cpuacct_stats_show(struct seq_file *sf, void *v) ++{ ++ cputime64_t user, sys; + ++ cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys); ++ seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user)); ++ seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys)); + return 0; + } + + +commit 1bb33e8a69f089f2d3f58a0e681d4ff352e11c97 +Author: Tejun Heo +Date: Fri Mar 11 07:31:23 2016 -0500 + + sched: Implement interface for cgroup unified hierarchy + + While the cpu controller doesn't have any functional problems, there + are a couple interface issues which can be addressed in the v2 + interface. + + * cpuacct being a separate controller. This separation is artificial + and rather pointless as demonstrated by most use cases co-mounting + the two controllers. It also forces certain information to be + accounted twice. + + * Use of different time units. Writable control knobs use + microseconds, some stat fields use nanoseconds while other cpuacct + stat fields use centiseconds. + + * Control knobs which can't be used in the root cgroup still show up + in the root. + + * Control knob names and semantics aren't consistent with other + controllers. + + This patchset implements cpu controller's interface on the unified + hierarchy which adheres to the controller file conventions described + in Documentation/cgroups/unified-hierarchy.txt. Overall, the + following changes are made. + + * cpuacct is implictly enabled and disabled by cpu and its information + is reported through "cpu.stat" which now uses microseconds for all + time durations. All time duration fields now have "_usec" appended + to them for clarity. While this doesn't solve the double accounting + immediately, once majority of users switch to v2, cpu can directly + account and report the relevant stats and cpuacct can be disabled on + the unified hierarchy. + + Note that cpuacct.usage_percpu is currently not included in + "cpu.stat". If this information is actually called for, it can be + added later. + + * "cpu.shares" is replaced with "cpu.weight" and operates on the + standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). + The weight is scaled to scheduler weight so that 100 maps to 1024 + and the ratio relationship is preserved - if weight is W and its + scaled value is S, W / 100 == S / 1024. While the mapped range is a + bit smaller than the orignal scheduler weight range, the dead zones + on both sides are relatively small and covers wider range than the + nice value mappings. This file doesn't make sense in the root + cgroup and isn't create on root. + + * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" + which contains both quota and period. + + * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by + "cpu.rt.max" which contains both runtime and period. + + v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for + CFS bandwidth stats and also using raw division for u64. Use + CONFIG_CFS_BANDWITH and do_div() instead. + + The semantics of "cpu.rt.max" is not fully decided yet. Dropped + for now. + + Signed-off-by: Tejun Heo + Cc: Ingo Molnar + Cc: Peter Zijlstra + Cc: Li Zefan + Cc: Johannes Weiner + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 77f3ddd..7aafe63 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -8591,6 +8591,139 @@ static struct cftype cpu_legacy_files[] = { + { } /* terminate */ + }; + ++static int cpu_stats_show(struct seq_file *sf, void *v) ++{ ++ cpuacct_cpu_stats_show(sf); ++ ++#ifdef CONFIG_CFS_BANDWIDTH ++ { ++ struct task_group *tg = css_tg(seq_css(sf)); ++ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; ++ u64 throttled_usec; ++ ++ throttled_usec = cfs_b->throttled_time; ++ do_div(throttled_usec, NSEC_PER_USEC); ++ ++ seq_printf(sf, "nr_periods %d\n" ++ "nr_throttled %d\n" ++ "throttled_usec %llu\n", ++ cfs_b->nr_periods, cfs_b->nr_throttled, ++ throttled_usec); ++ } ++#endif ++ return 0; ++} ++ ++#ifdef CONFIG_FAIR_GROUP_SCHED ++static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, ++ struct cftype *cft) ++{ ++ struct task_group *tg = css_tg(css); ++ u64 weight = scale_load_down(tg->shares); ++ ++ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); ++} ++ ++static int cpu_weight_write_u64(struct cgroup_subsys_state *css, ++ struct cftype *cftype, u64 weight) ++{ ++ /* ++ * cgroup weight knobs should use the common MIN, DFL and MAX ++ * values which are 1, 100 and 10000 respectively. While it loses ++ * a bit of range on both ends, it maps pretty well onto the shares ++ * value used by scheduler and the round-trip conversions preserve ++ * the original value over the entire range. ++ */ ++ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) ++ return -ERANGE; ++ ++ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); ++ ++ return sched_group_set_shares(css_tg(css), scale_load(weight)); ++} ++#endif ++ ++static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, ++ long period, long quota) ++{ ++ if (quota < 0) ++ seq_puts(sf, "max"); ++ else ++ seq_printf(sf, "%ld", quota); ++ ++ seq_printf(sf, " %ld\n", period); ++} ++ ++/* caller should put the current value in *@periodp before calling */ ++static int __maybe_unused cpu_period_quota_parse(char *buf, ++ u64 *periodp, u64 *quotap) ++{ ++ char tok[21]; /* U64_MAX */ ++ ++ if (!sscanf(buf, "%s %llu", tok, periodp)) ++ return -EINVAL; ++ ++ *periodp *= NSEC_PER_USEC; ++ ++ if (sscanf(tok, "%llu", quotap)) ++ *quotap *= NSEC_PER_USEC; ++ else if (!strcmp(tok, "max")) ++ *quotap = RUNTIME_INF; ++ else ++ return -EINVAL; ++ ++ return 0; ++} ++ ++#ifdef CONFIG_CFS_BANDWIDTH ++static int cpu_max_show(struct seq_file *sf, void *v) ++{ ++ struct task_group *tg = css_tg(seq_css(sf)); ++ ++ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); ++ return 0; ++} ++ ++static ssize_t cpu_max_write(struct kernfs_open_file *of, ++ char *buf, size_t nbytes, loff_t off) ++{ ++ struct task_group *tg = css_tg(of_css(of)); ++ u64 period = tg_get_cfs_period(tg); ++ u64 quota; ++ int ret; ++ ++ ret = cpu_period_quota_parse(buf, &period, "a); ++ if (!ret) ++ ret = tg_set_cfs_bandwidth(tg, period, quota); ++ return ret ?: nbytes; ++} ++#endif ++ ++static struct cftype cpu_files[] = { ++ { ++ .name = "stat", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .seq_show = cpu_stats_show, ++ }, ++#ifdef CONFIG_FAIR_GROUP_SCHED ++ { ++ .name = "weight", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .read_u64 = cpu_weight_read_u64, ++ .write_u64 = cpu_weight_write_u64, ++ }, ++#endif ++#ifdef CONFIG_CFS_BANDWIDTH ++ { ++ .name = "max", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .seq_show = cpu_max_show, ++ .write = cpu_max_write, ++ }, ++#endif ++ { } /* terminate */ ++}; ++ + struct cgroup_subsys cpu_cgrp_subsys = { + .css_alloc = cpu_cgroup_css_alloc, + .css_free = cpu_cgroup_css_free, +@@ -8600,7 +8733,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { + .can_attach = cpu_cgroup_can_attach, + .attach = cpu_cgroup_attach, + .legacy_cftypes = cpu_legacy_files, ++ .dfl_cftypes = cpu_files, + .early_init = 1, ++#ifdef CONFIG_CGROUP_CPUACCT ++ /* ++ * cpuacct is enabled together with cpu on the unified hierarchy ++ * and its stats are reported through "cpu.stat". ++ */ ++ .depends_on = 1 << cpuacct_cgrp_id, ++#endif + }; + + #endif /* CONFIG_CGROUP_SCHED */ +diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c +index 42b2dd5..b4d32a6 100644 +--- a/kernel/sched/cpuacct.c ++++ b/kernel/sched/cpuacct.c +@@ -224,6 +224,30 @@ static struct cftype files[] = { + { } /* terminate */ + }; + ++/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ ++void cpuacct_cpu_stats_show(struct seq_file *sf) ++{ ++ struct cgroup_subsys_state *css; ++ u64 usage, user, sys; ++ ++ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); ++ ++ usage = cpuusage_read(css, seq_cft(sf)); ++ cpuacct_stats_read(css_ca(css), &user, &sys); ++ ++ user *= TICK_NSEC; ++ sys *= TICK_NSEC; ++ do_div(usage, NSEC_PER_USEC); ++ do_div(user, NSEC_PER_USEC); ++ do_div(sys, NSEC_PER_USEC); ++ ++ seq_printf(sf, "usage_usec %llu\n" ++ "user_usec %llu\n" ++ "system_usec %llu\n", usage, user, sys); ++ ++ css_put(css); ++} ++ + /* + * charge this task's execution time to its accounting group. + * +diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h +index ed60562..44eace9 100644 +--- a/kernel/sched/cpuacct.h ++++ b/kernel/sched/cpuacct.h +@@ -2,6 +2,7 @@ + + extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); + extern void cpuacct_account_field(struct task_struct *p, int index, u64 val); ++extern void cpuacct_cpu_stats_show(struct seq_file *sf); + + #else + +@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *p, int index, u64 val) + { + } + ++static inline void cpuacct_cpu_stats_show(struct seq_file *sf) ++{ ++} ++ + #endif diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c0f6726450..04e35a02d81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12440,6 +12440,7 @@ with pkgs; [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes kernelPatches.cpu-cgroup-v2."4.4" + kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From 0a5ecde8085122835a9c8ffa2025e8ccb49ddb14 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Oct 2017 14:03:10 +0100 Subject: [PATCH 2008/2806] linux: 4.4.80 -> 4.4.95 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 16699dcdf43..a695fe34cd6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,18 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.80"; + version = "4.4.95"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hs07k49sbpi8yw2mdwn1967i82x4wn6kg0lbjvv5l1pv3alky1l"; + sha256 = "07vkxhh435gilxsh9ag6zvf2r9k5l9ffqp72900c50nsfjrdgdrx"; }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; } // (args.argsOverride or {})) From bfbe560411271e52fb1e0231a6d569bc3b5620b5 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 14 Sep 2017 13:11:16 +0200 Subject: [PATCH 2009/2806] ibus: fix emoji hashes --- pkgs/tools/inputmethods/ibus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 69ac0ad3ef6..3fd29d65f36 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -10,11 +10,11 @@ let srcs = { data = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt"; - sha256 = "0zfn3z61xy76yah3d24dd745qjssrib009m4nvqpnx4sf1r13i2x"; + sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf"; }; sequences = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt"; - sha256 = "0xzk7hi2a8macx9s5gj2pb36d38y8fa9001sj71g6kw25c2h94cn"; + sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1"; }; variation-sequences = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt"; @@ -22,11 +22,11 @@ let }; zwj-sequences = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt"; - sha256 = "0rrnk94mhm3k9vs74pvyvs4ir7f31f1libx7c196fmdqvp1qfafw"; + sha256 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q"; }; test = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt"; - sha256 = "1dvxw5xp1xiy13c1p1c7l2xc9q8f8znk47kb7q8g7bbgbi21cq5m"; + sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw"; }; }; in stdenv.mkDerivation { From 5d41dda02db3f538fb253056575c151192d4ce41 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Oct 2017 08:40:48 -0400 Subject: [PATCH 2010/2806] cyrus_sasl: Fix CVE-2013-4122 --- pkgs/development/libraries/cyrus-sasl/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 5dbf134cf45..68398e93764 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false }: +{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, + pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false }: with stdenv.lib; stdenv.mkDerivation rec { @@ -21,6 +22,10 @@ stdenv.mkDerivation rec { patches = [ ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 + (fetchpatch { # CVE-2013-4122 + url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff"; + sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2"; + }) ] ++ lib.optional stdenv.isFreeBSD ( fetchurl { url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch"; From 9b0d50e3d0ff4a0ab783159c0efe6de9472fe7ed Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 29 Oct 2017 22:07:48 +0000 Subject: [PATCH 2011/2806] fetchbower: clean common uri characters from version string Some bower.json files have URL dependencies missing a version. Fixes rvl/bower2nix#18 --- pkgs/build-support/fetchbower/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index dd0bac49cb6..3e1f0eff84a 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -4,13 +4,13 @@ let let components = lib.splitString "#" version; hash = lib.last components; - ver = if builtins.length components == 1 then version else hash; + ver = if builtins.length components == 1 then (cleanName version) else hash; in ver; - bowerName = name: lib.replaceStrings ["/"] ["-"] name; + cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name; fetchbower = name: version: target: outputHash: stdenv.mkDerivation { - name = "${bowerName name}-${bowerVersion version}"; + name = "${cleanName name}-${bowerVersion version}"; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildCommand = '' fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" From 9ec640ec70e9ecd1601d4b530db0ce34e9ac84f3 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 30 Oct 2017 12:16:48 +0000 Subject: [PATCH 2012/2806] bower2nix: fix execution under nix-shell --pure bower2nix needs nix to compute store hashes. Fixes rvl/bower2nix#16 --- pkgs/development/node-packages/default-v4.nix | 4 ++-- pkgs/development/node-packages/default-v6.nix | 4 ++-- pkgs/top-level/node-packages.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index 99cb7ca4044..c058154a996 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -1,4 +1,4 @@ -{pkgs, system, nodejs}: +{pkgs, system, nodejs, stdenv}: let nodePackages = import ./composition-v4.nix { @@ -43,7 +43,7 @@ nodePackages // { buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; }); diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 334c79a8267..3deee40812a 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -1,4 +1,4 @@ -{pkgs, system, nodejs}: +{pkgs, system, nodejs, stdenv}: let nodePackages = import ./composition-v6.nix { @@ -41,7 +41,7 @@ nodePackages // { buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; }); diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index d8eb668107b..4f72b420699 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -66,7 +66,7 @@ in rec { bower2nix.buildInputs = [ pkgs.makeWrapper ]; bower2nix.postInstall = '' for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; } // args.overrides or {}; From b93df240781617e0008e41dd8f7f735f6d7f5344 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 30 Oct 2017 09:52:29 +0100 Subject: [PATCH 2013/2806] pari: enable darwin build --- .../science/math/pari/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 64784facfb9..86d4d289c2a 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -14,12 +14,21 @@ stdenv.mkDerivation rec { buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ]; configureScript = "./Configure"; - configureFlags = - "--mt=pthread" + - "--with-gmp=${gmp.dev} " + - "--with-readline=${readline.dev}"; + configureFlags = [ + "--mt=pthread" + "--with-gmp=${gmp.dev}" + "--with-readline=${readline.dev}" + ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin"; - makeFlags = "all"; + preConfigure = '' + export LD=$CC + ''; + + postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + echo 'echo x86_64-darwin' > config/arch-osname + ''; + + makeFlags = [ "all" ]; meta = with stdenv.lib; { description = "Computer algebra system for high-performance number theory computations"; @@ -36,12 +45,12 @@ stdenv.mkDerivation rec { Bordeaux I, France), PARI is now under the GPL and maintained by Karim Belabas with the help of many volunteer contributors. - - PARI is a C library, allowing fast computations. + - PARI is a C library, allowing fast computations. - gp is an easy-to-use interactive shell giving access to the PARI functions. - GP is the name of gp's scripting language. - - gp2c, the GP-to-C compiler, combines the best of both worlds - by compiling GP scripts to the C language and transparently loading + - gp2c, the GP-to-C compiler, combines the best of both worlds + by compiling GP scripts to the C language and transparently loading the resulting functions into gp. (gp2c-compiled scripts will typically run 3 or 4 times faster.) gp2c currently only understands a subset of the GP language. @@ -50,7 +59,7 @@ stdenv.mkDerivation rec { downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes raskin AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; updateWalker = true; }; } From 25c8014a4bd3db23b603f557d0a12b5fc905919a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Oct 2017 13:34:53 -0400 Subject: [PATCH 2014/2806] gradle: 4.2.1 -> 4.3 --- 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 a5ea6df3c8d..bbfcc851307 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.2.1"; + name = "gradle-4.3"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1h7v133rm81jf0bgv9mgvydl7rgh4430dnsfs66wflfay82cqldm"; + sha256 = "0k358y18pp2809kn5il4kv3qvlqrbwmy276bbm3mnmwjxx7g9jwd"; }; }; From 3004b6f150b01af1e4f856097a67ade76c7c949f Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Mon, 30 Oct 2017 18:37:20 +0100 Subject: [PATCH 2015/2806] fetchgitrevision: removed It doesn't work and was last referred to in 5553546c212152a9cea72e1398b088cda78c7b8b --- pkgs/build-support/fetchgitrevision/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 deletions(-) delete mode 100644 pkgs/build-support/fetchgitrevision/default.nix diff --git a/pkgs/build-support/fetchgitrevision/default.nix b/pkgs/build-support/fetchgitrevision/default.nix deleted file mode 100644 index e877648978d..00000000000 --- a/pkgs/build-support/fetchgitrevision/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -runCommand: git: repository: branch: - import (runCommand "head-revision" - { buildInputs = [ git ]; - dummy = builtins.currentTime; - } - '' - rev=$(git ls-remote ${repository} | grep "refs/${branch}$" | awk '{ print $1 }') - echo "[ \"$rev\" ]" > $out - echo Latest revision in ${branch} is $rev - '') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04e35a02d81..2a96fbe6622 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -144,8 +144,6 @@ with pkgs; fetchgitPrivate = callPackage ../build-support/fetchgit/private.nix { }; - fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; - fetchgitLocal = callPackage ../build-support/fetchgitlocal { }; fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); From f7616c4f5e2c869192f353843a31eff7dab68d7f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 16 Feb 2017 22:06:57 +0100 Subject: [PATCH 2016/2806] openntpd: fix constraints feature on NixOS The OpenNTPD constraints feature requires a valid chain of SSL certificates, but the default path in openntpd didn't match the one in NixOS. Unfortunately the configured certificate path becomes hardcoded into the binary, so this feature will likely still fail on other distributions/operating systems, unless the path coincides with the NixOS path or the user sets up a symlink. --- pkgs/tools/networking/openntpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 2b2b441f2f9..7e1c257ec4b 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { "--with-privsep-user=${privsepUser}" "--sysconfdir=/etc" "--localstatedir=/var" + "--with-cacert=/etc/ssl/certs/ca-certificates.crt" ]; buildInputs = [ libressl ]; From 0581038e8e757f05dc1f75df52e7d0c79acea3fc Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 30 Oct 2017 13:49:05 -0400 Subject: [PATCH 2017/2806] nixos/acme: remove doc note about restarting nginx Discussion from #30945 indicates that it is no longer true that you have to restart nginx. --- nixos/modules/security/acme.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 823806f4641..6130ed82ed3 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -89,8 +89,5 @@ services.nginx = { }; } - -At the moment you still have to restart Nginx after the ACME -certs arrive. From 1d56d0c8a79334cd7149fd580512046558eaac78 Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Mon, 30 Oct 2017 17:51:30 +0000 Subject: [PATCH 2018/2806] types.submodule: Fix the NixOS Manual, by escaping the <> symbols. --- lib/types.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index dd0f31e9d14..db3bd381523 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -297,7 +297,7 @@ rec { # This is mandatory as some option declaration might use the # "name" attribute given as argument of the submodule and use it # as the default of option declarations. - args.name = ""; + args.name = "<name>"; }).options; getSubModules = opts'; substSubModules = m: submodule m; From 7bd64e3dee5c687030213c79601ea7da06528765 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 14 Sep 2017 11:16:22 +0200 Subject: [PATCH 2019/2806] cjdns: fix hash .. and switch to fetchFromGitHub to avoid future hash changes. --- pkgs/tools/networking/cjdns/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 11f65ea82b0..d5819639fa2 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }: +{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: let version = "20"; in stdenv.mkDerivation { name = "cjdns-"+version; - src = fetchurl { - url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; - sha256 = "1dyqxi9l2pmrgm16a161909rg3vfzvib40frr7p6ddpk8yfh5888"; + src = fetchFromGitHub { + owner = "cjdelisle"; + repo = "cjdns"; + rev = "cjdns-v${version}"; + sha256 = "0gqcspiz1n0j711vwq807cy456dkcf03r376l04qc92173g2fzrx"; }; buildInputs = [ which python27 nodejs ] ++ From d76572fa89094119ce284d698957680b461a887b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 31 Oct 2017 02:17:02 +0800 Subject: [PATCH 2020/2806] libarchive: Fixes for CVE-2017-14166 and CVE-2017-14502 --- .../libraries/libarchive/CVE-2017-14166.patch | 36 +++++++++++++++++++ .../libraries/libarchive/CVE-2017-14502.patch | 28 +++++++++++++++ .../libraries/libarchive/default.nix | 5 +++ 3 files changed, 69 insertions(+) create mode 100644 pkgs/development/libraries/libarchive/CVE-2017-14166.patch create mode 100644 pkgs/development/libraries/libarchive/CVE-2017-14502.patch diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14166.patch b/pkgs/development/libraries/libarchive/CVE-2017-14166.patch new file mode 100644 index 00000000000..b729ae41e0a --- /dev/null +++ b/pkgs/development/libraries/libarchive/CVE-2017-14166.patch @@ -0,0 +1,36 @@ +From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001 +From: Joerg Sonnenberger +Date: Tue, 5 Sep 2017 18:12:19 +0200 +Subject: [PATCH] Do something sensible for empty strings to make fuzzers + happy. + +--- + libarchive/archive_read_support_format_xar.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c +index 7a22beb9d..93eeacc5e 100644 +--- a/libarchive/archive_read_support_format_xar.c ++++ b/libarchive/archive_read_support_format_xar.c +@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt) + uint64_t l; + int digit; + ++ if (char_cnt == 0) ++ return (0); ++ + l = 0; + digit = *p - '0'; + while (digit >= 0 && digit < 10 && char_cnt-- > 0) { +@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt) + { + int64_t l; + int digit; +- ++ ++ if (char_cnt == 0) ++ return (0); ++ + l = 0; + while (char_cnt-- > 0) { + if (*p >= '0' && *p <= '7') diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14502.patch b/pkgs/development/libraries/libarchive/CVE-2017-14502.patch new file mode 100644 index 00000000000..dad8a93a8a8 --- /dev/null +++ b/pkgs/development/libraries/libarchive/CVE-2017-14502.patch @@ -0,0 +1,28 @@ +From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001 +From: Joerg Sonnenberger +Date: Sat, 9 Sep 2017 17:47:32 +0200 +Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR + archives. + +Reported-By: OSS-Fuzz issue 573 +--- + libarchive/archive_read_support_format_rar.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c +index cbb14c32d..751de6979 100644 +--- a/libarchive/archive_read_support_format_rar.c ++++ b/libarchive/archive_read_support_format_rar.c +@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry, + return (ARCHIVE_FATAL); + } + filename[filename_size++] = '\0'; +- filename[filename_size++] = '\0'; ++ /* ++ * Do not increment filename_size here as the computations below ++ * add the space for the terminating NUL explicitly. ++ */ ++ filename[filename_size] = '\0'; + + /* Decoded unicode form is UTF-16BE, so we have to update a string + * conversion object for it. */ diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index fb1faf8d1b1..e0242802fd3 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd"; }; + patches = [ + ./CVE-2017-14166.patch + ./CVE-2017-14502.patch + ]; + outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig ]; From 517a0723e48cd25c4771affd118e7500af9fb2bb Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 14 Sep 2017 17:58:43 +0200 Subject: [PATCH 2021/2806] pythonPackages.netaddr: fix patch hash --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d83ac0df11b..9ce0e45284b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12469,7 +12469,7 @@ in { patches = [ (pkgs.fetchpatch { url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch; - sha256 = "08rn1s3w9424jhandy4j9sksy852ny00088zh15nirw5ajqg1dn7"; + sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39"; }) ]; From 07e0c0e0a2f237639600f2a0d62f6eac748b1e6e Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 30 Oct 2017 17:35:14 +0100 Subject: [PATCH 2022/2806] network-interfaces-scripted: fix NixOS/nixops#640 Reverse the PartOf dependency between network-setup and network-addresses-* This was joint work of: @nh2, @domenkozar, @fpletz, @aszlig and @basvandijk at the NixCon 2017 hackathon. --- nixos/modules/tasks/network-interfaces-scripted.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index e92c9bc27de..1f424f84c6e 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -93,6 +93,7 @@ let after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ]; before = [ "network.target" "shutdown.target" ]; wants = [ "network.target" ]; + partOf = map (i: "network-addresses-${i.name}.service") interfaces; conflicts = [ "shutdown.target" ]; wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target"; @@ -171,8 +172,6 @@ let "network-link-${i.name}.service" "network.target" ]; - # propagate stop and reload from network-setup - partOf = [ "network-setup.service" ]; # order before network-setup because the routes that are configured # there may need ip addresses configured before = [ "network-setup.service" ]; From 94b7368eefcb833b96859ccc9e25facffdd4901a Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 30 Oct 2017 20:20:01 +0000 Subject: [PATCH 2023/2806] bchunk: fix recent CVEs, simplify installPhase For details, see: https://bugs.gentoo.org/635898 https://nvd.nist.gov/vuln/detail/CVE-2017-15953 https://nvd.nist.gov/vuln/detail/CVE-2017-15954 https://nvd.nist.gov/vuln/detail/CVE-2017-15955 https://github.com/extramaster/bchunk/issues/2 https://github.com/extramaster/bchunk/issues/3 https://github.com/extramaster/bchunk/issues/4 --- pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch | 25 ++++++++++++++ pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch | 33 +++++++++++++++++++ pkgs/tools/cd-dvd/bchunk/default.nix | 20 +++++------ 3 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch create mode 100644 pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch diff --git a/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch new file mode 100644 index 00000000000..f78bb7178af --- /dev/null +++ b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch @@ -0,0 +1,25 @@ +--- a/bchunk.c 2017-10-30 18:03:58.658741629 +0000 ++++ b/bchunk.c 2017-10-30 19:40:25.558131619 +0000 +@@ -18,6 +18,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#define _GNU_SOURCE + #include + #include + #include +@@ -271,11 +272,10 @@ + int16_t i; + float fl; + +- if (!(fname = malloc(strlen(bname) + 8))) { +- fprintf(stderr, "main(): malloc() failed, out of memory\n"); ++ if (asprintf(&fname, "%s%2.2d.%s", bname, track->num, track->extension) == -1) { ++ fprintf(stderr, "writetrack(): asprintf() failed, out of memory\n"); + exit(4); + } +- sprintf(fname, "%s%2.2d.%s", bname, track->num, track->extension); + + printf("%2d: %s ", track->num, fname); + + diff --git a/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch new file mode 100644 index 00000000000..80930ac69bc --- /dev/null +++ b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch @@ -0,0 +1,33 @@ +diff -urNZ bchunk-1.2.0.orig/bchunk.c bchunk-1.2.0/bchunk.c +--- a/bchunk.c 2017-10-30 18:03:58.658741629 +0000 ++++ b/bchunk.c 2017-10-30 19:17:36.732855884 +0000 +@@ -426,11 +426,11 @@ + printf("\nTrack "); + if (!(p = strchr(p, ' '))) { + fprintf(stderr, "... ouch, no space after TRACK.\n"); +- continue; ++ exit(3); + } + p++; + if (!(t = strchr(p, ' '))) { + fprintf(stderr, "... ouch, no space after track number.\n"); +- continue; ++ exit(3); + } + *t = '\0'; + +@@ -460,12 +460,12 @@ + } else if ((p = strstr(s, "INDEX"))) { + if (!(p = strchr(p, ' '))) { + printf("... ouch, no space after INDEX.\n"); +- continue; ++ exit(3); + } + p++; + if (!(t = strchr(p, ' '))) { + printf("... ouch, no space after index number.\n"); +- continue; ++ exit(3); + } + *t = '\0'; + t++; \ No newline at end of file diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index 4b8510773a3..ea4046f31f8 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -8,20 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0pcbyx3689cbl23dcij497hb3q5f1wmki7cxic5nzldx71g9vp5g"; }; - preConfigure = - '' - substituteInPlace Makefile \ - --replace "-o root -g root" "" \ - --replace "-o bin -g bin" "" - ''; + patches = [ ./CVE-2017-15953.patch ./CVE-2017-15955.patch ]; - makeFlags = "PREFIX=$(out) MAN_DIR=$(out)/share/man"; + installPhase = '' + install -Dt $out/bin bchunk + install -Dt $out/share/man/man1 bchunk.1 + ''; - preInstall = "mkdir -p $out/bin $out/share/man/man1"; - - meta = { + meta = with stdenv.lib; { homepage = http://he.fi/bchunk/; - description = "A program that converts CD-ROM images in BIN/CUE format into a set of ISO and CDR tracks"; - platforms = stdenv.lib.platforms.linux; + description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; + platforms = platforms.unix; }; } From 440178d729efbc279a70c93495b6212db029f180 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 30 Oct 2017 21:43:10 +0100 Subject: [PATCH 2024/2806] gdm: don't start getty@tty1 if enabled --- nixos/modules/services/x11/display-managers/gdm.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 45a67ac040b..e83f26516f5 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -125,6 +125,8 @@ in "getty@tty1.service" ]; + systemd.services."getty@tty1".enable = false; + systemd.services.display-manager.conflicts = [ "getty@tty1.service" ]; systemd.services.display-manager.serviceConfig = { # Restart = "always"; - already defined in xserver.nix KillMode = "mixed"; From 61aeeb50ab22e08ec920418107f10ad126f52189 Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Mon, 30 Oct 2017 22:19:11 +0100 Subject: [PATCH 2025/2806] pwgen: 2.07 -> 2.08 --- pkgs/tools/security/pwgen/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index b793219f649..79e8fb071b3 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, autoreconfHook}: stdenv.mkDerivation { - name = "pwgen-2.07"; + name = "pwgen-2.08"; src = fetchurl { - url = mirror://sourceforge/pwgen/pwgen-2.07.tar.gz; - sha256 = "0mhmw700kkh238fzivcwnwi94bj9f3h36yfh3k3j2v19b0zmjx7b"; + url = https://github.com/tytso/pwgen/archive/v2.08.tar.gz; + sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; }; + + nativeBuildInputs = [ autoreconfHook ]; + meta = { description = "Password generator which creates passwords which can be easily memorized by a human"; platforms = stdenv.lib.platforms.all; From 41267f612f2930ef989a28c2bfa9f882d9ec56c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 30 Oct 2017 22:35:54 +0100 Subject: [PATCH 2026/2806] mesa: maintenance 17.2.2 -> 17.2.4 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 0fde0192726..fe34a8bb88f 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.2"; + version = "17.2.4"; 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://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "10jplvxg7rlbp7569w08z0igwlsjjfb7q3n07zgfr8d5sr224lng"; + sha256 = "0l75q9l4g15y66rqk2swqvj18qj60hpimv0f97jk44bfrpz0i92v"; }; prePatch = "patchShebangs ."; From cdf059f79702135ac5b10d3c8c54ca511b385260 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 30 Oct 2017 21:48:00 +0000 Subject: [PATCH 2027/2806] fetchbzr: do not write logs to non-existing home --- pkgs/build-support/fetchbzr/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index af1257d3688..e424fd92d51 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -4,6 +4,6 @@ header "exporting \`$url' (revision $rev) into \`$out'" # Perform a lightweight checkout so that we don't end up importing # all the repository's history. -bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" +BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" stopNest From f2621d4ba86d7f78911c7a2e28d8883b57d1c65a Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 30 Oct 2017 21:58:37 +0000 Subject: [PATCH 2028/2806] nixos-generate-config: enforce umask 0022, fixes #30954 --- nixos/modules/installer/tools/nixos-generate-config.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index c0df2977856..7c737e84de0 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -8,6 +8,7 @@ use File::Basename; use File::Slurp; use File::stat; +umask(0022); sub uniq { my %seen; From d424bfe236ed257960de00618750cf76ca77a7c7 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 30 Oct 2017 23:21:22 +0100 Subject: [PATCH 2029/2806] beamPackages.hex: 0.14.0 => 0.17.1 --- pkgs/development/beam-modules/hex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 7f933f9a78a..d0af0b59c9f 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { name = "hex"; - version = "v0.14.0"; + version = "v0.17.1"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; rev = "${version}"; - sha256 = "042rcwznb6cf9khn4l969axf7vhk53gy3rp23y6c8fhfp1472pai"; + sha256 = "1s4asar1mcavzj3w37jcz243ka0z5jm0r42yws3h4aagawxxg02z"; }; setupHook = writeText "setupHook.sh" '' From 16e9541169fd05c850fa2c5571c9679002b74515 Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Mon, 30 Oct 2017 16:09:40 -0700 Subject: [PATCH 2030/2806] ansible: 2.4.0.0 -> 2.4.1.0 --- pkgs/tools/admin/ansible/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix index dd9c12c831c..80bd33bc776 100644 --- a/pkgs/tools/admin/ansible/2.4.nix +++ b/pkgs/tools/admin/ansible/2.4.nix @@ -6,12 +6,12 @@ pythonPackages.buildPythonPackage rec { pname = "ansible"; - version = "2.4.0.0"; + version = "2.4.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "http://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "0xkwnx817rygb1922gncv9ivgvb7hjg8g53r39hfdm3jgzp6y9qs"; + sha256 = "0spv0kjaicwss4q52s727b6grdizcxpa0bbsfg26pgf5kjrayqfs"; }; prePatch = '' From 25515ce9280dcb90cffc3fbd15e4ab2ac8ec0e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Oct 2017 00:12:08 +0100 Subject: [PATCH 2031/2806] libav_11: security 11.10 -> 11.11 Fixes CVE-2017-7862. --- pkgs/development/libraries/libav/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 90d7583673a..e348fe0fae2 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -27,8 +27,9 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in let result = { + # e.g. https://libav.org/releases/libav-11.11.tar.xz.sha1 libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; - libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00"; + libav_11 = libavFun "11.11" "d7444fa4f135bdd7347cc962ab4b5228796b0f23"; libav_12 = libavFun "12.2" "3784b15f88076ca0ab8fb6b0377e975b83a5c9f5"; }; From 54d1e1412b67a813a65b36bbe832bd97e9c4dbfc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 31 Oct 2017 00:18:41 +0000 Subject: [PATCH 2032/2806] ocamlPackages.lablgtk: 2.18.5 -> 2.18.6 --- .../ocaml-modules/lablgtk/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 9d01b73479a..ff42af0c0e4 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,18 +1,24 @@ { stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: -let - pname = "lablgtk"; -in - -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "2.18.5"; - - src = fetchurl { +let param = + let check = stdenv.lib.versionAtLeast ocaml.version; in + if check "4.06" then { + version = "2.18.6"; + url = https://forge.ocamlcore.org/frs/download.php/1726/lablgtk-2.18.6.tar.gz; + sha256 = "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d"; + } else if check "3.12" then { + version = "2.18.5"; url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz; sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + } else throw "lablgtk is not available for OCaml ${ocaml.version}"; +in + +stdenv.mkDerivation rec { + name = "lablgtk-${version}"; + inherit (param) version; + + src = fetchurl { + inherit (param) url sha256; }; nativeBuildInputs = [ pkgconfig ]; From 33c0dcacd0d61a41e6fdfb3244dd1fd442cf0738 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 31 Oct 2017 01:06:17 +0000 Subject: [PATCH 2033/2806] ocamlPackages.alcotest: 0.7.2 -> 0.8.1 --- .../ocaml-modules/alcotest/default.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index bf0ae24ff03..90ee8d905a6 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,20 +1,35 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner, astring, fmt, result }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, jbuilder +, cmdliner, astring, fmt, result +}: + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "0.8.1"; + sha256 = "1bjhgwmshlaz9xncrrkknys7prigf8vlg1kqvfx9l8kn92mlf10b"; + buildInputs = [ jbuilder ]; + buildPhase = "jbuilder build -p alcotest"; + inherit (jbuilder) installPhase; + } else { + version = "0.7.2"; + sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; + buildInputs = [ ocamlbuild opam topkg ]; + inherit (topkg) buildPhase installPhase; + }; +in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-alcotest-${version}"; - version = "0.7.2"; + inherit (param) version buildPhase installPhase; src = fetchzip { url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz"; - sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ] ++ param.buildInputs; propagatedBuildInputs = [ cmdliner astring fmt result ]; - inherit (topkg) buildPhase installPhase; - createFindlibDestdir = true; meta = with stdenv.lib; { From 1b918d1ad23160ea06dc5dec9c23149d5da9fb4b Mon Sep 17 00:00:00 2001 From: geistesk Date: Tue, 31 Oct 2017 02:09:33 +0100 Subject: [PATCH 2034/2806] racket: 6.10.1 -> 6.11 --- pkgs/development/interpreters/racket/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 1a9475df284..19517e2216b 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.10.1"; + version = "6.11"; src = fetchurl { - url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "0v3z6x277lq1y7wkqdf6mj3826z5vq0yadygspx9h4r0f1dnmafc"; + url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + sha256 = "1nk7705x24jjlbqqhj8yvbgqkfscxx3m81bry1g56kjxysjmf3sw"; }; FONTCONFIG_FILE = fontsConf; From 37f548e83630785d0839f1c2e553b4c615a59573 Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Wed, 4 Oct 2017 00:02:43 -0700 Subject: [PATCH 2035/2806] hugin: 2016.2.0 -> 2017.0.0 --- pkgs/applications/graphics/hugin/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 29e43a93c98..9acd8357cb7 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "hugin-2016.2.0"; + name = "hugin-2017.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl"; + sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46"; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a96fbe6622..43d2df104a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15046,7 +15046,9 @@ with pkgs; hue-cli = callPackage ../tools/networking/hue-cli { }; - hugin = callPackage ../applications/graphics/hugin { }; + hugin = callPackage ../applications/graphics/hugin { + wxGTK = wxGTK30; + }; hugo = callPackage ../applications/misc/hugo { }; From d061c5c4ff8f41788735d735299e4e9c6995fe19 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 31 Oct 2017 08:16:32 +0100 Subject: [PATCH 2036/2806] quagga: 1.2.1 -> 1.2.2 fixes CVE-2017-16227 & several other issues see [1] for details [1] https://download-mirror.savannah.gnu.org/releases/quagga/quagga-1.2.2.changelog.txt --- pkgs/servers/quagga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index ba3cc6dae76..68c9b7a5936 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "quagga-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "mirror://savannah/quagga/${name}.tar.gz"; - sha256 = "1kgvcr9cfgys5asvb5lh5h95silkr624apqm5x68xva19xfvmpda"; + sha256 = "0c99rjjc62xl5kwvx2pwyvs0709vbwax1qydqbqf6r7fpvr24bjj"; }; buildInputs = From ea6a4068cf89444accdd079accfd7c26eff63e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 30 Oct 2017 23:33:20 +0000 Subject: [PATCH 2037/2806] darwin: build apple stuff in parallel --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 6 +++++- .../darwin/apple-source-releases/xnu/default.nix | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 0e838994887..965632b5788 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -144,6 +144,10 @@ let appleDerivation_ = name: version: sha256: attrs: stdenv.mkDerivation ({ inherit version; name = "${name}-${version}"; + enableParallelBuilding = true; + meta = { + platforms = stdenv.lib.platforms.darwin; + }; } // (if attrs ? srcs then {} else { src = fetchApple version sha256 name; }) // attrs); @@ -153,7 +157,7 @@ let name = builtins.elemAt (stdenv.lib.splitString "/" namePath) 0; appleDerivation = appleDerivation_ name version sha256; callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation name version; }); - in callPackage (./. + builtins.toPath "/${namePath}"); + in callPackage (./. + "/${namePath}"); libsecPackage = pkgs.callPackage ./libsecurity_generic { inherit applePackage appleDerivation_; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index fd0d00d81cf..0ce9c54e48c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -127,8 +127,4 @@ appleDerivation { mkdir $out/Library/PrivateFrameworks mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks ''; - - meta = { - platforms = stdenv.lib.platforms.darwin; - }; } From 0744e0d82909f7522f5d76fde7f31a7110405b61 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 30 Oct 2017 20:33:14 -0400 Subject: [PATCH 2038/2806] ffmpeg-full: fix on darwin --- pkgs/development/libraries/ffmpeg-full/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 11d365159f8..b50025aa108 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -411,7 +411,8 @@ stdenv.mkDerivation rec { ++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals nvenc [ nvidia-video-sdk ] ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation - MediaToolbox VideoDecodeAcceleration ]; + MediaToolbox VideoDecodeAcceleration + libiconv ]; # Build qt-faststart executable buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; From 375cad399723b346f2444f66117806fb9da37985 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Tue, 31 Oct 2017 16:01:59 +0700 Subject: [PATCH 2039/2806] skypeforlinux: 5.4.0.1 -> 5.5.0.1 5.4.0.1 is no longer available (HTTP 404) --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 37bbfef65bb..bfccc4bfcb6 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -4,7 +4,7 @@ let - version = "5.4.0.1"; + version = "5.5.0.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -54,7 +54,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1idjgmn0kym7jml30xq6zrcp8qinx64kgnxlw8m0ys4z6zlw0c8z"; + sha256 = "1r65qlsjwp0n0fmlhvbp71h03b3x73r26jk9f4q687sjqnzmkvcr"; } else throw "Skype for linux is not supported on ${stdenv.system}"; From fe9cefa7e4ed4da1a0d1d9777bf0f7145fff22e3 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 31 Oct 2017 11:23:04 +0100 Subject: [PATCH 2040/2806] nodePackages: add more details about the packages to include and the Node.js versions to support --- pkgs/development/node-packages/README.md | 25 ++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index dea7cd9b38b..79f180759b0 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -1,13 +1,34 @@ Node.js packages ================ -To add a package from [NPM](https://www.npmjs.com/) to nixpkgs: +The `pkgs/development/node-packages` folder contains a generated collection of +[NPM packages](https://npmjs.com/) that can be installed with the Nix package +manager. + +As a rule of thumb, the package set should only provide *end user* software +packages, such as command-line utilities. Libraries should only be added to the +package set if there is a non-NPM package that requires it. + +When it is desired to use NPM libraries in a development project, use the +`node2nix` generator directly on the `package.json` configuration file of the +project. + +The package set also provides support for multiple Node.js versions. The policy +is that a new package should be added to the collection for the latest stable LTS +release (which is currently 6.x), unless there is an explicit reason to support +a different release. + +To add a package from NPM to nixpkgs: 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` - for packagages depending on Node.js 4.x) + for packages depending on Node.js 4.x) 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`. 3. Build your new package to test your changes: `cd /path/to/nixpkgs && nix-build -A nodePackages.`. To build against a specific Node.js version (e.g. 4.x): `nix-build -A nodePackages_4_x.` 4. Add and commit all modified and generated files. + +For more information about the generation process, consult the +[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` +tool. From 5618691751b6a0151d22a436622616545981472b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Oct 2017 11:25:56 +0100 Subject: [PATCH 2041/2806] perl-DBD-SQLite: 1.50 -> 1.54 - This fixes tests after sqlite update, also tested via nixStable and via building some other perl reverse dependencies. - The patch was conflicting due to upstream changes, but those changes allowed us to minimize the patch. - meta from nix-generate-from-cpan /cc #30927. --- .../perl-modules/DBD-SQLite/default.nix | 19 +++++----- .../DBD-SQLite/external-sqlite.patch | 36 ++++--------------- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index bf3089ebfb9..a2a439b295b 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,25 +1,24 @@ { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }: buildPerlPackage rec { - name = "DBD-SQLite-1.50"; + name = "DBD-SQLite-${version}"; + version = "1.54"; src = fetchurl { url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; - sha256 = "1qcw2nzla03ywrl6mx1qklvbc8n5bn4gxqbjnvadfkwlffmi7i9s"; + sha256 = "3929a6dbd8d71630f0cb57f85dcef9588cd7ac4c9fa12db79df77b9d3a4d7269"; }; propagatedBuildInputs = [ DBI ]; - - makeMakerFlags = "SQLITE_LOCATION=${sqlite.dev}"; + buildInputs = [ sqlite ]; patches = [ # Support building against our own sqlite. ./external-sqlite.patch ]; - sqlite_dev = sqlite.dev; - sqlite_out = sqlite.out; - postPatch = "substituteAllInPlace Makefile.PL; cat Makefile.PL"; + SQLITE_INC = sqlite.dev + "/include"; + SQLITE_LIB = sqlite.out + "/lib"; preBuild = '' @@ -39,5 +38,9 @@ buildPerlPackage rec { # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). #doCheck = false; - meta.platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Self Contained SQLite RDBMS in a DBI Driver"; + license = with licenses; [ artistic1 gpl1Plus ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch b/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch index 1f90546b252..5aafa461d94 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch +++ b/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch @@ -1,33 +1,11 @@ -diff --git a/Makefile.PL b/Makefile.PL -index 606b28d..0cea060 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -128,24 +128,10 @@ SCOPE: { - # the system SQLite. We expect that anyone sophisticated enough to use +--- a/Makefile.PL 2016-04-21 15:44:34.000000000 +0200 ++++ b/Makefile.PL 2017-10-31 11:04:28.389959946 +0100 +@@ -129,7 +129,7 @@ # a system sqlite is also sophisticated enough to have a patching system # that can change the if ( 0 ) to if ( 1 ) --my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc); + my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc); -if ( 0 ) { -- require File::Spec; -- if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) { -- $sqlite_base =~ /=(.*)/; -- $sqlite_base = $1; -- $sqlite_lib = File::Spec->catdir( $sqlite_base, 'lib' ); -- $sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' ); -- } -- if ( $sqlite_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) { -- $sqlite_local =~ /=(.*)/; -- $sqlite_local = "$1" ? 1 : 0; -- if ( $sqlite_local ) { -- # Keep these from making into CFLAGS/LDFLAGS -- undef $sqlite_lib; -- undef $sqlite_inc; -- } -- } -+my ($sqlite_local, $sqlite_lib, $sqlite_inc); +if ( 1 ) { -+ $sqlite_lib = '@sqlite_out@/lib'; -+ $sqlite_inc = '@sqlite_dev@/include'; - - # Now check for a compatible sqlite3 - unless ( $sqlite_local ) { + require File::Spec; + if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) { + $sqlite_base =~ /=(.*)/; From 1fee6e149bb0cd4f1c7a751226c9c6090e392025 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 31 Oct 2017 10:38:12 +0000 Subject: [PATCH 2042/2806] luastdlib: 41.2.0 -> 41.2.1 --- pkgs/top-level/lua-packages.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c94a401db0f..7a0b0a56c9b 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -438,12 +438,15 @@ let }; - luastdlib = buildLuaPackage { - name = "stdlib"; + luastdlib = buildLuaPackage rec { + name = "stdlib-${version}"; + version = "41.2.1"; - src = fetchzip { - url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; - sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; + src = fetchFromGitHub { + owner = "lua-stdlib"; + repo = "lua-stdlib"; + rev = "release-v${version}"; + sha256 = "03wd1qvkrj50fjszb2apzdkc8d5bpfbbi9pajl0vbrlzzmmi3jlq"; }; nativeBuildInputs = [ autoreconfHook unzip ]; From 16bfe585528453c9b0e015d1f84d16a9bdb332f1 Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Tue, 31 Oct 2017 12:13:39 +0100 Subject: [PATCH 2043/2806] clementine: Added gst-libav plugin Fixes regression introduced in 0322f66307286f5377d4479938ed57fadaf8425a that made clementine unable to play m4a files. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28367446d40..60b6ad2dac6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1394,7 +1394,7 @@ with pkgs; clementine = callPackage ../applications/audio/clementine { boost = boost155; gst_plugins = - with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ]; + with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; }; clementineFree = clementine.free; From 2a09272b5b7b649cd47b4f8f8b06a0170e12f420 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Tue, 31 Oct 2017 12:43:34 +0100 Subject: [PATCH 2044/2806] maven: 3.5.0 -> 3.5.2 --- .../tools/build-managers/apache-maven/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 5490790fe38..79648c16f5e 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.5.0"; in +let version = "3.5.2"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "0d7hjnj77hc7qqnnfmqlwij8n6pcldfavvd6lilvv5ak4hci9fdy"; + sha256 = "1zza5kjf69hnx41gy3yhvsk1kz259nig5njcmzjbsr8a75p1yyvh"; }; buildInputs = [ makeWrapper ]; @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://maven.apache.org/; license = licenses.asl20; platforms = platforms.unix; + maintainers = with maintainers; [ cko ]; }; } From 12da0b5f457fafd412609de1d1cca3aa068a03ba Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 30 Oct 2017 16:57:54 +0800 Subject: [PATCH 2045/2806] mht2htm: init at 1.8.1.35 --- pkgs/tools/misc/mht2htm/default.nix | 43 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/misc/mht2htm/default.nix diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix new file mode 100644 index 00000000000..930fd1e5d3e --- /dev/null +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, unzip, fpc, lazarus }: + +let + date = "07.apr.2016"; + +in stdenv.mkDerivation rec { + name = "mht2mht-${version}"; + version = "1.8.1.35"; + + src = fetchurl { + # there is a disconnect between the directory name date and file name date + # you should verify if that is still then case when the next version is released + url = "mirror://sourceforge/mht2htm/mht2htm/1.8.1%20%2805.apr.2016%29/mht2htmcl-${version}_${date}.source.zip"; + sha256 = "16r6zkihp84yqllp2hyaf0nvymdn9ji3g30mc5scfwycdfanja6f"; + }; + + sourceRoot = "."; + + buildInputs = [ fpc lazarus ]; + + nativeBuildInputs = [ unzip ]; + + buildPhase = '' + runHook preBuild + lazbuild --lazarusdir=${lazarus}/share/lazarus mht2htmcl.lpi + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin mht2htmcl + install -Dm644 -t $out/share/doc/mht2htm CHANGELOG COPYING README + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Convert .mht files to .html"; + homepage = http://pgm.bpalanka.com/mht2htm.html; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89e59463bd..03aaf29fc8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -163,6 +163,8 @@ with pkgs; packer = callPackage ../development/tools/packer { }; + mht2htm = callPackage ../tools/misc/mht2htm { }; + fetchpatch = callPackage ../build-support/fetchpatch { }; fetchs3 = callPackage ../build-support/fetchs3 { }; From 2ad3933dcae98149361264e7aa5df6d9166a8c97 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 31 Oct 2017 14:35:59 +0000 Subject: [PATCH 2046/2806] autofs: do not strip needed symbols Fixes #28282 after #27415 --- pkgs/os-specific/linux/autofs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 698c478aca0..8c207e4a47d 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -24,6 +24,8 @@ in stdenv.mkDerivation { export E2FSCK=${e2fsprogs}/bin/fsck.ext2 export E3FSCK=${e2fsprogs}/bin/fsck.ext3 export E4FSCK=${e2fsprogs}/bin/fsck.ext4 + + unset STRIP # Makefile.rules defines a usable STRIP only without the env var. ''; installPhase = '' From 04b2460eb65c64705df0de0ce33dde6ba524a216 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 31 Oct 2017 15:49:59 +0100 Subject: [PATCH 2047/2806] graphite: fix the graphiteApi service --- nixos/modules/services/monitoring/graphite.nix | 4 ++-- nixos/tests/graphite.nix | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 01b4aca9173..645dfeab019 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -22,8 +22,8 @@ let ); graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' - time_zone: ${config.time.timeZone} search_index: ${dataDir}/index + ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''} ${optionalString (cfg.api.finders != []) ''finders:''} ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} ${optionalString (cfg.api.functions != []) ''functions:''} @@ -536,7 +536,7 @@ in { environment = { PYTHONPATH = let aenv = pkgs.python.buildEnv.override { - extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders; + extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders; }; in "${aenv}/${pkgs.python.sitePackages}"; GRAPHITE_API_CONFIG = graphiteApiConfig; diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 4fd7de192d5..a22ef224580 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -4,22 +4,28 @@ import ./make-test.nix ({ pkgs, ...} : nodes = { one = { config, pkgs, ... }: { + time.timeZone = "UTC"; services.graphite = { - web = { + web.enable = true; + api = { enable = true; + port = 8082; }; - carbon = { - enableCache = true; - }; + carbon.enableCache = true; + seyren.enable = true; + pager.enable = true; }; }; - }; + }; testScript = '' startAll; $one->waitForUnit("default.target"); $one->requireActiveUnit("graphiteWeb.service"); + $one->requireActiveUnit("graphiteApi.service"); + $one->requireActiveUnit("graphitePager.service"); $one->requireActiveUnit("carbonCache.service"); + $one->requireActiveUnit("seyren.service"); $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003"); $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo") ''; From 12c8a4497217cf8bb5dbd2b037c63f24d190d2d6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 31 Oct 2017 16:21:13 +0100 Subject: [PATCH 2048/2806] pythonPackages.multidict: Fix the build and tests (Was broken since 7ce848309e6d64820af1e96045c5386992e90a4a) --- .../python-modules/multidict/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index cf05cbff631..8d9340625e1 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,9 +1,9 @@ { lib , fetchurl , buildPythonPackage -, pytest +, cython +, pytest, psutil, pytestrunner , isPy3k -, psutil }: let @@ -17,11 +17,8 @@ in buildPythonPackage rec { sha256 = "e76909da2fad6966281d4e0e4ccfd3c3025699ebcc30806afa09fa1384c3532b"; }; - checkInputs = [ pytest psutil ]; - - checkPhase = '' - py.test - ''; + buildInputs = [ cython ]; + checkInputs = [ pytest psutil pytestrunner ]; disabled = !isPy3k; @@ -30,4 +27,4 @@ in buildPythonPackage rec { homepage = https://github.com/aio-libs/multidict/; license = lib.licenses.asl20; }; -} \ No newline at end of file +} From 997e65e6aef3c194a6230cd54718aa7680657800 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 31 Oct 2017 15:57:02 +0100 Subject: [PATCH 2049/2806] beancount: 2.0b15 -> 2.0rc1 --- pkgs/applications/office/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index 70d5180191e..efc61dba7a4 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchhg, pkgs, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "2.0b15"; + version = "2.0rc1"; name = "beancount-${version}"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/b/beancount/${name}.tar.gz"; - sha256 = "1dvnpgja4v4k5zagfsmdjavlib0z3r9r4z197yvj86szhzs0z86k"; + sha256 = "12vlkck4q3dax9866krp6963c6d845b7inkkwrlkk4njh84n71wf"; }; buildInputs = with pythonPackages; [ nose ]; From b40215956f972f86beb074c5272c06bec755fcab Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 31 Oct 2017 15:58:30 +0100 Subject: [PATCH 2050/2806] bean-add: 2017-09-13 -> 2017-10-31 --- pkgs/applications/office/beancount/bean-add.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 0a93efd3990..9cee31b01eb 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { - name = "bean-add-2017-09-13"; + name = "bean-add-2017-10-31"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "035f07a9e48a9dd23b49a27ba9c070ee9ddc4cc7"; - sha256 = "0lj8940bn2h8541am4x0sfqpfk5xfnyfdnf3jpajfgx6wyjm2frg"; + rev = "9ac64272a17e76f8292bd94deb5aee45c14130d2"; + sha256 = "1vcwbbi2jsf87yq8f2hyf7nz9br1973sb20qjnsx5fxlmcpn47jh"; }; propagatedBuildInputs = with python3Packages; [ python ]; From ef50ac6fd21adc6d0a52205a48751973dd8610b7 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 31 Oct 2017 16:00:46 +0100 Subject: [PATCH 2051/2806] cli-visualizer: 1.5 -> 1.6 --- pkgs/applications/misc/cli-visualizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index fd88ea61ad8..8b24df1bee9 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.6"; name = "cli-visualizer-${version}"; src = fetchFromGitHub { owner = "dpayne"; repo = "cli-visualizer"; rev = version; - sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs"; + sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc"; }; postPatch = '' From 1d5e648eba0c0386d20a213dcbf2a6cd85740c61 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 31 Oct 2017 16:07:26 +0100 Subject: [PATCH 2052/2806] hstr: 1.22 -> 1.23 --- pkgs/applications/misc/hstr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index ba04bd5c39d..3c4f409d18f 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline, ncurses }: let - version = "1.22"; + version = "1.23"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp"; + sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv"; }; buildInputs = [ readline ncurses ]; From cc9431fee2352dbfad6d0dee89c5dedb0fa9a59d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 31 Oct 2017 16:09:14 +0100 Subject: [PATCH 2053/2806] http-prompt: 0.10.2 -> 0.11.0 --- pkgs/tools/networking/http-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 5f6f0466f63..83ad64a66a4 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pythonPackages, httpie }: pythonPackages.buildPythonApplication rec { - version = "0.10.2"; + version = "0.11.0"; name = "http-prompt"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; owner = "eliangcs"; - sha256 = "0c03n1ll61zd4f60kzih3skl0hspck5hhpcf74h5l6v5as7qdbi2"; + sha256 = "0arl85880nnyfx8cvpzm6cr8nalhyrkz5zqfr628p487rwqv45ip"; }; propagatedBuildInputs = with pythonPackages; [ From 64cf206745f7cfefd8cc37e846e0b0a07f335543 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 31 Oct 2017 16:10:32 +0100 Subject: [PATCH 2054/2806] khal: 0.9.7 -> 0.9.8 --- pkgs/applications/misc/khal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 1334f2317b9..91e583e2af4 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "khal"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "0x1p62ff7ggb172rjr6sbdrjh1gl3ck3bwxsqlsix8i5wycwvnmv"; + sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y"; }; LC_ALL = "en_US.UTF-8"; From 6123b53a863a3d8d5ba6146193a7dd41aaaca7f6 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 31 Oct 2017 16:13:31 +0100 Subject: [PATCH 2055/2806] loc: 2017-06-23 -> 0.4.1 --- pkgs/development/misc/loc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index fd5796276f7..88d24fddf79 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -3,17 +3,17 @@ with rustPlatform; buildRustPackage rec { - version = "2017-06-23"; + version = "0.4.1"; name = "loc-${version}"; src = fetchFromGitHub { owner = "cgag"; repo = "loc"; - rev = "bbea575f56879ef614d57a42a6b79fd45b9a8b38"; - sha256 = "0agyhi55rh248fmlsip4fi1iw4xv3433q7bcb2lpjfnjpzxxlvfn"; + rev = "v${version}"; + sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; }; - cargoSha256 = "0f3i8av9g19r2nhr9m8ca8s23kq294c5kqyvx155l6p76r7a9kvb"; + cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk"; meta = { homepage = http://github.com/cgag/loc; From 12255a855f30639bfdbd2d180fcd0278a4266b32 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 31 Oct 2017 16:21:37 +0100 Subject: [PATCH 2056/2806] pythonPackages.click-log: 0.1.3 -> 0.2.1 --- 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 9ce0e45284b..db60631dfa5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2703,12 +2703,12 @@ in { }; click-log = buildPythonPackage rec { - version = "0.1.3"; + version = "0.2.1"; name = "click-log-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/c/click-log/${name}.tar.gz"; - sha256 = "0kdd1vminxpcfczxl2kkf285n0dr1gxh2cdbx1p6vkj7b7bci3gx"; + sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; }; propagatedBuildInputs = with self; [ click ]; From 713a7b65e746a1ed268636aea6c85ce5fe2c6635 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 31 Oct 2017 16:22:38 +0100 Subject: [PATCH 2057/2806] vdirsyncer: 0.15.0 -> 0.16.3 --- pkgs/tools/misc/vdirsyncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 17798057ec3..382b69722a4 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -6,12 +6,12 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "0.15.0"; + version = "0.16.3"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "08aa5yxcj7ziz2r0hz4p554q8hgpfl2bh8r6r85f4g24mg6arxsj"; + sha256 = "0dpwbfi97ksijqng191659m8k0v215y8ld95w8gb126m4m96qpzw"; }; propagatedBuildInputs = with pythonPackages; [ From 8e93531157b19cbb04609b89aa54781565a1f100 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 31 Oct 2017 16:41:10 +0100 Subject: [PATCH 2058/2806] pythonPackages.raven: 6.2.1 -> 6.3.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 9ce0e45284b..10cd211b5e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7368,11 +7368,11 @@ in { }; raven = buildPythonPackage rec { - name = "raven-6.2.1"; + name = "raven-6.3.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "1zkh8llsfng5viz8cpf9j74v30705hv80vb5g6gha1ij7v60p8y0"; + sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k"; }; # way too many dependencies to run tests From 8e91f4ea91216d68186585d8ab863d4f6133688e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 31 Oct 2017 16:56:40 +0100 Subject: [PATCH 2059/2806] lf: 2017-09-06 -> 2017-10-30 --- pkgs/tools/misc/lf/default.nix | 6 +++--- pkgs/tools/misc/lf/deps.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index b10b7891e5d..f8b687a5c8b 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2017-09-06"; + version = "2017-10-30"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "ae4a29e5501f805fadb115658e83df6744a258b2"; # nightly - sha256 = "099ckbnyk08a716fc5qz7yldalb1p9gn2zn8kqp7bp4adi541hid"; + rev = "3f7bd0a62d1a243562e182d9051ebb54f3414aaa"; # nightly + sha256 = "0g6wf4j3dfy3yfkby3wlqajryv4kffqvhljq2q0x482fsrl4vipz"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index 5b014d18dc1..91a0c368d5f 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "4ed959e0540971545eddb8c75514973d670cf739"; # master - sha256 = "1vx64i1mg660if3wwm81p4b7lzxfb3qbr39i7misdyld3fc486p9"; + rev = "10cefba34bc5e7a6e5df0836a42513c28a10e074"; # master + sha256 = "05jy6dpva2a1xfsv3yajavbx41gx8hhh5k3k901dnk0118hnyd0w"; }; } { From bbb90b111301f51ba497629582241af15d14bb59 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Tue, 31 Oct 2017 15:59:06 +0000 Subject: [PATCH 2060/2806] wp-cli: 1.3.0 -> 1.4.0 --- pkgs/development/tools/wp-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 779aed7fea3..e0aac84abb7 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.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "0q5d32jq7a6rba77sr1yyj6ib6x838hw14mm186ah1xxgnn7rnry"; + sha256 = "0rav5a6znx81gwaxin1ib10sbfg16bgdnnyv1zn5sjify3f1wpqj"; }; completion = fetchurl { From e55d49bb1ab2e965f2e237511bb1e017ed776262 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 31 Oct 2017 15:57:33 +0100 Subject: [PATCH 2061/2806] wordpress: 4.7.4 -> 4.8.3 --- pkgs/servers/web-apps/wordpress/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 878e8480bb9..bb07c42b872 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,12 @@ { fetchFromGitHub, lib } : fetchFromGitHub { owner = "WordPress"; repo = "WordPress"; - rev = "4.7.4"; - sha256 = "1ia9d3n085x2r6pvdrv4rk6gdp6xhjhpsq5g7a6448xzv9hf14ri"; + rev = "4.8.3"; + sha256 = "077bdx22sj29v8q493b49xfzxpc38q45pjhmn4znw2fmkjilih5p"; meta = { homepage = https://wordpress.org; description = "WordPress is open source software you can use to create a beautiful website, blog, or app."; license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.basvandijk ]; }; } From 6df9c74238edc0d1a95569b1b6b9cc4c0a757e1b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 31 Oct 2017 17:28:59 +0100 Subject: [PATCH 2062/2806] pythonPackages: Move my libraries to python-modules --- .../python-modules/keyutils/default.nix | 24 ++++++++ .../python-modules/raven/default.nix | 23 +++++++ .../python-modules/zipstream/default.nix | 22 +++++++ pkgs/top-level/python-packages.nix | 61 +------------------ 4 files changed, 72 insertions(+), 58 deletions(-) create mode 100644 pkgs/development/python-modules/keyutils/default.nix create mode 100644 pkgs/development/python-modules/raven/default.nix create mode 100644 pkgs/development/python-modules/zipstream/default.nix diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix new file mode 100644 index 00000000000..2746f161668 --- /dev/null +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }: + +let + pname = "keyutils"; + version = "0.5"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/k/${pname}/${name}.tar.gz"; + sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; + }; + + buildInputs = [ pkgs.keyutils pytestrunner ]; + + doCheck = false; + + meta = { + description = "A set of python bindings for keyutils"; + homepage = https://github.com/sassoftware/python-keyutils; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix new file mode 100644 index 00000000000..00bc54d844b --- /dev/null +++ b/pkgs/development/python-modules/raven/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchurl, isPy3k, contextlib2 }: + +buildPythonPackage rec { + name = "raven-6.3.0"; + + src = fetchurl { + url = "mirror://pypi/r/raven/${name}.tar.gz"; + sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k"; + }; + + # way too many dependencies to run tests + # see https://github.com/getsentry/raven-python/blob/master/setup.py + doCheck = false; + + propagatedBuildInputs = lib.optionals (!isPy3k) [ contextlib2 ]; + + meta = { + description = "A Python client for Sentry (getsentry.com)"; + homepage = https://github.com/getsentry/raven-python; + license = [ lib.licenses.bsd3 ]; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix new file mode 100644 index 00000000000..aac2bceeb15 --- /dev/null +++ b/pkgs/development/python-modules/zipstream/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, nose }: + +let + pname = "zipstream"; + version = "1.1.4"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/z/${pname}/${name}.tar.gz"; + sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; + }; + + buildInputs = [ nose ]; + + meta = { + description = "A zip archive generator"; + homepage = https://github.com/allanlei/python-zipstream; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10cd211b5e1..de843c3dc50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7367,24 +7367,7 @@ in { }; }; - raven = buildPythonPackage rec { - name = "raven-6.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k"; - }; - - # way too many dependencies to run tests - # see https://github.com/getsentry/raven-python/blob/master/setup.py - doCheck = false; - - propagatedBuildInputs = optionals (!isPy3k) [ self.contextlib2 ]; - - meta = { - maintainers = with maintainers; [ primeos ]; - }; - }; + raven = callPackage ../development/python-modules/raven { }; rethinkdb = buildPythonPackage rec { name = "rethinkdb-${version}"; @@ -10574,27 +10557,7 @@ in { keyring = callPackage ../development/python-modules/keyring { }; - keyutils = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "keyutils"; - version = "0.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/${pname}/${name}.tar.gz"; - sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; - }; - - buildInputs = with self; [ pkgs.keyutils pytestrunner ]; - - doCheck = false; - - meta = { - description = "A set of python bindings for keyutils"; - homepage = https://github.com/sassoftware/python-keyutils; - license = licenses.asl20; - maintainers = with maintainers; [ primeos ]; - }; - }; + keyutils = callPackage ../development/python-modules/keyutils { }; klaus = buildPythonPackage rec { version = "0.9.1"; @@ -21860,25 +21823,7 @@ EOF }; }); - zipstream = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "zipstream"; - version = "1.1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/${pname}/${name}.tar.gz"; - sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; - }; - - buildInputs = with self; [ nose ]; - - meta = { - description = "A zip archive generator"; - homepage = "https://github.com/allanlei/python-zipstream"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ primeos ]; - }; - }; + zipstream = callPackage ../development/python-modules/zipstream { }; zodb = callPackage ../development/python-modules/zodb {}; From 527781ebc4137d9e6cda6dd21ab0dd776f8582d5 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 31 Oct 2017 17:31:02 +0100 Subject: [PATCH 2063/2806] apache-httpd: fix nix evaluation error This only sets the timezone when it's not null to prevent: error: cannot coerce null to a string, at nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix:676:7 --- nixos/modules/services/web-servers/apache-httpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 1c3c7835d96..f9f2511f45d 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -676,6 +676,7 @@ in '' ; Needed for PHP's mail() function. sendmail_path = sendmail -t -i + '' + optionalString (!isNull config.time.timeZone) '' ; Apparently PHP doesn't use $TZ. date.timezone = "${config.time.timeZone}" From 3165c56db9df4d2399e900a8d6eaffcd092359f7 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Tue, 31 Oct 2017 17:37:11 +0000 Subject: [PATCH 2064/2806] apache-httpd/wordpress: disable built-in WordPress autoupdater --- nixos/modules/services/web-servers/apache-httpd/wordpress.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index c6f4bcd0f66..1c654667dfc 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -13,6 +13,7 @@ let define('DB_HOST', '${config.dbHost}'); define('DB_CHARSET', 'utf8'); $table_prefix = '${config.tablePrefix}'; + define('AUTOMATIC_UPDATER_DISABLED', true); ${config.extraConfig} if ( !defined('ABSPATH') ) define('ABSPATH', dirname(__FILE__) . '/'); From 60321cb811940efea70c8c31b510958b0a4d9a83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Oct 2017 12:52:17 +0100 Subject: [PATCH 2065/2806] LTS Haskell 9.11 --- .../configuration-hackage2nix.yaml | 57 ++++++++++--------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8de2749004e..0a89e738357 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.10 + # LTS Haskell 9.11 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -323,7 +323,7 @@ default-package-overrides: - bytestring-strict-builder ==0.4.5 - bytestring-tree-builder ==0.2.7.1 - bytestring-trie ==0.2.4.1 - - bzlib-conduit ==0.2.1.4 + - bzlib-conduit ==0.2.1.5 - c2hs ==0.28.2 - Cabal ==1.24.2.0 - cabal-dependency-licenses ==0.2.0.0 @@ -669,7 +669,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - exp-pairs ==0.1.5.2 - - extensible ==0.4.5 + - extensible ==0.4.6 - extensible-effects ==1.11.1.0 - extensible-exceptions ==0.1.1.4 - extra ==1.5.3 @@ -686,6 +686,7 @@ default-package-overrides: - fclabels ==2.0.3.2 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 + - fedora-haskell-tools ==0.3 - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 @@ -790,7 +791,7 @@ default-package-overrides: - gi-soup ==2.4.14 - git ==0.2.0 - github ==0.16.0 - - github-release ==1.0.6 + - github-release ==1.0.7 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -948,7 +949,7 @@ default-package-overrides: - haddock-api ==2.17.4 - haddock-library ==1.4.3 - haddock-test ==0.0.1 - - hailgun ==0.4.1.5 + - hailgun ==0.4.1.6 - hailgun-simple ==0.1.0.0 - hakyll ==4.9.8.0 - hakyll-favicon ==0.1.0 @@ -1024,12 +1025,12 @@ default-package-overrides: - hebrew-time ==0.1.1 - hedgehog ==0.5 - hedgehog-quickcheck ==0.1 - - hedis ==0.9.10 + - hedis ==0.9.11 - here ==1.2.11 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.0 - hex ==0.1.2 - - hexml ==0.3.2 + - hexml ==0.3.3 - hexpat ==0.20.13 - hexstring ==0.11.1 - hformat ==0.3.1.0 @@ -1090,8 +1091,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.4 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1207,7 +1208,7 @@ default-package-overrides: - inline-c ==0.5.6.1 - inline-c-cpp ==0.1.0.0 - inline-java ==0.6.5 - - inline-r ==0.9.0.1 + - inline-r ==0.9.0.2 - insert-ordered-containers ==0.2.1.0 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2 @@ -1232,10 +1233,10 @@ default-package-overrides: - ip6addr ==0.5.3 - iproute ==1.7.1 - IPv6Addr ==1.0.1 - - IPv6DB ==0.2.2 + - IPv6DB ==0.2.3 - irc ==0.6.1.0 - irc-client ==0.4.4.4 - - irc-conduit ==0.2.2.3 + - irc-conduit ==0.2.2.4 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.1 - islink ==0.1.0.0 @@ -1283,7 +1284,7 @@ default-package-overrides: - kraken ==0.0.3 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==0.4.3 + - lackey ==0.4.4 - lame ==0.1.1 - language-c ==0.6.1 - language-c-quote ==0.12.1 @@ -1349,7 +1350,7 @@ default-package-overrides: - lmdb ==0.2.5 - loch-th ==0.2.1 - log ==0.9.0.1 - - log-base ==0.7.3.0 + - log-base ==0.7.4.0 - log-domain ==0.11.2 - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 @@ -1630,14 +1631,14 @@ default-package-overrides: - perf ==0.1.2 - persistable-record ==0.5.1.1 - persistable-types-HDBC-pg ==0.0.1.5 - - persistent ==2.7.0 + - persistent ==2.7.1 - persistent-mongoDB ==2.6.0 - - persistent-mysql ==2.6.1 + - persistent-mysql ==2.6.2.1 - persistent-mysql-haskell ==0.3.0.0 - - persistent-postgresql ==2.6.1 + - persistent-postgresql ==2.6.2 - persistent-redis ==2.5.2 - persistent-refs ==0.4 - - persistent-sqlite ==2.6.2 + - persistent-sqlite ==2.6.3 - persistent-template ==2.5.3 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 @@ -1646,7 +1647,7 @@ default-package-overrides: - picoparsec ==0.1.2.3 - picosat ==0.1.4 - pid1 ==0.1.2.0 - - pinboard ==0.9.12.5 + - pinboard ==0.9.12.6 - pinch ==0.3.2.0 - pinchot ==0.24.0.0 - pipes ==4.3.6 @@ -1735,8 +1736,8 @@ default-package-overrides: - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.4 - - protocol-buffers ==2.4.4 - - protocol-buffers-descriptor ==2.4.4 + - protocol-buffers ==2.4.5 + - protocol-buffers-descriptor ==2.4.5 - proto-lens ==0.2.1.0 - proto-lens-arbitrary ==0.1.1.1 - proto-lens-combinators ==0.1.0.7 @@ -1752,7 +1753,7 @@ default-package-overrides: - publicsuffix ==0.20170508 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript-bridge ==0.11.1.0 + - purescript-bridge ==0.11.1.1 - pusher-http-haskell ==1.2.0.1 - pwstore-fast ==2.4.4 - QuasiText ==0.1.2.6 @@ -1783,7 +1784,7 @@ default-package-overrides: - rank-product ==0.2.0.1 - Rasterific ==0.7.2.1 - rasterific-svg ==0.3.3 - - ratel ==0.3.5 + - ratel ==0.3.6 - ratel-wai ==0.2.0 - rattletrap ==2.5.0 - rawfilepath ==0.2.4 @@ -1852,7 +1853,7 @@ default-package-overrides: - result ==0.2.6.0 - rethinkdb ==2.2.0.10 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.4.2 + - retry ==0.7.4.3 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - rng-utils ==0.2.1 @@ -1921,16 +1922,16 @@ default-package-overrides: - servant-mock ==0.8.2 - servant-purescript ==0.8.0.1 - servant-ruby ==0.2.1.0 - - servant-server ==0.11 + - servant-server ==0.11.0.1 - servant-static-th ==0.1.0.6 - servant-subscriber ==0.6.0.0 - servant-swagger ==1.1.3.1 - - servant-swagger-ui ==0.2.4.3.0.20 + - servant-swagger-ui ==0.2.4.3.4.0 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - serversession-frontend-yesod ==1.0 - - servius ==1.2.0.2 + - servius ==1.2.0.3 - set-cover ==0.0.8 - setenv ==0.1.1.3 - setlocale ==1.0.0.5 @@ -2251,7 +2252,7 @@ default-package-overrides: - typography-geometry ==1.0.0.1 - tz ==0.1.3.0 - tzdata ==0.1.20170320.0 - - ua-parser ==0.7.4 + - ua-parser ==0.7.4.1 - uglymemo ==0.1.0.1 - unbound ==0.5.1 - unbounded-delays ==0.1.1.0 @@ -2357,7 +2358,7 @@ default-package-overrides: - wai-routes ==0.10.0 - wai-routing ==0.13.0 - wai-session ==0.3.2 - - wai-session-postgresql ==0.2.1.0 + - wai-session-postgresql ==0.2.1.1 - wai-slack-middleware ==0.2.0 - waitra ==0.0.4.0 - wai-transformers ==0.0.7 From 2177c9f036f1ab7ededcff4b753d4fda0eb63c9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Oct 2017 14:33:56 +0100 Subject: [PATCH 2066/2806] hackage2nix: disable failing builds --- .../configuration-hackage2nix.yaml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0a89e738357..93d8180bd0a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2803,6 +2803,7 @@ dont-distribute-packages: aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-tiled: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-yak: [ i686-linux, x86_64-linux, x86_64-darwin ] AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] affection: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3259,6 +3260,7 @@ dont-distribute-packages: cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3410,6 +3412,7 @@ dont-distribute-packages: clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] + clang-compilation-database: [ i686-linux, x86_64-linux, x86_64-darwin ] clang-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] clanki: [ i686-linux, x86_64-linux, x86_64-darwin ] clarifai: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3565,6 +3568,7 @@ dont-distribute-packages: Configurable: [ i686-linux, x86_64-linux, x86_64-darwin ] congruence-relation: [ i686-linux, x86_64-linux, x86_64-darwin ] conjure: [ i686-linux, x86_64-linux, x86_64-darwin ] + conkin: [ i686-linux, x86_64-linux, x86_64-darwin ] conlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] Conscript: [ i686-linux, x86_64-linux, x86_64-darwin ] consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4230,6 +4234,7 @@ dont-distribute-packages: filediff: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] + filepath-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] filepather: [ i686-linux, x86_64-linux, x86_64-darwin ] FilePather: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4336,7 +4341,9 @@ dont-distribute-packages: free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] + freelude: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4832,6 +4839,7 @@ dont-distribute-packages: haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5021,6 +5029,7 @@ dont-distribute-packages: Hermes: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit: [ i686-linux, x86_64-linux, x86_64-darwin ] + herms: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5753,6 +5762,7 @@ dont-distribute-packages: karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] karps: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5944,6 +5954,7 @@ dont-distribute-packages: libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] libvirt-hs: [ "x86_64-darwin" ] + libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5965,6 +5976,7 @@ dont-distribute-packages: linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] + linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5989,6 +6001,7 @@ dont-distribute-packages: liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6130,6 +6143,7 @@ dont-distribute-packages: mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + manifolds-core: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6253,6 +6267,7 @@ dont-distribute-packages: mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + modern-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6315,6 +6330,7 @@ dont-distribute-packages: mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] + monoid-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6325,6 +6341,7 @@ dont-distribute-packages: morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] morph: [ i686-linux, x86_64-linux, x86_64-darwin ] mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + motor: [ i686-linux, x86_64-linux, x86_64-darwin ] mount: [ i686-linux, x86_64-linux, x86_64-darwin ] movie-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6674,6 +6691,7 @@ dont-distribute-packages: paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] + parameterized: [ i686-linux, x86_64-linux, x86_64-darwin ] paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6878,6 +6896,7 @@ dont-distribute-packages: postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7048,6 +7067,7 @@ dont-distribute-packages: rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] rails-session: [ i686-linux, x86_64-linux, x86_64-darwin ] rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + Raincat: [ i686-linux, x86_64-linux, x86_64-darwin ] raketka: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7176,6 +7196,7 @@ dont-distribute-packages: reify: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] + relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] reload: [ i686-linux, x86_64-linux, x86_64-darwin ] remark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7237,6 +7258,7 @@ dont-distribute-packages: rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + rhine: [ i686-linux, x86_64-linux, x86_64-darwin ] rhythm-game-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] riak: [ i686-linux, x86_64-linux, x86_64-darwin ] RichConditional: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7324,6 +7346,7 @@ dont-distribute-packages: safer-file-handles: [ i686-linux, x86_64-linux, x86_64-darwin ] saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ] sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] + sajson: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7393,6 +7416,7 @@ dont-distribute-packages: sdl2-cairo-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2-mixer: [ i686-linux, x86_64-linux, x86_64-darwin ] sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7763,6 +7787,7 @@ dont-distribute-packages: step-function: [ i686-linux, x86_64-linux, x86_64-darwin ] stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + STLinkUSB: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8355,6 +8380,7 @@ dont-distribute-packages: wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-make-assets: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-brotli: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8436,6 +8462,7 @@ dont-distribute-packages: WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] wild-bind-task-x11: [ "x86_64-darwin" ] + windns: [ i686-linux, x86_64-linux, x86_64-darwin ] windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] winio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8451,6 +8478,7 @@ dont-distribute-packages: woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] + wordchoice: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8510,6 +8538,7 @@ dont-distribute-packages: xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] xkbcommon: [ "x86_64-darwin" ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] + xleb: [ i686-linux, x86_64-linux, x86_64-darwin ] xls: [ "x86_64-darwin" ] xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] From 48adf76d5dc27071cd5b9c4be399d228e758fd6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Oct 2017 03:00:41 +0200 Subject: [PATCH 2067/2806] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.6-13-gcf4b32a from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/476d2d9c505a27b5fdf591147cc05b41e6d4928c. --- .../haskell-modules/hackage-packages.nix | 2083 +++++++++++------ 1 file changed, 1376 insertions(+), 707 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b9b9e75c859..cc0d8deb1f5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1835,8 +1835,8 @@ self: { }: mkDerivation { pname = "Blogdown"; - version = "0.2.2"; - sha256 = "18lxj5ka4jfaz1ig6x6qkdzlil99i3bcy4cqpbsccvyvhbax323c"; + version = "0.2.3"; + sha256 = "0xdlcx82nfm74n88fghbg5f6fnjvrajpsz52hrc4bl5afxx63bpx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -2230,10 +2230,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "CSPM-CoreLanguage"; - version = "0.3.0.3"; - sha256 = "0vr6zpdz5lnpkyzwhig72pv8ncvqdjyp1nn76zpx3v6xlpzrs3q2"; + version = "0.3.1.0"; + sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255"; libraryHaskellDepends = [ base ]; - description = "Definition of a FDR-compatible CSP core-language"; + description = "Definition of a CSP core-language"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -2243,8 +2243,8 @@ self: { }: mkDerivation { pname = "CSPM-FiringRules"; - version = "0.4.3.0"; - sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m"; + version = "0.4.4.0"; + sha256 = "11j4f9za74x9f0l8jbf7mvjnmd6gyx02zb31jjrhza3y4hpcj412"; libraryHaskellDepends = [ base containers CSPM-CoreLanguage mtl parallel-tree-search QuickCheck random tree-monad @@ -2255,16 +2255,16 @@ self: { }) {}; "CSPM-Frontend" = callPackage - ({ mkDerivation, alex, array, base, containers, dlist, either - , ghc-prim, mtl, parsec2, prettyclass, syb, transformers + ({ mkDerivation, alex, array, base, containers, dlist, either, mtl + , parsec, prettyclass, syb, transformers }: mkDerivation { pname = "CSPM-Frontend"; - version = "0.10.0.0"; - sha256 = "0wmfk9givv604ajzkg60586lz08xqcx60bnqgslpfzkh458mz9z3"; + version = "0.12.1.0"; + sha256 = "17i5app854vb4mghf9l0laldbgraqbq08w36hh61j5n161ypb1s5"; libraryHaskellDepends = [ - array base containers dlist either ghc-prim mtl parsec2 prettyclass - syb transformers + array base containers dlist either mtl parsec prettyclass syb + transformers ]; libraryToolDepends = [ alex ]; description = "A CSP-M parser compatible with FDR-2.91"; @@ -2278,8 +2278,8 @@ self: { }: mkDerivation { pname = "CSPM-Interpreter"; - version = "0.7.0.0"; - sha256 = "0shf0bb4zqnxvclsavvxnsy697xbl5q1xjqww8makps6dirwk0qn"; + version = "0.7.1.0"; + sha256 = "01byczl4109mwmxflmnflxxh4pnfj4anqsfgng5q664a8rjzqfwy"; libraryHaskellDepends = [ array base containers CSPM-CoreLanguage CSPM-Frontend mtl prettyclass syb @@ -2290,15 +2290,13 @@ self: { }) {}; "CSPM-ToProlog" = callPackage - ({ mkDerivation, array, base, containers, CSPM-Frontend, ghc-prim - , pretty - }: + ({ mkDerivation, array, base, containers, CSPM-Frontend, pretty }: mkDerivation { pname = "CSPM-ToProlog"; - version = "0.5.2.0"; - sha256 = "0qy2zdxgdm9vacm2ickf1lvyj6wrcnpifaxgh25apg9j9v6g0h12"; + version = "0.5.5.0"; + sha256 = "1jr4q8jyai53g4yps1377q7wv9c52mg50yikycyirrpz46giiy2r"; libraryHaskellDepends = [ - array base containers CSPM-Frontend ghc-prim pretty + array base containers CSPM-Frontend pretty ]; description = "some modules specific for the ProB tool"; license = stdenv.lib.licenses.bsd3; @@ -2308,22 +2306,22 @@ self: { "CSPM-cspm" = callPackage ({ mkDerivation, base, cmdargs, containers, CSPM-CoreLanguage , CSPM-FiringRules, CSPM-Frontend, CSPM-Interpreter, CSPM-ToProlog - , hslua, parallel, pretty, prettyclass, syb, transformers, xml + , hslua, parallel, prettyclass, syb, transformers, xml }: mkDerivation { pname = "CSPM-cspm"; - version = "0.8.0.0"; - sha256 = "1lhfq8gjls2g3xwskwa7vx1kj6n83b4msx4fc6769li4r2xn1bc9"; + version = "0.8.1.0"; + sha256 = "0brgzzhkqk8pvdniqwzcfwwr9v7y3kw3zdhsw053lxs0dcb191n0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules - CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty + CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel prettyclass syb transformers xml ]; executableHaskellDepends = [ base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules - CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty + CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel prettyclass syb transformers xml ]; description = "cspm command line tool for analyzing CSPM specifications"; @@ -6077,8 +6075,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.9.1.1"; - sha256 = "13536fari7askp70zp7arzbk16vwgz42lw7anwxnhi9gpq2hjy5y"; + version = "0.9.2"; + sha256 = "04k0i27igqzvxmyp2yy5gvd9agymmxwxnnkqxkiv0qjhk1kj8p8r"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -9351,8 +9349,8 @@ self: { }: mkDerivation { pname = "Hastodon"; - version = "0.1.0"; - sha256 = "012b8f2jb297bnx7sgsvz0vw0ic0xmlrr0b7fs65y6ycll6ih2zw"; + version = "0.2.0"; + sha256 = "1ybchvkcv9n4wp8r4xassmgw1z0kdscmkccg3rbhz72lwp3m13zz"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types MissingH text ]; @@ -10251,36 +10249,6 @@ self: { }) {}; "IPv6DB" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger - , hedis, hspec, http-client, http-types, IPv6Addr, mtl - , optparse-applicative, text, unordered-containers, vector, wai - , wai-logger, warp - }: - mkDerivation { - pname = "IPv6DB"; - version = "0.2.2"; - sha256 = "117qn9h25wi0q8nnj10yj33spqizcsf0inb7n4xpbccg60x9i51k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring fast-logger hedis http-types IPv6Addr mtl - optparse-applicative text unordered-containers vector wai - wai-logger warp - ]; - testHaskellDepends = [ - aeson base hspec http-client http-types vector - ]; - homepage = "http://ipv6db.cybervisible.com"; - description = "A RESTful Web Service for IPv6-related data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "IPv6DB_0_2_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl , optparse-applicative, text, unordered-containers, vector, wai @@ -12662,31 +12630,33 @@ self: { }) {}; "MutationOrder" = callPackage - ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, base, bimaps - , BiobaseXNA, bytestring, cereal, cereal-vector, cmdargs - , containers, deepseq, directory, DPutils, file-embed, filepath - , FormalGrammars, log-domain, parallel, PrimitiveArray + ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, attoparsec, base + , bimaps, BiobaseXNA, bytestring, bytestring-trie, cereal + , cereal-vector, cmdargs, containers, deepseq, directory, DPutils + , errors, file-embed, filemanip, filepath, FormalGrammars, hashable + , lens, log-domain, mtl, OrderedBits, parallel, PrimitiveArray , PrimitiveArray-Pretty, QuickCheck, serialize-instances - , ShortestPathProblems, tasty, tasty-quickcheck, tasty-th, text - , unordered-containers, vector, vector-strategies + , ShortestPathProblems, split, tasty, tasty-quickcheck, tasty-th + , text, unordered-containers, vector, vector-strategies , ViennaRNA-bindings, zlib }: mkDerivation { pname = "MutationOrder"; - version = "0.0.0.2"; - sha256 = "0bzk2n84j2w1j11b8pi5505kdad3fzr4m86qwkwc9kmv2l25j680"; + version = "0.0.1.0"; + sha256 = "0zk0cwjapsinnadwk8ss5cv3g81c6cz1dcqq47g53bfi0m9aly9q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ADPfusion ADPfusionSet aeson base bimaps BiobaseXNA bytestring - cereal cereal-vector containers deepseq directory DPutils filepath - FormalGrammars log-domain parallel PrimitiveArray - PrimitiveArray-Pretty serialize-instances ShortestPathProblems text - unordered-containers vector vector-strategies ViennaRNA-bindings - zlib + ADPfusion ADPfusionSet aeson attoparsec base bimaps BiobaseXNA + bytestring bytestring-trie cereal cereal-vector containers deepseq + directory DPutils errors filemanip filepath FormalGrammars hashable + lens log-domain mtl OrderedBits parallel PrimitiveArray + PrimitiveArray-Pretty serialize-instances ShortestPathProblems + split text unordered-containers vector vector-strategies + ViennaRNA-bindings zlib ]; executableHaskellDepends = [ - base bytestring cmdargs file-embed filepath + base bytestring cmdargs directory errors file-embed filepath ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th vector @@ -15171,7 +15141,7 @@ self: { homepage = "http://raincat.bysusanlin.com/"; description = "A puzzle game written in Haskell with a cat in lead role"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Random123" = callPackage @@ -15872,6 +15842,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "STLinkUSB" = callPackage + ({ mkDerivation, base, binary, bytestring, transformers, usb + , vector + }: + mkDerivation { + pname = "STLinkUSB"; + version = "0.1.0"; + sha256 = "17rqwr9f0g9p4i7qw4gih1g7wj2y7d7bdma55warp82v0v996ypr"; + libraryHaskellDepends = [ + base binary bytestring transformers usb vector + ]; + description = "STLink USB interface in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "STMonadTrans" = callPackage ({ mkDerivation, array, base, Cabal, mtl }: mkDerivation { @@ -17478,8 +17464,8 @@ self: { }: mkDerivation { pname = "TeX-my-math"; - version = "0.201.0.0"; - sha256 = "0lrv0wybagc1zka9nq78qrdaygl4wbhkllw3w79cnmk1bagslxs4"; + version = "0.201.1.0"; + sha256 = "13rf0q74kk8lmgwfxicgf2d83b1jnvyq623pykm5z4g3cnap4nn4"; libraryHaskellDepends = [ base decimal-literals dumb-cas hashable haskell-src-meta HaTeX template-haskell text unordered-containers vector-space void @@ -18330,8 +18316,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.1.14"; - sha256 = "020ialav8dxbzkyra8sjip397l50j7d3gy3m44jf4wgiyk3d9jpj"; + version = "0.1.2.1"; + sha256 = "1iabmpf31vb493xp8ypmai15ld4jbf0zchjnmf6hwfs58w92v27d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18674,14 +18660,14 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_6_0_0" = callPackage + "Win32_2_6_1_0" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 , msimg32, shell32, shfolder, shlwapi, unbuildable, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.6.0.0"; - sha256 = "1swrahwg89c6001cprzfx9fi64kndzmfvwbr34k2f00izv39fn6l"; + version = "2.6.1.0"; + sha256 = "1qwwznnnqnr6zqvjzwr35bkvzrvjf7v90j4qkhinzs8p0yx4b97b"; libraryHaskellDepends = [ base bytestring filepath unbuildable ]; librarySystemDepends = [ advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm @@ -19856,6 +19842,8 @@ self: { pname = "accelerate-blas"; version = "0.1.0.1"; sha256 = "0rjcga34ipml402gikwvdxnpdjrmh9vnhd8wvcv109gs1ih6pafd"; + revision = "2"; + editedCabalFile = "1bxh38hyn7lq73z1dqg8rsbdblvy3551lp08jlm2h8p9b8bsriia"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda @@ -21980,6 +21968,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-tiled" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec, text + , vector + }: + mkDerivation { + pname = "aeson-tiled"; + version = "0.0.0.1"; + sha256 = "147rm19czz8bvzmjj4mmcvjyz02mr3cisyprzdfpx1q5msi7aghk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers text vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ aeson base hspec ]; + homepage = "https://github.com/schell/aeson-tiled#readme"; + description = "Aeson instances for the Tiled map editor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-toolkit" = callPackage ({ mkDerivation, aeson, base, bytestring, failure, hspec, text }: mkDerivation { @@ -22426,8 +22435,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.3"; - sha256 = "0apx1i3v5p416wa9d0s8qacras3p137f9djbyv5miz5n7yhmlfi3"; + version = "5.3.1"; + sha256 = "1qgccxz77fa3j6vakg14z81wqw3259zrgg3xvfmrizshxnp1vh54"; libraryHaskellDepends = [ array base binary containers deepseq mtl mwc-random random vector ]; @@ -22459,8 +22468,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.7.4.2"; - sha256 = "12igx82kzbsg9zick5r9nai2zdds33pkfgp0zm9kdr4a04qz58z1"; + version = "0.8"; + sha256 = "1ggr95d6na41sllnz6a8lnscb63v04b8x466hw6658r8vxai0560"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -22558,15 +22567,16 @@ self: { }) {}; "aivika-lattice" = callPackage - ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl - , mwc-random, random + ({ mkDerivation, aivika, aivika-transformers, array, base + , containers, mtl, mwc-random, random }: mkDerivation { pname = "aivika-lattice"; - version = "0.3"; - sha256 = "1770w2jbfyvcrdsvlh00l7861ckxk37yk4qc27fmigd060gbz552"; + version = "0.4"; + sha256 = "0fczcyg9bmijjwzh4x2kgs5q0x5swz17b51cv298ka4cmbqbhmgv"; libraryHaskellDepends = [ - aivika aivika-transformers base containers mtl mwc-random random + aivika aivika-transformers array base containers mtl mwc-random + random ]; homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library using lattice"; @@ -25249,7 +25259,6 @@ self: { ]; description = "Generic Haskell AMQP Consumer"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-worker" = callPackage @@ -26130,25 +26139,25 @@ self: { "apiary" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html - , blaze-markup, bytestring, bytestring-read, case-insensitive - , data-default-class, directory, exceptions, hashable, http-date - , http-types, HUnit, mime-types, monad-control, mtl, process - , resourcet, stringsearch, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, transformers, transformers-base - , types-compat, unix-compat, unordered-containers, vault, wai - , wai-extra, web-routing + , blaze-markup, bytestring, bytestring-lexing, case-insensitive + , data-default-class, directory, exceptions, ghc-prim, hashable + , hetero-dict, http-date, http-types, HUnit, mime-types + , monad-control, mtl, primitive, process, resourcet, stringsearch + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , time, transformers, transformers-base, unix-compat + , unordered-containers, vault, wai, wai-extra }: mkDerivation { pname = "apiary"; - version = "2.0.2"; - sha256 = "155mkd7fdy32vhpl3njwa4v5r720w1y436i3laz9nysxnjaqk85r"; + version = "2.1.2"; + sha256 = "03b3rhjpjfinj1xnkngipz09d1j1dijy25s0z0a5mvygahlf9kvc"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html blaze-markup bytestring - bytestring-read case-insensitive data-default-class exceptions - hashable http-date http-types mime-types monad-control mtl process - resourcet stringsearch template-haskell text time transformers - transformers-base types-compat unix-compat unordered-containers - vault wai wai-extra web-routing + bytestring-lexing case-insensitive data-default-class exceptions + ghc-prim hashable hetero-dict http-date http-types mime-types + monad-control mtl primitive process resourcet stringsearch + template-haskell text time transformers transformers-base + unix-compat unordered-containers vault wai wai-extra ]; testHaskellDepends = [ aeson base bytestring directory http-types HUnit mtl tasty @@ -26164,18 +26173,16 @@ self: { ({ mkDerivation, apiary, apiary-session, authenticate, base , blaze-builder, bytestring, cereal, data-default-class , http-client, http-client-tls, http-types, monad-control - , resourcet, text, types-compat, wai, web-routing + , resourcet, text, wai }: mkDerivation { pname = "apiary-authenticate"; - version = "1.4.0"; - sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0"; - revision = "5"; - editedCabalFile = "0jndacr6vcnh14d7bd10v9jl2qcpzfwr223j7x1f6zza70r2p5rl"; + version = "1.5.1"; + sha256 = "0j28iv0am45a104cpc6jd1gv1j7nqwbjji892d0q9g90wlf2r5p8"; libraryHaskellDepends = [ apiary apiary-session authenticate base blaze-builder bytestring cereal data-default-class http-client http-client-tls http-types - monad-control resourcet text types-compat wai web-routing + monad-control resourcet text wai ]; homepage = "https://github.com/philopon/apiary"; description = "authenticate support for apiary web framework"; @@ -26190,10 +26197,8 @@ self: { }: mkDerivation { pname = "apiary-clientsession"; - version = "1.4.0"; - sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6"; - revision = "3"; - editedCabalFile = "06kcmwm1mrvqmbl510ni2j1rdsrzhs81xsjia5wlyhn4jr4192ag"; + version = "1.5.1"; + sha256 = "1cxxc3nn05k2v0mr2lnhhjwigykx5jws23mik3znq259r18wjjk7"; libraryHaskellDepends = [ apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault @@ -26206,17 +26211,14 @@ self: { "apiary-cookie" = callPackage ({ mkDerivation, apiary, base, blaze-builder, blaze-html - , bytestring, cookie, time, types-compat, wai, web-routing + , bytestring, cookie, time, wai }: mkDerivation { pname = "apiary-cookie"; - version = "1.4.0"; - sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; - revision = "4"; - editedCabalFile = "0qc5nzjak8zb5i3kavz7hi1qy6ywalsrgj2wrxdb53jwac76gigc"; + version = "1.5.1"; + sha256 = "1lci1vim94nk3ah72wa9iy1vza3gnf3c05jp10bnv0khy131mghy"; libraryHaskellDepends = [ - apiary base blaze-builder blaze-html bytestring cookie time - types-compat wai web-routing + apiary base blaze-builder blaze-html bytestring cookie time wai ]; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; @@ -26228,10 +26230,8 @@ self: { ({ mkDerivation, apiary, base, blaze-builder, wai-extra }: mkDerivation { pname = "apiary-eventsource"; - version = "1.4.0"; - sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7"; - revision = "2"; - editedCabalFile = "15fc0hdrcic1nk62znn3dcq6dp00d0msl38kb7pdapvkpnyh1z0g"; + version = "1.5.1"; + sha256 = "0dkvj03ay44m49pmm96y9nvyqlrw91kyw0pzm6wraspagbvs57nm"; libraryHaskellDepends = [ apiary base blaze-builder wai-extra ]; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; @@ -26281,18 +26281,15 @@ self: { "apiary-logger" = callPackage ({ mkDerivation, apiary, base, data-default-class, fast-logger , lifted-base, monad-control, monad-logger, transformers - , transformers-base, types-compat + , transformers-base }: mkDerivation { pname = "apiary-logger"; - version = "1.4.0"; - sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; - revision = "4"; - editedCabalFile = "1qs3fxaiybyb4g9d4w393yxwsxr4b6wzg5va7qmlqpcavr9l1224"; + version = "1.5.1"; + sha256 = "19a8qiv0dygxmznjpr46s3wihryi83qj6d12nzr7d0n7j36ja2d8"; libraryHaskellDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base - types-compat ]; homepage = "https://github.com/philopon/apiary"; description = "fast-logger support for apiary web framework"; @@ -26323,17 +26320,15 @@ self: { "apiary-mongoDB" = callPackage ({ mkDerivation, apiary, base, bson, data-default-class , lifted-base, monad-control, mongoDB, resource-pool, text, time - , transformers, types-compat + , transformers }: mkDerivation { pname = "apiary-mongoDB"; - version = "1.4.0"; - sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd"; - revision = "2"; - editedCabalFile = "1pk0axkr5zrlbyqskznh050ahvpnccdpa0ixfn3i5sw26nnva4ny"; + version = "1.5.1"; + sha256 = "1liiyk2w2v18455ydbxz7k5d58f29sgmlagxikkgsplbdm3m5mz0"; libraryHaskellDepends = [ apiary base bson data-default-class lifted-base monad-control - mongoDB resource-pool text time transformers types-compat + mongoDB resource-pool text time transformers ]; homepage = "https://github.com/philopon/apiary"; description = "mongoDB support for apiary web framework"; @@ -26344,18 +26339,15 @@ self: { "apiary-persistent" = callPackage ({ mkDerivation, apiary, apiary-logger, base, monad-control , monad-logger, persistent, resource-pool, resourcet, transformers - , transformers-base, types-compat, web-routing + , transformers-base }: mkDerivation { pname = "apiary-persistent"; - version = "1.4.0"; - sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9"; - revision = "3"; - editedCabalFile = "17i3l8aj2k1hzlmyf2h4jl5savbrdvnvz2i8riwcmwfqgnmcfdc2"; + version = "1.5.1"; + sha256 = "03vd0vjz72dd8ngi5n9dziplpxdysql5gxgiqfn825fzc75c9pn4"; libraryHaskellDepends = [ apiary apiary-logger base monad-control monad-logger persistent - resource-pool resourcet transformers transformers-base types-compat - web-routing + resource-pool resourcet transformers transformers-base ]; homepage = "https://github.com/philopon/apiary"; description = "persistent support for apiary web framework"; @@ -26385,16 +26377,12 @@ self: { }) {}; "apiary-session" = callPackage - ({ mkDerivation, apiary, base, types-compat, wai, web-routing }: + ({ mkDerivation, apiary, base, wai }: mkDerivation { pname = "apiary-session"; - version = "1.4.0"; - sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23"; - revision = "3"; - editedCabalFile = "04yrlp26dbhhybqvviajmd85vrcdbscmbw4nmag32wfnz5xdb0qr"; - libraryHaskellDepends = [ - apiary base types-compat wai web-routing - ]; + version = "1.5.0"; + sha256 = "01z4r0sfm562wssfpqs3yzgwrprh8jzp0xsck4z099pwjknfi4i4"; + libraryHaskellDepends = [ apiary base wai ]; homepage = "https://github.com/philopon/apiary"; description = "session support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -26402,18 +26390,12 @@ self: { }) {}; "apiary-websockets" = callPackage - ({ mkDerivation, apiary, base, wai-websockets, web-routing - , websockets - }: + ({ mkDerivation, apiary, base, wai-websockets, websockets }: mkDerivation { pname = "apiary-websockets"; - version = "1.4.0"; - sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1"; - revision = "2"; - editedCabalFile = "1s8mpk1h6a6yxmwivclawwn20s2zs094cvbphl8ymil8mm505n3j"; - libraryHaskellDepends = [ - apiary base wai-websockets web-routing websockets - ]; + version = "1.5.0"; + sha256 = "0z43lqjz51r3mw92drjkrl3m8na7ldick76vqas0dr17v1d4qdsw"; + libraryHaskellDepends = [ apiary base wai-websockets websockets ]; homepage = "https://github.com/philopon/apiary"; description = "websockets support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -28914,8 +28896,8 @@ self: { ({ mkDerivation, attoparsec, base, ip }: mkDerivation { pname = "attoparsec-ip"; - version = "0.0.0"; - sha256 = "08hgjmi9nlgg9qavsh5sl0s52yzh7vk6c933dgx9k16vk456r2y4"; + version = "0.0.1"; + sha256 = "0aananvfa7h9d73yf1c69zw5b3s3m67qhfmfrzdbifw3wj5cm9cd"; libraryHaskellDepends = [ attoparsec base ip ]; testHaskellDepends = [ base ]; homepage = "https://github.com/athanclark/attoparsec-ip#readme"; @@ -29074,8 +29056,8 @@ self: { }: mkDerivation { pname = "attoparsec-uri"; - version = "0.0.2"; - sha256 = "096w3zb9a0fcqcnzl7lb9n27hgbaj6f5n93vll7rih972657h0my"; + version = "0.0.3"; + sha256 = "1n89gkgnd8zp7ggklv98y58hk3f45l20wr3m1avcpk9a42ig186n"; libraryHaskellDepends = [ attoparsec attoparsec-ip base bytedump ip strict text vector ]; @@ -34841,6 +34823,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bizzlelude-js" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "bizzlelude-js"; + version = "1.0.4"; + sha256 = "1wp1542cjcypz339f9b5qxcgf1ppilbxgi8861s5d9p89zrgimij"; + libraryHaskellDepends = [ base containers text ]; + homepage = "http://github.com/TheBizzle"; + description = "A lousy Prelude replacement by a lousy dude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bk-tree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -35993,8 +35987,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.10.0.0"; - sha256 = "1f7vfh9pcg6za8rcdpq1lbvyn2z7plcb70d5r1xj330akvl626jw"; + version = "0.10.1.0"; + sha256 = "024qd9dmgqsa3q5xykc0bbvgay9hp9qwl9xixkgjpa5li68rd54c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36184,8 +36178,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit }: mkDerivation { pname = "boolean-list"; - version = "0.1.0.1"; - sha256 = "0xz0p3simx0vzvpjcmlqw7hnx0v3fiz25q8d9n7iw6z72c1920mc"; + version = "0.1.0.2"; + sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs"; libraryHaskellDepends = [ base bytestring HUnit ]; homepage = "http://xy30.com"; description = "convert numbers to binary coded lists"; @@ -37140,6 +37134,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "buffer" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, criterion + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "buffer"; + version = "0.5.0.1"; + sha256 = "09dwscqkdppmiprz8k0rfxkwf7qd8b6md8iviqmxw3wamm9qx7dl"; + libraryHaskellDepends = [ base base-prelude bug bytestring ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/buffer"; + description = "Simple mutable low-level buffer for IO"; + license = stdenv.lib.licenses.mit; + }) {}; + "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances @@ -37494,8 +37508,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.6.1"; - sha256 = "18qg8fwmdq0lrfz7gyyzv6f4ch24sm925ykxb68rr996wxnmlbm2"; + version = "0.6.2"; + sha256 = "099awz60hp9bpc8d27zkb3vm8r5bqp2y358drj6bzas5gqlg67bf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -38132,8 +38146,8 @@ self: { }: mkDerivation { pname = "bzlib-conduit"; - version = "0.2.1.4"; - sha256 = "07gxnbr65pl70lssgcxbajc0id9x4p3p8mc0hfi9lgf8rh270w1d"; + version = "0.2.1.5"; + sha256 = "1bv78qr6fbf6lg1dx06g3r2904fjnpvb87mlqv6np2kpyzjc11an"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL bytestring conduit conduit-extra data-default mtl @@ -39107,6 +39121,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cabal-toolkit" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , template-haskell + }: + mkDerivation { + pname = "cabal-toolkit"; + version = "0.0.1"; + sha256 = "0rlr2zcm4pmiknw7z4jgn1n1wd9wr056g5hbv7jcr3l709b1753j"; + libraryHaskellDepends = [ + base binary bytestring Cabal containers template-haskell + ]; + homepage = "https://github.com/TerrorJack/cabal-toolkit#readme"; + description = "Helper functions for writing custom Setup.hs scripts."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-uninstall" = callPackage ({ mkDerivation, base, directory, filepath, mtl, process }: mkDerivation { @@ -42191,8 +42222,8 @@ self: { }: mkDerivation { pname = "chatwork"; - version = "0.1.1.2"; - sha256 = "050a0vhv59svdgja4lc8jxcyxqbrd9zr14hwbrnk7hzk9dxvd0wz"; + version = "0.1.1.3"; + sha256 = "0g7995g5i49mxd0qhdb2l1l1yz047yqwnmzk9f6xvqv5fqy5c6p5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42378,6 +42409,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkers_0_4_9" = callPackage + ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: + mkDerivation { + pname = "checkers"; + version = "0.4.9"; + sha256 = "1vpyyhvq1xkq8pxz2xpmw14yldn8ks95zaijpqxdzsmq4v3sy83a"; + libraryHaskellDepends = [ + array base QuickCheck random semigroupoids + ]; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "checkmate" = callPackage ({ mkDerivation, base, bytestring, containers, diff-parse , directory, file-embed, filepath, github, hlint, hspec @@ -42676,13 +42721,14 @@ self: { }) {}; "chronologique" = callPackage - ({ mkDerivation, base, hourglass, hspec, QuickCheck, time }: + ({ mkDerivation, base, hourglass, hspec, QuickCheck, time, vector + }: mkDerivation { pname = "chronologique"; - version = "0.2.1.0"; - sha256 = "13lrngxfbsfsmqph8slh8zn7hvvihbwzc6cna315kjzhi3a3mwbm"; - libraryHaskellDepends = [ base hourglass time ]; - testHaskellDepends = [ base hourglass hspec QuickCheck ]; + version = "0.3.0.0"; + sha256 = "1pgggmsmb3ah15iqkib9d9ms0vs4j3945a7mbih0zra4xha39dg9"; + libraryHaskellDepends = [ base hourglass time vector ]; + testHaskellDepends = [ base hourglass hspec QuickCheck vector ]; description = "Time to manipulate time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42690,16 +42736,16 @@ self: { "chronos" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable , HUnit, primitive, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, vector + , test-framework-hunit, test-framework-quickcheck2, text, torsor + , vector }: mkDerivation { pname = "chronos"; - version = "0.4"; - sha256 = "0lc7qb1ky15sxmvndfjcmmy6j913ncnzq0hjx9mbqljvg7di0yal"; - revision = "1"; - editedCabalFile = "1mk6kn0gs7azv7c9bcal8k6zzlpska0x9akk91la2xvg298sy6a5"; + version = "1.0"; + sha256 = "135fb54lac1rqb7ql0810f22a41whmswckhjbmb1xysryv0gv05k"; libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector + aeson attoparsec base bytestring hashable primitive text torsor + vector ]; testHaskellDepends = [ attoparsec base bytestring HUnit QuickCheck test-framework @@ -43390,6 +43436,7 @@ self: { homepage = "https://github.com/lambdageek/clang-compilation-database"; description = "JSON Compilation Database Format encoding and decoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clang-pure" = callPackage @@ -45306,8 +45353,8 @@ self: { ({ mkDerivation, array, base, bytestring, text }: mkDerivation { pname = "cndict"; - version = "0.8.2"; - sha256 = "0pc6rph99mxy5cbrxrysxq5q01vn2k2ax3c00pv9sw7inn4inh0p"; + version = "0.8.3"; + sha256 = "1vci3z74jsxfhbbz122mcbcdh6n2371i0l803vgd8ndzawhs13m4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring text ]; homepage = "https://github.com/Lemmih/cndict"; @@ -46019,8 +46066,8 @@ self: { }: mkDerivation { pname = "colour-space"; - version = "0.1.3.0"; - sha256 = "06ainna4nrqd9an0s0hvcrqw18g55v0fqw4a6p00g5kw53729qyq"; + version = "0.1.4.0"; + sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq"; libraryHaskellDepends = [ base colour constrained-categories JuicyPixels linear linearmap-category manifolds semigroups vector-space @@ -47471,6 +47518,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concurrent-buffer" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, criterion + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "concurrent-buffer"; + version = "0.1"; + sha256 = "0qrnsp98x42blvngixm9wzk9cnwk335s5axslwrl6hq8pawx2ycd"; + libraryHaskellDepends = [ base base-prelude bug bytestring ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/concurrent-buffer"; + description = "Concurrent expanding buffer"; + license = stdenv.lib.licenses.mit; + }) {}; + "concurrent-dns-cache" = callPackage ({ mkDerivation, array, async, base, bytestring, containers, dns , hspec, iproute, lifted-base, monad-control, network, psqueues @@ -48565,6 +48632,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "conkin" = callPackage + ({ mkDerivation, base, data-default, doctest, markdown-unlit + , pretty-show + }: + mkDerivation { + pname = "conkin"; + version = "1.0.2"; + sha256 = "1843mlmf09jgdj6hd7jzn81pwd4biimrc4rxaki9s2df2qd2zr6r"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base data-default doctest markdown-unlit pretty-show + ]; + homepage = "http://github.com/rampion/conkin"; + description = "Tools for functors from Hask^k to Hask"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conlogger" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -50806,8 +50891,8 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.20"; - sha256 = "08cvagp0v98s8x99cdq86yk1i33fcpgxq3zdm414lf6cpjq80qa1"; + version = "5.9.23"; + sha256 = "04f66vjl1bpfgsf0j5dpz7wjvkvw22ia0f1d375mzhp5xmv4qw46"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions filepath gray-extended hdaemonize hsyslog MonadRandom mtl @@ -51872,8 +51957,8 @@ self: { }: mkDerivation { pname = "cryptoids"; - version = "0.3.0.0"; - sha256 = "1n8mr80n1hmld02n1a97nsxh3x8fmnqmbpnnvjawkq1mj768nbc4"; + version = "0.4.0.0"; + sha256 = "1km63vgckjsxxrkd45w7c5gc3d5hk6dg6f0y4z4c8wajz4ddp1a3"; libraryHaskellDepends = [ base binary bytestring cryptoids-types cryptonite directory exceptions filepath memory @@ -52565,8 +52650,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.8.0.0"; - sha256 = "0zlasd6c3da462qaffj9z44546551b2cvs0wv0f23739x4i929z9"; + version = "0.8.0.1"; + sha256 = "0raaydjcnicg38kxy1mjpxb0k57q5nnzb7p38i8x5ify30bzxw0w"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -54183,14 +54268,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_1_2_0_2" = callPackage + "data-diverse_1_2_0_3" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "1.2.0.2"; - sha256 = "0h0wifwckybn0py6xndaj1fp0sld28aca4qgclw07qsyfd9rnc9x"; + version = "1.2.0.3"; + sha256 = "0mc9xzh0hja8zvgwnfa65hdwirqzggbw1k07fspgzs699wj9dh6r"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54215,13 +54300,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_0_5_0_0" = callPackage - ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: + "data-diverse-lens_0_5_1_0" = callPackage + ({ mkDerivation, base, data-diverse, hspec, lens, profunctors + , tagged + }: mkDerivation { pname = "data-diverse-lens"; - version = "0.5.0.0"; - sha256 = "1can16ndkff8c3dfn585hdbg8zw805icax01hfm0ys3rvypwn4vq"; - libraryHaskellDepends = [ base data-diverse lens tagged ]; + version = "0.5.1.0"; + sha256 = "0c1hrz9b8a01vphfqmlfgx3mh6ci8hd5wwr8iwpkv6z7ps7sp9kd"; + libraryHaskellDepends = [ + base data-diverse lens profunctors tagged + ]; testHaskellDepends = [ base data-diverse hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse-lens#readme"; description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which"; @@ -56941,18 +57030,17 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "dejafu_0_9_0_0" = callPackage + "dejafu_0_9_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , leancheck, mtl, random, ref-fd, semigroups, transformers - , transformers-base + , leancheck, random, ref-fd, transformers, transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.9.0.0"; - sha256 = "0n2qj6kaldg006pjz5aj0wjigr3dd7vgbl35fgsz3fx9j64ydi72"; + version = "0.9.0.1"; + sha256 = "18i21basz8d50axa1ccgz9djghd95iazv4k7x499fff1nak39147"; libraryHaskellDepends = [ - base concurrency containers deepseq exceptions leancheck mtl random - ref-fd semigroups transformers transformers-base + base concurrency containers deepseq exceptions leancheck random + ref-fd transformers transformers-base ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Systematic testing for Haskell concurrency"; @@ -57448,16 +57536,20 @@ self: { }) {}; "derive-topdown" = callPackage - ({ mkDerivation, base, mtl, primitive, syb, template-haskell - , th-expand-syns, transformers + ({ mkDerivation, base, binary, derive, haskell-src, mtl, primitive + , QuickCheck, syb, template-haskell, th-expand-syns, transformers }: mkDerivation { pname = "derive-topdown"; - version = "0.0.0.7"; - sha256 = "1r566bcp0qqwwbndwbbfnczxwmlyl9dfnsysnija7v8fn46z30ni"; + version = "0.0.0.9"; + sha256 = "0jvmdwd1dif8hxb45s2fw96pca1hm41p5cac68in1pkpsvq7z6cf"; libraryHaskellDepends = [ base mtl primitive syb template-haskell th-expand-syns transformers ]; + testHaskellDepends = [ + base binary derive haskell-src mtl primitive QuickCheck syb + template-haskell th-expand-syns transformers + ]; homepage = "https://github.com/HaskellZhangSong/derive-topdown"; description = "Help Haskellers derive class instances for composited data types"; license = stdenv.lib.licenses.bsd3; @@ -59671,8 +59763,8 @@ self: { }: mkDerivation { pname = "diskhash"; - version = "0.0.2.1"; - sha256 = "1kgjwcggi33jw1k1s462cya6hydcz7ka9pkqk2lgdcxwlw9fy9kb"; + version = "0.0.2.3"; + sha256 = "08g484knhw96mlk5qa6cx1cm9kblxrz8979c9xcvmidgj44phb8z"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring directory HUnit QuickCheck test-framework @@ -61379,15 +61471,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dotenv_0_5_1_0" = callPackage + "dotenv_0_5_1_1" = callPackage ({ mkDerivation, base, base-compat, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text , transformers }: mkDerivation { pname = "dotenv"; - version = "0.5.1.0"; - sha256 = "1cgx9q8gdfvkv3vr10yafa0vls2iil5kr5nqdbn4n9xf8m5p3dn1"; + version = "0.5.1.1"; + sha256 = "1i4892xc2d05qnswcyf40ww5idjd1m3wwqz9wxwhph1jqzvsgc9b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -62332,15 +62424,14 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.1.0.0"; - sha256 = "0jrxphgxm6f7wzrn8vzfz0i6scz2xz72yja5i2bmkf185gqvhpjz"; - revision = "1"; - editedCabalFile = "0wzq73i209fa8apj34lc851cgg6047kimxkl9ykv8l9nspg22faq"; + version = "0.1.1.0"; + sha256 = "1crzw0axgamjhxrm2ggdqw45jw80avp227bwc1v0c7lmb4cmkr3p"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers ]; testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/leftaroundabout/dumb-cas"; description = "A computer “algebra” system that knows nothing about algebra, at the core"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -62388,8 +62479,8 @@ self: { ({ mkDerivation, base, transformers, transformers-base }: mkDerivation { pname = "dunai"; - version = "0.1.1.0"; - sha256 = "1smzf6m5l2ma500r9d51iia994lq8wvq2ryf3gijz3fyll6f5ibn"; + version = "0.2.0.0"; + sha256 = "1h6rw4h300hbmv05immhzxzf5yb9kc5zsykifdysi40l4fbx7rkc"; libraryHaskellDepends = [ base transformers transformers-base ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; @@ -62951,12 +63042,16 @@ self: { }) {}; "eap" = callPackage - ({ mkDerivation, base, binary, bytestring }: + ({ mkDerivation, base, binary, bytestring, cryptonite, memory, mtl + , pretty-hex + }: mkDerivation { pname = "eap"; - version = "0.1.0.0"; - sha256 = "118nayxnc8xwyhx622wvgr3l35v90481j50m43x2zfkwish23dir"; - libraryHaskellDepends = [ base binary bytestring ]; + version = "0.9.0.1"; + sha256 = "0z7ab3i16424gpxwjhc4x7c55yhvzx5qjm80f2klpf94zz4w37ab"; + libraryHaskellDepends = [ + base binary bytestring cryptonite memory mtl pretty-hex + ]; homepage = "https://github.com/erickg/eap#readme"; description = "Extensible Authentication Protocol (EAP)"; license = stdenv.lib.licenses.bsd3; @@ -67868,8 +67963,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.1.3"; - sha256 = "0b3f9h0s7ayijkpqk929pgw6lxszbq94c9y69wsfcs7h7awd792h"; + version = "0.1.4"; + sha256 = "1dxkg5yc2njq7dpv7vgkmrs73x5np5w1ahi79my6ysamnc2w8a04"; libraryHaskellDepends = [ attoparsec base containers lattices singletons text transformers ]; @@ -67887,8 +67982,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.1.0"; - sha256 = "1ma1g8b25466cpk8fyaf6fajp330wvnd44h2ddjvm9hkgaa8s82x"; + version = "0.1.1"; + sha256 = "0hk8qhkvlh4v210k7d845krg31px72ma44fmwahbycn6pgy32659"; libraryHaskellDepends = [ base containers expressions singletons transformers z3 ]; @@ -67976,17 +68071,18 @@ self: { "extensible" = callPackage ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim - , lens, monad-skeleton, mtl, primitive, profunctors, QuickCheck - , semigroups, StateVar, tagged, template-haskell, transformers + , hashable, lens, monad-skeleton, mtl, primitive, profunctors + , QuickCheck, semigroups, StateVar, tagged, template-haskell + , transformers, vector }: mkDerivation { pname = "extensible"; - version = "0.4.5"; - sha256 = "10cs47fdl79dasq5afbj5b47ybmvfsx589bwy6y3qcmlwybjnmlj"; + version = "0.4.6"; + sha256 = "0khi212qc834qnrssbn4xcfiypi2m7x8gwpwvpd6sbi6hi6c052v"; libraryHaskellDepends = [ - base comonad constraints deepseq ghc-prim monad-skeleton mtl - primitive profunctors QuickCheck semigroups StateVar tagged - template-haskell transformers + 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"; @@ -68532,6 +68628,28 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-builder_0_0_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, process, QuickCheck, scientific, stm + , template-haskell, text, true-name, unordered-containers, vector + }: + mkDerivation { + pname = "fast-builder"; + version = "0.0.1.0"; + sha256 = "09s0jyiv1ch8cbgwfaxn5mmn9w7ik661h2g6d5znxr0nsi0bp2n1"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring process QuickCheck stm ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion deepseq ghc-prim + scientific template-haskell text true-name unordered-containers + vector + ]; + homepage = "http://github.com/takano-akio/fast-builder"; + description = "Fast ByteString Builder"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-digits" = callPackage ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck @@ -69264,6 +69382,22 @@ self: { license = "GPL"; }) {}; + "fedora-haskell-tools" = callPackage + ({ mkDerivation, base, directory, filepath, process, time, unix }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "0.3"; + sha256 = "0ml5laiwkpd68j87px57jdvjc90pw1ma41gsc06h1qjlhnvhhill"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath process time unix + ]; + homepage = "https://github.com/fedora-haskell/fedora-haskell-tools"; + description = "Building and tracking tools for Fedora Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -69717,8 +69851,8 @@ self: { }: mkDerivation { pname = "ffmpeg-light"; - version = "0.12.0"; - sha256 = "0cv8jq2if0pv40yp8inl3slsgs3z1rncffjgs2522qimq123rxcz"; + version = "0.12.0.1"; + sha256 = "1ikyhdkr3pvkpmqw7j4xgz07bnxnvckld8kd06191kgqlvr2k764"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70218,6 +70352,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "filepath-crypto" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , cryptoids, cryptoids-types, encoding, exceptions, filepath, sandi + , template-haskell + }: + mkDerivation { + pname = "filepath-crypto"; + version = "0.0.0.2"; + sha256 = "1i6y0bpyndghkfip2l0ijk9mnhia0fjmd6skzl1a3dbh5pibf7fd"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive cryptoids cryptoids-types + encoding exceptions filepath sandi template-haskell + ]; + description = "Reversable and secure encoding of object ids as filepaths"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filepath-io-access" = callPackage ({ mkDerivation, base, base-io-access, filepath }: mkDerivation { @@ -72808,6 +72960,24 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "fortytwo" = callPackage + ({ mkDerivation, ansi-terminal, async, base, doctest, hspec + , process, text + }: + mkDerivation { + pname = "fortytwo"; + version = "1.0.2"; + sha256 = "15imj5ps040iz5abfnzjpgfq726j9c28bwwg06zbf07ji74dz190"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base text ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ async base doctest hspec process ]; + homepage = "https://github.com/gianlucaguarini/fortytwo#readme"; + description = "Interactive terminal prompt"; + license = stdenv.lib.licenses.mit; + }) {}; + "forward-chan" = callPackage ({ mkDerivation, base, SafeSemaphore, stm, unagi-chan }: mkDerivation { @@ -73424,14 +73594,15 @@ self: { }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.2.0"; - sha256 = "1km43gdngrjbyd6z8v6nfj25aybb4xdkxdnfizkd9sbkdqyxkbk8"; + version = "0.1.4.0"; + sha256 = "057l1fnkqyqnjbhzjz2jjlcrsmkcv2gd16gb5n3j99crw97s62xj"; libraryHaskellDepends = [ base lens linear MemoTrie vector vector-space ]; homepage = "https://github.com/leftaroundabout/free-vector-spaces"; description = "Instantiate the classes from the vector-space package with types from linear"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-vl" = callPackage @@ -73492,6 +73663,7 @@ self: { homepage = "https://github.com/clintonmead/freelude#readme"; description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freenect" = callPackage @@ -74758,6 +74930,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fuzzyset" = callPackage + ({ mkDerivation, base, base-unicode-symbols, data-default, hspec + , ieee754, lens, text, text-metrics, unordered-containers, vector + }: + mkDerivation { + pname = "fuzzyset"; + version = "0.1.0.2"; + sha256 = "1gpx8qw9vxlardjxncgkbbk3zvq8zjrc6nhjk80va7d7ix5zpdhz"; + libraryHaskellDepends = [ + base base-unicode-symbols data-default lens text text-metrics + unordered-containers vector + ]; + testHaskellDepends = [ + base base-unicode-symbols hspec ieee754 lens text + unordered-containers + ]; + homepage = "https://github.com/laserpants/fuzzyset-haskell"; + description = "Fuzzy set for approximate string matching"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fuzzytime" = callPackage ({ mkDerivation, base, cmdargs, directory, old-time, process }: mkDerivation { @@ -75051,23 +75244,22 @@ self: { }) {}; "gauge" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, basement, bytestring - , code-page, containers, deepseq, directory, foundation, HUnit - , math-functions, mwc-random, optparse-applicative, QuickCheck - , statistics, tasty, tasty-hunit, tasty-quickcheck, vector + ({ mkDerivation, base, basement, bytestring, code-page, containers + , deepseq, directory, HUnit, math-functions, mwc-random, tasty + , tasty-hunit, vector }: mkDerivation { pname = "gauge"; - version = "0.1.0"; - sha256 = "10hxx7n8hpcivi0g34w85dsvfx4l926rv1b6s88hyhpwj4qyvxb5"; + version = "0.1.3"; + sha256 = "1i97f00haj4832s2arbnqq19dpna54ygmchvnqkq00hsxk38cyc0"; libraryHaskellDepends = [ - ansi-wl-pprint base basement code-page containers deepseq - foundation math-functions mwc-random optparse-applicative vector + base basement code-page containers deepseq math-functions + mwc-random vector ]; testHaskellDepends = [ - base bytestring deepseq directory foundation HUnit QuickCheck - statistics tasty tasty-hunit tasty-quickcheck vector + base bytestring deepseq directory HUnit tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base ]; homepage = "https://github.com/vincenthz/hs-gauge"; description = "small framework for performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; @@ -75393,29 +75585,108 @@ self: { }) {inherit (pkgs) gegl;}; "gelatin" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , file-embed, FontyFruity, gl, GLFW-b, JuicyPixels, lens, linear - , time, vector + ({ mkDerivation, base, bytestring, containers, lens, linear, mtl + , transformers, vector }: mkDerivation { pname = "gelatin"; - version = "0.0.0.3"; - sha256 = "07ixnrhgqfqgb8cfm5qik17vx893jrjk7lq6342lpczpks22a58q"; + version = "0.1.0.0"; + sha256 = "08y9wsym19rgwr6k44n8pxffwi1fna3nmg4bq5cc7in5zj1ihfbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers directory file-embed FontyFruity - gl GLFW-b JuicyPixels lens linear time vector + base bytestring containers lens linear mtl transformers vector ]; - executableHaskellDepends = [ - async base bytestring containers directory file-embed FontyFruity - gl GLFW-b JuicyPixels lens linear time vector - ]; - description = "An experimental real time renderer"; + executableHaskellDepends = [ base linear mtl vector ]; + homepage = "https://github.com/schell/gelatin"; + description = "A graphics description language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gelatin-freetype2" = callPackage + ({ mkDerivation, base, containers, either, freetype2, gelatin + , gelatin-gl, mtl, transformers + }: + mkDerivation { + pname = "gelatin-freetype2"; + version = "0.1.0.0"; + sha256 = "0nr5xsxwg73liyr572jv1vzj5bjk3qhkkk7j6g0kqf2h31yxgqhr"; + libraryHaskellDepends = [ + base containers either freetype2 gelatin gelatin-gl mtl + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/schell/gelatin/gelatin-freetype2#readme"; + description = "FreeType2 based text rendering for the gelatin realtime rendering system"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gelatin-fruity" = callPackage + ({ mkDerivation, base, FontyFruity, gelatin, linear, vector }: + mkDerivation { + pname = "gelatin-fruity"; + version = "0.1.0.0"; + sha256 = "0yp3z4sz52f21zvdy1xmd0bvpicbnv4wa53937rq1vw2jv60xx2r"; + libraryHaskellDepends = [ base FontyFruity gelatin linear vector ]; + homepage = "https://github.com/schell/gelatin-fruity#readme"; + description = "Gelatin's support for rendering TTF outlines, using FontyFruity"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gelatin-gl" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, either + , filepath, gelatin, gelatin-shaders, gl, JuicyPixels, lens, linear + , mtl, template-haskell, transformers, vector + }: + mkDerivation { + pname = "gelatin-gl"; + version = "0.1.0.0"; + sha256 = "1x9a3wb878d1nrlxj2rciw4xz93gn3m326zciqnn5dg31fwqs396"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory either filepath gelatin + gelatin-shaders gl JuicyPixels lens linear mtl template-haskell + transformers vector + ]; + executableHaskellDepends = [ base gelatin lens linear mtl vector ]; + homepage = "https://github.com/schell/gelatin/gelatin-gl"; + description = "OpenGL rendering routines for the gelatin-picture graphics EDSL"; + license = stdenv.lib.licenses.mit; + }) {}; + + "gelatin-sdl2" = callPackage + ({ mkDerivation, base, either, filepath, gelatin-gl, mtl, sdl2 + , transformers + }: + mkDerivation { + pname = "gelatin-sdl2"; + version = "0.1.1.0"; + sha256 = "0gnn5b06q6fsbblrjghyzn46dby2skm5r9ys6pl6fhp7pa3c924n"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base gelatin-gl mtl sdl2 transformers ]; + executableHaskellDepends = [ base either filepath sdl2 ]; + homepage = "https://github.com/schell/gelatin"; + description = "An SDL2 backend for the gelatin renderer"; + license = stdenv.lib.licenses.mit; + }) {}; + + "gelatin-shaders" = callPackage + ({ mkDerivation, base, bytestring, filepath, gelatin }: + mkDerivation { + pname = "gelatin-shaders"; + version = "0.1.0.0"; + sha256 = "001ifyyv85b9gb5l4hf21b5dqakg4f7n3bil5a1abb4vcj2zmpfr"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring filepath gelatin ]; + homepage = "https://github.com/schell/gelatin-shaders#readme"; + description = "Gelatin's OpenGL shaders"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gemstone" = callPackage ({ mkDerivation, array, base, bitmap, bitmap-opengl, containers , FTGL, lens, linear, OpenGL, random, SDL, SDL-image, stb-image @@ -77644,14 +77915,14 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_5_5" = callPackage + "ghc-typelits-natnormalise_0_5_6" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5.5"; - sha256 = "1dr0568hfxrjhvpgl624zghnvinfg7wwn9x36lrnxr4cl7najqk5"; + version = "0.5.6"; + sha256 = "07rrc3aw00i36z6xgp2jik9wqi0d8byzy48dy8jj089vp7s6birb"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -79185,7 +79456,7 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive + , bloomfilter, bup, byteable, bytestring, case-insensitive , clientsession, concurrent-output, conduit, conduit-extra , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus , directory, disk-free-space, dlist, dns, edit-distance, esqueleto @@ -79204,8 +79475,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20171018"; - sha256 = "17armwygz44wphv6hqpyjggh4ybarhy3a2ypnsrc1ifhpq3rf15d"; + version = "6.20171026"; + sha256 = "0i44cfxp5wy6y527l9jbj83ilkxilp4jm7106q70czls0hnx6yij"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -79214,10 +79485,6 @@ self: { ]; isLibrary = false; isExecutable = true; - setupHaskellDepends = [ - base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse process split unix unix-compat - ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession concurrent-output conduit @@ -79711,27 +79978,6 @@ self: { }) {}; "github-release" = 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.0.6"; - sha256 = "1ixs76y5cb1dkrvl8i13a7s9xgs3170w3sjx6bhj05fi6wvz3n8z"; - 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; - }) {}; - - "github-release_1_0_7" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text , unordered-containers, uri-templater @@ -79750,7 +79996,6 @@ self: { 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 @@ -85459,13 +85704,13 @@ self: { ({ mkDerivation, base, cairo, containers, filepath, gtk }: mkDerivation { pname = "gulcii"; - version = "0.2.0.3"; - sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29"; + version = "0.3"; + sha256 = "1crx9kz4s8by509x1k60m89jmmn7gfhi46d05q44ikhk5zkxycws"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo containers filepath gtk ]; - homepage = "http://code.mathr.co.uk/gulcii"; + homepage = "https://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -87495,25 +87740,6 @@ self: { }) {}; "hailgun" = callPackage - ({ mkDerivation, aeson, base, bytestring, email-validate - , exceptions, filepath, http-client, http-client-tls, http-types - , tagsoup, text, time, transformers - }: - mkDerivation { - pname = "hailgun"; - version = "0.4.1.5"; - sha256 = "0hi9a8aa10n14ipk4g8ksrf175z92kkwk0d9n3qzn835fkj5kkyr"; - libraryHaskellDepends = [ - aeson base bytestring email-validate exceptions filepath - http-client http-client-tls http-types tagsoup text time - transformers - ]; - homepage = "https://bitbucket.org/robertmassaioli/hailgun"; - description = "Mailgun REST api interface for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hailgun_0_4_1_6" = callPackage ({ mkDerivation, aeson, base, bytestring, email-validate , exceptions, filepath, http-client, http-client-tls, http-types , tagsoup, text, time, transformers @@ -87530,7 +87756,6 @@ self: { homepage = "https://bitbucket.org/robertmassaioli/hailgun"; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hailgun-send" = callPackage @@ -90687,23 +90912,25 @@ self: { }) {}; "haskell-compression" = callPackage - ({ mkDerivation, base, bimap, booleanlist, bytestring, containers + ({ mkDerivation, base, bimap, boolean-list, bytestring, containers }: mkDerivation { pname = "haskell-compression"; - version = "0.2"; - sha256 = "0z0jhz5m70qrs2w3q58xghgv279yjvhfdspy5pqpss87jm1fm3ab"; + version = "0.3"; + sha256 = "1yksgwhxpfl47d6zrqdx5bdxyya9vd3kr1g33pz19qfqsvfcqlhp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bimap booleanlist bytestring containers + base bimap boolean-list bytestring containers + ]; + executableHaskellDepends = [ + base bimap boolean-list bytestring containers ]; - executableHaskellDepends = [ base bimap bytestring containers ]; homepage = "http://xy30.com"; description = "compress files"; license = stdenv.lib.licenses.gpl3; - broken = true; - }) {booleanlist = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "haskell-conll" = callPackage ({ mkDerivation, base, containers, lens, pretty-show, protolude @@ -93337,8 +93564,8 @@ self: { }: mkDerivation { pname = "hasktags"; - version = "0.69.3"; - sha256 = "1yjsdvb3y6ly29anvh14bvfan1fplc9brb6i68ipcz9a7jk9l1jf"; + version = "0.69.4"; + sha256 = "1s7phsg20h15p2dnri6viy5k6c4n42gchy684dv3r30qrwwvv0ni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95446,23 +95673,42 @@ self: { }) {}; "heavy-logger" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, fast-logger, hsyslog - , monad-control, monad-logger, mtl, template-haskell, text - , text-format-heavy, transformers-base + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, fast-logger, hsyslog, lifted-base, monad-control + , monad-logger, mtl, stm, template-haskell, text, text-format-heavy + , th-lift, th-lift-instances, thread-local-storage + , transformers-base }: mkDerivation { pname = "heavy-logger"; - version = "0.1.0.0"; - sha256 = "0wnvgjbhwscmq0wm7arlwpqj5dsrshaqhnx5nvlcvjkzrhcpxlpp"; + version = "0.3.1.0"; + sha256 = "0cmanxnahxgk52ffpni0zx4z22vdrh6r5my4llvsdd94bpfmxpi4"; libraryHaskellDepends = [ - attoparsec base bytestring fast-logger hsyslog monad-control - monad-logger mtl template-haskell text text-format-heavy - transformers-base + attoparsec base bytestring containers data-default fast-logger + hsyslog lifted-base monad-control monad-logger mtl stm + template-haskell text text-format-heavy th-lift th-lift-instances + thread-local-storage transformers-base ]; description = "Full-weight logging based on fast-logger"; license = stdenv.lib.licenses.bsd3; }) {}; + "heavy-logger-amazon" = callPackage + ({ mkDerivation, amazonka-core, base, binary, heavy-logger + , template-haskell, text + }: + mkDerivation { + pname = "heavy-logger-amazon"; + version = "0.1.0.0"; + sha256 = "18wcnpnjmv841ac3kvnyk0s9rrgfwvlgv950s1znnjdmi3qc0bjk"; + libraryHaskellDepends = [ + amazonka-core base binary heavy-logger template-haskell text + ]; + homepage = "https://github.com/portnov/heavy-logger-amazon#readme"; + description = "heavy-logger compatibility with amazonka-core logging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hebrew-time" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, time @@ -95555,30 +95801,6 @@ self: { }) {}; "hedis" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, HUnit, mtl, network, resource-pool, scanner - , slave-thread, stm, test-framework, test-framework-hunit, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.9.10"; - sha256 = "1z8vl3ql5nyl4jg3pzghsbi1ld9a047zbwz6fgzgk1lvspa0pcd3"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq mtl network - resource-pool scanner stm text time unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring HUnit mtl slave-thread stm test-framework - test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - homepage = "https://github.com/informatikr/hedis"; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedis_0_9_11" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, HUnit, mtl, network, resource-pool, scanner , slave-thread, stm, test-framework, test-framework-hunit, text @@ -95600,7 +95822,6 @@ self: { homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -96374,6 +96595,7 @@ self: { homepage = "https://github.com/JackKiefer/herms"; description = "A command-line manager for delicious kitchen recipes"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hero-club-five-tenets" = callPackage @@ -96699,8 +96921,8 @@ self: { ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; - version = "0.3.2"; - sha256 = "0vyv45s6nqhbgkzxcgx1ihmif0d7sxmfafqc2xcmcm2vg4jb7ls4"; + version = "0.3.3"; + sha256 = "1lhwhv75s71bqdclvfawhg9ss9z5icg9rpihkjfss4yzhxhcrvf4"; libraryHaskellDepends = [ base bytestring extra ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/ndmitchell/hexml#readme"; @@ -101147,20 +101369,20 @@ self: { license = stdenv.lib.licenses.isc; }) {inherit (pkgs) openssl;}; - "hoopl_3_10_2_1" = callPackage + "hoopl_3_10_2_2" = callPackage ({ mkDerivation, base, containers, filepath, mtl, parsec , test-framework, test-framework-hunit }: mkDerivation { pname = "hoopl"; - version = "3.10.2.1"; - sha256 = "1c20ahr12dlapajzgb7mhxb1m8q1485amwmvzmsgy7l7x2ls41kw"; + version = "3.10.2.2"; + sha256 = "15rbb9a8mza3zv8h3p237zhmy29bxc4k48ik27kzzj7islb16yq9"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers filepath mtl parsec test-framework test-framework-hunit ]; - homepage = "http://ghc.cs.tufts.edu/hoopl/"; + homepage = "https://github.com/haskell/hoopl"; description = "A library to support dataflow analysis and optimization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -102350,8 +102572,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.4"; - sha256 = "0vijl65rxir61nwx7sdgy6lcwgskyks3cdgcqd814smnavh6nhdn"; + version = "2.4.5"; + sha256 = "0f4h9b5c6s523967hkqg6wz57g350awa26r2y2wlfr4f39qgjwx3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102731,6 +102953,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libb2;}; + "hs-brotli" = callPackage + ({ mkDerivation, base, brotli, brotlidec, brotlienc, bytestring + , ghc-prim, libbrotlidec, libbrotlienc, QuickCheck + , quickcheck-instances, tasty-quickcheck + }: + mkDerivation { + pname = "hs-brotli"; + version = "0.1.0.0"; + sha256 = "083l7bbjlxh629a9m88mfp087f09gwsmzs9vmpxrqffw23zrnclf"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + librarySystemDepends = [ brotlidec brotlienc ]; + libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; + testHaskellDepends = [ + base brotli bytestring QuickCheck quickcheck-instances + tasty-quickcheck + ]; + homepage = "https://github.com/iand675/brotli#readme"; + description = "Compression and decompression in the brotli format"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {brotli = null; brotlidec = null; brotlienc = null; + libbrotlidec = null; libbrotlienc = null;}; + "hs-captcha" = callPackage ({ mkDerivation, base, bytestring, gd, random }: mkDerivation { @@ -103382,8 +103627,8 @@ self: { ({ mkDerivation, base, bytestring, unix }: mkDerivation { pname = "hsI2C"; - version = "0.1.2"; - sha256 = "0ma8klvyv4rnfxkag99vm4nvw77yppcv63p6829b4ynsa9vyv9rn"; + version = "0.1.3"; + sha256 = "0p77xndqpqfyjw9y7q791pysrpz3zkimw8mcxyfl4yrh34sammx9"; libraryHaskellDepends = [ base bytestring unix ]; description = "I2C access for Haskell and Linux"; license = stdenv.lib.licenses.bsd3; @@ -108910,15 +109155,15 @@ self: { }) {}; "hw-conduit" = callPackage - ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec - , mmap, time, vector, word8 + ({ mkDerivation, array, base, bytestring, conduit + , conduit-combinators, criterion, hspec, mmap, time, vector, word8 }: mkDerivation { pname = "hw-conduit"; - version = "0.2.0.2"; - sha256 = "052sgj1bny2d2j4gsmfj7mx9jcnkac7b0rsz7310nv2rc9h46sbl"; + version = "0.2.0.3"; + sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a"; libraryHaskellDepends = [ - array base bytestring conduit time word8 + array base bytestring conduit conduit-combinators time word8 ]; testHaskellDepends = [ base bytestring conduit hspec ]; benchmarkHaskellDepends = [ @@ -109115,20 +109360,20 @@ self: { "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache - , containers, errors, hashable, hspec, http-client, mtl, pure-zlib - , QuickCheck, semigroups, servant, servant-client, text + , containers, errors, hashable, hspec, http-client, http-types, mtl + , pure-zlib, QuickCheck, semigroups, servant, servant-client, text , transformers, unordered-containers }: mkDerivation { pname = "hw-kafka-avro"; - version = "1.2.0"; - sha256 = "0v2l7g524wz45mnqdqrs33qbb1psm33jlfl1hlnd22dxfw7mhdhl"; + version = "1.3.0"; + sha256 = "0lryr18gcmgfxa10gmd5y43l62x684ahpzk53wx5z5qww0chy7fa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable - http-client mtl pure-zlib semigroups servant servant-client text - transformers unordered-containers + http-client http-types mtl pure-zlib semigroups servant + servant-client text transformers unordered-containers ]; executableHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable @@ -109153,8 +109398,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.0.3"; - sha256 = "0xdkkasjql0la376kmb8zljndfbcxyizf9rqj02nlb1np8gs6apq"; + version = "2.0.4"; + sha256 = "0mqrxczjr822hccmrdsmy98mw10jdmiiq94vdibkqrh618hs4fd5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111855,6 +112100,8 @@ self: { pname = "imagesize-conduit"; version = "1.1"; sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i"; + revision = "1"; + editedCabalFile = "1gq749v6558zkvvn8iqkd4iqv4giiysxjqb2kncarnhghkkbgbaf"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions ]; @@ -113111,8 +113358,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.9.0.1"; - sha256 = "1by27qjsgwaws7nf3lslml7n58j2fk478pinflk10jji5zcs4nz9"; + version = "0.9.0.2"; + sha256 = "1swxdilr1l7h3pk313fyjgpg58g20v6560j9g4cxz0gakqqhb3jc"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions mtl pretty primitive process reflection setenv @@ -114665,8 +114912,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.2.2.3"; - sha256 = "06gklbipbjg0n2c3iqh753v9njd602r3lj4rmq1155kx0bxlwhmg"; + version = "0.2.2.4"; + sha256 = "118ksbf8kh0bmwk5m32qv609kggwssm3a56zc14f8bg67bkdkrc4"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -117857,8 +118104,8 @@ self: { }: mkDerivation { pname = "justified-containers"; - version = "0.2.0.0"; - sha256 = "0fsr9j4qnlffhkgbz50lwy3f18d619risxfl44wgfgr9b722xj8r"; + version = "0.2.0.1"; + sha256 = "0k2vw8d37hkjj786kx52hjs7qlmmv4hr8bp9dd2rskgsnwjizmw2"; libraryHaskellDepends = [ base containers roles ]; testHaskellDepends = [ base containers ghc-prim hspec QuickCheck should-not-typecheck @@ -118469,14 +118716,14 @@ self: { ({ mkDerivation, aeson, async, base, bloodhound, bytestring , containers, criterion, deepseq, enclosed-exceptions, exceptions , http-client, http-types, katip, lens, lens-aeson - , quickcheck-instances, retry, rng-utils, scientific, stm - , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text - , time, transformers, unordered-containers, uuid, vector + , 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.1"; - sha256 = "0w1iprf3lpnbgil3gzpka5akjc8kl3l6g2knizddjb6xvszy564q"; + version = "0.4.0.3"; + sha256 = "0aji0738dz7i0lry30y6rpfbhvcpc79mfqc77nlvaplb3plw0m51"; libraryHaskellDepends = [ aeson async base bloodhound bytestring enclosed-exceptions exceptions http-client http-types katip retry scientific stm @@ -118489,9 +118736,10 @@ self: { unordered-containers vector ]; benchmarkHaskellDepends = [ - aeson base bloodhound criterion deepseq rng-utils text + 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; @@ -118512,6 +118760,7 @@ self: { homepage = "https://github.com/iconnect/katip-syslog#readme"; description = "Syslog Katip Scribe"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katt" = callPackage @@ -119986,8 +120235,8 @@ self: { }: mkDerivation { pname = "lackey"; - version = "0.4.3"; - sha256 = "07n5acnrwy991qsx0bg1hbpxky0nxwybnh1zs08n4jmbl10rvsrs"; + version = "0.4.4"; + sha256 = "0p689g86rim4hqw0chn6p22yr9vcb4xcl44aiv6lzqb8fnwzyadx"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base servant tasty tasty-hspec text ]; homepage = "https://github.com/tfausak/lackey#readme"; @@ -121872,8 +122121,8 @@ self: { ({ mkDerivation, base, HUnit, parsec, wl-pprint }: mkDerivation { pname = "language-webidl"; - version = "0.1.4.0"; - sha256 = "06px2m4zf1b14lx7nx0m21gmxqskfyk7a777j7sbqd3dwsrbl834"; + version = "0.2.0.0"; + sha256 = "1h93a19y8109mwxl795hi0xdb3jy1z9w2ks3sc6g673kv04pw0pf"; libraryHaskellDepends = [ base parsec wl-pprint ]; testHaskellDepends = [ base HUnit ]; description = "Parser and Pretty Printer for WebIDL"; @@ -124160,24 +124409,26 @@ self: { }) {}; "libssh2" = callPackage - ({ mkDerivation, base, bytestring, c2hs, libssh2, network, ssh2 + ({ mkDerivation, base, bytestring, c2hs, libssh2, network, select , syb, time }: mkDerivation { pname = "libssh2"; - version = "0.2.0.4"; - sha256 = "1abdd5k4pnfxpg1kg1kvmwgwv946zlndhnydhhphad2ah3d2pkjf"; + version = "0.2.0.5"; + sha256 = "0l224pd8bb9d29043qdy40dbknnhmwnjc95r3yyc93lhwd5fsqma"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring network syb time ]; - librarySystemDepends = [ ssh2 ]; + libraryHaskellDepends = [ + base bytestring network select syb time + ]; + librarySystemDepends = [ libssh2 ]; libraryPkgconfigDepends = [ libssh2 ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/portnov/libssh2-hs"; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libssh2; ssh2 = null;}; + }) {inherit (pkgs) libssh2;}; "libssh2-conduit" = callPackage ({ mkDerivation, base, conduit, libssh2, monad-control, stm @@ -124280,7 +124531,7 @@ self: { homepage = "http://redmine.iportnov.ru/projects/libvirt-hs"; description = "FFI bindings to libvirt virtualization API (http://libvirt.org)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libvirt;}; "libvorbis" = callPackage @@ -125012,8 +125263,8 @@ self: { ({ mkDerivation, base, sbv }: mkDerivation { pname = "linearEqSolver"; - version = "1.3"; - sha256 = "0bszi1k27ag4yk31zxkn3jk3cqh1xzdcscm4nb6k4n0psf0qm2rp"; + version = "2.0"; + sha256 = "0dianwg8r4b6x6z17d994kmhjmqwdx083vlm9rzakfkn7p773l8w"; libraryHaskellDepends = [ base sbv ]; homepage = "http://github.com/LeventErkok/linearEqSolver"; description = "Use SMT solvers to solve linear systems over integers and rationals"; @@ -125027,8 +125278,10 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.3.2.0"; - sha256 = "0g93h1sl6djyf0r6295a7iayjnwjwmk8w7m06gi3vqr2srwjk4s5"; + version = "0.3.4.0"; + sha256 = "0idmaw25cz7lk3kr9n0jri776j0qajrlc9j1aki0brvx6p6yh2dp"; + revision = "1"; + editedCabalFile = "0vrx3ws23qg1ygh1ksvgrpz92nhnr1nmrwy8a3ax08n8jcx2nrrw"; libraryHaskellDepends = [ base constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core semigroups tagged transformers vector @@ -125037,6 +125290,7 @@ self: { homepage = "https://github.com/leftaroundabout/linearmap-family"; description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan" = callPackage @@ -125625,6 +125879,7 @@ self: { homepage = "https://github.com/ucsd-progsys/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -126968,8 +127223,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.7.3.0"; - sha256 = "15bf0ly3fl2k7dqn5vskafsihil5lb7ij96vw0nsb3dil80f54qk"; + version = "0.7.4.0"; + sha256 = "06rzvh3g294hpwpxw2syvywrw3rms1chjxqhki8b97ml1nlfnrs0"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -129094,22 +129349,23 @@ self: { "madlang" = callPackage ({ mkDerivation, ansi-wl-pprint, base, Cabal, composition-prelude , containers, criterion, directory, file-embed, hspec - , hspec-megaparsec, http-client, megaparsec, MonadRandom, mtl - , optparse-applicative, process, random-shuffle, recursion-schemes - , tar, template-haskell, text, zip-archive, zlib + , hspec-megaparsec, http-client, http-client-tls, megaparsec + , MonadRandom, mtl, optparse-applicative, process, random-shuffle + , recursion-schemes, tar, template-haskell, text, th-lift-instances + , titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "3.0.0.1"; - sha256 = "0zh935qpaq3w0qdijbmpyf71yvjigygks7ryxfcw9q9hivypvxgj"; + version = "3.1.1.13"; + sha256 = "0qmgd368brmmibqlimv254i20ayxw96ipnwcfid4q3pdml9javn4"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal directory file-embed process ]; + setupHaskellDepends = [ base Cabal directory process ]; libraryHaskellDepends = [ ansi-wl-pprint base composition-prelude containers directory - file-embed http-client megaparsec MonadRandom mtl + file-embed http-client http-client-tls megaparsec MonadRandom mtl optparse-applicative random-shuffle recursion-schemes tar - template-haskell text zip-archive zlib + template-haskell text th-lift-instances titlecase zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-megaparsec text ]; @@ -129471,6 +129727,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "makefile_1_1_0_0" = callPackage + ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "makefile"; + version = "1.1.0.0"; + sha256 = "01swnw8fp2cx5z5xim9apia3yw48six61mhf6p3g0gp99w4i4ypd"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + attoparsec base doctest Glob QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + homepage = "http://github.com/nmattia/mask"; + description = "Simple Makefile parser and generator"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mallard" = callPackage ({ mkDerivation, base, byteable, bytestring, cryptohash, exceptions , fgl, file-embed, hashable, hasql, hasql-optparse-applicative @@ -129982,8 +130257,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.4.1.0"; - sha256 = "0493y21sq56hj99ny10nn9kbgq2525ij79rmq5x2p1dx30gk16m5"; + version = "0.4.4.0"; + sha256 = "1qihbyhmf9abyb7fh4gf6qxwbk2a1jwnxdpnjinfi3x87xasvajj"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -129995,20 +130270,26 @@ self: { }) {}; "manifolds" = callPackage - ({ mkDerivation, base, comonad, constrained-categories, containers - , deepseq, free, free-vector-spaces, lens, linear + ({ mkDerivation, base, call-stack, comonad, constrained-categories + , containers, deepseq, free, free-vector-spaces, lens, linear , linearmap-category, manifolds-core, MemoTrie, number-show - , semigroups, tagged, transformers, vector, vector-space, void + , placeholders, pragmatic-show, semigroups, tagged, tasty + , tasty-hunit, tasty-quickcheck, transformers, vector, vector-space + , void }: mkDerivation { pname = "manifolds"; - version = "0.4.1.0"; - sha256 = "1vmgcv0yy72a29w15sg0z3z885vjhfpapgabilqbvh7dpxfv43x1"; + version = "0.4.4.0"; + sha256 = "1wsqar82w0sqspihyvkd9jndw2q6818nci82clqgxb1dawyna5vx"; libraryHaskellDepends = [ - base comonad constrained-categories containers deepseq free - free-vector-spaces lens linear linearmap-category manifolds-core - MemoTrie number-show semigroups tagged transformers vector - vector-space void + base call-stack comonad constrained-categories containers deepseq + free free-vector-spaces lens linear linearmap-category + manifolds-core MemoTrie number-show placeholders pragmatic-show + semigroups tagged transformers vector vector-space void + ]; + testHaskellDepends = [ + base constrained-categories containers lens linearmap-category + pragmatic-show tasty tasty-hunit tasty-quickcheck vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; @@ -130017,15 +130298,16 @@ self: { }) {}; "manifolds-core" = callPackage - ({ mkDerivation, base, tagged, vector-space }: + ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.4.1.0"; - sha256 = "041b4mjrl800vlyg1ibfmmyp87ad2mak6171s2mlc4mwsi4xrl4g"; - libraryHaskellDepends = [ base tagged vector-space ]; + version = "0.4.4.0"; + sha256 = "00b24ry943f6m46wkbxh8452q9xswcn2ri9c511r9bsinhzg653q"; + libraryHaskellDepends = [ base call-stack tagged vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-exts" = callPackage @@ -133119,8 +133401,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.1.0"; - sha256 = "0vfypwp503ab91hca5mmclgxxy0ggzd9g90h7jaj5vxrij7ya5ly"; + version = "0.5.2.0"; + sha256 = "06gx1j9bxzxnagsymgr0nzhs1s6jsr14mhh2qx38h85n5g12zpvb"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base monad-control mtl murmur-hash network random resource-pool @@ -133130,6 +133412,7 @@ self: { 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; }) {}; @@ -134077,6 +134360,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "modern-uri" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-megaparsec + , megaparsec, profunctors, QuickCheck, template-haskell, text + , weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.1.0.0"; + sha256 = "04k6v2mdkwdwvphfhhm7dwgy12n3kwxi02azkpzng0qa24vb1w1r"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec profunctors QuickCheck template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + homepage = "https://github.com/mrkkrp/modern-uri"; + description = "Modern library for working with URIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -135973,15 +136282,23 @@ self: { }) {}; "monoid-statistics" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, math-functions, QuickCheck, tasty + , tasty-quickcheck, vector, vector-th-unbox + }: mkDerivation { pname = "monoid-statistics"; - version = "0.3.1"; - sha256 = "0gfdjmx457r580lc40vpg8fkzd8n971b5vam96v6kzssg2cznqy3"; - libraryHaskellDepends = [ base ]; - homepage = "https://bitbucket.org/Shimuuar/monoid-statistics"; + version = "1.0.0"; + sha256 = "0n3q8izk197lrkvm6hmdzg7dl1mzji2z09b1wkz02pm4y0gganv3"; + libraryHaskellDepends = [ + base math-functions vector vector-th-unbox + ]; + testHaskellDepends = [ + base math-functions QuickCheck tasty tasty-quickcheck + ]; + homepage = "https://github.com/Shimuuar/monoid-statistics"; description = "Monoids for calculation of statistics of sample"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-subclasses" = callPackage @@ -136343,6 +136660,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "motor" = callPackage + ({ mkDerivation, base, CTRex, indexed, indexed-extras, reflection + }: + mkDerivation { + pname = "motor"; + version = "0.1.0.0"; + sha256 = "00jr7dlnm22cvjwprclizcbm4kw2i84zzzd7n6im9li00w1a2iwy"; + libraryHaskellDepends = [ + base CTRex indexed indexed-extras reflection + ]; + testHaskellDepends = [ base CTRex indexed indexed-extras ]; + description = "Type-safe effectful state machines in Haskell"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mount" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -141433,8 +141766,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.9.0.0"; - sha256 = "099q24f9879sdwqa0jnlsamvpz1jbyryn90w7jp7np68avbhv9bf"; + version = "0.9.1.2"; + sha256 = "1428pkzj7kam7ya21fb3qchq95lvp6dp9dnh5qj41nkw9x5dz517"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -141490,8 +141823,8 @@ self: { }: mkDerivation { pname = "nice-html"; - version = "0.2.0"; - sha256 = "0lkqqfp6x3w9lxh1jgm6c07pyfz1yr7drkr15s1m9vwvdh7mj24v"; + version = "0.3.0"; + sha256 = "1ns6qrzm9lwbgjcr7mw58g0qivbqac4yxisvbfy9j2cq3dqzm6d3"; libraryHaskellDepends = [ base bifunctors blaze-markup bytestring data-default-class deepseq free recursion-schemes template-haskell text transformers vector @@ -142663,6 +142996,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "numbered-semigroups" = callPackage + ({ mkDerivation, base, call-stack, semigroups }: + mkDerivation { + pname = "numbered-semigroups"; + version = "0.1.0.0"; + sha256 = "100r6k3cwycl75mj9g1x4w4qv064v8bdaan5rsj2vnvx4w1jrhp2"; + libraryHaskellDepends = [ base call-stack semigroups ]; + homepage = "https://github.com/leftaroundabout/numbered-semigroups"; + description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "numbering" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -143435,6 +143780,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "octane_0_20_3" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers + , data-default-class, file-embed, http-client, http-client-tls + , overloaded-records, rattletrap, text + }: + mkDerivation { + pname = "octane"; + version = "0.20.3"; + sha256 = "0rjvl7f3sa8i7a1svhh4phc2r2zjjwi1p3cajnwzms7kasmcqfjp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed overloaded-records rattletrap text + ]; + executableHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed http-client http-client-tls overloaded-records + rattletrap text + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -146472,6 +146843,54 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_0_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , binary, blaze-html, blaze-markup, bytestring, Cabal + , case-insensitive, cmark-gfm, containers, criterion, data-default + , deepseq, Diff, directory, doctemplates, executable-path, filepath + , Glob, haddock-library, hslua, HTTP, http-client, http-client-tls + , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types + , parsec, process, QuickCheck, random, safe, scientific, SHA + , skylighting, split, syb, tagsoup, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, temporary, texmath, text, time + , unix, unordered-containers, vector, xml, yaml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.0.0.1"; + sha256 = "1wq21vsg9afv8lxk6rmmmb57437q7gv1qs4ymbzd1mvxkvzx0hwh"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring binary blaze-html + blaze-markup bytestring case-insensitive cmark-gfm containers + data-default deepseq directory doctemplates filepath Glob + haddock-library hslua HTTP http-client http-client-tls http-types + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting split syb tagsoup temporary + texmath text time unix unordered-containers vector xml yaml + zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory executable-path filepath + hslua pandoc-types process QuickCheck tasty tasty-golden + tasty-hunit tasty-quickcheck temporary text zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion text time + ]; + doCheck = false; + homepage = "http://pandoc.org"; + description = "Conversion between markup formats"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -146510,20 +146929,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_11_1_1" = callPackage + "pandoc-citeproc_0_11_1_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , Cabal, containers, data-default, directory, filepath, hs-bibutils + , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 , setenv, split, syb, tagsoup, temporary, text, time , unordered-containers, vector, xml-conduit, yaml }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.11.1.1"; - sha256 = "00732amji7xlrkxzlwc5rzkq6saxjlvwlvinhkw4hyh1w0d74qwj"; + version = "0.11.1.2"; + sha256 = "0lv1j035f5c0dd0n772ivav6kwzfxvnk6zcxmmhmkc3s9r9716sd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ aeson base bytestring containers data-default directory filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 @@ -146769,8 +147189,8 @@ self: { }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.1.0.1"; - sha256 = "1lzjia4fl2s6aak00cb79sq5n85wyfcdn5xjanl7x9xr07rv2641"; + version = "0.1.1.0"; + sha256 = "0blgccnzyignq14y94cnascjxlk6088wwpxifwm45rnn0hs786vf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147543,6 +147963,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "parameterized" = callPackage + ({ mkDerivation, base, data-diverse, hspec, transformers }: + mkDerivation { + pname = "parameterized"; + version = "0.2.0.0"; + sha256 = "0z40b6cja2c4y177w6iwg8dijlpk5zwrf5yfwppc5y6n57g260z7"; + libraryHaskellDepends = [ base data-diverse transformers ]; + testHaskellDepends = [ base data-diverse hspec transformers ]; + homepage = "https://github.com/louispan/parameterized#readme"; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parameterized-data" = callPackage ({ mkDerivation, base, template-haskell, type-level }: mkDerivation { @@ -148212,13 +148646,13 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, hedgehog }: + ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.2.0.1"; - sha256 = "0k3b66wlhi280wk3q5ilmcn93m4rch1ily8f3z79lpxjjlraz7lw"; + version = "0.3.0.2"; + sha256 = "0r2rhcq73lb18j03h5nk7j6vzv9qxjnw8zsir3zy6cynkv4w35zd"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog ]; + testHaskellDepends = [ base doctest hedgehog ]; homepage = "https://github.com/chris-martin/partial-semigroup"; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; @@ -148228,8 +148662,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.2.0.1"; - sha256 = "1c4rbf1x6llgprx0rgil71z3306ky9x59sl8db1z6hg9ykriv4n2"; + version = "0.3.0.1"; + sha256 = "0i1p3277qv05jrshj3f61l9ag10dlh0hbwx550achlff3blfqhdr"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; homepage = "https://github.com/chris-martin/partial-semigroup"; description = "Property testing for partial semigroups using Hedgehog"; @@ -148240,8 +148674,8 @@ self: { ({ mkDerivation, partial-semigroup-hedgehog }: mkDerivation { pname = "partial-semigroup-test"; - version = "0.2.0.1"; - sha256 = "1cdlwjq7bbbq7yz5flzjkj0kp5s991nwsjq52xiqhmlzbim598s4"; + version = "0.3.0.1"; + sha256 = "006dlck7dr1xs2wwd233bm87mf619dlwnb66xlcfp82ksdmnfl6n"; libraryHaskellDepends = [ partial-semigroup-hedgehog ]; doHaddock = false; homepage = "https://github.com/chris-martin/partial-semigroup"; @@ -149855,8 +150289,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.7.0"; - sha256 = "1snywd1qaj572m0nqdadqm9i86n0mhz8gcwwnaf35kk2sd8lvg6f"; + version = "2.7.1"; + sha256 = "079r6b1rvvwgagznxwf4j5i29jpqrvnck545ig004v2853r6x2f2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger http-api-data @@ -150042,8 +150476,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.6.1"; - sha256 = "0i1a7xmspgxzlwi1z9jyh5ckjx16yba1xs289vh2id9400yh8c57"; + version = "2.6.2.1"; + sha256 = "0rk3rplz8y0b9macvb19w7m7ljnkq4gkmrjrdqdqcpga6ih357ik"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent @@ -150079,7 +150513,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql-haskell_0_3_4_1" = callPackage + "persistent-mysql-haskell_0_3_5" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-control, monad-logger, mysql-haskell, network , persistent, persistent-template, resource-pool, resourcet, text @@ -150087,8 +150521,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.3.4.1"; - sha256 = "0w80z2098rh3svxncyaa4jrqdcdgzrfrzq4p981g34cs7kysfmn2"; + version = "0.3.5"; + sha256 = "0sc6hw112d8jk1rflyrmcc8gkjddl41bbw6hksyv7a5w6sc7z33n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150147,8 +150581,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.6.1"; - sha256 = "0w7qssz4avq82vzs40kf82gkjdkcxqbkrfq6kz39x9m3za9b9pqc"; + version = "2.6.2"; + sha256 = "0140cki5c5aj21qg2cvqm5a511l6n4zbx3vb94hpfr1bs9nmfjam"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -150261,8 +150695,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.6.2"; - sha256 = "1gw5p531187dqchi7384q3irh9n8p7prs172zpq9r1l1ziqw8dk1"; + version = "2.6.3"; + sha256 = "0wgj8v6wkqvj60klmxlmhgmbl6yp3i425v95p8s45wm96phpzn9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151244,32 +151678,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.5"; - sha256 = "1gvq7slby26cm62203gh13s4blwphiy0chdhkp3vl4k3gjlbslam"; - 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_6" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , http-client, http-client-tls, http-types, monad-logger, mtl , network, profunctors, QuickCheck, random, safe-exceptions @@ -151293,7 +151701,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 @@ -154938,6 +155345,8 @@ self: { pname = "postgresql-typed"; version = "0.5.1"; sha256 = "0bvrbbzqjvzsm0bqinvbcz897fzf1isg76mk3hniyf8l9a19a3wv"; + revision = "1"; + editedCabalFile = "047bjdwgg94gbpzcapar46vw33n4g8gx639ns9i4d32105w32f0r"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite haskell-src-meta HDBC memory network old-locale postgresql-binary @@ -155053,6 +155462,7 @@ self: { homepage = "https://github.com/diogob/postgrest-ws#readme"; description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postie" = callPackage @@ -155084,8 +155494,8 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.2.1"; - sha256 = "1afy3yra89909vilwr36j8vrvkhsy1xcp1jcvrdj90bj93rq64v3"; + version = "0.2.2"; + sha256 = "043q69v629r6y8ljij8nmfjz4qs3181278wrnlfgagfahh98pg0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156640,14 +157050,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_1_0" = callPackage + "process_1_6_2_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.1.0"; - sha256 = "0lwaa9qfh1x8zgmq7panhsvrs1nwcc1fficcg391dxp995ga4pr4"; + version = "1.6.2.0"; + sha256 = "0gsyzwvid2w1z5m0w492sqb8q8c86q9wa7iqjadcdhbv8ag9z6xm"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -157529,8 +157939,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.8.1"; - sha256 = "14q1zd6bvrfcs21pklxd6wgiqpb92v0464k4zhq9l31v4k2p5zpk"; + version = "4.9.0"; + sha256 = "1pciifl4hm5bmdx2li4hj3cm41ffj7s23r4ivkr8x3zghmik3n88"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157953,8 +158363,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.4"; - sha256 = "1qlkilnxfx5grim0hxf7drg2m48z76f88d4r61sy71npybf3mqnv"; + version = "2.4.5"; + sha256 = "1dcyv89z3869zd43wkby7xrzb1gz1iy2jrdr7yk45q2d1i63ssh4"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -157968,8 +158378,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.4"; - sha256 = "0jr1clff6vn8lpx2rbc72angn0glc2v18ji5lqgzijri8zya9nqj"; + version = "2.4.5"; + sha256 = "0rz1v9iab012sc2m45yvmag94xg64gjrw0pqddp8gvw67i5lfan3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -158298,6 +158708,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ptr" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, contravariant + , mtl, profunctors, quickcheck-instances, rerebase, semigroups + , tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "ptr"; + version = "0.15.3"; + sha256 = "1h66bk595nv0jmcxdzfzvpr7ymfm6hl3n4bnglwlwkp2y1ymm3i3"; + libraryHaskellDepends = [ + base base-prelude bug bytestring contravariant mtl profunctors + semigroups text transformers + ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/ptr"; + description = "Abstractions for operations on pointers"; + license = stdenv.lib.licenses.mit; + }) {}; + "pub" = callPackage ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes , pipes-bytestring, text @@ -158846,8 +159278,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.11.1.0"; - sha256 = "0syx11yzan1m86skjlxwv17ickplbiamkhbf2xsif0w0216whbvx"; + version = "0.11.1.1"; + sha256 = "023j88q724l38zqry6v916na1hlqhcinb5pw3cqssmql0cf32ajh"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -159060,7 +159492,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_1_5_0_0" = callPackage + "pusher-http-haskell_1_5_0_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , containers, cryptonite, hashable, hspec, HTTP, http-client , http-types, memory, network-uri, QuickCheck, scientific, text @@ -159068,8 +159500,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.0.0"; - sha256 = "098vj92gwzspqp0xbd4dxxb3dggpdz5gpf616p2spkj9xvdqgy17"; + version = "1.5.0.1"; + sha256 = "08fgyvm1lp1yr9p9a6fr111x78rlzhr02gbsd6q6hjxnlffya4vf"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring containers cryptonite hashable HTTP http-client http-types memory text time transformers @@ -160866,8 +161298,8 @@ self: { }: mkDerivation { pname = "radium"; - version = "0.8.0"; - sha256 = "04pc3zy09hg7p9w54ffwvfcby3341vbpzlv2d9ma2q9py0ymx6d5"; + version = "0.9.0"; + sha256 = "142c2qra8080yndj2y0m0bdrqmf8l6r0z43pj1icdvjqj9451j16"; libraryHaskellDepends = [ base containers lens parsec ]; testHaskellDepends = [ base Cabal containers hspec lens parsec QuickCheck @@ -160895,13 +161327,15 @@ self: { }) {}; "radius" = callPackage - ({ mkDerivation, base, binary, bytestring, iproute, pretty-hex }: + ({ mkDerivation, base, binary, bytestring, cryptonite, iproute + , memory + }: mkDerivation { pname = "radius"; - version = "0.2.0.0"; - sha256 = "1arch1d93yijbm7r9a9ggjj7wzy7rk0immj5g8frczrbp0xpgmzy"; + version = "0.4.0.0"; + sha256 = "0bdixglg4yy5n6chw0n5mpk563dbkhh7iyzrmp9q2vpzxxvvdi06"; libraryHaskellDepends = [ - base binary bytestring iproute pretty-hex + base binary bytestring cryptonite iproute memory ]; homepage = "https://github.com/erickg/radius#readme"; description = "Remote Authentication Dial In User Service (RADIUS)"; @@ -161142,8 +161576,8 @@ self: { }: mkDerivation { pname = "rakuten"; - version = "0.1.0.0"; - sha256 = "18gasv78zq8l51kpwvx6gc089day6pmlz2f43vrfichqbivahmhf"; + version = "0.1.0.1"; + sha256 = "1y9kyipmhhy5f0f7v805a17x7g938vkvxnzj9n4h9rlprpdbdczc"; libraryHaskellDepends = [ aeson base bytestring connection constraints data-default-class extensible http-api-data http-client http-client-tls http-types @@ -161988,25 +162422,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.5"; - sha256 = "0mw59q5wbj5mbhznqd4szc5ps7d1r7gf490vdjqfblb5sqncy510"; - 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_6" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, filepath, http-client, http-client-tls, http-types , tasty, tasty-hspec, text, uuid @@ -162023,7 +162438,6 @@ self: { homepage = "https://github.com/tfausak/ratel#readme"; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ratel-wai" = callPackage @@ -164068,15 +164482,18 @@ self: { }) {}; "reflex-sdl2" = callPackage - ({ mkDerivation, base, dependent-sum, mtl, ref-tf, reflex, sdl2 }: + ({ mkDerivation, async, base, containers, dependent-sum + , exception-transformers, mtl, primitive, ref-tf, reflex, sdl2, stm + }: mkDerivation { pname = "reflex-sdl2"; - version = "0.1.0.0"; - sha256 = "1k18lb7aa440i76yd6x4bh3sz6wsqv1cq1l93wpac1673bvxicll"; + version = "0.2.0.0"; + sha256 = "1aqcmj9gv1dhm8vqykawphk41fi24k4k061ynvfnpdypakldlvvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base dependent-sum mtl ref-tf reflex sdl2 + async base containers dependent-sum exception-transformers mtl + primitive ref-tf reflex sdl2 stm ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/schell/reflex-sdl2#readme"; @@ -165271,13 +165688,13 @@ self: { "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 - , persistable-record, relational-query, relational-query-HDBC - , relational-schemas, template-haskell, time + , persistable-record, product-isomorphic, relational-query + , relational-query-HDBC, relational-schemas, template-haskell, time }: mkDerivation { pname = "relational-record-examples"; - version = "0.3.2.1"; - sha256 = "1y0bxg2sgrq72wpa1llymhn3kbks7krnsh0qzqd1cqni01g6q8hv"; + version = "0.4.0.0"; + sha256 = "0ch075l87sxxgmvis6hnrpc72lr0v21nx0xhw0ahpirqbw01ndqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165286,10 +165703,11 @@ self: { template-haskell ]; executableHaskellDepends = [ - base relational-query template-haskell time + base product-isomorphic relational-query template-haskell time ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -166260,8 +166678,8 @@ self: { pname = "req-conduit"; version = "0.2.1"; sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c"; - revision = "1"; - editedCabalFile = "0pz1pz7l06c6g0d6ripgb8yn5kz5zryzjhabnx93d89qix0dzkg3"; + revision = "2"; + editedCabalFile = "1r7qfg670gdncb9yszgg4dw5x8az17cfgbkpbnb7zjdy7rqrj442"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -166418,15 +166836,14 @@ self: { }: mkDerivation { pname = "resolv"; - version = "0.1.1.0"; - sha256 = "03k0r57q93y3iv3g62zpjhh5a647v3g9imn3z9jr1vnj5gracyh5"; + version = "0.1.1.1"; + sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; testHaskellDepends = [ base bytestring directory filepath tasty tasty-hunit ]; - homepage = "http://github.com/hvr/resolv"; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -167012,8 +167429,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.7.4.2"; - sha256 = "0z5ls9z5zcqkk3vbpl4wdgspi98n19m5i8mfian1fyxkf0jkj6sj"; + version = "0.7.4.3"; + sha256 = "0i47gmlljz00fwf2qwkrh24hgsyw5sz2npaighx4wxvykf00d390"; libraryHaskellDepends = [ base data-default-class exceptions ghc-prim random transformers ]; @@ -167243,8 +167660,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.1.0.0"; - sha256 = "1gjz5i7a00kq48fkg7ms3qr04jzg8mw5vb3lgn1pflp45m4p95vi"; + version = "0.1.1.0"; + sha256 = "1vl7hnnb2bmrzaf4231pq9rvn8l7y2y3x5g6b1ry77rb45bzspkq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167253,6 +167670,7 @@ self: { executableHaskellDepends = [ base ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rhythm-game-tutorial" = callPackage @@ -168179,6 +168597,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rose-trees_0_0_4_4" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, hashable + , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups + , sets, tasty, tasty-quickcheck, unordered-containers, witherable + }: + mkDerivation { + pname = "rose-trees"; + version = "0.0.4.4"; + sha256 = "1kbjkfknl2pyp30n5c6m6xavqlm8zg06w78b3x7iwvi854yi64r3"; + libraryHaskellDepends = [ + base containers deepseq hashable mtl QuickCheck + quickcheck-instances semigroupoids semigroups sets + unordered-containers witherable + ]; + testHaskellDepends = [ + base containers deepseq hashable QuickCheck quickcheck-instances + semigroupoids semigroups sets tasty tasty-quickcheck + unordered-containers witherable + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl QuickCheck + quickcheck-instances semigroupoids semigroups sets + unordered-containers witherable + ]; + description = "A collection of rose tree structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rose-trie" = callPackage ({ mkDerivation, base, containers, deepseq, minilens, mtl , transformers @@ -169607,6 +170054,7 @@ self: { homepage = "https://github.com/kccqzy/haskell-sajson#readme"; description = "Fast JSON parsing powered by Chad Austin's sajson library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "saltine" = callPackage @@ -170186,13 +170634,13 @@ self: { ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck , template-haskell, text, unordered-containers, yaml }: mkDerivation { pname = "sbp"; - version = "2.2.12"; - sha256 = "14c188bn883nd5nngvydx6aj8z7x1cgjgsl41l8a6hsiwjx721l0"; + version = "2.2.15"; + sha256 = "02y9mvy2ij1kdn06wgdpn5y5f4wa814lj4krvfsjyc2g9am06y83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170202,7 +170650,7 @@ self: { ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra yaml + conduit-extra resourcet yaml ]; testHaskellDepends = [ aeson base base64-bytestring basic-prelude bytestring QuickCheck @@ -171651,7 +172099,7 @@ self: { executableHaskellDepends = [ base data-default-class sdl2 vector ]; description = "Bindings to SDL2_mixer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2_mixer;}; "sdl2-ttf" = callPackage @@ -172560,15 +173008,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sensu-run_0_4_0" = callPackage + "sensu-run_0_4_0_1" = 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"; - sha256 = "0wsrm7l12yfm89yfd5y1w8xypfg29d2s1afy7m8dpcdypmrxrghw"; + version = "0.4.0.1"; + sha256 = "05vmrbf3hk26ya5rvhadc8q1qb932x2n0x153bhafbf60yzc4bc5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173211,6 +173659,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-cookie_0_5_0_6" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring + , cereal, cookie, criterion, cryptonite, data-default, deepseq + , exceptions, hspec, http-api-data, http-types, memory, mtl + , QuickCheck, servant, servant-server, tagged, time, transformers + , wai + }: + mkDerivation { + pname = "servant-auth-cookie"; + version = "0.5.0.6"; + sha256 = "1bxvgf71710jzs0k83bz4rdj7zsagmwpsqv96invw8d7shipg650"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring blaze-builder bytestring cereal cookie + cryptonite data-default exceptions http-api-data http-types memory + mtl servant servant-server tagged time transformers wai + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default deepseq hspec + QuickCheck servant-server time transformers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptonite servant-server + ]; + description = "Authentication via encrypted cookies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-docs" = callPackage ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck , servant, servant-auth, servant-docs, text, yaml @@ -173505,6 +173983,8 @@ self: { pname = "servant-checked-exceptions"; version = "0.4.1.0"; sha256 = "19h0vywlh6b41mdjpka4b7rz4l6gxmjlvji8nzbgkllsjgr81g3g"; + revision = "1"; + editedCabalFile = "07srldxvgzgzxq5dik787ays7xylwsdmz8bv3ffvp435nvvpmrzr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173538,8 +174018,8 @@ self: { pname = "servant-client"; version = "0.11"; sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga"; - revision = "1"; - editedCabalFile = "0ymiqsn6451znpn524w1wn129plnqbplbvwxwjpp1drz3ab6xk6b"; + revision = "2"; + editedCabalFile = "0w3b3036rv9vfya5ayn9z70rkwk7hd9zisl7klgxzk4fgfmc3sgd"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring exceptions generics-sop http-api-data http-client http-client-tls @@ -173915,6 +174395,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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.0"; + sha256 = "0rsy8bmycmgxpnimaly08shlaqmna084bdgcxxs3ad0kicc427r1"; + 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-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { @@ -173959,8 +174465,8 @@ self: { pname = "servant-mock"; version = "0.8.2"; sha256 = "146z4n7ayg0347kabwdz1crha7ilfdcdx3pazdgsmq2bl8mwad3w"; - revision = "1"; - editedCabalFile = "19vvzy09wj0yxjz4sv417c45h1n34nd7zc9n8agxavr3wyi9lihh"; + revision = "2"; + editedCabalFile = "16zbbjz7rj7fg6qs8zjy9arz7bwza9pq1gn15csnsvm5n6qnpgal"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174347,10 +174853,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.11"; - sha256 = "1c821ia2741v7nxbv651hcj21dmcqnqf4ix198is5b63sj4ff3ib"; - revision = "1"; - editedCabalFile = "04s8kzc1jzarxg68nqgdckv0ajw846a1byqjksgzlqlmfqm0l32l"; + version = "0.11.0.1"; + sha256 = "0yrcs1ixy7mzifdyssi58m34xn95mfy9zxbkm9k5z6svqnv1qp72"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -174557,10 +175061,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.2.4.3.0.20"; - sha256 = "18qp908s0kjcz6dlvj2031kr8qjnzrgh2v92mdg4lwa1j7ddf0xn"; - revision = "1"; - editedCabalFile = "1wsbb9zaq5qv39hrymy1cma581337rbvqlm7y24jwfvk4vafs3fp"; + version = "0.2.4.3.4.0"; + sha256 = "1vb1bp7hjjyhb1p6x0j7z2ky05n72qm7zcmwgnsmnqalaxdnsvri"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -174907,25 +175409,6 @@ self: { }) {}; "servius" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, bytestring - , http-types, markdown, shakespeare, text, wai, wai-app-static - }: - mkDerivation { - pname = "servius"; - version = "1.2.0.2"; - sha256 = "0asxkdg7csxmnpzw672jazynhnnc73ddpay65npql0jz93mq45n1"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base blaze-builder blaze-html bytestring http-types markdown - shakespeare text wai wai-app-static - ]; - homepage = "http://github.com/snoyberg/servius#readme"; - description = "Warp web server with template rendering"; - license = stdenv.lib.licenses.mit; - }) {}; - - "servius_1_2_0_3" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, bytestring , http-types, markdown, shakespeare, text, wai, wai-app-static }: @@ -174942,7 +175425,6 @@ self: { homepage = "http://github.com/snoyberg/servius#readme"; description = "Warp web server with template rendering"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html" = callPackage @@ -175334,8 +175816,8 @@ self: { }: mkDerivation { pname = "sext"; - version = "0.1.3"; - sha256 = "0z6a4ghv5knfcwv28bax4gny5za0k0y076d15bnk01qg293w273b"; + version = "0.1.3.1"; + sha256 = "0836faqrrb9wsw5hlm82587isw6rkn4v8i6dh9hzxsqif1izd363"; libraryHaskellDepends = [ base bytestring template-haskell text vector ]; @@ -177753,18 +178235,18 @@ self: { }) {}; "simplessh" = callPackage - ({ mkDerivation, base, bytestring, mtl, ssh2 }: + ({ mkDerivation, base, bytestring, libssh2, mtl }: mkDerivation { pname = "simplessh"; version = "0.2.0.5"; sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq"; libraryHaskellDepends = [ base bytestring mtl ]; - librarySystemDepends = [ ssh2 ]; + librarySystemDepends = [ libssh2 ]; homepage = "http://hub.darcs.net/thoferon/simplessh"; description = "Simple wrapper around libssh2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {ssh2 = null;}; + }) {inherit (pkgs) libssh2;}; "simplest-sqlite" = callPackage ({ mkDerivation, base, bytestring, exception-hierarchy, sqlite @@ -178391,7 +178873,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_4_1" = callPackage + "skylighting_0_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -178400,8 +178882,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.4.1"; - sha256 = "0dsngs2nw2ijhxxwa8d7fb9rxgqz6kgimbsvxmhpd5s4y6a1ygf4"; + version = "0.4.2"; + sha256 = "0szhhmjz14wq1ica3gl6nj5fh85fwh55xyywlq8q3dq8isl1hcz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180202,17 +180684,26 @@ self: { }) {}; "snaplet-redis" = callPackage - ({ mkDerivation, base, configurator, hedis, lens, mtl, network - , snap, text, transformers + ({ mkDerivation, aeson, base, bytestring, cereal, clientsession + , configurator, hedis, heist, lens, monad-control, mtl, network + , snap, snap-core, snap-server, text, time, transformers + , unordered-containers, xmlhtml }: mkDerivation { pname = "snaplet-redis"; - version = "0.1.4.2"; - sha256 = "0ri5cj3gjz5c1snh7kbncb08ijs1551ixr06v3nxjsb03hrl4hhh"; + version = "0.1.5"; + sha256 = "12c4pgh2axnvd7hnyf0xpnsidfss39siys3nzwafdmm0p5wf67bx"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base configurator hedis lens mtl network snap text transformers + base bytestring cereal clientsession configurator hedis lens mtl + network snap snap-core text time transformers unordered-containers ]; - homepage = "https://github.com/dzhus/snaplet-redis/"; + executableHaskellDepends = [ + aeson base bytestring hedis heist lens monad-control mtl snap + snap-core snap-server text time xmlhtml + ]; + homepage = "https://github.com/dzhus/snaplet-redis#readme"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -187034,6 +187525,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "substring-parser" = callPackage + ({ mkDerivation, attoparsec, base, hspec, NoTrace, text }: + mkDerivation { + pname = "substring-parser"; + version = "0.1.0.0"; + sha256 = "0f4rbfpdhbnpk4gm4rsavblqdabxlqbf58xr9rvjcxq62hac6lvc"; + libraryHaskellDepends = [ attoparsec base NoTrace text ]; + testHaskellDepends = [ attoparsec base hspec NoTrace text ]; + homepage = "https://gitlab.com/igrep/substring-parser"; + description = "Match / replace substrings with a parser combinators"; + license = stdenv.lib.licenses.asl20; + }) {}; + "subtitleParser" = callPackage ({ mkDerivation, attoparsec, base, containers, text }: mkDerivation { @@ -187736,8 +188240,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.4"; - sha256 = "177aipxcycs79kh5vdkgq5rj8n0mixy374mxaggfp959i28rx164"; + version = "0.0.1.5"; + sha256 = "0fpviny6yxrmdhraan3ffhgwynn1lj88xdj093jf4229ysj0cskk"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -192212,6 +192716,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-fixture_0_5_1_0" = callPackage + ({ mkDerivation, base, data-default-class, exceptions + , haskell-src-exts, haskell-src-meta, hspec, hspec-discover, mtl + , template-haskell, th-orphans, transformers + }: + mkDerivation { + pname = "test-fixture"; + version = "0.5.1.0"; + sha256 = "1mjy7nx2w7gvsibvc5vl21hr8ypxd4qdiy46iagnfij1k3kdh6wv"; + libraryHaskellDepends = [ + base data-default-class exceptions haskell-src-exts + haskell-src-meta mtl template-haskell th-orphans + ]; + testHaskellDepends = [ + base hspec hspec-discover mtl template-haskell transformers + ]; + homepage = "http://github.com/cjdev/test-fixture#readme"; + description = "Test monadic side-effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "test-framework" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers , hostname, old-locale, random, regex-posix, time, xml @@ -192578,13 +193104,18 @@ self: { }) {}; "testCom" = callPackage - ({ mkDerivation, base, haskell-src-meta, template-haskell }: + ({ mkDerivation, base, haskell-src-meta, random, template-haskell + }: mkDerivation { pname = "testCom"; - version = "0.2.0"; - sha256 = "1gp8ylpp6315srcr1pi78a9f6kr24kp5dyfml9yibj35qd6wdil2"; - libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; - testHaskellDepends = [ base haskell-src-meta template-haskell ]; + version = "0.3.0"; + sha256 = "0j9mh47jq6igh5xkalgbrvjrvjsnyl7ir6jq7kr9rhh7rab4m7h1"; + libraryHaskellDepends = [ + base haskell-src-meta random template-haskell + ]; + testHaskellDepends = [ + base haskell-src-meta random template-haskell + ]; description = "Write your tests in comments"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -192989,8 +193520,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.4.0"; - sha256 = "1kmiksxzvd99d762n4vgrx90awsdy0s3gm1a5s73r9yd79pajq5n"; + version = "0.1.5.0"; + sha256 = "127h2pw3p9ixx34jiql9kgpjbjmkmwigm56iklaz6wxd69zr0sfx"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -194359,8 +194890,8 @@ self: { }: mkDerivation { pname = "thank-you-stars"; - version = "0.1.0"; - sha256 = "1qxi26g81ndrx8vxckb8hkpaqqpbd60r2ck705mhafrv0yd3kry7"; + version = "0.2.0"; + sha256 = "0a1mv7k7m4yaadfrmb45s09aa5zy0wd2jccjsyqhp63v89m58z8j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194368,7 +194899,9 @@ self: { hackage-db req split text ]; executableHaskellDepends = [ base containers directory filepath ]; - testHaskellDepends = [ base Cabal containers hackage-db hspec ]; + testHaskellDepends = [ + base Cabal containers directory filepath hspec + ]; homepage = "https://github.com/y-taka-23/thank-you-stars#readme"; description = "Give your dependencies stars on GitHub!"; license = stdenv.lib.licenses.bsd3; @@ -194620,8 +195153,8 @@ self: { }: mkDerivation { pname = "thread-hierarchy"; - version = "0.1.0.2"; - sha256 = "1fhbwzx8shf2ph9l5mkrlz40dxdzn02rvjgz9l2kvjmi8v5rclxk"; + version = "0.1.0.3"; + sha256 = "1j5caivjcvrmfqgl13lhlx9dq81kka64w96ykb0bfb089kwi0j9f"; libraryHaskellDepends = [ base containers lifted-base monad-control transformers-base ]; @@ -194808,22 +195341,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "threepenny-editors_0_5_5" = callPackage + "threepenny-editors_0_5_6" = callPackage ({ mkDerivation, base, bifunctors, casing, containers, generics-sop - , profunctors, threepenny-gui + , profunctors, text, threepenny-gui }: mkDerivation { pname = "threepenny-editors"; - version = "0.5.5"; - sha256 = "1gblkdkmkngry2fncjv4l7f3q614rw4p25cskf850kjgvcvm04fj"; + version = "0.5.6"; + sha256 = "0gnbzf3a3xykkf8xc5bnn1wznszyrnllf5s6cb4gqz6cbqnf2mnw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors + base bifunctors casing containers generics-sop profunctors text threepenny-gui ]; executableHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors + base bifunctors casing containers generics-sop profunctors text threepenny-gui ]; homepage = "https://github.com/pepeiborra/threepenny-editors"; @@ -195350,8 +195883,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "tile"; - version = "0.1.0.0"; - sha256 = "1j952m67spr4v7g3i8lpa9cn79rlmb8ybbg9hw2yswcijpq52fyb"; + version = "0.3.0.0"; + sha256 = "1w35rhrpjs39xbcg2i635jxdkbp4nhkzrrnl9p3bz85yc1iiiv8m"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/caneroj1/tile#readme"; @@ -196417,8 +196950,8 @@ self: { ({ mkDerivation, base, containers, HUnit, network-uri, text }: mkDerivation { pname = "tld"; - version = "0.3.0.1"; - sha256 = "0rfzcwaj9fyhrc8vswjjnqdj4bi7jln2lq38pcvnkl5zwx7kqhxa"; + version = "0.3.0.2"; + sha256 = "1snw5cdkyqyninqqqwa6qfndfmwfr4lkdg0v94267g7xbwcqjj8h"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; @@ -196969,8 +197502,8 @@ self: { }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.14"; - sha256 = "1zms4vigyy29c3wmjh6zmhjlmvj3x98dx99mdpxws6sxl0wibfcv"; + version = "0.1.0.17"; + sha256 = "0yfy0453j3s5sskz529rd50dbjxhr411a4g5803dsw06kibij05s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -199153,25 +199686,24 @@ self: { "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion - , data-default, directory, extra, hspec, htoml, http-client - , http-client-tls, http-types, lens, megaparsec - , optparse-applicative, QuickCheck, split, text - , unordered-containers + , data-default, directory, extra, hspec, htoml-megaparsec + , http-client, http-client-tls, http-types, lens, megaparsec + , optparse-applicative, split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.9"; - sha256 = "1s9gg1247xa2rl30s9i4rza04107s7awrx7pbmd4vc436mv4624z"; + version = "1.0.1.21"; + sha256 = "0m35d2ym83d3c0k2imjr9ws2nai6yhm784is9k1g6xrbazd947gr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring - composition-prelude containers data-default directory extra htoml - http-client http-client-tls http-types lens megaparsec - optparse-applicative split text unordered-containers + composition-prelude containers data-default directory extra + htoml-megaparsec http-client http-client-tls http-types lens + megaparsec optparse-applicative split text unordered-containers ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base bytestring hspec QuickCheck ]; + testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; @@ -200199,17 +200731,19 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion, ghc-prim - , hspec, QuickCheck, text + ({ mkDerivation, base, blaze-html, bytestring, criterion + , double-conversion, ghc-prim, hspec, QuickCheck, text }: mkDerivation { pname = "type-of-html"; - version = "1.0.0.0"; - sha256 = "0yknmw9xfi0pdg0ps2wg966i5k9y3nrqr38srj4lifng9bcgahx0"; - libraryHaskellDepends = [ base bytestring ghc-prim text ]; - testHaskellDepends = [ base hspec QuickCheck text ]; + version = "1.0.1.1"; + sha256 = "1fc8pqkvmrcvh3wayykqbc0ha336x77xq0hbzym9bknzr1xpy56n"; + libraryHaskellDepends = [ + base bytestring double-conversion ghc-prim text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ - base blaze-html bytestring criterion text + base blaze-html bytestring criterion QuickCheck text ]; homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; @@ -200525,6 +201059,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typedflow" = callPackage + ({ mkDerivation, base, ghc-typelits-knownnat, mtl, pretty-compact + }: + mkDerivation { + pname = "typedflow"; + version = "0.9"; + sha256 = "0hanh2gww0i4a8dkq1kxizni8qgk5mzj6qkvz9k1yvprpx2kym8c"; + libraryHaskellDepends = [ + base ghc-typelits-knownnat mtl pretty-compact + ]; + description = "Typed frontend to TensorFlow and higher-order deep learning"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "typedquery" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-meta, parsec , template-haskell, text, transformers @@ -200848,8 +201396,8 @@ self: { }: mkDerivation { pname = "ua-parser"; - version = "0.7.4"; - sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i"; + version = "0.7.4.1"; + sha256 = "1pwls2qbhd3ig2lm4ix3kh08yw20k0iajigbxqd0vmpkx459pmrf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring data-default file-embed pcre-light text yaml @@ -202193,21 +202741,26 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, exceptions - , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe - , safe-exceptions, stm, text, text-format, transformers - , type-operators, unordered-containers, utf8-string, vector + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl + , safe, safe-exceptions, semigroups, stm, text, text-format + , transformers, type-operators, unordered-containers, utf8-string + , vector }: mkDerivation { pname = "universum"; - version = "0.7.0"; - sha256 = "1d2887l2g8f9scpwcrvlxk0dm8w9d7qnlpbfjswa08dnmy63kcrf"; + version = "0.7.1"; + sha256 = "1q7q1ynfm4m1zz2inyvvj7868p3yxjl7w512j5xiz4mzx3llb292"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe safe-exceptions stm text text-format transformers type-operators unordered-containers utf8-string vector ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl semigroups text + unordered-containers + ]; homepage = "https://github.com/serokell/universum"; description = "Custom prelude used in Serokell"; license = stdenv.lib.licenses.mit; @@ -203860,8 +204413,8 @@ self: { }: mkDerivation { pname = "uuid-crypto"; - version = "1.3.0.0"; - sha256 = "02vzxxijz2pdwq4asgvsxvj6gcnjdzrfrhiavwbmc0vckw8s108s"; + version = "1.3.1.0"; + sha256 = "10r6phn23f3piqs4jhx764pcl6f3dbxq75pvwsnmwcszdi970a3l"; libraryHaskellDepends = [ base binary bytestring cryptoids cryptoids-types exceptions uuid ]; @@ -204217,23 +204770,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "validation_0_6_0" = callPackage - ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, directory - , doctest, filepath, lens, mtl, QuickCheck, semigroupoids - , semigroups, template-haskell, transformers + "validation_0_6_2" = callPackage + ({ mkDerivation, base, bifunctors, hedgehog, HUnit, lens, mtl + , semigroupoids, semigroups, transformers }: mkDerivation { pname = "validation"; - version = "0.6.0"; - sha256 = "1x2mi8lgy18q7g2gwwk8c31kg77lkfpmjkxf5nkli5pri9z947av"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.6.2"; + sha256 = "0631g3ffxchgg6hpy8w94a3713plgqp1k45zq85vaxyjg2x5bh7r"; libraryHaskellDepends = [ base bifunctors lens mtl semigroupoids semigroups transformers ]; - testHaskellDepends = [ - base cabal-doctest directory doctest filepath QuickCheck - template-haskell - ]; + testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; homepage = "https://github.com/qfpl/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; @@ -205259,8 +205807,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; - revision = "1"; - editedCabalFile = "1vgywmhxkkb7mfirl0wik5mk8xj9s3d23f9zwj5svnbyvdkc3fl4"; + revision = "2"; + editedCabalFile = "0jnnzhwkc82flvaxqc1vv30d8vpdwnyi82614c34j79m51wcmvya"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; @@ -205484,10 +206032,8 @@ self: { }: mkDerivation { pname = "vgrep"; - version = "0.2.0.0"; - sha256 = "0crd7hrnvl4z5xb1b6km47b6250ica1yv4sy370m7lkjx00c4lrb"; - revision = "1"; - editedCabalFile = "0qljh5nddpgv2w7y3nq5h12jpwc509yyizqv8cjzdr1krfsnk4ck"; + version = "0.2.1.0"; + sha256 = "0k74bpi995wqxmin6h7bx3yjiwh403c708yjp19igbw1971irxjr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206975,6 +207521,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-middleware-brotli" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, filepath + , hs-brotli, http-types, mtl, tasty, tasty-hspec, tasty-hunit, unix + , wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-brotli"; + version = "0.1.0.0"; + sha256 = "1gv3s2y49179kzkjqzs905g2rq1a9al9n716y86ivan8nnkhxjnq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring directory filepath hs-brotli http-types unix + wai + ]; + executableHaskellDepends = [ + base http-types wai wai-app-static wai-extra warp + ]; + testHaskellDepends = [ + base bytestring hs-brotli http-types mtl tasty tasty-hspec + tasty-hunit wai wai-extra + ]; + homepage = "https://github.com/iand675/wai-middleware-brotli#readme"; + description = "WAI middleware for brotli compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-cache" = callPackage ({ mkDerivation, base, binary, blaze-builder-conduit, bytestring , conduit, crypto-conduit, http-types, HUnit, pureMD5 @@ -207790,8 +208364,8 @@ self: { }: mkDerivation { pname = "wai-session-postgresql"; - version = "0.2.1.0"; - sha256 = "16myzcxas9nwhd54bc5pi1biym39vrz707rfmmc1mar6ia7a1xil"; + version = "0.2.1.1"; + sha256 = "0yab46s0xyd49s46skrgm9hk4pvzqv3sr8mzr58231jvn7lijyf9"; libraryHaskellDepends = [ base bytestring cereal cookie data-default entropy postgresql-simple resource-pool text time transformers wai @@ -209778,6 +210352,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wigner-ville-accelerate" = callPackage + ({ mkDerivation, accelerate, accelerate-fft, base, wigner }: + mkDerivation { + pname = "wigner-ville-accelerate"; + version = "0.1.0.2"; + sha256 = "1h5zdn3lkjnlr4m7s2xxiv36cr6hs7bnkr5rq20z585rfhbhavj5"; + libraryHaskellDepends = [ accelerate accelerate-fft base ]; + testHaskellDepends = [ base wigner ]; + homepage = "https://github.com/Haskell-mouse/wigner-ville-accelerate"; + description = "Wigner-ville transform using the Accelerate library"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {wigner = null;}; + "wikicfp-scraper" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec , scalpel-core, text, time @@ -209900,6 +210488,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "windns" = callPackage + ({ mkDerivation, base, bytestring, deepseq, dnsapi }: + mkDerivation { + pname = "windns"; + version = "0.1.0.0"; + sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c"; + revision = "1"; + editedCabalFile = "0kz6gv4dpppnnnyl57ibxi9gvykmkbmaz22yssx92mq306wbyimv"; + libraryHaskellDepends = [ base bytestring deepseq ]; + librarySystemDepends = [ dnsapi ]; + description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {dnsapi = null;}; + "windowslive" = callPackage ({ mkDerivation, base, Crypto, dataenc, mtl, network, parsec , pretty, split, time, urlencoded @@ -210085,6 +210688,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witherable_0_2" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.2"; + sha256 = "0bga2vx3bkg1m6pwdvnxbqjbljpwr6mxyq94fi87j3zy08mmmnwx"; + libraryHaskellDepends = [ + base base-orphans containers hashable transformers + unordered-containers vector + ]; + homepage = "https://github.com/fumieval/witherable"; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -210356,8 +210977,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.26"; - sha256 = "1wa1qpz5fdsgisvm9idla3jri1gzdgycmiphhynkn1k0337j0xy9"; + version = "0.3.29"; + sha256 = "147s2xg9y77gw81gnqgijnfzfx728ddv018n7zs2sl231asjqy3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210466,8 +211087,8 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.0"; - sha256 = "01zmgxs09dplk8hf41cfqjcm6w9mjnd6szn22kz2ycjxxdd7kncv"; + version = "0.1.2.1"; + sha256 = "0b9la9lh00x0rnh4mpgl8djgik72x75q5070r96ibzkl5hp6483w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210481,6 +211102,7 @@ self: { homepage = "https://github.com/githubuser/wordchoice#readme"; description = "Get word counts and distributions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wordcloud" = callPackage @@ -211117,6 +211739,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ws" = callPackage + ({ mkDerivation, async, base, bytestring, exceptions, haskeline + , mtl, network, network-uri, optparse-applicative, text, websockets + , wuss + }: + mkDerivation { + pname = "ws"; + version = "0.0.1"; + sha256 = "1i9jglq199pwxs9giigf3xgndspiwp30s2fb833mc7fl5s5mghhh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring exceptions haskeline mtl network network-uri + text websockets wuss + ]; + executableHaskellDepends = [ + base exceptions network-uri optparse-applicative + ]; + description = "A simple CLI utility for interacting with a websocket"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ws-chans" = callPackage ({ mkDerivation, async, base, http-types, HUnit, network , QuickCheck, quickcheck-instances, test-framework @@ -212175,6 +212819,7 @@ self: { homepage = "https://github.com/aisamanra/xleb"; description = "A simple monadic language for parsing XML structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xls" = callPackage @@ -212595,19 +213240,22 @@ self: { }) {}; "xml-isogen" = callPackage - ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck - , semigroups, template-haskell, text, xml-conduit - , xml-conduit-writer + ({ mkDerivation, base, data-default, dom-parser, generic-arbitrary + , hspec, lens, mtl, QuickCheck, quickcheck-instances, semigroups + , template-haskell, text, xml-conduit, xml-conduit-writer }: mkDerivation { pname = "xml-isogen"; - version = "0.2.0"; - sha256 = "1dmf660cyrs96ih1swlw44spd2g05dfikpak9mmjag40mab36116"; + version = "0.2.1"; + sha256 = "1kfv09ykz96dqd45bi618qi2qhzjkifh377ccylfzd55jkqnvn6l"; libraryHaskellDepends = [ base dom-parser lens mtl QuickCheck semigroups template-haskell text xml-conduit xml-conduit-writer ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base data-default dom-parser generic-arbitrary hspec QuickCheck + quickcheck-instances semigroups xml-conduit xml-conduit-writer + ]; homepage = "https://github.com/typeable/xml-isogen"; description = "Generate XML-isomorphic types"; license = stdenv.lib.licenses.mit; @@ -213217,6 +213865,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xmonad-extras_0_13_2" = callPackage + ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint + , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib + }: + mkDerivation { + pname = "xmonad-extras"; + version = "0.13.2"; + sha256 = "1ixnr76gmym9gab6m6r2rvrrvakxa5kda6cll9nbq954sjvj54jx"; + configureFlags = [ + "-f-with_hlist" "-fwith_parsec" "-fwith_split" + ]; + libraryHaskellDepends = [ + alsa-mixer base bytestring containers hint libmpd mtl network + regex-posix X11 xmonad xmonad-contrib + ]; + homepage = "https://github.com/xmonad/xmonad-extras"; + description = "Third party extensions for xmonad with wacky dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmonad-screenshot" = callPackage ({ mkDerivation, base, gtk, xmonad }: mkDerivation { @@ -217285,8 +217954,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.5.1.2"; - sha256 = "0q185phadgi8m45ii90x5k7mpw2xqf021q55q00nqyw8l7yai8pr"; + version = "0.6"; + sha256 = "059mbh2x4i521kg99b2mmgvc2rwbid641ilzc14ri7ym7ljkw1mv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; From 4c263586f6d48996095d08a4dbfc4c32dbe1847f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Oct 2017 20:46:18 +0200 Subject: [PATCH 2068/2806] git-annex: fix hash after version update --- 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 2b050dd613f..7bb62e1ccd0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -98,7 +98,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "1143qcsljp66v0xvq2a2nqji24890rnmxcmwnxw8xj818gqk0p3m"; + sha256 = "0iz0yz0bwkmpza5qahsxr9plg1ylmkv7znp1a8f0z65px7f300an"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From eb725c373bca426cdaa9746d5e4a4fdfb7ecf789 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 31 Oct 2017 19:18:26 +0100 Subject: [PATCH 2069/2806] websocket++: 0.4.0 -> 0.7.0 --- pkgs/development/libraries/websocket++/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 2672d6efbec..fbfc460db96 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { name = "websocket++-${version}"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "zaphoyd"; repo = "websocketpp"; rev = version; - sha256 = "1n6j0dh3qpis0f7crd49a2nhxd5459h0blch408z3kwlasx2g0i5"; + sha256 = "1i64sps52kvy8yffysjbmmbb109pi28kqai0qdxxz1dcj3xfckqd"; }; buildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.zaphoyd.com/websocketpp/; description = "C++/Boost Asio based websocket client/server library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ andir ]; }; } From e0318379ae3b5cb5fa75629b1b5392dbd270cfe8 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Wed, 1 Nov 2017 02:53:24 +0800 Subject: [PATCH 2070/2806] nixos/ssh: fix example --- nixos/modules/programs/ssh.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index e0fbba897fa..0935bf0cae7 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -148,11 +148,11 @@ in [ { hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; - publicKeyFile = "./pubkeys/myhost_ssh_host_dsa_key.pub"; + publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub; } { hostNames = [ "myhost2" ]; - publicKeyFile = "./pubkeys/myhost2_ssh_host_dsa_key.pub"; + publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub; } ] ''; From 67982125718b34d73df80520ea18160f6021e0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 31 Oct 2017 16:05:41 +0100 Subject: [PATCH 2071/2806] languagetool: add command for HTTP server --- pkgs/tools/text/languagetool/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 8aed674a644..4f3f8af3256 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { EXE chmod +x $out/bin/$lt done + cat > $out/bin/languagetool-http-server < Date: Tue, 31 Oct 2017 15:42:08 -0500 Subject: [PATCH 2072/2806] musl: 1.1.17 -> 1.1.18 Use this as an opportunity to remove empty patches array. --- pkgs/os-specific/linux/musl/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index c51b8b26c80..aaef5315b0f 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.17"; + version = "1.1.18"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "0r0lyp2w6v2bvm8h1si7w3p2qx037szl14qnxm5p00568z3m3an8"; + sha256 = "0651lnj5spckqjf83nz116s8qhhydgqdy3rkl4icbh5f05fyw5yh"; }; enableParallelBuilding = true; @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { "CFLAGS=-fstack-protector-strong" ]; - patches = []; - dontDisableStatic = true; meta = { From fb9e4daa41404cb1cb19f18222e9e0d38ab99ace Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 31 Oct 2017 22:01:31 +0100 Subject: [PATCH 2073/2806] dnschain: move to nodePackages.dnschain --- pkgs/development/node-packages/default-v6.nix | 7 + pkgs/servers/dnschain/default.nix | 51 - pkgs/servers/dnschain/package.json | 3 - pkgs/servers/dnschain/package.nix | 2188 ----------------- pkgs/top-level/all-packages.nix | 2 - 5 files changed, 7 insertions(+), 2244 deletions(-) delete mode 100644 pkgs/servers/dnschain/default.nix delete mode 100644 pkgs/servers/dnschain/package.json delete mode 100644 pkgs/servers/dnschain/package.nix diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 334c79a8267..759d3fc1f85 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -6,6 +6,13 @@ let }; in nodePackages // { + dnschain = nodePackages.dnschain.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + postInstall = '' + wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin + ''; + }); + node-inspector = nodePackages.node-inspector.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; }); diff --git a/pkgs/servers/dnschain/default.nix b/pkgs/servers/dnschain/default.nix deleted file mode 100644 index 52cccae50c5..00000000000 --- a/pkgs/servers/dnschain/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper, openssl }: - -let - nodePackages = callPackage (import ../../top-level/node-packages.nix) { - self = nodePackages; - generated = ./package.nix; - }; - -in nodePackages.buildNodePackage rec { - name = "dnschain-${version}"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "okTurtles"; - repo = "dnschain"; - rev = "a8d477f9ad33d7790f94ffc563e2205823e62515"; - sha256 = "0j5glbxf0fxnxl4l1lysb3a619b18rk0l1ks57wd255llc2mw7zy"; - }; - - deps = with nodePackages; [ - by-spec."bluebird"."2.9.9" - by-spec."bottleneck"."1.5.x" - by-spec."event-stream"."3.2.2" - by-spec."express"."4.11.2" - by-spec."hiredis"."0.4.1" - by-spec."json-rpc2"."0.8.1" - by-spec."lodash"."3.1.0" - by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" - by-spec."native-dns-packet"."0.1.1" - by-spec."nconf"."0.7.1" - by-spec."properties"."1.2.1" - by-spec."redis"."0.12.x" - by-spec."string"."2.0.1" - by-spec."winston"."0.8.0" - by-spec."superagent"."0.21.0" - ]; - - buildInputs = [ makeWrapper nodePackages.coffee-script ]; - postInstall = '' - wrapProgram $out/bin/dnschain --suffix PATH : ${openssl.bin}/bin - ''; - - meta = with stdenv.lib; { - description = "A blockchain-based DNS + HTTP server"; - homepage = https://okturtles.com/; - license = licenses.mpl20; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/servers/dnschain/package.json b/pkgs/servers/dnschain/package.json deleted file mode 100644 index fda40c8a90a..00000000000 --- a/pkgs/servers/dnschain/package.json +++ /dev/null @@ -1,3 +0,0 @@ -[ "dnschain" -, "coffee-script" -] diff --git a/pkgs/servers/dnschain/package.nix b/pkgs/servers/dnschain/package.nix deleted file mode 100644 index 600f5a94684..00000000000 --- a/pkgs/servers/dnschain/package.nix +++ /dev/null @@ -1,2188 +0,0 @@ - -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."accepts"."~1.2.3" = - self.by-version."accepts"."1.2.13"; - by-version."accepts"."1.2.13" = self.buildNodePackage { - name = "accepts-1.2.13"; - version = "1.2.13"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; - name = "accepts-1.2.13.tgz"; - sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; - }; - deps = { - "mime-types-2.1.14" = self.by-version."mime-types"."2.1.14"; - "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."assert-plus"."^1.0.0" = - self.by-version."assert-plus"."1.0.0"; - by-version."assert-plus"."1.0.0" = self.buildNodePackage { - name = "assert-plus-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - name = "assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."0.2.x" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = self.buildNodePackage { - name = "async-0.2.10"; - version = "0.2.10"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.2"; - by-version."async"."0.9.2" = self.buildNodePackage { - name = "async-0.9.2"; - version = "0.9.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - name = "async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."better-curry"."1.x.x" = - self.by-version."better-curry"."1.6.0"; - by-version."better-curry"."1.6.0" = self.buildNodePackage { - name = "better-curry-1.6.0"; - version = "1.6.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; - name = "better-curry-1.6.0.tgz"; - sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."binaryheap".">= 0.0.3" = - self.by-version."binaryheap"."0.0.3"; - by-version."binaryheap"."0.0.3" = self.buildNodePackage { - name = "binaryheap-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; - name = "binaryheap-0.0.3.tgz"; - sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bindings"."*" = - self.by-version."bindings"."1.2.1"; - by-version."bindings"."1.2.1" = self.buildNodePackage { - name = "bindings-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - name = "bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bluebird"."2.9.9" = - self.by-version."bluebird"."2.9.9"; - by-version."bluebird"."2.9.9" = self.buildNodePackage { - name = "bluebird-2.9.9"; - version = "2.9.9"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; - name = "bluebird-2.9.9.tgz"; - sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bottleneck"."1.5.x" = - self.by-version."bottleneck"."1.5.3"; - by-version."bottleneck"."1.5.3" = self.buildNodePackage { - name = "bottleneck-1.5.3"; - version = "1.5.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; - name = "bottleneck-1.5.3.tgz"; - sha1 = "55fa64920d9670087d44150404525d59f9511c20"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffercursor".">= 0.0.12" = - self.by-version."buffercursor"."0.0.12"; - by-version."buffercursor"."0.0.12" = self.buildNodePackage { - name = "buffercursor-0.0.12"; - version = "0.0.12"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; - name = "buffercursor-0.0.12.tgz"; - sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; - }; - deps = { - "verror-1.9.0" = self.by-version."verror"."1.9.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffercursor".">= 0.0.5" = - self.by-version."buffercursor"."0.0.12"; - by-spec."coffee-script"."*" = - self.by-version."coffee-script"."1.12.2"; - by-version."coffee-script"."1.12.2" = self.buildNodePackage { - name = "coffee-script-1.12.2"; - version = "1.12.2"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - name = "coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "coffee-script" = self.by-version."coffee-script"."1.12.2"; - by-spec."colors"."0.6.x" = - self.by-version."colors"."0.6.2"; - by-version."colors"."0.6.2" = self.buildNodePackage { - name = "colors-0.6.2"; - version = "0.6.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.7"; - by-version."combined-stream"."0.0.7" = self.buildNodePackage { - name = "combined-stream-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - name = "combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - deps = { - "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-emitter"."1.1.2" = - self.by-version."component-emitter"."1.1.2"; - by-version."component-emitter"."1.1.2" = self.buildNodePackage { - name = "component-emitter-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; - name = "component-emitter-1.1.2.tgz"; - sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."content-disposition"."0.5.0" = - self.by-version."content-disposition"."0.5.0"; - by-version."content-disposition"."0.5.0" = self.buildNodePackage { - name = "content-disposition-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; - name = "content-disposition-0.5.0.tgz"; - sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie"."0.1.2" = - self.by-version."cookie"."0.1.2"; - by-version."cookie"."0.1.2" = self.buildNodePackage { - name = "cookie-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; - name = "cookie-0.1.2.tgz"; - sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie-signature"."1.0.5" = - self.by-version."cookie-signature"."1.0.5"; - by-version."cookie-signature"."1.0.5" = self.buildNodePackage { - name = "cookie-signature-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; - name = "cookie-signature-1.0.5.tgz"; - sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookiejar"."2.0.1" = - self.by-version."cookiejar"."2.0.1"; - by-version."cookiejar"."2.0.1" = self.buildNodePackage { - name = "cookiejar-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; - name = "cookiejar-2.0.1.tgz"; - sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."core-util-is"."1.0.2" = - self.by-version."core-util-is"."1.0.2"; - by-version."core-util-is"."1.0.2" = self.buildNodePackage { - name = "core-util-is-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - name = "core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."core-util-is"."~1.0.0" = - self.by-version."core-util-is"."1.0.2"; - by-spec."crc"."3.2.1" = - self.by-version."crc"."3.2.1"; - by-version."crc"."3.2.1" = self.buildNodePackage { - name = "crc-3.2.1"; - version = "3.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; - name = "crc-3.2.1.tgz"; - sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cycle"."1.0.x" = - self.by-version."cycle"."1.0.3"; - by-version."cycle"."1.0.3" = self.buildNodePackage { - name = "cycle-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - name = "cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."1.x.x" = - self.by-version."debug"."1.0.4"; - by-version."debug"."1.0.4" = self.buildNodePackage { - name = "debug-1.0.4"; - version = "1.0.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; - name = "debug-1.0.4.tgz"; - sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; - }; - deps = { - "ms-0.6.2" = self.by-version."ms"."0.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."2" = - self.by-version."debug"."2.6.0"; - by-version."debug"."2.6.0" = self.buildNodePackage { - name = "debug-2.6.0"; - version = "2.6.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - name = "debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; - }; - deps = { - "ms-0.7.2" = self.by-version."ms"."0.7.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."~2.1.1" = - self.by-version."debug"."2.1.3"; - by-version."debug"."2.1.3" = self.buildNodePackage { - name = "debug-2.1.3"; - version = "2.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; - name = "debug-2.1.3.tgz"; - sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; - }; - deps = { - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delayed-stream"."0.0.5" = - self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = self.buildNodePackage { - name = "delayed-stream-0.0.5"; - version = "0.0.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."depd"."~1.0.0" = - self.by-version."depd"."1.0.1"; - by-version."depd"."1.0.1" = self.buildNodePackage { - name = "depd-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; - name = "depd-1.0.1.tgz"; - sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."destroy"."1.0.3" = - self.by-version."destroy"."1.0.3"; - by-version."destroy"."1.0.3" = self.buildNodePackage { - name = "destroy-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - name = "destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."duplexer"."~0.1.1" = - self.by-version."duplexer"."0.1.1"; - by-version."duplexer"."0.1.1" = self.buildNodePackage { - name = "duplexer-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; - name = "duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ee-first"."1.1.0" = - self.by-version."ee-first"."1.1.0"; - by-version."ee-first"."1.1.0" = self.buildNodePackage { - name = "ee-first-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; - name = "ee-first-1.1.0.tgz"; - sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."es5class"."2.x.x" = - self.by-version."es5class"."2.3.1"; - by-version."es5class"."2.3.1" = self.buildNodePackage { - name = "es5class-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; - name = "es5class-2.3.1.tgz"; - sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; - }; - deps = { - "better-curry-1.6.0" = self.by-version."better-curry"."1.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-html"."1.0.1" = - self.by-version."escape-html"."1.0.1"; - by-version."escape-html"."1.0.1" = self.buildNodePackage { - name = "escape-html-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; - name = "escape-html-1.0.1.tgz"; - sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."etag"."~1.5.1" = - self.by-version."etag"."1.5.1"; - by-version."etag"."1.5.1" = self.buildNodePackage { - name = "etag-1.5.1"; - version = "1.5.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; - name = "etag-1.5.1.tgz"; - sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; - }; - deps = { - "crc-3.2.1" = self.by-version."crc"."3.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."event-stream"."3.2.2" = - self.by-version."event-stream"."3.2.2"; - by-version."event-stream"."3.2.2" = self.buildNodePackage { - name = "event-stream-3.2.2"; - version = "3.2.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; - name = "event-stream-3.2.2.tgz"; - sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - "from-0.1.3" = self.by-version."from"."0.1.3"; - "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0"; - "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11"; - "split-0.3.3" = self.by-version."split"."0.3.3"; - "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."eventemitter3"."0.x.x" = - self.by-version."eventemitter3"."0.1.6"; - by-version."eventemitter3"."0.1.6" = self.buildNodePackage { - name = "eventemitter3-0.1.6"; - version = "0.1.6"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; - name = "eventemitter3-0.1.6.tgz"; - sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."express"."4.11.2" = - self.by-version."express"."4.11.2"; - by-version."express"."4.11.2" = self.buildNodePackage { - name = "express-4.11.2"; - version = "4.11.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; - name = "express-4.11.2.tgz"; - sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; - }; - deps = { - "accepts-1.2.13" = self.by-version."accepts"."1.2.13"; - "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; - "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "methods-1.1.2" = self.by-version."methods"."1.1.2"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1"; - "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.10" = self.by-version."proxy-addr"."1.0.10"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3"; - "send-0.11.1" = self.by-version."send"."0.11.1"; - "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1"; - "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; - "vary-1.0.1" = self.by-version."vary"."1.0.1"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."extend"."~1.2.1" = - self.by-version."extend"."1.2.1"; - by-version."extend"."1.2.1" = self.buildNodePackage { - name = "extend-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - name = "extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."extsprintf"."^1.2.0" = - self.by-version."extsprintf"."1.3.0"; - by-version."extsprintf"."1.3.0" = self.buildNodePackage { - name = "extsprintf-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - name = "extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."eyes"."0.1.x" = - self.by-version."eyes"."0.1.8"; - by-version."eyes"."0.1.8" = self.buildNodePackage { - name = "eyes-0.1.8"; - version = "0.1.8"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - name = "eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."faye-websocket"."0.x.x" = - self.by-version."faye-websocket"."0.11.0"; - by-version."faye-websocket"."0.11.0" = self.buildNodePackage { - name = "faye-websocket-0.11.0"; - version = "0.11.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz"; - name = "faye-websocket-0.11.0.tgz"; - sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50"; - }; - deps = { - "websocket-driver-0.6.5" = self.by-version."websocket-driver"."0.6.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."finalhandler"."0.3.3" = - self.by-version."finalhandler"."0.3.3"; - by-version."finalhandler"."0.3.3" = self.buildNodePackage { - name = "finalhandler-0.3.3"; - version = "0.3.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; - name = "finalhandler-0.3.3.tgz"; - sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; - }; - deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."form-data"."0.1.3" = - self.by-version."form-data"."0.1.3"; - by-version."form-data"."0.1.3" = self.buildNodePackage { - name = "form-data-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; - name = "form-data-0.1.3.tgz"; - sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; - }; - deps = { - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "async-0.9.2" = self.by-version."async"."0.9.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."formidable"."1.0.14" = - self.by-version."formidable"."1.0.14"; - by-version."formidable"."1.0.14" = self.buildNodePackage { - name = "formidable-1.0.14"; - version = "1.0.14"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; - name = "formidable-1.0.14.tgz"; - sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forwarded"."~0.1.0" = - self.by-version."forwarded"."0.1.0"; - by-version."forwarded"."0.1.0" = self.buildNodePackage { - name = "forwarded-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; - name = "forwarded-0.1.0.tgz"; - sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fresh"."0.2.4" = - self.by-version."fresh"."0.2.4"; - by-version."fresh"."0.2.4" = self.buildNodePackage { - name = "fresh-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; - name = "fresh-0.2.4.tgz"; - sha1 = "3582499206c9723714190edd74b4604feb4a614c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."from"."~0" = - self.by-version."from"."0.1.3"; - by-version."from"."0.1.3" = self.buildNodePackage { - name = "from-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; - name = "from-0.1.3.tgz"; - sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hiredis"."0.4.1" = - self.by-version."hiredis"."0.4.1"; - by-version."hiredis"."0.4.1" = self.buildNodePackage { - name = "hiredis-0.4.1"; - version = "0.4.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; - name = "hiredis-0.4.1.tgz"; - sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f"; - }; - deps = { - "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-2.5.0" = self.by-version."nan"."2.5.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.3"; - by-version."inherits"."2.0.3" = self.buildNodePackage { - name = "inherits-2.0.3"; - version = "2.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - name = "inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ini"."1.x.x" = - self.by-version."ini"."1.3.4"; - by-version."ini"."1.3.4" = self.buildNodePackage { - name = "ini-1.3.4"; - version = "1.3.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; - name = "ini-1.3.4.tgz"; - sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ipaddr.js"."1.0.5" = - self.by-version."ipaddr.js"."1.0.5"; - by-version."ipaddr.js"."1.0.5" = self.buildNodePackage { - name = "ipaddr.js-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; - name = "ipaddr.js-1.0.5.tgz"; - sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ipaddr.js".">= 0.1.1" = - self.by-version."ipaddr.js"."1.2.0"; - by-version."ipaddr.js"."1.2.0" = self.buildNodePackage { - name = "ipaddr.js-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz"; - name = "ipaddr.js-1.2.0.tgz"; - sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json-rpc2"."0.8.1" = - self.by-version."json-rpc2"."0.8.1"; - by-version."json-rpc2"."0.8.1" = self.buildNodePackage { - name = "json-rpc2-0.8.1"; - version = "0.8.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; - name = "json-rpc2-0.8.1.tgz"; - sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; - }; - deps = { - "jsonparse-0.0.6" = self.by-version."jsonparse"."0.0.6"; - "debug-1.0.4" = self.by-version."debug"."1.0.4"; - "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; - "es5class-2.3.1" = self.by-version."es5class"."2.3.1"; - "faye-websocket-0.11.0" = self.by-version."faye-websocket"."0.11.0"; - "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jsonparse"."0.x.x" = - self.by-version."jsonparse"."0.0.6"; - by-version."jsonparse"."0.0.6" = self.buildNodePackage { - name = "jsonparse-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; - name = "jsonparse-0.0.6.tgz"; - sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash"."2.x.x" = - self.by-version."lodash"."2.4.2"; - by-version."lodash"."2.4.2" = self.buildNodePackage { - name = "lodash-2.4.2"; - version = "2.4.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - name = "lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash"."3.1.0" = - self.by-version."lodash"."3.1.0"; - by-version."lodash"."3.1.0" = self.buildNodePackage { - name = "lodash-3.1.0"; - version = "3.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; - name = "lodash-3.1.0.tgz"; - sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."map-stream"."~0.1.0" = - self.by-version."map-stream"."0.1.0"; - by-version."map-stream"."0.1.0" = self.buildNodePackage { - name = "map-stream-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; - name = "map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."media-typer"."0.3.0" = - self.by-version."media-typer"."0.3.0"; - by-version."media-typer"."0.3.0" = self.buildNodePackage { - name = "media-typer-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - name = "media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."merge-descriptors"."0.0.2" = - self.by-version."merge-descriptors"."0.0.2"; - by-version."merge-descriptors"."0.0.2" = self.buildNodePackage { - name = "merge-descriptors-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; - name = "merge-descriptors-0.0.2.tgz"; - sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."methods"."1.0.1" = - self.by-version."methods"."1.0.1"; - by-version."methods"."1.0.1" = self.buildNodePackage { - name = "methods-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; - name = "methods-1.0.1.tgz"; - sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."methods"."~1.1.1" = - self.by-version."methods"."1.1.2"; - by-version."methods"."1.1.2" = self.buildNodePackage { - name = "methods-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - name = "methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = self.buildNodePackage { - name = "mime-1.2.11"; - version = "1.2.11"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.12.0" = - self.by-version."mime-db"."1.12.0"; - by-version."mime-db"."1.12.0" = self.buildNodePackage { - name = "mime-db-1.12.0"; - version = "1.12.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - name = "mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.26.0" = - self.by-version."mime-db"."1.26.0"; - by-version."mime-db"."1.26.0" = self.buildNodePackage { - name = "mime-db-1.26.0"; - version = "1.26.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; - name = "mime-db-1.26.0.tgz"; - sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.9" = - self.by-version."mime-types"."2.0.14"; - by-version."mime-types"."2.0.14" = self.buildNodePackage { - name = "mime-types-2.0.14"; - version = "2.0.14"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - name = "mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - deps = { - "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.1.6" = - self.by-version."mime-types"."2.1.14"; - by-version."mime-types"."2.1.14" = self.buildNodePackage { - name = "mime-types-2.1.14"; - version = "2.1.14"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; - name = "mime-types-2.1.14.tgz"; - sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; - }; - deps = { - "mime-db-1.26.0" = self.by-version."mime-db"."1.26.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."~0.0.1" = - self.by-version."minimist"."0.0.10"; - by-version."minimist"."0.0.10" = self.buildNodePackage { - name = "minimist-0.0.10"; - version = "0.0.10"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - name = "minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.6.2" = - self.by-version."ms"."0.6.2"; - by-version."ms"."0.6.2" = self.buildNodePackage { - name = "ms-0.6.2"; - version = "0.6.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - name = "ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.0" = - self.by-version."ms"."0.7.0"; - by-version."ms"."0.7.0" = self.buildNodePackage { - name = "ms-0.7.0"; - version = "0.7.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; - name = "ms-0.7.0.tgz"; - sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.2" = - self.by-version."ms"."0.7.2"; - by-version."ms"."0.7.2" = self.buildNodePackage { - name = "ms-0.7.2"; - version = "0.7.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - name = "ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nan"."^2.0.5" = - self.by-version."nan"."2.5.0"; - by-version."nan"."2.5.0" = self.buildNodePackage { - name = "nan-2.5.0"; - version = "2.5.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; - name = "nan-2.5.0.tgz"; - sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" = - self.by-version."native-dns"."0.6.1"; - by-version."native-dns"."0.6.1" = self.buildNodePackage { - name = "native-dns-0.6.1"; - version = "0.6.1"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/node-dns.git"; - rev = "08433ec98f517eed3c6d5e47bdf62603539cd402"; - sha256 = "9c3faf4d39fda7bb6dd52a82036625f37ed442d5e948d295acb2f055dd367080"; - }; - deps = { - "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; - "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2"; - "native-dns-packet-0.0.4" = self.by-version."native-dns-packet"."0.0.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-cache"."git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = - self.by-version."native-dns-cache"."0.0.2"; - by-version."native-dns-cache"."0.0.2" = self.buildNodePackage { - name = "native-dns-cache-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-cache.git"; - rev = "8714196bb9223cc9a4064a4fddf9e82ec50b7d4d"; - sha256 = "3f06b2577afc3c1e428533baae3c51bad44a2e1e02fca147a1303943c214f841"; - }; - deps = { - "binaryheap-0.0.3" = self.by-version."binaryheap"."0.0.3"; - "native-dns-packet-0.0.3" = self.by-version."native-dns-packet"."0.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-packet"."0.1.1" = - self.by-version."native-dns-packet"."0.1.1"; - by-version."native-dns-packet"."0.1.1" = self.buildNodePackage { - name = "native-dns-packet-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; - name = "native-dns-packet-0.1.1.tgz"; - sha1 = "97da90570b8438a00194701ce24d011fd3cc109a"; - }; - deps = { - "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" = - self.by-version."native-dns-packet"."0.0.3"; - by-version."native-dns-packet"."0.0.3" = self.buildNodePackage { - name = "native-dns-packet-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-packet.git"; - rev = "307e77a47ebba57a5ae9118a284e916e5ebb305a"; - sha256 = "3ab023906deb8ee86bcb34c3e67e03cebeed1ba2dcb0b1d561c362ca995b0739"; - }; - deps = { - "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" = - self.by-version."native-dns-packet"."0.0.4"; - by-version."native-dns-packet"."0.0.4" = self.buildNodePackage { - name = "native-dns-packet-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-packet.git"; - rev = "8bf2714c318cfe7d31bca2006385882ccbf503e4"; - sha256 = "2a5951696b4e514ab5dee36e4e5394781656a8e94c6aacba83b03f7e647f8df3"; - }; - deps = { - "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nconf"."0.7.1" = - self.by-version."nconf"."0.7.1"; - by-version."nconf"."0.7.1" = self.buildNodePackage { - name = "nconf-0.7.1"; - version = "0.7.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; - name = "nconf-0.7.1.tgz"; - sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "ini-1.3.4" = self.by-version."ini"."1.3.4"; - "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."negotiator"."0.5.3" = - self.by-version."negotiator"."0.5.3"; - by-version."negotiator"."0.5.3" = self.buildNodePackage { - name = "negotiator-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; - name = "negotiator-0.5.3.tgz"; - sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."on-finished"."~2.2.0" = - self.by-version."on-finished"."2.2.1"; - by-version."on-finished"."2.2.1" = self.buildNodePackage { - name = "on-finished-2.2.1"; - version = "2.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; - name = "on-finished-2.2.1.tgz"; - sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; - }; - deps = { - "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."optimist"."~0.6.0" = - self.by-version."optimist"."0.6.1"; - by-version."optimist"."0.6.1" = self.buildNodePackage { - name = "optimist-0.6.1"; - version = "0.6.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - name = "optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - deps = { - "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; - "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parseurl"."~1.3.0" = - self.by-version."parseurl"."1.3.1"; - by-version."parseurl"."1.3.1" = self.buildNodePackage { - name = "parseurl-1.3.1"; - version = "1.3.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; - name = "parseurl-1.3.1.tgz"; - sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."path-to-regexp"."0.1.3" = - self.by-version."path-to-regexp"."0.1.3"; - by-version."path-to-regexp"."0.1.3" = self.buildNodePackage { - name = "path-to-regexp-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; - name = "path-to-regexp-0.1.3.tgz"; - sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pause-stream"."0.0.11" = - self.by-version."pause-stream"."0.0.11"; - by-version."pause-stream"."0.0.11" = self.buildNodePackage { - name = "pause-stream-0.0.11"; - version = "0.0.11"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; - name = "pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pkginfo"."0.3.x" = - self.by-version."pkginfo"."0.3.1"; - by-version."pkginfo"."0.3.1" = self.buildNodePackage { - name = "pkginfo-0.3.1"; - version = "0.3.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - name = "pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."properties"."1.2.1" = - self.by-version."properties"."1.2.1"; - by-version."properties"."1.2.1" = self.buildNodePackage { - name = "properties-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; - name = "properties-1.2.1.tgz"; - sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."proxy-addr"."~1.0.6" = - self.by-version."proxy-addr"."1.0.10"; - by-version."proxy-addr"."1.0.10" = self.buildNodePackage { - name = "proxy-addr-1.0.10"; - version = "1.0.10"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; - name = "proxy-addr-1.0.10.tgz"; - sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; - }; - deps = { - "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; - "ipaddr.js-1.0.5" = self.by-version."ipaddr.js"."1.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."1.2.0" = - self.by-version."qs"."1.2.0"; - by-version."qs"."1.2.0" = self.buildNodePackage { - name = "qs-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; - name = "qs-1.2.0.tgz"; - sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."2.3.3" = - self.by-version."qs"."2.3.3"; - by-version."qs"."2.3.3" = self.buildNodePackage { - name = "qs-2.3.3"; - version = "2.3.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; - name = "qs-2.3.3.tgz"; - sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."range-parser"."~1.0.2" = - self.by-version."range-parser"."1.0.3"; - by-version."range-parser"."1.0.3" = self.buildNodePackage { - name = "range-parser-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; - name = "range-parser-1.0.3.tgz"; - sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."1.0.27-1" = - self.by-version."readable-stream"."1.0.27-1"; - by-version."readable-stream"."1.0.27-1" = self.buildNodePackage { - name = "readable-stream-1.0.27-1"; - version = "1.0.27-1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; - name = "readable-stream-1.0.27-1.tgz"; - sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; - }; - deps = { - "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.3" = self.by-version."inherits"."2.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."redis"."0.12.x" = - self.by-version."redis"."0.12.1"; - by-version."redis"."0.12.1" = self.buildNodePackage { - name = "redis-0.12.1"; - version = "0.12.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; - name = "redis-0.12.1.tgz"; - sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."reduce-component"."1.0.1" = - self.by-version."reduce-component"."1.0.1"; - by-version."reduce-component"."1.0.1" = self.buildNodePackage { - name = "reduce-component-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; - name = "reduce-component-1.0.1.tgz"; - sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."send"."0.11.1" = - self.by-version."send"."0.11.1"; - by-version."send"."0.11.1" = self.buildNodePackage { - name = "send-0.11.1"; - version = "0.11.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz"; - name = "send-0.11.1.tgz"; - sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; - }; - deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."serve-static"."~1.8.1" = - self.by-version."serve-static"."1.8.1"; - by-version."serve-static"."1.8.1" = self.buildNodePackage { - name = "serve-static-1.8.1"; - version = "1.8.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; - name = "serve-static-1.8.1.tgz"; - sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; - }; - deps = { - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1"; - "send-0.11.1" = self.by-version."send"."0.11.1"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."split"."0.3" = - self.by-version."split"."0.3.3"; - by-version."split"."0.3.3" = self.buildNodePackage { - name = "split-0.3.3"; - version = "0.3.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; - name = "split-0.3.3.tgz"; - sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stack-trace"."0.0.x" = - self.by-version."stack-trace"."0.0.9"; - by-version."stack-trace"."0.0.9" = self.buildNodePackage { - name = "stack-trace-0.0.9"; - version = "0.0.9"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - name = "stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stream-combiner"."~0.0.4" = - self.by-version."stream-combiner"."0.0.4"; - by-version."stream-combiner"."0.0.4" = self.buildNodePackage { - name = "stream-combiner-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; - name = "stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; - }; - deps = { - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string"."2.0.1" = - self.by-version."string"."2.0.1"; - by-version."string"."2.0.1" = self.buildNodePackage { - name = "string-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/string/-/string-2.0.1.tgz"; - name = "string-2.0.1.tgz"; - sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string_decoder"."~0.10.x" = - self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = self.buildNodePackage { - name = "string_decoder-0.10.31"; - version = "0.10.31"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."superagent"."0.21.0" = - self.by-version."superagent"."0.21.0"; - by-version."superagent"."0.21.0" = self.buildNodePackage { - name = "superagent-0.21.0"; - version = "0.21.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; - name = "superagent-0.21.0.tgz"; - sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; - }; - deps = { - "qs-1.2.0" = self.by-version."qs"."1.2.0"; - "formidable-1.0.14" = self.by-version."formidable"."1.0.14"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "methods-1.0.1" = self.by-version."methods"."1.0.1"; - "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1"; - "debug-2.6.0" = self.by-version."debug"."2.6.0"; - "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1"; - "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "form-data-0.1.3" = self.by-version."form-data"."0.1.3"; - "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."2" = - self.by-version."through"."2.3.8"; - by-version."through"."2.3.8" = self.buildNodePackage { - name = "through-2.3.8"; - version = "2.3.8"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - name = "through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."~2.3" = - self.by-version."through"."2.3.8"; - by-spec."through"."~2.3.1" = - self.by-version."through"."2.3.8"; - by-spec."type-is"."~1.5.6" = - self.by-version."type-is"."1.5.7"; - by-version."type-is"."1.5.7" = self.buildNodePackage { - name = "type-is-1.5.7"; - version = "1.5.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; - name = "type-is-1.5.7.tgz"; - sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; - }; - deps = { - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utils-merge"."1.0.0" = - self.by-version."utils-merge"."1.0.0"; - by-version."utils-merge"."1.0.0" = self.buildNodePackage { - name = "utils-merge-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - name = "utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."vary"."~1.0.0" = - self.by-version."vary"."1.0.1"; - by-version."vary"."1.0.1" = self.buildNodePackage { - name = "vary-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; - name = "vary-1.0.1.tgz"; - sha1 = "99e4981566a286118dfb2b817357df7993376d10"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."verror"."^1.4.0" = - self.by-version."verror"."1.9.0"; - by-version."verror"."1.9.0" = self.buildNodePackage { - name = "verror-1.9.0"; - version = "1.9.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz"; - name = "verror-1.9.0.tgz"; - sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee"; - }; - deps = { - "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0"; - "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; - "extsprintf-1.3.0" = self.by-version."extsprintf"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."websocket-driver".">=0.5.1" = - self.by-version."websocket-driver"."0.6.5"; - by-version."websocket-driver"."0.6.5" = self.buildNodePackage { - name = "websocket-driver-0.6.5"; - version = "0.6.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; - name = "websocket-driver-0.6.5.tgz"; - sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; - }; - deps = { - "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."websocket-extensions".">=0.1.1" = - self.by-version."websocket-extensions"."0.1.1"; - by-version."websocket-extensions"."0.1.1" = self.buildNodePackage { - name = "websocket-extensions-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; - name = "websocket-extensions-0.1.1.tgz"; - sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."winston"."0.8.0" = - self.by-version."winston"."0.8.0"; - by-version."winston"."0.8.0" = self.buildNodePackage { - name = "winston-0.8.0"; - version = "0.8.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; - name = "winston-0.8.0.tgz"; - sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; - }; - deps = { - "async-0.2.10" = self.by-version."async"."0.2.10"; - "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; - "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1"; - "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."wordwrap"."~0.0.2" = - self.by-version."wordwrap"."0.0.3"; - by-version."wordwrap"."0.0.3" = self.buildNodePackage { - name = "wordwrap-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - name = "wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64dd498b6d..a6109c55b6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11473,8 +11473,6 @@ with pkgs; inherit (perlPackages) Error MailDKIM MIMEtools NetServer; }; - dnschain = callPackage ../servers/dnschain { }; - dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; dovecot_antispam = callPackage ../servers/mail/dovecot/plugins/antispam { }; From ea8714ecb16fc5e000c8e4638a937063c430780c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 31 Oct 2017 22:03:38 +0100 Subject: [PATCH 2074/2806] nixos/dnschain: use nodePackages.dnschain --- nixos/modules/services/networking/dnschain.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index ab7bbb15ad4..ee1cd360003 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -158,7 +158,7 @@ in serviceConfig = { User = "dnschain"; Restart = "on-failure"; - ExecStart = "${pkgs.dnschain}/bin/dnschain"; + ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain"; }; preStart = '' From fe83d911577dce6a3ed35a30332cb699dd9438d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Oct 2017 19:39:07 +0100 Subject: [PATCH 2075/2806] rustc: disable a test failing on Hydra repeatedly The problem doesn't happen for me locally, but on Hydra we tend to experience more flakiness in networking tests. --- pkgs/development/compilers/rust/rustc.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 6eb160add26..a113f5db480 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -85,6 +85,9 @@ stdenv.mkDerivation { # https://reviews.llvm.org/rL281650 rm -vr src/test/run-pass/issue-36474.rs || true + # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' + sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs + # Disable some failing gdb tests. Try re-enabling these when gdb # is updated past version 7.12. rm src/test/debuginfo/basic-types-globals.rs From 252da8a66ebcd59baca63ea2b1886e3c47b0b44a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 31 Oct 2017 22:31:05 +0100 Subject: [PATCH 2076/2806] wlroots: init at 2017-10-31 In preparation for Sway 1.0 which will use wlroots instead of wlc. --- .../development/libraries/wlroots/default.nix | 35 +++++++++++++++++++ .../libraries/wlroots/libdrm.patch | 9 +++++ .../libraries/wlroots/no-werror.patch | 10 ++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 55 insertions(+) create mode 100644 pkgs/development/libraries/wlroots/default.nix create mode 100644 pkgs/development/libraries/wlroots/libdrm.patch create mode 100644 pkgs/development/libraries/wlroots/no-werror.patch diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix new file mode 100644 index 00000000000..79bd8bb9665 --- /dev/null +++ b/pkgs/development/libraries/wlroots/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman +, xcbutilwm, libX11, libcap +}: + +let pname = "wlroots"; + version = "unstable-2017-10-31"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "wlroots"; + rev = "7200d643363e988edf6777c38e7f8fcd451a2c50"; + sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac"; + }; + + # TODO: Temporary workaround for compilation errors + patches = [ ./libdrm.patch ./no-werror.patch ]; + + nativeBuildInputs = [ meson ninja pkgconfig ]; + + buildInputs = [ + wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman + xcbutilwm libX11 libcap + ]; + + meta = with stdenv.lib; { + description = "A modular Wayland compositor library"; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/libraries/wlroots/libdrm.patch b/pkgs/development/libraries/wlroots/libdrm.patch new file mode 100644 index 00000000000..2b9d8538276 --- /dev/null +++ b/pkgs/development/libraries/wlroots/libdrm.patch @@ -0,0 +1,9 @@ +--- a/backend/meson.build 2017-10-31 22:08:01.112927610 +0100 ++++ b/backend/meson.build 2017-10-31 22:09:28.155264343 +0100 +@@ -43,5 +43,5 @@ + 'wlr_backend', + backend_files, + include_directories: wlr_inc, +- dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos], ++ dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos, drm], + ) diff --git a/pkgs/development/libraries/wlroots/no-werror.patch b/pkgs/development/libraries/wlroots/no-werror.patch new file mode 100644 index 00000000000..78c374d9dbb --- /dev/null +++ b/pkgs/development/libraries/wlroots/no-werror.patch @@ -0,0 +1,10 @@ +--- a/meson.build 2017-10-31 22:08:01.132927689 +0100 ++++ b/meson.build 2017-10-31 22:20:58.215784350 +0100 +@@ -5,7 +5,6 @@ + default_options: [ + 'c_std=c11', + 'warning_level=2', +- 'werror=true', + ], + ) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a76c4eac651..16da59781e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15072,6 +15072,7 @@ with pkgs; spectrwm = callPackage ../applications/window-managers/spectrwm { }; wlc = callPackage ../development/libraries/wlc { }; + wlroots = callPackage ../development/libraries/wlroots { }; orbment = callPackage ../applications/window-managers/orbment { }; sway = callPackage ../applications/window-managers/sway { }; swaylock = callPackage ../applications/window-managers/sway { }; From b400e36548aab5a5adc1021f85cdde0054b06904 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 31 Oct 2017 21:23:58 +0000 Subject: [PATCH 2077/2806] pip-tools: update tests for 1.9.0 -> 1.10.1 --- .../python-modules/pip-tools/default.nix | 14 ++++++++++---- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 2c297d8d719..d916f9b95b1 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first -, setuptools_scm, glibcLocales, mock }: +, setuptools_scm, git, glibcLocales, mock }: buildPythonPackage rec { pname = "pip-tools"; @@ -12,12 +12,18 @@ buildPythonPackage rec { }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ pytest glibcLocales mock ]; + checkInputs = [ pytest git glibcLocales mock ]; propagatedBuildInputs = [ pip click six first setuptools_scm ]; checkPhase = '' - export HOME=$(mktemp -d) - py.test -k "not test_realistic_complex_sub_dependencies" # requires network + export HOME=$(mktemp -d) VIRTUAL_ENV=1 + tests_without_network_access=" + not test_realistic_complex_sub_dependencies \ + and not test_editable_package_vcs \ + and not test_generate_hashes_all_platforms \ + and not test_generate_hashes_without_interfering_with_each_other \ + " + py.test -k "$tests_without_network_access" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9c5fa93dfa..0be1ff17ee0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15114,6 +15114,7 @@ in { }; pip-tools = callPackage ../development/python-modules/pip-tools { + git = pkgs.gitMinimal; glibcLocales = pkgs.glibcLocales; }; From f90c468ea555c424c910681d471566925bd2c3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Oct 2017 23:03:34 +0100 Subject: [PATCH 2078/2806] nginxModules.moreheaders: fix source hash An amended git tag, apparently. There are only changes in documentation and whitespace changes in code. Sigh. Uncovered by c3255fe8ec. --- pkgs/servers/http/nginx/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f3222f2982b..9f0f5ac4bb9 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -35,7 +35,7 @@ owner = "openresty"; repo = "headers-more-nginx-module"; rev = "v0.26"; - sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn"; + sha256 = "0zhr3ai4xf5yghxvlbrwv8n06fgx33f1n1d4a6gmsczdfjzf8g6g"; }; }; From 947d48cdaf1dbe2440fba7396ce1007ec4226229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Oct 2017 23:11:23 +0100 Subject: [PATCH 2079/2806] 9pfs: fix src download Fortunately the hash is the same, so I don't really need to check authenticity. Uncovered by c3255fe8ec. --- pkgs/tools/filesystems/9pfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index c75cc45170a..5ad54adc08a 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "9pfs"; src = fetchFromGitHub { - owner = "spewspew"; + owner = "mischief"; repo = "9pfs"; rev = "7f4ca4cd750d650c1215b92ac3cc2a28041960e4"; sha256 = "007s2idsn6bspmfxv1qabj39ggkgvn6gwdbhczwn04lb4c6gh3xc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://github.com/spewspew/9pfs; + #homepage = https://github.com/spewspew/9pfs; # the account apparently doesn't exist description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; From 39e958b61e7fa04ad9ee74d62fb909b612ef3a1e Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 20 Oct 2017 05:24:19 +0200 Subject: [PATCH 2080/2806] lxqt-panel: fix patch hash ... and switch to fetchpatch to avoid GitHub hash changes. --- pkgs/desktops/lxqt/core/lxqt-panel/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index d2faf9c0eee..8dbe8990937 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchFromGitHub, fetchurl, standardPatch, + stdenv, fetchFromGitHub, fetchpatch, standardPatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, @@ -50,9 +50,10 @@ stdenv.mkDerivation rec { ]; patches = [ - (fetchurl { + (fetchpatch { url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch; - sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr"; + name = "fix-compile-explicit-keyword.patch"; + sha256 = "1grda0dw175kbsfq90lr5qaf79akwikzxw85jhd5f339nnramp81"; }) ]; From a1923194f37e0a2d16a7e3e64c7052bc07998b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Oct 2017 23:16:47 +0100 Subject: [PATCH 2081/2806] altcoins.bitcoin-unlimited: fix source hash An amended git tag, apparently. Only lengthened GIT_COMMIT_ID. Sigh. Uncovered by c3255fe8ec. --- pkgs/applications/altcoins/bitcoin-unlimited.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index 2ad8e3fb350..9eb1e54b909 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "v${version}"; - sha256 = "0rhk6xvzvzyfppg0pgq72nqgm2rmkiw0nhg3rwnzcvvj90nrz3da"; + sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From ff437fca45584b86d850c35de67333f908c0b5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Oct 2017 23:37:45 +0100 Subject: [PATCH 2082/2806] scrot: 0.8-17 -> 0.8-18 The old patch-set isn't available on Debian anymore. Uncovered by c3255fe8ec. --- pkgs/tools/graphics/scrot/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 5e4fd3ff062..49bd74ea412 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -2,23 +2,21 @@ let debPatch = fetchzip { - url = mirror://debian/pool/main/s/scrot/scrot_0.8-17.debian.tar.xz; - sha256 = "0ydsr3vah5wkcbnp91knkdbil4hx0cn0iy57frl03azqzc29bkw5"; + url = mirror://debian/pool/main/s/scrot/scrot_0.8-18.debian.tar.xz; + sha256 = "1m8m8ad0idf3nzw0k57f6rfbw8n7dza69a7iikriqgbrpyvxqybx"; }; in stdenv.mkDerivation rec { - name = "scrot-0.8-17"; + name = "scrot-0.8-18"; src = fetchurl { url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"; }; - inherit debPatch; - postPatch = '' - for patch in $(cat $debPatch/patches/series); do - patch -p1 < "$debPatch/patches/$patch" + for patch in $(cat ${debPatch}/patches/series); do + patch -p1 < "${debPatch}/patches/$patch" done ''; From 681c6f99a85bc1fc9cc5ecd4c7cfa361ef75e8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Oct 2017 23:46:32 +0100 Subject: [PATCH 2083/2806] luaPackages.mpack: fix sourceRoot Uncovered by c3255fe8ec. --- pkgs/top-level/lua-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 7a0b0a56c9b..f233ae43ad1 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -619,7 +619,7 @@ let # NOTE: For updating, new Lua mpack bindings live at: # https://github.com/libmpack/libmpack-lua. src = libmpack.src; - sourceRoot = "libmpack-${libmpack.rev}-src/binding/lua"; + sourceRoot = "${src.name}/binding/lua"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libmpack ]; # ++ [ libtool lua ]; From ebc8ffb010eeaf1a418853b9f0c66cd1cef41c66 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 31 Oct 2017 23:49:26 +0100 Subject: [PATCH 2084/2806] groovebasin: remove --- .../audio/groovebasin/default.nix | 69 - .../audio/groovebasin/package.nix | 4396 ----------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 4467 deletions(-) delete mode 100644 pkgs/applications/audio/groovebasin/default.nix delete mode 100644 pkgs/applications/audio/groovebasin/package.nix diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix deleted file mode 100644 index 7eb2e85f7be..00000000000 --- a/pkgs/applications/audio/groovebasin/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux, nodejs }: - -with stdenv.lib; - -let - nodePackages = callPackage (import ../../../top-level/node-packages.nix) { - inherit nodejs; - neededNatives = [ libgroove python utillinux ]; - self = nodePackages; - generated = ./package.nix; - }; - -in nodePackages.buildNodePackage rec { - version = "1.5.1"; - name = "groovebasin-${version}"; - - src = fetchFromGitHub { - owner = "andrewrk"; - repo = "groovebasin"; - rev = "${version}"; - sha256 = "1g7v0qhvgzpb050hf45pibp68qd67hnnry5npw58f4dvaxdd8yhd"; - }; - - deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); - - buildInputs = [ makeWrapper ]; - - postInstall = '' - mkdir -p "$out/lib/node_modules/groovebasin/public" - stylus -o "$out/lib/node_modules/groovebasin/public/" -c --include-css "$out/lib/node_modules/groovebasin/src/client/styles" - browserify-lite "$out/lib/node_modules/groovebasin/src/client/app.js" --outfile "$out/lib/node_modules/groovebasin/public/app.js" - wrapProgram "$out/bin/groovebasin" --set NODE_PATH "$out/lib/node_modules/groovebasin/node_modules/" - ''; - - passthru.names = ["groovebasin"]; - - meta = { - description = "Music player server with a web-based user interface"; - homepage = http://groovebasin.com/; - license = licenses.mit; - platforms = platforms.unix; - maintainers = [ maintainers.andrewrk ]; - longDescription = '' - Groove Basin runs on a server optionally connected to speakers. Guests can - control the music player by connecting with a laptop, tablet, or smart phone. - Further, users can stream their music libraries remotely. - - Groove Basin comes with a fast, responsive web interface that supports keyboard - shortcuts and drag drop. It also provides the ability to upload songs, - download songs, and import songs by URL, including YouTube URLs. - - Groove Basin supports Dynamic Mode which automatically queues random songs, - favoring songs that have not been queued recently. - - Groove Basin automatically performs ReplayGain scanning on every song using - the EBU R128 loudness standard, and automatically switches between track - and album mode. - - Groove Basin supports the MPD protocol, which means it is compatible with MPD - clients. There is also a more powerful Groove Basin protocol which you can - use if the MPD protocol does not meet your needs. - - Groove Basin supports Last.fm scrobbling. - ''; - # groovebasin was built with nodejs 0.10 which reached end of LTS - # in October 216, it doesn't built with nodejs 4.x - broken = true; - }; -} diff --git a/pkgs/applications/audio/groovebasin/package.nix b/pkgs/applications/audio/groovebasin/package.nix deleted file mode 100644 index 3f307cd32f0..00000000000 --- a/pkgs/applications/audio/groovebasin/package.nix +++ /dev/null @@ -1,4396 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."CSSselect"."~0.4.0" = - self.by-version."CSSselect"."0.4.1"; - by-version."CSSselect"."0.4.1" = self.buildNodePackage { - name = "CSSselect-0.4.1"; - version = "0.4.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; - name = "CSSselect-0.4.1.tgz"; - sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; - }; - deps = { - "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7"; - "domutils-1.4.3" = self.by-version."domutils"."1.4.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."CSSwhat"."0.4" = - self.by-version."CSSwhat"."0.4.7"; - by-version."CSSwhat"."0.4.7" = self.buildNodePackage { - name = "CSSwhat-0.4.7"; - version = "0.4.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; - name = "CSSwhat-0.4.7.tgz"; - sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."abbrev"."1" = - self.by-version."abbrev"."1.0.7"; - by-version."abbrev"."1.0.7" = self.buildNodePackage { - name = "abbrev-1.0.7"; - version = "1.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"; - name = "abbrev-1.0.7.tgz"; - sha1 = "5b6035b2ee9d4fb5cf859f08a9be81b208491843"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."abstract-leveldown"."~2.2.1" = - self.by-version."abstract-leveldown"."2.2.2"; - by-version."abstract-leveldown"."2.2.2" = self.buildNodePackage { - name = "abstract-leveldown-2.2.2"; - version = "2.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.2.2.tgz"; - name = "abstract-leveldown-2.2.2.tgz"; - sha1 = "ecaff98c20641422710ab04b01e8f04d6b64fe77"; - }; - deps = { - "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."accepts"."~1.2.7" = - self.by-version."accepts"."1.2.9"; - by-version."accepts"."1.2.9" = self.buildNodePackage { - name = "accepts-1.2.9"; - version = "1.2.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.2.9.tgz"; - name = "accepts-1.2.9.tgz"; - sha1 = "76e9631d05e3ff192a34afb9389f7b3953ded001"; - }; - deps = { - "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1"; - "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."amdefine".">=0.0.4" = - self.by-version."amdefine"."0.1.1"; - by-version."amdefine"."0.1.1" = self.buildNodePackage { - name = "amdefine-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"; - name = "amdefine-0.1.1.tgz"; - sha1 = "b5c75c532052dccd6a39c0064c772c8d57a06cd2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi-regex"."^1.0.0" = - self.by-version."ansi-regex"."1.1.1"; - by-version."ansi-regex"."1.1.1" = self.buildNodePackage { - name = "ansi-regex-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; - name = "ansi-regex-1.1.1.tgz"; - sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi-regex"."^1.1.0" = - self.by-version."ansi-regex"."1.1.1"; - by-spec."ansi-styles"."^2.0.1" = - self.by-version."ansi-styles"."2.0.1"; - by-version."ansi-styles"."2.0.1" = self.buildNodePackage { - name = "ansi-styles-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"; - name = "ansi-styles-2.0.1.tgz"; - sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."asn1"."0.1.11" = - self.by-version."asn1"."0.1.11"; - by-version."asn1"."0.1.11" = self.buildNodePackage { - name = "asn1-0.1.11"; - version = "0.1.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - name = "asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."assert-plus"."^0.1.5" = - self.by-version."assert-plus"."0.1.5"; - by-version."assert-plus"."0.1.5" = self.buildNodePackage { - name = "assert-plus-0.1.5"; - version = "0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - name = "assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.2"; - by-version."async"."0.9.2" = self.buildNodePackage { - name = "async-0.9.2"; - version = "0.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; - name = "async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."aws-sign2"."~0.5.0" = - self.by-version."aws-sign2"."0.5.0"; - by-version."aws-sign2"."0.5.0" = self.buildNodePackage { - name = "aws-sign2-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - name = "aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64url"."0.0.3" = - self.by-version."base64url"."0.0.3"; - by-version."base64url"."0.0.3" = self.buildNodePackage { - name = "base64url-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-0.0.3.tgz"; - name = "base64url-0.0.3.tgz"; - sha1 = "50c20edac277dde1a0b15059954ced7a2d102d57"; - }; - deps = { - "tap-0.3.3" = self.by-version."tap"."0.3.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64url"."~0.0.4" = - self.by-version."base64url"."0.0.6"; - by-version."base64url"."0.0.6" = self.buildNodePackage { - name = "base64url-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz"; - name = "base64url-0.0.6.tgz"; - sha1 = "9597b36b330db1c42477322ea87ea8027499b82b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64url"."~1.0.4" = - self.by-version."base64url"."1.0.4"; - by-version."base64url"."1.0.4" = self.buildNodePackage { - name = "base64url-1.0.4"; - version = "1.0.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-1.0.4.tgz"; - name = "base64url-1.0.4.tgz"; - sha1 = "29a2a7ade9791fbb25f312ab35a2fd3126ceac0e"; - }; - deps = { - "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10"; - "meow-2.0.0" = self.by-version."meow"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bindings"."~1.2.1" = - self.by-version."bindings"."1.2.1"; - by-version."bindings"."1.2.1" = self.buildNodePackage { - name = "bindings-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - name = "bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bl"."~0.9.0" = - self.by-version."bl"."0.9.4"; - by-version."bl"."0.9.4" = self.buildNodePackage { - name = "bl-0.9.4"; - version = "0.9.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz"; - name = "bl-0.9.4.tgz"; - sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7"; - }; - deps = { - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bl"."~0.9.4" = - self.by-version."bl"."0.9.4"; - by-spec."bluebird"."^2.9.26" = - self.by-version."bluebird"."2.9.30"; - by-version."bluebird"."2.9.30" = self.buildNodePackage { - name = "bluebird-2.9.30"; - version = "2.9.30"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz"; - name = "bluebird-2.9.30.tgz"; - sha1 = "edda875ec9aad1f29cf1f56d6e82fbab2b0df556"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."boom"."0.4.x" = - self.by-version."boom"."0.4.2"; - by-version."boom"."0.4.2" = self.buildNodePackage { - name = "boom-0.4.2"; - version = "0.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - name = "boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."boom"."2.x.x" = - self.by-version."boom"."2.8.0"; - by-version."boom"."2.8.0" = self.buildNodePackage { - name = "boom-2.8.0"; - version = "2.8.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-2.8.0.tgz"; - name = "boom-2.8.0.tgz"; - sha1 = "317bdfd47018fe7dd79b0e9da73efe244119fdf1"; - }; - deps = { - "hoek-2.14.0" = self.by-version."hoek"."2.14.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."browserify-lite"."~0.2.4" = - self.by-version."browserify-lite"."0.2.4"; - by-version."browserify-lite"."0.2.4" = self.buildNodePackage { - name = "browserify-lite-0.2.4"; - version = "0.2.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/browserify-lite/-/browserify-lite-0.2.4.tgz"; - name = "browserify-lite-0.2.4.tgz"; - sha1 = "00a32f466c8f3dbbd1074250fd0aa775716ab140"; - }; - deps = { - "pend-1.2.0" = self.by-version."pend"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "browserify-lite" = self.by-version."browserify-lite"."0.2.4"; - by-spec."buffer-crc32"."~0.2.3" = - self.by-version."buffer-crc32"."0.2.5"; - by-version."buffer-crc32"."0.2.5" = self.buildNodePackage { - name = "buffer-crc32-0.2.5"; - version = "0.2.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; - name = "buffer-crc32-0.2.5.tgz"; - sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffer-equal"."~0.0.0" = - self.by-version."buffer-equal"."0.0.1"; - by-version."buffer-equal"."0.0.1" = self.buildNodePackage { - name = "buffer-equal-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; - name = "buffer-equal-0.0.1.tgz"; - sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffer-equal-constant-time"."^1.0.1" = - self.by-version."buffer-equal-constant-time"."1.0.1"; - by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage { - name = "buffer-equal-constant-time-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; - name = "buffer-equal-constant-time-1.0.1.tgz"; - sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bunker"."0.1.X" = - self.by-version."bunker"."0.1.2"; - by-version."bunker"."0.1.2" = self.buildNodePackage { - name = "bunker-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz"; - name = "bunker-0.1.2.tgz"; - sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c"; - }; - deps = { - "burrito-0.2.12" = self.by-version."burrito"."0.2.12"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."burrito".">=0.2.5 <0.3" = - self.by-version."burrito"."0.2.12"; - by-version."burrito"."0.2.12" = self.buildNodePackage { - name = "burrito-0.2.12"; - version = "0.2.12"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz"; - name = "burrito-0.2.12.tgz"; - sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b"; - }; - deps = { - "traverse-0.5.2" = self.by-version."traverse"."0.5.2"; - "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."camelcase"."^1.0.1" = - self.by-version."camelcase"."1.1.0"; - by-version."camelcase"."1.1.0" = self.buildNodePackage { - name = "camelcase-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz"; - name = "camelcase-1.1.0.tgz"; - sha1 = "953b25c3bc98671ee59a44cb9d542672da7331b9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."camelcase-keys"."^1.0.0" = - self.by-version."camelcase-keys"."1.0.0"; - by-version."camelcase-keys"."1.0.0" = self.buildNodePackage { - name = "camelcase-keys-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"; - name = "camelcase-keys-1.0.0.tgz"; - sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec"; - }; - deps = { - "camelcase-1.1.0" = self.by-version."camelcase"."1.1.0"; - "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caseless"."~0.10.0" = - self.by-version."caseless"."0.10.0"; - by-version."caseless"."0.10.0" = self.buildNodePackage { - name = "caseless-0.10.0"; - version = "0.10.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz"; - name = "caseless-0.10.0.tgz"; - sha1 = "ed6b2719adcd1fd18f58dc081c0f1a5b43963909"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caseless"."~0.8.0" = - self.by-version."caseless"."0.8.0"; - by-version."caseless"."0.8.0" = self.buildNodePackage { - name = "caseless-0.8.0"; - version = "0.8.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"; - name = "caseless-0.8.0.tgz"; - sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caseless"."~0.9.0" = - self.by-version."caseless"."0.9.0"; - by-version."caseless"."0.9.0" = self.buildNodePackage { - name = "caseless-0.9.0"; - version = "0.9.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"; - name = "caseless-0.9.0.tgz"; - sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."chalk"."^1.0.0" = - self.by-version."chalk"."1.0.0"; - by-version."chalk"."1.0.0" = self.buildNodePackage { - name = "chalk-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; - name = "chalk-1.0.0.tgz"; - sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; - }; - deps = { - "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1"; - "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; - "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3"; - "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1"; - "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."charm"."0.1.x" = - self.by-version."charm"."0.1.2"; - by-version."charm"."0.1.2" = self.buildNodePackage { - name = "charm-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz"; - name = "charm-0.1.2.tgz"; - sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cheerio"."^0.18.0" = - self.by-version."cheerio"."0.18.0"; - by-version."cheerio"."0.18.0" = self.buildNodePackage { - name = "cheerio-0.18.0"; - version = "0.18.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz"; - name = "cheerio-0.18.0.tgz"; - sha1 = "4e1c06377e725b740e996e0dfec353863de677fa"; - }; - deps = { - "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1"; - "entities-1.1.1" = self.by-version."entities"."1.1.1"; - "htmlparser2-3.8.3" = self.by-version."htmlparser2"."3.8.3"; - "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1"; - "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."clarinet"."~0.8.1" = - self.by-version."clarinet"."0.8.1"; - by-version."clarinet"."0.8.1" = self.buildNodePackage { - name = "clarinet-0.8.1"; - version = "0.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/clarinet/-/clarinet-0.8.1.tgz"; - name = "clarinet-0.8.1.tgz"; - sha1 = "ddfd10cd292abf5cab239140774e394bfd1ee7a6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.7"; - by-version."combined-stream"."0.0.7" = self.buildNodePackage { - name = "combined-stream-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - name = "combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - deps = { - "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.5" = - self.by-version."combined-stream"."0.0.7"; - by-spec."combined-stream"."~1.0.1" = - self.by-version."combined-stream"."1.0.5"; - by-version."combined-stream"."1.0.5" = self.buildNodePackage { - name = "combined-stream-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - name = "combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - deps = { - "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."commander"."^2.8.1" = - self.by-version."commander"."2.8.1"; - by-version."commander"."2.8.1" = self.buildNodePackage { - name = "commander-2.8.1"; - version = "2.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; - name = "commander-2.8.1.tgz"; - sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; - }; - deps = { - "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."concat-stream"."~1.4.7" = - self.by-version."concat-stream"."1.4.10"; - by-version."concat-stream"."1.4.10" = self.buildNodePackage { - name = "concat-stream-1.4.10"; - version = "1.4.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz"; - name = "concat-stream-1.4.10.tgz"; - sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6"; - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connect-static"."~1.5.0" = - self.by-version."connect-static"."1.5.0"; - by-version."connect-static"."1.5.0" = self.buildNodePackage { - name = "connect-static-1.5.0"; - version = "1.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect-static/-/connect-static-1.5.0.tgz"; - name = "connect-static-1.5.0.tgz"; - sha1 = "f8b455532e04de7c3dc7c1e062207f0b7a626ec7"; - }; - deps = { - "findit2-2.2.3" = self.by-version."findit2"."2.2.3"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "pend-1.2.0" = self.by-version."pend"."1.2.0"; - "streamsink-1.2.0" = self.by-version."streamsink"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "connect-static" = self.by-version."connect-static"."1.5.0"; - by-spec."content-disposition"."0.5.0" = - self.by-version."content-disposition"."0.5.0"; - by-version."content-disposition"."0.5.0" = self.buildNodePackage { - name = "content-disposition-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; - name = "content-disposition-0.5.0.tgz"; - sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."content-disposition"."~0.5.0" = - self.by-version."content-disposition"."0.5.0"; - "content-disposition" = self.by-version."content-disposition"."0.5.0"; - by-spec."content-type"."~1.0.1" = - self.by-version."content-type"."1.0.1"; - by-version."content-type"."1.0.1" = self.buildNodePackage { - name = "content-type-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; - name = "content-type-1.0.1.tgz"; - sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie"."0.1.2" = - self.by-version."cookie"."0.1.2"; - by-version."cookie"."0.1.2" = self.buildNodePackage { - name = "cookie-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; - name = "cookie-0.1.2.tgz"; - sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie-signature"."1.0.6" = - self.by-version."cookie-signature"."1.0.6"; - by-version."cookie-signature"."1.0.6" = self.buildNodePackage { - name = "cookie-signature-1.0.6"; - version = "1.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - name = "cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookies"."~0.5.0" = - self.by-version."cookies"."0.5.0"; - by-version."cookies"."0.5.0" = self.buildNodePackage { - name = "cookies-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz"; - name = "cookies-0.5.0.tgz"; - sha1 = "164cac46a1d3ca3b3b87427414c24931d8381025"; - }; - deps = { - "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "cookies" = self.by-version."cookies"."0.5.0"; - by-spec."core-util-is"."~1.0.0" = - self.by-version."core-util-is"."1.0.1"; - by-version."core-util-is"."1.0.1" = self.buildNodePackage { - name = "core-util-is-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; - name = "core-util-is-1.0.1.tgz"; - sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."crc"."3.2.1" = - self.by-version."crc"."3.2.1"; - by-version."crc"."3.2.1" = self.buildNodePackage { - name = "crc-3.2.1"; - version = "3.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; - name = "crc-3.2.1.tgz"; - sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cryptiles"."0.2.x" = - self.by-version."cryptiles"."0.2.2"; - by-version."cryptiles"."0.2.2" = self.buildNodePackage { - name = "cryptiles-0.2.2"; - version = "0.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - name = "cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - deps = { - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cryptiles"."2.x.x" = - self.by-version."cryptiles"."2.0.4"; - by-version."cryptiles"."2.0.4" = self.buildNodePackage { - name = "cryptiles-2.0.4"; - version = "2.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz"; - name = "cryptiles-2.0.4.tgz"; - sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285"; - }; - deps = { - "boom-2.8.0" = self.by-version."boom"."2.8.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."css-parse"."1.7.x" = - self.by-version."css-parse"."1.7.0"; - by-version."css-parse"."1.7.0" = self.buildNodePackage { - name = "css-parse-1.7.0"; - version = "1.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; - name = "css-parse-1.7.0.tgz"; - sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ctype"."0.5.3" = - self.by-version."ctype"."0.5.3"; - by-version."ctype"."0.5.3" = self.buildNodePackage { - name = "ctype-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - name = "ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."curlydiff"."~2.0.1" = - self.by-version."curlydiff"."2.0.1"; - by-version."curlydiff"."2.0.1" = self.buildNodePackage { - name = "curlydiff-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/curlydiff/-/curlydiff-2.0.1.tgz"; - name = "curlydiff-2.0.1.tgz"; - sha1 = "6ac4b754ea5b63af2632022d03a152306f7eac0b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "curlydiff" = self.by-version."curlydiff"."2.0.1"; - by-spec."debug"."*" = - self.by-version."debug"."2.2.0"; - by-version."debug"."2.2.0" = self.buildNodePackage { - name = "debug-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - name = "debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - deps = { - "ms-0.7.1" = self.by-version."ms"."0.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."~2.2.0" = - self.by-version."debug"."2.2.0"; - by-spec."deep-equal"."~0.0.0" = - self.by-version."deep-equal"."0.0.0"; - by-version."deep-equal"."0.0.0" = self.buildNodePackage { - name = "deep-equal-0.0.0"; - version = "0.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; - name = "deep-equal-0.0.0.tgz"; - sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."deep-is"."0.1.x" = - self.by-version."deep-is"."0.1.3"; - by-version."deep-is"."0.1.3" = self.buildNodePackage { - name = "deep-is-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - name = "deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delayed-stream"."0.0.5" = - self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = self.buildNodePackage { - name = "delayed-stream-0.0.5"; - version = "0.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delayed-stream"."~1.0.0" = - self.by-version."delayed-stream"."1.0.0"; - by-version."delayed-stream"."1.0.0" = self.buildNodePackage { - name = "delayed-stream-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - name = "delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."depd"."~1.0.1" = - self.by-version."depd"."1.0.1"; - by-version."depd"."1.0.1" = self.buildNodePackage { - name = "depd-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; - name = "depd-1.0.1.tgz"; - sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."destroy"."1.0.3" = - self.by-version."destroy"."1.0.3"; - by-version."destroy"."1.0.3" = self.buildNodePackage { - name = "destroy-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - name = "destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."diacritics"."~1.2.1" = - self.by-version."diacritics"."1.2.1"; - by-version."diacritics"."1.2.1" = self.buildNodePackage { - name = "diacritics-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/diacritics/-/diacritics-1.2.1.tgz"; - name = "diacritics-1.2.1.tgz"; - sha1 = "e4d323a7c564197f7af514c5964bd45d0eb8cf77"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."difflet"."~0.2.0" = - self.by-version."difflet"."0.2.6"; - by-version."difflet"."0.2.6" = self.buildNodePackage { - name = "difflet-0.2.6"; - version = "0.2.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz"; - name = "difflet-0.2.6.tgz"; - sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa"; - }; - deps = { - "traverse-0.6.6" = self.by-version."traverse"."0.6.6"; - "charm-0.1.2" = self.by-version."charm"."0.1.2"; - "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dom-serializer"."0" = - self.by-version."dom-serializer"."0.1.0"; - by-version."dom-serializer"."0.1.0" = self.buildNodePackage { - name = "dom-serializer-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - name = "dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; - }; - deps = { - "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; - "entities-1.1.1" = self.by-version."entities"."1.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dom-serializer"."~0.0.0" = - self.by-version."dom-serializer"."0.0.1"; - by-version."dom-serializer"."0.0.1" = self.buildNodePackage { - name = "dom-serializer-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz"; - name = "dom-serializer-0.0.1.tgz"; - sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf"; - }; - deps = { - "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; - "entities-1.1.1" = self.by-version."entities"."1.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."domelementtype"."1" = - self.by-version."domelementtype"."1.3.0"; - by-version."domelementtype"."1.3.0" = self.buildNodePackage { - name = "domelementtype-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - name = "domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."domelementtype"."~1.1.1" = - self.by-version."domelementtype"."1.1.3"; - by-version."domelementtype"."1.1.3" = self.buildNodePackage { - name = "domelementtype-1.1.3"; - version = "1.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - name = "domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."domhandler"."2.3" = - self.by-version."domhandler"."2.3.0"; - by-version."domhandler"."2.3.0" = self.buildNodePackage { - name = "domhandler-2.3.0"; - version = "2.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; - name = "domhandler-2.3.0.tgz"; - sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; - }; - deps = { - "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."domutils"."1.4" = - self.by-version."domutils"."1.4.3"; - by-version."domutils"."1.4.3" = self.buildNodePackage { - name = "domutils-1.4.3"; - version = "1.4.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; - name = "domutils-1.4.3.tgz"; - sha1 = "0865513796c6b306031850e175516baf80b72a6f"; - }; - deps = { - "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."domutils"."1.5" = - self.by-version."domutils"."1.5.1"; - by-version."domutils"."1.5.1" = self.buildNodePackage { - name = "domutils-1.5.1"; - version = "1.5.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; - name = "domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; - }; - deps = { - "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0"; - "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ee-first"."1.1.0" = - self.by-version."ee-first"."1.1.0"; - by-version."ee-first"."1.1.0" = self.buildNodePackage { - name = "ee-first-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; - name = "ee-first-1.1.0.tgz"; - sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."entities"."1.0" = - self.by-version."entities"."1.0.0"; - by-version."entities"."1.0.0" = self.buildNodePackage { - name = "entities-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; - name = "entities-1.0.0.tgz"; - sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."entities"."~1.1.1" = - self.by-version."entities"."1.1.1"; - by-version."entities"."1.1.1" = self.buildNodePackage { - name = "entities-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - name = "entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-html"."1.0.1" = - self.by-version."escape-html"."1.0.1"; - by-version."escape-html"."1.0.1" = self.buildNodePackage { - name = "escape-html-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; - name = "escape-html-1.0.1.tgz"; - sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-string-regexp"."^1.0.2" = - self.by-version."escape-string-regexp"."1.0.3"; - by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage { - name = "escape-string-regexp-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"; - name = "escape-string-regexp-1.0.3.tgz"; - sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."etag"."~1.6.0" = - self.by-version."etag"."1.6.0"; - by-version."etag"."1.6.0" = self.buildNodePackage { - name = "etag-1.6.0"; - version = "1.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz"; - name = "etag-1.6.0.tgz"; - sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207"; - }; - deps = { - "crc-3.2.1" = self.by-version."crc"."3.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."express"."~4.12.3" = - self.by-version."express"."4.12.4"; - by-version."express"."4.12.4" = self.buildNodePackage { - name = "express-4.12.4"; - version = "4.12.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz"; - name = "express-4.12.4.tgz"; - sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2"; - }; - deps = { - "accepts-1.2.9" = self.by-version."accepts"."1.2.9"; - "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; - "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.6.0" = self.by-version."etag"."1.6.0"; - "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0"; - "methods-1.1.1" = self.by-version."methods"."1.1.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8"; - "qs-2.4.2" = self.by-version."qs"."2.4.2"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.12.3" = self.by-version."send"."0.12.3"; - "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3"; - "type-is-1.6.3" = self.by-version."type-is"."1.6.3"; - "vary-1.0.0" = self.by-version."vary"."1.0.0"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "express" = self.by-version."express"."4.12.4"; - by-spec."fast-future"."~1.0.0" = - self.by-version."fast-future"."1.0.1"; - by-version."fast-future"."1.0.1" = self.buildNodePackage { - name = "fast-future-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fast-future/-/fast-future-1.0.1.tgz"; - name = "fast-future-1.0.1.tgz"; - sha1 = "6cbd22d999ab39cd10fc79392486e7a678716818"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fd-slicer"."~1.0.0" = - self.by-version."fd-slicer"."1.0.1"; - by-version."fd-slicer"."1.0.1" = self.buildNodePackage { - name = "fd-slicer-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; - name = "fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; - }; - deps = { - "pend-1.2.0" = self.by-version."pend"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fd-slicer"."~1.0.1" = - self.by-version."fd-slicer"."1.0.1"; - by-spec."finalhandler"."0.3.6" = - self.by-version."finalhandler"."0.3.6"; - by-version."finalhandler"."0.3.6" = self.buildNodePackage { - name = "finalhandler-0.3.6"; - version = "0.3.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz"; - name = "finalhandler-0.3.6.tgz"; - sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."findit2"."~2.2.3" = - self.by-version."findit2"."2.2.3"; - by-version."findit2"."2.2.3" = self.buildNodePackage { - name = "findit2-2.2.3"; - version = "2.2.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz"; - name = "findit2-2.2.3.tgz"; - sha1 = "58a466697df8a6205cdfdbf395536b8bd777a5f6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "findit2" = self.by-version."findit2"."2.2.3"; - by-spec."forever-agent"."~0.5.0" = - self.by-version."forever-agent"."0.5.2"; - by-version."forever-agent"."0.5.2" = self.buildNodePackage { - name = "forever-agent-0.5.2"; - version = "0.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - name = "forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forever-agent"."~0.6.0" = - self.by-version."forever-agent"."0.6.1"; - by-version."forever-agent"."0.6.1" = self.buildNodePackage { - name = "forever-agent-0.6.1"; - version = "0.6.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - name = "forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."form-data"."~0.2.0" = - self.by-version."form-data"."0.2.0"; - by-version."form-data"."0.2.0" = self.buildNodePackage { - name = "form-data-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz"; - name = "form-data-0.2.0.tgz"; - sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forwarded"."~0.1.0" = - self.by-version."forwarded"."0.1.0"; - by-version."forwarded"."0.1.0" = self.buildNodePackage { - name = "forwarded-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; - name = "forwarded-0.1.0.tgz"; - sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fresh"."0.2.4" = - self.by-version."fresh"."0.2.4"; - by-version."fresh"."0.2.4" = self.buildNodePackage { - name = "fresh-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; - name = "fresh-0.2.4.tgz"; - sha1 = "3582499206c9723714190edd74b4604feb4a614c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."gapitoken"."~0.1.2" = - self.by-version."gapitoken"."0.1.4"; - by-version."gapitoken"."0.1.4" = self.buildNodePackage { - name = "gapitoken-0.1.4"; - version = "0.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.4.tgz"; - name = "gapitoken-0.1.4.tgz"; - sha1 = "643dedb26cb142466f62b73d2782e7822a6f1ad8"; - }; - deps = { - "jws-0.0.2" = self.by-version."jws"."0.0.2"; - "request-2.57.0" = self.by-version."request"."2.57.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."generate-function"."^2.0.0" = - self.by-version."generate-function"."2.0.0"; - by-version."generate-function"."2.0.0" = self.buildNodePackage { - name = "generate-function-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - name = "generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."generate-object-property"."^1.1.0" = - self.by-version."generate-object-property"."1.2.0"; - by-version."generate-object-property"."1.2.0" = self.buildNodePackage { - name = "generate-object-property-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - name = "generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - deps = { - "is-property-1.0.2" = self.by-version."is-property"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."get-stdin"."^4.0.1" = - self.by-version."get-stdin"."4.0.1"; - by-version."get-stdin"."4.0.1" = self.buildNodePackage { - name = "get-stdin-4.0.1"; - version = "4.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - name = "get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."glob"."3.2.x" = - self.by-version."glob"."3.2.11"; - by-version."glob"."3.2.11" = self.buildNodePackage { - name = "glob-3.2.11"; - version = "3.2.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; - name = "glob-3.2.11.tgz"; - sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."google-auth-library"."~0.9.3" = - self.by-version."google-auth-library"."0.9.6"; - by-version."google-auth-library"."0.9.6" = self.buildNodePackage { - name = "google-auth-library-0.9.6"; - version = "0.9.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/google-auth-library/-/google-auth-library-0.9.6.tgz"; - name = "google-auth-library-0.9.6.tgz"; - sha1 = "57aa09f2621d6eafe8852b0167c9100759a67220"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "gtoken-1.1.1" = self.by-version."gtoken"."1.1.1"; - "lodash.noop-3.0.0" = self.by-version."lodash.noop"."3.0.0"; - "jws-3.0.0" = self.by-version."jws"."3.0.0"; - "request-2.51.0" = self.by-version."request"."2.51.0"; - "string-template-0.2.1" = self.by-version."string-template"."0.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."google-p12-pem"."^0.0.1" = - self.by-version."google-p12-pem"."0.0.1"; - by-version."google-p12-pem"."0.0.1" = self.buildNodePackage { - name = "google-p12-pem-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.0.1.tgz"; - name = "google-p12-pem-0.0.1.tgz"; - sha1 = "965638d464f13b4a866356a5ba047163ec0b08b7"; - }; - deps = { - "node-forge-0.6.16" = self.by-version."node-forge"."0.6.16"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."googleapis"."~2.0.3" = - self.by-version."googleapis"."2.0.5"; - by-version."googleapis"."2.0.5" = self.buildNodePackage { - name = "googleapis-2.0.5"; - version = "2.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/googleapis/-/googleapis-2.0.5.tgz"; - name = "googleapis-2.0.5.tgz"; - sha1 = "fb2d678f97152eb0a336da84bbc1eeb16a9c8310"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4"; - "google-auth-library-0.9.6" = self.by-version."google-auth-library"."0.9.6"; - "request-2.54.0" = self.by-version."request"."2.54.0"; - "string-template-0.2.1" = self.by-version."string-template"."0.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "googleapis" = self.by-version."googleapis"."2.0.5"; - by-spec."graceful-readlink".">= 1.0.0" = - self.by-version."graceful-readlink"."1.0.1"; - by-version."graceful-readlink"."1.0.1" = self.buildNodePackage { - name = "graceful-readlink-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - name = "graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."groove"."~2.3.3" = - self.by-version."groove"."2.3.4"; - by-version."groove"."2.3.4" = self.buildNodePackage { - name = "groove-2.3.4"; - version = "2.3.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/groove/-/groove-2.3.4.tgz"; - name = "groove-2.3.4.tgz"; - sha1 = "bbfb8e40584c5921f6df9d52d4017f2acb0a7e45"; - }; - deps = { - "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-1.8.4" = self.by-version."nan"."1.8.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "groove" = self.by-version."groove"."2.3.4"; - by-spec."gtoken"."^1.1.0" = - self.by-version."gtoken"."1.1.1"; - by-version."gtoken"."1.1.1" = self.buildNodePackage { - name = "gtoken-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/gtoken/-/gtoken-1.1.1.tgz"; - name = "gtoken-1.1.1.tgz"; - sha1 = "969af828d1f7efea32a500ea09b0edfa8e0c438a"; - }; - deps = { - "google-p12-pem-0.0.1" = self.by-version."google-p12-pem"."0.0.1"; - "jws-3.0.0" = self.by-version."jws"."3.0.0"; - "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "request-2.57.0" = self.by-version."request"."2.57.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."har-validator"."^1.4.0" = - self.by-version."har-validator"."1.7.1"; - by-version."har-validator"."1.7.1" = self.buildNodePackage { - name = "har-validator-1.7.1"; - version = "1.7.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz"; - name = "har-validator-1.7.1.tgz"; - sha1 = "8ec8952f8287d21b451ba3e36f27ed8d997d8a95"; - }; - deps = { - "bluebird-2.9.30" = self.by-version."bluebird"."2.9.30"; - "chalk-1.0.0" = self.by-version."chalk"."1.0.0"; - "commander-2.8.1" = self.by-version."commander"."2.8.1"; - "is-my-json-valid-2.12.0" = self.by-version."is-my-json-valid"."2.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."har-validator"."^1.6.1" = - self.by-version."har-validator"."1.7.1"; - by-spec."has-ansi"."^1.0.3" = - self.by-version."has-ansi"."1.0.3"; - by-version."has-ansi"."1.0.3" = self.buildNodePackage { - name = "has-ansi-1.0.3"; - version = "1.0.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz"; - name = "has-ansi-1.0.3.tgz"; - sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538"; - }; - deps = { - "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; - "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hawk"."1.1.1" = - self.by-version."hawk"."1.1.1"; - by-version."hawk"."1.1.1" = self.buildNodePackage { - name = "hawk-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - name = "hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; - "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hawk"."~2.3.0" = - self.by-version."hawk"."2.3.1"; - by-version."hawk"."2.3.1" = self.buildNodePackage { - name = "hawk-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz"; - name = "hawk-2.3.1.tgz"; - sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f"; - }; - deps = { - "hoek-2.14.0" = self.by-version."hoek"."2.14.0"; - "boom-2.8.0" = self.by-version."boom"."2.8.0"; - "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4"; - "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hoek"."0.9.x" = - self.by-version."hoek"."0.9.1"; - by-version."hoek"."0.9.1" = self.buildNodePackage { - name = "hoek-0.9.1"; - version = "0.9.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - name = "hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hoek"."2.x.x" = - self.by-version."hoek"."2.14.0"; - by-version."hoek"."2.14.0" = self.buildNodePackage { - name = "hoek-2.14.0"; - version = "2.14.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"; - name = "hoek-2.14.0.tgz"; - sha1 = "81211691f52a5a835ae49edbf1e89c9003476aa4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."htmlparser2"."~3.8.1" = - self.by-version."htmlparser2"."3.8.3"; - by-version."htmlparser2"."3.8.3" = self.buildNodePackage { - name = "htmlparser2-3.8.3"; - version = "3.8.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; - name = "htmlparser2-3.8.3.tgz"; - sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; - }; - deps = { - "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0"; - "domutils-1.5.1" = self.by-version."domutils"."1.5.1"; - "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - "entities-1.0.0" = self.by-version."entities"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.1"; - by-version."http-signature"."0.10.1" = self.buildNodePackage { - name = "http-signature-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - name = "http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - deps = { - "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."http-signature"."~0.11.0" = - self.by-version."http-signature"."0.11.0"; - by-version."http-signature"."0.11.0" = self.buildNodePackage { - name = "http-signature-0.11.0"; - version = "0.11.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"; - name = "http-signature-0.11.0.tgz"; - sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6"; - }; - deps = { - "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."httpolyglot"."~0.1.1" = - self.by-version."httpolyglot"."0.1.1"; - by-version."httpolyglot"."0.1.1" = self.buildNodePackage { - name = "httpolyglot-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.1.tgz"; - name = "httpolyglot-0.1.1.tgz"; - sha1 = "cd0f5c995cbb95dde325d16a7537f90c0048e53d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "httpolyglot" = self.by-version."httpolyglot"."0.1.1"; - by-spec."human-size"."~1.1.0" = - self.by-version."human-size"."1.1.0"; - by-version."human-size"."1.1.0" = self.buildNodePackage { - name = "human-size-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/human-size/-/human-size-1.1.0.tgz"; - name = "human-size-1.1.0.tgz"; - sha1 = "052562be999841c037022c20259990c56ea996f9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "human-size" = self.by-version."human-size"."1.1.0"; - by-spec."indent-string"."^1.1.0" = - self.by-version."indent-string"."1.2.1"; - by-version."indent-string"."1.2.1" = self.buildNodePackage { - name = "indent-string-1.2.1"; - version = "1.2.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz"; - name = "indent-string-1.2.1.tgz"; - sha1 = "294c5930792f8bb5b14462a4aa425b94f07d3a56"; - }; - deps = { - "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; - "minimist-1.1.1" = self.by-version."minimist"."1.1.1"; - "repeating-1.1.3" = self.by-version."repeating"."1.1.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."*" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = self.buildNodePackage { - name = "inherits-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."2" = - self.by-version."inherits"."2.0.1"; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - by-spec."ipaddr.js"."1.0.1" = - self.by-version."ipaddr.js"."1.0.1"; - by-version."ipaddr.js"."1.0.1" = self.buildNodePackage { - name = "ipaddr.js-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz"; - name = "ipaddr.js-1.0.1.tgz"; - sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-finite"."^1.0.0" = - self.by-version."is-finite"."1.0.1"; - by-version."is-finite"."1.0.1" = self.buildNodePackage { - name = "is-finite-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - name = "is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; - }; - deps = { - "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-my-json-valid"."^2.12.0" = - self.by-version."is-my-json-valid"."2.12.0"; - by-version."is-my-json-valid"."2.12.0" = self.buildNodePackage { - name = "is-my-json-valid-2.12.0"; - version = "2.12.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz"; - name = "is-my-json-valid-2.12.0.tgz"; - sha1 = "8fa6c408b26be95b45a23e8f8c4b464a53874d2b"; - }; - deps = { - "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0"; - "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0"; - "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0"; - "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-property"."^1.0.0" = - self.by-version."is-property"."1.0.2"; - by-version."is-property"."1.0.2" = self.buildNodePackage { - name = "is-property-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - name = "is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isstream"."~0.1.1" = - self.by-version."isstream"."0.1.2"; - by-version."isstream"."0.1.2" = self.buildNodePackage { - name = "isstream-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - name = "isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json-stringify-safe"."~5.0.0" = - self.by-version."json-stringify-safe"."5.0.1"; - by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage { - name = "json-stringify-safe-5.0.1"; - version = "5.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - name = "json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jsonpointer"."^1.1.0" = - self.by-version."jsonpointer"."1.1.0"; - by-version."jsonpointer"."1.1.0" = self.buildNodePackage { - name = "jsonpointer-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz"; - name = "jsonpointer-1.1.0.tgz"; - sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jstream"."~0.2.7" = - self.by-version."jstream"."0.2.7"; - by-version."jstream"."0.2.7" = self.buildNodePackage { - name = "jstream-0.2.7"; - version = "0.2.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jstream/-/jstream-0.2.7.tgz"; - name = "jstream-0.2.7.tgz"; - sha1 = "55f06cd6d4204caeac4907a5de1b90aabf4d60da"; - }; - deps = { - "clarinet-0.8.1" = self.by-version."clarinet"."0.8.1"; - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jwa"."~1.0.0" = - self.by-version."jwa"."1.0.0"; - by-version."jwa"."1.0.0" = self.buildNodePackage { - name = "jwa-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jwa/-/jwa-1.0.0.tgz"; - name = "jwa-1.0.0.tgz"; - sha1 = "040b64fb582171a65f3368e96837ea4dcf42f3d8"; - }; - deps = { - "base64url-0.0.6" = self.by-version."base64url"."0.0.6"; - "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jws"."0.0.2" = - self.by-version."jws"."0.0.2"; - by-version."jws"."0.0.2" = self.buildNodePackage { - name = "jws-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jws/-/jws-0.0.2.tgz"; - name = "jws-0.0.2.tgz"; - sha1 = "8c6916977183cce3361da48c8c2e0c606e7a95c6"; - }; - deps = { - "tap-0.3.3" = self.by-version."tap"."0.3.3"; - "base64url-0.0.3" = self.by-version."base64url"."0.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jws"."^3.0.0" = - self.by-version."jws"."3.0.0"; - by-version."jws"."3.0.0" = self.buildNodePackage { - name = "jws-3.0.0"; - version = "3.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jws/-/jws-3.0.0.tgz"; - name = "jws-3.0.0.tgz"; - sha1 = "da5f267897dd4e9cf8137979db33fc54a3c05418"; - }; - deps = { - "jwa-1.0.0" = self.by-version."jwa"."1.0.0"; - "base64url-1.0.4" = self.by-version."base64url"."1.0.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jws"."~3.0.0" = - self.by-version."jws"."3.0.0"; - by-spec."keese"."~1.1.1" = - self.by-version."keese"."1.1.1"; - by-version."keese"."1.1.1" = self.buildNodePackage { - name = "keese-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/keese/-/keese-1.1.1.tgz"; - name = "keese-1.1.1.tgz"; - sha1 = "69a1f971e64ee5d2094af002f6d92fa806250842"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "keese" = self.by-version."keese"."1.1.1"; - by-spec."keygrip"."~1.0.0" = - self.by-version."keygrip"."1.0.1"; - by-version."keygrip"."1.0.1" = self.buildNodePackage { - name = "keygrip-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz"; - name = "keygrip-1.0.1.tgz"; - sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lastfm"."~0.9.2" = - self.by-version."lastfm"."0.9.2"; - by-version."lastfm"."0.9.2" = self.buildNodePackage { - name = "lastfm-0.9.2"; - version = "0.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lastfm/-/lastfm-0.9.2.tgz"; - name = "lastfm-0.9.2.tgz"; - sha1 = "d00ca2e3b30eb484e510792875525900e4d77d88"; - }; - deps = { - "underscore-1.6.0" = self.by-version."underscore"."1.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "lastfm" = self.by-version."lastfm"."0.9.2"; - by-spec."leveldown"."~1.0.6" = - self.by-version."leveldown"."1.0.7"; - by-version."leveldown"."1.0.7" = self.buildNodePackage { - name = "leveldown-1.0.7"; - version = "1.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/leveldown/-/leveldown-1.0.7.tgz"; - name = "leveldown-1.0.7.tgz"; - sha1 = "39bbe95f92ce09992ec12de47ade5167be2b6874"; - }; - deps = { - "abstract-leveldown-2.2.2" = self.by-version."abstract-leveldown"."2.2.2"; - "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "fast-future-1.0.1" = self.by-version."fast-future"."1.0.1"; - "nan-1.8.4" = self.by-version."nan"."1.8.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "leveldown" = self.by-version."leveldown"."1.0.7"; - by-spec."lodash"."~2.4.1" = - self.by-version."lodash"."2.4.2"; - by-version."lodash"."2.4.2" = self.buildNodePackage { - name = "lodash-2.4.2"; - version = "2.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - name = "lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash.noop"."~3.0.0" = - self.by-version."lodash.noop"."3.0.0"; - by-version."lodash.noop"."3.0.0" = self.buildNodePackage { - name = "lodash.noop-3.0.0"; - version = "3.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.0.tgz"; - name = "lodash.noop-3.0.0.tgz"; - sha1 = "f383ca8dba97d8f217e49afcd2b824db9e5e8d68"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.6.4"; - by-version."lru-cache"."2.6.4" = self.buildNodePackage { - name = "lru-cache-2.6.4"; - version = "2.6.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"; - name = "lru-cache-2.6.4.tgz"; - sha1 = "2675190ccd1b0701ec2f652a4d0d3d400d76c0dd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."map-obj"."^1.0.0" = - self.by-version."map-obj"."1.0.1"; - by-version."map-obj"."1.0.1" = self.buildNodePackage { - name = "map-obj-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - name = "map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."media-typer"."0.3.0" = - self.by-version."media-typer"."0.3.0"; - by-version."media-typer"."0.3.0" = self.buildNodePackage { - name = "media-typer-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - name = "media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."meow"."~2.0.0" = - self.by-version."meow"."2.0.0"; - by-version."meow"."2.0.0" = self.buildNodePackage { - name = "meow-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/meow/-/meow-2.0.0.tgz"; - name = "meow-2.0.0.tgz"; - sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; - }; - deps = { - "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0"; - "indent-string-1.2.1" = self.by-version."indent-string"."1.2.1"; - "minimist-1.1.1" = self.by-version."minimist"."1.1.1"; - "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."merge-descriptors"."1.0.0" = - self.by-version."merge-descriptors"."1.0.0"; - by-version."merge-descriptors"."1.0.0" = self.buildNodePackage { - name = "merge-descriptors-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; - name = "merge-descriptors-1.0.0.tgz"; - sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mess"."~0.1.2" = - self.by-version."mess"."0.1.2"; - by-version."mess"."0.1.2" = self.buildNodePackage { - name = "mess-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mess/-/mess-0.1.2.tgz"; - name = "mess-0.1.2.tgz"; - sha1 = "2c81a424efc87a69ad11f1c7129d1f6f6353b9c0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "mess" = self.by-version."mess"."0.1.2"; - by-spec."methods"."~1.1.1" = - self.by-version."methods"."1.1.1"; - by-version."methods"."1.1.1" = self.buildNodePackage { - name = "methods-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; - name = "methods-1.1.1.tgz"; - sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."1.3.4" = - self.by-version."mime"."1.3.4"; - by-version."mime"."1.3.4" = self.buildNodePackage { - name = "mime-1.3.4"; - version = "1.3.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - name = "mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."^1.2.11" = - self.by-version."mime"."1.3.4"; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = self.buildNodePackage { - name = "mime-1.2.11"; - version = "1.2.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.12.0" = - self.by-version."mime-db"."1.12.0"; - by-version."mime-db"."1.12.0" = self.buildNodePackage { - name = "mime-db-1.12.0"; - version = "1.12.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - name = "mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.13.0" = - self.by-version."mime-db"."1.13.0"; - by-version."mime-db"."1.13.0" = self.buildNodePackage { - name = "mime-db-1.13.0"; - version = "1.13.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz"; - name = "mime-db-1.13.0.tgz"; - sha1 = "fd6808168fe30835e7ea2205fc981d3b633e4e34"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~1.0.1" = - self.by-version."mime-types"."1.0.2"; - by-version."mime-types"."1.0.2" = self.buildNodePackage { - name = "mime-types-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - name = "mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.1" = - self.by-version."mime-types"."2.0.14"; - by-version."mime-types"."2.0.14" = self.buildNodePackage { - name = "mime-types-2.0.14"; - version = "2.0.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - name = "mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - deps = { - "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.3" = - self.by-version."mime-types"."2.0.14"; - by-spec."mime-types"."~2.1.1" = - self.by-version."mime-types"."2.1.1"; - by-version."mime-types"."2.1.1" = self.buildNodePackage { - name = "mime-types-2.1.1"; - version = "2.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.1.tgz"; - name = "mime-types-2.1.1.tgz"; - sha1 = "c7b692796d5166f4826d10b4675c8a916657d04e"; - }; - deps = { - "mime-db-1.13.0" = self.by-version."mime-db"."1.13.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimatch"."0.3" = - self.by-version."minimatch"."0.3.0"; - by-version."minimatch"."0.3.0" = self.buildNodePackage { - name = "minimatch-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; - name = "minimatch-0.3.0.tgz"; - sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; - }; - deps = { - "lru-cache-2.6.4" = self.by-version."lru-cache"."2.6.4"; - "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."0.0.8" = - self.by-version."minimist"."0.0.8"; - by-version."minimist"."0.0.8" = self.buildNodePackage { - name = "minimist-0.0.8"; - version = "0.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - name = "minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."^1.1.0" = - self.by-version."minimist"."1.1.1"; - by-version."minimist"."1.1.1" = self.buildNodePackage { - name = "minimist-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"; - name = "minimist-1.1.1.tgz"; - sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."0.3.x" = - self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = self.buildNodePackage { - name = "mkdirp-0.3.5"; - version = "0.3.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."~0.3" = - self.by-version."mkdirp"."0.3.5"; - by-spec."mkdirp"."~0.5.0" = - self.by-version."mkdirp"."0.5.1"; - by-version."mkdirp"."0.5.1" = self.buildNodePackage { - name = "mkdirp-0.5.1"; - version = "0.5.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - name = "mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - deps = { - "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."~0.5.1" = - self.by-version."mkdirp"."0.5.1"; - "mkdirp" = self.by-version."mkdirp"."0.5.1"; - by-spec."ms"."0.7.1" = - self.by-version."ms"."0.7.1"; - by-version."ms"."0.7.1" = self.buildNodePackage { - name = "ms-0.7.1"; - version = "0.7.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - name = "ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."multiparty"."~4.1.2" = - self.by-version."multiparty"."4.1.2"; - by-version."multiparty"."4.1.2" = self.buildNodePackage { - name = "multiparty-4.1.2"; - version = "4.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/multiparty/-/multiparty-4.1.2.tgz"; - name = "multiparty-4.1.2.tgz"; - sha1 = "54f8ec9712052fa1dfd8ec975056c8230d6f2370"; - }; - deps = { - "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "multiparty" = self.by-version."multiparty"."4.1.2"; - by-spec."music-library-index"."~1.3.0" = - self.by-version."music-library-index"."1.3.0"; - by-version."music-library-index"."1.3.0" = self.buildNodePackage { - name = "music-library-index-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/music-library-index/-/music-library-index-1.3.0.tgz"; - name = "music-library-index-1.3.0.tgz"; - sha1 = "f7dbf6f7df5a0c8c50382542183872aedc5cb86a"; - }; - deps = { - "diacritics-1.2.1" = self.by-version."diacritics"."1.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "music-library-index" = self.by-version."music-library-index"."1.3.0"; - by-spec."mv"."~2.0.3" = - self.by-version."mv"."2.0.3"; - by-version."mv"."2.0.3" = self.buildNodePackage { - name = "mv-2.0.3"; - version = "2.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz"; - name = "mv-2.0.3.tgz"; - sha1 = "e9ab707d71dc38de24edcc637a8e2f5f480c7f32"; - }; - deps = { - "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; - "ncp-0.6.0" = self.by-version."ncp"."0.6.0"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "mv" = self.by-version."mv"."2.0.3"; - by-spec."nan"."~1.8.4" = - self.by-version."nan"."1.8.4"; - by-version."nan"."1.8.4" = self.buildNodePackage { - name = "nan-1.8.4"; - version = "1.8.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz"; - name = "nan-1.8.4.tgz"; - sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ncp"."~0.6.0" = - self.by-version."ncp"."0.6.0"; - by-version."ncp"."0.6.0" = self.buildNodePackage { - name = "ncp-0.6.0"; - version = "0.6.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"; - name = "ncp-0.6.0.tgz"; - sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."negotiator"."0.5.3" = - self.by-version."negotiator"."0.5.3"; - by-version."negotiator"."0.5.3" = self.buildNodePackage { - name = "negotiator-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; - name = "negotiator-0.5.3.tgz"; - sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-forge"."0.6.16" = - self.by-version."node-forge"."0.6.16"; - by-version."node-forge"."0.6.16" = self.buildNodePackage { - name = "node-forge-0.6.16"; - version = "0.6.16"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-forge/-/node-forge-0.6.16.tgz"; - name = "node-forge-0.6.16.tgz"; - sha1 = "aae85babf97034d46f1b74a39bfe5891282ae842"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.3"; - by-version."node-uuid"."1.4.3" = self.buildNodePackage { - name = "node-uuid-1.4.3"; - version = "1.4.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; - name = "node-uuid-1.4.3.tgz"; - sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nopt"."~2" = - self.by-version."nopt"."2.2.1"; - by-version."nopt"."2.2.1" = self.buildNodePackage { - name = "nopt-2.2.1"; - version = "2.2.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; - name = "nopt-2.2.1.tgz"; - sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; - }; - deps = { - "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."number-is-nan"."^1.0.0" = - self.by-version."number-is-nan"."1.0.0"; - by-version."number-is-nan"."1.0.0" = self.buildNodePackage { - name = "number-is-nan-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - name = "number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-sign"."~0.5.0" = - self.by-version."oauth-sign"."0.5.0"; - by-version."oauth-sign"."0.5.0" = self.buildNodePackage { - name = "oauth-sign-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"; - name = "oauth-sign-0.5.0.tgz"; - sha1 = "d767f5169325620eab2e087ef0c472e773db6461"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-sign"."~0.6.0" = - self.by-version."oauth-sign"."0.6.0"; - by-version."oauth-sign"."0.6.0" = self.buildNodePackage { - name = "oauth-sign-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"; - name = "oauth-sign-0.6.0.tgz"; - sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-sign"."~0.8.0" = - self.by-version."oauth-sign"."0.8.0"; - by-version."oauth-sign"."0.8.0" = self.buildNodePackage { - name = "oauth-sign-0.8.0"; - version = "0.8.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"; - name = "oauth-sign-0.8.0.tgz"; - sha1 = "938fdc875765ba527137d8aec9d178e24debc553"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."object-assign"."^1.0.0" = - self.by-version."object-assign"."1.0.0"; - by-version."object-assign"."1.0.0" = self.buildNodePackage { - name = "object-assign-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; - name = "object-assign-1.0.0.tgz"; - sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."on-finished"."~2.2.1" = - self.by-version."on-finished"."2.2.1"; - by-version."on-finished"."2.2.1" = self.buildNodePackage { - name = "on-finished-2.2.1"; - version = "2.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; - name = "on-finished-2.2.1.tgz"; - sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; - }; - deps = { - "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."os-tmpdir"."^1.0.0" = - self.by-version."os-tmpdir"."1.0.1"; - by-version."os-tmpdir"."1.0.1" = self.buildNodePackage { - name = "os-tmpdir-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"; - name = "os-tmpdir-1.0.1.tgz"; - sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."osenv"."~0.1.0" = - self.by-version."osenv"."0.1.2"; - by-version."osenv"."0.1.2" = self.buildNodePackage { - name = "osenv-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/osenv/-/osenv-0.1.2.tgz"; - name = "osenv-0.1.2.tgz"; - sha1 = "f4d23ebeceaef078600fb78c0ea58fac5996a02d"; - }; - deps = { - "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "osenv" = self.by-version."osenv"."0.1.2"; - by-spec."parseurl"."~1.3.0" = - self.by-version."parseurl"."1.3.0"; - by-version."parseurl"."1.3.0" = self.buildNodePackage { - name = "parseurl-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; - name = "parseurl-1.3.0.tgz"; - sha1 = "b58046db4223e145afa76009e61bac87cc2281b3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."path-to-regexp"."0.1.3" = - self.by-version."path-to-regexp"."0.1.3"; - by-version."path-to-regexp"."0.1.3" = self.buildNodePackage { - name = "path-to-regexp-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; - name = "path-to-regexp-0.1.3.tgz"; - sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pend"."~1.2.0" = - self.by-version."pend"."1.2.0"; - by-version."pend"."1.2.0" = self.buildNodePackage { - name = "pend-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; - name = "pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "pend" = self.by-version."pend"."1.2.0"; - by-spec."proxy-addr"."~1.0.8" = - self.by-version."proxy-addr"."1.0.8"; - by-version."proxy-addr"."1.0.8" = self.buildNodePackage { - name = "proxy-addr-1.0.8"; - version = "1.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz"; - name = "proxy-addr-1.0.8.tgz"; - sha1 = "db54ec878bcc1053d57646609219b3715678bafe"; - }; - deps = { - "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; - "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."2.4.2" = - self.by-version."qs"."2.4.2"; - by-version."qs"."2.4.2" = self.buildNodePackage { - name = "qs-2.4.2"; - version = "2.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; - name = "qs-2.4.2.tgz"; - sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."~2.3.1" = - self.by-version."qs"."2.3.3"; - by-version."qs"."2.3.3" = self.buildNodePackage { - name = "qs-2.3.3"; - version = "2.3.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; - name = "qs-2.3.3.tgz"; - sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."~2.4.0" = - self.by-version."qs"."2.4.2"; - by-spec."qs"."~3.1.0" = - self.by-version."qs"."3.1.0"; - by-version."qs"."3.1.0" = self.buildNodePackage { - name = "qs-3.1.0"; - version = "3.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-3.1.0.tgz"; - name = "qs-3.1.0.tgz"; - sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."range-parser"."~1.0.2" = - self.by-version."range-parser"."1.0.2"; - by-version."range-parser"."1.0.2" = self.buildNodePackage { - name = "range-parser-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; - name = "range-parser-1.0.2.tgz"; - sha1 = "06a12a42e5131ba8e457cd892044867f2344e549"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."1.1" = - self.by-version."readable-stream"."1.1.13"; - by-version."readable-stream"."1.1.13" = self.buildNodePackage { - name = "readable-stream-1.1.13"; - version = "1.1.13"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; - name = "readable-stream-1.1.13.tgz"; - sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; - }; - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."~1.0.26" = - self.by-version."readable-stream"."1.0.33"; - by-version."readable-stream"."1.0.33" = self.buildNodePackage { - name = "readable-stream-1.0.33"; - version = "1.0.33"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; - name = "readable-stream-1.0.33.tgz"; - sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; - }; - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."~1.1.9" = - self.by-version."readable-stream"."1.1.13"; - by-spec."repeating"."^1.1.0" = - self.by-version."repeating"."1.1.3"; - by-version."repeating"."1.1.3" = self.buildNodePackage { - name = "repeating-1.1.3"; - version = "1.1.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - name = "repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; - }; - deps = { - "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."^2.37.0" = - self.by-version."request"."2.57.0"; - by-version."request"."2.57.0" = self.buildNodePackage { - name = "request-2.57.0"; - version = "2.57.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.57.0.tgz"; - name = "request-2.57.0.tgz"; - sha1 = "d445105a42d009b9d724289633b449a6d723d989"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.10.0" = self.by-version."caseless"."0.10.0"; - "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; - "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; - "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "qs-3.1.0" = self.by-version."qs"."3.1.0"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0"; - "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0"; - "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0"; - "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."^2.54.0" = - self.by-version."request"."2.57.0"; - by-spec."request"."^2.55.0" = - self.by-version."request"."2.57.0"; - by-spec."request"."~2.51.0" = - self.by-version."request"."2.51.0"; - by-version."request"."2.51.0" = self.buildNodePackage { - name = "request-2.51.0"; - version = "2.51.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz"; - name = "request-2.51.0.tgz"; - sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.8.0" = self.by-version."caseless"."0.8.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; - "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0"; - "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0"; - "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."~2.54.0" = - self.by-version."request"."2.54.0"; - by-version."request"."2.54.0" = self.buildNodePackage { - name = "request-2.54.0"; - version = "2.54.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.54.0.tgz"; - name = "request-2.54.0.tgz"; - sha1 = "a13917cd8e8fa73332da0bf2f84a30181def1953"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.9.0" = self.by-version."caseless"."0.9.0"; - "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; - "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; - "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "qs-2.4.2" = self.by-version."qs"."2.4.2"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0"; - "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; - "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."rimraf"."~2.2.8" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = self.buildNodePackage { - name = "rimraf-2.2.8"; - version = "2.2.8"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."runforcover"."~0.0.2" = - self.by-version."runforcover"."0.0.2"; - by-version."runforcover"."0.0.2" = self.buildNodePackage { - name = "runforcover-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz"; - name = "runforcover-0.0.2.tgz"; - sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc"; - }; - deps = { - "bunker-0.1.2" = self.by-version."bunker"."0.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sax"."0.5.x" = - self.by-version."sax"."0.5.8"; - by-version."sax"."0.5.8" = self.buildNodePackage { - name = "sax-0.5.8"; - version = "0.5.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; - name = "sax-0.5.8.tgz"; - sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."semver"."~4.3.4" = - self.by-version."semver"."4.3.6"; - by-version."semver"."4.3.6" = self.buildNodePackage { - name = "semver-4.3.6"; - version = "4.3.6"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; - name = "semver-4.3.6.tgz"; - sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "semver" = self.by-version."semver"."4.3.6"; - by-spec."send"."0.12.3" = - self.by-version."send"."0.12.3"; - by-version."send"."0.12.3" = self.buildNodePackage { - name = "send-0.12.3"; - version = "0.12.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz"; - name = "send-0.12.3.tgz"; - sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.6.0" = self.by-version."etag"."1.6.0"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "ms-0.7.1" = self.by-version."ms"."0.7.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."serve-static"."~1.9.3" = - self.by-version."serve-static"."1.9.3"; - by-version."serve-static"."1.9.3" = self.buildNodePackage { - name = "serve-static-1.9.3"; - version = "1.9.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz"; - name = "serve-static-1.9.3.tgz"; - sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57"; - }; - deps = { - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "send-0.12.3" = self.by-version."send"."0.12.3"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "serve-static" = self.by-version."serve-static"."1.9.3"; - by-spec."sigmund"."~1.0.0" = - self.by-version."sigmund"."1.0.1"; - by-version."sigmund"."1.0.1" = self.buildNodePackage { - name = "sigmund-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - name = "sigmund-1.0.1.tgz"; - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."slide"."*" = - self.by-version."slide"."1.1.6"; - by-version."slide"."1.1.6" = self.buildNodePackage { - name = "slide-1.1.6"; - version = "1.1.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - name = "slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sntp"."0.2.x" = - self.by-version."sntp"."0.2.4"; - by-version."sntp"."0.2.4" = self.buildNodePackage { - name = "sntp-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - name = "sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sntp"."1.x.x" = - self.by-version."sntp"."1.0.9"; - by-version."sntp"."1.0.9" = self.buildNodePackage { - name = "sntp-1.0.9"; - version = "1.0.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - name = "sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - deps = { - "hoek-2.14.0" = self.by-version."hoek"."2.14.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."source-map"."0.1.x" = - self.by-version."source-map"."0.1.43"; - by-version."source-map"."0.1.43" = self.buildNodePackage { - name = "source-map-0.1.43"; - version = "0.1.43"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - name = "source-map-0.1.43.tgz"; - sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; - }; - deps = { - "amdefine-0.1.1" = self.by-version."amdefine"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."streamsink"."~1.2.0" = - self.by-version."streamsink"."1.2.0"; - by-version."streamsink"."1.2.0" = self.buildNodePackage { - name = "streamsink-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz"; - name = "streamsink-1.2.0.tgz"; - sha1 = "efafee9f1e22d3591ed7de3dcaa95c3f5e79f73c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string-template"."~0.2.0" = - self.by-version."string-template"."0.2.1"; - by-version."string-template"."0.2.1" = self.buildNodePackage { - name = "string-template-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"; - name = "string-template-0.2.1.tgz"; - sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string_decoder"."~0.10.x" = - self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = self.buildNodePackage { - name = "string_decoder-0.10.31"; - version = "0.10.31"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stringstream"."~0.0.4" = - self.by-version."stringstream"."0.0.4"; - by-version."stringstream"."0.0.4" = self.buildNodePackage { - name = "stringstream-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"; - name = "stringstream-0.0.4.tgz"; - sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."strip-ansi"."^2.0.1" = - self.by-version."strip-ansi"."2.0.1"; - by-version."strip-ansi"."2.0.1" = self.buildNodePackage { - name = "strip-ansi-2.0.1"; - version = "2.0.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; - name = "strip-ansi-2.0.1.tgz"; - sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"; - }; - deps = { - "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stylus"."~0.49.3" = - self.by-version."stylus"."0.49.3"; - by-version."stylus"."0.49.3" = self.buildNodePackage { - name = "stylus-0.49.3"; - version = "0.49.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz"; - name = "stylus-0.49.3.tgz"; - sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511"; - }; - deps = { - "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "sax-0.5.8" = self.by-version."sax"."0.5.8"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "stylus" = self.by-version."stylus"."0.49.3"; - by-spec."supports-color"."^1.3.0" = - self.by-version."supports-color"."1.3.1"; - by-version."supports-color"."1.3.1" = self.buildNodePackage { - name = "supports-color-1.3.1"; - version = "1.3.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"; - name = "supports-color-1.3.1.tgz"; - sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tap"."~0.3.3" = - self.by-version."tap"."0.3.3"; - by-version."tap"."0.3.3" = self.buildNodePackage { - name = "tap-0.3.3"; - version = "0.3.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/tap/-/tap-0.3.3.tgz"; - name = "tap-0.3.3.tgz"; - sha1 = "c862237af0a213f97fff46594bd1d44eca705d63"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "yamlish-0.0.7" = self.by-version."yamlish"."0.0.7"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2"; - "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "difflet-0.2.6" = self.by-version."difflet"."0.2.6"; - "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0"; - "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."2.0.0"; - by-version."tough-cookie"."2.0.0" = self.buildNodePackage { - name = "tough-cookie-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"; - name = "tough-cookie-2.0.0.tgz"; - sha1 = "41ce08720b35cf90beb044dd2609fb19e928718f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."traverse"."0.6.x" = - self.by-version."traverse"."0.6.6"; - by-version."traverse"."0.6.6" = self.buildNodePackage { - name = "traverse-0.6.6"; - version = "0.6.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; - name = "traverse-0.6.6.tgz"; - sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."traverse"."~0.5.1" = - self.by-version."traverse"."0.5.2"; - by-version."traverse"."0.5.2" = self.buildNodePackage { - name = "traverse-0.5.2"; - version = "0.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz"; - name = "traverse-0.5.2.tgz"; - sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tunnel-agent"."~0.4.0" = - self.by-version."tunnel-agent"."0.4.0"; - by-version."tunnel-agent"."0.4.0" = self.buildNodePackage { - name = "tunnel-agent-0.4.0"; - version = "0.4.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"; - name = "tunnel-agent-0.4.0.tgz"; - sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."type-is"."~1.6.2" = - self.by-version."type-is"."1.6.3"; - by-version."type-is"."1.6.3" = self.buildNodePackage { - name = "type-is-1.6.3"; - version = "1.6.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.6.3.tgz"; - name = "type-is-1.6.3.tgz"; - sha1 = "d87d201777f76dfc526ac202679715d41a28c580"; - }; - deps = { - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."typedarray"."~0.0.5" = - self.by-version."typedarray"."0.0.6"; - by-version."typedarray"."0.0.6" = self.buildNodePackage { - name = "typedarray-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - name = "typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."uglify-js"."~1.1.1" = - self.by-version."uglify-js"."1.1.1"; - by-version."uglify-js"."1.1.1" = self.buildNodePackage { - name = "uglify-js-1.1.1"; - version = "1.1.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz"; - name = "uglify-js-1.1.1.tgz"; - sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."^1.6.0" = - self.by-version."underscore"."1.8.3"; - by-version."underscore"."1.8.3" = self.buildNodePackage { - name = "underscore-1.8.3"; - version = "1.8.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - name = "underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."~1.6.0" = - self.by-version."underscore"."1.6.0"; - by-version."underscore"."1.6.0" = self.buildNodePackage { - name = "underscore-1.6.0"; - version = "1.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - name = "underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utils-merge"."1.0.0" = - self.by-version."utils-merge"."1.0.0"; - by-version."utils-merge"."1.0.0" = self.buildNodePackage { - name = "utils-merge-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - name = "utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."vary"."~1.0.0" = - self.by-version."vary"."1.0.0"; - by-version."vary"."1.0.0" = self.buildNodePackage { - name = "vary-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz"; - name = "vary-1.0.0.tgz"; - sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xtend"."^4.0.0" = - self.by-version."xtend"."4.0.0"; - by-version."xtend"."4.0.0" = self.buildNodePackage { - name = "xtend-4.0.0"; - version = "4.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"; - name = "xtend-4.0.0.tgz"; - sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xtend"."~4.0.0" = - self.by-version."xtend"."4.0.0"; - by-spec."yamlish"."*" = - self.by-version."yamlish"."0.0.7"; - by-version."yamlish"."0.0.7" = self.buildNodePackage { - name = "yamlish-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.7.tgz"; - name = "yamlish-0.0.7.tgz"; - sha1 = "b4af9a1dcc63618873c3d6e451ec3213c39a57fb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."yauzl"."~2.3.0" = - self.by-version."yauzl"."2.3.1"; - by-version."yauzl"."2.3.1" = self.buildNodePackage { - name = "yauzl-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yauzl/-/yauzl-2.3.1.tgz"; - name = "yauzl-2.3.1.tgz"; - sha1 = "6707fe2b6a4dac9445cc429bf04a11c7dedfa36a"; - }; - deps = { - "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1"; - "pend-1.2.0" = self.by-version."pend"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "yauzl" = self.by-version."yauzl"."2.3.1"; - by-spec."yawl"."~1.0.2" = - self.by-version."yawl"."1.0.2"; - by-version."yawl"."1.0.2" = self.buildNodePackage { - name = "yawl-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yawl/-/yawl-1.0.2.tgz"; - name = "yawl-1.0.2.tgz"; - sha1 = "df1301cb50e5bc74cc36d5c1ef9cfbd1f84b408e"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "pend-1.2.0" = self.by-version."pend"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "yawl" = self.by-version."yawl"."1.0.2"; - by-spec."yazl"."~2.2.2" = - self.by-version."yazl"."2.2.2"; - by-version."yazl"."2.2.2" = self.buildNodePackage { - name = "yazl-2.2.2"; - version = "2.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yazl/-/yazl-2.2.2.tgz"; - name = "yazl-2.2.2.tgz"; - sha1 = "60187f4ce6df314e7501c3c0e40bcf1b58fda183"; - }; - deps = { - "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "yazl" = self.by-version."yazl"."2.2.2"; - by-spec."ytdl-core".">=0.5.1" = - self.by-version."ytdl-core"."0.5.1"; - by-version."ytdl-core"."0.5.1" = self.buildNodePackage { - name = "ytdl-core-0.5.1"; - version = "0.5.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ytdl-core/-/ytdl-core-0.5.1.tgz"; - name = "ytdl-core-0.5.1.tgz"; - sha1 = "3c48d696b019d7faae635a3f1e4eaa9131110f43"; - }; - deps = { - "cheerio-0.18.0" = self.by-version."cheerio"."0.18.0"; - "jstream-0.2.7" = self.by-version."jstream"."0.2.7"; - "request-2.57.0" = self.by-version."request"."2.57.0"; - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "ytdl-core" = self.by-version."ytdl-core"."0.5.1"; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a66bf5b53c9..efdf05fdad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11551,8 +11551,6 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; - groovebasin = callPackage ../applications/audio/groovebasin { nodejs = nodejs-4_x; }; - haka = callPackage ../tools/security/haka { }; heapster = callPackage ../servers/monitoring/heapster { }; From e83ee4938623e0d222b5855b1ddae99ba20765a7 Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Tue, 31 Oct 2017 23:54:11 +0100 Subject: [PATCH 2085/2806] icicles: 2014-11-06 -> 2017-10-28 Also add icicles to the new Emacs infrastructure. --- .../editors/emacs-modes/icicles/default.nix | 37 ++++++++++--------- pkgs/top-level/emacs-packages.nix | 2 + 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 11ccff3df01..f0d120dd803 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -2,27 +2,28 @@ let modules = [ - { name = "icicles.el"; sha256 = "175g8w620vy73pp3zyasfjspgljk6g0lki71kdnvw5z88w3s9d1n"; } - { name = "icicles-chg.el"; sha256 = "1bx5xdhirvnrjqk4pk0sjp9bpj1syymsjnckklsw04gv6y0x8zik"; } - { name = "icicles-cmd1.el"; sha256 = "1ff0mndin9zxrswwwq3a7b1s879rr6gy8rzxanr7kxg1ppciafad"; } - { name = "icicles-cmd2.el"; sha256 = "1a44l86jacp9nsy4z260azz6y672drjw3w5a0jsc8w26fgsrnx1k"; } - { name = "icicles-doc1.el"; sha256 = "0s3r4z3y06hd1nxp18wd0b8b88z2a7ryy0j8sx5fzibbmp58ars1"; } - { name = "icicles-doc2.el"; sha256 = "0c10jg91qxyrg1zwiyi4m57dbw3yf43jdrpi4nnby3pkzh6i37ic"; } - { name = "icicles-face.el"; sha256 = "0n0vcbhwgd2lyj7anq1zpwja28xry018qxbm8sprxkh6y3vlw8d2"; } - { name = "icicles-fn.el"; sha256 = "1i10593a7hp465bxd86h7h7gwrdyqxx0d13in53z4jnab8icp3d4"; } - { name = "icicles-mac.el"; sha256 = "1piq0jk8nz0hz9wwci7dkxnfxscdpygjzpj5zg3310vs22l7rrsz"; } - { name = "icicles-mcmd.el"; sha256 = "0c4325yp84i46605nlxmjm6n0f4fh69shsihvd0wb9ryg0a8qa65"; } - { name = "icicles-mode.el"; sha256 = "069wx5clqpsq2c9aavgd9xihvlad3g00iwwrc3cpl47v64dvlipq"; } - { name = "icicles-opt.el"; sha256 = "16487l3361ca8l6il2c0z892843sc5l9v4gr7lx5fxbmrlsswvvn"; } - { name = "icicles-var.el"; sha256 = "1a9cwxpi10x44fngxa7qnrg8hqfvdjb8s8k47gnn1rbh63blkkry"; } + { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; } + { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; } + { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; } + { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; } + { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; } + { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; } + { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; } + { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; } + { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; } + { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; } + { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; } + { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; } + { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; } ]; forAll = f: map f modules; in -stdenv.mkDerivation { - name = "icicles-2014-11-06"; +stdenv.mkDerivation rec { + version = "2017-10-28"; + name = "icicles-${version}"; - srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs-en/download/${name}"; inherit sha256; }); + srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); buildInputs = [ emacs ]; @@ -30,11 +31,13 @@ stdenv.mkDerivation { buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; - installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/"; + installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/"; meta = { homepage = http://www.emacswiki.org/emacs/Icicles; description = "Enhance Emacs minibuffer input with cycling and powerful completion"; license = stdenv.lib.licenses.gpl2Plus; + platforms = emacs.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ scolobb ]; }; } diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index dbddc05a23e..4ff8d23424c 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -268,6 +268,8 @@ let }; }; + icicles = callPackage ../applications/editors/emacs-modes/icicles { }; + rtags = melpaBuild rec { pname = "rtags"; version = "2.12"; From f1e81386303d40376bac2b732c6a7347071f6e7f Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Wed, 1 Nov 2017 00:07:58 +0100 Subject: [PATCH 2086/2806] nodejs: 8.8.1 -> 8.9.0 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 49cc205c024..c47a65bb4e1 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.8.1"; + version = "8.9.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "0ymmhw41n5a81qkxvq7lrssis4y53jh5gxs2k6s2v6brnxxc9qjw"; + sha256 = "128ir6rkdz1xj55hbflw0sh7snrrvjwgvxmgnka7cyhjkvw5i0mf"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; From 5a43c92ffdbdf4aa15cf8641f275611de3ef4e8a Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Wed, 1 Nov 2017 00:55:05 +0100 Subject: [PATCH 2087/2806] nodejs: init at 9.0.0 --- pkgs/development/web/nodejs/v9.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/web/nodejs/v9.nix diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix new file mode 100644 index 00000000000..7b99275eedc --- /dev/null +++ b/pkgs/development/web/nodejs/v9.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, libtool, fetchpatch +, callPackage +, darwin ? null +, enableNpm ? true +}@args: + +let + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "9.0.0"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; + sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv"; + }; + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efdf05fdad3..60fad0499da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3057,6 +3057,15 @@ with pkgs; enableNpm = false; }; + nodejs-9_x = callPackage ../development/web/nodejs/v9.nix { + libtool = darwin.cctools; + }; + + nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { + libtool = darwin.cctools; + enableNpm = false; + }; + nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; }; From d05b21d7c0c53a11319279f05ba56333f9016818 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Thu, 6 Oct 2016 23:26:34 +0200 Subject: [PATCH 2088/2806] goDeps: support fetchFromGiHub to fetch Go libs https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-246252087 https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245297782 --- pkgs/development/go-modules/generic/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 5a1a0eb52eb..3a973fc2644 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,5 @@ -{ go, govers, parallel, lib, fetchgit, fetchhg, fetchbzr, rsync, removeReferencesTo }: +{ go, govers, parallel, lib, fetchgit, fetchhg, fetchbzr, rsync +, removeReferencesTo, fetchFromGitHub }: { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" @@ -58,6 +59,10 @@ let fetchbzr { inherit (goDep.fetch) url rev sha256; } + else if goDep.fetch.type == "FromGitHub" then + fetchFromGitHub { + inherit (goDep.fetch) owner repo rev sha256; + } else abort "Unrecognized package fetch type: ${goDep.fetch.type}"; }; From 36c92a0df79d40cd6fb32da24b4fd072f15fceee Mon Sep 17 00:00:00 2001 From: Evan Wallace Date: Wed, 1 Nov 2017 06:21:37 +0000 Subject: [PATCH 2089/2806] utox: 0.13.1 -> 0.16.1 --- .../networking/instant-messengers/utox/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index d74d3fe3865..7506949f153 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }: +, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }: stdenv.mkDerivation rec { name = "utox-${version}"; - # >= 0.14 should have unit tests and dbus support - version = "0.13.1"; + + version = "0.16.1"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "07aa92isknxf7531jr9kgk89wl5rvv34jrvir043fs9xvim5zq99"; + sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828"; }; buildInputs = [ libtoxcore dbus libvpx libX11 openal freetype libv4l libXrender fontconfig libXext libXft filter-audio - libsodium + libsodium libopus check ]; nativeBuildInputs = [ From 732057238787f1ed5769d7946525834b7999b269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 1 Nov 2017 07:40:49 +0100 Subject: [PATCH 2090/2806] closure-info: half-blind attempt to fix on Hydra I'm not sure why these started to block channel several days ago. I've been unable to reproduce the failures locally. --- pkgs/build-support/closure-info.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index f1b0930cdcf..537cc1fbb75 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -19,7 +19,7 @@ if builtins.langVersion >= 5 then exportReferencesGraph.closure = rootPaths; - PATH = "${coreutils}/bin:${jq}/bin"; + nativeBuildInputs = [ jq ]; builder = builtins.toFile "builder" '' From 87202cf4dc3e5312c95a1da58b7e55e59fd47b02 Mon Sep 17 00:00:00 2001 From: midchildan Date: Tue, 31 Oct 2017 13:33:52 +0900 Subject: [PATCH 2091/2806] mikutter: 3.5.7 -> 3.5.13 --- .../instant-messengers/mikutter/Gemfile | 11 ++- .../instant-messengers/mikutter/Gemfile.lock | 85 ++++++++-------- .../mikutter/core/plugin/gtk/Gemfile | 2 +- .../instant-messengers/mikutter/default.nix | 5 +- .../instant-messengers/mikutter/gemset.nix | 97 ++++++++++--------- .../ruby-modules/gem-config/default.nix | 22 ++++- 6 files changed, 125 insertions(+), 97 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile index 66b17ff8760..0eed9808ab4 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile @@ -11,13 +11,13 @@ group :default do gem 'oauth', '>= 0.5.1' gem 'json_pure', '~> 1.8' gem 'addressable', '~> 2.3' - gem 'memoist', '~> 0.14' + gem 'memoist', '>= 0.16', '< 0.17' gem 'ruby-hmac', '~> 0.4' gem 'typed-array', '~> 0.1' gem 'delayer', '~> 0.0' gem 'pluggaloid', '>= 1.1.1', '< 2.0' - gem 'delayer-deferred', '>= 1.0.4', '< 2.0' - gem 'twitter-text', '1.14.2' + gem 'delayer-deferred', '>= 1.0.4', '< 1.1' + gem 'twitter-text', '>= 1.14.6' end group :test do @@ -31,7 +31,10 @@ end group :plugin do - Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "core/plugin/*/Gemfile"))){ |path| + Dir.glob(File.expand_path(File.join(__dir__, 'core/plugin/*/Gemfile'))){ |path| + eval File.open(path).read + } + Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path| eval File.open(path).read } end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock index 58f41087919..69530be4a44 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock @@ -1,67 +1,72 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) - atk (3.1.1) - glib2 (= 3.1.1) - cairo (1.15.7) - native-package-installer - pkg-config (>= 1.1.5) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + atk (3.1.9) + glib2 (= 3.1.9) + cairo (1.15.10) + native-package-installer (>= 1.0.3) + pkg-config (>= 1.2.2) + cairo-gobject (3.1.9) + cairo + glib2 (= 3.1.9) crack (0.4.3) safe_yaml (~> 1.0.0) delayer (0.0.2) - delayer-deferred (1.1.1) + delayer-deferred (1.0.4) delayer (>= 0.0.2, < 0.1) - gdk_pixbuf2 (3.1.1) - gio2 (= 3.1.1) + gdk_pixbuf2 (3.1.9) + gio2 (= 3.1.9) gettext (3.0.9) locale (>= 2.0.5) text - gio2 (3.1.1) - glib2 (= 3.1.1) - gobject-introspection (= 3.1.1) - glib2 (3.1.1) - pkg-config - gobject-introspection (3.1.1) - glib2 (= 3.1.1) - gtk2 (3.1.1) - atk (= 3.1.1) - gdk_pixbuf2 (= 3.1.1) - pango (= 3.1.1) - hashdiff (0.3.4) + gio2 (3.1.9) + glib2 (= 3.1.9) + gobject-introspection (= 3.1.9) + glib2 (3.1.9) + native-package-installer (>= 1.0.3) + pkg-config (>= 1.2.2) + gobject-introspection (3.1.9) + glib2 (= 3.1.9) + gtk2 (3.1.9) + atk (= 3.1.9) + gdk_pixbuf2 (= 3.1.9) + pango (= 3.1.9) + hashdiff (0.3.7) httpclient (2.8.3) instance_storage (1.0.0) json_pure (1.8.6) locale (2.1.2) - memoist (0.15.0) + memoist (0.16.0) metaclass (0.0.4) - mini_portile2 (2.1.0) + mini_portile2 (2.3.0) mocha (0.14.0) metaclass (~> 0.0.1) moneta (1.0.0) - native-package-installer (1.0.1) - nokogiri (1.7.2) - mini_portile2 (~> 2.1.0) - oauth (0.5.1) - pango (3.1.1) + native-package-installer (1.0.4) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + oauth (0.5.3) + pango (3.1.9) cairo (>= 1.14.0) - glib2 (= 3.1.1) - pkg-config (1.2.0) + cairo-gobject (= 3.1.9) + gobject-introspection (= 3.1.9) + pkg-config (1.2.8) pluggaloid (1.1.1) delayer instance_storage (>= 1.0.0, < 2.0.0) - power_assert (1.0.2) - public_suffix (2.0.5) + power_assert (1.1.1) + public_suffix (3.0.0) rake (10.5.0) ruby-hmac (0.4.0) ruby-prof (0.16.2) safe_yaml (1.0.4) - test-unit (3.2.3) + test-unit (3.2.6) power_assert text (1.3.1) totoridipjp (0.1.0) - twitter-text (1.14.2) + twitter-text (1.14.7) unf (~> 0.1.0) typed-array (0.1.2) unf (0.1.4) @@ -79,12 +84,12 @@ PLATFORMS DEPENDENCIES addressable (~> 2.3) delayer (~> 0.0) - delayer-deferred (>= 1.0.4, < 2.0) + delayer-deferred (>= 1.0.4, < 1.1) gettext (~> 3.0.1) - gtk2 (= 3.1.1) + gtk2 (= 3.1.9) httpclient json_pure (~> 1.8) - memoist (~> 0.14) + memoist (>= 0.16, < 0.17) mocha (~> 0.14) moneta nokogiri @@ -95,10 +100,10 @@ DEPENDENCIES ruby-prof test-unit (~> 3.0) totoridipjp - twitter-text (= 1.14.2) + twitter-text (>= 1.14.6) typed-array (~> 0.1) watch (~> 0.1) webmock (~> 1.17) BUNDLED WITH - 1.14.4 + 1.14.6 diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile index 4015fbec1bc..b7d19db3763 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'gtk2', '3.1.1' +gem 'gtk2', '3.1.9' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index e00468d9a4c..6b17eb0a897 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mikutter-${version}"; - version = "3.5.7"; + version = "3.5.13"; src = fetchurl { url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz"; - sha256 = "1vh5ap92q869j69hmmbznailaflmdp0km4sqdv06cpq7v8pwm28w"; + sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320"; }; env = bundlerEnv { @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - broken = true; description = "An extensible Twitter client"; homepage = https://mikutter.hachune.net; maintainers = with maintainers; [ midchildan ]; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix index d6d99f3d55b..ef7091689b3 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix @@ -3,28 +3,37 @@ dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.2"; }; atk = { dependencies = ["glib2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17x88g596s3pqfxplm5ia7anpcmd9kxs4nzmpf2h74bqwkbq2jrz"; + sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; cairo = { dependencies = ["native-package-installer" "pkg-config"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "115ksrswbs7pg7kdfi2w8bi9xxv9gzmfvcjj8qj4dxy8dkvp3k4d"; + sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c"; type = "gem"; }; - version = "1.15.7"; + version = "1.15.10"; + }; + cairo-gobject = { + dependencies = ["cairo" "glib2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26"; + type = "gem"; + }; + version = "3.1.9"; }; crack = { dependencies = ["safe_yaml"]; @@ -47,19 +56,19 @@ dependencies = ["delayer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bw48i6qbxmjf2al4a0mw23nlkcrjrwsrdrabbwz62v8sdmdynpc"; + sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb"; type = "gem"; }; - version = "1.1.1"; + version = "1.0.4"; }; gdk_pixbuf2 = { dependencies = ["gio2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x9fzsazfi6f3iq7zkqc0vjl6311876dvff0000vg41rajv3rhh1"; + sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; gettext = { dependencies = ["locale" "text"]; @@ -74,45 +83,45 @@ dependencies = ["glib2" "gobject-introspection"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ki9yxp860xk5cf04hrgvh386n93bkr0pf4c0kl3fx6pnwr4w3v0"; + sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; glib2 = { - dependencies = ["pkg-config"]; + dependencies = ["native-package-installer" "pkg-config"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "131jd26n2wwp2lrkyyfq5nb3qriasaym1zpygm991qzcaq79i444"; + sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; gobject-introspection = { dependencies = ["glib2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fbi1pxyq73d674cwznya6kda38yjp4ahc2xgxi9shsdqmqcx3vs"; + sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; gtk2 = { dependencies = ["atk" "gdk_pixbuf2" "pango"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00cbfl306xkglk0cc758vsvv1saaa24gvwh0m2jnzwgfwxk7mc5w"; + sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.7"; }; httpclient = { source = { @@ -149,10 +158,10 @@ memoist = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q"; + sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; metaclass = { source = { @@ -165,10 +174,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; type = "gem"; }; - version = "2.1.0"; + version = "2.3.0"; }; mocha = { dependencies = ["metaclass"]; @@ -190,44 +199,44 @@ native-package-installer = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1zh5x87y9dr16ic7vif2c3rnpr5k5wfs6kihpy4dnb9s0mqyqhsj"; + sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.4"; }; nokogiri = { dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jd8q3pr5rkrxx1vklvhcqcgl8kmfv5c8ny36ni3z5mirw6cm70c"; + sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021"; type = "gem"; }; - version = "1.7.2"; + version = "1.8.1"; }; oauth = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky"; + sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.3"; }; pango = { - dependencies = ["cairo" "glib2"]; + dependencies = ["cairo" "cairo-gobject" "gobject-introspection"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18cc24lz4dmb7pavfspivbhbsypf40fhcbdzj8885zs0zr0dknby"; + sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; pkg-config = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fklf2dnk354ahxma3iki5cx7b8yn9khby162pz17z6f1f3xk84g"; + sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.8"; }; pluggaloid = { dependencies = ["delayer" "instance_storage"]; @@ -241,18 +250,18 @@ power_assert = { source = { remotes = ["https://rubygems.org"]; - sha256 = "168ac459nv45a2lhdf86zv35lv9nr569ny5nh3kfnglnxyzyx0kr"; + sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.1"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.0"; }; rake = { source = { @@ -290,10 +299,10 @@ dependencies = ["power_assert"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kngxp21sqbm7kv7wnxfqk99ik3wv1bjab519vcbj8xj30a5y4py"; + sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.6"; }; text = { source = { @@ -315,10 +324,10 @@ dependencies = ["unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lld6d8rzj1zrgs6b227mp675bn8ds56f1c9w9wvx321f6ibn6np"; + sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg"; type = "gem"; }; - version = "1.14.2"; + version = "1.14.7"; }; typed-array = { source = { diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index ff5398a4293..05415b88968 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -22,7 +22,7 @@ , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xlibs, gtk2, buildRubyGem -, re2 +, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf }@args: let @@ -41,7 +41,7 @@ in { atk = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 pcre ]; + buildInputs = [ gtk2 pcre rake ]; }; bundler = attrs: @@ -64,6 +64,11 @@ in buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; }; + cairo-gobject = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cairo pcre xlibs.libpthreadstubs xlibs.libXdmcp ]; + }; + capybara-webkit = attrs: { buildInputs = [ qt48 ]; }; @@ -71,7 +76,7 @@ in charlock_holmes = attrs: { buildInputs = [ which icu zlib ]; }; - + curb = attrs: { buildInputs = [ curl ]; }; @@ -93,6 +98,11 @@ in buildInputs = [ libffi ]; }; + gdk_pixbuf2 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ rake gdk_pixbuf ]; + }; + gpgme = attrs: { buildInputs = [ gpgme ]; }; @@ -116,8 +126,10 @@ in CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; }; - nativeBuildInputs = [ pkgconfig ]; - gobject-introspection = attrs: { buildInputs = [ gtk2 pcre ]; }; + gobject-introspection = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gobjectIntrospection gtk2 pcre ]; + }; grpc = attrs: { nativeBuildInputs = [ pkgconfig ]; From c4be15a83b95b882357990488a7c8ccd47feb94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 1 Nov 2017 08:07:15 +0100 Subject: [PATCH 2092/2806] closure-info: another half-blind attempt to fix on Hydra The previous one was very bad and worsened the situation. But even running with some nix-1.12 I'm unable to reproduce the original failure. Let's unblock channels for now. --- pkgs/build-support/closure-info.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 537cc1fbb75..4d178ac96c5 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -8,7 +8,10 @@ { rootPaths }: -if builtins.langVersion >= 5 then +#if builtins.langVersion >= 5 then +# FIXME: it doesn't work on Hydra, failing to find mkdir; +# perhaps .attrs.sh clobbers PATH with new nix? +if false then # Nix >= 1.12: Include NAR hash / size info. @@ -19,7 +22,7 @@ if builtins.langVersion >= 5 then exportReferencesGraph.closure = rootPaths; - nativeBuildInputs = [ jq ]; + PATH = "${coreutils}/bin:${jq}/bin"; builder = builtins.toFile "builder" '' From 3dd5d52b72f22edcd5555bed47862033c7187799 Mon Sep 17 00:00:00 2001 From: midchildan Date: Wed, 1 Nov 2017 16:09:25 +0900 Subject: [PATCH 2093/2806] mikutter: prevent gems from locally-installed plugins from being included as a dependency --- .../networking/instant-messengers/mikutter/shell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix index efa57175b23..bc83767af32 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix @@ -8,6 +8,7 @@ pkgs.stdenv.mkDerivation { ]; shellHook = '' + export MIKUTTER_CONFROOT="/homeless-shelter" truncate --size 0 Gemfile.lock bundle lock bundle package --path=vendor/bundle --no-install From 398705ba863b65b27e90436ead111536665caae3 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Wed, 1 Nov 2017 10:25:26 +0200 Subject: [PATCH 2094/2806] containers: autoStart doc typo --- nixos/modules/virtualisation/containers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 82dfc1c9f1c..8618a9c93dd 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -537,7 +537,7 @@ in type = types.bool; default = false; description = '' - Wether the container is automatically started at boot-time. + Whether the container is automatically started at boot-time. ''; }; From 0671a2b6d40079af17896abe30bd89399c182ae0 Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Wed, 1 Nov 2017 10:35:20 +0100 Subject: [PATCH 2095/2806] pythonPackage.jug: 1.6.1 -> 1.6.3 Minor update to Jug (Python package) --- 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 0be1ff17ee0..64d79d22a77 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6111,7 +6111,7 @@ in { jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; jug = buildPythonPackage rec { - version = "1.6.1"; + version = "1.6.3"; name = "jug-${version}"; buildInputs = with self; [ nose numpy ]; propagatedBuildInputs = with self; [ @@ -6125,7 +6125,7 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; - sha256 = "15lv998mz6kpp65kh8wsfnrl5ay02bk1lm07nbbdv2k455bhrn1i"; + sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86"; }; meta = { From af0c3fca1de900de881f19a1fae3806ea34427cc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 1 Nov 2017 17:41:21 +0800 Subject: [PATCH 2096/2806] tvheadend: fix version detection and wrap bzip2 to support backups --- pkgs/servers/tvheadend/default.nix | 54 ++++++++++++++++++------------ 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 851149ad7f7..7ff0796811a 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,21 +1,27 @@ -{avahi, cmake, dbus, fetchurl, gettext, git, gnutar, gzip, bzip2, ffmpeg, libiconv, openssl, pkgconfig, python -, stdenv, which, zlib}: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg, libiconv, openssl, python +, which, zlib }: -with stdenv.lib; +let + version = "4.2.1"; -let version = "4.2.1"; - pkgName = "tvheadend"; +in stdenv.mkDerivation rec { + name = "tvheadend-${version}"; -in - -stdenv.mkDerivation rec { - name = "${pkgName}-${version}"; - - src = fetchurl { - url = "https://github.com/tvheadend/tvheadend/archive/v${version}.tar.gz"; - sha256 = "1wrj3w595c1hfl2vmfdmp5qncy5samqi7iisyq76jf3nlzgw6dvn"; + src = fetchFromGitHub { + owner = "tvheadend"; + repo = "tvheadend"; + rev = "v${version}"; + sha256 = "1lhk8psvifmn4kjwyfxjj21z0apyr59zizzsfd4j22v7bk66rrl9"; }; + buildInputs = [ + avahi dbus gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python + which zlib + ]; + + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + enableParallelBuilding = true; # disable dvbscan, as having it enabled causes a network download which @@ -28,28 +34,32 @@ stdenv.mkDerivation rec { "--disable-hdhomerun_static" ]; - buildPhase = "make"; - dontUseCmakeConfigure = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python - which zlib ]; - preConfigure = '' patchShebangs ./configure + substituteInPlace src/config.c --replace /usr/bin/tar ${gnutar}/bin/tar + + # the version detection script `support/version` reads this file if it + # exists, so let's just use that + echo ${version} > rpm/version ''; - meta = { + postInstall = '' + wrapProgram $out/bin/tvheadend \ + --prefix PATH : ${stdenv.lib.makeBinPath [ bzip2 ]} + ''; + + meta = with stdenv.lib; { description = "TV streaming server"; longDescription = '' - Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android + Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources. Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.''; homepage = https://tvheadend.org; license = licenses.gpl3; platforms = platforms.unix; - maintainers = [ maintainers.simonvandel ]; + maintainers = with maintainers; [ simonvandel ]; }; } From cbd65e79801170a0d3133900f6da5cb29cc76d87 Mon Sep 17 00:00:00 2001 From: "Andrew R. M" Date: Wed, 1 Nov 2017 05:49:01 -0400 Subject: [PATCH 2097/2806] pythonPackages.rply: move to python-modules/ --- lib/maintainers.nix | 2 +- .../python-modules/rply/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +---------------- 3 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/rply/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index dc2281401e0..797adae97b1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -443,7 +443,7 @@ nicknovitski = "Nick Novitski "; nico202 = "Nicolò Balzarotti "; NikolaMandic = "Ratko Mladic "; - nixy = "Andrew R. M. "; + nixy = "Andrew R. M. "; nocoolnametom = "Tom Doggett "; notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix new file mode 100644 index 00000000000..8dee7bcff2e --- /dev/null +++ b/pkgs/development/python-modules/rply/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, buildPythonPackage, appdirs }: + +buildPythonPackage rec { + pname = "rply"; + name = "${pname}-${version}"; + version = "0.7.4"; + + src = fetchurl { + url = "mirror://pypi/r/rply/${name}.tar.gz"; + sha256 = "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj"; + }; + + buildInputs = [ appdirs ]; + + meta = with stdenv.lib; { + description = "A python Lex/Yacc that works with RPython"; + homepage = https://github.com/alex/rply; + license = licenses.bsd3; + maintainers = with maintainers; [ nixy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0be1ff17ee0..cbd573c2f68 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18308,24 +18308,7 @@ in { rpkg = callPackage ../development/python-modules/rpkg/default.nix {}; - rply = buildPythonPackage rec { - name = "rply-${version}"; - version = "0.7.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rply/${name}.tar.gz"; - sha256 = "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj"; - }; - - buildInputs = with self; [ appdirs ]; - - meta = with pkgs.stdenv.lib; { - description = "A python Lex/Yacc that works with RPython"; - homepage = https://github.com/alex/rply; - license = licenses.bsd3; - maintainers = with maintainers; [ nixy ]; - }; - }; + rply = callPackage ../development/python-modules/rply/default.nix {}; rpm = (pkgs.rpm.override{inherit python;}); From 6743ff237983e1ca6d57dc9689fcf15b70ba714c Mon Sep 17 00:00:00 2001 From: "Andrew R. M" Date: Wed, 1 Nov 2017 05:51:50 -0400 Subject: [PATCH 2098/2806] pythonPackages.rply: 0.7.4 -> 0.7.5 --- pkgs/development/python-modules/rply/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 8dee7bcff2e..91f80291214 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "rply"; name = "${pname}-${version}"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { url = "mirror://pypi/r/rply/${name}.tar.gz"; - sha256 = "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj"; + sha256 = "0lv428895zxsz43968qx0q9bimwqnfykndz4dpjbq515w2gvzhjh"; }; buildInputs = [ appdirs ]; From 09bdae2dd77257c659ebf0595562ea939d73b79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Nov 2017 05:14:33 -0500 Subject: [PATCH 2099/2806] pythonPackages.rply: enable tests --- pkgs/development/python-modules/rply/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 91f80291214..912b3fd6ab0 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -1,17 +1,24 @@ -{ stdenv, fetchurl, buildPythonPackage, appdirs }: +{ stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: buildPythonPackage rec { pname = "rply"; name = "${pname}-${version}"; version = "0.7.5"; - src = fetchurl { - url = "mirror://pypi/r/rply/${name}.tar.gz"; - sha256 = "0lv428895zxsz43968qx0q9bimwqnfykndz4dpjbq515w2gvzhjh"; + src = fetchFromGitHub { + owner = "alex"; + repo = "rply"; + rev = "v${version}"; + sha256 = "0v05gdy5dval30wvz96lywvz2jyf000dp0pnrd1lwdx3cyywq659"; }; buildInputs = [ appdirs ]; + checkInputs = [ pytest ]; + checkPhase = '' + HOME=$(mktemp -d) py.test tests + ''; + meta = with stdenv.lib; { description = "A python Lex/Yacc that works with RPython"; homepage = https://github.com/alex/rply; From 25ed4dcac58ff9b727bf3baafeda765ff80b78c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Nov 2017 05:25:58 -0500 Subject: [PATCH 2100/2806] python.pkgs.jug: move to python modules --- .../python-modules/jug/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +--------------- 2 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/jug/default.nix diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix new file mode 100644 index 00000000000..ab94d7b40ac --- /dev/null +++ b/pkgs/development/python-modules/jug/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, numpy +, bottle, pyyaml, redis, six +, zlib }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Jug"; + version = "1.6.3"; + buildInputs = [ nose numpy ]; + propagatedBuildInputs = [ + bottle + pyyaml + redis + six + + zlib + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86"; + }; + + meta = with stdenv.lib; { + description = "A Task-Based Parallelization Framework"; + license = licenses.mit; + url = https://jug.readthedocs.io/; + maintainers = with maintainers; [ luispedro ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64d79d22a77..8c3dfe0e0d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6110,31 +6110,7 @@ in { jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; - jug = buildPythonPackage rec { - version = "1.6.3"; - name = "jug-${version}"; - buildInputs = with self; [ nose numpy ]; - propagatedBuildInputs = with self; [ - bottle - pyyaml - redis - six - - pkgs.zlib - ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; - sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86"; - }; - - meta = { - description = "A Task-Based Parallelization Framework"; - license = licenses.mit; - url = https://jug.readthedocs.io/; - maintainers = with maintainers; [ luispedro ]; - }; - }; + jug = callPackage ../development/python-modules/jug {}; jsmin = callPackage ../development/python-modules/jsmin { }; From e2f8fa37f27a4281429f35367c7ca3d489cb4feb Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Tue, 31 Oct 2017 10:25:51 +0000 Subject: [PATCH 2101/2806] Flag my-self as owner of Nixpkgs and NixOS internals --- .github/CODEOWNERS | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index bd24a2e0cab..ab64ddb3e67 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -15,7 +15,31 @@ pkgs/stdenv/ @edolstra pkgs/build-support/cc-wrapper/ @edolstra # Libraries -lib/ @edolstra +lib/ @edolstra @nbp + +# Nixpkgs Internals +default.nix @nbp +pkgs/top-level/default.nix @nbp +pkgs/top-level/impure.nix @nbp +pkgs/top-level/stage.nix @nbp + +# NixOS Internals +nixos/default.nix @nbp +nixos/lib/from-env.nix @nbp +nixos/lib/eval-config.nix @nbp +nixos/doc/manual/configuration/abstractions.xml @nbp +nixos/doc/manual/configuration/config-file.xml @nbp +nixos/doc/manual/configuration/config-syntax.xml @nbp +nixos/doc/manual/configuration/modularity.xml @nbp +nixos/doc/manual/development/assertions.xml @nbp +nixos/doc/manual/development/meta-attributes.xml @nbp +nixos/doc/manual/development/option-declarations.xml @nbp +nixos/doc/manual/development/option-def.xml @nbp +nixos/doc/manual/development/option-types.xml @nbp +nixos/doc/manual/development/replace-modules.xml @nbp +nixos/doc/manual/development/writing-modules.xml @nbp +nixos/doc/manual/man-nixos-option.xml @nbp +nixos/modules/installer/tools/nixos-option.sh @nbp # Python-related code and docs pkgs/top-level/python-packages.nix @FRidh From 8a59ef7354cb1ff66bbf815312946faab9b4a3b2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Nov 2017 10:57:54 +0000 Subject: [PATCH 2102/2806] wireguard: 0.0.20171017 -> 0.0.20171101 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 18ed3287edc..cc1890438f9 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20171017"; + version = "0.0.20171101"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1k9m980d7zmnhpj9kanyfavqrn7ryva16iblk9jrk6sdhxi9mdsp"; + sha256 = "0983aivw7wc5qq8didh4bdbdxcmddbpganf0z1xnqmjyls168sq9"; }; meta = with stdenv.lib; { From a4d5586d4781e5f2d2994c6a5773af7d03a6e59c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 1 Nov 2017 05:59:03 -0500 Subject: [PATCH 2103/2806] gcc: 5.4.0 -> 5.5.0 Switch to xz since there is no bz2 variant (apparently) --- pkgs/development/compilers/gcc/5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index d1c76b6097e..346ea928b76 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -59,8 +59,8 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "5.4.0"; - sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0"; +let version = "5.5.0"; + sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; @@ -217,7 +217,7 @@ stdenv.mkDerivation ({ builder = ../builder.sh; src = fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; + url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz"; inherit sha256; }; From fb7924eaecadf1f7b6b6ec65497e1375d5184192 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Wed, 1 Nov 2017 14:10:01 +0300 Subject: [PATCH 2104/2806] mpv: wayland support by default --- 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 fa4488b9317..19eeffc8488 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15714,6 +15714,7 @@ with pkgs; lua5_sockets = lua5_1_sockets; youtube-dl = pythonPackages.youtube-dl; libva = libva-full; + waylandSupport = stdenv.isLinux; }; mpvScripts = { From 737b4660311bd691200ebe1d422a8ff4958ad676 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 31 Oct 2017 15:10:47 -0700 Subject: [PATCH 2105/2806] fix ghcjs socket.io --- pkgs/development/compilers/ghcjs/base.nix | 7 +- .../ghcjs/node-packages-generated.nix | 943 --------- .../compilers/ghcjs/node-packages.json | 1 - .../haskell-modules/generic-builder.nix | 3 +- .../haskell-modules/with-packages-wrapper.nix | 3 + .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 1694 +++++++++-------- 7 files changed, 889 insertions(+), 1763 deletions(-) delete mode 100644 pkgs/development/compilers/ghcjs/node-packages-generated.nix delete mode 100644 pkgs/development/compilers/ghcjs/node-packages.json diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index a7381fa1a14..d4418b058d9 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -40,11 +40,6 @@ , coreutils , libiconv -, ghcjsNodePkgs ? callPackage ../../../top-level/node-packages.nix { - generated = ./node-packages-generated.nix; - self = ghcjsNodePkgs; - } - , version ? "0.2.0" , ghcjsSrc ? fetchFromGitHub { owner = "ghcjs"; @@ -178,7 +173,7 @@ in mkDerivation (rec { isCross = true; isGhcjs = true; inherit nodejs ghcjsBoot; - inherit (ghcjsNodePkgs) "socket.io"; + socket-io = pkgs.nodePackages."socket.io"; inherit stage1Packages; mkStage2 = stage2 { diff --git a/pkgs/development/compilers/ghcjs/node-packages-generated.nix b/pkgs/development/compilers/ghcjs/node-packages-generated.nix deleted file mode 100644 index a3c882ff76c..00000000000 --- a/pkgs/development/compilers/ghcjs/node-packages-generated.nix +++ /dev/null @@ -1,943 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."accepts"."1.1.4" = - self.by-version."accepts"."1.1.4"; - by-version."accepts"."1.1.4" = self.buildNodePackage { - name = "accepts-1.1.4"; - version = "1.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz"; - name = "accepts-1.1.4.tgz"; - sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a"; - }; - deps = { - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."after"."0.8.1" = - self.by-version."after"."0.8.1"; - by-version."after"."0.8.1" = self.buildNodePackage { - name = "after-0.8.1"; - version = "0.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz"; - name = "after-0.8.1.tgz"; - sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."arraybuffer.slice"."0.0.6" = - self.by-version."arraybuffer.slice"."0.0.6"; - by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage { - name = "arraybuffer.slice-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; - name = "arraybuffer.slice-0.0.6.tgz"; - sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."backo2"."1.0.2" = - self.by-version."backo2"."1.0.2"; - by-version."backo2"."1.0.2" = self.buildNodePackage { - name = "backo2-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; - name = "backo2-1.0.2.tgz"; - sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64-arraybuffer"."0.1.2" = - self.by-version."base64-arraybuffer"."0.1.2"; - by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage { - name = "base64-arraybuffer-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; - name = "base64-arraybuffer-0.1.2.tgz"; - sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64id"."0.1.0" = - self.by-version."base64id"."0.1.0"; - by-version."base64id"."0.1.0" = self.buildNodePackage { - name = "base64id-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; - name = "base64id-0.1.0.tgz"; - sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."benchmark"."1.0.0" = - self.by-version."benchmark"."1.0.0"; - by-version."benchmark"."1.0.0" = self.buildNodePackage { - name = "benchmark-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"; - name = "benchmark-1.0.0.tgz"; - sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."better-assert"."~1.0.0" = - self.by-version."better-assert"."1.0.2"; - by-version."better-assert"."1.0.2" = self.buildNodePackage { - name = "better-assert-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; - name = "better-assert-1.0.2.tgz"; - sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; - }; - deps = { - "callsite-1.0.0" = self.by-version."callsite"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."blob"."0.0.4" = - self.by-version."blob"."0.0.4"; - by-version."blob"."0.0.4" = self.buildNodePackage { - name = "blob-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/blob/-/blob-0.0.4.tgz"; - name = "blob-0.0.4.tgz"; - sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."callsite"."1.0.0" = - self.by-version."callsite"."1.0.0"; - by-version."callsite"."1.0.0" = self.buildNodePackage { - name = "callsite-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; - name = "callsite-1.0.0.tgz"; - sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-bind"."1.0.0" = - self.by-version."component-bind"."1.0.0"; - by-version."component-bind"."1.0.0" = self.buildNodePackage { - name = "component-bind-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; - name = "component-bind-1.0.0.tgz"; - sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-emitter"."1.1.2" = - self.by-version."component-emitter"."1.1.2"; - by-version."component-emitter"."1.1.2" = self.buildNodePackage { - name = "component-emitter-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; - name = "component-emitter-1.1.2.tgz"; - sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-emitter"."1.2.0" = - self.by-version."component-emitter"."1.2.0"; - by-version."component-emitter"."1.2.0" = self.buildNodePackage { - name = "component-emitter-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz"; - name = "component-emitter-1.2.0.tgz"; - sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-inherit"."0.0.3" = - self.by-version."component-inherit"."0.0.3"; - by-version."component-inherit"."0.0.3" = self.buildNodePackage { - name = "component-inherit-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; - name = "component-inherit-0.0.3.tgz"; - sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."0.7.4" = - self.by-version."debug"."0.7.4"; - by-version."debug"."0.7.4" = self.buildNodePackage { - name = "debug-0.7.4"; - version = "0.7.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; - name = "debug-0.7.4.tgz"; - sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."2.2.0" = - self.by-version."debug"."2.2.0"; - by-version."debug"."2.2.0" = self.buildNodePackage { - name = "debug-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - name = "debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - deps = { - "ms-0.7.1" = self.by-version."ms"."0.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."engine.io"."1.6.8" = - self.by-version."engine.io"."1.6.8"; - by-version."engine.io"."1.6.8" = self.buildNodePackage { - name = "engine.io-1.6.8"; - version = "1.6.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/engine.io/-/engine.io-1.6.8.tgz"; - name = "engine.io-1.6.8.tgz"; - sha1 = "de05a06b757e7517695e088c7b051c47819f511b"; - }; - deps = { - "base64id-0.1.0" = self.by-version."base64id"."0.1.0"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "ws-1.0.1" = self.by-version."ws"."1.0.1"; - "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4"; - "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."engine.io-client"."1.6.8" = - self.by-version."engine.io-client"."1.6.8"; - by-version."engine.io-client"."1.6.8" = self.buildNodePackage { - name = "engine.io-client-1.6.8"; - version = "1.6.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.8.tgz"; - name = "engine.io-client-1.6.8.tgz"; - sha1 = "6e2db11648b45e405c46b172ea3e3dac37cc0ceb"; - }; - deps = { - "has-cors-1.1.0" = self.by-version."has-cors"."1.1.0"; - "ws-1.0.1" = self.by-version."ws"."1.0.1"; - "xmlhttprequest-ssl-1.5.1" = self.by-version."xmlhttprequest-ssl"."1.5.1"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; - "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4"; - "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1"; - "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2"; - "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3"; - "yeast-0.1.2" = self.by-version."yeast"."0.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."engine.io-parser"."1.2.4" = - self.by-version."engine.io-parser"."1.2.4"; - by-version."engine.io-parser"."1.2.4" = self.buildNodePackage { - name = "engine.io-parser-1.2.4"; - version = "1.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz"; - name = "engine.io-parser-1.2.4.tgz"; - sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42"; - }; - deps = { - "after-0.8.1" = self.by-version."after"."0.8.1"; - "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6"; - "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2"; - "blob-0.0.4" = self.by-version."blob"."0.0.4"; - "has-binary-0.1.6" = self.by-version."has-binary"."0.1.6"; - "utf8-2.1.0" = self.by-version."utf8"."2.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-binary"."0.1.6" = - self.by-version."has-binary"."0.1.6"; - by-version."has-binary"."0.1.6" = self.buildNodePackage { - name = "has-binary-0.1.6"; - version = "0.1.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz"; - name = "has-binary-0.1.6.tgz"; - sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10"; - }; - deps = { - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-binary"."0.1.7" = - self.by-version."has-binary"."0.1.7"; - by-version."has-binary"."0.1.7" = self.buildNodePackage { - name = "has-binary-0.1.7"; - version = "0.1.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; - name = "has-binary-0.1.7.tgz"; - sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; - }; - deps = { - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-cors"."1.1.0" = - self.by-version."has-cors"."1.1.0"; - by-version."has-cors"."1.1.0" = self.buildNodePackage { - name = "has-cors-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - name = "has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."indexof"."0.0.1" = - self.by-version."indexof"."0.0.1"; - by-version."indexof"."0.0.1" = self.buildNodePackage { - name = "indexof-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - name = "indexof-0.0.1.tgz"; - sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json3"."3.2.6" = - self.by-version."json3"."3.2.6"; - by-version."json3"."3.2.6" = self.buildNodePackage { - name = "json3-3.2.6"; - version = "3.2.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; - name = "json3-3.2.6.tgz"; - sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json3"."3.3.2" = - self.by-version."json3"."3.3.2"; - by-version."json3"."3.3.2" = self.buildNodePackage { - name = "json3-3.3.2"; - version = "3.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - name = "json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.12.0" = - self.by-version."mime-db"."1.12.0"; - by-version."mime-db"."1.12.0" = self.buildNodePackage { - name = "mime-db-1.12.0"; - version = "1.12.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - name = "mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.4" = - self.by-version."mime-types"."2.0.14"; - by-version."mime-types"."2.0.14" = self.buildNodePackage { - name = "mime-types-2.0.14"; - version = "2.0.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - name = "mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - deps = { - "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.1" = - self.by-version."ms"."0.7.1"; - by-version."ms"."0.7.1" = self.buildNodePackage { - name = "ms-0.7.1"; - version = "0.7.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - name = "ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."negotiator"."0.4.9" = - self.by-version."negotiator"."0.4.9"; - by-version."negotiator"."0.4.9" = self.buildNodePackage { - name = "negotiator-0.4.9"; - version = "0.4.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"; - name = "negotiator-0.4.9.tgz"; - sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."object-component"."0.0.3" = - self.by-version."object-component"."0.0.3"; - by-version."object-component"."0.0.3" = self.buildNodePackage { - name = "object-component-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; - name = "object-component-0.0.3.tgz"; - sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."options".">=0.0.5" = - self.by-version."options"."0.0.6"; - by-version."options"."0.0.6" = self.buildNodePackage { - name = "options-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; - name = "options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parsejson"."0.0.1" = - self.by-version."parsejson"."0.0.1"; - by-version."parsejson"."0.0.1" = self.buildNodePackage { - name = "parsejson-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; - name = "parsejson-0.0.1.tgz"; - sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; - }; - deps = { - "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parseqs"."0.0.2" = - self.by-version."parseqs"."0.0.2"; - by-version."parseqs"."0.0.2" = self.buildNodePackage { - name = "parseqs-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; - name = "parseqs-0.0.2.tgz"; - sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; - }; - deps = { - "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parseuri"."0.0.4" = - self.by-version."parseuri"."0.0.4"; - by-version."parseuri"."0.0.4" = self.buildNodePackage { - name = "parseuri-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz"; - name = "parseuri-0.0.4.tgz"; - sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350"; - }; - deps = { - "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io"."*" = - self.by-version."socket.io"."1.4.5"; - by-version."socket.io"."1.4.5" = self.buildNodePackage { - name = "socket.io-1.4.5"; - version = "1.4.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io/-/socket.io-1.4.5.tgz"; - name = "socket.io-1.4.5.tgz"; - sha1 = "f202f49eeb9cf7cf6c0971ad75d8d96d451ea4f7"; - }; - deps = { - "engine.io-1.6.8" = self.by-version."engine.io"."1.6.8"; - "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6"; - "socket.io-client-1.4.5" = self.by-version."socket.io-client"."1.4.5"; - "socket.io-adapter-0.4.0" = self.by-version."socket.io-adapter"."0.4.0"; - "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "socket.io" = self.by-version."socket.io"."1.4.5"; - by-spec."socket.io-adapter"."0.4.0" = - self.by-version."socket.io-adapter"."0.4.0"; - by-version."socket.io-adapter"."0.4.0" = self.buildNodePackage { - name = "socket.io-adapter-0.4.0"; - version = "0.4.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz"; - name = "socket.io-adapter-0.4.0.tgz"; - sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "socket.io-parser-2.2.2" = self.by-version."socket.io-parser"."2.2.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io-client"."1.4.5" = - self.by-version."socket.io-client"."1.4.5"; - by-version."socket.io-client"."1.4.5" = self.buildNodePackage { - name = "socket.io-client-1.4.5"; - version = "1.4.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.5.tgz"; - name = "socket.io-client-1.4.5.tgz"; - sha1 = "400d630c31e7c9579e45173f977e4f5bd8dc7d2e"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "engine.io-client-1.6.8" = self.by-version."engine.io-client"."1.6.8"; - "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0"; - "component-emitter-1.2.0" = self.by-version."component-emitter"."1.2.0"; - "object-component-0.0.3" = self.by-version."object-component"."0.0.3"; - "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6"; - "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7"; - "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; - "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4"; - "to-array-0.1.4" = self.by-version."to-array"."0.1.4"; - "backo2-1.0.2" = self.by-version."backo2"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io-parser"."2.2.2" = - self.by-version."socket.io-parser"."2.2.2"; - by-version."socket.io-parser"."2.2.2" = self.buildNodePackage { - name = "socket.io-parser-2.2.2"; - version = "2.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz"; - name = "socket.io-parser-2.2.2.tgz"; - sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417"; - }; - deps = { - "debug-0.7.4" = self.by-version."debug"."0.7.4"; - "json3-3.2.6" = self.by-version."json3"."3.2.6"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io-parser"."2.2.6" = - self.by-version."socket.io-parser"."2.2.6"; - by-version."socket.io-parser"."2.2.6" = self.buildNodePackage { - name = "socket.io-parser-2.2.6"; - version = "2.2.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz"; - name = "socket.io-parser-2.2.6.tgz"; - sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "json3-3.3.2" = self.by-version."json3"."3.3.2"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."to-array"."0.1.4" = - self.by-version."to-array"."0.1.4"; - by-version."to-array"."0.1.4" = self.buildNodePackage { - name = "to-array-0.1.4"; - version = "0.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; - name = "to-array-0.1.4.tgz"; - sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ultron"."1.0.x" = - self.by-version."ultron"."1.0.2"; - by-version."ultron"."1.0.2" = self.buildNodePackage { - name = "ultron-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; - name = "ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utf8"."2.1.0" = - self.by-version."utf8"."2.1.0"; - by-version."utf8"."2.1.0" = self.buildNodePackage { - name = "utf8-2.1.0"; - version = "2.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz"; - name = "utf8-2.1.0.tgz"; - sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ws"."1.0.1" = - self.by-version."ws"."1.0.1"; - by-version."ws"."1.0.1" = self.buildNodePackage { - name = "ws-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ws/-/ws-1.0.1.tgz"; - name = "ws-1.0.1.tgz"; - sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9"; - }; - deps = { - "options-0.0.6" = self.by-version."options"."0.0.6"; - "ultron-1.0.2" = self.by-version."ultron"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xmlhttprequest-ssl"."1.5.1" = - self.by-version."xmlhttprequest-ssl"."1.5.1"; - by-version."xmlhttprequest-ssl"."1.5.1" = self.buildNodePackage { - name = "xmlhttprequest-ssl-1.5.1"; - version = "1.5.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz"; - name = "xmlhttprequest-ssl-1.5.1.tgz"; - sha1 = "3b7741fea4a86675976e908d296d4445961faa67"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."yeast"."0.1.2" = - self.by-version."yeast"."0.1.2"; - by-version."yeast"."0.1.2" = self.buildNodePackage { - name = "yeast-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"; - name = "yeast-0.1.2.tgz"; - sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/development/compilers/ghcjs/node-packages.json b/pkgs/development/compilers/ghcjs/node-packages.json deleted file mode 100644 index 55fa86675e7..00000000000 --- a/pkgs/development/compilers/ghcjs/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "socket.io" ] diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5d8a28f5c2b..3e82003be43 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -362,8 +362,7 @@ stdenv.mkDerivation ({ env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment"; - nativeBuildInputs = [ ghcEnv systemBuildInputs ] - ++ optional isGhcjs ghc."socket.io"; # for ghcjsi + nativeBuildInputs = [ ghcEnv systemBuildInputs ]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index ec7d961581a..ac484b3c112 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -74,6 +74,9 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \ --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \ --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" \ + ${lib.optionalString (ghc.isGhcjs or false) + ''--set NODE_PATH "${ghc.socket-io}/lib/node_modules"'' + } \ ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} fi done diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 7ea7ce2d3ed..c2876f1128c 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -73,6 +73,7 @@ , "sinopia" , "sloc" , "smartdc" +, "socket.io" , "stylus" , "svgo" , "tern" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index ebf116fed73..1b80e08ad2e 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -157,13 +157,13 @@ let sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; }; }; - "resolve-1.4.0" = { + "resolve-1.5.0" = { name = "resolve"; packageName = "resolve"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz"; - sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; + sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; }; }; "source-map-0.1.9" = { @@ -1399,13 +1399,13 @@ let sha1 = "56da1a2d1cbf01d38b7e1afc31c10bcfa1929167"; }; }; - "ms-rest-2.2.3" = { + "ms-rest-2.2.4" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.3.tgz"; - sha1 = "f4f244de6282d9644504a50d11ac7f7cfb01b867"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.4.tgz"; + sha512 = "0v97pcpwwnmp3a1wyz2i2a2csiqsk0pnb9wcjsc2q2glyqr0nzhz51x6qhk3fz5dja6099p49p5bl87rkjp6cilnszjg6cpsklsbni9"; }; }; "ms-rest-azure-2.4.1" = { @@ -2020,22 +2020,22 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "@types/node-8.0.46" = { + "@types/node-8.0.47" = { name = "@types/node"; packageName = "@types/node"; - version = "8.0.46"; + version = "8.0.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.0.46.tgz"; - sha512 = "0bmyn8y1ifdybpbvvr9r1m473d789767c3yc5vj96jh2na04a4mbf7abvgkrq9cly0390sf6dql3xklvhv6hjl408gq49gr8vi0y6dd"; + url = "https://registry.npmjs.org/@types/node/-/node-8.0.47.tgz"; + sha512 = "24zynk3vnq6mz1x5s476q5hmksqcr3pwnsbqpkwyi2jlm8l61r4b9bh9l37zwhca9iaxb6v1ccyrxjzc3rfnpzqyizznmlnivphpv4h"; }; }; - "@types/request-2.0.6" = { + "@types/request-2.0.7" = { name = "@types/request"; packageName = "@types/request"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.0.6.tgz"; - sha512 = "13hi2wdyaa8iypfbfhf051n1jjbkqzywy7sh2hy1w605q5jy2hfc0sr684jpxa7hwfigck8n5gv72f9icb9m31k866nny90r69l1xgk"; + url = "https://registry.npmjs.org/@types/request/-/request-2.0.7.tgz"; + sha512 = "1ncrcrax2iw3iwr7qcnlx4qcd2cpymjl89kblqpxp54415ldf9x4drqap21rs0d8a1sjvhq2wmkfb8qaw5sjw46vmsiqprvwcxjcnc6"; }; }; "@types/uuid-3.4.3" = { @@ -2047,13 +2047,13 @@ let sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; }; }; - "is-buffer-1.1.5" = { + "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; - sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; "is-stream-1.1.0" = { @@ -3046,6 +3046,15 @@ let sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; }; }; + "mime-db-1.31.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz"; + sha512 = "1yvkd7sias7i24nvvbv8kj6sagzn758wclfky650vs38mhz0aq28bwcyg3y8nx13pa2fck3kdn5855cg62rxs3px8fj7l3rbkvg07d0"; + }; + }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -4108,13 +4117,13 @@ let sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; }; }; - "asn1.js-4.9.1" = { + "asn1.js-4.9.2" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz"; - sha1 = "48ba240b45a9280e94748990ba597d216617fd40"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz"; + sha512 = "071d32h5646ddyfxvmm0yd0xc320zh2cdsjal4hs8cs0hgn9dpq7k9c9ndlhjq3y93nlawkinm99znqvp0cxx61ic7qy4nn7d5arwvg"; }; }; "ripemd160-2.0.1" = { @@ -6376,13 +6385,13 @@ let sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; }; }; - "acorn-5.1.2" = { + "acorn-5.2.1" = { name = "acorn"; packageName = "acorn"; - version = "5.1.2"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz"; - sha512 = "1cgdl1g9g05iz6r09i0hmf78cmjca2yafazwaj202w9dck00b7jnmyk4l27ackxy13g4g4ay6vkf6glh18wm29vpmjqsga1n9j8bpm3"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz"; + sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc"; }; }; "foreach-2.0.5" = { @@ -9179,13 +9188,13 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.138.0" = { + "aws-sdk-2.141.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.138.0"; + version = "2.141.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.138.0.tgz"; - sha1 = "acb923132b51fafe8a464aa757f65d61ac30bd77"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.141.0.tgz"; + sha1 = "3d96a5970fd9f540ceabcc1d4baeb33b71583aa7"; }; }; "request-2.83.0" = { @@ -9332,13 +9341,13 @@ let sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; - "ajv-5.2.4" = { + "ajv-5.3.0" = { name = "ajv"; packageName = "ajv"; - version = "5.2.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.2.4.tgz"; - sha1 = "3daf9a8b67221299fdae8d82d117ed8e6c80244b"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz"; + sha1 = "4414ff74a50879c208ee5fdc826e32c303549eda"; }; }; "har-schema-2.0.0" = { @@ -9368,6 +9377,15 @@ let sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; }; }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; "json-schema-traverse-0.3.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -9377,15 +9395,6 @@ let sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; }; }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; "hoek-4.2.0" = { name = "hoek"; packageName = "hoek"; @@ -9413,13 +9422,13 @@ let sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; }; }; - "sntp-2.0.2" = { + "sntp-2.1.0" = { name = "sntp"; packageName = "sntp"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz"; - sha1 = "5064110f0af85f7cfdb7d6b67a40028ce52b4b2b"; + url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; + sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; "boom-5.2.0" = { @@ -9935,13 +9944,13 @@ let sha1 = "898508da2226f380df904728456849c1501a4b0d"; }; }; - "chalk-2.2.0" = { + "chalk-2.3.0" = { name = "chalk"; packageName = "chalk"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz"; - sha512 = "3vfffivwlp2hr7dwh84lvayba94a98ddhb8dwkv14magmfdj1n895880sik7liqv4xgnvvpr2v5jsm1gzl1fypl7nl9dpa6d3zhq4yh"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; + sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; }; }; "indent-string-3.2.0" = { @@ -10268,13 +10277,13 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "ignore-3.3.6" = { + "ignore-3.3.7" = { name = "ignore"; packageName = "ignore"; - version = "3.3.6"; + version = "3.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.6.tgz"; - sha512 = "2bv6fgfnwzivrdak4qc7bxfydydg6qqv9nynyqc9bpj2fq57m5ac4asylrl5m5n67nq8bxx86vrv97b8r9zq9g0vrd9y6ck28vndg0y"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; + sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; }; }; "inquirer-3.3.0" = { @@ -10304,6 +10313,15 @@ let sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; }; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + }; + }; "levn-0.3.0" = { name = "levn"; packageName = "levn"; @@ -10538,13 +10556,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "jschardet-1.5.1" = { + "jschardet-1.6.0" = { name = "jschardet"; packageName = "jschardet"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz"; - sha512 = "3c44v9rz6j4z6i7gj2v3wmfcqv5i47psysgd1p4jcgz114vfk99fif1n1r08jbsdkp4g3smv1wx7x4ikwa7q9dp5i1bc77la17s2kdw"; + url = "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz"; + sha512 = "2crjzdrqdgc38g7nmam84m472pkagwnh3dj64d7pc87g5dgbw04p56ma6qqvmbb0b0r1pcx4wqr4kwvf7zplmk0434z1x681sys32y5"; }; }; "tmp-0.0.33" = { @@ -10664,13 +10682,13 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-keywords-2.1.0" = { + "ajv-keywords-2.1.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz"; - sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz"; + sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; "slice-ansi-1.0.0" = { @@ -10682,13 +10700,13 @@ let sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; - "eslint-4.9.0" = { + "eslint-4.10.0" = { name = "eslint"; packageName = "eslint"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz"; - sha1 = "76879d274068261b191fe0f2f56c74c2f4208e8b"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz"; + sha512 = "284ihlnpkrds6jd5rwdbmknxhci60p5sv24p9aad5ra2rjwb1pcakk3p630bggahmq6jjsxngj9rfmpv31jy9gs29cl2qfxzzq6bi9h"; }; }; "supports-color-3.2.3" = { @@ -10754,13 +10772,13 @@ let sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; }; }; - "extract-zip-1.6.5" = { + "extract-zip-1.6.6" = { name = "extract-zip"; packageName = "extract-zip"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz"; - sha1 = "99a06735b6ea20ea9b705d779acffcc87cff0440"; + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz"; + sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c"; }; }; "https-proxy-agent-2.1.0" = { @@ -10790,15 +10808,6 @@ let sha512 = "1bj83dg7c5sca2v9cpzz4m83y9mm8icldvpk2c9sq3216cr6cn7qvfwhw9hq881nq7pii3xxbg8lz6g2p6223ililwkzzp68ndbfd45"; }; }; - "debug-2.2.0" = { - name = "debug"; - packageName = "debug"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - }; "mkdirp-0.5.0" = { name = "mkdirp"; packageName = "mkdirp"; @@ -10817,15 +10826,6 @@ let sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; }; }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; "fd-slicer-1.0.1" = { name = "fd-slicer"; packageName = "fd-slicer"; @@ -11438,13 +11438,13 @@ let sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; - "tar-pack-3.4.0" = { + "tar-pack-3.4.1" = { name = "tar-pack"; packageName = "tar-pack"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz"; - sha1 = "23be2d7f671a8339376cbdb0b8fe3fdebf317984"; + url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; + sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; }; }; "console-control-strings-1.1.0" = { @@ -13005,22 +13005,22 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "@ionic/cli-utils-1.13.1" = { - name = "@ionic/cli-utils"; - packageName = "@ionic/cli-utils"; - version = "1.13.1"; + "@ionic/cli-framework-0.0.2" = { + name = "@ionic/cli-framework"; + packageName = "@ionic/cli-framework"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.13.1.tgz"; - sha512 = "0smk0gdbf976vrvp6n8yvcp1idyh5gp16810wyafah3hx4zgrmw3ni0xnq0a0m1lq914b9c5cfcw8hr5m94fb54381r62r684kr7b5g"; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.0.2.tgz"; + sha512 = "0sx59z1970yad1c2k9h7mz0fkjj21im682qb503ypng99fr0bm3nl6p5sw37iy2x44jj9jbh3a7lcc3kzm8ymy5gqw4v7rxbmcn8vv0"; }; }; - "@ionic/discover-0.3.3" = { - name = "@ionic/discover"; - packageName = "@ionic/discover"; - version = "0.3.3"; + "@ionic/cli-utils-1.15.2" = { + name = "@ionic/cli-utils"; + packageName = "@ionic/cli-utils"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.3.tgz"; - sha512 = "3brs0chjqyz8drf7i6w67bmzxgvi88pb54m6qz3ml1wc3j42hgby7x0rjzwzdhkyx5573vbr91ias805gff1piyn7x7nq0c4568zj65"; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.15.2.tgz"; + sha512 = "1611izq9j89s32sjxkrv23zm9lihvk5wgyyxqwzn286npawpx2gxvs24xm45k5ysy0gxbba9k258ixj9a6vzaz644w69y63nh2fxw18"; }; }; "opn-5.1.0" = { @@ -13050,6 +13050,60 @@ let sha512 = "0k910mhnraax4m75hvgb3f2mhfj6yrsqn7fmyqm2sx137f1kqpz8icww9zhlmqka5pfi8hvprd0wcyflim0nvh7jb14yksjj9crcqna"; }; }; + "ncp-2.0.0" = { + name = "ncp"; + packageName = "ncp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; + sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + }; + }; + "superagent-3.8.0" = { + name = "superagent"; + packageName = "superagent"; + version = "3.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.0.tgz"; + sha512 = "05p3nzd9iw05i37pkvil2wjvrvlxzwr4ym9m6f7ykdlssf2ljywmsmc6y6kbm0qd91d2lssks1riwvlpnp63809qb6l9vv71ddccmgg"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; + "cookiejar-2.1.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; + sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + }; + }; + "formidable-1.1.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; + sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; + }; + }; + "@ionic/discover-0.3.3" = { + name = "@ionic/discover"; + packageName = "@ionic/discover"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.3.tgz"; + sha512 = "3brs0chjqyz8drf7i6w67bmzxgvi88pb54m6qz3ml1wc3j42hgby7x0rjzwzdhkyx5573vbr91ias805gff1piyn7x7nq0c4568zj65"; + }; + }; "archiver-2.1.0" = { name = "archiver"; packageName = "archiver"; @@ -13104,15 +13158,6 @@ let sha1 = "e400e57f0e60d8ef2bd4d068dc428a54345dbcda"; }; }; - "ncp-2.0.0" = { - name = "ncp"; - packageName = "ncp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; - sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; - }; - }; "proxy-middleware-0.15.0" = { name = "proxy-middleware"; packageName = "proxy-middleware"; @@ -13131,15 +13176,6 @@ let sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c"; }; }; - "superagent-3.7.0" = { - name = "superagent"; - packageName = "superagent"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-3.7.0.tgz"; - sha512 = "0dv80576bgsb7mq2mh3f0jgik6wnrki1ml5n8c2r21g4ql72z683fn7v63bxkf20s9ihh39gr1sqaadhpkj3yvnc5wbqv4dxv26pjzz"; - }; - }; "tiny-lr-1.0.5" = { name = "tiny-lr"; packageName = "tiny-lr"; @@ -13149,6 +13185,15 @@ let sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32"; }; }; + "netmask-1.0.6" = { + name = "netmask"; + packageName = "netmask"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz"; + sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35"; + }; + }; "archiver-utils-1.3.0" = { name = "archiver-utils"; packageName = "archiver-utils"; @@ -13275,33 +13320,6 @@ let sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e"; }; }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; - "cookiejar-2.1.1" = { - name = "cookiejar"; - packageName = "cookiejar"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; - sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; - }; - }; - "formidable-1.1.1" = { - name = "formidable"; - packageName = "formidable"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; - sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; - }; - }; "body-5.1.0" = { name = "body"; packageName = "body"; @@ -13383,15 +13401,6 @@ let sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; }; }; - "netmask-1.0.6" = { - name = "netmask"; - packageName = "netmask"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz"; - sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35"; - }; - }; "is-wsl-1.1.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -13455,15 +13464,6 @@ let sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; }; }; - "@reactivex/rxjs-5.5.0" = { - name = "@reactivex/rxjs"; - packageName = "@reactivex/rxjs"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.5.0.tgz"; - sha512 = "3r28zxbg2644s5bc09s7bjngpgs5ws56r4j5vq7sk370zyl8vppri090phfblsmqnpv5y1hfb6qlb8j19mb8i2qzqvyqyzx98xd10jr"; - }; - }; "chai-4.1.2" = { name = "chai"; packageName = "chai"; @@ -13536,6 +13536,15 @@ let sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd"; }; }; + "rxjs-5.5.2" = { + name = "rxjs"; + packageName = "rxjs"; + version = "5.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz"; + sha512 = "208dclsk809q1ra99l8j8xzrl9kcm4wpzwjb89rwdqrz78x3i0861kkgqi1sp3v8sdnnvdq0flmazdv96ah7jxpvwf74lw1llh2h5m1"; + }; + }; "semaphore-async-await-1.5.1" = { name = "semaphore-async-await"; packageName = "semaphore-async-await"; @@ -13590,15 +13599,6 @@ let sha1 = "5043ae47ee4ac16af07bb3d0ca561235e0c0d2fa"; }; }; - "symbol-observable-1.0.4" = { - name = "symbol-observable"; - packageName = "symbol-observable"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz"; - sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"; - }; - }; "assertion-error-1.0.2" = { name = "assertion-error"; packageName = "assertion-error"; @@ -13734,6 +13734,15 @@ let sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; }; }; + "symbol-observable-1.0.4" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz"; + sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"; + }; + }; "vscode-uri-1.0.1" = { name = "vscode-uri"; packageName = "vscode-uri"; @@ -14724,6 +14733,15 @@ let sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; }; }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; "json3-3.3.2" = { name = "json3"; packageName = "json3"; @@ -14733,6 +14751,15 @@ let sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; }; }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; "lru-cache-2.2.4" = { name = "lru-cache"; packageName = "lru-cache"; @@ -17424,13 +17451,13 @@ let sha1 = "892e47000a99be55bbf3774ffea0561d8879c259"; }; }; - "moment-timezone-0.5.13" = { + "moment-timezone-0.5.14" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.13"; + version = "0.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz"; - sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz"; + sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1"; }; }; "fresh-0.5.0" = { @@ -17595,13 +17622,13 @@ let sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; - "websocket-stream-5.0.1" = { + "websocket-stream-5.1.1" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.1.tgz"; - sha512 = "3w842xsi7pgjjr5fkdzbx9dfsjl87x6c8wrvxgy8i1lr399yjiggbwrfdvpccv698f7n4ywvf7dbc8g61ly99yw1lf7fwpfrypg8x9p"; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.1.tgz"; + sha512 = "18iw90ncl6cpip9j7rxdf6mag5klhhn7fklhb5lz41dy3wk9vxp3lxxkmwsnldjk5zfx3fjww55xg47k5k1a4cpph92k7j26p9kk56a"; }; }; "leven-1.0.2" = { @@ -18756,13 +18783,13 @@ let sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e"; }; }; - "query-string-5.0.0" = { + "query-string-5.0.1" = { name = "query-string"; packageName = "query-string"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.0.0.tgz"; - sha1 = "fbdf7004b4d2aff792f9871981b7a2794f555947"; + url = "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz"; + sha512 = "0lcnspv96dv03600bgjxk2ypak8mysp77n47jkddpz6ldcgscwyan1akqjrddii4abb2brz6gr6yq9pcbdx63m9i16kk8m5028qrkv8"; }; }; "qw-1.0.1" = { @@ -18819,13 +18846,13 @@ let sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; }; }; - "worker-farm-1.5.0" = { + "worker-farm-1.5.1" = { name = "worker-farm"; packageName = "worker-farm"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.0.tgz"; - sha512 = "2lrlysxfbyzywla6i1q07xncmw30w1icgq18c4bra25dl6wvcd3mxg1lqbf88w5h7mqnf98j8ll657wnqwjq9rwd7pbmd9i11964x0c"; + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.1.tgz"; + sha512 = "0vwa4w6rn98nh8igcx2sni6hccs5wfwhh68zxzzgffimr7gmy5nw1ks0j2n0gra7g2ahsl7p7l34mcn8702n01y30qc6xxcdbllg4sg"; }; }; "write-file-atomic-2.1.0" = { @@ -19350,13 +19377,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.45.0" = { + "snyk-1.47.0" = { name = "snyk"; packageName = "snyk"; - version = "1.45.0"; + version = "1.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.45.0.tgz"; - sha1 = "890eae8b1c14ff8ff1be25388702cb585df86834"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.47.0.tgz"; + sha1 = "2c86a734a842fdfc18b97df682a91d419fec70f3"; }; }; "spawn-please-0.3.0" = { @@ -19539,13 +19566,13 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-go-plugin-1.3.7" = { + "snyk-go-plugin-1.3.8" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.3.7.tgz"; - sha512 = "0i5dcqyyfmb0caz9fa3qaqx7k1f79qyd9y6jn031c75647y8hmk265w6ynkpz8gkv7cn4w6cznrm5q436vg4wgs1ahqd5xrwkhsbxp4"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.3.8.tgz"; + sha512 = "0q7vax6wyzrd2d3rzymrvhqcb1mnhpya12f26v05ly4ydivj1x67mbw0bpcdccagzijy8lbsvn9pp7zy59mikyfvfaj1084xkml4xwc"; }; }; "snyk-gradle-plugin-1.2.0" = { @@ -19575,6 +19602,15 @@ let sha512 = "3ar9rk77y39sydnriw6k9p5s15qpv1in81365l0yjbvn6qis7v4na98xfibsmfnnkjyblnd5qs2q1j6fabdfx4g2x5yi7ld6hdm6r3r"; }; }; + "snyk-nuget-plugin-1.0.0" = { + name = "snyk-nuget-plugin"; + packageName = "snyk-nuget-plugin"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.0.0.tgz"; + sha512 = "0kqpbx8ic08dxrlg4mw6xv4ka0bi7f20h53i77rfs0v7j2cnihaij945b78rn6q464simc3amr66jv7svfwyyimj10qcvzhbb02ghvj"; + }; + }; "snyk-policy-1.7.1" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -19755,6 +19791,42 @@ let sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1"; }; }; + "zip-1.2.0" = { + name = "zip"; + packageName = "zip"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/zip/-/zip-1.2.0.tgz"; + sha1 = "ad0ad42265309be42eb56fc86194e17c24e66a9c"; + }; + }; + "bops-0.1.1" = { + name = "bops"; + packageName = "bops"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bops/-/bops-0.1.1.tgz"; + sha1 = "062e02a8daa801fa10f2e5dbe6740cff801fe17e"; + }; + }; + "base64-js-0.0.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz"; + sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"; + }; + }; + "to-utf8-0.0.1" = { + name = "to-utf8"; + packageName = "to-utf8"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz"; + sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852"; + }; + }; "minimatch-3.0.2" = { name = "minimatch"; packageName = "minimatch"; @@ -19900,13 +19972,13 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; - "domino-1.0.29" = { + "domino-1.0.30" = { name = "domino"; packageName = "domino"; - version = "1.0.29"; + version = "1.0.30"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-1.0.29.tgz"; - sha1 = "de8aa1f6f98e3c5538feb7a61fa69c1eabbace06"; + url = "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz"; + sha512 = "1g3pbkg3gg3kjffah03vil47662ra58gckz5z8qymfgb9xq97k7vsd83410fmncbbll1p40rs0s4r0pgdypfvj9j2fq146j41dbqjla"; }; }; "express-handlebars-3.0.0" = { @@ -19918,13 +19990,13 @@ let sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; - "mediawiki-title-0.5.6" = { + "mediawiki-title-0.6.4" = { name = "mediawiki-title"; packageName = "mediawiki-title"; - version = "0.5.6"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz"; - sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24"; + url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz"; + sha1 = "b453ded9e0d9d7c97b7914f3100dbe68840c6e03"; }; }; "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { @@ -19974,13 +20046,13 @@ let sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; - "yargs-5.0.0" = { + "yargs-7.1.0" = { name = "yargs"; packageName = "yargs"; - version = "5.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; - sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; + sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; }; }; "is-arguments-1.0.2" = { @@ -20037,13 +20109,13 @@ let sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; }; }; - "hot-shots-4.7.0" = { + "hot-shots-4.7.1" = { name = "hot-shots"; packageName = "hot-shots"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.7.0.tgz"; - sha1 = "1fb2eecd234c938e3ccb56c93681b573455dd64c"; + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.7.1.tgz"; + sha1 = "35cb2d3691c66cd18a0fcdffcc9e5b21194275b0"; }; }; "limitation-0.2.0" = { @@ -20055,15 +20127,6 @@ let sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62"; }; }; - "yargs-7.1.0" = { - name = "yargs"; - packageName = "yargs"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; - sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; - }; - }; "dnscache-1.0.1" = { name = "dnscache"; packageName = "dnscache"; @@ -20182,13 +20245,13 @@ let sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff"; }; }; - "msgpack5-3.5.1" = { + "msgpack5-3.6.0" = { name = "msgpack5"; packageName = "msgpack5"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.5.1.tgz"; - sha512 = "3a93gp3vf9vwp9dk4xsf25d7m8hmlm779x1wbhv6a8fg9p0341nsmbp2nmip7ypa1bc59f2y07b92cr3lb99i8a62828l5bppsylv2j"; + url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz"; + sha512 = "3nr151ygx2w2pydaamcjrcn5ksl2rx09sdad8gh0rp1l07igigvfsw0xjjcnxrdws1rwy7g1j533qzhr7w25jisad6npv9rf1j84yz8"; }; }; "dom-storage-2.0.2" = { @@ -20200,15 +20263,6 @@ let sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; }; }; - "yargs-parser-5.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; - sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; - }; - }; "lodash.clone-4.3.2" = { name = "lodash.clone"; packageName = "lodash.clone"; @@ -20227,13 +20281,13 @@ let sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; }; }; - "yargs-parser-3.2.0" = { + "yargs-parser-5.0.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "3.2.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; - sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; + sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; }; }; "airplayer-2.0.0" = { @@ -21362,13 +21416,13 @@ let sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; }; }; - "sanitize-html-1.14.1" = { + "sanitize-html-1.15.0" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.14.1"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz"; - sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.15.0.tgz"; + sha512 = "26swjh5wivmim7l7g64f40vnr1dr7kyl5hr9csv84s2apa43rs19qypyf7y5r3a19v0pg9ibcs1spqykznq6jcxvmwrbwdihm78ndfn"; }; }; "linkify-it-1.2.4" = { @@ -21380,13 +21434,22 @@ let sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a"; }; }; - "regexp-quote-0.0.0" = { - name = "regexp-quote"; - packageName = "regexp-quote"; - version = "0.0.0"; + "lodash.escaperegexp-4.1.2" = { + name = "lodash.escaperegexp"; + packageName = "lodash.escaperegexp"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz"; - sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; + url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; + sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + }; + }; + "srcset-1.0.0" = { + name = "srcset"; + packageName = "srcset"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz"; + sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; }; }; "domutils-1.6.2" = { @@ -21776,49 +21839,166 @@ let sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; }; }; - "coa-1.0.4" = { + "coa-2.0.0" = { name = "coa"; packageName = "coa"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz"; - sha1 = "a9ef153660d6a86a8bdec0289a5c684d217432fd"; + url = "https://registry.npmjs.org/coa/-/coa-2.0.0.tgz"; + sha1 = "af881ebe214fc29bee4e9e76b4956b6132295546"; }; }; - "js-yaml-3.7.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.7.0"; + "css-url-regex-1.1.0" = { + name = "css-url-regex"; + packageName = "css-url-regex"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz"; + sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec"; }; }; - "whet.extend-0.9.9" = { - name = "whet.extend"; - packageName = "whet.extend"; - version = "0.9.9"; + "unquote-1.1.0" = { + name = "unquote"; + packageName = "unquote"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz"; - sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; + url = "https://registry.npmjs.org/unquote/-/unquote-1.1.0.tgz"; + sha1 = "98e1fc608b6b854c75afb1b95afc099ba69d942f"; }; }; - "csso-2.3.2" = { + "css-select-1.3.0-rc0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.3.0-rc0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz"; + sha1 = "6f93196aaae737666ea1036a8cb14a8fcb7a9231"; + }; + }; + "css-select-base-adapter-0.1.0" = { + name = "css-select-base-adapter"; + packageName = "css-select-base-adapter"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz"; + sha1 = "0102b3d14630df86c3eb9fa9f5456270106cf990"; + }; + }; + "css-tree-1.0.0-alpha25" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha25"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz"; + sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw"; + }; + }; + "csso-3.3.1" = { name = "csso"; packageName = "csso"; - version = "2.3.2"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz"; - sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85"; + url = "https://registry.npmjs.org/csso/-/csso-3.3.1.tgz"; + sha512 = "087ks3lnvyygbxivwf2fnn53a033ncz1ywm3jyarhz2hvsflka09iw611cwc55ix974bflcf0wmg6zvfkhxsjqmqfrz61w5y1yi6c9s"; }; }; - "clap-1.2.3" = { - name = "clap"; - packageName = "clap"; - version = "1.2.3"; + "object.values-1.0.4" = { + name = "object.values"; + packageName = "object.values"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz"; - sha512 = "1ha66pbxhll7c6vv641rahzq0ylwaifskwpwggy9k4sfh8r9n0r8mpqbib22dppb7zfrk6a84a4dyaal7mqs12jvlaxszz11py0nap0"; + url = "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz"; + sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a"; + }; + }; + "stable-0.1.6" = { + name = "stable"; + packageName = "stable"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz"; + sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10"; + }; + }; + "util.promisify-1.0.0" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; + sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb"; + }; + }; + "mdn-data-1.0.0" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.0.0.tgz"; + sha1 = "a69d9da76847b4d5834c1465ea25c0653a1fbf66"; + }; + }; + "es-abstract-1.9.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz"; + sha512 = "3frzxsmb5c319c73k3r0zn7djgqbzvnjch99hni35lram09a0q8jlh666m8mjaag9gjnlqjd9gl9xb769gkjd4pb3lhvv58h8kchkcj"; + }; + }; + "es-to-primitive-1.1.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; + sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; + }; + }; + "is-callable-1.1.3" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; + sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + }; + }; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; + "is-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "is-symbol-1.0.1" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; + sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; + }; + }; + "object.getownpropertydescriptors-2.0.3" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; }; }; "enhanced-resolve-2.3.0" = { @@ -22001,13 +22181,13 @@ let sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de"; }; }; - "typescript-2.5.3" = { + "typescript-2.6.1" = { name = "typescript"; packageName = "typescript"; - version = "2.5.3"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz"; - sha512 = "3mhb4cnf07q9jnz7r8iy06iwsq32byfvn4z3f6bbbw2sknnppa4q2v5vm12bxix8lwvbdhhqhdvkr0v1bhdb0zkxf90pqcjrm1d5lm6"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz"; + sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631"; }; }; "zip-object-0.1.0" = { @@ -22127,15 +22307,6 @@ let sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg"; }; }; - "forever-monitor-1.1.0" = { - name = "forever-monitor"; - packageName = "forever-monitor"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz"; - sha1 = "439ce036f999601cff551aea7f5151001a869ef9"; - }; - }; "getmac-1.2.1" = { name = "getmac"; packageName = "getmac"; @@ -22181,6 +22352,15 @@ let sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937"; }; }; + "memorystore-1.6.0" = { + name = "memorystore"; + packageName = "memorystore"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.0.tgz"; + sha1 = "1fb5fb5f0b2edf1add184917e918f094a9ff3465"; + }; + }; "node-cache-4.1.1" = { name = "node-cache"; packageName = "node-cache"; @@ -22307,87 +22487,6 @@ let sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; }; }; - "broadway-0.2.10" = { - name = "broadway"; - packageName = "broadway"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz"; - sha1 = "0f58532be140426e9000e49a93e242a0d1263238"; - }; - }; - "minimatch-0.0.5" = { - name = "minimatch"; - packageName = "minimatch"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz"; - sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de"; - }; - }; - "watch-0.5.1" = { - name = "watch"; - packageName = "watch"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/watch/-/watch-0.5.1.tgz"; - sha1 = "50ea3a056358c98073e0bca59956de4afd20b213"; - }; - }; - "utile-0.1.7" = { - name = "utile"; - packageName = "utile"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; - sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69"; - }; - }; - "cliff-0.1.8" = { - name = "cliff"; - packageName = "cliff"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz"; - sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272"; - }; - }; - "winston-0.7.2" = { - name = "winston"; - packageName = "winston"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.7.2.tgz"; - sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb"; - }; - }; - "lru-cache-1.0.6" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz"; - sha1 = "aa50f97047422ac72543bda177a9c9d018d98452"; - }; - }; - "ncp-0.2.7" = { - name = "ncp"; - packageName = "ncp"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz"; - sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1"; - }; - }; - "rimraf-1.0.9" = { - name = "rimraf"; - packageName = "rimraf"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz"; - sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1"; - }; - }; "extract-opts-3.3.1" = { name = "extract-opts"; packageName = "extract-opts"; @@ -22964,13 +23063,13 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; - "pino-4.8.0" = { + "pino-4.8.2" = { name = "pino"; packageName = "pino"; - version = "4.8.0"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.8.0.tgz"; - sha1 = "ffe37684233ebf33ffa58140d7fb5c1f7e170ecd"; + url = "https://registry.npmjs.org/pino/-/pino-4.8.2.tgz"; + sha512 = "2cd8127wzi403lmj965crklncvs06pfnnc8can3s1m2v1lrs1cfpxmnqa4g4rgdph5zz5rqfsg16a0hwzb6j15fpqhxmw3agl5axv8a"; }; }; "postcss-6.0.11" = { @@ -24297,7 +24396,7 @@ in sources."moment-2.17.1" sources."node.extend-1.0.10" sources."pkginfo-0.2.2" - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."source-map-0.1.9" sources."walk-sync-0.3.2" sources."xml2tss-0.0.5" @@ -24586,7 +24685,7 @@ in ]; }) sources."moment-2.19.1" - (sources."ms-rest-2.2.3" // { + (sources."ms-rest-2.2.4" // { dependencies = [ sources."moment-2.18.1" ]; @@ -24692,10 +24791,10 @@ in sources."has-color-0.1.7" sources."ansi-styles-1.0.0" sources."strip-ansi-0.1.1" - sources."@types/node-8.0.46" - sources."@types/request-2.0.6" + sources."@types/node-8.0.47" + sources."@types/request-2.0.7" sources."@types/uuid-3.4.3" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-stream-1.1.0" sources."@types/form-data-2.2.0" sources."lodash-4.17.4" @@ -24892,7 +24991,7 @@ in sources."ext-list-2.2.2" sources."meow-3.7.0" sources."sort-keys-length-1.0.1" - sources."mime-db-1.30.0" + sources."mime-db-1.31.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -25041,7 +25140,7 @@ in sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" sources."readable-stream-2.3.3" - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" @@ -25108,7 +25207,7 @@ in sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.1" + sources."asn1.js-4.9.2" (sources."ripemd160-2.0.1" // { dependencies = [ sources."hash-base-2.0.2" @@ -25126,7 +25225,7 @@ in sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."function-bind-1.1.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."lexical-scope-1.2.0" sources."astw-2.2.0" sources."acorn-4.0.13" @@ -25702,7 +25801,7 @@ in sources."browserify-transform-tools-1.7.0" sources."falafel-2.1.0" sources."through-2.3.8" - sources."acorn-5.1.2" + sources."acorn-5.2.1" sources."foreach-2.0.5" sources."isarray-0.0.1" sources."object-keys-1.0.11" @@ -25716,7 +25815,7 @@ in sources."interpret-1.0.4" sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."path-parse-1.0.5" (sources."browserify-14.4.0" // { dependencies = [ @@ -25841,7 +25940,7 @@ in sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.1" + sources."asn1.js-4.9.2" (sources."ripemd160-2.0.1" // { dependencies = [ sources."hash-base-2.0.2" @@ -25850,7 +25949,7 @@ in sources."sha.js-2.4.9" sources."miller-rabin-4.0.1" sources."function-bind-1.1.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."lexical-scope-1.2.0" (sources."astw-2.2.0" // { dependencies = [ @@ -26532,7 +26631,7 @@ in sources."JSONStream-1.3.1" sources."async-2.5.0" sources."aws4-1.6.0" - sources."aws-sdk-2.138.0" + sources."aws-sdk-2.141.0" sources."ini-1.3.4" sources."optimist-0.6.1" sources."request-2.83.0" @@ -26581,13 +26680,12 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -26595,7 +26693,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -26637,7 +26735,7 @@ in sources."import-jsx-1.3.0" (sources."ink-0.3.1" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; @@ -26869,20 +26967,20 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz"; - sha1 = "76879d274068261b191fe0f2f56c74c2f4208e8b"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz"; + sha512 = "284ihlnpkrds6jd5rwdbmknxhci60p5sv24p9aad5ra2rjwb1pcakk3p630bggahmq6jjsxngj9rfmpv31jy9gs29cl2qfxzzq6bi9h"; }; dependencies = [ - sources."ajv-5.2.4" + sources."ajv-5.3.0" (sources."babel-code-frame-6.26.0" // { dependencies = [ sources."chalk-1.1.3" sources."strip-ansi-3.0.1" ]; }) - (sources."chalk-2.2.0" // { + (sources."chalk-2.3.0" // { dependencies = [ sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" @@ -26901,7 +26999,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-9.18.0" - sources."ignore-3.3.6" + sources."ignore-3.3.7" sources."imurmurhash-0.1.4" sources."inquirer-3.3.0" sources."is-resolvable-1.0.0" @@ -26928,6 +27026,7 @@ in sources."text-table-0.2.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."js-tokens-3.0.2" sources."ansi-styles-2.2.1" @@ -26957,7 +27056,7 @@ in sources."ms-2.0.0" sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.1.2" + sources."acorn-5.2.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -27000,7 +27099,7 @@ in sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.19" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -27022,7 +27121,7 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."ajv-keywords-2.1.0" + sources."ajv-keywords-2.1.1" sources."slice-ansi-1.0.0" ]; buildInputs = globalBuildInputs; @@ -27047,9 +27146,9 @@ in sources."supports-color-2.0.0" ]; }) - (sources."eslint-4.9.0" // { + (sources."eslint-4.10.0" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."strip-ansi-4.0.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" @@ -27057,7 +27156,7 @@ in ]; }) sources."optionator-0.8.2" - sources."resolve-1.4.0" + sources."resolve-1.5.0" (sources."supports-color-3.2.3" // { dependencies = [ sources."has-flag-1.0.0" @@ -27068,7 +27167,7 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."ansi-regex-2.1.1" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."babel-code-frame-6.26.0" sources."concat-stream-1.6.0" sources."cross-spawn-5.1.0" @@ -27083,11 +27182,11 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-9.18.0" - sources."ignore-3.3.6" + sources."ignore-3.3.7" sources."imurmurhash-0.1.4" (sources."inquirer-3.3.0" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."strip-ansi-4.0.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" @@ -27110,7 +27209,7 @@ in sources."strip-json-comments-2.0.1" (sources."table-4.0.2" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; @@ -27118,6 +27217,7 @@ in sources."text-table-0.2.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."js-tokens-3.0.2" sources."color-convert-1.9.0" @@ -27142,7 +27242,7 @@ in sources."ms-2.0.0" sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.1.2" + sources."acorn-5.2.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -27190,7 +27290,7 @@ in sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.19" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -27209,7 +27309,7 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."ajv-keywords-2.1.0" + sources."ajv-keywords-2.1.1" sources."slice-ansi-1.0.0" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" @@ -27248,7 +27348,7 @@ in sha512 = "261zykpcgv0r96yd3qck2g2a990psma49p37kdk1xgic657pv1jnp9n9js90hqv58spgmww85kig9bd7b05lyxagz4d8nm5algyc00x"; }; dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."log-update-2.2.0" sources."meow-3.7.0" (sources."ora-1.3.0" // { @@ -27336,12 +27436,7 @@ in ]; }) sources."debug-2.6.9" - (sources."extract-zip-1.6.5" // { - dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" - ]; - }) + sources."extract-zip-1.6.6" sources."https-proxy-agent-2.1.0" sources."mime-1.4.1" sources."progress-2.0.0" @@ -27524,7 +27619,7 @@ in }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -27562,7 +27657,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" @@ -27846,7 +27941,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."acorn-globals-1.0.9" sources."pop-iterate-1.0.1" sources."weak-map-1.0.5" @@ -27957,7 +28052,7 @@ in sources."lodash.isstring-4.0.1" sources."lodash.mapvalues-4.6.0" sources."rechoir-0.6.2" - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."detect-file-0.1.0" sources."is-glob-2.0.1" sources."micromatch-2.3.11" @@ -27997,7 +28092,7 @@ in ]; }) sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."remove-trailing-separator-1.1.0" sources."for-own-0.1.5" @@ -28200,23 +28295,55 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "3.13.2"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-3.13.2.tgz"; - sha512 = "2wd7s9cn0x8ig8dpajdk40ssym0byplr6qv8gd2ppb96r4cyhmx519k8m0skdzdir02d5ady9hbaz90jcfl4j1zfzibjjwr9g8rddb1"; + url = "https://registry.npmjs.org/ionic/-/ionic-3.15.2.tgz"; + sha512 = "0sdvn9yk297mzlaw81phrpki1xcg06jyyg8kc5wkwkyxbki8vszans6ynzlicpfyq4nqj2a31h4nwh9qyb0pxm7p838a2kxl33016a6"; }; dependencies = [ - sources."@ionic/cli-utils-1.13.1" - sources."@ionic/discover-0.3.3" - sources."chalk-2.2.0" + sources."@ionic/cli-framework-0.0.2" + sources."@ionic/cli-utils-1.15.2" + sources."chalk-2.3.0" sources."opn-5.1.0" sources."os-name-2.0.1" sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tslib-1.8.0" + sources."ncp-2.0.0" + sources."strip-ansi-4.0.0" + sources."superagent-3.8.0" + sources."ansi-regex-3.0.0" + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."debug-3.1.0" + sources."extend-3.0.1" + sources."form-data-2.3.1" + sources."formidable-1.1.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."qs-6.5.1" + sources."readable-stream-2.3.3" + sources."ms-2.0.0" + sources."asynckit-0.4.0" + sources."combined-stream-1.0.5" + sources."mime-types-2.1.17" + sources."delayed-stream-1.0.0" + sources."mime-db-1.30.0" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."@ionic/discover-0.3.3" sources."archiver-2.1.0" sources."basic-auth-1.1.0" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."chokidar-1.7.0" sources."ci-info-1.1.1" sources."cross-spawn-5.1.0" @@ -28225,15 +28352,19 @@ in sources."elementtree-0.1.7" (sources."express-4.16.2" // { dependencies = [ + sources."debug-2.6.9" sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) sources."inquirer-3.3.0" - sources."leek-0.0.24" + (sources."leek-0.0.24" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."lodash-4.17.4" sources."minimist-1.2.0" - sources."ncp-2.0.0" sources."proxy-middleware-0.15.0" (sources."slice-ansi-1.0.0" // { dependencies = [ @@ -28246,27 +28377,20 @@ in sources."is-fullwidth-code-point-2.0.0" ]; }) - (sources."strip-ansi-4.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - ]; - }) - (sources."superagent-3.7.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."form-data-2.3.1" - ]; - }) sources."tar-2.2.1" - sources."tiny-lr-1.0.5" + (sources."tiny-lr-1.0.5" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."uuid-3.1.0" sources."wrap-ansi-3.0.1" sources."ws-3.2.0" + sources."netmask-1.0.6" sources."archiver-utils-1.3.0" sources."async-2.5.0" sources."buffer-crc32-0.2.13" sources."glob-7.1.2" - sources."readable-stream-2.3.3" sources."tar-stream-1.5.4" sources."zip-stream-1.2.0" sources."graceful-fs-4.1.11" @@ -28275,7 +28399,6 @@ in sources."remove-trailing-separator-1.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."inherits-2.0.3" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -28283,12 +28406,6 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" sources."bl-1.2.1" sources."end-of-stream-1.4.0" sources."xtend-4.0.1" @@ -28297,22 +28414,17 @@ in sources."crc-3.5.0" sources."bytes-3.0.0" sources."content-type-1.0.4" - sources."debug-2.6.9" sources."depd-1.1.1" sources."http-errors-1.6.2" sources."iconv-lite-0.4.19" sources."on-finished-2.3.0" - sources."qs-6.5.1" sources."raw-body-2.3.2" sources."type-is-1.6.15" - sources."ms-2.0.0" sources."setprototypeof-1.0.3" sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.17" - sources."mime-db-1.30.0" sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -28350,7 +28462,7 @@ in ]; }) sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -28373,11 +28485,16 @@ in sources."rc-1.2.2" (sources."request-2.81.0" // { dependencies = [ + sources."form-data-2.1.4" sources."qs-6.4.0" ]; }) sources."hawk-3.1.3" - sources."tar-pack-3.4.0" + (sources."tar-pack-3.4.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" @@ -28388,6 +28505,7 @@ in dependencies = [ sources."string-width-1.0.2" sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" ]; }) sources."set-blocking-2.0.0" @@ -28400,22 +28518,19 @@ in dependencies = [ sources."string-width-1.0.2" sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" ]; }) sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."ansi-regex-2.1.1" sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" - sources."combined-stream-1.0.5" - sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" @@ -28426,8 +28541,6 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" sources."ajv-4.11.8" sources."har-schema-1.0.5" sources."co-4.6.0" @@ -28492,18 +28605,19 @@ in sources."etag-1.8.1" (sources."finalhandler-1.1.0" // { dependencies = [ + sources."debug-2.6.9" sources."statuses-1.3.1" ]; }) sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.2" sources."range-parser-1.2.0" (sources."send-0.16.1" // { dependencies = [ + sources."debug-2.6.9" sources."statuses-1.3.1" ]; }) @@ -28514,7 +28628,6 @@ in sources."forwarded-0.1.2" sources."ipaddr.js-1.5.2" sources."destroy-1.0.4" - sources."mime-1.4.1" sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" @@ -28528,7 +28641,7 @@ in sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."mimic-fn-1.1.0" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."tmp-0.0.33" sources."escape-string-regexp-1.0.5" sources."is-promise-2.1.0" @@ -28544,9 +28657,6 @@ in sources."lodash._getnative-3.9.1" sources."lodash.isarguments-3.1.0" sources."lodash.isarray-3.0.4" - sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" - sources."formidable-1.1.1" sources."block-stream-0.0.9" (sources."body-5.1.0" // { dependencies = [ @@ -28566,7 +28676,6 @@ in sources."websocket-extensions-0.1.2" sources."async-limiter-1.0.0" sources."ultron-1.1.0" - sources."netmask-1.0.6" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" sources."color-convert-1.9.0" @@ -28681,7 +28790,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."argparse-1.0.9" sources."sprintf-js-1.0.3" sources."has-flag-1.0.0" @@ -28698,16 +28807,15 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.5.2"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.2.tgz"; - sha512 = "2vlp1rxalykzb0qwn4sv1pk58ph37nhaqqgnih83i39msplqh826dvbdd4j1791hl2almpj9g1snhdfy89cyn8y86bz7bcbr9mh6aih"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.4.tgz"; + sha512 = "08pa61nhkvmac5kwr61iqbw0251r6kwhix9l41rgxjinpi8p9s5anvy8a2zzfjrlkr93aqbbniy4qa095li7xn84vl8dv6aqxkpaba4"; }; dependencies = [ - sources."@reactivex/rxjs-5.5.0" sources."chai-4.1.2" sources."chai-as-promised-7.1.1" - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."commander-2.11.0" sources."fast-json-patch-2.0.6" sources."glob-7.1.2" @@ -28721,13 +28829,13 @@ in sources."mz-2.7.0" sources."object-hash-1.2.0" sources."opentracing-0.14.1" + sources."rxjs-5.5.2" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."typescript-2.4.2" sources."vscode-jsonrpc-3.4.1" sources."vscode-languageserver-3.4.3" sources."vscode-languageserver-types-3.4.0" - sources."symbol-observable-1.0.4" sources."assertion-error-1.0.2" sources."check-error-1.0.2" sources."deep-eql-3.0.1" @@ -28764,6 +28872,7 @@ in sources."object-assign-4.1.1" sources."thenify-all-1.6.0" sources."thenify-3.3.0" + sources."symbol-observable-1.0.4" sources."vscode-uri-1.0.1" sources."vscode-languageserver-protocol-3.4.4" ]; @@ -28951,7 +29060,7 @@ in sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" - sources."superagent-3.7.0" + sources."superagent-3.8.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."debug-3.1.0" @@ -29117,13 +29226,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -29131,7 +29239,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -29401,7 +29509,7 @@ in }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -29436,7 +29544,7 @@ in sources."hawk-3.1.3" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."minimist-0.0.8" sources."abbrev-1.1.1" sources."osenv-0.1.4" @@ -29794,7 +29902,7 @@ in }; dependencies = [ sources."async-1.5.2" - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" sources."command-join-2.0.0" @@ -29959,7 +30067,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."through-2.3.8" sources."JSONStream-1.3.1" sources."is-text-path-1.0.1" @@ -30066,7 +30174,7 @@ in sources."onetime-2.0.1" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.19" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."tmp-0.0.33" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" @@ -30247,7 +30355,7 @@ in ]; }) sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."remove-trailing-separator-1.1.0" sources."for-own-0.1.5" @@ -30311,7 +30419,7 @@ in sources."hawk-6.0.2" sources."http-signature-1.2.0" sources."performance-now-2.1.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" @@ -30320,7 +30428,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" ]; }) @@ -30384,7 +30492,7 @@ in }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -30426,7 +30534,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" @@ -30567,6 +30675,7 @@ in sources."html-entities-1.2.1" sources."is-wsl-1.1.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" (sources."engine.io-3.1.3" // { dependencies = [ @@ -30690,7 +30799,7 @@ in }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -30728,7 +30837,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."minimist-0.0.8" sources."abbrev-1.1.1" sources."osenv-0.1.4" @@ -30978,7 +31087,7 @@ in sources."slash-1.0.0" sources."uri-js-3.0.2" sources."lodash-4.17.4" - sources."superagent-3.7.0" + sources."superagent-3.8.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."debug-3.1.0" @@ -31115,13 +31224,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -31129,7 +31237,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -31272,13 +31380,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -31286,7 +31393,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -31490,7 +31597,7 @@ in }) sources."hawk-3.1.3" sources."tar-2.2.1" - (sources."tar-pack-3.4.0" // { + (sources."tar-pack-3.4.1" // { dependencies = [ sources."rimraf-2.6.2" sources."glob-7.1.2" @@ -31623,7 +31730,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."minimist-0.0.8" sources."abbrev-1.1.1" sources."osenv-0.1.4" @@ -31812,7 +31919,7 @@ in }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -31846,7 +31953,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."minimist-0.0.8" sources."abbrev-1.1.1" sources."osenv-0.1.4" @@ -31977,7 +32084,7 @@ in sources."ansi-regex-3.0.0" ]; }) - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."configstore-3.1.1" sources."import-lazy-2.1.0" sources."is-installed-globally-0.1.0" @@ -32135,7 +32242,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" ]; }) @@ -32193,7 +32300,7 @@ in sources."cookie-signature-1.0.6" sources."object-assign-4.1.1" sources."vary-1.1.2" - sources."moment-timezone-0.5.13" + sources."moment-timezone-0.5.14" sources."moment-2.19.1" sources."accepts-1.3.4" sources."array-flatten-1.1.1" @@ -32251,7 +32358,7 @@ in sources."pump-1.0.2" sources."reinterval-1.1.0" sources."split2-2.2.0" - (sources."websocket-stream-5.0.1" // { + (sources."websocket-stream-5.1.1" // { dependencies = [ sources."ws-3.2.0" ]; @@ -32469,10 +32576,11 @@ in sources."performance-now-2.1.0" sources."uuid-3.1.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."nan-2.6.2" (sources."node-pre-gyp-0.6.36" // { @@ -32494,7 +32602,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" ]; }) @@ -32502,7 +32610,7 @@ in sources."rc-1.2.2" sources."rimraf-2.6.2" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -32743,7 +32851,7 @@ in sources."path-is-inside-1.0.2" sources."promise-inflight-1.0.1" sources."qrcode-terminal-0.11.0" - sources."query-string-5.0.0" + sources."query-string-5.0.1" sources."qw-1.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" @@ -32783,7 +32891,7 @@ in sources."uuid-3.1.0" sources."validate-npm-package-name-3.0.0" sources."which-1.3.0" - sources."worker-farm-1.5.0" + sources."worker-farm-1.5.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" @@ -32976,13 +33084,12 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -32990,7 +33097,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -33016,7 +33123,7 @@ in sources."unique-slug-2.0.0" (sources."boxen-1.2.2" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."string-width-2.1.1" sources."is-fullwidth-code-point-2.0.0" ]; @@ -33174,13 +33281,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -33188,7 +33294,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -33305,7 +33411,7 @@ in }) sources."semver-5.4.1" sources."semver-utils-1.1.1" - (sources."snyk-1.45.0" // { + (sources."snyk-1.47.0" // { dependencies = [ sources."update-notifier-0.5.0" sources."latest-version-1.0.1" @@ -33320,7 +33426,7 @@ in (sources."update-notifier-2.3.0" // { dependencies = [ sources."boxen-1.2.2" - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."configstore-3.1.1" sources."latest-version-3.1.0" sources."xdg-basedir-3.0.0" @@ -33607,10 +33713,15 @@ in sources."open-0.0.5" sources."os-name-1.0.3" sources."snyk-config-1.0.1" - sources."snyk-go-plugin-1.3.7" + sources."snyk-go-plugin-1.3.8" sources."snyk-gradle-plugin-1.2.0" sources."snyk-module-1.8.1" sources."snyk-mvn-plugin-1.1.0" + (sources."snyk-nuget-plugin-1.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) sources."snyk-policy-1.7.1" sources."snyk-python-plugin-1.4.0" (sources."snyk-recursive-readdir-2.0.0" // { @@ -33677,7 +33788,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."graphlib-2.1.1" sources."toml-2.3.3" sources."clone-deep-0.3.0" @@ -33697,6 +33808,13 @@ in sources."for-in-0.1.8" ]; }) + sources."xml2js-0.4.19" + sources."zip-1.2.0" + sources."sax-1.2.4" + sources."xmlbuilder-9.0.4" + sources."bops-0.1.1" + sources."base64-js-0.0.2" + sources."to-utf8-0.0.1" sources."js-yaml-3.10.0" sources."argparse-1.0.9" sources."esprima-4.0.0" @@ -33869,10 +33987,10 @@ in parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.7.1.tgz"; - sha1 = "121dcf59d0bacd9247405988525888f9a6ba2328"; + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.8.0.tgz"; + sha1 = "fbedac4c5c0b721f4c241287b81bdc3e4c7987c9"; }; dependencies = [ sources."async-0.9.2" @@ -33887,47 +34005,36 @@ in sources."content-type-git+https://github.com/wikimedia/content-type.git#master" sources."core-js-2.5.1" sources."diff-1.4.0" - sources."domino-1.0.29" + sources."domino-1.0.30" sources."entities-1.1.1" (sources."express-4.16.2" // { dependencies = [ sources."content-type-1.0.4" - sources."finalhandler-1.1.0" sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) sources."express-handlebars-3.0.0" - (sources."finalhandler-0.5.1" // { + (sources."finalhandler-1.1.0" // { dependencies = [ - sources."debug-2.2.0" sources."statuses-1.3.1" - sources."ms-0.7.1" ]; }) sources."js-yaml-3.10.0" - sources."mediawiki-title-0.5.6" + sources."mediawiki-title-0.6.4" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" - sources."node-uuid-1.4.8" sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" sources."prfun-2.1.4" sources."request-2.83.0" sources."semver-5.4.1" sources."serve-favicon-2.4.5" - (sources."service-runner-2.3.0" // { - dependencies = [ - sources."yargs-7.1.0" - sources."camelcase-3.0.0" - sources."cliui-3.2.0" - ]; - }) + sources."service-runner-2.3.0" sources."simplediff-0.1.1" - (sources."yargs-5.0.0" // { + sources."uuid-3.1.0" + (sources."yargs-7.1.0" // { dependencies = [ - sources."cliui-3.2.0" - sources."window-size-0.2.0" - sources."yargs-parser-3.2.0" sources."camelcase-3.0.0" + sources."cliui-3.2.0" ]; }) sources."asap-2.0.6" @@ -34031,7 +34138,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."function-bind-1.1.1" sources."object-keys-1.0.11" sources."define-properties-1.1.2" @@ -34057,16 +34164,14 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -34074,7 +34179,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -34093,7 +34198,7 @@ in sources."bunyan-1.8.12" sources."bunyan-syslog-udp-0.1.0" sources."gelf-stream-1.1.1" - sources."hot-shots-4.7.0" + sources."hot-shots-4.7.1" (sources."limitation-0.2.0" // { dependencies = [ sources."readable-stream-2.3.3" @@ -34140,7 +34245,7 @@ in }) sources."lodash-3.10.1" sources."merge-1.2.0" - (sources."msgpack5-3.5.1" // { + (sources."msgpack5-3.6.0" // { dependencies = [ sources."readable-stream-2.3.3" sources."isarray-1.0.0" @@ -34157,6 +34262,8 @@ in sources."string_decoder-1.0.3" ]; }) + sources."lodash.clone-4.3.2" + sources."lodash._baseclone-4.5.7" sources."get-caller-file-1.0.2" sources."os-locale-1.4.0" sources."read-pkg-up-1.0.1" @@ -34200,9 +34307,6 @@ in sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."lodash.clone-4.3.2" - sources."lodash._baseclone-4.5.7" - sources."lodash.assign-4.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -35109,7 +35213,7 @@ in sources."string_decoder-1.0.3" ]; }) - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" @@ -35175,7 +35279,7 @@ in sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.1" + sources."asn1.js-4.9.2" (sources."ripemd160-2.0.1" // { dependencies = [ sources."hash-base-2.0.2" @@ -35184,7 +35288,7 @@ in sources."sha.js-2.4.9" sources."miller-rabin-4.0.1" sources."function-bind-1.1.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."lexical-scope-1.2.0" sources."astw-2.2.0" sources."acorn-4.0.13" @@ -35294,7 +35398,7 @@ in sources."hawk-3.1.3" sources."semver-5.4.1" sources."tar-2.2.1" - (sources."tar-pack-3.4.0" // { + (sources."tar-pack-3.4.1" // { dependencies = [ sources."rimraf-2.6.2" ]; @@ -35557,13 +35661,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -35571,7 +35674,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -35613,10 +35716,10 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.3.1"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.3.1.tgz"; - sha512 = "3zimikqfpvw7vhrp8qaf1pk3wk9idqpa72jvla68f9skcyrl9027ksgb851y251fzxmklxzymipy42gf9m7vnp8jjvya4gwng7mmr6n"; + url = "https://registry.npmjs.org/serve/-/serve-6.4.0.tgz"; + sha512 = "0kb65fj5n5z4j11c8247zvabb0qp4w5w9ls29bypm11ay9g2a1riv5wl72ya44b4arwxhyawxxijb5r5zjlwfs9zsbklcp6vbc8mphs"; }; dependencies = [ sources."args-3.0.7" @@ -35637,7 +35740,11 @@ in sources."ip-1.1.5" sources."micro-9.0.0" sources."micro-compress-1.0.0" - sources."mime-types-2.1.17" + (sources."mime-types-2.1.17" // { + dependencies = [ + sources."mime-db-1.30.0" + ]; + }) sources."node-version-1.1.0" sources."openssl-self-signed-certificate-1.1.6" sources."opn-5.1.0" @@ -35730,7 +35837,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."media-typer-0.3.0" sources."raw-body-2.3.2" sources."bytes-3.0.0" @@ -35747,7 +35854,7 @@ in sources."on-headers-1.0.1" sources."vary-1.1.2" sources."negotiator-0.6.1" - sources."mime-db-1.30.0" + sources."mime-db-1.31.0" sources."is-wsl-1.1.0" sources."pify-3.0.0" sources."destroy-1.0.4" @@ -35939,13 +36046,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -35953,7 +36059,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -36000,7 +36106,7 @@ in sources."source-map-0.1.43" sources."amdefine-1.0.1" sources."markdown-it-4.4.0" - sources."sanitize-html-1.14.1" + sources."sanitize-html-1.15.0" sources."entities-1.1.1" sources."linkify-it-1.2.4" sources."mdurl-1.0.1" @@ -36010,7 +36116,8 @@ in sources."readable-stream-2.3.3" ]; }) - sources."regexp-quote-0.0.0" + sources."lodash.escaperegexp-4.1.2" + sources."srcset-1.0.0" sources."xtend-4.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.4.1" @@ -36024,6 +36131,8 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" + sources."array-uniq-1.0.3" + sources."number-is-nan-1.0.1" sources."jsonparse-1.3.1" sources."through-2.3.8" sources."minimist-0.0.8" @@ -36218,6 +36327,62 @@ in }; production = true; }; + "socket.io" = nodeEnv.buildNodePackage { + name = "socket.io"; + packageName = "socket.io"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; + sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; + }; + dependencies = [ + sources."debug-2.6.9" + sources."engine.io-3.1.3" + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.0.4" + sources."socket.io-parser-3.1.2" + sources."ms-2.0.0" + sources."accepts-1.3.3" + sources."base64id-1.0.0" + sources."engine.io-parser-2.1.1" + sources."ws-2.3.1" + sources."cookie-0.3.1" + sources."uws-0.14.5" + sources."mime-types-2.1.17" + sources."negotiator-0.6.1" + sources."mime-db-1.30.0" + sources."after-0.8.2" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + sources."has-binary2-1.0.2" + sources."isarray-2.0.1" + sources."safe-buffer-5.0.1" + sources."ultron-1.1.0" + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."engine.io-client-3.1.3" + sources."has-cors-1.1.0" + sources."indexof-0.0.1" + sources."object-component-0.0.3" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."to-array-0.1.4" + sources."component-inherit-0.0.3" + sources."xmlhttprequest-ssl-1.5.4" + sources."yeast-0.1.2" + sources."better-assert-1.0.2" + sources."callsite-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "node.js realtime framework server"; + homepage = "https://github.com/socketio/socket.io#readme"; + license = "MIT"; + }; + production = true; + }; stylus = nodeEnv.buildNodePackage { name = "stylus"; packageName = "stylus"; @@ -36258,33 +36423,56 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "0.7.2"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz"; - sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; + url = "https://registry.npmjs.org/svgo/-/svgo-1.0.1.tgz"; + sha512 = "2higmngdwd7fgjzcgy9drv5wgm201dza97l73s7arcwjvc725vkvwfqrzcs96agl989ya0mmi1k96d5k3hy6b9cb12jj5qz0dyy4h2q"; }; dependencies = [ - sources."sax-1.2.4" - sources."coa-1.0.4" - sources."js-yaml-3.7.0" + sources."coa-2.0.0" sources."colors-1.1.2" - sources."whet.extend-0.9.9" + sources."css-url-regex-1.1.0" + sources."unquote-1.1.0" sources."mkdirp-0.5.1" - sources."csso-2.3.2" + sources."css-select-1.3.0-rc0" + sources."css-select-base-adapter-0.1.0" + sources."css-tree-1.0.0-alpha25" + sources."csso-3.3.1" + sources."js-yaml-3.10.0" + sources."object.values-1.0.4" + sources."sax-1.2.4" + sources."stable-0.1.6" + sources."util.promisify-1.0.0" sources."q-1.5.1" - sources."argparse-1.0.9" - sources."esprima-2.7.3" - sources."sprintf-js-1.0.3" sources."minimist-0.0.8" - sources."clap-1.2.3" + sources."boolbase-1.0.0" + sources."css-what-2.1.0" + sources."domutils-1.5.1" + sources."nth-check-1.0.1" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."domelementtype-1.3.0" + sources."entities-1.1.1" + sources."mdn-data-1.0.0" sources."source-map-0.5.7" - sources."chalk-1.1.3" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" + sources."argparse-1.0.9" + sources."esprima-4.0.0" + sources."sprintf-js-1.0.3" + sources."define-properties-1.1.2" + sources."es-abstract-1.9.0" + sources."has-1.0.1" + sources."function-bind-1.1.1" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" + sources."object.getownpropertydescriptors-2.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -36342,10 +36530,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.5.3"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz"; - sha512 = "3mhb4cnf07q9jnz7r8iy06iwsq32byfvn4z3f6bbbw2sknnppa4q2v5vm12bxix8lwvbdhhqhdvkr0v1bhdb0zkxf90pqcjrm1d5lm6"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz"; + sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631"; }; buildInputs = globalBuildInputs; meta = { @@ -36378,7 +36566,7 @@ in sources."typings-core-2.3.3" (sources."update-notifier-2.3.0" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; @@ -36438,7 +36626,7 @@ in sources."thenify-3.3.0" sources."throat-3.2.0" sources."touch-1.0.0" - sources."typescript-2.5.3" + sources."typescript-2.6.1" sources."zip-object-0.1.0" sources."dot-prop-4.2.0" sources."make-dir-1.1.0" @@ -36504,7 +36692,7 @@ in sources."abbrev-1.1.1" (sources."boxen-1.2.2" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; @@ -36577,10 +36765,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.5.tgz"; - sha512 = "1fgrmz71wwy21h9m0vg1f0hd9g4c5gdj1xa87cfcl920plwpv90ps0kkafs6xhgbvxl2a9bqmjz8k6sdp96x9hf9cap0r66pwxsaamm"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.6.tgz"; + sha512 = "1hffvxym85dy9nzmjriwyazvy7k6x3iwp0j0dway300hawcdbmfirbglvshxjflzci25z725zl07650m5dgdfydlc0m648a275ixfzy"; }; dependencies = [ sources."commander-2.11.0" @@ -36597,10 +36785,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.33"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.33.tgz"; - sha1 = "f5b42a9e36e6d236060df399ece5bd14066cf716"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.2.0.tgz"; + sha512 = "3qbjszm2whg22ljrg0knwzn1d2ry9mxkpqsbh7pmnjgfzyalqjc8h8s7v8iyb71gavj78d6gmlk0dkhdlsr2hgcai9ndjs6vad8p6gg"; }; dependencies = [ sources."async-2.5.0" @@ -36622,10 +36810,9 @@ in sources."utils-merge-1.0.1" ]; }) - sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.3.6" + sources."ignore-3.3.7" sources."just-detect-adblock-1.0.0" (sources."keen.io-0.1.3" // { dependencies = [ @@ -36633,72 +36820,27 @@ in sources."qs-1.2.0" sources."mime-1.2.11" sources."methods-1.0.1" - sources."form-data-0.1.3" - sources."async-0.9.2" ]; }) sources."knockout-3.4.2" sources."lodash-4.17.4" - (sources."mkdirp-0.5.1" // { + (sources."memorystore-1.6.0" // { dependencies = [ - sources."minimist-0.0.8" + sources."debug-3.1.0" ]; }) + sources."mkdirp-0.5.1" sources."moment-2.18.1" sources."node-cache-4.1.1" (sources."npm-5.4.2" // { dependencies = [ - sources."lru-cache-4.1.1" sources."nopt-4.0.1" sources."readable-stream-2.3.3" - sources."request-2.81.0" sources."isarray-1.0.0" sources."string_decoder-1.0.3" - sources."combined-stream-1.0.5" - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."hawk-3.1.3" - sources."json-stringify-safe-5.0.1" - sources."oauth-sign-0.8.2" - sources."qs-6.4.0" - sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."npm-registry-client-8.4.0" // { - dependencies = [ - sources."request-2.83.0" - sources."aws-sign2-0.7.0" - sources."combined-stream-1.0.5" - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" - sources."json-stringify-safe-5.0.1" - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."ajv-5.2.4" - sources."har-schema-2.0.0" - sources."hoek-4.2.0" - sources."boom-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."sntp-2.0.2" - sources."assert-plus-1.0.0" ]; }) + sources."npm-registry-client-8.4.0" sources."octicons-3.5.0" sources."open-0.0.5" sources."os-homedir-1.0.2" @@ -36706,8 +36848,6 @@ in sources."passport-local-1.0.0" (sources."raven-2.1.2" // { dependencies = [ - sources."json-stringify-safe-5.0.1" - sources."stack-trace-0.0.9" sources."uuid-3.0.0" ]; }) @@ -36744,7 +36884,6 @@ in (sources."winston-2.3.1" // { dependencies = [ sources."async-1.0.0" - sources."colors-1.0.3" ]; }) sources."yargs-9.0.1" @@ -36817,79 +36956,6 @@ in sources."on-headers-1.0.1" sources."uid-safe-2.1.5" sources."random-bytes-1.0.0" - (sources."broadway-0.2.10" // { - dependencies = [ - sources."winston-0.7.2" - sources."utile-0.2.1" - sources."async-0.2.10" - sources."pkginfo-0.3.1" - sources."request-2.16.6" - sources."mime-1.2.11" - sources."qs-0.5.6" - ]; - }) - sources."minimatch-0.0.5" - sources."pkginfo-0.4.1" - sources."ps-tree-0.0.3" - sources."watch-0.5.1" - (sources."utile-0.1.7" // { - dependencies = [ - sources."async-0.1.22" - sources."ncp-0.2.7" - sources."rimraf-1.0.9" - ]; - }) - (sources."cliff-0.1.8" // { - dependencies = [ - sources."winston-0.6.2" - sources."async-0.1.22" - sources."pkginfo-0.2.3" - ]; - }) - sources."eventemitter2-0.4.14" - (sources."nconf-0.6.9" // { - dependencies = [ - sources."async-0.2.9" - ]; - }) - sources."colors-0.6.2" - sources."eyes-0.1.8" - sources."cycle-1.0.3" - sources."request-2.9.203" - sources."stack-trace-0.0.10" - sources."ini-1.3.4" - sources."optimist-0.6.0" - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - (sources."form-data-0.0.10" // { - dependencies = [ - sources."mime-1.2.11" - sources."async-0.2.10" - ]; - }) - sources."hawk-0.10.2" - sources."node-uuid-1.4.8" - sources."cookie-jar-0.2.0" - sources."aws-sign-0.2.0" - sources."oauth-sign-0.2.0" - sources."forever-agent-0.2.0" - sources."tunnel-agent-0.2.0" - sources."json-stringify-safe-3.0.0" - sources."combined-stream-0.0.7" - sources."delayed-stream-0.0.5" - sources."hoek-0.7.6" - sources."boom-0.3.8" - sources."cryptiles-0.1.3" - sources."sntp-0.1.4" - sources."deep-equal-1.0.1" - sources."i-0.3.6" - sources."ncp-0.4.2" - sources."lru-cache-1.0.6" - (sources."event-stream-0.5.3" // { - dependencies = [ - sources."optimist-0.2.8" - ]; - }) sources."extract-opts-3.3.1" sources."eachr-3.2.0" sources."editions-1.3.3" @@ -36900,10 +36966,22 @@ in sources."cookiejar-2.0.1" sources."reduce-component-1.0.1" sources."extend-1.2.1" + (sources."form-data-0.1.3" // { + dependencies = [ + sources."mime-1.2.11" + sources."async-0.9.2" + ]; + }) sources."readable-stream-1.0.27-1" + sources."combined-stream-0.0.7" + sources."delayed-stream-0.0.5" sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" + sources."lru-cache-4.1.1" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."minimist-0.0.8" sources."clone-2.1.1" sources."JSONStream-1.3.1" sources."ansi-regex-3.0.0" @@ -36911,11 +36989,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.1.2" sources."archy-1.0.0" - (sources."cacache-9.2.9" // { - dependencies = [ - sources."lru-cache-4.1.1" - ]; - }) + sources."cacache-9.2.9" sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" @@ -36937,16 +37011,13 @@ in sources."string_decoder-1.0.3" ]; }) - (sources."glob-7.1.2" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) + sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" sources."hosted-git-info-2.5.0" sources."iferr-0.1.5" sources."inflight-1.0.6" + sources."ini-1.3.4" sources."init-package-json-1.10.1" sources."lazy-property-1.0.0" (sources."libnpx-9.6.0" // { @@ -36965,7 +37036,6 @@ in sources."move-concurrently-1.0.1" (sources."node-gyp-3.6.2" // { dependencies = [ - sources."minimatch-3.0.4" sources."nopt-3.0.6" sources."semver-5.3.0" sources."tar-2.2.1" @@ -36982,12 +37052,7 @@ in sources."once-1.4.0" sources."opener-1.4.3" sources."osenv-0.1.4" - (sources."pacote-6.0.4" // { - dependencies = [ - sources."lru-cache-4.1.1" - sources."minimatch-3.0.4" - ]; - }) + sources."pacote-6.0.4" sources."path-is-inside-1.0.2" sources."promise-inflight-1.0.1" sources."read-1.0.7" @@ -36995,6 +37060,15 @@ in sources."read-installed-4.0.3" sources."read-package-json-2.0.12" sources."read-package-tree-5.1.6" + (sources."request-2.81.0" // { + dependencies = [ + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."form-data-2.1.4" + sources."qs-6.4.0" + sources."delayed-stream-1.0.0" + ]; + }) sources."retry-0.10.1" sources."safe-buffer-5.1.1" (sources."sha-2.0.1" // { @@ -37027,7 +37101,7 @@ in sources."uuid-3.1.0" sources."validate-npm-package-name-3.0.0" sources."which-1.3.0" - sources."worker-farm-1.5.0" + sources."worker-farm-1.5.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" @@ -37043,8 +37117,6 @@ in sources."jsonparse-1.3.1" sources."through-2.3.8" sources."y18n-3.2.1" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" sources."wcwidth-1.0.1" (sources."defaults-1.0.3" // { dependencies = [ @@ -37056,6 +37128,7 @@ in sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."fs.realpath-1.0.0" + sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" @@ -37097,11 +37170,7 @@ in sources."execa-0.7.0" sources."lcid-1.0.0" sources."mem-1.1.0" - (sources."cross-spawn-5.1.0" // { - dependencies = [ - sources."lru-cache-4.1.1" - ]; - }) + sources."cross-spawn-5.1.0" sources."get-stream-3.0.0" sources."is-stream-1.1.0" sources."npm-run-path-2.0.2" @@ -37187,11 +37256,7 @@ in sources."block-stream-0.0.9" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" - (sources."ignore-walk-3.0.1" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) + sources."ignore-walk-3.0.1" sources."npm-bundled-1.0.3" (sources."are-we-there-yet-1.1.4" // { dependencies = [ @@ -37218,11 +37283,7 @@ in ]; }) sources."os-tmpdir-1.0.2" - (sources."make-fetch-happen-2.5.0" // { - dependencies = [ - sources."lru-cache-4.1.1" - ]; - }) + sources."make-fetch-happen-2.5.0" sources."npm-pick-manifest-1.0.4" sources."promise-retry-1.1.1" sources."protoduck-4.0.0" @@ -37249,19 +37310,28 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" + sources."forever-agent-0.6.1" sources."har-validator-4.2.1" + sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" sources."asynckit-0.4.0" sources."ajv-4.11.8" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" sources."assert-plus-0.2.0" (sources."jsprim-1.4.1" // { dependencies = [ @@ -37312,7 +37382,7 @@ in sources."unique-slug-2.0.0" (sources."boxen-1.2.2" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" ]; }) (sources."chalk-1.1.3" // { @@ -37378,11 +37448,10 @@ in sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."fast-deep-equal-1.0.0" - sources."json-schema-traverse-0.3.1" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" + sources."stack-trace-0.0.9" sources."deep-extend-0.4.2" sources."strip-json-comments-2.0.1" sources."eve-0.5.4" @@ -37439,6 +37508,9 @@ in sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" + sources."colors-1.0.3" + sources."cycle-1.0.3" + sources."eyes-0.1.8" ]; buildInputs = globalBuildInputs; meta = { @@ -37618,14 +37690,14 @@ in sha512 = "1pjbfhy4mpjb68hg0k70iz51c13yq6biln5wyb3jg8ddbgc3qwhnqgxvd19if6sihd10yc42yrj50p451qkgd4wmy2p5a0cddcwp5g5"; }; dependencies = [ - sources."acorn-5.1.2" + sources."acorn-5.2.1" (sources."acorn-dynamic-import-2.0.2" // { dependencies = [ sources."acorn-4.0.13" ]; }) - sources."ajv-5.2.4" - sources."ajv-keywords-2.1.0" + sources."ajv-5.3.0" + sources."ajv-keywords-2.1.1" sources."async-2.5.0" sources."enhanced-resolve-3.4.1" sources."escope-3.6.0" @@ -37663,9 +37735,8 @@ in }) sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."lodash-4.17.4" sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" @@ -37751,7 +37822,7 @@ in sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.1" + sources."asn1.js-4.9.2" (sources."ripemd160-2.0.1" // { dependencies = [ sources."hash-base-2.0.2" @@ -37784,7 +37855,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."chokidar-1.7.0" sources."anymatch-1.3.2" sources."async-each-1.0.1" @@ -37852,7 +37923,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" @@ -37902,6 +37973,8 @@ in sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."har-schema-1.0.5" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."assert-plus-0.2.0" (sources."jsprim-1.4.1" // { dependencies = [ @@ -38197,7 +38270,7 @@ in sources."esprima-3.1.3" sources."first-chunk-stream-2.0.0" sources."jed-1.1.1" - sources."pino-4.8.0" + sources."pino-4.8.2" (sources."postcss-6.0.11" // { dependencies = [ sources."supports-color-4.5.0" @@ -38395,7 +38468,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -38487,7 +38560,7 @@ in sources."file-entry-cache-2.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."ignore-3.3.6" + sources."ignore-3.3.7" sources."imurmurhash-0.1.4" (sources."inquirer-3.3.0" // { dependencies = [ @@ -38513,7 +38586,7 @@ in sources."typedarray-0.0.6" sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.1.2" + sources."acorn-5.2.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -38552,7 +38625,7 @@ in sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."iconv-lite-0.4.19" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."is-promise-2.1.0" sources."tryit-1.0.3" sources."argparse-1.0.9" @@ -38562,7 +38635,7 @@ in sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."fast-levenshtein-2.0.6" - sources."ajv-keywords-2.1.0" + sources."ajv-keywords-2.1.1" (sources."slice-ansi-1.0.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -38592,7 +38665,7 @@ in sources."is-property-1.0.2" sources."interpret-1.0.4" sources."rechoir-0.6.2" - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."path-parse-1.0.5" sources."fast-json-parse-1.0.3" sources."fast-safe-stringify-1.2.0" @@ -38740,7 +38813,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -38774,7 +38847,7 @@ in sources."npmlog-4.1.2" sources."rc-1.2.2" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."are-we-there-yet-1.1.4" @@ -38899,7 +38972,7 @@ in sources."humanize-string-1.0.1" (sources."inquirer-3.3.0" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."strip-ansi-4.0.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" @@ -38981,7 +39054,7 @@ in sources."titleize-1.0.0" (sources."update-notifier-2.3.0" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; @@ -38996,7 +39069,7 @@ in sources."yeoman-doctor-2.1.0" (sources."yeoman-environment-2.0.5" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."debug-3.1.0" sources."log-symbols-2.1.0" sources."ansi-styles-3.2.0" @@ -39096,7 +39169,7 @@ in sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."iconv-lite-0.4.19" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -39150,13 +39223,12 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -39164,7 +39236,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -39272,7 +39344,7 @@ in (sources."boxen-1.2.2" // { dependencies = [ sources."camelcase-4.1.0" - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; From 04b3b00917ceec46ca0b678e0fcfa5f2eea3512e Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Wed, 1 Nov 2017 20:26:14 +0800 Subject: [PATCH 2106/2806] fastlane: 2.62.1 -> 2.63.0 --- pkgs/tools/admin/fastlane/Gemfile.lock | 2 +- pkgs/tools/admin/fastlane/gemset.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 93cf658719c..30c75f19fbf 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -24,7 +24,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.62.1) + fastlane (2.63.0) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 8e75f76ec35..8dd51a5733e 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -137,10 +137,10 @@ dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6ci3rkrzsdk8cbxidzcjv94hbwq7ljwvm5whgxb8lcxcfl696k"; + sha256 = "1al75bb3zq0y9r1ilrbhks198zmvwykmqnn2675jd9i2ijcbxv78"; type = "gem"; }; - version = "2.62.1"; + version = "2.63.0"; }; gh_inspector = { source = { From 8014307c643b8de8d04ad44e35f6cfb2a263162a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Stylianos=20Ramos?= Date: Wed, 1 Nov 2017 14:10:07 +0100 Subject: [PATCH 2107/2806] boot: 2.5.2 -> 2.7.2 --- .../tools/build-managers/boot/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 6f9c2ce38a7..d9dc59ee72d 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jdk }: stdenv.mkDerivation rec { - version = "2.5.2"; + version = "2.7.2"; name = "boot-${version}"; src = fetchurl { url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh"; - sha256 = "0brsimvmmpksxwc4l5c0x0cl5hhdjz76crd26yxphjvzyf7fypc9"; + sha256 = "1hqp3xxmsj5vkym0l3blhlaq9g3w0lhjgmp37g6y3rr741znkk8c"; }; inherit jdk; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ jdk ]; - meta = { + meta = with stdenv.lib; { description = "Build tooling for Clojure"; homepage = http://boot-clj.com/; - license = stdenv.lib.licenses.epl10; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.ragge ]; + license = licenses.epl10; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ ragge ]; }; } From 33cdc2b4839aecb39c807122512e716275a15737 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Nov 2017 12:17:44 +0100 Subject: [PATCH 2108/2806] libtasn1: fix CVE number Actually, this patch fixes CVE-2017-10790, not CVE-2017-9310 (Qemu: net: infinite loop in e1000e NIC emulation) --- pkgs/development/libraries/libtasn1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 516005b874f..7fa53fe162b 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - name = "CVE-2017-9310.patch"; + name = "CVE-2017-10790.patch"; url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39"; sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i"; }) From 107a11f5737cf7c5b2ffbddea6e7683dfffe6575 Mon Sep 17 00:00:00 2001 From: Avaq Date: Fri, 20 Jan 2017 18:26:11 +0100 Subject: [PATCH 2109/2806] mongodb: 3.2.9 -> 3.4.2 --- pkgs/servers/nosql/mongodb/default.nix | 12 +++------ .../nosql/mongodb/valgrind-include.patch | 25 ------------------- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 pkgs/servers/nosql/mongodb/valgrind-include.patch diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index ee373878cb6..35b21882b7b 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -let version = "3.2.9"; +let version = "3.4.2"; system-libraries = [ "pcre" #"asio" -- XXX use package? @@ -43,8 +43,8 @@ in stdenv.mkDerivation rec { name = "mongodb-${version}"; src = fetchurl { - url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "06q6j2bjy31pjwqws53wdpmn2x8w2hafzsnv1s3wx15pc9vq3y15"; + url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"; + sha256 = "0n8vspccrpd2z9xk3yjpz4gprd730dfacw914ksjzz9iadn0zdi9"; }; nativeBuildInputs = [ scons ]; @@ -52,12 +52,6 @@ in stdenv.mkDerivation rec { patches = [ - # When not building with the system valgrind, the build should use the - # vendored header file - regardless of whether or not we're using the system - # tcmalloc - so we need to lift the include path manipulation out of the - # conditional. - ./valgrind-include.patch - # MongoDB keeps track of its build parameters, which tricks nix into # keeping dependencies to build inputs in the final output. # We remove the build flags from buildInfo data. diff --git a/pkgs/servers/nosql/mongodb/valgrind-include.patch b/pkgs/servers/nosql/mongodb/valgrind-include.patch deleted file mode 100644 index 6b401525c08..00000000000 --- a/pkgs/servers/nosql/mongodb/valgrind-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript -index 6add602..6e232d8 100644 ---- a/src/mongo/util/SConscript -+++ b/src/mongo/util/SConscript -@@ -241,9 +241,6 @@ if get_option('allocator') == 'tcmalloc': - # Add in the include path for our vendored tcmalloc. - tcmspEnv.InjectThirdPartyIncludePaths('gperftools') - -- # Include valgrind since tcmalloc disables itself while running under valgrind -- tcmspEnv.InjectThirdPartyIncludePaths('valgrind') -- - # If our changes to tcmalloc are ever upstreamed, this should become set based on a top - # level configure check, though its effects should still be scoped just to these files. - tcmspEnv.Append( -@@ -252,6 +249,10 @@ if get_option('allocator') == 'tcmalloc': - ] - ) - -+ # Include valgrind since tcmalloc disables itself while running under valgrind -+ if not use_system_version_of_library('valgrind'): -+ tcmspEnv.InjectThirdPartyIncludePaths('valgrind') -+ - tcmspEnv.Library( - target='tcmalloc_set_parameter', - source=[ From a387a0f1717a23fc4e759adcfb1c96a7685bb446 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 1 Nov 2017 14:13:34 +0100 Subject: [PATCH 2110/2806] mongodb: fix darwin build --- pkgs/servers/nosql/mongodb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 35b21882b7b..11720fb154f 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -81,6 +81,8 @@ in stdenv.mkDerivation rec { --replace 'engine("wiredTiger")' 'engine("mmapv1")' ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unused-command-line-argument"; + buildPhase = '' scons -j $NIX_BUILD_CORES core --release ${other-args} ''; From a2437393f09c1d437df207653c7a47667754ad32 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 1 Nov 2017 10:46:44 +0100 Subject: [PATCH 2111/2806] slack: 2.8.0 -> 2.8.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes japanese input & some obscure security issues: `An important Electron update improving security. A precautionary measure, but it’s always good to be up to date.` and `A small release containing nothing but another Electron update, this one better than the last.` --- .../networking/instant-messengers/slack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 93bc6feff3c..8f107c4f3c3 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ let - version = "2.8.0"; + version = "2.8.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -46,7 +46,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "02khqi0qf8ryj6bkfla95mr3scvb99zrhihwdprdjqpgvy06wqhm"; + sha256 = "019gzij6m1y9bv561nhbhgf2njp2svjqi5hs907pdjf7xwciwrkm"; } else throw "Slack is not supported on ${stdenv.system}"; From e0b906c5cb667341c02c3badac1181d3bdd521df Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Nov 2017 15:00:55 +0100 Subject: [PATCH 2112/2806] jython: 2.7.0 -> 2.7.1 addresses CVE-2016-4000 --- pkgs/development/interpreters/jython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 80661c3feb9..e7bcef7bc3e 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jython-${version}"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar"; - sha256 = "0sk4myh9v7ma7nmzb8khg41na77xfi2zck7876bs7kq18n8nc1nx"; + sha256 = "0jwc4ly75cna78blnisv4q8nfcn5s0g4wk7jf4d16j0rfcd0shf4"; }; buildInputs = [ makeWrapper ]; From 17de809fb87d4c70d1239dcccd2977ec8dc15dc6 Mon Sep 17 00:00:00 2001 From: Renaud Date: Wed, 1 Nov 2017 15:08:25 +0100 Subject: [PATCH 2113/2806] hardlink: 2012.9.3ec908d539 --> 1.3-4 --- pkgs/tools/system/hardlink/default.nix | 38 ++++++++++++++------------ 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index b85ad32ca37..ea062115402 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -1,29 +1,33 @@ -{ fetchurl, stdenv, unzip }: +{ stdenv, fetchurl, pcre2 }: -let - rev = "3ec908d539"; -in -stdenv.mkDerivation { - name = "hardlink-2012.9.${rev}"; + +stdenv.mkDerivation rec { + name = "hardlink-${version}"; + version = "1.3-4"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; - sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647"; - name = "hardlink-${rev}.zip"; + url = "http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; + sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2"; }; + buildInputs = [ pcre2 ]; + NIX_CFLAGS_LINK = "-lpcre2-8"; + + buildPhase = '' + $CC -O2 hardlink.c -o hardlink $NIX_CFLAGS_LINK + ''; + installPhase = '' mkdir -p $out/bin $out/share/man/man1 - cc -O2 hardlink.c -o $out/bin/hardlink - mv hardlink.1 $out/share/man/man1/hardlink.1 + cp -f hardlink $out/bin/hardlink + cp -f hardlink.1 $out/share/man/man1/hardlink.1 ''; - buildInputs = [ unzip ]; - - meta = { - homepage = http://pkgs.fedoraproject.org/cgit/hardlink.git/; + meta = with stdenv.lib; { description = "Consolidate duplicate files via hardlinks"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + homepage = https://pagure.io/hardlink; + repositories.git = http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } From aa196db7ec8a012566be3d97f0a2c4bf8d830e85 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 1 Nov 2017 10:33:04 -0400 Subject: [PATCH 2114/2806] atom: 1.21.1 -> 1.21.2 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index f0af3b88c72..6ab881f2275 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.21.1"; + version = "1.21.2"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "13mpj3wvcgsxz9q6lai36lkfgd7rabcjrrih1j5309kd1dqaswnn"; + sha256 = "0snhhp8rjmk750snyzkqzwvi7f915pbc6qpa3vf0f57syf47m7vl"; name = "${name}.deb"; }; From 4f88411e0d6830d33c43f27d09843a47d5f9b62e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 31 Oct 2017 23:24:13 +0100 Subject: [PATCH 2115/2806] eclipse-plugin-rustdt: fix Emacs nix-mode highlighting --- pkgs/applications/editors/eclipse/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index f3459e57d9b..554edde711b 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -394,7 +394,7 @@ rec { sha256 = "1xfj4j27d1h4bdf2v7f78zi8lz4zkkj7s9kskmsqx5jcs2d459yp"; extraPostFetch = '' - mv "$out/${repo}-${rev}/releases/local-repo"/* "$out/" + mv "$out/${repo}-${rev}/releases/local-repo/"* "$out/" ''; }; From 94f2fdfe6cd7eeaf038468694b752cf4c5c1191f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 31 Oct 2017 23:24:53 +0100 Subject: [PATCH 2116/2806] eclipse-plugin-spotbugs: init at 3.1.0 --- pkgs/applications/editors/eclipse/plugins.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 554edde711b..f98d43a403f 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -424,6 +424,29 @@ rec { }; }; + spotbugs = buildEclipsePlugin rec { + name = "spotbugs-${version}"; + version = "3.1.0.r201710241414-11c9895"; + + srcFeature = fetchurl { + url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar"; + sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs"; + }; + + srcPlugin = fetchurl { + url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar"; + sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas"; + }; + + meta = with stdenv.lib; { + homepage = https://spotbugs.github.io/; + description = "Plugin that uses static analysis to look for bugs in Java code"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + testng = buildEclipsePlugin rec { name = "testng-${version}"; version = "6.9.13.201609291640"; From 9242f2fc7c1d30dc4ad87f6476a3f1e15cfc81ee Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 31 Oct 2017 23:35:21 +0100 Subject: [PATCH 2117/2806] josm: 12921 -> 13053 --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 38eba46138e..46263f7d83b 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "12921"; + version = "13053"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1fp6mpl8fa91dhdf3hw5hk8xsp1imj7558adjnjkb6n4vmrbszhm"; + sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6"; }; buildInputs = [ jre8 makeWrapper ]; From f179c389b50c80697c4f29eecc90b19afe90f616 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 31 Oct 2017 23:37:47 +0100 Subject: [PATCH 2118/2806] eclipse-plugin-anyedittools: 2.7.0 -> 2.7.1 --- pkgs/applications/editors/eclipse/plugins.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index f98d43a403f..0aeaee2155a 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -106,16 +106,16 @@ rec { anyedittools = buildEclipsePlugin rec { name = "anyedit-${version}"; - version = "2.7.0.201705171641"; + version = "2.7.1.201709201439"; srcFeature = fetchurl { url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar"; - sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9"; + sha256 = "1wqzl7wq85m9gil8rnvly45ps0a2m0svw613pg6djs5i7amhnayh"; }; srcPlugin = fetchurl { - url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar"; - sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h"; + url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.1/de.loskutov.anyedit.AnyEditTools_${version}.jar"; + sha256 = "03iyb6j2srq74iigmg7dk098c2svyv0ygdfql5jqr44a32n07k8q"; }; meta = with stdenv.lib; { From 9d4fc88fbfe9efa8872c3c7ab9c80dade4da5fd5 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 31 Oct 2017 23:52:15 +0100 Subject: [PATCH 2119/2806] python-pycdio: 0.20 -> 0.21 --- .../pycdio/add-cdtext-toc.patch | 52 ------------------- pkgs/top-level/python-packages.nix | 6 +-- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 pkgs/development/python-modules/pycdio/add-cdtext-toc.patch diff --git a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch b/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch deleted file mode 100644 index 4e36612d80d..00000000000 --- a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Nurp pycdio-0.20-orig/test/cdtext.toc pycdio-0.20/test/cdtext.toc ---- pycdio-0.20-orig/test/cdtext.toc 1970-01-01 01:00:00.000000000 +0100 -+++ pycdio-0.20/test/cdtext.toc 2014-11-06 23:36:12.520708320 +0100 -@@ -0,0 +1,48 @@ -+CD_DA -+ -+// global CD-TEXT data -+ -+CD_TEXT { -+ -+ // Mapping from language number (0..7) used in 'LANGUAGE' statements -+ // to language code. -+/// LANGUAGE_MAP { -+/// 0 : EN // 9 is the code for ENGLISH, -+/// // I don't know any other language code, yet -+/// } -+ -+ // Language number should always start with 0 -+ LANGUAGE 0 { -+ // Required fields - at least all CD-TEXT CDs I've seen so far have them. -+ TITLE "CD Title" -+ PERFORMER "Performer" -+ DISC_ID "XY12345" -+ UPC_EAN "" // usually empty -+ -+ // Further possible items, all of them are optional -+ ARRANGER "" -+ SONGWRITER "" -+ MESSAGE "" -+ GENRE "" // I'm not sure if this should be really ascii data -+ } -+} -+ -+ -+TRACK AUDIO -+// track specific CD-TEXT data -+CD_TEXT { -+ LANGUAGE 0 { -+ // if an item is defined for one track it should be defined for all tracks -+ TITLE "Track Title" -+ -+ PERFORMER "Performer" -+ ISRC "US-XX1-98-01234" -+ -+ ARRANGER "" -+ SONGWRITER "" -+ MESSAGE "" -+ } -+} -+ -+SILENCE 1:0:0 -+ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0777e894e71..60d5f9577e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15926,12 +15926,12 @@ in { pycdio = buildPythonPackage rec { - name = "pycdio-0.20"; + name = "pycdio-0.21"; disabled = !isPy27; src = pkgs.fetchurl { url = "mirror://pypi/p/pycdio/${name}.tar.gz"; - sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14"; + sha256 = "1bkcmg838l2yffsw5lln93ap5f8ks3vmqwg02mygmdmay647rc3v"; }; prePatch = '' @@ -15946,8 +15946,6 @@ in { buildInputs = [ self.setuptools self.nose pkgs.swig pkgs.libcdio ] ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv; - patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ]; - # Run tests using nosetests but first need to install the binaries # to the root source directory where they can be found. checkPhase = '' From e344aec6dbce7c24d082cdcf4f59d600025488b0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Nov 2017 14:34:36 +0100 Subject: [PATCH 2120/2806] perl-common-sense: change attribute name to match CPAN Leave the old attribute name as a backwards compatible alias. --- pkgs/top-level/perl-packages.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c8dc8a59ed2..0c24ff1f68f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -152,7 +152,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; sha256 = "2e3376d03bfa5f172f43d4c615ba496281c9ffe3093a828c539683e17e2fbbcb"; }; - propagatedBuildInputs = [ AnyEvent CommonSense ]; + propagatedBuildInputs = [ AnyEvent commonsense ]; }; AnyEventI3 = buildPerlPackage rec { @@ -2194,7 +2194,10 @@ let self = _self // overrides; _self = with self; { }; }; - CommonSense = buildPerlPackage rec { + # For backwards compatibility. + CommonSense = self.commonsense; + + commonsense = buildPerlPackage rec { name = "common-sense-3.74"; src = fetchurl { url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; @@ -2202,6 +2205,8 @@ let self = _self // overrides; _self = with self; { }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Implements some sane defaults for Perl programs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4938,7 +4943,7 @@ let self = _self // overrides; _self = with self; { sha256 = "2ae7f8734e2e4945510252152c3bea4be35f4aa58aad3db0504c38844b08a991"; }; buildInputs = [ CanaryStability ]; - propagatedBuildInputs = [ CommonSense ]; + propagatedBuildInputs = [ commonsense ]; meta = { license = stdenv.lib.licenses.gpl1Plus; }; @@ -7584,7 +7589,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.34.tar.gz; sha256 = "1sh0i73skxp3rvd9w8phxqncw9m1r5ibnb9qxxm21bmrfwkxybx6"; }; - propagatedBuildInputs = [ CommonSense ]; + propagatedBuildInputs = [ commonsense ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; @@ -7822,7 +7827,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/modules/by-module/Linux/${name}.tar.gz"; sha256 = "1l916p8xak6c51x4x1vrzd8wpi55bld74wf0p5w5m4vr80zjb7dw"; }; - propagatedBuildInputs = [ CommonSense ]; + propagatedBuildInputs = [ commonsense ]; }; ListAllUtils = buildPerlPackage { From 52bbba956b5d5f627518cd1889e41c9ddc928190 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Nov 2017 14:49:08 +0100 Subject: [PATCH 2121/2806] perl-Apache-Test: disable tests The tests don't work even with the redirects, possibly due to attempting to start Apache. Also add basic meta section. --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0c24ff1f68f..68191342037 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -227,11 +227,11 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.40.tar.gz; sha256 = "0h5fsi0is6nhclsd3wwkkqx2hfgl3bpdazxycafm9sqxr3qkgx9w"; }; - checkPhase = '' - make test \ - NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ - LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so - ''; + doCheck = false; + meta = { + description = "Test.pm wrapper with helpers for testing Apache"; + license = stdenv.lib.licenses.asl20; + }; }; AppCLI = buildPerlPackage { From 406653f8e77041b4e65f3011c778cf452b49d6fb Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Nov 2017 14:50:21 +0100 Subject: [PATCH 2122/2806] perl-ExtUtils-PkgConfig: 1.15 -> 1.16 --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 68191342037..514a86428e6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5229,13 +5229,14 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsPkgConfig = buildPerlPackage rec { - name = "ExtUtils-PkgConfig-1.15"; + name = "ExtUtils-PkgConfig-1.16"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "1cxh6w8vmyqmhl6afys2q6z6jkp1m6zvacpk70196zmk48p1kcv9"; + sha256 = "bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e"; }; propagatedBuildInputs = [ pkgs.pkgconfig ]; meta = { + homepage = http://gtk2-perl.sourceforge.net; description = "Simplistic interface to pkg-config"; license = stdenv.lib.licenses.lgpl21Plus; }; From 2d145b03ee54e584e1ce78df45ae5387058b773f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Nov 2017 14:51:23 +0100 Subject: [PATCH 2123/2806] perl-Inline: 0.64 -> 0.80 --- pkgs/top-level/perl-packages.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 514a86428e6..b705860be92 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7402,29 +7402,23 @@ let self = _self // overrides; _self = with self; { }; Inline = buildPerlPackage rec { - name = "Inline-0.64"; - + name = "Inline-0.80"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/${name}.tar.gz"; - sha256 = "17n3gbc9jigpfwqfhgmxpvbgr9rkdrij8jayxqpzw611ixcxrplw"; + url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + sha256 = "7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6"; }; - buildInputs = [ TestWarn ]; propagatedBuildInputs = [ ParseRecDescent ]; - meta = { - description = "Inline -- Write Perl subroutines in other programming languages"; - + homepage = https://github.com/ingydotnet/inline-pm; + description = "Write Perl Subroutines in Other Programming Languages"; longDescription = '' The Inline module allows you to put source code from other programming languages directly "inline" in a Perl script or module. The code is automatically compiled as needed, and then loaded for immediate access from Perl. ''; - - license = stdenv.lib.licenses.artistic2; - - maintainers = [ ]; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; From 01ab800212a9ee60959090775fc69204dafbaa8c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Nov 2017 14:52:00 +0100 Subject: [PATCH 2124/2806] perl-Inline-C: 0.76 -> 0.78 Also minor general cleanups. --- pkgs/top-level/perl-packages.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b705860be92..168a7fa8291 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7423,24 +7423,21 @@ let self = _self // overrides; _self = with self; { }; InlineC = buildPerlPackage rec { - name = "Inline-C-0.76"; - + name = "Inline-C-0.78"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "0dcs39zjiglif3ss8p8yl0jyqk7qvc9g1ad9wi4kq79k9lxp3s92"; + url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; + sha256 = "9a7804d85c01a386073d2176582b0262b6374c5c0341049da3ef84c6f53efbc7"; }; - + buildInputs = [ FileCopyRecursive FileShareDirInstall TestWarn YAMLLibYAML ]; + propagatedBuildInputs = [ Inline ParseRecDescent Pegex ]; postPatch = '' # this test will fail with chroot builds rm -f t/08taint.t rm -f t/28autowrap.t ''; - - buildInputs = [ TestWarn FileCopyRecursive FileShareDirInstall IOAll Pegex YAMLLibYAML ]; - propagatedBuildInputs = [ Inline ]; - meta = { - description = "Write Perl Subroutines in C"; + homepage = https://github.com/ingydotnet/inline-c-pm; + description = "C Language Support for Inline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; From e65b441cd3f210d345a33532d380df3713114953 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Nov 2017 14:52:34 +0100 Subject: [PATCH 2125/2806] perl-libapreq2: limit to "out" outputs The build otherwise fails due to being unable to produce `devdoc`. --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 168a7fa8291..6caf30612d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7627,6 +7627,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz; sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e"; }; + outputs = [ "out" ]; buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ]; propagatedBuildInputs = [ mod_perl2 ]; makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd.dev} --with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr.dev}/bin/apr-1-config --with-apu-config=${pkgs.aprutil.dev}/bin/apu-1-config"; From a7d25d4bbca32ae858962918da15a64e471fe604 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Nov 2017 14:56:36 +0100 Subject: [PATCH 2126/2806] perl-Parse-RecDescent: 1.967009 -> 1.967015 --- pkgs/top-level/perl-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6caf30612d1..74532d8fd4a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10797,10 +10797,14 @@ let self = _self // overrides; _self = with self; { }; ParseRecDescent = buildPerlPackage rec { - name = "Parse-RecDescent-1.967009"; + name = "Parse-RecDescent-1.967015"; src = fetchurl { url = "mirror://cpan/authors/id/J/JT/JTBRAUN/${name}.tar.gz"; - sha256 = "11y6fpz4j6kdimyaz2a6ig0jz0x7csqslhxaipxnjqi5h85hy071"; + sha256 = "1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37"; + }; + meta = { + description = "Generate Recursive-Descent Parsers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; From daf78689d475d6e3355e4c47e9314208d877960d Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 3 Oct 2017 22:39:33 -0400 Subject: [PATCH 2127/2806] Fix buildStackProject in nix-build --- .../haskell-modules/generic-stack-builder.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 7fbca53886e..6e43df9aba6 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, ghc, pkgconfig, glibcLocales, cacert }@depArgs: +{ stdenv, ghc, pkgconfig, glibcLocales, cacert, stack }@depArgs: with stdenv.lib; @@ -6,15 +6,17 @@ with stdenv.lib; , extraArgs ? [] , LD_LIBRARY_PATH ? [] , ghc ? depArgs.ghc +, stack ? depArgs.stack , ... }@args: -stdenv.mkDerivation (args // { +let stackCmd = "stack --internal-re-exec-version=${stack.version}"; +in stdenv.mkDerivation (args // { buildInputs = buildInputs ++ optional stdenv.isLinux glibcLocales ++ - [ ghc pkgconfig ]; + [ ghc pkgconfig stack ]; STACK_PLATFORM_VARIANT="nix"; STACK_IN_NIX_SHELL=1; @@ -39,13 +41,13 @@ stdenv.mkDerivation (args // { export STACK_ROOT=$NIX_BUILD_TOP/.stack ''; - buildPhase = args.buildPhase or "stack build"; + buildPhase = args.buildPhase or "${stackCmd} build"; - checkPhase = args.checkPhase or "stack test"; + checkPhase = args.checkPhase or "${stackCmd} test"; doCheck = args.doCheck or true; installPhase = args.installPhase or '' - stack --local-bin-path=$out/bin build --copy-bins + ${stackCmd} --local-bin-path=$out/bin build --copy-bins ''; }) From a209f56d6db2aec3314be79e543c2e1323410177 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Nov 2017 15:05:10 +0000 Subject: [PATCH 2128/2806] hashcat: 2.00 -> 4.0.0 remove 3.6.0 which was not the default --- pkgs/tools/security/hashcat/default.nix | 51 +++++++++---------- .../security/hashcat/hashcat3/default.nix | 37 -------------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 25 insertions(+), 64 deletions(-) delete mode 100644 pkgs/tools/security/hashcat/hashcat3/default.nix diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 298dd336be1..81c92415c50 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,40 +1,39 @@ -{ stdenv, fetchurl, gmp }: +{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }: -assert stdenv.isLinux; - -let - bits = if stdenv.system == "x86_64-linux" then "64" else "32"; -in stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "2.00"; + version = "4.0.0"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://codeload.github.com/hashcat/hashcat/tar.gz/${version}"; - sha256 = "0i2l4i1jkdhj9bkvycgd2nf809kki3jp83y0vrd4iwsdbbbyc9b3"; + url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; + sha256 = "0l1vq4h1gfxc2yclxkvy6gfz6sii2vyzip8pw6ifq930y8dvi34y"; }; - buildInputs = [ gmp ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ opencl-headers ]; - buildFlags = [ "posix${bits}" ] - ++ stdenv.lib.optionals (bits == "64") [ "posixXOP" "posixAVX" ]; + makeFlags = [ + "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" + "COMPTIME=1337" + "VERSION_TAG=${version}" + ]; - # Upstream Makefile doesn't have 'install' target - installPhase = '' - mkdir -p $out/bin $out/libexec - cp -R * $out/libexec - - ln -s $out/libexec/hashcat-cli${bits}.bin $out/bin/hashcat - ln -s $out/libexec/hashcat-cliXOP.bin $out/bin/hashcat-xop - ln -s $out/libexec/hashcat-cliAVX.bin $out/bin/hashcat-avx + # $out is not known until the build has started. + configurePhase = '' + runHook preConfigure + makeFlags="$makeFlags PREFIX=$out" + runHook postConfigure ''; - meta = { + postFixup = '' + wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib + ''; + + meta = with stdenv.lib; { description = "Fast password cracker"; - homepage = "https://hashcat.net/hashcat/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = https://hashcat.net/hashcat/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kierdavis zimbatm ]; }; } diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix deleted file mode 100644 index 7a0d7241bbf..00000000000 --- a/pkgs/tools/security/hashcat/hashcat3/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }: - -assert stdenv.isLinux; - -stdenv.mkDerivation rec { - name = "hashcat-${version}"; - version = "3.6.0"; - - src = fetchurl { - url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "127hdvq6ikah7r5vch63jnnkcsj7y61f9h8x79c3w25x9w55bxry"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ opencl-headers ]; - - makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ]; - - # $out is not known until the build has started. - configurePhase = '' - runHook preConfigure - makeFlags="$makeFlags PREFIX=$out" - runHook postConfigure - ''; - - postFixup = '' - wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib - ''; - - meta = { - description = "Fast password cracker"; - homepage = https://hashcat.net/hashcat/; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.kierdavis ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa4488b9317..24bac10e9ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2525,7 +2525,6 @@ with pkgs; hardlink = callPackage ../tools/system/hardlink { }; hashcat = callPackage ../tools/security/hashcat { }; - hashcat3 = callPackage ../tools/security/hashcat/hashcat3 { }; hash-slinger = callPackage ../tools/security/hash-slinger { }; From d4450489d26c9a7e401cbb126d0a33a1a1f8776f Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Nov 2017 15:21:45 +0000 Subject: [PATCH 2129/2806] beignet: 1.3.1 -> 1.3.2 --- .../development/libraries/beignet/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 18a15c70223..2484e287016 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -15,34 +15,34 @@ , mesa_noglu , makeWrapper , beignet -}: +}: stdenv.mkDerivation rec { name = "beignet-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://01.org/sites/default/files/${name}-source.tar.gz"; - sha256 = "07snrgjlhwl5fxz82dyqp632cnf5hp0gfqrjd2930jv79p37p6rr"; - }; + sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5"; + }; - patches = [ ./clang_llvm.patch ]; + patches = [ ./clang_llvm.patch ]; enableParallelBuilding = true; postPatch = '' patchShebangs src/git_sha1.sh - ''; + ''; cmakeFlags = [ "-DCLANG_LIBRARY_DIR=${clang-unwrapped}/lib" ]; - buildInputs = [ - llvm + buildInputs = [ + llvm clang-unwrapped - libX11 + libX11 libXext libpthreadstubs - libdrm + libdrm libXdmcp libXdamage ocl-icd @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { It supports the Intel OpenCL runtime library and compiler. ''; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ artuuge ]; + maintainers = with maintainers; [ artuuge zimbatm ]; platforms = platforms.linux; - }; + }; } From 933a9c5f16d1cbb1a50f3a83db9137d82381a671 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 1 Nov 2017 11:39:10 -0400 Subject: [PATCH 2130/2806] elpa-packages: 2017-11-01 --- .../editors/emacs-modes/elpa-generated.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index a2fc324a618..f0c4ca87aa2 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.6.0"; + version = "1.8.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.6.0.tar"; - sha256 = "1b0x7g753gn7mym8286b937zmxv50jgdish2h6wc05w1g1lygwsz"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar"; + sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v"; }; packageRequires = [ emacs ]; meta = { @@ -700,10 +700,10 @@ ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "ebdb"; - version = "0.3.4"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.3.4.tar"; - sha256 = "1jj7s0646wqg9ykmpi52cc6m6m0gk2inqc2h6h7cr7gr4v7n2l00"; + url = "https://elpa.gnu.org/packages/ebdb-0.4.1.tar"; + sha256 = "0gv1q1xkhjab0l77c92znn6x0dfdbnj6hc48axmrx6a7zwbm3g2r"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -945,10 +945,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.3.0.tar"; - sha256 = "0c256473llp7ahl1wbm6m236cj2lhp9ms1clmxpsfv51ds27ljqv"; + url = "https://elpa.gnu.org/packages/gnorb-1.3.1.tar"; + sha256 = "1g6xldkc6l6zlzd1slqizbbd5b9k4pbr66nrf5svidgiy7mlifw5"; }; packageRequires = [ cl-lib ]; meta = { @@ -1556,10 +1556,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20171016"; + version = "20171030"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20171016.tar"; - sha256 = "1196kv83p953nd9c5gxkn8ndw2kmm2kfw34dldap6m89khqflz5a"; + url = "https://elpa.gnu.org/packages/org-20171030.tar"; + sha256 = "1lszws6b5s4r7w871cyigs433dflf6w0y33fj6rzrq8240d5092i"; }; packageRequires = []; meta = { From 086f27616739e0bbf403a206a0d0f4719f2755b1 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 1 Nov 2017 11:39:26 -0400 Subject: [PATCH 2131/2806] org-packages: 2017-11-01 --- .../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 8d47f36f346..a6108093933 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 = "20171016"; + version = "20171030"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20171016.tar"; - sha256 = "1v89wl8xlxavvv2kdd5vms0rwpqaw2x73q0162ybxmrzf4a5f5mw"; + url = "http://orgmode.org/elpa/org-20171030.tar"; + sha256 = "1g2dyzy1844lli2hhfjnbskn1mskccgaaf0mxb1cm0zhhas8bnfd"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20171016"; + version = "20171030"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20171016.tar"; - sha256 = "0xy2xrndlhs4kyvh6mmv24dnh3fn5p63d2gaimnrypf1p8znwzh4"; + url = "http://orgmode.org/elpa/org-plus-contrib-20171030.tar"; + sha256 = "0pq2hs5d2i6s036pcs0jn6ld2p1ap08dmbjf17hsh899741mg9cj"; }; packageRequires = []; meta = { From 70b132c9760fefef4e3990eef2cff13b6c00a0e1 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 1 Nov 2017 11:39:44 -0400 Subject: [PATCH 2132/2806] melpa-stable-packages: 2017-11-01 --- .../emacs-modes/melpa-stable-generated.nix | 365 +++++++++++++----- 1 file changed, 267 insertions(+), 98 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 22c98d88ed2..51b9facd111 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 = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24"; - sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; 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 = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24"; - sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -989,12 +989,12 @@ aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aes"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "Sauermann"; repo = "emacs-aes"; - rev = "d78796facc034b09f379cda5f27090f3139305ec"; - sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2"; + rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af"; + sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes"; @@ -1073,12 +1073,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c"; - sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d"; + rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476"; + sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -3331,6 +3331,27 @@ license = lib.licenses.free; }; }) {}; + build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "build-status"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "sshaw"; + repo = "build-status"; + rev = "c29a0146c5d0be274f5e17921e01698f572c23a1"; + sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status"; + sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92"; + name = "build-status"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/build-status"; + license = lib.licenses.free; + }; + }) {}; bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "bundler"; @@ -3670,12 +3691,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.0beta2"; + version = "4.6.0pre1"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "817604da4d38362b6b2bd4c7787a5add6741cd21"; - sha256 = "1d49kiv9nfr624924qwmf0mfsvja28mvliipaylfbslyb3f7jpkl"; + rev = "500625015d40f716e19278209faaa44216dcff58"; + sha256 = "1s10wirx080yl0gd2n09lw5kj8yy1mbiipmcr8gpfyc8dq7kfjna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -4235,12 +4256,12 @@ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circadian"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; - rev = "0034de1551de9f420f42267f3ec081351c2b5d7f"; - sha256 = "1khczk5lsiicyjra7g5m3dcl1rc6g43zbypigkj3izx2dsa47n5d"; + rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee"; + sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; @@ -4667,12 +4688,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.10.0pre3"; + version = "3.10.0pre4"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "319622a49fb300cd8a7efd8378421a32204510de"; - sha256 = "19n0s0kd051xh3av9nd5ncpccx6bmvay6115g0kqgmi8wbw7587q"; + rev = "45da558742bad36be518e8d95dee0d0ec3793a64"; + sha256 = "0qq7dhwcl290ymza5imc16cg3f9crxym1q6b4i7w9fax8x2vlc1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5294,6 +5315,27 @@ license = lib.licenses.free; }; }) {}; + company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: + melpaBuild { + pname = "company-lsp"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "tigersoldier"; + repo = "company-lsp"; + rev = "86fda23d29b732ba3987bf20901034da1515b077"; + sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; + sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l"; + name = "company-lsp"; + }; + packageRequires = [ company emacs lsp-mode s ]; + meta = { + homepage = "https://melpa.org/#/company-lsp"; + license = lib.licenses.free; + }; + }) {}; company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; @@ -5360,12 +5402,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24"; - sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -5660,12 +5702,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "6ba9ef5d72ef613f478e07e2ebf57b47066beee7"; - sha256 = "0mp6jzyvz3m41vb4kwwikyvcjgc8qgryyx71n1m50jr2i23s9nk2"; + rev = "526be691824f4a32299f560a883913697bc4d847"; + sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -6329,6 +6371,27 @@ license = lib.licenses.free; }; }) {}; + cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: + melpaBuild { + pname = "cwl-mode"; + version = "0.2.4"; + src = fetchFromGitHub { + owner = "tom-tan"; + repo = "cwl-mode"; + rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9"; + sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; + sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j"; + name = "cwl-mode"; + }; + packageRequires = [ emacs yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/cwl-mode"; + license = lib.licenses.free; + }; + }) {}; cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; @@ -6374,12 +6437,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "32538fc162be830bf01ff96e43a020bc4924a1ee"; - sha256 = "03v4ig9zlh8dz9s0c31f5hz2wfpvjydiidb0zgghnrshlqacpyj3"; + rev = "41b4a28d7c7c505d58502c9cf69bde2e33091de0"; + sha256 = "04k534xyr8816821y0lf2dq24bzvb40v99ijdwgy5qhv4rjxbr18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -8057,15 +8120,36 @@ license = lib.licenses.free; }; }) {}; + eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "eacl"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "eacl"; + rev = "c7a8d705295dc51cc306cb4c2d8773e24c4c74f4"; + sha256 = "1f3liqrw55v9wnf7g475iabx4pf7gbg2x82mqrf22hhkvxzi2b2b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; + sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr"; + name = "eacl"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/eacl"; + license = lib.licenses.free; + }; + }) {}; easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "0b55c207c6552223857de03bf8aec8be3344ed26"; - sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0"; + rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0"; + sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -9139,12 +9223,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "1e65cb6e988df088c299572464335b6f149addcd"; - sha256 = "01mfrn6mn8h9fkpkqg2shp21864ffjr7q5h3rpbnk6wpa3pmjc1m"; + rev = "99f0b6401bff25d40b9f58123533271f7870a286"; + sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -9440,12 +9524,12 @@ embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "embrace"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "embrace.el"; - rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9"; - sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l"; + rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2"; + sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; @@ -9479,20 +9563,21 @@ license = lib.licenses.free; }; }) {}; - emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "emms"; - version = "4.3"; + version = "4.4"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "4cb3ae341847e8e8586373a95a458a453469812d"; - sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b"; + rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d"; + sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94"; name = "emms"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/emms"; license = lib.licenses.free; @@ -10064,12 +10149,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.1.2"; + version = "20.1.3"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "919ef5de2858e606d4a9be3e0e995b0802c76e33"; - sha256 = "0y76ci80wmzrxvj90bhiz6cvwbis34kcc6dzas9xxsj92b6sh7sk"; + rev = "a98379d0519c28f9bc9b673ed2c09fb1ad52456e"; + sha256 = "1672yqqh7ql88c6ifv555wvqrj8nyn5a2nph43n2nc43h7hhz17c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -12585,6 +12670,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }: + melpaBuild { + pname = "flycheck-nimsuggest"; + version = "0.8.1"; + src = fetchFromGitHub { + owner = "yuutayamada"; + repo = "flycheck-nimsuggest"; + rev = "8b1c69e9aa924368bc4dadd4cde818ff158cd3f0"; + sha256 = "0vnwy7b3xs2smbr6ah6yk8hq7vvsciq7d6m1qr91nfnazdgvxmvg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest"; + sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv"; + name = "flycheck-nimsuggest"; + }; + packageRequires = [ emacs flycheck nim-mode ]; + meta = { + homepage = "https://melpa.org/#/flycheck-nimsuggest"; + license = lib.licenses.free; + }; + }) {}; flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; @@ -19471,12 +19577,12 @@ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Galooshi"; repo = "emacs-import-js"; - rev = "15d395126f57408d770a72db2e5f43271f90fa52"; - sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l"; + rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250"; + sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js"; @@ -19992,6 +20098,27 @@ license = lib.licenses.free; }; }) {}; + iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "iter2"; + version = "0.9.4"; + src = fetchFromGitHub { + owner = "doublep"; + repo = "iter2"; + rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55"; + sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2"; + sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65"; + name = "iter2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/iter2"; + license = lib.licenses.free; + }; + }) {}; ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; @@ -20452,6 +20579,27 @@ license = lib.licenses.free; }; }) {}; + jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jetbrains"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "jetbrains.el"; + rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8"; + sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains"; + sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7"; + name = "jetbrains"; + }; + packageRequires = [ cl-lib emacs f ]; + meta = { + homepage = "https://melpa.org/#/jetbrains"; + license = lib.licenses.free; + }; + }) {}; jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jinja2-mode"; @@ -20518,12 +20666,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09"; - sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag"; + rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb"; + sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -20956,24 +21104,24 @@ license = lib.licenses.free; }; }) {}; - kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "kaolin-theme"; - version = "0.9"; + pname = "kaolin-themes"; + version = "1.0"; src = fetchFromGitHub { owner = "ogdenwebb"; - repo = "kaolin-theme"; - rev = "d43ba0e8e6b13b08e4d74de20c6e594ebb225501"; - sha256 = "0gg19rh5q1gl6ylwrmjq0dqh6p5fkms1av6bbgry6fqv8220xf8n"; + repo = "emacs-kaolin-themes"; + rev = "720762a42ad4cb4b325f78a9d41af380b8783501"; + sha256 = "104prgkjqnnv1bqgpcl0di1q9sqkfnj4ibqvrk6ls32hw75shvdh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; - sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c"; - name = "kaolin-theme"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; + sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw"; + name = "kaolin-themes"; }; - packageRequires = [ emacs ]; + packageRequires = [ autothemer cl-lib emacs ]; meta = { - homepage = "https://melpa.org/#/kaolin-theme"; + homepage = "https://melpa.org/#/kaolin-themes"; license = lib.licenses.free; }; }) {}; @@ -24629,6 +24777,27 @@ license = lib.licenses.free; }; }) {}; + nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: + melpaBuild { + pname = "nim-mode"; + version = "0.4.1"; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "nim-mode"; + rev = "86abed21b9b718ac65cc167f208e0bd5b92c79ed"; + sha256 = "0h1paf9z6xvkay97ns74w2w9plwi46md5f2kik4jvjy74p57gxal"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; + sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6"; + name = "nim-mode"; + }; + packageRequires = [ commenter emacs epc flycheck let-alist ]; + meta = { + homepage = "https://melpa.org/#/nim-mode"; + license = lib.licenses.free; + }; + }) {}; ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ninja-mode"; @@ -24682,8 +24851,8 @@ sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode"; - sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; + sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5"; name = "nix-mode"; }; packageRequires = [ emacs ]; @@ -25472,8 +25641,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a"; - sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj"; + rev = "906e29a702237f039f24c215fdb561a728a3df1b"; + sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -26109,12 +26278,12 @@ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mru-clock"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "096a7c514ab8487ec63def6281cf4dce24e3a626"; - sha256 = "1hmyqvi1dj5yrlish8kw4sdh3yy0b0w33smw4cbjagp4rs29p3fp"; + rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832"; + sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -27136,12 +27305,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "16cf5d595644ee4e05b05b351e0c4fdd5df0ac44"; - sha256 = "1n5xbgwv9x2b9zmv7nw0x64qbll4ycjf2dp09rdj3m4bmcg2gv42"; + rev = "c32359c71e7926c7f13039069d8d7481dfb9bc82"; + sha256 = "1nw2dp6rn3hnnzzffvpr6yz7c154338h9i5ixxgh5vjxm9phzdml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -28705,12 +28874,12 @@ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: melpaBuild { pname = "pocket-reader"; - version = "0.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-reader.el"; - rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd"; - sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh"; + rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574"; + sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; @@ -30957,22 +31126,22 @@ license = lib.licenses.free; }; }) {}; - rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: + rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "081685a8c624220ece68d6dca8d60016585b04ff"; - sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z"; + rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14"; + sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; name = "rg"; }; - packageRequires = [ cl-lib emacs s seq ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/rg"; license = lib.licenses.free; @@ -33457,12 +33626,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "2.1.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "262c46a282ce54ca4745b863cf323d9bf69e2faa"; - sha256 = "02ai86c15x0fbgg2bw6a9k3k825gkhl3hy9abq62dfgdwc0cqxmn"; + rev = "e220a0c0c478fee0be3622442651981cdd82090c"; + sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -35135,12 +35304,12 @@ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tickscript-mode"; - version = "0.3.1"; + version = "0.4"; src = fetchFromGitHub { owner = "msherry"; repo = "tickscript-mode"; - rev = "eb6eafee2df253a0f1356f260cc7f435ab68aea2"; - sha256 = "04pd1dvvs914f98yaq5n0nv1jbjr2sjgi3a288vpismrmxfybcch"; + rev = "9acf389dd055ae77c92170802769838810472490"; + sha256 = "1v60y244papzrirwqk9c2wcwgz4qp9h7m3887kvgr5ffn5imjss8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; @@ -37237,22 +37406,22 @@ license = lib.licenses.free; }; }) {}; - winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winum"; - version = "1.0.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "deb0ch"; repo = "emacs-winum"; - rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883"; - sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37"; + rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c"; + sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw"; name = "winum"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib dash ]; meta = { homepage = "https://melpa.org/#/winum"; license = lib.licenses.free; @@ -38018,8 +38187,8 @@ version = "1.80"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "ca7cf34e959c"; - sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma"; + rev = "16763e5b7481"; + sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; @@ -38276,12 +38445,12 @@ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "ed8aca43820678ff6e7b8ed697cba8dbb3a6136e"; - sha256 = "1na1syvbayqwbsvd1d0ajyzjvhg8q3s3mqrx82ffcbxr0ijyzzj8"; + rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40"; + sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; From 3ab147bee00dbe99adf1ab84f7fa158d099bc82a Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 1 Nov 2017 11:42:16 -0400 Subject: [PATCH 2133/2806] melpa-packages: 2017-11-01 Removals: - axiom-environment: 404 not found error - ob-axiom: 404 not found error --- .../editors/emacs-modes/melpa-generated.nix | 1663 ++++++++++------- 1 file changed, 990 insertions(+), 673 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 8c17823105e..3db74fa9d4f 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -383,8 +383,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; - sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; + rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859"; + sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -740,8 +740,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; - sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -757,12 +757,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20171017.422"; + version = "20171022.808"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; - sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -803,8 +803,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -841,12 +841,12 @@ ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "ac-slime"; - version = "20150729.2035"; + version = "20171027.1400"; src = fetchFromGitHub { owner = "purcell"; repo = "ac-slime"; - rev = "fafc6f75c90b2dbf124edd3e2887860ce052081e"; - sha256 = "0dix8giqbc9la5mycrjgq287j03s44nhrg9b1drsca2sc58cnach"; + rev = "6c80cb602ddad46486288f94ad7546396c6e4b1a"; + sha256 = "11w1z653klghi6inv9n92cigz8m3c67j3r18mdk39inc3izwplkj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime"; @@ -925,12 +925,12 @@ ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-jump-buffer"; - version = "20170828.2153"; + version = "20171031.850"; src = fetchFromGitHub { owner = "waymondo"; repo = "ace-jump-buffer"; - rev = "02797c22c10a817dbbdfbd8fddceeba6c4f0499a"; - sha256 = "13wq92ia18q9vyhmvnz1grl1l18hxnaisb7hv13dhfc06alcsrw2"; + rev = "ae5be0415c823f7bb66833aa4af2180d4cf99cef"; + sha256 = "0zg4x5faxkp0gnjq7209hn74qkzmk8k7wbr7k8wxpssjbnmxkvd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer"; @@ -1201,8 +1201,8 @@ src = fetchFromGitHub { owner = "codesuki"; repo = "add-node-modules-path"; - rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3"; - sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6"; + rev = "eb09f4743af210a8e27f21889b4e0fef33208e4a"; + sha256 = "064gzcyx6nkq9wdrf6sd64fs8biwfrn25qj9vv7gznlrl5rg31x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; @@ -1260,12 +1260,12 @@ aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aes"; - version = "20170607.157"; + version = "20171028.2323"; src = fetchFromGitHub { owner = "Sauermann"; repo = "emacs-aes"; - rev = "8d9ddaa7d13875745241f0f98758b1d72dd3be92"; - sha256 = "1d998xyfnzgci62h0wv1n9a7hlk23ngcbl83k04ahz61g7haqnh2"; + rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af"; + sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes"; @@ -1405,12 +1405,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20171009.1931"; + version = "20171029.2107"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c"; - sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d"; + rev = "6b078bf41f59ea0158b01742cae428ed61c4bc35"; + sha256 = "0c61wsvb82r2ygiyk3na559y0jhba266igampa43g4qdphkjzfqy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1468,12 +1468,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "alchemist"; - version = "20170803.414"; + version = "20171029.2307"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "8ea2db4781e367c1cf8ce2eec4222daa7d1b7b57"; - sha256 = "0gq4l95krvirv2rb4l52gka39588k817g4kl483hj2ii9il32gd0"; + rev = "4beb4c9ceee0534a36f7669aa35fcbdfd6bef7b7"; + sha256 = "0k1k5rb95nyndzhin47r4nzap4fp3dr57gv557wzy3a6jpl88fgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1489,12 +1489,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170913.926"; + version = "20171030.1008"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "0e800594796ae283f5c0a6a374b9c2f8ebdfef56"; - sha256 = "06j1imqknya3kglnmhsz2jg18mcbcycrjlgjzb9c1n68z43xglyh"; + rev = "3a08f8349a1ebe8e0ae8622f5bf6ed93491dd785"; + sha256 = "1lrgxawhsaziwvvs16n0339xn0m1333028q0gj3md23bpgrjqa5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1531,12 +1531,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20170824.1140"; + version = "20171024.1907"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "08f42ced409b6edd70e4b13ed648f16240dc1ec1"; - sha256 = "13my3m81binijaz9r113k1xll6p86qrcxacppzm20r71gpa1iifb"; + rev = "206d7095c93a25bb41af17cd26fd3967ddd57e00"; + sha256 = "1lyvq0zkamlyv3z23x8hb8dirjd45bihqhmwdgilnw3y139vhm4l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -2463,12 +2463,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20171019.916"; + version = "20171022.2203"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "5d25972192cd34553997ba193c09eab093a2b870"; - sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0"; + rev = "79422b610f2c3d9f52fb35449485a2fc541bc5a0"; + sha256 = "0i2k975szdgzmrbwkvcnhrk73ndvk0q215fn68sb5m4zf43ifwxz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2945,12 +2945,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "20161213.730"; + version = "20171022.107"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "1b96d563c5d435baf8dfa9cdae5ef38ce34629b9"; - sha256 = "0caiv0snjxj0f1p0rx18r1w4nbsk8shrin2dr2ddg54mpxzf8r98"; + rev = "1bd79fc940d2be82eaec20aca2069677e156a697"; + sha256 = "1j5brpmbahnrp8kxphq10g0l703czdalqa731y3s2p3m3gida54x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -3050,12 +3050,12 @@ auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "20170123.107"; + version = "20171026.537"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "b9fb3ef8d4ebe7bef939a3cf574f9caa833347c9"; - sha256 = "1rzqz560zqsymdpv84n1z17jyf7k75797y4bkzhk5grd3ry77x9j"; + rev = "79e297e9f2c2bccb545994ddda356f958889b4ac"; + sha256 = "11nc3hicp8n21rmj00svzh0kfhyb92w37ipk6nkl1fd3jk1xzr7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3680,12 +3680,12 @@ autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autobookmarks"; - version = "20170417.1407"; + version = "20171021.1532"; src = fetchFromGitHub { owner = "Fuco1"; repo = "autobookmarks"; - rev = "cd19e15b8951a7af55d67a5bb4e0948e62b0a119"; - sha256 = "1xv73ls9mhvgjxa9lpw3brmzdd8739zyn9nqb1lrnvx468bz4kry"; + rev = "b40c69f2d1c419adad516bee81b07b99110e5cc3"; + sha256 = "0dailajx26dixlibqps5wfh224ps7azm453lmzxjc2d10mgapi5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks"; @@ -3974,12 +3974,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20171018.937"; + version = "20171031.915"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "b583c34750044ad0da511341c44332ed94995520"; - sha256 = "138q2gj32sxx69vmxbc4wcihph38g9ychak7q7sy2zziqwip1nlb"; + rev = "5598fd25e483d8521e6d5f691802fa125947d7cf"; + sha256 = "1gkn1qbywv8as3csp5s1fwmrp89bmbqgyl7av0c1v9ggx7gkhd5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4034,26 +4034,6 @@ license = lib.licenses.free; }; }) {}; - axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "axiom-environment"; - version = "20171021.822"; - src = fetchhg { - url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "f99f1eb2af8a"; - sha256 = "1n4rrvq95bhhirak72wccwsd6822p38mvyyrrkgjz8ah1xfvfm1m"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment"; - sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66"; - name = "axiom-environment"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/axiom-environment"; - license = lib.licenses.free; - }; - }) {}; babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "babel"; @@ -4232,12 +4212,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20171005.1058"; + version = "20171025.1545"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "e7e646b79b5e3cebdf34f0ed775bceb8a5f3645a"; - sha256 = "1lgg54cxl1zhv1gh7y5z99dwfb15w64gn05g8iwha2f37kmk22r4"; + rev = "1578c6cd8f76a664bda7fc9b2515ee8106552cb2"; + sha256 = "0wp2vfk7hpvagdiad9g4wj5992f1fv4v77x387v1sz5w1zn195aj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4295,12 +4275,12 @@ basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "basic-mode"; - version = "20171011.1126"; + version = "20171027.1114"; src = fetchFromGitHub { owner = "dykstrom"; repo = "basic-mode"; - rev = "7683d9812b1f4c6ac33b386abf81461175075c30"; - sha256 = "01pmxcff8v64sc49ahzkks636p778l4fy8s5x6p9rngnwm72gmnw"; + rev = "7a76ec2d45f6bc1e4b5a4c8996c4bf27a31741e6"; + sha256 = "02q9sxx9g8pqyiknbzy48qbmnvgl1pmcgsppbk7rybb68kq5zlqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode"; @@ -4927,8 +4907,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "cb89901b52a9413b6c233d7fbb616a2d8f38b50a"; - sha256 = "1fypvrmn1brrq2200kr8s8zbcc30z9nhfv3k8vs36iawab2g573k"; + rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc"; + sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5364,12 +5344,12 @@ boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "boogie-friends"; - version = "20170907.922"; + version = "20171024.1955"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie-friends"; - rev = "c30b229fb765b42d059c15e76029379ed3fc7202"; - sha256 = "1cdl0sxa4rwr162cg8qhlwhvav4i0pv0njkfca7dg6xwfjkq6g8l"; + rev = "ff9903783013f3598b6f44c99d47b25c5cdbed00"; + sha256 = "0vc1pym7x6aafd88rrmm8yibq5y9wrx6b1pbgsfr7spcdq0hwwvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends"; @@ -5993,12 +5973,12 @@ build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "build-status"; - version = "20170323.1621"; + version = "20171031.611"; src = fetchFromGitHub { owner = "sshaw"; repo = "build-status"; - rev = "01bb9cc1776e8eaab68147175aee9879d9541c4b"; - sha256 = "1c6q6rk6rvip5xv2zdpqamprx9kqh0c6v3r939fn7m4fnyyz15fn"; + rev = "c29a0146c5d0be274f5e17921e01698f572c23a1"; + sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status"; @@ -6140,12 +6120,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20171020.527"; + version = "20171029.1011"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "62c416a534a1b0c2acf1cababc49c435d4e33ea7"; - sha256 = "140cwm0jirmq3b9xwcqf3hfy38xsbq0z8jnzbgblwf31zpzgj6qp"; + rev = "bbbf6924ff214b518718687ead96ceec92bdbaba"; + sha256 = "0z05rr85mf9as2byj3k1ai9x5ci45a7g425svv0ywgz1lgv2vsi4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6585,8 +6565,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "09e545e159c5166ae374ab505f4c1b66fb3ec6fd"; - sha256 = "00m9zd2dnv9bsg6y3imk6nj992zjsy1zf3ylg67iw6x88v01pvji"; + rev = "65252925f597008101cdb68b6dd119227106f0e2"; + sha256 = "0627mksg7hmmz1hzalyrklsnwpz2k3jzl41dyllk5b7xpap5s9q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -6623,12 +6603,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20170807.607"; + version = "20171026.13"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "61f4673b2b4d76ed6404f2c905e5de57c41ccc97"; - sha256 = "0nkrqmylyv2c7zrfy12p7j161mkg91zm9fb1gjjyq0k7ixad677q"; + rev = "3ecf0b89b3d36874a301a7e2fb429fc026c73f35"; + sha256 = "1mv1a0z379mr7y8by5s1lnkvp1kamch01j0yn1aqgxjry3z789dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -7046,8 +7026,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "51b4a9aed3d18eb7b27e1580807ffacf5abd3bc2"; - sha256 = "1g9wg331fr578sgdz9c7qk27aphi2ryddib0sqdk9wsc5h41cfmi"; + rev = "b0979047d55db2aefda4adc40cd266c693a57b70"; + sha256 = "15giw6kacnj1fa3w794gnaqjpywrdrz96rgq1igsygj1rjacrgi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7819,12 +7799,12 @@ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circadian"; - version = "20170924.1440"; + version = "20171022.724"; src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; - rev = "6412eca0dfd5030ccd18f949066f1352ed89b44d"; - sha256 = "0y62c3cfsz439x7pp7s4zzfhavyasv07y4gkn37383p38k56xqdf"; + rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee"; + sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; @@ -7928,8 +7908,8 @@ src = fetchFromGitHub { owner = "emacsorphanage"; repo = "clang-format"; - rev = "1fc9ffb08a71d8747c26037a133fbd811673adc0"; - sha256 = "0zldh5nk5i3y41q70kwlhf576xmv0baim3q4jam01d41p4p040mq"; + rev = "6e6114fac0e4e600f1ffed7b2ce978f7adb001cd"; + sha256 = "07zabj31bgckppkqgg5if515093k0lx2xyf3adh90ymmssvvgary"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format"; @@ -8314,12 +8294,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20171008.743"; + version = "20171031.357"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "05b6f053eeb56cb8301361bb84f9fe1371a53818"; - sha256 = "1vpa5k2f0ixgy2wzly420ywhrri07nvmimns6xkydilkqpp5mk1b"; + rev = "061431d86f05a5a25d2e00fc5f317b22cb9d8a79"; + sha256 = "09cv517p42nrzj435b1ma8lfl1k4izdv1dj1q9hi5y61q1q1zhp9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8339,8 +8319,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "05b6f053eeb56cb8301361bb84f9fe1371a53818"; - sha256 = "1vpa5k2f0ixgy2wzly420ywhrri07nvmimns6xkydilkqpp5mk1b"; + rev = "061431d86f05a5a25d2e00fc5f317b22cb9d8a79"; + sha256 = "09cv517p42nrzj435b1ma8lfl1k4izdv1dj1q9hi5y61q1q1zhp9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8545,12 +8525,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20171017.608"; + version = "20171101.236"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "cfdf8522159882a3e07bfa1f648b07d807afb650"; - sha256 = "0wiv1bqgf3szg9dkdhccbxk28xgz07jdmfpfp24wic6dpny2vzjx"; + rev = "114e2df27f79816f023a07e3e8024c7ab73603f0"; + sha256 = "1n7zv325kjvmz694r11sbz6650b8y22kv2mbx4yrdha9r6y2m1f7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8570,8 +8550,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "3e0441d87735241eb496b22bb8856bb29575b941"; - sha256 = "07q91k9fim3w646mfhwvj3ai56xkycs22izqlvz34ldlwysnx68q"; + rev = "a57bad6c3d0dbc885bb71dfe465d09a380c35960"; + sha256 = "1igyb96zbdr94sxry8irffhmhcz1wi0d4a65cf98j4vvnxz36b9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9028,12 +9008,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20171014.1430"; + version = "20171030.1358"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "acd7887256a77c07006fb45ebab67f1cd68df2f6"; - sha256 = "0rjidxjwaxmkrc8dcz37v3h76rzm4kf2gjx2s2mj3dym8l6bg5cl"; + rev = "e7f5d175916df20c411713e49be8b58aac36f7ed"; + sha256 = "11n5ly2n8l4b7xph81w57av42zv43fk2vc6b6mjhxvvn86l97ma7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9049,12 +9029,12 @@ color-theme-solarized = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-solarized"; - version = "20160626.743"; + version = "20171024.825"; src = fetchFromGitHub { owner = "sellout"; repo = "emacs-color-theme-solarized"; - rev = "797229d0d3c9a2233fd8c69c0c2d9948be1d0685"; - sha256 = "1mx4948qdbwg93261bxr0k5cjx05ws7c3cmhrv6znvjzp6gqxlcl"; + rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee"; + sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17096b452740bf6b7afa38e62df8e623494aa6b2/recipes/color-theme-solarized"; @@ -9112,12 +9092,12 @@ column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "column-enforce-mode"; - version = "20170103.1231"; + version = "20171030.1200"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "column-enforce-mode"; - rev = "379366fe0a5bcb333db2d55cddcf18d6e76ab3fc"; - sha256 = "1vqydf174rydclwmcq6j8xpr16k9w049x9rilg1lvyjc67p7pyaf"; + rev = "2341a2b6a33d4b8b74c35062ec9cfe1bffd61944"; + sha256 = "0rcxb7daxxrp5f1i5cbv25viwawbbsn4ij1mnlclp5wz7ilcy2rs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode"; @@ -9614,8 +9594,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; - sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; + rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859"; + sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9904,12 +9884,12 @@ company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20171019.2235"; + version = "20171031.1844"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "2e32d6141370e0736644928a8dbd7812b89c717e"; - sha256 = "0fyl2bkn289f3b6150kyg6civair659c2pg13ng6x5vn3pih5agk"; + rev = "5fc50b6ad5c4ee71625bddf348646be44e69f396"; + sha256 = "1gkabm9iaimv4s7v723aflvxa7z902py46m5mz0szpdcrrh36495"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10034,8 +10014,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; - sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10187,8 +10167,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10376,8 +10356,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; - sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; + rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4"; + sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10456,12 +10436,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "20171009.1921"; + version = "20171028.617"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "32f87d1f940058404858e5e6472877a069df219e"; - sha256 = "0zr86fr0dswxchm28jvkc4fdqg3wp7hw5ch8jai2pm3cn45cqk7z"; + rev = "526be691824f4a32299f560a883913697bc4d847"; + sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10477,12 +10457,12 @@ config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "config-general-mode"; - version = "20170719.446"; + version = "20171024.1140"; src = fetchFromGitHub { owner = "tlinden"; repo = "config-general-mode"; - rev = "8927fd1c359275dc4236c5f48fea0e3ce8349bed"; - sha256 = "04f6608ndhan6xmipzylzwzx2asx0bsqx8a9rnxfab3bza756c99"; + rev = "b4a8e6ba0bb027a77e4a0f701409f3e57bb2e4c0"; + sha256 = "115sk0h6i1bfnxw1v11719926cvnq7gyisjcysvkam40hp3d5fx5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode"; @@ -10813,12 +10793,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20171017.1029"; + version = "20171031.1234"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; - sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; + rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c"; + sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10876,12 +10856,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20171020.2305"; + version = "20171026.435"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "5d7b51ce7806bbe7e1f75077b4dde2ac17a53c5d"; - sha256 = "0v3b3gs4jy8cqkvchnakwpws3a0igiklchb9q3754lnmk8784dn8"; + rev = "19757e5d79a7a504760a1e7a7095779b48ec995f"; + sha256 = "1qacqjl1x01r3ss1a9qwy0651gamnkp59nzl9i6krnrdfksc6gjz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -10957,6 +10937,27 @@ license = lib.licenses.free; }; }) {}; + counsel-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "counsel-pydoc"; + version = "20171018.1342"; + src = fetchFromGitHub { + owner = "co-dh"; + repo = "pydoc_utils"; + rev = "1d8ff8ca3b9d69453cde423b1887fbb490a95c9e"; + sha256 = "06kf93y8wb9nwvs70xi4lkd5x4g6sl8f83diy2wl7ha657dwx3m8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/110939c12b4e042a486e97be4c2a2426c5978ca6/recipes/counsel-pydoc"; + sha256 = "1a3vwh4jf5y03z95bd4blk75n6wjd24l6yw6vpr3991bi4qrxclz"; + name = "counsel-pydoc"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/counsel-pydoc"; + license = lib.licenses.free; + }; + }) {}; counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-spotify"; @@ -11335,6 +11336,27 @@ license = lib.licenses.free; }; }) {}; + crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "crystal-mode"; + version = "20171023.212"; + src = fetchFromGitHub { + owner = "crystal-lang-tools"; + repo = "emacs-crystal-mode"; + rev = "1e8061c049766c25f1c06d43e703d3133426f7c0"; + sha256 = "0w11s1vmp9b4dlq9kvnxi63j69c94bqpg3fn9w4jasnpz4w9nkcf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode"; + sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk"; + name = "crystal-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/crystal-mode"; + license = lib.licenses.free; + }; + }) {}; csgo-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csgo-conf-mode"; @@ -11380,12 +11402,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20170923.807"; + version = "20171025.401"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "b5abcb68cedf1231c2e419bf87e875bfdb8fbc42"; - sha256 = "0r5c8g3jjb4p3a21mjdi9xcmify0c2r61d5y7ycbia7rjv9xpgdh"; + rev = "5680a266a32c62e8d7ebd987bf6e5fd40033bbeb"; + sha256 = "1zlb7bwx82rayzphf4q5f1w6yhm3r267fzgn74xmckh50jyq917y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -11573,8 +11595,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "747f5bafad712b90da9eb7e6b893fff16683fe17"; - sha256 = "1px9pycw44jvkl8gz1zz577hw61l7xvpmdl1bf1bl5wy72x13v42"; + rev = "0cdd084498c3f5de53a26ae756e4a9f33625fa1f"; + sha256 = "1zgdc4lm6dyh57fim52ynxx0jfs9hsdgbj739firblmin6cdvm32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11671,6 +11693,27 @@ license = lib.licenses.free; }; }) {}; + cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: + melpaBuild { + pname = "cwl-mode"; + version = "20171030.230"; + src = fetchFromGitHub { + owner = "tom-tan"; + repo = "cwl-mode"; + rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9"; + sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; + sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j"; + name = "cwl-mode"; + }; + packageRequires = [ emacs yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/cwl-mode"; + license = lib.licenses.free; + }; + }) {}; cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; @@ -11804,8 +11847,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "d31160f49f8d8dfe0287181830303f42ab2a12d5"; - sha256 = "05aggv2fzdnhpygkyabp8j2wg8m6zbn0bn8wqrgcybjr2dyp57mx"; + rev = "ed44d37a80ef91ccb059a8ae056439a889eb6973"; + sha256 = "08hk3lah5mx3aii4d6d4xb7dbz1d0m2ch0c2hf13pw2d7irqvfzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11947,12 +11990,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20171018.624"; + version = "20171101.339"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "d6e225cf5548ab67340697c2ba3a2a0f4149936a"; - sha256 = "0ll3h6ckmcagvsa0d02jymac95c3x79kgs4pi8dlly28rr7qa6b4"; + rev = "8d36d6dcddf36f89f06a3f848e69edbda28435eb"; + sha256 = "1hsfqkf3xfql3h4dprrrzrpp5fansv8ckfii5dnx55a6gl6y3sdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12178,12 +12221,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dart-mode"; - version = "20171018.1115"; + version = "20171024.2137"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "570e58c28b7f70923dfb507496468b227d5905c2"; - sha256 = "18zsqgdafphwj98jqiaaih0p0qy43z5i7d9ybsmy6b3d2qykbrwv"; + rev = "adef2a5b672d503ae3e92b30bb80095879b030d0"; + sha256 = "0bb790rpijlv4cjdcwgqzb249rnz6br557lnn74rb9g52wpabl69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; @@ -12199,12 +12242,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20171010.131"; + version = "20171028.854"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "a57c2c335d0527909f472ca51a2201ad44d38aab"; - sha256 = "0dg032h4ypib2baw83x5hgz7kkclgr6fkc0fiqd6rcikjg10y2rm"; + rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78"; + sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12241,12 +12284,12 @@ dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash-functional"; - version = "20160615.1351"; + version = "20171028.804"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "a57c2c335d0527909f472ca51a2201ad44d38aab"; - sha256 = "0dg032h4ypib2baw83x5hgz7kkclgr6fkc0fiqd6rcikjg10y2rm"; + rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78"; + sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12682,12 +12725,12 @@ deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deft"; - version = "20160610.1739"; + version = "20171031.530"; src = fetchFromGitHub { owner = "jrblevin"; repo = "deft"; - rev = "86825cd420985112d9dd38060e0edb72b08c6dab"; - sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l"; + rev = "c7413a390ac22331ad5226a8c8c007bd08759bc8"; + sha256 = "1rdjffw8vw71ay93zlr2klbr8q4q1sjnw03gsfdyll1q4idbarg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; @@ -13189,8 +13232,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13206,12 +13249,12 @@ dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-collapse"; - version = "20171010.1222"; + version = "20171026.159"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13336,8 +13379,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13357,8 +13400,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13483,8 +13526,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13504,8 +13547,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13546,8 +13589,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13567,8 +13610,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13630,8 +13673,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14406,8 +14449,8 @@ src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "8070936871e0fbb20fb04c28630288ebe314b8b9"; - sha256 = "0gk4ykvsv8wgfiym0z635a3n3jaw4wnvfmf78ppfinrzybg85r76"; + rev = "4df5f94c78817a1f3755a7c9b1358349bf287270"; + sha256 = "05ggavxq61w55n6b8g76xpqasfka3rbf3326jwxjrd1p6wzs1d3d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -15246,6 +15289,27 @@ license = lib.licenses.free; }; }) {}; + dynamic-spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dynamic-spaces"; + version = "20171027.1151"; + src = fetchFromGitHub { + owner = "Lindydancer"; + repo = "dynamic-spaces"; + rev = "97ae8480c257ba573ca3d06dbf602f9b23c41d38"; + sha256 = "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e0b59ce66132cbe2b1f41b665dcb30bdd04bc48b/recipes/dynamic-spaces"; + sha256 = "0l4hwqivzv51j7h5sgd91dxb5slylmrfrvf7r6w0k04bhld6ry0c"; + name = "dynamic-spaces"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dynamic-spaces"; + license = lib.licenses.free; + }; + }) {}; e2ansi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "e2ansi"; @@ -15435,6 +15499,27 @@ license = lib.licenses.free; }; }) {}; + eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "eacl"; + version = "20171028.258"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "eacl"; + rev = "94b0eb062899db25f2ef0e535bc6ecace4b5c4e8"; + sha256 = "042va8ysvnyr7vgwrhd970ly65q1fczk04n6vd9zqxn02cqvk2yh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; + sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr"; + name = "eacl"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/eacl"; + license = lib.licenses.free; + }; + }) {}; easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-after-load"; @@ -15480,12 +15565,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20171020.503"; + version = "20171025.1516"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "0b55c207c6552223857de03bf8aec8be3344ed26"; - sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0"; + rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0"; + sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -15648,12 +15733,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20170921.1440"; + version = "20171024.1038"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; - sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; + rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859"; + sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -16173,12 +16258,12 @@ edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "edts"; - version = "20170821.149"; + version = "20171030.9"; src = fetchFromGitHub { owner = "tjarvstrand"; repo = "edts"; - rev = "8a737e0601ab4a3fbe2f1252f8b1474ca39df94c"; - sha256 = "0dbha339yp7jd8nmz38g9igmj5bi03l9fz9gqy2z8j367br3afxs"; + rev = "6ef4bdf571235ee1b078db321402270cabff7fda"; + sha256 = "1nzf8wdv0hs4kp69cy3blwxh18c2bkxr4d4y6ggdp0vmwv41j3zi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts"; @@ -16269,8 +16354,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "170be423c79e8e28b99e5745bf7135ce3bf2de52"; - sha256 = "1hi2ch08m48lpkhqz05ry736qj1mjva4krbqn2wkhcfdfrxpzhx6"; + rev = "94d964066ed7cecaea2b31eda7703396032ea4ed"; + sha256 = "0ln5dzbrbxzhlr797hphd5dmbrhh76cdfbm1fvgl3bi1fw59g8pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16347,12 +16432,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20171020.1157"; + version = "20171024.1043"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "4909b176dcab9c762048dd654032722002e0f4ff"; - sha256 = "0dr2xarq5irzq095hag6scwimqsp21866iaxjy27rygzgwp5g794"; + rev = "eaded1e01378c61be8bc454d111e8cc4951a0b5b"; + sha256 = "0m0dkzr44bmgc5sxzgsp290hvsylvyrsnmfk6ki44qkvp4qg0bxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16554,12 +16639,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170729.1712"; + version = "20171016.1743"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "f598a7537710f929c6f7592d8c543768361ba0de"; - sha256 = "1ijnj8ldqhcv3bq22gw1knaasj08yk9vm0nyvnfca3p6w3zv65cm"; + rev = "32f7a12c2eaacd60d48ed5e5482121154a507fb8"; + sha256 = "0m1v3gjds2j16kpy05zipdh30fbsb2zrgjny156kgjjxy6fnrnki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -16806,12 +16891,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20170311.533"; + version = "20171022.625"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "5800e90f5ce23663fe370e4ad8fb40f59a4f93f5"; - sha256 = "0d3fakycfg7rfblp6wqxyynvnqnpnz4hvi812fp5v4wqz4slfjxh"; + rev = "278086fcffa1a4607392ca2b0ad57522e492b52c"; + sha256 = "1kf1281igi6pzg04fsiqwhwrlqv56c1fi56a4z6ch76wh5s63vj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -16894,8 +16979,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f343cfa93b7d91024496b8b7f46280762fe86659"; - sha256 = "0bysjh9626r2651n6vvq6mbbw36jrp41nmd45an6y9cl0z0wj58w"; + rev = "23cbeb803a312fd0e3801ef240e4322bf9965656"; + sha256 = "0vi0vbd2k4frj6ij2v8imx57vikgcp47gwk11w4qh4k0na4cjbfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16964,8 +17049,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f343cfa93b7d91024496b8b7f46280762fe86659"; - sha256 = "0bysjh9626r2651n6vvq6mbbw36jrp41nmd45an6y9cl0z0wj58w"; + rev = "23cbeb803a312fd0e3801ef240e4322bf9965656"; + sha256 = "0vi0vbd2k4frj6ij2v8imx57vikgcp47gwk11w4qh4k0na4cjbfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17191,12 +17276,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20171011.101"; + version = "20171028.2337"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "9c182dbbd7170c6626afb031bbc6a399399d2cd9"; - sha256 = "1vz8gc8az8cw2v7gg11l6ncg3cw09ynspxmp29rbcxl63qbis6fa"; + rev = "6fa343ada4a74850840e21bbe787c14fe5a67155"; + sha256 = "18yk029k12zd8xwgj4k0741lbxzl9djik0srvb5jn6bcbcp6hb9g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17419,15 +17504,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 = "20171015.548"; + version = "20171029.955"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "36d40a66832a3ec37702813463e4acfbb7b6b5ac"; - sha256 = "1030ihnb35dyad1v7a63kyn94jk0rdkdgil7wnj8pkpzxjvyrwqa"; + rev = "434f6799e103fcce7d896b3281eb59e15a760783"; + sha256 = "1mpxzyssvp6n1y17xqxmmpymvljz7g6j60whn9mdp3njn0ijyn5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17436,6 +17521,7 @@ }; packageRequires = [ company + emacs find-file-in-project highlight-indentation pyvenv @@ -17954,12 +18040,12 @@ embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "embrace"; - version = "20170615.1131"; + version = "20171031.1133"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "embrace.el"; - rev = "394863dd7271e831cb9c257a1cd2249302ba962a"; - sha256 = "14qs180p5kv1h4p9qsv4jj61pq7d7bsrvwm0wm85lhgpx8v64q7i"; + rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2"; + sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; @@ -18431,8 +18517,8 @@ src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "c1462183573258edfd8134581417d3c95f1c9c4c"; - sha256 = "1xyg52qf8zpkrgifw1lxk8h91acrg1n7nw59mxmwq8f122lmllx7"; + rev = "cc8e64baf7f7bcef2db5b7353ddda9d9733a11cc"; + sha256 = "1bps5ld798av9nqkjsv7mnj8blnyp30dh809q0fk9qnwylpj74yy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -18511,12 +18597,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20171005.347"; + version = "20171027.1433"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "82de811bde723e78a702e98592e46514ac700f9d"; - sha256 = "15n01ni833y9viccdcvhjj80yyavm1131njxwp0q13gqgbzj3n5f"; + rev = "483e94546d9b1de5841b8853882d5644cc419479"; + sha256 = "0dd6agcjpncd3vkdx405ql03rpfacwda0njcz69f1cp7z8rc5cdz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18624,12 +18710,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20171006.353"; + version = "20171024.651"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "4258ca3457e9a7ac46d1f0bd7a80f1da51b360cb"; - sha256 = "00v5ipcz642rrg4yicwmg1nam5n0yasqgrak13b3wqmzqx1qzf6f"; + rev = "6114b78b84cd8a96a117b7652d1e5138eee4b896"; + sha256 = "1fmvy8h3ng2ykfmr2n0zms2h3csq24f23ldf5zdxyg34riag4nl2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19106,12 +19192,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20170915.1902"; + version = "20171030.738"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "6231ee0ae7014bd8f8ef2a3adc13b4d3d403bf71"; - sha256 = "1c3ryazy796zcxp550ic7a7qsgs4528sfqqywmwqpf8vl7p0p7xp"; + rev = "3ce23bba3cb50562693860f87f3528c471d603ba"; + sha256 = "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -19152,8 +19238,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "4b8255e9217c293f84a1e96b3ae8034d089e815b"; - sha256 = "1nyya11mpvw0k6gvz90iqsxj65w3c5y72k9rf60171gy1rplsbib"; + rev = "a51424af47f879e776b9344be813a03d2a4bcb5b"; + sha256 = "18cyr3pmzwab6zqijl3c6h772wzkl1qh44j87p16hcn42sip9jz1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19756,12 +19842,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20171015.130"; + version = "20171030.820"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "78d86bf3a842af4dc77f02b01ed7589d8f9eedd2"; - sha256 = "064d3n05kkg8rkp6dnqsjpm9jy2qiiry01m6k7ifk25z6ab02kgn"; + rev = "da48f2fff367191796b976100c72277bdfb504d2"; + sha256 = "000rxx14fw1n4k3i6lsvy0bc249pdyx9m1pnpv3x02n0wvmfdq62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20092,12 +20178,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20171016.3"; + version = "20171031.22"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "6ca96e8df9fb957c423ae4738e6229106861d6b5"; - sha256 = "1ij64cg6qq93vwxsj4w60xq7377rlzmrlddnqaxm95m2fkbwr7fp"; + rev = "3735da896e6fc2672ee06c68e77d11befb99c9c1"; + sha256 = "01p450ap0dvnnv83cbmasb7avz6jv6xycjg4hczf8485xzq0nmcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20995,12 +21081,12 @@ evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "evil-smartparens"; - version = "20161010.322"; + version = "20171101.13"; src = fetchFromGitHub { owner = "expez"; repo = "evil-smartparens"; - rev = "7cde5544934930819e9dcaa1e0db2e3c58f0cd6f"; - sha256 = "0pmw98n32fyqr4qnpl52a7vax4rk8dfq98v66v8400b78j6d0n3q"; + rev = "3a9c2bf24db73c9443d3e2e65ca662df85653f36"; + sha256 = "05g6j5z63gmvi2j9h6iax3dklqk61ds28yq84mkiihp58swwmfpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens"; @@ -21146,8 +21232,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "6ca96e8df9fb957c423ae4738e6229106861d6b5"; - sha256 = "1ij64cg6qq93vwxsj4w60xq7377rlzmrlddnqaxm95m2fkbwr7fp"; + rev = "3735da896e6fc2672ee06c68e77d11befb99c9c1"; + sha256 = "01p450ap0dvnnv83cbmasb7avz6jv6xycjg4hczf8485xzq0nmcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21268,12 +21354,12 @@ evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: melpaBuild { pname = "evil-vimish-fold"; - version = "20161103.333"; + version = "20171030.451"; src = fetchFromGitHub { owner = "alexmurray"; repo = "evil-vimish-fold"; - rev = "674a8a894e4ae7e7f4b2608b0c9f801a548c69eb"; - sha256 = "1v2yr5q9c239xf002ymgwndmp5yp617rj7shw2zvfl13d7x229sg"; + rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15"; + sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold"; @@ -21456,12 +21542,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20171021.457"; + version = "20171031.426"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "d20ba97e36dfb8d6965e9f43768a5fdea752da96"; - sha256 = "0am1l6b26sjdf06gnfd78qvgy5jif6r2lqrfvypb6spv4j62xy5n"; + rev = "478dddaae45a8e2373bf2b868aeece64f1288d91"; + sha256 = "17646sa3pgmlzg2s4yic82hkq1bdiqh1spgp5x2lhqh4643fi62s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -21926,12 +22012,12 @@ fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fancy-narrow"; - version = "20160124.403"; + version = "20171030.1716"; src = fetchFromGitHub { owner = "Malabarba"; repo = "fancy-narrow"; - rev = "c0f70b4333d4764323b7154e37a378adb1610ab7"; - sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y"; + rev = "9f4a587f6a5a387271fb665e13f59d41fd42504c"; + sha256 = "0dl0fc3i8g193adpkr4fb2k151lw9r6gd8p27q9xgmm9brf9jf17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow"; @@ -22238,12 +22324,12 @@ fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fillcode"; - version = "20150812.941"; + version = "20171029.925"; src = fetchFromGitHub { owner = "snarfed"; repo = "fillcode"; - rev = "1f64f0303a3157eabec355fd155571bb0c042489"; - sha256 = "0cgrswhbmzyfpkrp8iznsn1lxnb61dz2f0181pqd9gdf55qrk67m"; + rev = "d0a9e20f5fcc24a786d09ea19bfb9237681ba823"; + sha256 = "1mf2gfcjaqbw523vkfbzs2nl1y9bn9gbgmbvn2phbyj78gzq18za"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85eb403503aa83799a6072bfe21bf66c8177ca73/recipes/fillcode"; @@ -22301,12 +22387,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20170906.2011"; + version = "20171025.1943"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663"; - sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v"; + rev = "a3ecd28182ba3102fefdc080e807866464153edc"; + sha256 = "08dk8jjg63rs15hq4rb32368nja2iwdsp8dxwb3isza96lsfkwmx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22644,12 +22730,12 @@ flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flappymacs"; - version = "20140715.901"; + version = "20171023.304"; src = fetchFromGitHub { owner = "taksatou"; repo = "flappymacs"; - rev = "bbc69405f62e1bc488533709d4ab0b5eba919dbd"; - sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5"; + rev = "27f3e21acb22f786606481e3f4e5dc1edbaaaed4"; + sha256 = "0zcwsbz93p1l2jb1fs6m4s5y9klcr5qg5nw10qg30j9l2bc1hda8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/flappymacs"; @@ -22791,12 +22877,12 @@ flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-compile"; - version = "20171006.905"; + version = "20171031.2349"; src = fetchFromGitHub { owner = "plandes"; repo = "flex-compile"; - rev = "e2a2820282458cad5bcac4037baa6c2e76b1bdce"; - sha256 = "15dlfayyrcy54davrha8vm87vbip01sbqxgdjfbri4y134fljrk8"; + rev = "031f4612a07dc0ddb03424a2f986ea18e7064fe7"; + sha256 = "1vwvhaxhpmpcyrmzdfbwxsxif3fx40548gks3y4n0nhprji7wjmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile"; @@ -23000,12 +23086,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20171019.835"; + version = "20171026.610"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "ed41c2f1f7f97d866d379ee3f5d6f3d9f7847357"; - sha256 = "1cjg14f44m2j3inxzzvbv3gyrpgaf93sl3wivagq5cjngh68w23a"; + rev = "0d982b2860927a03e4cdf663750bd3b4c128918a"; + sha256 = "0azjq7d3whlqwp0svj04drk1gxd1hm99d95lkqwj9pbag5hip3ly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23168,12 +23254,12 @@ flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-clang-tidy"; - version = "20170621.202"; + version = "20171024.108"; src = fetchFromGitHub { owner = "ch1bo"; repo = "flycheck-clang-tidy"; - rev = "5b1c86477f7d1eaabd781bc83dd1bd105c79335c"; - sha256 = "1zd6rqbrpvjxa9sclkldffb91mgyljh1jcvlvvd2cdlajcv98ciw"; + rev = "b8ebd49693f67e08e420ba847cc88f6721ef9e3e"; + sha256 = "0fnn1baw64f7x1zjb95adryr3mfynbblwppcd6ywh7pk0sq18b80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy"; @@ -23630,12 +23716,12 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20170815.44"; + version = "20171022.958"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "b313b62866b8a28cadc7331749e51eb32e4ddac2"; - sha256 = "1r94y0wj0ssmamyqfxv0gm0l5qbfrfka8qgsd5mbsaw1lzk5ikfb"; + rev = "ab2e4f9b5ce4665a9b00c3e16dc8ecce30c99d01"; + sha256 = "1508rd39zkvlwcakw708lpsahmkiq4pzagjd6j8zas0xn1gb6789"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -23900,6 +23986,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-nimsuggest"; + version = "20171027.1508"; + src = fetchFromGitHub { + owner = "yuutayamada"; + repo = "flycheck-nimsuggest"; + rev = "dc9a5de1cb3ee05db5794d824610959a1f603bc9"; + sha256 = "1bf65hrz0s6f180kn2ir8l5qn7in789w8pyy96b9gqn21z50vb9d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest"; + sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv"; + name = "flycheck-nimsuggest"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-nimsuggest"; + license = lib.licenses.free; + }; + }) {}; flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; @@ -24180,8 +24287,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24411,8 +24518,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; - sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; + rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4"; + sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -25981,8 +26088,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "021e595c589f45e8444e2d049d1300ce7811baa2"; - sha256 = "1k7fkwfgnai33mrdh3wkqmm00cyydkb13j04zmxiwg3w6q4sx3a9"; + rev = "d2f3977768f5588b9467cc73c12d9a1de204d9e8"; + sha256 = "1cx1fyr372zhkf35mjvl46c3zim7whz8z2ax88dqavh67h92ai9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26061,12 +26168,12 @@ function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "function-args"; - version = "20171006.1056"; + version = "20171031.1004"; src = fetchFromGitHub { owner = "abo-abo"; repo = "function-args"; - rev = "bb0f76412de0f791d82685b4131195e3127e2ccf"; - sha256 = "137fdy398f6fwp96pi7zqm3fmjlvdwh4h1kiivf8xasgp235f92z"; + rev = "609b25305670fff08d5e357298e7128e4f4e3497"; + sha256 = "1xymwk42n2l7c7iaigz23i4l580qpjgq8nqhgr4mnw6invdsgg2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; @@ -26103,12 +26210,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20171018.1049"; + version = "20171026.722"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "18a1d0228b28d8abb4c0fcb4af6d9815de19be07"; - sha256 = "186915xday81bqxdpwp5h5cylmlyflk9s1w3x3ajr2wzp2q3arfi"; + rev = "bfb9c4a565ac655322efe5c7bb1f77d255762846"; + sha256 = "141q924pacsxxfsy3yngyh7a9saipjszpm529s0d4hqqws2glxvz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26229,12 +26336,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "20170908.945"; + version = "20171026.554"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "cbcc56c372ec2d907c690a05cb420a4bf643c355"; - sha256 = "046hwfnn787c7q5y2pvqxzs5a67my2zmbg5l5rnw1g9swhfh9rfw"; + rev = "ef1dc851077913a327261a6b971fab5f5f657831"; + sha256 = "12zbvr7806xiyx2q944nfnqqfnm43v9ziaihkb9n10s2sp6ippb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -26413,22 +26520,22 @@ license = lib.licenses.free; }; }) {}; - general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20170708.104"; + version = "20171031.1345"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "00efad765a3ace42a2833c65a169d96c7925623b"; - sha256 = "1jp0vp4g46pcxsyz9d8n9iqf1rsaw4lhsrilmdkayj7n3skg4ipj"; + rev = "6828a859af771df5ec1bf50b67f0fcc7261b5a11"; + sha256 = "13sm85dybjhnqqgkshc4n4m3vm6pd949ppxyb5li7f0znhq6l3ai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; sha256 = "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc"; name = "general"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/general"; license = lib.licenses.free; @@ -26665,6 +26772,27 @@ license = lib.licenses.free; }; }) {}; + ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + melpaBuild { + pname = "ghost-blog"; + version = "20171023.42"; + src = fetchFromGitHub { + owner = "javaguirre"; + repo = "ghost-blog-emacs"; + rev = "71b358643cc9a2db1bf752281ff94aba9b59e4cc"; + sha256 = "1fkh7zslkdi7a4x2xrk73acmigbi7yx9k6iaj75zbjfd49gyqj13"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a906d461bcb2aa07050b72669feb5787414d809/recipes/ghost-blog"; + sha256 = "0c591cx5kkfmhhqh8jall470iicxdv01mm3m13irq5xhmp3i5kjy"; + name = "ghost-blog"; + }; + packageRequires = [ markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/ghost-blog"; + license = lib.licenses.free; + }; + }) {}; ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghq"; @@ -26903,8 +27031,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; - sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; + rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f"; + sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27634,12 +27762,12 @@ gmpl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmpl-mode"; - version = "20151116.1149"; + version = "20171031.1354"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gmpl-mode"; - rev = "a4481bcbd84f67cd87e7bc87456b6f5b3a95fcf6"; - sha256 = "0w9dfxpiwwfk1iy83a214xpvqf858k668xkcdr2n25bccg1i148y"; + rev = "c5d362169819ee8b8e8954145daee7e260c54921"; + sha256 = "00p2z6kbyc0bas21d1zygx7z49w6mf22y9kf1rcm9gqsnnadb4j9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode"; @@ -28051,6 +28179,27 @@ license = lib.licenses.free; }; }) {}; + go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "go-gen-test"; + version = "20171022.2058"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "go-gen-test"; + rev = "44c202ac97e728e93a35cee028a0ea8dd6e4292c"; + sha256 = "1vi5xsf0xbcbvapi20hsjangwyp38cbgi8kiccpmingnq2kp8ghs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0861c126161a2674f0e115eac6f948490b142b44/recipes/go-gen-test"; + sha256 = "1pj8n8xj9ccq9ips4wy4v6hdxxgwv11pwi671l6jjrig38v13dzr"; + name = "go-gen-test"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/go-gen-test"; + license = lib.licenses.free; + }; + }) {}; go-gopath = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-gopath"; @@ -28492,22 +28641,22 @@ license = lib.licenses.free; }; }) {}; - google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }: + google-contacts = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }: melpaBuild { pname = "google-contacts"; - version = "20170112.1022"; + version = "20171027.1033"; src = fetchFromGitHub { owner = "jd"; repo = "google-contacts.el"; - rev = "cf654c59b197a028eb8bf432d52776c2e0ad4135"; - sha256 = "1qrn9zqn25wpsrqbacamn3ixf90xmgxa8ifkday6cxn5ks0kgyj4"; + rev = "a40389bae006ae094aeb1a39fae9891ca687c0fa"; + sha256 = "06mfdmr3dlmk4gyq8fxqv78c5jyis8vxx4ih2azcr5c831pkayzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts"; sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn"; name = "google-contacts"; }; - packageRequires = [ oauth2 ]; + packageRequires = [ cl-lib oauth2 ]; meta = { homepage = "https://melpa.org/#/google-contacts"; license = lib.licenses.free; @@ -28751,8 +28900,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "b729d2e8e0270dea62f10a63be34c021d123e41b"; - sha256 = "187fkjpsvq1gyxsgnbvxi4z62hv773ii1lxna3vfz4rqjzcjgxh4"; + rev = "b227a2582a9e5175fc778fc6a03b98aa14534927"; + sha256 = "0ss8jqczipl557c9pipkpvz3h9x6lhzma15s799zw7jwyza6802y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -28877,8 +29026,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "923c77a37a89811d583042eaec56a9d4f20cdac2"; - sha256 = "1vp80iw0fgrpgph512ia36bx2akcyanp0ydkf6q02wg4iidaw6fz"; + rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; + sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29260,12 +29409,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20171015.430"; + version = "20171024.221"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "923c77a37a89811d583042eaec56a9d4f20cdac2"; - sha256 = "1vp80iw0fgrpgph512ia36bx2akcyanp0ydkf6q02wg4iidaw6fz"; + rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; + sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29470,12 +29619,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20171005.137"; + version = "20171031.1241"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "6927d5afd2c4543bc97785d3f35e06a8b0fe86f3"; - sha256 = "1hyghwnnkl7fsq3wm7acp4ia7a7zp396wbmmyk3zw93lnpjhwkpn"; + rev = "b11ddb65044468a1d1d7091ee9636aab7b13afed"; + sha256 = "0jhmc2s1xbr5dnmckszx8j0i3kfj7n868xw1d6sqplm7i0r0wm8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -29575,12 +29724,12 @@ habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "habitica"; - version = "20170924.857"; + version = "20171022.1922"; src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "752bd376bcf1db563d503d554802aa0ff6e2c054"; - sha256 = "01g9kkfddn7lggbqw6s1vk3igbdjh0v6qslnlbp1llih8wa2vdlr"; + rev = "e51ff7436fe1da10404e2c0872b15d6a7a926717"; + sha256 = "1hiiqf82nagnpq2qdcdv6y2blfiqs6f8ia8k66a4zn5xgwpd13f4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -29974,12 +30123,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20171020.2109"; + version = "20171022.26"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "19fe60b9d07b6a29a529bb58addf91fec5392416"; - sha256 = "1x0vi50ibch57099ifzslyl6icw603bv2lasbrspz2w87qqg59mc"; + rev = "9018ad5cac0b1b1b5e0a51586027fb0ca4076b1a"; + sha256 = "0aj6mjv1i8m18klj9mp690fkmwc81wxh2q69cxjf78fdpgbrhcwl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30245,12 +30394,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20171019.2338"; + version = "20171030.2225"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "e98a4279135d5d7f4a2fec06c7e7c8b1a1fcacf2"; - sha256 = "075dvbfv5f36r1br7w17i6nhj1vxdnv3c0x2p28rgk5mv10bdpl2"; + rev = "fe92240663f6b2314e79558f6eabbab955a797e3"; + sha256 = "1ip2a9fh3k14s87h8zhw6flybkskcx6vrayyzj5929g97mr26a5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30476,12 +30625,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20171012.332"; + version = "20171022.220"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "1e1eecfdb62e80a9166cf6e7a3ddb8ff0e80846e"; - sha256 = "0j8xfd11ragnmz51fgfnliwqcxsphghcs8l0cn7m44kfl1kpn9pj"; + rev = "54de08577f9c19354cc303ee52836263aef486fb"; + sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -30875,12 +31024,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20171020.1124"; + version = "20171029.2252"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "e98a4279135d5d7f4a2fec06c7e7c8b1a1fcacf2"; - sha256 = "075dvbfv5f36r1br7w17i6nhj1vxdnv3c0x2p28rgk5mv10bdpl2"; + rev = "fe92240663f6b2314e79558f6eabbab955a797e3"; + sha256 = "1ip2a9fh3k14s87h8zhw6flybkskcx6vrayyzj5929g97mr26a5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30942,8 +31091,8 @@ src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "2551469fb7faa1b7fdcbbcc3b143fdc8cab1ae66"; - sha256 = "1jmn6hyvi5y6zxbyddak6b3wxhck4w6mvi2fn7gnh04qvac2mb45"; + rev = "08961190b3982dcb8c359e633daba556a6d92ce3"; + sha256 = "1vdrfykhcfnmm254gd3aqypk9hfl0fcml1nc0wxmdjlimlsxadc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; @@ -32177,12 +32326,12 @@ helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-mu"; - version = "20171009.1022"; + version = "20171027.933"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-mu"; - rev = "c3d7fb6fd55c760895e0bd6491bafe70aa11409c"; - sha256 = "15jfn7djc8bdvb7xhw2j1d69bn2zn63xdss4cvcckd8dgxpkqrbh"; + rev = "cda769ef48e1e11e3b21cdafa85adb8e36384d78"; + sha256 = "0s7v2hdrsd3xmdw0iwd3zqpdj3zp3z0akcyyw3cicpmic7wrcc75"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu"; @@ -32790,8 +32939,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33944,8 +34093,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "e18ec3f55e288883f8042065190572e91651733d"; - sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z"; + rev = "578d1256e466eb8bf40fd7e441172eb12e878637"; + sha256 = "02dvnlg3r9pfk18664d5paqc90ll6a4sc05a9w2phafmi9kypwgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34234,12 +34383,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20171003.647"; + version = "20171031.1157"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "588c6a2df2ff4b8f77df49894808cf4ad3de6cad"; - sha256 = "18hjnha1imqiygydbbwwfldp0wvfhf02ffzhzd967nq6gvl0vzdf"; + rev = "7caae71ba87b592e08fb4caaaa1da8e9af80ec62"; + sha256 = "17b5hg7fkm8fj2v477ir9z87kn7q07v75akga414k29xlfzmvdw3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -34484,12 +34633,12 @@ ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20171020.1146"; + version = "20171024.1200"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "9d659f04b44f416676e6a002728d9a16afc9bd96"; - sha256 = "190vzs0pqcm120nv7959ri3v5qha5hnx4lgfby08wyl4973xncf4"; + rev = "a741bac82797d25ec0542764df7443e9e7241033"; + sha256 = "1m1v31bfaw2g3jymcxsl2bi1z37pj0sfhmldljk8m9zgjll56g6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -34799,12 +34948,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20171021.30"; + version = "20171030.1023"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "903dfb4b1f46495d7a8a83fd62142c9e0dda3a03"; - sha256 = "0v5a4xbzj3gbncwy05azahznh4fgj92f0vdz23l626w446cndz0x"; + rev = "afb1610b0f78e059ee1a034048a876ece70118f1"; + sha256 = "14b5dk7n9727dwyi9p80rcwm0f6i21y1x10rj05bal1s3lxq7frp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -34944,12 +35093,12 @@ iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iasm-mode"; - version = "20131004.1644"; + version = "20171023.722"; src = fetchFromGitHub { owner = "RAttab"; repo = "iasm-mode"; - rev = "6b404ff94bbfe971b3614007c8e5dcd5757c5727"; - sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5"; + rev = "abbec7f308f9ce97beeb57e459fff35f559b4c18"; + sha256 = "0hvpcckhlxab5f7w4s6iw5lhdbjrqn0l8gayg1w42rn6gssr3rap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c230ec10eb62d1b3f6df10c05c5dbc2e25d4507/recipes/iasm-mode"; @@ -36054,12 +36203,12 @@ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "20161220.508"; + version = "20171026.1628"; src = fetchFromGitHub { owner = "Galooshi"; repo = "emacs-import-js"; - rev = "15d395126f57408d770a72db2e5f43271f90fa52"; - sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l"; + rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250"; + sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js"; @@ -36180,12 +36329,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20171018.432"; + version = "20171027.914"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "db3b727c9deedcf9afa13e07cd25734cbf7305a2"; - sha256 = "1cm6zm8d7rywvlhzf1vpblqb1kgn6c7bwk9q2mjz7f5gdcsx1jp5"; + rev = "f7b46c9dd39dfc7ffefb52e35b0795450d3ea96f"; + sha256 = "0qba8c4qr8v0881lc2pnw6lddspzkdj7hsapf6x0vk1mwqmnww4x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -36222,12 +36371,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20171005.1130"; + version = "20171029.40"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "b048358406c24f5f22a3fc51c0a1348236bcfde1"; - sha256 = "0hw8981pi5xkcvs5023nj91vjq3agdlqabinmrrl0mj4wfh2q32q"; + rev = "b04f05d2c735795b68a10cc7e699b676a8acc811"; + sha256 = "16xsrny70f5lr6hr4sipyrnry813cvbhy25jxfx90kp2f9kkak53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -36478,8 +36627,8 @@ src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-inkpot-theme"; - rev = "b992c0996b4a711f3d6ebb6730c6f57edbc75fc5"; - sha256 = "1ykbf5hhs7z33bca5j0vk8vdyrwghbiqgdjy064nccgxlqyysy0k"; + rev = "7b2f19ebd01535f77da407e28ca970c2ce442493"; + sha256 = "1d2vi919fz6kdya5gafhy9wwmlzid88j9klcbslzh8bjmamnbxcx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; @@ -36683,12 +36832,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20171020.1447"; + version = "20171023.1102"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "55b17bc6b9cf1e8621a210fd07de6177e55d1334"; - sha256 = "0zx6p1i3sy771hp4n3dkfgypwrrr35qpa71hlhs5zrcn17xka9jg"; + rev = "5697c86fde2b6131629e8d1c69f9b2363dadc7ae"; + sha256 = "1zwvmchk8rymxfciiip78zf69p3f8jpbr7fqqj43cxv0lq9w284s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37184,6 +37333,27 @@ license = lib.licenses.free; }; }) {}; + iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "iter2"; + version = "20171031.755"; + src = fetchFromGitHub { + owner = "doublep"; + repo = "iter2"; + rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55"; + sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2"; + sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65"; + name = "iter2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/iter2"; + license = lib.licenses.free; + }; + }) {}; iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iterator"; @@ -37250,12 +37420,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20171021.207"; + version = "20171031.716"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; - sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; + rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c"; + sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37271,12 +37441,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20171012.332"; + version = "20171022.220"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "1e1eecfdb62e80a9166cf6e7a3ddb8ff0e80846e"; - sha256 = "0j8xfd11ragnmz51fgfnliwqcxsphghcs8l0cn7m44kfl1kpn9pj"; + rev = "54de08577f9c19354cc303ee52836263aef486fb"; + sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -37380,8 +37550,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; - sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; + rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c"; + sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37506,8 +37676,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38211,6 +38381,27 @@ license = lib.licenses.free; }; }) {}; + jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jetbrains"; + version = "20171027.2055"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "jetbrains.el"; + rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8"; + sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains"; + sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7"; + name = "jetbrains"; + }; + packageRequires = [ cl-lib emacs f ]; + meta = { + homepage = "https://melpa.org/#/jetbrains"; + license = lib.licenses.free; + }; + }) {}; jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "jg-quicknav"; @@ -38365,8 +38556,8 @@ src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "f2dc70af890694828b8227b2727240e82780d7e5"; - sha256 = "18hprvhlwf110j7anyrrrjp4xjr3556yipz7n4jyqj69i0kvjw5c"; + rev = "5c081859def7510dafc6b14449f5285916898f15"; + sha256 = "14421p9k6b02syb8irprz527dcqbh1r4i2m86pi94sv6ffzbs0gg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -38424,12 +38615,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "20171019.2142"; + version = "20171031.1819"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09"; - sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag"; + rev = "68c6c51320f124d84145643dda59619966bb29f4"; + sha256 = "04slx5ipcf1lj9fvx537yfyvqmg324pfji02w5iafqnyvyhdjy9p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -38442,6 +38633,27 @@ license = lib.licenses.free; }; }) {}; + js-codemod = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "js-codemod"; + version = "20171017.1411"; + src = fetchFromGitHub { + owner = "torgeir"; + repo = "js-codemod.el"; + rev = "cf0d0a47588cad640e4397f306fd17d2166a8f04"; + sha256 = "04im9cs7hbs2bzx5ynibwgbypy91vvrz3jjy72hzfaamdglw7w8r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/81670a2467fa846a3f0e6c81e870e8ae140dd54e/recipes/js-codemod"; + sha256 = "1m5wbyx12sc5qwbrh948ikskck10p6j05ahrrvmmflvfb3q4vpcj"; + name = "js-codemod"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/js-codemod"; + license = lib.licenses.free; + }; + }) {}; js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; @@ -38909,8 +39121,8 @@ src = fetchFromGitHub { owner = "tpapp"; repo = "julia-repl"; - rev = "fbee2f5995a7781576b7a3b9f0707ea1e7ead2c5"; - sha256 = "18vqw0sz1ifhd6hpa5am9z2qykqz1dxwav65v8vgl6hrrbnkfzbq"; + rev = "b20cadb67d65e52ecb57bbb07369215d01c956e0"; + sha256 = "048jf00lmyrsr815kk8h5y5hdvpmbd6zvchq8x5vyziqd2vpsdc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; @@ -39257,24 +39469,24 @@ license = lib.licenses.free; }; }) {}; - kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "kaolin-theme"; - version = "20171015.2347"; + pname = "kaolin-themes"; + version = "20171101.316"; src = fetchFromGitHub { owner = "ogdenwebb"; - repo = "kaolin-theme"; - rev = "b0808035ab7bb9b5b03a0f80dfb01141beeac75d"; - sha256 = "15bklknvd3x3n75shwis4j9gjfpwms37vaxvwd2bym3m1kx8kh2d"; + repo = "emacs-kaolin-themes"; + rev = "85d11341944ff91e7949306c588f237ebf8adc5e"; + sha256 = "1cqmg3hksqb3vi2m77ysacx8znp6b94vqcxw7lm4psrdwb3ris8g"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; - sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c"; - name = "kaolin-theme"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; + sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw"; + name = "kaolin-themes"; }; - packageRequires = [ emacs ]; + packageRequires = [ autothemer cl-lib emacs ]; meta = { - homepage = "https://melpa.org/#/kaolin-theme"; + homepage = "https://melpa.org/#/kaolin-themes"; license = lib.licenses.free; }; }) {}; @@ -39768,8 +39980,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "1f4fdb290b9ff6f3a0694cc0cdad56e78a9490bb"; - sha256 = "0cmhsnc20x3n2njs16w6ng3s1csc8pp3k00p6ibigbbs06hd0v7l"; + rev = "be946b5e33cc1fc734a29ba46ca734391803fbcd"; + sha256 = "1ngpwjhilpg974xx4z8fiz6c2ycpdr6xbky1d3d24563hjp1a5kr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40076,6 +40288,27 @@ license = lib.licenses.free; }; }) {}; + kubernetes-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "kubernetes-tramp"; + version = "20171026.922"; + src = fetchFromGitHub { + owner = "gruggiero"; + repo = "kubernetes-tramp"; + rev = "9fa84df71f6e88bc23a756cdf2df393a35aec945"; + sha256 = "1l1ibc97ahp3zwwypqfg3201qdxad4sdpdaq7nsfb87gh46vsbz8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ea4b15e64a9dc33b9977650488693cacadd1ab1/recipes/kubernetes-tramp"; + sha256 = "15nlx3w2v0gky0zgbx7n0w1mdr6yaj4dh028ay2k19wg8wbsckjq"; + name = "kubernetes-tramp"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/kubernetes-tramp"; + license = lib.licenses.free; + }; + }) {}; kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; @@ -41409,12 +41642,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170928.2107"; + version = "20171029.1522"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "145d21d65b5469e682ef464ae8f4e0e3d8c0f04b"; - sha256 = "1h188cprka13bd1prfj1w86m5z8c1nfaz4dw18g88jf6b0gyazhz"; + rev = "2ecd23457ac26f30f7218a5506142ca71dc602be"; + sha256 = "17d6p7i2yi3iawc2k8w4fkx5lwnr0x5kax73cgwapv6ghmr9yy42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -41517,8 +41750,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "7f2ed036912341ef20004385cf71d053a3cb156f"; - sha256 = "1kzzh5sybp9y47xzc4mirk4b6lcf736sxvi91rvf8fm5gp075sq1"; + rev = "26acced737715cfcbf29f6708f900b4bb8a6d5e8"; + sha256 = "189c90wax1zyzk017j4brq2i25smkmpkb05wzakywkf0rgswxwqh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -41973,12 +42206,12 @@ lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-java"; - version = "20171021.330"; + version = "20171023.650"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "c3aefd421535e63929bef25cd341e893572abb18"; - sha256 = "1mr3pd1744dmx0mk0advnf3d8l8axjmxkik7lqzwvv1rl7x734wx"; + rev = "5176f63e80e8f971563c0b98658db7dc72404369"; + sha256 = "07g259bx3vra2gf9mhxyd3qv1jb2s0lc0hndf0kvrcjdy29wwi52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java"; @@ -41994,12 +42227,12 @@ lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "lsp-javacomp"; - version = "20171011.422"; + version = "20171024.1547"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "bd3c3714158fe52d19025e9a13efd5e490b1d202"; - sha256 = "1gv0dl0vp2nkf7j74hin8kdmjppqz9cgfn2lhg06yj32yzvg6xbw"; + rev = "ed23aaeee27e6253bed5752fb8fbb7a5fa61967c"; + sha256 = "096rbyv0qwa454p1ns7g0py9lni5r6h1gw85wm5mwr00shjzq23n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; @@ -42015,12 +42248,12 @@ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-javascript-typescript"; - version = "20171021.253"; + version = "20171027.1005"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "c349da788f77b60f7e8ec8917054e97b8f41bc70"; - sha256 = "1b6lskd57p3c1dfz0c4pn80ksdq7vysjlbk3ja0az1nyxczmn44q"; + rev = "8a565260906f90bb39f2da54cdb6179ec27005a6"; + sha256 = "1dx0b7sq6wn309l1iy8s3ccn21hkv0xs061jbm53hz40pn30sjqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -42036,12 +42269,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20171021.234"; + version = "20171029.148"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "e67ecf89b3878f8d5d079af3ce2b57933aeb1765"; - sha256 = "12ms4zl8j3s9nbqqasmglhnagxrpf8cjplagv2dakdlq7zllr8ri"; + rev = "b221b2acce8936114649cdbdf0ce1d584487ef91"; + sha256 = "0ndbhy1035ji31ffhc6hxybwm59kzmlp9hg1zjhfww4d0sym9hz9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42054,6 +42287,27 @@ license = lib.licenses.free; }; }) {}; + lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-ocaml"; + version = "20171022.308"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-ocaml"; + rev = "3683281bcb56fbe778fadb23e4363a411b6f9e73"; + sha256 = "102cfv52hicmpbczs1z3cfz8d03p2hwzdkp3n0ljx1asnk4l1b8x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml"; + sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33"; + name = "lsp-ocaml"; + }; + packageRequires = [ emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-ocaml"; + license = lib.licenses.free; + }; + }) {}; lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-python"; @@ -42082,8 +42336,8 @@ src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "da4877ea682e46d6d6bb0077be5d00269f4c14e8"; - sha256 = "1miql5v987k6hgxxq0fqzj20al9y3qg79a5pi9d3y4yvzznidhpa"; + rev = "239e0cb8912749266a6226b68c6bc3b4362876c1"; + sha256 = "0ki66lcdc67hxx3llzw5x8vrsfi1p5m509jpcvkhrrxs1sqr4bqn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; @@ -42414,12 +42668,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20171021.1158"; + version = "20171031.1141"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; - sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; + rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f"; + sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42631,12 +42885,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20171020.1153"; + version = "20171023.926"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; - sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; + rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f"; + sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -42757,12 +43011,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20171021.1302"; + version = "20171029.1959"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "e5f33e46032deb381ec67832451a6c69cfdcb1e2"; - sha256 = "05s6cfsgxpqb6gvx6n4qdz5fznd87x7k26lz7ad0v7ky461any7w"; + rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794"; + sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -43290,12 +43544,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20171021.1428"; + version = "20171031.1725"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "df31e2e82bf88655ed895c4a372e28e3a3569353"; - sha256 = "179wa75kzr0k8kjgk4z5iq5v2c8zbg7c6ii21fq35kyikkp5n8n3"; + rev = "7a62259a22ccbf59b0132d077348ee489edf5d1e"; + sha256 = "137xkm76k6faak478hmnr6yrhymbfln0xs0ninzp4iy57kxyx9d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44831,8 +45085,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "7ee76939b9269c652f93065a8fcc7da24434a167"; - sha256 = "0drhrid8gb9rk9rl8afsf3ninjzs4p78lnrp285xkhwn7hlri4v9"; + rev = "88935a26318a574adeeb2301ae8d010f0102b1d3"; + sha256 = "1zibawwflf2wx7hzg2ld7qvmlpljfd6nb86998ckzbx75s5yb20a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -46859,22 +47113,22 @@ license = lib.licenses.free; }; }) {}; - nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: + nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20171021.1054"; + version = "20171028.2219"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "fd1af9030443a49d333956afc36491936aa930fe"; - sha256 = "010jr43xbwr2rfgcvjgb522ms92d0945svlngfdhkjq66bnl41a5"; + rev = "10296ac3d9ee70bf31180b5158ac3b4a58f45d22"; + sha256 = "0mswc1f141xif3h4zshza0ar64s99fp6j3l795c67a3yvmc7l50v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6"; name = "nim-mode"; }; - packageRequires = [ commenter emacs epc flycheck let-alist ]; + packageRequires = [ commenter emacs epc flycheck-nimsuggest let-alist ]; meta = { homepage = "https://melpa.org/#/nim-mode"; license = lib.licenses.free; @@ -46883,12 +47137,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20171003.1044"; + version = "20171026.504"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "f62edeb70cc19bc4c8de9b815c4e9d257acff35d"; - sha256 = "04y10x36bfgcg22cazza13ildkcsc3vmrd0z8qcsc74yd05n09zf"; + rev = "e78561a828e50b5bd0984723d9040620367180c8"; + sha256 = "04cbr0a3kvk79lyrriblm4q7y00j0banwl7a4r9li4iq92rgcivh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -46950,12 +47204,12 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "eb7623fb3b23afec25619a76adab6bab5e338bf2"; - sha256 = "1shgbh2iawml605qhr1s8bcmy0by7d455lm70wb2wkznsdlwv6wp"; + rev = "3294f8a2f83ace2d71f16c274a262ff76be412dc"; + sha256 = "1p1dka9v8fm6rklspkscj5rs5f21dwi3bq44d3hjqw6xva4q7bx4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode"; - sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; + sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5"; name = "nix-mode"; }; packageRequires = [ emacs ]; @@ -47303,8 +47557,8 @@ version = "20170927.415"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "d6929040a4828cf17fb1a4f4d49b95816a5e7b7c"; - sha256 = "1scgmw52ny6wwwdl7hcr3cw84ag2hrrvik6ppp16pfyzv58ywyw6"; + rev = "1b91884296f7e423f2e190ccf7f590ccb3028fdd"; + sha256 = "0f78b9nw7ccpkkf192ka40d5021gbj114capjlkf4d79qr8m91yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47464,15 +47718,15 @@ license = lib.licenses.free; }; }) {}; - nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree, which-key }: + nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }: melpaBuild { pname = "nu-mode"; - version = "20171021.1508"; + version = "20171028.1443"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "161f41f67b3fb10c2e3025670485a2dde24ab54b"; - sha256 = "0bqc0v4q222lx39axys2yfcfby6a5mcllnmpr3jdgsgagdhxxk05"; + rev = "683e2648a5b669e91138eec606f2e86f9f54ccd3"; + sha256 = "0mf8cj729ag7c0z1155ziaqx9s119nwxg9231rb8i8qx17vdci2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -47482,7 +47736,6 @@ packageRequires = [ ace-window avy - help-fns-plus transpose-frame undo-tree which-key @@ -47765,26 +48018,6 @@ license = lib.licenses.free; }; }) {}; - ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ob-axiom"; - version = "20171021.1448"; - src = fetchhg { - url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "fdb3336941b9"; - sha256 = "0adi26fj1rgcjis5xspbcrdzb98d3fd693pxv9311ffsxkpfsl9d"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom"; - sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6"; - name = "ob-axiom"; - }; - packageRequires = [ axiom-environment emacs ]; - meta = { - homepage = "https://melpa.org/#/ob-axiom"; - license = lib.licenses.free; - }; - }) {}; ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-blockdiag"; @@ -47890,22 +48123,22 @@ license = lib.licenses.free; }; }) {}; - ob-crystal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ob-crystal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-crystal"; - version = "20170811.57"; + version = "20171101.347"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-crystal"; - rev = "4bfd36c922d28e8a204218bde0e889cd1097ec04"; - sha256 = "00rlxm0gj2arcnjhy824id08gxpha73ikfipar780xm845ripm3j"; + rev = "9d58b880b74e0ad83b37596bb44635e5d7ae5c3f"; + sha256 = "11qly91h6cm0qdj2dx8lvmfgp7bakrvvwf106rqh4f98y1qv22xh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal"; sha256 = "11mk2spwlddbrvcimhzw43b6d3gxzmi8br58bily1x4qkvl6zy4n"; name = "ob-crystal"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ob-crystal"; license = lib.licenses.free; @@ -48079,6 +48312,27 @@ license = lib.licenses.free; }; }) {}; + ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-hy"; + version = "20171101.344"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "ob-hy"; + rev = "a3512f274709dc4ab6c18d7955d361f8715505f0"; + sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; + sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7"; + name = "ob-hy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ob-hy"; + license = lib.licenses.free; + }; + }) {}; ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; @@ -49006,12 +49260,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20171015.1228"; + version = "20171030.2201"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a"; - sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj"; + rev = "906e29a702237f039f24c215fdb561a728a3df1b"; + sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49327,6 +49581,27 @@ license = lib.licenses.free; }; }) {}; + orca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "orca"; + version = "20171030.1216"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "orca"; + rev = "5e1744afb793dda744ddc6fe342144b5e90bea08"; + sha256 = "0gqgs3rmdzm5vqk8azgzwannxjifvrf5fj40n543d0066c2dfsfi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4d9cf89c58a9b36b7c2a42de2aecb3b60001908/recipes/orca"; + sha256 = "012ndbrgm58r09snhvi476rw0lq4m913y0slc0cxb688p9wgz5w3"; + name = "orca"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/orca"; + license = lib.licenses.free; + }; + }) {}; org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "org-ac"; @@ -49607,8 +49882,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; - sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; + rev = "8cec702f602b18da90b3d6207888a887b8e07750"; + sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; @@ -50316,12 +50591,12 @@ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mru-clock"; - version = "20170901.444"; + version = "20171101.506"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "cb239b5704b742029145e7f15e928351e4e8dd9d"; - sha256 = "0h25w6i4qrbigcwpnwkz8wak5mh3kzh29nayzsf85jlq9vd2x5hq"; + rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832"; + sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -50596,12 +50871,12 @@ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: melpaBuild { pname = "org-projectile"; - version = "20171006.1230"; + version = "20171022.950"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; - sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; + rev = "8cec702f602b18da90b3d6207888a887b8e07750"; + sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -50621,8 +50896,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; - sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; + rev = "8cec702f602b18da90b3d6207888a887b8e07750"; + sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; @@ -50753,8 +51028,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "3c022af9adb6ff96edcc2f11ebf20cfd576df702"; - sha256 = "0qsiclmg9vm1svgr8m4yj0dwwvrvga1qaa6bzdhkw71s0r931sl2"; + rev = "8fb1275b4c0e2dd46593754e497940c49fd9da6b"; + sha256 = "0jha5qlab3gsyl8iysf1kqn2f15afvqjvnl2nyzh47llqng8yskj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51672,12 +51947,12 @@ osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-dictionary"; - version = "20170208.505"; + version = "20171026.34"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "osx-dictionary.el"; - rev = "ec16c40cc4db0140db1cf6ad1fb1198c7c344b2b"; - sha256 = "0n09s09qaqwdrpd4dgxj16bh3lgc8nzdld49z8zkipf3cfh5v040"; + rev = "b16630ecf69f87ac873486d8b9c8c03e6c9ea7fa"; + sha256 = "06qsg8hlw1b725pzpsg5f194pxqcg1pjncsi8j0815yrlzfcg6sp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary"; @@ -52155,12 +52430,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20171019.936"; + version = "20171029.1929"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "d0e8a5d7505ebdd55074a3ecd6ca467931b98454"; - sha256 = "1r39bllndh44jjsj4j0h8sqmz8a3xkwlp6cj9d7jvp640s8wddim"; + rev = "caa3aa99c6bef6d0dcaa4713a7934c7d410a5641"; + sha256 = "0vadb0d7wgz37cdzhgciv0b0fd6wc4gwdz0ppdhk1s9y3hkcbkw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -52304,14 +52579,14 @@ pname = "ox-nikola"; version = "20151114.316"; src = fetchFromGitHub { - owner = "masayuko"; + owner = "msnoigrs"; repo = "ox-nikola"; rev = "5bcbc1a38f6619f62294194f13ca0cd4ca14dd48"; sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-nikola"; - sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e3fa1b0728ad3058376800ec5e2e9e3847c1d2f/recipes/ox-nikola"; + sha256 = "13k5wggz8bhnfgpsc09jnisk7xdb226d6imp7v6vmd1ax9m2xb0w"; name = "ox-nikola"; }; packageRequires = [ emacs org ox-rst ]; @@ -52409,14 +52684,14 @@ pname = "ox-rst"; version = "20171004.1553"; src = fetchFromGitHub { - owner = "masayuko"; + owner = "msnoigrs"; repo = "ox-rst"; rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928"; sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst"; - sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst"; + sha256 = "0447q0gvasii57rp391la9prz0w228jnzgi59s785vzswdryww0n"; name = "ox-rst"; }; packageRequires = [ emacs org ]; @@ -52470,12 +52745,12 @@ ox-trac = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-trac"; - version = "20151102.955"; + version = "20171026.1123"; src = fetchFromGitHub { owner = "JalapenoGremlin"; repo = "ox-trac"; - rev = "2f2f70eefb9679025ae5812e221f0c118da36012"; - sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db"; + rev = "03cc31efb1aa06991918f1071e250a9d58f96cfb"; + sha256 = "0knrmq0sc8s9c6j0967jmrp2hq8jcwg281qqk89y8j9rpbmhbaj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b73753ef9229d0fdfbe237acc63126f1786a494/recipes/ox-trac"; @@ -53858,8 +54133,8 @@ src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "094b2931de775c734ad353c5d06cf5fc6a55f11d"; - sha256 = "0g92rd68m1l377hw5rr1y14z7fcs1blmyc6vi5a9gybr19bcxb7w"; + rev = "0f99f0c06514acf51445e7e4cb0f638fa0c75ee5"; + sha256 = "1gc7n5r60ib65bnkgpac3bn71pxnm58sxajnwjfkwi9xzgw72acv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -54104,12 +54379,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20170908.648"; + version = "20171014.111"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "fd57484756b7a7e34895bf55238413005ab35959"; - sha256 = "1f7qcy5swiqx17835dvwb89x0ndhviyxi5bqk2gn14c1z8fmld5a"; + rev = "ccf87da2c230c3a91e627105b0f034a954e6842a"; + sha256 = "1dv3ghl9falw888bl1w0d5pzp0jz8qsbisd7kfd887bsyn7x7jqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -54650,12 +54925,12 @@ php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-plus--mode"; - version = "20170215.657"; + version = "20171027.921"; src = fetchFromGitHub { owner = "echosa"; repo = "phpplus-mode"; - rev = "8224e6aabc2e3d046d717b4c87c643aa98a8e203"; - sha256 = "041xv3c2gwcxlj9bnjx6hlrm2k7s7fyzqbp4c583is6jx1adjfn3"; + rev = "523e7e50f9978ba74b8a324f9f896cd9b5dfd9de"; + sha256 = "0xf79pxsrfr9bi3138hdq2ccrh391sci8lvmvzcs3vnzw0hrzbfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode"; @@ -55444,12 +55719,12 @@ pocket-lib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, request }: melpaBuild { pname = "pocket-lib"; - version = "20171008.2135"; + version = "20171026.1610"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-lib.el"; - rev = "9f2a5dad867ef11d6629073ae4c8a43df1c03470"; - sha256 = "1y97zlnxp0lxh21x51bdkvd8yxg59sxbq94s06vkvkbq2pjz86pp"; + rev = "52d4c3d9ca500acbf0a4cac4abfacc0641007abe"; + sha256 = "1c59xzh2acrfmld0fg78h3kyzhgfcfcbk7nmvb584jr2qppkszgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib"; @@ -55486,12 +55761,12 @@ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: melpaBuild { pname = "pocket-reader"; - version = "20171015.1705"; + version = "20171023.737"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-reader.el"; - rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd"; - sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh"; + rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574"; + sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; @@ -55747,12 +56022,12 @@ ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ponylang-mode"; - version = "20170514.1419"; + version = "20171028.1356"; src = fetchFromGitHub { owner = "SeanTAllen"; repo = "ponylang-mode"; - rev = "88833317195f5ee2880e33a907861c6c2d3851da"; - sha256 = "0kzzf03m1jzkl9fxzivzh3536c0c9l7m9g5h7zycdz7nj5da38c0"; + rev = "5e23459dc395eb77fa4c6cfa3d6c08b1b185a6df"; + sha256 = "0iwdnv56200w53ba4f66vih7gha2nb36ajnvbqixc0byibwcsnc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode"; @@ -56062,12 +56337,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20171010.713"; + version = "20171023.750"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "595a9c1b230f4fcc4d72e6ed9c67aed7b838452d"; - sha256 = "0xpvsrr4klsw3fkclpkxcxrfwg2gk4fzc20n6di22cs5pysilp8a"; + rev = "fda4fb96984607d4a6502b1d8c8898e56d10cf6c"; + sha256 = "1lz3kr8w9z9xx5amqqvim85asjji13q84d4r1cb5x77wajmj1p21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -56377,12 +56652,12 @@ processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "processing-mode"; - version = "20150217.432"; + version = "20171022.1602"; src = fetchFromGitHub { owner = "ptrv"; repo = "processing2-emacs"; - rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33"; - sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h"; + rev = "448aba82970c98322629eaf2746e73be6c30c98e"; + sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-mode"; @@ -56402,8 +56677,8 @@ src = fetchFromGitHub { owner = "ptrv"; repo = "processing2-emacs"; - rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33"; - sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h"; + rev = "448aba82970c98322629eaf2746e73be6c30c98e"; + sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-snippets"; @@ -56607,12 +56882,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20171009.848"; + version = "20171031.456"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "dd48cb8af4cf41d109fb6d46f0c3f2134f37fcfb"; - sha256 = "0qgw3g4xq1qa6dvxyyhnb6536ay29jzf12829z9s689xqg0n7zsn"; + rev = "7892f642ce7ab6ee816e5926ae02ea2014dac2a8"; + sha256 = "17vclk40435qv2g0fjgyc0fndjghd2x20i43zvcff45yjqmyhw88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -57003,22 +57278,22 @@ license = lib.licenses.free; }; }) {}; - proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: + proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "proportional"; - version = "20170628.137"; + version = "20171025.1637"; src = fetchFromGitHub { owner = "ksjogo"; repo = "proportional"; - rev = "eb2bb2b3d1ca058365049271dc341b1180009f1a"; - sha256 = "1lc3xvkvy5lcy5zralbnwqlxmar443yq735pd023z6di54xm3991"; + rev = "f671ffe8fd803e2fc462e2e1844aeeab1a13918e"; + sha256 = "02sbrcb9c27djk64xv41vii6pbw83b6iljrd66w4ad9hgz2pkxzk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0a7f061df4cce44e5fe98f6e1c31bec4a7338f/recipes/proportional"; sha256 = "022lhbslzd67wyah8r0gl73vzxgjjwia08l3ssdd08jj3p56m3wx"; name = "proportional"; }; - packageRequires = [ emacs use-package ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/proportional"; license = lib.licenses.free; @@ -57052,8 +57327,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "b189389e2f2ca01dd534a8e9ba3ac38ea45cdba6"; - sha256 = "1yr4073qf6br07azrmhy9xk8zq9zlalbmldjsrkbf7k5r59217jg"; + rev = "cbe250591fca9d2e776776be065a72c5550a5556"; + sha256 = "0g8zp8ws7i9v3a719dvwkva0f9rap5s6jdpw2j8cj1kp94bvk9fl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -57090,12 +57365,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20170923.250"; + version = "20171031.129"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "e577f84b938a1fb461a016540b06f5d5e399526a"; - sha256 = "14q4bj7cfny1jwsvdjfsl88nhwh5al8hyvf4rxki9k2wim8lx2bv"; + rev = "d28c33f65318a475133afc2f42e103db9251d2a2"; + sha256 = "19f9aw675d6crhd9j9jvqya39ddsf4f6hcwb03525k307syvg62y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; @@ -57184,12 +57459,12 @@ psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psysh"; - version = "20170610.2104"; + version = "20171022.2229"; src = fetchFromGitHub { owner = "emacs-php"; repo = "psysh.el"; - rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa"; - sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7"; + rev = "926af4ae0c068ed699fc939f4b3e642aaa6f7c9e"; + sha256 = "0k6kb4xbfxcvd7dm3kb600mq56xyy086zi7nal04jkv9lc59bwn7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh"; @@ -57230,8 +57505,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "96718f802dad3acd5a3f770b1452b81e39f77d92"; - sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023"; + rev = "9dcebdb10c50620a3a5c6d71361d53bf482a482e"; + sha256 = "1rkbk8apd612ixksyssmmkrhswks6gbxl9kxhrbaxszfrrhqx86v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -57247,12 +57522,12 @@ pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pulseaudio-control"; - version = "20171019.2026"; + version = "20171024.2339"; src = fetchFromGitHub { owner = "flexibeast"; repo = "pulseaudio-control"; - rev = "30b47a785c5f5ee44ae98d522ab541c9ea310b35"; - sha256 = "0ik06rvgz6gj86ijd6jjpivd37wv5lwszqvcvhskvg68in0ybfg4"; + rev = "08c59e1dc45ec96edb62f34036e82cf5f14c0e8b"; + sha256 = "10cgg1r00kz2fsnnryvzay5pf8s1pwb1dzlds1fbjdnyfvdgammv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control"; @@ -58064,12 +58339,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20171005.1620"; + version = "20171031.431"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "93345f0531b03c5bb2bf34417e9c25fc6fcda6d9"; - sha256 = "016igycxn7h3gjklr24a7yhp49y4h55f4hpd05haq9raj7vaa6qf"; + rev = "06e1db1bb2f4d2da994387f2cbb1cfc6e5db242b"; + sha256 = "019j22hmc1f1izc61l8hnasvs4vj9sb9pl9w3v63ck086h89jda1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -58397,6 +58672,27 @@ license = lib.licenses.free; }; }) {}; + quick-shell-keybind = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "quick-shell-keybind"; + version = "20171022.2313"; + src = fetchFromGitHub { + owner = "eyeinsky"; + repo = "quick-shell-keybind"; + rev = "5f4541a5a5554d108bf16b5fd1713e962161ca1b"; + sha256 = "19hqywwf80q6ay886xmcjjpr4pghkw78hzdg0mrpkpkqn2vj06gk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e9bf4d78da24d88476545f97b2af0527dde73600/recipes/quick-shell-keybind"; + sha256 = "1f66wk2m0yykcbq6qbalgscpq8s53qshyyqdnimlmdi0g0glif1b"; + name = "quick-shell-keybind"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/quick-shell-keybind"; + license = lib.licenses.free; + }; + }) {}; quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "quickref"; @@ -58610,12 +58906,12 @@ rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rainbow-blocks"; - version = "20140306.1033"; + version = "20171025.738"; src = fetchFromGitHub { owner = "istib"; repo = "rainbow-blocks"; - rev = "8335993563aadd4290c5fa09dd7a6a81691b0690"; - sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c"; + rev = "dd435d7bb34ff6f162a5f315df308b90b7e9f842"; + sha256 = "06yfb3i7wzvqrhkb61zib9xvpb5i00s4frizkzff66im05k0n795"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks"; @@ -59267,12 +59563,12 @@ reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reason-mode"; - version = "20171015.1140"; + version = "20171027.2235"; src = fetchFromGitHub { owner = "reasonml-editor"; repo = "reason-mode"; - rev = "ee67917db828af02c97e18b0747725a16c3a0708"; - sha256 = "1vk00a06i2p344q5k3py38z967gsnhcix00m5k6z1vhlvd0r4m00"; + rev = "a9de59cced37b44db72ee248107021a660561d11"; + sha256 = "04g3598ykczxkmj5gjd4airfl41b821agy6r4h2bnq5fcfdj0jnx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode"; @@ -59477,12 +59773,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20171008.409"; + version = "20171030.1346"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "164d0b65d05fd883fc9ac66dd62d7427660fea37"; - sha256 = "1h09mlvrh7qx55s47135nkamv7frhcm3865xacpvifj72z46alg4"; + rev = "b01bf5db718395eead17b679ed10c6b876117034"; + sha256 = "0vnfjh0h0z9w28fb1sjncsjcc8f7h1ll0svm203cb5vw6v9d8nrs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -60190,12 +60486,12 @@ review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "review-mode"; - version = "20170804.545"; + version = "20171029.650"; src = fetchFromGitHub { owner = "kmuto"; repo = "review-el"; - rev = "e166efd9b8596a9abe14afae79b33eaa808c14ea"; - sha256 = "0cnwfb3q9xfsrzg5sf64y4p00wdcw0iiz5iard00siva0q0s5k9x"; + rev = "115cd06558c01889f89feaa659e0d7513a2ad21e"; + sha256 = "0162gg3hf633zhr5jwj222lx143xvph001qmpmlbbqdxc0sgw5hv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode"; @@ -60442,12 +60738,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20171010.725"; + version = "20171029.1156"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "4979f4fc53eb341dc1d76bb1762bd2c734dded40"; - sha256 = "0kf5sll3npw949hxqga2ywadm1mxc2sm9h136dvnrliaqvi4s95g"; + rev = "4c10dcd764ade8e3d5dc235c26ba9299576a513d"; + sha256 = "034hrzcvbnsrr9cxy2wzggnsax708hd231hfkixwffzrrwdlhwz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -60591,14 +60887,14 @@ pname = "rpm-spec-mode"; version = "20160710.436"; src = fetchFromGitHub { - owner = "bjorlykke"; + owner = "stigbjorlykke"; repo = "rpm-spec-mode"; rev = "c1c38050c48ea330c7cea632b8785d66daeefb2b"; sha256 = "0427kcvf2ljhzwxskn3jzk0ncrl3f9zcz2sm83d9pmhh5jax2gch"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f1ce736b8db53fea4935d195a0d07dc8141125a8/recipes/rpm-spec-mode"; - sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb7e188fffda3d4e42690511775e5e32a11e1b34/recipes/rpm-spec-mode"; + sha256 = "1ygk0pdhq1hvgzd173h79lxb04b9lmvq4hi70qf9244bqbm0m182"; name = "rpm-spec-mode"; }; packageRequires = []; @@ -60652,12 +60948,12 @@ rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "rspec-mode"; - version = "20170312.56"; + version = "20171025.1606"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "1f468e443e7f2d8419eec29e42074edc400f8c0c"; - sha256 = "03wv1k3ppvdk2776bkbz8bhxw5n7h4b8zm3b2j2j6x7hrxfza5h4"; + rev = "94a04f148922852b591957b0b3b22de5c4237448"; + sha256 = "04qcicaklj9fhl0wbb8axi8zvd0az43cnrhf53vhgwsgnf7rjya2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -60673,12 +60969,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20171019.1334"; + version = "20171027.1028"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -61135,12 +61431,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20170922.900"; + version = "20171101.219"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "12f116d58ac03706496bd682c6449b452681874e"; - sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv"; + rev = "71f2902fc7875b3df9ee089c85904a4e8a00d438"; + sha256 = "0k6ny3ca4iwvhmzpdfs5v44l19djwpx8x7a1kfjgdafdh2x6d7ds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; @@ -61475,8 +61771,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "bc00974cdcbf0366123fe2dc38253b1ba345dee0"; - sha256 = "0pd7w92z50xpr4vj2xnzm2bmz91728l0k1jr9my9hbpxss89xnvh"; + rev = "11ef66e8aa8d97f0ed8786c46daa091b1d812867"; + sha256 = "1p0xhsvpxk6sbw4fwq5yhnz8kgf5m7g5q3vxpx8qn7bsd3z0sg31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -61680,12 +61976,12 @@ scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "scpaste"; - version = "20160613.1943"; + version = "20171031.1337"; src = fetchFromGitHub { owner = "technomancy"; repo = "scpaste"; - rev = "eb415f7ca56d64c89cf99d5c6f8a442c4ec3912e"; - sha256 = "1fycdsa93bfiij72cwyc0rp85bwv3lv4r169p9czsph5ns466b65"; + rev = "68445166750a46c86dd7f2ffdca14d3c50e431de"; + sha256 = "0q8cka12gx11wpjz1jk24kn5m1nlqa1xnadlxflhz2x5p9fkscvq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste"; @@ -62813,12 +63109,12 @@ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20171003.2158"; + version = "20171018.131"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "284a4cdd394d2d52220c62c24ddbce00ea100471"; - sha256 = "1fnxb3fn6a25sn41isf3frja5iwxi98cbs7rvp9mkzb4jq3bhb89"; + rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e"; + sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; @@ -63083,6 +63379,27 @@ license = lib.licenses.free; }; }) {}; + sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sicp"; + version = "20171028.1523"; + src = fetchFromGitHub { + owner = "webframp"; + repo = "sicp-info"; + rev = "8e13f7ff4695a05471486d37a6c5f979a5b965fb"; + sha256 = "15krfnj2qz4j2ns4a05a4wwaknhx77m4jhazg7zvz9xm4b4j1qm8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1363d7b6e95375ac63f07eed2b3947f4f81bc9ba/recipes/sicp"; + sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz"; + name = "sicp"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sicp"; + license = lib.licenses.free; + }; + }) {}; sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sift"; @@ -64261,12 +64578,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20171021.718"; + version = "20171101.244"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "cdd10bc259fe7303e40efd8a6a05c7e43d12a242"; - sha256 = "0ybbbqnbnp1w4lksgjxjf9iccrvi012ihlq3az1c6k6ck18cmadb"; + rev = "9682ba930374a4d62b444950b008d2bca1cffba1"; + sha256 = "1nsi3x9zizbxx95ka5cgl5rnsw5iz92acjcv6b4id0acaysq6mdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -64597,12 +64914,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20171010.808"; + version = "20171030.1016"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "95e8d8aa8312b54d6ea18b35667fa3005be1bc76"; - sha256 = "1fbn6wqm515x8barbf8bjxkvxyv8p3szdz0h9zaam7hz7zbpdap2"; + rev = "990d6d8e98b96b9afe5b9b340507b1aecd8de1ce"; + sha256 = "1bd6kwzkk8vfhfc7m384y40lh6rdw90g6624c0hlfrs9zwihmvs3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -65297,12 +65614,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20170831.832"; + version = "20171030.528"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "397a0d5b6da3f60ca52bebd5e698b0a764956cd2"; - sha256 = "1z9w4cn5lanxl24ws4km816dfx4fszvgvrlb2ih3wsbc13710h1l"; + rev = "e220a0c0c478fee0be3622442651981cdd82090c"; + sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -65443,12 +65760,12 @@ spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spice-mode"; - version = "20160919.330"; + version = "20171027.2343"; src = fetchFromGitHub { owner = "stardiviner"; repo = "spice-mode"; - rev = "1dcaa4b4cd1527cf15bfc6dfc278c574359a5062"; - sha256 = "0ngfyxpvwgyqh99vjr2msqan0hma1qlljkx971qjxcpn0y80dj23"; + rev = "702bf2d5c3561be44771ea77b476532d32068504"; + sha256 = "1wqcy9nmhpl3vyasvc79msgd25xbbzva9nbxkdrsbpg07p1is9ik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spice-mode"; @@ -65905,12 +66222,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20171018.303"; + version = "20171031.2204"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "2226edb5fc91ab766177b82e578dbcc5c7e55554"; - sha256 = "0b2jq0s56mbl051313wyn1fpk3j5n819y1q6dcv8z7sa5zxsq7hm"; + rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23"; + sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -66957,8 +67274,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; - sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; + rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c"; + sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67100,12 +67417,12 @@ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symbol-overlay"; - version = "20170825.2047"; + version = "20171031.658"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "6c7ec584b62b7922a5398a552a1bf60f8144306c"; - sha256 = "0haflm6b8aqjbs54h3khax62rwlky3y8py4jq4m664r1nb91ni57"; + rev = "6076319f57a7e8dbf2fe11250def5a3fa3c0c854"; + sha256 = "11ny21rbczmkc7ni3kfw94dyc70bxwzn35f9gryxn1ppw48c7zsx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -68106,12 +68423,12 @@ terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "terminal-here"; - version = "20170805.251"; + version = "20171022.552"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "terminal-here"; - rev = "b17f82e894d5b0f77cea04a64c4f398124eb3290"; - sha256 = "0aawmlzy1w76lajz5lxaix793j3bni3fyb4sws3v765m1rxhnc5c"; + rev = "b3659e13d3d41503b4fc59dd2c7ea622631fc3ec"; + sha256 = "1z3ngwgv8ybwq42lkpavk51a25zdkl6v9xdfi41njpxdpbfcmx8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; @@ -68593,8 +68910,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "54ce558ba80905d124b82727d196f6d58964b74c"; - sha256 = "060fqxwmqra2wxi22250lnkfgs98b0kps8wn0lmqjkqnh6pqy7qi"; + rev = "a533ea1615e9df935e77b99440cf264c6b417e3e"; + sha256 = "0nx6amk2jawd5nqkz54sx1x29a8nkpa7h9b4qgn0j7j5sdvfyrxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -68631,12 +68948,12 @@ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tickscript-mode"; - version = "20171020.1330"; + version = "20171101.108"; src = fetchFromGitHub { owner = "msherry"; repo = "tickscript-mode"; - rev = "67400136647342b714c5f693c358f2bd671fe49c"; - sha256 = "0c3vap37rnr11cvwmgcamx4vl4z4bfmxj7w8hybxcrvs6wnjw20b"; + rev = "45ce0b4f8f18ffa00a4fd2ab3823118f69b94653"; + sha256 = "0w6gh6nb81c5jp4px6xx5d3wmwgkh6irzwgk42g0mkhjifzm83ip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; @@ -68913,12 +69230,12 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20170702.1859"; + version = "20171023.1929"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "ebdeb08950823765bf58dc2aba3559a5ad1103f1"; - sha256 = "1aigfmp4ra9qfwyk151y0cxmgd3n42rcjawklfm6ch2g49vx559q"; + rev = "fe1bd5cee3d30741c816f3ccc118b94105ceba4c"; + sha256 = "1hdkrgv03w968qf8fm7c35k5pahk9wfwz5vy8xz6568ci1af47h3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; @@ -69443,12 +69760,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20171005.1043"; + version = "20171029.1210"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "c8be91596420ca8d79de44602d836aa6d1cbe2fc"; - sha256 = "1nbm3m00s5ayicqhymw1y2y7qck5m4sajw467cp4gnsq8qw6ri53"; + rev = "d78ae51fdc9292cc0b77dfb18279b38b6ccbf480"; + sha256 = "01k0nppxvkd2cy13hjcvihgh6j9c4by92yxv4jv8zvaz35fqf92n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -69548,12 +69865,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20171021.615"; + version = "20171101.340"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; - sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; + rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258"; + sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; @@ -69573,8 +69890,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; - sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; + rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258"; + sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -69594,8 +69911,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; - sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; + rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258"; + sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -69798,12 +70115,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20171016.910"; + version = "20171101.231"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "64537bc753094b2adc2e3e97625fa9c0a01f9ae6"; - sha256 = "03d0n49p6d77p221majmbh0gjyrmh2z4cb2l2vi5xxfwc1fsxzmp"; + rev = "359d0e7a4f75dee8f57557b7cc133ae3a65f78a5"; + sha256 = "0v8wzifrc99y4dzl1wdkil1df76d5ijl2pasx5qdig69mpf5gj1w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -70071,12 +70388,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20171017.1128"; + version = "20171022.1029"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "30391a518a1d41d5c534a30850a50b0974132aec"; - sha256 = "1msslh5zj1mi74fg8wc1kzpxjq0g6s9ms66332r2ykwqzsw1iz7c"; + rev = "56a1ea861f80979d376716629abfce45a8e5e2c7"; + sha256 = "1lbfia8n2zwg9j8f9y1shjg88zmgr3cz03dk3277yrvh9djs8kcx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -70816,12 +71133,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20171013.1548"; + version = "20171030.1428"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "cb89901b52a9413b6c233d7fbb616a2d8f38b50a"; - sha256 = "1fypvrmn1brrq2200kr8s8zbcc30z9nhfv3k8vs36iawab2g573k"; + rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc"; + sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -71383,12 +71700,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20171021.1257"; + version = "20171025.514"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "3c5b181a32df5d7defa58a7a19021fa16d3670f9"; - sha256 = "17zakj614vrkyy2y3a1mdkqaa3p7r77zhg8wdaqapwiq36f5gcc1"; + rev = "b6d07ba21e9073a0e008831bfb82fbddbd0b5e90"; + sha256 = "1ypj9saprjaxx60fxjl9ab2lb4x9s8szkh3mj23iininx1bxp4wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -71572,12 +71889,12 @@ virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "virtualenvwrapper"; - version = "20161002.1515"; + version = "20171022.1831"; src = fetchFromGitHub { owner = "porterjamesj"; repo = "virtualenvwrapper.el"; - rev = "15af07004dba640df8202e76bea0b5dc82567f72"; - sha256 = "0ahlp3yfh1yxrlyyhjf9k4qssg2z3192dw4ab8lk62xnxq99bjln"; + rev = "b4fd61aa5fddd47d33b147ffa1c873d8b20db724"; + sha256 = "04qhxg2gghb9bbvabrjbwj89jl154hhk00s07mzgg93js75ipx6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; @@ -71845,12 +72162,12 @@ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20171013.1728"; + version = "20171029.1905"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "0a6b7c226c5c0a26f3402cfe40169cb00f5d792f"; - sha256 = "1s08rc3d2k6rnnn4fir854ndwq2b2xxh1blv1f2055gdf4jw25rf"; + rev = "a34f8a14fe6a680bb18cfa4519f7984d8071a4e3"; + sha256 = "08c3sgd80aszfpc4zbh0rsn7717nwwjhr38lfbsbxmgmlvqalxzk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -71887,12 +72204,12 @@ w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20171003.2122"; + version = "20171019.1734"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "284a4cdd394d2d52220c62c24ddbce00ea100471"; - sha256 = "1fnxb3fn6a25sn41isf3frja5iwxi98cbs7rvp9mkzb4jq3bhb89"; + rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e"; + sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; @@ -71991,12 +72308,12 @@ wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wand"; - version = "20170412.1315"; + version = "20171031.1103"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; - rev = "3674f2edaa6ac30c314a885b229204f978ddce14"; - sha256 = "1yylw7yn9k8li283d5r4x9i38wfdx24jmlzdivvffn0jkhjj6i4k"; + rev = "3d0b459c4ae7e0240cb16bd9bd0a0a0dc39d8f99"; + sha256 = "0wc1gmaz02bfbapwrmmc5r7rcfwqlfr52x3jqk6bhxpiav141yq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; @@ -72390,12 +72707,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20171021.1419"; + version = "20171025.956"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "bf082078fdfcefa38a4397f56c0366cf14c05600"; - sha256 = "104fzirvpp9c5h4gpb99j8i8j1imb3mr6zxh8gr42g38rg2y1nh6"; + rev = "f047313c656e0ea85033bacc564d02ae6f4605ff"; + sha256 = "00mawa0n415dcnrldqmgwwjcj2rv59wblrbzkc2g9i388nl41rp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -73185,22 +73502,22 @@ license = lib.licenses.free; }; }) {}; - winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winum"; - version = "20170430.1629"; + version = "20171028.702"; src = fetchFromGitHub { owner = "deb0ch"; repo = "emacs-winum"; - rev = "e950370d82cbb90ba291fc1c32de5d6f35068932"; - sha256 = "1p4b9gdrifjndk0irv735f8spy541x78chibdnr1i3qil2ib8xms"; + rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c"; + sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw"; name = "winum"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib dash ]; meta = { homepage = "https://melpa.org/#/winum"; license = lib.licenses.free; @@ -73838,12 +74155,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20171021.39"; + version = "20171026.422"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "2aa7ba860e72329a96395aeef1206e2adc637cf6"; - sha256 = "0vjlc5cs56g1d1gzww7cmkyf8mzgr630xg1krlhz4bb73c538k1s"; + rev = "6130b10b0f133344d5e6afa7c083d400c8e780ca"; + sha256 = "08shy433x5papxdbr6q2xsccpg1h0vym9vv6zcaz8vzqw33kr0w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -74510,12 +74827,12 @@ yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yahtzee"; - version = "20170617.20"; + version = "20171022.712"; src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "011bcb8e2f27b333b3300d7bcab3f52d70020e45"; - sha256 = "1gkls80rbj1hnima1fnbxnrz42qjqc55shdpiphzmdyv9hmw8vvf"; + rev = "5263fb8883d37d79a4ed34dd3216a8947d2ae4a0"; + sha256 = "1qv8p3zpxkkp0ncq3cs8sq2bj4jrxs4s5jfc5hbs905a9z8bsnq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -74804,12 +75121,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20171010.1224"; + version = "20171031.617"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "07389c67234e67c8ae423779468f56d0bd65da5e"; - sha256 = "105jdikzwggn1isnqmvj6hcmni4z387r2nfy2cwd11pan31vd4wi"; + rev = "120d35010a29d028634a1e4c6ec9d00c1bea5515"; + sha256 = "1bd89d9d1m6647kpdsczj6c28r3zkjpqjj7p4qndcrwc9h37r4dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -74845,11 +75162,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20170916.1826"; + version = "20171030.502"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "ca7cf34e959c"; - sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma"; + rev = "16763e5b7481"; + sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; @@ -74907,12 +75224,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20171012.1610"; + version = "20171027.1412"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; - sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; + rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4"; + sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -75068,8 +75385,8 @@ src = fetchFromGitHub { owner = "rudolfochrist"; repo = "zel"; - rev = "23b12d107f123667ddd443b9f3e2047209e0055a"; - sha256 = "1m8bw588r2a1034ynigrzgab857261nrjwnzag5i3rgwn27brfcz"; + rev = "9dae2d212224d1deae1f62561fa8e4d689fd09f2"; + sha256 = "1518wp3zjfdvzz5r22cjgn735c4yxr345qzj40b5agww4dsxmwmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48132eb4c0fd01b9fc31236c5c4701f8f83a806/recipes/zel"; @@ -75399,12 +75716,12 @@ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom"; - version = "20171018.1314"; + version = "20171030.529"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "dc6747c754622ed88eeac896f18845681c90cae0"; - sha256 = "1innar1xrjlh8pvq3gj903xrlpkr8qwjbr60k7zi7wd2r6lqd7h0"; + rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40"; + sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; From 1167fde2b295026c7ab5e497fa621979d36df097 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 1 Nov 2017 16:11:50 +0100 Subject: [PATCH 2134/2806] docs: add note about makeFlags quoting --- doc/stdenv.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index a097762130a..ee110b77104 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -698,8 +698,14 @@ nothing. A list of strings passed as additional flags to make. These flags are also used by the default install and check phase. For setting make flags specific to the - build phase, use buildFlags (see - below). + build phase, use buildFlags (see below). + + +makeFlags = [ "PREFIX=$(out)" ]; + + + The flags are quoted in bash, but environment variables can + be specified by using the make syntax. From 7e31aef88a03b32c31f2965bf532e07564ec5b2d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Nov 2017 03:40:38 +0000 Subject: [PATCH 2135/2806] ocamlPackages.lwt: remove spurious dependency on oasis --- pkgs/development/ocaml-modules/lwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index c3acdcf5bdb..53ba904f628 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 -, react, ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib +, react, ssl, libev, pkgconfig, ncurses, glib , ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" @@ -27,7 +27,7 @@ buildOcaml rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml_oasis which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] + buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] ++ stdenv.lib.optional ppxSupport ppx_tools; propagatedBuildInputs = [ result ] From 633b03c57f658d57a192eabb088b171b4542081e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 29 Oct 2017 17:15:43 +0100 Subject: [PATCH 2136/2806] docs: add section on common darwin issues --- doc/manual.xml | 1 + doc/platform-notes.xml | 83 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 doc/platform-notes.xml diff --git a/doc/manual.xml b/doc/manual.xml index 75bd21557fd..eb0a24789d4 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -18,6 +18,7 @@ + diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml new file mode 100644 index 00000000000..f4f6ec60029 --- /dev/null +++ b/doc/platform-notes.xml @@ -0,0 +1,83 @@ + + +Platform Notes + +
+ +Darwin (macOS) +Some common issues when packaging software for darwin: + + + + + + The darwin stdenv uses clang instead of gcc. + When referring to the compiler $CC or cc + will work in both cases. Some builds hardcode gcc/g++ in their + build scripts, that can usually be fixed with using something + like makeFlags = [ "CC=cc" ]; or by patching + the build scripts. + + + + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + buildPhase = '' + $CC -o hello hello.c + ''; + } + + + + + + On darwin libraries are linked using absolute paths, libraries + are resolved by their install_name at link + time. Sometimes packages won't set this correctly causing the + library lookups to fail at runtime. This can be fixed by adding + extra linker flags or by running install_name_tool -id + during the fixupPhase. + + + + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; + } + + + + + + Some packages assume xcode is available and use xcrun + to resolve build tools like clang, etc. + This causes errors like xcode-select: error: no developer tools were found at '/Applications/Xcode.app' + while the build doesn't actually depend on xcode. + + + + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + prePatch = '' + substituteInPlace Makefile \ + --replace '/usr/bin/xcrun clang' clang + ''; + } + + + + The package xcbuild can be used to build projects + that really depend on Xcode, however projects that build some kind of + graphical interface won't work without using Xcode in an impure way. + + + + +
+ + From b84c4206fca8b178cb779f6fc5d0f6419808d127 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Nov 2017 17:29:25 +0000 Subject: [PATCH 2137/2806] vaapiIntel: 1.7.3 -> 1.8.2 --- pkgs/development/libraries/vaapi-intel/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index df68b86519b..dcb44a408a8 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.7.3"; + name = "intel-vaapi-driver-${version}"; + version = "1.8.2"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "0dzryi9x873p9gikzcb9wzwqv2j3wssm0b85ws63vqjszpckgbbn"; + sha256 = "00mpcvininwr5c4wyhp16s4bddg7vclxxjm2sfq5h7lifjcxyv46"; }; patchPhase = '' From 309373ea68839fa28d61fc84c982a4b5c08322cf Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Nov 2017 17:58:20 +0000 Subject: [PATCH 2138/2806] intel-ocl: r4.0-59481 -> 5.0-63503 --- nixos/modules/hardware/opengl.nix | 2 +- pkgs/os-specific/linux/intel-ocl/default.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 486fe7c1cd8..c2c36f02a14 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -93,7 +93,7 @@ in hardware.opengl.extraPackages = mkOption { type = types.listOf types.package; default = []; - example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; + example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; description = '' Additional packages to add to OpenGL drivers. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 0d33954fd5d..d604c9ef6b7 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: stdenv.mkDerivation rec { - version = "r4.0-59481"; name = "intel-ocl-${version}"; + version = "5.0-63503"; src = fetchzip { - url = "https://software.intel.com/sites/default/files/managed/48/96/SRB4_linux64.zip"; - sha256 = "1q69g28i6l7p13hnsk82g2qhdf2chwh4f0wvzac6xml67hna3v34"; + url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip"; + sha256 = "0qbp63l74s0i80ysh9ya8x7r79xkddbbz4378nms9i7a0kprg9p2"; stripRoot = false; }; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { postUnpack = '' # Extract the RPMs contained within the source ZIP. - rpmextract SRB4_linux64.zip/intel-opencl-${version}.x86_64.rpm - rpmextract SRB4_linux64.zip/intel-opencl-cpu-${version}.x86_64.rpm + rpmextract source/intel-opencl-r${version}.x86_64.rpm + rpmextract source/intel-opencl-cpu-r${version}.x86_64.rpm ''; patchPhase = '' From 2ddcdcce2652016ac58826fa600d19db111178e5 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 1 Nov 2017 19:06:27 +0100 Subject: [PATCH 2139/2806] nixos/postfix: support alternate smtp ports when relaying (#30685) * postfix: support alternate smtp ports when relaying * fix missing ; after merge --- nixos/modules/services/mail/postfix.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 1fef9ac6ec9..867c0ea6761 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -60,11 +60,11 @@ let manpage_directory = "${pkgs.postfix}/share/man"; html_directory = "${pkgs.postfix}/share/postfix/doc/html"; shlib_directory = false; - relayhost = if cfg.lookupMX || cfg.relayHost == "" - then cfg.relayHost - else - "[${cfg.relayHost}]" - + optionalString (cfg.relayPort != null) ":${toString cfg.relayPort}"; + relayhost = if cfg.relayHost == "" then "" else + if cfg.lookupMX + then "${cfg.relayHost}:${toString cfg.relayPort}" + else "[${cfg.relayHost}]:${toString cfg.relayPort}"; + mail_spool_directory = "/var/spool/mail/"; setgid_group = setgidGroup; } @@ -461,13 +461,10 @@ in }; relayPort = mkOption { - type = types.nullOr types.int; - default = null; - example = 587; + type = types.int; + default = 25; description = " - Specify an optional port for outbound mail relay. (Note: - only used if an explicit is - defined.) + SMTP port for relay mail relay. "; }; From f5b773beecbb7ea64518570b3c9431afaf606238 Mon Sep 17 00:00:00 2001 From: Ryan Bernstein Date: Wed, 1 Nov 2017 14:37:31 -0400 Subject: [PATCH 2140/2806] pythonPackages.pomegranate: 0.8.0 -> 0.8.1 Also now using GitHub instead of PiPy, because the PiPy version fails to build. Not sure why they aren't identical. --- .../python-modules/pomegranate/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 2884ac9ddc4..fa7eb03fd0b 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,13 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }: +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }: buildPythonPackage rec { pname = "pomegranate"; - version = "0.8.0"; + version = "0.8.1"; name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "6b03d05bffbe46c674800652cf273a8d338a2e40001b763cd6925aac0b578a43"; + + src = fetchFromGitHub { + repo = pname; + owner = "jmschrei"; + rev = "v${version}"; + sha256 = "085nka5bh88bxbd5vl1azyv9cfpp6grz2ngclc85f9kgccac1djr"; }; propagatedBuildInputs = [ numpy scipy cython networkx joblib ]; From 20fd713669da88005f5955d032ba5b306d6a8b78 Mon Sep 17 00:00:00 2001 From: Ryan Bernstein Date: Wed, 1 Nov 2017 14:41:45 -0400 Subject: [PATCH 2141/2806] pythonPackages.pomegranate: Removed unnecessary dependency --- pkgs/development/python-modules/pomegranate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index fa7eb03fd0b..77b373de259 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }: +{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose }: buildPythonPackage rec { pname = "pomegranate"; From 088ce9f23ff6898d9146d78a154266206084d200 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Nov 2017 18:15:38 +0000 Subject: [PATCH 2142/2806] CODEOWNERS: fix path notation This format uses the path matching algorithm as the .gitignore format. The paths need to be prefixed with a / to become absolute, otherwise it will match all of these files. The paths will also match any of the sub-paths by default so it's not necessary to use the `*` like in bash globbing. --- .github/CODEOWNERS | 96 +++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ab64ddb3e67..297b91976a8 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -8,75 +8,75 @@ # Mentioned users will get code review requests. # This file -.github/CODEOWNERS @edolstra +/.github/CODEOWNERS @edolstra # Boostraping and core infra -pkgs/stdenv/ @edolstra -pkgs/build-support/cc-wrapper/ @edolstra +/pkgs/stdenv @edolstra +/pkgs/build-support/cc-wrapper @edolstra # Libraries -lib/ @edolstra @nbp +/lib @edolstra @nbp # Nixpkgs Internals -default.nix @nbp -pkgs/top-level/default.nix @nbp -pkgs/top-level/impure.nix @nbp -pkgs/top-level/stage.nix @nbp +/default.nix @nbp +/pkgs/top-level/default.nix @nbp +/pkgs/top-level/impure.nix @nbp +/pkgs/top-level/stage.nix @nbp # NixOS Internals -nixos/default.nix @nbp -nixos/lib/from-env.nix @nbp -nixos/lib/eval-config.nix @nbp -nixos/doc/manual/configuration/abstractions.xml @nbp -nixos/doc/manual/configuration/config-file.xml @nbp -nixos/doc/manual/configuration/config-syntax.xml @nbp -nixos/doc/manual/configuration/modularity.xml @nbp -nixos/doc/manual/development/assertions.xml @nbp -nixos/doc/manual/development/meta-attributes.xml @nbp -nixos/doc/manual/development/option-declarations.xml @nbp -nixos/doc/manual/development/option-def.xml @nbp -nixos/doc/manual/development/option-types.xml @nbp -nixos/doc/manual/development/replace-modules.xml @nbp -nixos/doc/manual/development/writing-modules.xml @nbp -nixos/doc/manual/man-nixos-option.xml @nbp -nixos/modules/installer/tools/nixos-option.sh @nbp +/nixos/default.nix @nbp +/nixos/lib/from-env.nix @nbp +/nixos/lib/eval-config.nix @nbp +/nixos/doc/manual/configuration/abstractions.xml @nbp +/nixos/doc/manual/configuration/config-file.xml @nbp +/nixos/doc/manual/configuration/config-syntax.xml @nbp +/nixos/doc/manual/configuration/modularity.xml @nbp +/nixos/doc/manual/development/assertions.xml @nbp +/nixos/doc/manual/development/meta-attributes.xml @nbp +/nixos/doc/manual/development/option-declarations.xml @nbp +/nixos/doc/manual/development/option-def.xml @nbp +/nixos/doc/manual/development/option-types.xml @nbp +/nixos/doc/manual/development/replace-modules.xml @nbp +/nixos/doc/manual/development/writing-modules.xml @nbp +/nixos/doc/manual/man-nixos-option.xml @nbp +/nixos/modules/installer/tools/nixos-option.sh @nbp # Python-related code and docs -pkgs/top-level/python-packages.nix @FRidh -pkgs/development/interpreters/python/* @FRidh -pkgs/development/python-modules/* @FRidh -doc/languages-frameworks/python.md @FRidh +/pkgs/top-level/python-packages.nix @FRidh +/pkgs/development/interpreters/python @FRidh +/pkgs/development/python-modules @FRidh +/doc/languages-frameworks/python.md @FRidh # Haskell -pkgs/development/compilers/ghc @peti -pkgs/development/haskell-modules @peti -pkgs/development/haskell-modules/default.nix @peti -pkgs/development/haskell-modules/generic-builder.nix @peti -pkgs/development/haskell-modules/hoogle.nix @peti +/pkgs/development/compilers/ghc @peti +/pkgs/development/haskell-modules @peti +/pkgs/development/haskell-modules/default.nix @peti +/pkgs/development/haskell-modules/generic-builder.nix @peti +/pkgs/development/haskell-modules/hoogle.nix @peti # R -pkgs/applications/science/math/R @peti -pkgs/development/r-modules @peti +/pkgs/applications/science/math/R @peti +/pkgs/development/r-modules @peti # Ruby -pkgs/development/interpreters/ruby/* @zimbatm -pkgs/development/ruby-modules/* @zimbatm +/pkgs/development/interpreters/ruby @zimbatm +/pkgs/development/ruby-modules @zimbatm # Darwin-related -/pkgs/stdenv/darwin/ @org/darwin-maintainers -/pkgs/os-specific/darwin/ @org/darwin-maintainers +/pkgs/stdenv/darwin @NixOS/darwin-maintainers +/pkgs/os-specific/darwin @NixOS/darwin-maintainers # Beam-related (Erlang, Elixir, LFE, etc) -pkgs/development/beam-modules/* @gleber -pkgs/development/interpreters/erlang/* @gleber -pkgs/development/interpreters/lfe/* @gleber -pkgs/development/interpreters/elixir/* @gleber -pkgs/development/tools/build-managers/rebar/* @gleber -pkgs/development/tools/build-managers/rebar3/* @gleber -pkgs/development/tools/erlang/* @gleber +/pkgs/development/beam-modules @gleber +/pkgs/development/interpreters/erlang @gleber +/pkgs/development/interpreters/lfe @gleber +/pkgs/development/interpreters/elixir @gleber +/pkgs/development/tools/build-managers/rebar @gleber +/pkgs/development/tools/build-managers/rebar3 @gleber +/pkgs/development/tools/erlang @gleber # Jetbrains -pkgs/applications/editors/jetbrains @edwtjo +/pkgs/applications/editors/jetbrains @edwtjo # Eclipse -pkgs/applications/editors/eclipse @rycee +/pkgs/applications/editors/eclipse @rycee From 755835c67a6f6d238fd287b930c5973b1a1839ff Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 1 Nov 2017 19:23:28 +0000 Subject: [PATCH 2143/2806] firefoxPackages: tor-browser: fix build --- .../networking/browsers/firefox/packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 56641c7ad9a..a1d5df5029c 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -54,8 +54,7 @@ rec { unpackPhase = '' # fetchFromGitHub produces ro sources, root dir gets a name that # is too long for shebangs. fixing - cp -a $src . - mv *-src tor-browser + cp -a $src tor-browser chmod -R +w tor-browser cd tor-browser @@ -106,9 +105,10 @@ in rec { # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; - repo = "tor-browser"; - rev = "tor-browser-45.8.0esr-6.5-2"; - sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j"; + repo = "tor-browser"; + # branch "tor-browser-45.8.0esr-6.5-2" + rev = "e4140ea01b9906934f0347e95f860cec207ea824"; + sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60"; }; } // commonAttrs) { stdenv = overrideCC stdenv gcc5; From b902a88e80a1aecf403e66ea43ec24688702dcec Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 1 Nov 2017 19:33:54 +0000 Subject: [PATCH 2144/2806] buck: 2017.05.31.01 -> 2017.10.01.01 --- pkgs/development/tools/build-managers/buck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index cddb1a90765..5d486f47844 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "buck-${version}"; - version = "v2017.05.31.01"; + version = "v2017.10.01.01"; src = fetchFromGitHub { owner = "facebook"; repo = "buck"; - rev = "0b8b3828a11afa79dc128832cb55b106f07e48aa"; - sha256 = "1g3yg8qq91cdhsq7zmir7wxw3767l120f5zhq969gppdw9apqy0s"; + rev = "2025fd74327477728b524eafdd4619a0170a24ea"; + sha256 = "05nyyb6f0hv1h67zzvdq8297yl8zjhpbasx35lxnrsjz0m1h8ngw"; }; patches = [ ./pex-mtime.patch ]; From ac2976d829b071e17e77383beddd3cb7f7566513 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 1 Nov 2017 20:03:58 +0000 Subject: [PATCH 2145/2806] bazel: 0.6.1 -> 0.7.0 --- pkgs/development/tools/build-managers/bazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 8701db8d161..e15b212ebca 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.7.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "19rb1lh6v2gi8xlxhdmhydp16i1bgmvb510i053rfy0jlmh1znns"; + sha256 = "05n4zz2a29y4vr2svc7ya9fx7qxb9151a6gkycxk9qj3v32sk150"; }; sourceRoot = "."; From 8e541c08d6468e37f8e950b04994cc1782d9f99a Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Mon, 31 Jul 2017 16:48:37 +1000 Subject: [PATCH 2146/2806] masterpdfeditor: init at 4.2.70 --- .../misc/masterpdfeditor/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/misc/masterpdfeditor/default.nix diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix new file mode 100644 index 00000000000..9eb2cea0895 --- /dev/null +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: + let + version = "4.2.70"; + in + stdenv.mkDerivation { + name = "masterpdfeditor-${version}"; + src = fetchurl { + url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + sha256 = "0vl5gc1fzsmzl56vd9g3av48557if8a04vhhl5yna8by26h6xz0c"; + }; + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc + glibc + sane-backends + qtbase + qtsvg + libXext + libX11 + libXdmcp + libXau + libxcb + ]; + dontStrip = true; + installPhase = '' + mkdir -pv $out/bin + cp -v masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v masterpdfeditor4.png $out/bin/masterpdfeditor4.png + cp -v -r stamps $out/bin/stamps + cp -v -r templates $out/bin/templates + cp -v -r lang $out/bin/lang + cp -v -r fonts $out/bin/fonts + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $libPath \ + $out/bin/masterpdfeditor4 + ''; + meta = with stdenv.lib; { + description = "PDF Editor"; + homepage = "https://code-industry.net/free-pdf-editor/"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = maintainers.cmcdragonkai; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60fad0499da..f2237b69249 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13669,6 +13669,8 @@ with pkgs; adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; + masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; + aeolus = callPackage ../applications/audio/aeolus { }; aewan = callPackage ../applications/editors/aewan { }; From fbf11263df6713ad4ca8ed76c948bd6afb5ce9ad Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Nov 2017 21:13:11 +0100 Subject: [PATCH 2147/2806] masterpdfeditor: 4.2.70 -> 4.3.61 also add flokli as maintainer --- pkgs/applications/misc/masterpdfeditor/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 9eb2cea0895..12541e35655 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: let - version = "4.2.70"; + version = "4.3.61"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0vl5gc1fzsmzl56vd9g3av48557if8a04vhhl5yna8by26h6xz0c"; + sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm"; }; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc @@ -34,10 +34,10 @@ $out/bin/masterpdfeditor4 ''; meta = with stdenv.lib; { - description = "PDF Editor"; + description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; platforms = platforms.linux; - maintainers = maintainers.cmcdragonkai; + maintainers = with maintainers; [ cmcdragonkai flokli ]; }; } From aac7370a22a893484bf18c10143d2fac097a5e19 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Nov 2017 20:17:40 +0000 Subject: [PATCH 2148/2806] kops: 1.6.2 -> 1.7.1 --- pkgs/applications/networking/cluster/kops/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index e036fb2f38b..ff7cb245ae2 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.6.2"; + version = "1.7.1"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l"; + sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd"; }; buildInputs = [go-bindata]; @@ -39,7 +39,7 @@ buildGoPackage rec { description = "Easiest way to get a production Kubernetes up and running"; homepage = https://github.com/kubernetes/kops; license = licenses.asl20; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [offline zimbatm]; platforms = platforms.unix; }; } From 81baa25fd1360b88f2b6f976147b6f9ed33f0e02 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Nov 2017 20:25:50 +0000 Subject: [PATCH 2149/2806] gifsicle: 1.88 -> 1.90 --- pkgs/tools/graphics/gifsicle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 4404a8b6440..7c5f9eaf5de 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gifsicle-${version}"; - version = "1.88"; + version = "1.90"; src = fetchurl { url = "http://www.lcdf.org/gifsicle/${name}.tar.gz"; - sha256 = "4585d2e683d7f68eb8fcb15504732d71d7ede48ab5963e61915201f9e68305be"; + sha256 = "0kc35g99fygzjj7qjcy87rdb8mbgmacr2mga9ihgln1dfnbb0wrd"; }; buildInputs = optional gifview [ xproto libXt libX11 ]; From f4e38223f38248d7cf9b834b7474b2fd6342f81c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Nov 2017 20:33:23 +0000 Subject: [PATCH 2150/2806] google-cloud-sdk: 171.0.0 -> 177.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index f1165f6172b..3622b981cc4 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -5,27 +5,28 @@ let pythonInputs = [ cffi cryptography pyopenssl crcmod google-compute-engine ]; pythonPath = lib.makeSearchPath python.sitePackages pythonInputs; + sources = name: system: { + i686-linux = { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; + sha256 = "0aq938s1w9mzj60avmcc68kgll54pl7635vl2mi89f6r56n0xslp"; + }; + + x86_64-darwin = { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; + sha256 = "13k2i1svry9q800s1jgf8jss0rzfxwk6qci3hsy1wrb9b2mwlz5g"; + }; + + x86_64-linux = { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; + sha256 = "1kvaz8p1iflsi85wwi7lb6km6frj70xsricyz1ah0sw3q71zyqmc"; + }; + }.${system}; + in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "171.0.0"; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "0scp9nhd46mrnd02bw7skm5fa04i7azf68g08js8kawvjgbwq0sb"; - } - else if stdenv.system == "x86_64-darwin" then - fetchurl { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; - sha256 = "0xvrqsg0vqws9n20lvipxilb45aln5p9iy0ldjfxx8vvi0s42298"; - } - else - fetchurl { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "0b9rqhwd30hn5l82a2x10rz86jz1j03b19di7bc3bqn4x041qii5"; - }; + version = "177.0.0"; + src = fetchurl (sources name stdenv.system); buildInputs = [ python makeWrapper ]; From 314979fbb759a40c5d8b332dafcec8ce2645a531 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Nov 2017 20:35:18 +0000 Subject: [PATCH 2151/2806] caddy: 0.10.9 -> 0.10.10 --- pkgs/servers/caddy/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 24f5cec8179..c24780095db 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.9"; + version = "0.10.10"; goPackagePath = "github.com/mholt/caddy"; @@ -12,19 +12,9 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "1shry7dqcbb5d3hp9xz5l3jx9a6i18wssz3m28kpjf3cks427v55"; + sha256 = "1x7f1yz5vnsy9n50ak0vjrm4w8fqc1qvhv8fmqnsc8cgbp7f3p8w"; }; - patches = [ - # This header was added in 0.10.9 and was since reverted but no new release made - # remove this patch when updating to next release - (fetchpatch { - url = "https://github.com/mholt/caddy/commit/d267b62fe9fdd008f13774afc72d95335934d133.patch"; - name = "revert-sponsors-header.patch"; - sha256 = "192g23kzkrwgif7ii9c70mh1a25gwhm1l1mzyqm9i0d3jifsfc2j"; - }) - ]; - buildFlagsArray = '' -ldflags= -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version} From b2e6b560164aeaa06dff26b43c79157b886bbe1b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Nov 2017 21:58:48 +0100 Subject: [PATCH 2152/2806] expat: 2.2.4 -> 2.2.5 --- pkgs/development/libraries/expat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 6533997de2f..569a82b750a 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchpatch, fetchurl }: stdenv.mkDerivation rec { - name = "expat-2.2.4"; + name = "expat-2.2.5"; src = fetchurl { url = "mirror://sourceforge/expat/${name}.tar.bz2"; - sha256 = "17h1fb9zvqvf0sr78j211bngc6jpql5wzar8fg9b52jzjvdqbb83"; + sha256 = "1xpd78sp7m34jqrw5x13bz7kgz0n6aj15wn4zj4gfx3ypbpk5p6r"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers From a66f1d6047cefd2ea0eb73a1e58d5f93f85e9b50 Mon Sep 17 00:00:00 2001 From: Renaud Date: Wed, 1 Nov 2017 15:31:51 +0100 Subject: [PATCH 2153/2806] rdfind: 1.3.4 -> 1.3.5 homepage and fetch src over HTTPS --- pkgs/tools/filesystems/rdfind/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 853654c0f79..b421a768b3d 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "rdfind-${version}"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "http://rdfind.pauldreik.se/${name}.tar.gz"; - sha256 = "0zfc5whh6j5xfbxr6wvznk62qs1mkd3r7jcq72wjgnck43vv7w55"; + url = "https://rdfind.pauldreik.se/${name}.tar.gz"; + sha256 = "0i63f2lwwkiq5m8shi3wwi59i1s25r6dx6flsgqxs1jvlcg0lvn3"; }; buildInputs = [ nettle ]; - meta = { - homepage = http://rdfind.pauldreik.se/; + meta = with stdenv.lib; { + homepage = https://rdfind.pauldreik.se/; description = "Removes or hardlinks duplicate files very swiftly"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ wmertens ]; - platforms = with stdenv.lib.platforms; all; + maintainers = [ maintainers.wmertens ]; + platforms = platforms.all; }; } From 8162e580f5ec8897729e0e6a6199dd90b3c01895 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Nov 2017 22:15:09 +0100 Subject: [PATCH 2154/2806] masterpdfeditor: add .desktop file and LICENSE --- pkgs/applications/misc/masterpdfeditor/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 12541e35655..2d2fd2c7bed 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -22,13 +22,23 @@ ]; dontStrip = true; installPhase = '' - mkdir -pv $out/bin + mkdir -p $out/bin $out/share/applications $out/share/pixmaps + + substituteInPlace masterpdfeditor4.desktop \ + --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" + cp -v masterpdfeditor4 $out/bin/masterpdfeditor4 - cp -v masterpdfeditor4.png $out/bin/masterpdfeditor4.png + cp -v masterpdfeditor4.png $out/share/pixmaps/ + cp -v masterpdfeditor4.desktop $out/share/applications + cp -v -r stamps $out/bin/stamps cp -v -r templates $out/bin/templates cp -v -r lang $out/bin/lang cp -v -r fonts $out/bin/fonts + install -D license.txt $out/share/$name/LICENSE + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ $out/bin/masterpdfeditor4 From e32352fd978a7d2804b9e2750797647a5d69a7f2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 1 Nov 2017 22:32:52 +0100 Subject: [PATCH 2155/2806] nixpkgs manual: unfree packages are untested Resolves confusion mentioned in #31045. --- doc/configuration.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/configuration.xml b/doc/configuration.xml index ac03b42714c..55c5ea809d3 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -55,6 +55,10 @@ configuration file located at +Note that we are not able to test or build unfree software on Hydra +due to policy. Most unfree licenses prohibit us from either executing or +distributing the software. +
Installing broken packages From e1d7f7ba82750c4e89f0ef8519518f0bf30c90c8 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 1 Nov 2017 21:37:19 +0000 Subject: [PATCH 2156/2806] cloc: fix sourceRoot --- pkgs/tools/misc/cloc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 534e3d950d3..e303b1dd7f2 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b"; }; - sourceRoot = "cloc-${version}-src/Unix"; + sourceRoot = "source/Unix"; buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ]; From c733fdd1c9f6b61127edf9d403dbc96dfeabbbf0 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 1 Nov 2017 21:42:46 +0000 Subject: [PATCH 2157/2806] firefox-devedition-bin: 57.0b11 -> 57.0b13 --- .../firefox-bin/devedition_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 6b08c3798ba..db45ad95656 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b11"; + version = "57.0b13"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ach/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ach/firefox-57.0b13.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "ba86d5610b286bf392c94e7dd5436500fedf033946c34bc56a53b1e9b4e934379e5ac82a989168a1d339b4de0819f273cee48d688899c34cb353f83376201183"; + sha512 = "cf01dfc2fa0995b24457e9aea6faafcafee48c900794845c08ae452fe920f75841db9e67302a7b23b6bf956baf0c79eb8bd2d63ea4a45b3f515a4745552756e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/af/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/af/firefox-57.0b13.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7cbf2ad3b2775b2edebb6b789896d9c2cf63c6a59272dafd1548c20b6ea592396b9f5b622f09305dce199146a23f98a16c8a8b6835115edded902114aa938be9"; + sha512 = "76be18af3bd07ce72f6ee1522d6b7e86f82d6449f178f07cc465c20afb9c453fb16b37aa6f301b4e83f9e7bc9affd8e76a52685be7a45db7fcedb50c99584630"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/an/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/an/firefox-57.0b13.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "4befe56ebeadccc674cad25d5c58ba8d330b8ca79f7deda3a86314ddf289404b8e167f31e3717ab360c78163940a90361bdbcbf112ae4830eb15f0103ec40442"; + sha512 = "3f544f11deed60cbf9cbd6bda27d68c7523ec087d71ff9eef74989b7185f5271d53e6ca7f6d463a64c11fda67692b609890dbfae73bacd164fb3cf7fbf327183"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ar/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ar/firefox-57.0b13.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8aabaa49507ce8036b4c921c78697973e69cfeab9a1091bf830c085f9b8287e41b026bd237590f2e2a89255b4fa4db47e563f726f945d15ac4ae5b790335a2ac"; + sha512 = "48515a3ef14a0caf407fa69eb42e27915bf5a8ebec1de7e4f53d85fbcbc756fb763ab9e596e6580900fbf52854da1dadfa7f8920b43dc9d1a6e36b07b989fd82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/as/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/as/firefox-57.0b13.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "68915c8a35cec3b9a2c9afb8f2c8e1cf5db0874c23195241fac7b75d317af0a23f53170d6f9169eeda3210202430c56e9fe47cb0fab434300236186d60d4e04f"; + sha512 = "376e899b9ccfa0bdb2a77977bc302c01504fd309226e9d63e79d1b799503284c7cc0ff8636e63afc17fe2e611594965ac14334e0c65058e80fc471f3057d3d3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ast/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ast/firefox-57.0b13.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f72a8fcc4cef1522f91e70158541a1328202a7dfeb467662deaf70ca62b049c942e664301f99314c3940b9cdb6bcdb663c3175c81d32c31a4a547954907813d2"; + sha512 = "17fb3d94d037ab1be8912662c9cf79590ecdd2c17b227b38477f3aaf18b3fc6309c9a3dbdfeeaaec9134ed9d3de8a7810f905c68003db5efa6e733a8b22e8226"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/az/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/az/firefox-57.0b13.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "4246cf3fd34a9824dd61d488966902086b51b68b5895b491cd7c3db81e4cdc0de8f06f74ffc77bedb80e5069e594f49eda524145c2f66c2fa8fc86db8177bfe9"; + sha512 = "ef29f2265b91bee270c77afe9a0034c07138157c5be1cd3ad5a68ecb94cacf98a7c52de1985ba9dd51ae4e92df08a916249ebad24df4ba672d757d9cf95ee135"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/be/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/be/firefox-57.0b13.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "9858669e11bbbe6f56bbddc2f3c94f0586a46fa5fbbde2a4439d6aeaff5bd28c9affaebdee4a2903ff1bd29392f10df0ca84a9695065c9dc60e8066627465d0a"; + sha512 = "c002738e74b87b9423d8b6c8cc15fd6532adc4cb9558c0f059c2b0a1c821663c7cd8e741c5835d91daeadda8cba92938484bea5099e5b6d7c386590a69a513a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bg/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bg/firefox-57.0b13.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "8e01fe5f5c02e9af5cb06a2f29860e1b7157c44ab10f21060bebb9561c9810d8a779e3c54a585cfeb2ec3647d2312b55263ad3cf5408ea36bd380caefd0a8688"; + sha512 = "b85df314c69649277e4a33e8374f21cb22565396685b742c6566b1c138daca254770c1d5e87f6af1f27ec65ac247b3eb888a14734cefd7a40755ff100b803531"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bn-BD/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bn-BD/firefox-57.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "adce1d58ebf4994ddb89db06c79411e7d2bd3b49a8e55f2bfc5a4a9968245973f1b01f30c74a84fb09310dd589076865f2d10b17b418d390ce5ed0898fbb5cc9"; + sha512 = "54bd6f4fc5b2a2a24bafcf19f48c3e4d104449af06ab9d68a58f6d02e29edda65024f32363988034246f989578bd37d7c7d9bdb567d5869767f908072ce8bc00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bn-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bn-IN/firefox-57.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "23910c2086cade899f596f22d0f9476f5cec5481b90467a90710711eadf54b04a1c1a6455ab741374df64076c633a70ea8b375e2aa280c14a193ab204a4d8609"; + sha512 = "c4acb6c52ba7bdc1e34f7020293daa2a8d230e92c19c700d34df6dc7052fde2928d2e79d252e9f2aa7b148d61328e839c218e5df78104617cf15a0bad8450b4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/br/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/br/firefox-57.0b13.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "31ec45b6ec424202a04287cb97ee24aa45968a41a1dab47cc7411b865dd8d3c9fd6882482d771cbc9e6c0196dec4323fd17ab5e095eb0ac436e2726896aa6a26"; + sha512 = "ceac213b63c36e6e3fc388cd725c52a77f223dd6864bf29a26c143d9b0631af62eb26d0a90efe737b08f2342096dbd32692fce7df281b6804dfed9798dc0a6d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bs/firefox-57.0b13.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "cb90a2470143abcc536e9f737cd655e2f0c4157088837ce2194213baba6957e34f76a974133be81f201d2db649901f33e3143e4432b5f7d59401c1baa09b5d30"; + sha512 = "179d662409f89bd47bbbee8903577048cbb114788ddc462b4fdb25c3a5ec1f7c5c52a218ec1b22039098761dc25f6021a14972d89522b798d9fa0104af7c5cad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ca/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ca/firefox-57.0b13.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a395e2a36990025b74a7cf2d3f58339e9f98ececedf6371fbbaf8b97afe2ddd0471231c1577044b7b030586c7ab92512aa3a2a51e77532c17678932d4fb69615"; + sha512 = "5b5b9558beb99619667c24a80341d74541f99a3cb9e3e958cbb53b7e7dc0e271071fd034fbcbcb909924a1712b6cb328c2de1c53f9d881a7f246fb2f92741f31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cak/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cak/firefox-57.0b13.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2e04f7b530ffa28af838974d278a1aade3613df7a17a0b2e5ff8854972a1071f376a2bbc974ea529b392de11662028ad05a4341504e9194a02dd983d8d011991"; + sha512 = "c5628b6333a0d4cf59994e70a1dddaa9143d498c929ed9237a6fccb87e5c19dd50c562cdcb4933d92f0b16acc7a881246c51baf1ebaf65b1ad897a208a20801d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cs/firefox-57.0b13.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1e060e7c001b2bd4b722611b5f2ee7d9be5ec93581bf6fb4c5eefb4188a569716a1855fb175dcb489f12b630133374cd0879a0401027e043e04e0c2d060b4c72"; + sha512 = "e5262f2be60ca5ad641483e773aee80669f63383990ea217a9a35a26865e58102b962c94ad9d4a3526055fd5dc6d0963485d7614a7dd10c74fc28888adcb6a54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cy/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cy/firefox-57.0b13.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "770b1bb389a356c5e99e371f1a1c7389d45f461a5d18f73685de289dc48f2f1686f39d44b8435133925e21659bda9053bf88f5094a332f69166dda468da40d01"; + sha512 = "5e77baf6c754a44ca730345ccdbe0bac033d8c547f033306ecf4ffcf3015a3f1c28d0d4542899f873e687dd90a4d6dd60bc970cef4c884598a1e919873e4e25d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/da/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/da/firefox-57.0b13.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f659f860640b029f0f254154d7f8a21bf011d2025113e701a2894d35acce8f345513c2792b5ec0460921765a73efc5a2d6f5ae52a09d6b6a46d45cf72af769c1"; + sha512 = "8903979b66612b7d8a856068a4ff1d4cd139ef96ca4fd1efe1abe1fa0af38a5965376b98522ef9ebefff28fee4ee6d3bc5d540e3db7f3047a6e0beda6b376f9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/de/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/de/firefox-57.0b13.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "123f3e65735317da980a57026cbf83b2ca30d8cf07dbf58f7cecab8edf805b05f0ceb2828176e8dd123cc3cfe33028357b53233add467c899d6878c1b2330c07"; + sha512 = "dd2be7aa009dc3322a065ca242e35b73f35bb28f639146b189a3306689d018f4fa23f213cb075ff4306acaf07146e3b207bfe6a9ef8f8ba57e7a810e434da627"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/dsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/dsb/firefox-57.0b13.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e4f54c55fa7b66ee1bdbfe1b17f839a81c8fde5c5e0c18c9b02f779716c901adb0c01b774a470b0c6bd7971577bd0c29429284fb35402fa6c4ddfc9069d97f27"; + sha512 = "15ab166ef554ce8d157cca1b11379f0542a2db0dc810f4520f56fe78b365f618fdac4d511e0fbae5f80ebbcfe18c03d9dcc3e02c49dd350cac7c01197573eced"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/el/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/el/firefox-57.0b13.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9fcc084e2ae0d0775d6357d9f3134cb1c60e9ee94be87d15ef90aafe7d74349684093c844c9ccbb648bc36066022762e859d21f179f074ba03ffb8ce7d7cc6c4"; + sha512 = "4ec1569340e2490a445970f75992f21f48d13411199f65df788e9e43327de8fcbffc64d628dd589471b9f7b0b5873a54c3583b2d5171ab531c602a2b22dff95f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-GB/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-GB/firefox-57.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "44b834bb9461d69ddc74aea8bdab6ad0c9f9184c5ddee037441b648da869ef584029f6c49119d22f96b43960ed17b96e82e466e42c7660ff990519928eea1aa6"; + sha512 = "1fa272fba658cea484b4f857c11daeb4abdd6e684040864d8eabf3d8671ed1019dc1dfc440d079e098fe7edae6258f39598b3d3da6301046d52460e31a409dad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-US/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-US/firefox-57.0b13.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d9ecf0ff474a71910b1611c0c8dba01e99b588719024776f27ad468718db5e6c54459da1efd648b31e69f6c3cc2bf87e31b65d5dc7cb373b2f141cfada5a2312"; + sha512 = "2106925dc8e912826332681de238dc5d72921bc9916488a242a0186a8550386e24a7eed6b67edd8126aadb42890b16c5572ff2ca6b1478720b00a5134267e27a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-ZA/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-ZA/firefox-57.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "811e666873a3211cbd31fafe3253328782053479caa3f117b27a64364b6d815e9c294f1e0ee08c3394cb9a87e7364a8b5dc2a934b394e119aef0c0ba70c713c8"; + sha512 = "7c33f60a0126c8058127499c178af6cc3398fc63ca0b1d2fec0ddb469da437349e063c61d1cd573fa157eb24f447099d82a189ef4026be865585883e9e6e41f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/eo/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/eo/firefox-57.0b13.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "13513b8f3d288009c16d06dc3cd0505ff66ed3df9d90706c8f48986be9122b3e46b0f2e1d38b2a715f6b043a15575ea05405b8d1564891291afb6bf79d90ce91"; + sha512 = "ef54f0c7c7fa9ae8aa760f4dd5c65734dbea6bc88f09dfdb814dbd16f86d1444f81f72584c3729d922c8f85bf4b9d0e2816d1ff4dc2325d92b8df1ff76221407"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-AR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-AR/firefox-57.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d9435c6fd5b6653173c2e32b6c8f88a4673eb4427821d5d0b01fcdd7f21bf93e42b02336325e4d6c295afe09a62d184d8b875eae4eb5337680ac9ed97dd17d3d"; + sha512 = "f19457ed569da5316d167691b59d8ad134e0b10394716612843e4f56adfc027631e8d927324c8ce04188e0e952c115967e63782e6fea8d461dd716458835aa26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-CL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-CL/firefox-57.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "13623e646ccd100e3c9dbf373de2a039e5fab955c1c0fd1d35f0c20eea6e32aa519eb4a9fe57682c953bf79a7d5a766f4aca45b17c5b00eea403add4ec28a70a"; + sha512 = "eed518d08ddfcd9be98d9905005b566821f1912816618c5ee1d3b76ee1972bc97e22e0fece4d35b64631db339916802d4c8e9c8416359fca0e77faea6127d53a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-ES/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-ES/firefox-57.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e1fb2a54cad6acd6ed7937dbb6c606b58261efa73a821ee2bb846d8cb32c2a89a57c52c2e5dfde8cf6571b0d23f6ec516444f9ef563e18c92b1ed60402f69d35"; + sha512 = "c26995c5de7f426baa55df935ad527b7a5c7490cdf2c3772ed680818e43ad102dec9aee510e17fc67fafa5c099216b3d23ffc7ac1f2021551e77047421ace60b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-MX/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-MX/firefox-57.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "a1b2cacb14ce0f78aa41de552a53dacf04162a69f852cc11930e58ab8dcd5168e860b59310d761a63f2ff8edfec91b7b340316a708e6d2aa61b6321c82df5901"; + sha512 = "fb4df0e91cb7c1a7c6fceeab29cf90dfda6d977123367944ce59bde0ffca551c0c4853451735bace50f260ca5fafdfca5ee109ef0600efec5eceb20ff067a315"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/et/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/et/firefox-57.0b13.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "6e4ffc6431cf650380344aac96be846a48e0aadae8d089d21784ba9a9944a3a1c9aa4f0d374d59023355d12cec2b38396aba0caf527088e58f6593bf5fd59bed"; + sha512 = "e7784770c0f40e3ce90b2e3ed200e7aa1143d62e47069c681646d5f406b299e50c45a4986880a7ed789ae3f6228307a07cc17e1c66d27b4b7864447af16ef956"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/eu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/eu/firefox-57.0b13.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "29fa095b868337dfe531538bcd4b24d16346f19277be1c6ce3e579f9cd696b5134662b58afa0d9089da37f6b312d54d19575c68b0f57a8782d2c6e46f1487d25"; + sha512 = "987b47288aec5c78ea75d8afc5d0c0850783034342de05c7ee6ebdc951ae73a6185dea25e5959d3932938915d539610c10d8943e2b1f094ee8f97c20d9add806"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fa/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fa/firefox-57.0b13.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9f6a5daa3485a1d1194a43da4d8c0d8e740cd36d10effd8dd5360297253ed2c37cd2749ee9e1d4e7446f3c84b8c985ad30128d84abdb4518e442dfc274afe770"; + sha512 = "7ad730d4e8312d861cb0882b45dfcd4656cebccab5d89dd49e78533cf6de5c525b48dcfa3ec700cf14eea579be4ed2806e1673d73f7f32a6c078fa397cb9687a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ff/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ff/firefox-57.0b13.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "a7d8f16d8edc997eb55823b8327bb057bc97bf480bff88c7c67085f601a81744b7a61f0e6364304774950f87686a5bd192937de33feb338a0de1c336d6b9773f"; + sha512 = "e1374f015fc8c5827ddc87d4d0c7c6ac7eecfef247c8f2e88c484c392160ef023695b11f8b02a526d266442cb54297769a647490257d54d7bc251cc6e03d7e03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fi/firefox-57.0b13.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e43a7e74de01d5e6145cb2b1f2757ad9692801701884079ce678768b98777a972e5ca65e037f3b1cc20ddfd7206d7582674104c4601780c02c71afa077e93a37"; + sha512 = "f6cee8f460a52106d1b06f65b9ce17555aa18a9c5baa707bab16bf1cb458dbe6effa7278379d5d8e13394412f95a3472d793551ffd6788612a166216edc1c814"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fr/firefox-57.0b13.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ab407a6f84324cc7bf302cfcdbf683f006cb9170a5d23932287392d626f3473a7b717bcfe87e09f8f7a7f7a7563dc61731474c8b4fba5e89df2d34b2b4ca1cfe"; + sha512 = "a1b252852b88523945962152a93cd0367ff5110642681bfddaf7d1659a232eed751f86378f29d4c01d08462e1d2369e23ce18f38b2580e39316741216b440f31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fy-NL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fy-NL/firefox-57.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "7f418fa811acddd2dd6b0a7c3c24b47359c1e80485d80812d8e11d6843914fdcb0314b1acc0e2e1a7a6df703df155849f468d2217fe5f99729b7c4e4a1b0f082"; + sha512 = "dfe5bdbdb642e21094be85c05aac9aaf24af22917d7d5f294f304ce2c5e53328eeb4d850e927b199b8f96ff573af4b22700890361edd14339581b5f3aaa4e9de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ga-IE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ga-IE/firefox-57.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ed03c7411b9cd7df2cce532481d2336cc296889ee25c23a387f47f920bdc21b477571ae313b6bb3c9967a48bfa025869110b398f1c4249732611fabc8c96110b"; + sha512 = "aaf0169774f0aa05b458d69bcb340796d6ee242f69dfd69dfeaaaf0647635e9e81a5658c3641c62623dd6a57dabbc42ffa3bbcb31b12c6efbf132c95c86043c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gd/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gd/firefox-57.0b13.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "421c17f1401a02793d8b5d888b7994be9638d3a62f39794f887b6e328a89a8311696ba272eaeab85a9200f9027312aa293796c48749eed8f62a60482e3513b91"; + sha512 = "161d0be36d2d590215eba19230bc660d19e6c6d2659d0fb14075bbb42b9033612cbbfd086f07ad237960fa732d1a3b2b8e9a759d24d808c8d250f2e282db234b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gl/firefox-57.0b13.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "970a6175e192046a9bb701bea9a80c83d09d73a7440bde2d94e740ab985808e8934c6b3df1121777b84282becfa4362c5595f977ba2650c235e235f9077e3776"; + sha512 = "30bfcf0e3cef19fd751242eb523fd52c4ea96c829416348e36be3f3e48e9cc9d6be6e05c63461881a7289966b64f2abcae4ad004ab0ad32c91e99459bffc7df4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gn/firefox-57.0b13.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "0cde258644b323b23e1810b8ea5dcf13dccd14292898d780cd24a1d2488f604d3dda4abf50a9840ca665d02bdb2b6bdb0186f0a434e0a350a71939c7fc7513ca"; + sha512 = "8500db008a57146706f1f6617d12a58ec238382551e45c31e140c2da499ee890fa48245518b87d53457488850a4103a204bf97d9a3edd8c92b802402b885863c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gu-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gu-IN/firefox-57.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ca20b858dc312f43844d3aaaef8de8f677bbb4409a8412d3d9ba77e0f98805aceeb0513307dafe6425fb9cc8d935f24732558fd68ad3f6d408094fe1db3a46a0"; + sha512 = "0a1ff4f35272bbc744f7a33317fc517d78fbca08b63edb91a0859d7c0c5a0bb5944ac574ab4c347f60f7dda4e8ad881e1a41696161336379ab3a40f7dd62c59d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/he/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/he/firefox-57.0b13.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "176d427cde28a1f69c90aecba0fb6459fc102d2a10d1be91ec7114643356ed60eab8cb2701802dc3641445bd8b5595ac454dd3b310a8e59f99f6467dd39bf050"; + sha512 = "56eff40d5dd8affe55b8e920d0778489186824a0b056d8413c3196ec66d4d4bceecdd5ee0a3c72d7a99ca93e9fce85b0ee51e3f79aac1ed968790293f0fe6959"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hi-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hi-IN/firefox-57.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "01bb047e7f5d259da175ec008a562d1a09ac3a327d481bc9604cb754ffd52cca861113b87a5fb6420858cf5a3be262933c8d4d35ec3be4e6c7b6ca98019afa52"; + sha512 = "f61d90b6aedd17f3afd25fd11bfb730320fd5e9eb0a7cbf24f3b0c6a5665c01b40cce8b88f753f7680c01548c1d71c4bb3a94ee16c4a87e22010269e4e03d7bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hr/firefox-57.0b13.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "d4779d34de6248f911bd52f13fb2b701e3d0d30327d79090175d665e684e9267d7a529635e855c0d4d98c04b668347d6c92fac8e027aa05eb66403757064cec4"; + sha512 = "d92b842aab0e1f4247842ca3fb9000f76ed2396b3e8bdb2f68de5b71956306bf30a58c20ed49a2c66b8551d89e65a21e9d50a69e78909aff4ac4ddab1af2c29e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hsb/firefox-57.0b13.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c497e1fe9840623adcc29caf6240c84666fde14da86567f20b43901c6f519e52b11f774feaf3990ce3e192da5966ad399cff6bb2618bafb355ec2746040a05bb"; + sha512 = "2be15782b4f478742ca0e2f00c6986a3efa10d63dd15f3f3ab249efa79aac8c0827c5f65ad38db55ec4789bb8e967cb9c397b8b5184d8ba91d5bb76b0e046648"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hu/firefox-57.0b13.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b3e49356510e4e4cc3eee442b87ee8fb757ac9c6285e5ec89824a9a32ce8af72ffba96874813e2162cc0673f08e206b1b9cbe32d0fa4e7ef87ffafe41bdc7b67"; + sha512 = "ffeafdf7b9792ce3d23f221d6b63671ac4a424f64e85996c7889f6257458d0902560b8b9133f133269191a1fc6b6d42fb0e2f1395aa1300e41c9096a6c8610c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hy-AM/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hy-AM/firefox-57.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "fc998684acfefbf64c8da70bb01cd76943132701b635763509eb264d04630f34089a306106a70c60638e4747ef08058f7e0a44400fdbd0048e9ab64cf7b8a84c"; + sha512 = "c6508a8049d2fd753c4ebca241db2a5a14a67843aa7203ae142144f7c1989aa28212224c3d09436710eb9049a8f6febb575bf6d7e301c1a7c568491e3d35b71a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/id/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/id/firefox-57.0b13.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "9ab41fb2057d749fe86c9c578bdaca62218e83209cbc5803a8072e26a21bf3496c6f7267c7a01680ef3d7c1f6da5a402920a3bb5e83f76fde9465d9b2635deb7"; + sha512 = "f217a62dfb40b9956ac0cba5ba96598ca04765135626fc29d12f5e2d547cb74ceeb77f7b02d41f56c2db50f0cf2b5ef46b16ee0b8d6f03fa90f97fa30939c23e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/is/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/is/firefox-57.0b13.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "6f6cd48c5122337109e55ba2ac7fe4ac0a0ad0424732414adc7ff3b95f5d5e07cfb603aad0463f006316526b3a07b7270426c8d31b43b530ba27313b609820bf"; + sha512 = "4861ee96ad8136ac16b47c1721a6e08a13de3b4fa4fbc25dc093e61137cc4137ff598c4c76364cdbc79a922e340318cfc735c0abfc54bf28b6b76ad5f30a4155"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/it/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/it/firefox-57.0b13.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "c409812a276eb9491e7e764c215eb0093db7e4863ae3da01fb878c838ebd0d379210924a7cae9b9a58c88eae43c317c54618005e1ab4f9e7c28ef10281d8dbbd"; + sha512 = "7057172854e90d7b555b65ecc3c73cd254db1e5bbc679ebe84e840885017fc37af67fa1cc29960f7fc0b98fa6eea86e428662b3cf60df5f3c12149e36b368688"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ja/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ja/firefox-57.0b13.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0325da2fa80de439d878b03635e934ec9445e8f6b48db620ae5de273181578a41b4b94db105f0b0e2567a12039fc2c25d46eb50fa95db4745bce9633d874348b"; + sha512 = "ce05d81cec4ebe23214c7f8cfcaa0571a78631c31b489a2a256ad2d4b71be9247fb05b9a1bdb4069ead050ca0a2ebbd5423035e544f362de9a6590633b407e1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ka/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ka/firefox-57.0b13.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "fb664987b2cfb2806acfed73664425ac73bed0646fd5c55dd40b64f3883c666c40fe7a3e26d3887641055385e1561ab47dc5517ff536fe2f132a6ae0ef0cef19"; + sha512 = "9fe9261290cfb4c39e6a6e2bca646232aa71c78b3953636a8c353da45bf8498250231809c5b2496a2bcbcc3aed82dac22b0dc41bd2195d259bc653c9126f16a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kab/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kab/firefox-57.0b13.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a0035b46bf35bc0d79fa2f9f065d0a80447438a56bb7f8653a56ff137a351abcacb0934d7402b70e4eb18da330aa43704d31530fddcaed115b3ab4666fc66468"; + sha512 = "6c4644299a5e45b50c9039daf6e6440917556a7c77bbdcbc63075b29e6b477df71fe5110de8cdeecfc160c9d13b1848541ecf777e3d5b3504da04ae2ee86083d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kk/firefox-57.0b13.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "3a9cbb1fcefaa47f49b7f98a612e019c07b5b838d54709a6f8b70e530665a06cbf7344ba09939e0ab89cb1cfc195a31ef60fc1524fb7d2a0dd88b87776a784b8"; + sha512 = "afe910f21c844f1af11e8655ffcbd00d009db44751884463322b17cb2aac576155be821fad093f2b1d6169f63af9a8674e4a1389e7502d2263343dc776c3c2e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/km/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/km/firefox-57.0b13.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "a681711346e29e9bfd8ac25b0a3b625c1e7eb7a08d502e66bc592fc4188878af0063974cf6dd60cbc9724ab489596561caabe80a91ae89ee0618a5a37c30ddfd"; + sha512 = "4b090f71b3b8c37e6944de298736a03a046ee1705ce6a30a35d75a66caa51503093f6e6287110756ee380a1524c56516e905dcf65f9af3f2f16b7c32a177a8f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kn/firefox-57.0b13.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7034448aafc92ada6ec4ffd974c9c15b8bcd2104ede74f58853c5e988cf4f4a10147d75e4c96730302a8bcb4a3403304ed6b379d369c2d1ebef7e37ca947e911"; + sha512 = "7776e3a75daaf0334f7a121fad252f8ec132ec35e32d8dd19e6c3880a802215ddfa2b147efdd21946817ef506f80c69e92dda3ba66f065776029ca39dbeaf64b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ko/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ko/firefox-57.0b13.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "14bec92a098c0398f75fcd2caadfd0c817bc5d1293b6cbbd667b76ae6cf4f9585aaafe85741ea297e6d994146586da348b7f576bac8af043f8d1918bccb85fcb"; + sha512 = "dffc3101063aa5c945b5eefd7bf487841676ba1d6021f22129f74520b5cda357c9134c7d99eb01886c70386a7bd8608fa2042c389a154b535dbd2dab471d0c47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lij/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lij/firefox-57.0b13.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "7972f52851eec48e16037fa3fedaa2745be72dff2d147d6eadb1167ad664d7cb2620227d5acd0954a1036c7f55ea8b25f5a1da5cf0bd9e13a81b567208330eda"; + sha512 = "4e80affa66e0cccadc62289a68ee6ea7a4484e86432af7eab481c26c278a23ceaa37adc97af571cabb0380611fbeaa4841b679454f13c35f39de7a6d1178e058"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lt/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lt/firefox-57.0b13.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "cbcd1637e7e9abfa847f9a44c59702adf887da8e109a280eb2e2f41e5624d2c64d3e8c6fd0d7855497ddd89b38f6485464cc6cdf10934d5752ee57f919db0aa8"; + sha512 = "3701dfe9d3489e30f12546860ae0816d7b740345ff668b93e639f73da15ae362543c9bc6308d62b4b176836a348bea37147c7168c0e92c422b626419c079e06b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lv/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lv/firefox-57.0b13.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "323b8973ee237d34790c9febc46030ae1386a7038524c67f77c19344b55350a5b921694679761de5049d9b39710e6dc16c829423c969856cc619902cdec9ba4b"; + sha512 = "bd32cceceb51dc5170c383c024b506eafc213b377bcd9d06ba38b4922fcf5360cf78b896af331dc04323f530b7ea4b39215bf57e41dae9510b928b40fd24c91c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mai/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mai/firefox-57.0b13.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0456dea7409fc7f646b89a86adcbd9769e4191fb9fd2491d9e0a09a05d7a8181ade50ad84c98522c9958437ed53dab24aded457333b5b694ebc5884ec324ad8b"; + sha512 = "5670c0b03d5e999c04ca1136e67d565b546a9b2750c18c639a79ed7c51afe6e2e1bf349fc2d512639194f352558c1af8db114d0b58f0370e3014907ce1d42eb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mk/firefox-57.0b13.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "3363dbd1913eff92a40325d61189130ceebec1994e762efc044cbb02539185697b2f4eaeb2627f77920efd84efe6da8f6e6bcb379283422d8dd276b3ac5598e1"; + sha512 = "c8cdc24f00b91db14231b3cc870ad13050907b44222fb4d84268252b572ca70c5a4818240e2c09f4e2a67517e2b3827f079fe06a075216c6017aab100841416a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ml/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ml/firefox-57.0b13.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "a5aa74b8c2cc081fa62d98a4476550f3c570e58da3c6bbb01216da2c290e85adccbcea5410ff48c814ee362b7194ab5f3b0ac1d00bd531726771caa2cd449c6c"; + sha512 = "1dac139667d0c94413cd9b3262674bce3e0d72f9deaf9b9ae0c847b8073257ffe41cc1694fc6a12316811817b23c1b19747ee3031f397a1fe3d7a6f47f26642d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mr/firefox-57.0b13.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3ba3d0a66c560e00bf4531b0dd9c2d0e1bce29f0fc890cc93511fd00298ab06f1268cfbc8ab2d759dffcabd8fae22ddf516e69b1de2b5c18ae8ea9a0313ee35b"; + sha512 = "fc37de2c1e80b25953dbabb745231efa8fe8ecca2c70f8ae8f1508c92cd8b087649513a2e6e0d19f3fefc627ff0eea863f2bf686cc79fbfe9cbe9419085c1508"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ms/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ms/firefox-57.0b13.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "5f1275956930a50b91b6ce8641f3616ecdfd12c7ce291b50e616d9dbc92da92863cc26eb3422ffc0210963ca17d3fc621456b0acae41a5891a307c9d32dcb569"; + sha512 = "f610c6b7e44eb3ecdc5b28f181511f232e368c031e94ea63cd2ef34defb17f89b66397ef63e0c625cff4d67c04f208cf965bc41580b8f570b79d3e79e01f9a15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/my/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/my/firefox-57.0b13.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "5ca368da2411fb199f737c0718876f4f8c44de2f2f738e689c40e55398e29b1ab3cea61e9af463341ef36baa96793b2767f30d268162ac598e5d075719db9f76"; + sha512 = "ab3089727c9887b9867f0069c8eb9ef47e3f3d37b8381e5bfc32a1822ff34b3496cc1c81ff44de096717455059e1b5f7cd4f40c87f1b0168b4b9c14cabe3b4f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nb-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nb-NO/firefox-57.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "dfde18c2ea0071db8353e36b7b6578701429b7f7c6130f7986443d8d922876e7f6b532c57c987de789167e3e6eca66b523329dddd120f458bf05a703e49aabee"; + sha512 = "13faa2d26f5f20c0e571d6afc7f5e3f81f5dede9c3923ce96427f9256bfacefef886525bec56d6ea59d5f39f466f50f7718afd0850e3cbd1a0949f0beca585d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nl/firefox-57.0b13.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9253d483ffc866737a3c5cc2dd22deb6269c31c1c413459860ff7f0f0a2716899fb788ca1b754354e4498ec6ce9488086083071bf13772eaab247131bb33851c"; + sha512 = "65c584e15f82c99417051a3ae14abd09b1a871a6371fbd6bf47300b4985ce34894a8dc34a9f50dbd106d7e0a3f196c870ff7fc28afab1ba4f5e7ccad3d281602"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nn-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nn-NO/firefox-57.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5bf67fd3411a246cbae4eb039e6d8c228df712f6ac8c01fc106feca2f64b77e6088ef9c06e059ae4ccd03477aeea40010c4b3a953216f980973b84934284bf9b"; + sha512 = "8abe9743e39fabf29eab41c9c02001389852805a548c645acf53a4cf4bef1c1d4103b528a3efca0614e5ef858cf358d26deb4c61a72b29bf93827f133def2685"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/or/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/or/firefox-57.0b13.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "a2e23e8e70733939dd39162864a1fc67a2870eff5b20e9de9ca028d4d619841fa2800fa7e8621c2e7f6cd16056fb58650c249e9214cb6f25fa5348b39a2de4d5"; + sha512 = "8895fed23449529006c8f1c821fcd3d95de74fc368e8ade0a41abc39a16510ccdef3a45b9df87ea88598d3e46dbbf404fee545fd1c0f07498028ce55914b68c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pa-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pa-IN/firefox-57.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "a87d34b6f50ab7001696b5c64577aab9cf0363f064a601cd527bab7a8181f9e5fd54bf4ed33552959ff0ef8dd8682ebd7b54d7d5de2b63150c852616897f1e57"; + sha512 = "c7367e682f0a37d99d5de03b5b7824596b74f8c79a2860e58b10cc1bce2e6f41e676cc39ec664817ea91a34c79aaf5a997cf7700d6484d5fb5271067e871943b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pl/firefox-57.0b13.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3c748f22568a34d99a72e7630182d731ba9e46b7659334e4c5105d586d76fc13cc96cd3da7e1bf928be6b71c8e523ddd325abd7f06407845b894273a67716929"; + sha512 = "5b542121130b2df20c0d6789729254955d0192832c87a28d4e9d976313da09654ea9ab415f2bd9aacfc796b2aacba2321f13854cf68c3ddd9ff910939edb027e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pt-BR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pt-BR/firefox-57.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a2239a7783497818a2c5f3b810c213ca2152fff3ee1cd2d8e57bfcb08f781cd8c588936182645c5eb9281bb41f80be493b119382f59e7fc83808e848a4d9b582"; + sha512 = "dcd06cc70ff67138b5b9431c84e4b771449920e5973753db1f203f72f8636c69fb91c217b04ab95773efe4f324a7c63baf32a58978534bbce6fec47e967d25e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pt-PT/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pt-PT/firefox-57.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "1e1ca4b80c9defa67221f642c7a79ce8b6ae350b9221269f89b252b6e150ec081780f0c6043ae015216a4986dcee4a515cc26b562c73d6ed2a274f0966f0b279"; + sha512 = "85caa2576bc8258cc3f5f5077b6a9ba816624d772b54c7c62a0f2c82e7e75bd0abd29677e36d709cb55eebecc9d28bdd673dc29d07329602b788c7d7d3a4a57e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/rm/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/rm/firefox-57.0b13.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "6a598e71a3da18d23bbeba744d6e8bc6b85263fef93d72edfcec66f3bd6b80b48d328e9b3cca90573352ed3a8407a98d0a2e1c61a9a56258b55df0984f21cf2b"; + sha512 = "82942a52ad073ccfc0f58e7b84b26b5394adb2bdf5f520ff946478a7299f2156e97e1ec5c8686dcd1d4b7e47ebd43eaefbb8fe2f68b0584f79ade7724981bfd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ro/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ro/firefox-57.0b13.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "3ac6ef4b82630b697b239dc972522aaa8d58829be15be41bfc91fec2b7b3fa36a4a24c2b6a0208a13ff2d0d190be3c72cebedf037f4023666c76704f1b2ea0f7"; + sha512 = "b45fa5a738d92fb5cedd06b42c5ae4599008f6abc05149e8f47bedd024470421cf8c5d3a56a111b590894c0941d5cef96476aaf0457a1f3e2a5112143572a8e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ru/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ru/firefox-57.0b13.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "4c8122918cc65958504a6b014e3729321f8d440f79605ea22d90dc3c49f4134220c2b4463fe08737854b62a76d8e67461b3c1a41ea9999c78eed95a99bb2c524"; + sha512 = "0f7655a3f0f290a14027305916b7c4a73a2292e6140677cca137bbd9417473a9c286807f8279dc3e6d723af2c142bdd958f68c748a48fa42b8d0dcc5f88d9407"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/si/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/si/firefox-57.0b13.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "e915c9acd651036a196f3845e34707a9622e5b49e2ef5614d5426849bfd809c9ab65fa0d80aa9865b7dc3bd9cfe906109b590173c545e84bb2b04d5edd2e943d"; + sha512 = "da2243a741a095132dda129af616e88fe4daca07e5a3d4ba65f18b9bd407636a3a312494a49cc1d48cf777650e44613dc69b49538d87616ca061264ba20e2447"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sk/firefox-57.0b13.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "ab7c52be7a4b0bfbaf8a52b7189407218df48c73aba5d5ddb569f6ebdf67d12c8da014e300045a51d535279571241985a21901c1c9cde9c32eb9cdbf3956ba95"; + sha512 = "3b09eb8284944e6bf490e071b64d3c373fc76f42d056635d4b3179068fba0064582ddd6deed1273fe429eacaeb3f786695824786f09d9ed1b35c4719f5dc97df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sl/firefox-57.0b13.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b9cde14b2886aa10b09cc862ac4882eaeae69ae5295625a9db046baf66ef16a76655c23b82d85eb95bed3985d13527c6eb210d006d5808dac0917b3e2a1b94ef"; + sha512 = "47cb5682058b1240bf31f2358ee72598956227c3dc344c58d82ce61bae24ec68a6f5c06adf1f39e7f824ac365fffd52dd20e4cf93489b1f7de79fa88faa4d923"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/son/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/son/firefox-57.0b13.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2ba989588f9c294718c6b2cad196a0b4631d3f189a5877ef817ac1b4b2af767531bab7ba1691dae21ceb29fbf63128cc38805db6412ce07af21d179c40ddafc5"; + sha512 = "738b5f57c0e7a36e5063ae7daf7dc51212098dcff77b26617a69e87392b26430414985a90ac81ed108f64d7b593e3a9e50d6dbd2eba79e4807309ef64ec351ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sq/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sq/firefox-57.0b13.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "07e478a5f07184d5730665b52a3cc162569553d7fc43b37579d4a33bde5b70f8ebf2deab9f6b144b961222fbced4f1fe204865dad46222c94b850ed3600e3a0d"; + sha512 = "7dfb54a4760e58880b2c0acef221c6822deb795f2dbf8e7d9e4d4949c750d1caea87ddbdf7ddce4d39388b318d470aa56d6bdfcbcb2a4f85f21ad0d2a6e76f82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sr/firefox-57.0b13.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "255f62d5f88214320dc1febe610f547b2bba08817e8eb7ec0c23dbcf5d900f47307aafe63193f93f1a3c1dabff3b7f49130df1cdde940dfdcec521553c4733a9"; + sha512 = "7ff4cfcba96156775744f6332c8ecd931f4e33613ffb78b04ecef0f7cd26fc8131c8de34b5eee250b2860d8c5696899a9e87e1d6d1e34de1730845595d6062a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sv-SE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sv-SE/firefox-57.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "4fb0f74ed4b7d221dd75c8e767b0f021c8bdda27388392c2b55cafc3ae48757b0bcc506061d59bf430fc2841ccd3aae0cb92627de00809bdd8fd536c860def24"; + sha512 = "7deb0438f37aff6fe17426fec316b2392823d6d6fbe98309921f305479475e8f8262f0f9566e9fa5d03ac90df65bbc6bf85f7082ea84836de7df016a85f81519"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ta/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ta/firefox-57.0b13.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "02214d133855b544246c930ac834c4076ba32a2f490deaf9e53cb8ed61ea6d9cf77d04b2ecc41d25eb1cd8dc87515725cb7446e85876b66ffc954d1cc8dc88ee"; + sha512 = "e30979bbaf5e66ba05800c23beb050c77658099aeb65819848fe282b00fd73b98e58cfb518f1db3e30132dd3ff5b3478c82db0177b7035952b6474157d9083df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/te/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/te/firefox-57.0b13.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "94d8bdd506216e56ab6b866b9f9a8158101b961e32e691217e16eddb748533fc39d312415e005f05656b877590487d5a5c340d4cb66f5fc9f7c97d9959206ea9"; + sha512 = "3bc7727c833709281e998b9201f2bf8e6e327d746ca080c73eb1f95239a30ca55c349040ff5789cadb03454e7ef836ebc3f1f1e47a86a19f3db1aa290a213a54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/th/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/th/firefox-57.0b13.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "305bfebb6a51ce94561a25e19acf82ca4efc3093a8de97ac352dce248140c9eb50212ca11cda550118f6bef6829ef3d6614c4696e09c662cd28b05b6d592f4a2"; + sha512 = "3ef644ae9d627f2fb46e5d1870f6b9dd71d9c8fce6ec74e027c67b3dfeec0015bd5b59e10e3b255387c86c25d7cf55ac7379d30589ab70548040452921a7f52a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/tr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/tr/firefox-57.0b13.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "37effb1cc8d59c6b6d556c1c99eef05f5bee3a31e9afe9e606790d1f901c40a20d34099d62ec610a495e9fa7a84060de5203349af4899f9da92f705fd59e9942"; + sha512 = "6b67d6386251e7bbac5fee1f0df49d34ac03856b0a22f717e62c1d246c218594b164863edba9f387c4acc3a3e6fd41dad80fac6816fcde672635b8e3f84265ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/uk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/uk/firefox-57.0b13.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2e7fc820dc9af6da8bc9af01d18c17138676e89d5e5d7e11e1bec938aee7db5d1ae16fa8b4aa03fba85adb4c9a31447fda87369b1b6b4ad7af4d265604ab9c13"; + sha512 = "89c5585413f09f5aab57532aa261d56f5df5b4f466608aea0957856036d5e1cf59763c7864e41bb9feb1313149ed5dff973193dd8c91b77e80ec3ccc9132cbd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ur/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ur/firefox-57.0b13.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "1698260ed76ecace3f65063e0e076a37fe4d780743c63512994826138cf43e60a9617c36d514d5b3a349938e7ef7b9e670d7a819cdebdc10ac5ffd00aaed5ca8"; + sha512 = "e3cf517fb7f5894d14833a7febadc14caaabc05211deafc5c0e69604131fc5b566a2898f91117cd556c7d551392fbe0cf35ba4fee357ad53a40a756600371024"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/uz/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/uz/firefox-57.0b13.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "99da803303a3269bc510fa82e278448e38ea20b73f6dad40682ac4037b23cc6869d2b6bf4f7f07ecc1b18ff3b759ba2ba4e13555a61cc9282bd29651571ec1df"; + sha512 = "d290e74c418d37cca154f56fbafa4ac9e07ec9e035d513f6b652567f72512c350212748aca15c3baff9b2137309261287cfc947f2cfdf81715e59b83fe6c2b5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/vi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/vi/firefox-57.0b13.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "dc967eb9b8f5f53a233212d5c9f05a7304bff7d2d9b8175e4f197eb54ec3c28ff6d8b634033651b20fc98a68e2d585338e6c3b50b9f22e4bfdf9b55096740d9f"; + sha512 = "d83f34b3d40faad14a8e9a91e07cb24f2ddfff65923788e258a9fe2455fa812b1b7d35dfc07c628f41b3bbd6b9ffc81dc0d313bacf33c36f5bb85106dc3fbc52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/xh/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/xh/firefox-57.0b13.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "7a47ebc63b02734c2ecf53ea98fa246a3d6612c203c9393cf8958230c583e0150b5da9fa3b315131d21576d6028565ab15eaed509848da850b7dbea65f580637"; + sha512 = "326fdc7d0082257b970a3b38aa7d25e57e558a204da939f061eb6bd43cdeb17c2d65b9f6ff38524c14d5225e3703949a4e6f01dafd926336d404742eb289b156"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/zh-CN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/zh-CN/firefox-57.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e6c7864bec03ae6ec3f5293373ef5b5ad04f1430cba8433b7e6d4d40ed4c40eb78ae48fd85e954c16a8dc5ad7c95d509cc3892832002ffef3b99dec161b4795c"; + sha512 = "04048407183c8607d6ca06b446e6da8b1cbe253b58561cb9635843479a1963474c26db589828c5586da8b76387b34696e3b256da9f978db51a96fbf3f1157bdf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/zh-TW/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/zh-TW/firefox-57.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "18cc76259b7f9b50d1dad72d76d4e9fbd140df85101a480a078840f22f8f778b90debe246e953591a7c531a64050569cc1162be30c8dd0054602d46b1e3f7ec1"; + sha512 = "aa9ae37761cd9096029e5f83a81eddc0e21964fa637f3af41d4928675f02c2d4f0b7558dd79c374c6cfaaf74e464837e5d0bcb1c5eb55c68aab24d501b163ebf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ach/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ach/firefox-57.0b13.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "731d0a857e84a66729efc652c0b562d683f12b847df3aacafba14b6b8c9f17a3b6f7c60c40dd68d85ce81c9bd876dddb98e677fd532cc4801769683530948761"; + sha512 = "83e9e88b26a4c5e84560e4248a2c465f0d73a0044c34b219ade4207702abda9355eba16222fee6c825118f70e36298d802cc8bb6e8806ff4fa099f8ac2d8173f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/af/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/af/firefox-57.0b13.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "ab2bfa2e51c36e254b9a410fa1b0ad1a5d4f2fe39b3b09c403a923ffaadcf339e71eefdf22dfa67af7a9b4c0ee543c9f507e49f9ec1ff424ec8f741950617ea9"; + sha512 = "d08c73098a6b95efc5ba120fe2d9e5c3ba1493333339e48e74346f82a4bd89bf65b1d3aa94f99f511d8716cc665cf5b4021da84aefc6ceb0a9b8fc5c21435447"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/an/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/an/firefox-57.0b13.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "61bb9e3e5d8341316888c8c8ac5df92791256181e7873db98e9ac4ccb40524552569c7b028105124c549a3ae2a62c056b310d89a2489a931be6a41d5ffbc291a"; + sha512 = "c6b460a4b52586795c0d8a9ac51e7990b8a8b0245e91056b0b1ac8290643fae32116fb3769961981da81a7ceff4979b04c923d9bda01a49f93aa08172897a101"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ar/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ar/firefox-57.0b13.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "132fb475429664ae4df2d5d2dc08274c7b8e253fdddec3e6ee2f0d11b5662b11553642dfc3ce69dfb2c1658efd16ed8568c0cab9ad626acf223979306e7132b0"; + sha512 = "346fe20b1b98c2ea7be7852252a844ccd87b2bc4c6097818198c79af5efcaf905f25157b8249be116afced8955bae9912c08d9decb7eca31050720adfb7856a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/as/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/as/firefox-57.0b13.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "86658f39915ab733cee46f19929101c50168f8ce78cb6e61a9d7814830a2eb7c8b7936db858c63beee7e06a94be9043b80975382cc2ae8623198afe8b65226df"; + sha512 = "d7f92e268a5ab4b3eb6f6d42f775a35237a529feb19656b895fb33398749024b029a66e639db30c342a753501dfb8c97868a9726cac33419c3d58865fdd24895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ast/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ast/firefox-57.0b13.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1cd4a682a831772b32b603edb6277b07b3f0de78b33246c2deec2c75a023060f24de2cd6c5ee05b6eaffa20b617fc8f7a6f413f502bd99c39086b689ac817444"; + sha512 = "a54e7fcf922ee97824d21fdaa2183fa45709f6989f41a96f913c664fc43d0d45be071c4458b026f8a22a10eb18f2b618778ca560b95dd52a43ff4897680e4eba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/az/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/az/firefox-57.0b13.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "45e91932826645df3265152fa3c80fd74ac729f97fdea29059a2e778ea04af1cadb8a0a7df8a8935ee9e70af480762d256888c4fad1be43101eebd95672dcbab"; + sha512 = "8299a0f1a33289485dc92a66600720289645e341eaf862678f6f0ea194c7f11b17a171ffb1f6d582a2810742f97085673bb8fbe58ce21b94e41b46bd1aa60e0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/be/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/be/firefox-57.0b13.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "a3a7dbc02eb8b3d64c67638a71e53a98a30092e03eac97c382aee8f2aa1cf099493c65aec5ba96aece30deb50bb5cee2f35f1ebbadbf38c93e8f9f9917b79406"; + sha512 = "6ff4d7d353c4c4273a59d09d1c642bee5245c79e62c9e6a5818785f0c22d02ed03613e93353d59793e214bee1fe34de73271a1ec84d9f74853fd821582bd8ca5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bg/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bg/firefox-57.0b13.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "7b52a3bf5a2be9f4de6f609ca11a7f7e9c219a9cb84d503e892e1b51868dfa10e650f6d75aeddbd0edf8fa54b48aa3d3c4852e0e4615efdac78912709b162591"; + sha512 = "b13a4e6ffbaae528136cfbdbe17f9ad8811cf2fd23d5764d583f63fb3ac2a76fc7ebfd51d8ec649e0f9e33fd618a5108b0cddd32fd25ac98bf83418086b9e364"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bn-BD/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bn-BD/firefox-57.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "84c687130785782f9b900249db6d108e160c36dcc90eb2fc10ea9661cc91b19c8da262189e72b3259f987c05dee4e2e83c870cb2b3e3fc21178a4dbc19598981"; + sha512 = "678021fce64a2725b8968d3090fe10caad1aac6a883a44c1a3fd7e2a5dcea9e9764f36249a299e9348bdaefe2bd9bdcfc3ae2d2bd864c5e66b022c8f61dc8947"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bn-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bn-IN/firefox-57.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "3d269322796c2384ddb03ccb07ebc0fc6ca04409d1fadd6c11a1ee436092139929f414ff9c46883379e9c92441189da386723b8ef7dad5f6599b1b522a3984a9"; + sha512 = "801fefcae2eb5d6959fac142d2ce77c6522b842b63f0a2493652ffe682b4d261a91278cea7777cd4d32575765206a4f7ce81e2fd73afe6466e418c40d99a7400"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/br/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/br/firefox-57.0b13.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "95f77bc8d74e8b6fba6ae6ee59f12cfada50572aae4aba4e3b519290dca20c6ca45111b5b7e58f5fa2a96cba4d35af4ef20dda4b908e607f00ab7c2d7ffe7834"; + sha512 = "dd1e074400bf491b833e7ed1dc97d211371be17ff5ca1b3d8221965b5ed67e79594b94eef3a8a778f4fef679debdb106e5c18db4d75989d4e4e9e6c794f05631"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bs/firefox-57.0b13.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "0f171ae78a2f5c3939827afd61dae0c96fe3e062a77be6e2de172e5e7b3110e953bc282ae353d1629daf9996798db65a163e4d74e6a727a734753708545a2d0c"; + sha512 = "444c9c97b8aaaadfa6b725709c6f49580f22e004f3d9de2c5b50f0f6c60e1496743c12ecce2b0482f3ff56408cbca14753e58b17337db016f7d217a5d62a3940"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ca/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ca/firefox-57.0b13.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "31243cdce440f556b8588b53c29c8a9140b43c9259c6c16c520773b5a5aaee1944a8f29b427d443701924075547d39f8eeb4eb61b683bd467a911cb59d549e91"; + sha512 = "e59c7ff93df39d6e6365e751ed9fb42170bb17f05cf88d8fd96decef6e7bd69fa60d7efda8ae3100e169bc401f3cbc26c94b67137e960f6684c8f219b934acc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cak/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cak/firefox-57.0b13.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c8d4bc2e74ba30cdf18b09911c464b026781933d234ab8421c2b41e19753191ffff7fb73a5b77283d372b2e6496edf818e8f9ad4e06faec184370c7b31c9b3d8"; + sha512 = "d0e0fcbc207ea7cd1d69d80add30bcd6f31e0931129328d17760c6681d12d6442c0c1006121ea8a7199756208868d892250be6405ee4d43ba23750fc9b3d7789"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cs/firefox-57.0b13.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "2b64d4d1e94ad36439fa95ea97915ae920fd4f2c0e749efa7d1367a9298a6e8ef96a177b0c435a96120644f8baddb76492827164add7caca100c80f7d11d3a9d"; + sha512 = "9e7a35fdd318037a638eede7ae11c4c28b63e8c3893ccc38b50d25bcab229002a0f912e50719a358ebe6f30205f61187a3fe4ed3d93f04545542888bda18c279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cy/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cy/firefox-57.0b13.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "70accb1975ffeb4fb3de11171c603e2fc5be7f9873a0d584f906e324d7b64a885efa5ec46739575abf97ede95d40299f1d30f5facf36c3073284d79485a701b9"; + sha512 = "1a1edc73f902139e8696c2c6609c763664f61bc654b33d822b60a31140f7f52afafe3878516d705d90196f72aa38fca57e3a085d5d03651f1a8f344235e2f92f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/da/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/da/firefox-57.0b13.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "54d63d2248d253e70fd5d69f8507878cd35bac533b77378cc700df3be14e90d551f9cdb2c5e5ccef570cc8d0a27a827c45166ab5ee8a50376d03c447583a5583"; + sha512 = "6a5833ecde7edea045ab18325a55ffe19f55d0a18af879caaeeac3b00b7412e2f6b9330959068632f3d87b932f544a993c7d836a69f0ab0be310c07c46851b90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/de/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/de/firefox-57.0b13.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "faedb51772813930a29e639bc11d713e484e79fd220ccb0c72b0071d74eeee238f92a337cb8a00c3ea86f1892baa5211e1dfa7a1d102c2869de1743963c176d6"; + sha512 = "c0e0954430d656565ce99d91c15ba7cc74da840034c4f70fb9ccb38ece341c86c500b27a3d1b57e8f5da4bb6484703dc98c6b8ad3d95972a9316a0c549de9814"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/dsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/dsb/firefox-57.0b13.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9f409b32ff72b5039481cfe88db1245f1ad626b0f1f8a500d16c24e5b8deacf2188d5a436259e0920667059d090700c4db1997bdf875938da26863a3096fdd95"; + sha512 = "e5ddd864a5ff73edbf2152828b036095ef1197595cf5ab751cd8037d3fff11c9e119293d4adb427488c20e0bfa13c064c76d4720c709d4ce31eedd74395e8dd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/el/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/el/firefox-57.0b13.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "069b856c0b4e5b232572bd838ff9fde813c72d14bd731a08ab7acb579f32eed3beb6402ff0669a1789b9e3a486fb76ccae593ac94975828d13350b3a24baa696"; + sha512 = "bde94744268cbceac403a4f166d7cd9d182c18cc8321af72d0197de00737b6f31f7d1a5513d1702d7f29df3d4eb7208d2a5086d6e0bb7a2d9b7fb33088f82f31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-GB/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-GB/firefox-57.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "fcb89801772ec01f7863016d82c0f5aa430b90231c7c46fbbc0185246cacbcebf033227fdb90a2395f3c21012bdcddf1e745c1fe3c857add303ee475c2320f9b"; + sha512 = "48d4fb95963853cee8398c168f51da141ed7e5d18c224d15c35f184669997248078756e6da0f619ed287df034c7d9836f75188c5c8ad17b4af9d1dc022336eff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-US/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-US/firefox-57.0b13.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ee3c3048b6644cbeb32ab784834b7f9c8c900d3a68da5d531fe4d7808876013f0990b2329cee04dbc1ca8b5cf3b4b10c39e19659b09d298961f1706024427a78"; + sha512 = "22555ce1e9f574e5e2e9b1164071ebf2362bdba7c182b6989b8da5e7fb736c7c6444faa44d52d91041d1862c2ad8c0881868e63c424b84d88ef39136e087f87e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-ZA/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-ZA/firefox-57.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "c31db87c3714bf29e19a25e4791e7d60c140598b7c64d3e47a413bb8ac95ecdfb67e97d6c5491b76ee355ed46bd907b736109bc64930629dbed4adb91ab07aed"; + sha512 = "2589efe14b8762492d668def0b4149755ec9ace70f581a1fae669249cfdd44d5bfe60a718fbe300bb92a3ba631ec8b0515357587c8d095013916320f8f1a90b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/eo/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/eo/firefox-57.0b13.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e84d9ecdbd2f03bb0d6673da736c618dc6b5dc7844384f3e1bb73041d8f7d1b85ac5f8b2cdc9c6a316a931ad34830a3a1873b6f0c517c97eee5d6fd1507b8df2"; + sha512 = "1a614091e1638edfcce4d755d4529594bbbc8785ad33af360b9003c76dc64dcd227f71a28e4fcc13b5b2a7afd2858bd9ff6287e7b97b48bee5025ef1de400870"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-AR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-AR/firefox-57.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d3f4b7711f81707a195e00ad532a5383a9d47d86681e882bdbb5d2d1145035b0d901abee5908daa607d3b6df27fb8eabfb163b6c800a4cae15b2211fd18d8209"; + sha512 = "508812c53be4877f130dbcf0aa712c6410774370b54571210f3c52e1d92fa0477d43f2f24aa95198059c318e91ba7a8fcbfe476cad03a8256eb37eb88ca9f460"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-CL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-CL/firefox-57.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c2d32c0666c7aeb41006720d7d10e55fb8f4f3e0e053ef43f8ef06c2644b79d51a47417cb4d84a7028cdb83d4d74bfee982dcce9e7399ab292f00665f31c7c18"; + sha512 = "bd7c5493a92fb7d6ee5680895ab24bede3f8dbdbe176166599fa918a981d11fbd124f4fab4b2bcd5f88df5c1cdac48c85a2fcde0fb87ea361ca2baed2db9270c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-ES/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-ES/firefox-57.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "b3a0e567aaf8defed6cceef8832bc188a4cc47599be7a02b6a63cdea2fabfa5380433b75d48d62d9f4fe8818160239455e7374e6a3958d4853208e4cc7b16e07"; + sha512 = "cde05cd2e4127258cfa26c76c018f2dcf8214a75a8c4cfac5b4dfabb51ffc43f21828e9a89fcd326cda5cd0c6fbd09649259b81212e13e4d15e32d0c1b87c267"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-MX/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-MX/firefox-57.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a073552f46c031259bc4f3b05af5a9692ec4b4266d993468900ab912bea88ae0767a2c1e4ec16ccfb33293081f83aae7ce71dc0472efe6340ea62ec65513ea18"; + sha512 = "75b8750f830a6353587a9eb555bb2e207b9d7e37894b6b2334be1dd27025d69adefdbd7ae1bff6c7fed823acf2684352e1bfeaae8a5ce5f0721838a82067a6be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/et/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/et/firefox-57.0b13.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b24a6b6a3246685d41a303c56ccbefc4596e6a09a9690f8fb0e522c3d25e3fd2fd087bc99647d4e3035057fd4245e00eee9abf639f06612dc4b7928c4092fad0"; + sha512 = "f33bc9d8e107eb70ab039257540e9a3f96826e597771ad86ec416773a1755b1e5551f8a14664e8507e29eb08d0e3abc8e1eb9e00c4320ba82b32c9b7eae7a68d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/eu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/eu/firefox-57.0b13.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "36cd0b76748edac4a2af813fe1ae06de166501eb765521cd1abf4b05bc55b0460b74e09a45d7e39910b1cf6dc6750848e64e288f27a23466dcb76ed4107da637"; + sha512 = "94c844674a045f2ef4d2dab12b070e49f6a79e4d86856b29965962df420b4dd57db5f21dab66b7a54317dc908c9b29c9bb3ab74a0b4b8eaf806e2fc2bc45a821"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fa/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fa/firefox-57.0b13.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "66108dc33aa1eaa305ccec598c6539795b06fad7ffc29f5da3576f770f8669345d3856f589bd6fce6eff3c446713b69913d1914946c0fa74d1c9f9dc3322964e"; + sha512 = "487d78630469eaa93bfc24b1b3a9d027b57b62c74904d9440e3cb173a86182e17758f98013b3089a173da0f671e2a44f334c61835f1e6f143d3d83704e36f3b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ff/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ff/firefox-57.0b13.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "8c8c3cc9224bc4b1aaeba0037c09185ac8e7ca6702e73df125d4103c3bd4e8ed95509c922d81afb25c8704bac08003b44d637d00962c000a56a5370539b780be"; + sha512 = "b6465926764e311aca0a74f6d6fb19396f0475bba5d2c43dd3af124e7d6dd1b0c018fd541d2c4f5916d8bf03db6a93344b558fcc392adf222893716bef95275d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fi/firefox-57.0b13.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "74642dfdb24453ff4e25ca74abc772ad30bb6072cd81c1e597df1b689b59e64bcf8fb36fcb366be6b3eb5378c5d682460ebd27ffd9ee069f5649a2657138c2cf"; + sha512 = "76f0748b9337bbd7232b0d1a056378f4149b1539bec8c43cc99b14d8036c8b737d71467b8d46fe51a4dbe0cc1fe3a061d749fe3937ad5df045da374ee72d4581"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fr/firefox-57.0b13.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "e0e555d2e7f31a49124a2e5cdb28dca04ac1d67400ba897df52716dc705f478e0ba6928ec8cadf5e82431c754a1559fa838649f0cc5cab15994d75d86d64a12d"; + sha512 = "84ae5e6b2d6a89bfe20646064f97ecab399cc916ba1c9a17a4787c6e01cffe159fcd563a595f0362c20132dd4dcb143334145a05c7cd6e065678b73f6b5c0017"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fy-NL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fy-NL/firefox-57.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c6a508bb5fc7e8350a0200da8aa189805d2af1c98bf623327404811205dfbae9365a3e4acb167d5867b48f2c28b9d1ec98edb6e7b9204d31fd0364b763e249e7"; + sha512 = "e1e8a0d6f1e96b7e4f6e8c315b04130c36717f9cf5a47d3fff06dd1b69ab424674161862296b93fa294a980afe75cdf04ec115e06272cb67cfd74809747a2bb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ga-IE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ga-IE/firefox-57.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "76235f086a5159d51579d772f223b694660a7c64b3701165f2f11317ab35969a3dbc8f77ced8cbd97cb0219545e10f5165e8786de0fba2a4ff0eaa87a1ee9253"; + sha512 = "3cfa2704c00b21d15445489735753014a481ad5b8eaef25a2c6ca35122aab9313b5cc9885d685c3ff206ed895e14dfdb7518ae5476e86bb35e6b81f06e54aad6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gd/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gd/firefox-57.0b13.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "1f0cb2ee88a34caa16865cf9e86744eb5a71c7133bc6735293bcbb5f4ef9aca7f9a3b4f8d1ec353728c3a7332c2804278ea58dcfd02a12328e5b3937e3761f39"; + sha512 = "b7e4e20f35ffe7275f8009194bd8325c3c8f6c02e185e7a337c85d03232909a44f1d4a41b598d466f560339c0e64cc3babeea2ec2efee0ffed015a791fbe265f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gl/firefox-57.0b13.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "3980aa2a37547a8e8c3d4f083cec9f69539ae0388dc342847b09b789f35ba7fc9cb83c5bd3e94eef1d56a7788dbafa0d9fd6aef305043d9a83b24598ddb750d7"; + sha512 = "9759d271de728720319dcd30507525a1693d00e6f443a5921eb221da1f0e2c122fe1da36c881b0e4032cd5ef074438da5933e8c10b42370f114dbe572204589e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gn/firefox-57.0b13.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "1859234d55f1e5a11be57e4fda90608c40842025b37cd047f5c924071006dadb3933752ce72fd7287c941caf707b14f66159af5a48e34677c017fdce6f1e9a78"; + sha512 = "9d4ee42485ef63e7747538362a4b5baabb4ecfa706b4c8b0c3fd440c48a6d15c4f8a1cf5e2b8ec71672dc529b50c7a6645986a867491e4f14e0cda127db5bc13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gu-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gu-IN/firefox-57.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e8da8d37f6a86522592084e267bb0ab3a2b26159aae08af59369091aed28b071bd3c1413ed80c3c3be4a41ed91ce3ca38a4aa4a4bddbfe924649aa382027bd32"; + sha512 = "45c21939311dc0414716ab272fe72c063b8adad201f2dc7893347a66c5e9abe7f1b215a4d75bd3ed3801b823679fb27f5cfb5fb6691785126ae516f237133ac8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/he/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/he/firefox-57.0b13.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6165ba93179ebc019ccaecda1ebe7b68bddacb583ccb417bbc50346ca5fd68f8d882c3723361f8334cf9159567c01adb620ea8dcbf01b7ed03da7d5efedba198"; + sha512 = "f17386cf6652a794303dfb24dc439031630239a9e7b82afcab0bd49bc3e018c4ee4f499f3c1557c68d38f74c37b8775a49fc72318a08fdfc2ee8f593426540a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hi-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hi-IN/firefox-57.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "230bf538f7498e9536d3057a6321f41d54b366f1d0debf79360a6ea6fdeeda97895ffd5e4c77c2874c97b5a642e6c5a3d2193270417198a0cb383ea349e01a62"; + sha512 = "c7311b1a5d69439b93fc0865394895e3d1776fd940d21838d4681659dd2aa222cf1aa041821f5f385cdf904de13e8ee16e000a582495f9eac91c0542317eec1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hr/firefox-57.0b13.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "617c8e4cd572f896b3c0094e74482e8fee5e0e924cc18f06f16e87f217b712de7665c38069be59f22d1b269951157634e11def128e0c5164a119bd23981ba9bd"; + sha512 = "70eff0fd9ec9c9c70ddc4afd3b95e427a945b35dad26dc29b166d784efacf9960738cbb0c62c700cfdcb48b38824d34ce46eef1ce0f55fdf63932beb1a69b04e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hsb/firefox-57.0b13.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "da7f1f00ed6b741129dac9a82b5116652e2d0f406d9ea535ece8907e1aea60c9393195882bf59557041c14ebb604456bbdd5514800d7b6a66700558bd256ff6b"; + sha512 = "973817d6011a72c676b14f9f5b333ae53fd38af8a06c5434eff0debd88f3beea8d209331870620dc3457cf0bb0f24462d2f9fadb302416e0e9ce84928ddc4d23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hu/firefox-57.0b13.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d6b2f966aec0e7c529d86916bebdd06a21850f32a436837c9efc4da5bd18ddbfc937697f758796b8e68ff79281b35186620e29bc93dbc885d6f9b135d028519c"; + sha512 = "836aec8829d07baced10aea1b461a4b503bd3887541c6e030cd802ee1a04d6533f7f899c268077a3f79e8ada8fe2606780c506a24f0388e3292e6935afc04048"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hy-AM/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hy-AM/firefox-57.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "cc9df9dab12511549daeb011c50c20c563eff9df7ff3ad0b351fa6362cdc35817f9b5c1c204c1e484a82022d6eb4dbb196c78b43a1429a8bcd92bb22e9c757d0"; + sha512 = "9a411df379d0f900fcabe91515409934da6d51092a4a44df7f7e003f1761504b399e353fc93f69022b91d72c44198d35ad9d7e2cf9be30c549503043bcee9b12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/id/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/id/firefox-57.0b13.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1d3027f632f4a7d74adb54da6c15d51af85a6713dbf91c3a01272cee6a4692c4fd130eb66757230ab7e9dd9da7dbeff7c889bb98681fc6cb193b1094d69f31ba"; + sha512 = "e91a619f10a6b9948bef49a5c21545f3881430d8f6c7b5f0eae112c9b8716519a88c635c37cd89586d8ff4669e31f4b549b4eed6cebf5a13a48df9ccd37e3988"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/is/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/is/firefox-57.0b13.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "45ca6f394b47890157680d7d0ee58b8ed75de1623491e38b0d31b79fc2940e7fef00cc2a5e7ab7ee7931261c6575122cd7ace209f94a4574e189b1acc0814755"; + sha512 = "aacbee57162998c21c870d541bd453130292211a19aec1d2b3ed0695f143eafff132cd4700f9a381e405e46ee1ec5865017c447771fee7bcd9c0c8586601c1ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/it/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/it/firefox-57.0b13.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "38b002021a2f68dcecbaa745944fec1af41b440615a04eb8ecac30923dba0514db70f505670db35d22fef794f682de03d16fb2e03888cb4e045e3d997ecddbf4"; + sha512 = "4388a33307067545cbc6c292a5aee825a53d7e38aba4847c347aa4ba3f30df2b2ac15430fd4a28a7fb490efc7c6a6d555d58d61fe753e0f8368d80a2a8034f25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ja/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ja/firefox-57.0b13.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "201681b0e830834add6bc3dffe883388fb9ca8e1d5995405224057ac3a2dd044f74c800c48c42bb1f77f493bcbc92c0e10a751b3d5871309455efac26e4c4ef0"; + sha512 = "f37f851f573e9ae734ad819f5ba22ff97a9081c10f63950ebc52cfd97202b295e035129fb7f4afcccbfface1de188f1ec8dee7bee14bb3f0f779f9cbc00667df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ka/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ka/firefox-57.0b13.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9298bdf3fac725ec59d4d358be141696c4bcb2079e4689da191ef2b52569cffdeee7e6f3454922b784d3ab02a0339eeab4969140457cd4b6e2533c72c740bd71"; + sha512 = "f06b7589ad1e2d96273be1470032d29816295ee48f05f9da685e210e0ecf35187dfde82cd5a6596ee0a0ecc8143c169eb2e7423c4f9026e3b06851b6ced6e3c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kab/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kab/firefox-57.0b13.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "65ed8e7902b0a0342f03f95fa0a51fafa5f902b3ba870e3d1fd783b366a0af257a47588981290cd9a0ec369f43aa3e72021122ab9fd8cd46c4eaa69ab726b194"; + sha512 = "c4ca6d1a50378309bff211138924f7b3ce22705592186c14d5b17501f2c49f04a29b4edb23746efcbc2947e0de0db88d0349c85e5a3b7e993649eace1975965b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kk/firefox-57.0b13.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "fb3dff8ae89e8b59a74474eddc21dfe5f5e69e7f087731f93d775c092895b38f69b39f66a7298a8b3417ab87bc01b144a5fbe6ea3f7385b395c3a82e2e5df026"; + sha512 = "78379ec69c88d1ec8c03feae66d4f4ea3b48de0c324084f8f68a331bba16cef5a66f388d5c0fad4cdeb3ec9b1ade21dcd67e4b5fb026319718daaa8a151d1e5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/km/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/km/firefox-57.0b13.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3dcd608f361056ae87882d5a28171af8ce24a16184952f0f5abe148cc341e056fa2b9abd583b835026992e60f316952b9d61b9b7920b5e65b50e3b9905517e60"; + sha512 = "ebcd7d6259f83f7ac9528e1eaabe7f75600ea96c49ab0f55c77688949096d7503973a262761ec0828f233654d0aa2271f338a756335f27b73a6174aee05e6f9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kn/firefox-57.0b13.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7215efc6c893389fc0137b5bf21a9a7b215fdda0fc556d1f1a1f84169797a4495aff29bb9777978699134aa59653c4e53d57e06ab785c07acb293c37d4cd7962"; + sha512 = "dc9f84b8d3efb12710c1a245bdf26c54f421fb6b993ed4219f28bbece45c37aa5c118206cc9c4e2e2805a667d90b7993462e57778c0eaf8193c71dd3111285be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ko/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ko/firefox-57.0b13.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "144eddbbc7fd3d3cf213cf411ac94707e2fb50cc10e981df169fbedc4c971084fc0e153ffbbc9242184f906bb4d0a412d1447e7b5e5d7136bf10633bf825bbff"; + sha512 = "377b555ea022b2a963fc2fa9bd44002485f575710925aa5d7056b2c343e476f599060e50e708322c535a8dda3cb50255519a833c031e2aecb5d4fb1f1c3ae65b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lij/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lij/firefox-57.0b13.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "7a90a94c35a0e1f00e3e55d34227cfa614469017355285cf053fae404807523b3e1a3146d8710b46de7c1296f9cee08bfe0eb0de9a215895ce3bfa99c06dbba5"; + sha512 = "56985bc727c6c7baafab85cfbc8e3fd83f4770a446aa2e6a894983948af99a36f522898bc35a17c1e91edad7eb3a80eb736a9bc75a0cfbc1cda49f617d649edd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lt/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lt/firefox-57.0b13.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "71d61ebc3961011dfe60e5915176d3c361f9809b1953afdad5eca2a3e9b543958eb7bd64ad3f2d64c788ec2478d32fd3da5a172afa4790b06cec7996c4a2c5b8"; + sha512 = "fb3644bf073c9c418ea3db482780d6a409e7761e31cb82641d6021dc90ae81f3f955cdfc3f773e4293a29dfc43e93db3d0feff8124f1dcee23a80e3006cb48ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lv/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lv/firefox-57.0b13.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "66af0c13de2bc1c24c2635106bcc482b53f872e937ed9e6ecfbbad3b6b59a0c12d05f18cfa7136d96ffe3991faad3649a45acb8a8e9d92e8ef6e3f0392d3d151"; + sha512 = "5a273bc8d85095663c6d66915e31c2cec48274db8445a3127b5fe23e1a6b59e0cf398a0631b23d7e8e29c2bdb40ea4b1f98d2d09c34f1f609e2b35f106263785"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mai/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mai/firefox-57.0b13.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "fddbd82c7de07c143c4cbb5005a88f595e38c0b6261adb534d8b0fed42233974e09d394a65359155652cf8be5ecf5a47af588f4e8f65ce649efecaca6394be72"; + sha512 = "13503b7879ae1c10e151ae85ef0f657dca6bced41bdca7b2ddaf3445c56e712c2b5c084f5490d41c5459ec9c5167c62ed517ca9083dd86cb3523d00a84ced8d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mk/firefox-57.0b13.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "10f027a08ce2fee653503dcac38f7d9afd9f888d1f904e63252dd1514dca8c471bf071f4ffaff37a9bad50c59eb833b8e5490a840593db3def2ca362cafc85ff"; + sha512 = "8071102677b25f92dddfe1b5ad16aadd9bccf4a794b9df4655f75777d7d55fdb0c1a5e4ab292c222e61302f1cefc15b649ac17fe58680708bea2223e0c5f0a66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ml/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ml/firefox-57.0b13.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "09f79b235b65c0ecde67f6207459660dad444c28c336e8a6df3cf958fc3eed4bb35f18adcfa61d48298a9c43076577d0edc49963a6b00fc221f69f30f5c69245"; + sha512 = "962cabdb6a3baa3fe6e25885eb27c5f119c37ca27fe75547a704b3409375d7dc61fdc4a1e4e12f0f0e6405f7be08dd628fd53eccf8431645c549bdac6ff6e6cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mr/firefox-57.0b13.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "86e1c01e504cde26a044fc2a288e3419785e93d46a6cf9deb2c49cb18e87149a486cf9bc06129c83f1387b7d7c62018930fdac77d4fce98da4fe5b5c78d061c0"; + sha512 = "0758144703046081bf3bf600de84c7a71275d73c3b6f9f27e2797937250b8ad288f41081fbf6f0c31e4d0bd61e1a8c449b546839e2a1da0ecda4097e7de6482b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ms/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ms/firefox-57.0b13.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "24a7cc19585c510737ccca398f31ac3181df6601f8400187861791a564b13154b825b78427229a9ec97c7441be38f36d4d15510d1b6720b7a29d9e71b7eecf1a"; + sha512 = "015433073ad4703c7636eed2e41645d1505b9ead82a8ea5c6e1e639e28db87d0f5afb1aab0e7bb852b2c5b5be7182bfa6bf7bf62a2cfd29d4948b1243d29ff2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/my/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/my/firefox-57.0b13.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "1c3a160af7c960cbd2fe31407acbb93a1e31702460572315dd6c45f6dd6c2efdf419789c638551055e01bd8ed9652a8b4cb76c96b0f509348eeaf7fc548b9b68"; + sha512 = "603b30c61668fdcb0ee54e0881fe4bddd6a6787062060d28fb0a5b632e178b8396c868c637bb08e0e1b03e51d53e878407505f484d864175e357c9aac790dd9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nb-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nb-NO/firefox-57.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "74ed8467b0678c9478c24c15fddcf22b839e0256f5e0f15379d5df8eaea59e928a42637517f6b4ef77b2136bacac8ef1477fc0b97390c20c7c09418ee9ec06b1"; + sha512 = "6c761e7827f210386ccbf210246e2a68a200ed98c3c14b18a9a4b9ceb99383cf59ec2873c0c5fd749a8ccb71575691fbfd0ecff62f9a044b3e4d2c272232a15f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nl/firefox-57.0b13.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "30cb204b285d9f8ee321fada6fd7eb2b490ff8fc1735ed61631e1136648c78a58b06d7e0487543e8f7e99f77d03fba43667a7ca9b9d7e2860b21c1d2f6baaf71"; + sha512 = "2847d4ceb5c572c090eb030a3c5ccc03a2a43f43002f4e308695905f7ed164bef73d1342800b7c0d0932d5b84246d68c8d5ef1b84b09690558d5b2b7453312cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nn-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nn-NO/firefox-57.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "870f52b1388b881a306f13b2ce7483ec1b07e603c5b1e9b5ecdd55263015e3b892d4343b3683e514bf58fd567466ce6d2b7da34a105ca805cb72455a17f0a48d"; + sha512 = "892eca2b59ae33326c1699afc273c0726b4fc26cea9adf7787310833bb50fac07bb2af18fbdf283f29ea1ac737e654a86bd844e97a0df408c7eb77c931ac4d85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/or/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/or/firefox-57.0b13.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "6441180343f8ae93b2544981bbfae7b29abfd47d59a8688e3da4f257da5c8cc95d225762c1633442908a4e3a0ebb29159491ef8cf583433913dbefdb39630273"; + sha512 = "0c4e996d5d73b1b13ca6fef1ae79a7f4c180cca8c6b5d1666c7172f80767624f5f64f70c2b5597ca22496e161379b37fbfbd20cc94998488eb6ebdbc1c2a9b5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pa-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pa-IN/firefox-57.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e9cc4097cb504ae0de523318afa8a5cd9fa7a1cb3348641cfe0538e039a4dc681d53bdb3976116f171018804c641450f3645af1d0d4502b3358bf4a3beb259d0"; + sha512 = "eb30dba1b3ee43ff2e6e86bb896b36e775ad6a803062aaa5c3ec68e3d579a0ce2ead6527b0dc1a5b4233f3be707c03af03063ef3495019eea04e331df544dae0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pl/firefox-57.0b13.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "5a5003b3e04cffe5d76a9badf8f0a8c15c2d00b26be6486b871129c9111b4b53e7aa9cb2b83cf88de9c2928e17c09e548b89bc140889da7134f3195a91983f89"; + sha512 = "d951353704501d27d6fb93da04ecdf8d06a2a6664167976fe018f39f82cf70ec7e59554043e7b4fb7a4b423331bac829f07a9f4d05c3dbe7d66eba3db09284a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pt-BR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pt-BR/firefox-57.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "9478a60bf2d3e2ec7a67a1e49c786664767ddbcb284775ad08750b0bb39a049183ba8e3feb04ec19d6e6aea6666cf280e2d90a7648c15bda1e05f5bc22f8da82"; + sha512 = "5e8cfd1c70bc72c58c7a7a06d30d9bb701c0c574de4bfffbffd96ac6009c712c0f8b14227c77dd109d16587f906b01c94f18c7d55f08a479cacb4bc479859db7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pt-PT/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pt-PT/firefox-57.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b9703a29b083beb649654e526d0438a388fac253b6d0093c366742504652f88d68993f2641cb62e5c90972b9c7dcfa7d6a2e28ea32bb52d5a6ffceea34d650fd"; + sha512 = "1035994860329ab318146f1faade952abfc48a50c828efdf73b3a103e7ef331acc82aad1a589b591384f33de1e3f0976eb62b61accb2507069e4055fd7bd5441"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/rm/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/rm/firefox-57.0b13.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "13ea09d2b80c421852b84ec8a2a7513ac5b9d51c0920ebb282a47087e384d15d8b7e7cb01638b4857fc26ac6ac54509f368f85d7b1ec3cd70f0b3e21fea6ebbd"; + sha512 = "3430038ecd626b4056cb95815ca36ab1d9385e4783259cf973dd1ed7fcce12a3c0e1a18555a579d94f1021d1073089c3d9be40ccd003e00057c498e98ce7bcbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ro/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ro/firefox-57.0b13.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "af210682a5380c324b542244cb74f1a0b39b659d93ad166b01026f55995fd281124cd8a2f5b3bceef85f2f5545972a0199ff9460a7f881fb807842596057f17a"; + sha512 = "488907bf47fdc4a02e2fdcf11c0c4517aacae0421eac41ca75b573c5401ea729e9dbbdce4a176dfca871ab919ca1a07a1db9e61a82f0516902fc80f6a070b9b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ru/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ru/firefox-57.0b13.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ba01c0e7a5595fb8dc7a3534640dc87c1baf45e70d45a490605d4f81b897f7633d322be060a575dd75cb89a7e319efbfe15461e7b43893c1956de536d4c05288"; + sha512 = "4bf91ef098ced14a89efefb99a8162a328c583ad0e2276ff3539b9ace7540bf7fadbf057acd9cf604b3fed0359bc208186cc42d8801304bc9dde85c4a12f38af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/si/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/si/firefox-57.0b13.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "42f647309456efa6195cf045c7ba2dae3bcd824884b2a645d6372ea8eb8cd9678076bfd555795acc463bcac550973b317a12500f8fd494ed7ea007c540c2d085"; + sha512 = "e214d7fd32c669f0a5367aad50ea9ea9c0f642c4af862251c52f1f1c95cb17a895edaecc2f69b6899ce95cd023480978936007ff26493cba9971624af422a5fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sk/firefox-57.0b13.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "ef08e41d68cd1496efbbdae6575e3c0529440b1b2d80b421aef1dd7abd2b383b31fc5091d6949f52d5b9146505d14033779188154705ed2882c1243e893713f5"; + sha512 = "17206bb3d59a74ec7acf2ea205e2d02db7257484257c8cf63341b99b7cbf9434968d3c16df7ba96438c44e970e53498883ac2744dfecb7993c21fc34dc4d9f2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sl/firefox-57.0b13.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "0e4aa9a51305c5f03e1e2ab953e600d922493e851d18c83927303b78cb178e0e0759e314fe6889fc7216f4af9dd82afc0288ceaeaaccf562ccc949be05525b86"; + sha512 = "d04a0b97ad4f3385e48e7a248d280ac5c46a1d63261ab2a4b3e6b7769d82c70bf523acbb040bc3d341669f6b51a724970fe8e358ccb3e88c9656182dff0d3317"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/son/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/son/firefox-57.0b13.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "3fcd85bcd3e85bf0114678a86776b8e7fb8bf0828b27f6e321af17f3b79f0235ee7269e36f7d3262c60f92946866084596d5dbf475cd15c459be3b7b014ccea4"; + sha512 = "ae95b4d44e9a0287d6696745edd2d9e6b03eeb7bdaf1959334ec4dd28a84154ec075ab25bdd319f92f2173f8d806f95b875d2050ceda125acf8e98e81e6ba47c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sq/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sq/firefox-57.0b13.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "a5b6c3c7918839aedbf87e3eda194dff5bf7e0c3f107b3c71763e731448eccd7aa1671ba43df45bbfa5e29e07d243f5309b1e18858c4dd21278093f37f722804"; + sha512 = "713dd79c91fc01940c9b102ebbf83d5a9ffb62e77c42d971eeeddc9dcff1b2947268bab5c99285de5826fe3a5ffd55d9ccbd62c809bcbf2a266f019e35451cb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sr/firefox-57.0b13.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "9cf631abedc27fb87bbc1fd3c65e748ebdc77169d4529d7cf6bc67266cae322635e1c2d7bdbc42b59c572af2105f5f0604b7eed899eedaec9c251ebfbf0c7507"; + sha512 = "c7ba73cc0df99cb28f5f5bc6a8dd237a3c9d5b67d7c63444ff8b63ed34f0e0e390d233a3f886999d5531ceb9be5b2272b3b282008499c5f09278c9a9043636a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sv-SE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sv-SE/firefox-57.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "71cb182020a6152af64ce709cf391ee70c18669081599101c34b69ef81bd3eca62024938d6c3fa121289a7e5588b2253ec536b35e7d5ed7d94190e247893b1f3"; + sha512 = "58663250980e784ed5481a31c09b4ee9002004d4026d6743f89c739beceb9a135c587a61a391dd3cb68d53ac34427d0ff00cfb8b6a235eb29d6da4d026ea3504"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ta/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ta/firefox-57.0b13.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "f6298909d8fdd4335d891de594c7f27fe0f181f90c4493c32fdbaa7f8d5ae5190de328b5e8904f99b413b244d14d956d887ab33c19355942d810d56d0700c604"; + sha512 = "89fc06a036be7359494eb098def2a7118e0e46449ad7545b148a4194fca4ee446aed7172567a7bc746a202e48aa67a5fd18321f93920c761851a103402dbb008"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/te/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/te/firefox-57.0b13.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "b24f0feacf4a484e6413ada972b1570a76c78f87dbb829f085dadf3a922d87d31d1a50c092bb45508a67267eedf3caca09d0efe10d9c329d2e46671730a30c5b"; + sha512 = "1c74315d96536cb03e842823e70246bf9597489ea0586db6c474a5a905031e034034a62ea549b202dfd5464684a52d3364d1423f34a5e720b6449981fc8bbe53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/th/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/th/firefox-57.0b13.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "d063097273e2f4345baf63d9502b3485bae78664d855e0ae1f33ebcbc18d49f4f5af0537bb141796cdc2c3fa35d90a6937303f4a4f54f6277f88456c3779017b"; + sha512 = "4f23ed4c12757f6d472c358af4dcf1366992a8c391bbeaf1f86f735ad2fc1638d516b76b22b118179062ba260154048c179b88bc3178488cfa20be4bcadcafc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/tr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/tr/firefox-57.0b13.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "c44e4b90c37484ee2050f219c5ea1f37d42ca9a3f683d8aed95cf94c412138c795011960af06d1b51ac7a44fb99f373ed28f0dfb9a8f81edc7e2675defdeca80"; + sha512 = "3b45d8d29d6f7f8a08e4fac95ee28b12d482fcd2812ba357252d85bc2bf49dbf640190b3174fdc0e63b9b5d95e87ab3086efb1b1fb717323e971080e0bc5b570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/uk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/uk/firefox-57.0b13.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a1fbc8ed8441138e6e70e925598f1a620218d6102386b67f84b32e87b8203fb229a20ab6ac631018a196451be9db93e1cf303e2a4aea9b9c065545b6aafe9083"; + sha512 = "a17831cff53566f313f691ae35f6b7032cd7c11b5501b4e84b70b64323d0dd9988ff422d8b7bbf67436af8c8ec631f9c68e7338c8c6d3d470094034a5766f3ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ur/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ur/firefox-57.0b13.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "7500eed932e4f892ab0e96e9e43fb0301616204859eea955c7700b7b804f87bd1cdb8ea490330b989c3e191d3d837a777830d02daacb4486cd38b565d4579282"; + sha512 = "e0eeb311d9cb0789cd17979057c1f4baa2065dcfa30f33058b2a866b239bb44690263ac408cdcbff8d4f7fce312bcd51dab60b84479917f2c615689ed0e1714d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/uz/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/uz/firefox-57.0b13.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2de4ced396b54c9a683dfac862eea893800980bc61d21dcc5a5aba727936f8d7c0c72941068a1e088061fc4a78b8437b10e97f4e41478048fbd702db64a1461a"; + sha512 = "3d6399921209541e003e8fd83e3eebb39d30682090b0f306fbbae6705cacc7fd1db50426f00084bc1c6b239b57da5587479ffda6bf0b848cf4c458f821936a9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/vi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/vi/firefox-57.0b13.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f3fb64b828d8319354630afb4e8239830d471edc4b76e074d8ad30d0802d0d0529abc265183c2b60223fadfedc8189715065d980d15489afa7c297c7ab5c7863"; + sha512 = "3a3d751644d605c92f973b680b4a093fdb8c476aa4eb4473e9350a03128668cfd9c96dc5a1f49dda2647342704e02326ecdda5c02e0b4bd80d73d03d4d5642de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/xh/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/xh/firefox-57.0b13.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "447b17edec8fb04b8460b9ce2b5a00aca48ef162288944746bb9a3fe52c1365a01ac51f13d853c27b5071c7d92db7beb6dc73a12dfcafbf9bd1f65a0d3b41214"; + sha512 = "8aca9406db4ec188f0c123a298f4bc89d8b5adf6a1471202dcac40e2abd7fb16c807458a52c2a5e9e31703a67dc792153d7c745219da9ab2c7144bb3f853a7c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/zh-CN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/zh-CN/firefox-57.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "918d2ce4543eefe6c304e51988b1af5e6de3fadbf04585ae45d5344555620619327b858755201f5b300e2e11b7696ccc6d2fff81f965b2f58615426585b128f0"; + sha512 = "ff87569273037e5de47a5c1ff61fc31933f8a4a9147ce8f54b8c9e16413e3546f7ffacf4ef8127363082ae173d4234783e54a7ece55a8afec1a51a57527d4e43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/zh-TW/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/zh-TW/firefox-57.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a2fff5569721bbe2455b320f057595c2c26986d26654be00a90f4ce269124a6c7328664287e73472df8fc13c44fd5e42614e992904dd86cb6caa3b0d05145ca0"; + sha512 = "063d9e0f85a04655f41e3e8cf9c875d6ec19d936c9c9aa04eb151dbd3de34493f7bfac557ae5f4f4dcb42037aad787e7e98ee42bf7fdf89c7833a21e5f827404"; } ]; } From bddb71a1383d306261d3df00eae9f04baf04554c Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Wed, 1 Nov 2017 22:43:38 +0100 Subject: [PATCH 2158/2806] audacious: drop unneeded libmcs input --- pkgs/applications/audio/audacious/default.nix | 4 ++-- pkgs/applications/audio/audacious/qt-5.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 6d4b18e29b0..8242d035e5b 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 -, libmowgli, libmcs, dbus_glib, libxml2, xorg, gnome3, alsaLib +, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis , libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gettext glib gtk3 libmowgli libmcs dbus_glib libxml2 + gettext glib gtk3 libmowgli dbus_glib libxml2 xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 libpulseaudio fluidsynth libmad libogg libvorbis libcdio082 libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index da143c7d946..803b0115fbd 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -3,7 +3,7 @@ gettext, pkgconfig, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, - libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug, + libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, wavpack @@ -39,7 +39,7 @@ mkDerivation { # Plugin dependencies alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb - libcdio082 libcue libjack2 libmad libmcs libmms libmodplug libmowgli + libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack ]; From 29798e84a6fae4f60006c7e3dbe65eec2f79795d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 1 Nov 2017 16:20:46 -0500 Subject: [PATCH 2159/2806] ark: fix wrapProgram invocation --- pkgs/applications/kde/ark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 013e2e63f59..fb631414838 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -27,7 +27,7 @@ mkDerivation { lib.makeBinPath ([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar); in '' - wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}" + wrapProgram "$out/bin/ark" --prefix PATH : "${PATH}" ''; meta = { license = with lib.licenses; From bfd57788b64c3c43f3b7e5974bff927cfa54e383 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 1 Nov 2017 23:01:37 +0100 Subject: [PATCH 2160/2806] tzdata; 2016j -> 2017c Notable recent changes: - Northern Cyprus resumed EU rules starting 2017-10-29. - Namibia will switch from +01 with DST to +02 all year, affecting UT offsets starting 2018-04-01. - Sudan will switch from +03 to +02 on 2017-11-01. - Tonga will not observe DST on 2017-11-05. - Turks & Caicos will switch from -04 all year to -05 with US DST, affecting UT offset starting 2018-11-04. --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 843055a2c45..ef2bae8dbaf 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "tzdata-${version}"; - version = "2016j"; + version = "2017c"; srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm"; + sha256 = "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr"; + sha256 = "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41"; }) ]; From 1c42c2f4181beb0f980e506ed20d23d81f92479d Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 1 Nov 2017 21:24:09 +0000 Subject: [PATCH 2161/2806] alembic: fix build --- pkgs/development/libraries/alembic/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 4ab09f5bb1d..bd540cdd500 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec buildInputs = [ unzip cmake openexr hdf5 ]; - sourceRoot = "${name}-src"; - enableParallelBuilding = true; buildPhase = '' From e2e8d5905552f7db44e6bd22516a56d46ffc97f3 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Wed, 1 Nov 2017 22:48:05 +0100 Subject: [PATCH 2162/2806] libmcs: 0.7.2 -> deprecated --- pkgs/development/libraries/libmcs/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/libmcs/default.nix diff --git a/pkgs/development/libraries/libmcs/default.nix b/pkgs/development/libraries/libmcs/default.nix deleted file mode 100644 index a457adfed80..00000000000 --- a/pkgs/development/libraries/libmcs/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libmowgli }: - -stdenv.mkDerivation rec { - name = "libmcs-0.7.2"; - - src = fetchurl { - url = "http://distfiles.atheme.org/${name}.tbz2"; - sha256 = "1knmgxrg2kxdlin8qyf6351943ldg8myllwf860af58x1wncxc74"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libmowgli ]; - - meta = { - description = "A library and set of userland tools which abstract the storage of configuration settings away from userland applications"; - homepage = http://www.atheme.org/projects/mcs.shtml; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa4488b9317..8fd266caa5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9384,8 +9384,6 @@ with pkgs; libmatroska = callPackage ../development/libraries/libmatroska { }; - libmcs = callPackage ../development/libraries/libmcs { }; - libmd = callPackage ../development/libraries/libmd { }; libmemcached = callPackage ../development/libraries/libmemcached { }; From e4913c2d303cb58cc8d31abf0854d3b332fa62de Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Nov 2017 23:58:54 +0100 Subject: [PATCH 2163/2806] masterpdfeditor: fix platform (amd64 only) --- pkgs/applications/misc/masterpdfeditor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 2d2fd2c7bed..764d400820d 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -47,7 +47,7 @@ description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; - platforms = platforms.linux; + platforms = with platforms; [ "x86_64-linux" ]; maintainers = with maintainers; [ cmcdragonkai flokli ]; }; } From e71dc0c2fcedbe47065bfd16d1b437336c30ef01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:47:42 -0200 Subject: [PATCH 2164/2806] liblxqt: 0.11.1 -> 0.12.0 --- pkgs/desktops/lxqt/base/liblxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix index 9363dba8669..bb5a9be6d84 100644 --- a/pkgs/desktops/lxqt/base/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liblxqt"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5"; + sha256 = "1852vfbkbpw49i8ad682jhqmnskmc9a90qwpalipgak7m64azg3j"; }; nativeBuildInputs = [ From 70fb53f657170b256e87b82fa4eab9c176629911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:50:28 -0200 Subject: [PATCH 2165/2806] libqtxdg: 2.0.0 -> 3.1.0 --- pkgs/desktops/lxqt/base/libqtxdg/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix index 47d3fb2e91c..966566db7c8 100644 --- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix @@ -2,24 +2,28 @@ stdenv.mkDerivation rec { name = "libqtxdg-${version}"; - version = "2.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "lxde"; repo = "libqtxdg"; rev = version; - sha256 = "1s5jw4q6gcivk7mc95ir9q2nry4yyhfwy039ddf5ymh79nynv8vy"; + sha256 = "03kdrx5sgrl93yband87n30i0k2mv6dknwdw2adz45j5z9rhd3z6"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ qt5.qtbase qt5.qtsvg ]; + preConfigure = '' + cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + ''; + meta = with stdenv.lib; { description = "Qt implementation of freedesktop.org xdg specs"; homepage = https://github.com/lxde/libqtxdg; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 05de6f3dd2ae4f4f699899a478ab696e75b23e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:51:28 -0200 Subject: [PATCH 2166/2806] libsysstat: 0.3.3 -> 0.4.0 --- pkgs/desktops/lxqt/base/libsysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix index 2776a53fa83..b5013f5ac1a 100644 --- a/pkgs/desktops/lxqt/base/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libsysstat-${version}"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxde"; repo = "libsysstat"; rev = version; - sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31"; + sha256 = "0yl20dj553z1ijkfxl9n45qvkzxyl9rqw12vb4v6zj3ch6hzbzsx"; }; nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; From 6e37bd54ce6acf9535208da4c2ebed12ef9dde73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:52:41 -0200 Subject: [PATCH 2167/2806] lxqt-build-tools: 0.3.2 -> 0.4.0 --- pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix index f8db33bc5a4..8d369f46433 100644 --- a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }: stdenv.mkDerivation rec { name = "lxqt-build-tools-${version}"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxde"; repo = "lxqt-build-tools"; rev = version; - sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv"; + sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1"; }; - nativeBuildInputs = [ cmake qt5.qtbase ]; + nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ]; + + preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"''; meta = with stdenv.lib; { description = "Various packaging tools and scripts for LXQt applications"; From 0054183cc6b857ea08865162bbcfeecca29e9dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:53:34 -0200 Subject: [PATCH 2168/2806] libfm-qt: 0.11.1 -> 0.12.0 --- pkgs/desktops/lxqt/core/libfm-qt/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix index 78c0a926b9c..612fbeafe19 100644 --- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - xorg, libfm, menu-cache, + pcre, libexif, xorg, libfm, menu-cache, qtx11extras, qttools }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libfm-qt"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v"; + sha256 = "0932yl098pc5rwgy9irrc3ys47jx64m3wm702dvs8yy15alv6x4i"; }; nativeBuildInputs = [ @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + pcre + libexif + xorg.libpthreadstubs + xorg.libxcb + xorg.libXdmcp qtx11extras qttools libfm From fb997f817fb2f514d3c9570b065b8bf6518bac75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:54:09 -0200 Subject: [PATCH 2169/2806] lxqt-about: 0.11.1 -> 0.12.0 --- pkgs/desktops/lxqt/core/lxqt-about/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix index ac81391af1d..645d634a26f 100644 --- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-about"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk"; + sha256 = "13knjxbnq0mh9jgkllarf6rjxkvj2c93l0srnlrqp3939gcpwxh3"; }; nativeBuildInputs = [ @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; - meta = with stdenv.lib; { description = "Dialogue window providing information about LXQt and the system it's running on"; homepage = https://github.com/lxde/lxqt-about; From 7f3576f2ddbf3be599e94643f253f8159d330970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:54:39 -0200 Subject: [PATCH 2170/2806] lxqt-admin: 0.11.1 -> 0.12.0 --- pkgs/desktops/lxqt/core/lxqt-admin/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix index 23b142f352f..54731b22686 100644 --- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-admin"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr"; + sha256 = "0dg3gm5m19dc4jarh8xcn0mcnpgxzz7nhy5dzm8chddaa6pdm7vi"; }; nativeBuildInputs = [ @@ -29,8 +29,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; - meta = with stdenv.lib; { description = "LXQt system administration tool"; homepage = https://github.com/lxde/lxqt-admin; From e54f761cd99051424f90b103ccd4c54010f614bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:54:59 -0200 Subject: [PATCH 2171/2806] lxqt-config: 0.11.1 -> 0.12.0 --- .../lxqt/core/lxqt-config/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix index 20e785ec5fd..191fe0796e8 100644 --- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-config"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx"; + sha256 = "1ccxkdfhgf40jxiy0132yr9b28skvs9yr8j75w663hnqi6ccn377"; }; nativeBuildInputs = [ @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; meta = with stdenv.lib; { description = "Tools to configure LXQt and the underlying operating system"; @@ -46,12 +49,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ romildo ]; }; - patches = [ - # Fixes a FTBFS with CMake v3.8 - (fetchpatch { - url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch; - sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf"; - }) - ]; - } From 2f0a5d14e5d7aa237e386fae8fe1c5c2b6817119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:55:19 -0200 Subject: [PATCH 2172/2806] lxqt-globalkeys: 0.11.1 -> 0.12.0 --- .../lxqt/core/lxqt-globalkeys/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix index 73248da1ef8..9e74eee5ec1 100644 --- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-globalkeys"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h"; + sha256 = "14icyik9x47wi3gfkmkyhag26a2ivyc42f4f8qwdgbr3dcg10b9a"; }; nativeBuildInputs = [ @@ -29,7 +29,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + for dir in autostart xdg; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + ''; meta = with stdenv.lib; { description = "Daemon used to register global keyboard shortcuts"; From 902ec14a9b08e65635b332969c54ad178bd690c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:55:55 -0200 Subject: [PATCH 2173/2806] lxqt-l10n: 0.11.2 -> 0.12.0 --- pkgs/desktops/lxqt/core/lxqt-l10n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix index b836b9776e6..10b767aedac 100644 --- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lxqt-l10n-${version}"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lxde"; repo = "lxqt-l10n"; rev = version; - sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h"; + sha256 = "025zg5y9f286p74rab4yxyz4cqlh4hqjq43xxpi76ma2fy2s03a4"; }; nativeBuildInputs = [ From 95ace38efdf6426c48e9038847f5ec95c463c95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:56:20 -0200 Subject: [PATCH 2174/2806] lxqt-notificationd: 0.11.1 -> 0.12.0 --- .../lxqt/core/lxqt-notificationd/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix index 8aea9a6458b..061a8522a6f 100644 --- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, qtx11extras }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-notificationd"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc"; + sha256 = "0pmpdqgnb2dfxw5lirh89j8hnrwwcn2zc64byg4zi0xdvq6qms43"; }; nativeBuildInputs = [ @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { lxqt-build-tools ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + buildInputs = [ qtbase qttools @@ -24,7 +29,6 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg - lxqt-common qtx11extras ]; From 530f8e820b5beeedd21003b96aed531e1dffa8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:56:40 -0200 Subject: [PATCH 2175/2806] lxqt-openssh-askpass: 0.11.1 -> 0.12.0 --- pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix index a52ce02cd14..bcc00a0add5 100644 --- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-openssh-askpass"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9"; + sha256 = "16xcw4yll6i9vij16kdb10s4aq2s57x4yjlwv6d8r75y5gq9iiw6"; }; nativeBuildInputs = [ From 9a907dcd6b7f9c97f652bf30f7ce3cdfbb2b861e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:57:11 -0200 Subject: [PATCH 2176/2806] lxqt-panel: 0.11.1 -> 0.12.0 --- .../desktops/lxqt/core/lxqt-panel/default.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index d2faf9c0eee..1a357f1d0fe 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -1,22 +1,22 @@ { - stdenv, fetchFromGitHub, fetchurl, standardPatch, + stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, - kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, + kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data + lxmenu-data, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-panel"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y"; + sha256 = "01xmnb17jpydyfvxwaa6kymzdasnyd94z62gjah8y4pzsmykcr4x"; }; nativeBuildInputs = [ @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { kguiaddons liblxqt libqtxdg - lxqt-common lxqt-globalkeys libsysstat xorg.libpthreadstubs @@ -47,18 +46,19 @@ stdenv.mkDerivation rec { alsaLib menu-cache lxmenu-data - ]; - - patches = [ - (fetchurl { - url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch; - sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr"; - }) + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + for dir in autostart menu; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + substituteInPlace panel/CMakeLists.txt \ + --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" + ''; meta = with stdenv.lib; { description = "The LXQt desktop panel"; From 644938aee91e0683bcc12eec4a98848b63cfd790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:57:37 -0200 Subject: [PATCH 2177/2806] lxqt-policykit: 0.11.1 -> 0.12.0 --- pkgs/desktops/lxqt/core/lxqt-policykit/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix index bdcc0a4d606..fca6a9ff1f6 100644 --- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt, - libqtxdg, + libqtxdg, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-policykit"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p"; + sha256 = "1hxz5bxxi118g255aqb3da767va0wd25y671lk2w9r1641j8zf2d"; }; nativeBuildInputs = [ @@ -31,10 +31,16 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + meta = with stdenv.lib; { description = "The LXQt PolicyKit agent"; homepage = https://github.com/lxde/lxqt-policykit; From f50e270076fd2cdd9f07d343408e499b223fe5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:57:57 -0200 Subject: [PATCH 2178/2806] lxqt-powermanagement: 0.11.1 -> 0.12.0 --- .../lxqt/core/lxqt-powermanagement/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix index d3793a9d928..e5012abed6a 100644 --- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-powermanagement"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79"; + sha256 = "1fxklxmvjaykdpf0nj6cpgwx4yf52087g25k1zdak9n0l9n7hm8d"; }; nativeBuildInputs = [ @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + meta = with stdenv.lib; { description = "Power management module for LXQt"; homepage = https://github.com/lxde/lxqt-powermanagement; From 2312b0ef475fddb91e09defc8a51b2c871513ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:58:19 -0200 Subject: [PATCH 2179/2806] lxqt-qtplugin: 0.11.1 -> 0.12.0 --- .../lxqt/core/lxqt-qtplugin/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix index d5b8987bbb8..c5fae1e9ecb 100644 --- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix @@ -1,19 +1,19 @@ { - stdenv, fetchFromGitHub, standardPatch, + stdenv, fetchFromGitHub, cmake, lxqt-build-tools, - qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, + qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-qtplugin"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02"; + sha256 = "1i1rga0pg764ccwhq7acdsckxpl1apxwj4lv4gygxxmpkrg62zkv"; }; nativeBuildInputs = [ @@ -28,11 +28,13 @@ stdenv.mkDerivation rec { qtsvg libdbusmenu libqtxdg + libfm-qt ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - - postPatch = standardPatch; + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" + ''; meta = with stdenv.lib; { description = "LXQt Qt platform integration plugin"; From 1288876ab09a9b1ac90554cdc866ec64b69c5595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:58:43 -0200 Subject: [PATCH 2180/2806] lxqt-runner: 0.11.1 -> 0.12.0 --- pkgs/desktops/lxqt/core/lxqt-runner/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix index 8e2332dad5c..0c1f08b34d7 100644 --- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, qtx11extras, -menu-cache, muparser }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras, +menu-cache, muparser, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-runner"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954"; + sha256 = "1354vdaskhch1n8v3kdy15nszgqb1092csr84nbhymzgrhrq1093"; }; nativeBuildInputs = [ @@ -27,14 +27,19 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg - lxqt-common lxqt-globalkeys menu-cache muparser + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + meta = with stdenv.lib; { description = "Tool used to launch programs quickly by typing their names"; homepage = https://github.com/lxde/lxqt-runner; From 9b07f61e8d1b379f9a0f6f94b5d7732440abd7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:59:05 -0200 Subject: [PATCH 2181/2806] lxqt-session: 0.11.1 -> 0.12.0 --- pkgs/desktops/lxqt/core/lxqt-session/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix index ba0bb69ce92..d3733950ed0 100644 --- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-session"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv"; + sha256 = "03gi9svxqsfjhk5ifbaalq9i44ggx8afwms1hb312czqn82wrszb"; }; nativeBuildInputs = [ @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg - lxqt-common xorg.libpthreadstubs xorg.libXdmcp xdg-user-dirs @@ -34,6 +33,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + for dir in autostart config; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + ''; + meta = with stdenv.lib; { description = "An alternative session manager ported from the original razor-session"; homepage = https://github.com/lxde/lxqt-session; From f451d92e6e15f0cfe8929bdd0205da38b88c664b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Nov 2017 23:59:37 -0200 Subject: [PATCH 2182/2806] lxqt-sudo: 0.11.1 -> 0.12.0 --- pkgs/desktops/lxqt/core/lxqt-sudo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix index 1e235af3c90..8700a768abd 100644 --- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-sudo"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk"; + sha256 = "0ql436yb51qwbnj5gbzvqi4rqx4zkmja5rdjs6yavb1x8ggn1jv6"; }; nativeBuildInputs = [ From 9258056a10c5f1942b6298d4f19a1229c6f4a5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:00:22 -0200 Subject: [PATCH 2183/2806] pavucontrol-qt: 0.2.0 -> 0.3.0 --- pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix index b8421d06202..918894d2208 100644 --- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pavucontrol-qt"; - version = "0.2.0"; + version = "0.3.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0k7sg4dxr48nk15gpqlnkjr9gbh7r5gs0s0ydifcmw281khrzlzj"; + sha256 = "1pfqdzsbygvq77npsizydps25d9g6vgw177yqvmz3cg3a68dad27"; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { qt5.qttools qt5.qtx11extras libpulseaudio + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; From 6ccc34c2ad78dfb022784c244a5cac567dda7d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:00:50 -0200 Subject: [PATCH 2184/2806] pcmanfm-qt: 0.11.3 -> 0.12.0 --- pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix index 7c115c2ca27..d9e2a651c3a 100644 --- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pcmanfm-qt"; - version = "0.11.3"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "04vhfhjmz1a4rhkpb6y35hwg565047rp53rcxf4pdn0i9f6zhr4f"; + sha256 = "050h5w1wph35l5m69qbxzvc96y7y0bg1m7flqdadrp688pbnzcxb"; }; nativeBuildInputs = [ @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + for dir in autostart config; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + ''; + meta = with stdenv.lib; { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = https://github.com/lxde/pcmanfm-qt; From 3eeed44419f3ed0e423b4b667be691f1bf64e8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:01:22 -0200 Subject: [PATCH 2185/2806] qtermwidget: 0.7.1 -> 0.8.0 --- pkgs/desktops/lxqt/core/qtermwidget/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix index 66620e195ec..f882088d07b 100644 --- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qtermwidget"; - version = "0.7.1"; + version = "0.8.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz"; + sha256 = "14yjz6b1l2yd7sfsxjv26yg5153fpyq23443kswkgkd9jh32gxj4"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; - buildInputs = [ qt5.qtbase ]; + buildInputs = [ qt5.qtbase qt5.qttools]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; meta = with stdenv.lib; { description = "A terminal emulator widget for Qt 5"; From 6556e696ffe47f7399688ca8efd83d19bf76b505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:01:57 -0200 Subject: [PATCH 2186/2806] compton-conf: 0.2.1 -> 0.3.0 --- pkgs/desktops/lxqt/optional/compton-conf/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix index 6e1ea128853..253f8112f5b 100644 --- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "compton-conf"; - version = "0.2.1"; + version = "0.3.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1hmirhsz010h6a6k7my1krh5nw5ds4x00c5fq6apamrdd8d4zrmq"; + sha256 = "1p1y7g5psczx1dgh6gd1h5iga8rylvczkwlfirzrh0rfl45dajgb"; }; nativeBuildInputs = [ @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + preConfigure = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ + ''; + meta = with stdenv.lib; { description = "GUI configuration tool for compton X composite manager"; homepage = https://github.com/lxde/compton-conf; From db19d1b4000e222f509534a4286490c98e2e23ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:02:29 -0200 Subject: [PATCH 2187/2806] lximage-qt: 0.5.1 -> 0.6.0 --- pkgs/desktops/lxqt/optional/lximage-qt/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix index 3308f0e412b..80921cac891 100644 --- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix @@ -3,16 +3,15 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lximage-qt"; - version = "0.5.1"; + version = "0.6.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0hyiarjjxjwvzinlfnfxbqx40dhgydd3ccv3xqwvj7yni1nfx7pb"; + sha256 = "0zmrpfgmlq005zikyvhqbpip6mz6pfcf9aqjpncyc5vlggmh28ym"; }; - nativeBuildInputs = [ cmake pkgconfig From 4efa48edf0f03518095fa917823034d583074510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:02:50 -0200 Subject: [PATCH 2188/2806] obconf-qt: 0.11.1 -> 0.12.0 --- pkgs/desktops/lxqt/optional/obconf-qt/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix index 36490b726e0..e3cb02e8b8a 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "obconf-qt"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1w94g8jk2j9qrkwg3i6qwgai2sj1m657bbk2zlk9bc3qvzmwxwrc"; + sha256 = "1vwza1516z7f18s5vfnhzsiyxs6afb1hgr3yqkr7qhplmq5wjma5"; }; nativeBuildInputs = [ @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + pcre qt5.qtbase qt5.qttools qt5.qtx11extras From 08c6d0e18e605d4419f33ad6469c492696806b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:06:09 -0200 Subject: [PATCH 2189/2806] qlipper: use src attribute instead of srcs --- pkgs/desktops/lxqt/optional/qlipper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix index 376b8fb0190..04b0cd3e6ac 100644 --- a/pkgs/desktops/lxqt/optional/qlipper/default.nix +++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "qlipper"; version = "5.0.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "pvanek"; repo = pname; rev = version; From f20eb21735422db38a2bdad23fe0e22f79e47ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:06:56 -0200 Subject: [PATCH 2190/2806] qps: 1.10.16 -> 1.10.17 --- pkgs/desktops/lxqt/optional/qps/default.nix | 31 ++++----------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/optional/qps/default.nix index d39341eb05d..e27388fa168 100644 --- a/pkgs/desktops/lxqt/optional/qps/default.nix +++ b/pkgs/desktops/lxqt/optional/qps/default.nix @@ -1,39 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, makeDesktopItem }: +{ stdenv, fetchFromGitHub, cmake, qt5 }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qps"; - version = "1.10.16"; + version = "1.10.17"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "QtDesktop"; repo = pname; - rev = "v${version}"; - sha256 = "1s6hvqfv9hv1cl5pfsmghqn1zqhibr4plq3glzgd8s7swwdnsvjj"; - }; - - desktopItem = makeDesktopItem { - name = "qps"; - exec = "qps"; - icon = "qps"; - comment = "Visual process manager - Qt version of ps/top"; - desktopName = "qps"; - genericName = meta.description; - categories = "System;"; + rev = version; + sha256 = "1d5r6w9wsxjdrzq2hllrj2n1d9azy6g05hg0w0s6pikrmn1yl0a3"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qt5.qtbase qt5.qtx11extras ]; - - installPhase = '' - mkdir -p $out/{bin,share/{man/man1,doc,icons}} - cp -a src/qps $out/bin/ - cp -a ../README.md $out/share/doc/ - cp -a ../qps.1 $out/share/man/man1/ - cp -a ../icon/icon.xpm $out/share/icons/qps.xpm - ln -sv "${desktopItem}/share/applications" $out/share/ - ''; + buildInputs = [ qt5.qtbase qt5.qtx11extras qt5.qttools ]; meta = with stdenv.lib; { description = "The Qt process manager"; From 546c7e874a744eba62dc51e6953f40c315a00783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:07:15 -0200 Subject: [PATCH 2191/2806] qterminal: 0.7.1 -> 0.8.0 --- pkgs/desktops/lxqt/optional/qterminal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix index ff59a2d893c..88c4740760f 100644 --- a/pkgs/desktops/lxqt/optional/qterminal/default.nix +++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qterminal"; - version = "0.7.1"; + version = "0.8.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14pfwii8axyswrkwvfmc2i0a07fjnhpyk3hh06qkbj2w3r00xhyb"; + sha256 = "1899a5zc5kx7mxiyrncigqjia1k98qg526qynf4754nr9ifghxdw"; }; nativeBuildInputs = [ From 8d7341e10b602ab12d95176d70c794268edbfe46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:09:14 -0200 Subject: [PATCH 2192/2806] screengrab: small fixes --- pkgs/desktops/lxqt/optional/screengrab/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix index 4bd040c00a8..3c4bebf39fd 100644 --- a/pkgs/desktops/lxqt/optional/screengrab/default.nix +++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "screengrab-${version}"; version = "1.97"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "QtDesktop"; repo = "screengrab"; rev = version; @@ -24,10 +24,6 @@ stdenv.mkDerivation rec { xorg.libXdmcp ]; - cmakeFlags = [ "-DSG_USE_SYSTEM_QXT=ON" "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; - meta = with stdenv.lib; { description = "Crossplatform tool for fast making screenshots"; homepage = https://github.com/lxde/screengrab; From 94e02ae507d7ea8b4fe9a4f2e4376627a5b26856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:12:29 -0200 Subject: [PATCH 2193/2806] lxqt-themes: init at 0.12.0 --- .../lxqt/core/lxqt-themes/default.nix | 34 +++++++++++++++++++ pkgs/desktops/lxqt/default.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/desktops/lxqt/core/lxqt-themes/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix new file mode 100644 index 00000000000..6251667430b --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, lxqt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-themes"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0f7bipkxkl741lpb2cziw9wlqy05514nqqrppsz5g4y8bmzw910n"; + }; + + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" + substituteInPlace themes/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" + ''; + + meta = with stdenv.lib; { + description = "Themes, graphics and icons for LXQt"; + homepage = https://github.com/lxde/lxqt-themes; + license = licenses.lgpl21; + platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 735ba79b405..9aab17d39f8 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -45,6 +45,7 @@ let lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { }; lxqt-session = callPackage ./core/lxqt-session { }; lxqt-sudo = callPackage ./core/lxqt-sudo { }; + lxqt-themes = callPackage ./core/lxqt-themes { }; pavucontrol-qt = callPackage ./core/pavucontrol-qt { }; qtermwidget = callPackage ./core/qtermwidget { }; @@ -95,6 +96,7 @@ let lxqt-qtplugin lxqt-session lxqt-sudo + lxqt-themes pavucontrol-qt ### CORE 2 From b6d27b72716f7ab221242a5cfd7e1179fd24de26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:14:46 -0200 Subject: [PATCH 2194/2806] lxqt: remove lxqt-common --- nixos/modules/services/x11/desktop-managers/lxqt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 89ad2882363..fb907618d35 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -41,7 +41,7 @@ in name = "lxqt"; bgSupport = true; start = '' - exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt + exec ${pkgs.lxqt.lxqt-session}/bin/startlxqt ''; }; From 7059004883f8718dc99171f6e49460083d4cec18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:15:35 -0200 Subject: [PATCH 2195/2806] lxqt: remove lxqt-common --- .../lxqt/core/lxqt-common/default.nix | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 pkgs/desktops/lxqt/core/lxqt-common/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix deleted file mode 100644 index cc114c31dfd..00000000000 --- a/pkgs/desktops/lxqt/core/lxqt-common/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "lxqt-common"; - version = "0.11.2"; - - src = fetchFromGitHub { - owner = "lxde"; - repo = pname; - rev = version; - sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn"; - }; - - nativeBuildInputs = [ - cmake - lxqt.lxqt-build-tools - ]; - - buildInputs = [ - qt5.qtsvg - hicolor_icon_theme - xmessage - ]; - - postPatch = lxqt.standardPatch - + '' - substituteInPlace ./startlxqt.in \ - --replace "cp " "cp --no-preserve=mode " \ - --replace xmessage "${xmessage}"/bin/xmessage - ''; - - meta = with stdenv.lib; { - description = "Common files for LXQt"; - homepage = https://github.com/lxde/lxqt-common; - license = licenses.lgpl21; - platforms = with platforms; unix; - maintainers = with maintainers; [ romildo ]; - }; -} From d7366454c41c810acab657386e43324e66b62b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:16:38 -0200 Subject: [PATCH 2196/2806] lxqt: remove lxqt-common --- pkgs/desktops/lxqt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 9aab17d39f8..35fe60e2f6c 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -34,7 +34,6 @@ let libfm-qt = callPackage ./core/libfm-qt { }; lxqt-about = callPackage ./core/lxqt-about { }; lxqt-admin = callPackage ./core/lxqt-admin { }; - lxqt-common = callPackage ./core/lxqt-common { }; lxqt-config = callPackage ./core/lxqt-config { }; lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { }; lxqt-l10n = callPackage ./core/lxqt-l10n { }; @@ -85,7 +84,6 @@ let libfm-qt lxqt-about lxqt-admin - lxqt-common lxqt-config lxqt-globalkeys lxqt-l10n From d3763a7164e7c8b1b269add0d0ed1e8f316bbdc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 00:20:11 -0200 Subject: [PATCH 2197/2806] lxqt: remove the attribute standardPatch --- pkgs/desktops/lxqt/default.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 35fe60e2f6c..16e864890f1 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -6,24 +6,6 @@ let # For compiling information, see: # - https://github.com/lxde/lxqt/wiki/Building-from-source - standardPatch = '' - for file in $(find . -name CMakeLists.txt); do - substituteInPlace $file \ - --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ - --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \ - --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" \ - --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations - echo ============================ - echo $file - grep --color=always DESTINATION $file || true - grep --color=always share/lxqt/translations $file || true - grep --color=always platform $file || true - done - echo -------------------------------------------------------- - ''; - ### BASE libqtxdg = callPackage ./base/libqtxdg { }; lxqt-build-tools = callPackage ./base/lxqt-build-tools { }; From ef97adf60c3797422f76aafaec3b06eedf4e0c54 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 2 Nov 2017 10:22:51 +0800 Subject: [PATCH 2198/2806] fpm: 1.6.2 -> 1.9.3 --- pkgs/tools/package-management/fpm/Gemfile | 1 - .../tools/package-management/fpm/Gemfile.lock | 33 +++++------ pkgs/tools/package-management/fpm/gemset.nix | 59 ++++++++++--------- pkgs/tools/package-management/fpm/update | 10 ++++ 4 files changed, 55 insertions(+), 48 deletions(-) create mode 100755 pkgs/tools/package-management/fpm/update diff --git a/pkgs/tools/package-management/fpm/Gemfile b/pkgs/tools/package-management/fpm/Gemfile index ea498ca7835..17ed0a0cb2a 100644 --- a/pkgs/tools/package-management/fpm/Gemfile +++ b/pkgs/tools/package-management/fpm/Gemfile @@ -1,4 +1,3 @@ source 'https://rubygems.org' -gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar' gem 'fpm' diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock index 16d7a8250ec..e0c12dcce31 100644 --- a/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -1,22 +1,16 @@ -GIT - remote: git://github.com/peterhoeg/archive-tar-minitar.git - revision: dae32ca550a87dba32597115ae18805db4782ebe - specs: - archive-tar-minitar (0.5.2.1) - GEM remote: https://rubygems.org/ specs: arr-pm (0.0.10) cabin (> 0) - backports (3.6.8) - cabin (0.8.1) - childprocess (0.5.9) + backports (3.10.3) + cabin (0.9.0) + childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) - clamp (1.0.0) - ffi (1.9.14) - fpm (1.6.2) - archive-tar-minitar + clamp (1.0.1) + dotenv (2.2.1) + ffi (1.9.18) + fpm (1.9.3) arr-pm (~> 0.0.10) backports (>= 2.6.2) cabin (>= 0.6.0) @@ -24,29 +18,30 @@ GEM clamp (~> 1.0.0) ffi json (>= 1.7.7, < 2.0) - pleaserun (~> 0.0.24) + pleaserun (~> 0.0.29) ruby-xz + stud insist (1.0.0) io-like (0.3.0) - json (1.8.3) + json (1.8.6) mustache (0.99.8) - pleaserun (0.0.24) + pleaserun (0.0.30) cabin (> 0) clamp + dotenv insist mustache (= 0.99.8) stud ruby-xz (0.2.3) ffi (~> 1.9) io-like (~> 0.3) - stud (0.0.22) + stud (0.0.23) PLATFORMS ruby DEPENDENCIES - archive-tar-minitar (>= 0.5.2.1)! fpm BUNDLED WITH - 1.14.3 + 1.14.6 diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix index 4243651dd25..26450bc3612 100644 --- a/pkgs/tools/package-management/fpm/gemset.nix +++ b/pkgs/tools/package-management/fpm/gemset.nix @@ -1,15 +1,6 @@ { - archive-tar-minitar = { - source = { - fetchSubmodules = false; - rev = "dae32ca550a87dba32597115ae18805db4782ebe"; - sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd"; - type = "git"; - url = "git://github.com/peterhoeg/archive-tar-minitar.git"; - }; - version = "0.5.2.1"; - }; arr-pm = { + dependencies = ["cabin"]; source = { remotes = ["https://rubygems.org"]; sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; @@ -20,50 +11,60 @@ backports = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k"; + sha256 = "1agsk23kfr194s690jnrpijh9pf3hq4a9yy66j1wzzj2x19ss9y0"; type = "gem"; }; - version = "3.6.8"; + version = "3.10.3"; }; cabin = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06b5ri2629ad9xjc419xswz17zli90v8x640k2sd6v2yb90zkr1b"; + sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici"; type = "gem"; }; - version = "0.8.1"; + version = "0.9.0"; }; childprocess = { + dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1is253wm9k2s325nfryjnzdqv9flq8bm4y2076mhdrncxamrh7r2"; + sha256 = "081hxbgrqjxha0jz0p0wkncdqawdvlsxb3awsx195g0pgkpqrcms"; type = "gem"; }; - version = "0.5.9"; + version = "0.8.0"; }; clamp = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0vy6ghz9l84qazlza30z0dwwrlifc5c7akgrl1v72ivmmjga45hw"; + sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; + }; + dotenv = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv"; + type = "gem"; + }; + version = "2.2.1"; }; ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nkcrmxqr0vb1y4rwliclwlj2ajsi4ddpdx2gvzjy0xbkk5iqzfp"; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; }; - version = "1.9.14"; + version = "1.9.18"; }; fpm = { + dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ids20mcs6w8nf4bpjj749ayc7h637kqx0pdw5d5a0yzik34daaj"; + sha256 = "0yvp9cifzfrxv3pr1kvcvvnyrcz8vxf6yd43hg5blaick50sbm23"; type = "gem"; }; - version = "1.6.2"; + version = "1.9.3"; }; insist = { source = { @@ -84,10 +85,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.6"; }; mustache = { source = { @@ -98,14 +99,16 @@ version = "0.99.8"; }; pleaserun = { + dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s26216ip6skzbdl48z8wbrzqbvwq1q4s6sm8r209zvvlp0rinkw"; + sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p"; type = "gem"; }; - version = "0.0.24"; + version = "0.0.30"; }; ruby-xz = { + dependencies = ["ffi" "io-like"]; source = { remotes = ["https://rubygems.org"]; sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; @@ -116,9 +119,9 @@ stud = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1raavxgn5k4bxap5wqdl7zmfw5k4ndl8aagnajlfg4f0bmm8yni7"; + sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb"; type = "gem"; }; - version = "0.0.22"; + version = "0.0.23"; }; } \ No newline at end of file diff --git a/pkgs/tools/package-management/fpm/update b/pkgs/tools/package-management/fpm/update new file mode 100755 index 00000000000..22d1e52e297 --- /dev/null +++ b/pkgs/tools/package-management/fpm/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -r ~/.gem +fi From cb59cfc5135a63d3f4ea6f01ab55b30105d84470 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 2 Nov 2017 12:00:57 +0800 Subject: [PATCH 2199/2806] firefox-beta-bin: 57.0b11 -> 57.0b13 --- .../browsers/firefox-bin/beta_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index b66d3192fb3..23316dc3aeb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b11"; + version = "57.0b13"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ach/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ach/firefox-57.0b13.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "298e523e55916ea7c6fb31ad383aaa6eeb582440aca98519d6abc3e44201b60f3e382be7947dd434b47e13f7e2d2c88b62009bbb4298a7085d0512307d37b4ea"; + sha512 = "051daa6d23e8d9559135f89a871372ae69ebb46c143265f72d85a55c5edbdc927fd2be25869815cce3ecb4bc5a4245f6bd3cfec2317e727c632437f377552793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/af/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/af/firefox-57.0b13.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "00e31d736101e3cd5c8f1b999f9b4342369bce56c061271e952022459e80ea8b77ca356cdf28ff0255bf09984caa059ee0e62a2dc0f2cb31f1156224e7eaa4ff"; + sha512 = "b9b936333fc86f3ebf34dfc05d5277a6a2552b427fa26a1e29c9fed93fbcd76c533c3543b3356ac61da808eb5154d83d40888c19a37003dce88c4da64fdec7f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/an/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/an/firefox-57.0b13.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7dec20660dbd4bf0a88742b58f4282d10b8f8778aa8b8b2b7847485039fe266b2ae4dcdc76ff1a37a516d2f0c16a2db2c2fbbab1e79d6eb8a79c63561da2539c"; + sha512 = "ed028a38d5360890f57617f8e0d9e02c578f7e786e78de8f2b8a3b96d0915d3369dc398da71d387761f56f6371d3047c63f0d39131e7dc7cdaa9cd6c8dd22abc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ar/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ar/firefox-57.0b13.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "05e8c1271f5e3f297e927bd08ef3308d57067d18116b98010c3cb2025e7b0a9ca608d046cd592a4afa3949b9a3244127a44ad90e89ce4b651397e95f5bd4a29e"; + sha512 = "ede95e488ee234430c3694a14c75ab116a29b91d9a1ec4b0676f687ce5a175122758815dbec69e2aaab0ab8ac91181fd4e0fdac545dddc0b1e3b4e7c81ccb648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/as/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/as/firefox-57.0b13.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "fc2986315e7514e51be8ab082be42be9b7f7f878c0c1d7cbdf36f3d7b5dccf59a39ea44329c3aa9afdd7118a29706308118c89937dfdd3d8f6109f8722c5646d"; + sha512 = "9e27132b8b1d0665cc88951ff24b316142bede88677dfbf6bd43ab147db8dd2b7ec44e830d152a2af48805e2a2de1b8858f4ceb0e8ff96d65c7cb769c0463d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ast/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ast/firefox-57.0b13.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "8dc4d3aa8935b61f90b21a059a97a6ffbaa90f13aeeb204b7eb28dd0ea33b899934ab162b7ba8ea00cd3c341d0f61de30ae2b3af052cd420246a891a2d902563"; + sha512 = "4e458e8dc02a226e40314bbce9771330a378536c7176e5f2e9ccfd0f0998d61ce33b234228226156abcd87aac88c01c740ccd7b0590863f6f1da44bea3b43af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/az/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/az/firefox-57.0b13.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9fb126c09f39b6c943fcc30636b19e3b566cb5fd78b1ce68ae78b1c94d68198bfd391bdab6474ce7d616ddb114b5ff7bf54caabed94e2e3dc4557c95832e1c8f"; + sha512 = "90a283a92da98ebc422f78deb01793888f9df97bdbb17f5e0f9045ac5f61eb2e4ae9ae706026f043535c2399fa476509af9d358093a92cdc344883e40bc4ed03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/be/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/be/firefox-57.0b13.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ba5250a70bf92c555f87fe2376c6c415678e5d065ae7c0fdcfe613a53119173a7231f5c711dc1451cb6fdd77a94c5077c98019f0441f0f0ecb97ec16aed8bffc"; + sha512 = "b16136b9d37ab3a563b9c90be7520430a89c204bab6d9e616939ce88f4d56c395a7670911361f746b9ac62e802e4b791b60ea1e77335c56fe80a0bd27c00fb14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bg/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bg/firefox-57.0b13.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "aa38dca42bb1ed7472e10db04e4346918c7d495c24d484a9182c8b1651d1ae2f68188d12f133581a6b1a7463f559320283ab0877b2c51a1b93edb195706a1ed0"; + sha512 = "7ad46009c3101e05b0285862f61067e68c50a202c4889efd138438721487ad21ae68228b9fa82162730fe41be297206831d5b4f8587c3243397427192f4351ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bn-BD/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bn-BD/firefox-57.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "11ba74486259041c06dc0c806c6b21332fbddfc525eaadd9a6eb37b1a8498bf25bd34b42155f642c8daa840040dbaeebb0721b541239656df4fe518d1cba3aab"; + sha512 = "24650ce5b04485512f7af58b0c0428f9aa442d28d614a2dfc2e427e33b35e442d0310ce3212a0750bbc0e5ab79aab848218c140edc49b7be456fc2f7f33b01a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bn-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bn-IN/firefox-57.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "25ae74c773a9d525497c9d0c7d3e14cafe490fc8dbcd363f7daa102bbddafe06c4999f84847545da5c8dd974528613a5c6e1468b323f60eb0e3ba79e360b88a2"; + sha512 = "9c48ad3e4081edf3c1b973f161fb9741f2f37a125ba5e63599698100c26f529c727fcb828696ac3b1f54fa299502cb4c537f15be6c696eaf51452c1cd0eac61f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/br/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/br/firefox-57.0b13.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "4f3dc389261f384238fc622d5ab1059cca0a5a4eb02daad0233bac7addd118bfc2c4c95a5bf5b7cf66053b049bc3150358593eafeb5026be47d676db212aeece"; + sha512 = "022d5dc1a4e4906375ca2b425d86636ba6cb91b5bc60459938e9e77341c886c4aa7285f4b52e7be221149519bd3bf72d1b4540a7c62cc347e2beac9de3d6c953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bs/firefox-57.0b13.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "91b13a19dacd457db11f78955bad518c2e590433ee1951e2951566f6609293da7195940de7daf97004021ae5229e887bc3c52832be21ae514c6a4afff3a365ef"; + sha512 = "9e4e388f43404eb98e68349ae95bf40631fbf33670d4a9200f60d9ab25f8dc2501d4fe1aaf6f95d9ade80d790b1ba53b78ead54f2cac45d7a2c2d85e505a1455"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ca/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ca/firefox-57.0b13.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "037eb9153e9f05a0c9cb2d80f39ae08ad8d425f349753ae2113e6a98a96950c6ddf3784fe2859383a5ed8a7450de02e6c2d344e20b851923c91576ad0d2de9b2"; + sha512 = "3c7e6f9c11ddf88900af2eccf8a22524f6cf74e5ac27464f8b4ad19849ac30220bc6eac03d79e22c349eba9e170ec379071b258d6bc80e9178dd1ddfe0aec965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cak/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cak/firefox-57.0b13.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "990d5f8637d4386e698cfa070118ef1e39d77065a54ff8293460caecf319707402e1f043c3ae9a46a7a58e2ddeabc312708cde361709835453a22d7826a46d1c"; + sha512 = "e5f9e7bf7145f2b33a0c59de6c576f82bb857ebe85335f218cd03ba005816c3e8e8fff03d5b6534885d796ea523696423c70035e62bb6a32bae4e4b7c1d79c71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cs/firefox-57.0b13.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "50422d5a16c205e10c1657eacad657403836ebeb5c1de656e12c4ad7b65776f0377faf55c6ea5b586be8f8694ee5952c289257d119aa3fae1860d5565f89643f"; + sha512 = "7e527e7bd04cd6107ec92d27f0705ebcf8da8117c84e61e13c2026dadd2ac3a888c9e3bb86f51026f19b10d06365bb41d48bc4fcbb08d09a88b3bb01e9637967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cy/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cy/firefox-57.0b13.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a78d86f637729089f5cf86778032c8093f07b03974a32444b1866f25a286b7e903630f3e836ef12a4c9df6025037885b0140a39680ffa6e6473f023fa3153155"; + sha512 = "287df6655c9793da325681baa13fc4c0b9a5975f0b13be38d8875838a762b2f435839ef5893c6b6a3439c225994fc64060f69edf349d2a9d4fd2d225e95fd1c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/da/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/da/firefox-57.0b13.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "50eaa3e29c322af80df70c3a52df53698c984187b8f8db86cf922fb38d61bea65dda2ecb6d6889a2f1a07c5f8b0d6026590d37c71df74068df0403f91998a584"; + sha512 = "8d03dae91a9cfe20091a2222eeb0bd41f3b3541c5ef6520a17a32187974daf8584e1d69017cfb99d2d18224ffb287f586bdf1ed678981a6b6a3d16ba9ba4a2e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/de/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/de/firefox-57.0b13.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "213227706f35dca646f3938044387aa42097d131cb6a2f361ec5d114f2c78b37b2298d9de3b289cd504c6559f37758324cdd7e59e5535caf3f8b8c8d71e701f4"; + sha512 = "ef084c0d0efcb77cdef1ffc0cb994ae6c6a9484c36282c7d9914b2d3e8599c8f2e9623cfef1e890a7d4c4feb6fba1c091937877ae8ea1d654a9bc824b5c8bf12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/dsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/dsb/firefox-57.0b13.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "67406fe340fdd8107a36755bc75b05560540421cb1000b47d89a6492c38c0904dda5ba17686ec01e1f77a0f8b6a52878042a9f0d999766847eed54fcea0ee470"; + sha512 = "e08b193db4230efae96862a6a9b62200c42b03667c3d5a905938375391d99eca37716cbea561341ae76547be0b5ee94475f9ca9faec64fc178be92236a4ac91b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/el/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/el/firefox-57.0b13.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "60a67bb618aba13377c10e3d798fc370e633070c30d50e7180244667449308ceea4571e7a997c80af80ad027e27074f6b3fc670e5253f6159ed10653f8abd798"; + sha512 = "db49f80f7c08322307dc5cd225d2dc10a3179ce4ce25723264679c1c78454fe1c701ebf218a34704946a1e7d042349d0fedfae5b70b1c68b5100ad7cd4ae4900"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-GB/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-GB/firefox-57.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "4bed5620eb52e080379044e3785a318e131387181748414367b02a5b6dd2a4dcf43b55a794d9add241b5a438a79ecf1cfc15eeeb82d6c188baf18914d722542f"; + sha512 = "b2cc8bc706e89390b500e6e8e3bd548417af1b0500aec7ed1c0ad79245941e20343cbcce80b03a2c885c7134c069e9f3d459739e6ea2a62c217a9f4ddb8851a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-US/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-US/firefox-57.0b13.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "85d751cfc31fbc330292aebc1fe8e7563d726a91242708b85104dde6a8043726e647628ee084b71c3f922eb0d40cbd7e1381a9a1b47aaf641edbd7401f3ec24a"; + sha512 = "621828144f0421ac2a3d5af1cf62a337d23409d26032d4c2518e99b0d04caebe1efc67c50f2b692612facfd5927cb0b51d9acceeecf9fc4c2129e6a899c9ddb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-ZA/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-ZA/firefox-57.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ebf2cc4e016e3623e2cda742d468fb0ebf0b6ff05c90d32e9eb5bad131fbbe12c46e667a21d1f446eca897ee65a8ec7ebd59b56951cf12e5ee44ce89e7bc147e"; + sha512 = "4dc4822fbc6d3027b9ba0b93b126e5223675c69c9e36c22e85681ca02c97fcfb9f9ef7dfa281dabec32b93ef8cb619ccb74ca18a3ebaf55f64c5547f5cb97c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/eo/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/eo/firefox-57.0b13.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e3719652420eb97abe0097aed9736370dd55c572e7745f862d4b031fc84e84611f0c08bf8a2b7fc830a6759ff73183b02269dd7cd1b9eee5076e7d26155c77f3"; + sha512 = "8eafe225337ad597afdb9a90caef3a252f9f467b6d0988f63d92ea35f5d284431c1ad1a29350d9cdd83f5108649d4cf05de50706025f8b2e2db55955bbc8f964"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-AR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-AR/firefox-57.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "4cc08c7b8b242d671ec85dc46761f546479d2e207628d68de4186ac48b619013ba39005ce3b67ea08eee6df8ac46effececc83c8fe5cb2f184d9d56d36f98f41"; + sha512 = "f9837bc84534f1d35aac94c0775fee981b9c7e5031bdd2c78b5609406a73cefa5797282aaf122e2eb772fae7baa0dc0714413c1b6d7255145fef540c31b89183"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-CL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-CL/firefox-57.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "5c6f753e119198ef1633a1a7039199f00c891d43ee5b49b95a4a1e8d5d20ada55ae03ef30e380fa50de4b777d4ad9dd5aa8bde9d0186265a6af9d7c277858ebf"; + sha512 = "e7fd613944dfdeafeee8877b77cb78844b1bfd1d5469dcfdbd90b6a0ea08c98f4fd9423dd18ae1333b90b5717f800a446f8d237de34a8131cf89db602b72a846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-ES/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-ES/firefox-57.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "702ec0d89777a6a9c4a54a9542a0d2e89b352643eb5854db83600a7a93ca41b5d811de21d1de1f33c976b9ce5b19492d2fed12be1f570aa66dd09d21aebdcc5f"; + sha512 = "b571a99b0e11c8b4fc202cc720f2f0850b54978bb98ca9a6fff2cfdb6c853c74ccb8f9b49cb14649cefeca5768ee408e6ab8028bf005be0def9c519ca8d14108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-MX/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-MX/firefox-57.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "2066be080187a297a2156d9953de0b9c38ff4c18e509f56884f596e37ef21e4a832bd0644f4e2df872d22a6fe3925b72b0548187d64e88974cfd50f9f1c18c54"; + sha512 = "fa46b9751f8548ea3724867a2d41cf9aa62a7416fa06ab63a4f59e24c45a5bddb84f982049d1cdb4d0ef3318aef46fb25f494cfc3be203165ba125234c9619ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/et/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/et/firefox-57.0b13.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "0ec67c6a1186fb686f67075dbe1f07b34f2a0f45d3631b7f6b3a144b7d6ac89bc7d34bf98088826cbd908aa05a38a410fbe32135203595e604483f465d4f8af1"; + sha512 = "21b6cb415d45f53f8c5bd63a463be60ed05f55604d55dcfd0587fe023653d4736f1945f1f5d96bd97718b8ef492fb2901fe883ed522db4d9edc805af0c118013"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/eu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/eu/firefox-57.0b13.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "2da25d33b6fff7bb463b65a866ec5bc89a39886e66022dc9b0ce7752d962cf3852158f1ef79bf4df0d7587729e295637b9c27c99840e3f2dc0ebaf6cbdc7a3c0"; + sha512 = "9e341110f6c2d52182faa95f032090b2904d734efb7f4472f87ba77b6604287ebe21c7b1502f71e107e285578cb6c0da6dd95b45fd27bc28a16c14735725d22b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fa/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fa/firefox-57.0b13.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "d3e17c82f7020af45b50215f39d78826a5072dd94be5bf3cdd61ed7f67a45593765efd7f65b071ec3b00be86f90ed65f15bd6a5bc2a4906c2eed9b0cac23ee6c"; + sha512 = "15085dcd3803767b4161fb6b3e55af4c29dfc573ff2ed24dad02eaf001e657e3ec8466e827df472cbb89a442e33641ad422f11b7d663f1944a0f5d2fb94bb305"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ff/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ff/firefox-57.0b13.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2a17680f7a595a35aff6f2a6a25eb9aeb8497ed7ab2cd2cf95e1894ea29cf99fd3c222144e3a0feee660cf0fc31d21c54d572483544267c8bc5312f0b31b9c3f"; + sha512 = "ccb9d489fb9211c9cabe344c65ba165f0aaa4e1217e4c60860c96e7d938532d1602a4c6d885ab5c934c744957a060cdcfa4203c8d93bdefb4f25bf938a4cc1a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fi/firefox-57.0b13.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a54e8c300ff17a0b2f1124b5c637fc2b07f47761b5df71e219a8bb77b21f67542b19ab6051bca5c542cd30bd3517817fb5f44250990d683a997a6f9d925f6b93"; + sha512 = "306668c5cd48f4c0c81e2a160a6703c43ab93d79cec7c9b754425faac9441edd5cddc1bd67d743e577a5c7aa2db39dfb2b5a290e983713c8de780e6596a720d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fr/firefox-57.0b13.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "50a58b205bd0d7ecddeeb4011ac9c499b35b32659f567cf27954561dac91b6bbc2a79e37e19b1fec07aa7459dc114d4cb8641847118fe50efd7d6c98e66a6203"; + sha512 = "099fcd14b1cc7429c7cc4330aa7a397c32acd28006732d272a89c2a6f5c7b1a0a0529734e24fad308c26fdef6418aac2d1b386d7e7dec8ea19a12490cfe53e50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fy-NL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fy-NL/firefox-57.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "22025a263c986be90ab5dc05138c2a8b58108bd39de83fe8266969cc1742358c2cd0730315904a1a35adcab94bd499e8d688d65920c346c28f76b650395838d4"; + sha512 = "688f6d9ccb1a130181e154ed75ffa71069348f82bc20ac649e5aabf69b31a65ba022b3a28d2149a63941bb6287dc8e14946e2f7d9d5ce8f89432c2a32f5095a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ga-IE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ga-IE/firefox-57.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a1fd88907a14be9eda4e392762dcdcb009701baeac908a4cce664c8dce3c6957cc889add929b26fb48e592001c2e6e1f34ced9bbe137b0ceb7d230dbbc102f3f"; + sha512 = "fdebffe1190222cd5b3955e54aa49286166366d910f1b4471ee36372abb7d515b22a48fbf2799abed4943b2a3203c983d0906cac6b5652f507c58778e8d98ff4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gd/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gd/firefox-57.0b13.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "eb8331550bb43251a5d66c5f108568de1fed964a8360cccb9426b6d163f47764d34c79224026c058aefb2a526475c6b406fc1717a588a61c65d73098f217df8b"; + sha512 = "5a957ebc86c7e305afb0e0f9e91f2c73b52b7ed2b65ca8c372cbc0666a86e809494e7deaf5ac4caaedd60400e8a82dd9e3773ec3aee04daebffc7c91a2586b08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gl/firefox-57.0b13.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e7326fbe2c6b9e10a3fae76d27ec0de8856f9aef95a31db1ae5481ea43d895ccb220337b68deaf8a76fd110d6d1f74209dd27e8726ced57a635befb8e27c0e7b"; + sha512 = "024ae0ddc5fe5590ef8ed4153e298b5a05dba17fd5a4d6ec78777969841cbd284908d7c19c36f6290efbc5ce1248c3f24c0cf4418f524166c1407199a6b5de90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gn/firefox-57.0b13.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "cb81a34ee5f87636b5519c9804f65d714c5ea4406a05c465c5ee2bc29381e8235a1788111dacc78066e420f2583f004b3dc4841df9aeef848dc7a48accb3c9c5"; + sha512 = "e6b36e68cb07c4563b350e4af1fe511ddd69ec05fe027809f5561a788b2fcd95c88bc8eb8d67618bb1769f10d11a75898374a433185de49e09554eb948b2aab3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gu-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gu-IN/firefox-57.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e26a80e9aa0e72892d79d0cbbee8473208342d3bd966cb034fbabfa6c3e844490184089ead6dddcd2f655c1577b66da239a24a636a651a8ad7951478e3dced9f"; + sha512 = "c8e3f732c6e91893f07821a2cd9d18e3c5effe7551434cc311455366faa5891afdd25b6d83b5e4c314f3d4f5c01e499c5d4823b332a120bc07c979dae8f171fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/he/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/he/firefox-57.0b13.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "13814b3b670a92013c08dbc8e37169fe758e378db0ac464f9b1d061ef5ba48063a1bc9284686317f4fb5b791a133b773bfda4db2ca25a154da258b81e2ba7bc7"; + sha512 = "a7192f190a83f5d3d1f300a072eea4396397fe02623daf9bfcd6a73ad2b8e89884723d9596f0be2d3da655fd937469f08d65e39037e3b7168edd28c8c23c10d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hi-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hi-IN/firefox-57.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "51f0fd4d50751559e0590340da3f3561f3526792965aa9cd86ba2b83866ac3342b5b4b225da2f2a2724b937c7ea00ea16881f27c8bee3deacebaeabdcc446c3d"; + sha512 = "30a355f58c9419472ede2713101721509a8c86c6c363693c256553cd64800572cf0eb000c8b2bcdfa788ea8876cbf6b7e8a86282ae1726eff4bde93dc8b33a1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hr/firefox-57.0b13.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "fe9febf45bb0b79c131868a16a4139a7e885923eadd8ec07f0aa5262e66c06c5c188d4e6b8b4d6164bb32195f27330abc199b79a8d2a524fe4699f9c02ed66be"; + sha512 = "fff70e068a744e89e28ede72398d60b83decbc908c6776b23d8e532b4630a9526411a62572882a596241a7b6b6550766f3ccf99a5d044d7fc14afa52772ee270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hsb/firefox-57.0b13.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "fbfaa755ed9ea1f86f1f27216fa6925957b3fc48ae847534ad289361722e8c70e28beb83b9b30a447c0acc06703fd2642c652a88ec8ddd215dc3538ea0baa819"; + sha512 = "aec6950ed6cd9b357bdb63e5edbcab7b42e76a72e44ec370380d2b5717db585da8060620eba7290880020b1e6325f134f001163f2ce7719c50b83e6a5a2fbc91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hu/firefox-57.0b13.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b51b7ef5f2b0ed15796abffc299bf633af897393b17d12b2cd6dce5bcd6fb9165c2ee001b44eb89b91e68e616b2265b1fa307d90e68e35c34f425254a0135dab"; + sha512 = "912b23344f96d37bdf66775ad933ac769e19818ccd178a6ad97b815228670c053111dd623fb98de382e2c2d414414fd9fc276f4aee5a00a439dfe235452fb16a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hy-AM/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hy-AM/firefox-57.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b2f781a77542c754185bd4f3aa040eb0d0aabbd773f27a422db87c8cb0cb60d1173c5e32e02886f608e03f2ef8ff84dc8a3cab7d55305fc36d9b11b96ec11485"; + sha512 = "04b2e8ae9de10cdc2aff751c5954f190ec749fea27ab265343b73d762e6e9ef6d96a7136cd9354988ac791ba7bf32661b5658fb490f1d80907505923bd7a70d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/id/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/id/firefox-57.0b13.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "6e251aa02c0ec21272cf8bc4bbccc9e8d3b1d512a0a1bc90ea90e4d3844fd90c03989b102d9129348ced8734a40576b2dd294e8a85422e215b01b025e48180d7"; + sha512 = "834087d98921683d0ae7216b6264c7dd7b77568b59e4739a7464f065328d3efa8256f03e9343177673ef5257db142466e3803936ec30a8f6902999a71c0ad163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/is/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/is/firefox-57.0b13.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "5fe16a677f6413b0229c67b46e7831fadc0a9ef04395ea7c928d1149fc262cb9f28bf3c40b7d57eec09fd821a37286177a19f1a608a062b84ab9d82897560994"; + sha512 = "2a8f3b35f7c1f8adc40504c3460139ae7959ca9657f899fab9e73eaeff5d983996a33d284d058599406d4d46ca941cd9969a7e6152650f6ecf6165329bf2f350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/it/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/it/firefox-57.0b13.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f0ed83b63ea8df081f9110b5e8a5f848e9b4e89ff5ad7ee685f9792fa4438cdceae34b0e1bf265454f966f6a6f9d00bf47d665e6553c3c786bf48f4fbceefe4f"; + sha512 = "6b04fbe6ad821a68d7bb968836d047fa08308a571fef1d5ef82d4719841a7b517362f706f4251d4d60fb084c06af9ebc671a8c131e5a403a21ad9190d84c5789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ja/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ja/firefox-57.0b13.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8e9d0e446bd4b46b267001f1d24563ff5eb064bcb72be2ff30f42834d91658664e96683d680ec03fb62b8ae3f5e6d68b4a18800d6f4fe1b93692b1e4ab7258e0"; + sha512 = "9dfae62887b03ab6a963547c1f4c4332bbc4469bce62318fbdc439130c65677e9e0328942b49b37d251aee45b56f474aa5e1ef487244ec61561217f1e7f2bcc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ka/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ka/firefox-57.0b13.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "b557a2da452b41685e4ef61dbacd8a4563c4016b16946e197eeb60f39523dce87942f38659047a284ba2f8dc78ebd4ce5d377a86d54366e0f0c49176e29b3255"; + sha512 = "8f1ae26d22d02bd3a1aa21cbcd750e6003f13fdd1aadc85114485cccf59f300b962a729016c3dd1611b8f32333422318ca806b7dac1a790c11749c909908840e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kab/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kab/firefox-57.0b13.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "cab2e7df696e67a290aadeba8553e65880156f33b4cc57feedc971517496e8a8beb2ada6f8dcf4fd963a034cae4bcdc03bd970c6a9b27af720f64ce1aa9bf8b8"; + sha512 = "28a00d36928bb60a2c65eb9e3866b8ec1fbe76973fcdcad78a6f00aa601e4990c1ea96c37984171577400dd511937011957e51e4996fa64db0600c0c3cadb810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kk/firefox-57.0b13.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ea92799a2896013796459e8b8e3f5cbb8e2da528eda74091d22c93fad5791d8669d8f092842090ed5ccfb9ee39e7c09b44502c752d29a956b5e9cbc793ff74d2"; + sha512 = "76361b378b4b2bd2a1e31caa344491868188155caa57317f46c9f89b9a77df5ea65f2d4f8ddd2e8cc574e602fc163c4d671de932938ffbb64a1e68a7fb51bd51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/km/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/km/firefox-57.0b13.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "76f3d509693148cc94949a786697a6bd3bdda894bc4692715e33397e24aba446d94f9e364e159c4504bc0317adba5388ccdf3698f1226cb0bfa6bee2f00fb4e0"; + sha512 = "abd176c702ab4f1e829e23a4fc4bedba45724ad119d84cd18a6d7d2c8487aed690702709312f5806f2fbe82076215e55e3e4de3cc8cb56b33079d4ab7e2921c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kn/firefox-57.0b13.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "3de7da4fa42a74b0187dec9b28cea76e3ca1bf80827f374bdf895461477a67478761c2059572da14c1e5660586a07239ed22d066e548c5271ab563713a3e0ef4"; + sha512 = "62056efe59a3acb2fdd04eaa343372b7b2e1f974485ca7f122d6cd9d7d67159f2a4361aa01c68cd11a93cc56d807068842b735b74e596b5d218c952f5e318658"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ko/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ko/firefox-57.0b13.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "fbe8b5a9a196a08f56408f57eaab71e3bb7ffec53bc05c4db0bfde4478267975aac5b876923c915a0a182d54fc1bc99f6361117fe659cc9e998e98f3a9aa122e"; + sha512 = "d1772efaaa2e2f42bb01d5ac39187accf59a235327d5d159866c5b80d7d54a867aa496d63fbf23737d52b976f0be8c35bf5f6045f0d69eb5d5af5e67b6202eef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lij/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lij/firefox-57.0b13.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "031ec2684ac7aee9a02e7aba789707b8aa6937fea27e191612b7cac6b0aa7bdf996c3f3cac1379d7ccce0a53701238f4379d691f29e2d4ad4c5b27a518d1d2b7"; + sha512 = "a45f3f8181906382f3df68abfba8682fb43db58fd7b6846eb3b64eb67e6d57971cb83ed6c74785e19807be06dbfcb7b003c67b800292cffcbb1b42c812bb034e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lt/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lt/firefox-57.0b13.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ab056e37c0159b7b62e4d20e6fac5de190c3e7b53919bfc29cadad90c664c800e233abae58d1e7c1b8ded76af6da7603ea187da6510bac904bc2d32f9f37feda"; + sha512 = "101d43ee97cb635073ea9bea836ac0aaec514fb5b4eb9b821df0f48d527b89745907f557a96339c19ebd152639d9a4bd745396bcc97c94e69579b177f9c1d7ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lv/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lv/firefox-57.0b13.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c4a498bd7832c9ee93d0d98730c962176775b347e95241e0e307a97e8d53fc21dd943143e880f994d81d4fe15a7d24a480a07ed41efc10d1f816549c5b37ebac"; + sha512 = "74afad1dea785fefa379c7eee2efd0f38673a632b9232102a02e8fa7591f89b0c58447362205b23638b54fbdfce90a813c111344ab4569f57b21bf3e3894b4c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mai/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mai/firefox-57.0b13.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "81f85952c2966471f4c74fe7092b7b614f33130ca19c74842084aecc6b53f8dc975d05ff0d9e7a8d692096e1f9cf2a49576bb9d4625904ae1074c5e0476e4bf1"; + sha512 = "4b87cc59533c6b9d3f131ba533314f5c622efba35084a8ca6b67c4c63b55833a8a3ad9a72ac1371dea86e39691a6670a3d38952120ef8e3af712a72fbf69caa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mk/firefox-57.0b13.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c9ddf832f7da91e15ce16fa46777e2458ade47c68dbc0c5a368e5e2b8a26682487449e51ee46057724c422ced2715754a4b5f459f6598e342ac0d553f2fba267"; + sha512 = "dd85e3305ef45f319211492163215f2f4140091d33422cf9bd01540493b13c9fb923a0c64aacb2639682a79cf6163fbb6e559aa29fd6dbe28f22c7cc0a1398ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ml/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ml/firefox-57.0b13.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "55b8c4e2152fadd17d21ae060532ad078dc83f92c383058d1ea979dfaafbea58f9c7c7d5852688f619c6332a8ffaa37e2bbea47517f4bee71af5696a21593611"; + sha512 = "19487b16d24a71463b1227a450648ad0f7a0dc08b6a0ba69b99d87387bb2c011f7139031eb09127bcef5c5e28be90b8bed4de449af4b2180e900cef4c7e26218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mr/firefox-57.0b13.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "713455cb6defd82c93ef80d92803923bc5049014b2409f1903056e0c04c2316a5606c9fcd13e96c9aed79224e24ee491e24ab31366a22c5ea74b55c556cca2a0"; + sha512 = "7a71d953b192d2453698318f7fcfec7e4a1a08f893094891b446add05a0a570df3db76a1054c296d723855e4190dc2b2cf84c953fa97486a8bcdeeaaed707bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ms/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ms/firefox-57.0b13.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "53402320cf458dd250bcbd967381df5d5901fd62fb34943b18f86137f338e96d5b7175698d57ed3169ba138fe303c21365baaa56cd40dbe05717a82bb14d4c26"; + sha512 = "8970064b77ede1f1b52a974bfc7bf543a203943a3aad2f42952669e48e1ddb092ac47d41704364802129501a5e0106e5158d6650a4ae7a84ff07916ff61af07c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/my/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/my/firefox-57.0b13.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "92b06c4aff57149610269474dcf242e58e0a9676a04a01e843bdb71cffbd24f222d0f65bc73751cc0807c6efd84149e7d241687c66413f76f75031edadce60d2"; + sha512 = "3681f7a89ff3f099c5a387c9bc32880e3935a68edaf004d97ce492a271491e40b06d28e9afe732163f94d0f882a777ce8655ec0d9aa61b5a3be53792661857dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nb-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nb-NO/firefox-57.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "52d82c8194062ec95b06f8956b52f7ef47df60436c40f3ae00358cec47034ebbc61fb2f0cb27a93dc96afd3aea5e3c7e8ebb92268f7fab01ae21d78d45f15994"; + sha512 = "10d807437bb0f40095486c6495be4460bd9f10747243576503faa78b3212b71a893b4dcc1bdbeac2cef0ffceda288687033d05db9e76576e6ed049ebcd0a547c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nl/firefox-57.0b13.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "75689e5e642b82e97f734b3997984d805794b9ee07a44314a6cdbfa36f7caef3840f02daa13cd1338ed8bb435aea59c14b634e269211cba3b31babbf594f8f27"; + sha512 = "31fb0e57141696f5ee310fff881e811e23c9c1d182c898cb8be142db54ac268dcfcb8a0e865ff5759984ced5e0cc9b87f64b6b27f5ae82c04b3011c7460694a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nn-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nn-NO/firefox-57.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5000b5497707614d74210aa372697c38db2997fa1fdced45e885de3838abdddde402e4282f32517e2b75f25b8d21d03149ec9621affe2e84f3dc34aac5ade534"; + sha512 = "386d209088359eddfe3d68eb2466b491139e9f372a424e8509e531ebed8901fc098eaedfb11a2d606f22a940a2520b2da7ae9c6ad8a1e6dc24e5b4efce39b63c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/or/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/or/firefox-57.0b13.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "123b0de9d2fea6509566df36fd2c2d0e540fada2b226e824c914cfd02ad964b37c34c3d1846aae0fe13e8bed1b01b267cb396a25f9bab1db9a6b0db420addf11"; + sha512 = "8bc59e0d4ac62b1409616512ba15ff15bce172e27f161407bfd11668399692a53d362e0198b6c0b137d979609b6b534ed63e1875747111af0faed895133f4b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pa-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pa-IN/firefox-57.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "38618f7df36e1044bbcc32d50e6158e47a0e98cb171d03082a1874b990722d535f2dc4c8df5177475ae8c33bad9407ad480925158e6f74077a977c5abeb4b4ea"; + sha512 = "b25496c3795ec349989b6fac8cbf055974dbee73287e9550b9266ef475a979f7589c8b318a9c05f4c324e69333b943382f2ebfedd0cc8c8b6d77f823537cef0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pl/firefox-57.0b13.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "54b384c63c0c017898ab5df66ccf5176c6d69c1a55c3470d3f16fb2e654854da802d4c15206f7419e26572871b09c700e6caa8cb1d85ecfccc364796d8595824"; + sha512 = "762e795c44733f161b2849a7057afd2b47021312324565c39d51a3b06634761518284eac7d34927c7e650c1e43179cb88b80396ca91592603ce737988c197533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pt-BR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pt-BR/firefox-57.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "11c908bd35ded6e5dbf4df7c518534fe321cddcc1de9ae55db4ec1557ed9df5228e085c5947117ecb50fffd7af3365455e8ba6c98dfb587c8edfb53fa7a330a1"; + sha512 = "a278133a771f43cf8fd48ca4fc06e324ef3d9187518ba1405c371004b94e608c3cff839dbda184b6c23c6818f8cc55b192bc9118f19e8fbafd6af0b2f0d6b611"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pt-PT/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pt-PT/firefox-57.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "54d9dcdcda3cc5cbacdb4bf6d5e697a0f1ed257ac8650573655485342db89fdb7ec6b98675d7255b600f76284a510b11e53c6bc9a2896d2f3656f2420f252ebc"; + sha512 = "f56e9591b8eb311484d814723a9d7eeb66914cae8d9b74cbe12f8824eba898f5fdf072e3cf0384deef3087826225bddc31c9a92e11906a05f6505524a6e9c7e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/rm/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/rm/firefox-57.0b13.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "9f5565b6692fdb5fc7c9004261f4b1bf2b6b51e75fd6397018f2c5eb8699cfe93eed15e9564ab89ea3f643898ea55c98245ff8da713e479477356de645c87da7"; + sha512 = "b0021b2b2c26aff1ef7bc043b64ba39e4152ed3ecb981cb8876d4c15af9e157b30cf9cf92481f76a4071f9407312a8a02a20cfe7223a4f20ad9cea46ffad3343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ro/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ro/firefox-57.0b13.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "402afbb1552668d7efe27faa3895ef8f2edac40a389d5694de04a0b74f01087659503e46cc9c49c57c35dee3f8079943efc2d655b3f8eb3fff3281d4ea6972aa"; + sha512 = "dca26a56abe6f6000e755a5df7d62245bea47964ef47bd0c5ad0283eb6b04c235e225e66bb54c979460188ef9a1c870d9d53b2c185e6dee2a37a36880cfca6e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ru/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ru/firefox-57.0b13.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fea3a0c0192a5c74cc47c8355f7b78500cf20a0c1deccb2adc3e3639404f07cbd9edfce9960a1e84a41887e1175e2643af6d2c6027f3aabcc840226f2940c153"; + sha512 = "26eb37a11bd7b484617d29432c67eb62c84f4a7aa1575234d284e39a23edf1f679532f818f7f4c64273d70bb400e52f327498ccc8226304e0e859fc7daa38dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/si/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/si/firefox-57.0b13.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b57c8c5327d6393b841f0d4b1b327a5816560a7ad2744182bf99cab8a333b3fb833c14cc0587d1111529876e89b9de24005084967b327c3376543e0284223ebd"; + sha512 = "a7eba6aa32b73a64b7b21447d7ebbfc25ac21c9cc353d06fa9eb1e6b5e43f2673f125abdc662e8296a8254c96e97e8684a8408d712bb201eb1b9ee494aebcc23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sk/firefox-57.0b13.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "221ee97c377002033a46564d8707308ab9c730eccb9dea3c93fa03d9f952cccab745298a8cc6ca4eba11fd171c92ffc159ce8fc004e9cb4710ff3553781635d6"; + sha512 = "da4a7e40f4063f11434616a1130640b663d1c73aeac6a8638a281174df890f0dec105fd8e5e0200dadf8898bce7adccfca5b059f35773abf4c642ea1d25ffbf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sl/firefox-57.0b13.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c9264bccf0c5c9c02c674349e641330e3a2a55807fd44d964c1bb50622597958278ce22c64e10ba5bdb3623d14d283ce91d61385bf0e58bd784e46f5e81b10ea"; + sha512 = "6d00fcd3f71520a5924772f0b04f091a3abaea2b481bc2f2eca793330a8a9600a7eab38c7b1a9bc575cfa40c74fad56c6f3847ec8edbfed3364a8b7522e23c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/son/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/son/firefox-57.0b13.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e0c93706e7ebf5e054beee0827fedf620b10b3c41140bb999e722cd5dbf8c9227d478ee689fdc88d77bf85b9e41414dbdf33017ac26b3d026ffea3d3cfe94415"; + sha512 = "0484c6de79a605e94192369aad55850b6897ecdc44912204fac58a23ecbedb8991ea3f670c3794d1cb1f311578db41ec518ae030e16e5266b2d802120bf151b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sq/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sq/firefox-57.0b13.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "faad9344981f9b9a4f978a53156825bc49c88084ebeb0cf14a950a11f7d0468e3fa00a3306f48d58c18c8ae0622299b3abd428390863101678cc4ad146094451"; + sha512 = "c5704bbea312df025d1e439563b358ae5115c0e91b82755c8a895194a04a5ca349da96aac99db11627912c5440a9e675c8bcc14456fb14bd4461c373781c2151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sr/firefox-57.0b13.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "cb8926a04f9c5563821ede2bca7e409ebe14c4f00c90c0edc5afa6668f9eac9e2225412cd8ec8cdbc530bc0c4988e5ab82d6a659cc19c127fb5db70d1fa898fa"; + sha512 = "27a3bff0a5ddbcd0905fc9ba69ea733d6a6c14da78d1bac0448b6804b8cfa8668890f2a1e617b17e1a642b59795c11b82d1ac4192863f23dc82adbafe2078714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sv-SE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sv-SE/firefox-57.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "e20c6b93249abb71c3550623603c2a20e1ef4eff5530c1b3971f1190f00ac60539a54d17cbe8964fa91d7edc377e16c54970901077526f3964521c3aff0dea68"; + sha512 = "e762be3b52075b4050719634f9e68ae86faf55295803535c046b2abf05ad6f695a0695311705b2293f79c1c8ce69d69b39609f27be6d0af9b625c0d9368449a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ta/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ta/firefox-57.0b13.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1cd968168f9b496046c0a10fc75bb0265deb964644098afe118f0d56f8bdc5dd038f23f78e94fe8f5585ab27f2bfbf85beb9771ca93ab9049e8d7947dd99d83d"; + sha512 = "cc0570a17d2325faadc7b1ae313241935588dcb1de8d6a1224a583fec6511a34d2a7ac786bce894f1a4b8b0b92d2d4392d8b4f7d0a0db9d31378191cf1ac8dc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/te/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/te/firefox-57.0b13.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "b7270f188b747ef0a833c29e9155bc58d1bbf38b9e97bc8a073df70b026751bf303b424ceb295746b3529775b8eaf0d9e3112970b5fad9673adbe435af9cf16a"; + sha512 = "3f6c7e8612cd483e209c95ff594ebcb0fcab2b03d3687c6a2cd8832bf512b85257e0ee5af2aa1426c6b3471c6d00910447cee91d5b45d5a5aefed0beeaad781b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/th/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/th/firefox-57.0b13.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "9dd0b419c71e6f8229973ce0738bd69247488786c1be9818930d24ba9506f40eef6fb9e4ab56b38136149755b217e8353eb07d3bbf11a673d34c485d4672b967"; + sha512 = "2576defc0da691c1a3a58387cef996e031683de1d0a1a0f928692b5982b61e53cf01953d473539e8afb5173d674d9e1ce82fa785307525a65e9af062924ff0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/tr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/tr/firefox-57.0b13.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "de7b9bd2cc817662a7975ff95bc34773f940d2b2a491b85df4bc3d19dc02dee75cb6305e9fc2441e3dd3d9ab746ae2de6d8984187f7276f988354a447a6096be"; + sha512 = "bf5b69d5d47c21bcf32ed5e9277d59d09cbdefc73f750b957feaf0f8aceb184425ea6d87e731aeee01bdd74ac42243eab0d781261d63db26bb57ffc3f530bb8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/uk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/uk/firefox-57.0b13.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "13ee663e62cd68b92083b001b2a3753e4c5a6c15aa5e1187c01e6cad8692a6f53b6e25cbb0d294a62a3986421bcfdafc8bb82dc167118c213e9f4939bc991ad7"; + sha512 = "eeae9bc7f51c8827c07bc140883c672455088aa9cbb5c4473399f612847ded8e95f61b6c0a295c598c2a943e641812fa75173f26cb46922fd0d962af7ebf9d53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ur/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ur/firefox-57.0b13.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "d913ddbf3e10f048226f3fdb5e8524e2599b236379e6def3786789b767e9359ef2d47e2ea025a508467d7c47101b922150866984d91dfc41d525876b72ed4549"; + sha512 = "36d2c5bcad4aadb2aa381e2a8f0d69256268d337088639a031af86fe4958529e0f32cf11c5703c39999dd247023134ea80201c351963639160875547e4728b00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/uz/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/uz/firefox-57.0b13.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "107db43aa14f63c0b7ff4fa4bfd43b0343b657c3791fe29b07812af2c810bbc5343eeb90cd43028259c40dc79b0a763cd770b1f4954bdbadffa598bf0885ce83"; + sha512 = "a245b8eeb1cf93dd51e85425c129e0a88c3b9d312bbd502a5125f603259f3ee97eef76489a5f9939f09d3bf1b134deb3391689a54d607bca125138761378602a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/vi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/vi/firefox-57.0b13.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "851f0e5fd8d057a3d55807ad8cd215dc378dcbe71b4c416bd8b88d0f0cfdd9d4febd7e93dd562affa0890d6aef9818970773f95ed76fa136c034459eecd977d4"; + sha512 = "b1e2fde3c1d08870153a83e921231aa2fb34238b450aa6ce7b79b180b5902ae7bbb2a2dc689a119cd0d8b3d9f9907223c08894634810c48b629d74c2521683e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/xh/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/xh/firefox-57.0b13.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "195e35390839059a49e6c4ae03c1d6d4f085f7cff5b1c7963455bf73904303946c0926158a0bff4024c03be96b9570eb0e18c19ffb42081609f5812cbcc2e941"; + sha512 = "36345b203efe934147e96548c25ac4cfa21b7eb4cd0a849c7e35ed8e99d36687ac3ac5657a42fad30113192b364b6577dbcf47b854244f02659cb89ac4553519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/zh-CN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/zh-CN/firefox-57.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2ceb83e0e1182c756ccf30ca95f252ed8e81d293f2c33cc2d325bc091fccae183bf3e75dec67bf6f497b257d4037d8715b12b540bac95427289ea0baa2bdabcb"; + sha512 = "b5a8464db5ffe2eba9e33de952e4a44077f0af332ceefe562805a5f285a42c5bdeedf4ccb3bb4598b9eca7875ed1f2144a2b54b652250c8a5dd98b0a76535243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/zh-TW/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/zh-TW/firefox-57.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "44597eb5fa3eb073a04a5fa36d92055ae9bff41049e4c8c3762ce2166d8af5974bb232ae244830d32d51a56e132cee3afee55f23704d389be78bc48063aef1b4"; + sha512 = "5967f8d5d89ea780dc7475ed50709a7b269f08eaae74c200df97e2b914e01466af1e3cf58fda4eb44f417e384dea03906d7855d612df3dcca7aeec58040ad30a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ach/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ach/firefox-57.0b13.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9809327388821a5aaea4e8c4d85b61608f677c2af3842108b27d3786dacfb36ea82eb29458a7acf9337eea51f6f850c4ac0398dc67fb503d5fcc3cbbbfecfef3"; + sha512 = "d32fbe4ed3824f2ece3987ceec2ab408032eb5d352a035b2db3c279a5c368a125ec234e3ab24728d4251838a2b60c13d3db3028cf48e3d2b2ed4c5b54ea47238"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/af/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/af/firefox-57.0b13.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "7bbb60c0bc784c4e58b2537b47e7b4b7ebcbf0a4fd63ab6db8ee0ddc1948ba9117c08baed37e5743ea90d28395dbf4df0bc512aa8bafcd810ac4e2b11ea220c1"; + sha512 = "fc5222c5df35584fbb18099913f8389f2c8b2f25b41f0e753d3e5f5ec78b5294fe5c88da0ac477e0363f31d7af96ec121b89325a0765cacec0e7ae3e03762d09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/an/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/an/firefox-57.0b13.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "d2dcadaee4456e112edaaca783c91e9c78246aa742835a3d4cd074c612bbe1b85b28ecac222550eb920f09a96249e36bcb49a274c28352a6896d8beebbcbfbd4"; + sha512 = "e97bd96f4d22d6893d4f89bb9e2b53eac8a68d30b46352cf296ff36ee02d60d3982c02c84c97c803b0216f86d3c7998101f91745b109e29d8c7d0c61e324a8a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ar/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ar/firefox-57.0b13.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c993eda8d34a3b5f656a7d4cf616f820bb2230a734df6c2f0b4270d5403e8d6d23bd4bf003ae9b115acd1f7925d46b89c3cccc9345ddc7f9d73a269e3c243431"; + sha512 = "55741f17e8698e02731b431c8b20a2d702255e37171f027ed779243056aaca35fd863a80109679c5fb920d0a2026bdc3db6759f1b3fdfaacf237e4b20bc7e9cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/as/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/as/firefox-57.0b13.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "5112aa43ee870c3fd8f13378a4159977cf4dae3b1792ef983325a0d1f0134f377e6e4c473b27406f2722c138309a1af175f4bc9ff4e37f08696abf4b8f001fc2"; + sha512 = "0e14c33b6f328cf931a7f9c42d5fe1d7fbcb8736381232c69920a45111410da3d09c1f5667e7206628d70a7caf1404c304bf9f4ec8a5ccc3342103b3ebcf3757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ast/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ast/firefox-57.0b13.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "cb7fa643c742ac1062f34acb1498a7e903dde4c8b685ba48b997cf0247aa70157ce2317b5e25660748294757f0d0fde7d08dddd6581726c8f33db1cef3767878"; + sha512 = "a2d51ee57a7cef66d862c593bb1e52311593a21ae0a25d2b9c14a64065906de26770c61665dbb0d55930241302940d697c982e050750fc04a5c89ae1ca1b419e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/az/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/az/firefox-57.0b13.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "267fe9b5398ec432e684efed10624819eee7a1729c8480a4acd616cf4dc988295c069a62f6e3f2936a9e822f45fc459d8aee2d94549fc77d3f2fdc6a23aa9ec6"; + sha512 = "b9fa717fe7d861152d2117f1d69a7ae264f18c7e1bcd4e71df7404277db6376a93021e070edf73fffe1b00b3f7031d8c555df645efe63571d8831922d0212d05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/be/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/be/firefox-57.0b13.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "35977b89eed0a7e7401bad75eb20e7acd07ea52ac252ffb73a464f7d7c7f44fdb9dd6bfd1418324cf8834165825ebde256704e7822734077a68c0a3ceecb8b56"; + sha512 = "670dc2d6d9d35947d181dfa1c11bb84cc65aebd268cdea059997fef685619757d3d7c6025a12d00fc5364f258a64fe1b08a69357a2d31fff7bfbd0ca07cdbd4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bg/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bg/firefox-57.0b13.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "dabb67aad05867acd8fc5226f1adc91168f70d68926a7d9e8407feb8795a9fa56121234c639b03cf10cd2ad44f638b6f96003e48977ecd07b8f267c9da10b943"; + sha512 = "99deb263d7111123582ef53bbb1919497a6ce6c73cc160b4e26f5adc22f46e383208ae25acb5b4bf6dbac4d9a4f801ce70e170b0e6e5c9a03593eb2db8edb601"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bn-BD/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bn-BD/firefox-57.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f6185c2eceae26618c3ddbb09f87cf120f300d8c3642d36b257fc8c6c0fbe7a0d0f0e409b53bf3fceb2158497be91b9dd70e3605a5177d858a115cb4cb065683"; + sha512 = "34132da469314d9fe9295b835ec2b8b79816611eda646c04f7e064bbee5cfb2cc42f92e14a2eac60239c44205be4f3239eefbd1cad6700520ca3fd4bcc1d127a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bn-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bn-IN/firefox-57.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "50730081c97abb504f76f2e4c5bfc42258473b5b1cd4393a09be927156e626ede088f7ee6242ecaf9b641345cb4f28fb9f0a5276bd781882aa047adb4d1281c2"; + sha512 = "9cd206c11d28b866004174532a253ad49c06f2c6cf9b2004b15bb14bf597e776cadfebec4b3935a323b98dcfd3590bf5a3b289a9f7952a8a438a7e90884cc0af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/br/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/br/firefox-57.0b13.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6a1cbf642c85abe216854a45d371dd8463c37a3d30a9cc0e7b88aef19baf4695def56c9ff61110868c1359c7b6b082ea9862ab4026fda70ddef05c304f805fe9"; + sha512 = "f30fe67e71b5c3c0e3f352653395094a31cbc52574a9dfbf5d5ccafcca528ca0a5b164cc75d5dc7d248eab74f0470cf8547fced782c979fb1e9ba4e177ca2b6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bs/firefox-57.0b13.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "f62dfafbccb28abda10bdda208ff161e5db06eaf4bb3291c4a2149c990ac28a80ff4eaa28bd300c296e349c762c1baade01f5881b8e079e0e690a9c3fdc302b8"; + sha512 = "b2a546259e46cb58d44a61fa78e53632fdf0708921d80f329924180eb1a01dbcafe1372c8818280c0b40aafc7d4e6fa59d3f34b7e6a514f2adb1796d4274c093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ca/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ca/firefox-57.0b13.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "990e3c75c387050c728bb6fb2dff2040e53b0ecdd73fba6ed27c6c66206597fd2ac099d561ba8a9cae1875ff38628a562143dd5802c7ab67221e2837de4ee0e9"; + sha512 = "0f256326b5338228098ec31b8182e2d5d85418c9ace5fae1ef5cde37704d2f333172e4db7497f36157fa530148585dc70c0bc1b677b9888ebf0ae850b4aba2af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cak/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cak/firefox-57.0b13.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "698fac4d2a06a5057cb81a57608eea45752e6ab787ce8264e5d3e0a1c11469d1e0b2c97a5ae34ccdce7e6221f6367dc4682154c6b013105750c854c1340252f7"; + sha512 = "effb3d74d649b7adacdfbbd568b561f55ef277a9b7ffebbc27cad5ea0533a73918effa9997b9565d33635d8bb39658900f251cd071799fb15adffbd8022b4515"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cs/firefox-57.0b13.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ae2e138b886fc3c2350437a57fff8f29a5018b78dc2b31a45dc981ffdf233d6ad11be5df8602cd7de4ff9df6868701b296ee42d1e41922da1db7aa5f1c1dfabb"; + sha512 = "494dc250f77d7933006121720aa6526534c7b90c17dcbdee6bad4e0a6f5224de661d3744862d5ce519a9ae4f36095af76d9b86d873d4db97991b1d27ff5ded8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cy/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cy/firefox-57.0b13.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "fff159c8d07c544a8cb66b4cb52ffed3f8975d362c0b69ee83a26490eda68bebdfce45ff71147198a2ee94841deb9115a6a2ced6ff7a583d09c6dad8edc87d99"; + sha512 = "910254333d2f47f4d2162cab76f84f2b9f1808d559d1eab0d1ac0c1673406869b3092eabe7f4107758dede9394b383ae98ccacfba768772d550630f34efe5c62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/da/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/da/firefox-57.0b13.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "32d5bfb5293e1d5346d189638b1e0269fc0d6aa2ebf3e7ca2f018533744d96868eed09797e8222102a6afe66d0b7e2f6ffcae5e72fcd2f249fc66f8af30e5bbe"; + sha512 = "f9fff4a380c84543212c610aed98fb0fdc4a0d2693bd87c3dc3188d7eda73615d028c7ff7c15db12425855105a1b5230a7f62d2eae84a893f07a4b8cdd47538c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/de/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/de/firefox-57.0b13.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "63b9b1ef0c83c91406c165034f0429c9c2ecac617d4f69dce40b9d12fd5f0583fb88148f6d14858e21a71ec0f59cc22c18abc296d0c561624d584fe6e6967b18"; + sha512 = "2e772ae4b2f5246c96e30811a322bceac788325c40463470152b495492e60e3084e0ce55473aab56c9be584992b6761e364902352616e70050b4b0e9467b1a79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/dsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/dsb/firefox-57.0b13.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c902b5bfbefeeeccd7b49dfdcff94f3219ab42398ff2e73aa166846b7265b896838754719f1e84d0662660bd03ec14737183e60e653721840cc53b4bbd6d6658"; + sha512 = "8c6b05440d039b4ea3666b718f8cb59f91804ac2899e9d2e0a32a7622f800126e3b3bf9360a8e830cb70408cd7e4bc18f4eeb639dab403718ca6226576d262db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/el/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/el/firefox-57.0b13.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "85b2c08615e034ed9f1aba837bd73564e877f3385e3c3989ce864b1848f79f72e30a5bf06d6b32358a7f296137207a785fb343874fcf551f6f0b98515a52fb14"; + sha512 = "9589eb08e3d128e1c22b639945790aea4ce2524eb3c16d581c615f18b3f1247240085fb3b6d9cf3b283029060a86c0747def43c3d89a1548d907edd50d0867e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-GB/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-GB/firefox-57.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d14d1d17020b8a79dc580f7f526403e17cf0337fdd567b464097bb3796e752a669208b2a94a0fa4d1834816153230be67ce815bf440e1acb9220c951fe84cfa2"; + sha512 = "b1848e886919f8698fb8ab7272e49fad3ae1f5d98ce92b3b82c6117f79df56a8ee6bc2ea2cdc8987701b9a0fb4c2b1e1a58a9faceddb0366372a40139a1c7664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-US/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-US/firefox-57.0b13.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "fdaef350da4b8eda52c70c613f8c5e6a5c80522d5afc8f6bdd9590c91bfce43d2d2034ea095b377b47f8da65d950fe4c203c2cdfa9bd880d3f6253fcd0b252a4"; + sha512 = "327081605198481bb18bcc45a88c4388ec9091c6c10bc6a27ae58e133470651d50edb106f95499de4e38d7ce78eff68bf38f430371e4c490962e2cdd3ea55635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-ZA/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-ZA/firefox-57.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "c4ce10a2ad4d8ac8cff1e87a408caba7c1736f84ad2e228b45b7f9d0f87e5c9f6a4adb0a0ade89fa88c54c38a68189f7e203370890eaf69b6bd033b90afda8c7"; + sha512 = "bb1432ab9e9f2e11fc2270501f25e3181aed4a782fb0337ea676e75c4db487a48bb1e3e44f0ea703c84c4dbe8d5c4e9a102c8cd1d45ff673bef7a5b884dfe707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/eo/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/eo/firefox-57.0b13.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "37f75ab35b3ecb080dfd7c3b5edb65df950d260edb0156bb09887e8f30f1ef1d66016f6b07eaed0288be1c5c92dcd5c18b88fb0a9e742ced375ecf661a3ff5b1"; + sha512 = "8ff8c209c3aeacff538d2f265f8a6eb7621d27df237c33b9265d9246674d61f7905369fb2b7636920cdacaeb3d44be11dfc136de940658309f3285e62179f8ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-AR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-AR/firefox-57.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "8f2603e1d4942e6c6d4f7bb5823473a0e44f820805301aa2b0faefca6540f4a8078d43b6b9427e581d9720f6ee47ce4af82113c113753fa7131d6971ec10441e"; + sha512 = "4eea00d279524be9a682ae46cf602572e0e1469d1dc10e37b1b0a58868386930ddecfe0dc43f0d185ed9bedb29fb85eefaf87d83ffd00ce51db04d37e5fa78ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-CL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-CL/firefox-57.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9a6845eeecb831cbc3d804377ef11ccebe513307a72f4b542968d1851e54679ce202e5c6e5b1b2efc767451a0202737837f564f146862791c53d9880e42a2565"; + sha512 = "c130ca1390f9859ec6d276f77889cd804a38e32551c898a17158b1b7b629f7f72a39afafbde38029438c465e3a0ca82cc80dd73905d84c0aabad8ebb35f2512c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-ES/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-ES/firefox-57.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4d94719060001c3e4fdabb0a08e977079a3ac05d5a5f006d724dc0d6a7bd31646f5603be8236b6cb0ceba10eef64697044cc104bcb10b4308b28fe4883e89167"; + sha512 = "6b515f16a2555f56c1cd8d4487efe2d4ba8107f3122b0dd81df9168768808d08314565a0a7bcfbbf4451d2a4e84559e84fcc730caa1641e801c6daae0ad517ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-MX/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-MX/firefox-57.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "38d46eaf7b40f753b9fd6fdffda3b21c5f4ea9a554488277cf55f97e230911606c98fb4e5b6b188621db24c552236aa67b1ebc880630c74f6c57777c6c0aabc1"; + sha512 = "a3fa5b35773656152eb16efb6486d8e33ca29e0094de24e389e94a6e7fea761569c3ad48984f8bad255c8ee97f54bb5521444993f0a8ba7a3c922da66c1295f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/et/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/et/firefox-57.0b13.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3babcc9f0bf78b491d11d96be70a62b409729180e3ebb0fc97ea0eecfa3caaa2db1f6956f8becd97066d8b7216101804d2fccd249ccea335b92bbbfe12b99d89"; + sha512 = "7a0a165105f5b1ff3f997fd400bc8d5a1bf976c1f4910d4c91be9827a5094dcbc03e8426e644766b4b255dacf861e88cb3c2b75131a9fbd89e2c0eca69718b36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/eu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/eu/firefox-57.0b13.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f2b1b2befbafdfcd2467822b7834c5a03ec380c2876d6641addffc5852453232c350273d310e734e7071d2dbe35c94779eea858ecda49411b6a8520629394c62"; + sha512 = "7cd08c560ae83926226cc69a10691918b7c89cc10282cedcc57955b362546554e76b36af217a3187b11abe8472838f4cfb1a32095bb537b43f33920b37b5965a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fa/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fa/firefox-57.0b13.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "05d1bc4004261475c6b806fd2327d2d1f0a1246769cf9de0755ac0cffad99c270064699b5d05cbc9353c5ce77be9810546f59b0d47a0f88c96d6296d4e51a358"; + sha512 = "02b19d0f74413a92c998be3540f5f8d25ae2857e1eb9b4171083bdf392e5dc5ab0c6b58de54e75f221f731806fb8a6df070146564a3b294acaef76fcc8e633b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ff/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ff/firefox-57.0b13.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "448fc135f815bf79fbb62e2b4ca799bfae3891f9d1197ec8febb441f2a13dee8405add2c54a12d2eb11fad6eb291d7cacbdc31fd5af1978a253a5672444fd30e"; + sha512 = "df7485cad8f46fd93ac6a013e5f362a19b1b603240ce50044169ffa4a4267102910c1d6bbce9a5d3675911acaf64dcf0ee3638090c0236ab664e9af5b4b567a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fi/firefox-57.0b13.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "06f995e53b88f32fadbed3d0b3b22c11117515b2e926b6ce7e9763ec6fa29bea6a05292ad8325368badd4a0a6b3f5ec8c49a147a7f864c238c814c4f53d99082"; + sha512 = "26971b0778b87e3b0a617197356626bc3120b2214b406e01f5fe865430abfeb6dff471496548883e3e2355d32b1630fc85f501eb9934a9b6fd23270d47df5984"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fr/firefox-57.0b13.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "dfd06c21d7dd83309f9d6d11fea295bfb1f942e9bfd19a5a1c45b63466eada5ed75b88fab5d4730b13db0522b3a977eb85164cb0c4121242a975462dd9518acf"; + sha512 = "324c4cb614a8c50d9d7eabe6e2e3aa420398db7074a7d043c4a44c5785a640988c9d531aab92f51adfaebcbcb1e274f825024b09e302334241a16c622ed97f7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fy-NL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fy-NL/firefox-57.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "ab381fb599161dd7df10db3a1c93f1e71d96ef1364a59518e1413c17f7a26b524c02ce54a33f8ea54a02829e519f8e8c475b9579b69bea62f44c76e909079e3d"; + sha512 = "e5d8d67c5c549240264b7a02ff6c5f54295f04a26553a5a19d3b58f94bd3531c04d5402084fd6f40d63f9aebe2df7d8b50415d8575774f71df5a180e50d39728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ga-IE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ga-IE/firefox-57.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "9054ad0c2184063e6c42ac23004c9c63438368c03fdd7bf9bc0610d1a2d4a47b9bc4cf4762a0cafc633ae397c38ff64e050409c5d6fa0ca1ac869d918dae547d"; + sha512 = "01c0998e8a32e6da0127680d17e71c173c21eaab66603ee6fee0ddf8698a16501d290b1ef9d375d4cf678606cb4a73c679434e22b309a592523d11ebcdfd9fab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gd/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gd/firefox-57.0b13.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3844132a9433fbcb107f380200d9b57756820a9a3495c805622b7f3952c59feb8b3599c774d844f57bd38aabe01eeb45cc35d8e06073350f884ddd0a0a18d3fe"; + sha512 = "88eb2f45c0242400d62310e0efd492b27b6439750d01f0f567dcfa48398c0b2572c842c6155e370b0400b40c2dd88b7f2696daa4e42d0dd5440b4175a409517c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gl/firefox-57.0b13.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "2d864cda23c59108866f6e8f473bf98d8c328f24202130d9168ca0588f43a9cc49c8df1ee4872601608cd27422d7243666b5a1dd006ae5ba101773b7334cdc15"; + sha512 = "d8c9f478d1859240b411ba6a819153d6d260216aa3bd4acdd043b0bd6e65630f02fe4b7f8dd549aef81190ac8358620487d5f2fb796797d220df70b3a597cbbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gn/firefox-57.0b13.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "fb23767c66deed8f0ef97fa5b8044654740b8952bd7b76da9d6074e22c91301fffd3006c5f9c09ee7e7b3ee3001e70b31a6c09a096e3dc73fcb867f15251a553"; + sha512 = "572a00d95247c758bc81b0cb61c2fa659ee5412ee3ee948640549d6e737fd0ef622ac4e16715fcb269980461bea32ccbd2249448ae8b340ef26c322f5c504090"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gu-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gu-IN/firefox-57.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "7e146f4b6c3eb1c96be1d95ce8502aa62b1483befbd7aaf9fb945fdee4e8b8f62088841057bb81d9d5f8d2163b25bf17797d5af5eb6d6f32ee77b0b7b84aecd8"; + sha512 = "34a4760f8748b6e6cd1856f5e99f04e320dbcd1cc3021e185abcd23c12e881e2eba31ef9253bda6677c767d5e7fe5aa0dc22f1145852dc58a7e24278a0c6dda2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/he/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/he/firefox-57.0b13.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "3ecc278918acc5f65c0552f9108bd167a9ed3f55b39b4f3ec41175bf9a1cb1d84e32b57ab208e6c6816cfd66b33b5d2846d5a776a79510c7186e0d5ce6bd25bc"; + sha512 = "57a0b28a0f68d88298d25c62efa70898aa911c11f0733798739f40e546288856306e062033d24abb80964345c0f0224e2c5f3a15b01d89c4ed3584b1e931d91f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hi-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hi-IN/firefox-57.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7aac53bb08c527b1c199bfffc5edc25e8d49082dc7df453439775afc07722bb126f95955aec799909818cfdc949efd5a9f987942a4655440c0ac26691a0bfd9b"; + sha512 = "dc1db5ed5ca72c48729ef8d2a25cf608072fa7112e02b001943242ec027157e197828e85697561febc15740f52f9ecc6d666d5c83201ec8101a24ff66e8eb4dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hr/firefox-57.0b13.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "ea03e4f1370fcf59c9022c7f4019484ebaea8e295e2c3ff3ad8f44aad9336ba809cda22fc0f98df2f5ed7ec536ed9ba349d5ee57bea3c4626ba5fcf41fe83be0"; + sha512 = "5488074d04fb6f592abde28e1ddd8e2d949a8744849f51192fbe0441a551b358ef8cf1cb78f69b5340c07b266d11783e2e722ad5574f255186c6bdf9762aed7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hsb/firefox-57.0b13.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "71ee5338b776daa0e9b33834079c94e3e9582b50d7b0e92f64e25546167838852ab606c2c2f9abb1f3480755a653b091e60c97babee00e66d4140600ae4d2612"; + sha512 = "4bffd78e28363aca1d2b63e56ed44703bbbcb701b4d6e1c353f36939b86c3d7045b5104d7f3da920a8a6cd3b69d021b5d19f9727c5fddb8a86c594d15fae80e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hu/firefox-57.0b13.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "defae5f9c7164bb5150af1fdd6c0b262fc88c63b9c7ed09753af5a361815ffce9ed43d0d79bad65bdf2e0de775d17660ff0c31a39134f9ebd2b6f60ca4a02d23"; + sha512 = "6a5ee323244358ed68c96de80f9ce1741217cb002e33a8c93e8386773ab27f11b7bb58747daa4138e5b91b2bb4543e1dbfd14b90731cf5bf357376f4dbdd3a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hy-AM/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hy-AM/firefox-57.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "924efdc4e8584d89b60d98117a229c4c9a619b42f0a713b0fbf9fab2ed63b5761a9b5051e7cfa825459cb3d499eb4679363b13a76dee2973ef6b843c7ee9fd9b"; + sha512 = "28e0cfb93884fd78cc2f126f8c08714545c2550ae40de29e0dc1f3186fdc437592c6365eaa92135dcd1983009be7a5021001d2a7e703bfe6bc81f695ae662619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/id/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/id/firefox-57.0b13.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "508c42fff4f6ba5e39cf757a1a306c7404e3c133308d6bf4d734f4d2c53fe79998724f861843d2ad76af2dc5482f108ddfa11026b8351a8786d814eacbbf839a"; + sha512 = "00136a82e957274eb9316778ff0f9aae66df21d6ecc64f67757816104aaf5cd6d83c0d9c0224214cd2d1c5a68c7bab75d439cb049035ed2a071255a415b337b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/is/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/is/firefox-57.0b13.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9930f784440abd54b53fbe94f7eeb0e26ff2b1e2b16ba30fe1a7d298195db58fc32a25624444df89176072a9344088cbff188b73b9d7fa8e8b571b4390a481b3"; + sha512 = "6f22f0efac6858498c755fdcb848553a0e40bb80bc8dd6717d986e84ee5bb8cf7c608592eaeb6653f6454147cf73bfe57b5e62b581c2217b8546fd27fa9e5c79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/it/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/it/firefox-57.0b13.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4bd98c6c17a3cc3f883e7c2cf8a76a5423aeba67c6c22a50befaa8d4efe0e8dab495598e17789dbe078c75aec7e612ce959ef8f82254ccfab460b273456ca50c"; + sha512 = "6321ade81a09236ab3b3ddd024b3e5ad6404fd712ff6f23f72901018157f9a845c492ecccd1148cedc1911365c70c286a7d947cfc4afa534b274080e7bc6909a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ja/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ja/firefox-57.0b13.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f034c703ab191fb39fd61859df9ec14040764a8e22502277d11447add96ab3b060931efc4f7dc1277519c47315c40793a7a7b8da161892b13fd433aae4f723dd"; + sha512 = "b652eb0aa3dfd71dd4d72e45fbf2713fed947b866f1fdf172a473d80cf3005706558a32d7a04b38766517f6ff571166ac5fdc1c8a5b89cacdeb91f9ebe98674f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ka/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ka/firefox-57.0b13.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "8ed142d84d31914f638daec87ad64cf1aab76e110bc7bc147630df019f1a6cfec8cfffdafa139cdde91a06b65966741aefaeaf3d16c63aeb94c4f2945e04ba8d"; + sha512 = "38ca6189c55363040db09d55d6b6d525eb91aa4858a660fed3b400ebe5e4cbe723efd9735b77705a1caf811ad0f0a9a117701ce8414ef6109157357193c1a655"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kab/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kab/firefox-57.0b13.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "435e8dedbc0014ac19a37d0450537d7b9c2d4e7de993644991c58640edbfeeba17c6a59ab5eedaf1318bb8c71cefb5d30adf01528bcbd8e043e0eefa63296be3"; + sha512 = "bf581810fd19d073fb80dd3ea93b6b856614e4821d095800faacc3c17d63c53d7d65aed4b168a3cdcc29a155073af78d26f5967f29102ec4b1e29325c3686b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kk/firefox-57.0b13.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "3b059e976cc10eb97b10ac4bd9e4dd2b8cbc24b805e23ec125d42ab731c5cc6f97bed8ecf222b1ed3e2c84a422a677cb938239110a38d6e34efa2a9f2472bbfe"; + sha512 = "aabff3d68e37a9b41f9345d8968608082c24e50e859a693d4642a52e534c5b8b7a5233469a1930fc54ecaf7b15aca486ad66b8cf3100fa62e474b4ff261b37cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/km/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/km/firefox-57.0b13.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "aacd4ce2f5a8152916b2a9b8f532cdd09c382e0e365de297082e5bc16f6c19136430504bd74e51422db530c66a13af45721c01b5cce3a7b4fa31e08beb852539"; + sha512 = "e5bb4825d777bc6001d7d95140d03ac6c44c96eb602141be48c36ac82863dfd5bcfb25b529d61f80b8a939e692bf833886fbbc48c45ecc7e024952ddc5dee570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kn/firefox-57.0b13.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "10993f98c96e83b8010957af8467c4434070ed5b3c52311aa67596621f415d6ef5d7946a6fa5112ad7fdbaea00675bb07f6845c6553774e1a9666716505778ef"; + sha512 = "1f5f4d4fe4b729ae2f08432a5d074354121c876c4cb0e7344e37b8d02e2aad38a0b16547d2987418acb98ecda10805dfd012448332c8f8e5d1f772cbf21554eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ko/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ko/firefox-57.0b13.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c31ea13732f5b2d14f7089d71923287be8fc99bc60db396757f1a8a2936d9ca5aa5f1e2c447cfde0f90683038868dae95eabd55ca16df17742b2f7bbbc89e7be"; + sha512 = "19ef2c157469a3225c7ffb875e66f41a9d2828635b26f6dfa0062cb92c0841c53f2eecf77ba9b043e3e2f448b8a08de55c7f74fc6fdd3f7b4554d13ecfa746bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lij/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lij/firefox-57.0b13.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b7febb474eb13034eaf9ec555202153562b8dc34cebd0c03d680757c19b2b8fc5f7060e66b115d0080cd3510a56033597409222eb56024ba136d9ab50cfb246e"; + sha512 = "4e5e6103793dd20efb49bb85dac4dbd208c0d164e69c5856bf9fba96350c3682d894af857d239e23f3c3e802f7300b5b915486421414fb6f9b8af86ee50e247e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lt/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lt/firefox-57.0b13.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "d07c56a82054d1238a8a5678b65efbb88b7807aaefb327eaeaa393218ae280ef4e134d4a3ac28694458470611610e3bde2be68f3df325a496d9f922d985681fd"; + sha512 = "d01f311ee9f36aec032a5c4eca34a86ebcb54960fd29b03af00f2b289c2b4a38e232242d1e48847e2385e7ccabcc1c928ecb1e57f9001d181c350762d59ecc72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lv/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lv/firefox-57.0b13.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "fd8adc196bded44b80d6875a0cfc270cd8672a19b8911753a7b62545823262c34381c3e1d72d21af695c273242093b4df45188bf6b07f83ba5a73aa7a8e5e528"; + sha512 = "d23ce47ecf7c790f38a9bd605150f403776b4e469be590a57b9de624fc10bfac2a3572470ff496899c2bd6ebd1799e9f4687b4e77e4714ab8228c26998760b21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mai/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mai/firefox-57.0b13.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "c31e747aa29393f12b4d32131b4a9134f57fcc88235258dabcec99583494832cf61079b8980171be2ea952121f3c5568c42e006e2bb9b1c0e6f6fd05d2204dc9"; + sha512 = "7d8baaa2d79f6e50afe9b915d461a4ca25ba777dbb0497d2fe0b1ed92eb30061061b3a29514351841f86366b91da0979b5bf270e290c477397f3201f1b517398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mk/firefox-57.0b13.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "3e304e2a82640adfb7d15705ccf740de623995385618a351651005da3bc23edaed3707209594bc2b70a244f0ba86accb80c319ef4f55ba156f5487e694fe37ee"; + sha512 = "b1f35402ed051ba91294dbacb52aa451efd48300fe982d638d206c75c3b0f7871fede1d7467ac8d6ea4308c4967b0334873d72c4c731c69f343b92d56fa7bbd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ml/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ml/firefox-57.0b13.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d229529966b0890b78d53e221d2e809d003248e2e42dce182f3f761434da72362181edaa0db9ae255878d01118ccb38921af715a412408e60373a0a76f02b104"; + sha512 = "32ea1f66ab87b299de4256cc25c6a67c0754e9fc8569f9c9693aee850c034bce1e77cfa6f8115015f085f74bddee99a7cf487cff09277f011dc51f9deb07b97c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mr/firefox-57.0b13.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d8e81fd44be727b8b72cfd5c4852df33f812b6c3fbf09c07a461c00b53bb41fa63a1e2cf9c17dc90ebbd630ef18541d4aea4d9cddf471fc52d9ba10952ec5ad5"; + sha512 = "3cf3fc88a84de5dce220f89928f05b8f8b1d8ecef2f83d01a880f07d5a935886fc30341eafd941f31213301773f463fb4f4681cfb5e8311665f61c8f28a5c0d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ms/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ms/firefox-57.0b13.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "e025f2b6a8724eabe4128d9e3567f0817c833a6fb2855b541e6a12208992c2586970b5adc422156bc00fc403714bfdaab762505308931584ed9ab8f9352e1183"; + sha512 = "a3b9dca6a332f939e6ac7b51956f34e893e1ab5e62e9c8e3afceeb6233d7d378b44fdd9f6dc46eecd73aa738df46534956545293604faccefc34591a7ee6e12c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/my/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/my/firefox-57.0b13.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "6518b67cc4ffe848a0e79fce56af5f9ba60f3338bad5dc65644d6064b51e1730182f4d6038c4deb64be852fac673229b75cf1fd0d1d7c37db62c830d018824fb"; + sha512 = "9daa4560c3c4424bfbce4f23bc414979dcc96359af3cb7c29f2a9c262aac81d96493cbf9f938b8b25ed0720801d0f87a11a7e5cfa83ba78e86e2fa0d2495fc45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nb-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nb-NO/firefox-57.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "177f3638d429bc4b5d97796de91c39c3a5712ca3fe5f93d5e1801937d16b80faab94cdd75dd99ec7c6451f55a5a9282195a0deef8f5500833b83dc3ab46ab20c"; + sha512 = "d5ab3676fbc7c3d3bea1af43bff89c3290af5846eefb7bc51d6f946c8c2c7968332de918d5fb11c475e873e7e1a032213e75a00407092e51baa5f0d0a64fcf9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nl/firefox-57.0b13.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "192f7cdededf9424631e96bd88d15fe66b7654cbf09701f361e0083b38106636df68f183aaf3b9a4894e432cf828f429ab5a62ee0b521956eed14e470c909aa1"; + sha512 = "6f1e8bb355f6ca1e8ced4b9b69de26d8cec4adcf2957a7422b98421fba4c3d7c3fe91596fc9ea06e15137f8bdff27153b9d068b7707c7f56b5357a7aa2ec6ffd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nn-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nn-NO/firefox-57.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e1d9ad0238f5fbbbb95d08e01f95a9ba71ec35ed47d0609a49a9f76e9f9008f21932a12b9a342b9ad02fde563dcbe7779d43b9bfbfcfbe7f17c4f59d324808e4"; + sha512 = "b9c27a5c824efc48e85fba2823d9288990fcec545fac3b1ef6c4617a624ad685b01d96d23ad8bd5eb1e7787849afc630560e08cb7fc617cf2e25c9cb9f2c1ffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/or/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/or/firefox-57.0b13.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "12012e659184136db31cad4448226eb4e70760b9234632c9fa1b71a54b0ca06608de7ffc62ecd018671fcb9ee7c3357ff18b7b5459b395a39eda59d1a44bbaf7"; + sha512 = "50c0e9956bb17f6df5d342e0f43a4439510e80d4001f504d566d2856e885aeef2b54b57761943771f8a4ba6648209080290fbd6d556934e14565bee023c257ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pa-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pa-IN/firefox-57.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "cc154c9b0d53ccfd515dacfcde3a55a75c16f542080770927533b9efba8bedb7f46adf0a54772f60ff8395c1e83d0ff602687d7b04998e9d9e0f6c3da2e95142"; + sha512 = "e01f2c4a9cb3f7e6adfcc3e58a5fb5485ab41ae01e302c93404e7b5a7bb1b30f351e364846853a2c6ac0ecddacc03806fea945338c050928c6e8eb6dd0a80600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pl/firefox-57.0b13.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ffa0cd7b26d4fd48cbbb9b56b60937190dc271cc6f002fd4da11929945d064d4aa59788a756ea4226b15e1856434094e151fb92a96f3ca9d14141fc1bf98d037"; + sha512 = "1bfbc1b9a401e0d9b912f5c91f1eb22b0b968d8bc75ddafa28390071431d17c4251b2624673aa068f59a451b7a9bab165690b5c87ba1dc952242287980c63dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pt-BR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pt-BR/firefox-57.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6e227b96787f07b9e04632d54ad33ffe17931e787d1e0212a3419bace1cf8fb062178adf6a2ae8d11a851d3de2eae983b086850e8df775c0a33d518dc0306b51"; + sha512 = "75b83b22962b42160d5956db90e55f23c2f12335569f908b1ad1acce48704e9012b4d2c8b3575854e7a36ba9dee49f4b96391a4b6958fe80545501dd91609084"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pt-PT/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pt-PT/firefox-57.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "fad503b60076143c5941ea7c280212570896aebe39e594e4af4b2c258b387a5489a63be17730e4c31628b96661d8deef7aad6ebd31eafd3bb52f841e4a344a39"; + sha512 = "4d9eca88e092531b87d8ddabda513f9a42a762f7af2511dbec25eb88fe791fa94bac3b08c7521227ddec2b049a4a55cd7d862144696702073bc13906b1f39f83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/rm/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/rm/firefox-57.0b13.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "737c4cd8234d87f96b1970f1ddead34eb4b109e201f794942bf2ae0603cafefce7b38f2900bea2d08d058766e8d1851d96052ed5f23fa46e351179c9ddae1c91"; + sha512 = "44b3eaa4cde855738c221e7c1a3acc80d862f5159c13d946d67e47b382dfb4a5a6d360be961a03f605aae3e1c89e2a8a0d16f586646cdd1a3dec13f777b32577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ro/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ro/firefox-57.0b13.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "506c842023cd3fd3bc0a6a57abf7b2b822253b0ef4bf2d3f511bb3ce5407d310cc976803f6959b8678899b38ffcda582da21a887d8608fe8d42c46ac70cbf133"; + sha512 = "a9dc8a1b4f0b236f2660be71df78c41e055b0547d8ce9bc258798fd4483fe888040d2c04a0ab0bab4c95a712d22370d957513b5ed08f1e332803d7067bc37aee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ru/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ru/firefox-57.0b13.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "94213fe894d4d6222b321aa6d9d37f3cf32f257c0e021f8d6f122c4e8c458f9845ab5abbfcab1b043b4d8aa72f83307081685a63ce7569194fc15e2ea655cd27"; + sha512 = "d2c42dee48f21e847de67efe353088ee949fc0af99ef510f5b76128933fd5432b2e0cced59ce0a0157e396b92beb645d78d758823582cc5dbb63718bf85d9b20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/si/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/si/firefox-57.0b13.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2174dc7cc1a8e8cf96550199d70e279c85a91671fe1b1a71161aa73acffc8a0c818dee6d0f2c3490384eff4de5175eb6c04cbe04ae92c60da72f5bb987bf60fd"; + sha512 = "57be5923936b02cce924fa05994a6a887906104175e305043ea5a51e90cd35cc48c190ddbe2d060d64965b32c65296967dfc53a1e700d7defa078d02907069ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sk/firefox-57.0b13.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f9a30f631ea892c1362eb17652213cdb603eddbb0a687f4ccaffe70949b8692e637a35c4d90e27f5f823da59ba01de45f810bce1ac33a0243a5c96f470f13ffd"; + sha512 = "12a74e9df967e6a058fbf53baa842bf199190dcc3e5c81eb49da29267760034ea41abdd5b1610f4e06cb30e462cde4c74430d58ab7efe7ed755d19919550827c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sl/firefox-57.0b13.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "abb5746927a53331da0604e4259a97b8d836c489a3c777ebcefb9d3c724503772474a2551c7347c8466e007fd248ca4b96c8e334272c958089abedd60f810a50"; + sha512 = "9053a6dd752ee19f8dc49a2bc41c1d91b6a0f77bca71cbdbbe46b645388320a12be4db14714c62c2306b1bab78059826a8fecdf0897ec52ce0fa8e743e25b83c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/son/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/son/firefox-57.0b13.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a88ec432a39c197d4b312b8eade6b5b1c27e2909dcf27c309844fddf6a21255a1bfe7f666f3287c6662a0985c75810eaf67bbac20a0b871bdb583da30beebf96"; + sha512 = "b8f6bbe404306f17ae982238d573302165c366beff14917e64dda7c07b6a2f4e1f9b2042a97b3cbfab02f5e7fb860287cbaa30536494506ded1ee51818d3093a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sq/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sq/firefox-57.0b13.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "32054a108dd8beef5dc9dedfdcddc4b37ec854ce32f65f6f69e1a4506e45931909391182ea61a9eefc4e3bd354027fd6cfda0d71d996906397d833a27b07cc55"; + sha512 = "6dd4c84f38d7c1d0ebff77737fec3ec669532fa9be785414a9f125cbf184c88185bfd4541818d696b93237d4acb0654d7c6f38e9a0ab7ea35a10369ccde1bcb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sr/firefox-57.0b13.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "adc284dba815ef84d2b99b90730d15ebb2a8974601cddbf38053356c8e7464f13d0e1fd764c8dc34e0cba0ca1bae427c2e1ec31bf0553f834d0213426295917b"; + sha512 = "984be4970c5224077e6e97c3137df1d62ccebb7fe78e3506ce4ae78e17d7961653feb276712735293d2ebf22a8ce8b0b91b28edc80b2413fea24dbf059eb1ad6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sv-SE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sv-SE/firefox-57.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "51f3a397e95f39fc2da2349b25d625114d02bb0444e56fa09c8246d57a93575ba9cb83479681c73ae1b257269ad9100949829aced4c1567b167dfb5ea680bee4"; + sha512 = "d0fd4b307598fd42d76414f4f097d0ea3e2243ab8de536870be23687eb6ea64f226a54b3fee176451bcd9e1305c6aa4c60daeb72b3341102f670d4905f4efe27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ta/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ta/firefox-57.0b13.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a1a5a458d540be0a5359c15f2a70770b39bf983d1f19a469c8caf1f7c2d61688a2650bfcdfd2d41321788b63d5a900ca1cc36fac4a62b67087182d9c1c3fa84c"; + sha512 = "6b59fe4cde16c02c5b4867d48e6af4814794bf4a4f3b41e24cfb6e85d1e81f31446193c831b2ce50f30114260fda5e0a20ebe15fa23e1b962f07d66394f5d654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/te/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/te/firefox-57.0b13.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a948071e0f1ad4e29483a87765a307a1cc4d2af629125025e71439875144535bf0d6d69be5100a8ec6f5be6b8b9a7c7d10e851486ae41ea5c8517dea932c54e2"; + sha512 = "a65e6b4d28f91764aadde1dd954d1e888a5bb24f356deba73c68fcc98d8be669a8f5147233af89881dbf20e40ba987326d15d5fcb857598e6718fdac4c5a59ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/th/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/th/firefox-57.0b13.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1340d951f126571e3d3fbdfb91e478ae914aeba9251da35b253a67f62b4148f0e5b9452495a7bf23e918c9fb3ab88db37f4f0fd11f28330957dc23bc65cbfe5b"; + sha512 = "bc6d32c9054072fe931b703aec3c2a6a60d25dccd6e853eca5e716903a4694618e4cae79c9aafa52a2bd34133b6314b5eeecb92e56082c84dc10c47dd46be085"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/tr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/tr/firefox-57.0b13.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "37e37e3679ffb5ebf93e3e7410c5bc9e1f85fe8bbecc83a7a33dd5b1c7d7f7150ffff3d91fc200f4c378a253627d5dd8ec90f46692b01f72cbf9f48bea84742d"; + sha512 = "31e923c48adbb9e2b87ab6d5bf9ceb951426ad8c523b8def49900875d2a66220c2800ca25ddd4fc0f8a007ca4c95f7a69311228b34c5a8429bb26ce9b0f43871"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/uk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/uk/firefox-57.0b13.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "067353b9d466bcff799f6c1ae46a91ffe9150a6c429a117464cf1289433fa2fed6a0f0a6e773f8b27d3618ffae233c7ebd56841f97d3c82b97ed24f038c7e4ea"; + sha512 = "5036b3bf40bbfb13eb99aec17d90e9a7a60bb39eab1bcd21fa62b1d12b47f4b9eca7980c762f67ff5406ddcb20777a6553fcb02e611b276f1cdd483c8b67c162"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ur/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ur/firefox-57.0b13.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a868433b2b18ca92bd6a6b765ec0fe072a44043a12f75ec4bbc16f4dac29577698b1fd7618e5c0876ff14742656263c0bffc2ae5ba0826a55df70c139275f9f0"; + sha512 = "3605b5370f7158ffa54f5c5def6806885cc609b385b363e5a5c6442ff9262fd666e35b3f2256ad68b8f03a9e95282f3792ab83f49f0efb1e422b6dde56a85713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/uz/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/uz/firefox-57.0b13.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "33603cb219121d06a97cc5c62865bdb9ad4f9acd0de6c14ef86acc16d818faf3e21b24f9f497dafd20639b81edbe7affa1fedd7a2aaf99a1a9d137b02e2b77d9"; + sha512 = "a15e00c34a831eb8b251f60a9e17f7cdb65ed097fe0182a576c5809ecd208938d38c99a711750f0fb7835565adfefb15acbabe3b66c2f03eff36bf05527b47d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/vi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/vi/firefox-57.0b13.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "a841c65cade257e6b5708b3de3c6109004f54a295e6b6fea97e6b3959cb70620844f8a4029dcf908d6fbba1ae71d038cd2adc0724180e22959edadc549bf8d12"; + sha512 = "fa4e9de86197c3a95cd0d048e16de89bafd9d4733d3f2c96d221aa5c3839b980ab92efde0d18347251edf718f8d37a3fb8c5afcbaf254f697e320420cb91cc96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/xh/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/xh/firefox-57.0b13.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "9d8338b04f2d8f43a096049b11b8d359a1a09a22a2074bb0fb4364e8a551976810cef148405fb45800a4d751d2321e4d9492a79549d076a8dad3db33d22dafb1"; + sha512 = "19b4a96abda10b29ab9aada2d9ba70e259ba0a3082796def317e1869f27b6326fe03f9d909f6753f494caef08f0f24e41f5b8be16c5c84ccaf06cf354b926cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/zh-CN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/zh-CN/firefox-57.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d3f4dab15e4293cff13be4da142169c18b2d672c9af141287c388a31fd1aec4305ce178af1dad6a21fbeef571445cc15ee15c38464bccefb4eae80dbb03177b1"; + sha512 = "dd7e4c7bf1af9975f043bcc2be140b6c667f6dd74c2acc5d31963f6963fa5e0d7dc672fcfaca7ebfe99fd14cbd78725d24dc9c490c9ed1e211bd9e154e51c311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/zh-TW/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/zh-TW/firefox-57.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "4b82c8291dda948e1f63dcce2c8803c1ed1db862e585612c0c2de96e14c7442c2a845cf896c5fb9492cb4424c05f14ca5a546b30c6491f557c511f936153cac2"; + sha512 = "82b442aeb21b5b0fa7d48519ef5a1d3a6b57f2e013cc4e7a18b050cdd6632ec69e8383e58d0608515397a460a2bf339e03f3e11f780698d5b8e3cd4f3aa8f5fc"; } ]; } From caa8284e096bcda78f64c230df6b8f6c05990935 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Wed, 1 Nov 2017 16:17:44 +0300 Subject: [PATCH 2200/2806] rambox, franz: install xdg_utils for url opening xorg installs this, but wayland doesn't --- .../networking/instant-messengers/franz/default.nix | 7 +++++-- .../networking/instant-messengers/rambox/default.nix | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index a238009cd11..c2e6528e637 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeDesktopItem +{ stdenv, fetchurl, makeDesktopItem, makeWrapper , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig -, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -39,6 +39,8 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; + buildInputs = [ makeWrapper ]; + unpackPhase = '' tar xzf $src ''; @@ -59,6 +61,7 @@ in stdenv.mkDerivation rec { postFixup = '' paxmark m $out/opt/franz/Franz + wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 38d489de02a..55e78c0ec63 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, dpkg +{ stdenv, fetchurl, dpkg, makeWrapper , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig -, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; - buildInputs = [ dpkg ]; + buildInputs = [ dpkg makeWrapper ]; unpackPhase = "dpkg-deb -x $src ."; @@ -50,6 +50,7 @@ in stdenv.mkDerivation rec { postFixup = '' paxmark m $out/opt/Rambox/rambox + wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin ''; meta = with stdenv.lib; { From 85f5d5ce16f81635e05869eda702a9333a96f9fd Mon Sep 17 00:00:00 2001 From: gnidorah Date: Wed, 1 Nov 2017 17:09:54 +0300 Subject: [PATCH 2201/2806] rambox: 0.5.12 -> 0.5.13 --- .../networking/instant-messengers/rambox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 55e78c0ec63..7c8367d7f7f 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -6,7 +6,7 @@ let bits = if stdenv.system == "x86_64-linux" then "x64" else "ia32"; - version = "0.5.12"; + version = "0.5.13"; runtimeDeps = [ udev libnotify @@ -23,8 +23,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb"; sha256 = if bits == "x64" then - "1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else - "063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa"; + "0bn562fr1wsnn3xsd4q2rrxi6c56vckrkfmjl2dqb30hpmj2vn0d" else + "180ndvkil5mk5idwnn7spfygnhhll6pjc342pfzgmzk46a723qs4"; }; # don't remove runtime deps From b3b438a8fde43811c54c59ea905511cb1d49c9da Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 17 Oct 2017 13:38:18 +0300 Subject: [PATCH 2202/2806] mailnag: use setup.py --- .../networking/mailreaders/mailnag/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 281bc690bad..e04a5dd469b 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -6,7 +6,9 @@ , withNetworkManager ? true }: -pythonPackages.buildPythonApplication rec { +let + inherit (pythonPackages) python; +in pythonPackages.buildPythonApplication rec { name = "mailnag-${version}"; version = "1.2.1"; @@ -31,6 +33,10 @@ pythonPackages.buildPythonApplication rec { pygobject3 dbus-python pyxdg ]; + buildPhase = ""; + + installPhase = "${python}/bin/python setup.py install --prefix=$out"; + doCheck = false; meta = with stdenv.lib; { From 5c06711c80d560ee2c090f1373c9757398a52163 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 19 Oct 2017 22:00:17 +0300 Subject: [PATCH 2203/2806] mailnag: gnomekeyring by default --- .../networking/mailreaders/mailnag/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index e04a5dd469b..b1ca80fc7e4 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -2,8 +2,8 @@ , gdk_pixbuf, libnotify, gst_all_1 , libgnome_keyring3, networkmanager , wrapGAppsHook, gnome3 -, withGnomeKeyring ? false -, withNetworkManager ? true +# otherwise passwords are stored unencrypted +, withGnomeKeyring ? true }: let @@ -22,8 +22,7 @@ in pythonPackages.buildPythonApplication rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gnome3.defaultIconTheme - ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3 - ++ stdenv.lib.optional withNetworkManager networkmanager; + ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3; nativeBuildInputs = [ wrapGAppsHook From cf7d701108910120b68332d0b026133defa09c98 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Nov 2017 13:24:32 +0800 Subject: [PATCH 2204/2806] unetbootin: 655 -> 657 and make it build again --- pkgs/tools/cd-dvd/unetbootin/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 4d6ddd546db..0da3ff45a8c 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { name = "unetbootin-${version}"; - version = "655"; + version = "657"; src = fetchFromGitHub { owner = "unetbootin"; repo = "unetbootin"; rev = version; - sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py"; + sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy"; }; - sourceRoot = "${name}-src/src/unetbootin"; + sourceRoot = "source/src/unetbootin"; buildInputs = [ qt4 ]; nativeBuildInputs = [ makeWrapper qmake4Hook ]; @@ -42,18 +42,17 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - cp unetbootin $out/bin + runHook preInstall - mkdir -p $out/share/unetbootin - cp unetbootin_*.qm $out/share/unetbootin - - mkdir -p $out/share/applications - cp unetbootin.desktop $out/share/applications + install -Dm755 -t $out/bin unetbootin + install -Dm644 -t $out/share/unetbootin unetbootin_*.qm + install -Dm644 -t $out/share/applications unetbootin.desktop wrapProgram $out/bin/unetbootin \ --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \ --set QT_X11_NO_MITSHM 1 + + runHook postInstall ''; meta = with stdenv.lib; { From 0fd585fa62099f666082c67fb87ff99624f3c2aa Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Nov 2017 13:28:53 +0800 Subject: [PATCH 2205/2806] puddletag: fix the due to sourceRoot changes --- pkgs/applications/audio/puddletag/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index c140e1a46e5..f5f580b3664 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,20 +1,17 @@ { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: -let - pname = "puddletag"; - -in python2Packages.buildPythonApplication rec { - name = "${pname}-${version}"; +python2Packages.buildPythonApplication rec { + name = "puddletag-${version}"; version = "1.2.0"; src = fetchFromGitHub { - owner = "keithgg"; - repo = pname; - rev = "v${version}"; + owner = "keithgg"; + repo = "puddletag"; + rev = "v${version}"; sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; }; - sourceRoot = "${pname}-v${version}-src/source"; + sourceRoot = "source/source"; disabled = python2Packages.isPy3k; # work to support python 3 has not begun @@ -29,17 +26,21 @@ in python2Packages.buildPythonApplication rec { dontStrip = true; # we are not generating any binaries installPhase = '' + runHook preInstall + siteDir=$(toPythonPath $out) mkdir -p $siteDir PYTHONPATH=$PYTHONPATH:$siteDir ${python2Packages.python.interpreter} setup.py install --prefix $out + + runHook postInstall ''; meta = with stdenv.lib; { - homepage = https://puddletag.net; + homepage = https://puddletag.net; description = "An audio tag editor similar to the Windows program, Mp3tag"; - license = licenses.gpl3; - platforms = platforms.linux; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; } From 7c83413a7daac386ec32867ac2f8743daaee60e6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Nov 2017 13:46:43 +0800 Subject: [PATCH 2206/2806] virtmanager-qt: 0.43.72 -> 0.45.75 --- .../virtualization/virt-manager/qt.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index fe885d86456..00d68a7d311 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,17 +1,17 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtmultimedia, qtsvg -, lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol +, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol }: mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.43.72"; + version = "0.45.75"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "0m8aqs58wnk404z2hav5j4yjsy8f0vfsm771pm0gprsfbx4sm3qg"; + sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n"; }; cmakeFlags = [ @@ -20,20 +20,22 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtsvg lxqt.qtermwidget - libvirt libvncserver pixman spice_gtk spice_protocol + libvirt libvncserver pcre pixman spice_gtk spice_protocol ]; nativeBuildInputs = [ cmake pkgconfig ]; + enableParallelBuilding = true; + meta = with lib; { - homepage = http://f1ash.github.io/qt-virt-manager; + homepage = https://f1ash.github.io/qt-virt-manager; description = "Desktop user interface for managing virtual machines (QT)"; longDescription = '' The virt-manager application is a desktop user interface for managing virtual machines through libvirt. It primarily targets KVM VMs, but also manages Xen and LXC (linux containers). ''; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; } From 7b9d338c674e3163f4f75d4f3d33f72754d462f3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Nov 2017 14:11:06 +0800 Subject: [PATCH 2207/2806] pypi2nix: fix build --- pkgs/development/tools/pypi2nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 5bcbacff4b9..70c292365ab 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { if [ -e git-export ]; then mv git-export/src/pypi2nix $out/pkgs/pypi2nix else - mv pypi2nix*/src/pypi2nix $out/pkgs/pypi2nix + mv source/src/pypi2nix $out/pkgs/pypi2nix fi fi ''; From 1c431f4664d219368710c2db1d1b81e6e556978f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Nov 2017 09:08:42 +0100 Subject: [PATCH 2208/2806] stack2nix: fix build closes #30899 --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7bb62e1ccd0..f7df3ec3158 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -976,4 +976,6 @@ self: super: { # Build with gi overloading feature disabled. ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; }); + # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 + stack2nix = doJailbreak super.stack2nix; } From 8796e3b6803b4128fc2c47d5e585519ba62384f0 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 08:19:58 +0000 Subject: [PATCH 2209/2806] python.pkgs.joblib: disable tests properly --- pkgs/development/python-modules/joblib/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 0efd110d1de..eedbed250a1 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -6,6 +6,7 @@ , numpydoc , isPy3k , stdenv +, pytest }: @@ -18,14 +19,10 @@ buildPythonPackage rec { sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085"; }; - checkInputs = [ nose sphinx numpydoc ]; + checkInputs = [ sphinx numpydoc pytest ]; - # Failing test on Python 3.x and Darwin - postPatch = '''' + lib.optionalString (isPy3k || stdenv.isDarwin) '' - sed -i -e '70,84d' joblib/test/test_format_stack.py - # test_nested_parallel_warnings: ValueError: Non-zero return code: -9. - # Not sure why but it's nix-specific. Try removing for new joblib releases. - rm joblib/test/test_parallel.py + checkPhase = '' + py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test ''; meta = { @@ -33,4 +30,4 @@ buildPythonPackage rec { homepage = http://pythonhosted.org/joblib/; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} From d0d9ed6fa0c1f980baa13dee0f9a2ba65bd40f21 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 2 Nov 2017 09:30:15 +0100 Subject: [PATCH 2210/2806] tokei: fix build See #30088. --- pkgs/development/tools/misc/tokei/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index b44548c8ffd..2759b18e35c 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -13,13 +13,12 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0y0rkxhkv31v5sa0425dwskd80i6srwbqhqkrw1g1kbmbs9y0vxz"; - installPhase = '' - mkdir -p $out/bin - cp -p target/release/tokei $out/bin/ + buildPhase = '' + # do not pass --frozen since Cargo.lock has the wrong tokei version + cargo build --release ''; meta = with stdenv.lib; { - broken = true; description = "Count code, quickly"; homepage = https://github.com/Aaronepower/tokei; license = licenses.mit; From 9ac793f860622b40ac8856a89abec202abad51e3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 1 Nov 2017 21:43:48 +0800 Subject: [PATCH 2211/2806] plasma: 5.11.1 -> 5.11.2 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 352 ++++++++++++++++---------------- 2 files changed, 177 insertions(+), 177 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index f4d39604726..cb0f50727d7 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.2/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 900c6c0b2c4..5873f747060 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,355 +3,355 @@ { bluedevil = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/bluedevil-5.11.1.tar.xz"; - sha256 = "0p1y3p87xg7rjj35n81jg4v4yr2k7bf80qzfnwslbvwrpnzs982q"; - name = "bluedevil-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/bluedevil-5.11.2.tar.xz"; + sha256 = "0gwvmy8zn3wcdvcgc5j84gy1y7cxysy7bvnppg34rh6l5qc7vvjq"; + name = "bluedevil-5.11.2.tar.xz"; }; }; breeze = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/breeze-5.11.1.tar.xz"; - sha256 = "0yqbr7j0iqnmczbfv454f1l5x3787vzfchgkrd995d6za2d0w2lp"; - name = "breeze-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/breeze-5.11.2.tar.xz"; + sha256 = "1wv5dp657gw4vyiv9zf6r8qbs67sp5g0x0kf1vmr1bp0gkw0ai81"; + name = "breeze-5.11.2.tar.xz"; }; }; breeze-grub = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/breeze-grub-5.11.1.tar.xz"; - sha256 = "0pcri1z4min5m6wb6ncyjavwd9nszyis3cqdyw6mqb4av55z0xl0"; - name = "breeze-grub-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/breeze-grub-5.11.2.tar.xz"; + sha256 = "04m74iy0rijccmvqd7c9n4p6nk3flmb3zaf5qk8hv31qscg5qjaj"; + name = "breeze-grub-5.11.2.tar.xz"; }; }; breeze-gtk = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/breeze-gtk-5.11.1.tar.xz"; - sha256 = "0qb3ykf1mdw1iparsaxnypc4z41lfal6idksz9va25p3vclh02gr"; - name = "breeze-gtk-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/breeze-gtk-5.11.2.tar.xz"; + sha256 = "0c3vshnkgp6c38rwr1x34hn244r78qkc7fj0ax2cibydv3l852d4"; + name = "breeze-gtk-5.11.2.tar.xz"; }; }; breeze-plymouth = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/breeze-plymouth-5.11.1.tar.xz"; - sha256 = "1z175176583aqdvv6gwy7mdkndr50x1c8xdihrrcvdhvqy9qc7hr"; - name = "breeze-plymouth-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/breeze-plymouth-5.11.2.tar.xz"; + sha256 = "1v43z59y0zzwsrwa0y255i2q8krvr9yafdciyr63v4pb2564v4sd"; + name = "breeze-plymouth-5.11.2.tar.xz"; }; }; discover = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/discover-5.11.1.tar.xz"; - sha256 = "0zr53nw9lix80wlf7wa7irng2vvy80wccjs439ib8r1yh3ggiq4c"; - name = "discover-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/discover-5.11.2.tar.xz"; + sha256 = "0j31x26s446xvi6dxr83v15xbr6ysifiwvdzil8yfsynifhjk5n3"; + name = "discover-5.11.2.tar.xz"; }; }; drkonqi = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/drkonqi-5.11.1.tar.xz"; - sha256 = "0kq06sz39m8qg19b4cjqfwnx19j3s29hddhls8wywswwxlz4aq35"; - name = "drkonqi-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/drkonqi-5.11.2.tar.xz"; + sha256 = "1mgcp8zk4md0cyx6z6zz9s64jx9yshlnmsf1jxzhqwg8lyhyb77b"; + name = "drkonqi-5.11.2.tar.xz"; }; }; kactivitymanagerd = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kactivitymanagerd-5.11.1.tar.xz"; - sha256 = "1j36mbngga492xxhm1ndw1bnq1qn480qpvzi94wyax9y3r4szmhg"; - name = "kactivitymanagerd-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kactivitymanagerd-5.11.2.tar.xz"; + sha256 = "165nybhn7pwgr6fds6frwcp3qsnxpmkz3842h0ni0flkkcl74n52"; + name = "kactivitymanagerd-5.11.2.tar.xz"; }; }; kde-cli-tools = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kde-cli-tools-5.11.1.tar.xz"; - sha256 = "0di7ypyhda4gpadhi0lbji4nyi9xk1y844kxfb586wpzkim5w82c"; - name = "kde-cli-tools-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kde-cli-tools-5.11.2.tar.xz"; + sha256 = "18pl9v2dxayzwzk4rw674ka3j45dj864604hgg0874kkr3kgsgka"; + name = "kde-cli-tools-5.11.2.tar.xz"; }; }; kdecoration = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kdecoration-5.11.1.tar.xz"; - sha256 = "1jpvdscmy5ymyvj22784swvf6181f7ggr875djhx57c7i4shb3ph"; - name = "kdecoration-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kdecoration-5.11.2.tar.xz"; + sha256 = "0qkh3p1zzvk0yvlpbvwfgmb2wvj0gd3j2sbz10vplf66fm3ck2va"; + name = "kdecoration-5.11.2.tar.xz"; }; }; kde-gtk-config = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kde-gtk-config-5.11.1.tar.xz"; - sha256 = "1afbwdrjdv9a2qwyxysgnslavan20cmhrz88kmnf9imxlll0i7al"; - name = "kde-gtk-config-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kde-gtk-config-5.11.2.tar.xz"; + sha256 = "0vhmpma2ssp7nqdy8yd12d42y2a2fnsyyz9msi4s7n1w5qga0g5p"; + name = "kde-gtk-config-5.11.2.tar.xz"; }; }; kdeplasma-addons = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kdeplasma-addons-5.11.1.tar.xz"; - sha256 = "09dwmd1aiiivkvdbyv97fili067sd8mw9dpknawair4mh7qb0zln"; - name = "kdeplasma-addons-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kdeplasma-addons-5.11.2.tar.xz"; + sha256 = "0x1lgvcnrc9vcy9fqvc60ilmcm8pbym76fq784qmgnmzm0br3bq6"; + name = "kdeplasma-addons-5.11.2.tar.xz"; }; }; kgamma5 = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kgamma5-5.11.1.tar.xz"; - sha256 = "1m9maxzn5y3zijmj2fkwsfwhinprhz97v9fi312dmwyvfhq3qvyd"; - name = "kgamma5-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kgamma5-5.11.2.tar.xz"; + sha256 = "0k6j6nl26bhdavfr4y0ph17fywprzxjnamh67vibk39xg6vwa56d"; + name = "kgamma5-5.11.2.tar.xz"; }; }; khotkeys = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/khotkeys-5.11.1.tar.xz"; - sha256 = "0d1p1sia9qvdls38m29jijsf1ya8zvza557flmhcajb5ldn243l5"; - name = "khotkeys-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/khotkeys-5.11.2.tar.xz"; + sha256 = "1w1a06v2cgq48z0b1rz6px1g14hm7f5jxzxf7sa26yszsyhwqglm"; + name = "khotkeys-5.11.2.tar.xz"; }; }; kinfocenter = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kinfocenter-5.11.1.tar.xz"; - sha256 = "0ivhf460y83qv4qdphdvskx2nlfqzy453xfnq7ldyzp2yacdmcc8"; - name = "kinfocenter-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kinfocenter-5.11.2.tar.xz"; + sha256 = "1131gnqapnin8i4bm3skzhfsqgcaynaxn9xgfwxnj64z41cc8z8l"; + name = "kinfocenter-5.11.2.tar.xz"; }; }; kmenuedit = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kmenuedit-5.11.1.tar.xz"; - sha256 = "081lqh5ck854pha1f99w6w4j032spl3v28ild61fmhvhzkvx48a6"; - name = "kmenuedit-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kmenuedit-5.11.2.tar.xz"; + sha256 = "03412s6wc9h2422lx57rg65zln9ywjk5gbs5mqjr6fi46a1zp5lg"; + name = "kmenuedit-5.11.2.tar.xz"; }; }; kscreen = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kscreen-5.11.1.tar.xz"; - sha256 = "1skdg59qacxxkiyz3gc1nn4y4lflbynpcb4mpsliqb2n2xdhvg8r"; - name = "kscreen-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kscreen-5.11.2.tar.xz"; + sha256 = "0bs09zfq1cs1ajgvz4p7l5naa3g3vzp72v9q7qkncx8yqiffxlnc"; + name = "kscreen-5.11.2.tar.xz"; }; }; kscreenlocker = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kscreenlocker-5.11.1.tar.xz"; - sha256 = "0jgq2w7zi1i4wdlfmfz1jh1kbkcn2lxkdg9ds5brisc3f6r4n3vg"; - name = "kscreenlocker-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kscreenlocker-5.11.2.tar.xz"; + sha256 = "1k32nzhv9d4g5ijkx8bl22hp5j1g22frriwq14xjw47ga8vkqmxw"; + name = "kscreenlocker-5.11.2.tar.xz"; }; }; ksshaskpass = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/ksshaskpass-5.11.1.tar.xz"; - sha256 = "00ghycjmagc8mjwsgny9bkr45ppnad6aay44ha6fn5gyx973xcmx"; - name = "ksshaskpass-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/ksshaskpass-5.11.2.tar.xz"; + sha256 = "1z3vm8kwyi9pf51bhpqf3phbjkbrqfj4iiqzzs0aqm0l5db5il0r"; + name = "ksshaskpass-5.11.2.tar.xz"; }; }; ksysguard = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/ksysguard-5.11.1.tar.xz"; - sha256 = "11z29w95ji815gwaggs0n9bw8f040z4fd87ci2wmqcpyrjs7a6z1"; - name = "ksysguard-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/ksysguard-5.11.2.tar.xz"; + sha256 = "0vy2ivsn0cg70n1cxwa2385fwh350xngc1429zjfcs0jj8lcj21l"; + name = "ksysguard-5.11.2.tar.xz"; }; }; kwallet-pam = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kwallet-pam-5.11.1.tar.xz"; - sha256 = "0zipldqjg3mazm2j7vrxkc0pqp7x7mmdq7cg1vlb1xlj8ld2vl7y"; - name = "kwallet-pam-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kwallet-pam-5.11.2.tar.xz"; + sha256 = "1jr4zvf9c5npi9mcgil5byx4bwh6kaa205329p5z8i15n1zf250f"; + name = "kwallet-pam-5.11.2.tar.xz"; }; }; kwayland-integration = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kwayland-integration-5.11.1.tar.xz"; - sha256 = "1h1lcvzbcf628hs5hj3ykpzy086ylvf5bz63gr0clhyckjxrbbkh"; - name = "kwayland-integration-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kwayland-integration-5.11.2.tar.xz"; + sha256 = "1dzlf9638d36h8z5a7rjbb0xl2wjqg04j37gn4jnjclm57bwlrjm"; + name = "kwayland-integration-5.11.2.tar.xz"; }; }; kwin = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kwin-5.11.1.tar.xz"; - sha256 = "1anc8pblpsb8g7lvnq43ji6fgpwxsnmypc3gkip26lb4j7gqfhqm"; - name = "kwin-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kwin-5.11.2.tar.xz"; + sha256 = "1wvq4pll1adncj88qd7isc0ip7hx2c72ah0vvmvxmkwxa4r5a89b"; + name = "kwin-5.11.2.tar.xz"; }; }; kwrited = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kwrited-5.11.1.tar.xz"; - sha256 = "11y2dpjs0g01nah1924dzf39y1smzlswc6nx1cwgfky3raaz3cj0"; - name = "kwrited-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kwrited-5.11.2.tar.xz"; + sha256 = "17i33yvpvpj6q42c58adb99xs1yb7yfchs626vw5nmllv7r7496l"; + name = "kwrited-5.11.2.tar.xz"; }; }; libkscreen = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/libkscreen-5.11.1.tar.xz"; - sha256 = "0drv6f8gzilirwp7p31qrng7cdp7b23ar5v1d5bkdrr1q29z8wdv"; - name = "libkscreen-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/libkscreen-5.11.2.tar.xz"; + sha256 = "18bf7mzzri7fj8iw60wqbs6w46lin8lninpqpcs5fwz6m81lcxsg"; + name = "libkscreen-5.11.2.tar.xz"; }; }; libksysguard = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/libksysguard-5.11.1.tar.xz"; - sha256 = "1m8514jv2487fbypxys65qb0a55psqvyzkw5l81ka4ydnrhl2hhm"; - name = "libksysguard-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/libksysguard-5.11.2.tar.xz"; + sha256 = "12d0r4rilydbqdgkm256khvkb9m0hya3p27xqvv3hg77wgxzdl3f"; + name = "libksysguard-5.11.2.tar.xz"; }; }; milou = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/milou-5.11.1.tar.xz"; - sha256 = "1v7rbjw8i1pdvl60xh8s0srrp17jks360zk42rp3hq9srsffd8cp"; - name = "milou-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/milou-5.11.2.tar.xz"; + sha256 = "0kxf2q0pk7kyfirrspgpwlnj18v8q2770rrmrv0jcfsgv4jhl2gj"; + name = "milou-5.11.2.tar.xz"; }; }; oxygen = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/oxygen-5.11.1.tar.xz"; - sha256 = "0b3yl4q5cbcj6d07xrmifpvwysaa870gf56a7l38zjba6z04819z"; - name = "oxygen-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/oxygen-5.11.2.tar.xz"; + sha256 = "18nkw02q7lzdhalmbwsb5i704szs19zc5a0z73smanf20cfq7a91"; + name = "oxygen-5.11.2.tar.xz"; }; }; plasma-desktop = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-desktop-5.11.1.tar.xz"; - sha256 = "1r7chviykyq2650k513qcp665pv8vpdczvbrvqfhbpn4yy47crps"; - name = "plasma-desktop-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-desktop-5.11.2.tar.xz"; + sha256 = "0dz57qywlircjjybxzb3mqxwaid86zdfwjgfwcb6fhm8rxhbhrzq"; + name = "plasma-desktop-5.11.2.tar.xz"; }; }; plasma-integration = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-integration-5.11.1.tar.xz"; - sha256 = "0jpshilcpklyx7cbpn0cf96md2h6pwd86bk8lphzm64zv3c655ly"; - name = "plasma-integration-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-integration-5.11.2.tar.xz"; + sha256 = "15vjmmrlk9dw0if0z3xam171f8z3qkjcllj3zyc0zxdwi2zw6i2l"; + name = "plasma-integration-5.11.2.tar.xz"; }; }; plasma-nm = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-nm-5.11.1.tar.xz"; - sha256 = "0479cqy7503krish11djg7rc4g7kdlbj3gapsbgvlq9x6j7ixz1p"; - name = "plasma-nm-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-nm-5.11.2.tar.xz"; + sha256 = "1h3ajq3fdv8fn0r51cpkhihacpjvpgzpfyg2m9aydh7ajygf0njq"; + name = "plasma-nm-5.11.2.tar.xz"; }; }; plasma-pa = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-pa-5.11.1.tar.xz"; - sha256 = "0g565v4dwcn6jppn1p2dvljg5r39xmgjzgf8rcipw70kcwc1nx4c"; - name = "plasma-pa-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-pa-5.11.2.tar.xz"; + sha256 = "1ckk4ckhy5y3b6cm7gahwkqvf8bxndk0srij3ggqdasxzdc4fjn8"; + name = "plasma-pa-5.11.2.tar.xz"; }; }; plasma-sdk = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-sdk-5.11.1.tar.xz"; - sha256 = "0ss148yig5zzprkk2ydq3np34gr0bnbh1gn18hgb5z33iglbdl3n"; - name = "plasma-sdk-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-sdk-5.11.2.tar.xz"; + sha256 = "10ayy3r36ysq3a79nlpqspfff0s28iq2xyp5767qpmzfrjby4bcx"; + name = "plasma-sdk-5.11.2.tar.xz"; }; }; plasma-tests = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-tests-5.11.1.tar.xz"; - sha256 = "03r5dczb9iqigg2s7h0k6zgb616358lqvl2h0k0bg2hxggnh8lpk"; - name = "plasma-tests-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-tests-5.11.2.tar.xz"; + sha256 = "06k1cmmbyp4rslhmj6b1ngq6pg0hv9hmc3yi135vjgppj5x523mm"; + name = "plasma-tests-5.11.2.tar.xz"; }; }; plasma-vault = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-vault-5.11.1.tar.xz"; - sha256 = "09wbjk0bsbjyh5n1d5gywdvaimajqr50sd23dbfdbnpi3br0gk10"; - name = "plasma-vault-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-vault-5.11.2.tar.xz"; + sha256 = "1lxp40lmb03aicw9lz742i1lrigkki76yy7p5h9gnb4djzv5h0m6"; + name = "plasma-vault-5.11.2.tar.xz"; }; }; plasma-workspace = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-5.11.1.tar.xz"; - sha256 = "1fy4bdxrz8mn29nc2qjxjnpxzjy9mynwwdjxj0jr61w0ljd40wiy"; - name = "plasma-workspace-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-5.11.2.tar.xz"; + sha256 = "12i7raf4qqinr3wd4kzz96pkng19c7mdjqz28m8jwb3c1gdlps2w"; + name = "plasma-workspace-5.11.2.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-wallpapers-5.11.1.tar.xz"; - sha256 = "0dcfrad2543fxapizmlikv52m9nmdg45gddvh9chc83kangsydlc"; - name = "plasma-workspace-wallpapers-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-wallpapers-5.11.2.tar.xz"; + sha256 = "01a4cz7d15mrb96yhfvck61vbqdnw208mgssrllrmcfdn7hwalv1"; + name = "plasma-workspace-wallpapers-5.11.2.tar.xz"; }; }; plymouth-kcm = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plymouth-kcm-5.11.1.tar.xz"; - sha256 = "0w3yhazbx79s9k1yc3lj16hanc3wrqphhk9zjl9q1vxsn2rzas8h"; - name = "plymouth-kcm-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plymouth-kcm-5.11.2.tar.xz"; + sha256 = "1dig5msins4grby4lvrrby0adjci8yplq1nw52xq571qvvcixjf4"; + name = "plymouth-kcm-5.11.2.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.11.1"; + version = "1-5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/polkit-kde-agent-1-5.11.1.tar.xz"; - sha256 = "04ycjqx9hnk3ab8qxk5gqz7b4r7im3bwap613qcgxjqr5cagp66w"; - name = "polkit-kde-agent-1-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/polkit-kde-agent-1-5.11.2.tar.xz"; + sha256 = "0qbr8c3fn6yp6ixfcfg4190q2wdj1xlm6791nn23bynd0nrxmxb3"; + name = "polkit-kde-agent-1-5.11.2.tar.xz"; }; }; powerdevil = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/powerdevil-5.11.1.tar.xz"; - sha256 = "02rf8iz2spcc78xs88dknl6a7slwgfgh4ra8lhwk69d210cxgahq"; - name = "powerdevil-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/powerdevil-5.11.2.tar.xz"; + sha256 = "10ah28rqdn8xhz578yhcnampbfq7vh89gm0jzjx9ryxiv6rch2cw"; + name = "powerdevil-5.11.2.tar.xz"; }; }; sddm-kcm = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/sddm-kcm-5.11.1.tar.xz"; - sha256 = "0sac2cknq7m26v8a59q1aakn6xjzmspnslfs6k633a8yz8w4lh19"; - name = "sddm-kcm-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/sddm-kcm-5.11.2.tar.xz"; + sha256 = "159qwvzk7g4ygg2sdb6k84vq0k1yadrgwzgq6sfbfhffim1w6dr1"; + name = "sddm-kcm-5.11.2.tar.xz"; }; }; systemsettings = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/systemsettings-5.11.1.tar.xz"; - sha256 = "0bnygmb3g573b7a8g0qg3ddj65miw29v3p25sh0ic9ij5bx6f4rw"; - name = "systemsettings-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/systemsettings-5.11.2.tar.xz"; + sha256 = "11gcrd1i28hifjysvnj97fcy619h660j4bgszj9lmr8w554j0cri"; + name = "systemsettings-5.11.2.tar.xz"; }; }; user-manager = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/user-manager-5.11.1.tar.xz"; - sha256 = "1iz5wm8d3ljn97msbh1bc7v8zmmgxrfr5mwfzh0ssdldba4wqlpm"; - name = "user-manager-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/user-manager-5.11.2.tar.xz"; + sha256 = "1pyyhhi276s8503q65n25rqwcddcbzy6l2vl844dnmmpd1m0gi4r"; + name = "user-manager-5.11.2.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/xdg-desktop-portal-kde-5.11.1.tar.xz"; - sha256 = "0w822jlg0h7qim70zamm7q5x2b614qmiggz9wr8yxq80lajizxnf"; - name = "xdg-desktop-portal-kde-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/xdg-desktop-portal-kde-5.11.2.tar.xz"; + sha256 = "0yjidwqk25c7grj42facqfl84ai7h4fin0zlf8y9jdksv26hskl0"; + name = "xdg-desktop-portal-kde-5.11.2.tar.xz"; }; }; } From faa9afbdfd492ed262e67383fa69d5cddeb0e415 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 2 Nov 2017 10:48:03 +0100 Subject: [PATCH 2212/2806] masterpdfeditor: move assets into $out/opt/masterpdfeditor, symlink from $out/bin --- .../applications/misc/masterpdfeditor/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 764d400820d..76d23f1a8f0 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -22,26 +22,25 @@ ]; dontStrip = true; installPhase = '' - mkdir -p $out/bin $out/share/applications $out/share/pixmaps + p=$out/opt/masterpdfeditor + mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps substituteInPlace masterpdfeditor4.desktop \ --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" - - cp -v masterpdfeditor4 $out/bin/masterpdfeditor4 cp -v masterpdfeditor4.png $out/share/pixmaps/ cp -v masterpdfeditor4.desktop $out/share/applications - cp -v -r stamps $out/bin/stamps - cp -v -r templates $out/bin/templates - cp -v -r lang $out/bin/lang - cp -v -r fonts $out/bin/fonts + cp -v masterpdfeditor4 $p/ + ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v -r stamps templates lang fonts $p + install -D license.txt $out/share/$name/LICENSE patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ - $out/bin/masterpdfeditor4 + $p/masterpdfeditor4 ''; meta = with stdenv.lib; { description = "Master PDF Editor"; From 5826097522a22d8e1db72441aac26d68bf31966d Mon Sep 17 00:00:00 2001 From: Evan Wallace Date: Thu, 2 Nov 2017 09:53:09 +0000 Subject: [PATCH 2213/2806] utox: Fixed test configuration Moved 'check' to nativeBuildInputs, as it is only used by the tests --- .../networking/instant-messengers/utox/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 7506949f153..9c4d88761b8 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore dbus libvpx libX11 openal freetype libv4l libXrender fontconfig libXext libXft filter-audio - libsodium libopus check + libsodium libopus ]; nativeBuildInputs = [ - cmake git pkgconfig + cmake git pkgconfig check ]; cmakeFlags = [ @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { doCheck = false; + checkTarget = "test"; + meta = with stdenv.lib; { description = "Lightweight Tox client"; homepage = https://github.com/uTox/uTox; From ccbcf15c8ee86bd1c2e4eae39d225fab63b376f5 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Wed, 1 Nov 2017 01:25:13 +0100 Subject: [PATCH 2214/2806] nodejs: refactor generic build function This removes some duplicated and dead code across the different versions of nodejs. --- pkgs/development/web/nodejs/nodejs.nix | 29 +++++++++++++------ pkgs/development/web/nodejs/v4.nix | 23 +++++---------- pkgs/development/web/nodejs/v6.nix | 22 +++++--------- pkgs/development/web/nodejs/v8.nix | 24 +++++----------- pkgs/development/web/nodejs/v9.nix | 24 +++++----------- pkgs/top-level/all-packages.nix | 40 ++++++-------------------- 6 files changed, 56 insertions(+), 106 deletions(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index d7917c52c99..eafaf956ee0 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage +{ stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser +, pkgconfig, which , darwin ? null -, enableNpm ? true }: with stdenv.lib; +{ enableNpm ? true, version, sha256, patches }: + let inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + + + baseName = if enableNpm then "nodejs" else "nodejs-slim"; + sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; }); sharedConfigureFlags = concatMap (name: [ @@ -25,12 +29,20 @@ let extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; in - rec { + stdenv.mkDerivation { + inherit version; + + name = "${baseName}-${version}"; + + src = fetchurl { + url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; + inherit sha256; + }; buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ python2 which zlib libuv openssl ] ++ optionals stdenv.isLinux [ utillinux http-parser ] - ++ optionals stdenv.isDarwin [ pkgconfig libtool ]; + ++ optionals stdenv.isDarwin [ pkgconfig darwin.cctools ]; configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags; @@ -40,10 +52,9 @@ in passthru.interpreterName = "nodejs"; - setupHook = ./setup-hook.sh; - patches = optionals stdenv.isDarwin [ ./no-xcode.patch ]; + inherit patches; preBuild = optionalString stdenv.isDarwin '' sed -i -e "s|tr1/type_traits|type_traits|g" \ @@ -59,7 +70,7 @@ in paxmark m $out/bin/node PATH=$out/bin:$PATH patchShebangs $out - ${optionalString enableNpm '' + ${optionalString enableNpm '' mkdir -p $out/share/bash-completion/completions/ $out/bin/npm completion > $out/share/bash-completion/completions/npm ''} diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index d3ad4d11e4c..08fd91aaf8d 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -1,20 +1,11 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage -, darwin ? null -, enableNpm ? true -}@args: +{ stdenv, callPackage, lib, enableNpm ? true }: let - nodejs = import ./nodejs.nix args; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; + buildNodejs = callPackage ./nodejs.nix {}; in - stdenv.mkDerivation (nodejs // rec { + buildNodejs { + inherit enableNpm; version = "4.8.5"; - name = "${baseName}-${version}"; - src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4"; - }; - - }) + sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; + } diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index e516d9b99b6..c703377d5a0 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -1,19 +1,11 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage -, darwin ? null -, enableNpm ? true -}@args: +{ stdenv, callPackage, lib, enableNpm ? true }: let - nodejs = import ./nodejs.nix args; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; + buildNodejs = callPackage ./nodejs.nix {}; in - stdenv.mkDerivation (nodejs // rec { + buildNodejs { + inherit enableNpm; version = "6.11.5"; - name = "${baseName}-${version}"; - src = fetchurl { - url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w"; - }; - }) + sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; + } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index c47a65bb4e1..1735d1cf9cf 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -1,21 +1,11 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage -, darwin ? null -, enableNpm ? true -}@args: +{ stdenv, callPackage, lib, enableNpm ? true }: let - nodejs = import ./nodejs.nix args; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; + buildNodejs = callPackage ./nodejs.nix {}; in - stdenv.mkDerivation (nodejs // rec { + buildNodejs { + inherit enableNpm; version = "8.9.0"; - name = "${baseName}-${version}"; - src = fetchurl { - url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "128ir6rkdz1xj55hbflw0sh7snrrvjwgvxmgnka7cyhjkvw5i0mf"; - }; - - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; - }) + sha256 = "128ir6rkdz1xj55hbflw0sh7snrrvjwgvxmgnka7cyhjkvw5i0mf"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index 7b99275eedc..aa51421253f 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -1,21 +1,11 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage -, darwin ? null -, enableNpm ? true -}@args: +{ stdenv, callPackage, lib, enableNpm ? true }: let - nodejs = import ./nodejs.nix args; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; + buildNodejs = callPackage ./nodejs.nix {}; in - stdenv.mkDerivation (nodejs // rec { + buildNodejs { + inherit enableNpm; version = "9.0.0"; - name = "${baseName}-${version}"; - src = fetchurl { - url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv"; - }; - - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; - }) + sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dc3f0c7a88..fe2e0df71bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3028,41 +3028,17 @@ with pkgs; nodejs-slim = nodejs-slim-6_x; - nodejs-4_x = callPackage ../development/web/nodejs/v4.nix { - libtool = darwin.cctools; - }; + nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {}; + nodejs-slim-4_x = callPackage ../development/web/nodejs/v4.nix { enableNpm = false; }; - nodejs-slim-4_x = callPackage ../development/web/nodejs/v4.nix { - libtool = darwin.cctools; - enableNpm = false; - }; + nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {}; + nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { enableNpm = false; }; - nodejs-6_x = callPackage ../development/web/nodejs/v6.nix { - libtool = darwin.cctools; - }; + nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {}; + nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; - nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { - libtool = darwin.cctools; - enableNpm = false; - }; - - nodejs-8_x = callPackage ../development/web/nodejs/v8.nix { - libtool = darwin.cctools; - }; - - nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { - libtool = darwin.cctools; - enableNpm = false; - }; - - nodejs-9_x = callPackage ../development/web/nodejs/v9.nix { - libtool = darwin.cctools; - }; - - nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { - libtool = darwin.cctools; - enableNpm = false; - }; + nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {}; + nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; }; nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; From 538acd9060df09045558c67cf98792a3902c5f3c Mon Sep 17 00:00:00 2001 From: Pierre-Etienne Meunier Date: Thu, 2 Nov 2017 11:10:47 +0100 Subject: [PATCH 2215/2806] ACME module: add server option (#31122) --- nixos/modules/security/acme.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index a40c5ef9ebe..fb011019f7f 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -139,6 +139,20 @@ in ''; }; + production = mkOption { + type = types.bool; + default = true; + description = '' + If set to true, use Let's Encrypt's production environment + instead of the staging environment. The main benefit of the + staging environment is to get much higher rate limits. + + See + https://letsencrypt.org/docs/staging-environment + for more detail. + ''; + }; + certs = mkOption { default = { }; type = with types; attrsOf (submodule certOpts); @@ -177,7 +191,9 @@ in cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ] ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins - ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); + ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains) + ++ (if cfg.production then [] + else ["--server" "https://acme-staging.api.letsencrypt.org/directory"]); acmeService = { description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" "network-online.target" ]; From c37c896ee00087b1e7d120938c213ed8c7840c26 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 2 Nov 2017 11:28:14 +0100 Subject: [PATCH 2216/2806] linux: 4.13.10 -> 4.13.11 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 8d4df067c83..bb40bbcb72e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.10"; + version = "4.13.11"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0c33v0y4hyklhz7i00sjrj2cpn6zlwc7qjj7w2zzxmnr9yn90c6x"; + sha256 = "1vzl2i72c8iidhdc8a490npsbk7q7iphjqil4i9609disqw75gx4"; }; } // (args.argsOverride or {})) From 6021ca25dbec863a52ed31c179814e0ff73ff4cf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 2 Nov 2017 11:28:27 +0100 Subject: [PATCH 2217/2806] linux: 4.4.95 -> 4.4.96 --- 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 a695fe34cd6..3a49c348687 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.95"; + version = "4.4.96"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07vkxhh435gilxsh9ag6zvf2r9k5l9ffqp72900c50nsfjrdgdrx"; + sha256 = "1asvcqip5w9nkg4c5jllbjygski9cnw7qn6ci7p6zwnd2mfks794"; }; } // (args.argsOverride or {})) From 68b5ec06b90406e81a2ff059f02fc25bf63b82af Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 2 Nov 2017 11:28:40 +0100 Subject: [PATCH 2218/2806] linux: 4.9.59 -> 4.9.60 --- 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 72959dd7a9e..7431694e362 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.59"; + version = "4.9.60"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16rj4wg8psh3d47x8disk275nzzv26drvp03hi0r44mxw0lmd53k"; + sha256 = "015dzkrhadmr3kadz0m3yhjikkmga8dv90f6s5ji5i2ja5f6qchf"; }; } // (args.argsOverride or {})) From 22beeeab7684994aab938a849455686ea2f2509c Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sat, 14 Oct 2017 15:45:35 +0200 Subject: [PATCH 2219/2806] criu: 2.0 -> 2.12.1 --- pkgs/os-specific/linux/criu/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 6f14e713139..23d1c4821b8 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,26 +1,27 @@ { stdenv, fetchurl, protobuf, protobufc, asciidoc -, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, pkgconfig +, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig , python }: stdenv.mkDerivation rec { name = "criu-${version}"; - version = "2.0"; + version = "2.12.1"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "1zqqshslcf503lqip89azp1zz0i8kb7v19b3dyp52izpak62c1z8"; + sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig docbook_xsl ]; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; patchPhase = '' 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 "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" "" + 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. @@ -31,7 +32,9 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; - hardeningDisable = [ "stackprotector" ]; + hardeningDisable = [ "stackprotector" "fortify" ]; + # dropping fortify here as well as package uses it by default: + # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] installPhase = '' mkdir -p $out/etc/logrotate.d From 1fc6f4695ce03cba4d48c42ab4874d90d86ea3a8 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Thu, 2 Nov 2017 05:09:47 -0700 Subject: [PATCH 2220/2806] iwona (font): init at 0_995 (#31067) * iwona: init at 0_995 * iwona: nitpicks --- pkgs/data/fonts/iwona/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/data/fonts/iwona/default.nix diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix new file mode 100644 index 00000000000..3649aad99f4 --- /dev/null +++ b/pkgs/data/fonts/iwona/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "iwona-${version}"; + version = "0_995"; + + src = fetchzip { + url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip"; + sha256 = "1wj5bxbxpz5a8p3rhw708cyjc0lgqji8g0iv6brmmbrrkpb3jq2s"; + }; + + installPhase = '' + install -m 444 -D -t $out/share/fonts/opentype/ *.otf + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa"; + + meta = with stdenv.lib; { + description = "A two-element sans-serif typeface, created by Małgorzata Budyta"; + homepage = http://jmn.pl/en/kurier-i-iwona/; + # "[...] GUST Font License (GFL), which is a free license, legally + # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or + # later." - GUST website + license = licenses.lppl13c; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8832afb256..c7f9ebf611e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13319,6 +13319,8 @@ with pkgs; ipafont = callPackage ../data/fonts/ipafont {}; ipaexfont = callPackage ../data/fonts/ipaexfont {}; + iwona = callPackage ../data/fonts/iwona { }; + junicode = callPackage ../data/fonts/junicode { }; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; From 7dce131b8625e4cb51f1e4ebcb28f88e21458c14 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 7 Sep 2017 03:29:36 +0200 Subject: [PATCH 2221/2806] kernelmptcp: 0.91.3 -> 0.92.1 --- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 10 +++++----- pkgs/os-specific/linux/kernel/patches.nix | 9 --------- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index dc4d10a0412..4c237cb24b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,18 +1,18 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - mptcpVersion = "0.91.3"; - modDirVersion = "4.1.38"; + mptcpVersion = "0.92.1"; + modDirVersion = "4.4.83"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; extraMeta = { - branch = "4.1"; - maintainers = [ stdenv.lib.maintainers.layus ]; + branch = "4.4"; + maintainers = with stdenv.lib.maintainers; [ teto layus ]; }; src = fetchurl { url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; - sha256 = "0vqjnkzcbbvyq24w3cryfmw7hhws1xqkkxqcv71szkbqqs6mcr14"; + sha256 = "1afjqmxq9p5gyr6r607bx3mqpnx451kfpwlffzxwgdwnf93alngz"; }; extraConfig = '' diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 93d7acdd8e7..c1288108b4f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -58,15 +58,6 @@ rec { cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - DCCP_double_free_vulnerability_CVE-2017-6074 = rec - { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch"; - patch = fetchpatch { - inherit name; - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4"; - sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2"; - }; - }; - tag_hardened = rec { name = "tag-hardened"; patch = ./tag-hardened.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7f9ebf611e..420c84b9b2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12394,11 +12394,12 @@ with pkgs; }; }; + # linux mptcp is based on the 4.4 kernel linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes - kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 + kernelPatches.cpu-cgroup-v2."4.4" ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From d9f9c0d0d11dbe3f3c9535d816c38b7c0898bb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 2 Nov 2017 10:15:48 -0200 Subject: [PATCH 2222/2806] qtermwidget: keep version 0.7.1, needed by virt-manager-qt --- .../virtualization/virt-manager/qt.nix | 3 ++- pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix | 26 +++++++++++++++++++ pkgs/desktops/lxqt/default.nix | 2 ++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index fe885d86456..2e0503f5a37 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -19,7 +19,8 @@ mkDerivation rec { ]; buildInputs = [ - qtbase qtmultimedia qtsvg lxqt.qtermwidget + # virt-manager-qt currently does not compile with qtermwidget-0.8.0 + qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1 libvirt libvncserver pixman spice_gtk spice_protocol ]; diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix new file mode 100644 index 00000000000..6bd6e2833f5 --- /dev/null +++ b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, qt5 }: + +stdenv.mkDerivation rec { + name = "${pname}_0_7_1-${version}"; + pname = "qtermwidget"; + version = "0.7.1"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt5.qtbase ]; + + meta = with stdenv.lib; { + description = "A terminal emulator widget for Qt 5"; + homepage = https://github.com/lxde/qtermwidget; + license = licenses.gpl2; + platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 16e864890f1..79896c7b90c 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -29,6 +29,8 @@ let lxqt-themes = callPackage ./core/lxqt-themes { }; pavucontrol-qt = callPackage ./core/pavucontrol-qt { }; qtermwidget = callPackage ./core/qtermwidget { }; + # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0 + qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { }; ### CORE 2 lxqt-panel = callPackage ./core/lxqt-panel { }; From 7f921735e76076196a93fa55c234a6f1d01534a9 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Fri, 22 Sep 2017 03:39:00 -0700 Subject: [PATCH 2223/2806] strongswan: allow configuring enabled plugins --- .../services/networking/strongswan.nix | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index b0eb0460b9b..3a3f64221c4 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -32,8 +32,10 @@ let ${caConf} ''; - strongswanConf = {setup, connections, ca, secrets}: toFile "strongswan.conf" '' + strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' charon { + ${if managePlugins then "load_modular = no" else ""} + ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""} plugins { stroke { secrets_file = ${ipsecSecrets secrets} @@ -112,6 +114,25 @@ in file. ''; }; + + managePlugins = mkOption { + type = types.bool; + default = false; + description = '' + If set to true, this option will disable automatic plugin loading and + then tell strongSwan to enable the plugins specified in the + option. + ''; + }; + + enabledPlugins = mkOption { + type = types.listOf types.str; + default = []; + description = '' + A list of additional plugins to enable if + is true. + ''; + }; }; config = with cfg; mkIf enable { @@ -122,7 +143,7 @@ in wants = [ "keys.target" ]; after = [ "network-online.target" "keys.target" ]; environment = { - STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; }; + STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; }; }; serviceConfig = { ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork"; From 8904ce343a67071dd080260d356fea556de7d0f2 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 2 Nov 2017 12:54:20 +0000 Subject: [PATCH 2224/2806] fix source root locations. These have changed following commit https://github.com/NixOS/nixpkgs/commit/c3255fe8ec326d2c8fe9462d49ed83aa64d3e68f. See also: - https://github.com/NixOS/nixpkgs/pull/31004 - https://github.com/NixOS/nixpkgs/pull/31106 --- pkgs/applications/audio/puddletag/default.nix | 4 +++- pkgs/applications/graphics/nomacs/default.nix | 4 +++- pkgs/applications/graphics/screencloud/default.nix | 4 +++- .../pidgin-plugins/pidgin-skypeweb/default.nix | 4 +++- pkgs/applications/science/misc/golly/default.nix | 4 +++- pkgs/development/compilers/dmd/2.067.1.nix | 3 +++ pkgs/development/compilers/dmd/default.nix | 3 +++ pkgs/development/compilers/ldc/default.nix | 4 ++++ pkgs/development/libraries/bobcat/default.nix | 4 +++- pkgs/development/libraries/cxxtest/default.nix | 4 +++- pkgs/development/libraries/openvdb/default.nix | 4 +++- pkgs/development/libraries/partio/default.nix | 2 -- pkgs/development/libraries/ptex/default.nix | 2 -- pkgs/development/tools/build-managers/icmake/default.nix | 5 ++++- pkgs/development/tools/misc/yodl/default.nix | 4 +++- pkgs/development/tools/parsing/flexc++/default.nix | 4 +++- pkgs/os-specific/linux/jool/cli.nix | 4 +++- .../http/apache-modules/tomcat-connectors/default.nix | 4 +++- pkgs/tools/cd-dvd/unetbootin/default.nix | 4 +++- pkgs/tools/compression/zstdmt/default.nix | 4 +++- pkgs/tools/inputmethods/zinnia/default.nix | 4 +++- pkgs/tools/misc/cloc/default.nix | 4 +++- pkgs/tools/networking/reaver-wps/default.nix | 5 ++++- pkgs/tools/text/zimreader/default.nix | 4 +++- pkgs/tools/text/zimwriterfs/default.nix | 4 +++- 25 files changed, 72 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index f5f580b3664..00f58750408 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -11,7 +11,9 @@ python2Packages.buildPythonApplication rec { sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; }; - sourceRoot = "source/source"; + setSourceRoot = '' + sourceRoot=$(echo */source) + ''; disabled = python2Packages.isPy3k; # work to support python 3 has not begun diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 669e46c6a84..ac0060ec7f8 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - sourceRoot = "${name}-src/ImageLounge"; + setSourceRoot = '' + sourceRoot=$(echo */ImageLounge) + ''; patches = [./fix-appdata-install.patch]; diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 6f2b0e34cbb..cffe485711f 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -43,7 +43,9 @@ stdenv.mkDerivation rec { "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}" ]; - sourceRoot = "screencloud-v${version}-src/screencloud"; + setSourceRoot = '' + sourceRoot=$(echo */screencloud) + ''; preConfigure = '' # This needs to be set in preConfigure instead of cmakeFlags in order to diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 53d1f30bee6..7ab9b194791 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; }; - sourceRoot = "skype4pidgin-${version}-src/skypeweb"; + setSourceRoot = '' + sourceRoot=$(echo */skypeweb) + ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin json_glib ]; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 8902bacf11c..94e7c0efaae 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { inherit (s) url sha256; }; - sourceRoot="${name}-src/gui-wx/configure"; + setSourceRoot = '' + sourceRoot=$(echo */gui-wx/configure) + ''; # Link against Python explicitly as it is needed for scripts makeFlags=[ diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix index 6fab56e4e7d..6a3cddbd2e5 100644 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ b/pkgs/development/compilers/dmd/2.067.1.nix @@ -17,18 +17,21 @@ stdenv.mkDerivation rec { repo = "dmd"; rev = "v${version}"; sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; + name = "dmd-v${version}-src"; }) (fetchFromGitHub { owner = "dlang"; repo = "druntime"; rev = "v${version}"; sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; + name = "druntime-v${version}-src"; }) (fetchFromGitHub { owner = "dlang"; repo = "phobos"; rev = "v${version}"; sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; + name = "phobos-v${version}-src"; }) ]; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 27f70b8d6c7..938dd04904b 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -14,18 +14,21 @@ stdenv.mkDerivation rec { repo = "dmd"; rev = "v${version}"; sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5"; + name = "dmd-v${version}-src"; }) (fetchFromGitHub { owner = "dlang"; repo = "druntime"; rev = "v${version}"; sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j"; + name = "druntime-v${version}-src"; }) (fetchFromGitHub { owner = "dlang"; repo = "phobos"; rev = "v${version}"; sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04"; + name = "phobos-v${version}-src"; }) ]; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 4be27531888..5c283dd4380 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -11,24 +11,28 @@ stdenv.mkDerivation rec { repo = "ldc"; rev = "v${version}"; sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl"; + name = "ldc-v${version}-src"; }) (fetchFromGitHub { owner = "ldc-developers"; repo = "druntime"; rev = "ldc-v${version}"; sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30"; + name = "druntime-ldc-v${version}-src"; }) (fetchFromGitHub { owner = "ldc-developers"; repo = "phobos"; rev = "ldc-v${version}"; sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g"; + name = "phobos-ldc-v${version}-src"; }) (fetchFromGitHub { owner = "ldc-developers"; repo = "dmd-testsuite"; rev = "ldc-v${version}"; sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj"; + name = "dmd-testsuite-ldc-v${version}-src"; }) ]; diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index c5a6f55681a..9805930c7bf 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ libmilter libX11 openssl readline utillinux ]; nativeBuildInputs = [ icmake yodl ]; - sourceRoot = "bobcat-${version}-src/bobcat"; + setSourceRoot = '' + sourceRoot=$(echo */bobcat) + ''; postPatch = '' substituteInPlace INSTALL.im --replace /usr $out diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index c620777dc5b..aa0708daaa7 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -13,7 +13,9 @@ in python2Packages.buildPythonApplication rec { sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; }; - sourceRoot = "${name}-src/python"; + setSourceRoot = '' + sourceRoot=$(echo */python) + ''; meta = with stdenv.lib; { homepage = http://cxxtest.com; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index b172b82a295..2940ab45eaa 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ]; - sourceRoot = "openvdb-v${version}-src/openvdb"; + setSourceRoot = '' + sourceRoot=$(echo */openvdb) + ''; installTargets = "install_lib"; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index ed0f38f8538..4f93ed56211 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; - sourceRoot = "partio-v${version}-src"; - enableParallelBuilding = true; buildPhase = '' diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index 7774cdbcb88..d40ae856495 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec buildInputs = [ zlib python cmake ]; - sourceRoot = "ptex-v${version}-src"; - enableParallelBuilding = true; buildPhase = '' diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 9185f5b9eaa..c79f238673e 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { owner = "fbb-git"; }; - sourceRoot = "icmake-${version}-src/icmake"; + + setSourceRoot = '' + sourceRoot=$(echo */icmake) + ''; buildInputs = [ gcc ]; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 1eed4c2ad86..e0bf9eac696 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { owner = "fbb-git"; }; - sourceRoot = "yodl-${version}-src/yodl"; + setSourceRoot = '' + sourceRoot=$(echo */yodl) + ''; preConfigure = '' patchShebangs ./build diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 7fb1289b7eb..c782df50758 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { owner = "fbb-git"; }; - sourceRoot = "flexcpp-${version}-src/flexc++"; + setSourceRoot = '' + sourceRoot=$(echo */flexc++) + ''; buildInputs = [ bobcat ]; nativeBuildInputs = [ icmake yodl ]; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 43edd8723a0..50f0398e134 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { src = sourceAttrs.src; - sourceRoot = "Jool-v${sourceAttrs.version}-src/usr"; + setSourceRoot = '' + sourceRoot=$(echo */usr) + ''; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libnl ]; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 61de807d8e8..5768e7badea 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; - sourceRoot = "${name}-src/native"; + setSourceRoot = '' + sourceRoot=$(echo */native) + ''; installPhase = '' mkdir -p $out/modules diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 0da3ff45a8c..7deac71f151 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy"; }; - sourceRoot = "source/src/unetbootin"; + setSourceRoot = '' + sourceRoot=$(echo */src/unetbootin) + ''; buildInputs = [ qt4 ]; nativeBuildInputs = [ makeWrapper qmake4Hook ]; diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix index 5cf88e68c64..b723c107936 100644 --- a/pkgs/tools/compression/zstdmt/default.nix +++ b/pkgs/tools/compression/zstdmt/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { owner = "mcmilk"; }; - sourceRoot = "zstdmt-v${version}-src/unix"; + setSourceRoot = '' + sourceRoot=$(echo */unix) + ''; buildInputs = [ zstd lz4 diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix index 18e6176b706..60f3a0feb55 100644 --- a/pkgs/tools/inputmethods/zinnia/default.nix +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg"; }; - setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)"; + setSourceRoot = '' + sourceRoot=$(echo */zinnia) + ''; meta = with stdenv.lib; { description = "Online hand recognition system with machine learning"; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index e303b1dd7f2..a1c04f06d14 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b"; }; - sourceRoot = "source/Unix"; + setSourceRoot = '' + sourceRoot=$(echo */Unix) + ''; buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ]; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index c9bd3fbaa85..667cbfbcead 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap sqlite ]; - sourceRoot = "reaver-${version}/src"; + + setSourceRoot = '' + sourceRoot=$(echo */src) + ''; configureFlags = "--sysconfdir=${confdir}"; diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 1c508a9cf7e..f9debaaf061 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ]; - setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`"; + setSourceRoot = '' + sourceRoot=$(echo */zimreader) + ''; preConfigure = "./autogen.sh"; meta = { diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index 6fcbf5061d1..5a5757bf2f2 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ]; - setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`"; + setSourceRoot = '' + sourceRoot=$(echo */zimwriterfs) + ''; preConfigure = "./autogen.sh"; meta = { From 88557901aedd110d70741a1dd40d099a23c1d106 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 17 Oct 2017 23:30:16 +0200 Subject: [PATCH 2225/2806] mopidy-iris: 3.4.9 -> 3.6.1 --- pkgs/applications/audio/mopidy-iris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 05d041380a0..caeba5eb1ac 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.4.9"; + version = "3.6.1"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "0acr8ss5d0jgcy1qsjb12h0n6kr6qdp9zrbbk9vv3m3s6kcm8vgb"; + sha256 = "1mfi3qx7pvfq4rz0py39lnbzv7sq703b6k6mypzhj1gdzbisfn46"; }; propagatedBuildInputs = [ From a4c431b5a7f986edc46039af3df5d01ac50db2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Thu, 2 Nov 2017 15:14:26 +0100 Subject: [PATCH 2226/2806] altcoins.dogecoin*: sha change --- pkgs/applications/altcoins/dogecoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index d8df6dd8349..33c2e598fca 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { owner = "dogecoin"; repo = "dogecoin"; rev = "v${version}"; - sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvy"; + sha256 = "04rddx20d4fps2w3h1jxa2j8iyqpjv2fh897z0z3r06qjvjzf7rr"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db5 openssl utillinux + buildInputs = [ openssl db5 openssl utillinux protobuf boost zlib miniupnpc ] ++ optionals withGui [ qt4 qrencode ]; From dce0e5d81ba4f0397f8be2371e43a9768a199876 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 2 Nov 2017 10:23:51 -0400 Subject: [PATCH 2227/2806] vim-plugins: add vim-docbk and related snippets --- pkgs/misc/vim-plugins/default.nix | 22 ++++++++++++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 2 ++ 2 files changed, 24 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 90502188e5f..eab2efbb6be 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2506,6 +2506,28 @@ rec { }; + vim-docbk = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-docbk-2015-04-01"; + src = fetchgit { + url = "https://github.com/jhradilek/vim-docbk"; + rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e"; + sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d"; + }; + dependencies = []; + + }; + + vim-docbk-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-docbk-snippets-2017-11-02"; + src = fetchgit { + url = "https://github.com/jhradilek/vim-snippets"; + rev = "69cce66defdf131958f152ea7a7b26c21ca9d009"; + sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc"; + }; + dependencies = []; + + }; + vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim2hs-2014-04-16"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 442464a16e7..b2273221e90 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -71,6 +71,8 @@ "github:jceb/vim-orgmode" "github:jeetsukumaran/vim-buffergator" "github:jgdavey/tslime.vim" +"github:jhradilek/vim-docbk" +"github:jhradilek/vim-snippets" "github:jiangmiao/auto-pairs" "github:jistr/vim-nerdtree-tabs" "github:jnurmine/zenburn" From 7c8ec77db2dd4acf1072938c4e3c7006bbb58e5d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 14:59:35 +0000 Subject: [PATCH 2228/2806] android-udev-rules: 20171014 -> 20171031 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b8b08430de8..28b17d7e69c 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20171014"; + version = "20171031"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "15mqngwv7x2xpdsaiga33lb0s9hcrhnambcv9fp6jvgkf6604cdr"; + sha256 = "0h9rp1bmry81lybly9x7qjdmaq0sj0m1ybl237qly8zqw7ywv5la"; }; installPhase = '' From eb33f5bc04828103f0c0388ca61e31ff816921b2 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 2 Nov 2017 16:28:06 +0000 Subject: [PATCH 2229/2806] build-pecl: honour nativeBuildInputs Otherwise certain extensions are unable to locate pkgconfig. --- pkgs/build-support/build-pecl.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index 30a42fcc0fe..ce948739c32 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -2,6 +2,7 @@ { name , buildInputs ? [] +, nativeBuildInputs ? [] , makeFlags ? [] , src ? fetchurl { url = "http://pecl.php.net/get/${name}.tgz"; @@ -15,7 +16,7 @@ stdenv.mkDerivation (args // { inherit src; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs; buildInputs = [ php ] ++ buildInputs; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; From d8702bfaebfc78a11858d9ea2346aff8336db689 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 14 Oct 2017 14:48:00 +0800 Subject: [PATCH 2230/2806] kde-applications: 17.08.1 -> 17.08.2 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 2232 ++++++++++++++++---------------- 2 files changed, 1117 insertions(+), 1117 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 11cbfcfe538..b4f190de136 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.08.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.08.2/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index f7b5ca0b31a..5e3c5b18b77 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,2235 +3,2235 @@ { akonadi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-17.08.1.tar.xz"; - sha256 = "1nhjhgpigi8bhavh609lxnr76w9c0j7017haiv6g6j6zd5h0pp6w"; - name = "akonadi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-17.08.2.tar.xz"; + sha256 = "1cd9ca3vifg6xsqsm8s9mzdkiavx7divwwjxk2vhb7pj8zxrnl45"; + name = "akonadi-17.08.2.tar.xz"; }; }; akonadi-calendar = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-calendar-17.08.1.tar.xz"; - sha256 = "15ld1jn1962wc5ynf8cgg9z6bh7hvjcl4nv9fqaa5mwy4mik4a0z"; - name = "akonadi-calendar-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-calendar-17.08.2.tar.xz"; + sha256 = "0a26li0m4swvr74vw10vwqg6m33wb74zsrjxym5g8j16y87sw660"; + name = "akonadi-calendar-17.08.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-calendar-tools-17.08.1.tar.xz"; - sha256 = "1y4r3y9gbc1zsip25pz47fxi9fw68fr6p18mljfkcg394sygvlcr"; - name = "akonadi-calendar-tools-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-calendar-tools-17.08.2.tar.xz"; + sha256 = "1y9iidqh1ssxp6mjzd4zjzsma3rvm2z1hfqjbs6sm2r1r3x3560q"; + name = "akonadi-calendar-tools-17.08.2.tar.xz"; }; }; akonadiconsole = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadiconsole-17.08.1.tar.xz"; - sha256 = "0xy8s23941rfh1yiz2c1v10m59jrd8hphzphckxa68zxb6cb7vws"; - name = "akonadiconsole-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadiconsole-17.08.2.tar.xz"; + sha256 = "19bxs8ds9klyqv7xhvnh3wy5ndll6qlhfvnw5cv10yf03ahf1lhb"; + name = "akonadiconsole-17.08.2.tar.xz"; }; }; akonadi-contacts = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-contacts-17.08.1.tar.xz"; - sha256 = "0hgabjca3fzb8hlzhfi54la7rgh4gaii6i2j623birslzry3mkc9"; - name = "akonadi-contacts-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-contacts-17.08.2.tar.xz"; + sha256 = "0b2zm7a1zbsxgb23cz78alhs2x364jaz8qcq8nl49qp7ydp44wn1"; + name = "akonadi-contacts-17.08.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-import-wizard-17.08.1.tar.xz"; - sha256 = "1f7k592papppfqdhgpcpw03phhdlkp18cbap1ibvzywhg1dn2qmg"; - name = "akonadi-import-wizard-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-import-wizard-17.08.2.tar.xz"; + sha256 = "1ynyjmzw8zg72hkxls0rw3p7hsvgm7y41mii28fc18qdx8qcj8vw"; + name = "akonadi-import-wizard-17.08.2.tar.xz"; }; }; akonadi-mime = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-mime-17.08.1.tar.xz"; - sha256 = "1apl89r1mpj5byngzdibxr4whr0932zr3j2y51pynnmilgkmyg6v"; - name = "akonadi-mime-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-mime-17.08.2.tar.xz"; + sha256 = "1pnxmljgsmdkv2rhg7ml6qy1q2j2gx4cswkakbga8fr2cds5fmjc"; + name = "akonadi-mime-17.08.2.tar.xz"; }; }; akonadi-notes = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-notes-17.08.1.tar.xz"; - sha256 = "1fgkipxhzj7c6ahdqhjii6ccxgn2qnn55jn64nrb36srmpnzrq7f"; - name = "akonadi-notes-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-notes-17.08.2.tar.xz"; + sha256 = "1n9rrlczsgax0hddsqx4x8h9w49ki56lpa72y2fi2hd0hqv7bdf1"; + name = "akonadi-notes-17.08.2.tar.xz"; }; }; akonadi-search = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-search-17.08.1.tar.xz"; - sha256 = "1m119843brcjcymfcp9n7pfybqnw9ydhsm9ry5im52kci4rwsfhx"; - name = "akonadi-search-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-search-17.08.2.tar.xz"; + sha256 = "0h8pcwv4svywf8sh698g6f3x15prcmz4nyxr92ab3x14k5na26v2"; + name = "akonadi-search-17.08.2.tar.xz"; }; }; akregator = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akregator-17.08.1.tar.xz"; - sha256 = "02p1vlxm91pyqhhwg3ggik9c8xw5ayz1w7bqpxmcb81gff75ha77"; - name = "akregator-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akregator-17.08.2.tar.xz"; + sha256 = "0ij4zxkwiai01cyzdai68c56j86r7b6nkijhmzhgvhv2mj9gi5bg"; + name = "akregator-17.08.2.tar.xz"; }; }; analitza = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/analitza-17.08.1.tar.xz"; - sha256 = "1kcyhim72g39ywq90hdd9ba6vwgq99xkbj82vbasy0il8xkkfcn4"; - name = "analitza-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/analitza-17.08.2.tar.xz"; + sha256 = "02rmgyl9sh4d3kf4412p1zgcmcmcb66drqf73fxf6cdb5addbzk3"; + name = "analitza-17.08.2.tar.xz"; }; }; ark = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ark-17.08.1.tar.xz"; - sha256 = "019gz57c46lh5wz84r0swhbx7ywgw8s7yc1f589xh4nz18i9xi69"; - name = "ark-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ark-17.08.2.tar.xz"; + sha256 = "1my3y6zsfw54c4kcbsl93ixig9b07cprgq47712v47niyqnihk92"; + name = "ark-17.08.2.tar.xz"; }; }; artikulate = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/artikulate-17.08.1.tar.xz"; - sha256 = "1dgr9ww0pm6k0rhb3lkvr65jx6pnwsck1v3sfwpyyf8rrwixbvyk"; - name = "artikulate-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/artikulate-17.08.2.tar.xz"; + sha256 = "0hw10djgnx8wsrs307j9hsh9famaaljdpr20dmf2ng3594hppxw1"; + name = "artikulate-17.08.2.tar.xz"; }; }; audiocd-kio = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/audiocd-kio-17.08.1.tar.xz"; - sha256 = "1k987lxm5wl6prdvbxxby1ly9r2dq7r5dsfbpazm43fxpx0pqyik"; - name = "audiocd-kio-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/audiocd-kio-17.08.2.tar.xz"; + sha256 = "0ivnl5aq553whgwnw6282vvj065hms34v1q1hl8l12k08rb8l2jl"; + name = "audiocd-kio-17.08.2.tar.xz"; }; }; baloo-widgets = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/baloo-widgets-17.08.1.tar.xz"; - sha256 = "19nij0hrcbcq4czxgh3l6gb25lkdi6j6sgmch24a8c7a106h0ips"; - name = "baloo-widgets-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/baloo-widgets-17.08.2.tar.xz"; + sha256 = "1qw0clwkcki6hg1hxxzb6h4nh6db7zw3ncl4hyf5550q973i2gl1"; + name = "baloo-widgets-17.08.2.tar.xz"; }; }; blinken = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/blinken-17.08.1.tar.xz"; - sha256 = "1nwdmhsyq1yzlr17mn98np0d3zg3rjyxsmlc7lyv1kszckhmb7qq"; - name = "blinken-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/blinken-17.08.2.tar.xz"; + sha256 = "1qs6nbxqrp0lmwf0z30i0r8h32r1a6a18k6sk78ja52vqkr7872h"; + name = "blinken-17.08.2.tar.xz"; }; }; blogilo = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/blogilo-17.08.1.tar.xz"; - sha256 = "1c9dq7xwdwxwdch4ygyz7pds8q41xpb5661wa4alnpd06ra0bq0c"; - name = "blogilo-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/blogilo-17.08.2.tar.xz"; + sha256 = "0ai91d5ydmw3yfv997hlrvky88v4aqcg7hacd3mizl23clqij4c9"; + name = "blogilo-17.08.2.tar.xz"; }; }; bomber = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/bomber-17.08.1.tar.xz"; - sha256 = "1pcva9rgmvvkbbabwiw3aqv0aq0w2s6vxrw0gfxh6plgs42hpb24"; - name = "bomber-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/bomber-17.08.2.tar.xz"; + sha256 = "1z6w6hh2f1k8skx87j11i6p34lcnh2c99gv2lvpd37z9gxbf0sjw"; + name = "bomber-17.08.2.tar.xz"; }; }; bovo = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/bovo-17.08.1.tar.xz"; - sha256 = "0vn4q6qvig9rjq8ynwg53vzas8vxg0b55mvpg801ky6kp3ma3m6i"; - name = "bovo-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/bovo-17.08.2.tar.xz"; + sha256 = "0vz9pfslj9f2g51yvdw8hasn92n0rn0gy4rd2f0xcfk2ifq2bwd1"; + name = "bovo-17.08.2.tar.xz"; }; }; calendarsupport = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/calendarsupport-17.08.1.tar.xz"; - sha256 = "1p1s5sn284j2lwzm09ifp6dj6gzg6p169hh7dv7k5bshi7kzf42v"; - name = "calendarsupport-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/calendarsupport-17.08.2.tar.xz"; + sha256 = "0zrazkcdm2m9rxdbgwcmidlxwnj1v4lnchf0d21i267dnck87m8x"; + name = "calendarsupport-17.08.2.tar.xz"; }; }; cantor = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/cantor-17.08.1.tar.xz"; - sha256 = "1m6si2gy6n20z27sby7g7nqaxl067qpkj29l6b3qsyyx03w73n33"; - name = "cantor-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/cantor-17.08.2.tar.xz"; + sha256 = "14hn1980z8wsr446r94scd3wdy83myy4wklxl24bynxpwiwxzv99"; + name = "cantor-17.08.2.tar.xz"; }; }; cervisia = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/cervisia-17.08.1.tar.xz"; - sha256 = "13p5gs2cg939mcnq2hvvncj8v7vr7pcklq932xhy4qfwhqbhkxp1"; - name = "cervisia-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/cervisia-17.08.2.tar.xz"; + sha256 = "0h56dfy27nf14dqz20f7chjzyhsdricxdrxxkw839r593k25fipd"; + name = "cervisia-17.08.2.tar.xz"; }; }; dolphin = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/dolphin-17.08.1.tar.xz"; - sha256 = "04b9vq03m6s5mrv7q4na65kv9hpx7i4v45g6ls7pcyxi6ziszr3q"; - name = "dolphin-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/dolphin-17.08.2.tar.xz"; + sha256 = "1m3v7z0k47r3fzl4w4nsldslw0z6sy1zn3mn3ssc03jhgqnj3grs"; + name = "dolphin-17.08.2.tar.xz"; }; }; dolphin-plugins = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/dolphin-plugins-17.08.1.tar.xz"; - sha256 = "0vrs8yk2vqfbc79xjkj95zndyig2gz2b8aafs61q25b29lzilyq9"; - name = "dolphin-plugins-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/dolphin-plugins-17.08.2.tar.xz"; + sha256 = "12mp7qf8aharyk8hqr8igwqnxraxy3nmad99mxkyny6wlkha459l"; + name = "dolphin-plugins-17.08.2.tar.xz"; }; }; dragon = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/dragon-17.08.1.tar.xz"; - sha256 = "143x7x07z5af0z7za8r3jiq5id33rmb62ygp84af905lm2gf2yk0"; - name = "dragon-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/dragon-17.08.2.tar.xz"; + sha256 = "0h9h2axwjqqvqla6mfml3bvk7gp36kij7swl96gsn7sy4ch0ydbz"; + name = "dragon-17.08.2.tar.xz"; }; }; eventviews = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/eventviews-17.08.1.tar.xz"; - sha256 = "1av86sbldkrgsdybxqzgda1pnd4y27ygxsibr76w6y8fnk66zrg7"; - name = "eventviews-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/eventviews-17.08.2.tar.xz"; + sha256 = "0gd7jmwidh9fngjbn8m6jhymzxv8qdxv3ksnawcamjxxd2k951c1"; + name = "eventviews-17.08.2.tar.xz"; }; }; ffmpegthumbs = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ffmpegthumbs-17.08.1.tar.xz"; - sha256 = "1lgi8rs3zbrwlcxbhq9qys8w0yh4f0rbalig0y020igbplkn9ccs"; - name = "ffmpegthumbs-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ffmpegthumbs-17.08.2.tar.xz"; + sha256 = "0bycdr60jnr0a121fr9alvma5zbkqm6wj45h81jvggdvmnrg7inh"; + name = "ffmpegthumbs-17.08.2.tar.xz"; }; }; filelight = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/filelight-17.08.1.tar.xz"; - sha256 = "0wi0j55z8h58slbq4hinhfycpjb69m5g4ilk0csjw8syxhmy1jhl"; - name = "filelight-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/filelight-17.08.2.tar.xz"; + sha256 = "0q7cn7hbmwg6km96yc3m1yd64nsnav8q9yjiri2k3p6v6if1042h"; + name = "filelight-17.08.2.tar.xz"; }; }; granatier = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/granatier-17.08.1.tar.xz"; - sha256 = "0panmz171ba3vfvdgjcwg1nxwv52qsh6qazagz7p5bv0hkf6y94n"; - name = "granatier-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/granatier-17.08.2.tar.xz"; + sha256 = "17ymbyzkgkwcinf65hzy3ny1zzg6p88bcg6kix1pbdmhmw4nhhj0"; + name = "granatier-17.08.2.tar.xz"; }; }; grantlee-editor = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/grantlee-editor-17.08.1.tar.xz"; - sha256 = "0xpkip7cy6d318mh3l8014zdifhx3njx8vk2cr2f00bjvs879zfj"; - name = "grantlee-editor-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/grantlee-editor-17.08.2.tar.xz"; + sha256 = "1385wcf2y3jjj9csp6p7iqyrlv0wxq32dkhdf33y80j29xnrckzp"; + name = "grantlee-editor-17.08.2.tar.xz"; }; }; grantleetheme = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/grantleetheme-17.08.1.tar.xz"; - sha256 = "0l6ycr609wvxad1dwgy56blcnag5pr30gj59d5dcnq0iqcs9v5w9"; - name = "grantleetheme-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/grantleetheme-17.08.2.tar.xz"; + sha256 = "1i1x8d7hkhzqbn4c1q0snni8x2dw1hlxkc0zw8hfyfppc9a1x5ha"; + name = "grantleetheme-17.08.2.tar.xz"; }; }; gwenview = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/gwenview-17.08.1.tar.xz"; - sha256 = "1f5c78007sqy3iq0rx8cskma8rjzinaahy26r054l59gq6b0d3v7"; - name = "gwenview-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/gwenview-17.08.2.tar.xz"; + sha256 = "0kw48xwinvyix23m1h4ark91w6nygr0a9kisdj3ighw29dqbqryx"; + name = "gwenview-17.08.2.tar.xz"; }; }; incidenceeditor = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/incidenceeditor-17.08.1.tar.xz"; - sha256 = "0axwkhwqgmdnh9qn6j87j44x24vqb5bhch2pscrifdni05j99wzx"; - name = "incidenceeditor-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/incidenceeditor-17.08.2.tar.xz"; + sha256 = "1jdwk67pxk9dwraq187wg58y0sgxwr5d18506fykrs7gv68p8dsl"; + name = "incidenceeditor-17.08.2.tar.xz"; }; }; jovie = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/jovie-17.08.1.tar.xz"; - sha256 = "19zhm6iqq505bwdd6f57rkzc9fmqqmw60071n679khrcgmsyx7ac"; - name = "jovie-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/jovie-17.08.2.tar.xz"; + sha256 = "0wh0wk653fzlaxkxjbsm305wqmvdy88vw7qr81mh9ziyfj4qpm7p"; + name = "jovie-17.08.2.tar.xz"; }; }; juk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/juk-17.08.1.tar.xz"; - sha256 = "1r3igqgw2ani4500sndbqnxcbyjg8l0lcd0l0r6wmqs9cgf1w5d5"; - name = "juk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/juk-17.08.2.tar.xz"; + sha256 = "0i1zh8asbzjg7s6qq26fwc1g5g9ivnppba0xnhz5c3y0nmz0g3i1"; + name = "juk-17.08.2.tar.xz"; }; }; k3b = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/k3b-17.08.1.tar.xz"; - sha256 = "1pv8fpalqr7fpcy7dypzjp91h82scvzfk5g0mpzjpqlmn99hgfj1"; - name = "k3b-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/k3b-17.08.2.tar.xz"; + sha256 = "1n7fw4zhsjc5bxxva420m8k0lmbx4whq8ay1ckianarjc8jm5dwx"; + name = "k3b-17.08.2.tar.xz"; }; }; kaccessible = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kaccessible-17.08.1.tar.xz"; - sha256 = "13j1c9l8qhll0a8fcny9nibr858w5cjpahccxgkh9v54iy3f243s"; - name = "kaccessible-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kaccessible-17.08.2.tar.xz"; + sha256 = "1phfz8n6gs9g216qhwmjhcrr0qpfk2q7bxxx68f86zzfv6b4fhjd"; + name = "kaccessible-17.08.2.tar.xz"; }; }; kaccounts-integration = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kaccounts-integration-17.08.1.tar.xz"; - sha256 = "0y09hnjhxy7lnqjhz82z090wv3y5942xh1vhgyi5ac7pkgyzjh7m"; - name = "kaccounts-integration-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kaccounts-integration-17.08.2.tar.xz"; + sha256 = "0v4ikcapq0vdfhj0v5c202yfbg1b82jbl74rpcw7lap7xjdxshgi"; + name = "kaccounts-integration-17.08.2.tar.xz"; }; }; kaccounts-providers = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kaccounts-providers-17.08.1.tar.xz"; - sha256 = "0dyrsvh98b75fxpap3x4vwvqx2dxyvcg4sfkic9sv137kwl8ihcp"; - name = "kaccounts-providers-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kaccounts-providers-17.08.2.tar.xz"; + sha256 = "1ir4s03ccf8mw56z2f293q4pb2rnh8rp0bs05nq93jjsxap3ssxn"; + name = "kaccounts-providers-17.08.2.tar.xz"; }; }; kaddressbook = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kaddressbook-17.08.1.tar.xz"; - sha256 = "0qf3wfjgbzjxrvhnwa702yhp54m8f4wk8d67jsgrlpvq3lizrzrf"; - name = "kaddressbook-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kaddressbook-17.08.2.tar.xz"; + sha256 = "0smihkmhi10c0khid3ziiwvbrlk3ihw7f1a2mf1pc62gmagf6iva"; + name = "kaddressbook-17.08.2.tar.xz"; }; }; kajongg = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kajongg-17.08.1.tar.xz"; - sha256 = "10bymw4bwqxjppvynwcx600ybr02kyd9m2ya0pi2208kj2s317m5"; - name = "kajongg-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kajongg-17.08.2.tar.xz"; + sha256 = "0607606yisch8s0ffv67fhpn8b5chi0y9h4giasc2s8m67zzjsvz"; + name = "kajongg-17.08.2.tar.xz"; }; }; kalarm = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kalarm-17.08.1.tar.xz"; - sha256 = "0nxkln40bwlfdn2fp5a2a55x40zakq5nrir9bi920jpp78ivx2mf"; - name = "kalarm-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kalarm-17.08.2.tar.xz"; + sha256 = "17sh27h6c1p0h1r6rfpqmh1pfd7clnwslhnj4rfxhvh95svdqgam"; + name = "kalarm-17.08.2.tar.xz"; }; }; kalarmcal = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kalarmcal-17.08.1.tar.xz"; - sha256 = "1dvv1rbh67c2vxcls8jv8chcgbp7q8c2jdjsr2cx2lmiasz0lqlf"; - name = "kalarmcal-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kalarmcal-17.08.2.tar.xz"; + sha256 = "00bfr9xsyg3r8nmvsana2n9m8ynhw1wcvx7dw3pazxf3f1sn5qvc"; + name = "kalarmcal-17.08.2.tar.xz"; }; }; kalgebra = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kalgebra-17.08.1.tar.xz"; - sha256 = "07l3gff8la0cjd3aszm2v0gykfb2ws6k5hix0ck9q62kz1h6zd8d"; - name = "kalgebra-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kalgebra-17.08.2.tar.xz"; + sha256 = "0f7zz9xxqckrkzmfga4ap117wix2ib4lpjq75blk43951qpnwwcw"; + name = "kalgebra-17.08.2.tar.xz"; }; }; kalzium = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kalzium-17.08.1.tar.xz"; - sha256 = "15rvpjni1a1fhr52awivzdc6v575510fs5mxxk05wqzsffa67i1f"; - name = "kalzium-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kalzium-17.08.2.tar.xz"; + sha256 = "1b27rx0ws6bikqa9gdr8d4mfqwsgcin5nl2m7svzdz27mb463iwc"; + name = "kalzium-17.08.2.tar.xz"; }; }; kamera = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kamera-17.08.1.tar.xz"; - sha256 = "044mn0k18ffxhc9nnbpqhcjlzkj4657nxqwdfl65k689y1l2bff1"; - name = "kamera-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kamera-17.08.2.tar.xz"; + sha256 = "19id26637w39b6dlsvhllnnpvcphh20mvva1394pw386s2irdrca"; + name = "kamera-17.08.2.tar.xz"; }; }; kanagram = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kanagram-17.08.1.tar.xz"; - sha256 = "07gykmv9r1ikaw4l3zz27rc7a23q2nizszblm1ygv2nlyj6lilgf"; - name = "kanagram-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kanagram-17.08.2.tar.xz"; + sha256 = "1zs1ww5w9sd9qzapl2shmfarhxsqpm8cifpw17vknwcp1w4qjwpj"; + name = "kanagram-17.08.2.tar.xz"; }; }; kapman = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kapman-17.08.1.tar.xz"; - sha256 = "1r7r13yfgf64jfarqjiirfbhmrg6d04ija5sgl8aiib8rwnbs2lb"; - name = "kapman-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kapman-17.08.2.tar.xz"; + sha256 = "0wl6zhm7cyb4ii475nh7pjz1pprccimpvdx5yxph4n99wri4xjd9"; + name = "kapman-17.08.2.tar.xz"; }; }; kapptemplate = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kapptemplate-17.08.1.tar.xz"; - sha256 = "0dcgsh4ns3749yybzz2jgdbjskxyzlnr2c0f5wzh9ilkz3yp7lq2"; - name = "kapptemplate-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kapptemplate-17.08.2.tar.xz"; + sha256 = "0b92kamyvw81bxvxly16kd1kcyn8l48cvk4hp0kqfxv5drr0y2sp"; + name = "kapptemplate-17.08.2.tar.xz"; }; }; kate = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kate-17.08.1.tar.xz"; - sha256 = "0z71s9g66ivbchrd2ps3j16ickjnky7ws484y04akjjs7sryzd0l"; - name = "kate-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kate-17.08.2.tar.xz"; + sha256 = "1m4dh9v1y8a3398wd3qv2qcz1lqjnji62cswnw8ch4hxmns6lib2"; + name = "kate-17.08.2.tar.xz"; }; }; katomic = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/katomic-17.08.1.tar.xz"; - sha256 = "04k29x2hvcqc22cm763aflpwzb6gqqbnpd6dknd34985fqrrcdp4"; - name = "katomic-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/katomic-17.08.2.tar.xz"; + sha256 = "1l8nvsm6mfsb1bvwhj77qicq010vmif8y046d2mc5sgw6xhg6xw5"; + name = "katomic-17.08.2.tar.xz"; }; }; kblackbox = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kblackbox-17.08.1.tar.xz"; - sha256 = "1n1rxh86qcaa8dm5qcs43pdxjndzssy4pdyn90anw6bqsw1mn7q0"; - name = "kblackbox-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kblackbox-17.08.2.tar.xz"; + sha256 = "0i5zy6zm8w4i5hljmv1qyhrr5iv7m5qr854f6j0iyvam33f68gdh"; + name = "kblackbox-17.08.2.tar.xz"; }; }; kblocks = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kblocks-17.08.1.tar.xz"; - sha256 = "0bx5j1kahyspbmrw2falkw037d1lkj6f1yppwdlh2l4zn7xbgx78"; - name = "kblocks-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kblocks-17.08.2.tar.xz"; + sha256 = "1qh2lcg9293icya06jwa01vri8y1m99jir7d0zxpwlm6rndrkca5"; + name = "kblocks-17.08.2.tar.xz"; }; }; kblog = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kblog-17.08.1.tar.xz"; - sha256 = "0kdwv2ym3xba7n0qslrgdlmanw1zqanv5ycjnl54gf1xlbdwbpv2"; - name = "kblog-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kblog-17.08.2.tar.xz"; + sha256 = "1095qs877zjip4899fisgyssp1n3j8rxpxkd7dc6ms4b82xnrz19"; + name = "kblog-17.08.2.tar.xz"; }; }; kbounce = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kbounce-17.08.1.tar.xz"; - sha256 = "0bl1pm8h547gwzx1pbc340711fp5scfa1dql7b1yjjpfg56flccm"; - name = "kbounce-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kbounce-17.08.2.tar.xz"; + sha256 = "0bkmk26spmlq607ycmyc5sfzi7rknim0d39fdvmn915xy7dps2l1"; + name = "kbounce-17.08.2.tar.xz"; }; }; kbreakout = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kbreakout-17.08.1.tar.xz"; - sha256 = "021hzg4m6aqvvavdx63ydj2s71shml6x1rrd9lyyw23harh7402h"; - name = "kbreakout-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kbreakout-17.08.2.tar.xz"; + sha256 = "02c4ldyxd6hcffivp1n8k5q42dibwpcf4xdp856zkaf9hk40ssjz"; + name = "kbreakout-17.08.2.tar.xz"; }; }; kbruch = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kbruch-17.08.1.tar.xz"; - sha256 = "110iar2p5wlil4b8j5gw37mizajvhc9j7fww7dmvffq1yn4m5ac2"; - name = "kbruch-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kbruch-17.08.2.tar.xz"; + sha256 = "0v8c63mxpd10nnbxiyfghbbjm97q37w9z08dzlys996nychmw0ba"; + name = "kbruch-17.08.2.tar.xz"; }; }; kcachegrind = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcachegrind-17.08.1.tar.xz"; - sha256 = "0pgc00y7l98fws7qfc9i92a9mizgkkvap48pi12r9ajj5bhy792b"; - name = "kcachegrind-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcachegrind-17.08.2.tar.xz"; + sha256 = "04dh0a33z7i1nf07bhc05gm1jr4wvv4a86l9avk6dgja0pag6j30"; + name = "kcachegrind-17.08.2.tar.xz"; }; }; kcalc = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcalc-17.08.1.tar.xz"; - sha256 = "177mr533r71jpa64bvkbl349lkf2yzanrjh22d4rii7lqma63z4k"; - name = "kcalc-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcalc-17.08.2.tar.xz"; + sha256 = "1k1l3qj4mdm8b0qbjp09hk4zd0y9qwzp062a0r428mvvcmrvpylw"; + name = "kcalc-17.08.2.tar.xz"; }; }; kcalcore = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcalcore-17.08.1.tar.xz"; - sha256 = "084gj40lssh6lsjn7xpvzlhlfcc6vcdk6ygv47wvf8y0yipppspw"; - name = "kcalcore-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcalcore-17.08.2.tar.xz"; + sha256 = "1j3vr2ycwsgahngwhvkv747b5rr062sx6xi35bj9anmkhpbs9kwi"; + name = "kcalcore-17.08.2.tar.xz"; }; }; kcalutils = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcalutils-17.08.1.tar.xz"; - sha256 = "04nn5lv2x15352p42589zyh1w2fxbijkq9wmbcr51fb4nphx007l"; - name = "kcalutils-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcalutils-17.08.2.tar.xz"; + sha256 = "02f5vr0l41kv6g92jj9g8yz5y422qvlgd3jbx3gmsagxxyvl5gss"; + name = "kcalutils-17.08.2.tar.xz"; }; }; kcharselect = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcharselect-17.08.1.tar.xz"; - sha256 = "1w6ydp7acf5ha0kag60m1anksj7fy2kk8bghpw14lv8bxzrjwdam"; - name = "kcharselect-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcharselect-17.08.2.tar.xz"; + sha256 = "1nmsn0kibd318dnka96lisplcggrvcgsivrqk322mw9wg6xhg5i9"; + name = "kcharselect-17.08.2.tar.xz"; }; }; kcolorchooser = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcolorchooser-17.08.1.tar.xz"; - sha256 = "1zmzd919crj25ngcv085pp4w213x4bra54npfw4z11cmc30zz57i"; - name = "kcolorchooser-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcolorchooser-17.08.2.tar.xz"; + sha256 = "0v8x3y2gxp8cm3m1dh8rjpxjnypfvrxm41vrqsz9p8lcs616zg6w"; + name = "kcolorchooser-17.08.2.tar.xz"; }; }; kcontacts = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcontacts-17.08.1.tar.xz"; - sha256 = "0iqpvsnwbnzczdcvbqlrgmx2czjqgl4ag4b09vhkj1s7gs8cracy"; - name = "kcontacts-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcontacts-17.08.2.tar.xz"; + sha256 = "1agwvi3lnmdz9fhqg6i029jpcwys4zsk2k5rpzjdqaf7bvccb9cl"; + name = "kcontacts-17.08.2.tar.xz"; }; }; kcron = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcron-17.08.1.tar.xz"; - sha256 = "0yzv068jsxyag68fix421z5qfvpxm1i9v1q3pw3ksvq07ai740f3"; - name = "kcron-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcron-17.08.2.tar.xz"; + sha256 = "1diqgcnlbq9x6w3sj4lk1i3kbi4g5w4j1knkc4qqjz3a6kfaqk60"; + name = "kcron-17.08.2.tar.xz"; }; }; kdav = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdav-17.08.1.tar.xz"; - sha256 = "1m9pcydg2fwz95mym7k7wdavbw4nz18ihhrhfmcda7m61x6y8z9q"; - name = "kdav-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdav-17.08.2.tar.xz"; + sha256 = "0cyh8qnzcnb7qnyjbyy73bj78kqjq853aaz7fskg2f3bk2bq5fkf"; + name = "kdav-17.08.2.tar.xz"; }; }; kdebugsettings = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdebugsettings-17.08.1.tar.xz"; - sha256 = "0jxy68fs45hwkd3hjl5rknwznsihk0nszmskw3hy3y64p2vvvzyf"; - name = "kdebugsettings-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdebugsettings-17.08.2.tar.xz"; + sha256 = "0i62w45flirca09bkwxkyyr4zhvzi4rxq7l6xh4liinl1n9kdf7w"; + name = "kdebugsettings-17.08.2.tar.xz"; }; }; kde-dev-scripts = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-dev-scripts-17.08.1.tar.xz"; - sha256 = "16dzmx80752n3wcg2dcwh4cc0mwxwckfbms134g83gwaix5wkyvd"; - name = "kde-dev-scripts-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-dev-scripts-17.08.2.tar.xz"; + sha256 = "1prk2j5y8rcz3xkhw2fnfhsky9jnk25akdg2whvz4zpvfvxn5jcw"; + name = "kde-dev-scripts-17.08.2.tar.xz"; }; }; kde-dev-utils = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-dev-utils-17.08.1.tar.xz"; - sha256 = "1lq8cya779667yjwinvx9xyfiq79p7m93m4r2zgd7r6fpakxdkch"; - name = "kde-dev-utils-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-dev-utils-17.08.2.tar.xz"; + sha256 = "0zzf1w6avjwzyr8p73jqidzzfgx7gpiksmgnfqm4nf91snfg7pp4"; + name = "kde-dev-utils-17.08.2.tar.xz"; }; }; kdeedu-data = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdeedu-data-17.08.1.tar.xz"; - sha256 = "1fk2r2cib8gzk1ss5z6wxdwswl3f0hvwmxdgg0cs0j11gk1m0m6g"; - name = "kdeedu-data-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdeedu-data-17.08.2.tar.xz"; + sha256 = "17jh5m5h64z6gkwblpq7jdsa4653bakz1mgy6qlyjlh8nljlf6wk"; + name = "kdeedu-data-17.08.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdegraphics-mobipocket-17.08.1.tar.xz"; - sha256 = "0y2yfcf2p864hzyxyxv65mkfl8qk08zh9pr24ycxfdl4g22pal6w"; - name = "kdegraphics-mobipocket-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdegraphics-mobipocket-17.08.2.tar.xz"; + sha256 = "008qp18m720759wj1bjm1z2nig1vafjcz8wifjgqdn3drn35qqvg"; + name = "kdegraphics-mobipocket-17.08.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdegraphics-thumbnailers-17.08.1.tar.xz"; - sha256 = "1milas13wb958z2p39rm1353lqz9ibhnpwb8ffw6wy5qdbx4fr4q"; - name = "kdegraphics-thumbnailers-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdegraphics-thumbnailers-17.08.2.tar.xz"; + sha256 = "11qf9dnqzw634iilmbfi9sy20w228y72w2aasjw7kg1l7y4y3y07"; + name = "kdegraphics-thumbnailers-17.08.2.tar.xz"; }; }; kde-l10n-ar = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ar-17.08.1.tar.xz"; - sha256 = "03bj86is2a0srygmabxmwmdmqxwwxm06lh9a6g362dhglh4ypp67"; - name = "kde-l10n-ar-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ar-17.08.2.tar.xz"; + sha256 = "1m5qi2qw4ndqzshg7bbi3mkvxpk0dj453bngm7qzmp9bgwpbgk3b"; + name = "kde-l10n-ar-17.08.2.tar.xz"; }; }; kde-l10n-ast = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ast-17.08.1.tar.xz"; - sha256 = "0vsyv4g8ywpvcxh1hkhx1y8plx9k068fqrgvglv9gvsr86w57xn7"; - name = "kde-l10n-ast-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ast-17.08.2.tar.xz"; + sha256 = "1y2qahv1d40k16s9xjckc51szzm8n2nhdy5bjqpakxv3iqy2yqvz"; + name = "kde-l10n-ast-17.08.2.tar.xz"; }; }; kde-l10n-bg = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-bg-17.08.1.tar.xz"; - sha256 = "0bz8ydq7i0q29znbia0fcw5y19cw9a5hxh2gh8s7v6pvniazlgfx"; - name = "kde-l10n-bg-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-bg-17.08.2.tar.xz"; + sha256 = "0h0ls4k1jyj8w2qh688nv43p6xxad3amh4gslg4xxk30scl58pay"; + name = "kde-l10n-bg-17.08.2.tar.xz"; }; }; kde-l10n-bs = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-bs-17.08.1.tar.xz"; - sha256 = "19jjrwga6b5vn0g8m5mgp9kgn9173km6jmj92fl63w7lhd60pqyy"; - name = "kde-l10n-bs-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-bs-17.08.2.tar.xz"; + sha256 = "1n2hw8835hf87d4sihnbryh702h6vh2z65s15lsrk5l760jdvyg7"; + name = "kde-l10n-bs-17.08.2.tar.xz"; }; }; kde-l10n-ca = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ca-17.08.1.tar.xz"; - sha256 = "1ldpsjaczqfczglfk2nib4kqkzi6z16mkyisx1byw3wxix7aqak5"; - name = "kde-l10n-ca-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ca-17.08.2.tar.xz"; + sha256 = "18g4vs2r63p25a0i8ggyv3gi7df54z1hv140lg44k5g4pffbzv0z"; + name = "kde-l10n-ca-17.08.2.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-17.08.1"; + version = "ca_valencia-17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ca@valencia-17.08.1.tar.xz"; - sha256 = "1dnvvc6jbwyvagy7ay3w1rdj82bx7zcc97i61drlv2cf1vgkmb4l"; - name = "kde-l10n-ca_valencia-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ca@valencia-17.08.2.tar.xz"; + sha256 = "0p7ykdkfxkqm6fa8y95j3jsmqlnkxfsigi457h8yhvikjvlym9an"; + name = "kde-l10n-ca_valencia-17.08.2.tar.xz"; }; }; kde-l10n-cs = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-cs-17.08.1.tar.xz"; - sha256 = "0f9h5ln31395kgbqa8rj1sdkwjaczw4mvjlif9656xqglzw0dvs1"; - name = "kde-l10n-cs-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-cs-17.08.2.tar.xz"; + sha256 = "13qxxh1rxv25i53r6744hyr7n7nhvhnxwb425caq0z8cl0y727xi"; + name = "kde-l10n-cs-17.08.2.tar.xz"; }; }; kde-l10n-da = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-da-17.08.1.tar.xz"; - sha256 = "0rr0gmzfbdwnya9bipbymwqy6250zdi47chawi7j3vc4j11511g2"; - name = "kde-l10n-da-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-da-17.08.2.tar.xz"; + sha256 = "1nqfmq3scmka10fqvd4q62klrsly0zxk5maqp914r2kq9a4761sr"; + name = "kde-l10n-da-17.08.2.tar.xz"; }; }; kde-l10n-de = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-de-17.08.1.tar.xz"; - sha256 = "08ad110q4k21j8mfzigjxxrlic2c6h0cxqiawbfswzc39r0vy0lb"; - name = "kde-l10n-de-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-de-17.08.2.tar.xz"; + sha256 = "0q0sqzsd9qig05qapa6psizcayfcr68jkz07wv1z0lsij6hbv81w"; + name = "kde-l10n-de-17.08.2.tar.xz"; }; }; kde-l10n-el = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-el-17.08.1.tar.xz"; - sha256 = "1m2f8rsygmyn05i3j5mnwnr7mm4jahy2yaphxv822g6i79iy3396"; - name = "kde-l10n-el-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-el-17.08.2.tar.xz"; + sha256 = "1g07qwgc5mm3x6diab934cfl9acl0baa5x1d1139c84x65d5iisx"; + name = "kde-l10n-el-17.08.2.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-17.08.1"; + version = "en_GB-17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-en_GB-17.08.1.tar.xz"; - sha256 = "14ql8kd60c4svg3ar5n61g544in805xsyfk2bgals0m47fy3axyf"; - name = "kde-l10n-en_GB-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-en_GB-17.08.2.tar.xz"; + sha256 = "03v7q53ng095rsc5h13d7ysakcr3ansvq259xw8ksqwnp3yzgivf"; + name = "kde-l10n-en_GB-17.08.2.tar.xz"; }; }; kde-l10n-eo = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-eo-17.08.1.tar.xz"; - sha256 = "05lnk520hg9kxf6f92fn9avx4h29pjk4k8j7rsk4nwngvvygqjb6"; - name = "kde-l10n-eo-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-eo-17.08.2.tar.xz"; + sha256 = "1w79dmbja6aga6z8wz5pisd9r6g5gdcbqyzf8nlj2yjvijdv19h5"; + name = "kde-l10n-eo-17.08.2.tar.xz"; }; }; kde-l10n-es = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-es-17.08.1.tar.xz"; - sha256 = "1h2lzs1z5rcyg60f5d9jkxmdxwbhrdgbmib5h1nlz3f7jnrnpj86"; - name = "kde-l10n-es-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-es-17.08.2.tar.xz"; + sha256 = "0j2y55iql56wwzfmfm5c0c3f64lqr74hqzqf5bcckhh6svjiwb9m"; + name = "kde-l10n-es-17.08.2.tar.xz"; }; }; kde-l10n-et = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-et-17.08.1.tar.xz"; - sha256 = "0ifcsc6ic76gnbni0qm4yfcbhz4b3kww3rqly34hlrpzlwf52x5w"; - name = "kde-l10n-et-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-et-17.08.2.tar.xz"; + sha256 = "0d7c3ij74iskf9hbfjjl48jfpgihlg8fjabcak34bklcf1h8qrl9"; + name = "kde-l10n-et-17.08.2.tar.xz"; }; }; kde-l10n-eu = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-eu-17.08.1.tar.xz"; - sha256 = "1nxmy2bdlljjf4dqy1fsfx7iawak7nh4h3x5h72im2s49z4y01rl"; - name = "kde-l10n-eu-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-eu-17.08.2.tar.xz"; + sha256 = "164851achb1p4yaw4x6sq83ibl6gj4iqh4771nc847rywgmq48dh"; + name = "kde-l10n-eu-17.08.2.tar.xz"; }; }; kde-l10n-fa = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fa-17.08.1.tar.xz"; - sha256 = "19x6zacpyc7gax1lrqls2cb9ax747ls6pm8046hcgdy2nb8byqmc"; - name = "kde-l10n-fa-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fa-17.08.2.tar.xz"; + sha256 = "030wwv8527yhn6k6jmjb790d05gz493dnhr759zv1yg0r1r14lsi"; + name = "kde-l10n-fa-17.08.2.tar.xz"; }; }; kde-l10n-fi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fi-17.08.1.tar.xz"; - sha256 = "04cdsrjr9hnx1x3w4chjaq82varc24hl65kqiyf13nr3nvgx3xba"; - name = "kde-l10n-fi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fi-17.08.2.tar.xz"; + sha256 = "1rvpkdssy346aijdb183j6fnpg7wqac2svg19rjnz40rg1sbqs5g"; + name = "kde-l10n-fi-17.08.2.tar.xz"; }; }; kde-l10n-fr = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fr-17.08.1.tar.xz"; - sha256 = "0dqjr15sg42pp3balfvanl7169nsyqyr67pjw02xzbkskh61jihg"; - name = "kde-l10n-fr-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fr-17.08.2.tar.xz"; + sha256 = "0i9525dvns41gvgdi3q760fivhjq8c81hsx6rmnp5gxwj2bp8nb9"; + name = "kde-l10n-fr-17.08.2.tar.xz"; }; }; kde-l10n-ga = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ga-17.08.1.tar.xz"; - sha256 = "0lbpbkip2fgml3jni4hllixpzaya5q5xcn3m674a7hs3y7gr35gs"; - name = "kde-l10n-ga-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ga-17.08.2.tar.xz"; + sha256 = "0a7ym789nqjngx0sjirxb19q0wzbh250kwsrjad5nw810syk2k8d"; + name = "kde-l10n-ga-17.08.2.tar.xz"; }; }; kde-l10n-gl = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-gl-17.08.1.tar.xz"; - sha256 = "1bbg7ya85phzxw3rcc2k04rc4axridcqdrkh719ivp7p46m47j28"; - name = "kde-l10n-gl-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-gl-17.08.2.tar.xz"; + sha256 = "1n0f4hs3qkraxc05ga2z4mzr425n5386f5wrd9crsw0pmsm24nm6"; + name = "kde-l10n-gl-17.08.2.tar.xz"; }; }; kde-l10n-he = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-he-17.08.1.tar.xz"; - sha256 = "1h4lzv2i37l2w8af5w2dxan9zancqbqbcvhc5lkngnq2mvlqhwax"; - name = "kde-l10n-he-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-he-17.08.2.tar.xz"; + sha256 = "1bk8ms9jspyphxki8fl2i8fy4b2xsx3bi55fhpah9r10fb3prccx"; + name = "kde-l10n-he-17.08.2.tar.xz"; }; }; kde-l10n-hi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hi-17.08.1.tar.xz"; - sha256 = "0zjbchy072gbslmvi894jqa5vlh4brxkqdk5n3b7nh8003f7kvdl"; - name = "kde-l10n-hi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hi-17.08.2.tar.xz"; + sha256 = "1wfjj9xdnyq94h5g3054mvwn7vd9v1n1myxclxfqszbym1lp9f6h"; + name = "kde-l10n-hi-17.08.2.tar.xz"; }; }; kde-l10n-hr = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hr-17.08.1.tar.xz"; - sha256 = "1k4zzn0cwqp6syr82nij26pnhhjiq39pd03lj1m7r83ylmywivxv"; - name = "kde-l10n-hr-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hr-17.08.2.tar.xz"; + sha256 = "070cbkpvvpxhi2kvmf97wazxn2x7jvrzwadfxwp8r6h1bxgpiq5f"; + name = "kde-l10n-hr-17.08.2.tar.xz"; }; }; kde-l10n-hu = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hu-17.08.1.tar.xz"; - sha256 = "1jj20ggv96lsfl1vc7gsv3vxwb3swj2bd1v8hyaycc86bw51qfcs"; - name = "kde-l10n-hu-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hu-17.08.2.tar.xz"; + sha256 = "1g77mh1av10h24hkqim86ik23nqxj6an4r4swzxl3ncibdx1x02f"; + name = "kde-l10n-hu-17.08.2.tar.xz"; }; }; kde-l10n-ia = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ia-17.08.1.tar.xz"; - sha256 = "0b0mp1jdbbarqd3ajc0fmjpq01y3yw37dd0ihs0r9l2v6s1ivrx2"; - name = "kde-l10n-ia-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ia-17.08.2.tar.xz"; + sha256 = "1d83558mvki39sffhrha6z3dgs1giwpbk27yi759fbc4k07w28pv"; + name = "kde-l10n-ia-17.08.2.tar.xz"; }; }; kde-l10n-id = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-id-17.08.1.tar.xz"; - sha256 = "1hdw5cgwmsp6d36jg9a7gnhiywzavrjs644w5gcw8ab2w5kzi725"; - name = "kde-l10n-id-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-id-17.08.2.tar.xz"; + sha256 = "0c1pfxc25izgrikbmp2afmi1j5i9gp9g3hkxn8c1znmwi4a0jp9n"; + name = "kde-l10n-id-17.08.2.tar.xz"; }; }; kde-l10n-is = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-is-17.08.1.tar.xz"; - sha256 = "0p9q8p3rffc79p25frgzk3jykwga3cxcc4icx29672bcy5ri6d3a"; - name = "kde-l10n-is-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-is-17.08.2.tar.xz"; + sha256 = "1jdh25rs37438acxkpb6bmwwyl4z310jv2k4dxcb3f7ml4szkg4k"; + name = "kde-l10n-is-17.08.2.tar.xz"; }; }; kde-l10n-it = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-it-17.08.1.tar.xz"; - sha256 = "1af31vfg6q30rgqfcpmjyk32rlz661azi9r205bbv45nagw5aiyz"; - name = "kde-l10n-it-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-it-17.08.2.tar.xz"; + sha256 = "015wj5xhi3mni6mcc2xv16vn18rmimfzi971jgg8xjd9z7z53fd7"; + name = "kde-l10n-it-17.08.2.tar.xz"; }; }; kde-l10n-ja = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ja-17.08.1.tar.xz"; - sha256 = "1273rm1m3ap8psf8qrvvdw7yh4bn0d90mgi02dk7vqx30j8vk2sx"; - name = "kde-l10n-ja-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ja-17.08.2.tar.xz"; + sha256 = "0vvvq1zfhj3c5xidrvfh372x4azxic3c8lhy43rn4wjalcmhyzi0"; + name = "kde-l10n-ja-17.08.2.tar.xz"; }; }; kde-l10n-kk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-kk-17.08.1.tar.xz"; - sha256 = "15wkhp673bfs23rxw8wa2q3z0gqm1wblaca0azhmy4fyhgwqaciz"; - name = "kde-l10n-kk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-kk-17.08.2.tar.xz"; + sha256 = "14vhxnchnlmz8ljh21vdrdirygkgkhmqpnnlmrz9pmqay7r8bzpk"; + name = "kde-l10n-kk-17.08.2.tar.xz"; }; }; kde-l10n-km = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-km-17.08.1.tar.xz"; - sha256 = "1c6bvy3fifdm1azqzdxbwb71pzlp90wn6k981c1ny2cpcmiwd4ps"; - name = "kde-l10n-km-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-km-17.08.2.tar.xz"; + sha256 = "0q82bvy359szsfa423rb3b65wbgnmvyk839blr9pzjp3gvhxiza2"; + name = "kde-l10n-km-17.08.2.tar.xz"; }; }; kde-l10n-ko = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ko-17.08.1.tar.xz"; - sha256 = "0wxnjjdlngpva34izxq7syga4gyfj2jyf1npayzq3ii0hzjarmrq"; - name = "kde-l10n-ko-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ko-17.08.2.tar.xz"; + sha256 = "1v4bjws17mz022n3r49z7rz1pdmqa4dsffj7pm60ixi6p5y3gvk2"; + name = "kde-l10n-ko-17.08.2.tar.xz"; }; }; kde-l10n-lt = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-lt-17.08.1.tar.xz"; - sha256 = "02571m0mnhryy3zggy2bzc2k3q2dqc8kwn49332jsvbmsbkznk6a"; - name = "kde-l10n-lt-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-lt-17.08.2.tar.xz"; + sha256 = "0f09kkaghydq4b0fs59vz4h8q8j84qnqaqqaljc3vq05ih3849n5"; + name = "kde-l10n-lt-17.08.2.tar.xz"; }; }; kde-l10n-lv = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-lv-17.08.1.tar.xz"; - sha256 = "17xhsgqb56al5zyvhllqfnm118fimnchd037649nnkddfpl95wwi"; - name = "kde-l10n-lv-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-lv-17.08.2.tar.xz"; + sha256 = "0aw8lpdh6y126gbwkfm408lz84kwd44wi3ryi5ascxadklmgcydw"; + name = "kde-l10n-lv-17.08.2.tar.xz"; }; }; kde-l10n-mr = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-mr-17.08.1.tar.xz"; - sha256 = "0p8ynpc1ryksb97zl50i23rknsr70p124wpxmr6i1i7aq8jagcqc"; - name = "kde-l10n-mr-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-mr-17.08.2.tar.xz"; + sha256 = "10670r4fmvd1030rnlyl1s1ixiy380jg84h3ayv3m270rydpwn4c"; + name = "kde-l10n-mr-17.08.2.tar.xz"; }; }; kde-l10n-nb = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nb-17.08.1.tar.xz"; - sha256 = "1ikh6fpj5lw4bfpmh8ln1v3mvmd9k55jz3v67ncrfyflljvwv6v7"; - name = "kde-l10n-nb-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nb-17.08.2.tar.xz"; + sha256 = "0cajcnk3clz175y2vhihpj33lcq5qmd0mgcl0srz5n28978v85wk"; + name = "kde-l10n-nb-17.08.2.tar.xz"; }; }; kde-l10n-nds = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nds-17.08.1.tar.xz"; - sha256 = "0g7da58vazj1ckw336hgp7zlp6ra31xdjp0zx6hmwcxjv9as9scy"; - name = "kde-l10n-nds-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nds-17.08.2.tar.xz"; + sha256 = "0r5zpc48sywkqb227kf963p01w1x7r828pr0dsy711h5wwwbnj93"; + name = "kde-l10n-nds-17.08.2.tar.xz"; }; }; kde-l10n-nl = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nl-17.08.1.tar.xz"; - sha256 = "0d059nb4qifpm4bx0akmxn0x9bx6cs5218yh9prqn9wpzaa96vf5"; - name = "kde-l10n-nl-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nl-17.08.2.tar.xz"; + sha256 = "02hz160xsacsbimwqva7f5fp2zk7nnngj349v0vhyx85fk2s5hd7"; + name = "kde-l10n-nl-17.08.2.tar.xz"; }; }; kde-l10n-nn = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nn-17.08.1.tar.xz"; - sha256 = "034570iymirny6di77gxck3j0b1n11v07kj7k80h03smq2gkb6rh"; - name = "kde-l10n-nn-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nn-17.08.2.tar.xz"; + sha256 = "005779r53bfzxrir56nxly5c38bzcjs20y690m3g7y4kfvlyas0d"; + name = "kde-l10n-nn-17.08.2.tar.xz"; }; }; kde-l10n-pa = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pa-17.08.1.tar.xz"; - sha256 = "10872cgamrm39xk5kr4qd5ddzpfpgra1rysj7raw9hr5fw0h5jqx"; - name = "kde-l10n-pa-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pa-17.08.2.tar.xz"; + sha256 = "0475yxyzs6m35hbhk6y68s86sfvwb838ji4ycjwg5164ml6p9x7f"; + name = "kde-l10n-pa-17.08.2.tar.xz"; }; }; kde-l10n-pl = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pl-17.08.1.tar.xz"; - sha256 = "0bvp9mcny4zbcq1pi2d33s0fkdpblg1qrizi3v3jhzmxx1i7hr3w"; - name = "kde-l10n-pl-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pl-17.08.2.tar.xz"; + sha256 = "13v729a2cpp1spk8zlvynf41naifks5skacgdxx7pnz3z5nq34ih"; + name = "kde-l10n-pl-17.08.2.tar.xz"; }; }; kde-l10n-pt = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pt-17.08.1.tar.xz"; - sha256 = "0m61a31iqzwk8wj40rjnx9i662mk3n9q21vh22p7ak9kf9r9kfhv"; - name = "kde-l10n-pt-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pt-17.08.2.tar.xz"; + sha256 = "13v7ahpp9yz197qggq6lwgyln2z4cszk4g46jc9c4qg1wq954cch"; + name = "kde-l10n-pt-17.08.2.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-17.08.1"; + version = "pt_BR-17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pt_BR-17.08.1.tar.xz"; - sha256 = "1kh7rrpx5idnkpd8j89gxkm33kjz808mvb0d6i39lsv8nqk8ifq8"; - name = "kde-l10n-pt_BR-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pt_BR-17.08.2.tar.xz"; + sha256 = "19qd7cm96hjbh4bwgy9r00i7fdzrsivjss00vd502s2620wxj8mh"; + name = "kde-l10n-pt_BR-17.08.2.tar.xz"; }; }; kde-l10n-ro = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ro-17.08.1.tar.xz"; - sha256 = "04b9bjz9nprhiki00b4yffd27dk1vjz6ddjw6bh6bxrzmzg2cgbc"; - name = "kde-l10n-ro-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ro-17.08.2.tar.xz"; + sha256 = "15jyjdvksqvhr7hkkfkb2mp7rkkidq7r15iibphi04d7nf5rgh7h"; + name = "kde-l10n-ro-17.08.2.tar.xz"; }; }; kde-l10n-ru = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ru-17.08.1.tar.xz"; - sha256 = "04zx9xf1ca2pl75rbkcr7fa6sy3kmzdgc626wygqg0s4bi3rlsh2"; - name = "kde-l10n-ru-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ru-17.08.2.tar.xz"; + sha256 = "1vk54wih1bv85ixl4zv229hi7yvfnljndlfaslzfq2ff0r3j5iyf"; + name = "kde-l10n-ru-17.08.2.tar.xz"; }; }; kde-l10n-sk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sk-17.08.1.tar.xz"; - sha256 = "0q4ykign8mifwfwv56p3ac7bn3ywc9anj43f8n08c7bma4idxv01"; - name = "kde-l10n-sk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sk-17.08.2.tar.xz"; + sha256 = "0n4j3cp9zh2r2jyy2mksm5qx1xxkb847q8vlx896q26cbzc2sl5k"; + name = "kde-l10n-sk-17.08.2.tar.xz"; }; }; kde-l10n-sl = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sl-17.08.1.tar.xz"; - sha256 = "13mb62fjlpbhyv485rp1f5xgdfqdkq3vm2qq82rbw4jdw140ck08"; - name = "kde-l10n-sl-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sl-17.08.2.tar.xz"; + sha256 = "05dpfmqcdclkkdk58q3dz9h4m5gyfdp0a47pj3wlp8gagn6lrll1"; + name = "kde-l10n-sl-17.08.2.tar.xz"; }; }; kde-l10n-sr = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sr-17.08.1.tar.xz"; - sha256 = "0xc6pgbm3rqn5g824pzfv0cxas6anb3glm11zhk9qhj24ig1zd5c"; - name = "kde-l10n-sr-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sr-17.08.2.tar.xz"; + sha256 = "1yavz6rfymg9ggb8xa7wrhr774482i7l7f110mbxb0hpp0rb37l4"; + name = "kde-l10n-sr-17.08.2.tar.xz"; }; }; kde-l10n-sv = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sv-17.08.1.tar.xz"; - sha256 = "0p067wi30d7vgxsv345vv0f01qbchnffamv4pjv8sfscbcmih9c6"; - name = "kde-l10n-sv-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sv-17.08.2.tar.xz"; + sha256 = "1hznlqyr93zbhp11s4q6x8ad0rscikqdxmgaw9i8h1wjiy926psy"; + name = "kde-l10n-sv-17.08.2.tar.xz"; }; }; kde-l10n-tr = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-tr-17.08.1.tar.xz"; - sha256 = "15x2r21810mndzzqx5cz1z6a6g7czmp2wiw8hw89g6nigq3qvacx"; - name = "kde-l10n-tr-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-tr-17.08.2.tar.xz"; + sha256 = "1mmi73sfrzqhwwj2pb7p1bklm0cgprs8mg73k7v1nvzxfj5mm3xl"; + name = "kde-l10n-tr-17.08.2.tar.xz"; }; }; kde-l10n-ug = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ug-17.08.1.tar.xz"; - sha256 = "1bpd63jv8dlikg3589in5h11ydkpwp5mq69vlam9z68bmbl5sy5w"; - name = "kde-l10n-ug-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ug-17.08.2.tar.xz"; + sha256 = "0b4qzcp08y6hv7184sxl305rl92y38h68ljs7kbmszggy33fw0xq"; + name = "kde-l10n-ug-17.08.2.tar.xz"; }; }; kde-l10n-uk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-uk-17.08.1.tar.xz"; - sha256 = "1yaynm508g03gn896q3zrw8y5rn4l7m8a2x2skwyjzfxy8pk4az9"; - name = "kde-l10n-uk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-uk-17.08.2.tar.xz"; + sha256 = "1jvrkc765s0dmbbh6yrfwp0nq3zr8kirp88ddnxv1jn4xk1wj60c"; + name = "kde-l10n-uk-17.08.2.tar.xz"; }; }; kde-l10n-wa = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-wa-17.08.1.tar.xz"; - sha256 = "0247pwdizs31jhrjx6kfydgkr2ghqnqsdza10a7mggz825mgg2hv"; - name = "kde-l10n-wa-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-wa-17.08.2.tar.xz"; + sha256 = "1jnca594pbvhm6bpqkpaibpn3bh1ady1px1cjqljm3v2173gqgsh"; + name = "kde-l10n-wa-17.08.2.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-17.08.1"; + version = "zh_CN-17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-zh_CN-17.08.1.tar.xz"; - sha256 = "0a58ikf8pkxhqr25cy04s5hwhdkp81y3304wa6xcni2k5vlzca9f"; - name = "kde-l10n-zh_CN-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-zh_CN-17.08.2.tar.xz"; + sha256 = "1szwwhd5jsafbnma968crz7x3l6r56qyx253119c0v7hribh2lh0"; + name = "kde-l10n-zh_CN-17.08.2.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-17.08.1"; + version = "zh_TW-17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-zh_TW-17.08.1.tar.xz"; - sha256 = "02lkg354vq3sqvy4iib51yynjb5yx0hsqh1alik97wajawv4fkrc"; - name = "kde-l10n-zh_TW-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-zh_TW-17.08.2.tar.xz"; + sha256 = "1v4qlh63l02689mjbxq3q6ljpij1ryr0z51lmymab65bk7vxh2mw"; + name = "kde-l10n-zh_TW-17.08.2.tar.xz"; }; }; kdelibs = { - version = "4.14.36"; + version = "4.14.37"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdelibs-4.14.36.tar.xz"; - sha256 = "08x5frbbgib9agn9ixslpx41wki8ky4l1r60xrl2pmywmwld4ag1"; - name = "kdelibs-4.14.36.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdelibs-4.14.37.tar.xz"; + sha256 = "0c74yg01r802j5jwl270w9sfkkhsn2fz26xhk5w44a1gycdlm7jf"; + name = "kdelibs-4.14.37.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdenetwork-filesharing-17.08.1.tar.xz"; - sha256 = "1m79c4ww25gcx4aiwjwp81r18i8s2x6afpp76xi2am6v4sd8rjb3"; - name = "kdenetwork-filesharing-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdenetwork-filesharing-17.08.2.tar.xz"; + sha256 = "0pz2zblg8hly141xkcrqs6hnv76zq5isbvyzdad6sjngjn4spcyc"; + name = "kdenetwork-filesharing-17.08.2.tar.xz"; }; }; kdenlive = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdenlive-17.08.1.tar.xz"; - sha256 = "0cj618pjkack3wj66nbq4src460la5qryylblswg2nzm0svqawqh"; - name = "kdenlive-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdenlive-17.08.2.tar.xz"; + sha256 = "0a0qadvxy9b2drpj2k163wfg73020qfclkl47krqgrn2mdvibr92"; + name = "kdenlive-17.08.2.tar.xz"; }; }; kdepim-addons = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdepim-addons-17.08.1.tar.xz"; - sha256 = "105b8pf9g44b5fz8vy404jiysz7sccvllz0bvhi9ihv7a3g4gihg"; - name = "kdepim-addons-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdepim-addons-17.08.2.tar.xz"; + sha256 = "036zs71aqr749n2cjv61y1xhgg16lsh07lx1kdqcqwyi8qgk7c1m"; + name = "kdepim-addons-17.08.2.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdepim-apps-libs-17.08.1.tar.xz"; - sha256 = "000gmblsgyzgml6h4v3ccr2n0n7s359rb91higiyrzkxi1cq0bh8"; - name = "kdepim-apps-libs-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdepim-apps-libs-17.08.2.tar.xz"; + sha256 = "14m7qxvpfdq53amigysqj4y26j8y8c45j7k4j9gv90amlh716ss1"; + name = "kdepim-apps-libs-17.08.2.tar.xz"; }; }; kdepim-runtime = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdepim-runtime-17.08.1.tar.xz"; - sha256 = "0q19j5dr0lml9v88ma32vqypi3jzg2dkjzv9adl48k9d2yrywq5n"; - name = "kdepim-runtime-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdepim-runtime-17.08.2.tar.xz"; + sha256 = "0yvrgi8rgwpvzkhzc5zdqyhqxs0czfqqc4dsgprg27a06lb7i3lz"; + name = "kdepim-runtime-17.08.2.tar.xz"; }; }; kde-runtime = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-runtime-17.08.1.tar.xz"; - sha256 = "0gl24dpkxbkjq7kqj2i022w82daihxnyi2ccld0ql9680w73s3zg"; - name = "kde-runtime-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-runtime-17.08.2.tar.xz"; + sha256 = "00bjnbpx2lbjl7nz9z118yanwqmgjmy0nvq4bgxz7i4b68aw17xb"; + name = "kde-runtime-17.08.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdesdk-kioslaves-17.08.1.tar.xz"; - sha256 = "10nz2ai5iahva93psw1dd86npwcp5xlx80n12biwqfgwj5d380k8"; - name = "kdesdk-kioslaves-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdesdk-kioslaves-17.08.2.tar.xz"; + sha256 = "0h1bv0dbi3a8b1q5dj999k28llckgxsf8055fw5fsbx6q2h0rq23"; + name = "kdesdk-kioslaves-17.08.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdesdk-thumbnailers-17.08.1.tar.xz"; - sha256 = "11d7vch9fc5w42wlq8bz3wpb68sjslvvqpqs67d155w682z1q4q1"; - name = "kdesdk-thumbnailers-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdesdk-thumbnailers-17.08.2.tar.xz"; + sha256 = "0z20hc8ssw439sdc8w2fzkaihzcag8sflymizwgf6x8c7awi4y2v"; + name = "kdesdk-thumbnailers-17.08.2.tar.xz"; }; }; kdf = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdf-17.08.1.tar.xz"; - sha256 = "09sjv6z5565mvgnicwaykisgrh859m7h8wfggmqs3rgldsi3iy0p"; - name = "kdf-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdf-17.08.2.tar.xz"; + sha256 = "0pfw8br46475h2v34nc0pnz94icrlivc3xcaxrf3w6x0wypmnhxs"; + name = "kdf-17.08.2.tar.xz"; }; }; kdialog = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdialog-17.08.1.tar.xz"; - sha256 = "1j5ahq4xksl0jrxcisai0mnk6vr126qbabd9hnwq491f419l3zh1"; - name = "kdialog-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdialog-17.08.2.tar.xz"; + sha256 = "03lb5h8lbravayx5fddbzb6xgi9dabcyqpld3h32ykw4v26wlb1v"; + name = "kdialog-17.08.2.tar.xz"; }; }; kdiamond = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdiamond-17.08.1.tar.xz"; - sha256 = "07is91glcffrznsg72drmyqmz3lyki62g6ijc14x5i7k8v26nlhi"; - name = "kdiamond-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdiamond-17.08.2.tar.xz"; + sha256 = "1fkldch162m4awk6j7xx61lh8h9i5cb9x38gndz4imvwmyvfqijn"; + name = "kdiamond-17.08.2.tar.xz"; }; }; keditbookmarks = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/keditbookmarks-17.08.1.tar.xz"; - sha256 = "1k18if8ssjwj8mgp2jgxxwa8hh6x5w402i8fb2nsc7b4khw02y9q"; - name = "keditbookmarks-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/keditbookmarks-17.08.2.tar.xz"; + sha256 = "0dfyp8macmqhczk7b60dc15wqw8wzpbp6wlm6cdibdw7hlia9hfl"; + name = "keditbookmarks-17.08.2.tar.xz"; }; }; kfilereplace = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kfilereplace-17.08.1.tar.xz"; - sha256 = "1ra01im1yp5k73m2hyz72d73qhwv3by1zyipn4l1m2m4r62kwjcr"; - name = "kfilereplace-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kfilereplace-17.08.2.tar.xz"; + sha256 = "02iwzcn5lm1riv1pg9d5s20q60f569qpx1wdbz1181r6806fsi37"; + name = "kfilereplace-17.08.2.tar.xz"; }; }; kfind = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kfind-17.08.1.tar.xz"; - sha256 = "114l6b081ddxx51ndkqjl9jnvy00nyydn245y1kskfbzk2yry1jb"; - name = "kfind-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kfind-17.08.2.tar.xz"; + sha256 = "06c3ba95h6lzfwlj4svwlrijbv0d8c5siljiradiam65zai2bfpd"; + name = "kfind-17.08.2.tar.xz"; }; }; kfloppy = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kfloppy-17.08.1.tar.xz"; - sha256 = "1afnlbk42g6sm7y7xkqnxr24mz2s95qkaap2s3zqc469gj1vlnxa"; - name = "kfloppy-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kfloppy-17.08.2.tar.xz"; + sha256 = "0icvsbxcxxg8lyzvzbga34an968gzwpd23zssbfy8flym95ci890"; + name = "kfloppy-17.08.2.tar.xz"; }; }; kfourinline = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kfourinline-17.08.1.tar.xz"; - sha256 = "12cy3sarcy361wivlbpx2cxc2yaffr2xfy4dwz3iz6vzx49mhyky"; - name = "kfourinline-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kfourinline-17.08.2.tar.xz"; + sha256 = "1d4bfl81v4v512ixi1vbfbvz8vbmn1acfxjazlhk8xjjj0ky3yb2"; + name = "kfourinline-17.08.2.tar.xz"; }; }; kgeography = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kgeography-17.08.1.tar.xz"; - sha256 = "1mjfacc850pqsgylwfcvp7yv0c4f1qgk0y7pgwrx2nspf8i1wwhc"; - name = "kgeography-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kgeography-17.08.2.tar.xz"; + sha256 = "16fgkp16bhpcibf8q0ivp9zsw8ws44icg34c3r8p5fbggfnkzqk6"; + name = "kgeography-17.08.2.tar.xz"; }; }; kget = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kget-17.08.1.tar.xz"; - sha256 = "182l5hd5hfbpl88p9yzc54n8m0mi2fffp19sjdhhadmyx142inc1"; - name = "kget-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kget-17.08.2.tar.xz"; + sha256 = "1n6ky1bvr24hj3d6s1lfmyybr73q9p59w80fpzbx5v8c8l2g40w0"; + name = "kget-17.08.2.tar.xz"; }; }; kgoldrunner = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kgoldrunner-17.08.1.tar.xz"; - sha256 = "0rzhg7hk07yaghflskiz4wh5d3jdfvhzig3zyyhimwir90lj1gxx"; - name = "kgoldrunner-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kgoldrunner-17.08.2.tar.xz"; + sha256 = "085ydmcmaiahzq32gasc5ihbxg25glpc9alqzhd4flzvqf646xmx"; + name = "kgoldrunner-17.08.2.tar.xz"; }; }; kgpg = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kgpg-17.08.1.tar.xz"; - sha256 = "1hcg9zv4f2bj1210fahxap1fnyk7zdj3gfpfpdrww6qga5z4dzcy"; - name = "kgpg-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kgpg-17.08.2.tar.xz"; + sha256 = "1nrz2p6h13wi4vk4mrpcjkksrr6brj1aap4mf1rpj0g1mhrhwqly"; + name = "kgpg-17.08.2.tar.xz"; }; }; khangman = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/khangman-17.08.1.tar.xz"; - sha256 = "17xk64lclbw2gcpnfpzi9sqryr8wl8g1v19gqrplvq4zw7qfanr5"; - name = "khangman-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/khangman-17.08.2.tar.xz"; + sha256 = "17qmsixr4ic86imdrw0z9lyjhnw00ycnxyyrzb736cw7s4jnnick"; + name = "khangman-17.08.2.tar.xz"; }; }; khelpcenter = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/khelpcenter-17.08.1.tar.xz"; - sha256 = "1js7sk1hdp3k7d4gjk8rzq5rw1al8bh0ap5irw5551kvbagm5dp4"; - name = "khelpcenter-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/khelpcenter-17.08.2.tar.xz"; + sha256 = "0n4rdw606rhc3fs7kqg28dh8ay7q3ihiaraay8by3bk5dqby8r8k"; + name = "khelpcenter-17.08.2.tar.xz"; }; }; kholidays = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kholidays-17.08.1.tar.xz"; - sha256 = "0gsvidakx0q0wqy2bgwq339hwghdcl882nvzj445hnmy10r2d6jk"; - name = "kholidays-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kholidays-17.08.2.tar.xz"; + sha256 = "03acmrw577lbs5h8az4wiw0dlmxmjiqak8pvm7w0ssmd2mrkggl2"; + name = "kholidays-17.08.2.tar.xz"; }; }; kidentitymanagement = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kidentitymanagement-17.08.1.tar.xz"; - sha256 = "1ippkav5nvfckp4145gcwa2hdl7zjw8bcaq6af5kcxqmvlcndvwv"; - name = "kidentitymanagement-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kidentitymanagement-17.08.2.tar.xz"; + sha256 = "1ylv4qcsry9m8zjddgpxb93yfmzbf0aikvf4m7j040272z2as6q9"; + name = "kidentitymanagement-17.08.2.tar.xz"; }; }; kig = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kig-17.08.1.tar.xz"; - sha256 = "0gzfdpi4qlmwg6hkx1slvnxlynsfgwv18a9law05hg35hs6zxzfk"; - name = "kig-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kig-17.08.2.tar.xz"; + sha256 = "19jm98rlfvzsqip8vdi8gf1hynfkizjn61j4p1srgaciffx5l8zb"; + name = "kig-17.08.2.tar.xz"; }; }; kigo = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kigo-17.08.1.tar.xz"; - sha256 = "0c498rzvmfkl0q5hnhddlx38qwyzsz4lh05cy5v4zpq8idvnxzj5"; - name = "kigo-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kigo-17.08.2.tar.xz"; + sha256 = "04qlqghgnnyqcvc1f3s4l9as4pma1g09jdgy48jwxlbg1h60m48z"; + name = "kigo-17.08.2.tar.xz"; }; }; killbots = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/killbots-17.08.1.tar.xz"; - sha256 = "0yay6pr83rh5slklmxvw3jr2bky7k5cgf55a8r6al5b4vsx2802r"; - name = "killbots-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/killbots-17.08.2.tar.xz"; + sha256 = "1xpigas92xn911jm0zrq47hpnxxr4lb9bvv9f5b6i7k9z8p9m8zl"; + name = "killbots-17.08.2.tar.xz"; }; }; kimagemapeditor = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kimagemapeditor-17.08.1.tar.xz"; - sha256 = "158vrszvz2acnbzvmjprg1j2knarffvg8awwjcfg3zn2i6arwwsg"; - name = "kimagemapeditor-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kimagemapeditor-17.08.2.tar.xz"; + sha256 = "13z3z4pjgky4bh5js79rnsbzcxj0ksh4wdqx3fgmjs5mzbaka5gg"; + name = "kimagemapeditor-17.08.2.tar.xz"; }; }; kimap = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kimap-17.08.1.tar.xz"; - sha256 = "1vch7y153jg010mcz7qjxjp6f3gfxrczbfh3bvx8q70cqfmx7ssm"; - name = "kimap-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kimap-17.08.2.tar.xz"; + sha256 = "0klpqy092hfqrvmm4nx3blwjnkybhg9zji500ckid90kv547ffmb"; + name = "kimap-17.08.2.tar.xz"; }; }; kio-extras = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kio-extras-17.08.1.tar.xz"; - sha256 = "1hk09yavrr1dqvxjsdg9rmn6j8jzczhnfyn71hyfbglshvlhwm8m"; - name = "kio-extras-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kio-extras-17.08.2.tar.xz"; + sha256 = "1pblk8vi2gcvyjw71pwihpd9n4qlhcksfs3py8mcll1pz2ijbz6n"; + name = "kio-extras-17.08.2.tar.xz"; }; }; kiriki = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kiriki-17.08.1.tar.xz"; - sha256 = "0cxmxxwn6ps00kf64z61r3k7iyr5falrbzmf6gz19m535b79drhi"; - name = "kiriki-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kiriki-17.08.2.tar.xz"; + sha256 = "1w83ggi02ibhgsmyw5s9cnjjqgx0zwbakf42l1dif9882svg38h7"; + name = "kiriki-17.08.2.tar.xz"; }; }; kiten = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kiten-17.08.1.tar.xz"; - sha256 = "1yp2r5linfkknvn5dx4vf2f6vxg3kzrpiqsrg34q957wvfsc91qm"; - name = "kiten-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kiten-17.08.2.tar.xz"; + sha256 = "0rdkwv4njdpv1air697gwlzx843ddqwa7kl15i012307jfgkbkj4"; + name = "kiten-17.08.2.tar.xz"; }; }; kjumpingcube = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kjumpingcube-17.08.1.tar.xz"; - sha256 = "161px7wad80a3p6hr27dj0990jb7j143q77q7ca308qysmffghnz"; - name = "kjumpingcube-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kjumpingcube-17.08.2.tar.xz"; + sha256 = "0q4y35ffq48yc2h843vv970rg4h8miy5pbsxkkrflwljcarwxv65"; + name = "kjumpingcube-17.08.2.tar.xz"; }; }; kldap = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kldap-17.08.1.tar.xz"; - sha256 = "11j0ai0y022xxgiw7ac5cgv8vqb3qa1dbh7n9jqz9lg8rhjch2ix"; - name = "kldap-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kldap-17.08.2.tar.xz"; + sha256 = "1p0ydrhji8cb4fmciyazy44d2nz6mhcl1brqn4ridv98hqa2ybpc"; + name = "kldap-17.08.2.tar.xz"; }; }; kleopatra = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kleopatra-17.08.1.tar.xz"; - sha256 = "1z32xwlsslhzqzsq8ngdws1ry56myvx8j56b973scbhd29z15www"; - name = "kleopatra-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kleopatra-17.08.2.tar.xz"; + sha256 = "0g5qg0kg1d0cza3689ppvj4hdhqdsxjcn8hc9cfpsapz28is8yk4"; + name = "kleopatra-17.08.2.tar.xz"; }; }; klettres = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/klettres-17.08.1.tar.xz"; - sha256 = "0s7n83smr4mrrs91bpyr3hk2s1sl3ix73scnllb6spb6gx5hhr13"; - name = "klettres-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/klettres-17.08.2.tar.xz"; + sha256 = "1n1z4nj3rqiyqz0ysr6fvhygayvxfyljg3z6f0y6f70n9r5n999m"; + name = "klettres-17.08.2.tar.xz"; }; }; klickety = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/klickety-17.08.1.tar.xz"; - sha256 = "0zp836x7ssgk7y5fcni7ya9cfdc28ywgvlzc01f7bi7pwh57q50x"; - name = "klickety-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/klickety-17.08.2.tar.xz"; + sha256 = "1haqc96jivnb93vhzmd9kp446p32gmkpf5zys5ix20r6lbsywgd9"; + name = "klickety-17.08.2.tar.xz"; }; }; klines = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/klines-17.08.1.tar.xz"; - sha256 = "069igz40zrwbnyvw53d59rksn2n3dxycysb9fakb165qr27kb42h"; - name = "klines-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/klines-17.08.2.tar.xz"; + sha256 = "1v5gqyyc6vl3s44w9v34q0g27fxf85kkk9i188j48q0kiblbxq8d"; + name = "klines-17.08.2.tar.xz"; }; }; klinkstatus = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/klinkstatus-17.08.1.tar.xz"; - sha256 = "11fakg10rlf4finznc2i5h1lbh1qq37wvzd93yc8vdwax98pps44"; - name = "klinkstatus-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/klinkstatus-17.08.2.tar.xz"; + sha256 = "1nfflb850mr1cd065lwryx6rd47w5bamg7sznvrhzjzqzrq6sm0x"; + name = "klinkstatus-17.08.2.tar.xz"; }; }; kmag = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmag-17.08.1.tar.xz"; - sha256 = "1y69rsdl9pz11xrbfg8p0ihm1691y3blb5jay0v228prbwsy2gn3"; - name = "kmag-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmag-17.08.2.tar.xz"; + sha256 = "16i4cysa77dmxvkhpvhja4v315nnj1i5m9pd8a62j32gkrq54cpr"; + name = "kmag-17.08.2.tar.xz"; }; }; kmahjongg = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmahjongg-17.08.1.tar.xz"; - sha256 = "17f57shs79pbwdaqblb4i9ibs3b4psy38ys69i8k5j04v7mam48s"; - name = "kmahjongg-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmahjongg-17.08.2.tar.xz"; + sha256 = "06f0wrjnlqgsh4n5kf7by5calrg2p0chm0c5b6wf4k311wb1cy65"; + name = "kmahjongg-17.08.2.tar.xz"; }; }; kmail = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmail-17.08.1.tar.xz"; - sha256 = "1c3yds59nssnqi0pxb6fjajq6yaj6ki7l83gj59wlmpsyc1nm15d"; - name = "kmail-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmail-17.08.2.tar.xz"; + sha256 = "0fxxys8fxal6f4grbnl5niwf80kg62zymlbsp3hk7iihis6zqq59"; + name = "kmail-17.08.2.tar.xz"; }; }; kmail-account-wizard = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmail-account-wizard-17.08.1.tar.xz"; - sha256 = "1vipb6330p67g4qpx2g1ps0fxnqb8w1agfwxnv61k3fccxpr4gkw"; - name = "kmail-account-wizard-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmail-account-wizard-17.08.2.tar.xz"; + sha256 = "1qf78p18pfyl7axm447q8zcrji53h6mvahampkqgmsybp35c7fd7"; + name = "kmail-account-wizard-17.08.2.tar.xz"; }; }; kmailtransport = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmailtransport-17.08.1.tar.xz"; - sha256 = "1r8xbccijiw5v92qq18rccvsdn87m8mwc6g53k8gxpjx37vxrba8"; - name = "kmailtransport-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmailtransport-17.08.2.tar.xz"; + sha256 = "0gzvvszwaqpckig8293m734gbyzx5v8sl9k9n1hi1cnwblsnn7aj"; + name = "kmailtransport-17.08.2.tar.xz"; }; }; kmbox = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmbox-17.08.1.tar.xz"; - sha256 = "0bgjj69by4c11z7j7v7inx4gzcsn6106r28n1ds6lc1k0vv8zw2d"; - name = "kmbox-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmbox-17.08.2.tar.xz"; + sha256 = "01ip8j5yj09gzzgynjqnxxxyv5d69rnnvq8mgwnpm6cxyh7lc8pv"; + name = "kmbox-17.08.2.tar.xz"; }; }; kmime = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmime-17.08.1.tar.xz"; - sha256 = "178bx5pasrrlqwzjz85ba06gs9r40prwk7z4v6ar6fr9q4pa088c"; - name = "kmime-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmime-17.08.2.tar.xz"; + sha256 = "1ai3czsl60rf0sqqbmvr34nz5q2dz7i5y818rrar52r7fdn93wba"; + name = "kmime-17.08.2.tar.xz"; }; }; kmines = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmines-17.08.1.tar.xz"; - sha256 = "1al98mzy8jrp17vq4j7np1bl5j9sd79drh78zd0343mrcqa7js28"; - name = "kmines-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmines-17.08.2.tar.xz"; + sha256 = "0k563bsd0yczcm4h5wvq2f5i029ah9wwv2f0qjwyrbzqxcl50xi0"; + name = "kmines-17.08.2.tar.xz"; }; }; kmix = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmix-17.08.1.tar.xz"; - sha256 = "1w783p49zgsj52cy3mv4zgvh8f55mdij2drzgk3qr510wsyf0cg5"; - name = "kmix-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmix-17.08.2.tar.xz"; + sha256 = "06rqnlrl2l91inllzn8jksg74sldjyghjg06vv49ly6jqyc04aqh"; + name = "kmix-17.08.2.tar.xz"; }; }; kmousetool = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmousetool-17.08.1.tar.xz"; - sha256 = "09rjvnp7f16d6cg3d5p1ah184j7710mziiiz5r0zxq7vdnkvxzlh"; - name = "kmousetool-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmousetool-17.08.2.tar.xz"; + sha256 = "1y568g0s88h0i67j9x083nqj7nyfsn4vyb149j97fm7d4iifbm2s"; + name = "kmousetool-17.08.2.tar.xz"; }; }; kmouth = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmouth-17.08.1.tar.xz"; - sha256 = "07s3fqybprw7gprksc271pspnh81yawm5prrz0lif2awvc7wp7pm"; - name = "kmouth-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmouth-17.08.2.tar.xz"; + sha256 = "0qbbqb0wb3pzz7xv6jvghm2fmgxkvwmyiyjc9m1yzbmrdzqj1rig"; + name = "kmouth-17.08.2.tar.xz"; }; }; kmplot = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmplot-17.08.1.tar.xz"; - sha256 = "1gxhfkjdsrf8klqhqji6yzv9g4sdjcjhmyvx5j71wmrdc6pdpkpf"; - name = "kmplot-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmplot-17.08.2.tar.xz"; + sha256 = "1ccnlbgzvx2b1sdzrvzpmnnk4g8r7rvpczm1xjyk62r7mdbffp97"; + name = "kmplot-17.08.2.tar.xz"; }; }; knavalbattle = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/knavalbattle-17.08.1.tar.xz"; - sha256 = "187n5kn5ri87a98rybsf4g5jcwvyxdnb4601iaaf4jb6rg3yf2pm"; - name = "knavalbattle-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/knavalbattle-17.08.2.tar.xz"; + sha256 = "1b0s28ybl1p62issc3rvl41zhn94y0y9aflpqkjfg6592zjc304g"; + name = "knavalbattle-17.08.2.tar.xz"; }; }; knetwalk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/knetwalk-17.08.1.tar.xz"; - sha256 = "10kjsw94yzz82af3adk9shm67kbg8f8p0xmh60jr97cm1lvz5186"; - name = "knetwalk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/knetwalk-17.08.2.tar.xz"; + sha256 = "0b9zqa3xgwkcfrnyxd026vd47hpf9i7j5xmx1b756rqm9yr531r5"; + name = "knetwalk-17.08.2.tar.xz"; }; }; knotes = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/knotes-17.08.1.tar.xz"; - sha256 = "0654fxaiyvhfxjyfaw9hgvv352xkix2ls7wlvyw5b15d9iqa5cl0"; - name = "knotes-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/knotes-17.08.2.tar.xz"; + sha256 = "02i25f43dwmlwx1yhhws0zvrvqf92zhw8868hbfxz0y1lq04navx"; + name = "knotes-17.08.2.tar.xz"; }; }; kolf = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kolf-17.08.1.tar.xz"; - sha256 = "0cmqpyd157b3n3x18d6wiijyvjaavxp65nagw2r0prjz9dckd1cl"; - name = "kolf-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kolf-17.08.2.tar.xz"; + sha256 = "1m0dn1v68y7vsranlv690hx3dyffzkjmnqzbvyaad72kldq0qw0l"; + name = "kolf-17.08.2.tar.xz"; }; }; kollision = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kollision-17.08.1.tar.xz"; - sha256 = "00chxdib0ym5x94pzgfg3zx2lixf9h5b7sfcbg0chvjlc8imfv2b"; - name = "kollision-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kollision-17.08.2.tar.xz"; + sha256 = "01z6yfr882hh00bga3iwcyiwxzyigxc2ddd6r8a3s6h7cpi4ik1x"; + name = "kollision-17.08.2.tar.xz"; }; }; kolourpaint = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kolourpaint-17.08.1.tar.xz"; - sha256 = "18cf856r66gwdf149zyam53p0sqvm0bf5f0k0n62mkp80z76kbvm"; - name = "kolourpaint-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kolourpaint-17.08.2.tar.xz"; + sha256 = "15bfzw03dh40m51fh1zwbrzqb5g2qjryznaaymjmzamgx08ldm4n"; + name = "kolourpaint-17.08.2.tar.xz"; }; }; kompare = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kompare-17.08.1.tar.xz"; - sha256 = "1whsbz99cdnivq6m7irvnj0vcq82s34z9mgzd4a50z3i7ms5hmvf"; - name = "kompare-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kompare-17.08.2.tar.xz"; + sha256 = "1l2rdv8sddhf2z0vnn591aarzq5nqbhi58cnnpdwb5px99kasnyv"; + name = "kompare-17.08.2.tar.xz"; }; }; konqueror = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/konqueror-17.08.1.tar.xz"; - sha256 = "1plq38ap1gdjq1s02s3km3pg8l2cgx0mkicb5jldz02qxj4z8rgy"; - name = "konqueror-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/konqueror-17.08.2.tar.xz"; + sha256 = "1c0fpbjba9bq515v3vbzj80jclx8kcy9khzvgaxasdmd9d01yvid"; + name = "konqueror-17.08.2.tar.xz"; }; }; konquest = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/konquest-17.08.1.tar.xz"; - sha256 = "01ps82zkd95w06im3x7cazwbn2m4xbr80ky16gd71v3sdgg5zpw7"; - name = "konquest-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/konquest-17.08.2.tar.xz"; + sha256 = "15mmavbkndzzfa3zzsqxh53wi2489dqr8iw25iaj3pcbjzkn75rd"; + name = "konquest-17.08.2.tar.xz"; }; }; konsole = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/konsole-17.08.1.tar.xz"; - sha256 = "00rrwk6i0ngg07md84bkfggdmmfknkpxiqbv37pb7xis1rvz9c8p"; - name = "konsole-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/konsole-17.08.2.tar.xz"; + sha256 = "0a7ks2an76jwkapy9rjhf29q9h4z212yf9bvx5757lj5qn5pwxq2"; + name = "konsole-17.08.2.tar.xz"; }; }; kontact = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kontact-17.08.1.tar.xz"; - sha256 = "1z0mqnb6567xmx7shv7v60yb2cj6wh3ndqdd9nqxp12371mgm6i0"; - name = "kontact-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kontact-17.08.2.tar.xz"; + sha256 = "19hkppf2jwky73v73j4c2ppah7va4yrsv40ivw50k51s68s60b4a"; + name = "kontact-17.08.2.tar.xz"; }; }; kontactinterface = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kontactinterface-17.08.1.tar.xz"; - sha256 = "09mpmdc65lm14s6hg1yq68i1wrawss0hl002bg9apgy2rfdk34k1"; - name = "kontactinterface-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kontactinterface-17.08.2.tar.xz"; + sha256 = "1gws8vl7s8jyqqbb37yw6gn85sqpfra8jzmin53j4wj4s8rdir5y"; + name = "kontactinterface-17.08.2.tar.xz"; }; }; kopete = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kopete-17.08.1.tar.xz"; - sha256 = "1inbw80a2mwfc2id12qn0as4l52hz3wfcvzcz3n4p393g0qfz8an"; - name = "kopete-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kopete-17.08.2.tar.xz"; + sha256 = "01km2qsf12z8sbsbg8d4ng9izaphlsfqhr29dqryf1kqrwcv6amb"; + name = "kopete-17.08.2.tar.xz"; }; }; korganizer = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/korganizer-17.08.1.tar.xz"; - sha256 = "0q35fyqxgwp5jv2qnpcjhfs1rkyp1jjrpmi28kqh93l04njmwvc0"; - name = "korganizer-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/korganizer-17.08.2.tar.xz"; + sha256 = "1anmc4bfd8pdf22vprw3x82fi2f19wh7xy5xwf144kqhwbyqk7ch"; + name = "korganizer-17.08.2.tar.xz"; }; }; kpat = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kpat-17.08.1.tar.xz"; - sha256 = "1bqqm5gb6mc1v8h524qnz2rfcplvz6v87gvc0jg3zcqjf2c4xn4y"; - name = "kpat-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kpat-17.08.2.tar.xz"; + sha256 = "09ck09ywhl2ywlv90ipgxs45xiwcc3sxvfmgviqxvky513kkx7mn"; + name = "kpat-17.08.2.tar.xz"; }; }; kpimtextedit = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kpimtextedit-17.08.1.tar.xz"; - sha256 = "16ymcccfn8pw098gr6b2k1xvwinhnx8c3npawy9fiqg138a4bkh9"; - name = "kpimtextedit-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kpimtextedit-17.08.2.tar.xz"; + sha256 = "15w338kwdrkag08zyg8dzkwfg25zh67bbwsfxa6ra40hdj1azz8p"; + name = "kpimtextedit-17.08.2.tar.xz"; }; }; kppp = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kppp-17.08.1.tar.xz"; - sha256 = "0783rn2gzgxscnfbins0drl8j8ka0lxyg3787v9778d5993fafpf"; - name = "kppp-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kppp-17.08.2.tar.xz"; + sha256 = "016rgayrxccmvn7pw40x12dv3qi781m2rbcbz8lkprdglzzavfrz"; + name = "kppp-17.08.2.tar.xz"; }; }; kqtquickcharts = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kqtquickcharts-17.08.1.tar.xz"; - sha256 = "1zym0lcim41krv1irdfvkfb4simymairqq2cp2kiagrp3ssz28km"; - name = "kqtquickcharts-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kqtquickcharts-17.08.2.tar.xz"; + sha256 = "186rqlwjpa43z9qi8m2xkyc739plq7cmvn6jkzgl4k21pkfbgx9f"; + name = "kqtquickcharts-17.08.2.tar.xz"; }; }; krdc = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/krdc-17.08.1.tar.xz"; - sha256 = "1lfh7w05b19bzdfmxydb0s55zgbizsh8j8vjblgsn2vihgm2f8lp"; - name = "krdc-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/krdc-17.08.2.tar.xz"; + sha256 = "1yv8z3hhhwrcy58lkaifnqkq38p9gs9sc6dhd3i6fpn1bci1j72a"; + name = "krdc-17.08.2.tar.xz"; }; }; kremotecontrol = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kremotecontrol-17.08.1.tar.xz"; - sha256 = "1b146xb9dnq97lswb0qnppcgjbw5vwy1y9za2k0kl3bhfvxd4qj2"; - name = "kremotecontrol-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kremotecontrol-17.08.2.tar.xz"; + sha256 = "0f31zbf7yc59jvdm7ivb0g7wwh5mmdk26kyjqw8dg46hg29k1p79"; + name = "kremotecontrol-17.08.2.tar.xz"; }; }; kreversi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kreversi-17.08.1.tar.xz"; - sha256 = "17y2iihszjshln2hwxp6nqz30iln79mwmfv8yb2bydchdy05g807"; - name = "kreversi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kreversi-17.08.2.tar.xz"; + sha256 = "1zrhaxnkjirkwjmbqjpagx6jijqdvb8khfhv7pwxij2q5ia9k7d8"; + name = "kreversi-17.08.2.tar.xz"; }; }; krfb = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/krfb-17.08.1.tar.xz"; - sha256 = "1dwyx0jdg0i64pxd7phm1kq7fyaj7jls8w08sfgq3730s4s59lfj"; - name = "krfb-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/krfb-17.08.2.tar.xz"; + sha256 = "1554ziphhwck62cyfq60nwiivxb9vvc7l03iz5ncwj1apgmrj9m8"; + name = "krfb-17.08.2.tar.xz"; }; }; kross-interpreters = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kross-interpreters-17.08.1.tar.xz"; - sha256 = "0hzsn1kjcpy2vbqx9sxhxbz4p67wcmv6agg932iavv2hi7731j14"; - name = "kross-interpreters-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kross-interpreters-17.08.2.tar.xz"; + sha256 = "0g5p25s1r1i60dlgsh9kwpq851cxhmprj6z00b91z6hj46v2zzx8"; + name = "kross-interpreters-17.08.2.tar.xz"; }; }; kruler = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kruler-17.08.1.tar.xz"; - sha256 = "1qmlhc35vhbzfllz6wrssr62d3s3xdq15s5rkpm3w05a70bilpyq"; - name = "kruler-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kruler-17.08.2.tar.xz"; + sha256 = "0c1sdb3nihpi3p82s49g9k86ivnr499b3jdzrqh6hfcr6dbhi8x6"; + name = "kruler-17.08.2.tar.xz"; }; }; ksaneplugin = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksaneplugin-17.08.1.tar.xz"; - sha256 = "08zl04ly9wggcr8y0azz69nvjkr4c8gnajx4w8cwlb1dkn1b5is4"; - name = "ksaneplugin-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksaneplugin-17.08.2.tar.xz"; + sha256 = "0zp898jb1vc5zliidhn5v4lqlqmmpn33fxarm5br9ks4zpqzam0y"; + name = "ksaneplugin-17.08.2.tar.xz"; }; }; kscd = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kscd-17.08.1.tar.xz"; - sha256 = "08mlbhbck68abj17mkaz76fpy4rcn0x4h4smwgxnhy88ddb15wa1"; - name = "kscd-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kscd-17.08.2.tar.xz"; + sha256 = "1p79dwp0gwdffhz5dhdpcyc8hrzs0ks8kxzhrrxksazc25wh3l8y"; + name = "kscd-17.08.2.tar.xz"; }; }; kshisen = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kshisen-17.08.1.tar.xz"; - sha256 = "0rg465092qkzbshr0pj6z6d38nykdfz2alhzy50qi9i32r8iwy9m"; - name = "kshisen-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kshisen-17.08.2.tar.xz"; + sha256 = "1kbyhxc5kp7s3if6lb39wjx1yxrwzkavf5vrlm0xynwzr560n6ar"; + name = "kshisen-17.08.2.tar.xz"; }; }; ksirk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksirk-17.08.1.tar.xz"; - sha256 = "1v4xqjak0nf4vqsf7p7i37x5c08vbxq18nb63bhwjlb2fgnbg0yh"; - name = "ksirk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksirk-17.08.2.tar.xz"; + sha256 = "0q19yvghp6fgdpjgs9qc3rxqm4ahf5h2dbnw32v3c1hv095dfvi0"; + name = "ksirk-17.08.2.tar.xz"; }; }; ksnakeduel = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksnakeduel-17.08.1.tar.xz"; - sha256 = "105rjym6vkzi9m0dmzwwb6491lfmb5y1dfqax9y2gi993x0l5ihl"; - name = "ksnakeduel-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksnakeduel-17.08.2.tar.xz"; + sha256 = "1gbsf3fmkpl438wq7xpvmyanm6p7knnyxvbvbd0my288xb4l3xf5"; + name = "ksnakeduel-17.08.2.tar.xz"; }; }; kspaceduel = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kspaceduel-17.08.1.tar.xz"; - sha256 = "11g362hax9x8b99wvcndd4hz6q918dxcn8js16cflfxn1ry80wb6"; - name = "kspaceduel-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kspaceduel-17.08.2.tar.xz"; + sha256 = "13pbg1pwl25qlyb9kha08gnpbx6njclld8zlasvpym2c4db5cxx2"; + name = "kspaceduel-17.08.2.tar.xz"; }; }; ksquares = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksquares-17.08.1.tar.xz"; - sha256 = "1lw9qlfqfsmyry5v6fvhyjh23l8dj71iyp1z3y0xikaybc4rbbi1"; - name = "ksquares-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksquares-17.08.2.tar.xz"; + sha256 = "1l2pgm3rj3cl7jgc1q7rjbv3kmi6zm4jh29r1q7zhfsiwin0sfz5"; + name = "ksquares-17.08.2.tar.xz"; }; }; kstars = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kstars-17.08.1.tar.xz"; - sha256 = "1qr8y4m6lqiv3zb7f2ys7c6iw7iryk9ayibdscq113nq0blm59zs"; - name = "kstars-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kstars-17.08.2.tar.xz"; + sha256 = "1l1bjqwhvzw5czlfjg4zqk48bva9xlrn53grlbl2yywzvmn5jhgy"; + name = "kstars-17.08.2.tar.xz"; }; }; ksudoku = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksudoku-17.08.1.tar.xz"; - sha256 = "0fb9k5hdyq2alp42x17r1cfi5qz5hm9xzcwd3vz3c1kym4xavnjp"; - name = "ksudoku-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksudoku-17.08.2.tar.xz"; + sha256 = "0hb4901gx81ra8mcrcsqbdhjqxfd1s5sxal4xhg72yd80qsg1da1"; + name = "ksudoku-17.08.2.tar.xz"; }; }; ksystemlog = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksystemlog-17.08.1.tar.xz"; - sha256 = "0wiwak8dmdm9kih2zvw2xxg67qs94imp6s24dgfxgylqqpqirlnv"; - name = "ksystemlog-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksystemlog-17.08.2.tar.xz"; + sha256 = "16fiprkbkpnnc17qkgsd4w8givk6ny3kflb8pc87f2zs2vw6dfad"; + name = "ksystemlog-17.08.2.tar.xz"; }; }; kteatime = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kteatime-17.08.1.tar.xz"; - sha256 = "08ripkkc6b3wi499kgsng4fzk2n7kbp3i6212q47h6bmgxs8a4zp"; - name = "kteatime-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kteatime-17.08.2.tar.xz"; + sha256 = "1cxxcaqzpjp6n8afrg1rw61grvmmla36r979761p3w0hwpgdrln3"; + name = "kteatime-17.08.2.tar.xz"; }; }; ktimer = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktimer-17.08.1.tar.xz"; - sha256 = "116c61k99h5y0yph2x7cz0ff99rsfblgj3db7sczhn3hkbcimakx"; - name = "ktimer-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktimer-17.08.2.tar.xz"; + sha256 = "0vi9lrjazw8vq811qgcd7wyfkd2n60drszii8gx7w9jq8f0hkvfp"; + name = "ktimer-17.08.2.tar.xz"; }; }; ktnef = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktnef-17.08.1.tar.xz"; - sha256 = "07jflp67mf748vf0ph89dbzy2lifm8148kl957qw1z9i1h5sm869"; - name = "ktnef-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktnef-17.08.2.tar.xz"; + sha256 = "012c1xsqj1ilq7w0shh22nmvkh1l56sn3ycg6xsigchk203im17d"; + name = "ktnef-17.08.2.tar.xz"; }; }; ktouch = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktouch-17.08.1.tar.xz"; - sha256 = "19m8bp655ir9n2pz6vly9q2x42gdnpfjs47nkfiix28mg4y004qj"; - name = "ktouch-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktouch-17.08.2.tar.xz"; + sha256 = "0zrqmhag522ri8d56hlrrdmgfh6ywswahs7mss61dbyig5bpfy4g"; + name = "ktouch-17.08.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-accounts-kcm-17.08.1.tar.xz"; - sha256 = "1kghza63ywjndcscwlkabfqnsnalf1kprghb47gjj15qn844g019"; - name = "ktp-accounts-kcm-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-accounts-kcm-17.08.2.tar.xz"; + sha256 = "0nkji06d23y7qa505r3971r83w8pnf1jrz5l3k9di1s0x93cd2lm"; + name = "ktp-accounts-kcm-17.08.2.tar.xz"; }; }; ktp-approver = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-approver-17.08.1.tar.xz"; - sha256 = "07vkhhldqkabfga79sl9hdbfdk4fdizj066180dirwbdkllfwnpf"; - name = "ktp-approver-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-approver-17.08.2.tar.xz"; + sha256 = "07mismz8srzwy7bkfh1gqzrxbj40xavnahhf8dhbskqn4sw8j50q"; + name = "ktp-approver-17.08.2.tar.xz"; }; }; ktp-auth-handler = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-auth-handler-17.08.1.tar.xz"; - sha256 = "1612gi5izaanp9rzwz163q776lszrs03a9rrx13qczdl231smyf6"; - name = "ktp-auth-handler-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-auth-handler-17.08.2.tar.xz"; + sha256 = "0ncbmvld2v6wz9zknrj699pixxjlk7kk22xj9q0q6ay3cdiivcf2"; + name = "ktp-auth-handler-17.08.2.tar.xz"; }; }; ktp-call-ui = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-call-ui-17.08.1.tar.xz"; - sha256 = "0881lgmp04g157q3pp1im113imrw9aihxd08hhm6h5cla5z97m46"; - name = "ktp-call-ui-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-call-ui-17.08.2.tar.xz"; + sha256 = "12k5qar1v0faqqsmzvqb8932hndk8kzhc5dkib1kccq7g068br2v"; + name = "ktp-call-ui-17.08.2.tar.xz"; }; }; ktp-common-internals = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-common-internals-17.08.1.tar.xz"; - sha256 = "1nlcmlkbaj7j6y1i6gnmd7s6ks4qnmcdhwidxql4vgr6bjifr5n2"; - name = "ktp-common-internals-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-common-internals-17.08.2.tar.xz"; + sha256 = "1423sd43xyjzs0fbpvs6nsd1rgfd8ffgmpzbyal1s2f3rb4hfk8h"; + name = "ktp-common-internals-17.08.2.tar.xz"; }; }; ktp-contact-list = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-contact-list-17.08.1.tar.xz"; - sha256 = "1xv0qaf05lvzwmgdfr31vynk768sc9gqrl0w1b270ks9jgsb3k9i"; - name = "ktp-contact-list-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-contact-list-17.08.2.tar.xz"; + sha256 = "1g07v4am7m3qyq2b8bidxdgz2iwilzsq5nigzxag44nx3kc5n269"; + name = "ktp-contact-list-17.08.2.tar.xz"; }; }; ktp-contact-runner = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-contact-runner-17.08.1.tar.xz"; - sha256 = "150m1lr7n39n88b0kaz8494ch0ym7i68f8c3hgzaxpy0m62mskkv"; - name = "ktp-contact-runner-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-contact-runner-17.08.2.tar.xz"; + sha256 = "145mbfpbzsrpqpk260jq44yiawj02fw27rr70b8j8az6jffjd1i2"; + name = "ktp-contact-runner-17.08.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-desktop-applets-17.08.1.tar.xz"; - sha256 = "167h8z1xd6q50xbgirfc6sxlnclliidpb5lg7s1baqdvlpg8rarz"; - name = "ktp-desktop-applets-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-desktop-applets-17.08.2.tar.xz"; + sha256 = "0kj2k78pcyswykqlh0clvh475f1c62910bxhnk03533fxrgdib3v"; + name = "ktp-desktop-applets-17.08.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-filetransfer-handler-17.08.1.tar.xz"; - sha256 = "0hvy0vdznv9js9fjmhgbcmh3gq6jlnynz4mfdbj8bjff635q76az"; - name = "ktp-filetransfer-handler-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-filetransfer-handler-17.08.2.tar.xz"; + sha256 = "10v0j46fdbmgciznwrxvb6wn037535w4sinvhn7r2myhf7vsvpah"; + name = "ktp-filetransfer-handler-17.08.2.tar.xz"; }; }; ktp-kded-module = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-kded-module-17.08.1.tar.xz"; - sha256 = "0rsb6qgf6kdizpp6iw48gxr1aka1yljcwc0wx03p6s31a9aql47w"; - name = "ktp-kded-module-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-kded-module-17.08.2.tar.xz"; + sha256 = "03p75jdh0q3709rcc5m2iv75rjphjsbgr40kaphakv57xk5wdhqv"; + name = "ktp-kded-module-17.08.2.tar.xz"; }; }; ktp-send-file = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-send-file-17.08.1.tar.xz"; - sha256 = "1ncxr7cwfbqr8pwgkl3mg4zv6klss99pansmwkyh49bbjzjc9j3v"; - name = "ktp-send-file-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-send-file-17.08.2.tar.xz"; + sha256 = "15pyjxhcg7hl0p3bq11w3mrn10i3q0man6rqp7w6vqlq19bjndl3"; + name = "ktp-send-file-17.08.2.tar.xz"; }; }; ktp-text-ui = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-text-ui-17.08.1.tar.xz"; - sha256 = "13isirx7in0vj4p3l2m9pnjz73bf48y586qbpn0rbzpwbc7xzbmz"; - name = "ktp-text-ui-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-text-ui-17.08.2.tar.xz"; + sha256 = "1my2k34adf95alppq4n69apin72bnl8n84mj7b61pndjiixh4q7b"; + name = "ktp-text-ui-17.08.2.tar.xz"; }; }; ktuberling = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktuberling-17.08.1.tar.xz"; - sha256 = "04fsplvry85m596qkx2i7601l7pc9dag4x45sw4z325fkzvlzsx9"; - name = "ktuberling-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktuberling-17.08.2.tar.xz"; + sha256 = "02vwy4zbzj80a9233107xgqa52r3pi4hgnvi6cpbdq9cmvcxw7fq"; + name = "ktuberling-17.08.2.tar.xz"; }; }; kturtle = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kturtle-17.08.1.tar.xz"; - sha256 = "0nrsmhdmc1qdnpwsgrhs2gd91al8b0wrm85nwia2mmyxsfnbd45l"; - name = "kturtle-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kturtle-17.08.2.tar.xz"; + sha256 = "0vx7im20yk1172cb5g7z7mkhbsbx78ad9azs5d23rsv9fpzwikc2"; + name = "kturtle-17.08.2.tar.xz"; }; }; kubrick = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kubrick-17.08.1.tar.xz"; - sha256 = "07lxc4i92i08hca2y6gqq3wsyp4mn857vwmy6ja40c2wh8sl6bix"; - name = "kubrick-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kubrick-17.08.2.tar.xz"; + sha256 = "0f9smvasgnjswx6jvhw4b7q58k47y1mv48vzygdx61zz1jyxjr8n"; + name = "kubrick-17.08.2.tar.xz"; }; }; kwalletmanager = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kwalletmanager-17.08.1.tar.xz"; - sha256 = "0dq8m160kwbrjmda4hvdgq5izdnr7nnlksb9l3cvbslpc685d8h0"; - name = "kwalletmanager-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kwalletmanager-17.08.2.tar.xz"; + sha256 = "1a2q58wjb816fb0wfr4d7i790jxxwbfw9fpk1g8lkfk3kbvdgsnj"; + name = "kwalletmanager-17.08.2.tar.xz"; }; }; kwave = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kwave-17.08.1.tar.xz"; - sha256 = "097viq7k2l4hkj0w07hnyfzfmz3apnri2n1g69ir1h37wq59fw89"; - name = "kwave-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kwave-17.08.2.tar.xz"; + sha256 = "1szn09swm8072x2mhy9q1szjm32pgg8agga1r2chf3jxc5iah2h3"; + name = "kwave-17.08.2.tar.xz"; }; }; kwordquiz = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kwordquiz-17.08.1.tar.xz"; - sha256 = "14l419ghf6xvdp2fnsdskflppzzvvhlbciwn6cicrkzmdr9zkawz"; - name = "kwordquiz-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kwordquiz-17.08.2.tar.xz"; + sha256 = "0i7jl7rb4bxkifvpf6dsscbvwsay9a5jvvbkkajcwfr1v5r2w969"; + name = "kwordquiz-17.08.2.tar.xz"; }; }; libgravatar = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libgravatar-17.08.1.tar.xz"; - sha256 = "0fn860y88pvq6mdpw1jw8msvkdmknradfp037gj9kvd5ykiicbvh"; - name = "libgravatar-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libgravatar-17.08.2.tar.xz"; + sha256 = "0zsxijykxxa4lg939wzv0vxh8jr6smmdd0zip8bimvdc4x2k6dv1"; + name = "libgravatar-17.08.2.tar.xz"; }; }; libkcddb = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkcddb-17.08.1.tar.xz"; - sha256 = "06i8gm7rysbdlm89nw5pd3jgbvz9vy5schwyfyhk6jbvlm43sx7z"; - name = "libkcddb-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkcddb-17.08.2.tar.xz"; + sha256 = "0hlk2302cnpk896fmaq7p5ph7baxi3dz673qpy8f9hlcbj5k4j35"; + name = "libkcddb-17.08.2.tar.xz"; }; }; libkcompactdisc = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkcompactdisc-17.08.1.tar.xz"; - sha256 = "1xrpbpg4w275afd4fbnsmjvp737v6z5nsdz5lrfxbqg8x97xb2fm"; - name = "libkcompactdisc-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkcompactdisc-17.08.2.tar.xz"; + sha256 = "0fimkf94xd7v2cv2ixs38x4bpsrrfk4n36i7qbpakrvnw60q0rk4"; + name = "libkcompactdisc-17.08.2.tar.xz"; }; }; libkdcraw = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkdcraw-17.08.1.tar.xz"; - sha256 = "0r9prk1pnbm2hj5q93j7axb869lzr8v7msqhylpf3awghfmy32a0"; - name = "libkdcraw-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkdcraw-17.08.2.tar.xz"; + sha256 = "140wq3h13gz3sv4d67i1pnrlzghy22zxf7ads0wia0iq85s7247m"; + name = "libkdcraw-17.08.2.tar.xz"; }; }; libkdegames = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkdegames-17.08.1.tar.xz"; - sha256 = "12w8i91pqshgb2bx4h68yni3sj7ssbcxrcdybnicg18hpcf5fzpa"; - name = "libkdegames-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkdegames-17.08.2.tar.xz"; + sha256 = "1131q3i7a4xz5rmcp820hjqp9bmv2wdbq6afp01572lbn9dryvir"; + name = "libkdegames-17.08.2.tar.xz"; }; }; libkdepim = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkdepim-17.08.1.tar.xz"; - sha256 = "17pg8fwpcdkj04fwzyqgykh9a23xkmkz46mknk43b37n0bcjhxq0"; - name = "libkdepim-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkdepim-17.08.2.tar.xz"; + sha256 = "04n4gj2rfafkb1k2c9yq9zshmy70ag415gmc24y7js82s20jh7y8"; + name = "libkdepim-17.08.2.tar.xz"; }; }; libkeduvocdocument = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkeduvocdocument-17.08.1.tar.xz"; - sha256 = "0kv7yirw7q953qv23f0z3m1nmdpax6f6vsrbncpdz2057p51fwf4"; - name = "libkeduvocdocument-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkeduvocdocument-17.08.2.tar.xz"; + sha256 = "0scj7l554zqxax4i2lg8qbw11ansrl2hp422b8348lzmcdcndsyp"; + name = "libkeduvocdocument-17.08.2.tar.xz"; }; }; libkexiv2 = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkexiv2-17.08.1.tar.xz"; - sha256 = "06qwd9lnl95vyzmj7nwgxflx82rvs5wkkwx4vnp408gya8w7cpjc"; - name = "libkexiv2-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkexiv2-17.08.2.tar.xz"; + sha256 = "0251w8y36d7k9wnm52ycbz4yr0310bkr7msnfs6828npfzynmy6i"; + name = "libkexiv2-17.08.2.tar.xz"; }; }; libkface = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkface-17.08.1.tar.xz"; - sha256 = "1w81dsmz9r2vx4aw5rkkg5s08jn4gqckgr1jscdxah6af354y052"; - name = "libkface-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkface-17.08.2.tar.xz"; + sha256 = "1x9vg4dadgcxawprqxzv6glnl9b2b5qxvq7rvnr2vi4a5p0j3kkf"; + name = "libkface-17.08.2.tar.xz"; }; }; libkgapi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkgapi-17.08.1.tar.xz"; - sha256 = "04nww7rip0qpz9cky28ygd9chfmpp1kycpri4s84cqdicwg691bv"; - name = "libkgapi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkgapi-17.08.2.tar.xz"; + sha256 = "1rpixzydg9421gblywyj8798d786yw9qfm7dnkn7dkzbm44pfrl4"; + name = "libkgapi-17.08.2.tar.xz"; }; }; libkgeomap = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkgeomap-17.08.1.tar.xz"; - sha256 = "0llh9ixa1wyafcvah48rfrbk4n897i97a6jrk3vnf0yrqhl8nps2"; - name = "libkgeomap-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkgeomap-17.08.2.tar.xz"; + sha256 = "1s0bhv4f97241k98ss1laki04z7gcx47apps06gl0px3xgmzfyk7"; + name = "libkgeomap-17.08.2.tar.xz"; }; }; libkipi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkipi-17.08.1.tar.xz"; - sha256 = "089avdka9rvv5j137k42d6sz6kvqci771wb8433xksnnci8r52xb"; - name = "libkipi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkipi-17.08.2.tar.xz"; + sha256 = "1hgmiazsy80hxfgc0y01wg1nzz33q8l0iw6g1sl8cxkgb06hkw93"; + name = "libkipi-17.08.2.tar.xz"; }; }; libkleo = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkleo-17.08.1.tar.xz"; - sha256 = "0d2rby5yfwpb1gy2j87kzffzn6hls3358886qhiq6pwpx2nq7chj"; - name = "libkleo-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkleo-17.08.2.tar.xz"; + sha256 = "0qk4mf2sgji2pc3jjd0bxan7d40f7qkg9c3sgbrxvcy3jg3vdly5"; + name = "libkleo-17.08.2.tar.xz"; }; }; libkmahjongg = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkmahjongg-17.08.1.tar.xz"; - sha256 = "11ciqd54isvjfccw3xc1xrdvjjmvacgvsdsxy3arcbivikmbmdqi"; - name = "libkmahjongg-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkmahjongg-17.08.2.tar.xz"; + sha256 = "1jibrvwy0147lwx09n19k1nj2vnssqwyc3slx6b0z3l23apa7vdw"; + name = "libkmahjongg-17.08.2.tar.xz"; }; }; libkomparediff2 = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkomparediff2-17.08.1.tar.xz"; - sha256 = "0vp33mkm52yn2gqy469m4wfmsrbzppl6hw1d842nm1q1csnva0v5"; - name = "libkomparediff2-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkomparediff2-17.08.2.tar.xz"; + sha256 = "0xc00yh2v7dhnsr70ndiql6rid8yjqdh968qbmpc5jlhhk00ws80"; + name = "libkomparediff2-17.08.2.tar.xz"; }; }; libksane = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libksane-17.08.1.tar.xz"; - sha256 = "0k2sjz86yw7lfij0kgn1byps2vd8c9hlrd4lizppflzxi2ajmkd0"; - name = "libksane-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libksane-17.08.2.tar.xz"; + sha256 = "0ilysa21wadnv4kcyi4g268l8mzyab7m31wq8plc1hxbi1wjb72l"; + name = "libksane-17.08.2.tar.xz"; }; }; libksieve = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libksieve-17.08.1.tar.xz"; - sha256 = "01d573a415i2advgad0xzxkg8f6z5fbfmyb0iim79qqhzkbmf6bm"; - name = "libksieve-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libksieve-17.08.2.tar.xz"; + sha256 = "0ypa7inmndq9k08gbcliwvx5x2q7z9dwx236wvq0zww0sjgnbdyx"; + name = "libksieve-17.08.2.tar.xz"; }; }; lokalize = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/lokalize-17.08.1.tar.xz"; - sha256 = "0gr1qj0ish0kp842654fli2irbrli77q1449xryik76frlyy16wj"; - name = "lokalize-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/lokalize-17.08.2.tar.xz"; + sha256 = "024awg6xhncgzvg88n57waxcw9i5k1cmp3f16l4ic93wrk8ga8c9"; + name = "lokalize-17.08.2.tar.xz"; }; }; lskat = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/lskat-17.08.1.tar.xz"; - sha256 = "1fhkg2vjy7xpp1rnx4cp9bpvxqc4i3nymyqgph92ankal0nnw2ai"; - name = "lskat-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/lskat-17.08.2.tar.xz"; + sha256 = "1lc99vik1bi474wwjr9pkfd9xhxs2rw6rcb72a3bq4ks83m3kmf0"; + name = "lskat-17.08.2.tar.xz"; }; }; mailcommon = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/mailcommon-17.08.1.tar.xz"; - sha256 = "0qw7hsy36r39l13x492mhfxj3x9inagd7fjsxvfblhgnh1c2ad0r"; - name = "mailcommon-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/mailcommon-17.08.2.tar.xz"; + sha256 = "1g9dr7ilw65zpjvr12hkambk691zynv9xgg9kcya1krmh50hdi53"; + name = "mailcommon-17.08.2.tar.xz"; }; }; mailimporter = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/mailimporter-17.08.1.tar.xz"; - sha256 = "0wwciyc8azx2sln5407gv4kqcx7zfl680szxgbw533iq9kccvl0z"; - name = "mailimporter-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/mailimporter-17.08.2.tar.xz"; + sha256 = "1xy07wlvvg5rs9534llsd6amaxk2sylx8lfzr22s17fcpr0rl71s"; + name = "mailimporter-17.08.2.tar.xz"; }; }; marble = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/marble-17.08.1.tar.xz"; - sha256 = "1jlz37m3a0jhnac4y6ix6n3hhxkp808qdnvxpd3my1gvn715wa58"; - name = "marble-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/marble-17.08.2.tar.xz"; + sha256 = "1yvhmmfgflsknlx0ffpj82clkd4py6kalf9dcf04f3lfw0k559fm"; + name = "marble-17.08.2.tar.xz"; }; }; mbox-importer = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/mbox-importer-17.08.1.tar.xz"; - sha256 = "0kjxx0nvxb6dshibaipgdf4i8magmsxnqhfnph831x13mig15bcs"; - name = "mbox-importer-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/mbox-importer-17.08.2.tar.xz"; + sha256 = "1g8zvg4xxpnic1qf020zcyy6bijz4a094xzdxyx64lq7wp1bi269"; + name = "mbox-importer-17.08.2.tar.xz"; }; }; messagelib = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/messagelib-17.08.1.tar.xz"; - sha256 = "0srjcqbqzyk8ca9ssisrils9jwm9p6b62q4b7g9bya602cbrh38b"; - name = "messagelib-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/messagelib-17.08.2.tar.xz"; + sha256 = "0wb371cb7glwvwhmk76r5ziq821b87d8cq9fy4pgxlj1wvsny2km"; + name = "messagelib-17.08.2.tar.xz"; }; }; minuet = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/minuet-17.08.1.tar.xz"; - sha256 = "17vvsnvhvpqcyrb5qlchp4na1wk5f4qlkh7w8sj162jsd1lbxr9j"; - name = "minuet-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/minuet-17.08.2.tar.xz"; + sha256 = "1x9h3k8dpn40119s1vxpnkj78glx0hajfg9wh7jnm70phasn1jci"; + name = "minuet-17.08.2.tar.xz"; }; }; okteta = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/okteta-17.08.1.tar.xz"; - sha256 = "00wmkzjw7h99b1lmab0llwzlmh1m4xgv3yy506hjwb78z1c6wbq2"; - name = "okteta-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/okteta-17.08.2.tar.xz"; + sha256 = "1f1gpyyd1xcdii34hjhflqaxfnk3clnin2ihb6fpkbz5fz2020bq"; + name = "okteta-17.08.2.tar.xz"; }; }; okular = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/okular-17.08.1.tar.xz"; - sha256 = "027isffca4g98qm6yx7m69cp2xjplqhnh7gy00sr1b96hhnlc9c6"; - name = "okular-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/okular-17.08.2.tar.xz"; + sha256 = "0mkyqg5n870zc2ryxgwyrf9n57gn5jfj9wvlwc405h5q8zf5fvy5"; + name = "okular-17.08.2.tar.xz"; }; }; palapeli = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/palapeli-17.08.1.tar.xz"; - sha256 = "0nnplg88xipmnb24qj2ki5m090g8cbinbb3azkqadwsjfc13xk06"; - name = "palapeli-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/palapeli-17.08.2.tar.xz"; + sha256 = "1smp7an5b059hp5d8bjwq65d11zkfbfcr1kkapbljamg1ydd4y21"; + name = "palapeli-17.08.2.tar.xz"; }; }; parley = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/parley-17.08.1.tar.xz"; - sha256 = "034nc5qgiy50wpnkm3d8w3cf7svj6as23sarz0h5hks4ffw1bxhg"; - name = "parley-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/parley-17.08.2.tar.xz"; + sha256 = "15m4vsmk9s4dh5rv7x2vdcy8kbi334nms79aj8yvx01nlipv7m79"; + name = "parley-17.08.2.tar.xz"; }; }; picmi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/picmi-17.08.1.tar.xz"; - sha256 = "14kbrbq59kmqz1rd7izrp57i1a6d6nm8i73rwcl80vyla8cnvika"; - name = "picmi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/picmi-17.08.2.tar.xz"; + sha256 = "01fqrd9za748m6gxbq3i3yvvmz2qkf3kln14wwl69hc29b6ikk0k"; + name = "picmi-17.08.2.tar.xz"; }; }; pimcommon = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/pimcommon-17.08.1.tar.xz"; - sha256 = "14vk8pnwbc4bvha26fxdfbyn0ipxj93qgan8f24kpxc7irjkr8ic"; - name = "pimcommon-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/pimcommon-17.08.2.tar.xz"; + sha256 = "01jh4c55yk4wmi3i7f81hgs0bgqxpm8fccvg51z2k05swdm7x10b"; + name = "pimcommon-17.08.2.tar.xz"; }; }; pim-data-exporter = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/pim-data-exporter-17.08.1.tar.xz"; - sha256 = "0drzj44p66ds4p42wk45755yjcs2dpysw54mzg2qx4cdv8kf1snq"; - name = "pim-data-exporter-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/pim-data-exporter-17.08.2.tar.xz"; + sha256 = "1xnv07lvhbb12qp0jcrd39l54gsgnifdn1ibzxh7fnbdrv3iqxqv"; + name = "pim-data-exporter-17.08.2.tar.xz"; }; }; pim-sieve-editor = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/pim-sieve-editor-17.08.1.tar.xz"; - sha256 = "1hclbjs596x5niszcccnzkr6x5avg2c982prq8qcrc68cdm1h7pg"; - name = "pim-sieve-editor-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/pim-sieve-editor-17.08.2.tar.xz"; + sha256 = "0fnm055sx18ripf5vhpiqi628vkvvgyhaw4xw7hz6hbmv8f3qsma"; + name = "pim-sieve-editor-17.08.2.tar.xz"; }; }; poxml = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/poxml-17.08.1.tar.xz"; - sha256 = "17g62xp5g4icfmbd001rhypn34a9asj8pcgj301q5v9065z44mmn"; - name = "poxml-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/poxml-17.08.2.tar.xz"; + sha256 = "1hkw1m3w5v12c8vm9wdksrb9q92lki3m97949h91zmdr7lc3s3sd"; + name = "poxml-17.08.2.tar.xz"; }; }; print-manager = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/print-manager-17.08.1.tar.xz"; - sha256 = "0f354qblzw3vkv4fypwp3fj3i29x6b478z79q5d2n6x9nk8li5in"; - name = "print-manager-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/print-manager-17.08.2.tar.xz"; + sha256 = "1gcr265bzj3knhqflyj12zza3cd94vgny8bxqqk7xbs2mii0pjsd"; + name = "print-manager-17.08.2.tar.xz"; }; }; rocs = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/rocs-17.08.1.tar.xz"; - sha256 = "18nygfbyiny8zpq2jm6mxs6r4b90c4dwxwzvs0a3vrc131fjc6bc"; - name = "rocs-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/rocs-17.08.2.tar.xz"; + sha256 = "0y0d64fdy22kx0bpbh9wkpxg8zqg24y02ww32h3p52zxyxcx7zf1"; + name = "rocs-17.08.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/signon-kwallet-extension-17.08.1.tar.xz"; - sha256 = "1ax4l1whdxrfnl7bbs805vpp7j2m5zl55fq12vvrkw0x38m78v2h"; - name = "signon-kwallet-extension-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/signon-kwallet-extension-17.08.2.tar.xz"; + sha256 = "1fnhzbd5akvr9cmwfpxv7dy9bd8z7lcqzpyh9m84gdw1ppgzqypp"; + name = "signon-kwallet-extension-17.08.2.tar.xz"; }; }; spectacle = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/spectacle-17.08.1.tar.xz"; - sha256 = "07x01i629zk0l409kl85yv5gws7cw7mzmp1mlwxrjix153sr4jr9"; - name = "spectacle-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/spectacle-17.08.2.tar.xz"; + sha256 = "1wv8ld3s69v00gvlk6r49v86z5l2xy243ily917v8c1imzvz6xhj"; + name = "spectacle-17.08.2.tar.xz"; }; }; step = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/step-17.08.1.tar.xz"; - sha256 = "11p9rdg0m42200g15lq61489zz0zkkhic2j6hyynb1z1lr9c2iga"; - name = "step-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/step-17.08.2.tar.xz"; + sha256 = "0llag76b39vf20rbm8zgvs4hh3pynb85a2gbbgxb3v4kvg9nj9zk"; + name = "step-17.08.2.tar.xz"; }; }; svgpart = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/svgpart-17.08.1.tar.xz"; - sha256 = "0xr0axiyn49szwwflq50sf9wp8i5xd7qs3krwznrdzlc8jcann9j"; - name = "svgpart-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/svgpart-17.08.2.tar.xz"; + sha256 = "10xmbck1kwp0hhg5k8v9ay2bh36xvvpz1mnixydmsyrc0x9n2zh4"; + name = "svgpart-17.08.2.tar.xz"; }; }; sweeper = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/sweeper-17.08.1.tar.xz"; - sha256 = "04gzc06p1fh7rnb3sbma2k8lav98v3w657k0sgscnv4dvsgbcqh9"; - name = "sweeper-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/sweeper-17.08.2.tar.xz"; + sha256 = "1sr1fw4ny09ch0hmgn4npd6hfvgc52xfwmys1kid7hi8lwrsn7g5"; + name = "sweeper-17.08.2.tar.xz"; }; }; syndication = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/syndication-17.08.1.tar.xz"; - sha256 = "0ihkway75n4r3zw18z07g5k2ggby5q1cz4cqi29cws1ay6s09qb9"; - name = "syndication-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/syndication-17.08.2.tar.xz"; + sha256 = "165fcw486qxlq5lmab7qa9bc7pkc3jfc4xqx1m5k4rgwapfk0sv9"; + name = "syndication-17.08.2.tar.xz"; }; }; umbrello = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/umbrello-17.08.1.tar.xz"; - sha256 = "0xvxcncsxikmnxv98ar3gzcvxahsnja4jz1l23hiy2ib1lmcgcy7"; - name = "umbrello-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/umbrello-17.08.2.tar.xz"; + sha256 = "0prwsw8qwcgia98kjvh9xbv3cdnh24fqk2zl59diighw11q2dnsk"; + name = "umbrello-17.08.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/zeroconf-ioslave-17.08.1.tar.xz"; - sha256 = "1crypk1cdh6cav1f6fx9p60ky1yf6hyyh1n6mih8mqjiibi1brz5"; - name = "zeroconf-ioslave-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/zeroconf-ioslave-17.08.2.tar.xz"; + sha256 = "0bki5dz2n8psja4mfj65hshaz7qdniyx7r72kv8xn8xk0vj292x3"; + name = "zeroconf-ioslave-17.08.2.tar.xz"; }; }; } From 9a9ea65de9a80772dc3c385b7cd2c29a4ae1122f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 2 Nov 2017 11:42:07 -0500 Subject: [PATCH 2231/2806] dropbox: use buildFHSUserEnv Instead of adapting Dropbox to NixOS with patchelf, NixOS is adapted to Dropbox with an FHS user environment. A crash due to missing libXert (#15356) is fixed. The client's automatic updater is fixed; this obviates the need to update Dropbox in Nixpkgs every time the client is updated upstream! Resolves: #15356 --- .../networking/dropbox/default.nix | 148 ++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 30 insertions(+), 120 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 06ac05da36d..d15b1d545b4 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,57 +1,23 @@ -{ mkDerivation, stdenv, lib, fetchurl, makeDesktopItem -, makeWrapper, patchelf -, dbus_libs, fontconfig, freetype, gcc, glib -, libdrm, libffi, libICE, libSM -, libX11, libXcomposite, libXext, libXmu, libXrender, libxcb -, libxml2, libxslt, ncurses, zlib -, qtbase, qtdeclarative, qtwebkit, wmctrl -}: +{ stdenv, lib, buildFHSUserEnv, writeScript, makeDesktopItem }: -# this package contains the daemon version of dropbox -# it's unfortunately closed source -# -# note: the resulting program has to be invoced as -# 'dropbox' because the internal python engine takes -# uses the name of the program as starting point. +let platforms = [ "i686-linux" "x86_64-linux" ]; in -# Dropbox ships with its own copies of some libraries. -# Unfortunately, upstream makes changes to the source of -# some libraries, rendering them incompatible with the -# open-source versions. Wherever possible, we must try -# to make the bundled libraries work, rather than replacing -# them with our own. +assert lib.elem stdenv.system platforms; +# Dropbox client to bootstrap installation. +# The client is self-updating, so the actual version may be newer. let - ## Prefetch commands to run after update, from this directory: - ## e.g. with Emacs: C-u M-x shell-command - # nix-prefetch-url ../../../../ -A dropbox.src - # nix-prefetch-url ../../../../ -A pkgsi686Linux.dropbox.src - - # NOTE: When updating, please also update in current stable, - # as older versions stop working - version = "37.4.29"; - sha256 = { - "x86_64-linux" = "0ymy8gb57bjq2mq35n52q2viww6am7wy0vskyvypliicggga8iaj"; - "i686-linux" = "0a7zir6x7z3ad71fj1iljc2l6x09f4wi40jfaiinf8ykx85cldw6"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + version = "38.4.27"; arch = { "x86_64-linux" = "x86_64"; "i686-linux" = "x86"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + }.${stdenv.system}; - # relative location where the dropbox libraries are stored - appdir = "opt/dropbox"; - - libs = [ - dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM - libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt - ncurses zlib - - qtbase qtdeclarative qtwebkit - ]; - ldpath = stdenv.lib.makeLibraryPath libs; + installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz"; +in +let desktopItem = makeDesktopItem { name = "dropbox"; exec = "dropbox"; @@ -61,93 +27,37 @@ let categories = "Network;FileTransfer;"; startupNotify = "false"; }; +in -in mkDerivation { - name = "dropbox-${version}"; - src = fetchurl { - name = "dropbox-${version}.tar.gz"; - url = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz"; - inherit sha256; - }; +buildFHSUserEnv { + name = "dropbox"; - sourceRoot = ".dropbox-dist"; - - nativeBuildInputs = [ makeWrapper patchelf ]; - buildInputs = libs; - dontStrip = true; # already done - - installPhase = '' - runHook preInstall - - mkdir -p "$out/${appdir}" - cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" - - # Vendored libraries interact poorly with our graphics drivers - rm "$out/${appdir}/libdrm.so.2" - rm "$out/${appdir}/libffi.so.6" - rm "$out/${appdir}/libGL.so.1" - rm "$out/${appdir}/libX11-xcb.so.1" - - # Cannot use vendored Qt libraries due to problem with xkbcommon - rm "$out/${appdir}/"libQt5*.so.5 - rm "$out/${appdir}/qt.conf" - rm -fr "$out/${appdir}/plugins" + targetPkgs = pkgs: with pkgs; with xlibs; [ + libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender + libXxf86vm libxcb + curl dbus fontconfig freetype gcc glib gnutar libxml2 libxslt zlib + ]; + extraInstallCommands = '' mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* $out/share/applications - - mkdir -p "$out/share/icons" - ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor" - - mkdir -p "$out/bin" - RPATH="${ldpath}:$out/${appdir}" - chmod 755 $out/${appdir}/dropbox - makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ - --prefix LD_LIBRARY_PATH : "$RPATH" - - - rm $out/${appdir}/wmctrl - ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl - - runHook postInstall ''; - preFixup = '' - INTERP=$(cat $NIX_CC/nix-support/dynamic-linker) - RPATH="${ldpath}:$out/${appdir}" - getType='s/ *Type: *\([A-Z]*\) (.*/\1/' - find "$out/${appdir}" -type f -print | while read obj; do - dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true) - if [[ -n "$dynamic" ]]; then - - if readelf -l "$obj" 2>/dev/null | grep "INTERP" >/dev/null; then - echo "patching interpreter path in $type $obj" - patchelf --set-interpreter "$INTERP" "$obj" - fi - - type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType") - if [ "$type" == "EXEC" ] || [ "$type" == "DYN" ]; then - - echo "patching RPATH in $type $obj" - oldRPATH=$(patchelf --print-rpath "$obj") - patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj" - - else - - echo "unknown ELF type \"$type\"; not patching $obj" - - fi - fi - done - - paxmark m $out/${appdir}/dropbox + runScript = writeScript "install-and-start-dropbox" '' + if ! [ -d "$HOME/.dropbox-dist" ]; then + # Dropbox is not installed. + # Download and unpack the client. If a newer version is available, + # the client will update itself when run. + curl '${installer}' | tar -C "$HOME" -x -z + fi + exec "$HOME/.dropbox-dist/dropboxd" ''; meta = with lib; { description = "Online stored folders (daemon version)"; - homepage = http://www.dropbox.com; - maintainers = with maintainers; [ ttuegel ]; + homepage = http://www.dropbox.com/; license = licenses.unfree; + maintainers = with maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60fad0499da..ee9b07f013d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16543,7 +16543,7 @@ with pkgs; bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; - dropbox = libsForQt5.callPackage ../applications/networking/dropbox { }; + dropbox = callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; From b62992a483e0b169c6e08c34340d08d828edadf4 Mon Sep 17 00:00:00 2001 From: Casey Ransom Date: Thu, 19 Oct 2017 18:53:44 -0400 Subject: [PATCH 2232/2806] kisslicer: init at 1.6.2 --- pkgs/tools/misc/kisslicer/default.nix | 58 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/tools/misc/kisslicer/default.nix diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix new file mode 100644 index 00000000000..588511638be --- /dev/null +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -0,0 +1,58 @@ +{ fetchzip +, libX11 +, mesa +, makeWrapper +, stdenv +}: + +let + + libPath = stdenv.lib.makeLibraryPath [ + mesa + stdenv.cc.cc + libX11 + ]; + + inidir = "\\\${XDG_CONFIG_HOME:-\\$HOME/.config}/kisslicer"; + +in + +stdenv.mkDerivation rec { + name = "kisslicer-1.6.2"; + + src = fetchzip { + url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.2_release.zip"; + sha256 = "0fb7hzic78skq3ykc37srnjsw0yri7m0pb3arlz076ws7jrcbr0f"; + stripRoot = false; + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + buildInputs = [ + makeWrapper + mesa + libX11 + ]; + + installPhase = '' + mkdir -p $out/bin + cp -p * $out/bin + ''; + + fixupPhase = '' + chmod 755 $out/bin/KISSlicer + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath} $out/bin/KISSlicer + wrapProgram $out/bin/KISSlicer \ + --add-flags "-inidir ${inidir}" \ + --run "mkdir -p ${inidir}" + ''; + + meta = with stdenv.lib; { + description = "Convert STL files into Gcode"; + homepage = http://www.kisslicer.com; + license = licenses.unfree; + maintainers = [ maintainers.cransom ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 420c84b9b2b..f8efb5cdd2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1128,6 +1128,8 @@ with pkgs; kapacitor = callPackage ../servers/monitoring/kapacitor { }; + kisslicer = callPackage ../tools/misc/kisslicer { }; + lcdproc = callPackage ../servers/monitoring/lcdproc { }; languagetool = callPackage ../tools/text/languagetool { }; From 69d0eac956f8c1aa7f31b7f84fc94d0c2ed56311 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 17:14:38 +0000 Subject: [PATCH 2233/2806] python.pkgs.podcastparser: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/podcastparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix index 25682099225..b45c8d96fc4 100644 --- a/pkgs/development/python-modules/podcastparser/default.nix +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "podcastparser"; - version = "0.6.1"; + version = "0.6.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "gpodder"; repo = "podcastparser"; rev = version; - sha256 = "0q3qc8adykmm692ha0c37xd6wbj830zlq900fyw6vrfan9bgdj5y"; + sha256 = "1mhg7192d6s1ll9mx1b63yfj6k4cnv4i95jllbnydyjv9ykkv0k1"; }; propagatedBuildInputs = [ ]; From 500300cf0ba694b50949e9ad29b7b896893f2ee7 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 2 Nov 2017 13:23:59 -0400 Subject: [PATCH 2234/2806] terminal-notifier: 1.5.0 -> 2.0.0 --- pkgs/applications/misc/terminal-notifier/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index 47cea34d4a5..c838eca5065 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -3,11 +3,12 @@ stdenv.mkDerivation rec { name = "terminal-notifier-${version}"; - version = "1.5.0"; + version = "2.0.0"; src = fetchzip { url = "https://github.com/alloy/terminal-notifier/releases/download/${version}/terminal-notifier-${version}.zip"; - sha256 = "09x7vl0kddivqq3pyrk6sg1f0sv5l7nj0bmblq222zk3b09bgg8p"; + sha256 = "0gi54v92hi1fkryxlz3k5s5d8h0s66cc57ds0vbm1m1qk3z4xhb0"; + stripRoot = false; }; dontBuild = true; From 51629d777d3d7ff2a91ff9bb1f09ad00544cf45a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 2 Nov 2017 13:37:24 -0400 Subject: [PATCH 2235/2806] kafka: Add 0.11.0.1 --- pkgs/servers/apache-kafka/default.nix | 32 +++++++++++++++++---------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index cc68697756c..da733df740b 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,18 +3,26 @@ let versionMap = { - "0.8" = { kafkaVersion = "0.8.2.2"; - scalaVersion = "2.10"; - sha256 = "1azccf1k0nr8y1sfpjgqf9swyp87ypvgva68ci4kczwcx1z9d89v"; - }; - "0.9" = { kafkaVersion = "0.9.0.1"; - scalaVersion = "2.11"; - sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; - }; - "0.10" = { kafkaVersion = "0.10.2.0"; - scalaVersion = "2.12"; - sha256 = "0py43s6zv8z7wr2lk8403k07xxckl11gla3vs4gr99lixc4whis1"; - }; + "0.8" = { + kafkaVersion = "0.8.2.2"; + scalaVersion = "2.10"; + sha256 = "1azccf1k0nr8y1sfpjgqf9swyp87ypvgva68ci4kczwcx1z9d89v"; + }; + "0.9" = { + kafkaVersion = "0.9.0.1"; + scalaVersion = "2.11"; + sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; + }; + "0.10" = { + kafkaVersion = "0.10.2.0"; + scalaVersion = "2.12"; + sha256 = "0py43s6zv8z7wr2lk8403k07xxckl11gla3vs4gr99lixc4whis1"; + }; + "0.11" = { + kafkaVersion = "0.11.0.1"; + scalaVersion = "2.12"; + sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7"; + }; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 420c84b9b2b..dbbdabab126 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6863,6 +6863,7 @@ with pkgs; apacheKafka_0_8 = callPackage ../servers/apache-kafka { majorVersion = "0.8"; }; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; + apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; kt = callPackage ../tools/misc/kt {}; From 46b09a8d556b03227fcd40b12d739a20d4f408ed Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 2 Nov 2017 13:46:07 -0400 Subject: [PATCH 2236/2806] kafka: Add 1.0.0 --- pkgs/servers/apache-kafka/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index da733df740b..e597a736c6f 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -23,6 +23,11 @@ let scalaVersion = "2.12"; sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7"; }; + "1.0" = { + kafkaVersion = "1.0.0"; + scalaVersion = "2.12"; + sha256 = "1cs4nmp39m99gqjpy5klsffqksc0h9pz514jkq99qb95a83x1cfm"; + }; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbbdabab126..5c5d44f4552 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6864,6 +6864,7 @@ with pkgs; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; + apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; kt = callPackage ../tools/misc/kt {}; From 90f0fd9d0cb5952c4f9995fd33c4d63c853996e3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 2 Nov 2017 13:48:01 -0400 Subject: [PATCH 2237/2806] kafka: 0.10.2.0 -> 0.10.2.1 --- pkgs/servers/apache-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index e597a736c6f..0e2dfd87dde 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -14,9 +14,9 @@ let sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; }; "0.10" = { - kafkaVersion = "0.10.2.0"; + kafkaVersion = "0.10.2.1"; scalaVersion = "2.12"; - sha256 = "0py43s6zv8z7wr2lk8403k07xxckl11gla3vs4gr99lixc4whis1"; + sha256 = "0iszr6r0n9yjgq7kcp1hf00fg754m86gs4jzqc18542an94b88z5"; }; "0.11" = { kafkaVersion = "0.11.0.1"; From ace06a2bf1527e8dcae3e82ff394c797404c3899 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 2 Nov 2017 13:48:22 -0400 Subject: [PATCH 2238/2806] kafka: Default to 1.0 --- pkgs/servers/apache-kafka/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 0e2dfd87dde..54784f6ff31 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, jre, makeWrapper, bash, - majorVersion ? "0.9" }: + majorVersion ? "1.0" }: let versionMap = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c5d44f4552..fd96ade2f30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6859,7 +6859,7 @@ with pkgs; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheKafka = apacheKafka_0_10; + apacheKafka = apacheKafka_1_0; apacheKafka_0_8 = callPackage ../servers/apache-kafka { majorVersion = "0.8"; }; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; From e18cdf0f46df107b943adc1e0a8ee644e1628e40 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Thu, 2 Nov 2017 19:59:28 +0200 Subject: [PATCH 2239/2806] pavucontrol-qt: use libsForQt5.callPackage --- pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix | 8 ++++---- pkgs/desktops/lxqt/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix index 918894d2208..862a4ff9cf9 100644 --- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio, pcre }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, pcre, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qt5.qtbase - qt5.qttools - qt5.qtx11extras + qtbase + qttools + qtx11extras libpulseaudio pcre ]; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 79896c7b90c..40c25b3302c 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -27,7 +27,7 @@ let lxqt-session = callPackage ./core/lxqt-session { }; lxqt-sudo = callPackage ./core/lxqt-sudo { }; lxqt-themes = callPackage ./core/lxqt-themes { }; - pavucontrol-qt = callPackage ./core/pavucontrol-qt { }; + pavucontrol-qt = libsForQt5.callPackage ./core/pavucontrol-qt { }; qtermwidget = callPackage ./core/qtermwidget { }; # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0 qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { }; From 9fa8f3ed0d3cb32c5fdf6fe8e4aff46ee2df842c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 3 Nov 2017 02:07:38 +0800 Subject: [PATCH 2240/2806] rpm: 4.13.0.1 -> 4.14.0 --- pkgs/tools/package-management/rpm/default.nix | 8 +++----- .../rpm/rpm-4.13.0.1-bfd-config.patch | 11 ----------- 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 860be0e1f79..0e9ef3876d2 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rpm-${version}"; - version = "4.13.0.1"; + version = "4.14.0"; src = fetchurl { - url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2"; - sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d"; + url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; + sha256 = "053396glswgszzg6wizn76vc8zc5m2bicw025vj44g0dc1aav806"; }; outputs = [ "out" "dev" "man" ]; @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; - patches = [ ./rpm-4.13.0.1-bfd-config.patch ]; - postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} diff --git a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch deleted file mode 100644 index b8192b24f13..00000000000 --- a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru rpm-4.13.0.1/tools/sepdebugcrcfix.c rpm-4.13.0.1.new/tools/sepdebugcrcfix.c ---- rpm-4.13.0.1/tools/sepdebugcrcfix.c 2017-02-16 10:40:09.988649399 +0100 -+++ rpm-4.13.0.1.new/tools/sepdebugcrcfix.c 2017-04-15 00:02:21.151359876 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - #define _(x) x From d27cf320cf23d45261b64326793e8e41bdba5971 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 2 Nov 2017 13:59:10 -0400 Subject: [PATCH 2241/2806] zookeeper: Add simple test --- nixos/release.nix | 2 +- nixos/tests/zookeeper.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/zookeeper.nix diff --git a/nixos/release.nix b/nixos/release.nix index d5f59a524e0..3ecf2ca42ce 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -329,7 +329,7 @@ in rec { tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; - + tests.zookeeper = callTest tests/zookeeper.nix {}; /* Build a bunch of typical closures so that Hydra can keep track of the evolution of closure sizes. */ diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix new file mode 100644 index 00000000000..d247654adad --- /dev/null +++ b/nixos/tests/zookeeper.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "zookeeper"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + server = { pkgs, config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + }; + + testScript = '' + startAll; + + $server->waitForUnit("zookeeper"); + $server->waitForUnit("network.target"); + $server->waitForOpenPort(2181); + + $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 create /foo bar"); + $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 set /foo hello"); + $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello"); + ''; +}) From 0b75c1df0746e1df2b2f43ae350d6b666eed899c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 2 Nov 2017 19:11:04 +0100 Subject: [PATCH 2242/2806] mongodb: fix build with pcre-8.41 via upstream patch --- pkgs/servers/nosql/mongodb/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 11720fb154f..969cd183c5c 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -61,6 +61,12 @@ in stdenv.mkDerivation rec { name = "boost160.patch"; sha256 = "0bvsf3499zj55pzamwjmsssr6x63w434944w76273fr5rxwzcmh8"; }) + # probably not needed for > 3.4.10 + (fetchpatch { + url = https://github.com/mongodb/mongo/commit/218a7b1d4ea3d3b.diff; + name = "pcre-8.41.patch"; + sha256 = "1dra51gw130bq78l2yfkdaj0jkha95ikpv4ig21rapbl63ip3znj"; + }) ]; postPatch = '' From 998027a531b0fce8e1be96da7782ff56b4607772 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 1 Nov 2017 17:07:01 -0400 Subject: [PATCH 2243/2806] openvpn-auth-ldap: init at 2.0.3 --- .../networking/openvpn/openvpn-auth-ldap.nix | 76 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix new file mode 100644 index 00000000000..3d1055be02b --- /dev/null +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -0,0 +1,76 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, + autoreconfHook, re2c, openldap, openvpn, gnustep, check +}: + +let + srcName = "openvpn-auth-ldap"; + srcVersion = "2.0.3"; + debianRev = "6.1"; + + fetchPatchFromDebian = + {patch, sha256}: + fetchpatch { + inherit sha256; + url = "http://sources.debian.net/data/main/o/${srcName}/${srcVersion}-${debianRev}/debian/patches/${patch}"; + }; +in + +stdenv.mkDerivation rec { + name = "${srcName}-${version}"; + version = "${srcVersion}+deb${debianRev}"; + + srcs = fetchFromGitHub { + owner = "threerings"; + repo = srcName; + rev = "auth-ldap-${version}"; + sha256 = "1v635ylzf5x3l3lirf3n6173q1w8g0ssjjkf27qqw98c3iqp63sq"; + }; + + patches = map fetchPatchFromDebian [ + {patch = "STARTTLS_before_auth.patch"; + sha256 = "14d2vy366rhzggxb1zb3ld00wmaqxi2gq885vxhlldnwpgig0jx0";} + {patch = "gobjc_4.7_runtime.patch"; + sha256 = "11hpmd4i1cm3m27x8c77d9jrwxpir4cy5d74k2kxq0q77rawnxcm";} + {patch = "openvpn_ldap_simpler_add_handler_4"; + sha256 = "0qj7v2w921489c18mfrs5bmipzn1mcjj9avyp15x4531ss0lyanb";} + {patch = "auth-ldap-gnustep.patch"; + sha256 = "0cz3jgyzgzi2p9bavd4lh69pnlnf4s7n9ihwg6zmmh6vqsynqss3";} + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + check + gnustep.base + gnustep.libobjc + gnustep.make + openldap + openvpn + re2c + ]; + + configureFlags = [ + "--with-objc-runtime=modern" + "--with-openvpn=${openvpn}/include" + "--libdir=$(out)/lib/openvpn" + ]; + + preInstall = '' + mkdir -p $out/lib/openvpn $out/share/doc/openvpn/examples + cp README $out/share/doc/openvpn/ + cp auth-ldap.conf $out/share/doc/openvpn/examples/ + ''; + + meta = with lib; { + description = "LDAP authentication plugin for OpenVPN"; + homepage = https://github.com/threerings/openvpn-auth-ldap; + license = [ + licenses.asl20 + licenses.bsd3 + ]; + maintainers = [ maintainers.benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa4488b9317..a0e6c398110 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3738,6 +3738,10 @@ with pkgs; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; + openvpn-auth-ldap = callPackage ../tools/networking/openvpn/openvpn-auth-ldap.nix { + stdenv = clangStdenv; + }; + update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; open-pdf-presenter = callPackage ../applications/misc/open-pdf-presenter { }; From 7726b4602709bbda969c021c56873a6eeebe97b2 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 2 Nov 2017 14:40:25 -0400 Subject: [PATCH 2244/2806] openssl_1_0_2: 1.0.2l -> 1.0.2m --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5a4d23b6a39..6a84488238b 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -107,8 +107,8 @@ let in { openssl_1_0_2 = common { - version = "1.0.2l"; - sha256 = "037kvpisc6qh5dkppcwbm5bg2q800xh2hma3vghz8xcycmdij1yf"; + version = "1.0.2m"; + sha256 = "03vvlfnxx4lhxc83ikfdl6jqph4h52y7lb7li03va6dkqrgg2vwc"; }; openssl_1_1_0 = common { From 5e2d96deb331b19fc1b69146c88a8128e8b6e466 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 2 Nov 2017 14:44:04 -0400 Subject: [PATCH 2245/2806] openssl_1_1_0: 1.1.0f -> 1.1.0g --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 6a84488238b..68e88cc57d0 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -112,8 +112,8 @@ in { }; openssl_1_1_0 = common { - version = "1.1.0f"; - sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj"; + version = "1.1.0g"; + sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy"; }; } From eeef094dfdb34755e57c5cc46c140ebee769a61e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 2 Nov 2017 13:47:12 -0500 Subject: [PATCH 2246/2806] libdwarf: 20161124 -> 20170709 --- pkgs/development/libraries/libdwarf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index a0e72f2b561..4bb91878bd3 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libelf }: let - version = "20161124"; + version = "20170709"; src = fetchurl { url = "http://www.prevanders.net/libdwarf-${version}.tar.gz"; - sha512 = "38e480bce5ae8273fd585ec1d8ba94dc3e865a0ef3fcfcf38b5d92fa1ce41f8b" - + "8c95a7cf8a6e69e7c6f638a3cc56ebbfb37b6317047309725fa17e7929096799"; + sha512 = "afff6716ef1af5d8aae2b887f36b9a6547fb576770bc6f630b82725ed1e59cbd" + + "387779aa729bbd1a5ae026a25ac76aacf64b038cd898b2419a8676f9aa8c59f1"; }; meta = { homepage = https://www.prevanders.net/dwarf.html; From beefaff2c19bdf1db24505cf2804487a3ba95b4c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 2 Nov 2017 15:10:33 -0400 Subject: [PATCH 2247/2806] kafka: Add tests --- nixos/release.nix | 4 ++++ nixos/tests/kafka_0_10.nix | 48 ++++++++++++++++++++++++++++++++++++++ nixos/tests/kafka_0_11.nix | 48 ++++++++++++++++++++++++++++++++++++++ nixos/tests/kafka_0_9.nix | 48 ++++++++++++++++++++++++++++++++++++++ nixos/tests/kafka_1_0.nix | 48 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 196 insertions(+) create mode 100644 nixos/tests/kafka_0_10.nix create mode 100644 nixos/tests/kafka_0_11.nix create mode 100644 nixos/tests/kafka_0_9.nix create mode 100644 nixos/tests/kafka_1_0.nix diff --git a/nixos/release.nix b/nixos/release.nix index 3ecf2ca42ce..1e24093ce75 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -270,6 +270,10 @@ in rec { tests.plasma5 = callTest tests/plasma5.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; + tests.kafka_0_9 = callTest tests/kafka_0_9.nix {}; + tests.kafka_0_10 = callTest tests/kafka_0_10.nix {}; + tests.kafka_0_11 = callTest tests/kafka_0_11.nix {}; + tests.kafka_1_0 = callTest tests/kafka_1_0.nix {}; tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {}; tests.kernel-latest = callTest tests/kernel-latest.nix {}; tests.kernel-lts = callTest tests/kernel-lts.nix {}; diff --git a/nixos/tests/kafka_0_10.nix b/nixos/tests/kafka_0_10.nix new file mode 100644 index 00000000000..6e7820f64bc --- /dev/null +++ b/nixos/tests/kafka_0_10.nix @@ -0,0 +1,48 @@ +import ./make-test.nix ({ pkgs, lib, ... } : +let + kafkaPackage = pkgs.apacheKafka_0_10; +in { + name = "kafka_0_10"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + zookeeper1 = { config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + kafka = { config, ... }: { + services.apache-kafka = { + enable = true; + extraProperties = '' + offsets.topic.replication.factor = 1 + ''; + package = kafkaPackage; + zookeeper = "zookeeper1:2181"; + }; + + networking.firewall.allowedTCPPorts = [ 9092 ]; + virtualisation.memorySize = 2048; + }; + }; + + testScript = '' + startAll; + + $zookeeper1->waitForUnit("zookeeper"); + $zookeeper1->waitForUnit("network.target"); + $zookeeper1->waitForOpenPort(2181); + + $kafka->waitForUnit("apache-kafka"); + $kafka->waitForUnit("network.target"); + $kafka->waitForOpenPort(9092); + + $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); + $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + ''; +}) diff --git a/nixos/tests/kafka_0_11.nix b/nixos/tests/kafka_0_11.nix new file mode 100644 index 00000000000..39f9c36bb22 --- /dev/null +++ b/nixos/tests/kafka_0_11.nix @@ -0,0 +1,48 @@ +import ./make-test.nix ({ pkgs, lib, ... } : +let + kafkaPackage = pkgs.apacheKafka_0_11; +in { + name = "kafka_0_11"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + zookeeper1 = { config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + kafka = { config, ... }: { + services.apache-kafka = { + enable = true; + extraProperties = '' + offsets.topic.replication.factor = 1 + ''; + package = kafkaPackage; + zookeeper = "zookeeper1:2181"; + }; + + networking.firewall.allowedTCPPorts = [ 9092 ]; + virtualisation.memorySize = 2048; + }; + }; + + testScript = '' + startAll; + + $zookeeper1->waitForUnit("zookeeper"); + $zookeeper1->waitForUnit("network.target"); + $zookeeper1->waitForOpenPort(2181); + + $kafka->waitForUnit("apache-kafka"); + $kafka->waitForUnit("network.target"); + $kafka->waitForOpenPort(9092); + + $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); + $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + ''; +}) diff --git a/nixos/tests/kafka_0_9.nix b/nixos/tests/kafka_0_9.nix new file mode 100644 index 00000000000..fee82aba2bd --- /dev/null +++ b/nixos/tests/kafka_0_9.nix @@ -0,0 +1,48 @@ +import ./make-test.nix ({ pkgs, lib, ... } : +let + kafkaPackage = pkgs.apacheKafka_0_9; +in { + name = "kafka_0_9"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + zookeeper1 = { config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + kafka = { config, ... }: { + services.apache-kafka = { + enable = true; + extraProperties = '' + offsets.topic.replication.factor = 1 + ''; + package = kafkaPackage; + zookeeper = "zookeeper1:2181"; + }; + + networking.firewall.allowedTCPPorts = [ 9092 ]; + virtualisation.memorySize = 2048; + }; + }; + + testScript = '' + startAll; + + $zookeeper1->waitForUnit("zookeeper"); + $zookeeper1->waitForUnit("network.target"); + $zookeeper1->waitForOpenPort(2181); + + $kafka->waitForUnit("apache-kafka"); + $kafka->waitForUnit("network.target"); + $kafka->waitForOpenPort(9092); + + $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); + $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + ''; +}) diff --git a/nixos/tests/kafka_1_0.nix b/nixos/tests/kafka_1_0.nix new file mode 100644 index 00000000000..936840dbcfd --- /dev/null +++ b/nixos/tests/kafka_1_0.nix @@ -0,0 +1,48 @@ +import ./make-test.nix ({ pkgs, lib, ... } : +let + kafkaPackage = pkgs.apacheKafka_1_0; +in { + name = "kafka_1_0"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + zookeeper1 = { config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + kafka = { config, ... }: { + services.apache-kafka = { + enable = true; + extraProperties = '' + offsets.topic.replication.factor = 1 + ''; + package = kafkaPackage; + zookeeper = "zookeeper1:2181"; + }; + + networking.firewall.allowedTCPPorts = [ 9092 ]; + virtualisation.memorySize = 2048; + }; + }; + + testScript = '' + startAll; + + $zookeeper1->waitForUnit("zookeeper"); + $zookeeper1->waitForUnit("network.target"); + $zookeeper1->waitForOpenPort(2181); + + $kafka->waitForUnit("apache-kafka"); + $kafka->waitForUnit("network.target"); + $kafka->waitForOpenPort(9092); + + $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); + $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + ''; +}) From 30d4deccbdf4b1d9083f9db6a7fa953dda3b678d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 2 Nov 2017 15:12:19 -0400 Subject: [PATCH 2248/2806] kafka: Remove 0.8 --- pkgs/servers/apache-kafka/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 6 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 54784f6ff31..152e6045574 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,11 +3,6 @@ let versionMap = { - "0.8" = { - kafkaVersion = "0.8.2.2"; - scalaVersion = "2.10"; - sha256 = "1azccf1k0nr8y1sfpjgqf9swyp87ypvgva68ci4kczwcx1z9d89v"; - }; "0.9" = { kafkaVersion = "0.9.0.1"; scalaVersion = "2.11"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd96ade2f30..085792f5394 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6860,7 +6860,6 @@ with pkgs; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; apacheKafka = apacheKafka_1_0; - apacheKafka_0_8 = callPackage ../servers/apache-kafka { majorVersion = "0.8"; }; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; From e06dbe4f5b51850746ef2c363be8326a1a3e84bf Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 2 Nov 2017 15:13:10 -0400 Subject: [PATCH 2249/2806] openssl: fix nix patch for recent update --- pkgs/development/libraries/openssl/nix-ssl-cert-file.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch index b615f1482b7..893fb3eb664 100644 --- a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch +++ b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch @@ -5,10 +5,10 @@ diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto switch (cmd) { case X509_L_FILE_LOAD: if (argl == X509_FILETYPE_DEFAULT) { -- file = (char *)getenv(X509_get_default_cert_file_env()); -+ file = (char *)getenv("NIX_SSL_CERT_FILE"); +- file = getenv(X509_get_default_cert_file_env()); ++ file = getenv("NIX_SSL_CERT_FILE"); + if (!file) -+ file = (char *)getenv(X509_get_default_cert_file_env()); ++ file = getenv(X509_get_default_cert_file_env()); if (file) ok = (X509_load_cert_crl_file(ctx, file, X509_FILETYPE_PEM) != 0); From 4866f16fbadd2fcc702102944b990ff578379b0a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 2 Nov 2017 14:28:39 -0500 Subject: [PATCH 2250/2806] Revert "Merge pull request #30255 from bkchr/qt_5_9_2" This reverts commit 4cf0b6ba5d5ab5eb20a88449e0612f4dad8e4c29, reversing changes made to 756b9c7d6caae3b02151642b85d84e9b4e4e9b17. Qt 5.9.2 is reverted to Qt 5.9.1, as recommended by KDE upstream due to https://bugreports.qt.io/browse/QTBUG-64017 --- pkgs/development/libraries/qt-5/5.9/fetch.sh | 2 +- .../libraries/qt-5/5.9/qtbase/default.nix | 4 +- pkgs/development/libraries/qt-5/5.9/srcs.nix | 322 +++++++++--------- 3 files changed, 164 insertions(+), 164 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index d026d2a922a..2ae85bba391 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( https://download.qt.io/archive/qt/5.9/5.9.2/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index d63936c561c..eee55dbded3 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -3,7 +3,7 @@ src, version, qtCompatVersion, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, which, + ruby, # darwin support darwin, libiconv, libcxx, @@ -73,7 +73,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig python2 which ] + [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix index f30802472fb..247800b7578 100644 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix @@ -3,283 +3,275 @@ { qt3d = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qt3d-opensource-src-5.9.2.tar.xz"; - sha256 = "10q7npsl087sja0g2n3v0cg4n75y7sbrs3mfjcsg1wpkw8psjmf9"; - name = "qt3d-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz"; + sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg"; + name = "qt3d-opensource-src-5.9.1.tar.xz"; }; }; qtactiveqt = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtactiveqt-opensource-src-5.9.2.tar.xz"; - sha256 = "1kz59ns6afnd8s73ys7hqffg9ki9g7px009b2ab72nq7f8cqsib0"; - name = "qtactiveqt-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz"; + sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg"; + name = "qtactiveqt-opensource-src-5.9.1.tar.xz"; }; }; qtandroidextras = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtandroidextras-opensource-src-5.9.2.tar.xz"; - sha256 = "1hsx16v17iqjhs20xn7an2ad7g8djwrmxachscjhji1dvk4682nl"; - name = "qtandroidextras-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz"; + sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj"; + name = "qtandroidextras-opensource-src-5.9.1.tar.xz"; }; }; qtbase = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz"; - sha256 = "16v0dny4rcyd5p8qsnsfg89w98k8kqk3rp9x3g3k7xjmi53bpqkz"; - name = "qtbase-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz"; + sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw"; + name = "qtbase-opensource-src-5.9.1.tar.xz"; }; }; qtcanvas3d = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtcanvas3d-opensource-src-5.9.2.tar.xz"; - sha256 = "1siyzgm1mjx90rwyzzq9vw2s2xzyf6n7q0vn8gw7mdim5indda44"; - name = "qtcanvas3d-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz"; + sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb"; + name = "qtcanvas3d-opensource-src-5.9.1.tar.xz"; }; }; qtcharts = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtcharts-opensource-src-5.9.2.tar.xz"; - sha256 = "193a3imkgryw42s0gbwaj9gpqd673h3jrg86jvmy33l2fc5gfyjf"; - name = "qtcharts-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz"; + sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k"; + name = "qtcharts-opensource-src-5.9.1.tar.xz"; }; }; qtconnectivity = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtconnectivity-opensource-src-5.9.2.tar.xz"; - sha256 = "1k7kjmlny0ykm40qx796wbsg3310v6b8hqizkbr597cmxjbrax9c"; - name = "qtconnectivity-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz"; + sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0"; + name = "qtconnectivity-opensource-src-5.9.1.tar.xz"; }; }; qtdatavis3d = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdatavis3d-opensource-src-5.9.2.tar.xz"; - sha256 = "1cmjjbbmdqdix1f8b7qyc2vwhj9pvchc8r4lp65qw11dhycmdbh6"; - name = "qtdatavis3d-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz"; + sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13"; + name = "qtdatavis3d-opensource-src-5.9.1.tar.xz"; }; }; qtdeclarative = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdeclarative-opensource-src-5.9.2.tar.xz"; - sha256 = "020bha6q8byxc8cj5zw7gms5rgsjg71hv31hv1rr2fy7x56zsh0d"; - name = "qtdeclarative-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz"; + sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj"; + name = "qtdeclarative-opensource-src-5.9.1.tar.xz"; }; }; qtdoc = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdoc-opensource-src-5.9.2.tar.xz"; - sha256 = "0dfva8h8f9wpszih285qcxlfcijy52qcbfy1zy20gxh72nfi86c9"; - name = "qtdoc-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz"; + sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x"; + name = "qtdoc-opensource-src-5.9.1.tar.xz"; }; }; qtgamepad = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtgamepad-opensource-src-5.9.2.tar.xz"; - sha256 = "0lm5v43psf7r8zc79dcjdmmdnz4jm30ylgkvsyv8k88mj06yklbn"; - name = "qtgamepad-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz"; + sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi"; + name = "qtgamepad-opensource-src-5.9.1.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtgraphicaleffects-opensource-src-5.9.2.tar.xz"; - sha256 = "0xpvigfiqfqvf05ywj8x69y57rp8dwq2hs1kpxlxs15pniz4wn8l"; - name = "qtgraphicaleffects-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; + sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz"; + name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; }; }; qtimageformats = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtimageformats-opensource-src-5.9.2.tar.xz"; - sha256 = "1wwxxcl24mk1p4w6knyfai09axmwqsm6cgsbkjsmdz3zmjh6qqis"; - name = "qtimageformats-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz"; + sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr"; + name = "qtimageformats-opensource-src-5.9.1.tar.xz"; }; }; qtlocation = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtlocation-opensource-src-5.9.2.tar.xz"; - sha256 = "033b6l6jbvmc0k5qvbgh5vkzvfga7npqcphrywrrqkmx9vj446n8"; - name = "qtlocation-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz"; + sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b"; + name = "qtlocation-opensource-src-5.9.1.tar.xz"; }; }; qtmacextras = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtmacextras-opensource-src-5.9.2.tar.xz"; - sha256 = "0f14xkardmidvwljccrv6adcs4nyn8rzry9k74mwqn0ikvycs3my"; - name = "qtmacextras-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz"; + sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11"; + name = "qtmacextras-opensource-src-5.9.1.tar.xz"; }; }; qtmultimedia = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtmultimedia-opensource-src-5.9.2.tar.xz"; - sha256 = "0815hi3cxy5zy6yc5fkdpx2xd6rk7968j1ziwl2g4wa80802g9n9"; - name = "qtmultimedia-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz"; + sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4"; + name = "qtmultimedia-opensource-src-5.9.1.tar.xz"; }; }; qtnetworkauth = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtnetworkauth-opensource-src-5.9.2.tar.xz"; - sha256 = "16i33m8x5yii22ciq97bpfmnw0lwhvgv84i2az30a1ikm9dg00x0"; - name = "qtnetworkauth-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz"; + sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra"; + name = "qtnetworkauth-opensource-src-5.9.1.tar.xz"; }; }; qtpurchasing = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtpurchasing-opensource-src-5.9.2.tar.xz"; - sha256 = "04f28y7qcr4kd0pw26mm515qj7haxr0i8lijn1q47wkikxyhawca"; - name = "qtpurchasing-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz"; + sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss"; + name = "qtpurchasing-opensource-src-5.9.1.tar.xz"; }; }; qtquickcontrols = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtquickcontrols-opensource-src-5.9.2.tar.xz"; - sha256 = "07xxhkfsljwdwlp9jfp88pwkrig02y2pnwhdsaz8mkcackwfq2az"; - name = "qtquickcontrols-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz"; + sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj"; + name = "qtquickcontrols-opensource-src-5.9.1.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtquickcontrols2-opensource-src-5.9.2.tar.xz"; - sha256 = "1ln83afxyp5dmvdnq6n7as82xrd5k3xvfx7b1jxnljivslyxsm9b"; - name = "qtquickcontrols2-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz"; + sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0"; + name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz"; }; }; qtremoteobjects = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtremoteobjects-opensource-src-5.9.2.tar.xz"; - sha256 = "1ylphdwis34y4pm9xiwh2xqfd0hh2gp8kkawlps2q5mh2bm11376"; - name = "qtremoteobjects-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz"; + sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0"; + name = "qtremoteobjects-opensource-src-5.9.1.tar.xz"; }; }; qtscript = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtscript-opensource-src-5.9.2.tar.xz"; - sha256 = "1wa0rnbphkhgydnwkf5bjwn0llskl6hgs0964nh0jik8qaspv027"; - name = "qtscript-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz"; + sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp"; + name = "qtscript-opensource-src-5.9.1.tar.xz"; }; }; qtscxml = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtscxml-opensource-src-5.9.2.tar.xz"; - sha256 = "0pdimqwdrj8hckm81lwy1z58ji4bdv0bzgv336m0a8v3pj914awx"; - name = "qtscxml-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz"; + sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0"; + name = "qtscxml-opensource-src-5.9.1.tar.xz"; }; }; qtsensors = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtsensors-opensource-src-5.9.2.tar.xz"; - sha256 = "1lxmhi19dbb8vjhpjph0l0ss6zh72hb4908lp4s1pgf8r641ai3r"; - name = "qtsensors-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz"; + sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was"; + name = "qtsensors-opensource-src-5.9.1.tar.xz"; }; }; qtserialbus = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtserialbus-opensource-src-5.9.2.tar.xz"; - sha256 = "025yv7zajz5scrmkjkmgkyvxpgkliqvrzc88is0gr481zpd4phmv"; - name = "qtserialbus-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz"; + sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa"; + name = "qtserialbus-opensource-src-5.9.1.tar.xz"; }; }; qtserialport = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtserialport-opensource-src-5.9.2.tar.xz"; - sha256 = "0hndc9z7qzxazzjvc6k5yd58afw13444plk70b05nqdi5p19rvah"; - name = "qtserialport-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz"; + sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1"; + name = "qtserialport-opensource-src-5.9.1.tar.xz"; }; }; qtspeech = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtspeech-opensource-src-5.9.2.tar.xz"; - sha256 = "0cq33dffi7q7dnvzhdivky5prakb8xnwap0b76fwgirhbbn88ypg"; - name = "qtspeech-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz"; + sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c"; + name = "qtspeech-opensource-src-5.9.1.tar.xz"; }; }; qtsvg = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtsvg-opensource-src-5.9.2.tar.xz"; - sha256 = "020icrl9vi8jh8ygsssqrx2bl8bx28m15dwmf9a969qdnvxyp5ms"; - name = "qtsvg-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz"; + sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr"; + name = "qtsvg-opensource-src-5.9.1.tar.xz"; }; }; qttools = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz"; - sha256 = "06nqsa5mj0mc9w9xbm7mgdkb66x4wlvkhnas32f97sb8ic8rdf9b"; - name = "qttools-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz"; + sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4"; + name = "qttools-opensource-src-5.9.1.tar.xz"; }; }; qttranslations = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qttranslations-opensource-src-5.9.2.tar.xz"; - sha256 = "0byi4s07lfnzzlr2c4sc5qg3hrysswmakwmf80q2mx50kpgnvwax"; - name = "qttranslations-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz"; + sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja"; + name = "qttranslations-opensource-src-5.9.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtvirtualkeyboard-opensource-src-5.9.2.tar.xz"; - sha256 = "1z66chp5746cb0rwy2isnpbvwjj44qvp2hg56n3g47dj901wldp8"; - name = "qtvirtualkeyboard-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; + sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b"; + name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; }; }; qtwayland = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwayland-opensource-src-5.9.2.tar.xz"; - sha256 = "1ipn4xh0dj1kjg5i4vfl4gpx3hg2377w5gls47xpv1ikz41lshzn"; - name = "qtwayland-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz"; + sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g"; + name = "qtwayland-opensource-src-5.9.1.tar.xz"; }; }; qtwebchannel = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebchannel-opensource-src-5.9.2.tar.xz"; - sha256 = "09iss70c1iqgf8qpik35qlgrdw5y9935v0fm2ppgkmxdxkpls6ww"; - name = "qtwebchannel-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz"; + sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0"; + name = "qtwebchannel-opensource-src-5.9.1.tar.xz"; }; }; qtwebengine = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebengine-opensource-src-5.9.2.tar.xz"; - sha256 = "0251qk04yif4lsn8qvkc2kmzzmaw1v3pfh5ypr06d04zb3j6kc6a"; - name = "qtwebengine-opensource-src-5.9.2.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.9.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebsockets-opensource-src-5.9.2.tar.xz"; - sha256 = "0x0nx1ampqsgj9qlc3l32z3ham1a5vq7m2lnxk5pr92yj6yw3pdg"; - name = "qtwebsockets-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz"; + sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn"; + name = "qtwebengine-opensource-src-5.9.1.tar.xz"; }; }; qtwebkit = { @@ -298,36 +290,44 @@ name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz"; }; }; - qtwebview = { - version = "5.9.2"; + qtwebsockets = { + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebview-opensource-src-5.9.2.tar.xz"; - sha256 = "1cdqw6pjfqagnwxrha0s18zadjnm65dsildxj07h2qiwqxwyrjpw"; - name = "qtwebview-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz"; + sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1"; + name = "qtwebsockets-opensource-src-5.9.1.tar.xz"; + }; + }; + qtwebview = { + version = "5.9.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz"; + sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn"; + name = "qtwebview-opensource-src-5.9.1.tar.xz"; }; }; qtwinextras = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwinextras-opensource-src-5.9.2.tar.xz"; - sha256 = "07qq9rxl6hhl300w7qxsjjbdd5fwpszfk3rbinxklg20f6c6ixml"; - name = "qtwinextras-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz"; + sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s"; + name = "qtwinextras-opensource-src-5.9.1.tar.xz"; }; }; qtx11extras = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtx11extras-opensource-src-5.9.2.tar.xz"; - sha256 = "1ias745j5lfnrfkgyk0pr8n8zlkqs08gq7yyzaj1c645sh54b1fv"; - name = "qtx11extras-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz"; + sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6"; + name = "qtx11extras-opensource-src-5.9.1.tar.xz"; }; }; qtxmlpatterns = { - version = "5.9.2"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtxmlpatterns-opensource-src-5.9.2.tar.xz"; - sha256 = "0knk4bplqhvsxar1wv16bzfw57q0aja12gdaxz7m8mvx121sm9ha"; - name = "qtxmlpatterns-opensource-src-5.9.2.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz"; + sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m"; + name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz"; }; }; } From 3c74fcf6bf84b515f0b20f08d417caeae32bfb53 Mon Sep 17 00:00:00 2001 From: John Boehr Date: Thu, 2 Nov 2017 12:49:55 -0700 Subject: [PATCH 2251/2806] phpPackages.apcu: 5.1.2 -> 5.1.8 and enable tests See #30734 - 5.1.2 segfaults --- pkgs/top-level/php-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 960de37332f..7e12d817e17 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -18,9 +18,13 @@ let }; apcu51 = assert isPhp7; buildPecl { - name = "apcu-5.1.2"; + name = "apcu-5.1.8"; - sha256 = "0r5pfbjbmdj46h20jm3iqmy969qd27ajyf0phjhgykv6j0cqjlgd"; + sha256 = "01dfbf0245d8cc0f51ba16467a60b5fad08e30b28df7846e0dd213da1143ecce"; + + doCheck = true; + checkTarget = "test"; + checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; }; ast = assert isPhp7; buildPecl { From 454c42c8493fb4425ae98444fcb8e14db013c3d4 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 31 Oct 2017 12:57:34 +0100 Subject: [PATCH 2252/2806] vboot_reference: Update In addition to updating to a more recent upstream version, this installs the development signing keys and removes the separate vbutil_* tools in favour of the single futility tool. --- pkgs/tools/system/vboot_reference/default.nix | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 6dfc6d1349d..0b8933bb7af 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -1,42 +1,35 @@ -{ stdenv, fetchgit, pkgconfig, libuuid, openssl }: +{ stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }: stdenv.mkDerivation rec { - version = "20130507"; - checkout = "25/50225/2"; + version = "20171023"; + checkout = "8122e0b8b13794"; name = "vboot_reference-${version}"; src = fetchgit { url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; - rev = "refs/changes/${checkout}"; - sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; + rev = "${checkout}"; + sha256 = "0qxm3qlvm2fgjrn9b3n8rdccw2f5pdi7z542m2hdfddflx7jz1w7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl stdenv.cc.libc.static ] - ++ stdenv.lib.optional (libuuid != null) - (libuuid.overrideAttrs (attrs: - { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; })); + buildInputs = [ openssl libuuid libyaml lzma ]; - arch = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "x86" - else throw "vboot_reference for: ${stdenv.system} not supported!"; + enableParallelBuilding = true; buildPhase = '' - make ARCH=${arch} `pwd`/build/cgpt/cgpt - make ARCH=${arch} `pwd`/build/utility/vbutil_kernel - make ARCH=${arch} `pwd`/build/utility/vbutil_key - make ARCH=${arch} `pwd`/build/utility/vbutil_keyblock - make ARCH=${arch} `pwd`/build/utility/vbutil_firmware + patchShebangs scripts + make -j''${NIX_BUILD_CORES:-1} \ + `pwd`/build/cgpt/cgpt \ + `pwd`/build/futility/futility ''; installPhase = '' mkdir -p $out/bin cp build/cgpt/cgpt $out/bin - cp build/utility/vbutil_kernel $out/bin - cp build/utility/vbutil_key $out/bin - cp build/utility/vbutil_keyblock $out/bin - cp build/utility/vbutil_firmware $out/bin + cp build/futility/futility $out/bin + mkdir -p $out/share/vboot + cp -r tests/devkeys* $out/share/vboot/ ''; meta = { From 0721c1ff3d04313a266cf5d688945996048780f9 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 2 Nov 2017 21:45:19 +0100 Subject: [PATCH 2253/2806] numix-gtk-theme: fix hash --- pkgs/misc/themes/numix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index 233a73df868..e21faf8b805 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { repo = "numix-gtk-theme"; owner = "numixproject"; rev = version; - sha256 = "1fmlc6vi8prvwsq0nxxcd00lp04bwmapzjqf727wb1czqf2lf0dv"; + sha256 = "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; From 994cff67e34e909e5f5e2009aa13f1c21e6b2e5f Mon Sep 17 00:00:00 2001 From: John Boehr Date: Thu, 2 Nov 2017 13:49:34 -0700 Subject: [PATCH 2254/2806] phpPackages.redis: rev 4a37e4 -> 3.1.4 --- pkgs/top-level/php-packages.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 960de37332f..f5b4d34b34e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -269,22 +269,16 @@ let buildInputs = [ pkgs.geoip ]; }; - redis = if isPhp7 then redisPhp7 else redis22; + redis = if isPhp7 then redis31 else redis22; redis22 = assert !isPhp7; buildPecl { name = "redis-2.2.7"; sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm"; }; - # Not released yet - redisPhp7 = assert isPhp7; buildPecl rec { - name = "redis-php7"; - - src = fetchgit { - url = "https://github.com/phpredis/phpredis"; - rev = "4a37e47d0256581ce2f7a3b15b5bb932add09f36"; - sha256 = "1qm2ifa0zf95l1g967iiabmja17srpwz73lfci7z13ffdw1ayhfd"; - }; + redis31 = assert isPhp7; buildPecl { + name = "redis-3.1.4"; + sha256 = "0rgjdrqfif8pfn3ipk1v4gyjkkdcdrdk479qbpda89w25vaxzsxd"; }; v8 = assert isPhp7; buildPecl rec { From c60bee3a4143800d4d4352e8a176f31130dca8b5 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 20:53:58 +0000 Subject: [PATCH 2255/2806] python.pkgs.jsbeautifier: fix name --- pkgs/development/python-modules/jsbeautifier/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 47bbdb5d07b..a2278566c6d 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -3,7 +3,7 @@ buildPythonApplication rec { pname = "jsbeautifier"; version = "1.7.4"; - name = "jsbeautifier-1.6.14"; + name = "${pname}-${version}"; propagatedBuildInputs = [ six ]; From 5bd48158e9dc41b6a9b011295ff94908502f2a06 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 2 Nov 2017 22:10:57 +0100 Subject: [PATCH 2256/2806] nodePackages: remove overrides for non-existent packages --- pkgs/development/node-packages/default-v4.nix | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index c058154a996..7546b2e34ce 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -9,42 +9,4 @@ nodePackages // { node-inspector = nodePackages.node-inspector.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; }); - - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - }); - - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - - preRebuild = '' - mkdir $TMPDIR/webdrvr - - ln -s ${pkgs.fetchurl { - url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; - sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; - }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar - ln -s ${pkgs.fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; - sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; - }} $TMPDIR/webdrvr/chromedriver_linux64.zip - ''; - }); - - wring = nodePackages.wring.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); - - npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { - postInstall = "npm run-script prepublish"; - }; - - bower2nix = nodePackages.bower2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; - postInstall = '' - for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} - done - ''; - }); } From d1491f490f04ab398cd6f520227f3904333da55a Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 2 Nov 2017 22:18:35 +0100 Subject: [PATCH 2257/2806] add sorki to maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 797adae97b1..97411d57bea 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -585,6 +585,7 @@ snyh = "Xia Bin "; solson = "Scott Olson "; sorpaas = "Wei Tang "; + sorki = "Richard Marko "; spacefrogg = "Michael Raitza "; spencerjanssen = "Spencer Janssen "; spinus = "Tomasz Czyż "; From 2b3726251990557f17457a50626ae4cbd86a1e3c Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 2 Nov 2017 22:19:13 +0100 Subject: [PATCH 2258/2806] ipmicfg: init at 1.27.0 --- pkgs/applications/misc/ipmicfg/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/misc/ipmicfg/default.nix diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix new file mode 100644 index 00000000000..92a16656ac9 --- /dev/null +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchurl, patchelf, unzip }: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "ipmicfg-${version}"; + version = "1.27.0"; + buildVersion = "170620"; + + src = fetchurl { + url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; + sha256 = "0mlhrxnkwazq5456csfds6w2z5pv2ksnqnxlv4prp07bwi2bccid"; + }; + + buildInputs = [ unzip ]; + installPhase = '' + mkdir -p "$out/opt/ipmicfg" + cp Linux/64bit/* "$out/opt/ipmicfg" + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}:${stdenv.cc.cc.lib}/lib64" "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" + + mkdir "$out/bin" + ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" + ''; + + meta = with stdenv.lib; { + license = licenses.unfree; + maintainers = with maintainers; [ sorki ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc0a8342145..5886b757493 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2739,6 +2739,7 @@ with pkgs; ipmiutil = callPackage ../tools/system/ipmiutil {}; + ipmicfg = callPackage ../applications/misc/ipmicfg {}; ipmiview = callPackage ../applications/misc/ipmiview {}; ipcalc = callPackage ../tools/networking/ipcalc {}; From af13b05dda7a598c51a81a81b92c36d27e599889 Mon Sep 17 00:00:00 2001 From: nocent Date: Thu, 2 Nov 2017 21:57:25 +0000 Subject: [PATCH 2259/2806] networkmanager: add power saving and mac address randomization options for wifi devices --- .../services/networking/networkmanager.nix | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index e03309c8729..6bdae32f72b 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -32,6 +32,11 @@ let ipv6.ip6-privacy=2 ethernet.cloned-mac-address=${cfg.ethernet.macAddress} wifi.cloned-mac-address=${cfg.wifi.macAddress} + ${optionalString (cfg.wifi.powersave != null) + ''wifi.powersave=${if cfg.wifi.powersave then "3" else "2"}''} + + [device] + wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"} ''; /* @@ -179,7 +184,27 @@ in { }; ethernet.macAddress = macAddressOpt; - wifi.macAddress = macAddressOpt; + + wifi = { + macAddress = macAddressOpt; + + powersave = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Whether to enable Wi-Fi power saving. + ''; + }; + + scanRandMacAddress = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable MAC address randomization of a Wi-Fi device + during scanning. + ''; + }; + }; useDnsmasq = mkOption { type = types.bool; From 054baf2cbe2dcab905e221b45fdbbb2fe794fc10 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 3 Nov 2017 09:29:22 +1030 Subject: [PATCH 2260/2806] awsebcli: unbreak after cement update awsebcli requests that the cement package be exactly at version 2.8.2 and won't build without it. --- pkgs/tools/virtualization/awsebcli/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index e43bc18ba70..cb1285504d2 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -3,6 +3,16 @@ let localPython = python.override { packageOverrides = self: super: rec { + cement = super.cement.overridePythonAttrs (oldAttrs: rec { + version = "2.8.2"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; + }; + }); + colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { version = "0.3.7"; From fcf0df2cf6e5e71cc1a13b230e121c946ca4c945 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 3 Nov 2017 09:35:47 +1030 Subject: [PATCH 2261/2806] awsebcli: tiny whitespace fix --- pkgs/tools/virtualization/awsebcli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index cb1285504d2..8b1174622b1 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,4 +1,4 @@ - { stdenv, python }: +{ stdenv, python }: let localPython = python.override { From 47c000b89414a859fa6a9fd02e47eec752bdc3cf Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 3 Nov 2017 09:36:21 +1030 Subject: [PATCH 2262/2806] awsebcli: 3.11.0 -> 3.12.0 --- pkgs/tools/virtualization/awsebcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 8b1174622b1..7439af27560 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -77,11 +77,11 @@ let in with localPython.pkgs; buildPythonApplication rec { name = "${pname}-${version}"; pname = "awsebcli"; - version = "3.11.0"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "052388annhyirlzdr89hbgif8k7pw7win2zm1ybn4iiisr5l49zi"; + sha256 = "0ljras4bgxpmk1l3plialmhi7jsm2cpzx0dcs9411ijykzkamdkd"; }; checkInputs = [ From da067f40f93693083416d59028e4fa344941e394 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 2 Nov 2017 23:06:05 +0000 Subject: [PATCH 2263/2806] ipmicfg: fix style --- pkgs/applications/misc/ipmicfg/default.nix | 22 ++++++++++++---------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 92a16656ac9..af67db3f654 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -1,31 +1,33 @@ -{ stdenv, lib, fetchurl, patchelf, unzip }: - -assert stdenv.isLinux; +{ stdenv, fetchzip }: stdenv.mkDerivation rec { name = "ipmicfg-${version}"; version = "1.27.0"; buildVersion = "170620"; - src = fetchurl { + src = fetchzip { url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; - sha256 = "0mlhrxnkwazq5456csfds6w2z5pv2ksnqnxlv4prp07bwi2bccid"; + sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5"; }; - buildInputs = [ unzip ]; installPhase = '' - mkdir -p "$out/opt/ipmicfg" + mkdir -p "$out/bin" "$out/opt/ipmicfg" cp Linux/64bit/* "$out/opt/ipmicfg" - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" - patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}:${stdenv.cc.cc.lib}/lib64" "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" + patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" - mkdir "$out/bin" ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" ''; + dontPatchShebangs = true; # There are no scripts and it complains about null bytes. + meta = with stdenv.lib; { + description = "Supermicro IPMI configuration tool"; + homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm"; license = licenses.unfree; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ sorki ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5886b757493..908b0dc75ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2740,6 +2740,7 @@ with pkgs; ipmiutil = callPackage ../tools/system/ipmiutil {}; ipmicfg = callPackage ../applications/misc/ipmicfg {}; + ipmiview = callPackage ../applications/misc/ipmiview {}; ipcalc = callPackage ../tools/networking/ipcalc {}; From c8943272153d1ad5c7dd1329bf0045f2834d52dd Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 2 Nov 2017 20:35:05 +0100 Subject: [PATCH 2264/2806] postage: replaced by pgmanage-10.0.2 postage is no longer maintained and has been replaced by the identical pgmanage. See: https://github.com/workflowproducts/postage#postage-has-been-replaced-with-pgmanage The following error is raised when a user enables the deprecated `services.postage.enable` option: Failed assertions: - services.postage is deprecated in favor of pgmanage. They have the same options so just substitute postage for pgmanage. --- nixos/doc/manual/release-notes/rl-1803.xml | 9 ++ nixos/modules/module-list.nix | 2 +- .../databases/{postage.nix => pgmanage.nix} | 125 ++++++++++-------- nixos/release.nix | 1 + nixos/tests/pgmanage.nix | 39 ++++++ .../misc/{postage => pgmanage}/default.nix | 16 +-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 8 files changed, 131 insertions(+), 64 deletions(-) rename nixos/modules/services/databases/{postage.nix => pgmanage.nix} (53%) create mode 100644 nixos/tests/pgmanage.nix rename pkgs/applications/misc/{postage => pgmanage}/default.nix (63%) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 6fa14b55386..17b385242f6 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -63,6 +63,15 @@ following incompatible changes: pass literal dollar signs through Postfix, double them. + + + The postage package (for web-based PostgreSQL + administration) has been renamed to pgmanage. The + corresponding module has also been renamed. To migrate please rename all + options to + . + +
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 44bcec5aec2..e66a2ba272a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -185,7 +185,7 @@ ./services/databases/neo4j.nix ./services/databases/openldap.nix ./services/databases/opentsdb.nix - ./services/databases/postage.nix + ./services/databases/pgmanage.nix ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/riak.nix diff --git a/nixos/modules/services/databases/postage.nix b/nixos/modules/services/databases/pgmanage.nix similarity index 53% rename from nixos/modules/services/databases/postage.nix rename to nixos/modules/services/databases/pgmanage.nix index d49c9a83a46..86733a3e5a0 100644 --- a/nixos/modules/services/databases/postage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -3,16 +3,16 @@ with lib; let - cfg = config.services.postage; + cfg = config.services.pgmanage; confFile = pkgs.writeTextFile { - name = "postage.conf"; + name = "pgmanage.conf"; text = '' - connection_file = ${postageConnectionsFile} + connection_file = ${pgmanageConnectionsFile} allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections} - postage_port = ${toString cfg.port} + pgmanage_port = ${toString cfg.port} super_only = ${builtins.toJSON cfg.superOnly} @@ -20,7 +20,7 @@ let login_timeout = ${toString cfg.loginTimeout} - web_root = ${cfg.package}/etc/postage/web_root + web_root = ${cfg.package}/etc/pgmanage/web_root data_root = ${cfg.dataRoot} @@ -33,24 +33,23 @@ let ''; }; - postageConnectionsFile = pkgs.writeTextFile { - name = "postage-connections.conf"; + pgmanageConnectionsFile = pkgs.writeTextFile { + name = "pgmanage-connections.conf"; text = concatStringsSep "\n" (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections); }; - postage = "postage"; -in { + pgmanage = "pgmanage"; - options.services.postage = { + pgmanageOptions = { enable = mkEnableOption "PostgreSQL Administration for the web"; package = mkOption { type = types.package; - default = pkgs.postage; - defaultText = "pkgs.postage"; + default = pkgs.pgmanage; + defaultText = "pkgs.pgmanage"; description = '' - The postage package to use. + The pgmanage package to use. ''; }; @@ -62,14 +61,14 @@ in { "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require"; }; description = '' - Postage requires at least one PostgreSQL server be defined. + pgmanage requires at least one PostgreSQL server be defined. Detailed information about PostgreSQL connection strings is available at: Note that you should not specify your user name or password. That information will be entered on the login screen. If you specify a - username or password, it will be removed by Postage before attempting to + username or password, it will be removed by pgmanage before attempting to connect to a database. ''; }; @@ -78,7 +77,7 @@ in { type = types.bool; default = false; description = '' - This tells Postage whether or not to allow anyone to use a custom + This tells pgmanage whether or not to allow anyone to use a custom connection from the login screen. ''; }; @@ -87,7 +86,7 @@ in { type = types.int; default = 8080; description = '' - This tells Postage what port to listen on for browser requests. + This tells pgmanage what port to listen on for browser requests. ''; }; @@ -95,7 +94,7 @@ in { type = types.bool; default = true; description = '' - This tells Postage whether or not to set the listening socket to local + This tells pgmanage whether or not to set the listening socket to local addresses only. ''; }; @@ -104,10 +103,10 @@ in { type = types.bool; default = true; description = '' - This tells Postage whether or not to only allow super users to + This tells pgmanage whether or not to only allow super users to login. The recommended value is true and will restrict users who are not super users from logging in to any PostgreSQL instance through - Postage. Note that a connection will be made to PostgreSQL in order to + pgmanage. Note that a connection will be made to PostgreSQL in order to test if the user is a superuser. ''; }; @@ -116,8 +115,8 @@ in { type = types.nullOr types.str; default = null; description = '' - This tells Postage to only allow users in a certain PostgreSQL group to - login to Postage. Note that a connection will be made to PostgreSQL in + This tells pgmanage to only allow users in a certain PostgreSQL group to + login to pgmanage. Note that a connection will be made to PostgreSQL in order to test if the user is a member of the login group. ''; }; @@ -133,10 +132,10 @@ in { dataRoot = mkOption { type = types.str; - default = "/var/lib/postage"; + default = "/var/lib/pgmanage"; description = '' - This tells Postage where to put the SQL file history. All tabs are saved - to this location so that if you get disconnected from Postage you + This tells pgmanage where to put the SQL file history. All tabs are saved + to this location so that if you get disconnected from pgmanage you don't lose your work. ''; }; @@ -156,15 +155,15 @@ in { }); default = null; description = '' - These options tell Postage where the TLS Certificate and Key files + These options tell pgmanage where the TLS Certificate and Key files reside. If you use these options then you'll only be able to access - Postage through a secure TLS connection. These options are only - necessary if you wish to connect directly to Postage using a secure TLS - connection. As an alternative, you can set up Postage in a reverse proxy + pgmanage through a secure TLS connection. These options are only + necessary if you wish to connect directly to pgmanage using a secure TLS + connection. As an alternative, you can set up pgmanage in a reverse proxy configuration. This allows your web server to terminate the secure - connection and pass on the request to Postage. You can find help to set + connection and pass on the request to pgmanage. You can find help to set up this configuration in: - + ''; }; @@ -177,29 +176,47 @@ in { }; }; - config = mkIf cfg.enable { - systemd.services.postage = { - description = "postage - PostgreSQL Administration for the web"; - wants = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = postage; - Group = postage; - ExecStart = "${pkgs.postage}/sbin/postage -c ${confFile}" + - optionalString cfg.localOnly " --local-only=true"; + +in { + + options.services.pgmanage = pgmanageOptions; + + # This is deprecated and should be removed for NixOS-18.03. + options.services.postage = pgmanageOptions; + + config = mkMerge [ + { assertions = [ + { assertion = !config.services.postage.enable; + message = + "services.postage is deprecated in favour of pgmanage. " + + "They have the same options so just substitute postage for pgmanage." ; + } + ]; + } + (mkIf cfg.enable { + systemd.services.pgmanage = { + description = "pgmanage - PostgreSQL Administration for the web"; + wants = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = pgmanage; + Group = pgmanage; + ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + + optionalString cfg.localOnly " --local-only=true"; + }; }; - }; - users = { - users."${postage}" = { - name = postage; - group = postage; - home = cfg.dataRoot; - createHome = true; + users = { + users."${pgmanage}" = { + name = pgmanage; + group = pgmanage; + home = cfg.dataRoot; + createHome = true; + }; + groups."${pgmanage}" = { + name = pgmanage; + }; }; - groups."${postage}" = { - name = postage; - }; - }; - }; + }) + ]; } diff --git a/nixos/release.nix b/nixos/release.nix index d5f59a524e0..5701d7826ca 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -306,6 +306,7 @@ in rec { #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; + tests.pgmanage = callTest tests/pgmanage.nix {}; tests.postgis = callTest tests/postgis.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {}; tests.printing = callTest tests/printing.nix {}; diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix new file mode 100644 index 00000000000..110cbd5c5b4 --- /dev/null +++ b/nixos/tests/pgmanage.nix @@ -0,0 +1,39 @@ +import ./make-test.nix ({ pkgs, ... } : +let + role = "test"; + password = "secret"; + conn = "local"; +in +{ + name = "pgmanage"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ basvandijk ]; + }; + nodes = { + one = { config, pkgs, ... }: { + services = { + postgresql = { + enable = true; + initialScript = pkgs.writeText "pg-init-script" '' + CREATE ROLE ${role} SUPERUSER LOGIN PASSWORD '${password}'; + ''; + }; + pgmanage = { + enable = true; + connections = { + "${conn}" = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres"; + }; + }; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("default.target"); + $one->requireActiveUnit("pgmanage.service"); + + # Test if we can log in. + $one->waitUntilSucceeds("curl 'http://localhost:8080/pgmanage/auth' --data 'action=login&connname=${conn}&username=${role}&password=${password}' --fail"); + ''; +}) diff --git a/pkgs/applications/misc/postage/default.nix b/pkgs/applications/misc/pgmanage/default.nix similarity index 63% rename from pkgs/applications/misc/postage/default.nix rename to pkgs/applications/misc/pgmanage/default.nix index eeb879ee6e4..fd66ce8fc31 100644 --- a/pkgs/applications/misc/postage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, runCommand, postgresql, openssl } : stdenv.mkDerivation rec { - name = "postage-${version}"; - version = "3.2.18"; + name = "pgmanage-${version}"; + version = "10.0.2"; src = fetchFromGitHub { - owner = "workflowproducts"; - repo = "postage"; - rev = "eV${version}"; - sha256 = "1kdg8pw2vxwkxw3b6dim4s740s60j3iyrh96524wi3lqkkq98krn"; + owner = "pgManage"; + repo = "pgManage"; + rev = "v${version}"; + sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a"; }; buildInputs = [ postgresql openssl ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { the style of NGINX and Node.js. This heart makes Postage as fast as any PostgreSQL interface can hope to be. ''; - homepage = http://www.workflowproducts.com/postage.html; - license = licenses.asl20; + homepage = https://github.com/pgManage/pgManage; + license = licenses.postgresql; maintainers = [ maintainers.basvandijk ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 20d9ba83354..b6f36aa9de1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -116,6 +116,7 @@ mapAliases (rec { pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 pidginlatexSF = pidginlatex; # added 2014-11-02 + postage = pgmanage; # added 2017-11-03 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 PPSSPP = ppsspp; # added 2017-10-01 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9edb35b6153..ced083faeef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19309,7 +19309,7 @@ with pkgs; opkg-utils = callPackage ../tools/package-management/opkg-utils { }; - postage = callPackage ../applications/misc/postage { }; + pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin = callPackage ../applications/misc/pgadmin { }; From 40124cd0cf474dd17959b5ae36c8a98112c173c0 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Thu, 2 Nov 2017 21:51:35 +0000 Subject: [PATCH 2265/2806] Add wrapper for idris exe for gcc/gmp runtime deps Fixes #10450 When compiling packages with -o the executable invokes gcc. There is no compile time flag to control this invocation so for now we create a wrapper which provides the dependency at runtime. --- pkgs/development/idris-modules/default.nix | 9 +++++++-- pkgs/development/idris-modules/idris-wrapper.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/idris-modules/idris-wrapper.nix diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 4d7c4928283..16f6c65b094 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, idris, overrides ? (self: super: {}) }: let +{ pkgs, idris-no-deps, overrides ? (self: super: {}) }: let inherit (pkgs.lib) callPackageWith fix' extends; /* Taken from haskell-modules/default.nix, should probably abstract this away */ @@ -33,7 +33,12 @@ value = callPackage (./. + "/${name}.nix") {}; }) files)) // { - inherit idris callPackage; + inherit idris-no-deps callPackage; + # See #10450 about why we have to wrap the executable + idris = + (pkgs.callPackage ./idris-wrapper.nix {}) + idris-no-deps + { path = [ pkgs.gcc ]; lib = [pkgs.gmp]; }; # A list of all of the libraries that come with idris builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_; diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix new file mode 100644 index 00000000000..32424ba1f86 --- /dev/null +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -0,0 +1,14 @@ +{ symlinkJoin, makeWrapper, stdenv }: idris: { path, lib }: + +symlinkJoin { + name = idris.name; + src = idris.src; + paths = [ idris ]; + buildInputs = [ makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/idris \ + --suffix PATH : ${ stdenv.lib.makeBinPath path } \ + --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} + ''; + } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a76c4eac651..294a79b101e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5876,7 +5876,8 @@ with pkgs; icedtea_web = icedtea8_web; idrisPackages = callPackage ../development/idris-modules { - idris = + + idris-no-deps = let inherit (self.haskell) lib; haskellPackages = self.haskellPackages.override { @@ -5893,6 +5894,8 @@ with pkgs; haskellPackages.idris; }; + idris = idrisPackages.with-packages [ idrisPackages.base ] ; + intercal = callPackage ../development/compilers/intercal { }; irony-server = callPackage ../development/tools/irony-server/default.nix { From 6d80920ab948f31b497afda7fcfc6235ada46f85 Mon Sep 17 00:00:00 2001 From: Renaud Date: Fri, 3 Nov 2017 00:21:16 +0100 Subject: [PATCH 2266/2806] htpdate: 1.1.3 -> 1.2.0 --- pkgs/tools/networking/htpdate/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 10ed8f34e3a..d937f3c2f0b 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchurl, coreutils, binutils }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.1.3"; + version = "1.2.0"; name = "htpdate-${version}"; src = fetchurl { - url = "http://twekkel.home.xs4all.nl/htp/htpdate-${version}.tar.gz"; - sha256 = "0hfg4qrsmpqw03m9qwf3zgi4brbf65w6wd3w30nkamc7x8b4vn5i"; + url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz"; + sha256 = "00xwppq3aj951m0srjvxmr17kiaaflyjmbfkvpnfs3jvqhzczci2"; }; - installFlags = [ - "INSTALL=${coreutils}/bin/install" - "STRIP=${binutils}/bin/strip" + makeFlags = [ + "INSTALL=install" + "STRIP=strip" "prefix=$(out)" ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Utility to fetch time and set the system clock over HTTP"; homepage = http://www.vervest.org/htp/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } From 5dc3ea4b31746eda99854b9f926ac3c0b5bba1fa Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 3 Nov 2017 09:42:54 +1030 Subject: [PATCH 2267/2806] flow: 0.57.3 -> 0.58.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 372295084d5..803bd70dbd8 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.57.3"; + version = "0.58.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0pmgj2mv4pmgw8slh4gdj7jskcgxbdsy09arh5rnwf0byy81fky6"; + sha256 = "0s27zj3lx1mqpmfwqpvdcqpz9gzp40mbiy5hp5796pg7627spld5"; }; installPhase = '' From 7eecac6f46e58f1b894debcad4a3310fa9a290ae Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 2 Nov 2017 19:26:06 -0400 Subject: [PATCH 2268/2806] ngspice: Build shared library This builds the libngspice shared library which is used by development versions of kicad. --- pkgs/applications/science/electronics/ngspice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 2588ee39add..ee7c0a5844d 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ readline libX11 flex bison libICE libXaw libXext ]; - configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ]; + configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ]; meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; From 14d3a7d744dc6d8b93282f87dfe19585cff923bd Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 22:41:03 +0000 Subject: [PATCH 2269/2806] python.pkgs.urwid: fix tests --- pkgs/development/python-modules/urwid/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 129f4821e87..8d5b7ab76e5 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch }: buildPythonPackage (rec { pname = "urwid"; @@ -10,6 +10,19 @@ buildPythonPackage (rec { sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng"; }; + patches = [ + # fix tests + (fetchpatch { + url = "https://github.com/mwhudson/urwid/commit/4b0ed8b6030450e6d99909a7c683e9642e546387.patch"; + sha256 = "0azpn0ylbg8mfpr0y27n4lnq0ph75a4d4m9wdv3napnhf1vh9ahx"; + }) + # fix tests + (fetchpatch { + url = "https://github.com/floppym/urwid/commit/f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3.patch"; + sha256 = "1b3vz7mrwz2bqvdwvbyv2j835f9lzapgw0j2km4sam76bxmgfpgq"; + }) + ]; + meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = http://excess.org/urwid; From 9d8cc4fab073478b9453b616b0bc2375b16134a6 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 23:32:49 +0000 Subject: [PATCH 2270/2806] python.pkgs.hyperframe: 4.0.1 -> 5.1.0 --- .../python-modules/hyperframe/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------------- 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/hyperframe/default.nix diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix new file mode 100644 index 00000000000..91e00a7a146 --- /dev/null +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "hyperframe"; + version = "5.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "017vjbb1xjak1pxcvihhilzjnmpfvhapk7k88wp6lvdkkm9l8nd2"; + }; + + meta = with stdenv.lib; { + description = "HTTP/2 framing layer for Python"; + homepage = "http://hyper.rtfd.org/"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9c5fa93dfa..fa5ee02f51c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11604,21 +11604,7 @@ in { }; }; - hyperframe = buildPythonPackage rec { - name = "hyperframe-${version}"; - version = "4.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/hyperframe/${name}.tar.gz"; - sha256 = "0hsfq0jigwa0i58z7vbnp62l7za49gmlg75vnygq2ijhkidkcmwa"; - }; - - meta = { - description = "HTTP/2 framing layer for Python"; - homepage = "http://hyper.rtfd.org/"; - license = licenses.mit; - }; - }; + hyperframe = callPackage ../development/python-modules/hyperframe { }; h2 = buildPythonPackage rec { name = "h2-${version}"; From fd261eefbd99e7a4d3e5adc9cfa99a32d5b7ca7d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 23:33:38 +0000 Subject: [PATCH 2271/2806] python.pkgs.h2: 2.5.1 -> 3.0.1 --- .../development/python-modules/h2/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------------- 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/h2/default.nix diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix new file mode 100644 index 00000000000..08cd1943eff --- /dev/null +++ b/pkgs/development/python-modules/h2/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, enum34, hpack, hyperframe }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "h2"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r3f43r0v7sqgdjjg5ngw0dndk2v6cyd0jncpwya54m37y42z5mj"; + }; + + propagatedBuildInputs = [ enum34 hpack hyperframe ]; + + meta = with stdenv.lib; { + description = "HTTP/2 State-Machine based protocol implementation"; + homepage = "http://hyper.rtfd.org/"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa5ee02f51c..1e6101f0bbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11606,23 +11606,7 @@ in { hyperframe = callPackage ../development/python-modules/hyperframe { }; - h2 = buildPythonPackage rec { - name = "h2-${version}"; - version = "2.5.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/h2/${name}.tar.gz"; - sha256 = "0xhzm5vcfhdq3mihynwh4ljwi0r06lvzk3ypr0gmmbcp1x43ffb7"; - }; - - propagatedBuildInputs = with self; [ enum34 hpack hyperframe ]; - - meta = { - description = "HTTP/2 State-Machine based protocol implementation"; - homepage = "http://hyper.rtfd.org/"; - license = licenses.mit; - }; - }; + h2 = callPackage ../development/python-modules/h2 { }; editorconfig = buildPythonPackage rec { name = "EditorConfig-${version}"; From 206a3c7653491165f8947aab18361787a2521119 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 23:34:11 +0000 Subject: [PATCH 2272/2806] python.pkgs.kaitaistruct: 0.6 -> 0.7 --- .../python-modules/kaitaistruct/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------------- 2 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/kaitaistruct/default.nix diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix new file mode 100644 index 00000000000..c9961956617 --- /dev/null +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -0,0 +1,18 @@ +{ stdenv, kaitaistruct, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "kaitaistruct"; + version = "0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "19j3snmr0qbd48f7yd3cc21ffv13dahf8ys591dnalbhvnkar71i"; + }; + + meta = with stdenv.lib; { + description = "Kaitai Struct: runtime library for Python"; + homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e6101f0bbb..b2962dc8459 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13812,21 +13812,7 @@ in { pecan = callPackage ../development/python-modules/pecan { }; - kaitaistruct = buildPythonPackage rec { - name = "kaitaistruct-${version}"; - version = "0.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/kaitaistruct/${name}.tar.gz"; - sha256 = "0rwcrlz7f2bwmypqa38pag492bp71wp1bhz51hsaynjjyr9knr12"; - }; - - meta = with stdenv.lib; { - description = "Kaitai Struct: runtime library for Python"; - homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime"; - license = licenses.mit; - }; - }; + kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; Kajiki = buildPythonPackage rec { name = "Kajiki-${version}"; From a478343856d0a3e47ecd198c3bde1735c934c658 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 23:35:11 +0000 Subject: [PATCH 2273/2806] python.pkgs.pyasn1: 0.1.9 -> 0.3.4 --- .../python-modules/pyasn1/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------------- 2 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/pyasn1/default.nix diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix new file mode 100644 index 00000000000..d0122a5b7e4 --- /dev/null +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pyasn1"; + version = "0.3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "06hhy38jhwh95gpn8f03cr439273fsfsh4vhd5024r86nh5gyiir"; + }; + + meta = with stdenv.lib; { + description = "ASN.1 tools for Python"; + homepage = http://pyasn1.sourceforge.net/; + license = "mBSD"; + platforms = platforms.unix; # arbitrary choice + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2962dc8459..c549a3bad4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15524,21 +15524,7 @@ in { }; - pyasn1 = buildPythonPackage rec { - name = "pyasn1-0.1.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyasn1/${name}.tar.gz"; - sha256 = "0zraxni14bqi20kr4bi6nwsh32aibz0fq0xaczfisw0zdpcsqg45"; - }; - - meta = { - description = "ASN.1 tools for Python"; - homepage = http://pyasn1.sourceforge.net/; - license = "mBSD"; - platforms = platforms.unix; # arbitrary choice - }; - }; + pyasn1 = callPackage ../development/python-modules/pyasn1 { }; pyasn1-modules = buildPythonPackage rec { name = "pyasn1-modules-${version}"; From 3cdbc9705dd186581a812e362879b798064dfb55 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 23:35:52 +0000 Subject: [PATCH 2274/2806] python.pkgs.pyasn1-modules: 0.0.8 -> 0.1.5 --- .../python-modules/pyasn1-modules/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +---------------- 2 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pyasn1-modules/default.nix diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix new file mode 100644 index 00000000000..a7ee15d6a18 --- /dev/null +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyasn1, isPyPy }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pyasn1-modules"; + version = "0.1.5"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1239h6h67vg0wazg2qgv6m3hdim2gs66pl89lbnayk55bbnkwc0x"; + }; + + propagatedBuildInputs = [ pyasn1 ]; + + meta = with stdenv.lib; { + description = "A collection of ASN.1-based protocols modules"; + homepage = https://pypi.python.org/pypi/pyasn1-modules; + license = licenses.bsd3; + platforms = platforms.unix; # same as pyasn1 + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c549a3bad4a..b9f62a1f34b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15526,25 +15526,7 @@ in { pyasn1 = callPackage ../development/python-modules/pyasn1 { }; - pyasn1-modules = buildPythonPackage rec { - name = "pyasn1-modules-${version}"; - version = "0.0.8"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyasn1-modules/${name}.tar.gz"; - sha256 = "0drqgw81xd3fxdlg89kgd79zzrabvfncvkbybi2wr6w2y4s1jmhh"; - }; - - propagatedBuildInputs = with self; [ pyasn1 ]; - - meta = { - description = "A collection of ASN.1-based protocols modules"; - homepage = https://pypi.python.org/pypi/pyasn1-modules; - license = licenses.bsd3; - platforms = platforms.unix; # same as pyasn1 - }; - }; + pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; pyaudio = buildPythonPackage rec { name = "python-pyaudio-${version}"; From f255de884b147fb6efc2b1ae95493f99d5512d2a Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 23:36:38 +0000 Subject: [PATCH 2275/2806] python.pkgs.ldap3: 1.0.4 -> 2.3 --- .../python-modules/ldap3/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/ldap3/default.nix diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix new file mode 100644 index 00000000000..895272f351d --- /dev/null +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }: + +buildPythonPackage rec { + version = "2.3"; + pname = "ldap3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b36lwil4iflk2ay8gi663abpnfm8id7qg4n3jkmmqbnc1sv6mn0"; + }; + + buildInputs = [ gssapi ]; + + propagatedBuildInputs = [ pyasn1 ]; + + doCheck = false; # requires network + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/ldap3; + description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library"; + license = licenses.lgpl3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9f62a1f34b..f7db34b4f61 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16856,25 +16856,7 @@ in { inherit (pkgs) openldap cyrus_sasl openssl; }; - ldap3 = buildPythonPackage rec { - version = "1.0.4"; - name = "ldap3-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/ldap3/${name}.tar.gz"; - sha256 = "0j4qqj9vq022hy7wfqn8s0j4vm2g6paabbzas1vbyspawvcfai98"; - }; - - buildInputs = with self; [ gssapi ]; - - propagatedBuildInputs = with self; [ pyasn1 ]; - - meta = { - homepage = https://pypi.python.org/pypi/ldap3; - description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library"; - license = licenses.lgpl3; - }; - }; + ldap3 = callPackage ../development/python-modules/ldap3 {}; ptest = buildPythonPackage rec { name = pname + "-" + version; From 0433604f51966bc43ffdbb6d741665a5738c6b7d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 23:38:23 +0000 Subject: [PATCH 2276/2806] mitmproxy: 2.0.2 -> 2017-10-31 --- pkgs/tools/networking/mitmproxy/default.nix | 74 ++++----------------- 1 file changed, 12 insertions(+), 62 deletions(-) diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 7348cd7f116..f96987a1300 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,82 +1,32 @@ { stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }: -let - p = python3.override { - packageOverrides = self: super: { - cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec { - version = "1.8.2"; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "8e88ebac371a388024dab3ccf393bf3c1790d21bc3c299d5a6f9f83fb823beda"; - }; - }); - cryptography_vectors = super.cryptography_vectors.overridePythonAttrs (oldAttrs: rec { - version = self.cryptography.version; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "00daa04c9870345f56605d91d7d4897bc1b16f6fff7c74cb602b08ef16c0fb43"; - }; - }); - pyopenssl = super.pyopenssl.overridePythonAttrs (oldAttrs: rec { - version = "17.0.0"; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1pdg1gpmkzj8yasg6cmkhcivxcdp4c12nif88y4qvsxq5ffzxas8"; - }; - patches = fetchpatch { - url = "https://github.com/pyca/pyopenssl/commit/" - + "a40898b5f1d472f9449a344f703fa7f90cddc21d.patch"; - sha256 = "0bdfrhfvdfxhfknn46s4db23i3hww6ami2r1l5rfrri0pn8b8mh7"; - }; - }); - }; - }; -in p.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { baseName = "mitmproxy"; - name = "${baseName}-${version}"; - version = "2.0.2"; + name = "${baseName}-unstable-2017-10-31"; src = fetchFromGitHub { owner = baseName; repo = baseName; - rev = "v${version}"; - sha256 = "1x1a28al5clpfd69rjcpw26gjjnpsm1vfl4scrwpdd1jhkw044h9"; + rev = "80a8eaa708ea31dd9c5e7e1ab6b02c69079039c0"; + sha256 = "0rvwm11yryzlp3c1i42rk2iv1m38yn6r83k41jb51hwg6wzbwzvw"; }; - patches = [ - # fix tests - (fetchpatch { - url = "https://github.com/mitmproxy/mitmproxy/commit/b3525570929ba47c10d9d08696876c39487f7000.patch"; - sha256 = "111fld5gqdii7rs1jhqaqrxgbyhfn6qd0y7l15k4npamsnvdnv20"; - }) - # bump pyOpenSSL - (fetchpatch { - url = https://github.com/mitmproxy/mitmproxy/commit/6af72160bf98b58682b8f9fc5aabf51928d2b1d3.patch; - sha256 = "1q4ml81pq9c8j9iscq8janbxf4s37w3bqskbs6r30yqzy63v54f2"; - }) - # https://github.com/mitmproxy/mitmproxy/commit/3d7cde058b7e6242d93b9bc9d3e17520ffb578a5 - ./tornado-4.6.patch - ]; - checkPhase = '' export HOME=$(mktemp -d) # test_echo resolves hostnames - LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo' + LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs ' ''; - propagatedBuildInputs = with p.pkgs; [ - blinker click certifi construct cryptography - cssutils editorconfig h2 html2text hyperframe - jsbeautifier kaitaistruct passlib pyasn1 pyopenssl + propagatedBuildInputs = with python3.pkgs; [ + blinker click certifi cryptography + h2 hyperframe + kaitaistruct passlib pyasn1 pyopenssl pyparsing pyperclip requests ruamel_yaml tornado - urwid watchdog brotlipy sortedcontainers + urwid brotlipy sortedcontainers ldap3 ]; - buildInputs = with p.pkgs; [ - beautifulsoup4 flask pytz pytest pytestrunner protobuf glibcLocales + buildInputs = with python3.pkgs; [ + beautifulsoup4 flask pytest pytestrunner glibcLocales ]; meta = with stdenv.lib; { From 449a0531524dfffd3f8f387c651ae19235b14f5b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 2 Nov 2017 19:53:57 -0400 Subject: [PATCH 2277/2806] linux-copperhead: 4.13.10.a -> 4.13.11.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 6ab59a497b6..47ef31bd20a 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.13.10"; + version = "4.13.11"; revision = "a"; - sha256 = "0m4yxdcll1zvvvagpjf9s7vw7dmad22qbakhc50as3ixyd7w5ah6"; + sha256 = "1nby5iii1k0vjvs1s2qvlszln2p9sza9ivbjjdhrmvpp1shzwcvx"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From febacc5de6bdc4a35728598879acf3c3a8577d82 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 3 Nov 2017 01:50:00 +0100 Subject: [PATCH 2278/2806] grafana: 4.6.0 -> 4.6.1 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index f6a4860380b..c186fc2835f 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.6.0"; + version = "4.6.1"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0z3981xnx97d1gn6w31kc066kyqksacdjmxbbrsczwn7mprkv6ij"; + sha256 = "1l606dbx3rfbqbr30iirsc2lkzqa2kc6160g2sn0205mdz8b31zj"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "14sk3rb29aa8qfskb1x9lmisn038a7v0rz5jr6x0m21rzc11ripa"; + sha256 = "04756ry3b8fyk91lzacsixha6l4q1g532krxz759d17sfrnbaz2q"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From c1de18ea236994120b5ab3c3700099f8dbe0d221 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 3 Nov 2017 00:44:23 +0000 Subject: [PATCH 2279/2806] vigra: enable parallel building (this rebuilds libreoffice) --- pkgs/development/libraries/vigra/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 2910e8b7dbb..324d977c72e 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -24,6 +24,8 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (stdenv.system == "x86_64-linux") [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; homepage = http://hci.iwr.uni-heidelberg.de/vigra; From b2d6c638105d2178c41e5f5c94e3739e844d0e91 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Thu, 2 Nov 2017 23:24:43 -0400 Subject: [PATCH 2280/2806] geckodriver: init at 0.19.1 --- .../development/tools/geckodriver/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/geckodriver/default.nix diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix new file mode 100644 index 00000000000..8f6e0dde589 --- /dev/null +++ b/pkgs/development/tools/geckodriver/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchurl +, rustPlatform +}: + +with rustPlatform; + +buildRustPackage rec { + version = "0.19.1"; + name = "geckodriver-${version}"; + + src = fetchurl { + url = "https://github.com/mozilla/geckodriver/archive/v${version}.tar.gz"; + sha256 = "04zpv4aiwbig466yj24hhazl5hrapkyvwlhvg0za5599ykzdv47m"; + }; + + cargoSha256 = "1cny8caqcd9p98hra1k7y4d3lb8sxsyaplr0svbwam0d2qc1c257"; + + meta = with lib; { + description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; + homepage = https://github.com/mozilla/geckodriver; + license = licenses.mpl20; + maintainers = with maintainers; [ jraygauthier ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fd266caa5f..60590058678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1074,6 +1074,8 @@ with pkgs; go-dependency-manager = callPackage ../development/tools/gdm { }; + geckodriver = callPackage ../development/tools/geckodriver { }; + geekbench = callPackage ../tools/misc/geekbench { }; gencfsm = callPackage ../tools/security/gencfsm { }; From f07ae8902d09b8ebaf7d3c4d15081dc9edf2550d Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Thu, 2 Nov 2017 23:26:49 -0400 Subject: [PATCH 2281/2806] pythonV.V-selenium: from 2.52.0 to 3.6.0 --- .../python-modules/selenium/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +----------- 2 files changed, 51 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/selenium/default.nix diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix new file mode 100644 index 00000000000..d33e86a3f07 --- /dev/null +++ b/pkgs/development/python-modules/selenium/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, buildPythonPackage +, geckodriver +, xorg +}: + +buildPythonPackage rec { + name = "selenium-3.6.0"; + src = fetchurl { + url = "mirror://pypi/s/selenium/${name}.tar.gz"; + sha256 = "15qpvz0bdwjvpcj11fm0rw6r5inr66sqw89ww50l025sbhf04qwm"; + }; + + buildInputs = [xorg.libX11]; + + propagatedBuildInputs = [ + geckodriver + ]; + + # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some + # absolute paths. Replaced by relative path so it is found when used in nix. + x_ignore_nofocus = + fetchFromGitHub { + owner = "SeleniumHQ"; + repo = "selenium"; + rev = "selenium-3.6.0"; + sha256 = "13wf4hx4i7nhl4s8xkziwxl0km1j873syrj4amragj6mpip2wn8v"; + }; + + patchPhase = '' + cp "${x_ignore_nofocus}/cpp/linux-specific/"* . + substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6" + gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o + gcc -shared \ + -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ + -o x_ignore_nofocus.so \ + x_ignore_nofocus.o + cp -v x_ignore_nofocus.so selenium/webdriver/firefox/${if stdenv.is64bit then "amd64" else "x86"}/ + ''; + + meta = with lib; { + description = "The selenium package is used to automate web browser interaction from Python"; + homepage = http://www.seleniumhq.org; + license = licenses.asl20; + maintainers = with maintainers; [ jraygauthier ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60d5f9577e4..5313b19b8eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18615,36 +18615,7 @@ in { seaborn = callPackage ../development/python-modules/seaborn { }; - selenium = buildPythonPackage rec { - name = "selenium-2.52.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/selenium/${name}.tar.gz"; - sha256 = "0971rd9b8kb97xp9fvrwzvxr8vqfdjc020cs75n787ya82km01c2"; - }; - - buildInputs = with self; [pkgs.xorg.libX11]; - - # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some - # absolute paths. Replaced by relative path so it is found when used in nix. - x_ignore_nofocus = - pkgs.fetchFromGitHub { - owner = "SeleniumHQ"; - repo = "selenium"; - rev = "selenium-2.52.0"; - sha256 = "1n58akim9np2jy22jfgichq1ckvm8gglqi2hn3syphh0jjqq6cfx"; - }; - - patchPhase = '' - cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11.out}/lib/libX11.so.6" - gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o - gcc -shared \ - -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ - -o x_ignore_nofocus.so \ - x_ignore_nofocus.o - cp -v x_ignore_nofocus.so py/selenium/webdriver/firefox/${if pkgs.stdenv.is64bit then "amd64" else "x86"}/ - ''; - }; + selenium = callPackage ../development/python-modules/selenium { }; serpy = callPackage ../development/python-modules/serpy { }; From 78ed9da5e4d9c4cd3451d10195f816eb0c0983d8 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 3 Nov 2017 04:14:22 +0000 Subject: [PATCH 2282/2806] mkPythonDerivation: let name default to ${pname}-${version} --- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index bc586e0b3ce..098ab0b1719 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -8,7 +8,7 @@ , ensureNewerSourcesHook }: -{ name +{ name ? "${attrs.pname}-${attrs.version}" # by default prefix `name` e.g. "python3.3-${name}" , namePrefix ? python.libPrefix + "-" From e82dc084d4d1c663c024fcc3c629d850c9cb5c3e Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 3 Nov 2017 16:02:41 +1030 Subject: [PATCH 2283/2806] lame: prevent build failure from using outdated symbol list Before this change, trying to build LAME on Darwin would throw an error: Undefined symbols for architecture x86_64: "_lame_init_old", referenced from: -exported_symbol[s_list] command line option ld: symbol(s) not found for architecture x86_64 clang-4.0: error: linker command failed with exit code 1 (use -v to see invocation) --- pkgs/development/libraries/lame/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 8ad7cb95a5d..2f713cb5977 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -55,6 +55,12 @@ stdenv.mkDerivation rec { (if debugSupport then "--enable-debug=alot" else "") ]; + preConfigure = '' + # Prevent a build failure for 3.100 due to using outdated symbol list + # https://hydrogenaud.io/index.php/topic,114777.msg946373.html#msg946373 + sed -i '/lame_init_old/d' include/libmp3lame.sym + ''; + meta = { description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = http://lame.sourceforge.net; From 1774cc04cb9293812572503e6017758aea033147 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 3 Nov 2017 09:06:41 +0100 Subject: [PATCH 2284/2806] snapraid: fix release checksum --- pkgs/tools/filesystems/snapraid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index c9f605ca69f..597be1b0f42 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - sha256 = "13v0gz22ng09gs87f7900z2sk2hg5543njl32rfn4cxxp0jncs3r"; + sha256 = "1vgyiagn6qvyyz4jkf8pzlg0w9apb6mzza97a9x03p82fav2afx0"; }; doCheck = true; From 2e6daff704922ff447eaff19cb721635fd3f27a7 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 3 Nov 2017 08:36:11 +0000 Subject: [PATCH 2285/2806] nixos/unbound: correct indented interface/access lists --- nixos/modules/services/networking/unbound.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index bcce4accdd6..545ee327d59 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -8,9 +8,9 @@ let stateDir = "/var/lib/unbound"; - access = concatMapStrings (x: " access-control: ${x} allow\n") cfg.allowedAccess; + access = concatMapStringsSep "\n " (x: "access-control: ${x} allow") cfg.allowedAccess; - interfaces = concatMapStrings (x: " interface: ${x}\n") cfg.interfaces; + interfaces = concatMapStringsSep "\n " (x: "interface: ${x}") cfg.interfaces; isLocalAddress = x: substring 0 3 x == "::1" || substring 0 9 x == "127.0.0.1"; From 5f86f5d5b185329d7d859c81b3c809f365706e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 3 Nov 2017 10:57:15 +0100 Subject: [PATCH 2286/2806] knot-dns: maintenance 2.6.0 -> 2.6.1 https://lists.nic.cz/pipermail/knot-dns-users/2017-November/001241.html --- pkgs/servers/dns/knot-dns/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 81d6d54df69..9207ceb12f1 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn , systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty -, fetchpatch }: let inherit (stdenv.lib) optional optionals; in @@ -8,27 +7,13 @@ 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.0"; + version = "2.6.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "68e04961d0bf6ba193cb7ec658b295c4ff6e60b3754d64bcd77ebdcee0f283fd"; + sha256 = "3013d45b4c7484268f3cad078f66f730a5bc9606e6b1061488dd821c1dce41e3"; }; - patches = [ - # remove both for >= 2.6.1 - (fetchpatch { - name = "kdig-tls.patch"; - url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/b72d5cd032795.diff"; - sha256 = "0ig31rp82j49jh8n3s0dcf5abhh35mcp2k2wii7bh0c60ngb29k6"; - }) - (fetchpatch { - name = "kdig-tls-sni.patch"; - url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/2e94ccee671ec70e.diff"; - sha256 = "0psl6650v7g240i8w196v7zxy6j11d0aa6hm11b7vnaimjshgibv"; - }) - ]; - outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; From 4b15ca22488a3f29c4a7d281855df5818b82afd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 3 Nov 2017 10:58:57 +0100 Subject: [PATCH 2287/2806] knot-resolver: 1.4.0 -> 1.5.0 https://lists.nic.cz/pipermail/knot-dns-users/2017-November/001240.html ICANN wants to watch what root trust anchors people use. https://www.icann.org/resources/pages/ksk-rollover --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 44c8b933400..ad5c87de365 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "ac19c121fd687c7e4f5f907b46932d26f8f9d9e01626c4dadb3847e25ea31ceb"; + sha256 = "c032e63a6b922294746e1ab4002860346e7a6d92b8502965a13ba599088fcb42"; }; outputs = [ "out" "dev" ]; From 05f96bf376bc04bb7cc447150b8cb182af84b35b Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 3 Nov 2017 10:25:22 +0000 Subject: [PATCH 2288/2806] weechat: split plugins into separate outputs Also add a wrapper generator that allows adding the plugins back conveniently and corresponding documentation in the package notes section of the nixpkgs manual. --- doc/package-notes.xml | 30 +++ .../networking/irc/weechat/default.nix | 172 +++++++++++------- 2 files changed, 140 insertions(+), 62 deletions(-) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 4d87a3a67fe..184bee089ae 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -664,4 +664,34 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el +
+Weechat + +Weechat can currently be configured to include your choice of plugins. +To make use of this functionality, install an expression that overrides its configuration such as +weechat.override {configure = {availablePlugins, ...}: { + plugins = with availablePlugins; [ python perl ]; + } +} + + +The plugins currently available are python, +perl, ruby, guile, +tcl and lua. + + +The python plugin allows the addition of extra libraries. For instance, +the inotify.py script in weechat-scripts requires +D-Bus or libnotify, and the fish.py script requires +pycrypto. To use these scripts, use the python +plugin's withPackages attribute: +weechat.override {configure = {availablePlugins, ...}: { + plugins = with availablePlugins; [ + (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) + ]; + } +} + + +
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 49cbe29eaf2..1b730af54fe 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,81 +1,129 @@ -{ stdenv, fetchurl, ncurses, openssl, aspell, gnutls -, zlib, curl , pkgconfig, libgcrypt +{ stdenv, fetchurl, fetchpatch, lib +, ncurses, openssl, aspell, gnutls +, zlib, curl, pkgconfig, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv +, writeScriptBin, symlinkJoin # for withPlugins , asciidoctor # manpages , guileSupport ? true, guile , luaSupport ? true, lua5 , perlSupport ? true, perl -, pythonPackages +, pythonSupport ? true, pythonPackages , rubySupport ? true, ruby , tclSupport ? true, tcl -, extraBuildInputs ? [] }: - -assert guileSupport -> guile != null; -assert luaSupport -> lua5 != null; -assert perlSupport -> perl != null; -assert rubySupport -> ruby != null; -assert tclSupport -> tcl != null; +, extraBuildInputs ? [] +, configure ? null +, runCommand }: let inherit (pythonPackages) python pycrypto pync; -in + plugins = [ + { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; } + { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; } + { name = "ruby"; enabled = rubySupport; cmakeFlag = "ENABLE_RUBY"; buildInputs = [ ruby ]; } + { name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; } + { name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; } + { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON"; buildInputs = [ python ]; } + ]; + enabledPlugins = builtins.filter (p: p.enabled) plugins; -stdenv.mkDerivation rec { - version = "1.9.1"; - name = "weechat-${version}"; + weechat = + assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; + stdenv.mkDerivation rec { + version = "1.9.1"; + name = "weechat-${version}"; - src = fetchurl { - url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1"; - }; + src = fetchurl { + url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; + sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1"; + }; - outputs = [ "out" "man" ]; + patches = [ + # TODO: Remove this patch when weechat is updated to a release that + # incorporates weechat/weechat#971 + (fetchpatch { + url = https://github.com/lheckemann/weechat/commit/45a4f0565cc745b9c6e943f20199015185696df0.patch; + sha256 = "0x7vv7g0k3b2hj444x2cinyv1mq5bkr6m18grfnyy6swbymzc9bj"; + }) + ]; - enableParallelBuilding = true; - cmakeFlags = with stdenv.lib; [ - "-DENABLE_MAN=ON" - "-DENABLE_DOC=ON" - ] - ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"] - ++ optional (!guileSupport) "-DENABLE_GUILE=OFF" - ++ optional (!luaSupport) "-DENABLE_LUA=OFF" - ++ optional (!perlSupport) "-DENABLE_PERL=OFF" - ++ optional (!rubySupport) "-DENABLE_RUBY=OFF" - ++ optional (!tclSupport) "-DENABLE_TCL=OFF" - ; + outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; - buildInputs = with stdenv.lib; [ - ncurses python openssl aspell gnutls zlib curl pkgconfig - libgcrypt pycrypto makeWrapper - cmake - asciidoctor + enableParallelBuilding = true; + cmakeFlags = with stdenv.lib; [ + "-DENABLE_MAN=ON" + "-DENABLE_DOC=ON" ] - ++ optionals stdenv.isDarwin [ pync libobjc libresolv ] - ++ optional guileSupport guile - ++ optional luaSupport lua5 - ++ optional perlSupport perl - ++ optional rubySupport ruby - ++ optional tclSupport tcl - ++ extraBuildInputs; + ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"] + ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins + ; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" - # Fix '_res_9_init: undefined symbol' error - + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); + buildInputs = with stdenv.lib; [ + ncurses openssl aspell gnutls zlib curl pkgconfig + libgcrypt makeWrapper cmake asciidoctor + ] + ++ optionals stdenv.isDarwin [ libobjc libresolv ] + ++ concatMap (p: p.buildInputs) enabledPlugins + ++ extraBuildInputs; - postInstall = with stdenv.lib; '' - NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" - wrapProgram "$out/bin/weechat" \ - ${optionalString perlSupport "--prefix PATH : ${perl}/bin"} \ - --prefix PATH : ${pythonPackages.python}/bin \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$NIX_PYTHONPATH" - ''; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" + # Fix '_res_9_init: undefined symbol' error + + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); - meta = { - homepage = http://www.weechat.org/; - description = "A fast, light and extensible chat client"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ]; - platforms = stdenv.lib.platforms.unix; - }; -} + postInstall = with stdenv.lib; '' + for p in ${concatMapStringsSep " " (p: p.name) enabledPlugins}; do + from=$out/lib/weechat/plugins/$p.so + to=''${!p}/lib/weechat/plugins/$p.so + mkdir -p $(dirname $to) + mv $from $to + done + ''; + + meta = { + homepage = http://www.weechat.org/; + description = "A fast, light and extensible chat client"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ]; + platforms = stdenv.lib.platforms.unix; + }; + }; +in if configure == null then weechat else + let + perlInterpreter = perl; + config = configure { + availablePlugins = let + simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";}; + in rec { + python = { + pluginFile = "${weechat.python}/lib/weechat/plugins/python.so"; + withPackages = pkgsFun: (python // { + extraEnv = '' + export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}" + ''; + }); + }; + perl = (simplePlugin "perl") // { + extraEnv = '' + export PATH="${perlInterpreter}/bin:$PATH" + ''; + }; + tcl = simplePlugin "tcl"; + ruby = simplePlugin "ruby"; + guile = simplePlugin "guile"; + lua = simplePlugin "lua"; + }; + }; + + inherit (config) plugins; + + pluginsDir = runCommand "weechat-plugins" {} '' + mkdir -p $out/plugins + for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do + ln -s $plugin $out/plugins + done + ''; + in writeScriptBin "weechat" '' + #!${stdenv.shell} + export WEECHAT_EXTRA_LIBDIR=${pluginsDir} + ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} + exec ${weechat}/bin/weechat "$@" + '' From 208fd871492afcdec456326657fbf9376b5c5704 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 21 Nov 2016 15:15:29 +0100 Subject: [PATCH 2289/2806] wordgrinder: init at 0.6 --- .../office/wordgrinder/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/office/wordgrinder/default.nix diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix new file mode 100644 index 00000000000..67f7e2816a4 --- /dev/null +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper +, lua52Packages, libXft, ncurses, readline, zlib }: + +stdenv.mkDerivation rec { + name = "wordgrinder-${version}"; + version = "0.6-db14181"; + + src = fetchFromGitHub { + repo = "wordgrinder"; + owner = "davidgiven"; + rev = "db141815e8bd1da6e684a1142a59492e516f3041"; + sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2"; + }; + + makeFlags = [ + "PREFIX=$(out)" + "LUA_INCLUDE=${lua52Packages.lua}/include" + "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" + ]; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + buildInputs = [ + libXft + lua52Packages.lua + ncurses + readline + zlib + ]; + + # To be able to find + NIX_CFLAGS_COMPILE = "-I${libXft.dev}/include/X11"; + + # Binaries look for LuaFileSystem library (lfs.so) at runtime + postInstall = '' + wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; + wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; + ''; + + meta = with stdenv.lib; { + description = "Text-based word processor"; + homepage = https://cowlark.com/wordgrinder; + license = licenses.mit; + maintainers = with maintainers; [ matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7383df20c0e..d226f0aa1ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17157,6 +17157,8 @@ with pkgs; wordnet = callPackage ../applications/misc/wordnet { }; + wordgrinder = callPackage ../applications/office/wordgrinder { }; + worker = callPackage ../applications/misc/worker { }; workrave = callPackage ../applications/misc/workrave { From 5d0ece7fd9c24e1e8567a6a0c950bcd3910d9480 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 3 Nov 2017 12:09:25 +0100 Subject: [PATCH 2290/2806] pythonPackages.django: 1.11.6 -> 1.11.7 --- pkgs/development/python-modules/django/1_11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index fb5a62296b9..2fe45b7a1f6 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "1.11.6"; + version = "1.11.7"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "0q0cmwifa6c0k6kh8fpa3mjmqw7yqd616qz8m4ls3h51xyhjrd63"; + sha256 = "16ab3p6jj1da94wkz2b5fb128ycy4826bbsnbabcd3qdaf9f6649"; }; patches = stdenv.lib.optionals withGdal [ From b2093d4611995839962912b85aa6e57ff5f3a13c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 3 Nov 2017 13:11:36 +0200 Subject: [PATCH 2291/2806] linuxPackages.bcc: Fix quoting for older Nix versions Issue #31179. --- pkgs/os-specific/linux/bcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 37c8c6841f6..768c8cedd35 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mv $out/share/bcc/man $out/share/ find $out/share/bcc/tools -type f -executable -print0 | \ - while IFS= read -r -d $'\0' f; do + while IFS= read -r -d ''$'\0' f; do pythonLibs="$out/lib/python2.7/site-packages:${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages" rm -f $out/bin/$(basename $f) makeWrapper $f $out/bin/$(basename $f) \ From d36a83a7840e159afed4f9646bdc912630b1bb41 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 3 Nov 2017 12:31:16 +0100 Subject: [PATCH 2292/2806] bundlerEnv: support unicode executables (#31145) --- pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index 92321d6427d..fe8c43f55ed 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -18,7 +18,8 @@ paths.each do |path| next unless File.directory?("#{path}/nix-support/gem-meta") name = File.read("#{path}/nix-support/gem-meta/name") - executables = File.read("#{path}/nix-support/gem-meta/executables").split + executables = File.read("#{path}/nix-support/gem-meta/executables") + .force_encoding('UTF-8').split executables.each do |exe| File.open("#{out}/bin/#{exe}", "w") do |f| f.write(<<-EOF) From 09ed44c9ebacc86bdbe201440ea9f47c299d9807 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 3 Nov 2017 12:24:52 +0100 Subject: [PATCH 2293/2806] perl-Software-License: 0.103012 -> 0.103013 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 74532d8fd4a..e571b2fa48a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12118,12 +12118,13 @@ let self = _self // overrides; _self = with self; { }; SoftwareLicense = buildPerlPackage rec { - name = "Software-License-0.103012"; + name = "Software-License-0.103013"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "47f9acb7f4eeed35e38c1bec37a71b61e651965233d67dadfae6390571517db1"; + url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + sha256 = "2641d937390f43b08fa31c419713cd96a2f0bf160be04cab322631daf6810ff3"; }; - propagatedBuildInputs = [ DataSection TextTemplate TryTiny ]; + buildInputs = [ TryTiny ]; + propagatedBuildInputs = [ DataSection TextTemplate ]; meta = { homepage = https://github.com/rjbs/Software-License; description = "Packages that provide templated software licenses"; From 6fb9706a1cd4804791a691b0525a88ea525f6f06 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 3 Nov 2017 12:25:23 +0100 Subject: [PATCH 2294/2806] perl-CGI: 4.36 -> 4.37 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e571b2fa48a..13cc777cf95 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1641,12 +1641,12 @@ let self = _self // overrides; _self = with self; { }; CGI = buildPerlPackage rec { - name = "CGI-4.36"; + name = "CGI-4.37"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz"; - sha256 = "142la7jagpni5z7m4s9h9v5vpg0pisc3y3z8kdzqc7j6yba89zpy"; + sha256 = "7a14eee5df640f7141848f653cf48d99bfc9b5c68e18167338ee01b91cdfb883"; }; - buildInputs = [ TestDeep TestWarn ]; + buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser self."if" ]; meta = { homepage = https://metacpan.org/module/CGI; From 10169cc3565ea76402b2ba8535d65bb5f349ddbb Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Fri, 3 Nov 2017 15:48:31 +0300 Subject: [PATCH 2295/2806] yarn: 1.2.1 -> 1.3.2 --- pkgs/development/tools/yarn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 0e66727ab1d..72b0fe2adaf 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.2.1"; + version = "1.3.2"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0jsaszykgmli503jgwdk79qks44krjgjr0qmizh3y7z4lplqdjip"; + sha256 = "0lyh24ais8xqfmzbb4sszd2002xl6qbsg9sdjnpwh6aysrwp56r8"; }; buildInputs = [makeWrapper nodejs]; From d83cfdc77ff4e5922632fa071cf3c22d1e0f3c71 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 3 Nov 2017 13:04:47 +0000 Subject: [PATCH 2296/2806] kafkacat: fix sandboxed build --- pkgs/development/tools/kafkacat/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index 0d5c6e83c01..3a1c4225bff 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ zlib rdkafka yajl ]; + preConfigure = '' + patchShebangs ./configure + ''; + meta = with stdenv.lib; { description = "A generic non-JVM producer and consumer for Apache Kafka"; homepage = https://github.com/edenhill/kafkacat; From 8ee4a3648ff1464c8027bcb893bc867a507ab26b Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 3 Nov 2017 14:25:01 +0100 Subject: [PATCH 2297/2806] xarchiver: 0.5.4.7 -> 0.5.4.12 - Fix github url - Add libxslt dependency - Gtk2 -> Gtk3 --- pkgs/tools/archivers/xarchiver/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index a257ece4877..1c8d8367793 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, gtk2, pkgconfig, intltool }: +{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }: stdenv.mkDerivation rec { - version = "0.5.4.7"; + version = "0.5.4.12"; name = "xarchiver-${version}"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; - rev = "${name}"; - sha256 = "0w9lx8d8r50j48qfhn2r0dlcnwy3pjyy6xjvgpr0qagy5l1q1qj4"; + rev = "${version}"; + sha256 = "13d8slcx3frz0dhl1w4llj7001n57cjjb8r7dlaw5qacaas3xfwi"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 intltool ]; + buildInputs = [ gtk3 intltool libxslt ]; meta = { description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; From 1f379ed3a7d5dd79e8e9a8e7f762f59f1499cb63 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 3 Nov 2017 14:06:23 +0000 Subject: [PATCH 2298/2806] snes9x-gtk: fix build --- pkgs/misc/emulators/snes9x-gtk/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index f2d3abc0de3..6be60526eb6 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; - sourceRoot = "snes9x-${version}-src"; preAutoreconf = "cd gtk; intltoolize"; buildInputs = [ SDL zlib gtk2 libxml2 libXv ]; From 74260a4922e678348eac91f4aa5767a3f5a039a4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 2 Nov 2017 19:15:47 +0100 Subject: [PATCH 2299/2806] vim: 8.0.1150 -> 8.0.1245 This update contains a lot of fixes that are too much to be summarized here, so here is the upstream changelog (basically "git log"): https://github.com/vim/vim/commits/v8.0.1250 The main reason for this bump is that I got annoyed by a bug that was fixed in upstream version 8.0.1194, which caused a race condition during vim startup when it's trying to retrieve background colors from the terminal. Sometimes it could happen that random commands are executed at Vim startup (typically pasting the "" buffer) and after bisecting I've found out that version 8.0.1194 indeed fixed this problem. The reason why I'm updating to version 8.0.1250 is that when looking through the Git log it contains a whole lot of fixes but no new features, so I'd assume it's safe to upgrade. I've tested all packages that depend on Vim and they still succeed building. In addition to that I've used the new version for a couple of hours without any issue. Signed-off-by: aszlig Cc: @lovek323, @LnL7, @vaibhavsagar --- 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 18e1df4575d..1b1751e9b1d 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.1150"; + version = "8.0.1245"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1k1qkmb2jbymqikrp99q1yjagdf508xzabrw7b08dlh926b2v23j"; + sha256 = "10nh8b2jgfbq4xvha0d2qashvdyqzvq96w8k6rl6793d8y7f3z8s"; }; enableParallelBuilding = true; From 16c69270ae96fadd6a1f39f3ef91fdc535ea03bd Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 3 Nov 2017 14:36:15 +0000 Subject: [PATCH 2300/2806] reaverwps-t6x: fix build --- pkgs/tools/networking/reaver-wps-t6x/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index 6e4a5561f07..2f0e19b231c 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap sqlite pixiewps ]; - sourceRoot = "reaver-wps-fork-t6x-v${version}-src/src"; + setSourceRoot = '' + sourceRoot=$(echo */src) + ''; configureFlags = "--sysconfdir=${confdir}"; From cc95949080a1a3ef8c1488db28bb1b28939f7c7e Mon Sep 17 00:00:00 2001 From: Yellow Ghost Date: Fri, 3 Nov 2017 15:38:33 +0100 Subject: [PATCH 2301/2806] abiword: 3.0.1 -> 3.0.2 --- pkgs/applications/office/abiword/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 18ece7a7401..ca7847430d6 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -5,15 +5,19 @@ stdenv.mkDerivation rec { name = "abiword-${version}"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "http://www.abisource.org/downloads/abiword/${version}/source/${name}.tar.gz"; - sha256 = "1ik591rx15nn3n1297cwykl8wvrlgj78i528id9wbidgy3xzd570"; + url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz"; + sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg"; }; enableParallelBuilding = true; + patches = [ + (fetchurl { url = https://gist.githubusercontent.com/ylwghst/f65fef2a751e81af57e2d64d40128247/raw/; sha256 = "1ni2sc7jhqafwkkjdwchdx56fv7rp91grxblravp2kymrf9j1add"; }) + ]; + buildInputs = [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme @@ -29,6 +33,6 @@ stdenv.mkDerivation rec { homepage = http://www.abisource.com/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub ylwghst ]; }; } From 5a539f5eb55bf35cea6ea39acd74ff89fa96459f Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 3 Nov 2017 14:43:11 +0000 Subject: [PATCH 2302/2806] curl-unix-socket: fix build --- pkgs/tools/networking/curl-unix-socket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index 985cb0c3015..d145e1e12c3 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; buildInputs = [ go ]; - buildPhase = "go build"; - installPhase = "install -D curl-unix-socket* $out/bin/curl-unix-socket"; + buildPhase = "go build -o curl-unix-socket"; + installPhase = "install -D curl-unix-socket $out/bin/curl-unix-socket"; meta = with stdenv.lib; { description = "Run HTTP requests over UNIX socket"; From c67a6482a3b717e6091b9b8f1d93367d97693d65 Mon Sep 17 00:00:00 2001 From: Jonathan Curran Date: Fri, 3 Nov 2017 09:23:01 -0600 Subject: [PATCH 2303/2806] Fix nix-shell command example in python docs The nix-shell command here is incorrect AFAICT. `-i` is supposed to specify the interpreter and `-p` specifies the packages. --- doc/languages-frameworks/python.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 7bdbbbd903a..0ff7c4ba77e 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -165,7 +165,7 @@ run the script in the `python3` shell. ```py #! /usr/bin/env nix-shell -#! nix-shell -i 'python3.withPackages(ps: [ps.numpy])' +#! nix-shell -i python3 -p 'python3.withPackages(ps: [ps.numpy])' import numpy From 100583c7c8ce05515d41d4495f38211e24dbb38f Mon Sep 17 00:00:00 2001 From: Yellow Ghost Date: Fri, 3 Nov 2017 17:45:23 +0100 Subject: [PATCH 2304/2806] abiword: 3.0.1 -> 3.0.2 --- pkgs/applications/office/abiword/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index ca7847430d6..6483702e822 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ - (fetchurl { url = https://gist.githubusercontent.com/ylwghst/f65fef2a751e81af57e2d64d40128247/raw/; sha256 = "1ni2sc7jhqafwkkjdwchdx56fv7rp91grxblravp2kymrf9j1add"; }) + (fetchurl { url = https://gist.github.com/ylwghst/b28ef051980f41aca56df7a8affd9526/raw/; sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al"; }) ]; buildInputs = From 5c4352fa2df3eac3f3e99cedc0ce8b478c28855e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 3 Nov 2017 18:49:15 +0100 Subject: [PATCH 2305/2806] Python docs: fix quotes PR #31197 --- doc/languages-frameworks/python.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 0ff7c4ba77e..cf81b240cea 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -165,7 +165,7 @@ run the script in the `python3` shell. ```py #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p 'python3.withPackages(ps: [ps.numpy])' +#! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])" import numpy From 194d7852f70bfeb73dd598cf98ebf6e90f019f39 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 3 Nov 2017 21:00:46 +0300 Subject: [PATCH 2306/2806] sway module: setcap binary, not wrapper --- nixos/modules/programs/sway.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index 2934fba96dd..9070722c770 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -10,7 +10,7 @@ let #! ${pkgs.stdenv.shell} ${cfg.extraSessionCommands} PATH="${sway}/bin:$PATH" - exec ${pkgs.dbus.dbus-launch} --exit-with-session "${sway}/bin/sway" + exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap ''; swayJoined = pkgs.symlinkJoin { name = "sway-wrapped"; @@ -53,7 +53,8 @@ in config = mkIf cfg.enable { environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages; security.wrappers.sway = { - source = "${swayJoined}/bin/sway"; + program = "sway-setcap"; + source = "${sway}/bin/sway"; capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip"; owner = "root"; group = "sway"; From a9a26d98d0172e53af71d9fc9b6ee59eb772cec0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Nov 2017 14:26:26 -0400 Subject: [PATCH 2307/2806] hipchat: 4.29.4.1662 -> 4.30.0.1663 --- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 326f9563070..4e116e685c6 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.29.4.1662"; + version = "4.30.0.1663"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "1cz9zv9aj8xdrjs6dgi7fpm4q9l9find4m8l0nmvac2s4r60vw6y"; + sha256 = "13mh49nx75pvaygzi70sg96iad3mn9ym0p4p3ja46amkxbdkq7h7"; } else throw "HipChat is not supported on ${stdenv.system}"; From 600f393bc7e9c55394dea6edba98397342aa5e2f Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 3 Nov 2017 14:41:06 -0400 Subject: [PATCH 2308/2806] keybase service: Turn off debug logging Keybase is _extremely_ verbose with its debug output when run with -d. --- nixos/modules/services/networking/keybase.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix index 7c7982ee8ea..a149f16a84c 100644 --- a/nixos/modules/services/networking/keybase.nix +++ b/nixos/modules/services/networking/keybase.nix @@ -28,7 +28,7 @@ in { description = "Keybase service"; serviceConfig = { ExecStart = '' - ${pkgs.keybase}/bin/keybase -d service --auto-forked + ${pkgs.keybase}/bin/keybase service --auto-forked ''; Restart = "on-failure"; PrivateTmp = true; From 525380b472697bd6488200f6757bafe4731ababc Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Fri, 27 Oct 2017 01:44:19 +0200 Subject: [PATCH 2309/2806] treewide: abandon Google Code homepages --- pkgs/applications/misc/quicksynergy/default.nix | 2 +- .../applications/networking/browsers/arora/default.nix | 4 ++-- .../applications/version-management/gource/default.nix | 2 +- pkgs/applications/window-managers/wmii-hg/default.nix | 2 +- pkgs/development/compilers/gwt/2.4.0.nix | 7 ++++--- pkgs/development/compilers/teyjus/default.nix | 4 ++-- pkgs/development/libraries/bullet/default.nix | 2 +- pkgs/development/libraries/garmintools/default.nix | 4 ++-- pkgs/development/libraries/glog/default.nix | 4 ++-- pkgs/development/libraries/gperftools/default.nix | 2 +- pkgs/development/libraries/gtest/default.nix | 2 +- .../development/libraries/java/junixsocket/default.nix | 4 ++-- pkgs/development/libraries/leveldb/default.nix | 2 +- pkgs/development/libraries/libcredis/default.nix | 4 ++-- pkgs/development/libraries/libctemplate/default.nix | 4 ++-- pkgs/development/libraries/libdivsufsort/default.nix | 6 +++--- pkgs/development/libraries/libdnet/default.nix | 6 +++--- pkgs/development/libraries/libfreefare/default.nix | 6 +++--- pkgs/development/libraries/libhangul/default.nix | 4 ++-- pkgs/development/libraries/libixp-hg/default.nix | 2 +- pkgs/development/libraries/libkate/default.nix | 4 ++-- pkgs/development/libraries/libnfc/default.nix | 2 +- pkgs/development/libraries/libofa/default.nix | 4 ++-- pkgs/development/libraries/libtiger/default.nix | 4 ++-- pkgs/development/libraries/marisa/default.nix | 2 +- pkgs/development/libraries/mdds/0.12.1.nix | 2 +- pkgs/development/libraries/mdds/0.7.1.nix | 4 ++-- pkgs/development/libraries/mp4v2/default.nix | 3 ++- pkgs/development/libraries/npapi-sdk/default.nix | 2 +- pkgs/development/libraries/ogrepaged/default.nix | 2 +- .../libraries/qtscriptgenerator/default.nix | 6 +++--- pkgs/development/libraries/snappy/default.nix | 4 ++-- pkgs/development/libraries/sparsehash/default.nix | 2 +- pkgs/development/ocaml-modules/bitstring/default.nix | 2 +- pkgs/development/tools/misc/gtkdialog/default.nix | 5 +++-- pkgs/development/tools/misc/stm32flash/default.nix | 4 ++-- pkgs/development/tools/selenium/server/default.nix | 2 +- pkgs/misc/emulators/wine/winetricks.nix | 2 +- pkgs/os-specific/linux/ftop/default.nix | 4 ++-- pkgs/os-specific/linux/i7z/default.nix | 4 ++-- pkgs/os-specific/linux/jujuutils/default.nix | 4 ++-- pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 2 +- pkgs/servers/kippo/default.nix | 10 +++++----- pkgs/servers/shellinabox/default.nix | 2 +- pkgs/tools/compression/lz4/default.nix | 2 +- pkgs/tools/filesystems/mtpfs/default.nix | 2 +- pkgs/tools/filesystems/s3backer/default.nix | 2 +- pkgs/tools/graphics/logstalgia/default.nix | 2 +- .../inputmethods/fcitx-engines/fcitx-mozc/default.nix | 6 +++--- .../inputmethods/ibus-engines/ibus-mozc/default.nix | 2 +- pkgs/tools/inputmethods/nabi/default.nix | 4 ++-- pkgs/tools/inputmethods/touchegg/default.nix | 4 ++-- pkgs/tools/inputmethods/uim/default.nix | 4 ++-- pkgs/tools/networking/pdsh/default.nix | 4 ++-- pkgs/tools/networking/reaver-wps/default.nix | 2 +- pkgs/tools/networking/slimrat/default.nix | 5 +++-- pkgs/tools/networking/udptunnel/default.nix | 6 +++--- pkgs/tools/package-management/opkg/default.nix | 2 +- pkgs/tools/security/mfcuk/default.nix | 4 ++-- pkgs/tools/security/mfoc/default.nix | 4 ++-- pkgs/tools/security/omapd/default.nix | 4 ++-- pkgs/tools/security/tmin/default.nix | 8 ++++++-- pkgs/tools/security/tor/torsocks.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 65 files changed, 118 insertions(+), 110 deletions(-) diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index f7722053401..b2616bf7b77 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Remember to open port 24800 (used by synergys program) if you want to host mouse and keyboard."; - homepage = https://code.google.com/p/quicksynergy/; + homepage = https://sourceforge.net/projects/quicksynergy/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.spinus ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix index 8bcefe4fe7b..da042c77c40 100644 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ b/pkgs/applications/networking/browsers/arora/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.11.0"; src = fetchurl { - url = "http://arora.googlecode.com/files/${name}.tar.gz"; + url = "https://github.com/Arora/arora/archive/${version}.tar.gz"; sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg"; }; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { platforms = qt4.meta.platforms; maintainers = [ maintainers.phreedom ]; description = "A cross-platform Qt4 Webkit browser"; - homepage = http://arora.googlecode.com; + homepage = https://github.com/Arora/arora; }; } diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index d0bea6d426d..25a85f4b92d 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "-std=c++11"; # fix build with glm >= 0.9.6.0 meta = with stdenv.lib; { - homepage = http://code.google.com/p/gource/; + homepage = http://gource.io/; description = "A Software version control visualization tool"; license = licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 88c312bd265..5a8b68df364 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { makeFlags = "WMII_HGVERSION=hg${rev}"; meta = { - homepage = https://code.google.com/archive/p/wmii/; + homepage = https://suckless.org/; # https://wmii.suckless.org/ does not exist anymore description = "A small window manager controlled by a 9P filesystem"; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 4705c327b42..f15e1060203 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "gwt-java-2.4.0"; src = fetchurl { - url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; - sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-web-toolkit/gwt-2.4.0.zip"; + sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17"; }; buildInputs = [ unzip ]; @@ -17,8 +17,9 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/webtoolkit/; + homepage = http://www.gwtproject.org/; description = "A development toolkit for building and optimizing complex browser-based applications"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 301915b7a26..222a22bf1cd 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "teyjus-2.0b2"; src = fetchurl { - url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/teyjus/teyjus-source-2.0-b2.tar.gz"; sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An efficient implementation of the Lambda Prolog language"; - homepage = https://code.google.com/p/teyjus/; + homepage = https://github.com/teyjus/teyjus; license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.bcdarwin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 0c9f0903f14..e7b50090537 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Bullet 3D Game Multiphysics Library provides state of the art collision detection, soft body and rigid body dynamics. ''; - homepage = http://code.google.com/p/bullet/; + homepage = http://bulletphysics.org; license = stdenv.lib.licenses.zlib; maintainers = with stdenv.lib.maintainers; [ aforemny ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix index f1df8c5ff7f..c1f9c6ad013 100644 --- a/pkgs/development/libraries/garmintools/default.nix +++ b/pkgs/development/libraries/garmintools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { name = "garmintools-0.10"; src = fetchurl { - url = https://garmintools.googlecode.com/files/garmintools-0.10.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz"; sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz"; }; buildInputs = [ libusb ]; meta = { - homepage = https://code.google.com/p/garmintools; + homepage = https://code.google.com/archive/p/garmintools/; # community clone at https://github.com/ianmartin/garmintools license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ocharles ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index c663c4e68a7..10ef1bbd920 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "glog-${version}"; version = "0.3.4"; - + src = fetchFromGitHub { owner = "Google"; repo = "glog"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = http://code.google.com/p/google-glog/; + homepage = https://github.com/google/glog; license = licenses.bsd3; description = "Library for application-level logging"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index e6d1fd3b640..5c863cf26cb 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://code.google.com/p/gperftools/; + homepage = https://github.com/gperftools/gperftools; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; license = licenses.bsd3; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 84b1fa9757c..f5fc635a5a4 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; - homepage = https://code.google.com/p/googletest/; + homepage = https://github.com/google/googletest; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ zoomulator ivan-tkatchev ]; diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index 317ba601cfb..bc34957b9c3 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "junixsocket-1.3"; src = fetchurl { - url = "http://junixsocket.googlecode.com/files/${name}-src.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/junixsocket/${name}-src.tar.bz2"; sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A Java/JNI library for using Unix Domain Sockets from Java"; - homepage = https://code.google.com/p/junixsocket/; + homepage = https://github.com/kohlschutter/junixsocket; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 0057611ed0f..2a109e0366f 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "; meta = with stdenv.lib; { - homepage = https://code.google.com/p/leveldb/; + homepage = https://github.com/google/leveldb; description = "Fast and lightweight key/value database library by Google"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index 036c918b32d..10a4c276ebd 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libcredis-0.2.3"; src = fetchurl { - url = "https://credis.googlecode.com/files/credis-0.2.3.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/credis/credis-0.2.3.tar.gz"; sha256 = "1l3hlw9rrc11qggbg9a2303p3bhxxx2vqkmlk8avsrbqw15r1ayr"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C client library for Redis (key-value database)"; - homepage = https://code.google.com/p/credis/; + homepage = https://code.google.com/archive/p/credis/; license = licenses.bsd3; # from homepage platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index cdaeb4969ae..94dc733a69b 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { emphasizes separating logic from presentation: it is impossible to embed application logic in this template language. ''; - homepage = http://code.google.com/p/google-ctemplate/; - license = "bsd"; + homepage = https://github.com/OlafvdSpek/ctemplate; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index d171f57eb1b..01ac56e885d 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation { name = "libdivsufsort-2.0.1"; - + src = fetchurl { - url = http://libdivsufsort.googlecode.com/files/libdivsufsort-2.0.1.tar.bz2; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-2.0.1.tar.bz2"; sha256 = "1g0q40vb2k689bpasa914yi8sjsmih04017mw20zaqqpxa32rh2m"; }; meta = { - homepage = http://code.google.com/p/libdivsufsort/; + homepage = https://github.com/y-256/libdivsufsort; license = stdenv.lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index dbda4107c48..46e264b59ca 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = http://libdnet.googlecode.com/files/libdnet-1.12.tgz; - sha1 = "71302be302e84fc19b559e811951b5d600d976f8"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdnet/libdnet-1.12.tgz"; + sha256 = "09mhbr8x66ykhf5581a5zjpplpjxibqzgkkpx689kybwg0wk1cw3"; }; buildInputs = [ automake autoconf libtool ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Provides a simplified, portable interface to several low-level networking routines"; - homepage = http://code.google.com/p/libdnet/; + homepage = https://github.com/dugsong/libdnet; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 2e8fad3db82..cfae74b4b9e 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.4.0"; src = fetchurl { - url = "https://libfreefare.googlecode.com/files/libfreefare-0.4.0.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libfreefare/libfreefare-0.4.0.tar.bz2"; sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; }; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations"; - license = licenses.gpl3; - homepage = http://code.google.com/p/libfreefare/; + license = licenses.lgpl3; + homepage = https://github.com/nfc-tools/libfreefare; maintainers = with maintainers; [bobvanderlinden]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix index 79fc973731a..9e72d933433 100644 --- a/pkgs/development/libraries/libhangul/default.nix +++ b/pkgs/development/libraries/libhangul/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "libhangul-0.1.0"; src = fetchurl { - url = "https://libhangul.googlecode.com/files/libhangul-0.1.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-0.1.0.tar.gz"; sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; }; meta = with stdenv.lib; { description = "Core algorithm library for Korean input routines"; - homepage = https://code.google.com/p/libhangul; + homepage = https://github.com/choehwanjin/libhangul; license = licenses.lgpl21; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index 6245a810c1d..68835c1414c 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip txt2tags ]; meta = { - homepage = https://code.google.com/archive/p/libixp/; + homepage = http://repo.cat-v.org/libixp/; # see also https://libs.suckless.org/deprecated/libixp description = "Portable, simple C-language 9P client and server libary"; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 7a3eb9caa66..77f047b4c58 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libkate-0.3.8"; src = fetchurl { - url = "http://libkate.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${name}.tar.gz"; sha256 = "00d6561g31la9bb8q99b7l4rvi67yiwm50ky8dhlsjd88h7rks2n"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { bitstream format. Kate is a karaoke and text codec meant for encapsulation in an Ogg container. It can carry Unicode text, images, and animate them.''; - homepage = http://code.google.com/p/libkate; + homepage = https://code.google.com/archive/p/libkate/; maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 150ece2a627..bef977caa28 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source library libnfc for Near Field Communication"; license = licenses.gpl3; - homepage = http://code.google.com/p/libnfc/; + homepage = https://github.com/nfc-tools/libnfc; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index dc0beb07db9..531e30ba755 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "libofa-${version}"; src = fetchurl { - url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${name}.tar.gz"; sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; meta = { - homepage = http://code.google.com/musicip-libofa/; + homepage = https://code.google.com/archive/p/musicip-libofa/; description = "Library Open Fingerprint Architecture"; longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index 3a67e1267e2..aa5de3f2a5f 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libtiger-0.3.4"; src = fetchurl { - url = "http://libtiger.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libtiger/${name}.tar.gz"; sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libkate pango cairo ]; meta = { - homepage = http://code.google.com/p/libtiger/; + homepage = https://code.google.com/archive/p/libtiger/; description = "A rendering library for Kate streams using Pango and Cairo"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix index 5f050c6e7a7..ed824ec7592 100644 --- a/pkgs/development/libraries/marisa/default.nix +++ b/pkgs/development/libraries/marisa/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://code.google.com/p/marisa-trie/; + homepage = https://github.com/s-yata/marisa-trie; description = "Static and space-efficient trie data structure library"; license = licenses.bsd3; maintainers = with maintainers; [ sifmelcara ]; diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix index 3c3a874c8ad..1c6134d0480 100644 --- a/pkgs/development/libraries/mdds/0.12.1.nix +++ b/pkgs/development/libraries/mdds/0.12.1.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://code.google.com/p/multidimalgorithm/; + homepage = https://gitlab.com/mdds/mdds; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix index 9c6c8e5e334..8ff1d6d5e9a 100644 --- a/pkgs/development/libraries/mdds/0.7.1.nix +++ b/pkgs/development/libraries/mdds/0.7.1.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { name = "mdds-${version}"; src = fetchurl { - url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/multidimalgorithm/mdds_${version}.tar.bz2"; sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy"; }; meta = { - homepage = https://code.google.com/p/multidimalgorithm/; + homepage = https://gitlab.com/mdds/mdds/; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 741ca96348d..de8e5f78646 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://code.google.com/p/mp4v2; + homepage = https://code.google.com/archive/p/mp4v2/; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mpl11; }; } diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index c2799d039cc..43732406064 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bundle of NPAPI headers by Mozilla"; - homepage = https://code.google.com/p/npapi-sdk/; + homepage = https://bitbucket.org/mgorny/npapi-sdk; # see also https://github.com/mozilla/npapi-sdk license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index d42677254e3..2408c3e4904 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Paged Geometry for Ogre3D"; - homepage = http://code.google.com/p/ogre-paged/; + homepage = https://github.com/RigsOfRods/ogre-paged; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 103b495f8e2..a4c51cb2d75 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "qtscriptgenerator-0.1.0"; src = fetchurl { - url = http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-0.1.0.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/qtscriptgenerator/qtscriptgenerator-src-0.1.0.tar.gz"; sha256 = "0h8zjh38n2wfz7jld0jz6a09y66dbsd2jhm4f2024qfgcmxcabj6"; }; buildInputs = [ qt4 ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cd generator qmake make - # Set QTDIR, see http://code.google.com/p/qtscriptgenerator/issues/detail?id=38 + # Set QTDIR, see https://code.google.com/archive/p/qtscriptgenerator/issues/38 QTDIR=${qt4} ./generator cd ../qtbindings qmake @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description = "QtScript bindings generator"; - homepage = http://code.google.com/p/qtscriptgenerator/; + homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/; inherit (qt4.meta) platforms; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index a31fa1f0516..c5e52124cee 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "snappy-${version}"; version = "1.1.4"; - + src = fetchurl { url = "http://github.com/google/snappy/releases/download/${version}/" + "snappy-${version}.tar.gz"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { - homepage = http://code.google.com/p/snappy/; + homepage = https://google.github.io/snappy/; license = licenses.bsd3; description = "Compression/decompression library for very high speeds"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix index 15b84363e02..f898152d820 100644 --- a/pkgs/development/libraries/sparsehash/default.nix +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://code.google.com/p/sparsehash/; + homepage = https://github.com/sparsehash/sparsehash; description = "An extremely memory-efficient hash_map implementation"; platforms = platforms.all; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index d6909efe4a6..7e9ba518251 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -20,7 +20,7 @@ buildOcaml rec { meta = with stdenv.lib; { description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml"; - homepage = http://code.google.com/p/bitstring/; + homepage = https://github.com/xguerin/bitstring; license = licenses.lgpl21Plus; maintainers = [ maintainers.maurer ]; }; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 71e9ee27a9e..50f451ebae2 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtkdialog-0.8.3"; src = fetchurl { - url = http://gtkdialog.googlecode.com/files/gtkdialog-0.8.3.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/gtkdialog-0.8.3.tar.gz"; sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; @@ -12,7 +12,8 @@ stdenv.mkDerivation { buildInputs = [ gtk2 hicolor_icon_theme ]; meta = { - homepage = http://gtkdialog.googlecode.com/; + homepage = https://code.google.com/archive/p/gtkdialog/; + # community links: http://murga-linux.com/puppy/viewtopic.php?t=111923 -> https://github.com/01micko/gtkdialog description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index f20343156e3..f81b327d842 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "stm32flash-1.0"; src = fetchurl { - url = https://stm32flash.googlecode.com/files/stm32flash.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/stm32flash/stm32flash.tar.gz"; sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; - homepage = https://code.google.com/p/stm32flash/; + homepage = https://sourceforge.net/projects/stm32flash/; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms maintainers = [ maintainers.the-kenny ]; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 4d506c900ec..3b1e8c2c8a7 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = https://code.google.com/p/selenium; + homepage = http://www.seleniumhq.org/; description = "Selenium Server for remote WebDriver"; maintainers = with maintainers; [ coconnor offline ]; platforms = platforms.all; diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 357d65aed53..f5f8d6a5f10 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; license = stdenv.lib.licenses.lgpl21; - homepage = http://code.google.com/p/winetricks/; + homepage = https://github.com/Winetricks/winetricks; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 1ca7d43b6a7..73a6d18fc8b 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0"; src = fetchurl { - url = "http://ftop.googlecode.com/files/${name}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${name}.tar.bz2"; sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Show progress of open files and file systems"; - homepage = https://code.google.com/p/ftop/; + homepage = https://code.google.com/archive/p/ftop/; license = licenses.gpl3Plus; longDescription = '' ftop is to files what top is to processes. The progress of all open files diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index dcbf3232e94..6d0c5ae82bc 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "i7z-0.27.2"; src = fetchurl { - url = "http://i7z.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/i7z/${name}.tar.gz"; sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A better i7 (and now i3, i5) reporting tool for Linux"; - homepage = http://code.google.com/p/i7z; + homepage = https://github.com/ajaiantilal/i7z; repositories.git = https://github.com/ajaiantilal/i7z.git; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 8e9f29306e7..617dad8bddd 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation { name = "jujuutils-0.2"; src = fetchurl { - url = "http://jujuutils.googlecode.com/files/jujuutils-0.2.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-0.2.tar.gz"; sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x"; }; buildInputs = [ linuxHeaders ]; meta = { - homepage = http://code.google.com/p/jujuutils/; + homepage = https://github.com/cladisch/linux-firewire-utils; description = "Utilities around FireWire devices connected to a Linux computer"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 1d8507fc4eb..1e898075d19 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://code.google.com/p/modwsgi/; + homepage = https://github.com/GrahamDumpleton/mod_wsgi; description = "Host Python applications in Apache through the WSGI interface"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index 2e2923e17c3..55440143870 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -63,8 +63,8 @@ in stdenv.mkDerivation rec { name = "kippo-${version}"; version = "0.8"; src = fetchurl { - url = "https://kippo.googlecode.com/files/kippo-${version}.tar.gz"; - sha1 = "f57a5cf88171cb005afe44a4b33cb16f825c33d6"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${name}.tar.gz"; + sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d"; }; buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ]; installPhase = '' @@ -76,17 +76,17 @@ in stdenv.mkDerivation rec { --replace "data_path = data" "data_path = /var/lib/kippo/data" \ --replace "txtcmds_path = txtcmds" "txtcmds_path = /var/lib/kippo/txtcmds" \ --replace "public_key = public.key" "public_key = /var/lib/kippo/keys/public.key" \ - --replace "private_key = private.key" "private_key = /var/lib/kippo/keys/private.key" + --replace "private_key = private.key" "private_key = /var/lib/kippo/keys/private.key" mkdir -p $out/bin mkdir -p $out/src - mv ./* $out/src + mv ./* $out/src mv $out/src/utils/* $out/bin ''; passthru.twisted = twisted_13; meta = with stdenv.lib; { - homepage = https://code.google.com/p/kippo; + homepage = https://github.com/desaster/kippo; description = "SSH Honeypot"; longDescription = '' Default port is 2222. Recommend using something like this for port redirection to default SSH port: diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 2a36e1f67a2..70bf5c32b3d 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://code.google.com/p/shellinabox; + homepage = https://github.com/shellinabox/shellinabox; description = "Web based AJAX terminal emulator"; license = licenses.gpl2; maintainers = with maintainers; [ tomberek lihop ]; diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 4b2f0276d78..bc8666a2690 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. ''; - homepage = https://code.google.com/p/lz4/; + homepage = https://lz4.github.io/lz4/; license = with licenses; [ bsd2 gpl2Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index 6d2b073d869..ac1a7c1c148 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://code.google.com/p/mtpfs/; + homepage = https://github.com/cjd/mtpfs; description = "FUSE Filesystem providing access to MTP devices"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index cc31a668059..b39be214d89 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/s3backer/; + homepage = https://github.com/archiecobbs/s3backer; description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index abebc0fc4ca..2f18857b2a1 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { glm freetype ]; meta = with stdenv.lib; { - homepage = http://code.google.com/p/logstalgia; + homepage = http://logstalgia.io/; description = "Website traffic visualization tool"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 596b3ce1565..170ac4c6a26 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -33,7 +33,7 @@ in clangStdenv.mkDerivation rec { ''; patch_version = "2.18.2612.102.1"; - patches = [ + patches = [ (fetchpatch rec { name = "fcitx-mozc-${patch_version}.patch"; url = "https://download.fcitx-im.org/fcitx-mozc/${name}"; @@ -43,7 +43,7 @@ in clangStdenv.mkDerivation rec { postPatch = '' substituteInPlace src/unix/fcitx/mozc.conf \ - --replace "/usr/share/fcitx/mozc/icon/mozc.png" "mozc" + --replace "/usr/share/fcitx/mozc/icon/mozc.png" "mozc" ''; configurePhase = '' @@ -91,7 +91,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isFcitxEngine = true; description = "Fcitx engine for Google japanese input method"; - homepage = http://code.google.com/p/mozc/; + homepage = https://github.com/google/mozc; downloadPage = "http://download.fcitx-im.org/fcitx-mozc/"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 2e32075992c..fd924cdd2a2 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -15,7 +15,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isIbusEngine = true; description = "Japanese input method from Google"; - homepage = http://code.google.com/p/mozc/; + homepage = https://github.com/google/mozc; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 7ca5af555f9..b93c59d9789 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nabi-1.0.0"; src = fetchurl { - url = "http://nabi.googlecode.com/files/nabi-1.0.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-1.0.0.tar.gz"; sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Easy Hangul XIM"; - homepage = https://code.google.com/p/nabi; + homepage = https://github.com/choehwanjin/nabi; license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index b32d0c78a1b..bdcbc939a07 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "touchegg-${version}"; version = "1.1.1"; src = fetchurl { - url = "https://touchegg.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${name}.tar.gz"; sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://code.google.com/p/touchegg/; + homepage = https://github.com/JoseExposito/touchegg; description = "Macro binding for touch surfaces"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 9af5de0476a..3f37c1a2ab0 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; src = fetchurl { - url = "http://uim.googlecode.com/files/uim-${version}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/uim/uim-${version}.tar.bz2"; sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777"; }; meta = with stdenv.lib; { - homepage = "http://code.google.com/p/uim/"; + homepage = "https://github.com/uim/uim"; description = "A multilingual input method framework"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 0c8ca56024b..5633061c721 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://pdsh.googlecode.com/files/${name}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pdsh/${name}.tar.bz2"; sha256 = "1kvzz01fyaxfqmbh53f4ljfsgvxdykh5jyr6fh4f1bw2ywxr1w2p"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/p/pdsh/; + homepage = https://github.com/chaos/pdsh; description = "High-performance, parallel remote shell utility"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index 667cbfbcead..6cbee7d2a85 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brute force attack against Wifi Protected Setup"; - homepage = http://code.google.com/p/reaver-wps; + homepage = https://code.google.com/archive/p/reaver-wps/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ nico202 volth ]; diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 14283c279e4..ef2c91ee2fa 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "slimrat-1.0"; src = fetchurl { - url = http://slimrat.googlecode.com/files/slimrat-1.0.tar.bz2; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/slimrat/slimrat-1.0.tar.bz2"; sha256 = "139b71d45k4b1y47iq62a9732cnaqqbh8s4knkrgq2hx0jxpsk5a"; }; @@ -24,9 +24,10 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/p/slimrat/; + homepage = https://code.google.com/archive/p/slimrat/; description = "Linux Rapidshare downloader"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + broken = true; # officially abandonned upstream }; } diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index b12ce573d1c..4ee4fa41833 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "udptunnel-19"; src = fetchurl { - url = http://udptunnel.googlecode.com/files/udptunnel-r19.tar.gz; - sha1 = "51edec3b63b659229bcf92f6157568d3b074ede0"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r19.tar.gz"; + sha256 = "1hkrn153rdyrp9g15z4d5dq44cqlnby2bfplp6z0g3862lnv7m3l"; }; installPhase = '' @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/p/udptunnel/; + homepage = https://code.google.com/archive/p/udptunnel/; description = "Tunnels TCP over UDP packets"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index e1e57a84b55..a0368b0df89 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; - homepage = http://code.google.com/p/opkg/; + homepage = https://git.yoctoproject.org/cgit/cgit.cgi/opkg/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index ebd9a6d5e7e..3d4bdd2edf1 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.8"; src = fetchurl { - url = "http://mfcuk.googlecode.com/files/mfcuk-0.3.8.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mfcuk/mfcuk-0.3.8.tar.gz"; sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MiFare Classic Universal toolKit"; license = licenses.gpl2; - homepage = http://code.google.com/p/mfcuk/; + homepage = https://github.com/nfc-tools/mfcuk; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index 8a454ca67fd..278818e88b5 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.10.6"; src = fetchurl { - url = "http://mfoc.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mfoc/${name}.tar.gz"; sha1 = "3adce3029dce9124ff3bc7d0fad86fa0c374a9e3"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mifare Classic Offline Cracker"; license = licenses.gpl2; - homepage = http://code.google.com/p/mfoc/; + homepage = https://github.com/nfc-tools/mfoc; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix index 9e01e8f0a9f..91df7f3fbb0 100644 --- a/pkgs/tools/security/omapd/default.nix +++ b/pkgs/tools/security/omapd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.2"; src = fetchurl { - url = "http://omapd.googlecode.com/files/${name}.tgz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${name}.tgz"; sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/omapd; + homepage = https://code.google.com/archive/p/omapd/; description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; license = licenses.gpl3; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/security/tmin/default.nix b/pkgs/tools/security/tmin/default.nix index 2c16e936a69..30bca5d1b26 100644 --- a/pkgs/tools/security/tmin/default.nix +++ b/pkgs/tools/security/tmin/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.05"; src = fetchurl { - url = "https://tmin.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/tmin/${name}.tar.gz"; sha256 = "0166kcfs4b0da4hs2aqyn41f5l09i8rwxpi20k7x17qsxbmjbpd5"; }; @@ -16,9 +16,13 @@ stdenv.mkDerivation rec { meta = { description = "Fuzzing tool test-case optimizer"; - homepage = "https://code.google.com/p/tmin"; + longDescription = '' + This project is obsolete and replaced by the afl-tmin tool bundled with american fuzzy lop (afl) + ''; + homepage = "https://code.google.com/archive/p/tmin/"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + broken = true; # officially deprecated upstream in favor of afl-tmin (afl package) }; } diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 466dc4b4e46..ebc567f54ce 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper to safely torify applications"; - homepage = http://code.google.com/p/torsocks/; + homepage = https://github.com/dgoulet/torsocks; repositories.git = https://git.torproject.org/torsocks.git; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13cc777cf95..0bdd0f2ccac 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4056,7 +4056,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ FileWhich JSONMaybeXS TestDifferences ]; meta = { - homepage = https://code.google.com/p/perl-devel-nytprof/; + homepage = https://github.com/timbunce/devel-nytprof; description = "Powerful fast feature-rich Perl source code profiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60d5f9577e4..7664f422c0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15441,7 +15441,7 @@ in { meta = { description = "Process and system utilization information interface for python"; - homepage = http://code.google.com/p/psutil/; + homepage = https://github.com/giampaolo/psutil; }; }; From 4ccf05b03b79caf9cc18a370fa0fe4ab6a6ca5df Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 3 Nov 2017 18:50:20 +0000 Subject: [PATCH 2310/2806] qtscriptgenerator: enable parallel building --- .../libraries/qtscriptgenerator/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index a4c51cb2d75..040072cb463 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -10,28 +10,33 @@ stdenv.mkDerivation { patches = [ ./qtscriptgenerator.gcc-4.4.patch ./qt-4.8.patch ]; - # Why isn't the author providing proper Makefile or a CMakeLists.txt ? - buildPhase = '' + postPatch = '' # remove phonon stuff which causes errors (thanks to Gentoo bug reports) sed -i "/typesystem_phonon.xml/d" generator/generator.qrc sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro + ''; + + configurePhase = '' + ( cd generator; qmake ) + ( cd qtbindings; qmake ) + ''; + + buildPhase = '' + makeFlags="SHELL=$SHELL ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}" + make $makeFlags -C generator - cd generator - qmake - make # Set QTDIR, see https://code.google.com/archive/p/qtscriptgenerator/issues/38 - QTDIR=${qt4} ./generator - cd ../qtbindings - qmake - make + ( cd generator; QTDIR=${qt4} ./generator ) + make $makeFlags -C qtbindings ''; installPhase = '' - cd .. mkdir -p $out/lib/qt4/plugins/script cp -av plugins/script/* $out/lib/qt4/plugins/script ''; + enableParallelBuilding = true; + hardeningDisable = [ "format" ]; meta = { From 8e982d5f2e09105242f6ff95e5b15eae9025fed9 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 3 Nov 2017 19:58:01 +0100 Subject: [PATCH 2311/2806] zstd: 1.3.0 -> 1.3.2 --- pkgs/tools/compression/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 2be3bf167da..aad9421305e 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { - sha256 = "1rnxfhcmg8zsagyf70hiwm32mam60hq58pzgy7jn8c3iwv24mpz5"; + sha256 = "1hwh6pw1z3y5kpwcwxrk8cwc83anigiqhy3z06ywy1jll8im57pz"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; From ae25bd35c6d332b8ff34ca98cb88d00612982e90 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 3 Nov 2017 20:01:12 +0100 Subject: [PATCH 2312/2806] zsh-completions: 0.26.0 -> 0.27.0 --- pkgs/shells/zsh-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh-completions/default.nix index 4a5731b9152..92a9d293e84 100644 --- a/pkgs/shells/zsh-completions/default.nix +++ b/pkgs/shells/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-completions-${version}"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; rev = "${version}"; - sha256 = "16yhwf42a11v8bhnfb7nda0svxmglzph3c0cknvf8p5m6mkqj9s2"; + sha256 = "1c2xx9bkkvyy0c6aq9vv3fjw7snlm0m5bjygfk5391qgjpvchd29"; }; installPhase= '' From 95d6424e9ab887e048530de490f799b4f9da79b2 Mon Sep 17 00:00:00 2001 From: vinymeuh Date: Mon, 30 Oct 2017 19:34:41 +0100 Subject: [PATCH 2313/2806] pythonPackages.py3exiv2: init at 0.2.1 --- .../python-modules/py3exiv2/default.nix | 29 +++++++++++++++++++ .../python-modules/py3exiv2/setup.patch | 11 +++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/py3exiv2/default.nix create mode 100644 pkgs/development/python-modules/py3exiv2/setup.patch diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix new file mode 100644 index 00000000000..4656b99df0a --- /dev/null +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }: + +buildPythonPackage rec { + pname = "py3exiv2"; + version = "0.2.1"; + name = "${pname}-${version}"; + disabled = !(isPy3k); + + src = fetchPypi { + inherit pname version; + sha256 = "06q7mlqy05c3jr61nmz93fxb6ilizfyggbh5sg0krwjap2sw1fr8"; + }; + + buildInputs = [ exiv2 boost ]; + + # work around python distutils compiling C++ with $CC (see issue #26709) + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + + # fix broken libboost_python3 detection + patches = [ ./setup.patch ]; + + meta = { + homepage = "https://launchpad.net/py3exiv2"; + description = "A Python3 binding to the library exiv2"; + license = with stdenv.lib.licenses; [ gpl3 ]; + maintainers = with stdenv.lib.maintainers; [ vinymeuh ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/pkgs/development/python-modules/py3exiv2/setup.patch new file mode 100644 index 00000000000..bb4b1152347 --- /dev/null +++ b/pkgs/development/python-modules/py3exiv2/setup.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2017-10-16 22:03:02.000000000 +0200 ++++ b/setup.py 2017-10-16 22:03:34.000000000 +0200 +@@ -39,7 +39,7 @@ + if '3' in l[2:]: + return l.replace('libboost', 'boost') + +-libboost = get_libboost_name() ++libboost = 'boost_python3' + + setup( + name='py3exiv2', diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60d5f9577e4..1d95a7fbfac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -232,6 +232,8 @@ in { pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}"; + py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; + pygame = callPackage ../development/python-modules/pygame { }; pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; From c7db2d7df01c80bec0a5f443212d9772c80fc965 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 3 Nov 2017 20:03:16 +0100 Subject: [PATCH 2314/2806] zsh-syntax-highlighting: 0.5.0 -> 0.6.0 --- pkgs/shells/zsh-syntax-highlighting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh-syntax-highlighting/default.nix index a97251d8e56..b7b44098fd7 100644 --- a/pkgs/shells/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh-syntax-highlighting/default.nix @@ -3,14 +3,14 @@ # To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.6.0"; name = "zsh-syntax-highlighting-${version}"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-syntax-highlighting"; rev = version; - sha256 = "0k0m5aw67lhi4z143sdawx93y1892scvvdfdnjvljb4hf0vzs2ww"; + sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4"; }; buildInputs = [ zsh ]; From 930414e22e1d59f1dbc0436e7ec5e8b2f0fa7e9e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 3 Nov 2017 19:18:17 +0000 Subject: [PATCH 2315/2806] arora: use fetchFromGitHub --- .../networking/browsers/arora/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix index da042c77c40..f9d5f01be20 100644 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ b/pkgs/applications/networking/browsers/arora/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "arora-${version}"; version = "0.11.0"; - src = fetchurl { - url = "https://github.com/Arora/arora/archive/${version}.tar.gz"; - sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg"; + src = fetchFromGitHub { + owner = "Arora"; + repo = "arora"; + rev = version; + sha256 = "0wmivgx3mw51rghi6q8fgivpkqc98z2mqmllf7c98ln0wd8rkf3c"; }; buildInputs = [ qt4 ]; nativeBuildInputs = [ qmake4Hook ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { platforms = qt4.meta.platforms; maintainers = [ maintainers.phreedom ]; From d2717a55d9feaffe04f076929e62526481d1bb9c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 3 Nov 2017 19:54:35 +0200 Subject: [PATCH 2316/2806] ethtool: 4.11 -> 4.13 --- 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 ae6ea6e3f53..85672619d61 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.11"; + version = "4.13"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "1cp132kk2xd2cwn1ysjv0cl8i9lnq3n4zi4wy676p5k4h2mfvn0j"; + sha256 = "1flwz4x76ajxigadq9knxgwr778g03y3qfx6c7rflc3x020a7hdp"; }; meta = with stdenv.lib; { From 78eaae0204f8b9fe64339f5aa2e11dac60a5f6f6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 3 Nov 2017 19:59:08 +0200 Subject: [PATCH 2317/2806] vim: 8.0.1245 -> 8.0.1257 --- 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 1b1751e9b1d..417f2d80516 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.1245"; + version = "8.0.1257"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "10nh8b2jgfbq4xvha0d2qashvdyqzvq96w8k6rl6793d8y7f3z8s"; + sha256 = "1y4c7wn5gr7n4c2ni36kadr26aldydxlf06yj7nsmw22ywwg78ig"; }; enableParallelBuilding = true; From ee23541f8981ddd85109130cf471f163f1f766b1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Nov 2017 23:32:41 +0000 Subject: [PATCH 2318/2806] ocamlPackages.ocaml_expat: 0.9.1 -> 1.0.0 --- pkgs/development/ocaml-modules/expat/0.9.nix | 51 +++++++++++++++ .../ocaml-modules/expat/default.nix | 65 +++++++------------ pkgs/top-level/ocaml-packages.nix | 5 +- 3 files changed, 78 insertions(+), 43 deletions(-) create mode 100644 pkgs/development/ocaml-modules/expat/0.9.nix diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix new file mode 100644 index 00000000000..5fcc317d940 --- /dev/null +++ b/pkgs/development/ocaml-modules/expat/0.9.nix @@ -0,0 +1,51 @@ +{stdenv, fetchurl, ocaml, findlib, ounit, expat}: + +let + pname = "ocaml-expat"; + testcase = fetchurl { + url = "http://www.w3.org/TR/1998/REC-xml-19980210.xml"; + sha256 = "00a3gsfvlkdhmcbziqhvpvy1zmcgbcihfqwcvl6ay03zf7gvw0k1"; + }; + +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "0.9.1"; + + src = fetchurl { + url = "http://www.xs4all.nl/~mmzeeman/ocaml/${pname}-${version}.tar.gz"; + sha256 = "16n2j3y0jc9xgqyshw9plrwqnjiz30vnpbhahmgxlidbycw8rgjz"; + }; + + buildInputs = [ocaml findlib ounit expat]; + + createFindlibDestdir = true; + + patches = [ ./unittest.patch ]; + + postPatch = '' + substituteInPlace "unittest.ml" \ + --replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}" + substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \ + --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \ + --replace "gcc" "\$(CC)" + ''; + + configurePhase = "true"; # Skip configure + + buildPhase = '' + make all allopt + ''; + + doCheck = true; + + checkTarget = "testall"; + + meta = { + homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; + description = "An ocaml wrapper for the Expat XML parsing library"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.roconnor ]; + }; +} diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 5fcc317d940..575ca45624f 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -1,51 +1,32 @@ -{stdenv, fetchurl, ocaml, findlib, ounit, expat}: - -let - pname = "ocaml-expat"; - testcase = fetchurl { - url = "http://www.w3.org/TR/1998/REC-xml-19980210.xml"; - sha256 = "00a3gsfvlkdhmcbziqhvpvy1zmcgbcihfqwcvl6ay03zf7gvw0k1"; - }; - -in +{ stdenv, fetchFromGitHub, expat, ocaml, findlib, ounit }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "0.9.1"; + name = "ocaml${ocaml.version}-expat-${version}"; + version = "1.0.0"; - src = fetchurl { - url = "http://www.xs4all.nl/~mmzeeman/ocaml/${pname}-${version}.tar.gz"; - sha256 = "16n2j3y0jc9xgqyshw9plrwqnjiz30vnpbhahmgxlidbycw8rgjz"; - }; + src = fetchFromGitHub { + owner = "whitequark"; + repo = "ocaml-expat"; + rev = "v${version}"; + sha256 = "0rb47v08ra2hhh73p3d8sl4sizqwiwc37gnkl22b23sbwbjrpbz0"; + }; - buildInputs = [ocaml findlib ounit expat]; + prePatch = '' + substituteInPlace Makefile --replace "gcc" "\$(CC)" + ''; - createFindlibDestdir = true; + buildInputs = [ ocaml findlib expat ounit ]; - patches = [ ./unittest.patch ]; + doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06"; + checkTarget = "testall"; - postPatch = '' - substituteInPlace "unittest.ml" \ - --replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}" - substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \ - --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \ - --replace "gcc" "\$(CC)" - ''; + createFindlibDestdir = true; - configurePhase = "true"; # Skip configure - - buildPhase = '' - make all allopt - ''; - - doCheck = true; - - checkTarget = "testall"; - - meta = { - homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; - description = "An ocaml wrapper for the Expat XML parsing library"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - }; + meta = { + description = "OCaml wrapper for the Expat XML parsing library"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 43c249e7b1d..7555cf5efd7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -407,7 +407,10 @@ let ocaml_data_notation = callPackage ../development/ocaml-modules/odn { }; - ocaml_expat = callPackage ../development/ocaml-modules/expat { }; + ocaml_expat = + if lib.versionAtLeast ocaml.version "4.02" + then callPackage ../development/ocaml-modules/expat { } + else callPackage ../development/ocaml-modules/expat/0.9.nix { }; frontc = callPackage ../development/ocaml-modules/frontc { }; From 0eb284b351a5ab4c8fa347453baf9409c0e819ca Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 3 Nov 2017 12:16:53 +0000 Subject: [PATCH 2319/2806] alt-ergo: remove constraint on OCaml version --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 136a4723133..b0212bd2c95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18561,9 +18561,7 @@ with pkgs; acgtk = callPackage ../applications/science/logic/acgtk { }; - alt-ergo = callPackage ../applications/science/logic/alt-ergo { - ocamlPackages = ocamlPackages_4_02; - }; + alt-ergo = callPackage ../applications/science/logic/alt-ergo { }; aspino = callPackage ../applications/science/logic/aspino {}; From da793b2c86ec6fdc7067de1d6b598e8b1e13ec09 Mon Sep 17 00:00:00 2001 From: Yellow Ghost Date: Fri, 3 Nov 2017 20:44:32 +0100 Subject: [PATCH 2320/2806] abiword: 3.0.1 -> 3.0.2 --- pkgs/applications/office/abiword/default.nix | 2 +- .../office/abiword/patches/fix-13791.patch | 161 ++++++++++++++++++ 2 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/office/abiword/patches/fix-13791.patch diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 6483702e822..1563cdf3d05 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ - (fetchurl { url = https://gist.github.com/ylwghst/b28ef051980f41aca56df7a8affd9526/raw/; sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al"; }) + ./patches/fix-13791.patch ]; buildInputs = diff --git a/pkgs/applications/office/abiword/patches/fix-13791.patch b/pkgs/applications/office/abiword/patches/fix-13791.patch new file mode 100644 index 00000000000..98004f01bcb --- /dev/null +++ b/pkgs/applications/office/abiword/patches/fix-13791.patch @@ -0,0 +1,161 @@ +From 46388f407c893123d9b3824a7570b050fc3b049b Mon Sep 17 00:00:00 2001 +From: James Cameron +Date: Thu, 17 Aug 2017 15:05:39 +1000 +Subject: [PATCH] Fix flickering +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- in GR_Caret::s_blink_timeout, avoid repeated calls by stopping the + timer, it will be restarted when needed, + +- in GR_Caret::s_enable, avoid extra unnecessary _blink calls when blink + is enabled, as they serve no purpose, + +- in XAP_UnixFrameImpl::_fe::expose, use the Cairo clip rectangle + instead of the expose event area, thanks to Hubert Figuière in + 865c1dda7e13deff04573ffc42028b71fee07f9c, + +- in XAP_UnixFrameImpl::_fe::expose, do not return FALSE, as other + handlers will need to handle the draw event, + +- in GR_UnixCairoGraphics::flush, fix excessive draw events; + gtk_widget_queue_draw only marks the widget as needing redrawing, + which causes a draw event for each call to flush, therefore every + caret blink, so use gdk_flush instead, + +Fixes AbiSource #13791. +Fixes Debian #851052. +Fixes Fedora #1287835. +Fixes Ubuntu LP: #1574278. +Fixes Sugar Labs #4915. + +Signed-off-by: James Cameron +--- + src/af/gr/gtk/gr_UnixCairoGraphics.cpp | 4 +--- + src/af/gr/xp/gr_Caret.cpp | 13 ++++--------- + src/af/xap/gtk/xap_UnixFrameImpl.cpp | 27 ++++++++++++++++++--------- + src/af/xap/gtk/xap_UnixFrameImpl.h | 2 +- + 4 files changed, 24 insertions(+), 22 deletions(-) + +diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp +index 509bd37..7c3c06f 100644 +--- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp ++++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp +@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint() + + void GR_UnixCairoGraphics::flush(void) + { +- if (m_Widget) { +- gtk_widget_queue_draw(m_Widget); +- } ++ gdk_flush(); + } + + bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const +diff --git a/src/af/gr/xp/gr_Caret.cpp b/src/af/gr/xp/gr_Caret.cpp +index 5d5d116..a8aa451 100644 +--- a/src/af/gr/xp/gr_Caret.cpp ++++ b/src/af/gr/xp/gr_Caret.cpp +@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w) + { + GR_Caret * c = static_cast(_w->getInstanceData()); + ++ c->m_enabler->stop(); + c->m_worker->stop(); +- c->_blink(true); +- if (!c->m_bCursorIsOn) +- c->_blink(true); // blink again +- else +- { +- c->_blink(true); // ?? - MARCM +- c->_blink(true); +- } + c->m_worker->start(); +- c->m_enabler->stop(); ++ c->_blink(true); + } + + void GR_Caret::s_blink_timeout(UT_Worker * _w) + { + GR_Caret * c = static_cast(_w->getInstanceData()); ++ ++ c->m_blinkTimeout->stop(); + if (c->isEnabled()) + c->disable(); + } +diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp +index 780000e..e81961a 100644 +--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp ++++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp +@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g + } + + #if GTK_CHECK_VERSION(3,0,0) +-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) ++gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) + #else + gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) + #endif + { + XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); + FV_View * pView = static_cast(pUnixFrameImpl->getFrame()->getCurrentView()); ++ double x, y, width, height; + #if GTK_CHECK_VERSION(3,0,0) +- GdkEventExpose *pExposeEvent = reinterpret_cast(gtk_get_current_event()); ++ cairo_clip_extents (cr, &x, &y, &width, &height); ++ width -= x; ++ height -= y; ++#else ++ x = pExposeEvent->area.x; ++ y = pExposeEvent->area.y; ++ width = pExposeEvent->area.width; ++ height = pExposeEvent->area.height; + #endif + /* Jean: commenting out next lines since the zoom update code does draw only + * part of what needs to be updated. */ +@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) + UT_Rect rClip; + if (pGr->getPaintCount () > 0) + return TRUE; +- xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height)); +- rClip.left = pGr->tlu(pExposeEvent->area.x); +- rClip.top = pGr->tlu(pExposeEvent->area.y); +- rClip.width = pGr->tlu(pExposeEvent->area.width)+1; +- rClip.height = pGr->tlu(pExposeEvent->area.height)+1; +-#if GTK_CHECK_VERSION(3,0,0) ++ rClip.left = pGr->tlu(x); ++ rClip.top = pGr->tlu(y); ++ #if GTK_CHECK_VERSION(3,0,0) ++ rClip.width = pGr->tlu(width); ++ rClip.height = pGr->tlu(height); + static_cast(pGr)->setCairo(cr); + pView->draw(&rClip); + static_cast(pGr)->setCairo(NULL); + #else ++ rClip.width = pGr->tlu(width)+1; ++ rClip.height = pGr->tlu(height)+1; + pView->draw(&rClip); + #endif + } +- return FALSE; ++ return TRUE; + } + + static bool bScrollWait = false; +diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h +index 30ee5d8..26fbb2e 100644 +--- a/src/af/xap/gtk/xap_UnixFrameImpl.h ++++ b/src/af/xap/gtk/xap_UnixFrameImpl.h +@@ -152,7 +152,7 @@ protected: + static gint key_release_event(GtkWidget* w, GdkEventKey* e); + static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); + #if GTK_CHECK_VERSION(3,0,0) +- static gint draw(GtkWidget * w, cairo_t * cr); ++ static gboolean draw(GtkWidget * w, cairo_t * cr); + #else + static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); + #endif +-- +2.11.0 + From cc04a30b6e14c4a6b2353766c8e22a6e96d30e76 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 2 Nov 2017 15:49:28 +0000 Subject: [PATCH 2321/2806] rambox: build from source --- .../instant-messengers/rambox/bare.nix | 61 ++++++++++++++++ .../instant-messengers/rambox/default.nix | 70 +++++-------------- .../rambox/fetchNodeModules.nix | 26 +++++++ .../rambox/hide-check-for-updates.patch | 35 ++++++++++ .../instant-messengers/rambox/isDev.patch | 14 ++++ .../instant-messengers/rambox/sencha/bare.nix | 41 +++++++++++ .../rambox/sencha/default.nix | 17 +++++ .../rambox/sencha/response.varfile | 13 ++++ 8 files changed, 223 insertions(+), 54 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/rambox/bare.nix create mode 100644 pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix create mode 100644 pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch create mode 100644 pkgs/applications/networking/instant-messengers/rambox/isDev.patch create mode 100644 pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix create mode 100644 pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix new file mode 100644 index 00000000000..ceb922624a1 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha }: + +stdenv.mkDerivation rec { + name = "rambox-bare-${version}"; + version = "0.5.13"; + + src = fetchFromGitHub { + owner = "saenzramiro"; + repo = "rambox"; + rev = version; + sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326"; + }; + + nativeBuildInputs = [ nodejs-8_x ruby sencha ]; + + node_modules = fetchNodeModules { + inherit src; + + nodejs = nodejs-8_x; + sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4"; + }; + + patches = [ ./hide-check-for-updates.patch ./isDev.patch ]; + + # These credentials are only for this derivation. If you want to get credentials + # for another distribution, go to https://auth0.com. If you want to reuse the same + # domain, drop a line at yegortimoshenko@gmail.com! + auth0ClientID = "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"; + auth0Domain = "nixpkgs.auth0.com"; + + configurePhase = '' + echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js + ln -s ${node_modules} node_modules + ''; + + buildPhase = '' + mkdir ../rambox-build + npm run sencha:compile:build + ''; + + installPhase = '' + mv ../rambox-build/ $out + + # https://github.com/saenzramiro/rambox/issues/1281 + echo '{"name": "rambox", "version": "${version}", "main": "electron/main.js"}' > $out/package.json + + # https://github.com/saenzramiro/rambox/issues/1282 + cp --parents ext/packages/ext-locale/build/ext-locale-*.js $out + + # Symbolic link causes `Uncaught Error: Cannot find module 'immutable'` + cp -r ${node_modules} $out/node_modules + ''; + + meta = with stdenv.lib; { + description = "Messaging and emailing app that combines common web applications into one"; + homepage = http://rambox.pro; + license = licenses.gpl3; + maintainers = with maintainers; [ gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 7c8367d7f7f..2e574fae8fa 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,64 +1,26 @@ -{ stdenv, fetchurl, dpkg, makeWrapper -, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig -, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: +{ stdenv, newScope, makeWrapper, electron, xdg_utils }: let - bits = if stdenv.system == "x86_64-linux" then "x64" - else "ia32"; - - version = "0.5.13"; - - runtimeDeps = [ - udev libnotify - ]; - deps = (with xorg; [ - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes - libXrender libX11 libXtst libXScrnSaver libxcb - ]) ++ [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc - ] ++ runtimeDeps; -in stdenv.mkDerivation rec { - name = "rambox-${version}"; - src = fetchurl { - url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb"; - sha256 = if bits == "x64" then - "0bn562fr1wsnn3xsd4q2rrxi6c56vckrkfmjl2dqb30hpmj2vn0d" else - "180ndvkil5mk5idwnn7spfygnhhll6pjc342pfzgmzk46a723qs4"; + callPackage = newScope self; + self = { + fetchNodeModules = callPackage ./fetchNodeModules.nix {}; + rambox-bare = callPackage ./bare.nix {}; + sencha = callPackage ./sencha {}; }; +in - # don't remove runtime deps - dontPatchELF = true; +with self; - buildInputs = [ dpkg makeWrapper ]; +stdenv.mkDerivation { + name = "rambox-${rambox-bare.version}"; - unpackPhase = "dpkg-deb -x $src ."; + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = ":"; installPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" opt/Rambox/rambox - patchelf --set-rpath "$out/opt/Rambox:${stdenv.lib.makeLibraryPath deps}" opt/Rambox/rambox - - mkdir -p $out/bin - cp -r opt $out - ln -s $out/opt/Rambox/rambox $out/bin - - # provide resources - cp -r usr/share $out - substituteInPlace $out/share/applications/rambox.desktop \ - --replace Exec=\"/opt/Rambox/rambox\" Exec=rambox + makeWrapper ${electron}/bin/electron $out/bin/rambox \ + --add-flags "${rambox-bare} --without-update" \ + --prefix PATH : ${xdg_utils}/bin ''; - - postFixup = '' - paxmark m $out/opt/Rambox/rambox - wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin - ''; - - meta = with stdenv.lib; { - description = "Free and Open Source messaging and emailing app that combines common web applications into one"; - homepage = http://rambox.pro; - license = licenses.mit; - maintainers = [ maintainers.gnidorah ]; - platforms = ["i686-linux" "x86_64-linux"]; - hydraPlatforms = []; - }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix new file mode 100644 index 00000000000..047890a932c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix @@ -0,0 +1,26 @@ +{ stdenv, jq }: { src, nodejs, sha256 }: + +# Only npm >= 5.4.2 is deterministic, see: +# https://github.com/npm/npm/issues/17979#issuecomment-332701215 +assert stdenv.lib.versionAtLeast nodejs.version "8.9.0"; + +stdenv.mkDerivation { + name = "node_modules"; + + outputHashAlgo = "sha256"; + outputHash = sha256; + outputHashMode = "recursive"; + + nativeBuildInputs = [ jq nodejs ]; + + buildCommand = '' + cp -r ${src}/* . + HOME=. npm install --force --ignore-scripts --only=production + for f in $(find node_modules -name package.json); do + # https://github.com/npm/npm/issues/10393 + jq -S 'delpaths(keys | map(select(startswith("_")) | [.]))' $f > $f.tmp + mv $f.tmp $f + done + mv node_modules $out + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch new file mode 100644 index 00000000000..8363baef2df --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch @@ -0,0 +1,35 @@ +https://github.com/saenzramiro/rambox/issues/1283 + +diff -urNZ a/electron/menu.js b/electron/menu.js +--- a/electron/menu.js 2017-11-02 22:02:59.753119865 +0000 ++++ b/electron/menu.js 2017-11-02 22:08:34.419698562 +0000 +@@ -220,14 +220,6 @@ + } + }, + { +- label: locale['menu.help[5]'], +- click(item, win) { +- const webContents = win.webContents; +- const send = webContents.send.bind(win.webContents); +- send('autoUpdater:check-update'); +- } +- }, +- { + label: locale['menu.help[6]'], + click() { + sendAction('showAbout') +@@ -290,14 +282,6 @@ + type: 'separator' + }); + helpSubmenu.push({ +- label: `&`+locale['menu.help[5]'], +- click(item, win) { +- const webContents = win.webContents; +- const send = webContents.send.bind(win.webContents); +- send('autoUpdater:check-update'); +- } +- }); +- helpSubmenu.push({ + label: `&`+locale['menu.help[6]'], + click() { + sendAction('showAbout') diff --git a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch new file mode 100644 index 00000000000..b918144c766 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch @@ -0,0 +1,14 @@ +https://github.com/saenzramiro/rambox/issues/1280 + +diff -urNZ a/electron/main.js b/electron/main.js +--- a/electron/main.js 2017-11-02 14:58:06.085127616 +0000 ++++ b/electron/main.js 2017-11-02 14:58:18.316887679 +0000 +@@ -8,7 +8,7 @@ + // Configuration + const Config = require('electron-config'); + // Development +-const isDev = require('electron-is-dev'); ++const isDev = false; + // Updater + const updater = require('./updater'); + // File System diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix new file mode 100644 index 00000000000..9b4a718ed23 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, gzip, which, unzip, jdk }: + +let + version = "6.5.2"; + srcs = { + i686-linux = fetchurl { + url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; + sha256 = "18gcqw9434xab97skcb97iw4p4s2pgggvq7jaisblap0ja00kqjr"; + }; + x86_64-linux = fetchurl { + url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip"; + sha256 = "1b8jv99k37q1bi7b29f23lfzxc66v5fqdmr1rxsrqchwcrllc0z7"; + }; + }; +in + +stdenv.mkDerivation rec { + inherit version; + + name = "sencha-bare-${version}"; + src = srcs.${stdenv.system}; + + nativeBuildInputs = [ gzip which unzip ]; + buildInputs = [ jdk ]; + + sourceRoot = "."; + + configurePhase = '' + substituteAll ${./response.varfile} response.varfile + ''; + + installPhase = '' + ./SenchaCmd*.sh -q -dir $out -varfile response.varfile + rm $out/shell-wrapper.sh $out/Uninstaller + ''; + + meta = with stdenv.lib; { + license = licenses.unfree; + platforms = attrNames srcs; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix new file mode 100644 index 00000000000..1ca04a9e168 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix @@ -0,0 +1,17 @@ +{ stdenv, callPackage, makeWrapper }: + +let + sencha-bare = callPackage ./bare.nix {}; +in + +stdenv.mkDerivation { + name = "sencha-${sencha-bare.version}"; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = ":"; + + installPhase = '' + makeWrapper ${sencha-bare}/sencha $out/bin/sencha + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile new file mode 100644 index 00000000000..0ff6f0a30d5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile @@ -0,0 +1,13 @@ +addToPath$Integer=1 +parentDir=. +sys.adminRights$Boolean=false +sys.component.148$Boolean=true +sys.component.157$Boolean=true +sys.component.26$Boolean=true +sys.component.30$Boolean=true +sys.component.90$Boolean=true +sys.component.91$Boolean=true +sys.component.92$Boolean=true +sys.component.94$Boolean=true +sys.installationDir=@out@ +sys.languageId=en \ No newline at end of file From 94043f511a62bd0c614b5aeb892c3b78913e4a29 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 3 Nov 2017 21:39:05 +0100 Subject: [PATCH 2322/2806] zfs: 0.7.2 -> 0.7.3 Bugfix release. --- pkgs/os-specific/linux/spl/default.nix | 4 ++-- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 5e0f83c4c68..b29573179f8 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -63,8 +63,8 @@ in assert buildKernel -> kernel != null; { splStable = common { - version = "0.7.2"; - sha256 = "10rq0npjlp09xjdgn9lc3wm310dqc71j0wgxwj92ncf9r61zf445"; + version = "0.7.3"; + sha256 = "0j8mb9ky3pjz9hnz5w6fajpzajl15jq3p0xvxb6lhpqj3rjzsqxb"; }; splUnstable = common { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index bfa8dac72ba..ccec513a470 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -140,9 +140,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.2"; + version = "0.7.3"; - sha256 = "1dl6i4sg7z0k4p1dmfcm9arx62x30lqsr9hycvhhs3pf58ks8z2v"; + sha256 = "1bbajrwfilnmfhn1n69gvsaznyc4q29wi7nkwc0p9r4dli37w28b"; extraPatches = [ (fetchpatch { From 5e563ae7490ad47699c0e687dd6e180c07b81a1f Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 3 Nov 2017 21:32:20 +0100 Subject: [PATCH 2323/2806] node2nix: 1.3.0 -> 1.4.0 + regenerate packages --- .../node-packages/composition-v4.nix | 2 +- .../node-packages/composition-v6.nix | 2 +- pkgs/development/node-packages/node-env.nix | 54 +- .../node-packages/node-packages-v4.nix | 3001 +---- .../node-packages/node-packages-v6.nix | 9887 ++++------------- 5 files changed, 2370 insertions(+), 10576 deletions(-) diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index dc5899ebf1a..f63ae1ef750 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! +# This file has been generated by node2nix 1.4.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 0c01a169af4..4d4f68cf50c 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! +# This file has been generated by node2nix 1.4.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 356e78f027b..33073e55ce5 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -110,16 +110,16 @@ let text = '' var fs = require('fs'); var path = require('path'); - + function resolveDependencyVersion(location, name) { if(location == process.env['NIX_STORE']) { return null; } else { var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - + if(fs.existsSync(dependencyPackageJSON)) { var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - + if(dependencyPackageObj.name == name) { return dependencyPackageObj.version; } @@ -128,12 +128,12 @@ let } } } - + function replaceDependencies(dependencies) { if(typeof dependencies == "object" && dependencies !== null) { for(var dependency in dependencies) { var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - + if(resolvedVersion === null) { process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); } else { @@ -142,17 +142,17 @@ let } } } - + /* Read the package.json configuration */ var packageObj = JSON.parse(fs.readFileSync('./package.json')); - + /* Pinpoint all dependencies */ replaceDependencies(packageObj.dependencies); if(process.argv[2] == "development") { replaceDependencies(packageObj.devDependencies); } replaceDependencies(packageObj.optionalDependencies); - + /* Write the fixed package.json file */ fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); ''; @@ -160,7 +160,7 @@ let in '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - + ${stdenv.lib.optionalString (dependencies != []) '' if [ -d node_modules ] @@ -171,11 +171,11 @@ let fi ''} ''; - + # Recursively traverses all dependencies of a package and pinpoints all # dependencies in the package.json file to the versions that are actually # being used. - + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: '' if [ -d "${packageName}" ] @@ -210,7 +210,7 @@ let compositionScript = composePackage args; pinpointDependenciesScript = pinpointDependenciesOfPackage args; - + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = args.installPhase or '' @@ -220,7 +220,7 @@ let # Compose the package and all its dependencies source $compositionScriptPath - + # Pinpoint the versions of all dependencies to the ones that are actually being used echo "pinpointing versions of dependencies..." source $pinpointDependenciesScriptPath @@ -287,31 +287,31 @@ let includeScript = includeDependencies { inherit dependencies; }; pinpointDependenciesScript = pinpointDependenciesOfPackage args; - + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; buildCommand = '' - mkdir -p $out/lib - cd $out/lib + mkdir -p $out/${packageName} + cd $out/${packageName} + source $includeScriptPath - - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath # Create fake package.json to make the npm commands work properly - cat > package.json < Date: Fri, 3 Nov 2017 21:36:43 +0000 Subject: [PATCH 2324/2806] nixos/cc-wrapper: Fix bug if dynamicLinker not found If a dynamic linker for target is not found the generated script fails due to unbound variable error (due to "set -u"). Correct by specifying default value with dynamicLinker:- and not generating ldflagsBefore if no linker is found. This problem was found when cross compiling to mingw32 targets --- pkgs/build-support/cc-wrapper/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 489fb02dcb5..80f794cbdde 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -286,7 +286,7 @@ stdenv.mkDerivation { *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; esac - if [ -n "$dynamicLinker" ]; then + if [ -n "''${dynamicLinker:-}" ]; then echo $dynamicLinker > $out/nix-support/dynamic-linker '' + (if targetPlatform.isDarwin then '' @@ -296,7 +296,9 @@ stdenv.mkDerivation { echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 fi - local ldflagsBefore=(-dynamic-linker "$dynamicLinker") + if [ -n "''${dynamicLinker:-}" ]; then + local ldflagsBefore=(-dynamic-linker "$dynamicLinker") + fi '') + '' fi From a2895b9084a8531f072b05e59b7099202af07044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Jos=C3=A9=20Ruiz-Henestrosa=20Ruiz?= Date: Fri, 3 Nov 2017 22:40:44 +0100 Subject: [PATCH 2325/2806] fava: changed SHA256 hash and version --- pkgs/applications/office/fava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 7bc549dd0fc..5fe20d80857 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,14 +1,14 @@ { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }: python3Packages.buildPythonApplication rec { - version = "1.3"; + version = "1.5"; name = "fava-${version}"; src = fetchFromGitHub { owner = "beancount"; repo = "fava"; rev = "v${version}"; - sha256 = "0g0aj0qcmpny6dipi00nks7h3mf5a4jfd6bxjm1rb5807wswcpg8"; + sha256 = "03wgggc2lzma1d57l1l4z8q7dsqxlg90alg2p1734jhavskfqw63"; }; assets = fetchzip { From 9bda3f2943b8fb6823c5edeee78328d42072bfbf Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Fri, 3 Nov 2017 22:42:25 +0100 Subject: [PATCH 2326/2806] licenses.ffsl: non-free FFSL forbids commercial redistribution --- lib/licenses.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 1bb153ce4c3..cbd737dc57f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -219,6 +219,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { ffsl = { fullName = "Floodgap Free Software License"; url = http://www.floodgap.com/software/ffsl/license.html; + free = false; }; free = { From 15ea14e5bf7f7aec0624e3a79687199592185093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Jos=C3=A9=20Ruiz-Henestrosa=20Ruiz?= Date: Fri, 3 Nov 2017 23:49:58 +0100 Subject: [PATCH 2327/2806] fava: 1.3 -> 1.5, refactor --- pkgs/applications/office/fava/default.nix | 42 +++++++---------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 5fe20d80857..56a93e99009 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,42 +1,26 @@ -{ stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }: +{ stdenv, python3, beancount }: -python3Packages.buildPythonApplication rec { +let + inherit (python3.pkgs) buildPythonApplication fetchPypi; +in +buildPythonApplication rec { + pname = "fava"; version = "1.5"; - name = "fava-${version}"; + name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "beancount"; - repo = "fava"; - rev = "v${version}"; - sha256 = "03wgggc2lzma1d57l1l4z8q7dsqxlg90alg2p1734jhavskfqw63"; + src = fetchPypi { + inherit pname version; + sha256 = "0d3jncidzvfsxjplzg4cmflqr4mxrbrlj5bh6fpxj529pialpkk6"; }; - assets = fetchzip { - url = "https://github.com/beancount/fava/releases/download/v${version}/fava-${version}.tar.gz"; - sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz"; - }; + doCheck = false; - checkInputs = with python3Packages; [ pytest ]; - - checkPhase = '' - # pyexcel is optional - # the other 2 tests fail due non-unicode locales - PATH=$out/bin:$PATH pytest tests \ - --ignore tests/test_util_excel.py \ - --ignore tests/test_cli.py \ - --ignore tests/test_translations.py \ - ''; - - postInstall = '' - cp -r $assets/fava/static/gen $out/${python3.sitePackages}/fava/static - ''; - - propagatedBuildInputs = with python3Packages; + propagatedBuildInputs = with python3.pkgs; [ flask dateutil pygments wheel markdown2 flaskbabel tornado click beancount ]; meta = { - homepage = https://github.com/aumayr/fava; + homepage = https://beancount.github.io/fava; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; From 4f7c0aed38d0dc3f7f8650d89949b1914b54aef1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 3 Nov 2017 22:48:50 +0000 Subject: [PATCH 2328/2806] ocaml: init at 4.06.0 --- pkgs/development/compilers/ocaml/4.06.nix | 9 +++++++++ pkgs/top-level/ocaml-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ocaml/4.06.nix diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/pkgs/development/compilers/ocaml/4.06.nix new file mode 100644 index 00000000000..b913d169e97 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.06.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "06"; + patch_version = "0"; + sha256 = "1dy542yfnnw10zvh5s9qzswliq11mg7l0bcyss3501qw3vwvadhj"; + + # If the executable is stipped it does not work + dontStrip = true; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7555cf5efd7..d41d5b97f18 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -990,7 +990,9 @@ in rec ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { }) (self: super: { }); - ocamlPackages_latest = ocamlPackages_4_05; + ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { }); + + ocamlPackages_latest = ocamlPackages_4_06; ocamlPackages = ocamlPackages_4_04; } From 66c0193e6b4e7a6a5d8c1f84c34da8e3b04fd7c3 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Fri, 3 Nov 2017 19:29:52 -0400 Subject: [PATCH 2329/2806] qt5: fix cmake cleanup on darwin This fixes the case where the `find` command does not return any files. --- pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh index ce1dada0c47..3f6a00dc1a1 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh @@ -3,7 +3,7 @@ qtQmlPrefix=@qtQmlPrefix@ qtDocPrefix=@qtDocPrefix@ _qtRmCMakeLink() { - find "${!outputLib}" -name "*.cmake" -type l | xargs rm + find "${!outputLib}" -name "*.cmake" -type l -delete } postInstallHooks+=(_qtRmCMakeLink) From 0ce1067b18af17a8a7a36b4570814adbbb8e516c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 3 Nov 2017 23:45:18 +0000 Subject: [PATCH 2330/2806] ocamlPackages.num: init at 1.1 --- .../development/ocaml-modules/num/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/ocaml-modules/num/default.nix diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix new file mode 100644 index 00000000000..d46bff5b3d5 --- /dev/null +++ b/pkgs/development/ocaml-modules/num/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib }: + +stdenv.mkDerivation rec { + version = "1.1"; + name = "ocaml${ocaml.version}-num-${version}"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "num"; + rev = "v${version}"; + sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0"; + }; + + patches = [ (fetchpatch { + url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch"; + sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b"; + }) + ]; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + description = "Legacy Num library for arbitrary-precision integer and rational arithmetic"; + license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d41d5b97f18..a56343713fe 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -387,6 +387,10 @@ let lwt = ocaml_lwt; }; + num = if lib.versionOlder "4.06" ocaml.version + then callPackage ../development/ocaml-modules/num {} + else null; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; comparelib = callPackage ../development/ocaml-modules/comparelib { }; From 57f6b8722945dae5612b0b087f785ef825297152 Mon Sep 17 00:00:00 2001 From: John Boehr Date: Fri, 3 Nov 2017 16:58:01 -0700 Subject: [PATCH 2331/2806] php: fix ldap paths when header exists on host system Fixes #20491 --- pkgs/development/interpreters/php/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index be9aab50cb9..c967ed2b862 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -50,7 +50,7 @@ let ldap = { configureFlags = [ - "--with-ldap" + "--with-ldap=/invalid/path" "LDAP_DIR=${openldap.dev}" "LDAP_INCDIR=${openldap.dev}/include" "LDAP_LIBDIR=${openldap.out}/lib" From 6b7321c42c93f667c7360712de3b1dc576394b65 Mon Sep 17 00:00:00 2001 From: Michal 'BlessJah' Marzuchowski Date: Fri, 3 Nov 2017 21:02:05 +0100 Subject: [PATCH 2332/2806] gotools: 20160519 -> 20170807 --- pkgs/development/tools/gotools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 3408c90cda6..e9a7e7ac891 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "gotools-${version}"; - version = "20160519-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + version = "20170807-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "5d2fd3ccab986d52112bf301d47a819783339d0e"; goPackagePath = "golang.org/x/tools"; goPackageAliases = [ "code.google.com/p/go.tools" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn"; }; goDeps = ./deps.nix; From c3e7e2249b459733ed22a2e07d940c1623381de1 Mon Sep 17 00:00:00 2001 From: Michal 'BlessJah' Marzuchowski Date: Fri, 3 Nov 2017 21:02:21 +0100 Subject: [PATCH 2333/2806] mtail: init at 3.0.0-rc4 --- pkgs/servers/monitoring/mtail/default.nix | 26 +++++++++ pkgs/servers/monitoring/mtail/deps.nix | 56 +++++++++++++++++++ .../servers/monitoring/mtail/fix-gopath.patch | 13 +++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 97 insertions(+) create mode 100644 pkgs/servers/monitoring/mtail/default.nix create mode 100644 pkgs/servers/monitoring/mtail/deps.nix create mode 100644 pkgs/servers/monitoring/mtail/fix-gopath.patch diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix new file mode 100644 index 00000000000..5044aef2bb5 --- /dev/null +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, gotools, buildGoPackage }: + +buildGoPackage rec { + name = "mtail-${version}"; + version = "3.0.0-rc4"; + goPackagePath = "github.com/google/mtail"; + + src = fetchFromGitHub { + owner = "google"; + repo = "mtail"; + rev = "v${version}"; + sha256 = "1n7pqvid48ayn15qfpgpbsx0iqg24x08wphzpc08mlfw47gq7jg3"; + }; + + buildInputs = [ gotools ]; + goDeps = ./deps.nix; + patches = [ ./fix-gopath.patch ]; + preBuild = "go generate -x ./go/src/github.com/google/mtail/vm/"; + + + meta = with lib; { + license = licenses.asl20; + homepage = "https://github.com/google/mtail"; + description = "Tool for extracting metrics from application logs"; + }; +} diff --git a/pkgs/servers/monitoring/mtail/deps.nix b/pkgs/servers/monitoring/mtail/deps.nix new file mode 100644 index 00000000000..6de3c8b6e13 --- /dev/null +++ b/pkgs/servers/monitoring/mtail/deps.nix @@ -0,0 +1,56 @@ +[ + rec { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://${goPackagePath}.git"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + rec { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://${goPackagePath}.git"; + rev = "5660eeed305fe5f69c8fc6cf899132a459a97064"; + sha256 = "0rpwvjp9xfmy2yvbmy810qamjhimr56zydvx7hb1gjn3b7jp4rhd"; + }; + } + rec { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://${goPackagePath}.git"; + rev = "v1.4.2"; + sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3"; + }; + } + rec { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://${goPackagePath}.git"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "95c6576299259db960f6c5b9b69ea52422860fce"; + sha256 = "1fhq8bianb9a1iccpr92mi2hix9zvm10n0f7syx6vfbxdw32i316"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "3ba1a4dc141f5236b19ccbf2f67cb63d1a688d46"; + sha256 = "07sbakmman41p5hmdbf4y2wak0gh7k1z88m0zb72acsypp4179h1"; + }; + } +] diff --git a/pkgs/servers/monitoring/mtail/fix-gopath.patch b/pkgs/servers/monitoring/mtail/fix-gopath.patch new file mode 100644 index 00000000000..9421d194a9e --- /dev/null +++ b/pkgs/servers/monitoring/mtail/fix-gopath.patch @@ -0,0 +1,13 @@ +diff --git a/vm/compiler.go b/vm/compiler.go +index c55266b..a46417c 100644 +--- a/vm/compiler.go ++++ b/vm/compiler.go +@@ -2,7 +2,7 @@ + // This file is available under the Apache license. + + // Build the parser: +-//go:generate $GOPATH/bin/goyacc -v y.output -o parser.go -p mtail parser.y ++//go:generate goyacc -v y.output -o parser.go -p mtail parser.y + + package vm + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0212bd2c95..6fe97f504db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2971,6 +2971,8 @@ with pkgs; mkcast = callPackage ../applications/video/mkcast { }; + mtail = callPackage ../servers/monitoring/mtail { }; + multitail = callPackage ../tools/misc/multitail { }; mxt-app = callPackage ../misc/mxt-app { }; From 50ad5f1c36414c7468de9fbb4478ca24f1b81b87 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 4 Nov 2017 12:46:00 +0800 Subject: [PATCH 2334/2806] audacity: 2.1.3 -> 2.2.0 --- pkgs/applications/audio/audacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 07385e2a8b8..26e58c023b8 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.1.3"; + version = "2.2.0"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b"; + sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry"; }; patches = [ (fetchpatch { From 07cb41b1836c9304982bccb7b60d3a6f490b1836 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 4 Nov 2017 12:50:16 +0800 Subject: [PATCH 2335/2806] firefox-beta-bin: 57.0b13 -> 57.0b14 --- .../browsers/firefox-bin/beta_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 23316dc3aeb..16b59debdd4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b13"; + version = "57.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ach/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ach/firefox-57.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "051daa6d23e8d9559135f89a871372ae69ebb46c143265f72d85a55c5edbdc927fd2be25869815cce3ecb4bc5a4245f6bd3cfec2317e727c632437f377552793"; + sha512 = "07c3398805092ba5d252adcdb690a144f8143a8827e70e3be3cb71175735c9c37c9d0edb93936f8cd1af16ad7a6f988b8e8fe9eaed7e36bbb85abab0137893b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/af/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/af/firefox-57.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b9b936333fc86f3ebf34dfc05d5277a6a2552b427fa26a1e29c9fed93fbcd76c533c3543b3356ac61da808eb5154d83d40888c19a37003dce88c4da64fdec7f6"; + sha512 = "fd954a1ddae090d6bd2c76922d4ec53ef249749c27996fbeb1276d2d82284540a000ad4fe6efbd690bb5e73b6923016d5c9c98d34ac5748c29791187417dd8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/an/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/an/firefox-57.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ed028a38d5360890f57617f8e0d9e02c578f7e786e78de8f2b8a3b96d0915d3369dc398da71d387761f56f6371d3047c63f0d39131e7dc7cdaa9cd6c8dd22abc"; + sha512 = "c57c10028a99df1694897966f54aa6f8b85a6b2d0ed23699542a7a2bbe458e26d622e2de398bf7559bc33e7e4172d23d5aff8402048174a39804247dd8516e0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ar/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ar/firefox-57.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ede95e488ee234430c3694a14c75ab116a29b91d9a1ec4b0676f687ce5a175122758815dbec69e2aaab0ab8ac91181fd4e0fdac545dddc0b1e3b4e7c81ccb648"; + sha512 = "a4417b95c1bec25f148c57c42895e84024153065536a303f8eef7a0d9a7d39d4de8bf287f3af815e8ccb7ec7ec797f098416f78775acc8d778c91975d6268014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/as/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/as/firefox-57.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "9e27132b8b1d0665cc88951ff24b316142bede88677dfbf6bd43ab147db8dd2b7ec44e830d152a2af48805e2a2de1b8858f4ceb0e8ff96d65c7cb769c0463d92"; + sha512 = "5b624b9d0a4ee345d5c7b79913a8cdb48acebae32f088479c0745acee925d58c826b5125186ffa7c017ff3524983bfa06fe5061ee9423c37fb6f0e7323cac85c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ast/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ast/firefox-57.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "4e458e8dc02a226e40314bbce9771330a378536c7176e5f2e9ccfd0f0998d61ce33b234228226156abcd87aac88c01c740ccd7b0590863f6f1da44bea3b43af6"; + sha512 = "efb5ac3daa79a88425401f2bf5df6c0fba90fefd21840723cedc8ebae149816198b727dae67c3f74406c47e01dd2365d1eeb92c39a549f1acba4ba65dab704b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/az/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/az/firefox-57.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "90a283a92da98ebc422f78deb01793888f9df97bdbb17f5e0f9045ac5f61eb2e4ae9ae706026f043535c2399fa476509af9d358093a92cdc344883e40bc4ed03"; + sha512 = "703332727a0db4a51a39859209ce76120cbdde5a00d32a931e118e478dbb5f4a4e8f3d06abfa9bc97bf66a411f533c23b7375599fc0a7f0c13c9d7f518cb8990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/be/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/be/firefox-57.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b16136b9d37ab3a563b9c90be7520430a89c204bab6d9e616939ce88f4d56c395a7670911361f746b9ac62e802e4b791b60ea1e77335c56fe80a0bd27c00fb14"; + sha512 = "d8ad4ba538e2e3f86ad8564e2418cbd34f33d4e89233fa6638acf10a3e10eafc0b81d6c20b585b872c5c00bb6fa2af1ea4097c19de01446a6811e4843c99fbf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bg/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bg/firefox-57.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "7ad46009c3101e05b0285862f61067e68c50a202c4889efd138438721487ad21ae68228b9fa82162730fe41be297206831d5b4f8587c3243397427192f4351ca"; + sha512 = "cb6af38306ab8bcd9229cf1dbcfaaf310108c31e28dbae6b9fc21a4cbdd82baf9fa785a9a94bdacb779c8679721903bc721a0e7ca2a1a09995fa97f1486a8232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bn-BD/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-BD/firefox-57.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "24650ce5b04485512f7af58b0c0428f9aa442d28d614a2dfc2e427e33b35e442d0310ce3212a0750bbc0e5ab79aab848218c140edc49b7be456fc2f7f33b01a3"; + sha512 = "1739ab1c4c1a7387dab56fb89762b26d8cf279c14a7bbfb1f7f888e9c2c714eaec84aba12f1384defc7974e207b506e206f980a8a68be7f274cccf7232f30e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bn-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-IN/firefox-57.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "9c48ad3e4081edf3c1b973f161fb9741f2f37a125ba5e63599698100c26f529c727fcb828696ac3b1f54fa299502cb4c537f15be6c696eaf51452c1cd0eac61f"; + sha512 = "358f8e3c1e9774fabd6bd8faff4cd2903c0e0cae6e5e6ee6f2ceb228ce7d489ed9112eb729a4f7d0ea25c377a2a54772279ea1343cec449b949688dfe19a69a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/br/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/br/firefox-57.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "022d5dc1a4e4906375ca2b425d86636ba6cb91b5bc60459938e9e77341c886c4aa7285f4b52e7be221149519bd3bf72d1b4540a7c62cc347e2beac9de3d6c953"; + sha512 = "df0c34c951d81d500a0720c2a9cfda76831564dc45d2e34d37b677702414b2f53710fe4eb7f63257658fd058ffa648a904aaad4d864a325a1b1e1ddfee2faf32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bs/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bs/firefox-57.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "9e4e388f43404eb98e68349ae95bf40631fbf33670d4a9200f60d9ab25f8dc2501d4fe1aaf6f95d9ade80d790b1ba53b78ead54f2cac45d7a2c2d85e505a1455"; + sha512 = "091cffc15f609bfab74061f13c526d4c13946e7b79d3a190ced0ffe2fb9aed457e1e1780d9c152699f4b42aa920d9bc77701eb944d9f9671b70da3278fabde8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ca/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ca/firefox-57.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "3c7e6f9c11ddf88900af2eccf8a22524f6cf74e5ac27464f8b4ad19849ac30220bc6eac03d79e22c349eba9e170ec379071b258d6bc80e9178dd1ddfe0aec965"; + sha512 = "cd485d1202daeee2e24ca812350ce348ba93a0bf389741b13ad6aa6a81ae4c57007ea0b312e401fed8c268c8a86b5ccbf62ee25d2c1d8d787f16e92467f3c136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cak/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cak/firefox-57.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e5f9e7bf7145f2b33a0c59de6c576f82bb857ebe85335f218cd03ba005816c3e8e8fff03d5b6534885d796ea523696423c70035e62bb6a32bae4e4b7c1d79c71"; + sha512 = "c5573576cc70d776f3d40a2451295ad8a6230b0de280b0a2a3dae7ecc2c1fcc2eee5fd5e4df91a2b1c9a63411263a4a55f0bfa605a0688cbfb10c341dfe4eaa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cs/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cs/firefox-57.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "7e527e7bd04cd6107ec92d27f0705ebcf8da8117c84e61e13c2026dadd2ac3a888c9e3bb86f51026f19b10d06365bb41d48bc4fcbb08d09a88b3bb01e9637967"; + sha512 = "771141fa3d846651448b158d8ad583a45dd2fc05ca5e3ff2ca19687431a140744707260b3ad9e304bb2062757ef333815f69e10a48e72308a802f9088e24b22b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cy/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cy/firefox-57.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "287df6655c9793da325681baa13fc4c0b9a5975f0b13be38d8875838a762b2f435839ef5893c6b6a3439c225994fc64060f69edf349d2a9d4fd2d225e95fd1c7"; + sha512 = "7fd6f5eb9473b3ee68a7a2a98128c205df6654bab21e4c19f6ecc1e427dcdca3b93e9ff22239ebb652a545a3cb8892782e34cb876ada78d604bc48816960f897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/da/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/da/firefox-57.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8d03dae91a9cfe20091a2222eeb0bd41f3b3541c5ef6520a17a32187974daf8584e1d69017cfb99d2d18224ffb287f586bdf1ed678981a6b6a3d16ba9ba4a2e2"; + sha512 = "30df907a7e99f41f9291d2e677e124363a8c2f702e90db870e2ccc1bbabec2266f0c64fa3daac66c5da1543056d1e3e1e8458dd4627cecfc0a9090ab0aee13ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/de/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/de/firefox-57.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ef084c0d0efcb77cdef1ffc0cb994ae6c6a9484c36282c7d9914b2d3e8599c8f2e9623cfef1e890a7d4c4feb6fba1c091937877ae8ea1d654a9bc824b5c8bf12"; + sha512 = "bce375636ad043e2a9e331ecf84154f5e329217b6c1697ddcf17301115f39c6f35b88083cbec132f92fc30d93b414a8a913ddf02ff0c406295047d5d11a7a3e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/dsb/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/dsb/firefox-57.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e08b193db4230efae96862a6a9b62200c42b03667c3d5a905938375391d99eca37716cbea561341ae76547be0b5ee94475f9ca9faec64fc178be92236a4ac91b"; + sha512 = "0b75a555b9b02759b4315d3f77d78e71f2106db1b2901457b54e7a487b9f35a0aed3b6f47e7363257b2bbcd42104783fe14bc4171d658515b72fb61bdf9b0fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/el/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/el/firefox-57.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "db49f80f7c08322307dc5cd225d2dc10a3179ce4ce25723264679c1c78454fe1c701ebf218a34704946a1e7d042349d0fedfae5b70b1c68b5100ad7cd4ae4900"; + sha512 = "f4592a580dd7fa207943d071c92816c1f6583f579e8a8fb6564da6e95c0edff1c7dac24c581e25f874b354b55aabdb8fba17a2f4d9677b653e957a66360fabc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-GB/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-GB/firefox-57.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "b2cc8bc706e89390b500e6e8e3bd548417af1b0500aec7ed1c0ad79245941e20343cbcce80b03a2c885c7134c069e9f3d459739e6ea2a62c217a9f4ddb8851a7"; + sha512 = "56731ee2e83a591201471bd6236a247a3a5713607344ae8a5c03efcad4f69eeec010dd89c1fdd6329325768a4b9a83ecbc278fc503a8d61244523748d0a8fd06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-US/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-US/firefox-57.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "621828144f0421ac2a3d5af1cf62a337d23409d26032d4c2518e99b0d04caebe1efc67c50f2b692612facfd5927cb0b51d9acceeecf9fc4c2129e6a899c9ddb9"; + sha512 = "cbe3a6ae2dc8d89ebd935d2c58d3f735ce08f45418c31f1faa9f75d75255a07fa87d9b7d53f571bfd876701b566e27cb8bd761cd167749e2019b1f3bc1fb569f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-ZA/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-ZA/firefox-57.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "4dc4822fbc6d3027b9ba0b93b126e5223675c69c9e36c22e85681ca02c97fcfb9f9ef7dfa281dabec32b93ef8cb619ccb74ca18a3ebaf55f64c5547f5cb97c08"; + sha512 = "f5c32cbea6753f4325c7cfdc99bacc4565b58b0ffb7cdc8db6d559922b8402493b502e7a05fda4e08746d48dfa50ca7b70ac27e152ceed3fadb9d2af2ac0f639"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/eo/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eo/firefox-57.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "8eafe225337ad597afdb9a90caef3a252f9f467b6d0988f63d92ea35f5d284431c1ad1a29350d9cdd83f5108649d4cf05de50706025f8b2e2db55955bbc8f964"; + sha512 = "89d278965fb4c7899abdf17f2fd1dbde201c959b623c46ba4db51628a3a09c5e054a614b8657f7f190ca5e9cdecced24f126978425bb38d14c84770958466bb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-AR/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-AR/firefox-57.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f9837bc84534f1d35aac94c0775fee981b9c7e5031bdd2c78b5609406a73cefa5797282aaf122e2eb772fae7baa0dc0714413c1b6d7255145fef540c31b89183"; + sha512 = "d21ed37e2d6461f31519d08040b271e9a6d476e7132f5db406fa3eb3fdce67384af376a89d740426fba12a5602c20a4d315c0e337f0707ed7b91d739b648ad63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-CL/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-CL/firefox-57.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e7fd613944dfdeafeee8877b77cb78844b1bfd1d5469dcfdbd90b6a0ea08c98f4fd9423dd18ae1333b90b5717f800a446f8d237de34a8131cf89db602b72a846"; + sha512 = "bd0dd077e732c996de27e5fabd22933aa1c1ff448425bc757be909ccfdf7a8a2f32944721a248e4998bf9d455fcce13c22a89dbb780c3a61d8fb06745075b122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-ES/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-ES/firefox-57.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b571a99b0e11c8b4fc202cc720f2f0850b54978bb98ca9a6fff2cfdb6c853c74ccb8f9b49cb14649cefeca5768ee408e6ab8028bf005be0def9c519ca8d14108"; + sha512 = "7abe774d7c2baa9e055c382fbe4612244e9ce5c778185e86c1b4e8422ab8af4f99a949bc8560109e6995d8101f8563e6251643a5c6e4ff1ca9675b064e1da580"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-MX/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-MX/firefox-57.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "fa46b9751f8548ea3724867a2d41cf9aa62a7416fa06ab63a4f59e24c45a5bddb84f982049d1cdb4d0ef3318aef46fb25f494cfc3be203165ba125234c9619ec"; + sha512 = "4f4c6a5cb3fb25a030a44f3b7c60d6a1af77b083ca4cd04711ed4663e276f03ac92f4b8be697554af7a4721641fc7588b005e27f2ed2c5c1efb947a64cfae8a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/et/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/et/firefox-57.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "21b6cb415d45f53f8c5bd63a463be60ed05f55604d55dcfd0587fe023653d4736f1945f1f5d96bd97718b8ef492fb2901fe883ed522db4d9edc805af0c118013"; + sha512 = "f23d6cdaac6a412c28c633fcd304833bb341c159090575b8f8cd7bed6068a3ca3497cae072d831b1ac40ebc98853fec978a09009d3eaa5c1f6aa6bd4f8c3b956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/eu/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eu/firefox-57.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "9e341110f6c2d52182faa95f032090b2904d734efb7f4472f87ba77b6604287ebe21c7b1502f71e107e285578cb6c0da6dd95b45fd27bc28a16c14735725d22b"; + sha512 = "1f7f209e1faafd254e607c7bfceb5b1913c59361d55bfde394d2af4f745e0be54b7d119cf71a88c577dc76f0ca9a96fa52cdb38b27ed5dd6d270eef5efca2501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fa/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fa/firefox-57.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "15085dcd3803767b4161fb6b3e55af4c29dfc573ff2ed24dad02eaf001e657e3ec8466e827df472cbb89a442e33641ad422f11b7d663f1944a0f5d2fb94bb305"; + sha512 = "e175dfa91bda0daac8854d999cf3770332d61dc11ba338ba8a9c42718e7d470e07dab656a3a13ff25f4295df648196549b4a3f4b273061c278f03e0a76815213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ff/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ff/firefox-57.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "ccb9d489fb9211c9cabe344c65ba165f0aaa4e1217e4c60860c96e7d938532d1602a4c6d885ab5c934c744957a060cdcfa4203c8d93bdefb4f25bf938a4cc1a6"; + sha512 = "243c09586248988625ae347ad10b691cb5f93ad78562c3223a244403a5ad41b138289a992edfce91a8744f45ff8a2feb008ef3dfeca608fa2cf44e39746bf794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fi/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fi/firefox-57.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "306668c5cd48f4c0c81e2a160a6703c43ab93d79cec7c9b754425faac9441edd5cddc1bd67d743e577a5c7aa2db39dfb2b5a290e983713c8de780e6596a720d1"; + sha512 = "66ac96ceef9d36ab4c16a288da714c9bb9dd72b12cd814dcdb3740135ce6d19f18ee564c31050b619a1af207d086674ea4f60ee01de3a18eb854f35af5d3fb8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fr/firefox-57.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "099fcd14b1cc7429c7cc4330aa7a397c32acd28006732d272a89c2a6f5c7b1a0a0529734e24fad308c26fdef6418aac2d1b386d7e7dec8ea19a12490cfe53e50"; + sha512 = "7a9398f8753c0b3d6777a5dab4c28fbacc493883e5326fcac0cb0a0f62509169768355a5c5db377afa6a1ec79676b8de53ccabc49666ac9830d588ad2c8bd8eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fy-NL/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fy-NL/firefox-57.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "688f6d9ccb1a130181e154ed75ffa71069348f82bc20ac649e5aabf69b31a65ba022b3a28d2149a63941bb6287dc8e14946e2f7d9d5ce8f89432c2a32f5095a9"; + sha512 = "b309d91af97a94246c9450eea61f81cd8f6e8564bd089caab7e1238df4855aea54568ae8d40c3c59e09729779623f1f488e2b18f05094ad79d7d773a82196eee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ga-IE/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ga-IE/firefox-57.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "fdebffe1190222cd5b3955e54aa49286166366d910f1b4471ee36372abb7d515b22a48fbf2799abed4943b2a3203c983d0906cac6b5652f507c58778e8d98ff4"; + sha512 = "f3b699c8cddca58a8610aade833b470e006a804606ecf13f166239f32ec7fdf0ae57e6f91d3a104efd08fa9cb34c7d78026753d0cc235cabad8aed8ae85ccb22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gd/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gd/firefox-57.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "5a957ebc86c7e305afb0e0f9e91f2c73b52b7ed2b65ca8c372cbc0666a86e809494e7deaf5ac4caaedd60400e8a82dd9e3773ec3aee04daebffc7c91a2586b08"; + sha512 = "261b14e52513485a14d4c92f580a9deb228dd730f77911dde25785b8eb7974a1fc6d39b6d377a3dabf3f488f9d29892aed86c38a115aa4c9660b27a229a512f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gl/firefox-57.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "024ae0ddc5fe5590ef8ed4153e298b5a05dba17fd5a4d6ec78777969841cbd284908d7c19c36f6290efbc5ce1248c3f24c0cf4418f524166c1407199a6b5de90"; + sha512 = "6028afc50364a4bc0e21fcf82181b3d6ab44a985d7ed55fc090544d25c0bd65ba8737e1b653e9cf860f201c6c3aded33693c2ee7cb7229b899007e9a607a39fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gn/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gn/firefox-57.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e6b36e68cb07c4563b350e4af1fe511ddd69ec05fe027809f5561a788b2fcd95c88bc8eb8d67618bb1769f10d11a75898374a433185de49e09554eb948b2aab3"; + sha512 = "a189db0e527b1a69d1f42b23b5898224313f73b269ece12bcafdaa9204cecc2424660ff3543098cd6036ca17c724436fc6cce9fa7f38376dbd35c943f56cb559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gu-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gu-IN/firefox-57.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c8e3f732c6e91893f07821a2cd9d18e3c5effe7551434cc311455366faa5891afdd25b6d83b5e4c314f3d4f5c01e499c5d4823b332a120bc07c979dae8f171fb"; + sha512 = "59c9e99ce0da07aefa433b76a961cf8b9294b30c4c3198ac7c8cee5d430c89a10058f614f0955ef768d1e0c12e583fb98612caad4cd48389454b9878bbb08667"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/he/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/he/firefox-57.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a7192f190a83f5d3d1f300a072eea4396397fe02623daf9bfcd6a73ad2b8e89884723d9596f0be2d3da655fd937469f08d65e39037e3b7168edd28c8c23c10d6"; + sha512 = "101f7135364f544517674f8c0bae2d16aa600798ec7755f4e02d0827df6920a60c19fb0d2ab3dc20febe1e9dfecd192a64fddfb2697b825ac940de530383ad7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hi-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hi-IN/firefox-57.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "30a355f58c9419472ede2713101721509a8c86c6c363693c256553cd64800572cf0eb000c8b2bcdfa788ea8876cbf6b7e8a86282ae1726eff4bde93dc8b33a1f"; + sha512 = "dfabec31fc6170e3390a313a6f201ee51930c1e1c884a5e1b0b2107a2a3c1d19753c91404146dbbad9dc572f9828e3196e6fc1002a9b318b3648b1dffe2a9cf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hr/firefox-57.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "fff70e068a744e89e28ede72398d60b83decbc908c6776b23d8e532b4630a9526411a62572882a596241a7b6b6550766f3ccf99a5d044d7fc14afa52772ee270"; + sha512 = "2dec6c07adeda8008e3d85b6552f29f882b1bb9b89a5e03422126067ebf9eda03e0272f31464c42f8b9deaea174c26b1571c1c416f1fab63a7e67cc0bfc2c136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hsb/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hsb/firefox-57.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "aec6950ed6cd9b357bdb63e5edbcab7b42e76a72e44ec370380d2b5717db585da8060620eba7290880020b1e6325f134f001163f2ce7719c50b83e6a5a2fbc91"; + sha512 = "b5dce6117e1c964a612708263adc5533d8a063ad6586030fda1a214c6df887995f7ae7782039f063786bb332732857781392c16c646c29d9ffc53fc3c8cac8fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hu/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hu/firefox-57.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "912b23344f96d37bdf66775ad933ac769e19818ccd178a6ad97b815228670c053111dd623fb98de382e2c2d414414fd9fc276f4aee5a00a439dfe235452fb16a"; + sha512 = "fe5654e089d50c099aa3cc9279c0a4a3e975a3e10d15b9b832249d082f95d461cbaa51f5851c3f4a680419e293fc9137b1ddf275ad376e073090db37ed92d888"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hy-AM/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hy-AM/firefox-57.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "04b2e8ae9de10cdc2aff751c5954f190ec749fea27ab265343b73d762e6e9ef6d96a7136cd9354988ac791ba7bf32661b5658fb490f1d80907505923bd7a70d2"; + sha512 = "9678679c8bdd32131fb7397a88098028a955624a68d59746d073671298a3ecbd8d2933675ba564fed0650f44add7fc1135f441a3edf2ea932cfe6fe5b2ef5d13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/id/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/id/firefox-57.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "834087d98921683d0ae7216b6264c7dd7b77568b59e4739a7464f065328d3efa8256f03e9343177673ef5257db142466e3803936ec30a8f6902999a71c0ad163"; + sha512 = "c863c503ecbd71f17c311f99d94a86af12a57bc1ce0beed6fd0d0ccc5c814c25e5636de9127610b768fb947a0ee48ea585e1a205e1646ab20d2f6c2044b67618"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/is/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/is/firefox-57.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "2a8f3b35f7c1f8adc40504c3460139ae7959ca9657f899fab9e73eaeff5d983996a33d284d058599406d4d46ca941cd9969a7e6152650f6ecf6165329bf2f350"; + sha512 = "7fe2398dfc0da2bd215867414d765729e2b30620930ee1f50b98a348f6e6fc098c952d0c5ee200dbb51a84ec82f4ee2fe8b01c4a6fc879d2ebebd95f39f825ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/it/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/it/firefox-57.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "6b04fbe6ad821a68d7bb968836d047fa08308a571fef1d5ef82d4719841a7b517362f706f4251d4d60fb084c06af9ebc671a8c131e5a403a21ad9190d84c5789"; + sha512 = "043b409173d097ce49eda0e16144b3f50ba7f7a83ed679f8fd09c26d18914681e15b68308ec6c65aa09f26afd195b6f8e5afb4e2276a5717b716280450dc403b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ja/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ja/firefox-57.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "9dfae62887b03ab6a963547c1f4c4332bbc4469bce62318fbdc439130c65677e9e0328942b49b37d251aee45b56f474aa5e1ef487244ec61561217f1e7f2bcc4"; + sha512 = "9c4391e27831ae034624f22e8643922324b7940f2b6c739d1c6b5c47449b83f2c8756b11efca47a42820a867248efc023876e1218327f1c8e80cda0c960734a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ka/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ka/firefox-57.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8f1ae26d22d02bd3a1aa21cbcd750e6003f13fdd1aadc85114485cccf59f300b962a729016c3dd1611b8f32333422318ca806b7dac1a790c11749c909908840e"; + sha512 = "490c43518d3cf1320d9a3e8f28c70908b31a5f9ed01b211f4e53aef67baa279eaf129f06ec6c21efe2fd4a89364f55ccda95847f058cb2f83fd1f92c466263dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kab/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kab/firefox-57.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "28a00d36928bb60a2c65eb9e3866b8ec1fbe76973fcdcad78a6f00aa601e4990c1ea96c37984171577400dd511937011957e51e4996fa64db0600c0c3cadb810"; + sha512 = "bffa144bd5c6c0d3fcf9c8d44c679f22af1127734ac8934a5cad4d5e6726978133cc99c61dde870143fcfa0b07c146c4d7a84117178e01083a0c37d9b4810184"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kk/firefox-57.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "76361b378b4b2bd2a1e31caa344491868188155caa57317f46c9f89b9a77df5ea65f2d4f8ddd2e8cc574e602fc163c4d671de932938ffbb64a1e68a7fb51bd51"; + sha512 = "5b49760338013954ffcc3ae2c9c79b0d9ebd92f1a148188249559723bf23338a7b606b26f5326b48e2acb15e7ce023f4dd2a536c0cbf5b7af8eacfc33f3be670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/km/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/km/firefox-57.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "abd176c702ab4f1e829e23a4fc4bedba45724ad119d84cd18a6d7d2c8487aed690702709312f5806f2fbe82076215e55e3e4de3cc8cb56b33079d4ab7e2921c1"; + sha512 = "7ea92ede74eda15d9a77b6b22a02a634364b60bff135da5356991644f474a47c16283670d24f2cc28d112c97f3b49fcfacb1c618f9caa16fb013c3c650b50feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kn/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kn/firefox-57.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "62056efe59a3acb2fdd04eaa343372b7b2e1f974485ca7f122d6cd9d7d67159f2a4361aa01c68cd11a93cc56d807068842b735b74e596b5d218c952f5e318658"; + sha512 = "e3d3ad10a374421603068c420e2c5c28ee8a9f9b822df556a1237eccc54a778ca572e09795aa9022cfa373652cf2913c621c2fab82484f7eba77f56305ed6aab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ko/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ko/firefox-57.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d1772efaaa2e2f42bb01d5ac39187accf59a235327d5d159866c5b80d7d54a867aa496d63fbf23737d52b976f0be8c35bf5f6045f0d69eb5d5af5e67b6202eef"; + sha512 = "a681d5e49952f1e671e0c86854102979e052b84140002b968f791f4a325858985751a3872446ae2495802ea0c1df884291c8559a573cdb236cadb7cd706ce718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lij/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lij/firefox-57.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "a45f3f8181906382f3df68abfba8682fb43db58fd7b6846eb3b64eb67e6d57971cb83ed6c74785e19807be06dbfcb7b003c67b800292cffcbb1b42c812bb034e"; + sha512 = "b33522bc78b07958a3b5b80bc0833673b1516652de2a165f5bc7ef54575a21af20a922e207be02c4531f64503e97279dca4ad4833d2eb86a6c04f3fd1fdae7f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lt/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lt/firefox-57.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "101d43ee97cb635073ea9bea836ac0aaec514fb5b4eb9b821df0f48d527b89745907f557a96339c19ebd152639d9a4bd745396bcc97c94e69579b177f9c1d7ce"; + sha512 = "ec27a8aabc0736b410509a9fb9706627e06316b34a241639ae27108ba3c4945b4ae675fd85da390ae053603a0a13a124c0638c11c0750c665c8226446435bfec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lv/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lv/firefox-57.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "74afad1dea785fefa379c7eee2efd0f38673a632b9232102a02e8fa7591f89b0c58447362205b23638b54fbdfce90a813c111344ab4569f57b21bf3e3894b4c8"; + sha512 = "bc4b125320ba7033946a290e0d974cd4a4f517ae9c9e2a24d86d28307476fbcb4372ec0cfc567d984e90d105cf692a08100bcec81e4ab615fff19ec0ced0096f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mai/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mai/firefox-57.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "4b87cc59533c6b9d3f131ba533314f5c622efba35084a8ca6b67c4c63b55833a8a3ad9a72ac1371dea86e39691a6670a3d38952120ef8e3af712a72fbf69caa4"; + sha512 = "2aca4d6ce673fcb71a8c6228e243157e597573d152d05bebdf8b9df3bdb479dcce1708cdaf2462902c5ed0b7eac83a9dca523bc55a6bf6b2a9fd1d4582a3d68b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mk/firefox-57.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "dd85e3305ef45f319211492163215f2f4140091d33422cf9bd01540493b13c9fb923a0c64aacb2639682a79cf6163fbb6e559aa29fd6dbe28f22c7cc0a1398ca"; + sha512 = "22fd8e59aad75508702ea3fd37af4261f864a76e943cf6d07789d4f1d094d7e0d5e76e5d4c92b6dc642e0f30047d4515d8520bab667c05c16aa4ffb60f0fa168"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ml/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ml/firefox-57.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "19487b16d24a71463b1227a450648ad0f7a0dc08b6a0ba69b99d87387bb2c011f7139031eb09127bcef5c5e28be90b8bed4de449af4b2180e900cef4c7e26218"; + sha512 = "f96568186cf49bde7ceaf36805277c0cf4d75da2d5930227e625e2abddd5b740df4207ce53abac24c77dc755f52132204b945fcd7706de4e3075505635eae9fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mr/firefox-57.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "7a71d953b192d2453698318f7fcfec7e4a1a08f893094891b446add05a0a570df3db76a1054c296d723855e4190dc2b2cf84c953fa97486a8bcdeeaaed707bf9"; + sha512 = "82fbe7593e52299dbebe38fb97126b91f57e48968c7235d8adba93776ea6c6883dd8eb5df3345cae55d156a7bde2004f1f446339e46de90c85f1525eb1334147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ms/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ms/firefox-57.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8970064b77ede1f1b52a974bfc7bf543a203943a3aad2f42952669e48e1ddb092ac47d41704364802129501a5e0106e5158d6650a4ae7a84ff07916ff61af07c"; + sha512 = "3ece240f01f8322a86d1b8861be25e895fdbfc9a024406727400e0d6cee8efe88a11cbd6799e4b7d0d8396cad80a6a7438d4f0e3b641f94396a7d2e80be06e02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/my/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/my/firefox-57.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3681f7a89ff3f099c5a387c9bc32880e3935a68edaf004d97ce492a271491e40b06d28e9afe732163f94d0f882a777ce8655ec0d9aa61b5a3be53792661857dc"; + sha512 = "9e670ecd9628c8822f634031dc7b6ea2610687df8967591ff44a3fc2922fc11bf84575811e9e0f51997764d67c357de5020619e3f637e31c3421e64b533930dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nb-NO/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nb-NO/firefox-57.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "10d807437bb0f40095486c6495be4460bd9f10747243576503faa78b3212b71a893b4dcc1bdbeac2cef0ffceda288687033d05db9e76576e6ed049ebcd0a547c"; + sha512 = "298d7d24c92a5f56f00d7d615ffcaa1b483882f5845f3de4bc8be2811ec6b5808a2bb813ee9d9b8aaac84a6c6f7bc600b45b7c22480e6c4c111fbe815d46e70f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nl/firefox-57.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "31fb0e57141696f5ee310fff881e811e23c9c1d182c898cb8be142db54ac268dcfcb8a0e865ff5759984ced5e0cc9b87f64b6b27f5ae82c04b3011c7460694a0"; + sha512 = "c59787d50bb14ecee498e9c454e3ab79571656160761e95a53b41ae8196093f6dec3f435d9a69f064b9c4aff0bef332e2d5334153d98c8984041e26c82ef04a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nn-NO/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nn-NO/firefox-57.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "386d209088359eddfe3d68eb2466b491139e9f372a424e8509e531ebed8901fc098eaedfb11a2d606f22a940a2520b2da7ae9c6ad8a1e6dc24e5b4efce39b63c"; + sha512 = "c7c9965a5810bcaac0f1b0d08ab6a9d660a00e40368369998101c2cf043837459e6e65078906c0278564412655a76987f30b671bd90edb25820362c3a846b1eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/or/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/or/firefox-57.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "8bc59e0d4ac62b1409616512ba15ff15bce172e27f161407bfd11668399692a53d362e0198b6c0b137d979609b6b534ed63e1875747111af0faed895133f4b4e"; + sha512 = "bbdad4aa7743a1af3c31eb81003612d0729ceeea5a0303f129f24e352219007b55f40a931a0140fe1b1b4cff694572d1141779238881376e77f30a3f3675512f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pa-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pa-IN/firefox-57.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "b25496c3795ec349989b6fac8cbf055974dbee73287e9550b9266ef475a979f7589c8b318a9c05f4c324e69333b943382f2ebfedd0cc8c8b6d77f823537cef0c"; + sha512 = "99f5ba6937e08c2cb0f05be9b8f2e87e1f27d5ad610540b3011cc2fcd11c2a7a84a1cdaea9b6133d1c9a38311eaa13221ba57bdb444c9aa343c446abc41c986b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pl/firefox-57.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "762e795c44733f161b2849a7057afd2b47021312324565c39d51a3b06634761518284eac7d34927c7e650c1e43179cb88b80396ca91592603ce737988c197533"; + sha512 = "956648b1f331356f8ee31158758fa0ca7cc7685aa7b20c1833d87828f5f4d695fb3fdbebc55f4862c0f76afe72ea6035261c9ebaaec2561d728d61a4bf53ca9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pt-BR/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-BR/firefox-57.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a278133a771f43cf8fd48ca4fc06e324ef3d9187518ba1405c371004b94e608c3cff839dbda184b6c23c6818f8cc55b192bc9118f19e8fbafd6af0b2f0d6b611"; + sha512 = "528a30c7ec5c7485d0a64b6787e0c14c66f832b2289884ff234799631f4e9c6d620c3312ca3d1872e28c80c7a192b8e0e4d0b9d88dbad610268e9d3fb37b3a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pt-PT/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-PT/firefox-57.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "f56e9591b8eb311484d814723a9d7eeb66914cae8d9b74cbe12f8824eba898f5fdf072e3cf0384deef3087826225bddc31c9a92e11906a05f6505524a6e9c7e4"; + sha512 = "c70eb4dd653d035fbcb7de8bcc78cc1855f7d6dde8296a825d733a26e9c44e38c8e77ad54c63f806f12b90c601508bd6376aa620a1e0948c0b265dde3c2443ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/rm/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/rm/firefox-57.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b0021b2b2c26aff1ef7bc043b64ba39e4152ed3ecb981cb8876d4c15af9e157b30cf9cf92481f76a4071f9407312a8a02a20cfe7223a4f20ad9cea46ffad3343"; + sha512 = "c9b9f0e3ea90fe7e2d5c2907d82e7ea5abd5f30212f1fc5e726dfe72adbe3835107cc836e310ee4bcbbcb6ed6a08bc8bea06d3bda08d1fe7a08ae20b6a22bbdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ro/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ro/firefox-57.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "dca26a56abe6f6000e755a5df7d62245bea47964ef47bd0c5ad0283eb6b04c235e225e66bb54c979460188ef9a1c870d9d53b2c185e6dee2a37a36880cfca6e2"; + sha512 = "6246be75562143b57f27de69e39f9c82c7aea3e60d515cbab0ed5e32228f5b33abd61cb2fa7f3c4e73c65a6dab5ed446a0eaaa94767e0196d5b337e6b5a410a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ru/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ru/firefox-57.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "26eb37a11bd7b484617d29432c67eb62c84f4a7aa1575234d284e39a23edf1f679532f818f7f4c64273d70bb400e52f327498ccc8226304e0e859fc7daa38dec"; + sha512 = "467a4adb72e27ea95d324f52007e18c3ea307b7ff158a4e58bba69859f5369fca8e7243329e2bacf590f35315402af10d8071c34886a7fdc3cfd6e0548653aba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/si/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/si/firefox-57.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a7eba6aa32b73a64b7b21447d7ebbfc25ac21c9cc353d06fa9eb1e6b5e43f2673f125abdc662e8296a8254c96e97e8684a8408d712bb201eb1b9ee494aebcc23"; + sha512 = "47b11ccc3bdc373f3591ee73b84edcb9afe915f1bdf5b7abe65eb2ea675da44316a4ee5087c0c4e69a90dc337d43e201ac15b98d04a0ad970f8017d737e4f738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sk/firefox-57.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "da4a7e40f4063f11434616a1130640b663d1c73aeac6a8638a281174df890f0dec105fd8e5e0200dadf8898bce7adccfca5b059f35773abf4c642ea1d25ffbf6"; + sha512 = "c7696394b76668733814f1b2cc1c41cbfd962d4d58e424c041fd419b3da2559b1f4057a8aee328e0698ec8b350e7909ce5da3770f287ba485dfbcbeb3d1de9ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sl/firefox-57.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6d00fcd3f71520a5924772f0b04f091a3abaea2b481bc2f2eca793330a8a9600a7eab38c7b1a9bc575cfa40c74fad56c6f3847ec8edbfed3364a8b7522e23c1c"; + sha512 = "aea6c90fe73f9aa1340de0ba8207089deebdfea21d5fbd5d5c0ada6df26a4acb4349eee4a7ce09f9088439cf059fb7fcd6169cb1c34c83a33c909bdb3ed7af43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/son/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/son/firefox-57.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "0484c6de79a605e94192369aad55850b6897ecdc44912204fac58a23ecbedb8991ea3f670c3794d1cb1f311578db41ec518ae030e16e5266b2d802120bf151b1"; + sha512 = "6d3a9b05ea14ad1281c51d99757475b6642a5411b7b409f2acba695c3c0a5719f4feaecd0c56713899475501fad3413fe46f4a3efd482111aae2395df22b1e25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sq/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sq/firefox-57.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c5704bbea312df025d1e439563b358ae5115c0e91b82755c8a895194a04a5ca349da96aac99db11627912c5440a9e675c8bcc14456fb14bd4461c373781c2151"; + sha512 = "9e7639f9fce27b4c3b3fa265e0662b31360313569f1fad798c89ad1eca1944827c3aae23c283f4e153d3f81a73d235b5fac56598cc02dfe2dcb38aca806203a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sr/firefox-57.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "27a3bff0a5ddbcd0905fc9ba69ea733d6a6c14da78d1bac0448b6804b8cfa8668890f2a1e617b17e1a642b59795c11b82d1ac4192863f23dc82adbafe2078714"; + sha512 = "d84980d2b454f33a33fdd9b44ea7e2c41a73a351492fa7bd951a8e4ec288a7aa4d12ae362443a664abfb554693e8a8f5428843b28ed48429de3d32575f94ea74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sv-SE/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sv-SE/firefox-57.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "e762be3b52075b4050719634f9e68ae86faf55295803535c046b2abf05ad6f695a0695311705b2293f79c1c8ce69d69b39609f27be6d0af9b625c0d9368449a0"; + sha512 = "b26deb242735a3fa662687efbb8a293e76561821540ad701091a8b7033c9c1047459fac955815790ed026e4f69a51d2b0396a21102a79623b72f5ef8cbbd06e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ta/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ta/firefox-57.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "cc0570a17d2325faadc7b1ae313241935588dcb1de8d6a1224a583fec6511a34d2a7ac786bce894f1a4b8b0b92d2d4392d8b4f7d0a0db9d31378191cf1ac8dc2"; + sha512 = "1e98d86b9df418542dd15a204ed70732dc8111d8fdf34edbfee8217460e04467a822b66804e9876e28f15e9167ec5a6dc1551c4159c136006392feb7ca218009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/te/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/te/firefox-57.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3f6c7e8612cd483e209c95ff594ebcb0fcab2b03d3687c6a2cd8832bf512b85257e0ee5af2aa1426c6b3471c6d00910447cee91d5b45d5a5aefed0beeaad781b"; + sha512 = "d22b7c8b45d37631434007b196c63044a860912826cb301a218b0aebab5ae8283370924a703cebb16a98a589336e024b31ad580b6fb57ccf3ed53f238e361704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/th/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/th/firefox-57.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "2576defc0da691c1a3a58387cef996e031683de1d0a1a0f928692b5982b61e53cf01953d473539e8afb5173d674d9e1ce82fa785307525a65e9af062924ff0c0"; + sha512 = "8a806b68e3e5d4ba884bb9f72bf07c2bcdcf33a8111236fe837a41738e997116d092ffe73e4028dd7429c4bb0f097270fec7a20ff3b5bb316fde0a90af92d22e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/tr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/tr/firefox-57.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bf5b69d5d47c21bcf32ed5e9277d59d09cbdefc73f750b957feaf0f8aceb184425ea6d87e731aeee01bdd74ac42243eab0d781261d63db26bb57ffc3f530bb8b"; + sha512 = "9b1e73d28f5f1fc352f830aa59612170b72dffd7ae060a8f2422ce14ec46f9e646fe625ce36dc4d380fb58ba0300c68a83f2d8aa8282100f6ff33a43ca79d807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/uk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uk/firefox-57.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "eeae9bc7f51c8827c07bc140883c672455088aa9cbb5c4473399f612847ded8e95f61b6c0a295c598c2a943e641812fa75173f26cb46922fd0d962af7ebf9d53"; + sha512 = "96d471b413e980ced87be210faccd8cb6b796c17b871cf785c34f10ebc04c4c76ce4756bec0dbe121b689bab2f777e54eef6ea43750e31c1c83524d0825d0fc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ur/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ur/firefox-57.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "36d2c5bcad4aadb2aa381e2a8f0d69256268d337088639a031af86fe4958529e0f32cf11c5703c39999dd247023134ea80201c351963639160875547e4728b00"; + sha512 = "0724b881cd4aa040b249882d41cf55260d6aca1f4876c89a42f717f00cecf40b32fa60451685b7a182d2ebb11dd08af7e0327bb5c9fe94b2a6f03ba8c9b4d02c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/uz/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uz/firefox-57.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "a245b8eeb1cf93dd51e85425c129e0a88c3b9d312bbd502a5125f603259f3ee97eef76489a5f9939f09d3bf1b134deb3391689a54d607bca125138761378602a"; + sha512 = "bedf1751786c828779fb719edfaec466a299ec706e40dda5f886bffe911d425b82e9f9a3cbf5a0deadff7ee77fd63c73f38ce3462aa7203316fc0569a4423927"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/vi/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/vi/firefox-57.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b1e2fde3c1d08870153a83e921231aa2fb34238b450aa6ce7b79b180b5902ae7bbb2a2dc689a119cd0d8b3d9f9907223c08894634810c48b629d74c2521683e4"; + sha512 = "3ed1b4f71d75d0e863da048edf60ee3cbcc5239d4a8ebaf69fa6d3a8e8be20e556dc838155d7b99ab2776ffed60e578ce253c8e6f57491dc84ef3b68049cf929"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/xh/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/xh/firefox-57.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "36345b203efe934147e96548c25ac4cfa21b7eb4cd0a849c7e35ed8e99d36687ac3ac5657a42fad30113192b364b6577dbcf47b854244f02659cb89ac4553519"; + sha512 = "23db4e5df5432094b7f31a688b84d23304c7890d0ef99cd9c992d7a108a08199b6f6f94bf3574668b9b0a915ac49d2c0e8c6b0c37ecb145da3f5e2a5660d6d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/zh-CN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-CN/firefox-57.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b5a8464db5ffe2eba9e33de952e4a44077f0af332ceefe562805a5f285a42c5bdeedf4ccb3bb4598b9eca7875ed1f2144a2b54b652250c8a5dd98b0a76535243"; + sha512 = "bf08e65cf257f789dee34891818f94368fe89bb500138ffc72855da7acc62cc08a4eec3f4d32a637f59fd0eaf072994ba4d5691da300d75738e3274e4db3ff45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/zh-TW/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-TW/firefox-57.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "5967f8d5d89ea780dc7475ed50709a7b269f08eaae74c200df97e2b914e01466af1e3cf58fda4eb44f417e384dea03906d7855d612df3dcca7aeec58040ad30a"; + sha512 = "6b924c8ad6b86cf07b6b2f01a6138636391acc519c469b7c1dd96ee5c707e1b81c656fe87df31519413ad60e56e06da46c0f762b26249426428dafa0420a5b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ach/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ach/firefox-57.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "d32fbe4ed3824f2ece3987ceec2ab408032eb5d352a035b2db3c279a5c368a125ec234e3ab24728d4251838a2b60c13d3db3028cf48e3d2b2ed4c5b54ea47238"; + sha512 = "56d847a9417a134af10f53ac5630f7b4a7108b177444327df97511494e2a28a279990ad37d48fe1fc482f34b45db66f1c8d458162f253faef3ea2e66e42e7166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/af/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/af/firefox-57.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "fc5222c5df35584fbb18099913f8389f2c8b2f25b41f0e753d3e5f5ec78b5294fe5c88da0ac477e0363f31d7af96ec121b89325a0765cacec0e7ae3e03762d09"; + sha512 = "98d55bc29423eaa62b1c5f179887ac95e8aa228ded6e077cc645660a048ee3e42da7966adb9dad5f168477262638456bd9509aeaabfb2a754f0435b60e9b3a46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/an/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/an/firefox-57.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e97bd96f4d22d6893d4f89bb9e2b53eac8a68d30b46352cf296ff36ee02d60d3982c02c84c97c803b0216f86d3c7998101f91745b109e29d8c7d0c61e324a8a6"; + sha512 = "0478d738826d3d9b0898ab93e25527b4dae789652a65a7b16ec5796b8e48e575387fa3b7474d7092ad851e107c03f9c58d8dbe738277371f2e881c56c9f727f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ar/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ar/firefox-57.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "55741f17e8698e02731b431c8b20a2d702255e37171f027ed779243056aaca35fd863a80109679c5fb920d0a2026bdc3db6759f1b3fdfaacf237e4b20bc7e9cc"; + sha512 = "4c884b86e8ef6b554d85151f1eb780edbee0bee6b60f2ae3b30ff9be74591c4f4df07e5834d0ca5cad456c574abac712a8e856e07892df652f7db510618d231a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/as/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/as/firefox-57.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "0e14c33b6f328cf931a7f9c42d5fe1d7fbcb8736381232c69920a45111410da3d09c1f5667e7206628d70a7caf1404c304bf9f4ec8a5ccc3342103b3ebcf3757"; + sha512 = "a58c8f47fea197a5b9a397f8e58f73e381ffae3426c83872407481f079b62a585230d2f389245d5eca6308e8832fc95d8dbb7da97d25551faa44c20f6e032bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ast/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ast/firefox-57.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a2d51ee57a7cef66d862c593bb1e52311593a21ae0a25d2b9c14a64065906de26770c61665dbb0d55930241302940d697c982e050750fc04a5c89ae1ca1b419e"; + sha512 = "fa4f10093602f03b759502d76ed1d7636ca2fb0f83174869e3cdaec3503fae625e6d49a07c011dfdf6964aca7e8ba81861677cb387ab8c638a5a671864451dd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/az/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/az/firefox-57.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "b9fa717fe7d861152d2117f1d69a7ae264f18c7e1bcd4e71df7404277db6376a93021e070edf73fffe1b00b3f7031d8c555df645efe63571d8831922d0212d05"; + sha512 = "8560bb32c0c3aec695d86d1c0ab6491ba0c2dfd0a936e7cddfb8d3cd35890db31ea233afc74d19974fa693614bfe7728e69b8d1ee47a34331b07674b0b57f118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/be/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/be/firefox-57.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "670dc2d6d9d35947d181dfa1c11bb84cc65aebd268cdea059997fef685619757d3d7c6025a12d00fc5364f258a64fe1b08a69357a2d31fff7bfbd0ca07cdbd4f"; + sha512 = "026e1ecbddc4972cbf1a2a930fa1488b4e649ca7c811ad243a3c068f8cd6b57e5a73d193a3feb4cb49f012dfe3b5af9002f30609cd1551abc1ccc5e89476440f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bg/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bg/firefox-57.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "99deb263d7111123582ef53bbb1919497a6ce6c73cc160b4e26f5adc22f46e383208ae25acb5b4bf6dbac4d9a4f801ce70e170b0e6e5c9a03593eb2db8edb601"; + sha512 = "9d145f71f46e12f071e8e181f6511d20a6ca5f1f1950cb076ca25b929893da7546b950450f7fcb41021c4591238738f9b8797395a86c599a907f0df687cf0282"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bn-BD/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-BD/firefox-57.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "34132da469314d9fe9295b835ec2b8b79816611eda646c04f7e064bbee5cfb2cc42f92e14a2eac60239c44205be4f3239eefbd1cad6700520ca3fd4bcc1d127a"; + sha512 = "846001c844e9ee3d9305eb5be18438af65d5920363f19935a60b503d4a31c0fecf1d7e6fd286cb7ee4b7e26455496b1d27fbf6ccdf2d2a432ec2e2472ebc9c75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bn-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-IN/firefox-57.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "9cd206c11d28b866004174532a253ad49c06f2c6cf9b2004b15bb14bf597e776cadfebec4b3935a323b98dcfd3590bf5a3b289a9f7952a8a438a7e90884cc0af"; + sha512 = "712ae023c09681b1ee9f41240d12a1641df5c4fd7eeff15d157c379e5b5779c65b93719b238fb121fdb9e5ce10809b21125a6eae23a77e1806daa0b2b13e4372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/br/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/br/firefox-57.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "f30fe67e71b5c3c0e3f352653395094a31cbc52574a9dfbf5d5ccafcca528ca0a5b164cc75d5dc7d248eab74f0470cf8547fced782c979fb1e9ba4e177ca2b6b"; + sha512 = "b99c48b8971dfdd0e642cf76cf890706402079122311b1b6af77d658b03acf87feb67918cb83e5435cbf0746e2c2a7c49bf7283969685d0b4bd616d4ec3066b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bs/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bs/firefox-57.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "b2a546259e46cb58d44a61fa78e53632fdf0708921d80f329924180eb1a01dbcafe1372c8818280c0b40aafc7d4e6fa59d3f34b7e6a514f2adb1796d4274c093"; + sha512 = "2203e66bcf453f22848df010cade83d6982178c8ccc023e05ff8fa60aa3f7e583f9d8e33a313fb70a696e149773d567be8228084708ca8d01b3cabc431a7576d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ca/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ca/firefox-57.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "0f256326b5338228098ec31b8182e2d5d85418c9ace5fae1ef5cde37704d2f333172e4db7497f36157fa530148585dc70c0bc1b677b9888ebf0ae850b4aba2af"; + sha512 = "75ce6cb2bd7c1d79b4260dfc19237a1344fbefdff9775a7e557f9a31dd9fc6235f58ca8bb8430b80bf0f25c14be5dc2509e86b41b7ff7814e2fc1baa63f187a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cak/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cak/firefox-57.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "effb3d74d649b7adacdfbbd568b561f55ef277a9b7ffebbc27cad5ea0533a73918effa9997b9565d33635d8bb39658900f251cd071799fb15adffbd8022b4515"; + sha512 = "b4f0a11030bad0cd177db357bc49b6f745cd429d3a8dd9bb09e99db1dffd32ce8c21a94c0b98b6db703fdbe16750b4574b3378dfd40a358bc0c7957fd2cbbe2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cs/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cs/firefox-57.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "494dc250f77d7933006121720aa6526534c7b90c17dcbdee6bad4e0a6f5224de661d3744862d5ce519a9ae4f36095af76d9b86d873d4db97991b1d27ff5ded8b"; + sha512 = "5ee1dbd826801dc5b029c8eadcfe8d040f000527a6ff7f2a40713a137c59a144456adbb35cb202d7883d831486a0ad56079d07f681ce294a5e97825b7effd69c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cy/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cy/firefox-57.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "910254333d2f47f4d2162cab76f84f2b9f1808d559d1eab0d1ac0c1673406869b3092eabe7f4107758dede9394b383ae98ccacfba768772d550630f34efe5c62"; + sha512 = "7116bf1dbec5603d22546b1927a6038812c2abe1e9e7e1ae556919e62f04af422950efd808e28eb7f8b349a9d79bf01b9280d6a6aab94bda8c0f6e2a8968b841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/da/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/da/firefox-57.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f9fff4a380c84543212c610aed98fb0fdc4a0d2693bd87c3dc3188d7eda73615d028c7ff7c15db12425855105a1b5230a7f62d2eae84a893f07a4b8cdd47538c"; + sha512 = "538ddf539a6d9dd22bc2dbf9f712773c1d7896ce2a49632d4acc2e5716dda95dc9d10393bacdf2fb7d24342c8a93c39eee139f32edfb429b0bbf7053b7bb3240"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/de/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/de/firefox-57.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "2e772ae4b2f5246c96e30811a322bceac788325c40463470152b495492e60e3084e0ce55473aab56c9be584992b6761e364902352616e70050b4b0e9467b1a79"; + sha512 = "ff33af1ffb0549951baa32e423eac3828b15bbce18ee03cfcdffb57504fb0e592db2721f7008e84562e5c1ad297311a1b3d4fd5ab41e3d8346a2d1ca50e54c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/dsb/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/dsb/firefox-57.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "8c6b05440d039b4ea3666b718f8cb59f91804ac2899e9d2e0a32a7622f800126e3b3bf9360a8e830cb70408cd7e4bc18f4eeb639dab403718ca6226576d262db"; + sha512 = "6dce022b035bf9c5d76c45492e29617668e0000f5f3981e3f132ca1595bb54b504cffa92d220e118fbefe8088f3749f4d077c591a12657ce9266b88aab8019c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/el/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/el/firefox-57.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "9589eb08e3d128e1c22b639945790aea4ce2524eb3c16d581c615f18b3f1247240085fb3b6d9cf3b283029060a86c0747def43c3d89a1548d907edd50d0867e3"; + sha512 = "b917927c48189bd26289fabe3a51f59965c8a421aa941732a50aa9aa3769ce085ee69bb04202c21699f5ebd6ec2cff75ea2446246d89916127be9418bb00f47b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-GB/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-GB/firefox-57.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b1848e886919f8698fb8ab7272e49fad3ae1f5d98ce92b3b82c6117f79df56a8ee6bc2ea2cdc8987701b9a0fb4c2b1e1a58a9faceddb0366372a40139a1c7664"; + sha512 = "17257657f8366c5efab1a0c47aeb6129e624c883222a6bc3bbb097bb49b531894cdbfd39898d0d83981a1609fd3ea5dd101419819a1f156668fd3cdb3758b8d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-US/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-US/firefox-57.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "327081605198481bb18bcc45a88c4388ec9091c6c10bc6a27ae58e133470651d50edb106f95499de4e38d7ce78eff68bf38f430371e4c490962e2cdd3ea55635"; + sha512 = "c86cce7893fbaaf4d3b00b961b07a2f2d680ec07451b735449a501b2d9fcfb2fcbc0cb29150866805ad38f6a4aa1b6c4cd87f5872b8c735791953f3646600703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-ZA/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-ZA/firefox-57.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "bb1432ab9e9f2e11fc2270501f25e3181aed4a782fb0337ea676e75c4db487a48bb1e3e44f0ea703c84c4dbe8d5c4e9a102c8cd1d45ff673bef7a5b884dfe707"; + sha512 = "0b278c62b2185a4a6cafb7015062693a0dad610ada1123d07e162456e4d942f02a0566ce525e68b639fd152c420b925ee3e934fd3c42ba25524b18cdeeb9af5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/eo/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eo/firefox-57.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "8ff8c209c3aeacff538d2f265f8a6eb7621d27df237c33b9265d9246674d61f7905369fb2b7636920cdacaeb3d44be11dfc136de940658309f3285e62179f8ee"; + sha512 = "a681db144a631e6584340febc3de05803921b757f7c1d39ad5b8ff3d119ed8b71a4d70a43ac1e3a121e04102770d2796103aa127886753b2bbea723e22df7000"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-AR/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-AR/firefox-57.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4eea00d279524be9a682ae46cf602572e0e1469d1dc10e37b1b0a58868386930ddecfe0dc43f0d185ed9bedb29fb85eefaf87d83ffd00ce51db04d37e5fa78ce"; + sha512 = "40f5a7d9ba055f7eef155601f8a57e566c0829f32c92df48ea2ecebf6e10dd80885881a98d18a693643e2c00f8734218a7ef8908652eba1c4d4288f95a34cde3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-CL/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-CL/firefox-57.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c130ca1390f9859ec6d276f77889cd804a38e32551c898a17158b1b7b629f7f72a39afafbde38029438c465e3a0ca82cc80dd73905d84c0aabad8ebb35f2512c"; + sha512 = "be1e5b8c6e184519d0b10fe67736d7635b6fe8ad71ab78014e53ce9a1f1342a83aa1b18f535ecde2406e8be7a8633ea58af9adb355ad2b19ce0879c62f70bd40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-ES/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-ES/firefox-57.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6b515f16a2555f56c1cd8d4487efe2d4ba8107f3122b0dd81df9168768808d08314565a0a7bcfbbf4451d2a4e84559e84fcc730caa1641e801c6daae0ad517ef"; + sha512 = "be0d2b2cb5f82fbaf10be63aa76a5ff9b9111b4caf0ef5222b3ad7d67d39f25dafc125352c00bd91bb1eef50a6f57e996f6a10618d50c5d1340604883bffecd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-MX/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-MX/firefox-57.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a3fa5b35773656152eb16efb6486d8e33ca29e0094de24e389e94a6e7fea761569c3ad48984f8bad255c8ee97f54bb5521444993f0a8ba7a3c922da66c1295f9"; + sha512 = "439f679ddd8169d51e1c1f9ad32185fc9b33df0a1301af7bdf8982dbfc5410cf82edb4dfce3dedc214ab258d714da91661882e45b8220895aafcca171fa9bb02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/et/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/et/firefox-57.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "7a0a165105f5b1ff3f997fd400bc8d5a1bf976c1f4910d4c91be9827a5094dcbc03e8426e644766b4b255dacf861e88cb3c2b75131a9fbd89e2c0eca69718b36"; + sha512 = "2b80629eba503ca034fc4e9d873707aaa7668b2d4563792e3500acf89b35153fbd7f6406d12497b1ff1423e7ddc3bb4e0f3f63cc759758e544145f31aaea5a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/eu/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eu/firefox-57.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "7cd08c560ae83926226cc69a10691918b7c89cc10282cedcc57955b362546554e76b36af217a3187b11abe8472838f4cfb1a32095bb537b43f33920b37b5965a"; + sha512 = "03047624365bb4fc5bae68a5bec91a396da7d404731cbe09d89baf3079be0c4a9a2c7ff73d231f39e98689d5c4dc7290d2401fe14cb564ea53d063f79d7c151c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fa/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fa/firefox-57.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "02b19d0f74413a92c998be3540f5f8d25ae2857e1eb9b4171083bdf392e5dc5ab0c6b58de54e75f221f731806fb8a6df070146564a3b294acaef76fcc8e633b5"; + sha512 = "8758735d6bce447b8492f9a395da6f58c63537fcc946b17b8173554b6eaf32a41137011bbd44842b16e8053d55642feb880e9cd52dbe75fbd55dc592724a98a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ff/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ff/firefox-57.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "df7485cad8f46fd93ac6a013e5f362a19b1b603240ce50044169ffa4a4267102910c1d6bbce9a5d3675911acaf64dcf0ee3638090c0236ab664e9af5b4b567a8"; + sha512 = "5d6a1b45f69135dce282fc411237db713538830b00f6361f86a95da199d56f2bb351de9e59fb1d61a4b617c79e8a80adce3c3e57ba837187d4c368b79e414dad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fi/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fi/firefox-57.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "26971b0778b87e3b0a617197356626bc3120b2214b406e01f5fe865430abfeb6dff471496548883e3e2355d32b1630fc85f501eb9934a9b6fd23270d47df5984"; + sha512 = "f35de96ff1b8542206fb8e9942333397050a6e88bd0e6bca3c1e56fc4dc754dfac0b554b74188d316e6c820881ded2812efd9221b2c3d6497826ff29b89382ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fr/firefox-57.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "324c4cb614a8c50d9d7eabe6e2e3aa420398db7074a7d043c4a44c5785a640988c9d531aab92f51adfaebcbcb1e274f825024b09e302334241a16c622ed97f7f"; + sha512 = "118d6ae69eb686ed1d791463bb2ba025749068017de94a9d002d22b195ccb9e0cf0d042e613ca88c310e685070612a070308971e12eeb318b26b2335b13a6a33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fy-NL/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fy-NL/firefox-57.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "e5d8d67c5c549240264b7a02ff6c5f54295f04a26553a5a19d3b58f94bd3531c04d5402084fd6f40d63f9aebe2df7d8b50415d8575774f71df5a180e50d39728"; + sha512 = "79a22424fddf0add63c3a3528a63ea4c0c9d39f3bf9e35e18fc9ad4a57be7e7f675087f1a491698868d5ce57cdd149aabddc224b7b3078ad3a81e6ee6dc35b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ga-IE/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ga-IE/firefox-57.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "01c0998e8a32e6da0127680d17e71c173c21eaab66603ee6fee0ddf8698a16501d290b1ef9d375d4cf678606cb4a73c679434e22b309a592523d11ebcdfd9fab"; + sha512 = "04b87f564be35d19135973a0e17c2db1670aa804ad8c76b40c8f3ccd670e0c64456d84cfec276dfc55dfa29db5fc0bc70826752bba756cdb597c7fc12da1d30e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gd/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gd/firefox-57.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "88eb2f45c0242400d62310e0efd492b27b6439750d01f0f567dcfa48398c0b2572c842c6155e370b0400b40c2dd88b7f2696daa4e42d0dd5440b4175a409517c"; + sha512 = "f2a66ee64ef80dfaf2c16af952be22ba9c11b3a2859b6a861e04ccc2e7863ed5bb1421338c1ce30ad9ca4506d6223190ab5feb194ee445e9fb09a11aa99a465f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gl/firefox-57.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d8c9f478d1859240b411ba6a819153d6d260216aa3bd4acdd043b0bd6e65630f02fe4b7f8dd549aef81190ac8358620487d5f2fb796797d220df70b3a597cbbb"; + sha512 = "f59b462819ee53e8727863b3e4cc240b83ec5828860e3a0428b012eb4047ac837760157a7db60bd85486cfb9945185a2b8f637581e489d90bf140bef873dd9f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gn/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gn/firefox-57.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "572a00d95247c758bc81b0cb61c2fa659ee5412ee3ee948640549d6e737fd0ef622ac4e16715fcb269980461bea32ccbd2249448ae8b340ef26c322f5c504090"; + sha512 = "17499a923e6f7d0e63e4ff0ebee17f02c99f614da02d0ff8a737a37ecdcf69ba1798139c1b824d187b67b443e54701b1046b59fc6bac3757f86fd6303a778c57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gu-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gu-IN/firefox-57.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "34a4760f8748b6e6cd1856f5e99f04e320dbcd1cc3021e185abcd23c12e881e2eba31ef9253bda6677c767d5e7fe5aa0dc22f1145852dc58a7e24278a0c6dda2"; + sha512 = "605ef03bab50ab1438be938bd8aadd917c742a5ac0bebd14dc8388a6e5cd844b52e0ef23670537dc50c2f3b4ca20814a9e559e667f3baaf292ce3fa16ded26a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/he/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/he/firefox-57.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "57a0b28a0f68d88298d25c62efa70898aa911c11f0733798739f40e546288856306e062033d24abb80964345c0f0224e2c5f3a15b01d89c4ed3584b1e931d91f"; + sha512 = "51bb0b64426ed0d46bb2265b18138dd0d5fdc58c2782d3bff4dd8ae13bbfb354648b346e07bfe2795a4fc31cff2df54d94ceb42ba0342a59218eb5444e9fc12f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hi-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hi-IN/firefox-57.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "dc1db5ed5ca72c48729ef8d2a25cf608072fa7112e02b001943242ec027157e197828e85697561febc15740f52f9ecc6d666d5c83201ec8101a24ff66e8eb4dd"; + sha512 = "74c921e0bcefd0c81616b8685ac3a0fc85129a950a917ec37c724fbd92df8099e79726639cf18235379ebd345f78de754e4b4e87d859e696aec6e780c607839d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hr/firefox-57.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "5488074d04fb6f592abde28e1ddd8e2d949a8744849f51192fbe0441a551b358ef8cf1cb78f69b5340c07b266d11783e2e722ad5574f255186c6bdf9762aed7f"; + sha512 = "8c4b634cbacfe34a2031c1edf196201fbbf13f7bf22be2910f27788e56b0647598d805953b888869644f4ec3547a0813377d517676e732770684b057e5f76028"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hsb/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hsb/firefox-57.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4bffd78e28363aca1d2b63e56ed44703bbbcb701b4d6e1c353f36939b86c3d7045b5104d7f3da920a8a6cd3b69d021b5d19f9727c5fddb8a86c594d15fae80e4"; + sha512 = "59ed77d9722413d8d75c8474de28660fe59d8990deb3c1743fca4fb1c18529173e0e7bb171cdd98df961792ca6368b91db26d6ebeb461543473ee5ce8eb7da82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hu/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hu/firefox-57.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "6a5ee323244358ed68c96de80f9ce1741217cb002e33a8c93e8386773ab27f11b7bb58747daa4138e5b91b2bb4543e1dbfd14b90731cf5bf357376f4dbdd3a44"; + sha512 = "de8d917b533941220763d011fc9b38f0c0f8f32f09d999fdbe985017a002c3375b592865420e58fdc4a3d56f73206ddbbac568fb506ccd2e3cf4d2507e8ed315"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hy-AM/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hy-AM/firefox-57.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "28e0cfb93884fd78cc2f126f8c08714545c2550ae40de29e0dc1f3186fdc437592c6365eaa92135dcd1983009be7a5021001d2a7e703bfe6bc81f695ae662619"; + sha512 = "ea76bd2eff30277dd06d606b0568dedb0f01c6330118da99fd6952f9bd5c8060a621687c66853b46554560b56f1ad2401e87e66bd44d1a85831805caf7ccebe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/id/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/id/firefox-57.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "00136a82e957274eb9316778ff0f9aae66df21d6ecc64f67757816104aaf5cd6d83c0d9c0224214cd2d1c5a68c7bab75d439cb049035ed2a071255a415b337b3"; + sha512 = "024ba211754ca36470ff316d626f46cfc2763b94dbfe027fec9dd628a0c617fbc9050ce7af336d22c962bcbb9190f1980b1381c5d3509485b4f7bb5780c6d15b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/is/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/is/firefox-57.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "6f22f0efac6858498c755fdcb848553a0e40bb80bc8dd6717d986e84ee5bb8cf7c608592eaeb6653f6454147cf73bfe57b5e62b581c2217b8546fd27fa9e5c79"; + sha512 = "d53d4d7545bca63ce99dc691481b890846c33f5efb802734514ba493e1b31e3b4ee9632a4389dc388c77692ceefa9eab4e9f85de1298d0337a6756ceb27d55a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/it/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/it/firefox-57.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "6321ade81a09236ab3b3ddd024b3e5ad6404fd712ff6f23f72901018157f9a845c492ecccd1148cedc1911365c70c286a7d947cfc4afa534b274080e7bc6909a"; + sha512 = "960bdeabd29fd9bfe72f9e2b5dcefc1c9577490636e9cacee964b8646ee29ce2cc4c9cb87a93f057e2a6371cb734920928bbab90e6c6738a19098e9e5a4dab75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ja/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ja/firefox-57.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b652eb0aa3dfd71dd4d72e45fbf2713fed947b866f1fdf172a473d80cf3005706558a32d7a04b38766517f6ff571166ac5fdc1c8a5b89cacdeb91f9ebe98674f"; + sha512 = "f9d889ff8a25259bcc28b1178ca511ad7cb0ad9d0882c8b3f6a04e98d5f4b63ad9b190cc66c184f93fc96e0f869bdb10cdabaeb7b9807d49c3f72b7c62efe3c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ka/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ka/firefox-57.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "38ca6189c55363040db09d55d6b6d525eb91aa4858a660fed3b400ebe5e4cbe723efd9735b77705a1caf811ad0f0a9a117701ce8414ef6109157357193c1a655"; + sha512 = "1ece76f8237065e712b9835d0ea15f2b7318f420f8e4d6f73496bd1dd9cc5fbbb4125a04b4b4cc5c36bedaac39fb844a101653efbb5d0555bd13c3a4ea3e9d28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kab/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kab/firefox-57.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "bf581810fd19d073fb80dd3ea93b6b856614e4821d095800faacc3c17d63c53d7d65aed4b168a3cdcc29a155073af78d26f5967f29102ec4b1e29325c3686b67"; + sha512 = "67d22ff37a79716869d7b59e95806c4a9b89bb2e256e0f1549fe5d3bc9fb3909f7d1c23111e8bb84a9cdfb4e029414908a79a8512c49847fb1d4b20263ccb43c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kk/firefox-57.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "aabff3d68e37a9b41f9345d8968608082c24e50e859a693d4642a52e534c5b8b7a5233469a1930fc54ecaf7b15aca486ad66b8cf3100fa62e474b4ff261b37cb"; + sha512 = "b9cc2b1c31ea4bfbf17c2c7b0452bebb830cd3b8cedfcf2739360dba562119e0eede3b660a403420f367287e94e0bb34f072ea13b1cd1b58681302267f299464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/km/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/km/firefox-57.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "e5bb4825d777bc6001d7d95140d03ac6c44c96eb602141be48c36ac82863dfd5bcfb25b529d61f80b8a939e692bf833886fbbc48c45ecc7e024952ddc5dee570"; + sha512 = "afb6985ad592ad2d634c3f84b1d573bb87c59bad892f066ddc1bafb5cce7109c59403f3c1394b2f65da0fcd29ec897a3144ce1ed410f623354410c27e386ce06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kn/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kn/firefox-57.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "1f5f4d4fe4b729ae2f08432a5d074354121c876c4cb0e7344e37b8d02e2aad38a0b16547d2987418acb98ecda10805dfd012448332c8f8e5d1f772cbf21554eb"; + sha512 = "cc85e9d276e4833fc962554e44a54ba8f5d56c387c37ea78f2f8deb1b845eae8ecaba1761726e209275d24c4192bd61e409c9d87320c1315665c095fb5231a9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ko/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ko/firefox-57.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "19ef2c157469a3225c7ffb875e66f41a9d2828635b26f6dfa0062cb92c0841c53f2eecf77ba9b043e3e2f448b8a08de55c7f74fc6fdd3f7b4554d13ecfa746bb"; + sha512 = "3934a012853c70b77fb02689141efcba7679e87d115d80d1c7f5945027f082986e679f146a6acbc97ff5b5be6b0d057e3b3f8dc292c4e66a37d5c3972fe865c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lij/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lij/firefox-57.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "4e5e6103793dd20efb49bb85dac4dbd208c0d164e69c5856bf9fba96350c3682d894af857d239e23f3c3e802f7300b5b915486421414fb6f9b8af86ee50e247e"; + sha512 = "571334620261a36127ae1e7a03c6142ed22fe49a95e28534030882c47a7325ba8200b8350904fa0e501cbe0801c2bb1968b456e9982bef165d3db0e82ad34b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lt/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lt/firefox-57.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "d01f311ee9f36aec032a5c4eca34a86ebcb54960fd29b03af00f2b289c2b4a38e232242d1e48847e2385e7ccabcc1c928ecb1e57f9001d181c350762d59ecc72"; + sha512 = "3a7a0f09b52991a4d8cc6009c2fb91f3f908989d8178b4b9909bfd90f29db6ba11f29ffb35f3f1e578f96d6be10eb0fb337d28188dc792e6d024e42a5a16af8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lv/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lv/firefox-57.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "d23ce47ecf7c790f38a9bd605150f403776b4e469be590a57b9de624fc10bfac2a3572470ff496899c2bd6ebd1799e9f4687b4e77e4714ab8228c26998760b21"; + sha512 = "7e5153caca960317e039f8ad44f6eee4ac8f582ff2b957f70c9eb3d6967d62fb94e4b13611006d746bcb4611ec1b0a003bbf610d412f9e41f86a8ea19096b70c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mai/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mai/firefox-57.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "7d8baaa2d79f6e50afe9b915d461a4ca25ba777dbb0497d2fe0b1ed92eb30061061b3a29514351841f86366b91da0979b5bf270e290c477397f3201f1b517398"; + sha512 = "07cbb84ad4537482ae8b1ddb00a86197552d3a80f6432779952bc9b1577c920de07e60f78272b1ee3889b031fff1c5a34e1c1a69d3fa0621fc53413242f80242"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mk/firefox-57.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "b1f35402ed051ba91294dbacb52aa451efd48300fe982d638d206c75c3b0f7871fede1d7467ac8d6ea4308c4967b0334873d72c4c731c69f343b92d56fa7bbd1"; + sha512 = "230ba5c56d60d1ec08092e9f6ae396fa836df56dff1aaed933a706014318fb13328db5d6b0bc3dcc030daab5f906d7760bb3a6af3c03422f724d627ab8b9d48d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ml/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ml/firefox-57.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "32ea1f66ab87b299de4256cc25c6a67c0754e9fc8569f9c9693aee850c034bce1e77cfa6f8115015f085f74bddee99a7cf487cff09277f011dc51f9deb07b97c"; + sha512 = "e4aff215ab6b3bbdbe08f7cc698f11b12bfdab232ddcf995681ef62dd9808789541e8ac7b9b71c003775b78451c06f79ebc45d5a85562385a2e449679db346f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mr/firefox-57.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "3cf3fc88a84de5dce220f89928f05b8f8b1d8ecef2f83d01a880f07d5a935886fc30341eafd941f31213301773f463fb4f4681cfb5e8311665f61c8f28a5c0d7"; + sha512 = "b2b44d4a205e39d82b453a35569da1a3f428610551d322a1c57e64da42d96ca2f199e8e01769a24628506cbf3b621cd734923f9760305de8e480d51f360f79e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ms/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ms/firefox-57.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "a3b9dca6a332f939e6ac7b51956f34e893e1ab5e62e9c8e3afceeb6233d7d378b44fdd9f6dc46eecd73aa738df46534956545293604faccefc34591a7ee6e12c"; + sha512 = "3646303c3858e4c2a7dbb555495f5f06b1867a04a37cb8ce95bdfd998e7bc96d8afb8c83b1df7d945bdc8327cc8d7be3f3bd7199efbe23e58cc3e38608ff8313"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/my/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/my/firefox-57.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "9daa4560c3c4424bfbce4f23bc414979dcc96359af3cb7c29f2a9c262aac81d96493cbf9f938b8b25ed0720801d0f87a11a7e5cfa83ba78e86e2fa0d2495fc45"; + sha512 = "afbcd9f8dce81267614855d4d59da02f87d369c2c0af78e28ebf25de18ea4eaa1412999fcf3d414ebd030f9448d71e48500a4e90aae03b3905ba69f2670b17d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nb-NO/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nb-NO/firefox-57.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d5ab3676fbc7c3d3bea1af43bff89c3290af5846eefb7bc51d6f946c8c2c7968332de918d5fb11c475e873e7e1a032213e75a00407092e51baa5f0d0a64fcf9e"; + sha512 = "747dbaa1919c1cec14d4e085f8c8f284fc49508ce82cdf9a97538a85aeb9b901eb9e160e03346a769ef760bdb2108b33a25a967a527dfd3758f25cf11bad2e31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nl/firefox-57.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6f1e8bb355f6ca1e8ced4b9b69de26d8cec4adcf2957a7422b98421fba4c3d7c3fe91596fc9ea06e15137f8bdff27153b9d068b7707c7f56b5357a7aa2ec6ffd"; + sha512 = "d882e7c1a49ba670535f17fc9ea99e7be4505d6dbd5d90855e4614cef319c38718da445afc411f1951ec3fc5d9a3b8799c64459a7adb588a29a126d1cd16d8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nn-NO/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nn-NO/firefox-57.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b9c27a5c824efc48e85fba2823d9288990fcec545fac3b1ef6c4617a624ad685b01d96d23ad8bd5eb1e7787849afc630560e08cb7fc617cf2e25c9cb9f2c1ffc"; + sha512 = "8bc137f953b13a447dfd419b9ee0e4005134437892f214e49e18f98e080d5413d1dc655bf0bf417cd7c8a09811d3e7850967662b9d0be0d3b72cbc92db7e2307"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/or/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/or/firefox-57.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "50c0e9956bb17f6df5d342e0f43a4439510e80d4001f504d566d2856e885aeef2b54b57761943771f8a4ba6648209080290fbd6d556934e14565bee023c257ea"; + sha512 = "34bbba4bf288f62654f88afc461155a27cc0316a920d7b8e42198054d5800360401c933624140cd569bb9864f9eeaa5616fe2530888e4717c964506ce66cce0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pa-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pa-IN/firefox-57.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e01f2c4a9cb3f7e6adfcc3e58a5fb5485ab41ae01e302c93404e7b5a7bb1b30f351e364846853a2c6ac0ecddacc03806fea945338c050928c6e8eb6dd0a80600"; + sha512 = "1403e23fb95cf8449a149ecd698e768897a3733718dc1f6eb4590685263e2a1b54aaa3e557a968cfe71c5172bbdf7d24f3eb9fcdbeb431e31a1a26c0b9738e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pl/firefox-57.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1bfbc1b9a401e0d9b912f5c91f1eb22b0b968d8bc75ddafa28390071431d17c4251b2624673aa068f59a451b7a9bab165690b5c87ba1dc952242287980c63dc8"; + sha512 = "a2d99c00bdb839e4ce89d1bd6a0334bee4b6c6d426c3054257824c46abb1eb3c1f283aa0a4a030f1865fea350a7032cfcba86e231d11ce06ec3066f5ac4d47fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pt-BR/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-BR/firefox-57.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "75b83b22962b42160d5956db90e55f23c2f12335569f908b1ad1acce48704e9012b4d2c8b3575854e7a36ba9dee49f4b96391a4b6958fe80545501dd91609084"; + sha512 = "5768a805aa0b7780b55fecbd9bd349c6cd78efcbb3595acc7cab18d3356835e53e63e58e352c30c79b349e0b0c80be59509fa684be21f541cc67aa320e654f44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pt-PT/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-PT/firefox-57.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "4d9eca88e092531b87d8ddabda513f9a42a762f7af2511dbec25eb88fe791fa94bac3b08c7521227ddec2b049a4a55cd7d862144696702073bc13906b1f39f83"; + sha512 = "ca4dc2c76af2db4d9a44f8ce9f29adf7188a799d00d2e8cb1bac807dc90930b06cc5329097ef771e4f070969cf42c3cfd65b32dfd3112f59efdb0071bc6292e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/rm/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/rm/firefox-57.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "44b3eaa4cde855738c221e7c1a3acc80d862f5159c13d946d67e47b382dfb4a5a6d360be961a03f605aae3e1c89e2a8a0d16f586646cdd1a3dec13f777b32577"; + sha512 = "86af2317c04244c63f8182f46eb95abb1a113223c6d503c6b85c2fa9b596f44959e86323da0ad3a708f6c94aea4180246bb562f26c64a8c9b27d9a490d65a291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ro/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ro/firefox-57.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "a9dc8a1b4f0b236f2660be71df78c41e055b0547d8ce9bc258798fd4483fe888040d2c04a0ab0bab4c95a712d22370d957513b5ed08f1e332803d7067bc37aee"; + sha512 = "2120d05bdf2dd8a702726e232fb3f94838befaedeedcb7c651d8d07047759b885904220173bfaaaa6d55b71e52085ce23156ad030992e8ae3981d47b41de046e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ru/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ru/firefox-57.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d2c42dee48f21e847de67efe353088ee949fc0af99ef510f5b76128933fd5432b2e0cced59ce0a0157e396b92beb645d78d758823582cc5dbb63718bf85d9b20"; + sha512 = "221b4170254ed9acd7edb256ae560060f640c7e6c02236e1925e38489e387f839c14b5cdfa2a0e4a0173e8b98a2ab57b7733a6fa361172166097fc84b260bba3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/si/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/si/firefox-57.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "57be5923936b02cce924fa05994a6a887906104175e305043ea5a51e90cd35cc48c190ddbe2d060d64965b32c65296967dfc53a1e700d7defa078d02907069ef"; + sha512 = "ea216290852677ae93bdbfee42b65473f9e00797175b7e36f4766a251fb302fd69009888f36efca7d04ef29fb0d66e75bbfddbf25f7f59dbe1d6767ffeb0c543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sk/firefox-57.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "12a74e9df967e6a058fbf53baa842bf199190dcc3e5c81eb49da29267760034ea41abdd5b1610f4e06cb30e462cde4c74430d58ab7efe7ed755d19919550827c"; + sha512 = "92071604add2392aa144caf61ad747d98be52c3fbb82c86f903772d470928f71748d8def2f367a8b6bfe04ac6769fc57f8de29210ae50bc45b75b94f5005b564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sl/firefox-57.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "9053a6dd752ee19f8dc49a2bc41c1d91b6a0f77bca71cbdbbe46b645388320a12be4db14714c62c2306b1bab78059826a8fecdf0897ec52ce0fa8e743e25b83c"; + sha512 = "94341abe0210c9632ebabc47325c55577e9e6a5f54b4cfb0ba9d19298dea1b3d6f70a68c3f82f6a4c371f8ddd6e088b18ea56282faeda0c824040e6c4cee0db1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/son/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/son/firefox-57.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "b8f6bbe404306f17ae982238d573302165c366beff14917e64dda7c07b6a2f4e1f9b2042a97b3cbfab02f5e7fb860287cbaa30536494506ded1ee51818d3093a"; + sha512 = "537a57fb00d61b0566d9fd344919b65486f7c767c93d0aec9595467cf9a081d63c8ee7d3c7c3a3409ddb08d57f36ae078e3defc79826779954641c895079c1da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sq/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sq/firefox-57.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6dd4c84f38d7c1d0ebff77737fec3ec669532fa9be785414a9f125cbf184c88185bfd4541818d696b93237d4acb0654d7c6f38e9a0ab7ea35a10369ccde1bcb8"; + sha512 = "a4ad413f8bf4ea8333b3c182a5c02283886e395e58b6ac5a53a298afba0938ec38648b67af3009a44468ab6fa89b6684d86b4d83525f0dcbb470f078584b6dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sr/firefox-57.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "984be4970c5224077e6e97c3137df1d62ccebb7fe78e3506ce4ae78e17d7961653feb276712735293d2ebf22a8ce8b0b91b28edc80b2413fea24dbf059eb1ad6"; + sha512 = "15990e14d69bc0f043f7bcba54c5c27b7562c8fa68c5c14e7df695382303ee6ad40eb6b22319e8f9110b59f51209e0c8a6357e257862a50d8d515ea7f414ae74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sv-SE/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sv-SE/firefox-57.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "d0fd4b307598fd42d76414f4f097d0ea3e2243ab8de536870be23687eb6ea64f226a54b3fee176451bcd9e1305c6aa4c60daeb72b3341102f670d4905f4efe27"; + sha512 = "690e94fc46c94710e488b1a8cd096927756026d0d6ea49f983883092e32f9dc0d2fdbaf6efe4c236cf750873b7907807fcec6826d2ce8b2473d0c4ef5461a1e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ta/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ta/firefox-57.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "6b59fe4cde16c02c5b4867d48e6af4814794bf4a4f3b41e24cfb6e85d1e81f31446193c831b2ce50f30114260fda5e0a20ebe15fa23e1b962f07d66394f5d654"; + sha512 = "839ac81dd6cde69b05e934a4bfb943fa5c65f86d4c7d64c58eb86e7911f81d93a85abc3ad732ae0baa9c7df76a906826a109ea15cb4ee85e802248b99b9ef1fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/te/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/te/firefox-57.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a65e6b4d28f91764aadde1dd954d1e888a5bb24f356deba73c68fcc98d8be669a8f5147233af89881dbf20e40ba987326d15d5fcb857598e6718fdac4c5a59ce"; + sha512 = "58b1225e50a0d3aef4b1d2da5d494b41e5ee41f53e2878a4945daf308d452348deed4cf87641aa51e9c061393c239109d02523596efb8ef7c675c885d80298aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/th/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/th/firefox-57.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "bc6d32c9054072fe931b703aec3c2a6a60d25dccd6e853eca5e716903a4694618e4cae79c9aafa52a2bd34133b6314b5eeecb92e56082c84dc10c47dd46be085"; + sha512 = "6d0cd2b6cd315ca50445f3f87d1d2d2977bc34246481a58239f06a90253bbb810c0de488d064e80d3d2bcc475d34481c1f59ef0499ff59057b77c0cd67e71c7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/tr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/tr/firefox-57.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "31e923c48adbb9e2b87ab6d5bf9ceb951426ad8c523b8def49900875d2a66220c2800ca25ddd4fc0f8a007ca4c95f7a69311228b34c5a8429bb26ce9b0f43871"; + sha512 = "291f0c8f1241120a4fe4c2754ac82f443ef6f0d354f8b71b25b2020948a4de5b7ddbc87bbe2fc08b09ab1ec491a34fbbc69e6d472dc0114e369a99f967bf27c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/uk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uk/firefox-57.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "5036b3bf40bbfb13eb99aec17d90e9a7a60bb39eab1bcd21fa62b1d12b47f4b9eca7980c762f67ff5406ddcb20777a6553fcb02e611b276f1cdd483c8b67c162"; + sha512 = "a6db7a4daa79d614b2d7c94372aacc50b4068ad437b38aab72cce99aba668fb230d5b81691678e09efb645282118dedf25e0c94e9d9cd9ef6a692c43a288e119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ur/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ur/firefox-57.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3605b5370f7158ffa54f5c5def6806885cc609b385b363e5a5c6442ff9262fd666e35b3f2256ad68b8f03a9e95282f3792ab83f49f0efb1e422b6dde56a85713"; + sha512 = "cb69cf2aab416490b866e9b15b3706dfb81b003887456ad83907047424285f46d1a4b727766b78a633b33c6418c3f24dd9b53a90b151a1752709191328c0e227"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/uz/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uz/firefox-57.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "a15e00c34a831eb8b251f60a9e17f7cdb65ed097fe0182a576c5809ecd208938d38c99a711750f0fb7835565adfefb15acbabe3b66c2f03eff36bf05527b47d4"; + sha512 = "bb29f30171804b14aed28e5953bdda7bc94e2e1d23eb9af54c36937f90ff7bfd068abe4c065690aeab2ea61df08a59a5ed808e1f41e7d055b81235f8662d35ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/vi/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/vi/firefox-57.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "fa4e9de86197c3a95cd0d048e16de89bafd9d4733d3f2c96d221aa5c3839b980ab92efde0d18347251edf718f8d37a3fb8c5afcbaf254f697e320420cb91cc96"; + sha512 = "b91dade05c291572c257be0a33d685fb48079c4c1dceb95d6b51601430717c5bdd4f962b9047c2f2a22dad38578a041025ad59b424efd1260ddf6f9d9e4d92b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/xh/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/xh/firefox-57.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "19b4a96abda10b29ab9aada2d9ba70e259ba0a3082796def317e1869f27b6326fe03f9d909f6753f494caef08f0f24e41f5b8be16c5c84ccaf06cf354b926cf5"; + sha512 = "771335861bfdb99f17ae6c8607e784e3901f637d8e4a06385bd2bab4797589377e8c1b875600e9d8434d6ce5a7003ba4ca154dced98228b85c6f70272c0b8616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/zh-CN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-CN/firefox-57.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "dd7e4c7bf1af9975f043bcc2be140b6c667f6dd74c2acc5d31963f6963fa5e0d7dc672fcfaca7ebfe99fd14cbd78725d24dc9c490c9ed1e211bd9e154e51c311"; + sha512 = "d48c546975b92cc5c130e50b9fb3c84116235aaaed6ae8e04e975d8ed3605540b9ad640bc995fed23e42d271b9b2b598613b14822358c7487852030c5802dca6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/zh-TW/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-TW/firefox-57.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "82b442aeb21b5b0fa7d48519ef5a1d3a6b57f2e013cc4e7a18b050cdd6632ec69e8383e58d0608515397a460a2bf339e03f3e11f780698d5b8e3cd4f3aa8f5fc"; + sha512 = "9e731700c738f0db2390478ba293f78a98496c374cd871a0ae483c3911685f0cca1b89531c06177f739fda77ee94fba03f2d93ad4669ce219d215cac8429819a"; } ]; } From b7e3f5d9444c608b3d725e3ec689ea5265a0b74a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 4 Nov 2017 12:50:43 +0800 Subject: [PATCH 2336/2806] firefox-devedition-bin: 57.0b13 -> 58.0b1 --- .../firefox-bin/devedition_sources.nix | 772 +++++++++--------- 1 file changed, 391 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index db45ad95656..bd23ac6baf8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,955 +1,965 @@ { - version = "57.0b13"; + version = "58.0b1"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ach/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ach/firefox-58.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "cf01dfc2fa0995b24457e9aea6faafcafee48c900794845c08ae452fe920f75841db9e67302a7b23b6bf956baf0c79eb8bd2d63ea4a45b3f515a4745552756e3"; + sha512 = "c76b0c8d0774eabdd49abdb211312da230ca467711ab3e4700bf683246986aef8bbae8eda45126bbb6c610db8bd5d12f8e35877956879fe02edb216f16449c58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/af/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/af/firefox-58.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "76be18af3bd07ce72f6ee1522d6b7e86f82d6449f178f07cc465c20afb9c453fb16b37aa6f301b4e83f9e7bc9affd8e76a52685be7a45db7fcedb50c99584630"; + sha512 = "d72db113a55e6d70cf467c1aedf24df07d9f4f5d74f3c67f3474ba3c8f959a52164a345d19b6c43e5c7ddcceefd639a9153950f5f30c945f3ba87d15ea23a66b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/an/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/an/firefox-58.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "3f544f11deed60cbf9cbd6bda27d68c7523ec087d71ff9eef74989b7185f5271d53e6ca7f6d463a64c11fda67692b609890dbfae73bacd164fb3cf7fbf327183"; + sha512 = "ad347d9d9a8cac45a5f369a4fb8284893b60b7a94b2daf4d67273410b0ecacd53d0040f78aed43405b5a99e30cdff1eeb986b7c1ad13cbf3807dae915f4dfe9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ar/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ar/firefox-58.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "48515a3ef14a0caf407fa69eb42e27915bf5a8ebec1de7e4f53d85fbcbc756fb763ab9e596e6580900fbf52854da1dadfa7f8920b43dc9d1a6e36b07b989fd82"; + sha512 = "9eb1d698f2ad84a4e8046b511272fc88d66d5142c72dce817cfa00814f4bb5320c314bbcc36f74acd774bb9bec0ae57a09ab0c46def2fdf4e1f225d467c1987c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/as/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/as/firefox-58.0b1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "376e899b9ccfa0bdb2a77977bc302c01504fd309226e9d63e79d1b799503284c7cc0ff8636e63afc17fe2e611594965ac14334e0c65058e80fc471f3057d3d3e"; + sha512 = "d9315adfac80bbdd4af955f7f7f19d14d3209d7fdb1df538dace2264b39901a94b5d79f8944ed1509de15168058eab44a43de46d2c90c1707853ff2e4401a116"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ast/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ast/firefox-58.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "17fb3d94d037ab1be8912662c9cf79590ecdd2c17b227b38477f3aaf18b3fc6309c9a3dbdfeeaaec9134ed9d3de8a7810f905c68003db5efa6e733a8b22e8226"; + sha512 = "3dc39b449c5eb3b877cfaff84534dc9d1acb3921d03ab2b520c5f02d1b8d2a09843976cb89954da1b99eab353e1960185580a70cb1d222dc42aed052361c4c28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/az/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/az/firefox-58.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "ef29f2265b91bee270c77afe9a0034c07138157c5be1cd3ad5a68ecb94cacf98a7c52de1985ba9dd51ae4e92df08a916249ebad24df4ba672d757d9cf95ee135"; + sha512 = "6329d4265be5662d4e7286ee3147dd14896eae75738a6e29548fcd7daa86c1021a00e44508efa8ed686e58f1a927115f01e797472848b1782c90410031672227"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/be/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/be/firefox-58.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "c002738e74b87b9423d8b6c8cc15fd6532adc4cb9558c0f059c2b0a1c821663c7cd8e741c5835d91daeadda8cba92938484bea5099e5b6d7c386590a69a513a1"; + sha512 = "978062dcf2f6991c5e9f0a7b23ae65c1d3b79c526d27ac86be8f1190a866491857cc2f3d93f444a2c5654df327c53ebc05fc30e6c9e3ef2f766c55274202cc3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bg/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bg/firefox-58.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b85df314c69649277e4a33e8374f21cb22565396685b742c6566b1c138daca254770c1d5e87f6af1f27ec65ac247b3eb888a14734cefd7a40755ff100b803531"; + sha512 = "eda16736abc407eba700e6cc6eb865e97091c89772df9d23d8514b2c05d1197c014586cf03e3732a839dc6ff0e031f85008c12144736145f7ef94b89b7761e41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bn-BD/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bn-BD/firefox-58.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "54bd6f4fc5b2a2a24bafcf19f48c3e4d104449af06ab9d68a58f6d02e29edda65024f32363988034246f989578bd37d7c7d9bdb567d5869767f908072ce8bc00"; + sha512 = "fd5980c7127464fcb4153d52096df9b4fc784fea4a3216265451394fa73800207c9df91a098860819bd4aad1acb0c04965dd196d41b0dcca70071b51a20e4437"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bn-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bn-IN/firefox-58.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "c4acb6c52ba7bdc1e34f7020293daa2a8d230e92c19c700d34df6dc7052fde2928d2e79d252e9f2aa7b148d61328e839c218e5df78104617cf15a0bad8450b4a"; + sha512 = "f82ddf7e43f17d836a7c8e9fa5a9eaf1c8956ee9b879ece444bdb0a4e98380c07c45cb168cdfdf8080d26ff330c0d71921d6fc65d1e59a7bd4e89fea6c2ba7d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/br/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/br/firefox-58.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ceac213b63c36e6e3fc388cd725c52a77f223dd6864bf29a26c143d9b0631af62eb26d0a90efe737b08f2342096dbd32692fce7df281b6804dfed9798dc0a6d7"; + sha512 = "6e98d54e5fcc89da576648c666a9788e1843c57879d3bcfe81e6f92c5a6386c7fb606e35a1d5b6d45a6c6208122f36f127754747b4b0a75b1b0ef9f8ebb1ec6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bs/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bs/firefox-58.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "179d662409f89bd47bbbee8903577048cbb114788ddc462b4fdb25c3a5ec1f7c5c52a218ec1b22039098761dc25f6021a14972d89522b798d9fa0104af7c5cad"; + sha512 = "1d418dc9092188a40ec3ad5b168685840fe3da5444222a076324f38d71d332cfe9cba0b6497287e231252f7db4017ed31d3f004fff7425d801babd485ab13807"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ca/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ca/firefox-58.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "5b5b9558beb99619667c24a80341d74541f99a3cb9e3e958cbb53b7e7dc0e271071fd034fbcbcb909924a1712b6cb328c2de1c53f9d881a7f246fb2f92741f31"; + sha512 = "8482b0b9552915cc839f560a6a884511e6470673684877fbff233e6af23067a9e5a04589a255f885f90efc1fa00ff826bd65e6b53d4993c4eba793b578d898cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cak/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cak/firefox-58.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "c5628b6333a0d4cf59994e70a1dddaa9143d498c929ed9237a6fccb87e5c19dd50c562cdcb4933d92f0b16acc7a881246c51baf1ebaf65b1ad897a208a20801d"; + sha512 = "1f701c6a9946686f92439b354476c96254c8a57def972966a6b3f54136f259bc377f1f95801abd1e2e42785c2650f62dd449f01a305147ea2f788eaffb348b88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cs/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cs/firefox-58.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "e5262f2be60ca5ad641483e773aee80669f63383990ea217a9a35a26865e58102b962c94ad9d4a3526055fd5dc6d0963485d7614a7dd10c74fc28888adcb6a54"; + sha512 = "11159a760106742340387a75637929eb1d7df32a811720ad509cdbd7c58cacb6b50621dba012bccf72f4960cb13fb19152512d9bcd83b2f17dcfffbf10d4976b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cy/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cy/firefox-58.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "5e77baf6c754a44ca730345ccdbe0bac033d8c547f033306ecf4ffcf3015a3f1c28d0d4542899f873e687dd90a4d6dd60bc970cef4c884598a1e919873e4e25d"; + sha512 = "387d647ed24ec9d7f77a6dc38796868a6324db960f7b8077e2b53387a1837edbccad0675eb9d4bf7a68d2ecb7bc60fc8840217d49865a05b1c4f5235479a8a65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/da/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/da/firefox-58.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8903979b66612b7d8a856068a4ff1d4cd139ef96ca4fd1efe1abe1fa0af38a5965376b98522ef9ebefff28fee4ee6d3bc5d540e3db7f3047a6e0beda6b376f9e"; + sha512 = "60e94f82dc68b5251b084e69be480e5fb281483d1355696328888d620f3b9e404abbb990c80d43a28acaf0df062948231fdd17ebf1dc9205cd1b74d962278bf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/de/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/de/firefox-58.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "dd2be7aa009dc3322a065ca242e35b73f35bb28f639146b189a3306689d018f4fa23f213cb075ff4306acaf07146e3b207bfe6a9ef8f8ba57e7a810e434da627"; + sha512 = "a1699568157938780c4105888b528db7ef2277c8a5e1afc6a55382fe57b2009d7eb00351c2b993ebc3294df75bc452016a5c35e3428b4b548483a0fc4a1f2013"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/dsb/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/dsb/firefox-58.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "15ab166ef554ce8d157cca1b11379f0542a2db0dc810f4520f56fe78b365f618fdac4d511e0fbae5f80ebbcfe18c03d9dcc3e02c49dd350cac7c01197573eced"; + sha512 = "dea6a3e68356cfb47db8a6e7347437e88c9349113e73268964776ca8a1399671d648e426151cbec939b3b3b8691d8b2869536d853f0390d5ae4cfb982c2eef50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/el/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/el/firefox-58.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4ec1569340e2490a445970f75992f21f48d13411199f65df788e9e43327de8fcbffc64d628dd589471b9f7b0b5873a54c3583b2d5171ab531c602a2b22dff95f"; + sha512 = "b0eba65b07508dd2f96846bdf7b4a71b6668d8ae38cbddcd842b7e08fbd1769087b32f05cee00d8a471adac7c63845ba93b34d906092c9778776066610c788d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-GB/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-GB/firefox-58.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "1fa272fba658cea484b4f857c11daeb4abdd6e684040864d8eabf3d8671ed1019dc1dfc440d079e098fe7edae6258f39598b3d3da6301046d52460e31a409dad"; + sha512 = "3fc478ed384adabde913525d2afcec4f3d029c85a102144b6ba7549543429530d3970edee5bf14ac069f122e2709dcac2462f572faa9c2ebffa322101929a914"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-US/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-US/firefox-58.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "2106925dc8e912826332681de238dc5d72921bc9916488a242a0186a8550386e24a7eed6b67edd8126aadb42890b16c5572ff2ca6b1478720b00a5134267e27a"; + sha512 = "5afe0a59430e9241a58af0926d5d73151355e9d64a8c8f562ca0369199824d10a1a4bc2de84102e96a8aa5921d83d9b630f49d9ed998ac4506dd481dc06264d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-ZA/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-ZA/firefox-58.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "7c33f60a0126c8058127499c178af6cc3398fc63ca0b1d2fec0ddb469da437349e063c61d1cd573fa157eb24f447099d82a189ef4026be865585883e9e6e41f9"; + sha512 = "c84deb7d082259e29dd2ae7964c0ab585d3bee0d2be7c1042babc122356d067792166eabf2fed8a55c7f688c23ee7f6125d7c89a3b0948546091a54b4a136ae1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/eo/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/eo/firefox-58.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ef54f0c7c7fa9ae8aa760f4dd5c65734dbea6bc88f09dfdb814dbd16f86d1444f81f72584c3729d922c8f85bf4b9d0e2816d1ff4dc2325d92b8df1ff76221407"; + sha512 = "76c714ce1840b4dcab54bd675d74bd93fd8f76a45f90e526b2e0c55a2fd8882e6b8c9c8e4f559ec575338eeeea2ec7f3ff75629a276eda0051e898256b0f2add"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-AR/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-AR/firefox-58.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f19457ed569da5316d167691b59d8ad134e0b10394716612843e4f56adfc027631e8d927324c8ce04188e0e952c115967e63782e6fea8d461dd716458835aa26"; + sha512 = "b049c2e42a4868da6eacd1d5c0d945203acd6d3ed3803d2257b504df4ea7288765b6b6922d3b73397b0fd8b54a990b0340d4722a0ee3171a55e3a566c5a2bbce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-CL/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-CL/firefox-58.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "eed518d08ddfcd9be98d9905005b566821f1912816618c5ee1d3b76ee1972bc97e22e0fece4d35b64631db339916802d4c8e9c8416359fca0e77faea6127d53a"; + sha512 = "48c2b419d67c26c6c6b5ce1e8b6d12dcd5bf8c084176d4c8afb3f45d17f50817a38a85e509fbc7cded4e00f659067c3e34080f58c22f74ba1e19e83cb58a415a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-ES/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-ES/firefox-58.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c26995c5de7f426baa55df935ad527b7a5c7490cdf2c3772ed680818e43ad102dec9aee510e17fc67fafa5c099216b3d23ffc7ac1f2021551e77047421ace60b"; + sha512 = "2ae19907f1d812268b3c49247d902b061f9caced2fa87a19ef40c88de48cff7b68d26577b30ce7f1b8f94f0e1924f32205230bc503f226c4a85497da834ac740"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-MX/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-MX/firefox-58.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "fb4df0e91cb7c1a7c6fceeab29cf90dfda6d977123367944ce59bde0ffca551c0c4853451735bace50f260ca5fafdfca5ee109ef0600efec5eceb20ff067a315"; + sha512 = "e82f465b33114ad11628c06fbc0c0102e682d8e8277e3900888aa05481a3cbc4e707545ebf5b7fbd0eaef12e824135b437bd51676cc9299ddda1969c4d4bcf2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/et/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/et/firefox-58.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e7784770c0f40e3ce90b2e3ed200e7aa1143d62e47069c681646d5f406b299e50c45a4986880a7ed789ae3f6228307a07cc17e1c66d27b4b7864447af16ef956"; + sha512 = "6c7802262a3042a78d25ed5774db69079ebea48e540847a70c0f8bdaec7e87aee5ca4ea31110ea54db14058d4f7f7a0fd12a5100e2c66f9f4c1b591d17abbcf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/eu/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/eu/firefox-58.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "987b47288aec5c78ea75d8afc5d0c0850783034342de05c7ee6ebdc951ae73a6185dea25e5959d3932938915d539610c10d8943e2b1f094ee8f97c20d9add806"; + sha512 = "ae43f9ed41f67610a1394cd27225585904f1efec63b2b8149a16515eceff0e2921cf8ee18c1555d69972af8b0fda71180a2e6872e9abae3cebd642693aa281be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fa/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fa/firefox-58.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7ad730d4e8312d861cb0882b45dfcd4656cebccab5d89dd49e78533cf6de5c525b48dcfa3ec700cf14eea579be4ed2806e1673d73f7f32a6c078fa397cb9687a"; + sha512 = "f5ca6891883c09f292a4939c0443bd5bda8b292e7f432d81c32d1fd5e5d4c15a7d649ea6d430a618b72522ffa53319c2b5a32c028ff2a619e0f68bfee7420dff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ff/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ff/firefox-58.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "e1374f015fc8c5827ddc87d4d0c7c6ac7eecfef247c8f2e88c484c392160ef023695b11f8b02a526d266442cb54297769a647490257d54d7bc251cc6e03d7e03"; + sha512 = "0a3e6d06e0e61c1bfba7ebca1a80fc7615210a148c48d89acc04f8b9ef2050a7ceb9aa7c92b9d888a376f668e4b6f1c0d40a752ba3de185548a3ac1630d9260d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fi/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fi/firefox-58.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "f6cee8f460a52106d1b06f65b9ce17555aa18a9c5baa707bab16bf1cb458dbe6effa7278379d5d8e13394412f95a3472d793551ffd6788612a166216edc1c814"; + sha512 = "5213bbbb4620cd718741f4c1f31e37addaa72bf3947a81255d556c6ebcfa2def8c830f4b9d73ef472acd28fd7efaff064fe96a67b1f276f6901353ed420bfe72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fr/firefox-58.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a1b252852b88523945962152a93cd0367ff5110642681bfddaf7d1659a232eed751f86378f29d4c01d08462e1d2369e23ce18f38b2580e39316741216b440f31"; + sha512 = "6e4c02cecae55b7930521384482b9b5edc8480fcc103ac762960a8af4230e7eb52ca5d17d3fd71fa559b49c5b2d0eee2bdce150f486969f77f71a483d8cd04f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fy-NL/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fy-NL/firefox-58.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "dfe5bdbdb642e21094be85c05aac9aaf24af22917d7d5f294f304ce2c5e53328eeb4d850e927b199b8f96ff573af4b22700890361edd14339581b5f3aaa4e9de"; + sha512 = "7263eb28bbeab70a833e28984108dc125868b1f1fc0cf3c1d37c3e1694b0512c028368363c28a1c0a48e87cadba366f7ce91509783805a6fe6f8ad7e298b27f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ga-IE/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ga-IE/firefox-58.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "aaf0169774f0aa05b458d69bcb340796d6ee242f69dfd69dfeaaaf0647635e9e81a5658c3641c62623dd6a57dabbc42ffa3bbcb31b12c6efbf132c95c86043c2"; + sha512 = "c64a0c0889e10d6463e02323e386142113afaabeff1b772d5411dfc747e09803911b161fe4332d36becbcd45bf0f1b5e000aba2e099c5bcbfc39b3e5d300e072"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gd/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gd/firefox-58.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "161d0be36d2d590215eba19230bc660d19e6c6d2659d0fb14075bbb42b9033612cbbfd086f07ad237960fa732d1a3b2b8e9a759d24d808c8d250f2e282db234b"; + sha512 = "70ee658038c2c2d8c9c12cd45993daa5226d35a8ef974cdd14649cf5cd3a6abc149f56eaadefef01d98daca0b5686a65b17300b5cfcea704c9942cf827e29aaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gl/firefox-58.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "30bfcf0e3cef19fd751242eb523fd52c4ea96c829416348e36be3f3e48e9cc9d6be6e05c63461881a7289966b64f2abcae4ad004ab0ad32c91e99459bffc7df4"; + sha512 = "73400f4ca91de506d18cefff5ac33847c1caf05770d0fac1481a58a3cd709eb96337f6f5f9a77635e18202f007f736e815fbe60ead23dd64a537ab6c67028c20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gn/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gn/firefox-58.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "8500db008a57146706f1f6617d12a58ec238382551e45c31e140c2da499ee890fa48245518b87d53457488850a4103a204bf97d9a3edd8c92b802402b885863c"; + sha512 = "c5310f699ebe8f28f0ae3b07b5569c202aba5f2641ae6a365c4bc581780d12b736b8cbd2f7dab7b4b5ab4a8853af3cf004b3306ab47b71c50f428f2471c6d2c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gu-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gu-IN/firefox-58.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "0a1ff4f35272bbc744f7a33317fc517d78fbca08b63edb91a0859d7c0c5a0bb5944ac574ab4c347f60f7dda4e8ad881e1a41696161336379ab3a40f7dd62c59d"; + sha512 = "34e9331c90ab69f43867ed77520d820386a3c9e5b116b6e0851b7a264d6a632fe69080d2885819afaf7c434ecca8324a2a67b2af4d3dfb0dd737a6f147d41077"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/he/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/he/firefox-58.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "56eff40d5dd8affe55b8e920d0778489186824a0b056d8413c3196ec66d4d4bceecdd5ee0a3c72d7a99ca93e9fce85b0ee51e3f79aac1ed968790293f0fe6959"; + sha512 = "b3e2155264ddc8ebeab870e3c865aba4c7c04325e526134c0132efd503b825d4bfaea4389e39412e047b18eea1abd6249754c4571c690c6a4276f8a7ad627840"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hi-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hi-IN/firefox-58.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f61d90b6aedd17f3afd25fd11bfb730320fd5e9eb0a7cbf24f3b0c6a5665c01b40cce8b88f753f7680c01548c1d71c4bb3a94ee16c4a87e22010269e4e03d7bf"; + sha512 = "03ba58309941b1a209e2d162374abbd46c4fdfae505ec6b51a20a41e306d8c0d5070ebd7eb882ff63010f41aaa11be589e91c567b2efde702732051eb31e3104"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hr/firefox-58.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "d92b842aab0e1f4247842ca3fb9000f76ed2396b3e8bdb2f68de5b71956306bf30a58c20ed49a2c66b8551d89e65a21e9d50a69e78909aff4ac4ddab1af2c29e"; + sha512 = "c41bab3259faddc4cda80d24f9b28bdb888078547c1fe63b7f7016748e930da158ce20707e78cd15342b6a38d37d0166094cfffbeef08f6266aee6ce80380783"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hsb/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hsb/firefox-58.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "2be15782b4f478742ca0e2f00c6986a3efa10d63dd15f3f3ab249efa79aac8c0827c5f65ad38db55ec4789bb8e967cb9c397b8b5184d8ba91d5bb76b0e046648"; + sha512 = "479436f7066df5ecda4e284a8b3b1d453385d9dda69b4b04cd1532f369dfc6ede9de9cae0218594b46dbf1feb0c44b8e5fdfe8084b9627524fd16ec3981fad68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hu/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hu/firefox-58.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ffeafdf7b9792ce3d23f221d6b63671ac4a424f64e85996c7889f6257458d0902560b8b9133f133269191a1fc6b6d42fb0e2f1395aa1300e41c9096a6c8610c2"; + sha512 = "4ded7381906f90f5660c81025d5ad1dd27e4c9bc49f464c84a05904d2c7a8c860f7576cc9f0f65e9666cc894084a539cece48f6242fad69d6f8f265f2b3f35b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hy-AM/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hy-AM/firefox-58.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "c6508a8049d2fd753c4ebca241db2a5a14a67843aa7203ae142144f7c1989aa28212224c3d09436710eb9049a8f6febb575bf6d7e301c1a7c568491e3d35b71a"; + sha512 = "1e90907b9280b33faebaf770ee5e148f35a3d6d79f2c3d19b8d1834c84e09a6dabe965e3f9585dc357e145e0b8272225fc90c27ec507aad7dfda0aaf0c26db89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/id/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/id/firefox-58.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f217a62dfb40b9956ac0cba5ba96598ca04765135626fc29d12f5e2d547cb74ceeb77f7b02d41f56c2db50f0cf2b5ef46b16ee0b8d6f03fa90f97fa30939c23e"; + sha512 = "f2eb5f44cbe8c20e6716bd2db644f54768c6ccdbac15acbdc8268f95383545b3f9d9e74092dedf886bd3dc02b56fc9f0f468d1cd1205ddc5fedd361b557213ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/is/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/is/firefox-58.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "4861ee96ad8136ac16b47c1721a6e08a13de3b4fa4fbc25dc093e61137cc4137ff598c4c76364cdbc79a922e340318cfc735c0abfc54bf28b6b76ad5f30a4155"; + sha512 = "d1397242c59aeca21ff98f8b3e158fb496c6813de0a73ea5454602888caf71dbcf33d2847a99a224fece4fd60e24b6b4c0c7d1b68f9df0088eddd6011e64c9b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/it/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/it/firefox-58.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "7057172854e90d7b555b65ecc3c73cd254db1e5bbc679ebe84e840885017fc37af67fa1cc29960f7fc0b98fa6eea86e428662b3cf60df5f3c12149e36b368688"; + sha512 = "468070735cbf093381640627ffe594efd0504e9a87ae2547fcb0d132e44d2ef3abb98861452f177d0d901ad8586b55c44189fff7b2dfb99d25a7d2055eb8410c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ja/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ja/firefox-58.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ce05d81cec4ebe23214c7f8cfcaa0571a78631c31b489a2a256ad2d4b71be9247fb05b9a1bdb4069ead050ca0a2ebbd5423035e544f362de9a6590633b407e1d"; + sha512 = "7cef74da3ff145b1b02a6b60f8f4b4933f427fd5268c4fac0cff31d0d09ec75f123a97ef08d3b5e8ce2d45bf44ac0d3fcdae0d0ab844608998fc51fb1805986f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ka/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ka/firefox-58.0b1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9fe9261290cfb4c39e6a6e2bca646232aa71c78b3953636a8c353da45bf8498250231809c5b2496a2bcbcc3aed82dac22b0dc41bd2195d259bc653c9126f16a9"; + sha512 = "febbd32b794d70c4e1a41a793f69dafd230dddecaba329c65f34ff49cfe779d63e7bf53326a0a286206f51742199776190704c8e7c1f0fa0aa663a5cd2153f26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kab/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kab/firefox-58.0b1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6c4644299a5e45b50c9039daf6e6440917556a7c77bbdcbc63075b29e6b477df71fe5110de8cdeecfc160c9d13b1848541ecf777e3d5b3504da04ae2ee86083d"; + sha512 = "caedabf8a7cc8cc54e46b6e9d7933fa7b04953dc4fd19311d097c350a8219938d3819ea34fde869f24a0f932677411114955670b179c7037b4c61ddf6b2674d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kk/firefox-58.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "afe910f21c844f1af11e8655ffcbd00d009db44751884463322b17cb2aac576155be821fad093f2b1d6169f63af9a8674e4a1389e7502d2263343dc776c3c2e5"; + sha512 = "44f92252326591941edccbe19f62a46728fb332bb9c83c5a5904f62e9f886ef55c792cefda9ff47136c2e90ca01059f71679417a559eb257464b2a1ee3fbd261"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/km/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/km/firefox-58.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "4b090f71b3b8c37e6944de298736a03a046ee1705ce6a30a35d75a66caa51503093f6e6287110756ee380a1524c56516e905dcf65f9af3f2f16b7c32a177a8f8"; + sha512 = "a3f09ec1af9c65a046ad84fc25a67cf4d5c81d16e7700ff3923d192e73846789b256ffce375436f10c563f0d31bbde6af690f8d36545412c6911329cd1315f46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kn/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kn/firefox-58.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7776e3a75daaf0334f7a121fad252f8ec132ec35e32d8dd19e6c3880a802215ddfa2b147efdd21946817ef506f80c69e92dda3ba66f065776029ca39dbeaf64b"; + sha512 = "c8192e86a04c82b02a8232cee724a870e70990d0a706177c1937897dd82e8b4d1b87f3723e8227ad266ab4bb75393bb1bd799d3d094c5d63a38bfd356f8ab0c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ko/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ko/firefox-58.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "dffc3101063aa5c945b5eefd7bf487841676ba1d6021f22129f74520b5cda357c9134c7d99eb01886c70386a7bd8608fa2042c389a154b535dbd2dab471d0c47"; + sha512 = "87b23fd57f68d60e55a01303a7ea7e4cc49cc017416eb582ecc6ced589f841504425c60e5b2b45f9d7bc17cfc0c5b8a6aae36b08314583d011bda59f96dc687d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lij/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lij/firefox-58.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "4e80affa66e0cccadc62289a68ee6ea7a4484e86432af7eab481c26c278a23ceaa37adc97af571cabb0380611fbeaa4841b679454f13c35f39de7a6d1178e058"; + sha512 = "a96df7d83aa66c52e73682fec0d06433a32c75a9d60ec225be4a29768ab245e3263f253c15f5001615ebd9cb2bce19a8c7ad9994c17801ca59a573986f4c3f97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lt/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lt/firefox-58.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3701dfe9d3489e30f12546860ae0816d7b740345ff668b93e639f73da15ae362543c9bc6308d62b4b176836a348bea37147c7168c0e92c422b626419c079e06b"; + sha512 = "ad89134d5104eee908b67faf1cf6770d9c40091de1da2382f67f224e16527e63a705d7a1ed0a5fcdfbff68813bb3d6de4a17d69e150cd702cc886d761ab2749f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lv/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lv/firefox-58.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "bd32cceceb51dc5170c383c024b506eafc213b377bcd9d06ba38b4922fcf5360cf78b896af331dc04323f530b7ea4b39215bf57e41dae9510b928b40fd24c91c"; + sha512 = "d28affbb7c92d56a3de7cdb06db345d73e0aa877b683b242ed88450471b7ca63e43e211e167041ddcfb10e408d6b7dacad09c102fa59465d337fd557ff8c6c1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mai/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mai/firefox-58.0b1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "5670c0b03d5e999c04ca1136e67d565b546a9b2750c18c639a79ed7c51afe6e2e1bf349fc2d512639194f352558c1af8db114d0b58f0370e3014907ce1d42eb7"; + sha512 = "4296967ff83a31e5470bd0fb354208030a5bc3b2fd7d8358f0de6df22bb50a2636188ba54194ea534dd34244e1e036f1d525bb6a397633b2c1749e78160c5eea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mk/firefox-58.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c8cdc24f00b91db14231b3cc870ad13050907b44222fb4d84268252b572ca70c5a4818240e2c09f4e2a67517e2b3827f079fe06a075216c6017aab100841416a"; + sha512 = "bb6c4a0320911ee062ad5fd2d10c2b121fbed1bff2de3f7014b8d0e4b5962814e52bd6d8e96ac4c88aef07bfc18964dbc24659c32b475a18a888723327ce6b8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ml/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ml/firefox-58.0b1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "1dac139667d0c94413cd9b3262674bce3e0d72f9deaf9b9ae0c847b8073257ffe41cc1694fc6a12316811817b23c1b19747ee3031f397a1fe3d7a6f47f26642d"; + sha512 = "c20dd470b07c46e105b4a3689797b25294a2f445825d7c3b9e55dca277fdb134003889f625fbf02807f56b04451223dc61b376337f0483f3b62e94e1b89d2382"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mr/firefox-58.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "fc37de2c1e80b25953dbabb745231efa8fe8ecca2c70f8ae8f1508c92cd8b087649513a2e6e0d19f3fefc627ff0eea863f2bf686cc79fbfe9cbe9419085c1508"; + sha512 = "d1baed0c6dddec7f0f8bc731e8928eea02d5e6fda10adba7a329cdbe08cc3afb8527c47756b9db07ab812cb6bdbd2439680e001b2614ce1e8afa23b5091ff642"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ms/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ms/firefox-58.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "f610c6b7e44eb3ecdc5b28f181511f232e368c031e94ea63cd2ef34defb17f89b66397ef63e0c625cff4d67c04f208cf965bc41580b8f570b79d3e79e01f9a15"; + sha512 = "c9162c9c22a07cbd8ac6a3aec1ee218925821e24c9f41965d11ce221b21cd99f77f8e91f0c7426d272c418de11d3d51ede0f89ac6710a9d05f50cd558e59f094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/my/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/my/firefox-58.0b1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "ab3089727c9887b9867f0069c8eb9ef47e3f3d37b8381e5bfc32a1822ff34b3496cc1c81ff44de096717455059e1b5f7cd4f40c87f1b0168b4b9c14cabe3b4f9"; + sha512 = "46b6758c2368780e6d0619a501d753ae51da65c55391aba72fb7eb2462c56afb5903afc04a274de68ee90afb98543f16536ab86cfc71219fecdcaf5b92fef41b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nb-NO/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nb-NO/firefox-58.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "13faa2d26f5f20c0e571d6afc7f5e3f81f5dede9c3923ce96427f9256bfacefef886525bec56d6ea59d5f39f466f50f7718afd0850e3cbd1a0949f0beca585d2"; + sha512 = "92f72a819c65e299e5f42bf08ddba7a87037da4bcf7f40f4a175c2813a4d16407e30fb767161a8bf33762848e5c1649293cfca40e77ac7f127d024593f9e936d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ne-NP/firefox-58.0b1.tar.bz2"; + locale = "ne-NP"; + arch = "linux-x86_64"; + sha512 = "bd18c5c1c106cc37fc041722150131896665132427a5562acacf36772e6f77e34735a5c0799c8292feadd2ff5b91f5373937ac9f780b130c02707c63c9d10ace"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nl/firefox-58.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "65c584e15f82c99417051a3ae14abd09b1a871a6371fbd6bf47300b4985ce34894a8dc34a9f50dbd106d7e0a3f196c870ff7fc28afab1ba4f5e7ccad3d281602"; + sha512 = "f1b1ac149e1ee37cbf54e355364f6788c638f46f4ec82541728c6f641cfefc4c5369ec541723e91ed5c75abd8a86048780375370eca9aa6fd91beda1b153168e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nn-NO/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nn-NO/firefox-58.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "8abe9743e39fabf29eab41c9c02001389852805a548c645acf53a4cf4bef1c1d4103b528a3efca0614e5ef858cf358d26deb4c61a72b29bf93827f133def2685"; + sha512 = "7c2f8035101ac0b197095d5c7cf1117bbb82727ff328b7752b0cba8d707a519c385f37d987190226b1fcf8256dfc70e103bbd558814e62b8dcdab1f2477dfc64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/or/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/or/firefox-58.0b1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "8895fed23449529006c8f1c821fcd3d95de74fc368e8ade0a41abc39a16510ccdef3a45b9df87ea88598d3e46dbbf404fee545fd1c0f07498028ce55914b68c9"; + sha512 = "1983452f6208949a0fd412712aae93f49f051d730b4f73ad95dc77086b745f39cc35e765f270f6d4c2094df10d99348c9aa745cf765e731a947ab99b48676921"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pa-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pa-IN/firefox-58.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "c7367e682f0a37d99d5de03b5b7824596b74f8c79a2860e58b10cc1bce2e6f41e676cc39ec664817ea91a34c79aaf5a997cf7700d6484d5fb5271067e871943b"; + sha512 = "1c86552ea21ae1c6a7d9745fa72e9e52754544b0f145e87cba1e5df6a719d524295331c6dd691ec5402cdc46fff14e68a7260da2ad7ebf56bdcdc8c9fc793fba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pl/firefox-58.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "5b542121130b2df20c0d6789729254955d0192832c87a28d4e9d976313da09654ea9ab415f2bd9aacfc796b2aacba2321f13854cf68c3ddd9ff910939edb027e"; + sha512 = "0b2df8461171913f2d6a3621c74ba497617e9512572e5fde0b5e0ae54f514e083b42134b38fc3e380be444196965a078fedd199ad3115070cb1d69f20f6540a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pt-BR/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pt-BR/firefox-58.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "dcd06cc70ff67138b5b9431c84e4b771449920e5973753db1f203f72f8636c69fb91c217b04ab95773efe4f324a7c63baf32a58978534bbce6fec47e967d25e4"; + sha512 = "86e7c61df3bc0c1cc00bd4eab4ae9a9d307490c6c871792d8afd27208fa93c5ae4b39564caced53102d8ec5f2c7275889c23378f6bfaf4f44c1244b5c661dcc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pt-PT/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pt-PT/firefox-58.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "85caa2576bc8258cc3f5f5077b6a9ba816624d772b54c7c62a0f2c82e7e75bd0abd29677e36d709cb55eebecc9d28bdd673dc29d07329602b788c7d7d3a4a57e"; + sha512 = "36e9e0fbddafbed694acdb37e46a2665b1bdead88fddf7b4859e33d48e6dffc904106a3c760619886981aa6cd642153dd203110269834d6183d0a09de6f7c6d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/rm/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/rm/firefox-58.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "82942a52ad073ccfc0f58e7b84b26b5394adb2bdf5f520ff946478a7299f2156e97e1ec5c8686dcd1d4b7e47ebd43eaefbb8fe2f68b0584f79ade7724981bfd2"; + sha512 = "eb0e746a428912e1d15e20e2929fb6d3fd92b2954baa5e717e393fa0449d9c15e8396ae0c2aac50213b1320347869c923c5fe29153bce1182102971d69560946"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ro/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ro/firefox-58.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "b45fa5a738d92fb5cedd06b42c5ae4599008f6abc05149e8f47bedd024470421cf8c5d3a56a111b590894c0941d5cef96476aaf0457a1f3e2a5112143572a8e7"; + sha512 = "a38120e5e5aa2202ce215a938619323565ca00021cee6f66eb8d5ebd25164e3ec4fd2e4bb13a0c2d95c9b215adfe2f663f62170fc61dcd156d49615d2c1a5329"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ru/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ru/firefox-58.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "0f7655a3f0f290a14027305916b7c4a73a2292e6140677cca137bbd9417473a9c286807f8279dc3e6d723af2c142bdd958f68c748a48fa42b8d0dcc5f88d9407"; + sha512 = "acea191b728bf9be9c979be2b869dffb5d37649ebcc2511695c85daba41a8e7e3481fdbc474cd70017c75e08a054fa068a09ac52ba11cdc3803bdbfa4a94f548"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/si/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/si/firefox-58.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "da2243a741a095132dda129af616e88fe4daca07e5a3d4ba65f18b9bd407636a3a312494a49cc1d48cf777650e44613dc69b49538d87616ca061264ba20e2447"; + sha512 = "8f79244bea0d018ddedc32bbfd0fa057782d0bc88e99f82850f711dd753201f3903c588a1b065743750bdf09f6119e1af0720bccdb5f0e8e74c73e99ed267f6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sk/firefox-58.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3b09eb8284944e6bf490e071b64d3c373fc76f42d056635d4b3179068fba0064582ddd6deed1273fe429eacaeb3f786695824786f09d9ed1b35c4719f5dc97df"; + sha512 = "6d54dffe631bd5cb1042daf577b6695d643d87f9fa332b24d7461b61c1871034195eb931726f2f35a76cfc5f3cffcbd44c34f9b5fff4ae9435b2518e8f6143c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sl/firefox-58.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "47cb5682058b1240bf31f2358ee72598956227c3dc344c58d82ce61bae24ec68a6f5c06adf1f39e7f824ac365fffd52dd20e4cf93489b1f7de79fa88faa4d923"; + sha512 = "85d6480d65f110bdb3bcc1c7187541d2c7a652629f57f42c5640c84f29632624fbbcd6ef70de804cdde9b903e1b6a81739297dbb7235b1cbc8877c77feab787f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/son/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/son/firefox-58.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "738b5f57c0e7a36e5063ae7daf7dc51212098dcff77b26617a69e87392b26430414985a90ac81ed108f64d7b593e3a9e50d6dbd2eba79e4807309ef64ec351ab"; + sha512 = "956ce25b91bc64e72a5160f185076d5afa51ed4a8a70ddbe20a0ad5ea372c9ded252ba5b29b355ecb7d7ffbf53f58da82f082f389dd178993059d911a3d8248c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sq/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sq/firefox-58.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "7dfb54a4760e58880b2c0acef221c6822deb795f2dbf8e7d9e4d4949c750d1caea87ddbdf7ddce4d39388b318d470aa56d6bdfcbcb2a4f85f21ad0d2a6e76f82"; + sha512 = "7b2429c1ad8ff0febea367d6f9b049fd9d29ee74be2418777dfee396949d54d05f976964d801b5a67a83bc34558e3a6940297fce135b76d0fa4df4bf220569fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sr/firefox-58.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "7ff4cfcba96156775744f6332c8ecd931f4e33613ffb78b04ecef0f7cd26fc8131c8de34b5eee250b2860d8c5696899a9e87e1d6d1e34de1730845595d6062a7"; + sha512 = "fa728c7049659aa6d2f0570ae037b20bc01eb15e8fa1315ff8766c7b4b93f2d7147ff8af5ed78a55ea73c57324b6c5882de77c905c984b55a3d1180e87444a8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sv-SE/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sv-SE/firefox-58.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7deb0438f37aff6fe17426fec316b2392823d6d6fbe98309921f305479475e8f8262f0f9566e9fa5d03ac90df65bbc6bf85f7082ea84836de7df016a85f81519"; + sha512 = "9b1cd04b974a0952a5525f33ba8fa1195b6cf874849fc84ef8c037acf4af1497e7041057b8ea0b362f5bf57df944002f2cfb06d2004eb7114a2491d7bae2cca6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ta/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ta/firefox-58.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e30979bbaf5e66ba05800c23beb050c77658099aeb65819848fe282b00fd73b98e58cfb518f1db3e30132dd3ff5b3478c82db0177b7035952b6474157d9083df"; + sha512 = "28578f38c1c6a38edaa5120dc772901ff7db0e752501ba5e949c6d64b2477e6c1edf59df1ead5356652f5f5f550c3520a75db65ab4c8ee430fa9c8fd62f76fb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/te/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/te/firefox-58.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3bc7727c833709281e998b9201f2bf8e6e327d746ca080c73eb1f95239a30ca55c349040ff5789cadb03454e7ef836ebc3f1f1e47a86a19f3db1aa290a213a54"; + sha512 = "3317b9857651cdad4dd3886a4a778889f62df6981d40c9c28e4ca09cfe879adaad2502108d7085048ed233be4328a7bdc24d264cf7a5e0955b573e271054a01f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/th/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/th/firefox-58.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3ef644ae9d627f2fb46e5d1870f6b9dd71d9c8fce6ec74e027c67b3dfeec0015bd5b59e10e3b255387c86c25d7cf55ac7379d30589ab70548040452921a7f52a"; + sha512 = "171da97ebff3276da07ea3ed3b3e9fd3a09e1ff7b443e0bc6f9a31098515eb48c604a5491cae701a9ee9e8d23f788a5e2bc095cadc9060a014aab3b157dee825"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/tr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/tr/firefox-58.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "6b67d6386251e7bbac5fee1f0df49d34ac03856b0a22f717e62c1d246c218594b164863edba9f387c4acc3a3e6fd41dad80fac6816fcde672635b8e3f84265ce"; + sha512 = "d33e3b109238f1ec24cb4301e89c039bb2a7002bda379aafb1a46fd3621268d10bfb446ff9c81f3d96101c11ae946e74b359970f588a4d40af360057f6bc2537"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/uk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/uk/firefox-58.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "89c5585413f09f5aab57532aa261d56f5df5b4f466608aea0957856036d5e1cf59763c7864e41bb9feb1313149ed5dff973193dd8c91b77e80ec3ccc9132cbd7"; + sha512 = "b28fb0f609d33dcb5d7d9331a3a89979779fa284fe1a0ceac6badfb4549ea830d181d52f2f8d25c888b448b0e7400bc99bf829e185fdc06680bf81efd5f9b843"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ur/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ur/firefox-58.0b1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e3cf517fb7f5894d14833a7febadc14caaabc05211deafc5c0e69604131fc5b566a2898f91117cd556c7d551392fbe0cf35ba4fee357ad53a40a756600371024"; + sha512 = "1d15aa7b5ba212e0b2f7520f4a0c4c7f9d53be840a971852485ab3491b28c0d81f0425f32774cd90508eb74d42175f3ba76f3f20f21c182a276b21090062a9b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/uz/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/uz/firefox-58.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "d290e74c418d37cca154f56fbafa4ac9e07ec9e035d513f6b652567f72512c350212748aca15c3baff9b2137309261287cfc947f2cfdf81715e59b83fe6c2b5d"; + sha512 = "bc750432a94d68897a2a39b425946aeb65e3a9980ce05dbca143615360b45d7f8afd0523ba9bfc4769d41a52ebe554e74d81981391a36b0a812a2938bb0df91d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/vi/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/vi/firefox-58.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "d83f34b3d40faad14a8e9a91e07cb24f2ddfff65923788e258a9fe2455fa812b1b7d35dfc07c628f41b3bbd6b9ffc81dc0d313bacf33c36f5bb85106dc3fbc52"; + sha512 = "71088078c930889f1747f087d6424743df809fcf62c833470c3222002c1037e5a91d6a2c81e08d39527c673e4d5e807e40c85ae63a7917796af8e9f1e0ea6b6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/xh/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/xh/firefox-58.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "326fdc7d0082257b970a3b38aa7d25e57e558a204da939f061eb6bd43cdeb17c2d65b9f6ff38524c14d5225e3703949a4e6f01dafd926336d404742eb289b156"; + sha512 = "c64f34d50755e61487d9280ec60659dd8fc883effe88d61d73416ce740ed5205bff1e107844f04c658aa495bde5add5d10fd8d171312913e2dabf351ade7b481"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/zh-CN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/zh-CN/firefox-58.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "04048407183c8607d6ca06b446e6da8b1cbe253b58561cb9635843479a1963474c26db589828c5586da8b76387b34696e3b256da9f978db51a96fbf3f1157bdf"; + sha512 = "3e86e76898a2587d079384ebff6a511c6d8a212a1a4632c224de9a1259020358d0ccb2acd1383949f0f6610c284dcb2a942c6aa483ce61d82a8bdb22a6d95ee1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/zh-TW/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/zh-TW/firefox-58.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "aa9ae37761cd9096029e5f83a81eddc0e21964fa637f3af41d4928675f02c2d4f0b7558dd79c374c6cfaaf74e464837e5d0bcb1c5eb55c68aab24d501b163ebf"; + sha512 = "f560cfec6fb0999be49da6c27df85086a1dcb9f88d1467008c417ce47c596cc4616d5971eec40db5e112d1a57cb135ae12e9fafbc4d20b903c3e77dcf23eb826"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ach/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ach/firefox-58.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "83e9e88b26a4c5e84560e4248a2c465f0d73a0044c34b219ade4207702abda9355eba16222fee6c825118f70e36298d802cc8bb6e8806ff4fa099f8ac2d8173f"; + sha512 = "d322b206a5c7e8873d9c161984a95730b91ed900d81b9ef53b0464192cfa52dda02a684a6bb615bbb109f1f6d93f50236dd36147acb681fbb3be8e08332e6d5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/af/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/af/firefox-58.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "d08c73098a6b95efc5ba120fe2d9e5c3ba1493333339e48e74346f82a4bd89bf65b1d3aa94f99f511d8716cc665cf5b4021da84aefc6ceb0a9b8fc5c21435447"; + sha512 = "68b112350d8f8b4ca5499e04193ffb0a8871e8089bad80cec0e232f72aad4561ac9f44a33ef65b9014fce830a878cfa9975cc6408a70d7e62878453895e3e557"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/an/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/an/firefox-58.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "c6b460a4b52586795c0d8a9ac51e7990b8a8b0245e91056b0b1ac8290643fae32116fb3769961981da81a7ceff4979b04c923d9bda01a49f93aa08172897a101"; + sha512 = "69954435c30b30c77896cf195658e32465b93c7c2795f60ddcecf837b85aac4be27bf739250412bed286a9148754edaea29229593d0fd1f0dfdc02ac7918789f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ar/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ar/firefox-58.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "346fe20b1b98c2ea7be7852252a844ccd87b2bc4c6097818198c79af5efcaf905f25157b8249be116afced8955bae9912c08d9decb7eca31050720adfb7856a2"; + sha512 = "962d6b22c1513c2d1e148e30b93aaff1a768e6f7aad5e2d2fa3403e47db1712daf14a32be51b5e2de74e789bc7db3cb3a7d82d24392f0af10c2d313f899a69c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/as/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/as/firefox-58.0b1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d7f92e268a5ab4b3eb6f6d42f775a35237a529feb19656b895fb33398749024b029a66e639db30c342a753501dfb8c97868a9726cac33419c3d58865fdd24895"; + sha512 = "8f1278ec528108c4b93c734aecac9a1cc28f5c459a76aabcbb2f03cb467299db858c89e167e8b576b74f58950979cc7c4d4c1fc563151abd1b1c50c4d89ba2e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ast/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ast/firefox-58.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a54e7fcf922ee97824d21fdaa2183fa45709f6989f41a96f913c664fc43d0d45be071c4458b026f8a22a10eb18f2b618778ca560b95dd52a43ff4897680e4eba"; + sha512 = "bc79681e1256efbb3ffaf0faeb53f8336c6c3be90f94fd815670563298adfc6e4bcad5936fd7988aca49d4ad069abbb0e9769458455b5b8d338c3d0d36a93d0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/az/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/az/firefox-58.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "8299a0f1a33289485dc92a66600720289645e341eaf862678f6f0ea194c7f11b17a171ffb1f6d582a2810742f97085673bb8fbe58ce21b94e41b46bd1aa60e0f"; + sha512 = "9a7360b36c18ef4668ded6eef44030e99e488e404e083bf63c1a47bda13ebe1b8674fdbbf39f2e4ceb3fba832c0e78ed3e280d036b6cbfae3b662a716dde8c23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/be/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/be/firefox-58.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "6ff4d7d353c4c4273a59d09d1c642bee5245c79e62c9e6a5818785f0c22d02ed03613e93353d59793e214bee1fe34de73271a1ec84d9f74853fd821582bd8ca5"; + sha512 = "083df6a06d92174d1f9b0c8348d668e8834e03b4c1cac657f7cb4981167926f4d851f7f6b2071c077b99a1f5a2f717d16531092cf01b8c01320afcc69043d990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bg/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bg/firefox-58.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b13a4e6ffbaae528136cfbdbe17f9ad8811cf2fd23d5764d583f63fb3ac2a76fc7ebfd51d8ec649e0f9e33fd618a5108b0cddd32fd25ac98bf83418086b9e364"; + sha512 = "cc38cfa3f2f7bb99d4c4c25bc90d5756500ed3aadbd517e3bf6cb1e700cf8c5216cae2683e9ee801613375ba8442b75efff14fa17057c9e5cc0129a813a5260d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bn-BD/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bn-BD/firefox-58.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "678021fce64a2725b8968d3090fe10caad1aac6a883a44c1a3fd7e2a5dcea9e9764f36249a299e9348bdaefe2bd9bdcfc3ae2d2bd864c5e66b022c8f61dc8947"; + sha512 = "3137e5f268b52d400a67bcb9652a3d446879e5b68ce1ad5bfe0653e1f630dcab7294a9ac060c2a9238634df13274b948e95d3549065b471db6bc33e7ab03a8f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bn-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bn-IN/firefox-58.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "801fefcae2eb5d6959fac142d2ce77c6522b842b63f0a2493652ffe682b4d261a91278cea7777cd4d32575765206a4f7ce81e2fd73afe6466e418c40d99a7400"; + sha512 = "40c279e62742135fa246f2f005677cfebe2e1530ffa832c435d3b7248edcb9ab28c9f82ff5a9118f05da98a0b93de02f5d66059cbac935243b6b7824dccd10cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/br/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/br/firefox-58.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "dd1e074400bf491b833e7ed1dc97d211371be17ff5ca1b3d8221965b5ed67e79594b94eef3a8a778f4fef679debdb106e5c18db4d75989d4e4e9e6c794f05631"; + sha512 = "07fffb9c815a1a3299e3adf5016b2f9f4f405907f567124ba9e05dcfe7e098efffbf0cb4cc7b5ac3df171e9705331ea33cb02ce8c78d8c35766f13a328f52174"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bs/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bs/firefox-58.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "444c9c97b8aaaadfa6b725709c6f49580f22e004f3d9de2c5b50f0f6c60e1496743c12ecce2b0482f3ff56408cbca14753e58b17337db016f7d217a5d62a3940"; + sha512 = "f7f591e6783fdcd7de3a5e33dc43580937f88381458ab774b86688a7c76943afe717026b75ad003c041df426e22638fb085ebb640f459110f5f37f195fee73c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ca/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ca/firefox-58.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e59c7ff93df39d6e6365e751ed9fb42170bb17f05cf88d8fd96decef6e7bd69fa60d7efda8ae3100e169bc401f3cbc26c94b67137e960f6684c8f219b934acc1"; + sha512 = "0ad04e6f72ad6df7cba03008ca5053f162c94d0e0109fe3d2d49e80546561f010f890bff3fb632ebf91edcd71bfac3f743614759ef3207eb19f1278ae2283561"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cak/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cak/firefox-58.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "d0e0fcbc207ea7cd1d69d80add30bcd6f31e0931129328d17760c6681d12d6442c0c1006121ea8a7199756208868d892250be6405ee4d43ba23750fc9b3d7789"; + sha512 = "1be5b051151eec3e46d9d8a5da1a44569bf56ce160a49041be51ad25c5081d019014a7c2a2861e654c39f8fc918c308450827ad68f409161a07e15de44f14b1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cs/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cs/firefox-58.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "9e7a35fdd318037a638eede7ae11c4c28b63e8c3893ccc38b50d25bcab229002a0f912e50719a358ebe6f30205f61187a3fe4ed3d93f04545542888bda18c279"; + sha512 = "6362cbc640673f6c93c073f116fc98efaf5ec417a5f6754eaa28d750b4c239e12da5b89eadb7a1f163237daafea2b1fb3db211cf00d2062fc9272865472e4a04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cy/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cy/firefox-58.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1a1edc73f902139e8696c2c6609c763664f61bc654b33d822b60a31140f7f52afafe3878516d705d90196f72aa38fca57e3a085d5d03651f1a8f344235e2f92f"; + sha512 = "d72e0eeaa88a03af2f8d10b329d5d734841aa45f05f6c283e2774a7a80625c638b59bf579ab0609385557e911f319701a073e6982f5319df717f786e11475df0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/da/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/da/firefox-58.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6a5833ecde7edea045ab18325a55ffe19f55d0a18af879caaeeac3b00b7412e2f6b9330959068632f3d87b932f544a993c7d836a69f0ab0be310c07c46851b90"; + sha512 = "7585f369e94b4f2f0ecc9f2ecfaa059c0295ee96e13cdd93f94a6558d99764bf20b248a47cb1ea97cd4f7f14c37bddebf4e1f1f396df5384795321656882d790"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/de/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/de/firefox-58.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c0e0954430d656565ce99d91c15ba7cc74da840034c4f70fb9ccb38ece341c86c500b27a3d1b57e8f5da4bb6484703dc98c6b8ad3d95972a9316a0c549de9814"; + sha512 = "94610bb17c0164a9b39fecd5c108f08b44c98a7493f9db16305cfd1dce95eac8565d57dabf3335c674b92a45dd8590f95f4d0046bc132b724710cd1338d712de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/dsb/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/dsb/firefox-58.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e5ddd864a5ff73edbf2152828b036095ef1197595cf5ab751cd8037d3fff11c9e119293d4adb427488c20e0bfa13c064c76d4720c709d4ce31eedd74395e8dd5"; + sha512 = "1508bfb8bb5d2756ebe39a9e778b45baee849c6109022475e9106ab79a03ee49986421b809dab70d924fa0edc6613c877150de334738cb3f9a9c53ce3d524ce8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/el/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/el/firefox-58.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "bde94744268cbceac403a4f166d7cd9d182c18cc8321af72d0197de00737b6f31f7d1a5513d1702d7f29df3d4eb7208d2a5086d6e0bb7a2d9b7fb33088f82f31"; + sha512 = "660a1f30c682ae84aa75d7519e76cb9e2c30978a5195a9e194f734c7b37ed2b12fb216a50c44c0278aa11c51e426b7b85a81363d263dc49a41dd7935db4bc49a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-GB/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-GB/firefox-58.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "48d4fb95963853cee8398c168f51da141ed7e5d18c224d15c35f184669997248078756e6da0f619ed287df034c7d9836f75188c5c8ad17b4af9d1dc022336eff"; + sha512 = "3e52290ebcc54803162781fb2b87389819537b6e1ad671c8bd95185372ea8dbce11a7cd40ab6d71130effba71155c16be729d0cf74bb39e0aca3d1547cd096b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-US/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-US/firefox-58.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "22555ce1e9f574e5e2e9b1164071ebf2362bdba7c182b6989b8da5e7fb736c7c6444faa44d52d91041d1862c2ad8c0881868e63c424b84d88ef39136e087f87e"; + sha512 = "f1aacb89284c8627c55c186fc50a5fbb2db42577e0c8db86889599332f711f484cbdf3f53c0ecafe4431da35fe51c3a8b7cb831710c19eeb7eab2ad475061684"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-ZA/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-ZA/firefox-58.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "2589efe14b8762492d668def0b4149755ec9ace70f581a1fae669249cfdd44d5bfe60a718fbe300bb92a3ba631ec8b0515357587c8d095013916320f8f1a90b6"; + sha512 = "f4eb9f4dd20a255bc054089a71d9fdea91c184919b8bbf75ced397bac4d4ee1fb5299d60203f59701ccd1673439653338071fa7c90c32ed0b94ad78cb510f3ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/eo/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/eo/firefox-58.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1a614091e1638edfcce4d755d4529594bbbc8785ad33af360b9003c76dc64dcd227f71a28e4fcc13b5b2a7afd2858bd9ff6287e7b97b48bee5025ef1de400870"; + sha512 = "b310c3d01ed998222d922deefb641333239c57da410fff273f238c852e75909eaf1ea851afce1a93257527670b0f0d8861d9b47b68cdc80c5ba4c8bf1afe9775"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-AR/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-AR/firefox-58.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "508812c53be4877f130dbcf0aa712c6410774370b54571210f3c52e1d92fa0477d43f2f24aa95198059c318e91ba7a8fcbfe476cad03a8256eb37eb88ca9f460"; + sha512 = "95ce1ffd9d736b3ee78e22c3c8b6185d55fc3cfa501bef1779f30d345f4af642c92ed5a0248b2acee04136c7ab04bff604f6931d8e19fa86b9a0047c18d41569"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-CL/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-CL/firefox-58.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "bd7c5493a92fb7d6ee5680895ab24bede3f8dbdbe176166599fa918a981d11fbd124f4fab4b2bcd5f88df5c1cdac48c85a2fcde0fb87ea361ca2baed2db9270c"; + sha512 = "2be8b488b2c633513e9b8832a3be8263769fcd28721bf26085ffd62d855aa22eee94bd32bf57d19a8a226d6a5997c4595e4a1d4ff3df71948e66ef9d778975cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-ES/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-ES/firefox-58.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cde05cd2e4127258cfa26c76c018f2dcf8214a75a8c4cfac5b4dfabb51ffc43f21828e9a89fcd326cda5cd0c6fbd09649259b81212e13e4d15e32d0c1b87c267"; + sha512 = "e5b26bb9cb2a428bee971fb09694a47601304ed5bb49945ce83a84eab90d59e4b60358baea20015a54e4dd8dee1beaa9ce06f80faf9e1d6ef3572087eccee172"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-MX/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-MX/firefox-58.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "75b8750f830a6353587a9eb555bb2e207b9d7e37894b6b2334be1dd27025d69adefdbd7ae1bff6c7fed823acf2684352e1bfeaae8a5ce5f0721838a82067a6be"; + sha512 = "2069a6fe973341930bbb482a7983d49576475a6ab858089c64e388812002e698efc7efa328508cb52cb38f013edbe995b5b941779e03f4f44afabe0b013f2209"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/et/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/et/firefox-58.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "f33bc9d8e107eb70ab039257540e9a3f96826e597771ad86ec416773a1755b1e5551f8a14664e8507e29eb08d0e3abc8e1eb9e00c4320ba82b32c9b7eae7a68d"; + sha512 = "65c02f08263fb91e5eb5f4edc445f1590e96586890200298339496ec93c9b003eff729f96ce2a954b80bd8161e1ab066bce5df1d1ec501292f4080bd3414a9b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/eu/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/eu/firefox-58.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "94c844674a045f2ef4d2dab12b070e49f6a79e4d86856b29965962df420b4dd57db5f21dab66b7a54317dc908c9b29c9bb3ab74a0b4b8eaf806e2fc2bc45a821"; + sha512 = "b45b71c7ce796bf6a9bdf1e07ed239b33655ef4b79db6d45be4ce5137039b3ee3e10054d90db19b3733b92e9c77e822c5c27b23f1fa5dfc0350129571e56e7c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fa/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fa/firefox-58.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "487d78630469eaa93bfc24b1b3a9d027b57b62c74904d9440e3cb173a86182e17758f98013b3089a173da0f671e2a44f334c61835f1e6f143d3d83704e36f3b8"; + sha512 = "e64792f27a99925e49b10db7442963d8ac188f3d2d658fbb6a15e2ca462e2c609abd9f265a6577503b3bf62d9e64879c44917f541d84bd389b6f6ff4150cdf1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ff/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ff/firefox-58.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "b6465926764e311aca0a74f6d6fb19396f0475bba5d2c43dd3af124e7d6dd1b0c018fd541d2c4f5916d8bf03db6a93344b558fcc392adf222893716bef95275d"; + sha512 = "ecdf7ffe75352bccc1e5a642f48ed82ed7cef703193ccc97163177fc3c7a77b5bcf4bbef452ea1768ca490037ecad5d742800ec45d984e41dfcc30dcbc70b3a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fi/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fi/firefox-58.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "76f0748b9337bbd7232b0d1a056378f4149b1539bec8c43cc99b14d8036c8b737d71467b8d46fe51a4dbe0cc1fe3a061d749fe3937ad5df045da374ee72d4581"; + sha512 = "063fbd923090c7452620db1a42358687e1d29975cf19049a5867c18eb0265790f4fca2644010196c09b639e63ada98ffb71bbe17191b31a0cc1b4fd468b4838c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fr/firefox-58.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "84ae5e6b2d6a89bfe20646064f97ecab399cc916ba1c9a17a4787c6e01cffe159fcd563a595f0362c20132dd4dcb143334145a05c7cd6e065678b73f6b5c0017"; + sha512 = "889f628248f6c504198988697f18cd2f99be305090350aa5fb8d5afcdac572c14cb780ba07e9c3f98b6155f29e4d32fb5f140886b0dbcc55d9a71cf31d058fc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fy-NL/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fy-NL/firefox-58.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "e1e8a0d6f1e96b7e4f6e8c315b04130c36717f9cf5a47d3fff06dd1b69ab424674161862296b93fa294a980afe75cdf04ec115e06272cb67cfd74809747a2bb8"; + sha512 = "8749fc2e704a9156bc944f89626e3fdb2ac51d325cc6c3f2c6646c0a60d6029caf5b51ad8cb6a269cbd4b6c0b23b719cfa1f7c4dd1febc3cea2febc6b4964f5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ga-IE/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ga-IE/firefox-58.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "3cfa2704c00b21d15445489735753014a481ad5b8eaef25a2c6ca35122aab9313b5cc9885d685c3ff206ed895e14dfdb7518ae5476e86bb35e6b81f06e54aad6"; + sha512 = "93628f55f76a44041a49ae2c2564814b277095d33b67fbe4d902234554a30461acd5eaaef74780722287874ac4080b8def72a2fece9ed72f5a9e6d2140cebae3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gd/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gd/firefox-58.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "b7e4e20f35ffe7275f8009194bd8325c3c8f6c02e185e7a337c85d03232909a44f1d4a41b598d466f560339c0e64cc3babeea2ec2efee0ffed015a791fbe265f"; + sha512 = "af3bdeeb07e2f63628d787f66d0838bc073b927900e6358768a083832a13e0b056ea1821a43623e3c385b6a77d6cef49cdeacf7678be3ba16263ea7c34144d4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gl/firefox-58.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "9759d271de728720319dcd30507525a1693d00e6f443a5921eb221da1f0e2c122fe1da36c881b0e4032cd5ef074438da5933e8c10b42370f114dbe572204589e"; + sha512 = "37082a0429ea2fa9d8009452fc9940b4d507f64a5285d67f3f9d77ae4846aac4d40b58f4ea5c6b6684c5c59057bff330f7ca21a7ce240b78037ca90589231990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gn/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gn/firefox-58.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "9d4ee42485ef63e7747538362a4b5baabb4ecfa706b4c8b0c3fd440c48a6d15c4f8a1cf5e2b8ec71672dc529b50c7a6645986a867491e4f14e0cda127db5bc13"; + sha512 = "b2ec403ccb785f8eda9e1a03d5200c40827f20bf450a334f8ef0ad1a1b4fb38ba63b812405360efe77e0c6705730dc484541065a969e9b51406a47a8a13fa32f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gu-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gu-IN/firefox-58.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "45c21939311dc0414716ab272fe72c063b8adad201f2dc7893347a66c5e9abe7f1b215a4d75bd3ed3801b823679fb27f5cfb5fb6691785126ae516f237133ac8"; + sha512 = "2275c8bf1639108c77b304140ce32a69239fbc96a371c1d88464694f989deb9264ab41053c3a2d3e1afd6443ff3f0fb8e58b61d085dd2f6cde346867aa380c08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/he/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/he/firefox-58.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f17386cf6652a794303dfb24dc439031630239a9e7b82afcab0bd49bc3e018c4ee4f499f3c1557c68d38f74c37b8775a49fc72318a08fdfc2ee8f593426540a9"; + sha512 = "982b15fc9cef3fb813154f90e1ca6d0768237b04ed496d91c141c59e6b59ce0d02623644d12b885339e6677b01556d1724f3010ed06cce89c1d26a3cbaa9863d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hi-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hi-IN/firefox-58.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "c7311b1a5d69439b93fc0865394895e3d1776fd940d21838d4681659dd2aa222cf1aa041821f5f385cdf904de13e8ee16e000a582495f9eac91c0542317eec1a"; + sha512 = "40e6842ab3a8fd79bf9c06cbb2bf1aed9244e87470a7b39957db7c48f8eab2dcbd988c47b81d362bfdf19e7c9891c1ecbf0183cceaae9761c38583aff32e6706"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hr/firefox-58.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "70eff0fd9ec9c9c70ddc4afd3b95e427a945b35dad26dc29b166d784efacf9960738cbb0c62c700cfdcb48b38824d34ce46eef1ce0f55fdf63932beb1a69b04e"; + sha512 = "9c798f2d7483a4b122fa579c0b40232a312a5ac7e19db9a940fd58aa7b54a52494822bf545a79a690c181d47dfbaa7e4e7b9c70d68a981e9bb46f3469b356855"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hsb/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hsb/firefox-58.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "973817d6011a72c676b14f9f5b333ae53fd38af8a06c5434eff0debd88f3beea8d209331870620dc3457cf0bb0f24462d2f9fadb302416e0e9ce84928ddc4d23"; + sha512 = "b00f4b0e377e413c196eadc2eed1c914b496e6b71742c51ef87ec502308fae0fb55c0d69172d47a9ba6271b137b50e1fa365781cef11d0d65ead0089d8c16ef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hu/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hu/firefox-58.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "836aec8829d07baced10aea1b461a4b503bd3887541c6e030cd802ee1a04d6533f7f899c268077a3f79e8ada8fe2606780c506a24f0388e3292e6935afc04048"; + sha512 = "806ec30cfbfc22fa206dda8e3cb5b43aeba99866a19e8fdde212b95c852bd2f313f451b93409d153c0dc07ed5e1ac94a18b75f91a4ba9b4787a89b77491a5293"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hy-AM/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hy-AM/firefox-58.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "9a411df379d0f900fcabe91515409934da6d51092a4a44df7f7e003f1761504b399e353fc93f69022b91d72c44198d35ad9d7e2cf9be30c549503043bcee9b12"; + sha512 = "9e3a8e46d15d9b71d645d830f10e3ee2089c4dc5083dd2debbd3d9d05ef464b01405f920d9a2787d5155e533ec57c3fe3def34ad88137a4542a2cf5cf8a904fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/id/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/id/firefox-58.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e91a619f10a6b9948bef49a5c21545f3881430d8f6c7b5f0eae112c9b8716519a88c635c37cd89586d8ff4669e31f4b549b4eed6cebf5a13a48df9ccd37e3988"; + sha512 = "253958e0e6955a8768c5dc7645f6431135bacdfc9c1552305f7409c8044a3bff529a87bcdb2a0676b0eca3ec90de34fdff41a46a9ea63c5ab038b4119e231b4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/is/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/is/firefox-58.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "aacbee57162998c21c870d541bd453130292211a19aec1d2b3ed0695f143eafff132cd4700f9a381e405e46ee1ec5865017c447771fee7bcd9c0c8586601c1ba"; + sha512 = "070ba6e602719e79d2a3ecbca1f5c3c412c02cad89c8aba624918179b436606f352c6fc0586597deb2ba7f703623e0484c17a11df78655b4ca0a1a6a826a1b9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/it/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/it/firefox-58.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4388a33307067545cbc6c292a5aee825a53d7e38aba4847c347aa4ba3f30df2b2ac15430fd4a28a7fb490efc7c6a6d555d58d61fe753e0f8368d80a2a8034f25"; + sha512 = "9f624b314b29b1ebaa6c92f2b8cf7b4a0b3c38851af4bfb123e140f49435e294a7aa2bf6e449ecb6b315b893d5d55beb487d30814cf6d72c4905eb7df91d0327"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ja/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ja/firefox-58.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f37f851f573e9ae734ad819f5ba22ff97a9081c10f63950ebc52cfd97202b295e035129fb7f4afcccbfface1de188f1ec8dee7bee14bb3f0f779f9cbc00667df"; + sha512 = "22a95b25a5e66280791fc18bd5050db7726265aa999ad959b07d45c7fa4720f067749a60e33cf8f548b93adbf440e15e47269f98a31d3643d157ed3d3c46b9d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ka/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ka/firefox-58.0b1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f06b7589ad1e2d96273be1470032d29816295ee48f05f9da685e210e0ecf35187dfde82cd5a6596ee0a0ecc8143c169eb2e7423c4f9026e3b06851b6ced6e3c4"; + sha512 = "3cec01bb5d98f192426cb39ccab91d823604b7c722831baefd8f1f6deeebcd5068a9ec8ad52cffeb02842ecccad891534598cb6a898adb40c0fda77a038b94b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kab/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kab/firefox-58.0b1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "c4ca6d1a50378309bff211138924f7b3ce22705592186c14d5b17501f2c49f04a29b4edb23746efcbc2947e0de0db88d0349c85e5a3b7e993649eace1975965b"; + sha512 = "9f43fea99f324955625889082fc8ca119d0aeef63d226532f87121c6659c0c5a9cb54a07faee30f8b1b10ba58ece7ca1419996269f05c705fa36c364c8fb609b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kk/firefox-58.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "78379ec69c88d1ec8c03feae66d4f4ea3b48de0c324084f8f68a331bba16cef5a66f388d5c0fad4cdeb3ec9b1ade21dcd67e4b5fb026319718daaa8a151d1e5a"; + sha512 = "c3f10ae05036eff27646d613699c4be408891917fc9d523e202f58815d2ce76a976f3660a507e6f5e4db4dfa7172227c6ab874c8586997d530808ff409ef827a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/km/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/km/firefox-58.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "ebcd7d6259f83f7ac9528e1eaabe7f75600ea96c49ab0f55c77688949096d7503973a262761ec0828f233654d0aa2271f338a756335f27b73a6174aee05e6f9b"; + sha512 = "d25c83ccbbaec8e599c5ccbd5a21926020392bad5349d65e62a12f9ffcf7fe44bd46fb79974bec12fde2a79e43c6089b9906d5b6926cd17daa30ac3dc6e811ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kn/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kn/firefox-58.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "dc9f84b8d3efb12710c1a245bdf26c54f421fb6b993ed4219f28bbece45c37aa5c118206cc9c4e2e2805a667d90b7993462e57778c0eaf8193c71dd3111285be"; + sha512 = "d707cabbe662203520681556c9dce1c7dd0f97e002b795214d17e61f8ef6bcbdd7e16b77f2e5bfd1a0fa80cbba9cff49f4d416f1cffe04138460a49dc7baeded"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ko/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ko/firefox-58.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "377b555ea022b2a963fc2fa9bd44002485f575710925aa5d7056b2c343e476f599060e50e708322c535a8dda3cb50255519a833c031e2aecb5d4fb1f1c3ae65b"; + sha512 = "c6ad38ff830a6a1af80422af252bcf9dcbdef4151deb59e72de10d048649f8e8ec7ff3013b50ee4e3851afdf609a019bb15e4bb92d93a848b8cd2d57a0bf5a3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lij/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lij/firefox-58.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "56985bc727c6c7baafab85cfbc8e3fd83f4770a446aa2e6a894983948af99a36f522898bc35a17c1e91edad7eb3a80eb736a9bc75a0cfbc1cda49f617d649edd"; + sha512 = "98dea891a50e0176283eb7435aa36e038e2608ed32ac46b587d6212d3484fd42c5f4fa4dae98878fa2b79c69b46f186ce4487234cfe53474db2fce063bbebcc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lt/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lt/firefox-58.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "fb3644bf073c9c418ea3db482780d6a409e7761e31cb82641d6021dc90ae81f3f955cdfc3f773e4293a29dfc43e93db3d0feff8124f1dcee23a80e3006cb48ea"; + sha512 = "5b0ed58b46552c756b47a83b6334c7a47184172db0babfe9b40e3b296088f8814ccd190854cc24c4e79f512f444ba447321848ed34d105c419ec6b1372d746e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lv/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lv/firefox-58.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "5a273bc8d85095663c6d66915e31c2cec48274db8445a3127b5fe23e1a6b59e0cf398a0631b23d7e8e29c2bdb40ea4b1f98d2d09c34f1f609e2b35f106263785"; + sha512 = "34a6f8469d4fd7e4fd2c3c8f8f336be95160a076dd7a88b58d345ad540179d241d4a68b46c122380627b2177509ca04a565a53364a9f2190017e75dc0b26bd1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mai/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mai/firefox-58.0b1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "13503b7879ae1c10e151ae85ef0f657dca6bced41bdca7b2ddaf3445c56e712c2b5c084f5490d41c5459ec9c5167c62ed517ca9083dd86cb3523d00a84ced8d1"; + sha512 = "a5bcf34dd945648f6ef88fb96d7b545936aa811f4d1863fb1b381df9e4190e74ee08eb38bab30a46bc5e6449c98a2b3db99d70a62fc46ab85a178bceab7981f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mk/firefox-58.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8071102677b25f92dddfe1b5ad16aadd9bccf4a794b9df4655f75777d7d55fdb0c1a5e4ab292c222e61302f1cefc15b649ac17fe58680708bea2223e0c5f0a66"; + sha512 = "974c9f4ef377be4b456dfc74d8510074f8bc0bceeaec90670a806fc583795bc06360b4aa21831fa23aff8ebd8d4b8ae6c9f88126a9374b4bc96577b6cd7a5b2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ml/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ml/firefox-58.0b1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "962cabdb6a3baa3fe6e25885eb27c5f119c37ca27fe75547a704b3409375d7dc61fdc4a1e4e12f0f0e6405f7be08dd628fd53eccf8431645c549bdac6ff6e6cc"; + sha512 = "a2ee22bc5caba643d7694652c2f6288aa6e709ba816023321997e070bfb84a356c6b5d5b92c4a973554aa44862e673690c388d92ac5699e4aec7290d24054565"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mr/firefox-58.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "0758144703046081bf3bf600de84c7a71275d73c3b6f9f27e2797937250b8ad288f41081fbf6f0c31e4d0bd61e1a8c449b546839e2a1da0ecda4097e7de6482b"; + sha512 = "cd828c6366c5450fc3fc5e16268cbccfae4a14bc2cd8041f2965192a9175d642527194564d9891c57bc6f7f8d70ad56338908520ec1c24407f2bfcad1ec1070a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ms/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ms/firefox-58.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "015433073ad4703c7636eed2e41645d1505b9ead82a8ea5c6e1e639e28db87d0f5afb1aab0e7bb852b2c5b5be7182bfa6bf7bf62a2cfd29d4948b1243d29ff2b"; + sha512 = "21abfe77496cfef3807c962d8f9328511ced673627dd7227c025733d5e229683590b4200e6654f6c20d1ad82657d31ee4dcb64b6d83f797d0c7fa7bc3f5372ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/my/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/my/firefox-58.0b1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "603b30c61668fdcb0ee54e0881fe4bddd6a6787062060d28fb0a5b632e178b8396c868c637bb08e0e1b03e51d53e878407505f484d864175e357c9aac790dd9c"; + sha512 = "5d4dec8c8107401ba3e09a1137866b8f690093be14991a0890d941bc4530747d3f64d9cd68bc41dab92b95aa566a30ffbb4156e69f920f0aca7d1560dd9c19c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nb-NO/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nb-NO/firefox-58.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "6c761e7827f210386ccbf210246e2a68a200ed98c3c14b18a9a4b9ceb99383cf59ec2873c0c5fd749a8ccb71575691fbfd0ecff62f9a044b3e4d2c272232a15f"; + sha512 = "10eb68ae015e2a686bea9340f4a26776b388d1a0394ff229a18fc0861a5bea9b3e726f9e3256f99463b2ef56b0035bd17beb8a06b6b3d57b14e22ebd396b135a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ne-NP/firefox-58.0b1.tar.bz2"; + locale = "ne-NP"; + arch = "linux-i686"; + sha512 = "6eccbc0c1cd1307a3f37893b3e0bdc01d9de889fe5a203c034aee4ed7a615d8d049728e7fef4ee87776d9294223839d6cf15565e2a7ced72bda56faab5970a9b"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nl/firefox-58.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "2847d4ceb5c572c090eb030a3c5ccc03a2a43f43002f4e308695905f7ed164bef73d1342800b7c0d0932d5b84246d68c8d5ef1b84b09690558d5b2b7453312cb"; + sha512 = "f1e27b02d460af36dba3fea06c83446a1a12a5994fb3e8ad84dff769fe2307283e7d8eb4dd04211d1bbc12a8b058b4463b012ab01fd8996c12718072ac94311f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nn-NO/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nn-NO/firefox-58.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "892eca2b59ae33326c1699afc273c0726b4fc26cea9adf7787310833bb50fac07bb2af18fbdf283f29ea1ac737e654a86bd844e97a0df408c7eb77c931ac4d85"; + sha512 = "d3c6c97576c393f9a32375ddfe2b6f7055fda84e340af9fa2e4405c0d2e76f309da67a4885ffe58439e7394845c78815bc4ff39367626a3092bf96ae1ccdbb3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/or/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/or/firefox-58.0b1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "0c4e996d5d73b1b13ca6fef1ae79a7f4c180cca8c6b5d1666c7172f80767624f5f64f70c2b5597ca22496e161379b37fbfbd20cc94998488eb6ebdbc1c2a9b5b"; + sha512 = "93c8b41c446b15144615ef7c58ac81f0e63dac3747e874e52a6503a953cacb9220274dcc31268440c95dae8b242416dfeef39b392e262bae5b741a323be5fbcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pa-IN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pa-IN/firefox-58.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "eb30dba1b3ee43ff2e6e86bb896b36e775ad6a803062aaa5c3ec68e3d579a0ce2ead6527b0dc1a5b4233f3be707c03af03063ef3495019eea04e331df544dae0"; + sha512 = "b17ac7bc677fa78f45a2855cc12a35c70701e882a6839764a4d05ee3519f68e1347194895475e916d62d2a679c7bc60588253f6f201b41d82b3a7b85a356a6f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pl/firefox-58.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "d951353704501d27d6fb93da04ecdf8d06a2a6664167976fe018f39f82cf70ec7e59554043e7b4fb7a4b423331bac829f07a9f4d05c3dbe7d66eba3db09284a9"; + sha512 = "8b65402216f991dbc780099859821facbee757993d1b57cb9c4cdef792affdc14c01519dfc47731f195796322e5a4d3ee5db319c8d96b2565ee6fd639b42a026"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pt-BR/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pt-BR/firefox-58.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "5e8cfd1c70bc72c58c7a7a06d30d9bb701c0c574de4bfffbffd96ac6009c712c0f8b14227c77dd109d16587f906b01c94f18c7d55f08a479cacb4bc479859db7"; + sha512 = "925380239a6575be1e933f645dd26d922ab5368cd10c6822d9b14df8dcb4aed5a59f4c36181d6da79fdd94019800533bff33e6879070815d3ceb089f6ded8249"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pt-PT/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pt-PT/firefox-58.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "1035994860329ab318146f1faade952abfc48a50c828efdf73b3a103e7ef331acc82aad1a589b591384f33de1e3f0976eb62b61accb2507069e4055fd7bd5441"; + sha512 = "d87499d577afcf51f2d7dad05a2307567506612adb87eee14412bd996602c6c8eed554beb1450deaf8224192ee82f8aa6dd51066e7ec1f1cd052f2285402a969"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/rm/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/rm/firefox-58.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3430038ecd626b4056cb95815ca36ab1d9385e4783259cf973dd1ed7fcce12a3c0e1a18555a579d94f1021d1073089c3d9be40ccd003e00057c498e98ce7bcbb"; + sha512 = "a99a69291f670e09abeb7bc336e089da68209fb6b7dcca3391e1716c1a0a2f679c0b2ac902f3ba7239d248159de0128ea5643b01478b66f92d139d2232cbdc10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ro/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ro/firefox-58.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "488907bf47fdc4a02e2fdcf11c0c4517aacae0421eac41ca75b573c5401ea729e9dbbdce4a176dfca871ab919ca1a07a1db9e61a82f0516902fc80f6a070b9b2"; + sha512 = "13d6d1421ccc54a249b89f172aafc1a4330df11fe68d8c49b74c8da8c4e34d7372be770e19d70f46ac57b6784a57848ecd006a35c93e50b05f89568365bd74c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ru/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ru/firefox-58.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "4bf91ef098ced14a89efefb99a8162a328c583ad0e2276ff3539b9ace7540bf7fadbf057acd9cf604b3fed0359bc208186cc42d8801304bc9dde85c4a12f38af"; + sha512 = "2af20c6a0e203fe79c285718bd286a2c8c282e4d1fc669a1586ff3682d704a07e593670c63f94be646e7e3324666ed1de10e445cf05849184ddb295b5bec71b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/si/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/si/firefox-58.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e214d7fd32c669f0a5367aad50ea9ea9c0f642c4af862251c52f1f1c95cb17a895edaecc2f69b6899ce95cd023480978936007ff26493cba9971624af422a5fc"; + sha512 = "b403cb79bfa008d094262c22071e4499101f15607ae43985bb1a550aac4cfc5fd361742dbaf3a1f655cd74aab41dfdbcfeebdb1606ce9cca77030cb1dcab83aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sk/firefox-58.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "17206bb3d59a74ec7acf2ea205e2d02db7257484257c8cf63341b99b7cbf9434968d3c16df7ba96438c44e970e53498883ac2744dfecb7993c21fc34dc4d9f2e"; + sha512 = "a1a4b65c352ccc73a8d55f38de5aac5288b7f8b406f62d5cc6993f53b0e5a90dd71834a92be5078b0da5a95892070dd1ad51c9458b54f294c791c8307daa1219"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sl/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sl/firefox-58.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "d04a0b97ad4f3385e48e7a248d280ac5c46a1d63261ab2a4b3e6b7769d82c70bf523acbb040bc3d341669f6b51a724970fe8e358ccb3e88c9656182dff0d3317"; + sha512 = "8b90668816fb2869f81e4c4ed1611817b63e0072fb58a46409337e4069167722aba206976b9550f72307d8366da5c1379de05cc0102ccfd5b1a01d97b1dfd365"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/son/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/son/firefox-58.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "ae95b4d44e9a0287d6696745edd2d9e6b03eeb7bdaf1959334ec4dd28a84154ec075ab25bdd319f92f2173f8d806f95b875d2050ceda125acf8e98e81e6ba47c"; + sha512 = "3b6792727ccfdae1ac318b93b82997f6aae8754607429c2f15e16c2ed1d8f1d04f6c95bd474abed2604f16969ca580e85945a7d8ced2a694734a236c43c10949"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sq/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sq/firefox-58.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "713dd79c91fc01940c9b102ebbf83d5a9ffb62e77c42d971eeeddc9dcff1b2947268bab5c99285de5826fe3a5ffd55d9ccbd62c809bcbf2a266f019e35451cb3"; + sha512 = "554397bd32fbfa5475227cbb5d926c03b5359460c02833b917bd4278ac1917e9fc4da8a75c8cba566a573c26e8f8e0f82f41fef9b57e6584e3da327c6a566b5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sr/firefox-58.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c7ba73cc0df99cb28f5f5bc6a8dd237a3c9d5b67d7c63444ff8b63ed34f0e0e390d233a3f886999d5531ceb9be5b2272b3b282008499c5f09278c9a9043636a3"; + sha512 = "8e753463023f2428b15b58fe932ce9a33ff1dab4dcbd4321fb5055eba7768260769b1468d515c76590c61e2248d07fcffe2cc0c0d7035260d6b3694b90ce954e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sv-SE/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sv-SE/firefox-58.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "58663250980e784ed5481a31c09b4ee9002004d4026d6743f89c739beceb9a135c587a61a391dd3cb68d53ac34427d0ff00cfb8b6a235eb29d6da4d026ea3504"; + sha512 = "a86ddb45f3900e00906a938d35d5a463f12a7008f0c17c4775ac08216fb4207dc366ce4c23eefaaa7157af8a973cf2bc7a80e166f51c7388dc497ce9455c23fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ta/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ta/firefox-58.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "89fc06a036be7359494eb098def2a7118e0e46449ad7545b148a4194fca4ee446aed7172567a7bc746a202e48aa67a5fd18321f93920c761851a103402dbb008"; + sha512 = "65565bff074e4f5299c6aeafd81f21d8fd265ee060788d0c494371b0c862baa9fabd1a5182d14b49d1f6aa6a9f8c47894163292236421c42fd93b27f0d9da195"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/te/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/te/firefox-58.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "1c74315d96536cb03e842823e70246bf9597489ea0586db6c474a5a905031e034034a62ea549b202dfd5464684a52d3364d1423f34a5e720b6449981fc8bbe53"; + sha512 = "5b4f7656a5ef4dee75c958da7492d7d52e3636f0ee064e1ba93c7ad0360fb0a66825be76a4d26e316f67fb73616d223fc77ba95eaf4283f679c22da1dee79adb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/th/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/th/firefox-58.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "4f23ed4c12757f6d472c358af4dcf1366992a8c391bbeaf1f86f735ad2fc1638d516b76b22b118179062ba260154048c179b88bc3178488cfa20be4bcadcafc7"; + sha512 = "cee14df62eb7923ccf2d63953ddc4763ba76443c181cd9e1239db3b489216207b0a367eb9794cf4d52f3b7459df7515348383eb9a035f4252b0310045aa215b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/tr/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/tr/firefox-58.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3b45d8d29d6f7f8a08e4fac95ee28b12d482fcd2812ba357252d85bc2bf49dbf640190b3174fdc0e63b9b5d95e87ab3086efb1b1fb717323e971080e0bc5b570"; + sha512 = "e385eaeb6fc0cd0902c3e48bf99fec484880ca4907c8feeabe2c0747e10fbc3d8198d5aee83bd0b21cff2550d144d20d7a9e9e68ef07169825ef8a512cb0af7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/uk/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/uk/firefox-58.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a17831cff53566f313f691ae35f6b7032cd7c11b5501b4e84b70b64323d0dd9988ff422d8b7bbf67436af8c8ec631f9c68e7338c8c6d3d470094034a5766f3ec"; + sha512 = "962aef76a18a25890be145184aabe5149a5469d69ac46c8bafe3ea997613b31c214c96d9ddd565d65173fa639fb5f2cbf5de73b9c9b2aa6394fcbc84233fd38d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ur/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ur/firefox-58.0b1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e0eeb311d9cb0789cd17979057c1f4baa2065dcfa30f33058b2a866b239bb44690263ac408cdcbff8d4f7fce312bcd51dab60b84479917f2c615689ed0e1714d"; + sha512 = "68de26543d894104bf4349a6e7e13ae58cfafdb35bd14cb97604410b02196d0cdcc40750a04c64be301fbbcdd2c74e624c47cc2363d96d4e293edbfbe0a1f3e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/uz/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/uz/firefox-58.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "3d6399921209541e003e8fd83e3eebb39d30682090b0f306fbbae6705cacc7fd1db50426f00084bc1c6b239b57da5587479ffda6bf0b848cf4c458f821936a9f"; + sha512 = "37afeaeced1488f94212ae76b58465c3ecffc5550db240afc9dee2c5dd1277027402f7264d35707bb132f467305b367d982eaefd83cac72e51601c7d65bef0a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/vi/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/vi/firefox-58.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "3a3d751644d605c92f973b680b4a093fdb8c476aa4eb4473e9350a03128668cfd9c96dc5a1f49dda2647342704e02326ecdda5c02e0b4bd80d73d03d4d5642de"; + sha512 = "1d23a043e6f1ba27f13f89a88061b1f4f81c4ba70abcd6c15f563c76ff7b3bb95e66d968ead3df8bca51540b10042a8ed1f1792a42eb7f1e563eed0e92035f0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/xh/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/xh/firefox-58.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8aca9406db4ec188f0c123a298f4bc89d8b5adf6a1471202dcac40e2abd7fb16c807458a52c2a5e9e31703a67dc792153d7c745219da9ab2c7144bb3f853a7c1"; + sha512 = "247dc73aeb071d3f430e5f61447287d641d18951bb0c519a95146746906f4a25595f57a781c2f402ec7da2379d0b4fad657b5b097d00f774584f1d746fa783ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/zh-CN/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/zh-CN/firefox-58.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ff87569273037e5de47a5c1ff61fc31933f8a4a9147ce8f54b8c9e16413e3546f7ffacf4ef8127363082ae173d4234783e54a7ece55a8afec1a51a57527d4e43"; + sha512 = "10ad6c7fe8693d502b9d16630962f19f23b0457403430c8d24b34fe32de9b88513f82af3b09dc23bf252c2026efc6f45cad75e7244533aaebd824c7b0ab01926"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/zh-TW/firefox-57.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/zh-TW/firefox-58.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "063d9e0f85a04655f41e3e8cf9c875d6ec19d936c9c9aa04eb151dbd3de34493f7bfac557ae5f4f4dcb42037aad787e7e98ee42bf7fdf89c7833a21e5f827404"; + sha512 = "d69059c966b06a9b2c7bc10ce83d0b927f29b85d6aa2a78e62163f8718bde6478f7ee5f8040a70816a29719ae7336cc6d483b4ceefbb2b8153acd5040e0bedcc"; } ]; } From 49e0be1d4dbb005616d025b9105ed7c5031febe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Stylianos=20Ramos?= Date: Mon, 30 Oct 2017 00:09:00 +0100 Subject: [PATCH 2337/2806] joker: init at 0.8.6 --- lib/maintainers.nix | 1 + .../interpreters/joker/default.nix | 29 +++++++++++++++++++ pkgs/development/interpreters/joker/deps.nix | 11 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 43 insertions(+) create mode 100644 pkgs/development/interpreters/joker/default.nix create mode 100644 pkgs/development/interpreters/joker/deps.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7c3a845c00c..ccdf1e5b7a5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -44,6 +44,7 @@ anderspapitto = "Anders Papitto "; andir = "Andreas Rammhold "; andres = "Andres Loeh "; + andrestylianos = "Andre S. Ramos "; andrewrk = "Andrew Kelley "; andsild = "Anders Sildnes "; aneeshusa = "Aneesh Agrawal "; diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix new file mode 100644 index 00000000000..a0302b5530d --- /dev/null +++ b/pkgs/development/interpreters/joker/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "joker-${version}"; + version = "0.8.6"; + + goPackagePath = "github.com/candid82/joker"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "candid82"; + repo = "joker"; + sha256 = "0m6xi1jgss6f4maxqpwjyyhyyc71wy5a7jpm908m49xx80mz5ams"; + }; + + preBuild = "go generate ./..."; + + dontInstallSrc = true; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/candid82/joker; + description = "A small Clojure interpreter and linter written in Go"; + license = licenses.epl10; + platforms = platforms.all; + maintainers = with maintainers; [ andrestylianos ]; + }; +} diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix new file mode 100644 index 00000000000..d5cc0bc44b0 --- /dev/null +++ b/pkgs/development/interpreters/joker/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "6a4bc7b4feaeff8feb63f87d5fb2cf3e3610a559"; + sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 596051f4ea7..ca40870e48c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6451,6 +6451,8 @@ with pkgs; jmeter = callPackage ../applications/networking/jmeter {}; + joker = callPackage ../development/interpreters/joker {}; + davmail = callPackage ../applications/networking/davmail {}; kanif = callPackage ../applications/networking/cluster/kanif { }; From a167ea6875ed48aab6c4e9cfc537a772b7e7484b Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 4 Nov 2017 07:03:06 +0000 Subject: [PATCH 2338/2806] joker: do not install private generators --- pkgs/development/interpreters/joker/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index a0302b5530d..8906c9c5d24 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -17,6 +17,8 @@ buildGoPackage rec { dontInstallSrc = true; + excludedPackages = "gen"; # Do not install private generators. + goDeps = ./deps.nix; meta = with stdenv.lib; { From 4b5d30df2de8978516ff0cd979b86b33d9853990 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 4 Nov 2017 08:20:37 +0100 Subject: [PATCH 2339/2806] sbcl: 1.4.0 -> 1.4.1 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 85004767e58..3aa3ac6aadb 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0s87ax5hg9hz6b8kc9yrjckgz56s9iv96l2dcq216cbqkykrrm88"; + sha256 = "1qdaf847g5p2zgq00ax5hdy4r82bl3ss382psd0kkca1h83cdiz8"; }; patchPhase = '' From 765091d80b7e11651657d69eec3f3a33568bc05c Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 4 Nov 2017 08:25:03 +0100 Subject: [PATCH 2340/2806] tmuxp: 1.3.1 -> 1.3.4 --- pkgs/tools/misc/tmuxp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 9faa36c13f0..24486980b4b 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "tmuxp-${version}"; - version = "1.3.1"; + version = "1.3.4"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/t/tmuxp/${name}.tar.gz"; - sha256 = "189mxnb2pxj3wjijn56j8y5x1r23fil00fn2q7d6bd13vgr0f85s"; + sha256 = "149n35rr27n2c6yna1bla20x3w1zz9gxnjj3m3xxdfp4fbsd2y31"; }; patchPhase = '' From 16172d4299d2057701305d30d58d81f8c6509d7f Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 4 Nov 2017 08:36:33 +0100 Subject: [PATCH 2341/2806] fzf: 0.17.1 --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index e0367dc915d..830f9cb878b 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.17.0-2"; + version = "0.17.1"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0j4m3xf6qxfymfq6y5ml5rgz2rr1glh54k3b5xa9zi4cl5wg43qv"; + sha256 = "0zxav6kfifppj49kif8917djq1vqjznqzmviqj4iiar8jmyrn2fy"; }; outputs = [ "bin" "out" "man" ]; From c375ed9b8668b8d0492f6cf6eaa19c3d445b5433 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 4 Nov 2017 09:29:49 +0100 Subject: [PATCH 2342/2806] rlwrap: 0.42 -> 0.43 --- pkgs/tools/misc/rlwrap/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index 86d81fd2585..bd60e786036 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "rlwrap-0.42"; + name = "rlwrap-${version}"; + version = "0.43"; src = fetchurl { - url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz"; - sha256 = "0i3yz303wscrysyzpdq04h4nrl9ajz9dbwi80risdl5rkm3dhw2s"; + url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf"; }; buildInputs = [ readline ]; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Readline wrapper for console programs"; - homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/; + homepage = https://github.com/hanslub42/rlwrap; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; From 97d251e6acd09090342e1c19abb826b4d4b850c0 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 4 Nov 2017 09:31:18 +0100 Subject: [PATCH 2343/2806] rofi-pass: 1.5.2 -> 1.5.3 --- pkgs/tools/security/pass/rofi-pass.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 919ad9791a2..61f51973ed3 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; rev = version; - sha256 = "1sc4b1g2z7402akk96rqbnwjd66n6qn046ihpwxdb03bv2qahiap"; + sha256 = "1fn1j2rf3abc5qb44zfc8z8ffw6rva4xfp7597hwr1g3szacazpq"; }; buildInputs = [ makeWrapper ]; From 292f23c4b5d28fb8ea5a06a49d7c7596496d44c7 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sat, 4 Nov 2017 08:54:28 +0000 Subject: [PATCH 2344/2806] bcc: fix module installation BCC_KERNEL_MODULES_DIR should have not been removed --- pkgs/os-specific/linux/bcc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 768c8cedd35..6cf14b66a35 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper cmake flex bison ]; + cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"; + postInstall = '' mkdir -p $out/bin $out/share rm -r $out/share/bcc/tools/old From 6ec3bf3a77b8eadaa6011ef5edaa9f67eb0d79e4 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sat, 4 Nov 2017 08:58:04 +0000 Subject: [PATCH 2345/2806] bcc: add myself as maintainer --- pkgs/os-specific/linux/bcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 6cf14b66a35..75b7802772d 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "Dynamic Tracing Tools for Linux"; homepage = https://iovisor.github.io/bcc/; license = licenses.asl20; - maintainers = with maintainers; [ ragge ]; + maintainers = with maintainers; [ ragge mic92 ]; }; } From bb87d2c81a6405032d23cc46c4e859d7818b46cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 4 Nov 2017 10:20:39 +0100 Subject: [PATCH 2346/2806] drbd: fix evaluation after #30872 --- pkgs/os-specific/linux/drbd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 5c0fae7bf4f..971eef6a8b5 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = '' - export PATH=${systemd.udev.bin}/sbin:$PATH + export PATH=${systemd}/sbin:$PATH substituteInPlace user/Makefile.in \ --replace /sbin '$(sbindir)' substituteInPlace user/legacy/Makefile.in \ From 5633431c2b48413274d348d1bd3591041442f615 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 4 Nov 2017 10:23:28 +0100 Subject: [PATCH 2347/2806] statsd: repackage with node2nix --- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 222 ++++++++++---- pkgs/tools/networking/statsd/default.nix | 13 - .../networking/statsd/node-packages.json | 6 - .../tools/networking/statsd/node-packages.nix | 284 ------------------ pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 158 insertions(+), 372 deletions(-) delete mode 100644 pkgs/tools/networking/statsd/default.nix delete mode 100644 pkgs/tools/networking/statsd/node-packages.json delete mode 100644 pkgs/tools/networking/statsd/node-packages.nix diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index c2876f1128c..76ebb7eaa10 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -74,6 +74,7 @@ , "sloc" , "smartdc" , "socket.io" +, "statsd" , "stylus" , "svgo" , "tern" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index a2be42b0802..16d3b6ebc85 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -8621,13 +8621,13 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.144.0" = { + "aws-sdk-2.145.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.144.0"; + version = "2.145.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.144.0.tgz"; - sha1 = "14d8179bb44971b08426c63a1cc5f63dc09389e7"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.145.0.tgz"; + sha1 = "085bb4553231defd93b96b0d95023717c9c3c093"; }; }; "request-2.83.0" = { @@ -9431,13 +9431,13 @@ let sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; - "log-update-2.2.0" = { + "log-update-2.3.0" = { name = "log-update"; packageName = "log-update"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-2.2.0.tgz"; - sha1 = "e1b034d4325e3436c9df1aa7fd9c9c243bfb9198"; + url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; + sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; "prop-types-15.6.0" = { @@ -20003,24 +20003,6 @@ let sha512 = "1qi9fsw42grlhv4aj7v42xikvicr5657809syvp4dca33fjzzr1h7x1q9zwhclpyb879g6bgb2yd4i2iasnpmxn8ng1dcnq85yg001r"; }; }; - "boxen-1.2.1" = { - name = "boxen"; - packageName = "boxen"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz"; - sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d"; - }; - }; - "chalk-2.1.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; - sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; - }; - }; "detect-port-1.2.1" = { name = "detect-port"; packageName = "detect-port"; @@ -20030,22 +20012,13 @@ let sha512 = "0r0mpkpa1r78cmagyv47v38fc8ik7pr3zvlnqg57v8nkh4ipd83rla5s1j2c8gymfbwzzlna6pp7h9xw94h93gic3l2z9hzpd68p9fq"; }; }; - "filesize-3.5.10" = { + "filesize-3.5.11" = { name = "filesize"; packageName = "filesize"; - version = "3.5.10"; + version = "3.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-3.5.10.tgz"; - sha1 = "fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"; - }; - }; - "handlebars-4.0.10" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz"; - sha1 = "3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"; + url = "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz"; + sha512 = "3bg35im21jf6dhyrcajczdjl3rjm5mphdhansyfbpzm067vv3jp91n43nrzxf8q6nx3b5vkn2my1rskyp4pmg91xzdq01lawyifazk4"; }; }; "micro-9.0.0" = { @@ -20093,6 +20066,15 @@ let sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; }; }; + "chalk-2.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; + sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; + }; + }; "mri-1.1.0" = { name = "mri"; packageName = "mri"; @@ -20687,6 +20669,78 @@ let sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd"; }; }; + "generic-pool-2.2.0" = { + name = "generic-pool"; + packageName = "generic-pool"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz"; + sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e"; + }; + }; + "modern-syslog-1.1.2" = { + name = "modern-syslog"; + packageName = "modern-syslog"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz"; + sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; + }; + }; + "hashring-3.2.0" = { + name = "hashring"; + packageName = "hashring"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz"; + sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce"; + }; + }; + "winser-0.1.6" = { + name = "winser"; + packageName = "winser"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; + sha1 = "08663dc32878a12bbce162d840da5097b48466c9"; + }; + }; + "connection-parse-0.0.7" = { + name = "connection-parse"; + packageName = "connection-parse"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; + sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; + }; + }; + "simple-lru-cache-0.0.2" = { + name = "simple-lru-cache"; + packageName = "simple-lru-cache"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + }; + }; + "sequence-2.2.1" = { + name = "sequence"; + packageName = "sequence"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; + sha1 = "7f5617895d44351c0a047e764467690490a16b03"; + }; + }; + "commander-1.3.1" = { + name = "commander"; + packageName = "commander"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; + sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; + }; + }; "css-parse-1.7.0" = { name = "css-parse"; packageName = "css-parse"; @@ -20759,13 +20813,13 @@ let sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw"; }; }; - "csso-3.3.1" = { + "csso-3.4.0" = { name = "csso"; packageName = "csso"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-3.3.1.tgz"; - sha512 = "087ks3lnvyygbxivwf2fnn53a033ncz1ywm3jyarhz2hvsflka09iw611cwc55ix974bflcf0wmg6zvfkhxsjqmqfrz61w5y1yi6c9s"; + url = "https://registry.npmjs.org/csso/-/csso-3.4.0.tgz"; + sha1 = "57b27ef553cccbf5aa964c641748641e9af113f3"; }; }; "object.values-1.0.4" = { @@ -21569,13 +21623,13 @@ let sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; }; }; - "webpack-sources-1.0.1" = { + "webpack-sources-1.0.2" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz"; - sha512 = "27l6lhqai0bhgk7mbchvf608bgmrgbqmgjd07k1rsg7xh12lnaflr459cy7ay108jr7dk8g5ybx70xi7cbz6lm5c7m022sl5b34r6yk"; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.2.tgz"; + sha512 = "1mk1l1f1bv2cnxbyr13i5rbiwm9cgv91d28rk3mmy8z2m6f0xksgkjv5k00xcmvkd3sjsbrica8a1xrlzz0crydrfix3sdgq1s1vdb3"; }; }; "es6-map-0.1.5" = { @@ -25076,7 +25130,7 @@ in sources."JSONStream-1.3.1" sources."async-2.5.0" sources."aws4-1.6.0" - sources."aws-sdk-2.144.0" + sources."aws-sdk-2.145.0" sources."ini-1.3.4" sources."optimist-0.6.1" sources."request-2.83.0" @@ -25292,7 +25346,7 @@ in sources."indent-string-2.1.0" sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" - sources."log-update-2.2.0" + sources."log-update-2.3.0" sources."prop-types-15.6.0" sources."color-convert-1.9.0" sources."color-name-1.1.3" @@ -25703,7 +25757,7 @@ in }; dependencies = [ sources."chalk-2.3.0" - sources."log-update-2.2.0" + sources."log-update-2.3.0" sources."meow-3.7.0" (sources."ora-1.3.0" // { dependencies = [ @@ -31447,23 +31501,27 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.4.0.tgz"; - sha512 = "0kb65fj5n5z4j11c8247zvabb0qp4w5w9ls29bypm11ay9g2a1riv5wl72ya44b4arwxhyawxxijb5r5zjlwfs9zsbklcp6vbc8mphs"; + url = "https://registry.npmjs.org/serve/-/serve-6.4.1.tgz"; + sha512 = "385jwid220bqcnr46ck6vz22ic9kxmxghcpy4m15lvzcl7r3g8f6jyigwmjvdfypf8jaiv1shrfwj2fsgq7wsg6mh7q9hc3pkfk99x0"; }; dependencies = [ - sources."args-3.0.7" + (sources."args-3.0.7" // { + dependencies = [ + sources."chalk-2.1.0" + ]; + }) sources."basic-auth-2.0.0" sources."bluebird-3.5.1" - sources."boxen-1.2.1" - sources."chalk-2.1.0" + sources."boxen-1.2.2" + sources."chalk-2.3.0" sources."clipboardy-1.1.4" sources."dargs-5.1.0" sources."detect-port-1.2.1" - sources."filesize-3.5.10" + sources."filesize-3.5.11" sources."fs-extra-4.0.2" - sources."handlebars-4.0.10" + sources."handlebars-4.0.11" sources."ip-1.1.5" sources."micro-9.0.0" sources."micro-compress-1.0.0" @@ -31478,6 +31536,12 @@ in sources."mri-1.1.0" sources."pkginfo-0.4.1" sources."string-similarity-1.2.0" + sources."ansi-styles-3.2.0" + sources."escape-string-regexp-1.0.5" + sources."supports-color-4.5.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" sources."lodash-4.17.4" sources."safe-buffer-5.1.1" sources."ansi-align-2.0.0" @@ -31506,12 +31570,6 @@ in sources."path-key-2.0.1" sources."code-point-at-1.1.0" sources."number-is-nan-1.0.1" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.5.0" - sources."color-convert-1.9.0" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" sources."address-1.0.3" sources."debug-2.6.9" sources."ms-2.0.0" @@ -32018,6 +32076,34 @@ in }; production = true; }; + statsd = nodeEnv.buildNodePackage { + name = "statsd"; + packageName = "statsd"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz"; + sha1 = "92041479e174a214df7147f2fab1348af0839052"; + }; + dependencies = [ + sources."generic-pool-2.2.0" + sources."modern-syslog-1.1.2" + sources."hashring-3.2.0" + sources."winser-0.1.6" + sources."nan-2.7.0" + sources."connection-parse-0.0.7" + sources."simple-lru-cache-0.0.2" + sources."sequence-2.2.1" + sources."commander-1.3.1" + sources."keypress-0.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Network daemon for the collection and aggregation of realtime application metrics"; + homepage = https://github.com/etsy/statsd; + license = "MIT"; + }; + production = true; + }; stylus = nodeEnv.buildNodePackage { name = "stylus"; packageName = "stylus"; @@ -32072,7 +32158,7 @@ in sources."css-select-1.3.0-rc0" sources."css-select-base-adapter-0.1.0" sources."css-tree-1.0.0-alpha25" - sources."csso-3.3.1" + sources."csso-3.4.0" sources."js-yaml-3.10.0" sources."object.values-1.0.4" sources."sax-1.2.4" @@ -32887,7 +32973,11 @@ in ]; }) sources."watchpack-1.4.0" - sources."webpack-sources-1.0.1" + (sources."webpack-sources-1.0.2" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."yargs-8.0.2" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" diff --git a/pkgs/tools/networking/statsd/default.nix b/pkgs/tools/networking/statsd/default.nix deleted file mode 100644 index 6f909a915ae..00000000000 --- a/pkgs/tools/networking/statsd/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ recurseIntoAttrs, callPackage, nodejs -}: - -let - self = recurseIntoAttrs ( - callPackage ../../../top-level/node-packages.nix { - inherit nodejs self; - generated = callPackage ./node-packages.nix { inherit self; }; - overrides = { - "statsd" = { passthru.nodePackages = self; }; - }; - }); -in self.statsd diff --git a/pkgs/tools/networking/statsd/node-packages.json b/pkgs/tools/networking/statsd/node-packages.json deleted file mode 100644 index f75224e79f9..00000000000 --- a/pkgs/tools/networking/statsd/node-packages.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - "statsd" -, "statsd-librato-backend" -, "stackdriver-statsd-backend" -, "statsd-influxdb-backend" -] diff --git a/pkgs/tools/networking/statsd/node-packages.nix b/pkgs/tools/networking/statsd/node-packages.nix deleted file mode 100644 index fd196c249ae..00000000000 --- a/pkgs/tools/networking/statsd/node-packages.nix +++ /dev/null @@ -1,284 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."commander"."1.3.1" = - self.by-version."commander"."1.3.1"; - by-version."commander"."1.3.1" = self.buildNodePackage { - name = "commander-1.3.1"; - version = "1.3.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; - name = "commander-1.3.1.tgz"; - sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; - }; - deps = { - "keypress-0.1.0" = self.by-version."keypress"."0.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connection-parse"."0.0.x" = - self.by-version."connection-parse"."0.0.7"; - by-version."connection-parse"."0.0.7" = self.buildNodePackage { - name = "connection-parse-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; - name = "connection-parse-0.0.7.tgz"; - sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."generic-pool"."2.2.0" = - self.by-version."generic-pool"."2.2.0"; - by-version."generic-pool"."2.2.0" = self.buildNodePackage { - name = "generic-pool-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz"; - name = "generic-pool-2.2.0.tgz"; - sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hashring"."3.2.0" = - self.by-version."hashring"."3.2.0"; - by-version."hashring"."3.2.0" = self.buildNodePackage { - name = "hashring-3.2.0"; - version = "3.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz"; - name = "hashring-3.2.0.tgz"; - sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce"; - }; - deps = { - "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7"; - "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."keypress"."0.1.x" = - self.by-version."keypress"."0.1.0"; - by-version."keypress"."0.1.0" = self.buildNodePackage { - name = "keypress-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - name = "keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."modern-syslog"."1.1.2" = - self.by-version."modern-syslog"."1.1.2"; - by-version."modern-syslog"."1.1.2" = self.buildNodePackage { - name = "modern-syslog-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz"; - name = "modern-syslog-1.1.2.tgz"; - sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; - }; - deps = { - "nan-2.4.0" = self.by-version."nan"."2.4.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ "!win32" ]; - cpu = [ ]; - }; - by-spec."nan"."^2.0.5" = - self.by-version."nan"."2.4.0"; - by-version."nan"."2.4.0" = self.buildNodePackage { - name = "nan-2.4.0"; - version = "2.4.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; - name = "nan-2.4.0.tgz"; - sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sequence"."2.2.1" = - self.by-version."sequence"."2.2.1"; - by-version."sequence"."2.2.1" = self.buildNodePackage { - name = "sequence-2.2.1"; - version = "2.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; - name = "sequence-2.2.1.tgz"; - sha1 = "7f5617895d44351c0a047e764467690490a16b03"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."simple-lru-cache"."0.0.x" = - self.by-version."simple-lru-cache"."0.0.2"; - by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage { - name = "simple-lru-cache-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - name = "simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stackdriver-statsd-backend"."*" = - self.by-version."stackdriver-statsd-backend"."0.2.3"; - by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage { - name = "stackdriver-statsd-backend-0.2.3"; - version = "0.2.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; - name = "stackdriver-statsd-backend-0.2.3.tgz"; - sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3"; - by-spec."statsd"."*" = - self.by-version."statsd"."0.8.0"; - by-version."statsd"."0.8.0" = self.buildNodePackage { - name = "statsd-0.8.0"; - version = "0.8.0"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz"; - name = "statsd-0.8.0.tgz"; - sha1 = "92041479e174a214df7147f2fab1348af0839052"; - }; - deps = { - "generic-pool-2.2.0" = self.by-version."generic-pool"."2.2.0"; - }; - optionalDependencies = { - "modern-syslog-1.1.2" = self.by-version."modern-syslog"."1.1.2"; - "hashring-3.2.0" = self.by-version."hashring"."3.2.0"; - "winser-0.1.6" = self.by-version."winser"."0.1.6"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "statsd" = self.by-version."statsd"."0.8.0"; - by-spec."statsd-influxdb-backend"."*" = - self.by-version."statsd-influxdb-backend"."0.6.0"; - by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage { - name = "statsd-influxdb-backend-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz"; - name = "statsd-influxdb-backend-0.6.0.tgz"; - sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.6.0"; - by-spec."statsd-librato-backend"."*" = - self.by-version."statsd-librato-backend"."0.1.7"; - by-version."statsd-librato-backend"."0.1.7" = self.buildNodePackage { - name = "statsd-librato-backend-0.1.7"; - version = "0.1.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz"; - name = "statsd-librato-backend-0.1.7.tgz"; - sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.7"; - by-spec."winser"."=0.1.6" = - self.by-version."winser"."0.1.6"; - by-version."winser"."0.1.6" = self.buildNodePackage { - name = "winser-0.1.6"; - version = "0.1.6"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; - name = "winser-0.1.6.tgz"; - sha1 = "08663dc32878a12bbce162d840da5097b48466c9"; - }; - deps = { - "sequence-2.2.1" = self.by-version."sequence"."2.2.1"; - "commander-1.3.1" = self.by-version."commander"."1.3.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0999802514c..fe9566dadf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16510,9 +16510,7 @@ with pkgs; stella = callPackage ../misc/emulators/stella { }; - statsd = callPackage ../tools/networking/statsd { - nodejs = nodejs-4_x; - }; + statsd = nodePackages.statsd; linuxstopmotion = callPackage ../applications/video/linuxstopmotion { }; From 6269306a8dfa0744ddc4609946a8105b996cd23a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Wed, 25 Oct 2017 10:56:51 +0200 Subject: [PATCH 2348/2806] pythonPackages.tensorflow: add flags for efficent math on CPU --- pkgs/development/python-modules/tensorflow/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index a0a2f3a24af..2ce419fa7fb 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -7,6 +7,9 @@ , cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] +, sse42Support ? false +, avx2Support ? false +, fmaSupport ? false }: assert cudaSupport -> cudatoolkit != null @@ -77,6 +80,9 @@ let hardeningDisable = [ "all" ]; bazelFlags = [ "--config=opt" ] + ++ lib.optional sse42Support "--copt=-msse4.2" + ++ lib.optional avx2Support "--copt=-mavx2" + ++ lib.optional fmaSupport "--copt=-mfma" ++ lib.optional cudaSupport "--config=cuda"; bazelTarget = "//tensorflow/tools/pip_package:build_pip_package"; From b34f5db38fccea937b47ef74c0b0bc49df1c0619 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 4 Nov 2017 11:29:40 +0100 Subject: [PATCH 2349/2806] parallel: 20170722 -> 20171022 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 648d09b4265..676db3ab69c 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20170722"; + name = "parallel-20171022"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "117g50bx1kcbrqix0f1539z5rzhvgsni2wddjv939wcxkrdb1idx"; + sha256 = "18pq10npl7g764ww7cy9r5n5s3kiy984jclf932qfgndcxsbpqpp"; }; nativeBuildInputs = [ makeWrapper perl ]; From ba885e1d7decd14dd70c1602a208eda4d2b352cb Mon Sep 17 00:00:00 2001 From: gjeusel Date: Sat, 4 Nov 2017 11:48:38 +0100 Subject: [PATCH 2350/2806] tortoisehg: 4.1.1 -> 4.3.1 Signed-off-by: gjeusel --- pkgs/applications/version-management/tortoisehg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 1a0c506a19d..6466e5ab0ae 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.1.1"; + version = "4.3.1"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "14fy5p5hx4iij5kyma9679nrprd9lsjr6j047bfyfrwa3l4knj2g"; + sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; From 86bc99cc8a1a15ebb776e3cd9361e8ec2a53f9c2 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 4 Nov 2017 01:00:28 +0100 Subject: [PATCH 2351/2806] tor-browser-bundle-bin: 7.0.8 -> 7.0.9 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 4464d490bc8..4af725d3c95 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.8"; + version = "7.0.9"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0bi4l4ma40ifsajvjpwv6ixphijqvb7yrci2jcyykh3j41ndfjf2"; + sha256 = "0ykbpp0qr3glygmnnc6ac41kkvrxn52472z6kbpf7i6qzvk4ba0d"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "182q1gb8jnk92wxr7m977yxcksa8d3zg90qbsja1raym2vhqaf73"; + sha256 = "02alpzmvm3ldlp51sqppz41d12lx93n5qj6i3gqz6din96swm7j8"; }; }; in From 42b70ae5edccac2c6ca2afb205ace21790850919 Mon Sep 17 00:00:00 2001 From: Maciej Kazulak Date: Fri, 3 Nov 2017 15:15:01 +0100 Subject: [PATCH 2352/2806] nixpkgs manual: add rstudio shell.nix example Provide an example of a self-contained shell.nix for rstudio with additional packages. --- pkgs/development/r-modules/README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md index 477059cbb2c..c8f02bd1478 100644 --- a/pkgs/development/r-modules/README.md +++ b/pkgs/development/r-modules/README.md @@ -79,6 +79,23 @@ environment, see `rstudioWrapper`, which functions similarly to Then like above, `nix-env -f "" -iA rstudioEnv` will install this into your user profile. +Alternatively, you can create a self-contained `shell.nix` without the need to +modify any configuration files: + +```nix +{ pkgs ? import {} +}: + +pkgs.rstudioWrapper.override { + packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ]; +} + +``` + +Executing `nix-shell` will then drop you into an environment equivalent to the +one above. If you need additional packages just add them to the list and +re-enter the shell. + ## Updating the package set ```bash From eafd703a63a598a33028aca6f1349544dfd09b65 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 4 Nov 2017 12:45:51 +0100 Subject: [PATCH 2353/2806] lispPackages.clwrapper: make sure to patch shebangs in the scripts before using them --- pkgs/development/lisp-modules/clwrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 2088439c61d..fb4a090c702 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { substituteAll ${./common-lisp.sh} "$out"/bin/common-lisp.sh substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh" substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh" + patchShebangs "$out/bin" chmod a+x "$out"/bin/* substituteAll "${./setup-hook.sh}" "setup-hook-parsed" From 632a1807db13f0176f1374788cd15070eebed8e5 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 4 Nov 2017 12:57:58 +0100 Subject: [PATCH 2354/2806] hyp: move expression out python-packages.nix --- pkgs/servers/http/hyp/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 19 ------------------- 3 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 pkgs/servers/http/hyp/default.nix diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix new file mode 100644 index 00000000000..3a1eb50f05b --- /dev/null +++ b/pkgs/servers/http/hyp/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, python3Packages }: + +python3Packages.buildPythonPackage rec { + name = "hyp-server-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "mirror://pypi/h/hyp-server/${name}.tar.gz"; + sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; + }; + + meta = with stdenv.lib; { + description = "Hyperminimal https server"; + homepage = https://github.com/rnhmjoj/hyp; + license = with licenses; [gpl3Plus mit]; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64dd498b6d..93c1245eb11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11489,6 +11489,8 @@ with pkgs; exhibitor = callPackage ../servers/exhibitor { }; + hyp = callPackage ../servers/http/hyp/default.nix { }; + prosody = callPackage ../servers/xmpp/prosody { lua5 = lua5_1; inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf670a40c6c..300dcd1e9d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7726,25 +7726,6 @@ in { subliminal = callPackage ../development/python-modules/subliminal {}; - hyp = buildPythonPackage rec { - name = "hyp-server-${version}"; - version = "1.2.0"; - disabled = !isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/hyp-server/${name}.tar.gz"; - sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; - }; - - meta = { - description = "Hyperminimal https server"; - homepage = https://github.com/rnhmjoj/hyp; - license = with licenses; [gpl3Plus mit]; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - }; - }; - hyperlink = callPackage ../development/python-modules/hyperlink {}; zope_copy = buildPythonPackage rec { From 5fe398fdc9324f94c298b82441ac5a3486b4fdea Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 4 Nov 2017 11:41:54 +0100 Subject: [PATCH 2355/2806] fdm: 1.8 -> 1.9.0.20170124 sf.net repo does not exist anymore --- pkgs/tools/networking/fdm/default.nix | 60 ++++++++++----------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 0061620b58d..3984922abe2 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -1,45 +1,31 @@ -{ stdenv, fetchurl - , openssl, tdb, zlib, flex, bison - }: -let - buildInputs = [ openssl tdb zlib flex bison ]; - sourceInfo = rec { - baseName="fdm"; - version = "1.8"; - name="${baseName}-${version}"; - url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz"; - sha256 = "0hi39f31ipv8f9wxb41pajvl61w6vaapl39wq8v1kl9c7q6h0k2g"; - }; +{ stdenv, fetchFromGitHub, autoreconfHook, openssl, tdb, zlib, flex, bison }: + +let + + baseName = "fdm"; + version = "1.9.0.20170124"; + in -stdenv.mkDerivation { - src = fetchurl { - inherit (sourceInfo) url sha256; + +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "nicm"; + repo = baseName; + rev = "cae4ea37b6b296d1b2e48f62934ea3a7f6085e33"; + sha256 = "048191wdv1yprwinipmx2152gvd2iq1ssv7xfb1bzh6zirh1ya3n"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl tdb zlib flex bison ]; - preBuild = '' - export makeFlags="$makeFlags PREFIX=$out" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Dbool=int" - sed -i */Makefile -i Makefile -e 's@ -g bin @ @' - sed -i */Makefile -i Makefile -e 's@ -o root @ @' - sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @' - sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @' - sed -i */Makefile -i Makefile -i GNUmakefile -e 's@-I-@@g' - ''; - - meta = { + meta = with stdenv.lib; { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; - maintainers = with stdenv.lib.maintainers; - [ - raskin - ]; - platforms = with stdenv.lib.platforms; - linux; - homepage = http://fdm.sourceforge.net/; - inherit (sourceInfo) version; - updateWalker = true; + maintainers = with maintainers; [ raskin ]; + platforms = with platforms; linux; + homepage = https://github.com/nicm/fdm; + downloadPage = https://github.com/nicm/fdm/releases; }; } From adf5aea0b61d8eb1c73a68b7dc67f3ff2e1242f8 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sat, 4 Nov 2017 12:45:59 +0000 Subject: [PATCH 2356/2806] tcpflow: fix build --- pkgs/tools/networking/tcpflow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix index 52727f1c49e..1df0f2c37fc 100644 --- a/pkgs/tools/networking/tcpflow/default.nix +++ b/pkgs/tools/networking/tcpflow/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib libpcap boost automake autoconf ] ++ lib.optional useCairo cairo; postUnpack = '' - pushd tcpflow-*-src/src + pushd "$sourceRoot/src" cp -rv ${be13_api}/* be13_api/ cp -rv ${dfxml}/* dfxml/ cp -rv ${httpparser}/* http-parser/ From 0936dd0d5784e30b40f94001bdcd1a327bcd4506 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sat, 4 Nov 2017 13:56:32 +0000 Subject: [PATCH 2357/2806] textadept: fix build --- pkgs/applications/editors/textadept/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index db74a58da43..4f1a29278be 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -32,7 +32,7 @@ let build_dir=$PWD cd $TMPDIR - local_path=$(basename ${store_path} .zip | sed -e 's/^[a-z0-9]*-//') + local_path=$(basename ${url} .zip) cp -r ${store_path} $local_path chmod u+rwX -R $local_path From 9e59605bab906f7d65c416e3e4646ba99cc553d8 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sat, 4 Nov 2017 14:18:47 +0000 Subject: [PATCH 2358/2806] openrct2: fix build --- pkgs/games/openrct2/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index a54d3a45ae8..6881767cbb9 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -24,8 +24,7 @@ in stdenv.mkDerivation rec { inherit name; - srcs = [ openrct2-src title-sequences-src ]; - sourceRoot = "."; + src = openrct2-src; buildInputs = [ SDL2 @@ -46,11 +45,7 @@ stdenv.mkDerivation rec { ]; postUnpack = '' - cp -r ${openrct2-src}/* ${sourceRoot} - cp -r ${title-sequences-src} ${sourceRoot}/title - - # creating temporary files in fixCmakeFiles fails otherwise - chmod -R u+w ${sourceRoot} + cp -r ${title-sequences-src} $sourceRoot/title ''; cmakeFlags = [ From 84ad480e0c2b7d65b66cb9551f8985f159d3fe38 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 4 Nov 2017 08:02:45 +0100 Subject: [PATCH 2359/2806] tilix: 1.6.4 -> 1.7.1 --- pkgs/applications/misc/tilix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 2128c260b80..c7ee4fb1c4c 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "tilix-${version}"; - version = "1.6.4"; + version = "1.7.1"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = "${version}"; - sha256 = "1vqi68jlbbaky1569kd4lr6p02zsiv7v2rfb8j1pzwj7gydblaac"; + sha256 = "0x0bnb26hjvxmvvd7c9k8fw97gcm3z5ssr6r8x90xbyyw6h58hhh"; }; nativeBuildInputs = [ From 93c54acf97077567e8d6135a36f191e872b26692 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 17 Oct 2017 19:58:22 +0200 Subject: [PATCH 2360/2806] services.xserver: assert that either desktop- or window manager is not "none" resolves #11064 --- nixos/doc/manual/release-notes/rl-1803.xml | 8 ++++++++ .../services/x11/desktop-managers/default.nix | 4 ++-- nixos/modules/services/x11/xserver.nix | 12 ++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 17b385242f6..fe776c3df22 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -90,6 +90,14 @@ following incompatible changes: That means that old configuration is not overwritten by default when update to the znc options are made. + + + The option is now none by default. + An assertion failure is thrown if WM's and DM's default are none. + To explicitly run a plain X session without and DM or WM, the newly introduced option + must be set to true. + + diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 13f339e3fbf..b393167ae2c 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -87,8 +87,8 @@ in default = mkOption { type = types.str; - default = ""; - example = "none"; + default = "none"; + example = "plasma5"; description = "Default desktop manager loaded if none have been chosen."; apply = defaultDM: if defaultDM == "" && cfg.session.list != [] then diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index d4fe475690c..58dc75bcb4e 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -161,6 +161,15 @@ in ''; }; + plainX = mkOption { + type = types.bool; + default = false; + description = '' + Whether the X11 session can be plain (without DM/WM) and + the Xsession script will be used as fallback or not. + ''; + }; + autorun = mkOption { type = types.bool; default = true; @@ -552,6 +561,9 @@ in + "${toString (length primaryHeads)} heads set to primary: " + concatMapStringsSep ", " (x: x.output) primaryHeads; }) + { assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX; + message = "Either the desktop manager or the window manager shouldn't be `none`! To explicitly allow this, you can also set `services.xserver.plainX` to `true`."; + } ]; environment.etc = From 97594ffd869e134bb1be4ed552ee39edfa184b75 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Sun, 5 Nov 2017 01:24:20 +1100 Subject: [PATCH 2361/2806] synergy: track upstream repository name change. --- pkgs/applications/misc/synergy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 3ecc772feaa..ee3cb9cd8ed 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "symless"; - repo = "synergy"; + repo = "synergy-core"; rev = "v${version}-stable"; sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3"; }; From 303ad53e7ef15784224d9f21efa32188868902d3 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 4 Nov 2017 15:36:17 +0100 Subject: [PATCH 2362/2806] jruby: 9.1.12.0 -> 9.1.13.0 --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 0ea1bf19231..ff192c07286 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.1.12.0"; + version = "9.1.13.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "15x5w4awy8h6xfkbj0p4xnb68xzfrss1rf2prk0kzk5kyjakrcnx"; + sha256 = "021rmm5c18js569i4z6vj1bb193j4nska43jfiqz5hisc936c5cx"; }; buildInputs = [ makeWrapper ]; From 9720703d2424485a7bad4c282d33916ef815c548 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 4 Nov 2017 12:05:42 +0100 Subject: [PATCH 2363/2806] mawk: 1.3.4-20161120 -> 1.3.4-20171017 --- pkgs/tools/text/mawk/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 8840130dde5..a8657c3ea2f 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mawk-1.3.4-20161120"; + name = "mawk-1.3.4-20171017"; src = fetchurl { - url = "ftp://invisible-island.net/mawk/${name}.tgz"; - sha256 = "07hc33g2ip7463dravsiz0zwfc8vy4y4jxqvp7rz3hb896xw27in"; + urls = [ + "https://invisible-mirror.net/archives/mawk/${name}.tgz" + "ftp://invisible-island.net/mawk/${name}.tgz" + ]; + sha256 = "0nwyxhipn4jx7j695lih1xggxm6cp4fjk4wbgihd33ni3rfi25yv"; }; meta = with stdenv.lib; { From 2c9e195eedad527341c6dbf36bbda21d79c96083 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 1 Nov 2017 06:00:27 +0000 Subject: [PATCH 2364/2806] nixos-prepare-root: chmod if dir already exists --- .../installer/tools/nixos-prepare-root.sh | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh index 0bd70d2d349..ed5af234fec 100644 --- a/nixos/modules/installer/tools/nixos-prepare-root.sh +++ b/nixos/modules/installer/tools/nixos-prepare-root.sh @@ -31,16 +31,16 @@ if ! test -e "$mountPoint"; then fi # Create a few of the standard directories in the target root directory. -mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home -mkdir -m 01777 -p $mountPoint/tmp -mkdir -m 0755 -p $mountPoint/tmp/root -mkdir -m 0755 -p $mountPoint/var -mkdir -m 0700 -p $mountPoint/root +install -m 0755 -d $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home +install -m 01777 -d $mountPoint/tmp +install -m 0755 -d $mountPoint/tmp/root +install -m 0755 -d $mountPoint/var +install -m 0700 -d $mountPoint/root ln -sf /run $mountPoint/var/run # Create the necessary Nix directories on the target device -mkdir -m 0755 -p \ +install -m 0755 -d \ $mountPoint/nix/var/nix/gcroots \ $mountPoint/nix/var/nix/temproots \ $mountPoint/nix/var/nix/userpool \ @@ -48,7 +48,7 @@ mkdir -m 0755 -p \ $mountPoint/nix/var/nix/db \ $mountPoint/nix/var/log/nix/drvs -mkdir -m 1775 -p $mountPoint/nix/store +install -m 1775 -d $mountPoint/nix/store # All Nix operations below should operate on our target store, not /nix/store. # N.B: this relies on Nix 1.12 or higher @@ -80,7 +80,7 @@ if [ ! -x $mountPoint/@shell@ ]; then echo "Error: @shell@ wasn't included in the closure" >&2 exit 1 fi -mkdir -m 0755 -p $mountPoint/bin +install -m 0755 -d $mountPoint/bin ln -sf @shell@ $mountPoint/bin/sh echo "setting the system closure to '$system'..." @@ -89,17 +89,16 @@ nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system # Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel. -mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles -mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user -mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root +install -m 0755 -d $mountPoint/nix/var/nix/profiles +install -m 1777 -d $mountPoint/nix/var/nix/profiles/per-user +install -m 0755 -d $mountPoint/nix/var/nix/profiles/per-user/root if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then echo "copying channel..." nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet fi -mkdir -m 0700 -p $mountPoint/root/.nix-defexpr +install -m 0700 -d $mountPoint/root/.nix-defexpr ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels # Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out. touch $mountPoint/etc/NIXOS - From 4e892b9c03ea69eee38cdd40126194ea92cc00be Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 4 Nov 2017 15:26:22 +0100 Subject: [PATCH 2365/2806] nixpkgs manual : clearer meta.platforms description Refer to doubles.nix for a list of common platforms types used in packages --- doc/meta.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/meta.xml b/doc/meta.xml index b1ffd0502b2..0f9dccfb91b 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -200,11 +200,9 @@ meta-attributes meta.platforms = stdenv.lib.platforms.linux; - Attribute Set stdenv.lib.platforms in - - nixpkgs/lib/platforms.nix defines various common - lists of platforms types. - + Attribute Set stdenv.lib.platforms defines + + various common lists of platforms types. From 25f080ca4af5b5bff1640cdd11202a3ae31b086c Mon Sep 17 00:00:00 2001 From: mimadrid Date: Tue, 24 Oct 2017 17:53:30 +0200 Subject: [PATCH 2366/2806] gawk: 4.1.4 -> 4.2.0 --- pkgs/tools/text/gawk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 415a2ade28d..65d0a1e4c00 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -19,11 +19,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-4.1.4"; + name = "gawk-4.2.0"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "0rn2mmjxm767zliqzd67j7h2ncjn4j0321c60y9fy3grs3i89qak"; + sha256 = "1wm9lqj77y7xz07zi0n187aqm8zavzxzpm1j53ahxz81q0qwvwyl"; }; # When we do build separate interactive version, it makes sense to always include man. From 7325ad9ab735424257b05a81e0c8197e4651e68f Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 1 Nov 2017 01:09:39 +0100 Subject: [PATCH 2367/2806] graphite: override django and django_tagging instead of depending on specific versions in the django_tagging_0_4_3 and graphite_web derivations. This should fix: https://github.com/NixOS/nixpkgs/pull/30277#discussion_r145393088 This was joint work of @basvandijk and @layus at NixCon 2017. --- .../modules/services/monitoring/graphite.nix | 22 +++++++++++++------ pkgs/top-level/python-packages.nix | 15 +++++++++---- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 645dfeab019..4b1ad34b3a4 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -467,7 +467,15 @@ in { ]; }) - (mkIf cfg.web.enable { + (mkIf cfg.web.enable (let + python27' = pkgs.python27.override { + packageOverrides = self: super: { + django = self.django_1_8; + django_tagging = self.django_tagging_0_4_3; + }; + }; + pythonPackages = python27'.pkgs; + in { systemd.services.graphiteWeb = { description = "Graphite Web Interface"; wantedBy = [ "multi-user.target" ]; @@ -477,8 +485,8 @@ in { PYTHONPATH = let penv = pkgs.python.buildEnv.override { extraLibs = [ - pkgs.python27Packages.graphite_web - pkgs.python27Packages.pysqlite + pythonPackages.graphite_web + pythonPackages.pysqlite ]; }; penvPack = "${penv}/${pkgs.python.sitePackages}"; @@ -516,17 +524,17 @@ in { fi # Only collect static files when graphite_web changes. - if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python27Packages.graphite_web}" ]; then + if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite_web}" ]; then mkdir -p ${staticDir} ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic --noinput --clear chown -R graphite:graphite ${staticDir} - ln -sfT "${pkgs.python27Packages.graphite_web}" "${dataDir}/current_graphite_web" + ln -sfT "${pythonPackages.graphite_web}" "${dataDir}/current_graphite_web" fi ''; }; - environment.systemPackages = [ pkgs.python27Packages.graphite_web ]; - }) + environment.systemPackages = [ pythonPackages.graphite_web ]; + })) (mkIf cfg.api.enable { systemd.services.graphiteApi = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0be1ff17ee0..7013b980865 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8093,14 +8093,17 @@ in { django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_tagging_0_4_3 = self.django_tagging.overrideAttrs (attrs: rec { + django_tagging_0_4_3 = if + self.django != self.django_1_8 + then throw "django_tagging_0_4_3 should be build with django_1_8" + else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec { name = "django-tagging-0.4.3"; src = pkgs.fetchurl { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs"; }; - propagatedBuildInputs = with self; [ django_1_8 ]; + propagatedBuildInputs = with self; [ django ]; }); django_classytags = buildPythonPackage rec { @@ -22835,7 +22838,11 @@ EOF }; }; - graphite_web = buildPythonPackage rec { + graphite_web = if + self.django != self.django_1_8 + || self.django_tagging != self.django_tagging_0_4_3 + then throw "graphite_web should be build with django_1_8 and django_tagging_0_4_3" + else buildPythonPackage rec { name = "graphite-web-${version}"; disabled = isPy3k; version = graphiteVersion; @@ -22846,7 +22853,7 @@ EOF }; propagatedBuildInputs = with self; [ - django_1_8 django_tagging_0_4_3 whisper pycairo cairocffi + django django_tagging whisper pycairo cairocffi ldap memcached pytz urllib3 scandir ]; From 8923737cd5d386c3eafdf8f84fa1aad1a77a4368 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 3 Nov 2017 23:53:25 +0000 Subject: [PATCH 2368/2806] ocamlPackages.sexplib: 0.9.2 -> 0.9.3 --- .../ocaml-modules/janestreet/default.nix | 17 ++++++++++++----- pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 4aabb976ee1..7cddf0507df 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,17 +1,24 @@ { stdenv, lib, janePackage, ocaml, ocamlbuild, cryptokit, ctypes, magic-mime, - ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, + ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num, openssl }: rec { # Jane Street packages, up to ppx_core - sexplib = janePackage { + sexplib = janePackage ({ name = "sexplib"; - version = "0.9.2"; - hash = "0szj7gi5ksy7kif5g71rkr6xhxc41xl8hq6s5zz610cjyngzyzjl"; meta.description = "Automated S-expression conversion"; - }; + } // (if lib.versionAtLeast ocaml.version "4.05" + then { + version = "0.9.3"; + hash = "0a2sqh235ja3qwy7b2k3qym2616dz7369a195qwi6ljy3cnh7s53"; + buildInputs = [ num ]; + } else { + version = "0.9.2"; + hash = "0szj7gi5ksy7kif5g71rkr6xhxc41xl8hq6s5zz610cjyngzyzjl"; + } + )); base = janePackage { name = "base"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a56343713fe..5e95f2ce7fd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -682,7 +682,7 @@ let janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = import ../development/ocaml-modules/janestreet { - inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime; + inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime num; inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith; inherit (pkgs) stdenv openssl; }; From 8ea1b79003ddf21a0a7d8da4812aeba9d7f99e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 4 Nov 2017 18:27:32 +0100 Subject: [PATCH 2369/2806] wxGTK-{2.9,3.0}: apply an upstream patch Close #30909. --- pkgs/development/libraries/wxwidgets/2.9/default.nix | 8 ++++++++ pkgs/development/libraries/wxwidgets/3.0/default.nix | 12 +++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 56080841ca3..6230536b33a 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -20,6 +20,14 @@ stdenv.mkDerivation { sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc"; }; + patches = [ + (fetchurl { # https://trac.wxwidgets.org/ticket/17942 + url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" + + "fix_assertion_using_hide_in_destroy.diff"; + sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; + }) + ]; + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 2375de4b1bf..951f27f7d54 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, gtk3, libXinerama, libSM, libXxf86vm +{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig +, gtk2, gtk3, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true @@ -37,9 +38,14 @@ stdenv.mkDerivation { propagatedBuildInputs = optional stdenv.isDarwin AGL; - patches = + patches = [ + (fetchurl { # https://trac.wxwidgets.org/ticket/17942 + url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" + + "fix_assertion_using_hide_in_destroy.diff"; + sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; + }) # "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4 - optional (!withGtk2) (fetchpatch { + ] ++ optional (!withGtk2) (fetchpatch { url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch"; sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q"; }); From a8c4829f7c3cf2b88b7469d979ec8a6a610df32b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 4 Nov 2017 17:12:57 +0000 Subject: [PATCH 2370/2806] ocamlPackages.base: 0.9.3 -> 0.9.4 --- pkgs/development/ocaml-modules/janestreet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 7cddf0507df..580ebdc0490 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -22,8 +22,8 @@ rec { base = janePackage { name = "base"; - version = "0.9.3"; - hash = "14v3zsr7za9h1gkxdmkk1yagnrfjk3y9snraywv9hsqbhv39ajvv"; + version = "0.9.4"; + hash = "0x85xi66b4zwlbdwmyc99zcmawgpp75gxqbl55rr67awavw162rw"; propagatedBuildInputs = [ sexplib ]; meta.description = "Full standard library replacement for OCaml"; }; From 9e0159c04cd38d07fb8c976d868fa0b8efb8ab59 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 4 Nov 2017 17:50:58 +0000 Subject: [PATCH 2371/2806] ocamlPackages.stdio: 0.9.0 -> 0.9.1 --- pkgs/development/ocaml-modules/janestreet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 580ebdc0490..938a84454be 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -56,7 +56,8 @@ rec { stdio = janePackage { name = "stdio"; - hash = "1c08jg930j7yxn0sjvlm3fs2fvwaf15sn9513yf1rb7y1lxrgwc4"; + version = "0.9.1"; + hash = "13rj3ii0rvmklfim9ild0ib44ssdadig7a9ccjbz22m0pw84a1sx"; propagatedBuildInputs = [ base ]; meta.description = "Standard IO library for OCaml"; }; From 27114d45ae3e68483aab8652f32ec02aa75799cd Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 4 Nov 2017 19:56:04 +0100 Subject: [PATCH 2372/2806] stdenv.lib.maintainers: add c0bw3b --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e6dd349676f..451cb4867a5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -94,6 +94,7 @@ bramd = "Bram Duvigneau "; bstrik = "Berno Strik "; bzizou = "Bruno Bzeznik "; + c0bw3b = "Renaud "; c0dehero = "CodeHero "; calbrecht = "Christian Albrecht "; calrama = "Moritz Maxeiner "; From 9754503c6be6bcaa489658b73dbc4cbad99404d6 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 4 Nov 2017 20:02:23 +0100 Subject: [PATCH 2373/2806] nsjail: 2.1 -> 2.2 plus fixed meta.license which should be Apache License 2.0 --- pkgs/tools/security/nsjail/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index a9763b07b71..8f087ef3d93 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -3,29 +3,31 @@ stdenv.mkDerivation rec { name = "nsjail-${version}"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "google"; repo = "nsjail"; rev = version; fetchSubmodules = true; - sha256 = "1wkhy86d0vgzngdvv593yhcghjh63chb8s67v891zll6bwgwg5h2"; + sha256 = "11323j5wd02nm8ibvzbzq7dla70bmcldc71lv5bpk4x7h64ai14v"; }; nativeBuildInputs = [ autoconf libtool pkgconfig ]; buildInputs = [ bison flex libnl protobuf protobufc ]; + enableParallelBuilding = true; installPhase = '' - mkdir -p $out/bin - cp nsjail $out/bin + mkdir -p $out/bin $out/share/man/man1 + install nsjail $out/bin/ + install nsjail.1 $out/share/man/man1/ ''; meta = with stdenv.lib; { description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters"; homepage = http://nsjail.com/; - license = licenses.apsl20; - maintainers = [ maintainers.bosu ]; + license = licenses.asl20; + maintainers = with maintainers; [ bosu c0bw3b ]; platforms = platforms.linux; }; } From a09460b82765e22fcb5c2583084d9bd53a945f0e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Oct 2017 19:56:28 +0100 Subject: [PATCH 2374/2806] ghc: add 8.2.2-rc2 --- pkgs/development/compilers/ghc/8.2.2.nix | 119 +++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 11 +++ 2 files changed, 130 insertions(+) create mode 100644 pkgs/development/compilers/ghc/8.2.2.nix diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix new file mode 100644 index 00000000000..f76958227d6 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -0,0 +1,119 @@ +{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +, autoconf, automake, happy, alex, python3, sphinx, hscolour +, buildPlatform, targetPlatform , selfPkgs, cross ? null + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp +}: + +let + inherit (bootPkgs) ghc; + version = "8.2.1.20171030"; + + commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; + commonPreConfigure = '' + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString enableIntegerSimple '' + echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk + ''; +in stdenv.mkDerivation (rec { + inherit version; + name = "ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/8.2.2-rc2/${name}-src.tar.xz"; + sha256 = "0m2lx13yscgxmb18nrzhgg5h4kwzcnxdw7rjcqwx4dcwl1k0a724"; + }; + + postPatch = "patchShebangs ."; + + patches = [ ./ghc-gold-linker.patch ]; + + preConfigure = commonPreConfigure; + + buildInputs = commonBuildInputs; + + enableParallelBuilding = true; + + configureFlags = [ + "CC=${stdenv.cc}/bin/cc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional (! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + ] ++ stdenv.lib.optional stdenv.isDarwin [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + postInstall = '' + paxmark m $out/lib/${name}/bin/{ghc,haddock} + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i + done + ''; + + outputs = [ "out" "doc" ]; + + passthru = { + inherit bootPkgs; + } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { + crossCompiler = selfPkgs.ghc.override { + cross = targetPlatform; + bootPkgs = selfPkgs; + }; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs (cross != null) { + name = "${cross.config}-ghc-${version}"; + + preConfigure = commonPreConfigure + '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk + ''; + + configureFlags = [ + "CC=${stdenv.ccCross}/bin/${cross.config}-cc" + "LD=${stdenv.binutils}/bin/${cross.config}-ld" + "AR=${stdenv.binutils}/bin/${cross.config}-ar" + "NM=${stdenv.binutils}/bin/${cross.config}-nm" + "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib" + "--target=${cross.config}" + "--enable-bootstrap-with-devel-snapshot" + ] ++ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; + + buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ]; + + dontSetConfigureCross = true; + + passthru = { + inherit bootPkgs cross; + cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; + ld = "${stdenv.binutils}/bin/${cross.config}-ld"; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b3bbb0d5b64..111893f93b7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -78,6 +78,13 @@ in rec { sphinx = pkgs.python3Packages.sphinx; selfPkgs = packages.ghc821; }; + ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix rec { + bootPkgs = packages.ghc802; + inherit (bootPkgs) hscolour alex happy; + inherit buildPlatform targetPlatform; + sphinx = pkgs.python3Packages.sphinx; + selfPkgs = packages.ghc822; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc802; inherit (bootPkgs) alex happy; @@ -166,6 +173,10 @@ in rec { ghc = compiler.ghc821; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; + ghc822 = callPackage ../development/haskell-modules { + ghc = compiler.ghc822; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; From d594ca69fdbb9aaa96fcbebe6f817a0e86f165f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Nov 2017 03:01:12 +0100 Subject: [PATCH 2375/2806] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.6-15-g404d240 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/be48096efe0680f3983647271087603c66c6647f. --- .../haskell-modules/hackage-packages.nix | 1141 +++++++++++++---- 1 file changed, 887 insertions(+), 254 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cc0d8deb1f5..4a393718257 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8749,6 +8749,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HUnit-approx_1_1_1_1" = callPackage + ({ mkDerivation, base, call-stack, HUnit }: + mkDerivation { + pname = "HUnit-approx"; + version = "1.1.1.1"; + sha256 = "1brblqpz002jzql9wgzxk5zlfglmkv91s8gcfd6992xv539jfhsa"; + libraryHaskellDepends = [ base call-stack HUnit ]; + testHaskellDepends = [ base call-stack HUnit ]; + homepage = "https://github.com/goldfirere/HUnit-approx"; + description = "Approximate equality for floating point numbers with HUnit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HXMPP" = callPackage ({ mkDerivation, base, base64-string, binary, bytestring , crypto-api, enumerator, HLogger, network, pureMD5, random @@ -10697,6 +10711,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_2_2" = callPackage + ({ mkDerivation, base, criterion, hspec, JuicyPixels }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.2.2"; + sha256 = "1f0ysxwd73s04mrqzqj9rfp6dd5441ckc96x2a4zkc1hixgkfzld"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + homepage = "https://github.com/mrkkrp/JuicyPixels-extra"; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-repa" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { @@ -15848,8 +15878,8 @@ self: { }: mkDerivation { pname = "STLinkUSB"; - version = "0.1.0"; - sha256 = "17rqwr9f0g9p4i7qw4gih1g7wj2y7d7bdma55warp82v0v996ypr"; + version = "0.1.1"; + sha256 = "1b0cxrjbldsdh948fa3d5qr0lmjl2g5qkh7ii4smkmsakzk9jx0s"; libraryHaskellDepends = [ base binary bytestring transformers usb vector ]; @@ -15858,6 +15888,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "STM32-Zombie" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, STLinkUSB + , STM32F103xx-SVD, transformers + }: + mkDerivation { + pname = "STM32-Zombie"; + version = "0.2.0"; + sha256 = "10vknxgihz3cgyzi1rmyh30zqyg0q7ll653ljndjj8lh3hnghajx"; + libraryHaskellDepends = [ + base binary bytestring containers STLinkUSB STM32F103xx-SVD + transformers + ]; + description = "control a STM32F103 microcontroller"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "STM32F103xx-SVD" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "STM32F103xx-SVD"; + version = "0.1"; + sha256 = "0m6vvj4mfmmn1r21aglwdb6801bwr0ks60vbwz7y1cb97vsdad9v"; + libraryHaskellDepends = [ base ]; + description = "Definition for Peripherals,Registers and Fields from STM32F103xx.svd"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "STMonadTrans" = callPackage ({ mkDerivation, array, base, Cabal, mtl }: mkDerivation { @@ -15872,6 +15929,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "SVD2HS" = callPackage + ({ mkDerivation, base, containers, pretty, text, xml-conduit + , xml-lens + }: + mkDerivation { + pname = "SVD2HS"; + version = "0.1"; + sha256 = "16crp18wyp7gb99x0vmjcqdwvsvns2kppaic3aspnidlc14hwg35"; + libraryHaskellDepends = [ + base containers pretty text xml-conduit xml-lens + ]; + description = "translate a SVD of a Microcontroller to Haskell tables"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "SVG2Q" = callPackage ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb , xml @@ -17464,8 +17536,8 @@ self: { }: mkDerivation { pname = "TeX-my-math"; - version = "0.201.1.0"; - sha256 = "13rf0q74kk8lmgwfxicgf2d83b1jnvyq623pykm5z4g3cnap4nn4"; + version = "0.201.1.1"; + sha256 = "064ram3i1a59ypd8i3wnp7x9vbkc8zawby52676y4pfkqvddnhnm"; libraryHaskellDepends = [ base decimal-literals dumb-cas hashable haskell-src-meta HaTeX template-haskell text unordered-containers vector-space void @@ -22435,8 +22507,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.3.1"; - sha256 = "1qgccxz77fa3j6vakg14z81wqw3259zrgg3xvfmrizshxnp1vh54"; + version = "5.4"; + sha256 = "1ymzhbmff1wnpksnad0dc47xa0iha5pf6w3ng6gykni2wx8smsgv"; libraryHaskellDepends = [ array base binary containers deepseq mtl mwc-random random vector ]; @@ -22572,8 +22644,8 @@ self: { }: mkDerivation { pname = "aivika-lattice"; - version = "0.4"; - sha256 = "0fczcyg9bmijjwzh4x2kgs5q0x5swz17b51cv298ka4cmbqbhmgv"; + version = "0.5"; + sha256 = "05s7mv2k8211qmrqh8m1xfzpnm7g6x0b9asqlizgqrxq0n5vdyhj"; libraryHaskellDepends = [ aivika aivika-transformers array base containers mtl mwc-random random @@ -22606,8 +22678,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.3"; - sha256 = "08c8hkc1sbq08dsj25sb6ik9nq0insv0k8j42klbpgzmmc4pjvxd"; + version = "5.4"; + sha256 = "0if4i3jsc0bf8l0grdrijyzs5h5c85nq328gkwpmzpmawzssbqr5"; libraryHaskellDepends = [ aivika array base containers mtl mwc-random random vector ]; @@ -22798,6 +22870,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alg" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "alg"; + version = "0.2.0.0"; + sha256 = "1lh5pz3zmzyq9dkgzabgi8xhlssxccxw24ng97lynmsvc7jjras8"; + libraryHaskellDepends = [ base ]; + description = "Algebraic structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alga" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions , file-embed, filepath, formatting, haskeline, hspec, hxt @@ -26262,15 +26345,15 @@ self: { "apiary-http-client" = callPackage ({ mkDerivation, apiary, base, bytestring, bytestring-builder - , http-client, http-types, text, transformers, types-compat, wai + , http-client, http-types, text, transformers, wai }: mkDerivation { pname = "apiary-http-client"; - version = "0.1.3.0"; - sha256 = "1p1scvv9m93g11xy7fix10nyw1ps4261v9h98k77z2hmhcvwnrpd"; + version = "0.1.4.0"; + sha256 = "0y5sl8xy2ginmb97495xb3dzzczjvrznfrdklvrbsrll9a4b5iia"; libraryHaskellDepends = [ apiary base bytestring bytestring-builder http-client http-types - text transformers types-compat wai + text transformers wai ]; homepage = "https://github.com/winterland1989/apiary-http-client"; description = "A http client for Apiary"; @@ -36306,6 +36389,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "boop" = callPackage + ({ mkDerivation, base, mtl, text }: + mkDerivation { + pname = "boop"; + version = "0.1.0.0"; + sha256 = "1gn4b8y6dlhhf1vi92km32lyryl25xvbc8akbq1xxgn16iq49y8c"; + libraryHaskellDepends = [ base mtl text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/tdammers/boop"; + description = "OOP primitives for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bootstrap-types" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -37141,8 +37237,8 @@ self: { }: mkDerivation { pname = "buffer"; - version = "0.5.0.1"; - sha256 = "09dwscqkdppmiprz8k0rfxkwf7qd8b6md8iviqmxw3wamm9qx7dl"; + version = "0.5.3"; + sha256 = "0bf9y6rb3q26rk6qd7a2mjlb1gd1gp2k080ywhp5g48l474h6p26"; libraryHaskellDepends = [ base base-prelude bug bytestring ]; testHaskellDepends = [ bug quickcheck-instances rerebase tasty tasty-hunit @@ -38576,6 +38672,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-doctest_1_0_3" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "cabal-doctest"; + version = "1.0.3"; + sha256 = "1qyqxmw5z1418jda3q5j04pknqirfrfrqigibbxi4n31ajwlfisc"; + 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 }: @@ -42409,15 +42518,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "checkers_0_4_9" = callPackage + "checkers_0_4_9_5" = callPackage ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; - version = "0.4.9"; - sha256 = "1vpyyhvq1xkq8pxz2xpmw14yldn8ks95zaijpqxdzsmq4v3sy83a"; + version = "0.4.9.5"; + sha256 = "1xaffx0vmq4swciyq3qzjfklfj19nnhd5yama9di5sas4f8v517i"; libraryHaskellDepends = [ array base QuickCheck random semigroupoids ]; + homepage = "https://github.com/conal/checkers"; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -42432,8 +42542,8 @@ self: { }: mkDerivation { pname = "checkmate"; - version = "0.3.0"; - sha256 = "0yqinjpc65flh50kb2jax10lrmcbp8lcy36ivrya180wdfvlcm0n"; + version = "0.3.2"; + sha256 = "1s79cpi5hzfb59705i6gdvicczvddsbikcwwqx22v3yfyakbbxww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42451,7 +42561,7 @@ self: { ]; homepage = "https://github.com/spoqa/checkmate#readme"; description = "Generate checklists relevant to a given patch"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -46104,8 +46214,8 @@ self: { }: mkDerivation { pname = "columbia"; - version = "0.1.1"; - sha256 = "10yd0rp9zzdsx2hcb7gn0yxz8b9zj0pfy4g8d09qgs3c8lg8fdan"; + version = "0.1.2"; + sha256 = "1mayj9bzjrf37chd37mnwr6xbc126n4cbsdjzb2fy87q3vy4g7bh"; libraryHaskellDepends = [ array base bytestring containers contravariant data-endian directory filelock invariant mmap mmorph monad-loops mtl parallel @@ -47865,24 +47975,24 @@ self: { "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq - , directory, filepath, HUnit, mtl, resourcet, stm, stm-chans - , stm-conduit, test-framework, test-framework-hunit - , test-framework-th, transformers, unix + , directory, HUnit, mtl, resourcet, stm, stm-conduit + , test-framework, test-framework-hunit, test-framework-th + , transformers }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.6.0"; - sha256 = "0b3wpmx35bl85mzy9v0hiz48flzv2vjdimkgdv58si24l3drg6g6"; + version = "0.0.6.1"; + sha256 = "0zs7klxlkirch0j7gasxqalfw9nc4pfslgrg93jwn5vhpxdxhgwk"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory filepath mtl resourcet - stm stm-chans stm-conduit transformers unix + conduit-extra containers deepseq mtl resourcet stm stm-conduit + transformers ]; testHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory filepath HUnit mtl - resourcet stm stm-chans stm-conduit test-framework - test-framework-hunit test-framework-th transformers unix + 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; @@ -48174,16 +48284,16 @@ self: { }) {}; "conduit-resumablesink" = callPackage - ({ mkDerivation, base, bytestring, conduit, hspec, transformers - , void + ({ mkDerivation, base, bytestring, conduit, hspec, resourcet + , transformers, void }: mkDerivation { pname = "conduit-resumablesink"; - version = "0.1.1"; - sha256 = "1bqdpnhqjh4dhvppsa8nlgja0jpdw48kxywz2999sp5hi53qxdfg"; + version = "0.2"; + sha256 = "0pk4qvsxmmvrx9kfypbsjiq6kgcma73w97873rk3nrc9vdcm888v"; libraryHaskellDepends = [ base conduit void ]; testHaskellDepends = [ - base bytestring conduit hspec transformers void + base bytestring conduit hspec resourcet transformers void ]; homepage = "http://github.com/A1kmm/conduit-resumablesink"; description = "Allows conduit to resume sinks to feed multiple sources into it"; @@ -48193,21 +48303,21 @@ self: { "conduit-throttle" = callPackage ({ mkDerivation, async, base, conduit, conduit-combinators - , conduit-extra, HUnit, resourcet, stm, stm-chans, stm-conduit - , test-framework, test-framework-hunit, throttle-io-stream - , unliftio, unliftio-core + , conduit-extra, HUnit, monad-control, resourcet, stm, stm-chans + , stm-conduit, test-framework, test-framework-hunit + , throttle-io-stream, unliftio, unliftio-core }: mkDerivation { pname = "conduit-throttle"; - version = "0.2.0.1"; - sha256 = "0402bnj5z4m2lqgagbw8rc7c8vmm3sldp1vcrywd5zvcp5031xsa"; + version = "0.3.0.0"; + sha256 = "1kwrryplhck8q6hn6lx6j741d9hllzf84ykmqwiq0h34fjdd0a4r"; libraryHaskellDepends = [ - async base conduit conduit-combinators conduit-extra resourcet stm - stm-chans throttle-io-stream unliftio unliftio-core + async base conduit conduit-combinators conduit-extra monad-control + resourcet stm stm-chans throttle-io-stream unliftio unliftio-core ]; testHaskellDepends = [ async base conduit conduit-combinators conduit-extra HUnit - resourcet stm stm-chans stm-conduit test-framework + monad-control resourcet stm stm-chans stm-conduit test-framework test-framework-hunit throttle-io-stream unliftio unliftio-core ]; homepage = "https://github.com/mtesseract/conduit-throttle#readme"; @@ -49078,6 +49188,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "content-store" = callPackage + ({ mkDerivation, aeson, base, bytestring, cond, conduit + , conduit-combinators, conduit-extra, cryptonite, directory + , filepath, hspec, htoml, memory, monad-control, mtl, resourcet + , temporary, text, transformers, transformers-base, unix + }: + mkDerivation { + pname = "content-store"; + version = "0.1.0"; + sha256 = "1qimbnqfvnl7zhcpklnzp2n7s7swq5knif6li29fyvfb6ls1471c"; + libraryHaskellDepends = [ + aeson base bytestring cond conduit conduit-combinators + conduit-extra cryptonite directory filepath htoml memory + monad-control mtl resourcet temporary text transformers + transformers-base unix + ]; + testHaskellDepends = [ base bytestring hspec memory ]; + homepage = "https://github.com/weldr/content-store"; + description = "Store and retrieve data from an on-disk store"; + license = "LGPL"; + }) {}; + "context-free-grammar" = callPackage ({ mkDerivation, array, base, containers, control-monad-omega , dlist, HUnit, mtl, pretty, QuickCheck, quickcheck-properties @@ -57030,14 +57162,14 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "dejafu_0_9_0_1" = callPackage + "dejafu_0_9_0_2" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, random, ref-fd, transformers, transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.9.0.1"; - sha256 = "18i21basz8d50axa1ccgz9djghd95iazv4k7x499fff1nak39147"; + version = "0.9.0.2"; + sha256 = "1mxg88jlr6qga82s37xs9mwq2y26vgfkd9dg9j9mxwdzw39581gr"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck random ref-fd transformers transformers-base @@ -57833,23 +57965,25 @@ self: { }) {}; "dhall" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive - , charset, containers, contravariant, 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, ansi-wl-pprint, base, base16-bytestring + , bytestring, case-insensitive, charset, containers, contravariant + , cryptohash, 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.7.0"; - sha256 = "1177px9xlvby3wbhwgrvx23wxgmcqhl3qllbry6k42rbgf7rw900"; + version = "1.8.0"; + sha256 = "0bfnylfjqp8065i2akz5b8p55c45396hi8h6lx0jkl1i597567c4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring case-insensitive charset containers - contravariant exceptions http-client http-client-tls lens parsers - prettyprinter system-fileio system-filepath text text-format - transformers trifecta unordered-containers vector + 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 @@ -57868,8 +58002,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.5"; - sha256 = "1cicl18sz969ws64jybxsibcbk1686mfia9avw8asy1fmr2w6ryv"; + version = "1.0.6"; + sha256 = "1wjwjpprvd90dpmxij5zj1gr5x41bvzmr4qwyfhxd2am6bzg5n5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57910,8 +58044,8 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.0.7"; - sha256 = "1wgzj9gfvxs2yvh0hnncfck2qbf4fhqpnibl6n10d0hllmvdbq1b"; + version = "1.0.8"; + sha256 = "0icwbsx7a6m62klyghllvwj474f2kxghh40d7f5v01l135qrg8a1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57928,16 +58062,18 @@ self: { "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix - , neat-interpolation, optparse-generic, text, trifecta, vector + , neat-interpolation, optparse-generic, text, text-format, trifecta + , vector }: mkDerivation { pname = "dhall-nix"; - version = "1.0.8"; - sha256 = "1z6jgcfk1zi0alhpp6ycskb6yd40j2l7bl9bxfkb79443383r2mm"; + version = "1.0.9"; + sha256 = "06njwk2mmn8virrzd7q1bw91rwagcczkjn21kjhbajn6gzl77dry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-fix dhall hnix neat-interpolation text vector + base containers data-fix dhall hnix neat-interpolation text + text-format vector ]; executableHaskellDepends = [ base dhall hnix optparse-generic text trifecta @@ -57951,8 +58087,8 @@ self: { ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.3"; - sha256 = "1kic5mwndqmxqrg9f2a7panawns5j43pik42hl2dds5fvj3cmvr9"; + version = "1.0.4"; + sha256 = "1ba2sljiq016jhgx7ifh5vjrwxd1czv2gm56h2pig3p0x45ds2wm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dhall optparse-generic text ]; @@ -59181,8 +59317,8 @@ self: { ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }: mkDerivation { pname = "dimensions"; - version = "0.3.1.0"; - sha256 = "1img3byk6jyfjqn1diss2067k88ii6hg5g92yaghkizh1d2vmyi0"; + version = "0.3.2.0"; + sha256 = "1ps9yy363xfpvq6dl5mjp02h0cj1vdib2vggvsykvgqwwrnra83p"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/achirkin/easytensor#readme"; @@ -59699,6 +59835,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "disjoint-containers" = callPackage + ({ mkDerivation, base, containers, doctest, QuickCheck + , transformers + }: + mkDerivation { + pname = "disjoint-containers"; + version = "0.2.1"; + sha256 = "1082mx4af7h70hvnj0fxgimhnqbgn3ywkh53lm1hyhcfalnmyrs7"; + libraryHaskellDepends = [ base containers transformers ]; + testHaskellDepends = [ base containers doctest QuickCheck ]; + homepage = "https://github.com/andrewthad/disjoint-containers#readme"; + description = "Disjoint containers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "disjoint-set" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, QuickCheck , transformers @@ -62424,8 +62575,8 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.1.1.0"; - sha256 = "1crzw0axgamjhxrm2ggdqw45jw80avp227bwc1v0c7lmb4cmkr3p"; + version = "0.1.1.1"; + sha256 = "0pimlspgrfv04hwz91krbcq0g01fhrp9vgi2sj1kc7wz9hcd1pva"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers @@ -62479,9 +62630,10 @@ self: { ({ mkDerivation, base, transformers, transformers-base }: mkDerivation { pname = "dunai"; - version = "0.2.0.0"; - sha256 = "1h6rw4h300hbmv05immhzxzf5yb9kc5zsykifdysi40l4fbx7rkc"; + version = "0.3.0.0"; + sha256 = "0ncznc3khbanqsq4ab0n246sx30slq13awclafln5bjxvi1cx3yl"; libraryHaskellDepends = [ base transformers transformers-base ]; + homepage = "https://github.com/ivanperez-keera/dunai"; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62835,8 +62987,8 @@ self: { }: mkDerivation { pname = "dynamic-plot"; - version = "0.2.2.0"; - sha256 = "1w4w58x75x04i4mgfwb2znprrbf8vbml691niymlx1vlzlcsf13z"; + version = "0.3.0.0"; + sha256 = "0a674aqs9jnkga3a9sp24qyr3fssbizh4p1zwfvzwafnjrbmrc5c"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -63187,8 +63339,8 @@ self: { }: mkDerivation { pname = "easytensor"; - version = "0.3.1.0"; - sha256 = "07shnpbnh3qq28yhcrhwhhb8m8b9x5ad36cj5f5hxqghfhih7k6b"; + version = "0.4.0.0"; + sha256 = "13wgg67gjg07r1n91kqikbhz8nnzfbgmi0v8a1596a6z7al4kvpr"; libraryHaskellDepends = [ base dimensions ghc-prim ]; testHaskellDepends = [ base Cabal dimensions QuickCheck ]; benchmarkHaskellDepends = [ base dimensions time ]; @@ -64697,6 +64849,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm-websocket" = callPackage + ({ mkDerivation, aeson, base, bytestring, concurrent-extra + , containers, directory, formatting, hspec, http-types, lens, mtl + , network, scotty, stm, text, time, wai, wai-middleware-static + , wai-websockets, warp, websockets, wl-pprint-text + }: + mkDerivation { + pname = "elm-websocket"; + version = "1.0"; + sha256 = "10v97m93dl34apvv3jn26jfcb7f206q3bqvwqk220j83s8kas07a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring concurrent-extra containers directory + formatting lens mtl stm text time wai wai-websockets websockets + wl-pprint-text + ]; + executableHaskellDepends = [ + aeson base concurrent-extra http-types scotty text wai + wai-middleware-static warp + ]; + testHaskellDepends = [ + aeson base concurrent-extra hspec http-types mtl network text wai + warp websockets + ]; + homepage = "http://github.com/rhyskeepence/elm-websocket"; + description = "Generate ELM code from a Wai websocket application"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "elm-yesod" = callPackage ({ mkDerivation, base, blaze-markup, Elm, shakespeare-js, text , yesod-core @@ -64927,8 +65109,8 @@ self: { }: mkDerivation { pname = "emailparse"; - version = "0.2.0.6"; - sha256 = "0n02h7d3n4xaivwpqiki2p0qca44y1md5zxp77l74ld7lf7y7rm9"; + version = "0.2.0.8"; + sha256 = "1x6hzmmsmdyqbcsx3sfgzi59y21ps7knz5hdinsyg1s30i22zgkz"; libraryHaskellDepends = [ attoparsec base bytestring either either-unwrap mime MissingH strptime text text-icu time word8 @@ -71042,6 +71224,8 @@ self: { pname = "fixed-vector-binary"; version = "0.6.0.0"; sha256 = "1yjyw9wc92laiwd9w8ng3456azicvf9a9wqk2v6liiksj3flw7hy"; + revision = "1"; + editedCabalFile = "04xrlp3r2798jpjw9v0zfjda79j19xz81szwp8jp5g71r5y16pvj"; libraryHaskellDepends = [ base binary fixed-vector ]; testHaskellDepends = [ base binary fixed-vector tasty tasty-quickcheck @@ -71058,6 +71242,8 @@ self: { pname = "fixed-vector-cereal"; version = "0.6.0.0"; sha256 = "1kf3d0pfaif5fish1vc5z7d5ym23bwl80l8bg4bgpdw75cg2dnn6"; + revision = "1"; + editedCabalFile = "1xhryv8d2znbfi99grg8dsn2lpya0wd8ff4pv6piyb01c13fl3xh"; libraryHaskellDepends = [ base cereal fixed-vector ]; testHaskellDepends = [ base cereal fixed-vector tasty tasty-quickcheck @@ -71074,6 +71260,8 @@ self: { pname = "fixed-vector-hetero"; version = "0.3.1.2"; sha256 = "0l8vphi8ijyzyk372r9i7imq8r6ki1w774gid69c8d2a2b63gvdd"; + revision = "1"; + editedCabalFile = "05scgl0r3g9nnb0pfg39cinylm11wdyqr8f51k69wj5y79fzf5yz"; libraryHaskellDepends = [ base deepseq fixed-vector ghc-prim primitive transformers ]; @@ -71982,8 +72170,8 @@ self: { }: mkDerivation { pname = "fluid-idl"; - version = "0.0.1"; - sha256 = "1mqswhsvyycxa7c7c92jag6rsp0dbkdm8bwjv6pcr92w293ycrv2"; + version = "0.0.2"; + sha256 = "1qcsdnjwz0gcn8z6ss27f3a687fi47cmm95a9rfag42gvvlwyr9z"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async monad-control monad-logger mtl random safe-exceptions scientific @@ -75590,8 +75778,8 @@ self: { }: mkDerivation { pname = "gelatin"; - version = "0.1.0.0"; - sha256 = "08y9wsym19rgwr6k44n8pxffwi1fna3nmg4bq5cc7in5zj1ihfbv"; + version = "0.1.0.1"; + sha256 = "151sf11a9sfwi6wg26l7lyphklv3lgy51djfqx3qszykhzccgv7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76897,8 +77085,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.3.0.0"; - sha256 = "1yazd4wgf4ivk2x3apymddcww24z7a4b0jxzph7l8273wd8dy8zg"; + version = "0.3.1.0"; + sha256 = "1w9iqfkyi0ij33kng4adczi6m8chyhsadc2af5ryp8xzl7w64l8m"; libraryHaskellDepends = [ base bytestring cereal containers iproute mmap reinterpret-cast text @@ -79263,7 +79451,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ginger_0_7_2_0" = callPackage + "ginger_0_7_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , data-default, filepath, http-types, mtl, parsec, safe, scientific , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers @@ -79271,8 +79459,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.7.2.0"; - sha256 = "1xgczxqqd4ml8ifcyr45nrgbqn5a40nrbkvzbn4r4djpivnsrk0k"; + version = "0.7.3.0"; + sha256 = "1c4k0ixpkdb711arxcn028z27y78ssr6j5n7dfs9cajf93x727gs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90586,8 +90774,8 @@ self: { }: mkDerivation { pname = "haskanoid"; - version = "0.1.5.2"; - sha256 = "1hw4ylwwsmp59ifw8s4w1394gv7p2xc6nvqajfmil0p8r8s6r1pf"; + version = "0.1.5.4"; + sha256 = "01cwjvs1sj66w9siqfq3vzrw5607bh2pxr6zzx64jhqhcr3yv73d"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -93789,7 +93977,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hasql_1" = callPackage + "hasql_1_1" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, data-default-class, dlist, either, hashable @@ -93800,8 +93988,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1"; - sha256 = "0zhk9vwlmjc1cwbqx1l9nns155a5f2zbb8k1240wqcylignfqi2b"; + version = "1.1"; + sha256 = "1c2gfdgxki17ng6b5qr3pvmra7v7x3hf9vh75hq4n6jr8rp03iki"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder contravariant contravariant-extras data-default-class dlist either @@ -93870,8 +94058,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.3.1"; - sha256 = "0m9lr2n5ac0n9gslj2v24jmm68b1aq29zb9ca5wszfs16x6v92ci"; + version = "0.4.4"; + sha256 = "0xbnhgix1g4sf2cpimz77ljiwm79l4lnx1ys7q31rak1fyw7fgs0"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors @@ -93893,8 +94081,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6.2.1"; - sha256 = "113fkkkdh2ar431b9l3jbqabymmas2r0fwc7icfys3ayh8r50fg7"; + version = "0.6.3"; + sha256 = "12vzkay4r0pzz41p4n60zd077yigr3373i5nr8cpf8z39msj8vaj"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql hasql-transaction transformers @@ -93953,8 +94141,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.2.3"; - sha256 = "0ph2dzfl12bcdcd4xqw5kg1sdyd36ajz3n3ha27rnvv0l8slld6i"; + version = "0.2.4"; + sha256 = "0gdbwhzcfjriq2yah5kfn9r1anc77f1iyay86zsdgq4z8qi6asvr"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -93975,6 +94163,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-pool_0_4_3" = callPackage + ({ mkDerivation, base-prelude, hasql, resource-pool, time }: + mkDerivation { + pname = "hasql-pool"; + version = "0.4.3"; + sha256 = "08fzh0y1cxaslp8ia26p9jhs3dckjfdvmiqw1lasdabb7ij82i0j"; + libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + homepage = "https://github.com/nikita-volkov/hasql-pool"; + description = "A pool of connections for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , criterion-plus, deepseq, directory, doctest, either, filepath @@ -94079,6 +94280,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-transaction_0_5_2" = callPackage + ({ mkDerivation, async, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, contravariant-extras + , hasql, mtl, rebase, transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "0.5.2"; + sha256 = "0w4y65vqgc4pk66xpip9jzzbas6cpnss4gx1w91rg7j48491cmym"; + libraryHaskellDepends = [ + base base-prelude bytestring bytestring-tree-builder contravariant + contravariant-extras hasql mtl transformers + ]; + testHaskellDepends = [ async hasql rebase ]; + homepage = "https://github.com/nikita-volkov/hasql-transaction"; + description = "A composable abstraction over the retryable transactions for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hastache" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , directory, filepath, HUnit, ieee754, mtl, process, syb, text @@ -94318,10 +94539,8 @@ self: { }: mkDerivation { pname = "hat"; - version = "2.9.0.0"; - sha256 = "05sbgq1mliahdn4qj7flgw7klrm67r2mz7gxs03i6lx6mi3phm9f"; - revision = "1"; - editedCabalFile = "1wspd2shxpp3x4p4ghgf82vqchlkxk6qhvsgn07ypzm2kfz3a9dh"; + version = "2.9.4"; + sha256 = "13ldpj92qzp243zwnx0q044isdq2nmbh93wardqzr37jybs7m4xs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -99130,7 +99349,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hjsonschema_1_7_0" = callPackage + "hjsonschema_1_7_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-types, pcre-heavy, profunctors, protolude @@ -99139,8 +99358,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.7.0"; - sha256 = "01k29v8xqw3d8vy3qdf6ppgjmly7ppbg19yjrsiv10szishwigg2"; + version = "1.7.1"; + sha256 = "0x9w33scdnbfdmadxpx2c4fgkmpvny9ipsl2y7fq56zr6fa0ybfz"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-types pcre-heavy profunctors @@ -99693,6 +99912,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hlint_2_0_10" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, cpphs, data-default, directory, extra, filepath + , haskell-src-exts, haskell-src-exts-util, hscolour, process + , refact, text, transformers, uniplate, unordered-containers + , vector, yaml + }: + mkDerivation { + pname = "hlint"; + version = "2.0.10"; + sha256 = "1kmjgdj652lx269sppa35wga8a2376nzjd548nnc6h52kdpgix30"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers cpphs + data-default directory extra filepath haskell-src-exts + haskell-src-exts-util hscolour process refact text transformers + uniplate unordered-containers vector yaml + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/ndmitchell/hlint#readme"; + description = "Source code suggestions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hlogger" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -100530,15 +100776,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_1_4_0" = callPackage + "hoauth2_1_5_0" = 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.4.0"; - sha256 = "0wksa14mj7pyd6mjv81m1djqs8s79sri8a1by14l626pgai7p3h0"; + version = "1.5.0"; + sha256 = "0dfrqdjrvc94f94xl8vqggdvzbkiwj3xfkmwilkskvnfg1s1hg8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101466,8 +101712,8 @@ self: { pname = "hopenpgp-tools"; version = "0.19.5"; sha256 = "1yb6slxphz7lghclv1cjs2kwig1ll1dxzcaf4js26nanq280lqz0"; - revision = "1"; - editedCabalFile = "0lid8ck44b5ybb8wq81bh8wianr4r4rigqzq49cfr1g4kxmhqcq8"; + revision = "2"; + editedCabalFile = "1w9ban4w6zm7cknfnlzhgx649xg2j0vsrhqdlnd5g8qzcbbhh0si"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103688,6 +103934,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsass_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, filepath + , hlibsass, hspec, hspec-discover, monad-loops, temporary + , transformers + }: + mkDerivation { + pname = "hsass"; + version = "0.5.0"; + sha256 = "07jhny061fnxqiijr2rqac85qzlxz24w8dms5pn844as8nkwdi4d"; + libraryHaskellDepends = [ + base bytestring data-default-class filepath hlibsass monad-loops + transformers + ]; + testHaskellDepends = [ + base bytestring data-default-class hspec hspec-discover temporary + ]; + homepage = "https://github.com/jakubfijalkowski/hsass"; + description = "Integrating Sass into Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsay" = callPackage ({ mkDerivation, base, Hclip, HTTP, process, unix }: mkDerivation { @@ -109398,8 +109666,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.0.4"; - sha256 = "0mqrxczjr822hccmrdsmy98mw10jdmiiq94vdibkqrh618hs4fd5"; + version = "2.1.0"; + sha256 = "1kl9pkcpsciwxya92kr75nd0n2xb4qrhs5fs75ifkgzicjipxd5v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109816,8 +110084,8 @@ self: { }: mkDerivation { pname = "hwsl2"; - version = "0.4.0.0"; - sha256 = "0f081h2w2his8fgis6prj6z5bywh4csjqgwn5mc4wdy5s1zi6010"; + version = "0.4.0.1"; + sha256 = "07kg0m75fi9m236lnisrjdyx7y53hl6pm4v5l9cxvghfankfbgk0"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring quickcheck-properties tasty tasty-quickcheck @@ -111377,7 +111645,7 @@ self: { pname = "idris"; version = "1.0"; sha256 = "1srbz0cyvd0k1yqgbrwnfj94yg5y3z533q1kzac96z1h7v454s5h"; - configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; + configureFlags = [ "-fcurses" "-f-execonly" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -111421,7 +111689,7 @@ self: { pname = "idris"; version = "1.1.1"; sha256 = "0rq43i3mf7b4yiwzrzzpyh3ldka3j514ms9cf31vsfpy0jn3bvkp"; - configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; + configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -112662,6 +112930,27 @@ self: { license = "GPL"; }) {}; + "incremental-parser_0_2_5_2" = 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"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -120244,6 +120533,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lackey_0_4_5" = callPackage + ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec + , text + }: + mkDerivation { + pname = "lackey"; + version = "0.4.5"; + sha256 = "0xczvbfvgcifb6mzyicihgz6vcn7bx2d3w9r8ih9mdclbfhc32l6"; + libraryHaskellDepends = [ base servant servant-foreign text ]; + testHaskellDepends = [ base servant tasty tasty-hspec 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 @@ -123109,8 +123414,8 @@ self: { }: mkDerivation { pname = "leksah-server"; - version = "0.16.2.0"; - sha256 = "0wfikbv98p29rv2cl1wwnac82g5vj1w70hy4m40vxgag3qpnr6iw"; + version = "0.16.3.0"; + sha256 = "0cjg4r6yjwfzr2xn90gvrw2x93mlpz6z2i1i4djbnilknl9s53vp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -123568,8 +123873,8 @@ self: { ({ mkDerivation, base, base-unicode-symbols, transformers }: mkDerivation { pname = "lenz"; - version = "0.1.2.1"; - sha256 = "058j5gkcz0dcwscnssjzxhkgkq5zxffbsj12dwbgiiyd57fwfv88"; + version = "0.1.2.2"; + sha256 = "1hzvw76fgaf5d5l1dca9662c0pplgv0h53dwfr42cwg0hxj6c876"; libraryHaskellDepends = [ base base-unicode-symbols transformers ]; description = "Van Laarhoven lenses"; license = "unknown"; @@ -123581,8 +123886,8 @@ self: { }: mkDerivation { pname = "lenz-template"; - version = "0.1"; - sha256 = "1cbpb0m31kf7x9li0yf0c2gblz0nbyhl3k7pj70k97y1d4ns0g7h"; + version = "0.1.0.1"; + sha256 = "1j11cg76w9kyc1nn395qhzj9cp64ff0jq8y0h5x9lcn2r18zihhi"; libraryHaskellDepends = [ base base-unicode-symbols containers lenz template-haskell ]; @@ -128400,8 +128705,8 @@ self: { }: mkDerivation { pname = "ltk"; - version = "0.16.1.0"; - sha256 = "00vxsp5w38wv12wl09z6wa72kpczd6k5g9m02clshaq3ai6cyg1a"; + version = "0.16.2.0"; + sha256 = "1x8abgss6j46wp0cz7vfr704j38f00pcgkhyxn8ismqf3k7sdzxc"; libraryHaskellDepends = [ base base-compat Cabal containers filepath ghc gi-cairo gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-hs haskell-gi-base @@ -129351,21 +129656,22 @@ self: { , containers, criterion, directory, file-embed, hspec , hspec-megaparsec, http-client, http-client-tls, megaparsec , MonadRandom, mtl, optparse-applicative, process, random-shuffle - , recursion-schemes, tar, template-haskell, text, th-lift-instances - , titlecase, zip-archive, zlib + , recursion-schemes, recursion-schemes-ext, tar, template-haskell + , text, th-lift-instances, titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "3.1.1.13"; - sha256 = "0qmgd368brmmibqlimv254i20ayxw96ipnwcfid4q3pdml9javn4"; + version = "3.1.1.18"; + sha256 = "00np5hkbab7hi46056hp6maa7fc63vbx227pj0y3d5q502hgf3jj"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory process ]; libraryHaskellDepends = [ ansi-wl-pprint base composition-prelude containers directory file-embed http-client http-client-tls megaparsec MonadRandom mtl - optparse-applicative random-shuffle recursion-schemes tar - template-haskell text th-lift-instances titlecase zip-archive zlib + optparse-applicative random-shuffle recursion-schemes + recursion-schemes-ext tar template-haskell text th-lift-instances + titlecase zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-megaparsec text ]; @@ -129437,6 +129743,37 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "magicbane_0_1_2" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude + , conduit, conduit-combinators, data-default, data-has, either + , ekg-core, ekg-wai, envy, errors, fast-logger, http-api-data + , http-client, http-client-tls, http-conduit, http-date + , http-link-header, http-media, http-types, lifted-async + , mime-types, monad-control, monad-logger, monad-metrics, mtl + , network, network-uri, raw-strings-qq, refined, servant + , servant-server, split, string-conversions, text, transformers + , unordered-containers, wai, wai-cli, wai-middleware-metrics + }: + mkDerivation { + pname = "magicbane"; + version = "0.1.2"; + sha256 = "19k31vy2ldf9a3jvmlys16n6w31a8h7b1iyp6m35f4n16ndjvwa1"; + libraryHaskellDepends = [ + aeson aeson-qq attoparsec base classy-prelude conduit + conduit-combinators data-default data-has either ekg-core ekg-wai + envy errors fast-logger http-api-data http-client http-client-tls + http-conduit http-date http-link-header http-media http-types + lifted-async mime-types monad-control monad-logger monad-metrics + mtl network network-uri raw-strings-qq refined servant + servant-server split string-conversions text transformers + unordered-containers wai wai-cli wai-middleware-metrics + ]; + homepage = "https://github.com/myfreeweb/magicbane#readme"; + description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "magico" = callPackage ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { @@ -134343,6 +134680,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "model_0_4_1" = callPackage + ({ mkDerivation, base, containers, convertible, deepseq, doctest + , filemanip, ghc-prim, pretty, tasty, tasty-hunit, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "model"; + version = "0.4.1"; + sha256 = "115apma3mbvpskd5kbgccs4g4d1n9g5lj62bd9appd0d0i8rskf8"; + libraryHaskellDepends = [ + base containers convertible deepseq pretty transformers + ]; + testHaskellDepends = [ + base containers doctest filemanip ghc-prim pretty tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "http://github.com/tittoassini/model"; + description = "Derive a model of a data type using Generics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modelicaparser" = callPackage ({ mkDerivation, ansi-terminal, base, containers, filepath, parsec , QuickCheck @@ -136199,6 +136558,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_4_0" = 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.4.0"; + sha256 = "0qwmzjf25gradzajr4f9zw3a48m4hw26qvqnb134daqkyxpkzf13"; + 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"; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -136628,6 +137012,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "morte_1_6_11" = 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.11"; + sha256 = "10zwdf82hxjgxh7zs7wlnvyzjpaqalwj7rlg454jjlml59ifzvmw"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mosaico-lib" = callPackage ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels @@ -139592,8 +140009,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "1"; - editedCabalFile = "1scwm1gs07znkj4ahfyxpwrksj4rdl1pa81xflcqhkqfgcndvgl3"; + revision = "2"; + editedCabalFile = "1j90pd1zznr18966axskad5w0kx4dvqg62r65rmw1ihqwxm1ndix"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -144528,6 +144945,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye-trans_0_3_7" = callPackage + ({ mkDerivation, base, mtl, opaleye, postgresql-simple + , product-profunctors, transformers, transformers-base + }: + mkDerivation { + pname = "opaleye-trans"; + version = "0.3.7"; + sha256 = "17yfa0kgd3v8dlz77nlgplyi23f622f46z9q2xyswnrrf5w2c4z0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base mtl opaleye postgresql-simple product-profunctors transformers + transformers-base + ]; + executableHaskellDepends = [ + base opaleye postgresql-simple product-profunctors + ]; + homepage = "https://github.com/WraithM/opaleye-trans"; + description = "A monad transformer for Opaleye"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "open-browser" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -145713,6 +146153,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-simple_0_0_4" = callPackage + ({ mkDerivation, base, bytestring, directory, either, gitrev + , optparse-applicative, template-haskell, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.0.4"; + sha256 = "1md24dlz6949rqv6y2x9d5r07lrqw42c21kdy09nk5y8r3mq43x0"; + libraryHaskellDepends = [ + base either gitrev optparse-applicative template-haskell + transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + description = "Simple interface to optparse-applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -146004,7 +146462,7 @@ self: { }) {}; "orgstat" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, colour + ({ mkDerivation, aeson, attoparsec, base, boxes, bytestring, colour , containers, data-default, diagrams-lib, diagrams-svg, directory , exceptions, filepath, formatting, hashable, hspec, HUnit, lens , linear, log-warper, mtl, optparse-simple, orgmode-parse @@ -146013,15 +146471,15 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.1.1"; - sha256 = "0241f7d996akmqi1id6dqwki5yql7mgw331msxvza616s3gcyd36"; + version = "0.1.2"; + sha256 = "11q8n9sy841klms368bs0wl14wg0q5dq5gfcipzm25pw6jswfgyy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base bytestring colour containers data-default - diagrams-lib diagrams-svg directory exceptions filepath formatting - hashable lens linear log-warper mtl optparse-simple orgmode-parse - text time turtle universum yaml + aeson attoparsec base boxes bytestring colour containers + data-default diagrams-lib diagrams-svg directory exceptions + filepath formatting hashable lens linear log-warper mtl + optparse-simple orgmode-parse text time turtle universum yaml ]; executableHaskellDepends = [ base bytestring directory exceptions filepath formatting log-warper @@ -146843,7 +147301,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_0_0_1" = callPackage + "pandoc_2_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -146857,8 +147315,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.0.0.1"; - sha256 = "1wq21vsg9afv8lxk6rmmmb57437q7gv1qs4ymbzd1mvxkvzx0hwh"; + version = "2.0.1"; + sha256 = "00c7iv2s70dijyd651sflncmba9dfbflrrzii1hn0m5als75jgmb"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -146929,7 +147387,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_11_1_2" = callPackage + "pandoc-citeproc_0_11_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 @@ -146938,8 +147396,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.11.1.2"; - sha256 = "0lv1j035f5c0dd0n772ivav6kwzfxvnk6zcxmmhmkc3s9r9716sd"; + version = "0.11.1.3"; + sha256 = "00c9r8v7rc8ff8gw41470c3marhp0vqrdywmj91565k4ri7wfnwp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -147076,8 +147534,8 @@ self: { }: mkDerivation { pname = "pandoc-include-code"; - version = "1.1.0.0"; - sha256 = "1ygdmnmr4lw7f83xhqaa7m074ii6wbrsx148i9qx3inz5z2rm9b5"; + version = "1.1.1.0"; + sha256 = "016c6xf9avh4ydhd0vb5l044d4zlxgrpvp40v15889plrkbvxnbb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147184,17 +147642,17 @@ self: { }) {}; "pandoc-stylefrommeta" = callPackage - ({ mkDerivation, base, containers, HaTeX, MissingH, pandoc - , pandoc-types + ({ mkDerivation, base, bytestring, containers, MissingH, pandoc + , pandoc-types, text }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.1.1.0"; - sha256 = "0blgccnzyignq14y94cnascjxlk6088wwpxifwm45rnn0hs786vf"; + version = "0.2.0.2"; + sha256 = "12yvbh8cx5r6llx0gnz70n1b3zwm3zc8bdciq3cxyfivci5iks2r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base containers HaTeX MissingH pandoc pandoc-types + base bytestring containers MissingH pandoc pandoc-types text ]; homepage = "http://github.com/lyokha/styleFromMeta"; description = "Pandoc filter to customize links, images and paragraphs"; @@ -147967,8 +148425,8 @@ self: { ({ mkDerivation, base, data-diverse, hspec, transformers }: mkDerivation { pname = "parameterized"; - version = "0.2.0.0"; - sha256 = "0z40b6cja2c4y177w6iwg8dijlpk5zwrf5yfwppc5y6n57g260z7"; + version = "0.3.0.0"; + sha256 = "148i3s6j38qvncbkk2hz86lbzprr5h7l7gpjqf0zb0ay0i9idczs"; libraryHaskellDepends = [ base data-diverse transformers ]; testHaskellDepends = [ base data-diverse hspec transformers ]; homepage = "https://github.com/louispan/parameterized#readme"; @@ -155362,6 +155820,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postgresql-typed_0_5_2" = callPackage + ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring + , containers, convertible, cryptonite, haskell-src-meta, HDBC + , HUnit, memory, network, old-locale, postgresql-binary, QuickCheck + , scientific, template-haskell, text, time, utf8-string, uuid + }: + mkDerivation { + pname = "postgresql-typed"; + version = "0.5.2"; + sha256 = "0ws9xmh199jsvdmxjxkhm59j05ljfsrf16xchkbxqd8p1pg8786c"; + libraryHaskellDepends = [ + aeson array attoparsec base binary bytestring containers cryptonite + haskell-src-meta HDBC memory network old-locale postgresql-binary + scientific template-haskell text time utf8-string uuid + ]; + testHaskellDepends = [ + base bytestring containers convertible HDBC HUnit network + QuickCheck time + ]; + homepage = "https://github.com/dylex/postgresql-typed"; + description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-typed-lifted" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, exceptions , lens, monad-control, postgresql-typed, transformers-base @@ -155837,8 +156320,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.49"; - sha256 = "1xk8l4lbicl1k6xr14x80dlc5g55dj59xgzgx01b61d0k595mmj1"; + version = "0.0.50"; + sha256 = "09gsl99ikglf1cyzmy53xcn2lb549z6gi5930ldz03nd50lg0fdg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158715,8 +159198,8 @@ self: { }: mkDerivation { pname = "ptr"; - version = "0.15.3"; - sha256 = "1h66bk595nv0jmcxdzfzvpr7ymfm6hl3n4bnglwlwkp2y1ymm3i3"; + version = "0.15.4"; + sha256 = "0hmj6411wqsa9wgh2i3aksbkx07yaz88lp9h6lj9r8qfyv9yls5l"; libraryHaskellDepends = [ base base-prelude bug bytestring contravariant mtl profunctors semigroups text transformers @@ -162440,6 +162923,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel_0_3_7" = 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.7"; + sha256 = "0jwmlnxnaaldi1gr988gdy82y3ylvmi9ylnrsas8rg6pwyj76v9c"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -163251,8 +163754,8 @@ self: { }: mkDerivation { pname = "reactive-midyim"; - version = "0.4"; - sha256 = "0aq3iaq3l4wcdixa09q9na2n4l92nkzikjbma3mxl4d6gklhcvhy"; + version = "0.4.0.1"; + sha256 = "1ck2f8nhlhcw9vyh42svp94xrnd4jcvic2kzxikw50vjcd4w6rrf"; libraryHaskellDepends = [ base containers data-accessor data-accessor-transformers event-list midi non-negative random reactive-banana-bunch transformers @@ -167176,6 +167679,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rest-snap_0_3_0_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, case-insensitive + , rest-core, safe, snap-core, unordered-containers, uri-encode + , utf8-string + }: + mkDerivation { + pname = "rest-snap"; + version = "0.3.0.0"; + sha256 = "1s38xrmg90y80rxmz1kf5wfxq7dgf63xysicg0jfawwl3sy88iff"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive rest-core safe + snap-core unordered-containers uri-encode utf8-string + ]; + description = "Rest driver for Snap"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rest-stringmap" = callPackage ({ mkDerivation, aeson, base, containers, hashable, hxt , json-schema, tostring, unordered-containers @@ -170690,8 +171211,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.3"; - sha256 = "01vcil4zij8ap1bnkmmi8439mmnsbw3qc1gw994wdnar082wzh66"; + version = "7.4"; + sha256 = "0yylg2zdrcqzckhmlz9d5chac1jawbnrdp7fn49ia1nsl0i3jggc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -171093,7 +171614,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "schematic_0_4_0_0" = callPackage + "schematic_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens , mtl, profunctors, regex-tdfa, regex-tdfa-text, scientific @@ -171102,8 +171623,8 @@ self: { }: mkDerivation { pname = "schematic"; - version = "0.4.0.0"; - sha256 = "1n0i7irbf4flnhybhvl5kqkcyz673nyv7bl8z14yxi152a7kjkqi"; + version = "0.4.2.0"; + sha256 = "0k63pnv8mip8kn623s5n7w24bd4spjmi1a9h280nf7wd1q8z72n4"; libraryHaskellDepends = [ aeson base bytestring containers hjsonschema mtl profunctors regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged @@ -171306,6 +171827,8 @@ self: { pname = "scientific"; version = "0.3.5.2"; sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w"; + revision = "1"; + editedCabalFile = "1gnz52yrd9bnq4qvd4v9kd00clx0sfbh64phafdq5g2hbk9yrg0v"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-gmp integer-logarithms primitive text @@ -173526,8 +174049,8 @@ self: { pname = "servant"; version = "0.11"; sha256 = "00vbhijdxb00n8ha068zdwvqlfqv1iradkkdchzzvnhg2jpzgcy5"; - revision = "1"; - editedCabalFile = "1az9id2dl7psc8lknf7y9cvzkivcjzw7g27yyp40flb6bfvmaqp3"; + revision = "2"; + editedCabalFile = "1b5zxz1cqf0n2y1jfvb1rsza95hdyhn9fc6fl73bxr5m9apv511z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive @@ -176283,8 +176806,8 @@ self: { }: mkDerivation { pname = "shakers"; - version = "0.0.33"; - sha256 = "1wn0bk867nbzcg6c6a8q5sa4ma60r3zc46ykpdla34k61nq5g3qy"; + version = "0.0.35"; + sha256 = "14hkdkhpg5gs1mhd96ldy7xb35rqrr0cqnnaw3hmv2cyk6np7fnz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177176,8 +177699,8 @@ self: { ({ mkDerivation, base, bytestring, hsI2C, time, transformers }: mkDerivation { pname = "si-clock"; - version = "0.1.3"; - sha256 = "0s2d1liaknk5qhh41pi3508m3dz9k0ljl5fc2v1vs6ckv4sd9fjr"; + version = "0.1.3.1"; + sha256 = "15fk63nynpk5wz9ikij18g5vnrslsrv97fn649dkssmsdwifjfj5"; libraryHaskellDepends = [ base bytestring hsI2C time transformers ]; @@ -178390,8 +178913,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.4.0.2"; - sha256 = "1nrjdy7rkjla2cgyb2j50p7qi30divl6aa75m3yvf2whb38wgisw"; + 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"; @@ -178546,8 +179069,8 @@ self: { }: mkDerivation { pname = "sitepipe"; - version = "0.1.1"; - sha256 = "1kymvi3pf67chjsvqxv29i4fbac2yyrjx5llc2r7qjfw3hblf5sj"; + version = "0.2.0.0"; + sha256 = "15cynic59qkfgb8d3ca6hr3dag0cs48af266xaiblpvim39rk1fb"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache @@ -178873,7 +179396,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_4_2" = callPackage + "skylighting_0_4_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -178882,8 +179405,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.4.2"; - sha256 = "0szhhmjz14wq1ica3gl6nj5fh85fwh55xyywlq8q3dq8isl1hcz3"; + version = "0.4.3.1"; + sha256 = "087f41qx28609i9ryc5njvjyyw1n3ypym63vmw2q4bhlr5lxkf30"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182370,8 +182893,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.2.9"; - sha256 = "0xk8i5hskr59vrf8vkvwsvp4n048fd66k959q7nl0i5z3k0lx2m2"; + version = "0.2.10"; + sha256 = "1c2fpswmlrza9al6i94rjnd1k14g5f48g4zrqgyxrgl4sqkhbbs9"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -185895,15 +186418,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_10_0" = callPackage + "stratosphere_0_11_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable , hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.10.0"; - sha256 = "195rr247bzrnnvjv7i13z88xbpajxk34n94ywqvfyf3457466iqh"; + version = "0.11.0"; + sha256 = "1l9wyyw8zvmb7z0qvs5qk0mxbjnlm1405sxiz7wzff6ibxvk9kn5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189423,8 +189946,8 @@ self: { ({ mkDerivation, base, process, regex, regex-with-pcre }: mkDerivation { pname = "system-info"; - version = "0.1.0.8"; - sha256 = "0pv4f5yrzybm2r1zi02ranq1ag1akkpzzc8w3qjpwliv2ahy4516"; + version = "0.1.0.9"; + sha256 = "0f27y3bdqlyvbxdchsn7mz2rhsvk4bxqy0xldy6l30vsv2q9gdx4"; libraryHaskellDepends = [ base process regex regex-with-pcre ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -190844,6 +191367,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty_0_12" = callPackage + ({ mkDerivation, ansi-terminal, async, base, clock, containers + , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged + , unbounded-delays, unix + }: + mkDerivation { + pname = "tasty"; + version = "0.12"; + sha256 = "0840ziawhj0lrzn927nx9lww6wxc5krvf0c3xygl577vvxh4adg1"; + libraryHaskellDepends = [ + ansi-terminal async base clock containers deepseq mtl + optparse-applicative regex-tdfa stm tagged unbounded-delays unix + ]; + homepage = "https://github.com/feuerbach/tasty"; + description = "Modern and extensible testing framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-ant-xml" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers @@ -190897,12 +191439,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "tasty-dejafu_0_7_0_2" = callPackage + "tasty-dejafu_0_7_0_3" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.7.0.2"; - sha256 = "1yj4sdprlz79sk14q5b8089sw1bn0z4nqpbdb2sr90smlxa57zpa"; + version = "0.7.0.3"; + sha256 = "0xvqlw5w5rwz1xxi277r9w7iad7prds5i1rrmy8wz3x3vh9kbnmm"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -191057,6 +191599,8 @@ self: { pname = "tasty-hspec"; version = "1.1.3.2"; sha256 = "0n4pn89jz9i8d7mxsdp6ynwkg5gjyaipdy261parx64m3nxi4vcv"; + revision = "1"; + editedCabalFile = "05fl6jirj479lax2wqg6h5m82mkc475lhas7wmpx91kv1kfklx54"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck random tagged tasty tasty-quickcheck tasty-smallcheck @@ -191321,6 +191865,8 @@ self: { pname = "tasty-stats"; version = "0.2.0.3"; sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b"; + revision = "1"; + editedCabalFile = "1kvvz549gs7vm9w6gypr8pa1klsab335rzmdq7v638rvijgqfbn8"; libraryHaskellDepends = [ base containers directory process stm tagged tasty time ]; @@ -191363,6 +191909,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-travis" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit }: + mkDerivation { + pname = "tasty-travis"; + version = "0.1.2"; + sha256 = "0ypk596sjlh6s2gyy1bgx414jhhfhaaqqqdl9647mjsd49a83g2s"; + libraryHaskellDepends = [ base tasty ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/merijn/tasty-travis"; + description = "Fancy Travis CI output for tasty tests"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tateti-tateti" = callPackage ({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }: mkDerivation { @@ -193292,8 +193851,8 @@ self: { }: mkDerivation { pname = "texbuilder"; - version = "0.1.1.1"; - sha256 = "14fg4hxyfvv54n85495dbk6avccms92kw5jzgycylnk8aiw2nxa4"; + version = "0.1.1.2"; + sha256 = "069y2d2k87sfx4mkmd8219iiyh9s6x79kigxbdi9swfa4k9xa1gm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -193331,6 +193890,31 @@ self: { license = "GPL"; }) {}; + "texmath_0_10" = 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"; + sha256 = "0i9haxii7kklz6qrfidb54iv5cl73p201zy24mwkf4bf56lff1pa"; + 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"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -195149,16 +195733,16 @@ self: { "thread-hierarchy" = callPackage ({ mkDerivation, base, containers, hspec, lifted-base - , monad-control, transformers-base + , monad-control, stm, transformers-base }: mkDerivation { pname = "thread-hierarchy"; - version = "0.1.0.3"; - sha256 = "1j5caivjcvrmfqgl13lhlx9dq81kka64w96ykb0bfb089kwi0j9f"; + version = "0.2.0.0"; + sha256 = "1y11q5ijb9hqvxgcf5jig6d24895nrrg06ig8sy7fk1s32rr0bqm"; libraryHaskellDepends = [ - base containers lifted-base monad-control transformers-base + base containers lifted-base monad-control stm transformers-base ]; - testHaskellDepends = [ base containers hspec ]; + testHaskellDepends = [ base containers hspec stm ]; homepage = "https://github.com/nshimaza/thread-hierarchy#readme"; description = "Simple Haskel thread management in hierarchical manner"; license = stdenv.lib.licenses.mit; @@ -202558,6 +203142,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "units-parser_0_1_1" = callPackage + ({ mkDerivation, base, containers, mtl, multimap, parsec, syb + , tasty, tasty-hunit, template-haskell + }: + mkDerivation { + pname = "units-parser"; + version = "0.1.1"; + sha256 = "0d39r1vcwqs61529gjz3329a41fp4pwx0x4j4kw4xl2lza3wr164"; + libraryHaskellDepends = [ base containers mtl multimap parsec ]; + testHaskellDepends = [ + base containers mtl multimap parsec syb tasty tasty-hunit + template-haskell + ]; + description = "A parser for units of measure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unittyped" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -202749,8 +203351,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.7.1"; - sha256 = "1q7q1ynfm4m1zz2inyvvj7868p3yxjl7w512j5xiz4mzx3llb292"; + version = "0.7.1.1"; + sha256 = "08q3ldx0saahlxh2zkwmsq71lkwrvfrs19nzbgwwdvd31y4r0iq6"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe safe-exceptions stm text @@ -210977,8 +211579,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.29"; - sha256 = "147s2xg9y77gw81gnqgijnfzfx728ddv018n7zs2sl231asjqy3i"; + version = "0.3.31"; + sha256 = "1f5b4j788yr2m7f9if2fj41j236h5zjszzldcna0v6f93za7kzy2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214493,6 +215095,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; + "yaml_0_8_24" = callPackage + ({ mkDerivation, aeson, aeson-qq, 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.24"; + sha256 = "08cawq5q2bm23fi48m56x1h6qdf52wn9i9y770v6q2810wj2f7n1"; + 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 aeson-qq 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libyaml;}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers @@ -217002,8 +217636,8 @@ self: { }: mkDerivation { pname = "yi"; - version = "0.15.0"; - sha256 = "1mkdpc4fg7qx8mslcmjwnws24hr5p7289v026qf0m6ivc4dkbkbi"; + version = "0.17.1"; + sha256 = "18937w0w1hk7ngyrl1p5gy4djgz8py9kcsndas82w82wwh36jnqg"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; @@ -217081,23 +217715,23 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-core_0_17_0" = callPackage + "yi-core_0_17_1" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring , containers, criterion, data-default, deepseq, directory, dlist - , dynamic-state, filepath, hashable, ListLike, microlens-platform - , mtl, old-locale, oo-prototypes, parsec, pointedlist, process - , process-extras, quickcheck-text, split, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers-base, unix - , unix-compat, unordered-containers, xdg-basedir, yi-language - , yi-rope + , dynamic-state, exceptions, filepath, hashable, ListLike + , microlens-platform, mtl, old-locale, oo-prototypes, parsec + , pointedlist, process, process-extras, quickcheck-text, split + , tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers-base, unix, unix-compat, unordered-containers + , xdg-basedir, yi-language, yi-rope }: mkDerivation { pname = "yi-core"; - version = "0.17.0"; - sha256 = "018fcmviyy0xrzrvmcrdl4r4mk69ig7jgck5zgq58y0h7m4wxkmg"; + version = "0.17.1"; + sha256 = "1qv86znr7kjwnxv771xx1j7z63fqbnfasn2ndkbj5ldk3m5bil0p"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default - directory dlist dynamic-state filepath hashable ListLike + directory dlist dynamic-state exceptions filepath hashable ListLike microlens-platform mtl old-locale oo-prototypes parsec pointedlist process process-extras split text time transformers-base unix unix-compat unordered-containers xdg-basedir yi-language yi-rope @@ -217119,8 +217753,8 @@ self: { }: mkDerivation { pname = "yi-dynamic-configuration"; - version = "0.17.0"; - sha256 = "1slf3qrq61b171sg6izw212qajvmjwv786gndhql8r9kyi7na9ys"; + version = "0.17.1"; + sha256 = "1cnafzrgi7js9zayq223752v7jvl9rp526s7bd1nwwyjwl59y0h8"; libraryHaskellDepends = [ base data-default dyre microlens-platform mtl text transformers-base yi-core yi-rope @@ -217150,8 +217784,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.17.0"; - sha256 = "141kp6f6f0xrql8jmghqj1h5vrbim28z7p1a9psa40xry1hhlhr7"; + version = "0.17.1"; + sha256 = "0jh9bmxhjr1wpilmghanihq6iwn4xn34ihqlfc2c080wm5s8kw4w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -217182,15 +217816,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-frontend-vty_0_17_0" = callPackage + "yi-frontend-vty_0_17_1" = callPackage ({ mkDerivation, base, containers, data-default, dlist , microlens-platform, pointedlist, stm, text, vty, yi-core , yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.17.0"; - sha256 = "12yl4d3dkjkbz8n184lcs8z08mj8yc1ybaj52z7j58nialvq4ibh"; + version = "0.17.1"; + sha256 = "0i00m3z7zj6xqgh78wfrw2zqwcffsb31i2549m0b5g9qsicfp9h6"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist stm text vty yi-core yi-language yi-rope @@ -217219,15 +217853,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-fuzzy-open_0_17_0" = callPackage + "yi-fuzzy-open_0_17_1" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, pointedlist, text, transformers-base, vector , yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.17.0"; - sha256 = "1447w8gqwjnala08sysvy1bxhdna1hydh0bnjx2awz7hns5040ap"; + version = "0.17.1"; + sha256 = "1wd1w1d67hkp5rk3130cnmffgh40qb1vp9pnz6f36n0c8b2jqvjh"; libraryHaskellDepends = [ base binary containers data-default directory filepath mtl pointedlist text transformers-base vector yi-core yi-language @@ -217268,14 +217902,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-ireader_0_17_0" = callPackage + "yi-ireader_0_17_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-ireader"; - version = "0.17.0"; - sha256 = "0cwfjajs25lbxhzn8zbpjavy1yjym3k4iliqal9iq3i51k9inacc"; + version = "0.17.1"; + sha256 = "12babkhlqr7w3mb7z8w8ccwrvmkz8583yi0p9s50rqkn778cij7y"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -217302,14 +217936,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-cua_0_17_0" = callPackage + "yi-keymap-cua_0_17_1" = callPackage ({ mkDerivation, base, microlens-platform, text, yi-core , yi-keymap-emacs, yi-rope }: mkDerivation { pname = "yi-keymap-cua"; - version = "0.17.0"; - sha256 = "0v7gcd5arq33r2cf55ig307cfvapz3r1h9cz3ssvkw0fjzr1p1a3"; + version = "0.17.1"; + sha256 = "053w4b1p482wma64888vb3ikh7x0f58bl43vy7xs1lazlz22iwaj"; libraryHaskellDepends = [ base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; @@ -217338,15 +217972,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-emacs_0_17_0" = callPackage + "yi-keymap-emacs_0_17_1" = callPackage ({ mkDerivation, base, containers, filepath, Hclip , microlens-platform, mtl, oo-prototypes, text, transformers-base , yi-core, yi-language, yi-misc-modes, yi-rope }: mkDerivation { pname = "yi-keymap-emacs"; - version = "0.17.0"; - sha256 = "1d90884kjpq13d7nrxjla9kx6gr09xh8lwzbpnf69jg6iiavjlfg"; + version = "0.17.1"; + sha256 = "1jx7vhp7v098p3rrs21b43fwcbra6fmg4clamgqbbvbqgiy4bsrw"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes text transformers-base yi-core yi-language yi-misc-modes yi-rope @@ -217386,7 +218020,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-vim_0_16_0" = callPackage + "yi-keymap-vim_0_17_1" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, data-default , directory, filepath, Hclip, microlens-platform, mtl , oo-prototypes, pointedlist, QuickCheck, safe, tasty, tasty-hunit @@ -217395,9 +218029,8 @@ self: { }: mkDerivation { pname = "yi-keymap-vim"; - version = "0.16.0"; - sha256 = "1fvl4frjikkdp561zai6z35r8r7f4fq2izlcxl1k1rvsvxz3cbi2"; - enableSeparateDataOutput = true; + version = "0.17.1"; + sha256 = "1zvd0y6ak56cqxa60x4kgil2lp5lbidnkmp6kh7dq3i71n0nv48w"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe text @@ -217443,7 +218076,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-language_0_17_0" = callPackage + "yi-language_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -217452,8 +218085,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.17.0"; - sha256 = "046aavm0pf5s8bx6z0v8fvbizzr3s9s8kq79sj3gvis26im9kzpy"; + version = "0.17.1"; + sha256 = "17mnjfhxr6vhpfx7l4zg606f2vffjr39ga4j5qmnp7cf4y5n5vja"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -217491,14 +218124,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-misc-modes_0_17_0" = callPackage + "yi-misc-modes_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-misc-modes"; - version = "0.17.0"; - sha256 = "0ki6dc1frzhgn7dfbsrpbf75a5i32iz9a8cvy1c33xmdh9s8k4fw"; + version = "0.17.1"; + sha256 = "0yyv8p65vhpcjj97pzax0b8bbqhh3lzy3by4rzf0f11p862wzag0"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -217528,14 +218161,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-mode-haskell_0_17_0" = callPackage + "yi-mode-haskell_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.17.0"; - sha256 = "17cfbww6lpg29dz51pbzlsx95azhxlgv0lqcpxpxk82w9s4c2dji"; + version = "0.17.1"; + sha256 = "1fl9kmv264c0cmpn6c77ylyngyjh9ilcvpcrsn7j75g2xacgdpyx"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -217566,15 +218199,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-mode-javascript_0_17_0" = callPackage + "yi-mode-javascript_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, dlist , filepath, microlens-platform, mtl, text, yi-core, yi-language , yi-rope }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.17.0"; - sha256 = "040mc9mfm46alfl21p6p4a8n9p8hr12ywn6sfgq32zrhpa1zn9yb"; + version = "0.17.1"; + sha256 = "073yywxsf3j4vcc9rg0hw7jm6gmwvc7krvm0g9q9pv2y49n5aj14"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -217661,15 +218294,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-snippet_0_17_0" = callPackage + "yi-snippet_0_17_1" = callPackage ({ mkDerivation, base, binary, containers, data-default, free , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector , yi-core, yi-rope }: mkDerivation { pname = "yi-snippet"; - version = "0.17.0"; - sha256 = "10680a4zc5r9mnvhajgfrvzxpf8naclx4sygvbi69c5aann4q4a1"; + version = "0.17.1"; + sha256 = "1prczicjzmqnpkq6sda878f056g4ld1g6wmfpqzly2qa5rs4zg6b"; libraryHaskellDepends = [ base binary containers data-default free microlens-platform mtl text vector yi-core yi-rope From a6e12e5cf53d4d2a2d1e37a27954c9f472762ad0 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 4 Nov 2017 20:30:27 +0100 Subject: [PATCH 2376/2806] elixir: 1.5.1 -> 1.5.2 --- pkgs/development/interpreters/elixir/1.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix index e85d2500223..469502a3f85 100644 --- a/pkgs/development/interpreters/elixir/1.5.nix +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.5.1"; - sha256 = "0q0zr3v9cyb7p9aab8v038hnjm84nf9b60kikffp6w9rfqqqf767"; + version = "1.5.2"; + sha256 = "0ng7z2gz1c8lkn07fric18b3awcw886s9xb864kmnn2iah5gc65j"; minimumOTPVersion = "18"; } From af3a11b8f60644730368f432a279226a39d947e4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 4 Nov 2017 21:21:28 +0100 Subject: [PATCH 2377/2806] pgpdump: Add support for compressed data packets This will add support for compressed data packets (Tag 8) [0] and enable it by default. [0]: https://tools.ietf.org/html/rfc4880#section-5.6 --- pkgs/tools/security/pgpdump/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 93b53c3ad4a..09b5b5f58ca 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub +, supportCompressedPackets ? true, zlib, bzip2 +}: stdenv.mkDerivation rec { name = "pgpdump-${version}"; @@ -11,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc"; }; + buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ]; + meta = with stdenv.lib; { description = "A PGP packet visualizer"; longDescription = '' From 0094ca20cc224085d9479c614bfed52172c93b4b Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sat, 4 Nov 2017 10:45:34 -0700 Subject: [PATCH 2378/2806] acl2: 6.5 -> 7.4, refactor The `make regression` line was failing because the expression was downloading a core-system-only, no-libraries source tarball. I switched to using fetchFromGitHub, which downloads the full source code -- the core system as well as the "community books", i.e. libraries -- but the libraries unfortunately do not build yet because they have more dependencies than the core system, and they also run into some impurity problems during the build process. This commit changes the ACL2 package so that at least the user will obtain the latest version of the core system, even though they won't get the community books. In a later commit I hope to fix this; it will require either changes to ACL2 itself, or a patch to be applied to ACL2 in nixpkgs. ACL2 7.4 has no trouble building on the current version of SBCL in nixpkgs, so I let it do so instead of using the ancient SBCL version 1.2.0 from 2014. I also added myself as a maintainer to this package, since I'm an active contributor to the ACL2 project and am interested in seeing it working on Nix. --- lib/maintainers.nix | 1 + .../development/interpreters/acl2/default.nix | 63 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 52 insertions(+), 16 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 451cb4867a5..e2d3c73301b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -328,6 +328,7 @@ KibaFox = "Kiba Fox "; kierdavis = "Kier Davis "; kiloreux = "Kiloreux Emperex "; + kini = "Keshav Kini "; kkallio = "Karn Kallio "; knedlsepp = "Josef Kemetmüller "; konimex = "Muhammad Herdiansyah "; diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index f1e2315d794..16734c184eb 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchurl, sbcl }: +{ stdenv, fetchFromGitHub, + # perl, which, nettools, + sbcl }: -stdenv.mkDerivation rec { +let hashes = { + "7.4" = "04jb789nks9llwysxz1zw9pq1dh0j39b5fcmivcc4bq9v9cga2l1"; +}; +in stdenv.mkDerivation rec { name = "acl2-${version}"; - version = "v6-5"; + version = "7.4"; - src = fetchurl { - url = "http://www.cs.utexas.edu/users/moore/acl2/${version}/distrib/acl2.tar.gz"; - sha256 = "19kfclgpdyms016s06pjf3icj3mx9jlcj8vfgpbx2ac4ls0ir36g"; - name = "acl2-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "acl2-devel"; + repo = "acl2-devel"; + rev = "${version}"; + sha256 = hashes."${version}"; }; - buildInputs = [ sbcl ]; + buildInputs = [ sbcl + # which perl nettools + ]; + + enableParallelBuilding = true; phases = "unpackPhase installPhase"; @@ -18,18 +28,45 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/${installSuffix} + mkdir -p $out/bin cp -R . $out/share/${installSuffix} cd $out/share/${installSuffix} - make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' - make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' regression - make LISP=${sbcl}/bin/sbcl TAGS - mkdir -p $out/bin + + # make ACL2 image + make LISP=${sbcl}/bin/sbcl + + # The community books don't build properly under Nix yet. + rm -rf books + #make ACL2=$out/share/saved_acl2 USE_QUICKLISP=1 regression-everything + cp saved_acl2 $out/bin/acl2 ''; meta = { description = "An interpreter and a prover for a Lisp dialect"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; + longDescription = '' + ACL2 is a logic and programming language in which you can model + computer systems, together with a tool to help you prove + properties of those models. "ACL2" denotes "A Computational + Logic for Applicative Common Lisp". + + ACL2 is part of the Boyer-Moore family of provers, for which its + authors have received the 2005 ACM Software System Award. + + NOTE: In nixpkgs, the community books that usually ship with + ACL2 have been removed because it is not currently possible to + build them with Nix. + ''; + homepage = http://www.cs.utexas.edu/users/moore/acl2/; + downloadPage = https://github.com/acl2-devel/acl2-devel/releases; + # There are a bunch of licenses in the community books, but since + # they currently get deleted during the build, we don't mention + # their licenses here. ACL2 proper is released under a BSD + # 3-clause license. + #license = with stdenv.lib.licenses; + #[ free bsd3 mit gpl2 llgpl21 cc0 publicDomain ]; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ kini raskin ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92974dd3d5d..bb573341d73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6362,9 +6362,7 @@ with pkgs; ### DEVELOPMENT / INTERPRETERS - acl2 = callPackage ../development/interpreters/acl2 { - sbcl = sbcl_1_2_0; - }; + acl2 = callPackage ../development/interpreters/acl2 { }; angelscript = callPackage ../development/interpreters/angelscript {}; From 21db63d66956aef37f372809877f17c747df66ca Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sat, 4 Nov 2017 10:45:51 -0700 Subject: [PATCH 2379/2806] sbcl: remove old versions 1.2.0, 1.3.12 SBCL 1.2.0 was being retained for the acl2 package, which no longer needs it. SBCL 1.3.12 was being retained for the maxima package, which appears to no longer need it. --- pkgs/development/compilers/sbcl/1.2.0.nix | 84 ----------------- pkgs/development/compilers/sbcl/1.3.12.nix | 104 --------------------- pkgs/top-level/all-packages.nix | 6 -- 3 files changed, 194 deletions(-) delete mode 100644 pkgs/development/compilers/sbcl/1.2.0.nix delete mode 100644 pkgs/development/compilers/sbcl/1.3.12.nix diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix deleted file mode 100644 index 975cb7db1bb..00000000000 --- a/pkgs/development/compilers/sbcl/1.2.0.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv, fetchurl, sbclBootstrap, clisp}: - -stdenv.mkDerivation rec { - name = "sbcl-${version}"; - version = "1.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; - }; - - buildInputs = [ ] - ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap) - ++ (stdenv.lib.optional stdenv.isLinux clisp) - ; - - patchPhase = '' - echo '"${version}.nixos"' > version.lisp-expr - echo " - (lambda (features) - (flet ((enable (x) - (pushnew x features)) - (disable (x) - (setf features (remove x features)))) - (enable :sb-thread))) " > customize-target-features.lisp - - pwd - - # SBCL checks whether files are up-to-date in many places.. - # Unfortunately, same timestamp is not good enough - sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # Fix the tests - sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp - - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp - sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - - # Use whatever `cc` the stdenv provides - substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc - - substituteInPlace src/runtime/Config.x86-64-darwin \ - --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 - ''; - - preBuild = '' - export INSTALL_ROOT=$out - mkdir -p test-home - export HOME=$PWD/test-home - ''; - - buildPhase = if stdenv.isLinux - then '' - sh make.sh clisp --prefix=$out - '' - else '' - sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit' - ''; - - installPhase = '' - INSTALL_ROOT=$out sh install.sh - ''; - - meta = { - description = "Lisp compiler"; - homepage = http://www.sbcl.org; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.all; - inherit version; - }; -} diff --git a/pkgs/development/compilers/sbcl/1.3.12.nix b/pkgs/development/compilers/sbcl/1.3.12.nix deleted file mode 100644 index 8fa4741a4a1..00000000000 --- a/pkgs/development/compilers/sbcl/1.3.12.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ stdenv, fetchurl, writeText, sbclBootstrap -, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" -, threadSupport ? (stdenv.isi686 || stdenv.isx86_64) - # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. - # Note that the created binaries still need `patchelf --set-interpreter ...` - # to get rid of ${glibc} dependency. -, purgeNixReferences ? false -}: - -stdenv.mkDerivation rec { - name = "sbcl-${version}"; - version = "1.3.12"; - - src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1hjr2xqazy4j0m58y4na6fz8ii3xflqairxy7vpd7ajbs00yqfc0"; - }; - - patchPhase = '' - echo '"${version}.nixos"' > version.lisp-expr - echo " - (lambda (features) - (flet ((enable (x) - (pushnew x features)) - (disable (x) - (setf features (remove x features)))) - '' - + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)") - + stdenv.lib.optionalString stdenv.isArm "(enable :arm)" - + '' - )) " > customize-target-features.lisp - - pwd - - # SBCL checks whether files are up-to-date in many places.. - # Unfortunately, same timestamp is not good enough - sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # Fix the tests - sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp - - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp - sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - - # Use whatever `cc` the stdenv provides - substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc - - substituteInPlace src/runtime/Config.x86-64-darwin \ - --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 - '' - + (if purgeNixReferences - then - # This is the default location to look for the core; by default in $out/lib/sbcl - '' - sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ - -i src/runtime/runtime.c - '' - else - # Fix software version retrieval - '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp - '' - ); - - - preBuild = '' - export INSTALL_ROOT=$out - mkdir -p test-home - export HOME=$PWD/test-home - ''; - - buildPhase = '' - sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" - ''; - - installPhase = '' - INSTALL_ROOT=$out sh install.sh - ''; - - # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`. - setupHook = writeText "setupHook.sh" '' - envHooks+=(_setSbclHome) - _setSbclHome() { - export SBCL_HOME='@out@/lib/sbcl/' - } - ''; - - meta = sbclBootstrap.meta // { - inherit version; - updateWalker = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb573341d73..b47d817d372 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6234,12 +6234,6 @@ with pkgs; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; - # For Maxima - sbcl_1_3_12 = callPackage ../development/compilers/sbcl/1.3.12.nix { }; - # For ACL2 - sbcl_1_2_0 = callPackage ../development/compilers/sbcl/1.2.0.nix { - clisp = clisp; - }; scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; From d71833ee36c707717821b7f833587817168b4684 Mon Sep 17 00:00:00 2001 From: knupfer Date: Sat, 4 Nov 2017 23:01:20 +0100 Subject: [PATCH 2380/2806] fetchipfs: init Fixes #18296 --- pkgs/applications/misc/hello/default.nix | 9 +-- pkgs/build-support/fetchipfs/builder.sh | 87 ++++++++++++++++++++++++ pkgs/build-support/fetchipfs/default.nix | 52 ++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 4 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 pkgs/build-support/fetchipfs/builder.sh create mode 100644 pkgs/build-support/fetchipfs/default.nix diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 8a31c591b29..6b090e84c3f 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchipfs }: stdenv.mkDerivation rec { name = "hello-2.10"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; + src = fetchipfs { + url = "https://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz"; + ipfs = "QmWyj65ak3wd8kG2EvPCXKd6Tij15m4SwJz6g2yG2rQ7w8"; + sha256 = "1im1gglfm4k10bh4mdaqzmx3lm3kivnsmxrvl6vyvmfqqzljq75l"; }; doCheck = true; diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh new file mode 100644 index 00000000000..7a6a517566f --- /dev/null +++ b/pkgs/build-support/fetchipfs/builder.sh @@ -0,0 +1,87 @@ +source $stdenv/setup + +# Curl flags to handle redirects, not use EPSV, handle cookies for +# servers to need them during redirects, and work on SSL without a +# certificate (this isn't a security problem because we check the +# cryptographic hash of the output anyway). + +set -o noglob + +curl="curl \ + --location \ + --max-redirs 20 \ + --retry 2 \ + --disable-epsv \ + --cookie-jar cookies \ + --insecure \ + --speed-time 5 \ + -# \ + --fail \ + $curlOpts \ + $NIX_CURL_FLAGS" + +finish() { + runHook postFetch + set +o noglob + exit 0 +} + +ipfs_add() { + if curl --retry 0 --head --silent "localhost:5001" > /dev/null; then + echo "=IPFS= add $ipfs" + tar --owner=root --group=root -cWf "source.tar" $(echo *) + res=$(curl -# -F "file=@source.tar" "localhost:5001/api/v0/tar/add" | sed 's/.*"Hash":"\(.*\)".*/\1/') + if [ $ipfs != $res ]; then + echo "\`ipfs tar add' results in $res when $ipfs is expected" + exit 1 + fi + rm "source.tar" + fi +} + +echo + +mkdir download +cd download + +if curl --retry 0 --head --silent "localhost:5001" > /dev/null; then + curlexit=18; + echo "=IPFS= get $ipfs" + # if we get error code 18, resume partial download + while [ $curlexit -eq 18 ]; do + # keep this inside an if statement, since on failure it doesn't abort the script + if $curl -C - "http://localhost:5001/api/v0/tar/cat?arg=$ipfs" --output "$ipfs.tar"; then + unpackFile "$ipfs.tar" + rm "$ipfs.tar" + set +o noglob + mv $(echo *) "$out" + finish + else + curlexit=$?; + fi + done +fi + +if test -n "$url"; then + curlexit=18; + echo "Downloading $url" + while [ $curlexit -eq 18 ]; do + # keep this inside an if statement, since on failure it doesn't abort the script + if $curl "$url" -O; then + set +o noglob + tmpfile=$(echo *) + unpackFile $tmpfile + rm $tmpfile + ipfs_add + mv $(echo *) "$out" + finish + else + curlexit=$?; + fi + done +fi + +echo "error: cannot download $ipfs from ipfs or the given url" +echo +set +o noglob +exit 1 diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix new file mode 100644 index 00000000000..196b3bebc91 --- /dev/null +++ b/pkgs/build-support/fetchipfs/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, curl +}: + +{ ipfs +, url ? "" +, curlOpts ? "" +, outputHash ? "" +, outputHashAlgo ? "" +, md5 ? "" +, sha1 ? "" +, sha256 ? "" +, sha512 ? "" +, meta ? {} +, port ? "8080" +, postFetch ? "" +}: + +assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; + +let + + hasHash = (outputHash != "" && outputHashAlgo != "") + || md5 != "" || sha1 != "" || sha256 != "" || sha512 != ""; + +in + +if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation { + name = ipfs; + builder = ./builder.sh; + buildInputs = [ curl ]; + + # New-style output content requirements. + outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else + if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; + outputHash = if outputHash != "" then outputHash else + if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; + + outputHashMode = "recursive"; + + inherit curlOpts + postFetch + ipfs + url + port; + + # Doing the download on a remote machine just duplicates network + # traffic, so don't do that. + preferLocalBuild = true; + + inherit meta; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92974dd3d5d..bfc54b5fa52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -177,6 +177,10 @@ with pkgs; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; + fetchipfs = import ../build-support/fetchipfs { + inherit curl stdenv; + }; + # fetchurlBoot is used for curl and its dependencies in order to # prevent a cyclic dependency (curl depends on curl.tar.bz2, # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It From bfe218e3cb3a66d25a95e37711e1e7419670cf23 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 4 Nov 2017 18:03:04 -0400 Subject: [PATCH 2381/2806] adapta-gtk-theme: 3.91.2.147 -> 3.92.1.72 --- pkgs/misc/themes/adapta/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index bfbae3396c8..9a4ec9f49f6 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.91.2.147"; + version = "3.92.1.72"; src = fetchFromGitHub { - owner = "tista500"; - repo = "Adapta"; + owner = "adapta-project"; + repo = "adapta-gtk-theme"; rev = version; - sha256 = "1sv4s8rcc40v4lanapdqanlqf1l60rbc5wd7h73l5cigbqxxgda9"; + sha256 = "19kav8m6aj4h7qg0z92k09lppzdgy6h9lxxv3qqqrl3hmg7bn0sx"; }; preferLocalBuild = true; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An adaptive Gtk+ theme based on Material Design"; - homepage = https://github.com/tista500/Adapta; + homepage = https://github.com/adapta-project/adapta-gtk-theme; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; From 0cabd5fa6782aa26167ce334a9b02338f8a7665f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 4 Nov 2017 19:13:51 +0000 Subject: [PATCH 2382/2806] ocamlPackages.ocaml-migrate-parsetree: 1.0.5 -> 1.0.7 --- .../ocaml-modules/ocaml-migrate-parsetree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index 108a2c30f2d..b88000eeb32 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "let-def"; repo = "ocaml-migrate-parsetree"; rev = "v${version}"; - sha256 = "1wj66nb16zijacpfrcm7yi0hlg315v71nxri3ia7r0sa3mlzxl34"; + sha256 = "0v1h943xv5bd8qy5mr8pvyjbgamhs59nkgr94j3vznabrcfqzkh7"; }; buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; From e64dc2543458b52abcd913bad87851f5d7db435d Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 4 Nov 2017 19:06:37 +0100 Subject: [PATCH 2383/2806] Revert "services.xserver: assert that either desktop- or window manager is not "none"" This reverts commit 93c54acf97077567e8d6135a36f191e872b26692. This reopens #30517 @nbp @Ma27 Breaking people's config for this is hardly reasonable as is. If it absolutely cannot be avoided, at the very least, we need to provide clear instructions on what people need to upgrade in their config. I actually had to bisect to the commit, to even find out what property I should change or define, as the error message was useless. It didn't even mention a property name. Discussion on the PR seems to be ongoing, so I'm reverting this, so we don't break people's systems on unstable. --- nixos/doc/manual/release-notes/rl-1803.xml | 8 -------- .../services/x11/desktop-managers/default.nix | 4 ++-- nixos/modules/services/x11/xserver.nix | 12 ------------ 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index fe776c3df22..17b385242f6 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -90,14 +90,6 @@ following incompatible changes: That means that old configuration is not overwritten by default when update to the znc options are made. - - - The option is now none by default. - An assertion failure is thrown if WM's and DM's default are none. - To explicitly run a plain X session without and DM or WM, the newly introduced option - must be set to true. - - diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index b393167ae2c..13f339e3fbf 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -87,8 +87,8 @@ in default = mkOption { type = types.str; - default = "none"; - example = "plasma5"; + default = ""; + example = "none"; description = "Default desktop manager loaded if none have been chosen."; apply = defaultDM: if defaultDM == "" && cfg.session.list != [] then diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 58dc75bcb4e..d4fe475690c 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -161,15 +161,6 @@ in ''; }; - plainX = mkOption { - type = types.bool; - default = false; - description = '' - Whether the X11 session can be plain (without DM/WM) and - the Xsession script will be used as fallback or not. - ''; - }; - autorun = mkOption { type = types.bool; default = true; @@ -561,9 +552,6 @@ in + "${toString (length primaryHeads)} heads set to primary: " + concatMapStringsSep ", " (x: x.output) primaryHeads; }) - { assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX; - message = "Either the desktop manager or the window manager shouldn't be `none`! To explicitly allow this, you can also set `services.xserver.plainX` to `true`."; - } ]; environment.etc = From 07e2460afd4b2de598cebd4c7466e63e0a28d872 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Fri, 1 Sep 2017 23:25:31 +0200 Subject: [PATCH 2384/2806] hubstaff: init at 1.2.14 --- pkgs/applications/misc/hubstaff/default.nix | 64 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/misc/hubstaff/default.nix diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix new file mode 100644 index 00000000000..91cf494d257 --- /dev/null +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE, libXext +, freetype, libXrender, fontconfig, libXft, libXinerama, libnotify, glib +, gtk3, libappindicator-gtk3, curl }: + +let + + version = "1.2.14-36df5e3"; + + rpath = stdenv.lib.makeLibraryPath + [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft + libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3 + curl ]; + +in + +stdenv.mkDerivation { + name = "hubstaff-${version}"; + + src = fetchurl { + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh"; + sha256 = "0yzhxk9zppj94llnf8naa6ca61f7c8jaj6b1m25zffnnz37m1sdb"; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + unpackCmd = '' + # MojoSetups have a ZIP file at the end. ZIP’s magic string is + # most often PK\x03\x04. This *should* work for future updates, + # but feel free to come up with something more reasonable. + dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text $'PK\x03\x04' $curSrc | cut -d: -f1) + dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null + unzip -q data.zip "data/*" + rm data.zip + ''; + + dontBuild = true; + + installPhase = '' + # TODO: handle 32-bit arch? + rm -r x86 + + opt=$out/opt/hubstaff + mkdir -p $out/bin $opt + cp -r . $opt/ + + prog=$opt/x86_64/HubstaffClient.bin.x86_64 + + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $prog + wrapProgram $prog --prefix LD_LIBRARY_PATH : ${rpath} + + ln -s $prog $out/bin/HubstaffClient + + # Why is this needed? SEGV otherwise. + ln -s $opt/data/resources $opt/x86_64/resources + ''; + + meta = with stdenv.lib; { + description = "Time tracking software"; + homepage = https://hubstaff.com/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.michalrus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f039113e3bd..6aaba4e165e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14615,6 +14615,8 @@ with pkgs; ht = callPackage ../applications/editors/ht { }; + hubstaff = callPackage ../applications/misc/hubstaff { }; + hue-cli = callPackage ../tools/networking/hue-cli { }; hugin = callPackage ../applications/graphics/hugin { }; From a4085e28b17fcac19c7c44b1b72fd47becc93989 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 1 Nov 2017 12:26:04 +0000 Subject: [PATCH 2385/2806] subsurface: 4.6.0 -> 4.7.2 --- pkgs/applications/misc/subsurface/default.nix | 119 +++++++++--------- 1 file changed, 60 insertions(+), 59 deletions(-) diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 950f8da7860..051b67bc972 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,64 +1,23 @@ -{ - stdenv, - cmake, doxygen, pkgconfig, autoreconfHook, - curl, - fetchgit, - grantlee, - libgit2, - libusb, - libssh2, - libxml2, - libxslt, - libzip, - qtbase, qtconnectivity, qtquickcontrols, qtscript, qtsvg, qttools, qtwebkit, - sqlite +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake +, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib +, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit }: let - version = "4.6.0"; - - libmarble = stdenv.mkDerivation rec { - name = "libmarble-ssrf-${version}"; - - src = fetchgit { - url = "git://git.subsurface-divelog.org/marble"; - rev = "refs/tags/v${version}"; - sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd"; - }; - - buildInputs = [ qtbase qtquickcontrols qtscript qtwebkit ]; - nativeBuildInputs = [ doxygen pkgconfig cmake ]; - - enableParallelBuilding = true; - - cmakeFlags = [ - "-DQTONLY=TRUE" - "-DQT5BUILD=ON" - "-DBUILD_MARBLE_TESTS=NO" - "-DWITH_DESIGNER_PLUGIN=NO" - "-DBUILD_MARBLE_APPS=NO" - ]; - - meta = with stdenv.lib; { - description = "Qt library for a slippy map with patches from the Subsurface project"; - homepage = http://subsurface-divelog.org; - license = licenses.lgpl21; - maintainers = with maintainers; [ mguentner ]; - platforms = platforms.all; - }; - }; + version = "4.7.2"; libdc = stdenv.mkDerivation rec { name = "libdivecomputer-ssrf-${version}"; - src = fetchgit { - url = "git://subsurface-divelog.org/libdc"; - rev = "refs/tags/v${version}"; - sha256 = "0s82c8bvqph9c9chwzd76iwrw968w7lgjm3pj4hmad1jim67bs6n"; + src = fetchurl { + url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; + sha256 = "04wadhhva1bfnwk0kl359kcv0f83mgym2fzs441spw5llcl7k52r"; }; nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib ]; + enableParallelBuilding = true; meta = with stdenv.lib; { @@ -70,31 +29,73 @@ let }; }; + googlemaps = stdenv.mkDerivation rec { + name = "googlemaps-${version}"; + + version = "2017-09-17"; + + src = fetchFromGitHub { + owner = "vladest"; + repo = "googlemaps"; + rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35"; + sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84"; + }; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtbase qtlocation ]; + + pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; + + installPhase = '' + mkdir $out $(dirname ${pluginsSubdir}) + mv plugins ${pluginsSubdir} + mv lib $out/ + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "QtLocation plugin for Google maps tile API"; + maintainers = with maintainers; [ orivej ]; + license = licenses.mit; + platforms = platforms.all; + }; + }; + in stdenv.mkDerivation rec { name = "subsurface-${version}"; - src = fetchgit { - url = "git://git.subsurface-divelog.org/subsurface"; - rev = "refs/tags/v${version}"; - sha256 = "1rk5n52p6cnyjrgi7ybhmvh7y31zxrjny0mqpnc1wql69f90h94c"; + src = fetchurl { + url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; + sha256 = "06f215xx1nc2q2qff2ihcl86fkrlnkvacl1swi3fw9iik6nq3bjp"; }; buildInputs = [ - libdc libmarble + libdc googlemaps curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip qtbase qtconnectivity qtsvg qttools qtwebkit ]; - nativeBuildInputs = [ cmake pkgconfig ]; - enableParallelBuilding = false; # subsurfacewebservices.h dependency on ui_webservices.h + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; cmakeFlags = [ - "-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so" + "-DLIBDC_FROM_PKGCONFIG=ON" "-DNO_PRINTING=OFF" ]; + postInstall = '' + wrapProgram $out/bin/subsurface \ + --prefix QT_PLUGIN_PATH : "${googlemaps}/${googlemaps.pluginsSubdir}" + ''; + + enableParallelBuilding = true; + + passthru = { inherit version libdc googlemaps; }; + meta = with stdenv.lib; { - description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux"; + description = "A divelog program"; longDescription = '' Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix. It allows tracking of dive locations including GPS coordinates (which can also From 7d52814ba56bcb3bf41c3d0a2e6186a1b9930311 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Wed, 18 Oct 2017 19:45:40 -0600 Subject: [PATCH 2386/2806] dump1090: init at 2014-10-31 --- pkgs/applications/misc/dump1090/default.nix | 33 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/misc/dump1090/default.nix diff --git a/pkgs/applications/misc/dump1090/default.nix b/pkgs/applications/misc/dump1090/default.nix new file mode 100644 index 00000000000..3e9fe133d93 --- /dev/null +++ b/pkgs/applications/misc/dump1090/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libusb, rtl-sdr }: + +stdenv.mkDerivation rec { + name = "dump1090-${version}"; + version = "2014-10-31"; + + src = fetchFromGitHub { + owner = "MalcolmRobb"; + repo = "dump1090"; + rev = "bff92c4ad772a0a8d433f788d39dae97e00e4dbe"; + sha256 = "06aaj9gpz5v4qzvnp8xf18wdfclp0jvn3hflls79ly46gz2dh9hy"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libusb rtl-sdr ]; + + makeFlags = [ "PREFIX=$out" ]; + + installPhase = '' + mkdir -p $out/bin $out/share + cp -v dump1090 $out/bin/dump1090 + cp -vr public_html $out/share/dump1090 + ''; + + meta = with stdenv.lib; { + description = "A simple Mode S decoder for RTLSDR devices"; + homepage = https://github.com/MalcolmRobb/dump1090; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ earldouglas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c6d4ad356e..9db04cee12e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -122,6 +122,8 @@ with pkgs; dispad = callPackage ../tools/X11/dispad { }; + dump1090 = callPackage ../applications/misc/dump1090 { }; + vsenv = callPackage ../build-support/vsenv { vs = vs90wrapper; }; From 316de025d1cd2d12c0a2a6b8b61b8a70a293fe9b Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 5 Nov 2017 06:36:00 +0100 Subject: [PATCH 2387/2806] python/meliae: Fix version string for download URL While the version listed on PyPI is "0.4.0.final.0", the actual tarball however is called just "meliae-0.4.0.tar.gz", which is the same *name* (but different hash) as the one before the update in 7ce848309e6d64820af1e96045c5386992e90a4a. Here is the PyPI page for reference: https://pypi.python.org/pypi/meliae/0.4.0.final.0 After checking the tarballs contents, the version string however *is* "0.4.0.final.0", so I'm only changing the version in the download URL rather than in the version attribute. Signed-off-by: aszlig Cc: @FRidh --- pkgs/development/python-modules/meliae/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index 9fa46ce6863..2a1c4f4341f 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -12,7 +12,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; src = fetchPypi { - inherit pname version; + inherit pname; + # FIXME when updating to the next version: The tarball on pypi is called + # "meliae-0.4.0.tar.gz" while the version within that tarball is + # "0.4.0.final.0". + version = "0.4.0"; sha256 = "976519ab02aaa6a8fb5f596dc4dd9f64fc9510b00e054979566e51c9be7cec99"; }; From ef21b240c84ae4a1c3dd3c7060006d766c2140bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Nov 2017 10:12:19 +0100 Subject: [PATCH 2388/2806] fetchurl: add passthru so that we could add e.g. the `version` attribute. --- pkgs/build-support/fetchurl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 5811950bf05..8dac273eb1c 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -84,6 +84,9 @@ in , # Meta information, if any. meta ? {} + + # Passthru information, if any. +, passthru ? {} }: assert builtins.isList urls; @@ -139,4 +142,5 @@ else stdenv.mkDerivation { ''; inherit meta; + inherit passthru; } From 07eeeb36008b63c8edfc75fce79beb028cd5c1e4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Nov 2017 10:45:54 +0100 Subject: [PATCH 2389/2806] Python: move expressions in python-modules to their own folders --- .../{bcrypt.nix => bcrypt/default.nix} | 0 .../default.nix} | 0 .../default.nix} | 0 .../{docker.nix => docker/default.nix} | 0 .../default.nix} | 0 .../{ds4drv.nix => ds4drv/default.nix} | 0 .../{dulwich.nix => dulwich/default.nix} | 0 .../default.nix} | 0 .../default.nix} | 0 .../default.nix} | 0 .../default.nix} | 0 .../default.nix} | 0 .../{flask-wtf.nix => flask-wtf/default.nix} | 0 .../{ghdiff.nix => ghdiff/default.nix} | 0 .../{gunicorn.nix => gunicorn/default.nix} | 0 .../{htmlmin.nix => htmlmin/default.nix} | 0 .../default.nix} | 0 .../{jabberbot.nix => jabberbot/default.nix} | 0 .../{ldap.nix => ldap/default.nix} | 0 .../{markdown2.nix => markdown2/default.nix} | 0 .../{nltk.nix => nltk/default.nix} | 0 .../{pep257.nix => pep257/default.nix} | 0 .../{protobuf.nix => protobuf/default.nix} | 0 .../{pyaes.nix => pyaes/default.nix} | 0 .../{pyrax.nix => pyrax/default.nix} | 0 .../default.nix} | 0 .../{pyudev.nix => pyudev/default.nix} | 0 .../default.nix} | 0 .../default.nix} | 0 pkgs/top-level/python-packages.nix | 60 +++++++++---------- 30 files changed, 30 insertions(+), 30 deletions(-) rename pkgs/development/python-modules/{bcrypt.nix => bcrypt/default.nix} (100%) rename pkgs/development/python-modules/{csscompressor.nix => csscompressor/default.nix} (100%) rename pkgs/development/python-modules/{django_guardian.nix => django_guardian/default.nix} (100%) rename pkgs/development/python-modules/{docker.nix => docker/default.nix} (100%) rename pkgs/development/python-modules/{docker_compose.nix => docker_compose/default.nix} (100%) rename pkgs/development/python-modules/{ds4drv.nix => ds4drv/default.nix} (100%) rename pkgs/development/python-modules/{dulwich.nix => dulwich/default.nix} (100%) rename pkgs/development/python-modules/{flask-elastic.nix => flask-elastic/default.nix} (100%) rename pkgs/development/python-modules/{flask-ldap-login.nix => flask-ldap-login/default.nix} (100%) rename pkgs/development/python-modules/{flask-login.nix => flask-login/default.nix} (100%) rename pkgs/development/python-modules/{flask-oauthlib.nix => flask-oauthlib/default.nix} (100%) rename pkgs/development/python-modules/{flask-testing.nix => flask-testing/default.nix} (100%) rename pkgs/development/python-modules/{flask-wtf.nix => flask-wtf/default.nix} (100%) rename pkgs/development/python-modules/{ghdiff.nix => ghdiff/default.nix} (100%) rename pkgs/development/python-modules/{gunicorn.nix => gunicorn/default.nix} (100%) rename pkgs/development/python-modules/{htmlmin.nix => htmlmin/default.nix} (100%) rename pkgs/development/python-modules/{hypothesis.nix => hypothesis/default.nix} (100%) rename pkgs/development/python-modules/{jabberbot.nix => jabberbot/default.nix} (100%) rename pkgs/development/python-modules/{ldap.nix => ldap/default.nix} (100%) rename pkgs/development/python-modules/{markdown2.nix => markdown2/default.nix} (100%) rename pkgs/development/python-modules/{nltk.nix => nltk/default.nix} (100%) rename pkgs/development/python-modules/{pep257.nix => pep257/default.nix} (100%) rename pkgs/development/python-modules/{protobuf.nix => protobuf/default.nix} (100%) rename pkgs/development/python-modules/{pyaes.nix => pyaes/default.nix} (100%) rename pkgs/development/python-modules/{pyrax.nix => pyrax/default.nix} (100%) rename pkgs/development/python-modules/{pytest-pep257.nix => pytest-pep257/default.nix} (100%) rename pkgs/development/python-modules/{pyudev.nix => pyudev/default.nix} (100%) rename pkgs/development/python-modules/{rackspace-novaclient.nix => rackspace-novaclient/default.nix} (100%) rename pkgs/development/python-modules/{requests-oauthlib.nix => requests-oauthlib/default.nix} (100%) diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt/default.nix similarity index 100% rename from pkgs/development/python-modules/bcrypt.nix rename to pkgs/development/python-modules/bcrypt/default.nix diff --git a/pkgs/development/python-modules/csscompressor.nix b/pkgs/development/python-modules/csscompressor/default.nix similarity index 100% rename from pkgs/development/python-modules/csscompressor.nix rename to pkgs/development/python-modules/csscompressor/default.nix diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian/default.nix similarity index 100% rename from pkgs/development/python-modules/django_guardian.nix rename to pkgs/development/python-modules/django_guardian/default.nix diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker/default.nix similarity index 100% rename from pkgs/development/python-modules/docker.nix rename to pkgs/development/python-modules/docker/default.nix diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose/default.nix similarity index 100% rename from pkgs/development/python-modules/docker_compose.nix rename to pkgs/development/python-modules/docker_compose/default.nix diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv/default.nix similarity index 100% rename from pkgs/development/python-modules/ds4drv.nix rename to pkgs/development/python-modules/ds4drv/default.nix diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich/default.nix similarity index 100% rename from pkgs/development/python-modules/dulwich.nix rename to pkgs/development/python-modules/dulwich/default.nix diff --git a/pkgs/development/python-modules/flask-elastic.nix b/pkgs/development/python-modules/flask-elastic/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-elastic.nix rename to pkgs/development/python-modules/flask-elastic/default.nix diff --git a/pkgs/development/python-modules/flask-ldap-login.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-ldap-login.nix rename to pkgs/development/python-modules/flask-ldap-login/default.nix diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-login.nix rename to pkgs/development/python-modules/flask-login/default.nix diff --git a/pkgs/development/python-modules/flask-oauthlib.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-oauthlib.nix rename to pkgs/development/python-modules/flask-oauthlib/default.nix diff --git a/pkgs/development/python-modules/flask-testing.nix b/pkgs/development/python-modules/flask-testing/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-testing.nix rename to pkgs/development/python-modules/flask-testing/default.nix diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-wtf.nix rename to pkgs/development/python-modules/flask-wtf/default.nix diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff/default.nix similarity index 100% rename from pkgs/development/python-modules/ghdiff.nix rename to pkgs/development/python-modules/ghdiff/default.nix diff --git a/pkgs/development/python-modules/gunicorn.nix b/pkgs/development/python-modules/gunicorn/default.nix similarity index 100% rename from pkgs/development/python-modules/gunicorn.nix rename to pkgs/development/python-modules/gunicorn/default.nix diff --git a/pkgs/development/python-modules/htmlmin.nix b/pkgs/development/python-modules/htmlmin/default.nix similarity index 100% rename from pkgs/development/python-modules/htmlmin.nix rename to pkgs/development/python-modules/htmlmin/default.nix diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis/default.nix similarity index 100% rename from pkgs/development/python-modules/hypothesis.nix rename to pkgs/development/python-modules/hypothesis/default.nix diff --git a/pkgs/development/python-modules/jabberbot.nix b/pkgs/development/python-modules/jabberbot/default.nix similarity index 100% rename from pkgs/development/python-modules/jabberbot.nix rename to pkgs/development/python-modules/jabberbot/default.nix diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap/default.nix similarity index 100% rename from pkgs/development/python-modules/ldap.nix rename to pkgs/development/python-modules/ldap/default.nix diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2/default.nix similarity index 100% rename from pkgs/development/python-modules/markdown2.nix rename to pkgs/development/python-modules/markdown2/default.nix diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk/default.nix similarity index 100% rename from pkgs/development/python-modules/nltk.nix rename to pkgs/development/python-modules/nltk/default.nix diff --git a/pkgs/development/python-modules/pep257.nix b/pkgs/development/python-modules/pep257/default.nix similarity index 100% rename from pkgs/development/python-modules/pep257.nix rename to pkgs/development/python-modules/pep257/default.nix diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf/default.nix similarity index 100% rename from pkgs/development/python-modules/protobuf.nix rename to pkgs/development/python-modules/protobuf/default.nix diff --git a/pkgs/development/python-modules/pyaes.nix b/pkgs/development/python-modules/pyaes/default.nix similarity index 100% rename from pkgs/development/python-modules/pyaes.nix rename to pkgs/development/python-modules/pyaes/default.nix diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax/default.nix similarity index 100% rename from pkgs/development/python-modules/pyrax.nix rename to pkgs/development/python-modules/pyrax/default.nix diff --git a/pkgs/development/python-modules/pytest-pep257.nix b/pkgs/development/python-modules/pytest-pep257/default.nix similarity index 100% rename from pkgs/development/python-modules/pytest-pep257.nix rename to pkgs/development/python-modules/pytest-pep257/default.nix diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev/default.nix similarity index 100% rename from pkgs/development/python-modules/pyudev.nix rename to pkgs/development/python-modules/pyudev/default.nix diff --git a/pkgs/development/python-modules/rackspace-novaclient.nix b/pkgs/development/python-modules/rackspace-novaclient/default.nix similarity index 100% rename from pkgs/development/python-modules/rackspace-novaclient.nix rename to pkgs/development/python-modules/rackspace-novaclient/default.nix diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix similarity index 100% rename from pkgs/development/python-modules/requests-oauthlib.nix rename to pkgs/development/python-modules/requests-oauthlib/default.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70202d2d4a8..d33b7fd6dd5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -208,7 +208,7 @@ in { # version of nixpart. nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; - nltk = callPackage ../development/python-modules/nltk.nix { }; + nltk = callPackage ../development/python-modules/nltk { }; ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; @@ -216,7 +216,7 @@ in { Pmw = callPackage ../development/python-modules/Pmw { }; - pyaes = callPackage ../development/python-modules/pyaes.nix { }; + pyaes = callPackage ../development/python-modules/pyaes { }; pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}"; @@ -1659,7 +1659,7 @@ in { cram = callPackage ../development/python-modules/cram { }; - csscompressor = callPackage ../development/python-modules/csscompressor.nix {}; + csscompressor = callPackage ../development/python-modules/csscompressor {}; csvkit = callPackage ../development/python-modules/csvkit { }; @@ -3641,7 +3641,7 @@ in { }; }; - bcrypt = callPackage ../development/python-modules/bcrypt.nix { }; + bcrypt = callPackage ../development/python-modules/bcrypt { }; cffi = callPackage ../development/python-modules/cffi { }; @@ -3960,7 +3960,7 @@ in { }; }; - pytest-pep257 = callPackage ../development/python-modules/pytest-pep257.nix { }; + pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; pytest-raisesregexp = buildPythonPackage rec { name = "pytest-raisesregexp-${version}"; @@ -4737,7 +4737,7 @@ in { dns = callPackage ../development/python-modules/dns { }; - docker = callPackage ../development/python-modules/docker.nix {}; + docker = callPackage ../development/python-modules/docker {}; dockerpty = buildPythonPackage rec { name = "dockerpty-0.4.1"; @@ -4932,7 +4932,7 @@ in { }; }; - ds4drv = callPackage ../development/python-modules/ds4drv.nix { + ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; @@ -5940,7 +5940,7 @@ in { }); - htmlmin = callPackage ../development/python-modules/htmlmin.nix {}; + htmlmin = callPackage ../development/python-modules/htmlmin {}; httpauth = buildPythonPackage rec { version = "0.3"; @@ -8051,7 +8051,7 @@ in { django_extensions = callPackage ../development/python-modules/django-extensions { }; - django_guardian = callPackage ../development/python-modules/django_guardian.nix { }; + django_guardian = callPackage ../development/python-modules/django_guardian { }; django-ipware = callPackage ../development/python-modules/django-ipware { }; @@ -8383,7 +8383,7 @@ in { }; }; - dulwich = callPackage ../development/python-modules/dulwich.nix { + dulwich = callPackage ../development/python-modules/dulwich { inherit (pkgs) git glibcLocales; }; @@ -8716,7 +8716,7 @@ in { }; }; - docker_compose = callPackage ../development/python-modules/docker_compose.nix {}; + docker_compose = callPackage ../development/python-modules/docker_compose {}; fdroidserver = buildPythonPackage rec { version = "2016-05-31"; @@ -8865,11 +8865,11 @@ in { flask-cors = callPackage ../development/python-modules/flask-cors { }; - flask_elastic = callPackage ../development/python-modules/flask-elastic.nix { }; + flask_elastic = callPackage ../development/python-modules/flask-elastic { }; - flask_login = callPackage ../development/python-modules/flask-login.nix { }; + flask_login = callPackage ../development/python-modules/flask-login { }; - flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { }; + flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; flask_mail = callPackage ../development/python-modules/flask-mail { }; @@ -8877,7 +8877,7 @@ in { flask_migrate = callPackage ../development/python-modules/flask-migrate { }; - flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { }; + flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { }; flask_principal = buildPythonPackage rec { name = "Flask-Principal-${version}"; @@ -8944,9 +8944,9 @@ in { }; }; - flask_testing = callPackage ../development/python-modules/flask-testing.nix { }; + flask_testing = callPackage ../development/python-modules/flask-testing { }; - flask_wtf = callPackage ../development/python-modules/flask-wtf.nix { }; + flask_wtf = callPackage ../development/python-modules/flask-wtf { }; wtforms = buildPythonPackage rec { version = "2.1"; @@ -9486,7 +9486,7 @@ in { gflags = callPackage ../development/python-modules/gflags { }; - ghdiff = callPackage ../development/python-modules/ghdiff.nix { }; + ghdiff = callPackage ../development/python-modules/ghdiff { }; gipc = buildPythonPackage rec { name = "gipc-0.5.0"; @@ -9802,7 +9802,7 @@ in { rebulk = callPackage ../development/python-modules/rebulk { }; - gunicorn = callPackage ../development/python-modules/gunicorn.nix { }; + gunicorn = callPackage ../development/python-modules/gunicorn { }; hawkauthlib = buildPythonPackage rec { name = "hawkauthlib-${version}"; @@ -9945,7 +9945,7 @@ in { propagatedBuildInputs = with self; [ requests ]; }; - hypothesis = callPackage ../development/python-modules/hypothesis.nix { }; + hypothesis = callPackage ../development/python-modules/hypothesis { }; colored = buildPythonPackage rec { name = "colored-${version}"; @@ -10391,7 +10391,7 @@ in { }; }; - jabberbot = callPackage ../development/python-modules/jabberbot.nix {}; + jabberbot = callPackage ../development/python-modules/jabberbot {}; jedi = callPackage ../development/python-modules/jedi { }; @@ -14886,7 +14886,7 @@ in { }; }; - pep257 = callPackage ../development/python-modules/pep257.nix { }; + pep257 = callPackage ../development/python-modules/pep257 { }; percol = buildPythonPackage rec { name = "percol-${version}"; @@ -15415,13 +15415,13 @@ in { }); - protobuf = callPackage ../development/python-modules/protobuf.nix { + protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; protobuf = pkgs.protobuf; }; - protobuf3_1 = callPackage ../development/python-modules/protobuf.nix { + protobuf3_1 = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; protobuf = pkgs.protobuf3_1; @@ -16843,7 +16843,7 @@ in { buildInputs = with self; [ pyasn1 pycrypto ]; }; - pyudev = callPackage ../development/python-modules/pyudev.nix { + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) fetchurl systemd; }; @@ -16908,7 +16908,7 @@ in { }; }); - ldap = callPackage ../development/python-modules/ldap.nix { + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl openssl; }; @@ -17230,9 +17230,9 @@ in { doCheck = false; }; - rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient.nix { }; + rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient { }; - pyrax = callPackage ../development/python-modules/pyrax.nix { + pyrax = callPackage ../development/python-modules/pyrax { glibcLocales = pkgs.glibcLocales; }; @@ -17750,7 +17750,7 @@ in { requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; - requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { }; + requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 @@ -23883,7 +23883,7 @@ EOF }; }; - markdown2 = callPackage ../development/python-modules/markdown2.nix { }; + markdown2 = callPackage ../development/python-modules/markdown2 { }; evernote = buildPythonPackage rec { name = "evernote-${version}"; From 6254141c927842bdf95dca39613b9baa21f32f76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Nov 2017 10:56:38 +0100 Subject: [PATCH 2390/2806] Python pkgs: remove old/unused patches --- .../pelican-fix-tests-with-pygments-2.1.patch | 318 ------------------ .../sqlalchemy-0.7.10-test-failures.patch | 49 --- 2 files changed, 367 deletions(-) delete mode 100644 pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch delete mode 100644 pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch diff --git a/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch b/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch deleted file mode 100644 index 4568b8b9448..00000000000 --- a/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch +++ /dev/null @@ -1,318 +0,0 @@ -diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml -index 3ce41d7..3cf97a8 100644 ---- a/pelican/tests/output/basic/feeds/all-en.atom.xml -+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -@@ -58,4 +58,4 @@ pelican.conf, it will have nothing in default.</p> - <p>Lovely.</p> - </div> - The baz tag2010-03-14T00:00:00+00:00tag:,2010-03-14:tag/baz.html<p>This article overrides the listening of the articles under the <em>baz</em> tag.</p> -- -+ -\ No newline at end of file -diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml -index 3a9478a..24d31a9 100644 ---- a/pelican/tests/output/basic/feeds/all.atom.xml -+++ b/pelican/tests/output/basic/feeds/all.atom.xml -@@ -43,7 +43,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -@@ -59,4 +59,4 @@ pelican.conf, it will have nothing in default.</p> - <p>Lovely.</p> - </div> - The baz tag2010-03-14T00:00:00+00:00tag:,2010-03-14:tag/baz.html<p>This article overrides the listening of the articles under the <em>baz</em> tag.</p> -- -+ -\ No newline at end of file -diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml -index a9b5977..4ad7008 100644 ---- a/pelican/tests/output/basic/feeds/misc.atom.xml -+++ b/pelican/tests/output/basic/feeds/misc.atom.xml -@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.</p> - <p>Lovely.</p> - </div> - The baz tag2010-03-14T00:00:00+00:00tag:,2010-03-14:tag/baz.html<p>This article overrides the listening of the articles under the <em>baz</em> tag.</p> -- -+ -\ No newline at end of file -diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html -index dfb0c54..b7f8a7e 100644 ---- a/pelican/tests/output/basic/unbelievable.html -+++ b/pelican/tests/output/basic/unbelievable.html -@@ -38,7 +38,7 @@ - Published: Fri 15 October 2010 - - --

In misc.

-+

In misc.

- -

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -@@ -58,7 +58,7 @@ pelican.conf, it will have nothing in default.

- -
-

Testing more sourcecode directives

--
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-+
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-

Lovely.

-
-
-@@ -97,4 +97,4 @@ pelican.conf, it will have nothing in default.

- - - -- -+ -\ No newline at end of file -diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml -index cb74637..987f987 100644 ---- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml -+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml -index 2c4b116..89082ee 100644 ---- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml -+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml -index 3574ab4..75b6333 100644 ---- a/pelican/tests/output/custom/feeds/all-en.atom.xml -+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml -index 391ab85..efb43cd 100644 ---- a/pelican/tests/output/custom/feeds/all.atom.xml -+++ b/pelican/tests/output/custom/feeds/all.atom.xml -@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml -index a78d2de..548b16c 100644 ---- a/pelican/tests/output/custom/feeds/all.rss.xml -+++ b/pelican/tests/output/custom/feeds/all.rss.xml -@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml -index 91d6b28..dbab63c 100644 ---- a/pelican/tests/output/custom/feeds/misc.atom.xml -+++ b/pelican/tests/output/custom/feeds/misc.atom.xml -@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml -index 3493d2a..2d13bda 100644 ---- a/pelican/tests/output/custom/feeds/misc.rss.xml -+++ b/pelican/tests/output/custom/feeds/misc.rss.xml -@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html -index 2e51cf0..b6d2136 100644 ---- a/pelican/tests/output/custom/unbelievable.html -+++ b/pelican/tests/output/custom/unbelievable.html -@@ -43,9 +43,9 @@ - - -
-- By Alexis Métaireau -+ By Alexis Métaireau -
--

In misc.

-+

In misc.

- -

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.

-
-
-

Testing more sourcecode directives

--
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-+
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-

Lovely.

-
-
-diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml -index 8fb3ef6..2090087 100644 ---- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml -+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml -index 99255ee..00944ce 100644 ---- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml -+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml -index 6b2f09b..297558d 100644 ---- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml -+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml -index 5ef59e0..78da527 100644 ---- a/pelican/tests/output/custom_locale/feeds/all.atom.xml -+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml -@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml -index 071e2f1..84fd5df 100644 ---- a/pelican/tests/output/custom_locale/feeds/all.rss.xml -+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml -@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml -index c91d4d7..fde02e6 100644 ---- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml -+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml -@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml -index 82b5898..bd727bb 100644 ---- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml -+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml -@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html -index a6ea869..1e2d78f 100644 ---- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html -+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html -@@ -45,7 +45,7 @@ -
- By Alexis Métaireau -
--

In misc.

-+

In misc.

- -

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.

-
-
-

Testing more sourcecode directives

--
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-+
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-

Lovely.

-
-
diff --git a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch deleted file mode 100644 index 5880af40d14..00000000000 --- a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch +++ /dev/null @@ -1,49 +0,0 @@ -From abd9f52ade78c737571be69f21dba384be3edf4e Mon Sep 17 00:00:00 2001 -From: Mike Bayer -Date: Sat, 2 Mar 2013 16:24:50 -0500 -Subject: [PATCH] - Fixed an import of "logging" in test_execute which was not - working on some linux platforms. [ticket:2669] - ---- - doc/build/changelog/changelog_07.rst | 10 ++++++++++ - lib/sqlalchemy/__init__.py | 2 +- - test/engine/test_execute.py | 2 +- - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst -index 416df5a..f07c9ec 100644 ---- a/doc/build/changelog/changelog_07.rst -+++ b/doc/build/changelog/changelog_07.rst -@@ -3,6 +3,16 @@ - 0.7 Changelog - ============== - -+.. changelog:: -+ :version: 0.7.11 -+ -+ .. change:: -+ :tags: bug, tests -+ :tickets: 2669 -+ :pullreq: 41 -+ -+ Fixed an import of "logging" in test_execute which was not -+ working on some linux platforms. - - .. changelog:: - :version: 0.7.10 -diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py -index 69b94f1..a37f684 100644 ---- a/test/engine/test_execute.py -+++ b/test/engine/test_execute.py -@@ -9,7 +9,7 @@ - import sqlalchemy as tsa - from test.lib import testing, engines - from test.lib.engines import testing_engine --import logging -+import logging.handlers - from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam - from sqlalchemy.engine import base, default - from sqlalchemy.engine.base import Connection, Engine --- -1.8.1.6 - From 14da187ad60b46a0e657933fd55d99cbb00e1c5c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Nov 2017 11:08:38 +0100 Subject: [PATCH 2391/2806] Python update-python-libraries: fetch and update asynchronously --- maintainers/scripts/update-python-libraries | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 7c73510c353..3ddc8c23a79 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -18,6 +18,7 @@ import os import re import requests import toolz +from concurrent.futures import ThreadPoolExecutor as pool INDEX = "https://pypi.io/pypi" """url of PyPI""" @@ -235,7 +236,8 @@ def main(): packages = map(os.path.abspath, args.package) - count = list(map(_update, packages)) + with pool() as p: + count = list(p.map(_update, packages)) logging.info("{} package(s) updated".format(sum(count))) From 5f3b84e979a85765fd2f05b302d75b24b285f930 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 17 Oct 2017 00:31:44 +0300 Subject: [PATCH 2392/2806] cc-wrapper: disable POSIX compatibility --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/ld-wrapper.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index f1f56cf5cec..d2cdbf6ce0c 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -1,5 +1,5 @@ #! @shell@ -set -eu -o pipefail +set -eu -o pipefail +o posix shopt -s nullglob if (( "${NIX_DEBUG:-0}" >= 7 )); then diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index b15f1e461e5..7a0eb28be63 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -1,5 +1,5 @@ #! @shell@ -set -eu -o pipefail +set -eu -o pipefail +o posix shopt -s nullglob if (( "${NIX_DEBUG:-0}" >= 7 )); then diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh index 88e644dc54d..0944d74e431 100644 --- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh @@ -1,5 +1,5 @@ #! @shell@ -set -eu -o pipefail +set -eu -o pipefail +o posix shopt -s nullglob if (( "${NIX_DEBUG:-0}" >= 7 )); then diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 232e1245af0..ef618f9a86d 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -1,5 +1,5 @@ #! @shell@ -set -eu -o pipefail +set -eu -o pipefail +o posix shopt -s nullglob if (( "${NIX_DEBUG:-0}" >= 7 )); then From eca212741eb9dad7f2e5187c02077d40dd60bc05 Mon Sep 17 00:00:00 2001 From: Shaun Ren Date: Fri, 27 Oct 2017 19:29:18 +0900 Subject: [PATCH 2393/2806] compton: change extraOptions type to types.lines --- nixos/modules/services/x11/compton.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index 8701354b528..11cbcac6fa8 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -221,7 +221,7 @@ in { }; extraOptions = mkOption { - type = types.str; + type = types.lines; default = ""; example = '' unredir-if-possible = true; From 5fde24c20bf212e3faa80802e2831c19a62abdbc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Nov 2017 13:44:16 +0100 Subject: [PATCH 2394/2806] python.pkgs.urwid: fix build --- pkgs/development/python-modules/urwid/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 129f4821e87..000cf5ea5ef 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, fetchurl }: buildPythonPackage (rec { pname = "urwid"; @@ -10,6 +10,13 @@ buildPythonPackage (rec { sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng"; }; + patches = [ + (fetchurl { + url = https://github.com/urwid/urwid/commit/4b0ed8b6030450e6d99909a7c683e9642e546387.patch; + sha256 = "0ygghd6wzjqij5szg61l1dsk8b0yv8bwyj3bgxxj1lj4m17zsy5q"; + }) + ]; + meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = http://excess.org/urwid; From 20bb7d5373ee7816dae8b24786deb2279830c29d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 5 Nov 2017 11:35:14 +0100 Subject: [PATCH 2395/2806] krita: 3.2.1 -> 3.3.2 --- pkgs/applications/graphics/krita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 98f92413a76..a9c238ead3c 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -9,11 +9,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "3.2.1"; + version = "3.3.2"; src = fetchurl { - url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0fafy5ggplgq2rz85sqa42vmkzs2r9dq47qfrbnn2n6pfzkcw1pg"; + url = https://download.kde.org/stable/krita/3.3.2/krita-3.3.2.1.tar.xz; + sha256 = "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From cf610f8a48dd10be105881393fae5857c8cbfd71 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 5 Nov 2017 14:00:27 +0100 Subject: [PATCH 2396/2806] fast-cli: pinpoint to a 1.x version, since 2.x requires nodejs 8 or greater --- pkgs/development/node-packages/default-v6.nix | 2 +- .../node-packages/node-packages-v6.json | 2 +- .../node-packages/node-packages-v6.nix | 433 ++++++++++-------- 3 files changed, 232 insertions(+), 205 deletions(-) diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 6cf74cdc4e7..179629ddfa6 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -61,7 +61,7 @@ nodePackages // { ''; }); - fast-cli = nodePackages.fast-cli.override (oldAttrs: { + fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { preRebuild = '' # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 76ebb7eaa10..51b08fb8f6e 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -16,7 +16,7 @@ , "eslint" , "eslint_d" , "emojione" -, "fast-cli" +, { "fast-cli": "1.x" } , "fetch-bower" , "forever" , "git-run" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 16d3b6ebc85..99f2b08897f 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -10196,6 +10196,15 @@ let sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; }; }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; "ora-1.3.0" = { name = "ora"; packageName = "ora"; @@ -10205,22 +10214,31 @@ let sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a"; }; }; - "puppeteer-0.12.0" = { - name = "puppeteer"; - packageName = "puppeteer"; - version = "0.12.0"; + "phantomjs-prebuilt-2.1.16" = { + name = "phantomjs-prebuilt"; + packageName = "phantomjs-prebuilt"; + version = "2.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-0.12.0.tgz"; - sha512 = "0lz3hi4l5ajb19cspw7s46bnygfb5njss0jb7nb21p32qjpad8lmnyavipfya9fp2wdq3240b3366n5zqis2ndj6wdwqwf5vsag5xhz"; + url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz"; + sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; }; }; - "zen-observable-0.6.0" = { + "promise-phantom-3.1.6" = { + name = "promise-phantom"; + packageName = "promise-phantom"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz"; + sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; + }; + }; + "zen-observable-0.5.2" = { name = "zen-observable"; packageName = "zen-observable"; - version = "0.6.0"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.6.0.tgz"; - sha512 = "0i23iwlb1ycrijxi8b09v6fx1nms22g2aj52kmbgqr7n5fxafmjmbbfkiv57c7wzvzayzy5hyqqpcvkbibwmqjdym1a5ykmarwgi6qv"; + url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz"; + sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf"; }; }; "cli-spinners-1.1.0" = { @@ -10241,6 +10259,15 @@ let sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; }; }; + "es6-promise-4.1.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; + sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r"; + }; + }; "extract-zip-1.6.6" = { name = "extract-zip"; packageName = "extract-zip"; @@ -10250,31 +10277,40 @@ let sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c"; }; }; - "https-proxy-agent-2.1.0" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz"; - sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w"; - }; - }; - "proxy-from-env-1.0.0" = { - name = "proxy-from-env"; - packageName = "proxy-from-env"; + "fs-extra-1.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; - sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; + sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; }; }; - "ws-3.2.0" = { - name = "ws"; - packageName = "ws"; - version = "3.2.0"; + "hasha-2.2.0" = { + name = "hasha"; + packageName = "hasha"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-3.2.0.tgz"; - sha512 = "1bj83dg7c5sca2v9cpzz4m83y9mm8icldvpk2c9sq3216cr6cn7qvfwhw9hq881nq7pii3xxbg8lz6g2p6223ililwkzzp68ndbfd45"; + url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; + sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; + }; + }; + "kew-0.7.0" = { + name = "kew"; + packageName = "kew"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; + sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; + }; + }; + "request-progress-2.0.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; + sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; }; }; "mkdirp-0.5.0" = { @@ -10313,40 +10349,40 @@ let sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; - "agent-base-4.1.1" = { - name = "agent-base"; - packageName = "agent-base"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz"; - sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9"; - }; - }; - "es6-promisify-5.0.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; - }; - }; - "es6-promise-4.1.1" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; - sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r"; - }; - }; - "async-limiter-1.0.0" = { - name = "async-limiter"; - packageName = "async-limiter"; + "throttleit-1.0.0" = { + name = "throttleit"; + packageName = "throttleit"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; - sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf"; + url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; + sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; + }; + }; + "mkpath-1.0.0" = { + name = "mkpath"; + packageName = "mkpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz"; + sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; + }; + }; + "node-phantom-simple-2.2.4" = { + name = "node-phantom-simple"; + packageName = "node-phantom-simple"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz"; + sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; + }; + }; + "tmp-0.0.31" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; + sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; }; }; "glob-3.2.11" = { @@ -12537,6 +12573,15 @@ let sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32"; }; }; + "ws-3.3.0" = { + name = "ws"; + packageName = "ws"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-3.3.0.tgz"; + sha512 = "04dfjwby2clbbb8pijv63a46hi2s4vl03p1l6yg533ra5hz5x6205z8bgdwkm5y2xw1j067msjbl08x7175lqhsh2rqw91cirzhdz2w"; + }; + }; "netmask-1.0.6" = { name = "netmask"; packageName = "netmask"; @@ -12753,6 +12798,15 @@ let sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; }; }; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf"; + }; + }; "is-wsl-1.1.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -13779,15 +13833,6 @@ let sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; }; }; - "tmp-0.0.31" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; - }; - }; "useragent-2.2.1" = { name = "useragent"; packageName = "useragent"; @@ -16542,15 +16587,6 @@ let sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a"; }; }; - "fs-extra-1.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; - sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; - }; - }; "fs.notify-0.0.4" = { name = "fs.notify"; packageName = "fs.notify"; @@ -18765,13 +18801,13 @@ let sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; }; }; - "lokijs-1.5.0" = { + "lokijs-1.5.1" = { name = "lokijs"; packageName = "lokijs"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.0.tgz"; - sha1 = "99e403d6a89e47e11ed0c5d499fb55a0603d5efc"; + url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.1.tgz"; + sha512 = "1pi08ry0a4zvg7mqj14gl0vacka95k77bbvljmcf25whxxbkh2rprsxpd8pv6frqh4ix6vslk44silx83sk65xhaw7ia2zssf0vngiy"; }; }; "vscode-languageclient-3.4.5" = { @@ -19444,24 +19480,6 @@ let sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; }; }; - "hasha-2.2.0" = { - name = "hasha"; - packageName = "hasha"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; - sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; - }; - }; - "kew-0.7.0" = { - name = "kew"; - packageName = "kew"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; - sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; - }; - }; "request-2.67.0" = { name = "request"; packageName = "request"; @@ -19471,15 +19489,6 @@ let sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; }; }; - "request-progress-2.0.1" = { - name = "request-progress"; - packageName = "request-progress"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; - sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; - }; - }; "which-1.2.14" = { name = "which"; packageName = "which"; @@ -19525,15 +19534,6 @@ let sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; }; }; - "throttleit-1.0.0" = { - name = "throttleit"; - packageName = "throttleit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; - }; - }; "browserify-13.3.0" = { name = "browserify"; packageName = "browserify"; @@ -20984,15 +20984,6 @@ let sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3"; }; }; - "log-update-1.0.2" = { - name = "log-update"; - packageName = "log-update"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; - sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; - }; - }; "promise-finally-3.0.0" = { name = "promise-finally"; packageName = "promise-finally"; @@ -21803,6 +21794,15 @@ let sha1 = "eec5c726eacef51b7f6b73c20db6e1b13b069c98"; }; }; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + }; "event-to-promise-0.8.0" = { name = "event-to-promise"; packageName = "event-to-promise"; @@ -22091,22 +22091,13 @@ let sha1 = "79450aff22b2a9c5a41ef54e02db907ccfbf9ee2"; }; }; - "parse5-3.0.2" = { + "parse5-3.0.3" = { name = "parse5"; packageName = "parse5"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz"; - sha1 = "05eff57f0ef4577fb144a79f8b9a967a6cc44510"; - }; - }; - "@types/node-6.0.90" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "6.0.90"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz"; - sha512 = "2q3rymdpikk7mc1rlmv8r1n0rlw856xmw64dx65mi90khgn1plppcsal3jvcbbhc527f06fh2wk9yargn2mlmgxxibhdvv2ax2hcymm"; + url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz"; + sha512 = "005xscj5zlz7pkxa5ngys7i7pdb2f4pirj1zw7hr1145zhxxgg04nhykjh1csy2ncr5lyjw8phq8m2ylqhfhi2z4hgvjb2b1rkbs0xf"; }; }; "anchor-markdown-header-0.5.7" = { @@ -25747,42 +25738,33 @@ in }; production = true; }; - fast-cli = nodeEnv.buildNodePackage { + "fast-cli-1.x" = nodeEnv.buildNodePackage { name = "fast-cli"; packageName = "fast-cli"; - version = "2.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-cli/-/fast-cli-2.1.0.tgz"; - sha512 = "10v8s8wk027pmsk69zgmnhhmbjiq33sz8fv92g30m488hm62j9kzpsqjrxvr28zm6s2abszgsflp5m62rjwxi9kjy89r867728fbkb6"; + url = "https://registry.npmjs.org/fast-cli/-/fast-cli-1.0.0.tgz"; + sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."chalk-2.3.0" - sources."log-update-2.3.0" + sources."chalk-1.1.3" + sources."log-update-1.0.2" sources."meow-3.7.0" - (sources."ora-1.3.0" // { - dependencies = [ - sources."chalk-1.1.3" - ]; - }) - sources."puppeteer-0.12.0" - sources."zen-observable-0.6.0" + sources."ora-1.3.0" + sources."phantomjs-prebuilt-2.1.16" + sources."promise-phantom-3.1.6" + sources."zen-observable-0.5.2" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" - sources."supports-color-2.0.0" - sources."color-convert-1.9.0" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."ansi-escapes-3.0.0" - sources."cli-cursor-2.1.0" - sources."wrap-ansi-3.0.1" - sources."restore-cursor-2.0.0" - sources."onetime-2.0.1" - sources."signal-exit-3.0.2" - sources."mimic-fn-1.1.0" - sources."string-width-2.1.1" + sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" - sources."is-fullwidth-code-point-2.0.0" + sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-2.1.0" + sources."restore-cursor-2.0.0" + sources."exit-hook-1.1.1" + sources."onetime-2.0.1" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -25795,6 +25777,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" @@ -25826,17 +25809,18 @@ in sources."get-stdin-4.0.1" sources."cli-spinners-1.1.0" sources."log-symbols-1.0.2" - sources."has-ansi-2.0.0" - sources."debug-2.6.9" + sources."mimic-fn-1.1.0" + sources."es6-promise-4.1.1" sources."extract-zip-1.6.6" - sources."https-proxy-agent-2.1.0" - sources."mime-1.4.1" - sources."progress-2.0.0" - sources."proxy-from-env-1.0.0" - sources."rimraf-2.6.2" - sources."ws-3.2.0" - sources."ms-2.0.0" + sources."fs-extra-1.0.0" + sources."hasha-2.2.0" + sources."kew-0.7.0" + sources."progress-1.1.8" + sources."request-2.83.0" + sources."request-progress-2.0.1" + sources."which-1.3.0" sources."concat-stream-1.6.0" + sources."debug-2.6.9" sources."mkdirp-0.5.0" sources."yauzl-2.4.1" sources."inherits-2.0.3" @@ -25848,23 +25832,66 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" + sources."ms-2.0.0" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."agent-base-4.1.1" - sources."es6-promisify-5.0.0" - sources."es6-promise-4.1.1" - sources."glob-7.1.2" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."async-limiter-1.0.0" - sources."ultron-1.1.0" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."is-stream-1.1.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.17" + sources."oauth-sign-0.8.2" + sources."performance-now-2.1.0" + sources."qs-6.5.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."ajv-5.3.0" + sources."har-schema-2.0.0" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."json-schema-traverse-0.3.1" + sources."hoek-4.2.0" + sources."boom-5.2.0" + sources."cryptiles-3.1.2" + sources."sntp-2.1.0" + sources."assert-plus-1.0.0" + sources."jsprim-1.4.1" + sources."sshpk-1.13.1" + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."asn1-0.2.3" + sources."dashdash-1.14.1" + sources."getpass-0.1.7" + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.30.0" + sources."punycode-1.4.1" + sources."throttleit-1.0.0" + sources."isexe-2.0.0" + sources."mkpath-1.0.0" + sources."node-phantom-simple-2.2.4" + sources."tmp-0.0.31" + sources."os-tmpdir-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -26526,7 +26553,7 @@ in sources."tiny-lr-1.0.5" sources."uuid-3.1.0" sources."wrap-ansi-3.0.1" - sources."ws-3.2.0" + sources."ws-3.3.0" sources."netmask-1.0.6" sources."archiver-utils-1.3.0" sources."async-2.5.0" @@ -29361,7 +29388,7 @@ in sources."media-typer-0.3.0" (sources."mqtt-2.9.0" // { dependencies = [ - sources."ws-3.2.0" + sources."ws-3.3.0" ]; }) sources."multer-1.3.0" @@ -30221,16 +30248,16 @@ in ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.1.tgz"; - sha512 = "05wpkgddw5r99fm8082l7sm48yd4xi2892w95fbsqhvy81xas0v2z8k9c7s09m7bvw3hn8rhl7c7cdwf4xafzphwax8zx5w22prpp15"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.4.tgz"; + sha512 = "1ppin5vfrqf2x1d1mmw98r4j9iblgv7lhhmfbvmzqp97ynkksyzajx5ssm1l8drn79k8l1iqqx1y4ldpq83hnvlfv3h8zh053iv8p04"; }; dependencies = [ sources."async-2.5.0" sources."glob-7.1.2" sources."lodash-4.17.4" - sources."lokijs-1.5.0" + sources."lokijs-1.5.1" sources."pegjs-0.10.0" sources."vscode-jsonrpc-3.4.1" sources."vscode-languageclient-3.4.5" @@ -32460,10 +32487,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.6.tgz"; - sha512 = "1hffvxym85dy9nzmjriwyazvy7k6x3iwp0j0dway300hawcdbmfirbglvshxjflzci25z725zl07650m5dgdfydlc0m648a275ixfzy"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.7.tgz"; + sha512 = "2797l10f7jfyy5pljy05q04aa7000bzdyj6c57b91fvhvdnh1g4gk71ghn6399qgpja92k5s6fjsw9dnvyiwxr3xnfbd169l81ky6v5"; }; dependencies = [ sources."commander-2.11.0" @@ -33338,7 +33365,7 @@ in sources."dom-serializer-0.1.0" sources."entities-1.1.1" sources."htmlparser2-3.9.2" - sources."parse5-3.0.2" + sources."parse5-3.0.3" sources."css-what-2.1.0" sources."domutils-1.5.1" sources."boolbase-1.0.0" @@ -33353,7 +33380,7 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."@types/node-6.0.90" + sources."@types/node-8.0.47" sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."clone-1.0.2" From b50693d16ca394690bfec52ddd9eaf43d346ca8b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 3 Nov 2017 15:55:09 +0200 Subject: [PATCH 2397/2806] kernel, initrd: Remove legacy ubootChooser --- pkgs/build-support/kernel/make-initrd.nix | 4 ++-- pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 70727f9b49d..6fcdc93b104 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,13 +12,13 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend +{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools , hostPlatform }: let inputsFun = ubootName : [ perl cpio ] - ++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ]; + ++ stdenv.lib.optional (ubootName != null) ubootTools; makeUInitrdFun = ubootName : (ubootName != null); in stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 8227475f1b1..61349175c78 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl -, writeTextFile, ubootChooser +, writeTextFile, ubootTools , hostPlatform }: @@ -225,7 +225,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe enableParallelBuilding = true; nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null) - (ubootChooser stdenv.platform.uboot); + ubootTools; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; @@ -248,6 +248,6 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe # crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot # can just go into buildInputs (but not nativeBuildInputs since cp.uboot # may be different from stdenv.platform.uboot) - buildInputs = optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv; + buildInputs = optional (cp.uboot != null) ubootTools.crossDrv; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fef39389c8..eee20ec8f08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13002,9 +13002,6 @@ with pkgs; tunctl = callPackage ../os-specific/linux/tunctl { }; - # TODO(dezgeg): either refactor & use ubootTools directly, or remove completely - ubootChooser = name: ubootTools; - # Upstream U-Boots: inherit (callPackage ../misc/uboot {}) buildUBoot From 91de9958c0223a57f6703b6e93484c4ce578dfb6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 5 Nov 2017 14:38:03 +0100 Subject: [PATCH 2398/2806] browserpass: 1.0.6 -> 2.0.7 --- pkgs/tools/security/browserpass/default.nix | 6 +++-- pkgs/tools/security/browserpass/deps.nix | 30 +++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/security/browserpass/deps.nix diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index c078c3a21c5..7230d30c795 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -3,15 +3,17 @@ buildGoPackage rec { name = "browserpass-${version}"; - version = "1.0.6"; + version = "2.0.7"; goPackagePath = "github.com/dannyvankooten/browserpass"; + goDeps = ./deps.nix; + src = fetchFromGitHub { repo = "browserpass"; owner = "dannyvankooten"; rev = version; - sha256 = "07wkvwb9klzxnlrm9a07kxzj3skpy0lymc9ijr8ykfbz6l0bpbqy"; + sha256 = "1dbp5za5qh6xmgh3w2cx5fbw13mh1szgj2y7ilmq0jh2ik09fbnd"; }; postInstall = '' diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix new file mode 100644 index 00000000000..4a86966a9fc --- /dev/null +++ b/pkgs/tools/security/browserpass/deps.nix @@ -0,0 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gokyle/twofactor"; + fetch = { + type = "git"; + url = "https://github.com/gokyle/twofactor"; + rev = "eaad1884d40f9cabff98a57a524c17afd00c9fe7"; + sha256 = "07kvga6f2b56kpy52a3xk16garvlqz950s350dax97x7cayba95g"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-zglob"; + rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6"; + sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn"; + }; + } + { + goPackagePath = "rsc.io/qr"; + fetch = { + type = "git"; + url = "https://github.com/rsc/qr"; + rev = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5"; + sha256 = "1npxy32glnkvsp0871972jzjzgkwaqmbv6jsj9wgqsa1s2jr004p"; + }; + } +] From b032b3544fe583d467ca11b7e605eae7e2f95346 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 5 Nov 2017 14:56:06 +0100 Subject: [PATCH 2399/2806] linux_mptcp: 0.92.1 -> 0.93 --- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 4c237cb24b4..c7e9859ded7 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - mptcpVersion = "0.92.1"; - modDirVersion = "4.4.83"; + mptcpVersion = "0.93"; + modDirVersion = "4.9.60"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; extraMeta = { @@ -10,9 +10,11 @@ import ./generic.nix (args // rec { maintainers = with stdenv.lib.maintainers; [ teto layus ]; }; - src = fetchurl { - url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; - sha256 = "1afjqmxq9p5gyr6r607bx3mqpnx451kfpwlffzxwgdwnf93alngz"; + src = fetchFromGitHub { + owner = "multipath-tcp"; + repo = "mptcp"; + rev = "v${mptcpVersion}"; + sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys"; }; extraConfig = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eee20ec8f08..1817ed69c31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12410,7 +12410,8 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes - kernelPatches.cpu-cgroup-v2."4.4" + kernelPatches.cpu-cgroup-v2."4.9" + kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From cdbe4671bef1c0ba6345c51270472998bd44e266 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Nov 2017 15:25:54 +0100 Subject: [PATCH 2400/2806] SBCL: bump to unstable to include upstream fixes for bugs breaking iolib --- pkgs/development/compilers/sbcl/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 3aa3ac6aadb..9b7ce4120c4 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, sbclBootstrap +{ stdenv, fetchurl, fetchgit, writeText, sbclBootstrap , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.system) # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. @@ -9,11 +9,16 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.1"; + version = "1.4.1.0.20171104"; - src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1qdaf847g5p2zgq00ax5hdy4r82bl3ss382psd0kkca1h83cdiz8"; + #src = fetchurl { + # url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; + # sha256 = "1qdaf847g5p2zgq00ax5hdy4r82bl3ss382psd0kkca1h83cdiz8"; + #}; + src = fetchgit { + url = "https://git.code.sf.net/p/sbcl/sbcl"; + sha256 = "1fq34h8h8pax5q17w84kwv5amiaag3ikkq3cdmb31r64736mxi6r"; + rev = "11aa57d23bc464d6a6867a80e946907404ceadd1"; }; patchPhase = '' @@ -35,7 +40,7 @@ stdenv.mkDerivation rec { # SBCL checks whether files are up-to-date in many places.. # Unfortunately, same timestamp is not good enough sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp + #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp sed -i src/cold/slam.lisp -e \ '/file-write-date input/a)' sed -i src/cold/slam.lisp -e \ From 8877ba4c0f7c1be2c4d7d83de748d7c8a70b9beb Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 5 Nov 2017 15:41:13 +0100 Subject: [PATCH 2401/2806] bdf2psf 1.158 -> 1.170 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index bf1377419a5..b8b01a7c0fc 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.158"; + version = "1.170"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "12zaj7hi5gzdh9r7rcyqnkwik1ljw1qzj6j7rw80bgw6fn611rs9"; + sha256 = "0xh743cr21qk8cmc6ijp59d61dqra4ggdlgbin9v991xqa0mqdxb"; }; buildInputs = [ dpkg ]; From 896ec47a39e49c7f9b499e540fef6e39fba2fae0 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 5 Nov 2017 15:52:37 +0100 Subject: [PATCH 2402/2806] rewritefs: 2016-07-27 -> 2017-08-14 --- pkgs/os-specific/linux/rewritefs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 3801036f9e5..5b16799a89c 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "rewritefs-${version}"; - version = "2016-07-27"; + version = "2017-08-14"; src = fetchFromGitHub { - owner = "sloonz"; - repo = "rewritefs"; - rev = "fe19d389746bdffcc1cc7b3e3156dbacd04b4e9b"; + owner = "sloonz"; + repo = "rewritefs"; + rev = "33fb844d8e8ff441a3fc80d2715e8c64f8563d81"; sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; }; From c53d874277c0eaf88ec71bab9658425535a2252a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 8 Jul 2017 14:10:22 +0200 Subject: [PATCH 2403/2806] lib/types: add intBetween An int type that checks the value range. --- lib/types.nix | 6 ++++++ nixos/doc/manual/development/option-types.xml | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/lib/types.nix b/lib/types.nix index db3bd381523..e921f7f6d9f 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -114,6 +114,12 @@ rec { merge = mergeOneOption; }; + intBetween = min: max: + addCheck types.int (x: x >= min && x <= max) // { + name = "intBetween"; + description = "integer between ${toString min} and ${toString max} (both inclusively)"; + }; + str = mkOptionType { name = "str"; description = "string"; diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 7b86e518aaf..dedfc286ca3 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -26,6 +26,17 @@ types.int An integer. + + + types.intBetween + min + max + + An integer between min + and max (both inclusive). + Useful for e.g. port ranges. + + types.path A filesystem path, defined as anything that when coerced to From af424a607cf6888c7e7e2cf718516d0786a2e3d2 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 8 Jul 2017 14:17:11 +0200 Subject: [PATCH 2404/2806] lib/modules: Change type error to be gramatically nicer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before: is not a integer between 0 and 100 (inclusively). (notice that “a” is wrong, it should be “an”) Now: is not of type `integer between 0 and 100 (inclusively)'. This sounds a bit more formal, but circumvents the grammatical problems. Multi-word type descriptions are also easier to see. --- lib/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/modules.nix b/lib/modules.nix index eb2f89684f3..8c3584bbbf4 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -338,7 +338,7 @@ rec { # Type-check the remaining definitions, and merge them. mergedValue = foldl' (res: def: if type.check def.value then res - else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.description}.") + else throw "The option value `${showOption loc}' in `${def.file}' is not of type `${type.description}'.") (type.merge loc defsFinal) defsFinal; isDefined = defsFinal != []; From 281d071b6a5380a811c5b2f7493bbcf75461c7ff Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 5 Aug 2017 15:06:48 +0200 Subject: [PATCH 2405/2806] lib/types: add various signed/unsigned int types It is sometimes necessary to restrict the domain of integers for configurations, as well as restricting them to unsigned/positive values. --- lib/types.nix | 67 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index e921f7f6d9f..3dc99cd36f2 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -107,17 +107,64 @@ rec { merge = mergeEqualOption; }; - int = mkOptionType rec { - name = "int"; - description = "integer"; - check = isInt; - merge = mergeOneOption; - }; + int = ints.signed; + + # specialized subdomains of int + ints = + let + int = mkOptionType rec { + name = "int"; + description = "signed integer"; + check = isInt; + merge = mergeOneOption; + }; + + betweenDesc = lowest: highest: + "${toString lowest} and ${toString highest} (both inclusive)."; + between = lowest: highest: assert lowest <= highest; + addCheck int (x: x >= lowest && x <= highest) // { + name = "intBetween"; + description = "Integer between ${betweenDesc lowest highest}"; + }; + ign = lowest: highest: name: docStart: + between lowest highest // { + inherit name; + description = docStart + " Between ${betweenDesc lowest highest}"; + }; + unsign = bit: range: ign 0 (range - 1) + "unsignedInt${toString bit}" "${toString bit} bit unsigned integer."; + sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1) + "signedInt${toString bit}" "${toString bit} bit signed integer."; + + in rec { + /* an int with a fixed range + * + * Example: + * (ints.between 0 100).check (-1) + * => false + * (ints.between 0 100).check (101) + * => false + * (ints.between 0 0).check 0 + * => true + */ + inherit between; + + unsigned = addCheck types.int (x: x >= 0) // { + name = "unsignedInt"; + description = "unsigned integer, meaning >=0"; + }; + unsigned8 = unsign 8 256; + unsigned16 = unsign 16 65536; + unsigned32 = unsign 32 4294967296; + # the biggest int the nix lexer accepts is 9223372036854775808 + # the smallest int the nix lexer accepts is -9223372036854775807 + # unsigned64 = unsign 64 18446744073709551616; + + signed = int; + signed8 = sign 8 256; + signed16 = sign 16 65536; + signed32 = sign 32 4294967296; - intBetween = min: max: - addCheck types.int (x: x >= min && x <= max) // { - name = "intBetween"; - description = "integer between ${toString min} and ${toString max} (both inclusively)"; }; str = mkOptionType { From c776489cacb32d2cbfe0ba2622b2b6e4d27bae7d Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 5 Aug 2017 15:13:55 +0200 Subject: [PATCH 2406/2806] lib/types: add port type --- lib/types.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 3dc99cd36f2..cd59a00cfd8 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -120,16 +120,16 @@ rec { }; betweenDesc = lowest: highest: - "${toString lowest} and ${toString highest} (both inclusive)."; + "${toString lowest} and ${toString highest} (both inclusive)"; between = lowest: highest: assert lowest <= highest; addCheck int (x: x >= lowest && x <= highest) // { name = "intBetween"; - description = "Integer between ${betweenDesc lowest highest}"; + description = "Integer between ${betweenDesc lowest highest}."; }; ign = lowest: highest: name: docStart: between lowest highest // { inherit name; - description = docStart + " Between ${betweenDesc lowest highest}"; + description = docStart + " Between ${betweenDesc lowest highest}."; }; unsign = bit: range: ign 0 (range - 1) "unsignedInt${toString bit}" "${toString bit} bit unsigned integer."; @@ -137,7 +137,7 @@ rec { "signedInt${toString bit}" "${toString bit} bit signed integer."; in rec { - /* an int with a fixed range + /* An int with a fixed range. * * Example: * (ints.between 0 100).check (-1) @@ -167,6 +167,9 @@ rec { }; + /* A network port number */ + port = ints.unsigned16; + str = mkOptionType { name = "str"; description = "string"; From 3e3bfc66f7b98d7b57f67ba201dd446be9512078 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 5 Aug 2017 16:44:12 +0200 Subject: [PATCH 2407/2806] lib/types: nixos manual documentation for signed/unsinged int Synchronize the manual for the new types. --- nixos/doc/manual/development/option-types.xml | 85 +++++++++++++++---- 1 file changed, 70 insertions(+), 15 deletions(-) diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index dedfc286ca3..ccdbc0900be 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -22,21 +22,6 @@ A boolean, its values can be true or false. - - types.int - An integer. - - - - types.intBetween - min - max - - An integer between min - and max (both inclusive). - Useful for e.g. port ranges. - - types.path A filesystem path, defined as anything that when coerced to @@ -50,6 +35,65 @@ +Integer related types: + + + + + types.ints.signed + + A signed integer. + + + + + types.ints{signed8, signed16, signed32} + + + Signed integers with a fixed length (8, 16 or 32 bits). + They go from + −2n/2 + to + 2n/2−1 + + respectively (e.g. −128 to 127 + for 8 bits). + + + + types.int + A convenience alias for ints.signed. + + + + + types.ints.unsigned + + An unsigned integer (that is ≥ 0). + + + + + types.ints{unsigned8, unsigned16, unsigned32} + + + Unsigned integers with a fixed length (8, 16 or 32 bits). + They go from + 0 to + 2n−1 + + respectively (e.g. 0 to 255 + for 8 bits). + + + + + types.port + + A network port number (0–65635). + + + String related types: @@ -95,6 +139,17 @@ sep, e.g. types.separatedString "|". + + + types.ints.between + lowest + highest + + An integer between lowest + and highest (both inclusive). + Useful for e.g. creating types like types.port. + + types.submodule o A set of sub options o. From 7fcd3892a93912cd444832f6289307aedc3abcbd Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 31 Oct 2017 12:47:49 +0100 Subject: [PATCH 2408/2806] lib/types: remove port type again Will be introduced as a taggedUnion, once that type is in nixpkgs. --- lib/types.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index cd59a00cfd8..df141885f95 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -167,9 +167,6 @@ rec { }; - /* A network port number */ - port = ints.unsigned16; - str = mkOptionType { name = "str"; description = "string"; From 77648da2336b4a85bbbf33866402a775e3cbdae8 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 31 Oct 2017 12:48:37 +0100 Subject: [PATCH 2409/2806] lib/types: signed -> s, unsigned -> u, remove signed alias MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mirrors the way it’s done in modern low-level languages like Rust (by input of @nbp). Removes the signed alias for int. --- lib/types.nix | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index df141885f95..01d82d31c83 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -107,18 +107,16 @@ rec { merge = mergeEqualOption; }; - int = ints.signed; + int = mkOptionType rec { + name = "int"; + description = "signed integer"; + check = isInt; + merge = mergeOneOption; + }; # specialized subdomains of int ints = let - int = mkOptionType rec { - name = "int"; - description = "signed integer"; - check = isInt; - merge = mergeOneOption; - }; - betweenDesc = lowest: highest: "${toString lowest} and ${toString highest} (both inclusive)"; between = lowest: highest: assert lowest <= highest; @@ -153,18 +151,16 @@ rec { name = "unsignedInt"; description = "unsigned integer, meaning >=0"; }; - unsigned8 = unsign 8 256; - unsigned16 = unsign 16 65536; - unsigned32 = unsign 32 4294967296; + u8 = unsign 8 256; + u16 = unsign 16 65536; + u32 = unsign 32 4294967296; # the biggest int the nix lexer accepts is 9223372036854775808 # the smallest int the nix lexer accepts is -9223372036854775807 # unsigned64 = unsign 64 18446744073709551616; - signed = int; - signed8 = sign 8 256; - signed16 = sign 16 65536; - signed32 = sign 32 4294967296; - + s8 = sign 8 256; + s16 = sign 16 65536; + s32 = sign 32 4294967296; }; str = mkOptionType { From f8e6cd3465c6efdfd3b9db510c6365c31740644c Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 31 Oct 2017 14:23:05 +0100 Subject: [PATCH 2410/2806] lib/types: add tests for `ints.between` and `ints.unsigned` The int types are trivial invocations of `ints.between`, so they are not tested explicitely. --- lib/tests/modules.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index ba0c67fb7d4..ac0372e66f8 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -61,6 +61,14 @@ checkConfigError() { checkConfigOutput "false" config.enable ./declare-enable.nix checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix +# Check integer types. +# unsigned +checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix +checkConfigError 'The option value .* in .* is not of type.*unsigned integer.*' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix +# between +checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix +checkConfigError 'The option value .* in .* is not of type.*between.*-21 and 43.*inclusive.*' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix + # Check mkForce without submodules. set -- config.enable ./declare-enable.nix ./define-enable.nix checkConfigOutput "true" "$@" @@ -126,7 +134,7 @@ checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'The option value .* in .* is not a string or integer.' config.value ./declare-coerced-value.nix ./define-value-list.nix +checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix cat < Date: Tue, 31 Oct 2017 14:55:51 +0100 Subject: [PATCH 2411/2806] lib/types: update docs to match the new type names --- .../modules/declare-int-between-value.nix | 9 ++++++ .../modules/declare-int-unsigned-value.nix | 9 ++++++ .../modules/define-value-int-negative.nix | 3 ++ .../modules/define-value-int-positive.nix | 3 ++ nixos/doc/manual/development/option-types.xml | 32 ++++++------------- 5 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 lib/tests/modules/declare-int-between-value.nix create mode 100644 lib/tests/modules/declare-int-unsigned-value.nix create mode 100644 lib/tests/modules/define-value-int-negative.nix create mode 100644 lib/tests/modules/define-value-int-positive.nix diff --git a/lib/tests/modules/declare-int-between-value.nix b/lib/tests/modules/declare-int-between-value.nix new file mode 100644 index 00000000000..8b2624cc5d6 --- /dev/null +++ b/lib/tests/modules/declare-int-between-value.nix @@ -0,0 +1,9 @@ +{ lib, ... }: + +{ + options = { + value = lib.mkOption { + type = lib.types.ints.between (-21) 43; + }; + }; +} diff --git a/lib/tests/modules/declare-int-unsigned-value.nix b/lib/tests/modules/declare-int-unsigned-value.nix new file mode 100644 index 00000000000..05d0eff01c9 --- /dev/null +++ b/lib/tests/modules/declare-int-unsigned-value.nix @@ -0,0 +1,9 @@ +{ lib, ... }: + +{ + options = { + value = lib.mkOption { + type = lib.types.ints.unsigned; + }; + }; +} diff --git a/lib/tests/modules/define-value-int-negative.nix b/lib/tests/modules/define-value-int-negative.nix new file mode 100644 index 00000000000..a041222987a --- /dev/null +++ b/lib/tests/modules/define-value-int-negative.nix @@ -0,0 +1,3 @@ +{ + value = -23; +} diff --git a/lib/tests/modules/define-value-int-positive.nix b/lib/tests/modules/define-value-int-positive.nix new file mode 100644 index 00000000000..5803de17263 --- /dev/null +++ b/lib/tests/modules/define-value-int-positive.nix @@ -0,0 +1,3 @@ +{ + value = 42; +} diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index ccdbc0900be..0b00f7077c2 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -35,19 +35,16 @@ -Integer related types: +Integer-related types: - - types.ints.signed - - A signed integer. - + types.int + A signed integer. - types.ints{signed8, signed16, signed32} + types.ints.{s8, s16, s32} Signed integers with a fixed length (8, 16 or 32 bits). @@ -60,21 +57,16 @@ for 8 bits). - - types.int - A convenience alias for ints.signed. - - types.ints.unsigned - An unsigned integer (that is ≥ 0). + An unsigned integer (that is >= 0). - types.ints{unsigned8, unsigned16, unsigned32} + types.ints.{u8, u16, u32} Unsigned integers with a fixed length (8, 16 or 32 bits). @@ -86,15 +78,9 @@ for 8 bits). - - - types.port - - A network port number (0–65635). - -String related types: +String-related types: @@ -123,7 +109,7 @@
Value Types - Value types are type that take a value parameter. + Value types are types that take a value parameter. @@ -147,7 +133,7 @@ An integer between lowest and highest (both inclusive). - Useful for e.g. creating types like types.port. + Useful for creating types like types.port. From 1158910676323b57ba0248a71ad0a0d8e57a960b Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 31 Oct 2017 17:08:32 +0100 Subject: [PATCH 2412/2806] lib/types: match lowercase descriptions of other types --- lib/types.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 01d82d31c83..021641fdc22 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -122,17 +122,17 @@ rec { between = lowest: highest: assert lowest <= highest; addCheck int (x: x >= lowest && x <= highest) // { name = "intBetween"; - description = "Integer between ${betweenDesc lowest highest}."; + description = "integer between ${betweenDesc lowest highest}"; }; ign = lowest: highest: name: docStart: between lowest highest // { inherit name; - description = docStart + " Between ${betweenDesc lowest highest}."; + description = docStart + "; between ${betweenDesc lowest highest}"; }; unsign = bit: range: ign 0 (range - 1) - "unsignedInt${toString bit}" "${toString bit} bit unsigned integer."; + "unsignedInt${toString bit}" "${toString bit} bit unsigned integer"; sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1) - "signedInt${toString bit}" "${toString bit} bit signed integer."; + "signedInt${toString bit}" "${toString bit} bit signed integer"; in rec { /* An int with a fixed range. From 462c048c77fa0aa0cb4c47d7812a57f094587f68 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 31 Oct 2017 17:30:15 +0100 Subject: [PATCH 2413/2806] lib/types: add `ints.positive`. For values that are positive, but cannot be 0. --- lib/tests/modules.sh | 2 ++ lib/tests/modules/declare-int-positive-value.nix | 9 +++++++++ lib/tests/modules/define-value-int-zero.nix | 3 +++ lib/types.nix | 4 ++++ nixos/doc/manual/development/option-types.xml | 7 +++++++ 5 files changed, 25 insertions(+) create mode 100644 lib/tests/modules/declare-int-positive-value.nix create mode 100644 lib/tests/modules/define-value-int-zero.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index ac0372e66f8..96a91c0fffb 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -65,6 +65,8 @@ checkConfigError 'The option .* defined in .* does not exist.' config.enable ./d # unsigned checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix checkConfigError 'The option value .* in .* is not of type.*unsigned integer.*' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix +# positive +checkConfigError 'The option value .* in .* is not of type.*positive integer.*' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix # between checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix checkConfigError 'The option value .* in .* is not of type.*between.*-21 and 43.*inclusive.*' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix diff --git a/lib/tests/modules/declare-int-positive-value.nix b/lib/tests/modules/declare-int-positive-value.nix new file mode 100644 index 00000000000..6e48c6ac8fe --- /dev/null +++ b/lib/tests/modules/declare-int-positive-value.nix @@ -0,0 +1,9 @@ +{ lib, ... }: + +{ + options = { + value = lib.mkOption { + type = lib.types.ints.positive; + }; + }; +} diff --git a/lib/tests/modules/define-value-int-zero.nix b/lib/tests/modules/define-value-int-zero.nix new file mode 100644 index 00000000000..68bb9f415c3 --- /dev/null +++ b/lib/tests/modules/define-value-int-zero.nix @@ -0,0 +1,3 @@ +{ + value = 0; +} diff --git a/lib/types.nix b/lib/types.nix index 021641fdc22..1675a54156d 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -151,6 +151,10 @@ rec { name = "unsignedInt"; description = "unsigned integer, meaning >=0"; }; + positive = addCheck types.int (x: x > 0) // { + name = "positiveInt"; + description = "positive integer, meaning >0"; + }; u8 = unsign 8 256; u16 = unsign 16 65536; u32 = unsign 32 4294967296; diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 0b00f7077c2..83dcf0232d9 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -78,6 +78,13 @@ for 8 bits). + + + types.ints.positive + + A positive integer (that is > 0). + + String-related types: From 213bd2847bb6590126591435766793df0410b4d1 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 3 Nov 2017 12:20:35 +0100 Subject: [PATCH 2414/2806] lib/types: fix up documentation formatting a bit --- lib/types.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 1675a54156d..adbae8f08a5 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -114,7 +114,7 @@ rec { merge = mergeOneOption; }; - # specialized subdomains of int + # Specialized subdomains of int ints = let betweenDesc = lowest: highest: @@ -225,7 +225,7 @@ rec { }; # drop this in the future: - list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf; + list = builtins.trace "`types.list` is deprecated; use `types.listOf` instead" types.listOf; listOf = elemType: mkOptionType rec { name = "listOf"; @@ -242,7 +242,7 @@ rec { ).optionalValue ) def.value else - throw "The option value `${showOption loc}' in `${def.file}' is not a list.") defs))); + throw "The option value `${showOption loc}` in `${def.file}` is not a list.") defs))); getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubModules = elemType.getSubModules; substSubModules = m: listOf (elemType.substSubModules m); @@ -313,7 +313,7 @@ rec { let nrNulls = count (def: def.value == null) defs; in if nrNulls == length defs then null else if nrNulls != 0 then - throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}." + throw "The option `${showOption loc}` is defined both null and not null, in ${showFiles (getFiles defs)}." else elemType.merge loc defs; getSubOptions = elemType.getSubOptions; getSubModules = elemType.getSubModules; From 14f232d812e94a9de4fdb5693c362b8660d2c272 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sat, 4 Nov 2017 15:17:12 +0000 Subject: [PATCH 2415/2806] ultrastardx: fix build --- 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 1817ed69c31..b5a795913e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18098,7 +18098,9 @@ with pkgs; ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; - ultrastardx = callPackage ../games/ultrastardx/default.nix { }; + ultrastardx = callPackage ../games/ultrastardx/default.nix { + ffmpeg = ffmpeg_2; + }; unnethack = callPackage ../games/unnethack { }; From 0d9f2f0bb497020af31c93706cdf970a3db4bdfc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 5 Nov 2017 16:58:14 +0200 Subject: [PATCH 2416/2806] platforms.nix: Clean up more 'uboot' legacy For a while now, the only thing the 'uboot' attribute does is to tell whether to add ubootTools to kernel/initrd builds. That can be determined with platform.kernelTarget == "uImage" just as well. --- lib/systems/platforms.nix | 14 -------------- pkgs/build-support/kernel/make-initrd.nix | 13 +++++-------- pkgs/os-specific/linux/kernel/generic.nix | 1 - pkgs/os-specific/linux/kernel/manual-config.nix | 10 +++------- 4 files changed, 8 insertions(+), 30 deletions(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 9ce697a1f7a..9dcd59066d0 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -2,7 +2,6 @@ rec { pcBase = { name = "pc"; - uboot = null; kernelHeadersBaseConfig = "defconfig"; kernelBaseConfig = "defconfig"; # Build whatever possible as a module, if not stated in the extra config. @@ -50,9 +49,6 @@ rec { kernelTarget = "uImage"; # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working #kernelDTB = true; - - # XXX can be anything non-null, pkgs actually only cares if it is set or not - uboot = "pogoplug4"; }; sheevaplug = { @@ -162,9 +158,6 @@ rec { ''; kernelMakeFlags = [ "LOADADDR=0x0200000" ]; kernelTarget = "uImage"; - uboot = "sheevaplug"; - # Only for uboot = uboot : - ubootConfig = "sheevaplug_config"; kernelDTB = true; # Beyond 3.10 gcc = { arch = "armv5te"; @@ -251,7 +244,6 @@ rec { LATENCYTOP y ''; kernelTarget = "zImage"; - uboot = null; gcc = { arch = "armv6"; fpu = "vfp"; @@ -342,7 +334,6 @@ rec { XEN? n ''; kernelTarget = "zImage"; - uboot = null; }; scaleway-c1 = armv7l-hf-multiplatform // { @@ -374,7 +365,6 @@ rec { kernelMakeFlags = [ "LOADADDR=0x10800000" ]; kernelTarget = "uImage"; kernelDTB = true; - uboot = true; #XXX: any non-null value here is needed so that mkimage is present to build kernelTarget uImage gcc = { cpu = "cortex-a9"; fpu = "neon"; @@ -464,7 +454,6 @@ rec { FTRACE n ''; kernelTarget = "vmlinux"; - uboot = null; gcc = { arch = "loongson2f"; abi = "n32"; @@ -477,7 +466,6 @@ rec { kernelAutoModules = false; kernelExtraConfig = ""; # TBD kernel config kernelTarget = "zImage"; - uboot = null; }; armv7l-hf-multiplatform = { @@ -489,7 +477,6 @@ rec { kernelDTB = true; kernelAutoModules = true; kernelPreferBuiltin = true; - uboot = null; kernelTarget = "zImage"; kernelExtraConfig = '' # Fix broken sunxi-sid nvmem driver. @@ -552,7 +539,6 @@ rec { # which our initrd builder can't currently do easily. USB_XHCI_TEGRA m ''; - uboot = null; kernelTarget = "Image"; gcc = { arch = "armv8-a"; diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 6fcdc93b104..5353ae82841 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -16,17 +16,14 @@ , hostPlatform }: -let - inputsFun = ubootName : [ perl cpio ] - ++ stdenv.lib.optional (ubootName != null) ubootTools; - makeUInitrdFun = ubootName : (ubootName != null); -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "initrd"; builder = ./make-initrd.sh; - nativeBuildInputs = inputsFun hostPlatform.platform.uboot; - makeUInitrd = makeUInitrdFun hostPlatform.platform.uboot; + makeUInitrd = hostPlatform.platform.kernelTarget == "uImage"; + + nativeBuildInputs = [ perl cpio ] + ++ stdenv.lib.optional makeUInitrd ubootTools; # !!! should use XML. objects = map (x: x.object) contents; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 3912d9d10f5..c2f4e6843f5 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -29,7 +29,6 @@ , ... }: -assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; assert stdenv.isLinux; let diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 61349175c78..28ad5aeca35 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -224,8 +224,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe enableParallelBuilding = true; - nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null) - ubootTools; + nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] + ++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; @@ -244,10 +244,6 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe karch = cp.kernelArch; - # !!! uboot has messed up cross-compiling, nativeDrv builds arm tools on x86, - # crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot - # can just go into buildInputs (but not nativeBuildInputs since cp.uboot - # may be different from stdenv.platform.uboot) - buildInputs = optional (cp.uboot != null) ubootTools.crossDrv; + nativeBuildInputs = optional (cp.kernelTarget == "uImage") ubootTools; }; }) From 611829ba42f833c4627063c2510c4209486db074 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 5 Nov 2017 15:15:41 +0100 Subject: [PATCH 2417/2806] imagemagick: 6.9.9-20 -> 6.9.9-21 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 35e4fb989b3..507912ee43e 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-20"; - sha256 = "1pz8clmhnq26vdsp1j21czq3nfbvrmfdz30k7na7w4vh7wqxsrx1"; + version = "6.9.9-21"; + sha256 = "0241g3c207rawn61bz8rc5gz55k5mi2b0n3zlwa0jv9xczlkd6a9"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. From 4f8c5331c85b578c38076b7c6b92b70f7d659bc0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 5 Nov 2017 15:16:00 +0100 Subject: [PATCH 2418/2806] imagemagick7: 7.0.7-8 -> 7.0.7-9 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index f2046f0d912..973e7f88e80 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-8"; - sha256 = "0h2jbaxrxrmdcr5crf1d93sc60v4zfqrrl3w79md6h11wf57ksbp"; + version = "7.0.7-9"; + sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w"; patches = []; }; in From 711303952e7333f8667958610e3248c2a4c6b1c6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Aug 2017 23:02:47 +0200 Subject: [PATCH 2419/2806] wireguard module: add device name environment var This makes the interface name available as an environment variable for the pre/post hooks. --- nixos/modules/services/networking/wireguard.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index eb08e7f90c0..24accd41511 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -195,6 +195,7 @@ let description = "WireGuard Tunnel - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + environment.DEVICE = name; serviceConfig = { Type = "oneshot"; From f4914d4eb4e966d7dbb66f903de391fc921b5349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Sun, 22 Oct 2017 19:49:16 +0200 Subject: [PATCH 2420/2806] bignums: init at various versions Bignums used to be part of the standard library of Coq. We provide a version for Coq 8.6, and one for Coq 8.7. --- .../coq-modules/bignums/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/coq-modules/bignums/default.nix diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix new file mode 100644 index 00000000000..5762da66fed --- /dev/null +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, coq }: + +let rev_and_sha = { + "8.6" = { + rev = "v8.6.0"; + sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; + }; + "8.7" = { + rev = "V8.7.0"; + sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; + }; +}; +in + +if ! (rev_and_sha ? "${coq.coq-version}") then + throw "bignums is not available for Coq ${coq.coq-version}" +else with rev_and_sha."${coq.coq-version}"; + +stdenv.mkDerivation rec { + + name = "coq${coq.coq-version}-bignums"; + + src = fetchFromGitHub { + owner = "coq"; + repo = "bignums"; + inherit rev sha256; + }; + + buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + license = licenses.lgpl2; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9226e15d63c..3eb87bd64f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18630,6 +18630,7 @@ with pkgs; coqPackages = self; autosubst = callPackage ../development/coq-modules/autosubst {}; + bignums = callPackage ../development/coq-modules/bignums {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; coquelicot = callPackage ../development/coq-modules/coquelicot {}; dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; From 1ddadc6b1c43b46bfff3e85ab543bcf8e742ccfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Sun, 29 Oct 2017 18:56:03 +0100 Subject: [PATCH 2421/2806] coqPackages.math-classes: 1.0.6 -> 1.0.7 This version introduces compatibility with Coq 8.7. --- .../coq-modules/math-classes/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 0e7549623e7..d045ec4223b 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, coq }: +{ stdenv, fetchFromGitHub, coq, coqPackages }: -stdenv.mkDerivation { - name = "coq${coq.coq-version}-math-classes-1.0.6"; +if ! stdenv.lib.versionAtLeast coq.coq-version "8.6" then + throw "Math-Classes requires Coq 8.6 or later." +else - src = fetchurl { - url = https://github.com/math-classes/math-classes/archive/1.0.6.tar.gz; - sha256 = "071hgjk4bz2ybci7dp2mw7xqmxmm2zph7kj28xcdg28iy796lf02"; +stdenv.mkDerivation rec { + + name = "coq${coq.coq-version}-math-classes-${version}"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "math-classes"; + repo = "math-classes"; + rev = version; + sha256 = "0wgnczacvkb2pc3vjbni9bwjijfyd5jcdnyyjg8185hkf9zzabgi"; }; - # src = fetchFromGitHub { - # owner = "math-classes"; - # repo = "math-classes"; - # rev = "1d426a08c2fbfd68bd1b3622fe8f31dd03712e6c"; - # sha256 = "3kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr"; - # }; - - buildInputs = [ coq ]; + buildInputs = [ coq coqPackages.bignums ]; enableParallelBuilding = true; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; From 9ee18a51c609f33777597651283af42403e3d20b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:01:31 +0200 Subject: [PATCH 2422/2806] =?UTF-8?q?gnome3.folks:=200.11.3=20=E2=86=92=20?= =?UTF-8?q?0.11.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/folks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 171ad077450..6fcaa67b771 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -8,11 +8,11 @@ let majorVersion = "0.11"; in stdenv.mkDerivation rec { - name = "folks-${majorVersion}.3"; + name = "folks-${majorVersion}.4"; src = fetchurl { url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; - sha256 = "2a2828a7c87fd39e5786f8f2cf0ebe47576a74974f1355c478a6dc747d7bcb64"; + sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57"; }; propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; From 1e8e2a4f0d86c4adab90ef422ef886fd42d817d5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 5 Oct 2017 00:41:27 +0200 Subject: [PATCH 2423/2806] gnome3.totem-pl-parser: move src to a separate file --- pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix | 7 +------ pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix index 794f3801333..370fdee5381 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -1,12 +1,7 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "totem-pl-parser-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz"; - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; - }; + inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ file intltool gmime libxml2 libsoup ]; diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix new file mode 100644 index 00000000000..8e352ccfb4c --- /dev/null +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "totem-pl-parser-3.10.2"; + + src = fetchurl { + url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz; + sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; + }; +} From 573c039f9be29da3c7673afdceb14fc756e431bb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:10:29 +0200 Subject: [PATCH 2424/2806] =?UTF-8?q?gnome3.grilo:=200.3.3=20=E2=86=92=200?= =?UTF-8?q?.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/grilo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix index 18a4da4efe2..ffa489927e2 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { major = "0.3"; # if you change this, also change ./setup-hook.sh - minor = "3"; + minor = "4"; name = "grilo-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz"; - sha256 = "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw"; + sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw"; }; setupHook = ./setup-hook.sh; From e03c009a5e7ebab3c710b48ed3c0c8af48b63224 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:10:50 +0200 Subject: [PATCH 2425/2806] =?UTF-8?q?gnome3.grilo=5Fplugins:=200.3.3=20?= =?UTF-8?q?=E2=86=92=200.3.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/grilo-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index b6d9ccef666..b8911dd5c1f 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { major = "0.3"; - minor = "3"; + minor = "5"; name = "grilo-plugins-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz"; - sha256 = "fe66e887847fef9c361bcb7226047c43b2bc22b172aaf22afd5534947cc85b9c"; + sha256 = "1yv8a0mfd5qmdbdrnd0is5c51s1mvibhw61na99iagnbirxq4xr9"; }; installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ]; From b5c634966141cc95f16a4f55c01e1339daa2b19c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:11:19 +0200 Subject: [PATCH 2426/2806] =?UTF-8?q?gnome3.libgdata:=200.17.6=20=E2=86=92?= =?UTF-8?q?=200.17.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/libgdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix index 08f05bcaedc..ddf245f49e0 100644 --- a/pkgs/desktops/gnome-3/core/libgdata/default.nix +++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix @@ -5,11 +5,11 @@ let majorVersion = "0.17"; in stdenv.mkDerivation rec { - name = "libgdata-${majorVersion}.6"; + name = "libgdata-${majorVersion}.9"; src = fetchurl { url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz"; - sha256 = "8b6a3ff1db23bd9e5ebbcc958b29b769a898f892eed4798222d562ba69df30b0"; + sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45"; }; NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; From f53657d68b2c6b30287ff7ebd2e4d14e640e8efd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:12:51 +0200 Subject: [PATCH 2427/2806] =?UTF-8?q?clutter=5Fgtk:=201.8.2=20=E2=86=92=20?= =?UTF-8?q?1.8.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/clutter-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 39296f86d8e..bada2c2c709 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { major = "1.8"; - minor = "2"; + minor = "4"; name = "clutter-gtk-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz"; - sha256 = "da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94"; + sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; }; propagatedBuildInputs = [ clutter gtk3 ]; From 7d0357449ff2b1ecdd1147fdc13688e0f181a937 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:13:19 +0200 Subject: [PATCH 2428/2806] =?UTF-8?q?gnome3.libpeas:=201.18.0=20=E2=86=92?= =?UTF-8?q?=201.22.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/libpeas/src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/libpeas/src.nix b/pkgs/desktops/gnome-3/core/libpeas/src.nix index cd440858946..6f2cd82fb21 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/src.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/src.nix @@ -1,13 +1,13 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: rec { - major = "1.18"; + major = "1.22"; minor = "0"; version = "${major}.${minor}"; name = "libpeas-${version}"; src = fetchurl { url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz"; - sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz"; + sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; }; } From 1ac2dec0f628cdb3056503b5bb918523c0a60117 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:14:47 +0200 Subject: [PATCH 2429/2806] =?UTF-8?q?glibmm:=202.50.0=20=E2=86=92=202.54.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/glibmm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 5c318c9b46a..a3af96d51ed 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }: let - ver_maj = "2.50"; - ver_min = "0"; + ver_maj = "2.54"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94"; + sha256 = "0jkapw18icz59cmlmsl00nwwz0wh291kb4hc9z9hxmq45drqrhkw"; }; outputs = [ "out" "dev" ]; From 578beeb52547205de597495731dc0194e647cc2f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:15:55 +0200 Subject: [PATCH 2430/2806] =?UTF-8?q?gusb:=200.2.9=20=E2=86=92=200.2.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gusb/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 93f24b0f722..4da9db3ef04 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,24 +1,22 @@ {stdenv, fetchurl , automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt -, glib, systemd, libusb1, vala_0_23 +, glib, systemd, libusb1, vala_0_38 }: stdenv.mkDerivation rec { name = "gusb-${version}"; - version = "0.2.9"; + version = "0.2.11"; enableParallelBuilding = true; src = fetchurl { - url = "http://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "056yxlppgycsfw1l8c9j6givk1n15jylhvx89wqhsxdi1b6vs83k"; + url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; + sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw"; }; preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt - systemd vala_0_23 glib - ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext + gobjectIntrospection libxslt vala_0_38 ]; + buildInputs = [ systemd glib ]; propagatedBuildInputs = [ libusb1 ]; From 00269f660c4da075bd931555845161cafc5d6758 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:16:25 +0200 Subject: [PATCH 2431/2806] =?UTF-8?q?gvfs:=201.30.1=20=E2=86=92=201.34.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bash completions were removed upstream because gvfs is deprecated in favour of glib’s gio . https://bugzilla.gnome.org/show_bug.cgi?id=769378 --- pkgs/development/libraries/gvfs/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 6eb341d66bc..78f507ca146 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool , glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit -, libgphoto2, avahi, libarchive, fuse, libcdio +, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma , libxml2, libxslt, docbook_xsl, samba, libmtp , gnomeSupport ? false, gnome, makeWrapper }: let - ver_maj = "1.30"; + ver_maj = "1.34"; version = "${ver_maj}.1"; in stdenv.mkDerivation rec { @@ -13,21 +13,21 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz"; - sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b"; + sha256 = "1d3j6f252mk316hrspwy63inrhxk6l78l4bmlmql401lqapb5yby"; }; nativeBuildInputs = [ - pkgconfig intltool libtool + pkgconfig intltool libtool file makeWrapper libxml2 libxslt docbook_xsl ]; buildInputs = - [ makeWrapper glib dbus udev libgudev udisks2 libgcrypt - libgphoto2 avahi libarchive fuse libcdio + [ glib dbus udev libgudev udisks2 libgcrypt + libgphoto2 avahi libarchive fuse libcdio lzma bzip2 samba libmtp libcap polkit # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - gtk libsoup libgnome_keyring gconf gcr + libsoup libgnome_keyring gconf gcr # ToDo: not working and probably useless until gnome3 from x-updates ]); From 804af47f8af761f2be6251253878576a4542d37c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:16:54 +0200 Subject: [PATCH 2432/2806] =?UTF-8?q?libchamplain:=200.12.14=20=E2=86=92?= =?UTF-8?q?=200.12.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libchamplain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index f6d6c5b803e..514a1fa8534 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { major = "0.12"; - version = "${major}.14"; + version = "${major}.16"; name = "libchamplain-${version}"; src = fetchurl { url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz"; - sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi"; + sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja"; }; nativeBuildInputs = [ pkgconfig ]; From 14e518d0207dff28689807c5688c521144ef613f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:17:22 +0200 Subject: [PATCH 2433/2806] =?UTF-8?q?librsvg:=202.40.17=20=E2=86=92=202.40?= =?UTF-8?q?.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/librsvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7845f28adc9..09a0f4444b5 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -6,11 +6,11 @@ # no introspection by default, it's too big stdenv.mkDerivation rec { - name = "librsvg-2.40.17"; + name = "librsvg-2.40.19"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz"; - sha256 = "1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6"; + url = "mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz"; + sha256 = "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; From d3027030ceacaf670e58935630f2f5d5a83cd1fa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:17:45 +0200 Subject: [PATCH 2434/2806] =?UTF-8?q?libgtop:=202.34.1=20=E2=86=92=202.38.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libgtop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index de72072e48b..49cd1d163a6 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection, libintlOrEmpty }: stdenv.mkDerivation rec { name = "libgtop-${version}"; - major = "2.34"; - version = "${major}.1"; + major = "2.38"; + version = "${major}.0"; src = fetchurl { url = "mirror://gnome/sources/libgtop/${major}/${name}.tar.xz"; - sha256 = "c89978a76662b18d392edbe0d1b794f5a9a399a5ccf22a02d5b9e28b5ed609e2"; + sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"; }; propagatedBuildInputs = [ glib ]; From 464a113201f805012f37880bf66af109a55e569e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:19:36 +0200 Subject: [PATCH 2435/2806] =?UTF-8?q?spice=5Fprotocol:=200.12.12=20?= =?UTF-8?q?=E2=86=92=200.12.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/spice-protocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index bd56d880f94..56adea9ca82 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.12"; + name = "spice-protocol-0.12.13"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "00wx81f2ml62g3maw63jq9w217zym921rdi38h7lpm5m8ckxraqp"; + sha256 = "0cwrgkp558mblcf4vrhacb3iizz12khsrrl82w38w9nj0ar13vl9"; }; postInstall = '' From 846608238df2f9551efcb1d772f29de0c3991a1b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:20:03 +0200 Subject: [PATCH 2436/2806] =?UTF-8?q?spice=5Fgtk:=200.33=20=E2=86=92=200.3?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/spice-gtk/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 240de378afc..080dbc4510d 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, spice_protocol, intltool, celt_0_5_1 +{ stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , gtk3, epoxy }: @@ -8,11 +8,11 @@ with stdenv.lib; let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "spice-gtk-0.33"; + name = "spice-gtk-0.34"; src = fetchurl { url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx"; + sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; }; buildInputs = [ @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy ]; - nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ]; + nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; @@ -29,10 +29,6 @@ in stdenv.mkDerivation rec { --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' ''; - preConfigure = '' - intltoolize -f - ''; - configureFlags = [ "--disable-maintainer-mode" "--with-gtk3" From a443311dfc91d07347ef3d15323554300214e7d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:20:23 +0200 Subject: [PATCH 2437/2806] =?UTF-8?q?libxkbcommon:=200.7.1=20=E2=86=92=200?= =?UTF-8?q?.7.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libxkbcommon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index fd61ae84028..e730cc6eaab 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.7.1"; + name = "libxkbcommon-0.7.2"; src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b"; + sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918"; }; outputs = [ "out" "dev" ]; From 1d55dd3d138e15f3529732b9c14ed981ab2b67b5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:22:39 +0200 Subject: [PATCH 2438/2806] =?UTF-8?q?fwup:=200.14.3=20=E2=86=92=200.16.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/fwup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 8937de88c38..82b3a1d963d 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "0.14.3"; + version = "0.16.1"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "15sjpxw1llpipshriivpha6470lkvhcgs5wh5mlaabjbvrgxygqh"; + sha256 = "1hphgpwxzdbfswzxbx0jm7lma1xkkwxvm8ll3jp2ljmimqzzb7jf"; }; doCheck = true; From 4d5a009b117c0a912055a193bcbff0b86d05eb23 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:25:14 +0200 Subject: [PATCH 2439/2806] spidermonkey_52: init at 52.2.1gnome1 --- .../interpreters/spidermonkey/52.nix | 62 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/interpreters/spidermonkey/52.nix diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix new file mode 100644 index 00000000000..75c7c64e324 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: + +stdenv.mkDerivation rec { + version = "52.2.1gnome1"; + name = "spidermonkey-${version}"; + + # the release notes point to some guys home directory, see + # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 + # probably it would be more ideal to pull a particular tag/revision + # from the mercurial repo + src = fetchurl { + url = "mirror://gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${version}.tar.gz"; + sha256 = "1bxhz724s1ch1c0kdlzlg9ylhg1mk8kbhdgfkax53fyvn51pjs9i"; + }; + + buildInputs = [ readline icu zlib nspr ]; + nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; + + postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + + preConfigure = '' + export CXXFLAGS="-fpermissive" + export LIBXUL_DIST=$out + export PYTHON="${python2.interpreter}" + ''; + + configureFlags = [ + "--enable-threadsafe" + "--with-system-nspr" + "--with-system-zlib" + "--with-system-icu" + "--with-intl-api" + "--enable-readline" + + # enabling these because they're wanted by 0ad. They may or may + # not be good defaults for other uses. + "--enable-gcgenerational" + "--enable-shared-js" + ]; + + # This addresses some build system bug. It's quite likely to be safe + # to re-enable parallel builds if the source revision changes. + enableParallelBuilding = true; + + postFixup = '' + # The headers are symlinks to a directory that doesn't get put + # into $out, so they end up broken. Fix that by just resolving the + # symlinks. + for i in $(find $out -type l); do + cp --remove-destination "$(readlink "$i")" "$i"; + done + ''; + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + # TODO: MPL/GPL/LGPL tri-license. + + maintainers = [ maintainers.abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eb87bd64f1..47c3f1c4c1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6731,6 +6731,7 @@ with pkgs; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { }; + spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { }; spidermonkey = spidermonkey_31; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; From faac8b301c9ba0db32f12c895e3b143deaccc938 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:26:42 +0200 Subject: [PATCH 2440/2806] libzapojit: add meta.description --- pkgs/desktops/gnome-3/core/libzapojit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix index c5c75c166f7..dab1a0fea8a 100644 --- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; meta = with stdenv.lib; { + description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; platforms = platforms.linux; }; } From 716af52fe12a666f66b48f9b537162325dddb83d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 Sep 2017 21:28:31 +0200 Subject: [PATCH 2441/2806] =?UTF-8?q?gstreamer:=201.10.4=20=E2=86=92=201.1?= =?UTF-8?q?2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/orc/default.nix | 6 +++--- pkgs/development/libraries/gstreamer/bad/default.nix | 6 +++--- pkgs/development/libraries/gstreamer/base/default.nix | 6 +++--- pkgs/development/libraries/gstreamer/core/default.nix | 6 +++--- pkgs/development/libraries/gstreamer/ges/default.nix | 6 +++--- pkgs/development/libraries/gstreamer/gnonlin/default.nix | 2 +- pkgs/development/libraries/gstreamer/good/default.nix | 6 +++--- .../libraries/gstreamer/gstreamermm/default.nix | 7 +++++++ .../libraries/gstreamer/legacy/gst-ffmpeg/default.nix | 2 +- .../libraries/gstreamer/legacy/gst-plugins-bad/default.nix | 2 +- .../gstreamer/legacy/gst-plugins-base/default.nix | 2 +- .../gstreamer/legacy/gst-plugins-good/default.nix | 2 +- .../gstreamer/legacy/gst-plugins-ugly/default.nix | 2 +- .../libraries/gstreamer/legacy/gst-python/default.nix | 2 +- .../libraries/gstreamer/legacy/qt-gstreamer/default.nix | 2 +- pkgs/development/libraries/gstreamer/libav/default.nix | 6 +++--- .../libraries/gstreamer/qt-gstreamer/default.nix | 2 +- pkgs/development/libraries/gstreamer/ugly/default.nix | 6 +++--- pkgs/development/libraries/gstreamer/vaapi/default.nix | 6 +++--- pkgs/development/libraries/gstreamer/validate/default.nix | 6 +++--- pkgs/development/python-modules/gst-python/default.nix | 6 +++--- 21 files changed, 49 insertions(+), 42 deletions(-) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 5e0cbb9d395..543fc6dfa48 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "orc-0.4.26"; + name = "orc-0.4.27"; src = fetchurl { - url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; - sha256 = "0jd69ynvr3k70mlxxgbsk047l1rd63m1wkj3qdcq7644xy0gllkx"; + url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; + sha256 = "14vbwdydwarcvswzf744jdjb3ibhv6k4j6hzdacfan41zic3xrai"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 69378d95a30..2e0e711ce71 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -17,11 +17,11 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.10.4"; + name = "gst-plugins-bad-1.12.2"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' a set of plug-ins that aren't up to par compared to the rest. They might be close to being good quality, but they're missing @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0rk9rlzf2b0hjw5hwbadz53yh4ls7vm3w3cshsa3n8isdd8axp93"; + sha256 = "0dwyq03g2m0p16dwx8q5qvjn5x9ia72h21sf87mp97gmwkfpwb4w"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 70aa9101ad8..2ff42917964 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,18 +4,18 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.10.4"; + name = "gst-plugins-base-1.12.2"; meta = { description = "Base plugins and helper libraries"; - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "1dsyjf6rncsbg4rfj40cvf1wwpjj9h3j3c7bh4zp7jylnfv4blpn"; + sha256 = "0x86a7aph0y6gyq178plvwvbbyhkfb3hf0gadx9sk5z1mzixqrsh"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 4bd7fb5396a..67521e40daf 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.10.4"; + name = "gstreamer-1.12.2"; meta = { description = "Open source multimedia framework"; - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "062jidnw17hkpva6ddygp80gyasyigfkpm1y7w56rk56a2pzbhjh"; + sha256 = "1fllz7n58lavyy4nh64xc7izd4ffhl12a2ff0yg4z67al8wkzplz"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index cf69fa943a2..e206f317d4b 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,18 +3,18 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.10.4"; + name = "gstreamer-editing-services-1.12.2"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "0i11b1rwkjsy9gxrf9vk9lgg8qm60ggfi5lp0ncyh4lxvh16vbgj"; + sha256 = "0bi0f487949k9xnl1r6ngysgaibmmswwgdqcrchg0dixnnbm9isr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 90d4ec458a9..c04b64ae3c6 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gstreamer Non-Linear Multimedia Editing Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' Gnonlin is a library built on top of GStreamer which provides support for writing non-linear audio and video editing diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index c18d8332b0c..1c7f7951e91 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -11,11 +11,11 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.10.4"; + name = "gst-plugins-good-1.12.2"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' a set of plug-ins that we consider to have good quality code, correct functionality, our preferred license (LGPL for the plug-in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "0zjdwxn83sp9wjp9rxjbyk8kf284g9av7l2v6rjldi586hacd1la"; + sha256 = "15pfw54fsh9s9xwrnbap4z4njwgqdfvq52k562d2hc5b11rfx4am"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index a4169565511..f6138fafaef 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry"; }; + patches = [ + (fetchurl { + url = https://bug783628.bugzilla-attachments.gnome.org/attachment.cgi?id=354765; + sha256 = "082510a934bl05mz4cyakp8mfmd97cdj7vdrbvyqc4g58dcskvz0"; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig file ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 953f8900ade..95b394a6d4b 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" + "https://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index fecc77b2a54..bdb1b6c7bb7 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "‘Bad’ (potentially low quality) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 5b2ba728f3a..2c2e1b0da12 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; meta = with stdenv.lib; { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "Base plug-ins for GStreamer"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 9339de3d9ed..d533f798d99 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "`Good' plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 9863b3e0128..5c289fb3911 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index fd01aa5c1dc..c8414a7b681 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gstreamer python ]; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "Python bindings for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix index 74b1417e069..9797f21c168 100644 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "qt-gstreamer"; src = fetchurl { - url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl"; }; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index f312a14de24..7c0a05f8202 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,17 +9,17 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.10.4"; + name = "gst-libav-1.12.2"; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "12r68ri03mgbbwsxyn6yklgfsq32rwvyq83zw0aq7m73fp5gx83c"; + sha256 = "1crdahkjm23byg1awcrjkmgfbalfpvvac7h7whm6b2r1pfwkbdsv"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index 72068bb1f7b..a9e7f9fcff3 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "qt-gstreamer"; src = fetchurl { - url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz"; sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4"; }; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index bd034ac13a1..610f10075a8 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.10.4"; + name = "gst-plugins-ugly-1.12.2"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' a set of plug-ins that have good quality and correct functionality, but distributing them might pose problems. The license on either @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "0ngsiwcsz3jd08id4mc0qiy2q1n7h2kkvdnh3r1vm725m1ycg1k3"; + sha256 = "0rplyp1qk359c97ig9i2vc1v34g92khd8dslwfipva1ypwmr9hqw"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index caca5440084..becd4cf0d92 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "1.10.4"; + version = "1.12.2"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "0xfyf1mgcxnwf380wxv20hakl2srp34dmiw6bm4zkncl2mi91rh3"; + sha256 = "0fhncs27hcdcnb9a4prkxlyvr883hnzsx148zzk7lg2b8zh19ir3"; }; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0"; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index b537ad2897d..9704ca1d743 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,18 +3,18 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.10.4"; + name = "gst-validate-1.12.2"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "0g6px08x4kq5xqlbyxvxn6cm9b1s1gfvhkmlrmvw9afccjzh1775"; + sha256 = "1pgycs35bwmp4aicyxwyzlfy1i5l2rzmh2a8ivhgy21azp8jaykb"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 1333c4b59a4..71d77c283b8 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "gst-python"; - version = "1.10.4"; + version = "1.12.2"; name = "${pname}-${version}"; src = fetchurl { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "04l2hvvz9b0f3nyds1k3yfk5di8a91fpr6maj19c11mwp1s82l2r"; + sha256 = "0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l"; }; patches = [ ./different-path-with-pygobject.patch ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { passthru.pythonPath = []; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "Python bindings for GStreamer"; From f5d5c13ad77ae67d054206c7f7fc59f9f53dfc8b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:29:08 +0200 Subject: [PATCH 2442/2806] =?UTF-8?q?gnome3.libgxps:=200.2.2=20=E2=86=92?= =?UTF-8?q?=200.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desktops/gnome-3/core/libgxps/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix index 5c1ffb45039..9e1e4588918 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff -, openssl, bzip2, acl, attr, libxml2 +{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo +, libarchive, freetype, libjpeg, libtiff }: stdenv.mkDerivation rec { - name = "libgxps-0.2.2"; + name = "libgxps-0.3.0"; src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; + url = "mirror://gnome/sources/libgxps/0.3/${name}.tar.xz"; + sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; + buildInputs = [ glib cairo freetype libjpeg libtiff ]; propagatedBuildInputs = [ libarchive ]; - configureFlags = "--without-liblcms2"; + mesonFlags = [ + "-Denable-test=false" + "-Dwith-liblcms2=false" + ]; meta = with stdenv.lib; { platforms = platforms.linux; From f9031957eda8d880edf17cc9eb8469e47f382bb0 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 5 Nov 2017 17:32:06 +0100 Subject: [PATCH 2443/2806] pdns-recursor: 4.0.4 -> 4.0.6 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 0e8d1e70bc7..664fabbb312 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -11,11 +11,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.0.4"; + version = "4.0.6"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0k8y9zxj2lz4rq782vgzr28yd43q0hwlnvszwq0k9l6c967pff13"; + sha256 = "03fnjiacvhdlkr3a2206mham0p6p24gkawashs5v12r68k32l67j"; }; nativeBuildInputs = [ pkgconfig ]; From 38dd08bc77fa3b4d31466e80145c1fd62eb6c8fc Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 5 Nov 2017 15:22:24 +0100 Subject: [PATCH 2444/2806] zimg: 2.4 -> 2.6.1 --- pkgs/development/libraries/zimg/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 2c9d27a8b6a..b5bb73e3e33 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.4"; + version = "2.6.1"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; - rev = "v${version}"; - sha256 = "11pk8a5manr751jhy0xrql57jzab57lwqjxbpd8kvm9m8b51icwq"; + rev = "release-${version}"; + sha256 = "08hynzcxz95a4i67k5cn6isafdb6xjgd0x0miyhlnp2xc220zfqj"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; meta = with stdenv.lib; { description = "Scaling, colorspace conversion and dithering library"; From c47ac4d2ad758b4ee1e47dc6207fbeff579711d4 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 5 Nov 2017 15:04:25 +0100 Subject: [PATCH 2445/2806] ddcutil: 0.8.2 -> 0.8.4 --- pkgs/tools/misc/ddcutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index c45c85e4271..53755c8a19d 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1hcdg54xyb1pfl03iqll14y9yglwmyvxyvhbql87hd9q0dywah6m"; + sha256 = "1w9bkrlxlgc58rpf03xfd2qbkj73rlbiqrhy8nhwxqqhsj1kkdb0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 9f30edc08530f754a3b16da08b3d7e62e72d4516 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 5 Nov 2017 17:52:09 +0100 Subject: [PATCH 2446/2806] gnome3.glade: fix compatibility with glib 2.53.4 Closes: #31272 --- pkgs/desktops/gnome-3/apps/glade/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index da49c36cd06..6064a8c768a 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, python +{ stdenv, intltool, fetchurl, python, autoreconfHook , pkgconfig, gtk3, glib , makeWrapper, itstool, libxml2, docbook_xsl , gnome3, librsvg, gdk_pixbuf, libxslt }: @@ -8,13 +8,25 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + # reconfiguration + autoreconfHook gnome3.gnome_common gnome3.yelp_tools + ]; buildInputs = [ gtk3 glib intltool itstool libxml2 python gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; enableParallelBuilding = true; + patches = [ + # https://bugzilla.gnome.org/show_bug.cgi?id=782161 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=351054; + sha256 = "093wjjj40027pkqqnm14jb2dp2i2m8p1bayqx1lw18pq66c8fahn"; + }) + ]; + preFixup = '' wrapProgram "$out/bin/glade" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ From 6ad65e046fa19e8249e2b8e3c598656c949f1e03 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 5 Nov 2017 17:58:30 +0100 Subject: [PATCH 2447/2806] gnome3.glade: clean up --- pkgs/desktops/gnome-3/apps/glade/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 6064a8c768a..ce29ebf0a7e 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; nativeBuildInputs = [ - pkgconfig + pkgconfig intltool itstool makeWrapper docbook_xsl libxslt # reconfiguration autoreconfHook gnome3.gnome_common gnome3.yelp_tools ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 python - gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl - gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; + buildInputs = [ gtk3 glib libxml2 python + gnome3.gsettings_desktop_schemas + gdk_pixbuf gnome3.defaultIconTheme librsvg ]; enableParallelBuilding = true; From c1a6665549ba566fe33b433d31fc52686844c7e7 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 5 Nov 2017 17:16:36 +0000 Subject: [PATCH 2448/2806] pdns-recursor: enable parallel building --- pkgs/servers/dns/pdns-recursor/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 664fabbb312..9b017249c15 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { "--with-systemd" ]; + enableParallelBuilding = true; + meta = { description = "A recursive DNS server"; homepage = http://www.powerdns.com/; From aee015dbcf229a441883660aa48201b215e946a2 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 5 Nov 2017 17:17:31 +0000 Subject: [PATCH 2449/2806] opera: 46.0.2597.39 -> 48.0.2685.52 --- .../networking/browsers/opera/default.nix | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 52a2ce9164c..0852b5c9d43 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -37,7 +37,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "46.0.2597.39"; + version = "48.0.2685.52"; rpath = stdenv.lib.makeLibraryPath [ @@ -87,19 +87,10 @@ in stdenv.mkDerivation { name = "opera-${version}"; - src = - #if stdenv.system == "i686-linux" then - # fetchurl { - # url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb"; - # sha256 = "..."; - # } - #else - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "1ladvqilm5rr222wjybvribnyii2l0p8jbsd10xr06wps63g1kia"; - } - else throw "Opera is not supported on ${stdenv.system} (only x86_64 linux is supported)"; + src = fetchurl { + url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; + sha256 = "027njqh2as4d0xsnvzamqiplghb8cxqnc19y0vqkvjnsw57v828p"; + }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; @@ -123,6 +114,7 @@ in stdenv.mkDerivation { meta = { homepage = http://www.opera.com; description = "Web browser"; + platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.unfree; }; } From de1e0ee43f1c4c87a2a3f8f283c7b1b6b51a9484 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 5 Nov 2017 18:15:53 +0100 Subject: [PATCH 2450/2806] masscan: 2017-02-04 -> 1.0.4 --- pkgs/tools/security/masscan/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 46c90481628..22a452ccabd 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, libpcap }: +{ stdenv, fetchFromGitHub, makeWrapper, libpcap }: stdenv.mkDerivation rec { name = "masscan-${version}"; - version = "2016-11-03"; + version = "1.0.4"; src = fetchFromGitHub { owner = "robertdavidgraham"; repo = "masscan"; - rev = "dc88677a11dc3d9a5f6aa55cc1377bc17dba1496"; - sha256 = "1mdjqkn4gnbwr5nci6i6xn7qzkjgq7dx37fzd6gghv87xgw7cdbg"; + rev = "39061a5e9ef158dde1e6618f6fbf379739934a73"; + sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf"; }; - buildInputs = [ libpcap ]; + buildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ]; @@ -24,13 +24,15 @@ stdenv.mkDerivation rec { cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.hml cp doc/masscan.8 $out/share/man/man8/masscan.8 cp LICENSE $out/share/licenses/masscan/LICENSE + + wrapProgram $out/bin/masscan --prefix LD_LIBRARY_PATH : "${libpcap}/lib" ''; meta = with stdenv.lib; { description = "Fast scan of the Internet"; homepage = https://github.com/robertdavidgraham/masscan; license = licenses.agpl3; - platforms = with platforms; allBut darwin; + platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; }; } From 4f8b98035500c02338488ccd0c7627c17697e8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 5 Nov 2017 18:23:31 +0100 Subject: [PATCH 2451/2806] torcs: fix libGL when the OS uses non-mesa Fixes OP of issue #30749. --- pkgs/games/torcs/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 1b6ad5b34c3..26f0fe534f3 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchpatch, fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchpatch, fetchurl, stdenv, mesa_glu, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, bash, makeWrapper }: @@ -29,18 +29,11 @@ stdenv.mkDerivation rec { sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; - buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto + buildInputs = [ mesa_glu freeglut libX11 plib openal freealut libXrandr xproto libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; - nativeBuildInputs = [ bash ]; - installTargets = "install datainstall"; - postInstall = '' - wrapProgram $out/bin/torcs \ - --prefix LD_LIBRARY_PATH : ${mesa}/lib - ''; - meta = { description = "Car racing game"; homepage = http://torcs.sourceforge.net/; From 721e07ea99573cb242a0df6c00f260471e12388b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 5 Nov 2017 11:29:50 -0600 Subject: [PATCH 2452/2806] hplip: 3.17.9 -> 3.17.10 --- pkgs/misc/drivers/hplip/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index a01fc74ce47..66ed1d44adc 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -11,16 +11,16 @@ let name = "hplip-${version}"; - version = "3.17.9"; + version = "3.17.10"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0y46jjq8jdfk9m4vjq55h8yggibvqbi9rl08vni7vbhxym1diamj"; + sha256 = "0v27hg856b5z2rilczcbfgz8ksxn0n810g1glac3mxkj8qbl8wqg"; }; plugin = fetchurl { - url = "http://hplipopensource.com/hplip-web/plugin/${name}-plugin.run"; - sha256 = "10z8vzwcwmwni7s4j9xp0fa7l4lwrhl4kp450dga3fj0cck1gxwq"; + url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; + sha256 = "07am3dnl0ipgfswz5wndprryljh9rqbfhq7mm4d4yyj3bdnnzlig"; }; hplipState = substituteAll { From 06105849982e6d9a808bdc0118b3a48440c6e84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 5 Nov 2017 18:42:20 +0100 Subject: [PATCH 2453/2806] factor-lang: fix libGL when the OS uses non-mesa I was careful to keep libGLU in LD_LIBRARY_PATH, in the unlikely case that it's actually used. Reported in https://github.com/NixOS/nixpkgs/issues/30749#issuecomment-341987725 --- pkgs/development/compilers/factor-lang/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 87572661635..ae2d39d604a 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, glib, glibc, git, rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext, - mesa, libXmu, libXt, libICE, libSM }: + mesa_glu, libXmu, libXt, libICE, libSM }: stdenv.mkDerivation rec { name = "factor-lang-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ git rlwrap curl perl makeWrapper libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa libXmu libXt libICE libSM ]; + mesa_glu libXmu libXt libICE libSM ]; buildPhase = '' make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev} @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # to be a generic solution here. find $(echo ${stdenv.lib.makeLibraryPath [ glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst + mesa_glu libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'"; for l in $(<$TMPDIR/so.lst); @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \ "${stdenv.lib.makeLibraryPath [ glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa libXmu libXt libICE libSM ]}" + mesa_glu libXmu libXt libICE libSM ]}" sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor mv $out/bin/.factor-wrapped $out/lib/factor/factor From d6b8f184970406fe540839fe381ea7b165c2dc61 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Nov 2017 00:43:27 +0100 Subject: [PATCH 2454/2806] ncmpc: remove unneeded rpath wrapping --- pkgs/applications/audio/ncmpc/default.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index ef0bb75b2ec..cb0f35ebc15 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,11 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses , mpd_clientlib, gettext }: -let - rpath = stdenv.lib.makeLibraryPath [ - glib ncurses mpd_clientlib - ]; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "ncmpc-${version}"; version = "0.28"; @@ -19,12 +15,6 @@ in stdenv.mkDerivation rec { buildInputs = [ glib ncurses mpd_clientlib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - postFixup = '' - for elf in "$out"/bin/*; do - patchelf --set-rpath '${rpath}':"$out/lib" "$elf" - done - ''; - meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://www.musicpd.org/clients/ncmpc/; From 0979856cdf38538436b81a31e9be362227f13df2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Nov 2017 00:44:36 +0100 Subject: [PATCH 2455/2806] appstream-glib: remove unneeded rpath wrapping --- .../libraries/appstream-glib/default.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index e07e1fc3908..1c97b879a18 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -3,15 +3,7 @@ , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl , libuuid, json_glib, autoconf-archive, meson, gperf, ninja, gdk_pixbuf }: -let rpath = stdenv.lib.makeLibraryPath - [ libuuid.out - glib - libsoup - gdk_pixbuf - libarchive.lib - gcab - ]; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "appstream-glib-0.7.2"; src = fetchFromGitHub { @@ -28,12 +20,6 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gtk3 ]; mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ]; - postFixup = '' - for elf in "$out"/bin/* "$out"/lib/*.so; do - patchelf --set-rpath '${rpath}':"$out/lib" "$elf" - done - ''; - meta = with stdenv.lib; { description = "Objects and helper methods to read and write AppStream metadata"; homepage = https://github.com/hughsie/appstream-glib; From 2dfa36233d38097462359ef54d14c36d1ab7dcb1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Nov 2017 00:45:04 +0100 Subject: [PATCH 2456/2806] sshfs-fuse: remove unneeded rpath wrapping --- pkgs/tools/filesystems/sshfs-fuse/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 7d251d2e00d..eebe3076c98 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -4,7 +4,6 @@ let inherit (stdenv.lib) optional; - rpath = stdenv.lib.makeLibraryPath [ fuse3 glib ]; in stdenv.mkDerivation rec { version = "3.3.1"; name = "sshfs-fuse-${version}"; @@ -30,10 +29,6 @@ in stdenv.mkDerivation rec { ln -sf $out/bin/sshfs $out/sbin/mount.sshfs ''; - postFixup = '' - patchelf --set-rpath '${rpath}' "$out/bin/sshfs" - ''; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH"; From 00fe37217e8ec37c6fb3ce821fd9bdb8b98840b9 Mon Sep 17 00:00:00 2001 From: Alex Feldman-Crough Date: Sun, 5 Nov 2017 10:00:17 -0800 Subject: [PATCH 2457/2806] gitea: 1.2.1 -> 1.2.3 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 734b9d3629c..d4afdd7b3cd 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "15zw4b6hnx4hmzn2xlsi4p7jvh6jx4g4smbdidnrzrykzyq4rmpp"; + sha256 = "0v24q14xzmqgwk10m7rqyn6pahd630v3bnc646ij4w8fbgr8hzja"; }; patches = [ ./static-root-path.patch ]; From 0c01c58aec109d856aeb09fc3479b4af902174a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 27 Aug 2017 22:06:04 +0200 Subject: [PATCH 2458/2806] gcc6: fix build with new glibc, by upstream patches --- pkgs/development/compilers/gcc/6/default.nix | 4 +- .../compilers/gcc/struct-sigaltstack.patch | 87 ++++++++ .../compilers/gcc/struct-ucontext.patch | 190 ++++++++++++++++++ 3 files changed, 280 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/gcc/struct-sigaltstack.patch create mode 100644 pkgs/development/compilers/gcc/struct-ucontext.patch diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 47cb93c1995..7d019c7fe84 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -72,7 +72,9 @@ let version = "6.4.0"; # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. ++ optional langAda ../gnat-cflags.patch - ++ optional langFortran ../gfortran-driving.patch; + ++ optional langFortran ../gfortran-driving.patch + ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26 + ; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at diff --git a/pkgs/development/compilers/gcc/struct-sigaltstack.patch b/pkgs/development/compilers/gcc/struct-sigaltstack.patch new file mode 100644 index 00000000000..6e1ddb252c2 --- /dev/null +++ b/pkgs/development/compilers/gcc/struct-sigaltstack.patch @@ -0,0 +1,87 @@ +From 72edc2c02f8b4768ad660f46a1c7e2400c0a8e06 Mon Sep 17 00:00:00 2001 +From: jakub +Date: Mon, 17 Jul 2017 19:41:08 +0000 +Subject: [PATCH] Backported from mainline 2017-07-14 Jakub + Jelinek + + PR sanitizer/81066 + * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969. + * sanitizer_common/sanitizer_linux.cc: Likewise. + * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise. + * tsan/tsan_platform_linux.cc: Likewise. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250287 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libsanitizer/ChangeLog (REMOVED) | 11 +++++++++++ + libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +-- + libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +--- + .../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +- + libsanitizer/tsan/tsan_platform_linux.cc | 2 +- + 5 files changed, 15 insertions(+), 7 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc +index 806fcd5..5b6f186 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc +@@ -605,8 +605,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { + } + #endif + +-uptr internal_sigaltstack(const struct sigaltstack *ss, +- struct sigaltstack *oss) { ++uptr internal_sigaltstack(const void *ss, void *oss) { + return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); + } + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h +index 895bfc1..a42df57 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.h ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h +@@ -19,7 +19,6 @@ + #include "sanitizer_platform_limits_posix.h" + + struct link_map; // Opaque type returned by dlopen(). +-struct sigaltstack; + + namespace __sanitizer { + // Dirent structure for getdents(). Note that this structure is different from +@@ -28,8 +27,7 @@ struct linux_dirent; + + // Syscall wrappers. + uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); +-uptr internal_sigaltstack(const struct sigaltstack* ss, +- struct sigaltstack* oss); ++uptr internal_sigaltstack(const void* ss, void* oss); + uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, + __sanitizer_sigset_t *oldset); + +diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +index 891386dc..234e8c6 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +@@ -273,7 +273,7 @@ static int TracerThread(void* argument) { + + // Alternate stack for signal handling. + InternalScopedBuffer handler_stack_memory(kHandlerStackSize); +- struct sigaltstack handler_stack; ++ stack_t handler_stack; + internal_memset(&handler_stack, 0, sizeof(handler_stack)); + handler_stack.ss_sp = handler_stack_memory.data(); + handler_stack.ss_size = kHandlerStackSize; +diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc +index 2ed5718..6f972ab 100644 +--- a/libsanitizer/tsan/tsan_platform_linux.cc ++++ b/libsanitizer/tsan/tsan_platform_linux.cc +@@ -287,7 +287,7 @@ void InitializePlatform() { + int ExtractResolvFDs(void *state, int *fds, int nfd) { + #if SANITIZER_LINUX && !SANITIZER_ANDROID + int cnt = 0; +- __res_state *statp = (__res_state*)state; ++ struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { + if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) + fds[cnt++] = statp->_u._ext.nssocks[i]; +-- +2.9.3 + diff --git a/pkgs/development/compilers/gcc/struct-ucontext.patch b/pkgs/development/compilers/gcc/struct-ucontext.patch new file mode 100644 index 00000000000..c7fb6d1f71c --- /dev/null +++ b/pkgs/development/compilers/gcc/struct-ucontext.patch @@ -0,0 +1,190 @@ +From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001 +From: jsm28 +Date: Tue, 4 Jul 2017 10:23:57 +0000 +Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files. + +Current glibc no longer gives the ucontext_t type the tag struct +ucontext, to conform with POSIX namespace rules. This requires +various linux-unwind.h files in libgcc, that were previously using +struct ucontext, to be fixed to use ucontext_t instead. This is +similar to the removal of the struct siginfo tag from siginfo_t some +years ago. + +This patch changes those files to use ucontext_t instead. As the +standard name that should be unconditionally safe, so this is not +restricted to architectures supported by glibc, or conditioned on the +glibc version. + +Tested compilation together with current glibc with glibc's +build-many-glibcs.py. + + * config/aarch64/linux-unwind.h (aarch64_fallback_frame_state), + config/alpha/linux-unwind.h (alpha_fallback_frame_state), + config/bfin/linux-unwind.h (bfin_fallback_frame_state), + config/i386/linux-unwind.h (x86_64_fallback_frame_state, + x86_fallback_frame_state), config/m68k/linux-unwind.h (struct + uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext), + config/pa/linux-unwind.h (pa32_fallback_frame_state), + config/sh/linux-unwind.h (sh_fallback_frame_state), + config/tilepro/linux-unwind.h (tile_fallback_frame_state), + config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use + ucontext_t instead of struct ucontext. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libgcc/ChangeLog (REMOVED) | 14 ++++++++++++++ + libgcc/config/aarch64/linux-unwind.h | 2 +- + libgcc/config/alpha/linux-unwind.h | 2 +- + libgcc/config/bfin/linux-unwind.h | 2 +- + libgcc/config/i386/linux-unwind.h | 4 ++-- + libgcc/config/m68k/linux-unwind.h | 2 +- + libgcc/config/nios2/linux-unwind.h | 2 +- + libgcc/config/pa/linux-unwind.h | 2 +- + libgcc/config/sh/linux-unwind.h | 2 +- + libgcc/config/tilepro/linux-unwind.h | 2 +- + libgcc/config/xtensa/linux-unwind.h | 2 +- + 11 files changed, 25 insertions(+), 11 deletions(-) + +diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h +index 4512efb..06de45a 100644 +--- a/libgcc/config/aarch64/linux-unwind.h ++++ b/libgcc/config/aarch64/linux-unwind.h +@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe + { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + }; + + struct rt_sigframe *rt_; +diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h +index bdbba4a..e84812e 100644 +--- a/libgcc/config/alpha/linux-unwind.h ++++ b/libgcc/config/alpha/linux-unwind.h +@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + sc = &rt_->uc.uc_mcontext; + } +diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h +index 77b7c23..8bf5e82 100644 +--- a/libgcc/config/bfin/linux-unwind.h ++++ b/libgcc/config/bfin/linux-unwind.h +@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, + void *puc; + char retcode[8]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + + /* The void * cast is necessary to avoid an aliasing warning. +diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h +index 540a0a2..29efbe3 100644 +--- a/libgcc/config/i386/linux-unwind.h ++++ b/libgcc/config/i386/linux-unwind.h +@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, + if (*(unsigned char *)(pc+0) == 0x48 + && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) + { +- struct ucontext *uc_ = context->cfa; ++ ucontext_t *uc_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem + because it does not alias anything. */ +@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, + siginfo_t *pinfo; + void *puc; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h +index 75b7cf7..f964e24 100644 +--- a/libgcc/config/m68k/linux-unwind.h ++++ b/libgcc/config/m68k/linux-unwind.h +@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + /* is unfortunately broken right now. */ + struct uw_ucontext { + unsigned long uc_flags; +- struct ucontext *uc_link; ++ ucontext_t *uc_link; + stack_t uc_stack; + mcontext_t uc_mcontext; + unsigned long uc_filler[80]; +diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h +index 2304142..30f25ea 100644 +--- a/libgcc/config/nios2/linux-unwind.h ++++ b/libgcc/config/nios2/linux-unwind.h +@@ -38,7 +38,7 @@ struct nios2_mcontext { + + struct nios2_ucontext { + unsigned long uc_flags; +- struct ucontext *uc_link; ++ ucontext_t *uc_link; + stack_t uc_stack; + struct nios2_mcontext uc_mcontext; + sigset_t uc_sigmask; /* mask last for extensibility */ +diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h +index 9a2657f..e47493d 100644 +--- a/libgcc/config/pa/linux-unwind.h ++++ b/libgcc/config/pa/linux-unwind.h +@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, + struct sigcontext *sc; + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *frame; + + /* rt_sigreturn trampoline: +diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h +index e389cac..0bf43ba 100644 +--- a/libgcc/config/sh/linux-unwind.h ++++ b/libgcc/config/sh/linux-unwind.h +@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h +index 796e976..75f8890 100644 +--- a/libgcc/config/tilepro/linux-unwind.h ++++ b/libgcc/config/tilepro/linux-unwind.h +@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe { + unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_; + + /* Return if this is not a signal handler. */ +diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h +index 9872492..586a9d4 100644 +--- a/libgcc/config/xtensa/linux-unwind.h ++++ b/libgcc/config/xtensa/linux-unwind.h +@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, + + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_; + + /* movi a2, __NR_rt_sigreturn; syscall */ +-- +2.9.3 + From 9bb67d5c1e546968fa3d195f0bcad82414243566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 26 Aug 2017 11:35:11 +0200 Subject: [PATCH 2459/2806] glibc: 2.25-49 -> 2.26-75 Security: the NEWS claims a couple more CVEs are fixed than what we patched, though perhaps nothing critical. I personally don't find DNS fragmentation attacks that interesting anymore, as it's just about weaker improvements for cases that choose not to use DNSSEC. Largest expected caveat: upstream bumped the minimal supportable kernel to 3.2.0. That's the oldest kernel still supported upstream, released in Jan 2012, but most notably RHEL 6 and derivates still use a heavily patched 2.6.32 kernel and those systems are still supported and in use (production support is scheduled to last till the end of 2020!). --- .../libraries/glibc/2.25-49.patch.gz | Bin 89721 -> 0 bytes .../libraries/glibc/2.26-75.patch.gz | Bin 0 -> 289084 bytes pkgs/development/libraries/glibc/common.nix | 17 +++++++---------- 3 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.25-49.patch.gz create mode 100644 pkgs/development/libraries/glibc/2.26-75.patch.gz diff --git a/pkgs/development/libraries/glibc/2.25-49.patch.gz b/pkgs/development/libraries/glibc/2.25-49.patch.gz deleted file mode 100644 index 6796347e3795f2c45c400cbb3789ff86f36ebf92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89721 zcmb2|=3oE;CgwR2nZ>tH2>#8v@~@-s?Wze%jt^BFe`#D4+Pa!+@eZAvew%JOu{ASx zigFYbzBqC1-}gO|0wRu{+phm|Xlj0$yet0u7vb|^t9PheFV;=WWjBg^E2B zO-+7Wc=+yu*tU*}l-=9R)}Bh8=Kn&8@9}kxMgxU#D zySLxs)IQqMp*LN0Zdb#xls>g-=7qAGc#2(Y51a7#9_F*^&CgUkW#lIw5~j&53cNOHOPZ^qQ&O*!{OP)z z%V(#anf^mWvoLImK#CahX#T3))s_JwdrTS zvw6a9L35qcDT>m&a*ni36IJYfd_eHt49mugSGO4SDP8)?y5z>gkCT>i8=e;vxnrMQ zDAg6+<#Svh$%5->!U5a!OnN;Xf}c!EWPGoGjjddJ{q@!o8QF<>-*R8gti8N!vGQ8= z&ugTo?tgHdu~Ws0N4QovYww=u?xYP%{DiB|O;Sntb4q`= z@T?-eYpPG8W-5jWoEE?8wS?od^U|XY!NQ$OE)&b=g} zE>}Ql$IG^b61-;*9@rLh?#BsXKWW9RYF@st8ifzPwO=Xzy^J;Hz_I|-R;9%nrv-0( zovTwjZ{aJi9T5vy?x{D4YKZK7dHi#KiI1nu6P}|2A>5~qTAe=Kv@Y3g{q)qG^JL_< z`PX*j{_mdLBKzo1sN&cE<&2_#)~_&5{rA)A{GqPt=QX=rg$_OAk9r?0tFno0nzex{ zUut!yQOY;BR}EpDij4eSIy>D0?;Uw6^y?9m_o?TdQmlW(S4!%{tR|h$|@<95)lPO?si$mg@G_#eU%ezrVuzsuDVz-v{!~ zcfP6mg0)qtE7B^Y`ds;nf@}TmowsiiEn<~FQ4X+aOzV;rnSYL?(^aolz%6GC|G;2 zM|@YAMT*(1<^r8#ZOVr?>~E3O{4EjlWY?+I)l%($f^Jq^nDyRSqP-)b=k&I7*7w%_ z{$lXrip?rUrM`lrVLShAJEyX@()qdk^UqZ~9Bdae1W)yu6lvME;)Gyki}6`6FV<7> zWkRN6UtV5cwc_jQqsIc~ihWsjOnN16{aGEw$MMxlwfBk>Cn|2WnP9i&(x&piEY;kz zTUe5fWm*p(kl|xnXe`FJ+2`F>;Z5oh>B;#U^`chWPYc!FAENcj*RG-TX}G4``hw3# zJtL;ag^T68*!$X_owaM<1&-@JlEn=s6IuHk*)M*Pzccqr<}pK2l_{;KRxPtHinJ^H zYIang`PS8{`#M|0`?gx#YOS-EzjpYkwAGDW6&I#+hSb8RK|P1;%e z=g#fVc^fptYmYr$>QP_me2h)(_Jixvk3<%{aPUz*wJCJb6>+hB+G*c?f4=<5(j0Uu z?11emp}&j0|5qyQ|MH0SYW3BE*1f)Q^B?-ldYtn5eSX&dw67nhT)%b8?!DL7eL7zw z=9Sz2{JT)vW%oR7h8(e3f3|=7F8AiWNnlXwy}L;ZMVW5#U-z3+w(W0Y*@E1PhKD;2 z$yF`>IHO(cR=$KwT*K*u8(l26wWv28csAqZc9nM~CyP$z+I3g7=6$o;70BCI`^Fuf`ypb59`E<6uo)m z85Q<0>T7b=v+B!#pU(T}voz;$A(Nd{@63~T4w&U!-;#T{i0QOQSjz3k9N|5deN301 zn1);ZGr9cmPC&U#w$067rIS{s@gDcM%5%Hi#q;_(iDj98FTEA^-YFw%nA5hV#ep#) zonwN`y_EcTu5ItMcP==zHu#k6S54KYA?^nr3FRmYNc>FEIOI5c$AcpNt~&w}gd z>QW_@`w6RhHH@M@`+kt*S(tj(W%7~+?U!6_n{TD=I;pj#_?*|inFUW@@Y?6OOsbLg z=4Esiv^rBD^N{N@$KnH@W8`}GZak@b{mYFLN#}0-G1mDyZ)TDSulu}{IoE&cP0QLA zvC4GO-$xaDtjbQVWLf{D+4L5l>be>R@1R4mJ&l=jPj$Rw)OP&v`QW;y{msU1g-w^H zGiaJ!*{tIwyQ-wcGWfUkTG68-m$j3))&4(Mm?4A2nc~fC*Gzflga1ycm9d#0y|87D#-W(wO8t>>DepoL z>`Re7_BT}W;>O;HZ&%do9({FMQYH2$>cO=``e!%`txjBdY_$5+S>^rpF`M@=a6CDy zl6QKJ=^=e<>r=aaoIF%8_pm{h#rZC$_uI=8-ki8_>QhryzFD2dCUtJcS1LLAhig>B ztox^BEwL(Fe6X>k_Vc|m-^`NeZojOXts3Fw1?JN~bSQt6E{!Xj_D0I3O!K`-?dS6y zdH?-H?n=!t4WAgVHQ~M8ytDp)9)ExD|NOGN{*#GuWv@QGKC8s{XH)ay^^0%koqomg zdQ)?nmeD8EXDhXBLwe#=qUNt5*Xsmzb5n^$i!d*v~?OHqH? zsupjQPOehf>i=@R;ze7feY00{Cs(cg_ATV0?qT;mbK;~o7dOnl*~7Be$-*gM!dc(L z+l2ZLv3ey=>2xsLcwK8*22ZyjZ>cQvVpoHyx694u_3z}(G_-cC?NnT+TJ%zpL-ADZ z{9V7KlV<}4|DSjx$80AHZF08wtgJ@t?HGk zxr{FyucaCNKIl?lyZiR{zBh{J8<>yZm0{t`DayRF`cUSF-D~w4TNCFWWV*;8vr2IO zBpaiDstvalb{zS)=;p%(^+M~mO{}kOPsqI_qHuP_1GO*Lo_Ji{Ex<4#G0NMQIoiwc z?%~)Y>N#(tTIHPW7P{&m5h`sdP2rEIa$LHja^t$Ey|>yp-@7qf`7y)5&S8yr!&RO+ z%r~5bm~(&Kn!iqvf)Cie}lU+MNxY;fJCHfx`#$<&K?{9h`+-!^&E z!SaV)4O>nY{F77YRj_2c;Vq^s=Hl^x`^!IvuP)yy6<-&)zc=0Z%p3iDiI4-*T5HlK zx^~=F-;(GyQF6`p7mVFMD(q(0IL!RG{&M%rKis8H?v~V5))gq$j&c+le%*V!!WXY$`vxCfT)G0H7J{yRU#<8D^1XT#6O z1&?0;?fJy;$KlJl!ntV&zU>eGzg6dO(L0Z4$TPbYTt`p4Vp5E%Oju!{G zWe1oB{VXV(TrZXWKK*h3tMZ>lJ9k+9ud&Nqxo(B)%6u`O9a$BAtDjujA^RbvIz#%| z^#AeVm$xccTu9jC_4CTL~7^3*~-1+=xY!i-txhwwo&*u_7 zM{UF2Gmhb(Ph`Kn^J3#twwpC8e`hizty^?KjZLJVO}AU@^gr*et0h$j=CZM@o>u*v zW6m4xu+ad>Iu&m6{wgW!<@+te zy^!rwLb(G2ch?+K*=zPve^+}%A1r;9$GCU5i-&6+$Aa`@+SlWbuhg$~+H}FK*mLRw z8;bA8Q+g9JPs(tGjJyx&1)Qg@ep{9WKvlo9iOTc6vc$)})NXD{8L?O`Wvm z^@OKil6P42mpRID7K%UP%G)&M?&rl7v3>^|q*q>D;Ste(%xKx26|U)qGqOy-ylG-P z7gO!%5^?XNk9b*Uf_MD%E2-1@s`gCb<~ej=k*~SW3$eMy7fv^dD|bT@Z6~iS0zXXdLlo-3# zJz?ql5w#}&#D$yU&!%0gRCQoF_iS3&j2kn(4OSmBxmvJf_y^mIOlwaj z$j%{t#dp7r!hfLeFLY?5&q>*r5<>_bx!yIK?gNMBMxL9Wh!l4}zT-7fw1F#W$(4 zB;mv}=h7PECKg}44xQf>rIn`pcg^vO%JTOr*)nCBol;oZ&r@?cPG#NM<5}#Hx@*>j z;xlWr-aP%;Qkf}~d`b6%Mw{cr#)pg=x*?C3m;YJ$oz;8OBi%zkmdf;eF%XP>p8X-% zc=g^p?dPhJkF4_*3BSfL_nS-Sf^{BFo%WM=zJIld|BK>gHpaZ%z0321g@TOjZZ0r* z%gk&a=2G_KMb0zMr#<3p&3C>Gl%I9zPJyw3+^;*&>wfNtNiEuQ&)+-k(W%LrcWYNq zQNH!sI*{c@D8J8XyDL5~(w`L=s?=HK`Ct7fVje!T<+bmv_7an__Uj#W=4YAs_4uac zv0bQb+?FcDJ#S~~(sg$^lsBdnvut_%`az(%p5yxI&$jU zOPWBJUDvD$&xBUWyvfnre>426c3YIxi%`eTUvvMhkdm@f^wo)4XgX8sXP%hqQC6`S z&%?J$FL__{l)Bk`s)*Hgy~@eW`{&>8V_$2|7W6{bDg0}lQQ)3nIpZ6Tgf&DaU1sTu z-M2`U!|!~{gD~%NztoOD(O9u1rZ(r=$*cX(%rmquE1cd?e)awS&&p>?3%Nu#@2wEC z$z)Mjp=zafgK?IC|N7cxd;T3+v_5Lqn!u`y-G^6ho!G0BAIV(e{P^*Y&F{9@ZI9pl z=1S&1CLe7+@d&wJp|^rG>cbOv?0D{VnSbu(8ylzim3u6hK2`6e$aKT&%TmIhuKGJ= zs%JRIt7}$|`K`(AXUgK--*p}0i@GJ)Dkrj8ReMv2cgCsp zvsQtv&oBub;-Wgy!|_8w%xJ5Jk2!uTivq#9G9LL{OX&3X{xEvtt1}h?cpr< zPvx#y6&&y^iv9Spx$iCX?zSdf(7)dk>T-RuR4MN=;hLuD=Y#YoUVju!<;pSoRsCjG+B|3{NELyxo*FF3YLcKcWPG-UVM0S&->0hteYn=eLw8} zHu==iMYeuz`F;E5?_#bkH~OZOK4n_RYKw~Yl5Xc8AydvPp4M9OV9vX~gU@D2{r$90 z<7a8@+yg2JjZGoj-z+wZ_Q_kYH(Kp$a5lfO__|29TU&SKnf|=y$aVYik>}P&UwZEB zQAw~|T`+NTL;sh9e2%kbF6Iam5?|*uRq62Ib;`Fpr+pP#zQSjZ+{CFy`wum+O};7H zt{Ncych0Vp>wQ!1uq=+5Wj9MrQ;T7yU7(3m)%6p59GHUUpE6dy&3ZiK?vHJ!d#27j z+P3>*_)OmgB3+)Bw@sK^yZE-1@aO2umv%}gJ~_MfA3xuVJ*@XHX_jhds~`1jDLBik zR3UXud`pn6d*_}rPyX;TfctN!{a!op-2E)dI89{b9u*ZX@4ALn(k-i2`35XCTQJFM z!-M-XldEmcZ^?YQY4zz`qy8HwZ#i*Tz8ep#UGRY!j(Mz-1i^u=B zez3Ot`tsV8`Mb?;e*Jgyui~ZO^(sFkpZ~m zZ>HV0I49rzv&Z6ia+MeQA<@S8npnX!cdP{jJk_4wo+F zD78~DTCsTMXSH%8Z`1D*7V}mq?JC&&=)B{3`-dH8B{js1-*weMgnm*!{`ZSW^yRlQd+!MNT+v`z_GkG^*A=dRj?Mg`H^t-A&$k&rGPcV1 zy?O4uaQnVBr_25Jewg;@>eiUF!>3MX9&3Ia|J(N9s(fi@N9*^uyl!j!;I4nW>ie|K|K6T`d-uz;b+PYztG=1u z|6RTMC!hCeLBIZ2?*sqZuG-HYRBznktG@R7B>mf0?v=E2EM|OTd*HK<`u)#Ot1^EE z+aB!|_`aM|>&A9P*VAVnw`uGCFDp9uzt6XPVS{h>8jK3kDYW(bKF<=!6Q=d^Smn!)iK7oaursN zCVk6=1Gc-gmD|6hhT-)(5kN5qwvW2^E zR0?dU%3jnkX%b7^uBj)?yC(!Q|7QRtbtZigRxsmEY;^uBH-S37{YlzSJr-UOnKtRc z1?8X|e5o_%wsCOft2{7P+$ zzzo;Fvd1PmZfgqdevuf~^5esj##8PhH`K04C25-TMt{7&XOe`aN#U%OrBlDL*1JBd z39ww!t+0@DQ3;#fuOA^>XE|HWUwx6MGHj;Z3DcQz_s`V4{keMkrEcbV+dWI70t1hi zKDjYrk)_ywi%qRrcOz2-`eskNKbz~pi#Cg*kTqJbTo)OyU-44Xcgxg&LcfD$lyz6B^5UM5n2&yZPy)=jo1D`u!^t@&TF+?m$@{NRHtYDVRAHtGJ<-Q`#>y5#1&Pdpo9b3dm| zI*}G6xoPMqq*yzSOzmrZMW5|%cqHU-&4{GGPq(!5G5-OlYH z_qQ&6Cf0BLFR5p3;HjXkn}62Ep8vO^dEVxemp5dquD-eb^{w|CUSAeoQ}XzFgWu!& z?>|<&Yq$_&aWFIL=J!?a|E%tEJO296yZb+HoVlY{pmw<`Y>sn@diG*d*%|BZ&uP$` zo~7RMBUUgdg7c;(L-dAoSL?1hefTSRUnh0;qn7Ume4a-(V7%!b;Hf?R-DebDm zo=Z!<%<^*6K3yRnu>bz_slAglrtm2Ap1kehylq-rjxw*u!z}OH))H^Sj|PTV_FAvp zC2xN1oU~8Cnhjnil70#`7g|j1)Y`v%`X2t*D*64>hI2oqH<`R^TKfLpGzS3?u8P%D zW-Yidrq(-SqI~mAHf80legEncpDpJ<(4+WS)^~H5fy3GlvBo~vAAV4q zvu=s~T(-r=A7TaX_3;0^C>ZCxV(r?GaivuY=Oq4AQ|=La#cn--6ED!=Xh3D=1-W}|HM5YPuOAog>ANW`$B(C zKXlD&lEOr*19#?ZzjNsOmLO}}1$@qSGP(VdoHoX>KQ?&S6z#jJy|C+fuNOQ+4Bwe{l9(q^fdf$qEW*In}5z9#IFnZ%6iS7vuwuL}2X{8Gx# zZrD^W^}pC~*RFpdvTJ`z{rr*WTybUjd#fkzpAK|iF;o+s>XLusLwM%@WYwDZRW)fh zUoBe|HBarNWvCqQfyqLJQ*=&*+Q(S!7hpM8boTfH=cA?WmsEX=6Y&2_ z>GKfl4|V_77*_-5Bt=8SCE%_?SGw-HprXD+_SQ7o| zM25Ib#Gk|BYj$gR?0>8k_hMDa>i6a+zkXkLO1)xj*Sv|7Z3Caa+yC(1Y0H!QU)-DU z``Y+RrHh4Ui55|fn_KI{1F z$ONy>suR~YpPg%dL3Uw~_Sa*Xlg|jma2;N1*dN`Q0@KN}bBd0m@q_6u}%e(z-7teBBG|M=I~+Z$fK+Vu0&r8s@f zhrDNb*7FxS7)UWVdb2oBNj@u2v}UR}${I^Cz#q?|st!_uC)6zyFq3Dmp`y zYqpH+O|`SdHR5f8Yp3~a+h#HO1uG-#)+YP@6FV2B-IuM=n_Cjpx&M&=g6E7}i>hV? z+8pWa>}A->^wWAhgOu7NUiD4a7C3}h8(1bzZRzlRIPde1q%~iCo^?#_JG$#k+d9Wp zrQ4SC2#7Ou#fQ9o-q@MVzV}>a|LGq>foZ{iIwcE^vMuUb_%&kojpwUhpT0Q%gynz7 zWz(;)+aI{FDp9qFw{>>Qo5c|-_nv0O&bYL$Tk_j-O+Jf;@C)}BGA=&*D_kVN^y5vL zXLFQ{Z*4#HUHg@{`}(4$3lAQ723XCAOI=;Eb?fEmHOrsgIhI^ic_Dn|)W-iii`Guy zsw&=Oyvy**Um2fS8lgW}3W|;wuWd6wYy9=9>+C-hmsvbD*6{sS#P<4}q0U0zQ#3&3}CPaLrbuo*jT%_Y8{j&4NciEqgzVOLF`)c#$Wd#maEI)Q`?-cUywE6Gc z;&IS*vC2v2L#$mQ6%zAy?JG?w_Pw^CZ?R~$lU%Ri>6hj*dnHdhG2G(#ajocYsQvt{ z`*SPRo*aJnB_p7Eb!p_bFIAqpzppQRai($BxhwDgR=$5Tp({4@yPnHt^8&?Ldu|$r z-;%x5^ZM|rpElmJUxof*$@#~U^AFs0le)XX^LqF04euW;xmg-l5P3pIVVdwRj{8h( zav$~l^iJt$FdkFRxi0miD(!@?b%64PvPaV$rXFcd%NM9-Q@lQ_IMey`s)~SW&J`S0 zt!!Ve6`x>D*l@O`!mMu5`MVA8HnB}@INJH4OXB6NH7;ACHwy_a-ts{CNJD7MmPDOX z6PQ-~Vx0eD0poYx7Ydq7zOlSmm@ z=f3nyh-2U8Ltd{ECb`|ZZpyYtoO9dGT`aG}liC9ApHLG0qPA1_8Q00xCR1F^x{@!Q zpH&@qVePkH>k93^8+QEuQnSvxwfx@8lJ$1+Up>n#Q>v*g8cN7c!_J;cOK8-Ve5g&3UdA{S9mqJ#nqL1}UP24%* z=<1vltM%H({_gG%U(Y`5xLN4)mgv^h({eI07Ta{1luURuoyG1|-042Q?DgiCzjAij zabBLPHt*Z#$G10c%lNI{eSK4+cEp}pvgtbo&ur>!HqW%0TrlMiAL|R*;9!gMQjN1% zRi8SZIi?rAvLSoQs|`>8$nL0LI_JMZVKjSKIEc!c!idR!}JzZBUi9~S6(HcIcv z68^|<98dpdJo5Fe5-f}I;fV-&zs6fC;{TIZv#wk-yPW)5DdI8L^DWC?o>?HqSHEP* zJ>^TyDrHmpbl-O8*b5a*4>>gZ@8Q~&DuD-WKYqA+d-1b{v0qdZE(Gr5^~e)-i~9Of z)5z*=XJ%?}yvUbgJ;8>F?QK6)V#tm^z@CR1S8 z|4+5wAFc7$%`)3rF12Bo`>{5gErOR!HqLTSbM4^}uKwe!q3*pm%kxT9@he?+nZJTd zFPyaHwd`<^oV>qn%Yk%;^UnoUod2CZx!rF%kLW)M)|;!$Sg-!=eCpn|g=6j4kle_{ zdwsX^b1f0rJZ&o1@5$^eYW$MzLbf4p7ZV=`HnVS8^W@%)O9v-kUd>xjzmNM5-^;|T ze76-l_C~UNmMr+&{`PF($J$K~Up}{D_PZt7WM9Eh)}N~P_S=L&@ulDUx|{41S6^Le zUlaLm>n4$B@u!y?_Z^pv(K4-b+;;G8!TBE&KORnd%lygl)th%$4cBj9a_GV1_}KGL z{2s{3^Uu(^WV~DSiqBcKuahi)af5~p_Qc-xzwN;DKU_&=N!b#PB^xtCK5XdU&bjQO ztzt`tbbyPe*QHB2!T-O{t^GE)cITGX_P32oPd+W0zwP|Lo7?{1@lib~>vLG*Uj zU(0@4{d2>wX)-&`olJWDYbCi7{;cmG<9IIVe(IXH z;NQQQc?OM_W4)*TQ`Q$qJDYOKiffKqTh!a5Cj+I+H}tV(s<#Wdt(IJ7%DE*o%yEi# zw$;U_nVEb#ZUW2`*8lt)k>B;@#Uw!;iJ6(A_R*7U^Bz2i50Gf zZn=4OAC}l?i#CS* znEdnX!q<1&2OXsGx&QWi#6* zu7vLI%L^qH{F~X9o_uDnWn_3qYKlbZw#2W8j+<_byWL_g z@>KFm+2+WdO`+}c)cq|TEegOdZHEWckIskzKPh^_-vMuXbgX7tmv=IqmuRRNr{vKN+U4U!5O+?*Akh+a6=2y}Ik@G>3$Sx!W|?_#a$*_wGJ5+~UMm9AY5*9;SyG?CZVbdAdH)=3J&9GyGuYc{uhma@yXO}ClcI_<$m?f2dZ zpU(4$a65E19yWe*&5CFC+(?^<*FxW}$atON%$}xVo35-gBV<~#^Zc_F(_D{9KH9YC zm;)1wcr$+_KSSX0lE{Y(lI|V4>GO6{xoy9G+s~JpDn<%@&Yr0bl}tKp65Qb`wp(4z zG}Vrn8tzzd_NR=k{iP=bJV7kWvf{Ko6}KmrhwS*Lee9or2jgG2&DAD<7@y4!KhN>m zz?w(kLHiZ6{>09L9e!*g7cAUzLqwUvTiDcmS(p!9xiou@s=VvItoik;7Jv9y9az;} z$9kew!s~)_y`AsAC`Be+cNOginmu!$xyw~$@W0mPzpkKr$orY0REJQ*;*bd!9P=YK z=M-K(_H9knYoDDF8^x7RHM;4B%*m}enwh8MHSX#V-B%%jd2P&d}ZUWU^6-ob0b>=CxZ5_k1zB z`u5_s=Luy>-WmTF%6ACzmL}+g%ij?SRXQqBur;=-&f~Jq`HhF9+}B-R<@c38=Co?n%fB8^`+InH z%LN6tzPZY|bVHCjQ`qVXX`b2H(i57bzjc;ZaP#DvJKx?IAzmOYXf)yCWybxg+s_so zZ*2d=@hIxYX`3j1vNk1qv%p2~m3MU(EII-56l?Wu+TF8JrZt6F!F)0~;-_PtXjF%e(a>OD~@i_(gAd*-j7SJD2K z>6>X%KJ#`RZ@J2KQ|?~AEnRZ|htw&VE~U6zvmZs-?3`tDY3i-g9FJl{ z^XFngD-MNyO4z;sbn>-nSAVbAXYz7;{-b&O8(!bhU9(d#Q*usE)5PAWw&m#;`4>z( zHRH`8hR@aSj~jeH{&@FaHq-CIlXIAz%o63T9~3S>uz2J7j{COnY^zGnXS#Z=(*8AB zdsUL%?X=g1-sfjp{T6+o((`BaC7YF>jJ$$ zx&2ggyXe}cq}hjD)Vt4TRz*eaerC9Hi_>-6Wop$E^laE4zLNcX*gfu8$&(%PRzI!2 z^2bvv@X&$z6QjDnYV-Cydo|V0I%wYJ(2x1+CD+bbJmLI$g_cKK{8}cdy2L#3jDKF~ z!oE)|yZ8G^zMGEAYSVt6ZkfU<VnFrhnAS-Y@lWn8nJ!xzy&-o0$5x zjnCD^PX0d<_DRhyv6ETBA^S+%#MX)Orw*TV+Oq1s?39OhSFMbH6Z^XO_71`SIllin zd=_81&oHcb4U90^OkLzTX<(#uHNH^%u{XzEb^a{qkj3%`@69XDjGp%e|Kyt zzs%pMI+5Yv(R^|4H`#Olq~2GZxnkj)?BMI^ooaG!mlKb_@7MG5yT9Mo>Zbhl+*rvA zaWXuTC9l7Q=XB|6#vi#S*B#>jK&d}$gQMv5Rrj7fReO4F|JqL3slu;Mw!MFT`=50| z^#057Ho$*-^|bU z&D%NiQ{BB>?l^M?&28OHiA`+f>g;w0PCo36k-O$nW0n~jzWR+wk@flsPop!hPd}SA z@8iEfkJarvs(tS}r@b?r{O!ljTNa_!Pv6{Fd89&j^Xdu7H=F#!7VunTWZi52LhIk5 ziO(NhlF>Y;@YJzF;DX+4KaEMzeHvyybpmTAWfs1gYHK^w`hvcc_S+?zX+`z=7bW&j zD4DRXGAK=L*Ak|Azp5`=e9<`R`p$(bcJjUDJ8D8Jt5hQwNxc#~ayazGilc5T^vte) z+ByF;XRjRl96lLAp-(EeL$6LyS?WB0x7e5VXl?oHWt)3W9>f8lDqGhux*-oT_Ua(|V&5ALX{stkNaO2upm@%O zzp_+`NxGp>&qp&QMeO8(>4m#4>b=W&UvlaAm!JF}Ppv<$!3Dw>Algf`O3|&O2n1> zZOW>)oGQD;EJanU^@KpyA-iac*Q+eH= z<*{M7 z(J|GNOUm`S_&>ey6>-scdEWEJ(q9@}N{wqnu5j*8a1UFa*?Fho`lam;J_XG_8?Swf-RcmX`01Z=j?hzXyYIKRAK_1}cq4LR z)4|XmW^2OP|Asu;%Q2Db%<|NDp);onk6u0-Ds^&N{)9T^4R55rx2Im;!LGBG&+f7H zp-Y!`|2JN7WTTD5l-Ro~7`=`jUHGmtcI||g`(Fa@E;DF-KmE}1H(FuJ$-b3L=1W%W zRF&;aa$PewmSy*up#N*qy%n1)4Q;*V&0IdG=gGcKkA10GZB@&*TfRIU)#51^8zdR@ zspO$bQIJ00!sDAS*K0WI+?d1jbb*Bbv$Tgca}NGvUFq^Xt>W3X0~X8zr?U%N&ac?S zo^BM)wE2zHLM`3{FLYuy{p*lESMZ?H_Pm_Lp4WUj#W!Rl8?QfYj=R1!_I~@_)~h$- zb(b5SIB6cZhhwhg?*oYu+~1N5eC6YGcko-y;JdpoM<%GR%qBTzV{$sr?I}$oS8gT|e!j`L@gozw@7T!mqdY3HLNDO#PkN!pHVd<87*h-#^*Md1w5@ALr>b zAIh7+Gwb42p6<25TV^d`=+&Jnpuer|z$_JQ^;-vJg_e0le40IBYuxDt{{p6TFK*#h z%=>zKx8%l!rJZN2N-N*gJX6wT_&p=;=aHz#hs_`VUHm;tWLK4tv;TX`W6Zf*?}SSH zj52EFzBR>tgL`v##Ds-A@3rNLpFH`6W82)_IWl$6t}Eso{CHJM?pde%+>eqOK1mfP zryqGf{p7i`8|p8Jko?Y(nK6v@Rn; z&G`FqxBdI|wi+#wdk*E56?kcWS=DrGQMpaoWjhzyx7qFt3lFl`>7JFkc0|2k>5=7$ zH=F%k&s9}3H5J*g&6_Y^CA{=*-hmRx8T`^O)3D``nQ|^29)w=e9 z=8xo{T3^*CoGDgK|4sL*Dog86mG*z^?s6t{(o+S&7^X#mV$XV**)EAWR|r{YF$+F! z=YFSqIU-5j^9Rq5bjL8^I_FE*{2%umUNZ4#v5uu^X3IQj{cYYk+jYec95zr4KXl^f zuhxgIPvT|fKFQ;Wm}e!iU1sxP|{znrI_svFz=w4YOYDddcg1+hq5<6&)!{Co*jQ#5^@YPH5i8{?1VS zh;vIKUhcR#%j%>_WF2GGN$t08RsGu{-2Oe=eIZC*fnol}?TrT_^wtYCZO~`v=y}|| zEB03Ssv;?ub1oq_4?c5U>G$REqa1_ZKQpEZMRB-S>h%9T!1|`8^;=I)2;Ud1_*QU(ajDOrM)`!db=9B5ZS#zMg*=64%g^cTeBPO9VfxT* zhiVg~zQnwB$leyW_hxI@`9!Ag^R^f6O}xc8!6Y)%;pgcG%i?CIai_MM z73-O*L1TILP99{KwnIJ-sUIcben3oUCD$zuoaf*{4&f-ko1G zK+gER$detC44gL=qGcNYdn`HJ&)LtkH&BM}lR>(;_>HGW&u~8HUF)TCk|ABlW9p|B z3v&geqFxs6JaJ)(M9r~#x)u|IBIJ%Vb=7zrZqjXix8kPu#Bxv5!`~l!%ET5ksua-x>uK zFx(F>nZWBT?ko_KGs}(t=8YqBQk)MS-=W;~Tyy!;Ti^9!m=)Eu%GInFyo^~lZPuPX zZLnDFT(_iM!uQH35v99@<>?Xa#DSO_uCH5jmexLN0zt|_p{<|fs+qQwPvOA8`qg9%pHH*`RYubvPN-^v6s@RfTD?p_FGLCpPX^) za-3rJ`ncsHYf|n!nQ`gX;+ACa-WEVpCY+nXCYU-DLeD@b4~D_o@|)!n&zhlA1H?#mqiXRDoC95Qv= zKkz2CO`AeL@O<08!C>nZ)0WK)Yhq*bn+!y1%l02i@!oc%Uqj*1yk~Rx(`HK;Z+2%E z72C`!ZZGuxefjxZ$Hb!!UzR5A%x#?a?OyThdr~K-&WwpX8QNZ;W9s*Ht9=Gf+vDw- z|5Ghy@0y(W^`@+4?@JxQcf8tDoBt$Sdb`acw>YaHt0-$}@5vb(WPERz+Rb}gXi_(; z|L*sejM@jS-M8zOzuC7#NN8vKFD2W9*2}(yZgb3kH-%xDmQQ*{ht~3$I^UuaE-l!- z^4xXH(3;qFuj&qOTbX$Ld)3)xncrjttLn55CzdWv{r~#i2a9)Q6$+R8pKLQsZ2c(F z5Oip^rd{RDIVE~87I1HC%ir@uwK+pGg1>P=QO~8b=KZ@gEH6BdshhoU8~^Ft4{IfJ zwsITX=ALk?_{W>ZlW|vzR=hdf@8aweuBkr7vTI(D+b?F-NiP>Ts{V1Vlgw-lQ`}Q# zp2M#8a%vez{d(6YioMs2wytV$R`p`I>&D&2wfsx?%<12aj`;Kbz4rh4)m>H{j3=}M zT?`a1K6MXqn6m48%2M8^-PT1%Q;R=E?{u5-Wp32@h{WfNim$l!eiw*ynyyRC_L4kQ zcSi4V@Zx6MnjZ(7B3JEp{-IiMH(@K=_GcCK(k#tSqgu8f^O3pBbk_P?A?Hmqx6W|a z@DHm`AD@4IWwg>_2|m+%0sC7DY|^QIV?t#rdmrHbZOK_P^oyWFt8N=!b zhYROi6OL8SX5KFxr1|FQ>7@%Q+m27;jKVI#fh}n^U;1QcMv602n=0bJL>W)qcF4O3iNqon+d6mn>jbV#U zXid_zf0K7MNiQp@E2S{wq~Fuy`Q^+rnwMyL-D`j0s=|KYK}Jb^?ShGZ&m{uGPN;Nc zxG5e@`)-n}x^=DD--_qSy$5u{Kiv6hlaO_YD|XtGoyocC%h#UW!kLjRs3N&(Qj7J> zYqPQw*{|OUENafJ-TQ{^ew6+%onu=+&f708nfrRtx8$~slQ|wn8TvoE@Xc16JLlje z1A#-InY-1eJvKVF=~VyE(|_{P=5RYm9DA9=6l?fzVpsbakuOh|TQFOgoetY-{Mr11 znBHcIV%8fu4)e^VUHMN)!Ml;EOs_@Ftq!6 zcda<)AmroG^@?}iuk}Ieyt_?iIXDDIpDT4>e3kOU@8z}wI@y=M+*me2(j`Kx{+7eH z+^tblnja@unp&%^Tdb3|K=fav&+-k<481NN&ibew?RTwmI&1QqtGl^q#gdlnhGvGN zcdm0@SyUo5v6Qp_v5xl1WyP0yk6(X&F{8#xMt;TOqYD2SUYhC&I9hD83%|8WN%+G3 zZWHD6EsY+0S@B9U1KrrB%ywtI9!nWQZg^;_hgDp+-DR(FlkbbX|M@NA&8wEC z%{sau_;S^WfTqVb%~sDI<$Zko=<$=3rp=$+bSCc>j(KO!@XOz!xb(M-viLi3^=Z;< z`wr(m+Z)++TzK2`#do}O)nfDvYAn8QvJqJ6v14)-gOKgK--QC)X@>7D`##;W%$t=t zV`Y!n1chd6RW6 z=<0O}%3d*@Icc|yp~#z~KaFyQT6f*dtU*6=4_RVhY*#FO`I$U-h zOCisz-I;8O0>%2@ubEz6zy0F0&e`WrCLcXyNu^&&B9`T~Ok>Qlh*fV> z4cS(OektDQBrB?HaM@lU*j$t0=TVjjrc?t5wNDyPZk{ep+ai{KIcM?gGtcF@KY7a} z>ddnHf9Gx4)0H)`442mmJU+N$3v*@a>?v)&m#qwCa*Z-ihi#rDlWscsZ@z2C6ZNT; z>u=}&bNJd7dUKbV<8-xoYfEmwKb>Z4nGusaJu;);s%WOVEbpQ{=DTG7wudSE>{XL9 zn#;Ppa>CcImk$1J3OyMvd*;T?O5WN;+lnvmZ?4`ob=T3lcD{2=N?oF5GtS9tip#xq z+bSHoJK#?!yD#hIb6y$YAf4 zP7~gg8^&xli`h-+M}&^jne1zFYuP+?cr26s9rauv2}+YVR8H`z?JGtR4SzWO2KOQze#II#kW{Dhm#w=aFrxbVS4 z={2LH4%VNxqRohQXjXK!V_0Sm*uTL*O$LuFH7({qo7Ks$F8Mr zVZoPs-g({MvNWwm{lfpI<@0Zu&-dUly#79O&l2^CjaD9Oa*j#w4Lu%FsIywmbXfzl z6Uq><3f4<}?*VMc-cA9UXe5URp7tH`Bn~ZM&(yg46jg4p$WTZk@ciYGy;H z;rBy2m2)iTO+UW!D6{%kUVqOO0T7FZgid3I!~Z~4~y;FpjWpScb40Qbx&e8-&8y8=giD!cQ)nb zRW|MqUYT#cIdo;d_`;=+pO`#da*cUT#xmWuSu?tJ{QD@{v8V25>NcVIXLpAig#LZs zB~$y+;;BTb_Wq10_eusWucr?2n(`Z11g30{&I>M1@wyg2Rc!An6S>!ix2)6d5&!A3 z&OkIy`Sl7zNyB3`tFF8i>@zs^ae=Vpf#sJ^-HZ2RwiYn--kILo_Bs9<0q1WR~8Z{{HAk6N#q=lgl2~{b8NPF5;KWbAj*r zGr4_JRvX+&cy3*hJxk3`&bsgMF9v=KekQ&piOV@ZORy)Mkcl`nCHnlswWju_z5zya z1)4X^75@BYWsnRZE;*hj|N{U0E z`mFaFZ5OZpwQBjhNhe&|r%r$7y+`l$Ma-)$xmW${nXj`*mU-og$VaJ`UPqCqqeV9>WiDuW##1c3*t^vVHc8B#RpRHw+ISEMY8mzqf8W1M~Ed zL?yu)n`^FJRtcCLf)3+vgp?)l2_ zD*f`;w)*|5(uX=enNF;53U-V%E)g>CKVIZy$eR@Z`M25f>(g4!ic8f04L#Ugwc9+c zZ2d)r+?=xc&z`=Je!g^G#bPHR%i=vMK9UT@w@WL+MiQN*aBbW%q9^lN9A z#VacWj-6)`IQ@rl#}vua{q|EI?fYXgdrQAytR6R$a38DGn*&doZ(n}ik;AL@DRd>z zdyzi(?}rj>m<@F+I?`5f`Lyg|R9olZBi(nmU$gGP!iaO}BK9t?l1nN}YX$f2-*Y4+ z)jq!0U45T+=^+g!y9(1i7Sg9xZ6}y#-8;UeWK)qz9lLP8&kM0hp+i^G{y7H`y%A*~?78`WUunttm4ZUMBkK(eVr#?0!>@O0S-p_z zn)<%{)*_+07BATs+m?o8AE-LT^>$6VR8E+DW`oK~`<%C7vkp$)9~f-^V6N6qu}amX z+KP=!FNz3sCqA8Tx%`@5 zHO}3?+J0G`i45=ZQ};tFBKkyY_~-oiaQd~#zxp4aKELIV`}EZMX$F71yK4!um__jqVE^(D`X054P1l{eo%JC!Mau z>Ob|I;fk-zXC*1zZf$(?!1}kMoBW)a7j&L%-_mo?f2u#fpP#`USF={j&)Qk;xP^RpJ=7{vGat|{HK=!UpHNd-+c6EjNpV#M-R#U4`}=+W0dQ%hWVMO zMs)oXdm&X#pG}?yTx*`Ccr96eg^8=n{Nky!@4HsbYLjF5c+vJRYx$n=9glT)Butg5 z^q#Ssr}U`l|6ZkOy|FXmw?wFBK3}D(wSh_6K*cqWL2^=8V?pMLlq1objRjy!+!zW z{{BAazxb$4T}#!ZGPll$u8nNZFK>7t#XtGNWm$!32g)K26uTPA#3Y37oqj^a{?I{n zUeP^rXKHWXHh(R(YLd^Sv#PEeo(djoUMeoAl&qe}D5ssJvhK#S=W1(3UbfAs*S^|% z{KywijcptDA7VI>I=5+&(xSt$U@YhRK$P+H z0+l+)+@5t-cm5sxX}DX2(^z-TS{@t5=U(h3yLvxsth=IPUtI9yMzGaR*|q@o_u_AC z)pVaf(o(Vd4J z`O{CW|CN5}%tz+vSMO4;O|6;WJmr$tMlILre?9JnEWROszG(5nc253?n`)Eivrd>| zC>3$^jhA2H?8ol=?q{qMY&&N?TVsX?m!4oC^S8#GEs}mSCoVUby7;Kb(WAMW-W_!@ zocS@oP^d_pt0_}P<)&Hg#%i9bE9;N?D0&ZS)-bbf!c_Wb6X2{GcW5ju9#sw^g%XJojiJbrS<`1E$3T7k;S_6w7| z9jl+ScHQn|GYs-opB$LTup`w;pZg4l_VdTb6_>A@H^KeLmHE60#nm%-ue!@>CzUMPE9EF}o-?nE(PTbd?y7T|n&7T&3(tmnYZqB8>CEvQ7r4u`z z2XS@GVaf@9u{ewMr@h(DX%}lZ-F&!m!nIV^z4z|5=$!lb;K6ghaMMuU`sUA@%00il z2#}E|HIQHW+BNE;@L40L@Xaxo`@S4u?7QB(HIGT;7EkTvZ>856I(&}^T2?Pw)%fzq ztX$T*KlX{CW>>`(EaSc78x9%$`a7}Z{~H~r-_B0P8B02j928D2a}3z1sjVt8rDy7| z$wxl!7*{5I_#5-@^TNjuubXT;Q%_ap=B}VQ%j|3tM7ypZ(GRhU%&@$i#@7C3 z_lcXG)1-e0&)4;waDd^WV$rEh*KM4`w)xIb=l*vf;FFR4G=s-Zi*=*TQ)0q0H@`}* z(yec63>V%J^7GpS$L{Vx*Oco=tvy*zCOERsnkL&nQ)F}QsWrMfwkLj@72lg+D-@dg z`KIf%^}R1ukDsYB{XF@{)IIV?-bTqx-mz7AitGN)^cNYfO}>_TMmCQ$Z70Yskv}JX zB<+E&zC@b`V_IKPG2bI~qeX|?W5f;^#NUdIh`zj_pswxc6EB^5z35{FztoSvKNrBY zZ*FL=_Ip3Qd-?8}^Vyn>GS;21KK%NZvecdhp$iwxs9Zedw~L33AOE@E&&7{lXP2)! zCC~M*wBXynH}jXjU$1xczKT%3GUq~%gh|?8O^gdv7sSE+``=&X2RZWh*(4o{x&OTUy|L)$?cgrHKQeY}|Hc>} zvXVFC`L*0@CfD3A6T4R5Ic(kIlwX`+IWx0?M=JP#=VA%*`IkR@QrNy{zg?f(tV;{$ z`^C+FGJj@?!;vcw_sw1vB3&mG;Q!iu&z@6ZqHk6+{ElKz{*t7A=9fjC`n-=WTs%{>N@iaC z!g}tfM=PBiS35|Ul}&iraWisq&YhdFiHjpmb9PtUe;*$3G||9QT72KWrP;Yx|FedM zEzq(rv@rXGIt!Y|fXX+f#eIzvMpGVT+#K z8=viTn-Jkf@VF{tN%{)>pLohg?MJ(}>vP4Jit zbR$x`a@L)_PqS@YH5IaCeXk#~Yh3TWVq&3|3QpkoC*Gv&r5=C1aV2Zj3(LeANBRVrr!Q@tC(H8TRN0yX@5;6+Z1L4E zziZdQ_OYY&&-_1ybC&JGNo!%5$)V%fb@Ov>YppG>~3^RmH0 zE02SJkzw@W$<^ns><lPt{6y4-bPp1X1Hs;tUb=gV6T6vZ82vR37j z_*N)sWz)_7rg-zuE)mNUrZe6PeUF%W`C3)G=JkD^`4aj(u@M^&goPgWk+C=XIw8;d z__m{;uDJ=Q|PSLtZsoHaT89GrXJ*Dp9WDRb|}_ad=|BEo$yudTZ= z;jNCZXL7YtaE9}2rDJxzo_U*={dxN;#?tQhfHQu)MJAw%bD9Ql1Cu)(1AP z?q*sXm0(c5cCqM_b*sBQ<`ig7T=p{B=BbFd!7&|o2d@Wxer+<-d>R;d9nQw9|FdO& zxn^Eg`qPleuI}dA(h18>{f@s9ZtgQ|zv;8u0=I??RtdVDeUNPvY%=DgjcG91ZlZ%88ONxCgRS&+Fbt>bb zbJ(WEMg0fPu^(pAP>np?HuJkvr^FlgIj0=5T(z~b(qEcPcy#)h=N11$Yt1C(bysgt zT@vK|ypMN-@8lgvmadz1Mm_SUruE~M2g|Qq(3^eFSZ`kS!@G+nAF;DGXw67vs!^kL=RWL>Q(S`lh|a$(q6#r7zpU(c7c zSQRWuOsEXJ(;K7w=|Zv|kJ9b$TQ6+0J-o?Ox#LbR&&T3z9-)gbd~!O@d*_3yrP~^z z{uWD_YZHa`y?O9{o0-i!ZELB3powjZW3^W;@LId4NoDINuBt1iv^yA|o|n0zD)80N zu2^Hb!`Tzbc9w@%)WxRVZFed|^jx^?2L6|1-$j$i*Wq4tRU8N0Cl7%|u7Uq1f6v~tPO zQ#rO<-EZF%mp@VVaJu2Dzv-ts{Tm}Lp6GnMHJN_rc8eWq$_sB|D5oq_)9?Zrxb}c)q8sSG0U%Qp3GSD zPX6cS%KuqDfhOf{q@o_+cGgi;TqM5Z>c7DE4-Q{-eZQ%{e$L^!VKYjsv)LC5ZjIZqbNAGv5&L%U{`BoAPr8xq ziKnUl3tKWo?uGB{PW<`IU&g9xWs2V1DG_@fyX>sI{` zH|KmBt~tG29eKxO+WG8BGY+mgtbhNevGkcim>( zYi-HQd;VcvL37KwinQpK^w`(+UFl8BnR&XKkN+xP#^USRU=p%z_mVe%R_x>vSh$gA+n$X) zX4^ONY%4rzQF-{){mk@N^E0_0eK6!-eyvyL{M9>4X8-UEKP)1!uUYbqOoc$zzU&vV zhc_Pnuz&Kb$lts6#$>fsiWOG72q^MAa$M-U+RSC<=2_QcbN?UjcHQ{)ds=bVZmYB> zisr34F%#cpKCz!F6H>I=&|yVF&<0uO)i)}-D)U5kycUoqhFYo_KIuQ(;iAno%{IH{#I{eM-> zEt~K!0aXX*ynZ;#+odAKReR=Eor3~z7jWphdv=`Se&AnemQuO1u`*)Y&HA>O_x4v} zbMtST3H*Cgzc48~@qDLq;QP01CZ5q-oSXPG+e+uNbS{z-?bN;DIbG~Vy?noW&?Md4 zL5oB)1rBU<3UZh0cb9uVFIYI${rj%jUoZG=+g5xeEjqVq?eD zX8m~5_BiJ%vlmzR*%Y>z_yoki^L)%FvY7ocM~vv%NAcg6@IO*}{bc2P>y@|DdrBf- zS?CoT&)+4e()&r~HmAkn#>o={{$wuilfSS=Ty2q|!?`riW5H~CA0B=;cDok7QPF2| zY}lH+(@yfeo?>|BZT#F@3i7|#cwP?dpSt4k>1}K5F9()SvR-2vJL|@_LthkAzh_-q z`fZ!(5`NL!*Sq;lx33ZE{T@E;s$SAo#y{60C$Mc<9JcN9O&zaKIs&i7o*upxsQFdp zT;HD(`6R_RIZrpYZTckpZS$wMdg;@+_vRW_R-W~fT~od__gCN3jd{keb7Qu=%Z}Ny zOHzEI&dd61r~5ip-fc=u>Qw8OZ~t55a5*_OPvq7;)xc@L9L4yut4a*EU1oTD?M(Vt z#pBL9%@(^(o;E3(XVZhnYtA$*aW{R?xh{SEOt$FfO=^8Xxyn=6W`-#*Jawk4^VM62 z?|U=v-+Z%gl6LOnpRV=n{HMOXx_$hJ)EYyHm3P{zcPF=Q*2HugX~y*x{)WVzpDzcTKhB=YTYuia+nopA_{h71whJvG07G zym8Xp`E&N}>qwrn-TLAlbMsX%{~7&KGUb;&CoAW)Y26$)#==Dj+wa$VN56e=Z}!tC zhnhXTG}K(%SXR`Vf4}Nzqm3yV^W5rZ0j>gN>_niMH;CfH4z9V&#py{-0 zJIo9h^q&8mugq0S)UUb%L>&&3TB zHqTzKDt~ppT!g-&E{}>5>xC5&%!@h?rN8fwKWfA(@I>6&u3P`!aq;zbb?(!cvVJef z32ooB#aVH$xI)8$gEC5f{}h?0I4N#eV(lE7{Cnq0uDlJG3N{t?tm&U(Bl?dcNQ+Z; z&iuJgwrFJ-6$kdKNj587QQ+~ICb;Wejb~RIA;{{bo&Lfppyuq_BO>oI8UpFoGYvxY>g<0O-wNp;XyUv}~{QB~y z)lPR$)I4%G>8Ls7yfDyH!NO~%^wYl)w;}^hud~{k6Ta$c^7U0u|1S!=xMlh~{p1N# zY!v70eDF9&EVVEBw&Ll-?`)24`?gv5^vNG`(iSgol`4i#^H7aRulgaSq}?dH|IWo9 zVbVLzQns)9u}54ulV9!9p4JtPKd*aQ_*!nh^GT(!$>eLR&{GwWo|MRY-TiZ2H*0CD z3j6PTcx=(?+{4v7SG7F&Sh#IMn({=m_;AMtjWeOF8u3b*l-H-9{Wz(Mr0zbias2YD(zVO!v9Ndc~wlt+;7z zo@t6qFy}ghngI5NFC8}tFuncKD`~f*LO|H7H?R22liv&uz6)JWHn_wJZf?_Bp|LJa zm&e%0b#j}4&1XeRMz`8*^EqF>O|H7uqj~M&X$70m51Uk$1iNfr5c}nahugA6Zw~5) zZJW?=RG5eVLQ?w5Cte2*?)vazzNPpR=c;(a85}j+-$v~(aQe^T5ohcdqsJev?YBDm z%IT*r&r~wET-I6>t-N-w%F{W<`sIIZ)cfYA1y1{|;_LaO*h}Vis!z_p!*&aATrK^V zGtI#I(S)y`4{Gk*1B8N3i^T(2PzvWNde7T}`{@3j5|6=C!-Ks3_&%Uv%+`0Jt zrEBlEeBD@ff%7rTxxF`wHb!l9;V`mr zdib~hNZ_x}hhInJXzTa=x2mtL`}OTmPSJYD|3?=5)nG8>RLy42v3;Y>pIiTDN_zQ* zViEbPuei-iv$__3+dJvO+MbU>lMP-=vU07s^nK}qwHFMZ|6<=@RS>>3ef@=1+qF6O z>%E_1+`QSv+26PBqZr}D{> ziC@h7vu$&#m&Uh?=eOl+b;R~a7|zN6_~+XzFL~aA1za*K4k_$-QM>K&vbuM-&XgGo zJ-xG>@w4#!Aafp1u^*2Xiceg?cIMOXq@$<3U;oj5aQe@$$hvCI8~ro3f3XLzThdzP z68oa3L}CBJol`eXoZ2b*Mo5_X$u`p^1x#(r^q!Oi#s+8`%A0KE&9PK#IwZ4_sdeiv zqsc{$s}}MKeP~MjV3c&hljp+YZ;Ijm%|gz8s!Lo7%gfs0oF;MF=}K3{K`glw`x?|9 z`akEdXcV_dnau5~)2ntTMCO#=yrtqH!{QvyG0Df&?eDA<^V3a#-tV>!()Zr>X36}h zEmL*wek`<^=>Dl<|Lv-Oiz_7-I5(V6DhSLI z+_ibhiaS+{x4(a6aW}^1d)^6+knbgzjxBw^%sTSU&fLcMi}T##Qz8v>xz5+#SvAA; z$!2S>J-r`grzc&R!|vOZ-p?HPDZ?()b*I(t7YCdY(}a)k9&A1K+^9>rK~1eZibLpM z7EiqN^irWWYSYS;UWO?Osnu03(#<}|H8E$>5uv;nr>}3majDPcg3I&|Y6p#6)*f}< zYsBERA!4h!cEZ~?e{x-)j9t=;Vy6evFmAoVs z7h}0ST>ZtZM=Z^aizhvgx9aWMt$D~U(x@j^i+MDS^)#!cLuf}m`ww8FTamC=rNu5uo>^=Z!vccOo+XD@Aza>(?Y|J zojng8xV7&!`H{x6YVOMq+rCsBef;%&;Ob)s`A%K2sMyJ6%J(gF&Zn5IU!5OK^_q0! z()sy*DM^nnmn1EoedU|lhqC3p<%d#ZKbu@NaJ-n~{C35o3)ZbC(zwU|M?1i^{E?o0#+PBw!|3trsOT~9RbQZsx>tKFC-_Y3P;E9s@`uPeT zJ{4Ypzb(r0ycX4ng)U-yYVGu8p>pP-G>O0|3i4S=oH6(`^D5vUs`!8q`3+gv$V{4bvMNC z@W0Y9Kh>GjFKaGsDfts~xNQ0V`VD3ItM#)h5AH9%E&O-h+W8-H^6Do=x(TlO>Y%c# zTW!e_C6Us0rNI9cyB6#Z5dUIZ>R8{V_rm(6Q=IyzTN|76UhIDD<}|CN^=(hcvYS>j zes6lS`M?L8{*!HMSh;-IpB%UnE6t;)8d)ph^UUIi$Mzf>SB(P?=H=D#-sDKzchvY= z{hG8%x|+A5Ln~KjySjX={2^+%d^yW*qyL)@d72%)x!dNoX9C~m3G&^2;>FfCFJHZ# z)ZQC%K78isoXchl*kpGnpYSoBv2bPMvKPA+tyz` zU%(+;uGM8^{B3Uav%00cT27CY%=p%wIy&iYY34q$?3d5?{>wLiUl{QyB8z*+fslkB zzeE2odA{d8zx_9RFVl~ocl}Q+P|-cka#ME!=d2DvfrOwtXCFU$<$tD4eX`A?-_q+d zRcF4|tye$;G1^xWoWny$D)-2Y{s{>WSuTP{djffhHcmPU+Ah>vBrfbe2?*jnE&&yN|@^g zbS~P_ywrD&+H}D^hwn~nn$nSGn8>HTIC*maNd>tZtCpWwm3X)!EqmKa>3N50x+UAz zXm@E#ugm{AZ6=%8zBbE8cWrhx^X2+Emfr3Bq9?>3efmkFrkWMc3yT%nEz8x)?`4I( zS-tr9;$JHzG-_UG|MW}V(UrWZp5^st#(%!%u2%zcqC>AQ&QcJPTXI3pz1Y>9_h_UR zU;jegN5a#dlw6*$_8zC+vWs^UyxY3=`nMf@b(Zbeff%M{K_+yubul#BlY>+q?fCG=dr3C?bQkH@jC0VM(AQu#?+em z-%c&-@eP^!X&vw62rVw%hIi>J6Bgw289E&P`=E;9r>>lnQ`MZai4PJ4d+v4%<~1zK z|B${VP}%Id*8K^yU$&ex5Q}JgK8vkqiIMSF2h-RM`sOdsO#8y+wWW317O!hpm5lzowY@=sq_PkrfL$+mfxqPpT)FG;EU%UyncdF%D-|0kX*RcDE35>uu;tOqwI znsj^(82AGnGp9^p%H8h71(QMm8Bm>;USNjyQ`S~6_>Y$lBsgx0{V^8eq zqT6O7vCs7b(kF)nX-#_Mylu7Qt-#>3H}Z}bT2G$JuHxuz`ct@@S6E~xH3@p6N@Z_4SCv>jbb9jz`D z-J2D5h28$5>rzd(;#u(_(OFY27cRZGWk#QSA-8(l%|)e|VL3?=XEwy7fe5~76`kJ3 z-}ry2=O13o`2Sq|qTPD_M;fyOUUqCg=$O5)!^z>U_0lKJ>}vTha#xr~wzhs@TY2HX z;j3TU0E$Im*si_% zf2VpOd&ZxIlh0j!)Ow(}Vx68=)bpTtKGCWO{q-5=FDt*27U|=;b!cMj^P4i9PAXpg zM?&~-UsLAcE%&c}`0nJAZLtd9wy&?R|NZ>(etEltbHx6sEpdEc9hbN6-;^4Tr7^Qj zUs=udGj@-6UYq9RpgC&-kKO({5h?LgM_M;_T35AbhVE+8^4tA+O$g&Uj`^z3Qa*}C zZcFY~>Xr<*<6gJG-Y$D((E^#+^CD}*8pYzz3x5()6)MX8kfNqNcjhg#D@;6|kG90x zToa5)+CF>R=NglpVaz|bu9VAC*nh7{ac7E0-mwY#cR1rq?pRE@^knOu6Q#E-a&_6uqIZ>=!?nkU~88kDc89V-=dtZ*xX z^Qi+YehUhX0cHbR=?Vey$G+2M@>-NHt*czVSN&_~aibSAf317@BHQ5g?DC*3z56N` z^VB5gJnWMT%zt!M>DP^Z;oD8@GiSJQ`U+Jn?H>z;#5S+vjy>#`e0<@&t^34FIaTIF{Nk5Oe;dK5 zHus};{l?vHai6+;#gglGsQ+ZNPk*GLJ1-&k<|7@gJHLfLA3L(?<)?=$xoJx&2E1TP}2|`UXjb z`Z!7RdmLD{vE7r$)$?7K(JqxNp-j;?`_Ip>%?y%S7CQMDb4d92qMe)Vt*`v+nSa_y3drg6!%L~FZuc9C({K| z{EgMpvyN_VHGh6xoaN~C>G8*=Nj7aeA&}){@px{wamdW}6EnGH_A^RyBt|ax+HuxA zZl>!}_R1Y0iH-r&-Cw27Ww(sK5_j=Kb;&c2gAuovR2eQSNvQ9?{pNt(?iIEMOOEm` z`RJk*>GSu%J$`4VG{eRB*YPu~yu3zhRcM6bM3*AF8K<5s>&rVExoZ9Ae*&Y_+XDahOMe(?Z4P<>r%r5?goK{lE24_HN+TbrS-N{yUaE`YrJI zc8=a5ty|R-!zy<>{S|+C!s^?R?DdCcpZp@cjQO;hz?S1;Z(l775OVcrk-zbDnup3s z<1ZT@?iI23nU(E#&}EbChNPqEESK%OvUJst%~x$cWvr>BHalW=?zBI8+UGt$J@`U& zvPwmAQFK>&_%*|yD+RZ^PM@Qym&@}y$Mc&tB_qn@p7c;<2Uc@XU9- z`#NSmoIPtpWLM%$-X%3Y+&38X8pFK7x&!WE|C2GT-B7P zKX*R7At{!e{h>_Zt3|HUwHLjbtK%;uZJGH+{NId^kC_fN=YLD+%li;?r^t1o;AfXB z7W`4)+Hd#sHgC2Rm^|f}(3Zuis{gA*(w+yOm#_ZAI%ncNEBQu`8n%O%wR&H3&DnQ4 z)b9D}`%fe_`U{?C9+T~9>1&nCTD8qkKuU38#>~D9);R&UUoT$hW_Co!c6!oQ_aB!& z&KKca!V>W3tws2Y2bHfH*UUR)yIE7nW{F$2x9<Cp2_i9tFzsP8}Z%`{HLR?C7ra(&-A(Bs?C#jZY@w^Uo7kY^H5pzT?un7wl!++BLhUdypOFu zc3^jKbmV5PbsUFpM+;xhNH40Cf3K4;vD})Yl7C&-#bs|+Z=EE!WQT4YcmpESw=;>$ zv>h&+s))X5p3HFX&%BtJ3GC)0E)o-3%xFCfJ-?B=@k~rHA>f|4H{H8W{$VgEQB} zX8Ygv5cxajAJ=;?UC++}alD)v+6(O_YA85~uMN>GN=ld3oN%I$YvQT;_qN~98E*^L zsNp(fJn!S3o&CjW&-&)+Ik34MJ}a=>?ZTeU+=QzVf^W=g1y?-qJ%5G&^UKhmf2ya1 zWJF!`=j~|xU%7RGgla^c`q>pL*Y4YECYHcqwEgPNdHmwy>Ei5GGva%0ioV+$^S05T zX}yfJwIf^KS?&2Ae#=be@-)ylOj}x&A)S?Yo&Keb#T! z)vcG_ms$4ft--4;yU*rn%h|BkUa-s9D(@~YQ(NnQF@>?RVNH`$s&?0jXIw_1E8R9# zN<`kt@BRJuWyOWpzRMqHTzI?ZrO$WvxdvHpw@2;uTz~WZa$2R|IDZBbHgR? z9x2b1D@~lq`Q*}xeE)?RVtXr=ymoEb``{1TS?No&e=Jn9;q$o@*tku;<9 zb!z+Tx5fR{O*2=Qe!6GzNiES7)n#wW4}|(f?TkINV$Z(WoF(BbS6%!&Fbj0xf<-jo)~2@dv@Z7xZPfsD|K91=lpbYajZ8gXI`JZ=wnmj za)*p{hw`0Y1Y7R)j!Cz=x_rTj{r_g@UK5d8`l>_Rw4rRuhpF?;Hhp*+a8@?-uix$7 zhbj+6;vRo3S@kK$!(AmMnXhZQ5A(TiQxp1DOfz;)VOL=Oxn>*lr@OCrmgiimD_mz} zR(0p{Oreeb{)Pc7o<%-daG;HS{mn_)tGHgr=Wlm$DvX|&_u`Tpk5H86i=^d>Qw$>4 z{9mpZqhOtqcF(|d>fAQTLu$Vh*W~g4Ht5p&Y=15&3q z_cq(w&bykGr@4GNm)57}m(n+XU-NR}jHQ0-%RUNJZZdgq(9c)8IQ>dW)7J%21+!bc zn`Ylwq_}vp$G^;LS|OKgca%?MQk)u=p{io|RU+uTzQwLW{byIQ7Me=^eAPawFLv8f zFP}4qzFj|g<#Nz#_4W@o z=944LrsRlaJ6)dmL6*ZdRsU+#Ox@7sAKyNk?eN)O-NBS&uH+B%XNybrNeQMrEdJTR zE0OekevQL_*9E6;2^P*4n;nr{v56l4sR?;yYNK zc#vnyQ>_Z#Z4MV^afZLLJgO?e^L%&74uv-y&;Mk1J!MZ`AF|Qwp6b!<8x3r=E^06D z{rapyhMzD0Fz+d+HWOWk|F?8DZaO2gY~d^Q<>jW6U6<~9@%iEHa|_n5ORme))%cjY zlVL@nlFhrCUT@pSSB>VK*|1CNpR;P(grlX~*mvAz_&Rasv|vW{M!v2s6?;9Sw`q&* z435&Zp7llKVv=^o;W^VqI18rSRyf1oIQPcoiHpBo3A$&clg{ry)%@!LHOH6fb4sJu zut+z4$P-y=|Dk@S*rSd9;@i8J*cP@Q>`Th}D5d?%sUdfR!pcc&{xgAg%4~_f>wnuo zpkA-u^+?=`jNM1hx?j${B*Bv_<>Rs7ZD!Y}hfeOd6ee+f-0;8ld*X7>Spg2M(FJArrIAcg(WL4>`>UnD& z8s}V2xnOAX;q6KkBuVIndVeMEEMVec|VJsl=v~7fH5!zit`#;61z5 zQ_iR#TQVLPt}t>I`};I}#*S?XkGS6Rc5<^aZ;SBp4v<(U z*W%A};uTNMcK)N~xmP5Up6L4?U}RDXY!Y67IR5jpJZZ+a9DXW-T9;o7F8K7ILG#A_ zipTRe1>V$azgKunEV%f&*($j!<#R)$UVj9WJ}JBmcaV@aM{XpWU83 zTB!5rMV{{YA0DlF7qgltd28zN@-A_W{Sk82{?@6yQ+aEZubg)(5nOyGHBTZwfMZc< z!oFqJ->gm=uonliWiuW%ocr20{&>(K!G;{^>+Xr%(>d?hd@vR9RyKYg>YH;cZu?#C ze~)XcuD)8j-1qQ@uUw0#UplnwZCrb_?(OowM#n^*LSJh1ZITZCB6v*ZvyObhk1Ua! zZ~PBzk9_y}OwhX^eCpzL zBRd|A1@8rJCFp%#R}gBFbhaS$e5u6B@aW$sjwzhjqirdEG;#Lv_u(AL2dv!8Wv;CZ zJG^3PFRRY_3+oiWi${A)_J=s^)qJ|N;+1yHoTQ+#G|vaK&K-`ne0zlpczaUCN9f_sONFxMd3^Je`WD~po-^s%wx<^}9-YzIv7z?4 zY1y+v-SVcFlDSULIadaM^iz_n?$i!y-pp6M_D@J}#IG2=OKU55-^+a4W#Lx;^=Zu} z>BAq&g8zxtul~O$Hah>7fe5I>zv>%4Jmxla3@hbr&YDf9VnMZ%vV^hP+}TtB9xe0*{#ayAKsaru*C8i1Oa>_owak z%dVRuIGw6?Mu=;zWlV6_zh=}T^gDc-N7MVJv&z%llHX1gMHR`WeQ@y1V2*6L|q;C1`6 zd-l_5^0ilUD;1+`O)v6#9d&&8kh!m&<@V#iriXW#xxPzHNGQyg^Um&iFQ%KPty=D# zDVYC;yGqgSD@${M<>E7m+oZQF|C5)!bl$JsYul!H&TthxUz3nvAZz6My|*$T;o}3B zJ6F0E-~4)Y`|H)Ku6_2hU)FpwL!#DRa*nySY|_%Kd*$0U%f{{5eCbV6iPfxqG47V8 z=BK-vxu>bwneWvp(>d5X^XSg(bd%0nFX3sHN0g8BHuvl~87UE(cQzF^BEJ|D=jbFcK$-HLC|EgAtK22PiW4tFM*x8Huy8oOI1I6}b z^ES*iy1o72?d!fwUb?rRM+yiedY3X9i+*B${(7gEA7hc*|D-h`JoD!1hcnFYlK&L5 zVpHWdHio7N0sF7(f0*&Cpn2z=Gn08`8cMH}a_+Es>=@CQug9PFTdLyD;cu=!6*sL_ z?EQ9HSsf0MeznDU%ibWlyaN|gg^hw%I@Ifg8@aAOvaNE8?#Z1xHdg<@6AMdXU+3TQ z5cps7NA%wWuY!Yp2l?MDdpp&8p{v(yj*e9x>WbBSS;F=194#!~x&L2UTKV5Ydv4Wb zc7NZSeE!cf%h|mqw_iN}=XNz|zw1@65{>rPVY3}>L|as9Pkw7uy{JXV-L>)evgWTh zYt*^cIG+E?d^!5posWm@l5P3p>USs|Pg>salu3d4)kc}yy-f3e+cQqvyUKrC?Iizi z`-1j-no&AoHOtog;GYkbZvNnmK6+YRX7R#;`{x^e2gR5-{$8A|INhvd0axM5r9y&A z+mBc8>nt_5cpd%BXp7D3A66%x3i5|L>TMSbzk7VO+V|gkdgM;}-NO82%jQ?U=kLbuw=P3NKhL1RmuLBd zTAsQM4^7LIc9;J-I+e|)CV%O%lH7{SX*;$YRu3t;S17rhPw||E|HX&;e;Lc)%5C47 z&R(`ZfA_k_F4H7k6gRW?oxbb1KK*%4@YH4Xn}1D{@Sp8F$!u!ijP*tdGdiDTE&F?G zTion*s}>mq{1KYAa<^HH^Q0e%YuCJB_-pu4=%+-3$BqM1i!0x0EEU%avNZhlMe& zAG$a^yxs9sgn61DN9DiO?tVwjGcF&tS1)?JR9N%lmRFKGL0gy>@F%J`v$@vHu&}RD zyAH zb6xyxlUP>NM~8Of$z}^eR%M>nULDEHAos#?)#T6Z`wls2_pcH^**N>DkU?D568-zV ze_scLt1h1Rs73xofc*R)m6IdN%?NR2%6`RgGZ(5Z3b;sq;Gv6Bsvm6!Jx6Mr2 z;P~^u7x-c)Jdx~X*fd8;TkMk}hy1lmyua#>)M+)G*X8Wi(3jKJ5#k8uVYFa6(2`%6 zrgF3T&pox~eHy;<|DWxbGxjB(Q}fEt*w(&JI_mwhS9i57d`_PgmR*)$v9z`% z+U&~>b;+taN%=Rcmd7f#6nh8&T^}T+(W@@Zt;%cL^r<$2t z*_Or2mVzp1+kT#$^7oq;V~y$X=;$|C_HV0xb4eZ2Kd`(+Y4w~V)^p#*A9}2P{P~KPSGV71o8x|Oui6Xt|2M7d zw=E5Ony-85YT#{&xl#seu4Zel*N;{Ccv3!3$$#3RkGuH74jtV8fPH4X*V37{taPTO z&7F4d%b{svolEXm*)O_y?e*HUd+s5xa_{de`MPB5wE2t+^QVWXXoo(n=Q&(tbK6+< zS)tO#?vDREBGNM!WGk(#DX}r%+^yFf>waV7$#Blv7bS_@-j4UU<#tTi=c1tRslE7h zp)ULMg)Qk**Sas+yz^AI;nww5PIu%M#};mjw3{fK(32<@q-_*we6jmU#;tNe;T^Ge z?@pNM_UtSBjqWwmSI&7lX^vaq<)&#zL(~ME-g3Wr&E)(1#g9#mr>hRi8$MrU5VK%@ zLDalIQoXPGZ@I7Pnx3&ea>kLKUC+P1NId!@dza8At8aI-OAvF`sLllV+=X`9k>>4oi4X`Lrlu&v#? ze)7-dvv=<_`%|>OR@QI%Vg1j)y(gtz%$zl$amxo4!&~c`j~`F?`(;s+g?<0B@c9e) zJN{pv{L?ls#b#!`k=M1G6tUKpOIzD)2D0PE*m0;PUtwCL^nX}fYSNM~kLLDhow|JJtR3(2#r$8s)w=FcO+F=X^{yZ1oYJix zj|{t}taX(7!o!`qCf?=qWvj+Jn@trNTX|G&2#UUa9nkFa^vZ6V9ePsIo0BfG?h3zj z$Xas4FUOY&TBj#pSl+YiiME)?MqZOb&5XYP-2z`?Nu}BJAhGARWD| z80WRQsp3yt7aBE*ZExM3@FA2ZqhzmxYEg9{``fKoPYUmJY>(=U_1+=sx$Tx?-tH55 zYHHbYgBd^GkACi}u;uSZ$b>wT*&>AMZ3!FZ|;Dj9i zo!gTdUM=QLYV=(dbR%{_$6C>jXb00o?}UYyLzg}{tS7+OTOeeRZvE@fnwGczuHTp{ zF00R~lAZ8cF?i*y31q9w#-?JYA%I1Ty6=w`|sD?pKofMZ+^QauJXuw{@Xd{_iwHh-@26)j)#;F&Uyc8 z*4@ihvTr2}!Y55)EPdj1T3jQ1=9i^w?@B~H@@Br5_3*tY?}4i&X0bi**X5@l@}7K~ zPlbE&gQL+87-vm6>;1IQl(o6AK;rYc%$?OgKP9(cDA?_M|J|*)_cIiAPMqLdpceR1 zX!`lEO*g+^)4OXeRp);Aea4Uf7YdGA3Ymwzye#~(@&5cLa?f*=rd<^I=Cwi~za&h~ zCTHrMpA6>|1mg}`w|MNHB)I;1(xho3uO4O|@OyXS_)AU3l_65K=T}c**GpwrkX-We zP2R`7Ev?zU+bU}UBkuOQGkk4188-D-(xj%vB7Ss(7iQscll`=ejxD zw&bjqbCFLt6Im#}`40PmJzJNVExLCn?{j+is-&mqB~m~2ez4qEpY-(v-$vfL1gCW0 zQED zoIfPn^v(Hg$0m8e%QMd=V)g3m$?fiLtHopDFFXpG*7bbCeLwI1H~Stv;*s0gldUX& z{hP+~?!%Yu1eTS5RFY(!%5}cIV{`m`p@aOM|I}`+ds^-G!h5};veD8Mb$wpd4~zeP zioci zrMRVllh<J-KmrrXz$=8aP-c~5Q(g|56!23ta!A&=iTY# zi4Q+bF5Tf(*2>I$@Qi?WI#Y?Z%qp$b#rC~i&z!rSooe56dXxLqsvy^kj?-EXJ((`c zr+E2LFW-zXd%K490_xf;**D31xUzf7{%61YW|HnJ&!;uMZ*p#4_7QN~@O-*mZ9t>! znNUIZ&zJQtZ*DEQ^(=j|q|@`u=O@26{?X?wd&B(%H{0`4o~GT2H`tQTL@+OYY+=;< z&|rJt!Arj^^wK^Db6z^|V+wop&1t!Yz0ZZ7nS7`)x4G2j{&aU-{Oi8Qo24se)#jd9CuK6bYE{-Yh&N>leJ5S%dhW{TD98*eDH^nJkJwAJ~ z?0zMlpyScW$JZ*QDLCo*;`XMa+Ze__}H{3&TdbXI+`q3J;QQJ z`?}|HPLH*6EM96aonb6>`9|IQqxtVT?-=tvN^9gfu&pM_f2B3uXBV^1 zIjy%ZY{i~KuHL;9`#Mb8bJD-uc}mA?-!!@km97`6xZ|6ACykGd?ZeXLySFdXi(K&5 zDQLCI0pr`x&osZ;cgNeLV?rujcN+8tjJa;iGT%`L^PCQ#XX@9M(8ySq+b z_pjAA6uSNXYsC>|`^KX;Kb%8ti+Bsd%ecbLX?%U$Z$z`!dAi(+l{I~I3 z#w+Fs}I z&M#iSu8@DiwSz}43+bD+P`vZ@>Sx`QW=>-gV{MG&_|7@5--5)A-%q)RvgaY}|i_&ExWS z2_DH`f66Ar_up8pxopQzzLI-4Yu}fhSiaZsPQc6ier!4QHi=;jr?ajXmdAQ`Zr&!8 zeq4Eiw4f}bA=jsip>rPVEZ%PSPW-;X5d#C0$Z0cey>v=mB~4p>pzV*A(#CBwjymu8 zd4^N4ogv#xyXc45Q;|a(?#Q`B2|Bv1>8e>)#=m+M*OiJ3>MmcLcU_T)iS5=_-m+9& z_t@mR)mD59KA-SpeecRCdTC7$uUpY4jaoWCyRa;nhCF*JEM2 zNo4WmG)H?5oy-1}_e~AfWK5gsI7QMk=jbgz^&>MfY|icPICp93b(5X%Iwsz~GwEBS z#E}UFIqi?uJbClw@z_+o6g;$|)G}`b^3PL#B(yT$GN1i_;F7uK_om%Ex_tlS z-gIkMkGDr^wM6Y3b zR|V&&CMq?`s(e;DzlE7SBQ32j(=AXYdS3d$)hD_w+A5xBvzBVIcEstki3)BBe7DqJ zRBevlnj7tr2ZH1lG{0Bq{i?jgJ)rFO&ES_i|Gsh5$~tsP>(UgtsB532Vg#mtGmX=n zxoGS8$rh%(=C8iK>A20(OYPdN#wrNjK@9&r(XRwwR}1KzSSE$^@(x&W)?7J@F>5tR1|nq=g9R?U0kzJbiPQ7s_3#bFj}b{+MPav-tD{wTvG9jn(?^i$A`8 z`26(ezs;vVTz>g;Hh03b+1DpL`4^>Oav^Pntk>Rj{h5XD4+~xY|8}LD+fm-zB5P~w z>gOjfkGms1SNyx$pY3&WcIuCIGBQrDayxGH;?IU&BcY&;TuY*RIKUxNPodohd4q^}nxwJIjRL7F7Y!2k{xMx>ZW|x-PYZ zx-xP;@0v72yZB-0=BG_=>3)|4#D!Jj7i{;dWD9>>Jhw`$Q8mItFM893sxJ(lD`hea z9gA|e3vdgsi1bsg?X|dc%i!8Gqi=t|W3;KK;b;tsUipEYGn`qp zbT_|%gmmyE55`Fy6?Pq4+a`o8dHaBiv+(>5=NpZ_4>VmC>Df%tak}Q99s1|UKG%1L z%UJIRHJNXpQ!`zf=(~P zxktY~e$;;Xan9n$MsF|i2<~->kSGk(nUHp}fZ5w2dGcINpW7FG-~TcdmXm*KV&`VL zD3QT!sYflBdDxaEZ6_-uPp#8X_x`u!WTMjvMz42fOHXHVWnK2WDk@^RD*viy)4l&M zJF;p$4sA}l{cu`-)y$L3>f3~F7bad(YZO;0oAqO#^zOU|Yo2}$_blBTH|2<*jKsRP z_D+XBn=D z&HTXPy$Vl#UD{c9F6G(!K%DWX%ej=I3r9~LT+V6q;PK(f@_P3hz{cB+db8Wrmy6rSWjwU3d?LB-x$3ffD@V3X%kyvlHF>>! z+f(Unli3#3{EADln>6)eBI5?5cFAw+9=^Zzw{?Q`)Ypn^ucnv<&pG?4@FEMh#6olF zwf>?nzQzClBj2(jvBJ;%P13yjzn|+11r{sbuK(XQx6jeh?X<^j{u>8xwojEfHK$mm z>%!D#6`u*S^;TUCnSbv^iL7x$*4yt@83~WSCNH0FJD1<$^{2+=CEK4cXB#S1O8pUG z`@(SK#3nr*mfsQ69EEf`nYFiCZr>Ys{?lEPzRC+MCb63zn7x>|bmoLFN@6U3Ti5TL z&`~yX^TB&ww@=4@v+;5}T52J^_{wLQw4Gk5c^e$R-jU6?xqY?%JGanvy(*Wz_1K&> z1fwsR^K3~Mke67n`P8JRi!;3Zncu!$P_y>xoBWck>1#y~9^3XUCj00`-x5`&cx~(V z&pCC{FGt)+O)R`-e)5M?jb6^$%{#XC-HQs(Ub}kxwaZbjO^?0#b-KbN_JZ1dK{mxl zpYPvRlUP^P?N!WS?(6WZk=Nw3&GiCZIfnJ0ey_V(zQ(RxNBygjHt#i)_8l{LGrbkE zIga1l+8Y)kxrP1kZutjaB)Zh5bnJhap`)xnL2t|dkDIfj@~=KjelYvi&QC7|>eD}U zc`~i6{rB+0r{Db>q~&Vd9Pi&rdU5%vUfthGkKL36ZQLg>T0ECAZs|v{g^Lfn?OhRg z@vW^{kI?>^cY8EHL}yw$R%ErDTb=NH`jo(TZc8Fp)i0C&!uu`jcEw)p3&QC~O=~8s z%!{rPzBK#n7tiV{?n}{UzhqWdNng5cWGfZ&c<;`}cF`J7RmK#qlx5Wk-#+GMUy``3 zZ>@0Jee>gU-JO}s*6y@;R^+noW5yY|SFUX@@4Ef^#^>U}dO3SZ{&FXmkPog^Q$8Ni zusmHYxYL9C=68vrzvAsC%h;QQtG8x+IuOI1|MPFQ)`x-_*VGfZf`ca47=#4*wexXw zY}x(HMt$?M<$fhPOG=mR{^he@*7uk}mj1pwcO+#0WM8_!z;rY7%(*|$h^20RnZMt3 zvz_hMGkmGVu7BOK-?3!sPMmD=J|w{qd!rxHizDS0TZW_-$R`?_xS$3&;_2}Q?6ZJ$hzw#z(z zU+eqV){X${lNHx=n~fWV95*g{kh&tSNw4tW@~uKi9!-}@Ihu~0Dms?+y=mptlx_1R zCW_wNH#;S4TG9IXGXurcJDD#{&aQTxW|94{Ynqgj(u^Zvx5|Bf8#-G2D$Omll~!Kl z%zQTE>BakX-%c1_pX!qytNK~u#gAY98`_sf|N6_j;oXO~5C1)F|9rT+;QyZou@zzG?*}?FZC#u? zg~R;AC)Mf|LOhLKn{&-{SUz#JX|qb!`)@8OO16Ie+i_A#ZTIcY?3vr1Hu_~P**Edl z#>Cx!Z#<0*TD7QNE|&l1>=$CMZnpm|Fi2T{sY7nxWdXa_hGzmad1s`)i~1XTI>c+` z;whJ2f3y%{^IdAKu#4;LF|KaL{KUrcYe(K3lS{K$D={hJk6&nu$;<`%2dwWWH%L7F zq~%l;GiT$?9bplb*QY*NZ1F5b-gM)hQa+W{xl6Ab@4ewtVrE|VOHBBH*x}FG=k9&5 zQQtm)irl{4yLP@`x@X(L3ktdQTLo{`6;yoLn`+A~c#B*7oj`GKZ*;wuzOKcY1beTK z8HSHDbC&J9yUF^DXyAS6XLVv9`7WlEM%O%GW$QcYW}01S@ld%ZU2@m;k__24MWncU)6* z?j>yqdl363I&D*|l%kPzW?w-0RKZuL1Yc=A?!O(#$5egJ+*QG+CrQ75Un}e49`8Rg ziX8Ly8d$wK+TAJo$L3F^mXGrvyF(9t)D~*&;VPW}wrj!pOJbV>Lf>q9KKXf$a9iT) z#d5Z`dpXMd71w3hcFyT(NMhOBI``xKkol{W8%tb5j@A7Ybd>)fw_M|7_mg{fZr@&X zKrV~>1k>sMvn}do?7C;0@~6#bjg+?yn|tCj&%D&e$2NK-M`Dm5rSnFTbj~ys<9Qvy~%B`(w_# z0&TCeI;OV9+zxL`Dzc>KJxy5=d1RgZ`o&HmHnKB(9;yA^muYG^FxjKQC@RUGV?OBMqMV#Mw#@#h6&P2s=v% zJ{InMsnj*0*jeIT^M$H9$$ftdiW(&Nqrd);Pwbd?$k|7}?d#r02Yr2SYi0yjD@4VK zDz3l&*kE_?1yQ5?){II%$9PNso@w9nJL-?mllkxGcAD>giO)?CYE z@zh4HSGVdey{>FbRFmvK+qS;gc=?R-v)fCUJto?2|F~G+Y~Eqvo}iL~8pZD)@*{U% zvYRKjmy`dSzTVAc8&&64q^^oBnYy6qaLh9?iPA+ix+`5|M z{3QuXF`kT9t2r1;mMx13ITah~<{?m~V)$+*^StFkU*g3YHgYW}ymTr+#HqVoXYJ7p zkCt_pj=SEN98h*7{nw(hSNUGjdXAfXmt37zbXu(I*)#ijQ{TObIJB%oRqeRMz96|o zotrE9=bTub#+JFTiuI~~&)bDt4(1=btbbv{v-1{;Voxehx!exE`#VM5(UB%V*f$cg>+_pjz zDQA;^Cbh4+E2utIQ7(Dm)vEWq9x~LZJ&d|vzr*H_jNDwASh=_I@_)a6sNwD}%)jXE zAh2EazGauVxVt?6b8im+bGKysL;oHA{P}Y6!e_SY8vdI9PM_Yt{{NrLA2qMUzWWiPIDPs5+pmQBboz1MT`qK;{wKk^_E%{fkYrNE3wLPP>cJn1e$NN1!XG$(zsrS*a zIlc1rY_aGAQPCBv>$YW7eLcN;`A3_*OF}JWV;glJ<}aAM?%>reSF%4C>0Y;z@j1QC z>i(tZ9dn}3E{~b)p2@27)aUm3TR$!~v*bQ?TJ6`Wx+i_Fl32lvPSc+phH)W%8lJT~S{~}92$bCU_|1pDa!58Q5 z7Hn$?3cse!C&(nN-76mzxLRt8TWA02cAeH;$0{Tm-Nj?t*q3LN8yE<)Sc*M15>FQl zlaUI39ui{bRVT{M@rWUGz5lDeUP+I8YE8eSpM1Fys@K2BE@j)+FmtvDpZSh~L37tM zEt9I-e);G`VPEa#k?u-U@1E9lXpVk%e6jzLnyKQ=%d8e%lnzphGx~Dspy+y=4`HlP z7g)YFyjLpokWhN|X4Gx0SqPY*;s<)@iy71#psKXtT zlTVfA_?%`tZMjG-lx_CvIT{yB!Y*vNFe}zRVa0vMOY#@ryv&e#ns~7OcC_~G*e}}i zd*vtcpTDy;r`J*D(K1e-oR905`YaSx=y%M#WzrInWId5%WoNVG-HyrrCBNQH)4N}z z_e9AHoGJTQQf;z%7$tX{+3Onr z+UWE9O(xMl)&KANKJ|80Dwo0e_1EJDSv>@8P)L`u^OxZ_c{kemr7%p&I7u)VXZ&Y)2~*BU!Sx33Y|^jW$S3bf7CbSrAjmak1Lu3EZFz;_y`pL&cNv^Gue7}E zIO%cJ>yF`Gy(%%|olWMuwyYIAFY3F3WoMV5zi39*lxdIZYXug>Z}?I5X3DywYT*|r zq_9p2`RS6!)$x5>#-DeKm{NGw)B@_7mcO;w6(OM<9-}1*5&8srI-U%-} z%xzfy@mc$U;=;a%SO2}pC!1#Y1}jA$ z=idCPtob4K=+wQN`#a4ye_F!AuFxpozW(>lT{m1lqUf?}p@d_uc1GpI z-B8BWh~__FC&)PZ$#^II6IvsxMtvDOry&NC0> zPCwTzj0%xd5-49^85tJ?ED=qzl}cF6;6MoRvdNL-Q%UuWn=#~ zfwygU*G*K6|ME4ZfO$OgDZTPXaW!DKsv%=#W6FIu$k4@|S$G_c1T+4!S0?V|$p1$c{_&^h* zZ(^(Sr7Q*hTmKcArnNL+TATZ<;}^U8gfcD)IylVgF1eJ|=<2BI5XsTLsOJ0Up83Di z6eljy%Drl~yRPT>=6}7mk0p1BIKNWeIb+97AA1)tay`}R|v-#?X|lU}o~ov=5d>b3f|i5E_>OnG3n zp0o2$$jOGLDQ3SU?_N%H*|z)>r|a~?drftjIu#FlU-aBKm+{BK88z9GzREfmljU1O z{;z%zIlcOp+Lzk~5gXXHZTrC|B4c!<*{a}{fbK%KCppWSt+n27k#*PIS`yeE+Ht6p zHG(JHo#XTO1E*w!KXe=J%$N3*-POK8kVEmQ*P2hkRv|tQdIUbI`XnsbV>4xszuluG z*PEh#E}qFrM=l&KxKWhwRWm3fC;8)yAk7o;r*<;f7_lA>@^GKUer?h|%Xf+#^0V3Z zs4K_IY-p(dcH~$8sb`_wn;!@2O?~kB*l&aHC963nZQeJ#wm?G6z(3(%w`ozu3)WoD z8*_Y$bEEAOA8lAJ68}QeL-f*#PtC`f`9saWwX?dU!oG%Wlv3z4y;zu6sWA2U5G%n=gD8*TnSEqy9P1b@{7V z+hg;~c;lLE4(4Y>mgwy{zv)zXzIAb7!Sy_^Q0}we#7rtVJ2u+nJ2zfC;-}&gwQ;+m zgV~2)yV;q3qzX?{s*-1{`SR`CrbXhaHe2zj_dWjL%kwJdS6nmZOtWn`RDX10rOe8csY;Vw)aFgzV$pdrN8fPw zx-Pfadn>$)hN;B za&V2?eQU+ycaIlZcPD`XTke~S@HSRp_{MnTyoj9T=0R@{nw_e9z2WFH;>#Y zE?FdWi&yFEPZg);BdZ_odvHcowqL5xO~buPX<~wYmvPE*e>Xit&gCaQ&)q2|cIS8O z<-bRMN~W;Wm4VX}sYO|sB&F9miY3-s* z4_-RnU)O$yos&Q5p&y^jJ+F4XFM% ^srB`S8YJHLH~Yl}Athjr}pRZF!yA=~(S~ zy4M(X<%JpD?t8?}clC6DNnvE)=BAF_|E|eo=5xvI_D}vewIht9_Gt1IllY$=cR3@= zTich^m8$%%+uj?v;MSbtmq9nbGin|7&gt{>Y%75+Nd{JoA&q=p> zPT9^&moAvwYT5m1OPcVOpmV1Av07eBoTMKAI~0`@5xJ_YaJ`91eE6E9DbFTcYd?MS z%Cdw{sSW)9n7*Xe32afS_$BReNqt_xvgf%nxk3&r4{Pd9Je%Xnc1) zSoT>+_)qgX$R>B_`k98>O#OGVwG6x-61x@dUwC7t_%^iONUmW1mqy!C1Lg-Z^Q_8W zF;z(1_BtYG+`Z*lU)+x=;(yc_g;)GX!ZA5SM#P{iINRcdt0G5roJ%SvVr~E55`zog&4m> znXc=dG8>AyjooG}UbW0oX11n(yu#0~^6u`hzedH_EWWR1_EaWT!`mdh@AX-)$G7?aHfm$6k;Uwd}>H&=#H#2S9*WdToHFReOikhOK1v%12x>|1Y&@-KSa zyv45nRCcRNhGzEB#HSy3nx2|F_uKE|)rm`Az30`uKj9OvX1)57Dfhp&dr zeMs20^ZRB88Hux=cGA!g5#g$v+;rncqQM29l>Cy;Kijt-iK$Rr?6*5hQ1Bm{T&W40 zd$Lud+jO-mzqPFfn-5)DkyrJ$OLL9)mad=EE=B6!%D38n!tban=h5{w95(9?uKl!S zhICQ?#+lD1+b$`e1YT{nCpJ6(@iw8qZ~kzZIdEHVinYzv-g&b1wvJi%YzxOXx!WUH zno>ObHr5^FPhrmaefzzQhwYy(S?Rm{H(eIFJvlSMSmkK(2B+D^LPnp>p5M_h&wQKq zaHaCz%(>>1=AD_~sOj%?JNb2^tZCN9%UgMtFZqHrZ=QBv$m5&E?WU>wTKH|gJU{Ou;MuW$?Tb`>jwdYNc0`r( zh?^{PU$#}A#Yk@3#N|o%TN`x34EwKd@jQLus({y@iv^R8S{F<*Z{C@HKbg7xMe_YQVb(Uwul7y4 zob~=hW+XrR^DVdfEZ?%u$pYWq zS92=o^1tg#(y&f!AGMCpL z6Y@5QDlWZco40J^rl{PK($g1oFB{wwG?#8ac9wbSGSPd>wQ@}v)^pxU(#&}NW%ssc z2XCG3O1@)$woQIUU+h{X=gO4QwYP*A-`qNWlOa2Qp>7s0H_yU{^))FKCmXwWYPO$J zF0kfXCi`LYo)YglbA1naN=n6R_$+(8^T;+uwM50LpY&x#hF= z|3ClxN5%j2+rR%ftkCDEa!#H2Wo?9t%B9VdX0$9~veybvaXrG{7|Fa(x0d%46$XF8Qd+PizS)R^5JDsdkl;(e&~!e3ePDy??jGUp`!w^3u*H`pkyx zw!-Tz3<1T5s$$C%KJ@e6=ex7G=kK|l@8-=ucWa~kZ?m%+i{p8>Cz{SP3$T8A>doOV zhaOm-cRsPS`|a%Ax9`s~n6_22W@3-~1~$&aM6S1?#h(`nGk+ zmL638yl~@}xrvT%HqM=p>AxY{)793Lgfxkr>3~^ zZ+PV~#oeBh%j;>WdHKEPV)OX5CDIuE<&ASRRHoXV>gl@taYo`vuNt`+flj0QGClEA z+TufhDYcytvX*r5R)2rvm(%}s$>lBeU(CJ=Y|_*?5f*)im20;7{FX@_PLBWkeCBS_ zlYMeYq2mnem5eP43ZW-9b^iEl8MQR*L{pFQGMN_~r>Z`8mvkOAU*mSSN7j5p^6iqh zv);ezi@WT*ccFRK-4h#LPs?<3ms*wc{7z1e%&G$A)W;G>&9|@J($eh3bFurx-NTK? zJsq}lTYXpYD)M}48);{xV=d9YUsr9OiJ+nC#a)XxNwQ4)7jtn&!nVdQ_m$aH&R#z6 z%A>>e>j&Ghz%xy!O=gEqG~k+gRcd)nxS!0P@K8qfhAGU}vr3o$Jt>ox_R`@%!>{6l zxyKgY{N1zXWk&ScUF#T&g^m5h?Y>D=DxSBicro=@Tx7+qyGKr(t67n_^^oA1m7;uR zi=v{Vxh}hNc_f|Aid^+R;V`f0_O%K;F^8|5%`#ngyY9l(v+vA`7Ka>|)w=16nsbpr z>uk6G!pY+xJ4e=NI+Vi9a`+H!ks=^!AH8vrL$A`T4L4zCQ=M z|66_Dp>ZheL$-#ZT2KF?Ic^KgE1c_<&OLB{>9T^C_e8`?*03O?h^_JWX|Hc778l#y-Y75oJfrL6 zD*db6cNeWZ5M!|0`PX*^soZRzmf2oTPBZF$esVQYKhvmd_(U@7P`&H))^*}sF(Te- zEJcl)HL^dQce-kc2!Gdkr8OtQ#avybOULNblml~W-K^5Ya--a*26arGGr@k<)s~;E zQq5V~Uc6zGR!)9!O<=zMVLP|Wioc`lwH5%hd^T$KPDfQZk>qC)O!w zmbY=s&SOhGIktNWxw#ANOwVoBoGKff{Zy36tUry#!oS$#PU1C{`L8|JZTQA+pw+|q zbjE?37pHAbKO$J^_+{FEqwTt3S{+q?1t;z}9U8PTtHfMP9-%3XuOoR0g&h8are${pARIHfZZ$-vO3h(wlVoR%k5P7t~ zN7In!=I0CxZ?V-SBp7s!&xccl=%6|=|y*S&Th&|y{-61N20yWz`Bu<`I2dxQG(QWVZ}{5 zg^n0~c@UGz7r;I^gbPv6;9S^KvmKP8K+-faDY;J-WWt1ekH z-Ed+_vj37vT917<=fC{5MbgE!%>S@qMUR4qfQj^@<;RP@2VPhgBC&L){f@aDf8K5X zdF6c&$EKo<<<8l`s+W!7neQ`% zCpuoZzbIR&Gh%MO3N!1{OVdxwu2M16cqrd3%(mvEzjU=am+so&kbBvV9?Q}=qd9oR zxYJH0EE4FtAaZc|zXGFY9~0H4)^+drcShAo#o$5gf~F1r^Tn2YGJJC8>N?dzZ;$&Y zf5~uql%L@c$i0(3#r))H$C)a573@3SzijUm+!(*^vPu}^qGLzZzAt({rTQh;4}slx z-TppOUYgtY1G3+0O{{nRBLe}u-|-Qy(W0t}$TlZa-llPbY<9CNQOwXRP`_#dM+M7G1UmE!T>)G^x@xhJ%4+77gxA-DFNk^>X z`0r;`UD0d{b51Se2>*L7$$Ib2oQMz;P#)NgSq6m+n6B$87z}s-JSxm1bN{|DpBauZ}{_t;qAMGUX?33Ah~7 zyD=-_jg-W4wqt+UjAzQJg~#kTeCSZJqBVQC$&%$e*IpL*ZF0ntcjdfvUEAjiZQ@vy zZfNVfH|lyHIQcq0(__K~rOHi$C$&!()`p(GHJ@egyNoYa551ZZ+W2Zp=T+m?Oi#?gd}cy-2V7HX-!6F(`rPn&&ts7=_^1M7q=LYqEC=zq7D3aXa9_EK_R+d}=%22#5w z#b3P8dQYW#`^kBF_5WtIuKzGA^#9ZSZ;YR%AKWam$6`s{>|Jk{T>bRyZOgfpFRjy` zFigqJR$-bl`@<8%RmSsI9hCoQ(8>0A`El`WPaGF3o?mpZ>+gbIw+&I<%X|YJxEKFx zx$U)BFmJkb+@}TB)f{ezKPt@NT_&^XcKx1*%a0%2+ZX%$-Sxc7AqSTDO`CG9AXhcj zuU>WY$^(*2;(Gt~z5iAjb#9fEdfMX48v`x97GKz$$|M$Al-qfpL2T`DwS!l)Cm+^K zlvw9xJTKj+CUB>Jaq(`NH2Z3ej_@;HfvNtFP5pl~TyT8GGPSng!{@Ax)9$(YeBkc5yX3w@{*Ohk z4NexD91d8`#(%f-Rl{vxvEV-YnTrGZMb>?0Gd(IXLn-GUr1u;9y7;!+r2jtG{|ain z-KjLyL*jkAndjQ%)6%(?le~f^?S8XtLj{kDo5)F4kK4Oe|GvLo-ne4I1dbD4+p^4m zDNJgfIq#rN)voHQy1xa|D$&>1yyMe4@~Uy2wO#G*&eyJqR`nsYm!dLJZG}L&2qEpUFsiS#k&dbUWD}ZugQ{s z_U+RYtDNsf^KzaxhpzF;I1)DNbh%IVuY=-iDyD2dTE9(u)2c3?bt`tNtyC&6cg^eX zdb3K&JM2kL$dfngPP`197#x~%x~r+T>&;!!o3>g-tGi^@t=OruLMgl4HLSmD&nl(x zuq~F7XYPv5ye)k#{roOIA?N48?41jZmo^`{V0pnY>BWn(2@+O$BAGnCO6t=up3D^f z{E$KZL_oJfA@8=HFQ%O#+a~CoFgonWym8%fw^=(Ea(sTcZGxhkK<3{9CzEQKL+&2O z`1d7?DxVkW6^?$iZqxq2oGWvV?d4n=6u-#J_oCd%bH_K?t7Y+fmR~xu@{=ZaV(g}M zuATdTzrVfpfq$-#>z3oK9>yVGq*F7pEfeDx?a(eFk{?g5S4zHch{cEXy` zR^!r5B}ew-OlB1`2)8v!#eYnP;EykPrla)r?<-Cy~tz|`&iWw-n- z-!7m1EyVYC<}%wg!L~iYhjW8vcP-C7c!crpWwYAKx4FUJYkZck4q3W!%fZDut~Lw2 zJM*$<%nC7N&z#Y(H6!PI*teg3;`c7-N9w*=7;CpICQo>xQKqQaB$hK=a~h&8*;Fk= zPm8wxb9v^Fq+M{ms8IcaOXIsMXXGW4+;yM7`10n*qeoxX6rKIRqi%ZU3isn9-|m=r zzg6+|(KmN_rQZ1ZA#c!i@5$*!XE!t{-+oncwnIrmb<1Lf4UIC~Ws9qK)w{U{?01=6 z{dc$BK7%%yJ=faTcGzn;UEUxp_{UhW(C+zO{_^<8k`Eq!(ox@Wt9Z@>K7p09WT$>P zzj~STyOfRcw;1J&EgjP$luViw7llqvlmEDC=KN)on~PsguvchYbK5m5c2f5uZmEV@ z$S(YCx=QHCm1WA#{}vhS|5d$faa~B^tShIP)lYxcY3KVKo7h%2;c20mbRyFq_8mR* ztMiiVg_jrZQQrMK%}V=gQQ4x;3VE}4oPWrfB@%mmuFZ_cG5Kruync3S^{aOuq%yZA zb9k@1Ibq#yzc&_sQp*n7Gv_|Bv~rWJ&M$G7_q*EvJoEg?&%caky=LrrRyF%##m?-f z(_XgBTo*m_eNtx1+vohZNENRLLuX@xPgKu8c z74XQqTYl)g^ZF{kDiKw$i;lRPmo-t~%JQzeNA^8T&zzAG zHfIJ~#y+Pdo%1ci(q>ia6kYz9th{l4_uU;2CuZktoP9l#&G;G1lsJJWCvKNm_%oUo z=v4$=4sS_g*tBDM-o;uzv#%=R2cKqrV!ZZ7_wwTP{@=`Ma#XL2urnBi<_JclJgTs( z**vf5b)wXMt^POG7v>+&VgC{PR_e-mVHfF=GUKQFq_e;OGi0f9>2kNEX+^+#=y4r#McLBwX`iIEFTA0xBOQ-Xc3k(^ErR!-Hw&Pvxx9bwu(^kPGg?K(W*)N zET3vTTlx4`nN$U*<^R;WY0*C?1m*<1F>LF-W6@NzmE+&#w7_0@WB+3xgFG0ns($~H zW_39GrTp=zofnp^*7sW5Q`~l2@we9W$!=jw7kyNC=rm>9l3v42FFb8c-#iRHT$gb& z`H_{Qr;pVthM)KS-mfdojpbi!vXMuff7AV-_uFh@mVJnqI&1y)9lQ9;$?lITE#9&( zTpL^&80~qwk#SbVv)0U<-(`6bm9LH_zI%S?o3rs};lmxq%KY=)qrUa~Oqh09H&gQe zhW-5)4s)4&oc!5*;&X*pdQNXI&a118|F^)=D%MH=_NFf?OD);9zg+Q? z#nIjE?+bOdzBKBccJxbgnernak!to0OGGx@U!^3hKm91vd#OvhHz%z-n!oj_a?Qi7 zo!9mEyXHKJ4m@+zr~2>Nlik1crtbOFk>}`;HJdNMpL2~xG)LLow(#|*_FG!lmVbKw z;_K1b`HSV_=f?%U{Cr(}`tghW$Hk|sr!VIcYt+6Up!cG0^@%BrrB23GOwNa&rEC$+ z&e2H!u4*%Pv2_3aKSx%~5ncLMMQ^!gW2nma4^ida{5N!4IL|u#Y7x?z;CJTUi;Nj* zk0umvb~mzQdFt41cg5K~Kw0ym3uk%a1h0UVjJxvKXU>$KsXZxCt1(uxh<~=!!Pjrt zb}jrNaDL1DB%b?1&0YfGoxlDUJer@zp||OQYtfGADevkYA6Cy+zEzy5{C8*FU#{Ih za_4T=7pW3sU@zv??vZbGx*r-XEO9sFz>D+^mcsWVm45g{8r6mMH8P6^S$z~g%2CJe z`CnG$Z~25TaSAW%S0ul>Gku4^*V*ei?H zfT`(7N%H;jSn-D{uCtc;>3mY*c0T{badp>x&$^9{Err{jOgFFCI%m&h$!%O^-V40% z1m8|yk$rs&-!4P7pNa7-cP#WSNuPiD=u)V5)RHS_zaPuIqyKuh>bswUX>uuxlno9% z%~^U_tMB3-zE2GaR#F}eCuXwAtP1{x`ZK#q4V?wVjYS>wkCm?8o14 z_}$CC!sovGc-HbA7m{1dQregAspdCa6rJ~T>e<4roPO7f^$S~cU1a|JdS-Fi^n%=R zdEU42GapC&lHQcC?Z%cq3pM4=RKH*c-kmP*bdyu=Pl#Ql{m@d^cDXm#rTp9@T06fP z>8;~^Ih`#tEI{^}n(@IG`(7N$NHk*H|5!3lWNuuDh^}*HuRYh+$qV|F?i!!)-PK$j zvQGO|+S<1Kof=YlS39<-w$1t;HM#2gjx9#3yFW*Y&FFmm*wbNJ%b_A6WfQhD-DVf% zHZP8C@Y$9jKk0z+=FCa2o<8bm*((0kzw^*F4}tO)&MO{FPbVAsuA0&@v+l37a#fSn z&(n7|&8#XCd)i~yo4xTPOHuQ)+4qh<&E2|QYGLc|RnHFzeagM=XJcM$6D+Z>+d6C3 z?Rh6^lxvsOUM=lgllw%hvZni)LCZXCj))Agr5?1eAA zu^s2O3Qn&0YWBpxc1z6GTwy26Ec22F$282HWBr+#B^(~HKH`*4{vr8$(Ve>~^`(tU z_A94z%&b_QKX1)ByUOqP7#;3ZZGUp{_$jlORoi6MD*JB8EPKA}h1YiGo*k~sq$ll| z%Gz$Wp`lggQ2nLgt$lg+N#^rbO}=<_!@V+{;-1@ljdm9sCHoIo%~R?VO}-#6^nAag z>68y&BpCZeRCR>%8y`GmP(Gr}&ZrQ{cFgq*r-@vNNx)5uC-ROjYDGTgx+e8R%zkCJ zs3p&}T6nUn!p8kaQ&4PLIn|W!VbF7)eJxmkjm<-ANZ&?6v%+oNP1PlcOb} zkhEK|<2HlTo4u>5)uvu!iTIOy^F@{3-|r_?^we*JD*blSI=st7(&kIosa+lWmiVxS zM!)il(CrA0@wpt$^WayQP9UG-pQx~$$(ny+04TlbKo{_GM`~c`jSHLq#%v+5DD6Pn$){&3%u>_kNhd z(qdq|oH@T$T7&=04lhofn=NM-H#cwNNH+~~(zFxWZC;bYwJf#Q_qX6WhS2}6uY^v#=Q_G7@m}2wy=$qzSGgT#cHjA+XV$$lJ5p!3pRv}HTdo>g>$B_9Vz298rt3`B zQ)pjWG{s{-TcOpz^^;d0JO8&cDCv~i^L$juCOaB+c zZD=Ac=ooQEHQ`Iv+!dxl86Qh~qLk-}#DyRG;VGotrqudshpx2HMLVBYOcrO0yq>eD zoIia|Xqj;IzWke+S;v>XPMJ6V_RgoA_j!z!J$hC69-k@VXX7y0DzNyq0aM>}>%Meb z#|0bbw7ER?S#aL`_^Rp+QoF3azIyoLuSonfH>JqOo&m=lHtf>X4PC!u^+kPyL#Co< z8=2)pq{`GTMaG!Olv?~={r*w3W-!U+8k`)w;|!|MYGDF15RNOnc^U?=bgReCog# zO~EXO=lSn8vi;S3S1#YW#kzRvj>Q4fe1HA8q?M-s?cLFjPjCK~SIQ~*a`yZCd$RE^ z)79-|l|Koe`&hR4vkf8+m(g?|I)x<{6F-5=fzd8t@No-xR`6rh;$H|lyEuxDf4{7AWv;4;JH;4dC#!BY;$ zOuM!3#HTw~N)MYb=@;)Uc+8NtSw(-}*^pgdd$*l+cE2b5;KlLw_{@4|H|6rjFW9a* z^6fo%D(1D|iYW%RM^0s{KK|#cr!k>wMeZrT=*WdOS#P3WEaqo?B&|3XQ_@1nKP;vXj7b;(8rbONS{Bz4H zJ6WGs8@fgKj(j%p>bv(@;5WOQO3kvik6$ExR%ZupTl#g0@lK`!1EK3?%nx7fl9u*N zlIojWqIbUR<29*V`$f$i6a18%L|1LH>T3UYT$3$Yn@u#|rlULc4_Bqmn+oZEh5Bg; zx0d(?M}NA0w)kH=%RjNLMN@snqcbb4Ym7hct7-kjp*A^wS@L7=hwZ-qw)f{WRg}%t zTiCzvQjh(jtx5j(CvP-&Ur;=!zCN|;clgDdKSe!QHW**td8dB9{O5zwQy=f1e7W|X zJfLGVglB)q<_)f^Cs{AdI3wRyjHSO8fqE@vuzVc?FUsq=r zt4(Nj@G`%9a_5HKk}@%`)utu-?Nn%uVOp6z?-=j@`P1f{ySCm+?23r%T~_h-h05yE zla3dziBj6RF7tPI44>`=uY_sJEU^=c%Fj4nKXiAMQH*)}^L<^4t!smh1+H{*s6K7F zC-h9?g(b&>L=TB8cQ$-ePhI}vmFozBtHLba_TTmQPr#WjEU^Z!TH z#F&>X^#x^)-NLD|km4 zPsKk(lUMnuD2jMCC`?<}CGpc~s=Umx=`lC2Oq25tVA5vglxBauKYstSotwKi)P8@c zr6QJ5E@x|NYx{Rr<^!YM(O=J2&*Zsp(v^1MVMy)+1C84uab8DGF!;Oa+%jLZyKR5^ zgNw({Ri;;$3xDgGd#x<}O3u>5hin%Y9549ZEgQDDyy&;zDhiET399h`%S|^u8d7y_x8OkoO}M4bWP>u>aeXV?<{P! zUK^P@Mds{;{uSvPrV32aP4Rl}b8geFx`14z>{Y$u#pk*zSDpT=`py5k3HK>a6_qzf ze&{MOtP1pU)pL_Gc)(4PrCinQ*Un4ya{F|vr3Pe zuh%#zmwqMp@~t~}*KW7+KEGtC)XXzW)jq9On|QG91=HHH)cuEC_xa8CxOv8NmDNm> znL0CfPtu&sv)wI5#b~0f1j`}KBnP3bNx{qJY%i`;-<=(>AjSD#US(dw>=J`b3*Jt+ zaO$aUr%uaNb+*Pk!*V0Dt2ohEQSL&Bvrxy*RR(hWz9ZXY{yQZ434@3)SY z6Tdes2&r>uc+tw_#*(#R-zrX7VH1&Qd^;oWKYDXx)pT>S_3iBkWEOAU^zu?F6r!B!#P=NSl2*R+d_A|<9j^%|j_xb?6W@2B$#N{(t+Tsi(gU-+Ks!Q7RFpJac>-r0`-QV<{)0KFnHhFo6kivJ~7je$# zW}ab?4Av>QvN-wVmZzKM^9%bVuKH{{zyD&0MX-$2D^4Xbr*j`wlbH9+TKJ*D_8H^E z1vi$T@Yu&5&;Hu;RC(ok`Cw@tEwzs0-kt6zW(fO~eEKCGDrtVnO}03F`QKvod(*NE znm%^O9A@I)oz*en(gyD-!9}chzKFf(scY^j(#Z^o+h_asFPHSci!U!8hI&?`yYp#JiC1|4@WaAXWzVetIO72yO)$x@St?{%?1DKZkSGb zoB95%=DnVRFMsZmv4Gzr%Ig|4$4mAMgJ3@o4btHM%;7c1ypStTE^3YK^|HQ%m#1S3OZLerftZ zAiJsX%mKYj2LEnPb-u|Kr@na={B=+%?&h1u-^<%IYk2ouTKfC^hfVggMRPrVZasG9-NYH5 zyLCc3_vV(`%`pqR_^;S*-_^7Tp3`qeql_%g4UaN9B!1v?kpS-h@JEY?%p zlxUH|=jJ^vO^cCf^)6-3`5q|?KThfsvJQ|G<<*k#nfGYVN0zmY@3*aA$G<3c-kKjO zYt&ULmVIDri`w`)kL%PenS`jPt5+s!`{g?pxuyP{zn(Ad+q@OWH-DdbY|q-`ITw!x zv@GagDC9ZsptjcSi=y+rH`^YZw=KOsgI{nr+vV)+SAx0AJ{-+i6vtfhWR1~^V(F_H zk{85;4k>mmi3khpiPP9)cg7^po1ydI{+@{a?z~EjTeBP*XTFv*3;a>*B)sK&#gfM{ zC%F0V3(nuClgZM`=5cPpfopTs^HS48zim>yb^p_CEAF!zd~pZ+Oxe^@g@lYH&q!UW z!T(&#pcC2 zp$QxJM|jF_PWkJS{PNr)Z7pp!A=?ch#@oyMQaw3jW=Y=i-0@jL+o@=ljLk>&S9(_% zC+y7IcJiaiE;bLnX9_D;dwt$^Gu?Z|FCC`<^EFb7@{D|qBUiRwiDWM;$anU5u9M)P zoy{?0>RC;#U;orJZrxxK4vY8^|1u)Yyv^>%PX6XCrV0`7qvmej)5UscLFMhdB$dd` zt@D-tNW3|e{_ww`t1su;H}6-6EzjHk=G6V}|F>Tn#-EXYSE9Sd<#$<^;pJ6j6$MoX z)FhiGm3(hLd|23IE>q77F-339_5xl*N!BLQMa^4wI5ORL`S$tQ^X9|X_fJTfskGd2 z+akNT{^y@fqWv~XEIskKq^VRlaN^?CYW%OG^whp-Z0e1B{7EOpAi7P(_U#X?y^C^h zZrSroF3d2eR`+K6ZbO!!?zQJW`EHwiA&2{4?>%No=g-lpXPZsB+}nIVpXcw3yYTH+ zQ|z&uYfSqz8XkR&H(%W&;osIN_efx$>eue8g;5KI=54HGyH!)Y`|$ibhj)c9stxb5zOTa6b+wOtMY5voj zf0Sw_+>iL%Shg=`$=pc`%l4g(ur|8U*R$>F&qEK}cmn=c^c2jgeG%WMD=rdMW5Zu|`qFKE@(ycyLN(*DpX$fC6Bk(o%vMV`Q_JT1 zn7dPXpIGK4&e#j~a{iYdU%0S~*}VDP;$HU;%+V+J#LQi+CV$jII{EN)tc;<{K=JEl`x!MJ$zpr>uT0B7?7gKcL^EwgVd0h71v&>`?2XyJGSZaSSLamK zgIAx^>$gmN`Q5~839FSu{*~MAU#2ENuVJ4zNV!qflqwC0yP9)JC*%D%=|C1qM#gUz}p zNxiwE_l43$ln%?9=F6LJ&y(*kT{X*jdfd(Y3ID&OugX#Vuu$-As^~jkUC+kU>0vh~ zUGiRBPHi#5GD&H}&Wrk>KyVy>p@A zCilyge^y=)uJ`R4;g0_L2X_2Z72jFyu#bYC8-ef9NBc%`G^6rQ=4Yi7Nh{@EpgGsdPr zy~n70Pyhd2Cr`5-oHaW^&oMjT)N$S9Y{wU_rZ+0gqV8^LjoRe1b6y|$Krx)YST65VbJqxm2 zY2Tz~yHEAR!V`}ss&B9Oek$PM^}`Qu~_vrdFp6J^8fRK z$K4fAZdtX|^>^etja8NPJb>7aB*?#0|zdBEn;NnZ~MefRn zUF;T3n16iQ%u-pFGmFH&zh+@EpYpC(ai9GPV-pkqqYeAkh$?6~dDh0gEi!cvab>Ub zdoI*kzZZ&{y-a?|HTSLTuZUevtG_<(|Fg43)aFlyPsZu6Oxq1!>DAT6 zx7Tm}FkSKJTW9S(9Cvp_IxBn#>v`g!`s;M?16>FCPg}E;e)x#S`7N7Nv-PUY@AdIh zof&q@{ma!pxc&Fu`M=goUiCF! zU8$$4OEg7NCvpkoJqW*YJ2OM|>z`I%;q2I|w)`FPDT_Mh2p^ez>f&>?`cmV!`H$YR z_qwHT*tvIa={>2onf;5us=jpjA{+ba#=WJ{vbT5F1Sh@Q^+?qAr-;V4cTW$lZ`Vke zR~kNrt9eUvy7xRem&x|`IhHtY?~Ajo&*hJPsa&A^e2Q&%r3pjA&b4Yi37doS%PTm- zo&=uTdTQeC8KJ!PueCQ`4hVca!LY=$;xt#>kHfD!<}>_WQoXh3Rk5Lxh)O=kswMr; zQ=Wed;9nuJWa|OF-CoZRc}6Uc3tKz+@|L$Dk8_Im)m2>G@A5Dt;HaC3>HLIG+%x{E zXDBB}N={qDdEw>)L5bgD9)A^57yS#km~1vn@Oq&f!yOJ~whrHmI>m;cuEy}L7S7N4 zvaRjn2f2l}j&XnZ_poNqvF0Oc46|lcI32su(dKvUW=+4?=5KQYmEYA0!nEwCZXO>xfs=-IUDDfXUx0Uty_WgDpcCu1y z){C&}DezC2Y%?uuZaYUy&NL3D`*~YsgxaPAh*xmR^(##6?^AwoN$uIzv*oYen|#d8K~m9c-IY-hDdqU`D3wGCdzg=R~dS znEulJX&s4^HosHcbth8d%>KR^j~p2J3_q-y)U-=wKch0SJp$K<>NQXC?>mT|JyQ{Slm{r>pw zM4_*bEKYJQ*`_&3$^VIL|07%f#TQpt&DC$4&HeG<>#xr&=Jzbq_4AE>*i>@8|8(fW ztHB3a>UeH5>@M=O=vwvbV}f&PcS57n2md0`N^Gi`L3<7bgW8YKCPCys@oPycN53?c0))u#o#l=IV@rMnl{RQD-QUw8gvg2+t!6REN6|1YdeiVQpUQ!9M3$@-X@xf-u0#a-h* zcw72y`ZUk(4ce?>{}}|gXl}YSVd7Q&&be2Z6H-^rZ~J&n)xvStK4H_Yx@~q7+hf1Y zSA9LFb4#(1>8%^Cd``Q?4&Cg3&U<%(SnAUMXCm({x}w0ABHg~$f9j*lE*y_7%?-=E z3@0!7Sif{;s7KP*tCO7H&!6xyj{kjLyZEvLZ-1TXUbEu7Q+P#%?D@ClYxB5thIqcdc=xI_2=BO}b@4~Nxbejj(WPsW zD-}+5%9YJ%T6~4$udn4?hKqmhOcRy)DOy$YS2jR~ao4w>0hvuwB?UL1KdE^a%eskK zmxguI}OS!vHRr1Io-hGEBb#Pp} z_C97=81o6I1Gg6Q=-$hbd$s?0$>(1WYHF$sbDtJ(Ypl#xxMR?AG}_Tym;2)XvMDpC zpN?6R*Y)&R`s0hwAMNGqE!wm~&;9qd7?zW1$5x)qoX?&6?9YZrr)1Wrw4_@de5dX4 zS;T$1(%IY2m!=99a|$1Ax?r3;`|J0~B{x^R$yxd4o>MBTOW3rxRojpKe00*I?jHN= zr3s>7u!WnX7=$UBXXA-#i>>&SM7M_XeyxLlflc;AuO6LLMj9=sO#C>8DGu8(DN%rs9R*7MXZ&M2OMz@)8PU2Tjnq^fdlR{-V^Tf4lG^boHcUNx<(lOvmUN}o! zTd~O`wr)#{N79GKAH&zWZgEx;&)ax<&8_k?@!9({q8+D-m~fhSzdmxcjPpj;)@Mpw z^%7s>Uo&*xc;xRtN%Yw9#)}qzBoAdTmX+e@JbZ*>GiO|lg=KJe#FNc@jq9yE#TaGECNo%kx~cwJWTo*@ z{WOQe9O^a~o=kRPxULPI?Mh#3Oyqvq)kycNeY*X!#A?s3Z|C#XnqOah%3|iv*HiHG zR-JTpmHK^~*PU9SC91i{uAja*)81lkT)OOUH=j~Io}J5{do4S8=Y;hFF9sRtv9ln!P4&EHvbeA?)3F^Q#RhkdN8_W!jY|g3mL+{ok+{_ zTWD(KWgO+)_kZ8}S2O1YzGnE7`;lFI*1Njey>;&2tuIu}k>NhP)a!~?dE}aXi)M#tuTy^4`Y6dT-#t%)-_3pT=`HUjmI(gnc|R;I1t#1Jked0Qoo!ia!>EwO!yYH7 zP~uQfvPp`A`T+;kidb zHu0Ryv)IWtd!1=lbnex<@a6fwtM^Co$(-8CYwFDK_+vx;@s3*;Q|8$n_;LDZ$L~sM z;mHvbGm2mB3)+$$lDGV6>Ee4I3_kP*?!4Y~eNoYO_Nst)Ev~vQO#0prr_}W+T@toP z6WFX&obhh@iaYv&JL4A>t#^4E_GmU&NN;t=bIvC`2d28tSZ%i_QRrBt2*c7ZJ;JkY zi$pJVs;*rUW?*ZTxN_I&$4wL}iHj`o=@b0KQRO;yM$;h!3qGSi4*I&!7HWh})HU;Ux!1mu_2~J< zRt7sB{e4yP>{3H!!5?Ne?{7z*G*zytPya0X^Q-CgUCf=qtUrQ#>>p1kN#uC2V&SwU zE=Pky`8|^)T(5>cUcagBh??D*89RHquYJ@k;J3Ma&3uoCd49J;!2P|Ib~DzOF-~sP z+JDl#cdM(DW3GqNhLsx6nohUY9()(;keXZm#ea2mh)(Uzm2a(6x6BEB90JTF2G97h9M_3AWF9c=?E8 zcO~21&SyNoU0tdKC&sxfnd`DdRP|}@w@GF>mF*W3FBJc}tH8sSxLkbOqd1Y@vFb0j z{wa9y<72{&{(0XgnQfSJF0i`bO77Y{OJePPnr|P?=?atVI`UBY)uH5n?ToP*iE1Ah zCsIbu?v{_2yG0s;?ye5>1b;LefioHFmP$@*?p*SH@a-te5g@&4N%iTj1y z_9p6g{fRR#`m^ml`xQ4M_2U1ZW?j*--J^Oi$;N-O`HyYgdv9y~_j2n0^xC^zb-%8| z`Z|Hq-)WzAuVkOg6#UEEp?CegACEP!v^{EGRl2Q1!@@ei`HT5;5oxX~ZK1hAkB>qmFjVlK9NoGTwEZ>Cv+5`tUpS^gJft zt$m)=&u6jZyjPG*_GMuad9-BH`+zDYu2TUwr=J%UO*(&Rx9H>3$%0Sglc$9+{^GKC z>lA;IUTWFCSh7+$wUuFaW2dUF)rCKAStMR@tk`IH%;wj`>xXQ#3)`@ zX@`ROL~cF)4qkO3?W$RBmrauW*cNS=^Z7C#+ryI=d?vW1OsmbkVRT+uCcG@~jCS-* z{TxTva}sAP^IaeLr|$2lm>NI(Y|-OOVox@#@w)oUtZU-F>d!y#GT+L2uwZ2s^V|1OwiE6rDa2j6FioL0kLz_sF=zVH#{GxG}C7rOtOV6pGVt-QMr znYn(gIdt-woNAZCyaXBDLg}4{INvGpv&ihs2`*kfaZk{d&cD^mE6aH1yw;VQ@rZ}3 zHf*i8nc*?HjrZ0vX{@+U&CrbkkYZ=hf$^4cBgey7A$n?f)YzJ9m6ryz!Ru>3I=T=S~&)>!4U? z8^vik;ndNcZ)DflZ`i;wRme=6E!B+kT29fa`BO9(u+MTSf8n|!;=uj4H>6n_Zwl;4 znY#JYOdsEq8H?8Ts9ku~v-;-Dvu8V9&sT1~d1R^c5&Kf-%3lml?b6B@d*x%i;-z(G z^l3MIugF-s&gK6X<%qr$s`Wg3*Kwy`JenK(*Y3D%X=477s`}`i-Wt)XmMUaBcYZKC zJ@v`OEuC|I?h5Fh;sfjUDNHrKyhg1m@$=%jBu|I@%y_BmqCBkHum7b_d{d)G??Xw#4+^-#zI;q?DK=g%PlB}EU z_3u|6y_J=yj+&{i@yK+FeOhqzD(|LWI#QX&GZ(J?(UrJ5Fe)_P6we#_!_S4Swx<^5NW0u6wIbHW*c_M)@o= z=)Kd?Ic1rfSkc5hksaw9JzK?mKPI`Kogj2YU+k4I&t3Q1mkXcucX-x+Oi^;&^6^an z@)W}}O50Q>hJSOe@G>}}9_e{Q zLvu^%PN~ZO9A=yLb{R;S_#NJ)!S67UCFbtjMUQ`SF8?#RP5chm+Xa^kj=g=p<8WqH zlfqOEx6>@n?g!s)xbU(yp;YSDOpT)=*TYx>BY&pE-k)=?W{;STySL_LN3X z3VGN6lhs`hitbJ5%Cr3!pEj*7$M);|28Z3>mN#$cwk!yHXPvbzxvWz$f99`^U%f4R z&uMk|p55H}CsO?XJ8ix?rQoXNJ|4?sS3EX&c>%j)Y+OQ?>1CMOBX*h1GR=R`HD|d3zSiU=7vF!ET(9$cvEz(L@%45`<)Zy3 z&+@t(wlDHd*VDq(&5oxhaUT0)G_$kiNvk?bU!1S>GpK)mj@| z-md|4sxYm<`C%@OXZ zoVG_d^5@&sUY(_D`^~T4a*q(->Q;J*{VB)M$AXJ=`UHY~f-;hg4))o8%G1e>ye7Z( z{6Tgt9lO~&4?^_BMP66F>0P#2MV8&uu{>es-jnAeM0mH|&Mo2i%k??_d&4wEu|L{p zuCz?7h@PXi>{@@w`P8y&lkVLs{QPv?ItNjK{Tpm%{{qcdi zXZmyfFScEL=9cQ$YCErZg{tG$j9>RZCYiaqYb1rb&h31)V~^N|=L;;>Tzs{3QG%rG zlbG2@zyCS2$~7>cNBhurfeM|Jt*L)c*oMhUcdrvRstrzO`_$HRS57=8e^WM}@zHJlvfJC2NqwJDY3+4=>ZT1&<@?$$JuR8DM0+X!$=OdU!kT7; zZ~c}tDM_Vl_K~-X8FJWFM)ZPrjSKdNS*V^Ommf9v!!QyU@DN+i|+4b1{n#&+H#9E2jU4Zgr3Ke{3OA z`+ofig+{4mYiC_xJEh~HvtVXcI>W_9v1i|LEj3xQ>q6O-2C=du_3`)lt;^oDObh#M z^4VZ%<|7O9Z(q08zO&T0!df%YXdl}?h7*@XuOC`9WtrdtU&b@CMLU&a?jM@;Ab*B` zrZHP4^J$w^2POsQ%q{iROz1qd;BOVDN4ck~{tJJ!>6*9eMu9)eOuD7+J^1ru`s>O4)7|5x;{HE+ z^r@zzPB+TvwQ{un?mayRKYR+&ci9sh%gL}xjjL-a+m}Y6oJG&4exKB4^!*oZC0l^YZ9- z@q}zj&C+>N_V#tz*4haN#TG`cYrdOTp`WATw9)d{qI+_$u4#YY&b9sA$xYn$2CZ9u z+daCv?zde}ZSmccuf2*`?>w5Ndba(fh=;h~VY{E+co*XgStzRX|r^IQAh#pnO7 zUp{?DRXfjW-{4ZViIHFDeEBCEY%DH4Re$qu+387(mYSI_u;e%2#p9v>!0Jca@pMj> zw+#CZ>~S>Z&{SQ)q+9&Ex$=p6UD--uMxns89}UTUmt`MsI4#P2ui~$fT*v_~RW}CH z;D4R#r@V-nVB<6KLHMZ~+W&rJ^{-yLKKzPr{-5gkT?ULQbHCr7dq9%K}%WQo*+rqJ0obe%}g7WnXoH0QOtp~lgEbC(byWsfT zwwc^vp}fpV6K7fLMHy7Aq(hgIrkQQ-dtPlVJ^**xcp-D)qT4H-+VuL*4{6*`}$V) z7d3AlZ`l?3@<~neao3pUY|a+;hQbLB3XbnYeig;|6fLb>JDvTZUZf(|wTq|Xu33l7 zDAL|0u=<@I*V+lO`fWZPJeBTE>vk30(>eTrtBLpXt0wg#@!T&Q!K|U#UsIm0aIW2X zee>F$OGT=e^A~@%OMMh#7;}B$T=PA>y=~$R0ezdBtrr>Ozy8`@B(Ao2>-F{D=U)Ea zv+UBkb-w#=$cn};(R1H8XS3qw_iY*9HtgNqbu;xC`^~#={jO)d`+xtQzRpx37J<)g z37ZX`v~-wDysa+0d8lTxs@$b0rC-&0&!R)!434Sa<`E6wXZA?H>g6rzcUol&8b9im zX~DSG zzL{Hmea3kBb)}V`!A9Sbm<#tCmdfwUeEqaYBFo8j_uQlFCcNjKd!|rT(br&q?}_S0 zhQPvOU4hfg7A7v!KKXdTA8pgw8gtnnhVgCm`cML zfwv}8^Yf+bUrz2mbG>F0$Nx#1X;1v~cFJtnm>hkn=y^%S?lX&axt!W~Yf-zn@|v$4 zD+P=TtzHNyeq)?x!FI{6X7UDc^R8A^3F&!uyMOyh8lAWyVl*iy+I(w{(cC-7SA0IP zch&C5!!}GlwUv8wtSr+@x4m;XTIOE3X><8*bFQehdo}KHPnx|#c87KL(X(gfMeh;S zoKd2@pz&;(L*J2OPHUE(_yy>Q-8_XUD$DN_9c%!td~9ZL|wl3IGN#t;;e6P zp4Yz5vCGzC;F4n5{L0a%`CIJ#&4r(Qzi7SdxUqS~R*QF^43^Dx`aENX_|zQBXICTB ztcBk9MfY!cawA4o@%)C#pt~i@_xj=1er?-*ZYmp!g&HQEOZ=CsN ze*E_fJH`wa_5j9-S$$i-Nu;0Hb^Oeg!j7zNU)LXpj|ay8sI6PJB7Uyc*{wQLcT7$H zzfp13hKG;s0+&#-s~$GBQB9LsY#_JprI+8yqx9aEDnVh>LJ_<7OH zGjBh>wUAL?oL8#0`LkG+T5))qQS^m7DS;{P`bD10Yo3G5f4_;%^}lT(@K2jDGxX4< zRhkCN41Z<%%sRqQnsKRR6_>|mLxGSj9Vi+X8Yg^hrfk?E5|`xEdp0fU(6N#W><&D< zoNr5ae|ocpEo!>Qcend5IWzJOMJ+Q3Z=dw$dzLV(zoZPu@wnRCDq6Gl25iavRC{io zgv6QmUW`f)k|#OLYB21)7R(US$t0*UBk=#av-Q4=;dA2uF8dQ!lvc(5y!}$uRmX+} z%d$VRRy6YZ@o)VlvphJ*YHs0|eX4)j7qF~5cg6kR>Dfi*FDJT~f4$eV`_+4vcQa-^ zI~V(0I&apFCx1M5iQkQR>V4vC7;lyNC(F#7?ib$c>~^^7mU-bO!_51m8#3sH<-gA=0Z{d(H6K8+_wp2CgQ6l%3AXgzOiLIHx|}(PcqrtLBa!^Ib*aIsLMv+jiLea{mEZyl=`vlPx%3qNMm zDVI27fZ>=~No84Wru1eoZW92K&SE37|!$UK#Joc=rDk}N%)FNtGqmom# zsjJU~%DVV>>PxtLr)FfDcr4CKD@`tc9jEF{&54~tRcaf`I-grF z>#9zwZuD+gxuNFO%Dd8WSDm?oJ0ESW6AOQy`0_u)UyYu+8BE{ao@rmOFFF5%RFk*N z+l#LsY?w7Owa4pBLG0C#WEBSW2)<2ERJZXPYMO3o@OieZ?1IT|t#8}(@5jE`cY*H_ z+tU8h^AgVYKW58*-o4c=(<2#6EU(AhZtJ{p zVdqxX1@*JMUmvx*G$ZVIn&uM*MVs!-&d7C7_N_73I(4iiV)4qze_Pf)^^tnddRFqy zgMK#|yVnXEig&)AXX79#J?TK-=?OC`rml{)n-a-RB<*Ec7fJ7H`_I>}4UB`?4J(_Z-V#_^%7p(3r!;T(ooUy}u!^Lr?7d&?R2K=W+P- z>iu)A``mBNSR1C*S|4evpi~>cx>Od&zC}M!#xjhlH-MYts%~@w)rp?*3eR zVe2Ka^0(PFe$;fHZ?Cny|M%U5k28x?{vUb#EA;~ZA=lkE=ZPEZ$hv=B$Rs;oDW;!$ zI;(j}Ui*VQ?rmHOC-={qy#Cpf)s{b5ia%A_eM+BqOnZxTVB4|Vc?%!Pe7IOG*w4d# zp6R0&Q$-7BnO*tP2m1H?LwhA_-}(5SVp`b$)tLDh*RGXKR#Ss44?cP*(#fAcqb=@# zV|~r);|w=6?q$h8coxo5G-V-^SaFG})XQ68SC+rZXs_LMrGIkNxEZvVhD%atUrLenbCpD)A zyfp5blPK5_bhV&m>5;RpKho>|7IROK5b&I-;PA5TzIKkZ+|)p)sjezpx4kjj-Z%g9 zGc*6_pkIep`qma^^Qcccd+flK?e&=@hkmcP@G8cC4(o<(eJ;y6SijYPJ8`_N8H|jyX4E|?7KHzW#cgW=cRgJ z=HbeuTK4@y{MVx1-P~AcHD`CWp|zXtzQ}j$_Il*FU25fI{(g*0*XwZIypAJR^5ic* zaQ#(cxFpbcdeQD(*+*W#He73-F-4iLE3yUuav9$Kh zTXn@X{p|nUIaeP`osOBYsVT91{h7zVW=ee#6gsuStLn+LYW90Uol}MPRUdfDVi2`F zKD%tgFBR2&`&P&lKj+k%Bl4)Or+kv=_l5V2dOPz^uj0O+<@#x&s)e3Gsp!o)n@p$v z4hz1)!_?}hxJ*yAN~I>=s35rI$(18PEUvL(o=sbqI0?^^wA{qPIPt~(OSc1~9Qijh z&DA~Tko3dA;__FMs@Ix0SnUB;}{4Hu<4=`0XcM_DA~M=j$!I-@?|`p(It7 zHTOc;0d;K-M>i*=jY_rb(2m5N)*BmhYuFL$gF8%FwXIrRxM`YK{L&Ar?GN&*Y zz0T^G)%!E#WZgstGjX-1Rd>q&2|i%e39U-Z{m6TFy}>T_zIKuJClA8~rZ0#KvgXp! zS|MJgc$}A)Yuh;msg1mX!84onbDphXxskCwJiBp!`GwPOR-KQ&^5N%|?MKf;Okmsz%ffmcHu6ii>-|}{@Yp`pMI)S?s;+3EQ^M(3PFzwzTKO9bMDV$ zmkxccwKiY-he5z!F-T~_L6Jv}XBq;;IghAzmWfrk>D?5(kZL)RCG#_D2m5BPC3>c5 zn@-!#j}+C){IqV8hOw<}`5==nb@@Mz53D9l$7o4ft@66t4ditC?<#hhuB zIja4(g=<%@ex&bKt65j~%+QlswSw#AR}0NA&G%k!5?_6+TSac;_neTN&Kr)AQzo`w zD)*n!^56#V;Ujw&Xf3|IbYXS(7Hhw$FUr?u+?rjLSbr&F3wv|fi?3{Zi+;^Lwl?7K zWsQy2-#9+3dH#xPw`4(NRMH)t?VGa;SQkl}S!zsqc7KUz7T4deT5*8|{=!Y1e0ToM zU2EvX-j%2zIq55_-`k?6Ym6C%oJ+bpKPcb3bJucqfm}{t+^>#u^_q!iF3HPVznahe zzg(p4tvyxgJ5;&l8?Z;?%qHAyrb{>BCKqy_c6Cwb?cEd~1n; z@J-uebLP$1d;Qn3wyMZam)?b4dvbrytcyp#-F>^6gwJ1J~D>FwMBD ze4~rwnjMc)L|&JgQ-s9Mzj>$Mez9(M!o5_Z$3kUJFC;FBig^e1soPoiSMXV znD23AL(z|T*X2Q9-5-{HR9>~7^-$@G5BdJAbF<^~^?Ic3X8X(7iv5;*7t+@?gH7=! zPhF;Q)Z84Sd!}p7R31oDJikrsQOv#{hg+iezq49;`;Jbn!iIBKUpiYxmd&bNfAb}4 zL#;grt>k5~M0PRZEzrf{R# zoTp`iyxWx9&p17rnig_s;Zn298D*>ca}1{no~mO{k`A#pI&|>fnl;CdUTkp_=DxyO zlW4Tyf8NsCHD4ATTW{%R+i5Oz{pOQdax%vCK7TDDWmP7NOzl59yWKVI^#V5ENb6g9 z*_YmYU;fuXE7d)F*`&=W1<@m{eKGv^;l5i0jV9Z%vNgfdL~Ef{)X^+&xq_zkxZLR{(OF$VG*=Q z{IJ;9+JKOn{mT;cOoLT3RWdiONjVUx)6TQ^RoIrlw^lN=OKGQ^Z4@Z5V>wmy?!~|L zA7^(bp5*v^?!}us?9DCv-ShA77nXVOefRbB#}DOqwOc)1{LgFkJ)hs3o8;8L1RS2Z z+5N88rKVe*YZpZ)s$W%Hug@v7IBr>LzW9yBbG<%wtlOiZ%A*{}%cRZmI_vzrQ>wKW ziqvDxUzu6=x~Z2$uRZYg+d40e_mjG7w>}rqn7GX#Kr`l7&E)8d6Ss-wtUEkQn>Bd#zh7164SCL`?|SPH~#aoQC;lY{5Q3@wQPF`t~ z%GwC@`zUXXJc>Arh8wHZSADE#Mx}(IGIbx^$hpVP_#(SGg zbb3}Oa*NbGKdtd+Md9no()v;p>^Inz`#zlJ_4kPFinFt}PFbHd<;YI^0}cjv_;ajR z-fK+KjtDkBK3Dt8sz&n{uI*Cg+fwG=hjQE&;=bp7&s(bVNo7miZDNBKWbN+F4zq%Em@kq7A+0xHzvX;|yrzrxV%Y$2| zrFxpR#wI8RhTg5;Kl9`1TXFhJF220NA8My^b8GtXZ#U%n)1Ot=8GV}1t;Kk^@Pt_R z%)=@%hYD)APJQMGx&N@Dq}14A>3+L-UUu>NP|c0j@yfmbIw$tzs50eqc~6g$`jL>=D7zB_#>T`JAeYcqqJmjpkfNu#_@R#=x! zv&UBL3W)?{GDH68?L9Y1=bc{oY(cVmQA_j$-<)8)n}JYem3#> z&&hq&mDjUpzux(;O=P)QmXGM4r=mBiN~_oXle<0tma)y3>jz`??wk;9TC&CHy3u2w zw6nIH`VZoxnnGP<&D2d}*{1H|U+bEz?r3?+^3?sc0-rk9ezCchR`|{B=jGIcJhw{S zKS?Cd%lyV)og6l$z+e2(HwE(^o8#9N8V-GP%cy)Ao{+_CDyKBx-Tdms?Dd!O3RHru zT`qNP3Fuf{_#?xrVAgSlioG?z*{8lR4BWQ5+BQ;lV&xQ>8~IlXue{rBRDINbbI_EX z)rTELmaoqB@X=cxwl~L)Q_fJ{wg2Yd>?sQiAGB-ix_U9__{}p(t?MpNojCv0$Gsfx zFDkCOb%$C#`et;RNwzDuvq}5y-Gw@32B9@w%u;F1(^d&=dH?O`%wzS>;0_k@hSG@R~&-FjinL#Vy@_g+X9P-nx>{S<6u98d)UeMz1n`rLdks;=r zSlOQznC7tW&HTm?`AMgqEPq+nxS$|or>e^Y=8*YYxUCq^DB86i`}s$wait_{eDIn# z>jQ0-V?L>#H|@IL{OY#JnyFt;AKt^Et@$!B{qe$|){~|fDjl7x{+@yV&da0BMz@PB z>=q>z{f|qjdfI2o&R)6j%&`{^l^0UNo%)J=`hNDAa;x23*O?g{cQx#V&W{^gb&B;a z?L2wnc}BVT`^Rh=WDC~vKH>! ztk>^YUUzEquf^7HszsH(*{)vpPZ$4t@c754S3iin&-<`L!8s=)Uh(0bb$?l97GG*v zugWBuK0EJ0hTa3Ck8WwcI|8_EHZ0QfbNTc2?X*pwWxAB@COvqz+i2cHj(RVb+n#xC z(-*(K7+PQ8CvxSW?rHg>x>W`y3Tzv!^Zrqw9!tEt;+L25j$p&a6{| z*0~F=)?L46&-||J3_~B!^{mGewmm7DVVvyUQ?BWo{P3lcQH}Mb&6*1$H%FC7|1J(( zYp*O`Y4bnCRj_q_t5QQjYDnBgrITHgHySJ~H*WvU?`g#UcSgJYp%g)m4VP}@9b8?+ z8M^q6>h!;NLZ$?})y!jF)Aq3}&|uPql|lwr=Du9Gphf0xS#8kwzO=U+!kR~9^Z<_A1Wvpvf-q880+Q)lz)0Z1xKYTg=@#fE~C)F3TeEFuvImvR$ zi}**pZwqRQ%T}gxr>}dlYkze78QZy|ZOj+N0`Xfujt|9GQ~*H$3P`;kc*EQnr|{BX^g{r5MlD z?-Thv8TX5{uu<{L7;o62JdfN@Q2ga50Zv%qp;Sj=R3#9*d^X4nN~xN;BLofHzbdug)gA z4O^sce0gErwo&$ehWdpyf<;0NULN1sE*s1_wd&Tb^(}8+HZ`@X-JV&Uv4EBT*^!E= z+?lJomY(4#E}GmN9${oOX~y3>Yl;q<_5>~4vBsJ2ly=S23%^;vr`UaI>;GYV<8Mi= zot-qF+kF3D%8z2c|1o^Q$-hGG_m9eo;=*qanWhQ$+&MFE{+#(=*!do+&$egVr7hT8 z+Ve)q?a6Or7w*m!Y5ud`>_0kRF{$6w%9A6j z!s6M9R+}|ln~FQ9^uJ3w^|mLy##orMc<%}Ru-hEE4O1TG%GJ7F)vfAy_Hb=TqmCb! zaZP5-!P^#BZ)mMs9I-?zPi|#dhvwfEcEMk#8oE9|e=gju$8vUG8HeZZw36J*YhUbb zXFS?;lxs43Y4ramCr-RFiMjvu*grc7^P2@o#*|bHHtdxiz@qHI-5t1qNT9Ed3|OD|H_q?s{U}^IQ3Rl(~zlkHX?o`9FNxN>4W{s7e}o9g{ir*wtq4 zVzb8bKHju-Tm2uW2{4*W(EQ2hQzWUtcI%0UNaip0E1Sf_Cs%T2^IY8cWV!K$$$agP z3kq$Q+*QcER9t0Kx?RV?w1-n$aCxhH?l;xDt3FQp@$s;R(9{W!-u8OmJ-=}J9DWI& zqkl^bDrF>k`Gjuq&0Ash*EB+F<<*M}dt{gDB`?6;@l>D!(VTUc3Vt>Taaq!L^Hme87gY4TsYS}=P$l|lBelt(I49i$CFRDF?|$R zvec+idS~qVzt3OY4E8R&IdS*&vwX2r-+HWCE%~bLFIVigX*UDkn0<6Sdg;jVJ&XUO zJFrdu>N;myt);SJn1j`^wV7Vp3bM98f@V)V=p^v9M^3T-*o$oMy%k4lbd(wt6)%0W z_inv9(QcNFyx*yf_0j6qr%R{q(LGqa@>Ab(m$da~8kIjBaQL3wW%PbiqiB&W+gk=C__MTIifLgo`*V1s4}WMuJ?zO!+!esl#wS0&>|!bZWWHy~gDH!8$h2_tm}7g(_H<#uB^u0&q!zU z{NSA(+Vjjmy!`dx%iEtHm-APM+Q@qA&&W<+HLZ2;jba@$-dK?>JzG!-^sy9OZ;MpBwrjPD!%`%Bm?7i{jqsRBx9bvuN+Al*tI@GLoUs!Lw zAm>=)r-%DjpJe5_lbFH1^AOW_?|m2V-l)r~G2f&4qo|7M^vlN&e?L~fQxf#!PWH;K zMn%(g&I|ZG3*|z;2h9X*pOk)KyD7s9XT@OO=*lXA??GkJ^l zEPNsvt}9+@zfn%?6z>a3{sneNH(6xdb6BZ=^7e(In{Ox2O{&hWUjE{(hZc@Y?oF0bjxYAhxMBsrGk>fvg*D}OOp>wSmcnE^Zc;u*0Y}_ zAM&IZyq>&qg4}xFCW-4uQ`qhbYo=`3v7CM4BKNz3+y0$j(d^_FEBm6|@I#iqZCyw2 zUFk!Qzvb};wyr&yx#`vx>)-R`Uw`p@5Z~V|{A+Gfou8rTP94AWB+Z%p*F!htUy_mk z{aH*;X8NuTGa0$7zE0izNd1?J{gu4NGrjU}ekXlv+LfZV{%zjw$lo07=}%5RI@-~@ z>fMB^v2j;om%jG<&2~Ng;*8u?;-5D?UlQS#kuBZ+^2o6(W!%SvX4u*KOK!B7y0lnn z;kuAh7g_IR?0KW`xNz_9XEvu5Ihi{C9J@F3@3e1EY(=jctaf9)*x7M7bLVTT3+eOn zLd#Eg{gT{j`Py$SS4o48Vo}zX9tA4_*$%$Y8K>;C`#R+E9(yRq#;mcNTvMkdUfca% z_forz?#~+Yo$337_zg;Pl=#XlqdFPeZ>lhzI=7`QQdisfa&hphQw%3~ibU9q&+vMM z9M*9&*c>Rg${?xp9{ab8H@?if9r;-NKIgx@{-2@WD)t$EV>)l@)?Im4`GfO*`K)RK zcRtfhu@~IWbZZs}Z*~%xCwr#gh4*wW*c`oY|1ARn+sW~QOW!nZbKJiPHudiD-am$HY>2DIMX0O<|NBHB@ zg3T*BAM2=EI*441XbBWy-~2FOnWw}_lc^^o+a_I2s+Gyq?v>ffakNPJ(Tan8?Z2u5 zE)*$#oPOTtw@vJt7me+OSMDs=pBF51Z2{wY|MbUlZ=USg_iUBue!s-#eIx0vxXkGUH9gjX6+WKfRf+hg(d5A3fAWY=8FhEzZq2ccY@@y`7Kekyho*L zqFd*`GTSyKM0e+N>4wjfU0QeDWU0GbF@L#rO#AiCyatywtUD{^u5Z}-%Byzf`UQMR zxBXRK)I46k>rZy_@#I~ zw(gpUZ=aad4ZghaTPrd9=6e|i=E5hH&1*y}ipr;ctA4lsbqS+HQFZ&YNU3`TtgCIm z*yueI@pRi{A?|-rLde%Wk*PlOM#)<%*Ntn%QeP?u*>$bznt1f~y62+ZImdOQbk3%P zKd^Z4@&iY8dF?j_ohg}?w|6SmTvK~^x^CLCpHyDi!g)4l zqqzj6wwCzkPpDlS(4%ITx8mXd|L?u{HVNJ6&3sRp_kUfHDi?|ys_ls?k1 zMB@6Ki*}bg-51UkxW41P`R4wLrA?EM>&7H8>CMgFTs^D#h_3Tf$GcWJk|r&C%#F&L za%+#LS1%LIeb%_yn?K?V{~4)m7Fyb8wuY45UCyl#9T~WJZQtvIWuhkO#T~aM*>K!y zTDERU^$gE-dwEY>kzD5@ZX6?Pn3%BdUTEr6_obnx>%BeLb{v_vs9gP%L!jm)7TGDK zZqZ5t8%pz89CB_=s@CUpl{=!W8TFX|`bEbdj#6KwZ*OQ_zec!3E%JJ)fN!_pUBL|< z#_)~g5L#SITTMh+;zMvQjspOtn*Tkwz;+H<_@!?VrMeW6lt4Y zykK+m$fX;T9)*dY={p!+&=_lW>$!Aet)0i2V{>4KL)nY|%WpKrMM%+_Ox!W5+t#j&(kpGA%AZn=Sq%Ytf9E zCkwQ<`>Y7h6O5HOxZX~A;pOGl8#Z@L;NE8t9sVKm(7`(wPBq{C!|HqJ!Z)!=yC;LMt`nOE02yA|C@KhpH~u>b4pU)Zu&C|+Jy*vXw$ zP{b=&aQE@Mn>WH|uEC+ivpI{ylASSY&<_!<26is@;=Vj!jr@JUO#J^K+W+ z^)pOo_1?V`N#3y#mo6hEb`aq$H z#j3nbD@2V99_i0)*!*I3RN&GVm4?9^|M^CziNC!lbUf|cSvl#smW}Ht9|-QcWOLv{ zPPOFDd2joB{56X|F}V7k{c%ZQ3-iK5fl`W9(^6a(zj8h~>*%3<8wGz%nak4{G)3=- zO4QA`oPP7G>rT(HVG0axc4$7p$HL{lQ-@_yATNiGj-3$G{LhmW1G+BxEb4qJWX{*- z&Tf7Zhgv?SpSKRJye1f$_*Z#S3cjJxxDrixCS_0-wCV^Pbx;P)Iy)|{~8&YLDRTivK_p6!d3 z7Czk0g%M_lC9-GD(+%>@=4V}9HRr=jGkXEu2~(pVt(c&Bs_P7+ieI?dhu6PmRqT7Z zW^RLtPvhxrrUfU9_T79ewC!xt{F=?~a{B)d#V9_W_~cE^l~2>B-oB|Z`({Jn4I$$& z`8#j=V$TcwI3@kA!mjw;mZWgmkM7a&pSKIJtlCmoWjg6nKtKB|!LsT=-UH?wT@E~P z|NlxQYD+3$a{oqcS} z$>x;Xv)E4-?R&j|-}!3!o6}KK?LzoJHt7DFY+s;gc63+FSw_iX9+j|F)0Z#5r~cde z=WQWdOxNB_w7t3#m_BDsx=0CNQ(am`uZ{2y}lO`?>Mmah&Y8&=MH>_B6+v3z` z*|W|k(si_g4*h*~yZ`*{+h>=5c$~KTZ_#ev{hJF9Jj?D_`e@(bzcIJ3E{Z!9B5uEP zn(5)+_F414R-CI_{C?m46}#6Ko}Ya#=3c&()$2H}pZuW4=bYHr!M800{-29qC}}67 zsq)pDuhvKNg7q_v)Cw8%>xo92blLem=iKsZ{QvKp;!nXzhwh$@S$pEv)u^boWvzSn z`?l!+Q_U5A*!}!G$19a%j~{Pd{PE()hc8uY|1y+uOkp*7_3782Kevxgo%ipfyv5(w z*Y{Pv-oDq*cW&HoqY`E7uQmOX4p$u3@IB-!`B&=J)UEN?gD<(JpWk>yFD52@d92UE z)mx_he*b#& zGSYSrTZq(J?*|uu=x<{2EuJMVwMSCCd)<*zR@a)V<`>zdHd^1jnRRKqDObY1$YbB9 zzP|NqckSkDyhK@Au=;$(@DTs=^}nJv-s4F>{c}C*1NH1^v5xua#v7#Ko}9XPV!G!8SFMkG zJ(lfzZn^MnKa(ZT-y?kOiY_Oj*-yXXv;FAIS+-f^ex3EH=UG;w?~_;kU^%@$XtTBD z+K?u}OUKtL&q!}E`O8&Yv|$bhdklB|{ZHTS3cC00o|YULz2)*o#yjHio7}%VR@}vO z^PR%1*U#+*&sjQE-Ii>%&GP$yC*#keuEnR1+g@US=5kQ+m`H`ofuGYNW9J#G$K8xM zvTB7&TxzG~!>b8K4KtFqt(eD>Q8x8xQC0)5ms`vwjW_nwBzGkHD+OI`4l1sb+wfjw z|K@YL?F_{lnGPhmO2<*HhkmjV(91i#$9Z~k|W(S^s4wju6k_k z)UfDE$EL(72Sn%Zmoa&~g?Xbdqjxf6Qqrc(FXmt0EH~m!*5;UW#j8o9PdT6=<%O!J z0oRl+rudr^rCkg2SMRnwjib zY_k97k|U}gjBdG=1&02*wt@eZ^14rtmd{apq!cV{+Im99sa~g6D}>3|sNp!%ZU6U7 z>t1E9T`_mrg&)74*B>!^c}@3EmGZOhtY6<&?+M>>i!)>0o44J~DhoxP zMnTG_3!fAiFgz^`zAjs({g1`;Ip=bvN?x<2S=%h19a%izWWL{L_7?G0*YgGYTD3lF zHr2fpp3SpR$MLE6)_$pfvT5g~?#{|(pB}p~&0x|ak(jR8hnqityxx4;o-_H)1Fk(U z4!`bBHd#2?>73W$gT;BQ%aZk1)fRHf@g4H-X!Uv`Q*3U3BB{^lXi=n*nhdK-MV&i4 z{{;!2=7*w9CK;zrEsvby|8h!KP{CrB%+N)`-MjCXhwa{W)`(leeAAWy`)OTvOI;df zY)|p#GE=+tqrqdBzd29dQO1+~jO-HZpAt5>+bA)YuQ;^WJf*y@sO8&|wzbz}n2zrj zz5Y39S%pK}f{!JY8m!Zn|4`CwY7^mD#8Yk*StR4i+!ydU>G_BC$ySYT4)2N16Zm41 zeMP}`M@@s~hl>e5UVj|6On6{c^W%WEjpv+Di;t64dG)PIW52%EySU=_ZoWKQgWN)? z_Jp=aH#pnZJzXB#`sUKcw6fP8uC`as#qM)pjb!=QxQ5Yk&W6j=reyDpY>Yb{_G4|) z1ug#QrvViC(3Ew3Uid1>?afWeTD#xaS=K#>PSlaLlxT?)XmL(G{@Ns4c=ohKxmivxlxFO&yM8?8+piz9c$#|> zpH7inTg0-SnSbdKWyNov0$C#B-*|dOZ}$eN>~u3Z@$yczkg=I^g8Gfw2DzN66Ms1@ zsdh>{K0U#}V734A^e5_1H?!uf{k-bfwJT{ny4zBYFK>9scD`ekr%i6ahG{z(nVos% zD);D|a4^)pIkV&LHrI)QEX?1Mfs@e4FP4%7w5(DSJi*6FR8zMtbXm(|Na}}O*U~_32Nx^%*-jhmCT=eJ2SX` z%a5v$hf*F?e%qF<@z(V3qZ;W$L%YoNR z=LkCJbgYnj=`rgHcXPPwuK9Z0T`60+HnF5#QFfI(;W8&`7w@_% zb#UIb{sq2yZ6B6peqR^&S)(*uSIU<4W`u3rQqlGAi+lC9RHbgcv2t(A*U9YHmON{p zd?4i3EyLhV-si>cUg+5ASDAg3N&S4rlx5tvOP+o7%U-?5X^HK{^yEK%p-G#aq-OQG z8OcoV?+C7G?5bx3Rq0D&qqC*mMe4ro7Z5qab=pm@QLTgR(lN!QzA-}WPjVwYl`Cgm zU3cM)m*Bzww$H7n-|SXVSFJPLR(5WV<@EP4X%{Qk9H>~+nO!crqv_wH)qBf~pFGp? zoxXGaxl41rc$nU++~hfzto`fm@%p^~f2{xhcz6H0{=NGjGCq7PSaEsTBZjTs5eib8 z++Vqmwa9f9yJx7|UEcms(C&dz<>JM26r|%P1ieg={jKxbx8SD|-?hcL`5QG?Ef(Z+ znNs%dgj|uh$1&G1@3g}JIkNb6dE>60a(WzuM=YQeZ6VshvZoTsJr>5t|1|Q`+CP(ROmiiT(5cP1!lO z_Na#^##RURfS@w!37Oijj-B9_h z^~C<2trpIEBPKlasB7tRdYBuz(=5$dvt^&kk4>$&Kd~4dIoQ^d?{3;S(Lki#aGSX1 z8dllbyFnXeXFXWR=cYC>^UZJNgcmb+i$;FC)~dLFvOuD1rsULpGDnLU8qe%{`{v^2 z8r6-Qlec|bF!93kl>u{7rO#Y@H}m9b{&MsAm-yf3#}&OdnkT=`b&a&7#WB6IwC#~` z)^Y+Xgs+6BuBd1z_xb3yl=UvI0RBU+r^z%%wWz%B6-YQi7G`Z7kX2Q8N`Qn4`8onrm zWhSAAX}NN=I^Z~UWe27Ph)mi|Ks6T^;n>B6HpM62syNn>_ZPe;%Lz{*t-AU2o2AkLQhs8#{M3Z)QJS z-7Z+c@KOEoeYfk6mTFM1zrDt3%)p1@V`Q!?cd+`ES&DnWDVJU{_S;)_MD;$HnsOu4R2t z{DGs*;y_S|pwiyYCq&y0*E%;pW%}~u(%-|}8XBr%*70@`tCS5B-)TCO-)lV6TIO1l)XI%7=`{^8cf_3@owC|Z_ z>YHax(rR1w#abri;KGngXNsimur1A0o@6L}xzYdf;nr@aXV)V#b<3+cOMj-Cbf!-{ z&*(H~`3b|vb4*{S%riX564)uXu66=zd*qFtZJodV$o*<*D?54A$E7y+tLVDMd5aEQ zn?B{ahNkAi8@)eoo!)WA`_@)}<>*DbS=8rE6>005qyrA zD`41nZ?(bHV97;YCpqJDR*7Zp2WkIXI8q*5zNywa@>Fk_x{Mfba zMzPo3|U&4rrTiTE!m`rWUC4?KD%R;--yXoA#Se zR1ax-GcQSsU+`)DV}+9`LaUi;OG6U=R{UI+ep6$OUt-GNPyVT%GiO-syUDA$AVzq3 zeZlv2YT76IOBmU`{dXEZ6y5JraPzIw(b?A?u=SS;?gN*lYhryt3v6va$8Qk7&a_l1 zkNL?1md4u_Yx#Tm3(qm?UfejLL&QU~?cuNe<@ajd=&436nzl>QsC=ije17`9GhW#r z+9md|zWH*qAY{2`AM;C-i;NZT>W+wIKU9@kmH*y^>r&<{-Ftp>UT2Ogd6AA&aa0FlU(Yy7OI` zXMHVgq!gmpiEnqhUj0jd1^r% zQw!Mlgugj&s&~mld1it1tn>q`)&IO>%}n;|`txzc`!BB#Z}ZC7^Xs7PWD~bptxrxY z+Mtv0z+(M-{@be>8#s)AybnC#@#BaGo7B|G*gc6ic_to9J-nFrj9Q1Ok+ghrM&0|u zW6$o(CKlLOoVrz!QXhOd)UL8)nooJy)cxz`%+)<`@7dGGT)q`PJC@l$4_dcrk|j59 z*|mb_o!foRz1wk2lx1sF+ILp%{n^g9_N51uFIm7Oxm^8g#C)YnKLOFbwYxQi|MY6R z|BtENBYE=SWR0tD8vgB3T{!zS|Mi#iE%$EPwL4q)-%ZPR;-OVDZizgdqAk~L8E^4y z5#x3LFqMZvya)Gkny)ysXZfU;+qtS9z4>tacTK0X==LS7=22_4HYl8AnaF9gz}KRD zTDp1Aa>bksx8K)~rsu{i3DLT->fGvs9Pi((&i#6Y=i;gbC(fUlQFh^6^6JUW9-K!M zJbfONr*yA)y|t_OO;?ZOn{bsa+cbKV3R%UsWrZCqit}4j^z3tt?x9CP8mU&5w$F>q zPwrGS=Tk|%CnkEKdh;z&fuGBNxqO@Jch~6VcUiUUN>M%8)xYvyZhrq1n{6DzA?!96X8wDlq-@V(jh`lH9Hm zzm0fq9{Z*kc+Kjj(m@Xv0d5yR4)!L2V{cg&oPA)#*L)+d{1LzX#r{x_dAt5T*jxE= zbN}+_3CZ)dUM=C9^Je?x7m1JU3*5If+|Zoz#g{Md%@Ia1ZL1CCY6Z+z>t;_>&78UU z)m!e(hc{@O&rnNIk6yFMceCe}xn|q`OpLFOc$zM1Wn5?Zqk8LY>Fdo zH3D}!PRK7<`L0!8;2C4|Iv2~$b#6Pm82+m0luW!PdHM5>_)`;YBvR%Y<oifyxj&ce{yccu7bW?kQQP>%If?c`H&ChqA@ z&labYcIn(K>(JTw*t%tZMg56M2lq`-{ry+r#+`%f7%blvGmBjf5Kn03HLRbPu;Arq zndUQbX%#1*Y+jQ4Zk^(?tN%}xbH>f@Js-F9=Irb1kL~||@n(f^%*)$%D}-l$XXABz z(G`0=Gx*u*XZxZ&f2zMQj?-6Poz*0jIP3M)TdAyh7v&!nlxt=et-btf`;rzfqvsh* zrkTliNZsLSc`G+1=<7evf8eqDEpra~A2JX*cK)BZZC;{s(FBQJ!+AX7`dK!UG?fby zq}UZz{(byby?%YRw|U}&$_wkV?_aE>WRHeu5F*le4*h?f%A@Uw^s|V;+6H* zO|dCBQ6v?;I%!{8UZ8|l)vE3X=j$cssj=y9lmA%2cKN5+Hzu`|xRa}H_`YVHW;>@P z$;GELc<+0L$ovD=mvh<9wOl>5XuCz>64Ca}1zgI4B`KkoN`*I`lKq-%!Nt7!R%z6O zxe3bsJDX1_2)JK(WWzrpFE%!P@y7^m@tq5gE!UbJ=da{-E6b1B>Q3^s=DG`;C#(td z*%R@deSMV9?0 zmk{Ueyyj>M-)4VJmdwD-W{dB#hHq10e|6TlKWMi_!^cp?44z- z_FGo=6$;#x6yiLtb#1%sEf34~xhus}uQF66bPIc5a<|xgC2i)so6XxDd@Lu5Oqz7_ z*uJRSzgmr4g1csQe%oQ`5H!UhMMwOGp6SeV+m=OV(w=ZEJ2k_vx%kwhr8WN<82?W7 zJpEw)=gaaopGwj`r+O9ChXqf19<3F!NoLyNoc#U|ZxcTmRaW`@Z?{TG*^|9*%lha1 z3>g<6CNEg~oinC~kKylv`uD=gB~{mrCtcfpAJQv(6MN84#*oMMx&E^0mqMp`%?af9 zSo*4Sk?og=%LPSQ@C1Zem*R#wB4V+8=GrS3x@_<< znZ<395_PZDWa;-0jT@BD#VD7vGRW*S@v%QT$K@dDKL5*{?+x)vqCGruieD6V zJb2=0E6r)W?W`fsjyPRsb<1fYA08jFO?kUox?_Tj$ECpiI<8&+PT1=9n=RpO#7AtK*rs-+EZtZkYMgE2c>;zW$K?v(#BN^IrzAzRLUf z>p{)auAXQ&$LW!*S?<;H72FofPbWgcyE&?!2! z`}91mD;8Yq6pr3Mv*lOcA@3PS{G^h-mVf)uufFiS*1`6dLXz84H%EW&I<(~2*Hg@C z4_p+2zV==?vTa(a&K>>};Vk*dr`n}~3~lr`4X9 z-@^@fM9e01D!kqhxml!aw#b*7WUZOvS8v^mZM#_^HF=rQHf7Ph>WTpi%iXrzD|qv+ zt?cm{$+Vm9nk|NzhF;vC7M-a4rz)9m6z|n>`AfCE^)?&P^XbcQ$4uXFhm%$C3Tu_EmF{@bEqrygJ3T7G=7*22b9JJjwNm7Ke{J4N8~&SdGC6KmH= zth>G=QRKp|gg4Gh3->D=TqpkT%8t7(`wl;iiZSWjEqkhC{nNsB&hqJ%x9jF@yRpg1 zC1)OssnE?`uJf4Z>fG%6m2>LVw*>2~6WS7GXF~i|oZ@tq3EpHO8h3cb!rUish5DV} zG47waA>s9_#2a^ZX@2mX`RM7Qjt_D{j)k&6jA!-OE7Sw5kz zzUGfi|JWQ>36oYTkx{v_QgNH&!Rd1s@Y>lLUj3x(drJ6>^{n&+UD?E?n|+Or9h%n5 zHFd=%TZdVxa#0&~Jqz!w*CBCxY*0x+tKV9X-9U<*a7r(6**f4c( ziSw>Gn%XU-yR3nQ46alU4{79aDeTY_-<#x6-+eS@YIU;Z{?u zS^IqLl-K;=$=bKEZ;Nl8ko+Ix|Gy*GYWhazW0M3p9_>E!pd}`Q^IO85p4&S=a(Ld@ z)wFG4*x4zeYtNi_!e@D^Vx8YmopNjYF{Pt;G zmCfnn$NzBeKexVXuUlDU*R)*;lIz0mpUi*h-**4f_V0U6z6o2b|8>vJ&9_heDfwh) zdH>*P*SWgUHRf6wZCw#gzuz?$DL=0ba6a&9d;PnFbMEzG{;;4x{k!7h8xCmJ(eD6^hQ z_?sK5d*q(dA8v+U(ykhN+&8E&%Qh^|oBt%KAisO(kEa_RW=#99yWoKKDXZ^{LQlgj zZW%cUE>q*HlvgU(J$gP+sr=!}9TEMh!A3_4ie^SQXzk$DTzx0^tVL*?-X?wqNiPf2 z=t%i6BbB0_kLv2yTaq;S88o;8*UBHc5}&$M{%!x7n+vT{-#rODbT3ewi^cpHLt2sK zq}MDtf8SRvHlL&^H22`vitCbm*3B2cY8E{!U~1aLmdUuPg6Co2AJrq$l@8OSZcKjn z;i+`wvf^v6zq?((FyZ>%iwmkNHRI;UVK6jP*sUVokH z=BU@-&l&9CxfB@jvHIbWaG#8zo!07~nPN1Z7{xA$Nix(dWpUrPiP_!G*+F-TUs$Wl zm*Ugv7u$A7&zu+Fcwce4%KO&$e_2|YBt$3w^#A!{!UBgp^@mbFjCj1~Ez3Tcc;L>y zxxa(o1RruaxRLeSt|QKe(x1rh%PBY#7}=)u{IgEFT;$DLpFdqV<;>^0&uRbqtG{=4 z>1nE4De7!A-Ok6NC2r)lasTJ(ifevo&APux#651$bFL49b8at^+^RTBucWm|K26VP z?xABG+jggX-{18_ZpJVEqS=2OeN(>K+xS07V|?^=*_`JEyzwl);sRISG5AiOQ5B(H zp!0;wxF=J|{6On|u6H*&d3e9h+>jx7mVfOtU(1X4Z+(>se4?;2R-{N|od(A)PY?eK z(fbNIbsjc9+S=ZH>i2ge?U;rMEDg%P9~es{n79a3I<%ZAtkHh3U`n}U!js1?=jT<( z_;c=J$(r9GHtAsgU+r0I{r^?k3vbW1*waz|+>+h!;PQ?Bt*$%f=oieW+q_o3qE)LP z$?AZi z1=j=VUS@@J-}f#*zsJ>i%D0{8`qM;=uBXZT&E0UvpIhdDqil=Qg)F=-${V`s%89+jJ!%(<>RxtLx(T9g;Iw^XG9Bd-#W~ zfJ^e=tmS=KYnu(*$Cl zguN>~!*P(4@xi6l1$h@H=kAhUug;(DYl~%n<5~^n$dlwbnEwXKr^r>rE<$quEVDq8k1T}~6cjRmr zSwFhI^UinvmCaYoH&u)1HuyecdG^0>N6$ksp*=R z?eSIhvj_MNdA^7~+ZMgP`>^>Yr$;|pg_7r6m@Y3g`W)Qz-oRed)9x1MR3Z1=6mj;)t#nZ$$%1&(&kGjh%wCvKYE zJ1y6DO-7RGqOc2nufF~|@~!52Z;IV&(`~cA9w@)1+i<~+&&pjsLc`+e&n*j#O+?b` zm%q13f1@=eexbVEkIqTyn^sNrpXwsVWVnmp>rqufLGzuMLd!;nxLi41IqSWm+H?2aK&ar-O!4#L)$Ef;e z%5SDj-$$ulNk`tKG1g9DkUzObUPpHE?+wj;JP+Op79Ov7xG%LOu~;A^{Kw3?vpTxV z?N_J^KYOuCDR0}X&_|L#&x_1i^*Z-;^ONMisRiu%f1bX%w|n+Gc7=Nx*3;hq@;xql zTi9IYdam{s=IgoJ_ZD8>s&u@3c5l^{A3_Wtc}(_%ZGOG(?u;!@W&TPrd`y#b*z@-< z!;wP6Kbtr?`?_DSi5^|C@oZz0c$}QAc({e9>dc=eQ@)BEy%~7>TWju-?+rZ1d*m3} zn2%WYXeaGz(m38P_*u#zZTXIhCsUjXK0W+-^Xk(TT5+Yn=f0kOF!g(CD9`!zZ0nyG zNy;dGv3S;O+-)hCA=~*peW~bz*yRn;|14yzJr3>g;(G9hJK@pMe~Wd>7R}E-@;NH^ zQ6%sA$HBTt4|mNzZSP+wC~X>jr0-{dxqQs$ zg@Gzbb>)KQXW8|?PdI&DYf`3tm&&}`ZO3ol|0u%QT=rmh<7?Aw)9a;A3}3O9z82*9 zDAOy%@bONy4fE}|tJ|I$a@60g5tx4H<^IE_ zFTM2b#GVUt*1kRQqT_GWWOKILq2KK#a-T9}cs)NEIiD-&>b(8ZCGFuSnndiQP=W!oAhu`SB+ftzFX^Ib-qxv?>6YB7nt)59eG92MQB`hVNk z(7&~{fA{VCxBB(zC*OTlH+TiFKC$hur^Pqvz_n>x)h1rvus9=TQ&&+ccUS6MzaF2f znGDLorMWw%bQ(>adLzW8vpG4)iTQdrlkXn>*V3JBY6;gmCTyOoUpERWCbc>m~Y`_~Pt%s$!ucW`235MchlB}M4|qMn2Wq46w54h?MH^!bOnss!ApH}xM{6K3YDA=&xoLEnDPPaOtc&8aqS5u7X` zVTS1%+(IYZKTdKsm>8U(V+jVLT9XN z{}d^@yoIUpbl~#)?0@3b7Idd?_iA>TrjfHlB1dd7cgDNb6BJGr^Y`>HpIE&4#L}<} z_g3W2o?>pG-v2-56YpG)FMXBo%6c6cxg?7s_ze2kOs`tkhuR#uIAy}3%4f@r4ZgGP z47zx$+|d8x9r2vBP#eQ#5i$igCIxM_4t&sk>U7B2$p!0b47iK^Zfkfs#m@P8$6$-n zq1~F_IlLB%Zb_JUVp5oL(vwCPPM#|cZR_`};W3?2QKm3O&d0{tR>C5C<1wb5d;Ed* z{pMCbe}(Mjo+Rofq~&$=Bh%NwluHGxwRjXQ{PaHl+~Tuf-{KV)m(TatRMGL;IrSRv zDwVn?d`yn!T1zc$I|V$LvJ@GYNsW6yyIVRepCOaz{Es{qT4+|Q$M!;_^>km z>04uQmyp+`;@Otk{PU+wWu2HPVt3Nbes$9&wMT9Iw-d`RSiUaL*Q;WGG|}ti<4jZj zXThtc-8!e=w)gYwdk=ieZ(N=#vO7{h_2cansVlQ2G=S zHkDnL61lYX%tZ!np6drbEr|K(bgF&P#{>7k^9}o-a=EW#WdH!$_JCdh diff --git a/pkgs/development/libraries/glibc/2.26-75.patch.gz b/pkgs/development/libraries/glibc/2.26-75.patch.gz new file mode 100644 index 0000000000000000000000000000000000000000..e2a8867e4fff6396fd1c1a368929c9f0e93e6d1e GIT binary patch literal 289084 zcmb2|=3oE;Cgvj%w~OwW3Dt^e%U@hw+wtUL0mmeTgA?CQ%JKFK`m|K%=cKcFg^mm| zMvo?JR>|=6%nh|u`MI;^q}d6{PG#>dA=@`LJdQC^cb8wRl@hsHGcS9>p`|`64m>^O zIqAsqMh=U`A!?ozD$ax}@rE9mvGx9|HLI2vM1+){^Zv2o)6P{73#+b~e#=rdUY8qq zc7Bxpj<8?`i<40|^3xwMeq3fUYmz_=`+v8-*A~-SjT4rcOy6|w^p;tNtV1>KX{-nh z7M&lsYlYX^bEYAxD|W5RI^n%pX|>ed1N`UzG1ixJCVz>ayW(BGcZ$VlCb69sp+c8- z&00L=+!c)vcMo_AsWHD=qLQG(v0{Nq$sdzKj&!Y(%mK}Z&Oz^mefqhSdh2MkU*D7q})@^rNd~sIKUR#ODvixo- z>P>rXvr{feTIal}D3E_386ThJ@$?*SPk+y?xP5 zvEzHpS?wbe#a&f*oZG1WwDRJ$Q^$NC1_g>gu$XQX?8}zFnmcZFaNd;MX>+T6uU>PS z`>-MQ>gMHQyEsdayp@`gnZDucy9X~4{{LVQwF;9eVV&Lk%yXgH^}Qc{J$P)`lrE?J z=5EKbb;>e%w*~oYq}&)&U*9OdTzzBrGRHaZSPT|fA8|cV=+9~uyuiywXX?R(!im$3 zn_JKH-t5gicw278F`ufRzie&VmHe~%KB!de%HFyn%cg&RF<-y&TJg&#Q|`Xv^!u%; z&t>QM`}VOD|G)FNcC0_!Xm&ea@0Hg!r+lYbtDPRri;rB)Z|m{kR$hYeLmyQ#$+3Awq8X{?uHWE@&v5U_qsPf5OePwSQD|IM7NV{&=?u~!G z*8YFP{#j((ziS<{vL_z(oV{#SUwUaNTXfaF1K;1i)xXa0XHQ}5jSS_!>i0*z?;l-d zvQhZ?(o2jv4-<60{OtSq@z#ZJ?_!k;d0c<8PkQ1K7OcCZl1U4)&BU1RNc>8PoC>a+?KXdW!{2A;++1m&kXK= zc6Eq&5&Wq2(WF`5KC+1I)Ou(gH(k``+3D|l*FD^67F8!~x%1tX&&yPzCQjb0wA?1) zU`pS$XM4nEcFvfoCA!PkFWSo z{w#T|)ZMq{AyK#LT_zs+E__nB-KuknqVPQFQym`-yf}g}sY(J}Zmr9V( zI~Oj^OAF(?rgj{P{`B0Ib^Y=y)q1ZorY~f7ziYqm)T*N?Cag)0Q6VwH(|r$aRgmX- za(H54+?uwU?2@lex;t{J**+iMCepTJ`G%7dv&@(Ol~lTN{Ec0d-Nx5mJM3>)BO zr9Yqf${y9M?XUJN)0NHeZokFGoZFmzBUQZH>;8htuP^v5|F^SEdAIL$#lANOXDMd9 zu3F2{{JX2jZ^!#;rKguVg#7vmioDU*6o|YCq$;tSp8wIwC$YM)#q5KEmN`>Ane*7=$ zn?hgA^X<|;9(k`~o%&1neQ8b6+?vaCQN?p+$UW0#yAr=n>dTXOxoK+Q(G#&&EV*-R zn)*xozTUog@bz@{`wm5o*Jez3{dh?T@3ASz{^YDOU-$6l@56_i%gq)nmA%BLvv^5n ztHESni(XEib;m0{s9&p)oH66FS1xaJjki`R}^4P3&QkV~cC?G*FzL`A+(` zwRB(9o;m*_ZtPmsm6mVjo_pQ?n#}gp>GzmeYG3^hKL7Ia?HiooFW=5#eSBd4q3S)R z$2N6rJaaYTo6dTEt#xA0K6Oa0+TH%H{)bCvb;ZxQYAVg|P4c~r`HJ<7&Y1b`e{}hD z^W=2-3s0WUe{fP*;daIOW3PVx__D|#)a2eo-e;kA-|*P|IFqu8*C^kj>ap6=AJ2;y zN0|R~wT_p_e;i}#{>`8~Zso4-`dunBcBjNVGk;!xCn`7pwwb`cIsdr$GP;&+Ox^39 zcYQ(Z^d#ABrWrvA8HN%fu1E7!y|?BZ&%FMBpY^0oD!0FQZ}R75x+(U)@5$Z?=Vf;q zytY5h{afwl&nq_7T2kGSmM#5{Ib$MqzG_HyRDdu&zJQ|+!@wsv^0@k?j^du=jb$FQ z^J&K9f|JMMxU6$$J~O|-F#FAqmyLCOYrdD2h%EYAvi{}E&ow~}*ZT4|pLz4(ve5Z} z({GqI?>?8qZRT$CJL=i8YO@)!2cMn%=c{Y(9KBi~tKfH&{)9Wz`fle}g*97GalU6) zu>Yk2Z<_bZGq(&&<}1}-tvtA?slM~%N2ii_`>k&zT+dZ~|La#QaO)oPmYJL1$eRCu z_G0T@w%RSF#y%@Lg!Ow&3YqqmFPqx-ta$3{Gy6Yz+G%syU7YlI&fNtUE5mAj)-MV< zk|;ZELZZ>SFmI#Q*i|Ywc^ZnQ`CBAz*O^*S+0$};WtHnECP(40=|}m#JG?TRe`N1Y zqXPd7sRJ!}^L5*Q>hyXZIk|=ulbrf?570mD;EpItp# zt#hq*=10Tbt~!g$Vl18QW`6ce?p*aR?EBZRLZS~^<+Ri8uCnSeC^M1sW&cnVuy;!9 z|7k589s>D%3>j~FjeGX;H73ng^*i8`6|DXtB1zrw`|nQI$sLB<&&Qtsc(`R}`x4&L zRS6P}?>7lt7JB`!-N7!>$^1axgx|GNXM0M%F)66}Uq4@ef$yx-b;Vouw!0Redp|Yz zj{4b~5x%z#o@RJ2-ZWoyHpe1niMbEeYcKP}8kd=epETph3_oHf(BX5W)Os4{PL4XO z2=ho|*2*>KgroH5Z&|}yrTpan^U{_WAB%Z%f2Q&;@tkKH!KV4dD%^6R()}HKY}A8K z6nYgdbLFyI_VUZN=IrCgMA-}*J}%hZbHdz{_1x*1Hg8uM?22Qn=<#Xud#}s(=ktLj z&g)J;kXbA=Q+kG%_5Gy`mRY7xmi^kD{_3{-LyPFgtg450Ra`N-CUz-(>ZXr5EAFPd ziN8=!IJ)`yhW4ZCQ=KM?OnZ0m_2=o~@9)oz=Zo7{{q^>PMQ87?3}M>)_~&`fRn0b4 zE@h=oefv1`XE$DsN#4nMsE^^8JOApSix-}8Zk?o3Hn-#WwA!{5vriifr_TS!S@-+5j_QO-PED`A zKHTpWFjvb_RK4bt!p9IqR-a1!I7#rC;p0y^91qK`N$)Ku2=#VJP)tlb$nU;p8}*heAU&3nwKno{ZK@tUA0ihd{I)??S=dF?#1o< zSslr;*6NV+R+Fi57mW4>`R~3I$z{=^z>zS|@Aax3Cs{ifes0*pU$Z^&_o`{TZYrz_ z+VV)hKk*^!i!xglAI-P@%8d)1<>&uo`6IvkR9@?>4P30!r>CSli3EwSwL3D2wa-eb z`F5l1q$y0tOQtMyI=u8n%cS#<|D>%svf5;GOI!and-bXW_K6Fb%RZ^ZS~9)6_3Cx! z8s1Q|m8Ewk1-CbDY_GYWTh_RL!E}2D)B8PM`m+V z(m$eZ^Qw1hPyBvG2$!0l%{cOAvGPZTcI67^Wik7eCNGVMO^cl+=6q}Nj7#rRpKi@$ z+m_F>Jn|No*MaY`N4`rOSeSl%U-Hc~0V~d@aZ_64OluiR($3uJh_d;{@Hm=1;g{5L z>9*Hjeeb88*>`&7)~DMYYvEW4? zWt9PwKOVSo>ul8l8~(n zL)Uh5O)k;>`po)8-STZyw=UN0z53MrgtM^v%i@S83I2#DvjUUeU)w3PD15ilgz)<< z&-N~Rw(;lj;5ykA6SsM4-s@(%Z#;9h!C?*y?#LrC#y3{|h&tl7_4--qJF%w!R%l(f ztl1o@dCw=O;JeBf*~1+b_Dkj*|69R-G{5+#SZlz3{VVUcU-{o``M3T|)LE`W20Z(I zi!keRDdnwRcX%>S;6k4Zlb0LCmIoi4Kbt>)(y`8Snui=M<=U4V!7zRlU4dnUt)s(E!&2VOmTl27c66n=3>8Y zZTQS*2HVU#Ek-TEK52)(?%g-PQ)^CT<&?dms?WZ3Sngf_*}@`ALGDFx0{^SE4hkaw zmHDoEDLRS>eXah>#lZ0Y|CN~7{M%+CwSIN2^VqEA^)x%DJXs_yay+9~tti1dIygbV zV^&YErJushjPAVOZ+9Y}YVx#i?)><*4RvT`F!nt;_aeLBHqC$xk+Ky7p_&=O?}OM!z%*ZXc@Txw-pW z9pnFcS@r79zdz4@7TKcM-S$z;;0UW>ajCqbqvpr5PxIb-te6xzJ>rGv%&(VCwwUbc z*8W@LvZdL0t?@;>iT?#{URmmCeN&cA+1=+|TQ6~g#aeIC5#E}2Mou>2fts4(HUWpj zSI#ut6ma3likBC<=2XsF=DT|7@2tfu`n;FEZc_19yWbUl#$}p&VbGi1EPa2|U8AO{ ze0a6%&W&B>w{G6P=<|J6VDGHGH}@Pk8uM5ndMDSS2H)Cu$tzD>cxslixa)`6!Xxe> zyW$$oShS|+M9n=EV&}lOxi7M|@mCqE8Q&oh<`)(h%#Z6W^*Fd?BD)-)fsoS;rv&$R zA=CHAG~}De?4V(UCn{mw(4AgJE+}kD+qH+A_w!eEiq?C1M9<5xV zuQ_$C_=_oL58P_^yBTruZc41b{0)g;8*i~*u-cuWHF=}PpY=LzE4AibKd`2cAmMCF8ybCjYOr0nfSVK~q0*LrW*z-C&y-qXjtLacd>ib_aQ^8NN!WiA;a<`bS<}`jgaMPD=l0ardlysNyaDS>6A$ zknh{S2U=V|^!%QC{%u9VUB7phvvrQ0j=p<7zpuyqrIK~<>$Eq|c{j-fhRYsUv8#Qi zWcwSns|%jyDxO;C#%KDqS7~V!+P!OlPHW`>>@SA1(6>>~S8%+WyjS=c?fO>0(O zsl42xy4~pH$(vWq|FMHg%r!B&`L{d-{>}LC};jUylX%FFM~`*`lm?uWeg@_y-GLVQ`Jrx?!J zlrgzVa?cQr;_sUh#P( zvAc7(kmNNH4=LT2?vVK^&o$q*>_526$6%-4GFI(hh82c7ZU;)aOv}X2Q0j(|mHY0pul{;SLLyE2bKeZ1 zO}m^JnQv%4d*l1^fxN-$?ZpibU)WqPDCtt||LmHOwrJL*n2mFmg&mYuyY~6}-Gem` zZpPJL*lznjq@wNqRwm{{H+JUEwwv+)Fw?KkDpM*BJM2m1jg!2_ckh7E0+s5c%VtaL zoM^NmKp}R+BbmYp9c*WIPtQ?y*LwFN?a9QVf@P_8>%DItFs^k7n`UtLzzlW)pY!Y- z?k*QvC2q`0zT0*Eb-l2V=Ee49FRRwSf4wblSG&sQm!%p>HPsBh(v1gP-o5eu>HYi6 zzh{3Qy?WeH?Bn-;=I56=MsjC=e8{qT_DBBOB=dO=dkVi;7^_@6mcM2BZ;K|&NZoVo zmsc9k{P?*)T)AYP`i$9f2}LGbpFfgWusP!K-#OPWoZb9z`kF#Zi8@=s?bA2zTE==H z(EI(&e}7)?xa(Gu{J#Gdf6wjIBfT|$^KySWzGt}6U&9`d>=K-@_t{jN_;Yh!vu%_4 zX!^Eff%LzaHzu}OeN*OS#i=fnj4=MfR4=IZ^v+JJ$LZ%@6#WY3i{R?qS7&ecSh*l% z&D7?(GSBuj?N&+byZLa2>q^^<~d}y#4ftS8aCI2~Jr?-C#$K$u6os2Ta}e z?e}C@{p*RroZ0-sO)?MCSd;8>_!NupE@onO`D|txP;xQeAkxDY2$TkTZN%uQ<;!gli1^29F|wb*aqTE45mP;pwKuBIsG#oz6> zc{#a#Oj!l{Cauw#-ly!d$tUGBJAX&u@_iv?AA(t?bd&w9S^QySFL`P>Qc9=>d4RIE1Tn- zw^l4NcWhgDCOX*L?VIca37yTJjQmUzdX*1O|KdJ3@wSDg$e9^luf1mUUStcKdXlM& zXUFEEjmykal`q_J^1H^6=Ph?=-?OP&bAEp;n*50WrFP|Re&O^-e-1{a&7M1NLX(+( zv_$BX+RCzR++~dK=AHegwQfO}jo~6Kj^D?g&*}?`h(1(OX7=d%xfHMO3s>LU`RyC8 zan9{)z1~v)wq~Aqt7rW$az@q7x0MV(m~56B_^wWu+$K>W=hD3{{dL_1(bVJnxvzUW zaNpc{EKO?n0=Am{de3e?GPhcEWn1>d%!S)mJ+@n;;(X`&@?x3Q4YgaHHt8#M)|S{X zcsU<9SDsllJ7xREHFx7qd#%Z~>OW*=k?6H;VJolW!LJc+OIN%({M&vmr?h|jn$<6# zuI$~y#dm|C3-~O|U6iD36sWS} zX>!9EBd6c1bT%)!KC{WJp{PgO+-Xg`>&lZTVDu_ErYSjBrn=$RSTG#RT zy#9?p70>#+wRLv4_huOhDCIe;G(0xAq}*UwCe!}4TFm&2W4n%S89%fC1x4vKT5lYV z*0Jm5em37a(?&yEPSC}vYGG=}Ce_)U_+_yfN;dT)@4m=WMejf2)9kw#|KBoecdoCI2+1EwHKi#gn^A zFe5{(<(c<&@%~L6GaNVZthq2RB0Tl_lk(Zqw7OI?>uU9?#rH11^-4Q%S!=FsZ6f=k zY@S`Qcfajjm;19ZPr~ZJ`gzhb8gIU?3)X*Qw8`a+wZ&KF-PHloELO)??*DKv{l)&I zm#f*gO}n^enw7_#I2lqcMFi{HP}U#BQzPOXY75>TLS1 z{GO{;ku?aAsf$?QZH6W zX))fe_uBTf)oVdZ1Zx(rmZPQUtO<&)cXpkcU@}$li-KC{K{4gCFCX?=DFsPP3s6;y zJyaGRwM=4pWJHsjzK`zZAf28wI+uMuy6Xk5l*`T$UMy_w2!RmMuoTWAg6b3tJDw>ZK}fDp8O0WBSs+f96g0`PZb&d6{lJOWtW6bFRkt z^IM%=(Z9YIHa<+bs6Tmk-K**|-J2D}JcTx^bXQD!=6Pb0MUv*}r0eO0Ra!sZHs^Ba z|9NmIKcD+!nd61ttfm{8Y2SDW}={5vl;S<_v1 zt@rFE>F^U#8NYH5)(Ey-OzCWV!@B2Mk8gVLhsvw3zWV;XP*J;U(o&Bre~mYBhF`Je z43Za3TDp9OEt^ry3Vru88}BfD<+VAtRB}%6O2&nOabcXbXP4!Com0F+N=kRxbmT3!k{rDd=zh=1h^#=Md|qyBrUN{uY_QvfQdIkwtTLtVW_!{Cn}M+8+g_UWCWZ zSlhK_#y)S(z?rwEZk-o?|619en~QlxQwlq;N_p2PF`4G_$2SF;NO#FKRLrsv;bo2F zcHy`py~?NMJ!edE)xoLeOD*fRoONEi^sKPQsirv+TC9tntkc@^rsLJ49FgB~6B>=a zR)nZ@nxFc6p*LoFW!^cryeaBBecv5RRVNkCxzOFE^WYDQ^_+^6feZ8kydU&en(z2{ z&@g|=M3EcCCZV64U*tZ0In}W4IAiLZA2y!B8=3vjD_b?MX{hGWe}7)&{&gAq@86wy zj%HqFF6~NaJ{08V7xvftc|nbSnXq}!fy7g;)1LTL%*+T1KegK=cd3oi%KLVgG(NPe z9O(S{%k!#LSZMe2Zp+r4ysVGomrNFq;COGHE+V??cwRK{%$aR zE|{(qb;{k4`Td2KR>6wE*+Q)s+qcblYI1r0KijznRW6yuJry!|(*Ahu(Gw!m49;}S zvOKyjp`ki&llU&hJ*AJIUvy6X`84p%Yu!m&6{jj@DmmIcaXPwS(@*n)o>S+hC@jf6 zGXMA5Eo_~Ozi(Y1X|eaLt<2@XGg&o9W7@v0IP+E{*j(w@YK=MfJ~}-N;jB`gsHVy9 zmMQQo@8PFI+!1qJ8#VqYaXU{h6lBmT^Jl5rd*Rcg?i0=b*Dfe_ou0XMGt*uT=MB89 z*BbK@7bQ$InpJy)tz*?)pZpr-{;$3bQ=+O^%WtVBy?r4Rc~tRS5GO-)#8T6qw>Ym2mBjN;$XVMi_XUEd0~3J5R01+;-mYN{KA1pk2+I zXZft&p>E0bo#pIT&b4`)t|`jq$hg)W;F?%;ys+|-+CKABQrv5!w`(!qve5}Y+`i5I z^}~nioU$fUPsU8lH&k=A2=iF}eaoyb+B}&m{N5G@%o;zH+g%DmzejVABS7Cqz#&ELsner*|v_Iduz_qfQ74i#Wl2Dr|M3;mL46x znWudBjI|{#DXH@~<1R2YGgTZ72=`bc!ShMP>r%^|q`bwfL0b;K=Lo;HAUPv?<-xxC zKZ$nMRX-#ed}nTDE42&L?e{&s`qkOJ-{!Ee{K%4%&a3>Z_?Yl!0uH_3! zIWq4JKW1WKUE)yk{N7^8IV<^cr2_Xad%Wu`hsWnqT_29dszap>3$Lr|p zXV&K2cd36Q8#znIYm&)#Mw?AayoYr>yKVX<&qoMu5Ip{Adrruan)SV(c>D_Hv=kmt z$rO{@bV|@5P1NKE`vwzFfmj`1=ff(K_N)Bwvn;%FGs$qWX37Ds89RS1iBU{4ZI;=3 zrPLtsIL{5E*^lo96||Lwm#*^vXZo9GGaqwJ$b+ztCL15E+LOTXuPyd(wUYe3-M^l` zJA3xSkE5CE`l$P1`)ASY; z&df^A`!ch5_v14y=VBth@A#`#l3U7^Ql=7gN9c$ab9mq5r7t~PSSv1CvutGIN@8ti z-{|M1{da%++>k%oW`dSa7he~?9QwEI{xy;7{rc+JT_+Rcx34S6t!r9S=@QQMn337{ zMOEwLB~8^nDsj`wHpQNuYr1W<<*F>9OL=>?iJ!FkS+kAJ;zuCl0({}Frlf05fPZulgAKi_=$jUUcQtn}Qx?=SD^zx;6*lXm>od+2e+`FXS7 z-{$LQLef${bfsN>>+|gO^{81UQImKQCY>&@4Zk6@?9+pyZV5Ko&gZc|uc)@)Ds)?T z`f|ta#Sa4PN}WRWh4->o^lEfjA5lCOw)*;k)hjj@2=ZUnTAkUN$i~Hblj*e2q+10K z@R9HDM*8jR*ZX zc>YB#7JvPE&3xUcf8%9u7CLhR?K%znzC!o zM8Thi;`;XIu5XUKTd`&K@&21zV{g3gP*ZEHC>`{8!AY+-4^{fMel9d} z&8T@RaGrnuT7UP&6QVDg3f9V2<`vp3i18v=2*<0uOn5Ub~xNe<4(Cv z)}_4TD??pQNB^8yU#4>P@@d0mvxU-abC=A?(VfZr`Nh)h?&9nH?!{#MUSEIt-n;pV zw@&2Orlt#gbLwi7U$$cQ11`CZ!Ge>1e0_TJpmxUQ|9@Wmc=5>m&xFH^yRYk?Kfm?x zWaHd;>$~>5Evzbv_tY<&yU)_v*7CT)+s_u$WYX_lD~v6aQCC^Im^qWNxXHur4_mU{ zrV|S}x*RVSc5#VVF~;6sW4T7cQz3M{<-c!*;SI{!?BAmLcGPuwDpc*>J>S0mn&X!x zECSBUro4UEX)DE>=af^Yb=2G_sDoMPy0F_U_ZgaQEA4C&?v$=%@K~xY%I7CCU+>#J zh3|d}>(>NsR9)fo(I9cVp2)3Z$rsI)nsf_S9`-kBNUYgEN7E(Ai=H?x<9n+)M~?`b`OPu|S2<}xpKBp+;^dO>SBPYb3Tun7vSr zdmg2!<7(~mx#c8h^t!vz`o6FJzdYKJyKjFs%l0>C4&PsU;^>RYzzZL3v^#Ef&W><= z;GTEA`_Pdx>vfXHaxZ(#S@8OfwA016l6mJhYK1>$o)GeArS*vf?(WMO1-7#N6MVyy zZ#?|7^2THK>6s#mHK|$wE7>lc2raXJl2vIv@+kgHq4cYIf38n* zR#eK;p1f8wUD_l%aos?ksJ85MI=;(R=>UJJ#;gA&a)>CA1YV zxLe8Gp4)fP?@#511xHOPY{aLBPm1oi(GXnEwE6p=CueUS^zKaz+_13hOH{&*@_mE#tSf<_H=A`d%C+&2O_1rw` zcUO4M#=JhX;LOwx>34mncC}wP=Jj{?$+C}E+?>VlO8LJ(w%O^~w^Q@Ath0YyTXj3& z`Sq;*6K?+XTmRC2m8JBn>BgIsk9RUIH2q|A|J$M)OrF=a_VmflTFCl5{fYa&i;c3^ zG+0)>>u=CEIDY={>GO3AHOuz@pLg)zTKB?U7H;P|Z*Sh67wM`X=N9PC5Zcsp)GBSt zqlKz>9!yW-Js$X?+>xnc_uUJd|1dmxFR&zE`tQ-$+eJM0^N+vXT66qUZv1uO`=2f_ zpY?qwzw~+5=RK>9{CD=wT=zU6=H9{maoZZ=?@nW0zx=MXoZ9XK7PcQYd)vw`ydI>> z{GNGhdHd(|&Rr8%OGuPFKPJ2T^{uy0U$wQLzU^FJ^uzUF+pYOee*K&rGRJ&9Cv(QG zlj1E^t}!Y$``&)GnB!}}Ci#VL*DKK*2DaDyy=&eTnsB@bkF@Y~yrmw_#9Q3*VA>?X z&6fMG{y2POf08uoZ1%saOO8zMD^e(%(!}S*wc^E-d>@ImJ?FeGSWXvy$=RE-Xtv-5 z&P31te_bCf6k@{pPPdjXnkb#iah>I@ms_*VHX~vAt`fVmZ7ZCMzm(3ODt6jgvsqesR)5YWetCtR`_xw44HwqYZQc2l ztGN1IXUU6hC1cLRM>Yw5I{MYhFK6rX0-0ygpQ2{gpX#_EQoXUaUbt%QgUJ4z{6o(3 z-x&OqVM*;d!VMa<#XBa1CuBQ$sm`C~7CdiO z|JKDzwgf%WUvXb>_lNm=_~yulaIH(KpK|h)ic}&?oIv*n_C?eB?0WxC+MHvsK)K)c zDZ9!0i;o`&C~ji5|I>Y}%xuw4rwyT7juj<|w8qC}ZYr?aDe0rmp|{!7=EfA($scZB zyZ@x$J{LdCgEM8iylWw$` zV6pKcpKr-jUmk5gruEs;dB^i_&xroS_*me!?d`WS{f@eoYc(a*7+v&OZ1m7J;m;EL zCv&gqR~*>5_xbg|-QmsM@u%3B%;v9f+N83uT;Tmxql$^ma#x-*%=A+BDr()uc3U^) z#Bz=xC3*9QH~M$~{P%gW*sT?gv*u~-;aS8#+iITVp^}YC6WA@kO)aol71&yO(8N{8 zV@tEca^;j69J-I*i``~pt}Iw?f9BGgAj5_?a;Z10U#%_h(-JrrZ2Iwwn(-e|$0~yp z9MT~oudEjN{hXZ9Q7w9F{mBT{db@K8364@T8%|Aqweg;?lFh2B`NtIMmK=V%aISUK zwRckSH}-S#Eo#iZ?p`hC^tgWgN8_6Q48E*QjR(SJO;$}}T_CvWi0+)l2Hbf8(V@W` z*SM!CF~yv_94VImx?$gxj;jm@rX)THS-}|hMNv7bweNM}jg;ecFBz6y|LFfS^?%)m zcXxm9Way0ART?7pwZYoq`VysOi<{~Keki8}dEZLUuY8^R!RM!X>ShKNoiCw>_wAjZ zd~bKT_s#a0jM$Y0wTT-KKkPYWyZ>3W=bt94EUBGeud?djU-bB=S_ZdcMoGZ+*Ec36 zSIm3avf<$FL=jfU7e@o7zg#OV*%Pz=a_R9;Jg0eU)OU5yJgwUNcEVXCs@@>*o5avv>oIv`pt|A7WKKb+Tnf zkHM*wbZ&Mb;VT=uFMZp5DMBH`?IojC-suO^LtkC%f3sL-Q}mZ)leT$t_SqbM5ZrX9 zSfgLzpX(njy*)?em$hsCTYB5|mFa8I-JO1h#f*BTp&yyER^{p6WYt=7`pC>Y?SD;C ziQFQ83{=Irv!!WD5IRQJ&wmr==u{7yoZ0+l^uws4d{xfrtTiwv`I+ z*xzYa#k6f|;PKC$R~GOy${mi$&WbOdam8sV%iH4-_uS9#b!};xRi(XjDu?LQd(kU- zy`M-dsu%RQ{^+`>V`hGGlY_PHKL3;nf7}>l&*aZ}bK;-VthUtGQcHR-Rur-RZs5r{ z89ra<(ADc6>rVa_u6_N%yhFWxdGlxU^YQcN{M}W5XU)wwV()GqeEW2@l~>d>`SN6A zj=xdvCvV>m{4&ktwrjbk=#&uAPtV@y->+5P|J$wZdvDAmY0Zyb4R;(YtY)}Q_Y{l! z=EZm8vW9H8#pFMlODCM*I;cK*hHuNx6eEU{Ers8%Z0oX=S{AsTJxPFZw}EI}vwPDP zmW;3mJExbd@Vu@*VMdo=i$SB?q4T{_WnH=-4<W$x1oo#`c%Z2@o ztucPe?AzV_pD`Az@DG{Z#__qQ(= z-E}d>!znnH!75N!_UiHIjt{%VCOt^21~q*Si^$3}(6eJ+X||HvaqasGNHI$rsEkcB@XFaBatrteWP3 z5`Q`^j@?;s-MK=A)6L5MROyry>ziyh@i6wR4t!6q&yJ#kJhMfu-Ip z&o!r+O%z=*&0KcT9QP@A_wC6(7JM`J%8YaQy0_c~J-!6?f7qA*u)t~OAFqikzpZFd z_g0y(YaK(ns^v!+wU-qw<&Qr6=`OFRh|t+{X!RGJ&%9c$o@>@!30c~m72%z|WwmM8 z?|b!+8pO?_JtfW4=B6{}T|95H**<*7gU4ajZ-0ug^2GoC;jn)D^_tqVhMPZJJ+?Pq zSH1eFjuv~l=w!9$(bt1#U9C3q&R^INx_;NBrZly#{P@&Og^8J8KfhbWU{IQMPmwD} zwK;D?km<`ajULMzUrX98GX5Dj;YV7=x_MKQ&sppW3N8EnpyzcCz24>dUdbwvMCaHxa{^<>)4*E4EDC{O1Br)oK`-T`zHSAOpp3!yI1O75}(zV z+b+-d%zOE5PL|jH!(Y0C){6fynGk(2;lr<#f|^girXTE{Y<}KR%K5VF%Zi%AQ}6%Z z8@u$^xjiq_?rn8QTR%JX={^CQn2WqlZPPiHau+k zt1dAo@FbSs{GY%1?<}5OCEpK~PWqyAbxE)nUwezlBbnAhzx35=kxi>S|0;gpJ$Y5< z#G~J~ol2^XPTkntyZOf5r?1{WzJ7QD-{yNk2RG{3=l_vEVY2N~_A&S6se5Mk?KpSi z{B4W7@3z|CE7Lh~pjGHlk(2_0{G!u{b z^_){=U8?n_jpgmzT^E*?O%7{PWA%*fJS}$5de>2hE$u7?C))F?zL_6YSy`wc)$}TK zxr)N{8c5}9M=qLpF-N#3%IR=0}lLB7z z1m5$cnY~unUc(j<6(CzTulsi8&6t*ro3~waJ$B&2lOKBIe&}9!v2TH7+Dz+L`=79iS{7zGCA!aF5N)brme^umE+lj9aO5>9v#r}y zuPvBrwYU8FckcQdlOO*2us`PTZ?@;{n#>id%@VHlmGkQ)|JrQT+qLNO|APuwZ6m!M z7VV5^vNJmMNrgvpzfhfL_Y#FbzN?u%YE#-(&L^)ZRoi^(_O1e{TPv^RPuV)Td)k8j zko5)2ZkI2dogegVH)~tU{^%?_hB+~*CI*}2XK`sCx47$|Ayv{EdE@=DUdP(|(`Gk( zoE&fS<2Lh*%W|LW!IQ0b=AQR&HV`>}{#Urk#}qRUZst2jo4Y#2d(+yFdK;VZd5fG~ z)+zqK{H1nl(60oaNHPE9*NgX8OsV^Bw}qoRbMMyDucnq$eq9nx*MA%OQulgq(M>(G zDIS0J-O^6jClIUr(Q;wY#*d9^?~lIPr@rBFtf>LVo1-k#Oj46`W~O(j?C3LPjfgLu z@HwkT!!^P2yv=cc{!jhs(er$Frk>prK5s|g?Z^|QQ)}FGX05Y&x%8=y>ie!=Z(4#w zbB*sVerlB=cj<-MS~ah^W?=^&*OaZi6Vh_e-!qcaF8Jv4yeALxo=h=){UTubn$~O6 z?r?<(=uKK${yIWpV?yGR1BY_{=^s{lB=hmutJs>e&QdJFbyKe^&pV%Du~PP95KDfO z+RDxr@uinfa5s0pX7ipUzwrXM?&CIH?v}SfClAzDZzyjxpB5v2QM^1rfRnMq<-YbB zZb`x7VhgWu_9gDq@@MPZwfL~?jaBvkKR5pAIymJpaB9}K37GEj<(Hn_x9H^$rVWp* zS{Gz0YBwqM_y3C425(-`dX@1qd%WpQeFHlKokQDhER~k}x7T+2mJNbE5~g-~ z+|$hj7T7+oYyT>v`Nio^>VD7Hh6{guHt?x1nftf#zRIQ}9H*}REu4I!{&U-g!g~|C z-&Z)R%{RF!YZ-cMn*FcE!8Lm{m$G)KDotAWBvXlL9_z*!EXn$u9au)kiUNCqW_gw zTij>A|Gs#|mUC%2|2+&cVw|SjZOy#&YUNCZ`Op2t7nvAo-EZ;J)xGZVa@Nk^yIZtu zTa+J_oU(EEcsYBI&4mRo-q{t}#(B-oc2Jmo??a|>kh7)B{R6AdhBPn9d!8L8%^ZAN z+qG6QL!3Eesb>Ck9gnV644I`30{-16a_SbV*{oz1U~XA|RqBf8smBL97}B(K)K}dy z>t5Ej@2W?|lBi>W;y*I4B|kMT%Qja?zuRnF(iM@A$rfZCz@b(zkq{X3kw<|LK&v|GdfT zo;^LOpOO7H=iKpyoi=B0GDSqX=vlvL(b=`SBDJZ{f>RR6b7;d7R?B*hQInvq-V<;}qe`DWKio|NpOv_0GR-Az-(C ze^W$4_l=3UfkIzB8klmW61Z71Csy!R8+q88xd|Wdn7Z!!hX1wcZA_C{40|Z@M34hubQs^7bk6*H+7m> zMD^{pPn`4qzUP@}@U-RLubn={W@h#>FI*ofF+OGcm8p37%SXv(zMDT9Vjq60texNQ zu|~C{g?&eVt^L8{FPKZ6zBGpZ_K-St`KzB@5VzrW&E+xH9*5s=2>r+ZM@Rk|*LN@F zScPBhGv#-ESw1D`p5j9p9iN|-b90v62#&IC-n%>Z>b!4rZasUGCGbmqmvZd9zNnSi z>ARGVzvi9Svf#wdx<&Fe76;t}y!RbdetGKFdEq({m3i+E#@{gDj!)_Q6e5_~cwRaF zW6SdeclUE}PUQVy7QeZnuuhC6{mxs(hi~_<{_^f+A!~Ck@BOp|nj-!|{njgP-!gdZ zn8eW9mpZGm^LeS7cXCs>=%riP5?VIiA9NVrhCcgQ$9Cg<=$c6i#~(L3bQyHSEOeSz zu`rwSMCXB~SLO$wESEjAW$Gh=ylX~hU&d8FSa~#X;*z+Dp7WKW(q}%pbkQ)n)=BIfq+xKDmKJU+WXPn`F^YnPp#h}|~125+A>^@p8%##-ywU4*!m)|q#4ADtU zQ!es3{EoeR)IYbf^zZYlQx*L(i;J%(nsL4Tx<%PnoLP6~(^RX=n!!FR{TOFY5)ps0 zXXVRiPp_Mrm)ES;y}Y9PZ+YGe)eYib%r5Mj9jq@QD)!Cc%JQhLb(4~={7Jgra$i=4 z@$$p_s=pRxXLHRxu6JJ-Sw{YI8`gB)s@x;~ci}jXRODvPQb>{U&Gx5r+ z-DflNJBuB(l42D1`LMlu&Bj~I>(7wQJ#(M@y6Lh8m$s(VFDUOViC$)V;kWy*rnGX? zB@3MX#V~12tUGYV#=+-!vT&r=Yn8=Ci&mXzySTviLzU?Li75q&rOD<&cHf_tME$5# zWC>pg8)H3w}R7@bOPxMg!w~hb8{6p5L%rKW)L{>>|}YS^uIobmw3H zeERjzwWZ4(Eea$)dJ3QZu=pU)7h|oP)7P6%7yq1ZUVk=EZ~eadS^pPuY8NEsdR6zd zJZQUI_~+$k-Di!7FG7}RUljTwy>i;dIc+U`jW>2gELGE8p{Sd?^w+mJd`@>CPsy_1 zV(@ayW8oJ^3~SUiE!{r5aA6bJs7hIfp_D#rv`=7km-&i*5?crzA?UxcOk{^HHtLk1KtZt3%V_I~rYI{<<$W&Yd>VG1hp>(JhSW zUnltWbVV@swN9DZ>A6>U!Ph4T-Tdv!9)5zXcsmn&H~*1^K>fLYqC2Y{Qn^FtwA6^a zows9Jtl~nuDPgx>m2CRtxihtqwJLP|_W!>t)7~6uba*+fy;@OeoBBVA+s6Ahrf-XM zQdX{TUY)#qnsS+-9`~Dv6JlE@CTsm&aN=(Rdy(Jo)-+E)Bi~xDX^TH)Z=E~)es=CL zw#+w~FW&V(kXv-(@%(FSsx?2Adc91$|1R&Fwn~_5a1PAGcXgbS1B2ie%^s;{UpxXg9V`rgjhZ`%_dq(mr3>!lZO%I)~u{_mly zNbFk)-+jKzE>5cXlANv7oFjoG)J{j`d8oiOB$uc|3e-8IPV=u4LV-**ka3J^Efr$+hW#A z6O<4CH_fbAA-vT=kL`&=e7}NLN6g`q*L~u?nrInJm=>U9%bx7V@_7$yv6a@TU?uDH zbe*KQgy@a)Wu>2PjFq1?#GwtT)$1LJ&PG2wXJKNU8aWcoHH;BctQRw*Z=OWn-6O$oQ;7glji$gH1}w%IUEZxv&uwD(49 zlXnyIqk|%Hr>xC4+kG`lco_?m>;GNlUw861%C0cslKeaS^!=X>9{aC{?@bI|Ey3i* z`*Y^uedVk6g-@uztNwJJG`HCQsQc#~{!9qB64=f?sb9TOXb~se{YNT`WUcr`ingmJNomg%(p)( ztS)5K`z*zq;_LAK%cAA&qDvD4muhciIT%xreb?i`(uP}tyVm>dU%N~|J18`JRdj*p z#Klg3cm7)(@@-$nX|wK^!tZwWNy{u}K3FDud?~ZpFSUS%l?-gmY_^eGv>p_nRCvF* zG<5Z0Uzf0dbJtzs%=>%zT}6Fax7wL&Mbku#O!hEs3C~VRZS>4&?Y!3VY1aO^v$x#h zcvPU-H6d??IE#n(OtB?_xuTg$-*%ss<6wK8x~lu&yQF1~udElDpUO7Myth>Op~#-+ zb&FRAzk2eWX^otwrJ#DMBa;@}nziaz7W*!_GPQ5V#loGJ6H`QMcV9fP<|Lc@b&XT^ ze}7%X^jBQd!fmS>tD{W8r^&LNzMC24A|9R<>*b0T-Q~Ockaz`8>>BHuO+Ri6SAO!i z@M_;}j?{>o66V6K8;qV=Sjm4`$7_9K>q1@iBe&lgzB=%G-@69hk5koVOL_ZR#`76o zn<6&xYLxkfIa0q&{#Y8_ox~NFc1T$3PokOVp~qiV#_(@^IIHpaly9;Xiyn2m8A%D7 zPpSLWZ=yE2kQbZhuhX!zv_;xefiKCe$T9n+?e?m{w>g$K3WeeXcMg-=bo#?$LP(d}kxOiG1%hUaG z`*hE|-79(Rw$I_4&buO>w>udX^j|)hqOG0cojUbOPhHTu5Y6fq&+QY`TK#l%r$%I~ z|D)kMal(2f>q#x{@6C_c^qMRR@LgM`&nbGtr8#BCt)Q#EkDvWo_kE}Nj!D0TU1Y68 zBBtJ+eBzT-rSR(SJ^N=THLu`4e##_u(>miX)y!Txy>s>*EwcYG*JRU-$;WkkoYSHc z?rnLi@|F2`q0xEIH_8dT|8_o=Z!o>{S?ktCvVw5QmA z>z^Wf=SiMCa-n4VZ=*MBo+zfV=`ymU36+^;eVrL$xb5*a=D;K6_sc`RKHavld2(-< z^-PvG>sGCM9J+V$z2CMwGj4Bc$hmN{R7YWTuW9twh9_bCp;u+BuL<8bYkC{)P~x>U znXB{bN~`C^u8*`%@61YD#wO%n?&0|>Xm!*xDfiwe)i@2SWly>ud@|C1b!tue{D(VV zPUv3za?^>QCATkd%|2JY{dP`@*UjohnoE=Rew>%H?_-_A?_S@^a^BlQmaFIc>1)3c zKNT*e@y*OMU<;S%p7o}g3j*FX+Hg%)yd{u--*QdJ(W0M!&*38e4?=f4O6qsLn^QoKb8 zrLCUvuXjyS$xq(rxpfcsUJBW^Jwxj^+qR9RZ(~lMNxsLQEWg=GEo+l5x9P2KVP`F7 z@@id#?VJEQtn-m)&Ss81=uYnS>~t`@m6r}xwH<3H2#A{MN!JFNDF^R~gZ=e~a@ ztmQu*@Zi!L-K>jOAL{I~)KBzrb$>2(Z^Cbz%lbcehArQp{(0Y=R#$Ja#=4mWl+s$uN|Dbc>z7K+LS10_B-mzb!rhTHzj^dTPAsuWp zYx!qszT17xZR;l6WgBtdo#cIm6LQ%>z)eTt|j}gJo;_RvnSL!Z*K4P-;6zb zq$6{}Z&mJf=h<7mns@Kobko~OvCaneDf^GK7Ij~$RWn#O<+bbTpHGw?pUpX!mvn34 z+Q_z*JNI4uCacc(Q2Tzq^}4)_h3{t932mRd_Qo9E@~vloCRxopa`|C8>yMogGAwM) zlh?LP3~77(vHhpZu^sEDx7ihy-rk<%%bmP^@ozVY-|OC4mEHEO;oawVXWM)AZ)($S z-jQ0p%I(rdtBI0fiPmO(hIcllZcB(fy2IY$&C|tLN!88&*mE?v(z)dEwVK-A%HKeJ8emxqLJ2#lyo&pMNPW_51d8Sq6W| zj|)ofad#uxymlT)I%v2^_B?Bkxu>32Ju|2SK|HryR257H(jRG6dH3xxR&eC5}l>{TGl;y zRJ6}1O6;Pe{`zx`^*tY7c^)}Lel*uYj&IC*o4_|k}k5zdsN8FZP!RX2Qk@=e4M#7A{ z8`>3*Eeo)@(!-GV;aT}!?!fy6v9^9Dcej`N#f5*R8tM zX|+*U+HuoYiT{0_8`X9H96WbF+AzK5@7JSN*ToLaeG?cgr0lMCB1v=omihBvJ=wx= zWRjQPne3A{eP(E1Vw|yhv(k}(N4!_El7f~ysjk@8@E~cYw6x3ClZ&rR;r~y4&U)DVeM5@?ZLzH7Qgp5M>TT7PYRly=%CkHU zitFR<+&OLep9N=vH^|JW)>_RcyHn1$CLm(*(Z%w+PVALelrsPJgH?w2=^C|7s=@Wz z!GRB!JSdg;UK56T`S|($iv)x+O*ztzWT~p`7$L4IB zt6Sjo{6IyEuu_?Neqe&o#ejr>Q+sD^w2|Fbqx<{t<7^*+-+^a3Z*(cHIF(|x!__`O zQ9XH<<&W9tEI*!|vDd#fMCGIT!~eTAo0z=!U-sc&B^iqY7{iMPazeNWVo;=q~ z5}4Pns!+(WsYvC3A$Q%%L%&OO+vd&KCwrugHEM#i>c-dZo%y>b-tSW~XDZ9PS$5&w zj<>!NRp*X`Zk65M>tViF;U`y{U)d`4qLPSby+5n-{#ncR+b@_Dx#g=6msGCW4WpU= zof?^nRtwC#Uuj{oR$N`?(1GVXU)FdU)GEaa9Qt_hvaQpUn~Uq-Je2(1_cv&|y_);g zi|lDu)rT`??9X(az0jlGWx>{?pUxP6W3rcRvC#Zb$uy;7{ZHoYqEe|Z*v$8RpI995 z{*#Tbg@|U#r4Ktw^R|9tjX3q#Z12TdlYL*=7tc!Zy&4nHte&ylbybCn(W#}1p{0`* z40(h5zx?-h%l2}s+B)^1hK&EkIeMlW-mIAxu03fg*ZK<034ioYMySrxmgRJOxp>c= zmnvl`uXe3&E?LK3mGNTQ+bNkFLV7bdei7a2z0+gz2mRyBm%p)aIv!Zkv__cqPqsD5))voAUH6IHbvL)Sh(ReMiQMD#gtYLTKvisUngX}=yS zbhMq1=2`X2(yzQe&*)Ae*QGF-#0gPtiu?W;RNp(r@ULD=TGPUYIo?@O#+YTnK4o*0 zwry?khbk;mX7A&lBy*zlhKJR@-r^mRJZZrhe?B|5c+ClVWAHHSl!ZW@;FsAuW~K_+ zZ?@{W_sh6x+LF%IM4!&4^G6j1+%m6fM#hJ@USxO*p=E6z=hSR3U~ zrE3~!zx@W^+Dqq@uC7bcZ~7M|T4^W5)3I&3N_wIBw7<(&Im%e!Q;TZ^m^Ez=M6n1@?%FP+HUD_=qMV4&jIXi}&M7?dpy96jX%@9KS@#)X zJif&SXM_24m@L(F_x&+(D+qg9Zgc3*!XiWdHicP9UxO{CyLaTU+aAlm{GB7o|995Q z3H(P}rA!ry<)v5Y-PgFaWcC&{kC^!{&-EFpyt`m3vS^Qg>e;EEC-PfQnx6OGG4Sjp z?fbkAc^n?w{GU0qIXlU3y{`V({@nWCUfmZ=gqvY`Fx#B7m{`VsRX>%oWnD7 zt3B(bS+&zF>eg3HcdvJt`z~L7x%yvenG+v9|MLiP^qtqAx~}Nr-Z%4QV&|9XPwjqv zy8H8Lxfkr=g*xeTo^Q*$wpr5snMe5p!Czgx!Iu2y8=gHfo7iV_Rt}kA1(zFaF}P_;~go-RqY&?aKatSXMuQ(QnyD zmhuYWy@&q1++ARP_`~ddzf~Cjd~(#>e@*#9VT@C;tc+FTpXtv3HM1l|*Iqm^@odOL z|A+>w>=$i|vp%qwuoSsUB+dL|KD93S?Bn~3-8Mcu*f_8D#u_z`H6PrX?`ejr3g~Jt zt;-S-U&iRKt$ecW#GXtWEs;urpS_zz7k!yNb&uN~xuU9OiC+v-3_)>|AD+1JGsHF8mE=d1G3e&~=4ncTU8M@jeWY(>!~5 z^8F8X&wo7GQvNh{?t882e=kqJm-#*3e9DJS4L>XH*jj%5@YiaK^fX&hsjiIYPbIf8 zc`q~g_jtn8NzeLxrj+WlPZLfTz2AF^vwHT2LyPm$-FBSXdns|=Vb5Lv&81Zr*B8E( z=KfKgb4Y7So>|w^@>g0W8y*}insw^b!c{Ek{~9MvR1$fTdgGM<@5;7Zv#`ZRH*`)s zoZTBWNB-)E9p9S+KOQ*YFX{S~UCBXc8EX~$mHLa;w{*oljz45SRsC~yQEA;5|M#ov zZ@%8QN<>LyYJp9Qle)P0^yhzz*VmU!6s-~vSY-P8(}`0$e9v3$1^hMIRNZdp2Nte7 zS9SQR)C=?O%?|IL3!R@LzIR`oopiu;`3FniugSaVrG3bFGe7frareTlIkhetoZn^~ zytR{2r1*1O!T%#?66UY&Zc+Kt^72ocaGUM#_depWCL%u_IK_Y7Z=p$ z#PImypRk`yNv2N!d1@9IW{TZaHJx&xM=oWCuT15ltn9O^b{}erzU=bssU2^AWBc@9 z94-Be_APjMtdHmB1K;2*jy7gje(#SnPv2Tnr?=(Q#oCm0uL^RWU0;79>G_i-Ypyzb z)%ATl;_f!*?E8gB8sjYAZ4$MWuE_T6Us=-H@{bubtgu8j*88x*hxILXmQk&oS2uS0 z?_2d?vclpVJ?+Me=W<+A-|U~g`;Pmf+mroIJ5^nOa_P=fJJp^k`(G9Oe*Je<;&mB; z4+)Cu0U;~r{Hazvd*5+(T{`F5oe_O$&)J%eEPq^=yYy5|!qLwkxO+^*-kn+W_GJz0 z*W#E?&G}_QnM;^Eb_BCc^z8R+yV$f*M)QH(^q0TNVy>FLcAx$9f?2}BHB0?8B;ER_ z9RHj8V#U3XE7|K7rQNK{bv((-#k1sd=bBf`dE|Fq;j;^`ew}P5b)P?%;k|;D&=P}3 z!fciEH_y5vf5WbP-`T^@ELApjyG;suyv%5NvXFzr>4xuC?Uu7ex@OO=exvE_UTyNL z`C#hf+Gs`Z2BE5>|5iP?W3i)j;oI2TQTa^D!qc{&t0~?XKEZv)N8S~+;(g~Etp5r7 zsjpwqF7r65}f5)D;`}h7SC{+6y@<@5X zAKe#mG2eElr(fSYTblQ*`qsBa37lKS3ri-6`PFGpR@z`a;R@eeen!?eJiIy=<2V0Q zej}wZWpnQ3z}dyh&1*l`l(?_kr1-meLk}}!z^+wdLh3V~Zw|`06bugXj^Z_2bFyfQ zL*d^@(OcylzvRQ#fBtv;SpMDBtM5tvV!OZV{k^4JHgjJ{U0(i2!#C;Q{yR#60c(7O z9yrF_p8f9VQ`YYNnz8LMQ+B;)$#qitc_e?9#;!NB81$|kR<>t3;@Z|Uv(9(Ff#vU~ zQtQ3#=EN%AFWu{Bl2dNQyUXaLcG2CxUw*}Wt}F6pkq^C-;c?H=C{^``#FVmw4rVG6 zQxy@kW z&94XTD!-|EVNQWtY-QoRME}eYEXXJDb-!0glB5TRe1L1n6ISQL6vN*)u8ibAr$j zqi-w1c%2f?@+ofkro>*Pc6!digjK16OxeFKhL&Wree3B+ULsr^Cp52c+Pt&2;(v4X zc72G}Jz(}J+P5n=gf(NC+$(|H{`eO&9*D1+eUf#7X<5cxeO?vk3;%?xnNQ^F)IR+X zV9t}vDa5?&(v`B;pBpNQTxLDXkTJhoW}IREI#0&EPNeTx;NFLo?@oM=+9zK5*g$7` z*MH4Ek1p?qJypvC-|vW1JK8E6F1SbM(h|N`Xa6-6_)8t?T6;Ky@8ON-;q~TouHHFV z&%7_+SoY3+XTEh^J$%o(%Vok?Q#Q`=7g)Gy(e&?^*7{qu2b|%WwEMqD2FDvWj(>}- zWj>ZjxKHHR6TRl~Q~MO|8v^TW_}qI>WcNN!l&E^Q<02pXMER<-CuG?+zBW62?SO1` zSiw^z_NPBAx}xq`NSOW!n^`ku*{pt{h$o9bob&pwd{e4jPUn?H?6($$iKou*h&tz~ z=C#b-K=8%n?;F0mZ1zlGZDUvWyz!&Bcc#E!R(8$_M;k47HosVX&_$(aL(|7o$2SYg z9ekv{t+hqjnoX_^x~~CFbSp#Dj;Q%&Cd#Z_C>)d&suj_kRDZ#m{zp zm=mM8$XX*jPN7*z<-nC6{);E>;-AT$?zMlTwrB8lrQnL|ypFRooG&bUwsXtT3FX4Z zS6K^%jpfWPNDnDwUW91hj;f^g-5A< z6LOp)X1=t$S)sUovcXbKo}HQ&XI}h$`+T)rT=<#PqiH#^M%!LkPdNSKcMhMXe!(`? z%hes~hRjw{lV53^;?_JPB>kABEZFYmIt{e?UjHde0Kqbt8n=Y>~Rt$B2% zWBt+o`A7Lv4nJkDGB(`V+_f^W-a_5nO8IHTe~z~Y->*FUXR=RXfvC7i*c*|%-*!JR zJKbWc`awOEW0!sKx@9Xn?@kT9Jo!wem#A}{&pD&imv=vBi2ktu7WKXVd*aWt`)Ufm zKMeV7R~v8sqa)y(h)Jx~sY#K?Y^6R==6UyZQxJEq=B-(Wnu22wE?F3Ka(PPal0A#F z+waK#^x>4$idkx9>@HIDP(AhclLq!?6)9rFIVNXstyZ=KoKbww!`EOt#$$gJAO&G+H|J&s8e{ysNp zY-v1NZtbF-lXBJV-+q%T&vu1m=zB>zN}E>2aZYaCc-t<^VO}A#wfEQew|#FJ?DJJy zeyGmU!-7D8Nx!s8inVgyUEBBRnwP56e%T$x&2RQQ z7gcI)?0tCWQPbp78|jO+pI+bN-B~eXORFn)zJk%w_>I-m7rM4ATe$qqdW#zG$?Q|L ztLFvjEJ&X7aCwxNX_d$PN7FaCDjh$6^7O~a-Wycxo!_PWHSn|#`EpX>cfg+YCFth3UvrX;vVQfuF;_cBI`Eo}LNT*oNLq9AT#1JZCMk-EoVpni zzJ&9BP-GKVTXLbYPpRrnHu+Nb2f7X8{R`sX%jF45PI)4SP32-qoq%;N0(J=oV$SE68 zEFZitYtpZzTk@ehnhxfv{aV1JueD*$tK90oV*$A@cKi=r|I+5iqQEOJdp<4?zID6e zTwI;;e3kT13=C?i>ijQEoisOC%FlUcX4Fljl7y z`Mm9>@C{ad&t^9Vk7=BHlQ>qF&T6?@)-Ppuv*3AS-Ib_?;W~MqZ}!S}Ur=guYViBH zQLFm($&5g@L*ZgxE`QFsebjz!I6HJk@WW}s2J3gcYdf=gqMz7nChuoU-+KRKU+B7h z@9f)la+=Tc?H4yQb7WgC+p&=Ug?edK@&m1+wnb}VE@p|HtpkESouJwB<(m zANJZPE3pQ$37u)$*(W=BAWgZs(fPLwB-+-0*RQ#3 zu40KC)f8XvP~Thm^X+e2vU9YD&0PWV>OZ>Cv{i5(oT?<#&O!eao*nY*XG$b*5{OK-aLGI>%EWP<}|#SzH#oW zGmk#}y8r9#E<1_bS=(~qWe6ch?lyw4d%)9rq#XpXu0{z-D!u~v?SI%Exat! z<2NZ&kfBZZi(T82m0N`;a7~lE#u2_mW~Qs8#)~P-8a{}NcP}ZJ^e1oUmrbnM8kI4J z?!BF=GUKw7Sa{IU;K&^@g4=jy4`;61Rq=AJe;?D#7p58nKFX`-1PUmftcpRAO?ePP#eUhPfv;e~a17 z-f(SShCH9I&W^)*zQ0a%{W&Fcs9#`1&*Pr=yMqg>1658l*>`$-yj8i_ z+gI#8&0bi4ir(ZG7~bU^BPaEA;ZD20;E6u__>xQ4+hG=q4(>(sZia`LYS?vCAW$ZOJ^X}Mj+`f}KkocqzU z%zw_GRleA>U~f{~e(kl4a}|@O*00}{{Z4g!CtE?uCyNb9w1}RO$Dkg)4(}{+2&KlQZe=om(cZ0t=UHDJ?5IzW4pS;w@Dw%(J&l|9Wlf zu7Hit@4ei*!gOxi%Fnv)^Um1aFaFD>AY@Y=wD5V=!<$zotJzQFI`MOBmpE(4m1nE& zN*C32H*Jahbf}AQPIz!((xm4plIc+w68}AxQ`$c3$dN7Y?`Pb3Wpkp^l*>}zn&t0_ z%2KT&yXM}jvMVPRRLxi({4OG6UTpM-MVVc;p%p1tLf)olUDlAlQnylM^TUc7zhiei z)_?d>w5!x=mwm>f-#7bBS3j_MtuvKh;pYYIi?*p}{fnkKyC>~D$i=0idTGL3PN_*N zzP_rT=CwfO{-Ub=>(o-u`Q$vBY7)@*BdGWh*S5v?`c8%^tgtlsKl$;TrR{SSEn>eg zubN)xAiG4qpl%tD<+kO;!aJC_O!JtYxut#W5-|z)}3$!z$(sEtc zg*M0So|1g!tarjUEv}c%VUt*d16tmhwH#V=;DOt!l_q->8~taF;{vvT=N}|Y#b0Z=S#F;-;dsL4nEh+b zuAaQskaR;xd6U0t(j(5jcS{y{>ADKJO_}PRD-l&8u{3{z^D+Z5#?YI3Qxqk4=j~wK z^T@VUuOagE(*sF?&+qWw5#3<7viqcspzNd309mDb3*D{{f@yK+qq z3skgTU*mTz+I3R#|6ZA(E%Q2cZ+cc|@D=JzQx6W95S_U);V7s+c}{c7){l&_DzE&qIfUrg!I6zS%*Pds(!$@aScdU58{*@N3J zUapK<;GN3)!)(@!eN(P?b6ek<6ubY&AIEh!>)YPV{JtCgD!H1fb4|Rrd|5qJW0PLzs+X&LuXMS+5SyAOVW@Z1 z$m{*Zm$QHUEern z4!81ty_xc8_QJWlZ*DGjyYP~GL&47gNBjMAUS8N2c+dUZ+xpKnZ*uo7X%?NmY_G)2 zFHh&aN?T$3#i-qRE#q5-`*vqfntlmO+c_uc(1ypH{v7v(><;f!*yh1<@W{ru7y6Y7 zS*lh$pTA?aH#Gm{iL~eC20P=@zh@}^h_71r;p1a=k^4;i%Qe(z$E#{Qo%!kai{=BJ zNAIlu%Xez|JW)#<6}_W31np84`-IiE#JsvSXE*2OCz~g);D5gL$z``r>Jar^RiW=Kq_wO7LFX>$$eN9>piFyFIU;@aa_RsR=cn2F(4xo`;@#{(v#( z>4^z$9Ez#bPyEn2*C_Ja)n#_68h7mZ;t$-j)ogA`&O3dScSq>roY=J00b5gLcV1$gb=YHP z{j)6Q&%er68qL4Eyeqh1rRYn6!#0lh=bo@jJN45it;Ou}m93&CIq|opW;j3n@i@8K zteC|wLaAn@N^H(Cue(y68;fFhE`PF!TW$6y=EsMQC-pGT-B|C;muKztJYX&@S9|pjOT=UC%B2aB4&SGD?c@93BJ%Wh z*K`&`NIEowUL?yC)viwLfyEKU3m6;{u@)6$Zok)`>H2T-?v% zu!YmXZApV;tkJZDFQ<1+*(kKmYgf>Mi3epRzFu3n=rF_fr&SyIelGf@*Tx(yYFpmm z%W1G#l6$d0wMcaZ|As)m!k@n#HvH6gV6ozJkyx@Yy!~bZ|C*IAl5SMqROmZfkP|J~ zV#ukj*mF#*QlwDp>g)xK-H{a(dxIYHRk(rPBtQ7*;>E5fccT-xF$b>YLpf1j_Njbrc0Y+Vzv zzqw2H#Qmk49LnrE(kF&h?cQ}Zbf0PkW9!7#mKhuCyRPV!Y`Ca;>Z!NS3h7l}yWbx% zEKbr}+Fh%^Bu+)Bty9`MgJ$L(DjtuVv1yj~*;ZTN%{1@y&}m zXX@{(_*G23PUzBsBQEx7e93dU^d>I7az|i|y-=})fJKgcx^%`OBW3o+12wX@KB=E_ zGno6;u}?SZOj@VEkjJrSN0}!amhY2E-V)OP<#4hP%jT-mUCw6~Z=2KKz`muC-MU)q z>E_>=T>&Rmet{P!9*I2|)NCN|SG3P+t6`(Sq_DXkA8h<4JVT&E&T8%DDBGX!-?a&O zWNs{bQ;{eU!K9+EKRZ?aB*O}ZAg2{Zs-YVvxJGO&+0(T2`$HYWieyQst>x=$=iYsiJSVtIg)yYMR%m-eIA(w$`Uq8UzomkQoug89U^|I2gdRFVi$;#$GKE3RaWf!~8QNH}}j_3DGz_VCo)7oh&Qah3!-H6%w@bHO* zE&TJvH%bb0%vd5@dPVnY#butgF)x0H$7t-5xmR$^x#4S?gk;_Ng!L{7(&m!^DZ1=a$t**GmJ!6sE?`-oWcN8vmi`WNsm~~`t z-w<-wjsJC4)b-1yn^F;7HxY^PW84RWoPrt{^F?S;l>SuXvc> zT1)XP3vP+iuifdqAj&P<^_{YU^)!bGZEsd{x_vu5*==%k;i?-9ab*Hm!gsqrT~jsl zoO90_?QoV*iw6a68$C-l&)7S)OPYPN>v8X3)?}M%CB8}f&iwtfuF9hFPSl&DD+9w! zeJroc;qHmr{^X;xwr{@rOqu$NvFVBb7e7At_2qk~_W1C%&zyG&%BojLoznF3`MNIZ z-i%@u7M+jQ)}a?az3eOZuz1)u>yv6{v(%klL+NMtmddbqi-d4rKXmKP)(|iGg3mAC z%t=<5@ioWsp4FLC!J69tx2rnvpGi(RBN>0qO=Qy3pL&yx_NGd{9f$GJB;x3BoTy6^J@)(2L{C*8mPGd|k$!Sg1MRXz+k~Xg@=dxg0c_=6LFssqT)U=H6AD(=x__ZZgj;A(}Kk4d}4=o!b zlRBmwH3!FZY!cJ{`$_HcGWDh26|yR`zcw5?U8~Y;CVgsE!-a+JA2*rJcYF6x=!gG{ z2Tr^ip-w4jM_({DL^4ElHd~yo^(waict~eKoe(=;xrG1c1LtMf3g?ycB)oGlQmj;B zI)DDhP*$&#FBR(aa<)!VknnCjTNR!!bqYs9?bmzt;Vxow|r z9=xsmjLENQyDW1>_&pBohc;!8u3T-j`KrOqu)gYGK*U|!wHtO7PflEL@e1#SBY&iC zr|mtGE}ht^6MNHW-5HU4YhLZIWe@*aBba2#!7#o1RbtlJgIcdx{dRWFs$#yElHRsh za?M6Ft_!!XuVLir3>RUDQP{(AVsBdZ)q))cyP5@^Z(NbG7ZbX*IW$V=A4hdGV}7is z&6?R+Qt4@Dp1aL8SRpJW_(CrxYLnFARE5M|^{-wT-uI?0joPlheSu=Zn?Pmf*y~wx ziM>VzYFVlNYvZ?_Ji%ji4_%XFOBto$^I(a*J)Ozz1o=b z$|`yLi${MJ`+qOF?x2yhc~->BpS!+=*$Srj6tT(3+^PNdDVeX>!tkl(;=(h3JsOUG zysYB6(_@A-r`+$#6E@S9`g!%wT6ot|(rJDdv< zwi8pC1i#9Dx+Az^-{Im#(p{S;eegKMW^^`4xUq3oQU=o-b9E_c>6yzSB~%_;U*tV1 zkfXk9p$5bDF2~82ZY{g8GP7v=Tu6buBsSOowt>JupZeBNPEHM9VfDgGJ|50@6KWi0 z-&nHHH~6UqU$@vTt=yxh)$5LZ`~E|9_vX)Bjr$I;dmR30P=2oX`R>oDy~4X*iB32_ ze^T?G<}k(wQf5E&q{SLrcE3NRo3r}ZEw+%k?;QhWiza`Z>9so9z1RBg2lmtg4=LHI z6OHdqR;=)gefn22*m7sopL_a=$9fslRy^3~fA+@5r1MM%B&&L6+V$#ku29g?dbFWs zX7Rkgk>^fs*I|6GGS~gG&andVdo}x4+%-{(TzJlNn#Prnou)i7`WrGP8X9?Dndv%X z!OpKYXIQ4pJoju>(c>R~n0M~jJzaP)Z^^UrVv{gt+bn_e)0iC|W`BKj+U^qv*FOD^ zRjd&*iMQtP&di^6iO*TRBxiQuv6y00!>+vQf|@MZC?TsKF{BTLnH9c!YsT=9yREBIDESX^{tl1=0H zt9!PTgOM@n=`~Ld1CF{Csf`OuM zHb;bBf_u8Rz@pTn`z9zFJHI-p$GhzxgS7N7Ro9@Iw~l;a_F|rHSL{;~k;-8I!)eI| z3!YH>WqZn63$>0-a$mERcXONF+P7ae9(i42!t~z#Y3K7>_1O=*mn$dM8H@f5%=tb4 z?SiB$a}M8J()Gf|?$23e!+!q%UpN%kG(2(7yYhPah3GSlyLvXd1h2F<@okMrt4dPc zXtjT5x#usJH_5+VOj>c}2XEM&gn02!oBzlDZB&l+xvqcXUzMgtAm_5SWx7QxQUmQh zCMLDc=lkb>;mDbb+k6fjF|mkM7cBeZ94@|1>p|4@uag?i9)9#wGt49DdtAr@7v6Vn zsTON~-1 z{cT?__xWOx6WtrPcTa1(;#|MF!AALl)toe|!$2;J290ZQf|E~KhiQ#BZ z>bVq0xlY5Gb8lAM?wR@SY|Bi|i#j*UzgLy(vbG6aobhv$&IRqKzxHcyxtpK8gFR}V z%fH5^cM1z8XT17xifMlHtje0WcW27$XX>u$_;sY=;gZ*r51hHQl5={Nr0(m}+!h;u zF?^Jsp_U)DAlmiGiixH+v)#*VL^_g=206yoYMl#dcJG6T{J{-N9Gt1`0%AU{nmy4Xz3^C*>vN|8q8xr5s{x5?^(?G%~<7Gg;!-`|u zKU+LJ?H{9FX!F+Zd{+AZDVfLqeqSEmT6lETCtF#L^^bcJDixpTI6C~y>f=%@*w}J2 z>_&{>_kujlsw4Z;Q*yeNm3r!{uy$(Ob-6^Ax_nJemW>ZrkT`bUr=HO+_JQVCBc6S+ zYqUKQHgBrKN*!ij=^9R=-yDr#iK1&z6?mKRJtC z@y|XNgEH;iv1yX;jJAXnuXb`M&VOR6XA*SUR=D{|%YV59*>$j&@`9x03w2uAPq4s~XTx#TmD4sQrG4q$@*@-PYWgqnF;!1;8 zI)_(8w(FK&i%ssI%`@-QzV%z1zwKYNlkeqwVFrf(|KG&MXWupusK2-UM3Bam9Ri+Z za~*b1H@M;L7IFMr%%&+~cdn@LE3c8SvwE3wdeWLxowKcu`YRsX7g4_7`mX)l>HN|g z>i#U=JllxP!S2sP)m@^K?K2s^OsMQ_<2=Z<;Hhhz^RJik`xb{*d{gOtIz{91@}Q+V zri;7&-K^9vVQK$-W68Pj+`Jz@K8R+lF8{4?Rlqpv1IIp|hjDuqwHEx^0G_27f@ znKd`V3`M#>D6sE&y)vg@%lu4M3UM2`j9jkoP* z*Uz;MkdqMJkx*^r$Y`_r%v0UOj?O1758J&}GXCqm4?n1MYPZb9q&=-4N?$H=Xy%RZTiBiKhzun?HR{+^Tzf`u67MrQ4cqEW(*894zk4S*!Q(Ovkq%i8n=d)qC3c z_8xqHQ`aOTJH))azS{fhvZY=f6`kt7lRGByr>*4Lu%~~c(YEXNs&o0bYIZ)7SaxAa zpwYjC6|O73NWbx2Xu5pYVW~wqsol2GYyaEai=MfrM%^g#=Q@4;t<%rV*L@IjgUj#Y ztc5y%v{KJKP6+L6lJ{TEay0yUqtKO4n&KyFPZe&mTGlDC^wA%7??sn;%-RQ%Ju-SV$rW~>%x=u{VMeEI8w$wQt^-KIrWs|tj;gqI2~IGcQCw@BuyV+9v4hnRY< zvYoI*ePvc~h+FE>gBjY6sY{ou+*xJA!w_x2|5EzHgtESNrY+%}Te9vH^KQ)I{m^yo ztvB~I-A9Gh(_|AKn=ox#S8spjifKdqjDySDH@56!_I^?zaM4Ii_?6wS+>)vV?K{Hs z9)-;=W}990^5RSDYW7ErZ{kjeWsCmXcv9rn6E{QAligLP;}wp*Jnrgnx$K#O?lOU} z;=eau9zVIXVvl9Urk#ytY3;_(_e(x#F8_V%nP@+s+_t%kcCxFSDty=6`zzrvTY*nO zM5t6$Qt)5r>ki9wHs5S)7tDVXouvIeeDR@Y2MP)reQ(G0{+h*odtLAKt_UrI@6)a& zNpa6h&MvgJ5&s)g{h`+7UejmgOQH9S#V%_4FnB2++w*hRw#TPq-c?u5m(0{RKJ;=B4z7TlvT_Src>!HgzUGLXhKe8+4GF;LZ_P$9~%E#DPB|6E=Tx>Gm zJzuV?kC<2Ws^l$S67}HF;#pOV-rb9KEWc6VFyqq`E!M$Vx! zs&^C1a`{Ta8Z9NGTbggFwJm4`bu$_M|35PKKB%90eE!Y&hsXVTbOaPmZke7{a@Tp8 zU+(=d&Y1~eCQ_>$R+V1*_x(3^e$-Y%uT8!$hE{`MKOI!5>s}^Tpt`wTR$3$S;+TZ;5?}iy(T4(=B)P42;$oqGt zSIbWB*zWnWaYIf{+HS+FD^6SX&fl`@{6n3eGJJMgtYUM1e$Tr1<*b3Io^wuv<#HFz zQ#YBt`v0tcDIXJPwd>02e+Re}+rxq>xL zGiu*olvyjtb~a$|!a|FuJ~v-XSz?^setg~*@$oZE-if~T zF#F9{wk&Y&(Vkffmo}EjWZu4b=Z|^X-Wkj4Lwb1c8oYe}@8$DHQ$MYEZINAXRXpj2 zu($rE>*tL8_GCOfpL_i?OTTS(+U`Y%3g@QR9Nzcr(Nu?l3bGBmZy&A?h{+G zO~Q7wj+@=;rv9up|7xesIRY1(yNkp(vJ@T=D(wrH-{N6^rFF^o8`GMVm305>c$x1u zI-Bs`YU^ItN4vKD7i;gGG$Xg@l7GW$)-^GjDzRDY7aNUT?nytIE`Q0CD@`j@$KVmW z`whXv_frgR>L&Hi`(gGpP>qZ8-X#;271=85w^y%;RGnx$J$$=Q&Z%6jC;Otfv)=mF zY@U8=#tTtlnTwO|wuUiHySOf;P)c}P&lcw;?VrUMIu6~m*}s%N*hap&!u6Cck~kXLzz zJIJa>p*%>_ewmbW#i6TWE2oN0uJ-*uHAqV0b7IBrU7Y&*d51qM>(A-uuX!ipp(Me1 zspw(UiaO7|dODMCU9*}HyT42?%Uq)AWv%LPz+wzxI zyb9w_%q?7OoNC+r;{b#51hW>USn&%LEZpL2cUv#{li zt$yDmRi!UGa{b*qc|)G;IjQm~?PHSR?4su)UGwe>NY6MI@%P#7^6$A$k?v2XXYO$e z`^sylG~MTM1l!lrx}bYAjy=ek=*#|$!$fY9WNlf`8TQK(^H@#Y7T9*((>3hb%W=2w z_u}UIU*K~akHo$#y6qME5cZ(k=9CY5e>YD0n26p4-ck|w@udcfA>g?Tx?5DdnC9HU@?Bur2m)AP0 zKJlHG_}TAI*43PeZ){)RT9CTd_+k-5m@c!=nYEAq@n<|~*kB$}{_2^Y!siMx#tQEzZB+jd3@SxqjS=^ld3}cuM%)Q^%D2@1$XkDU z^EA^9N7nAqJHQa)@b%20@0JhrQ+PK^eAprPXGi3&>obIRB|B>tICod@anCt$Uo#C=3v+Vw>@-5H5M?F7V8nvfUQtjdNo6{Es@8>W}j ztuiKY!m)0r7nbhiZIunZeXsYf+Rn|*`$HJFP5+^Na$UTltn!_*?|(0`{IE0A6EFW6 zR}z;I%A&i_P`^DU{3_`m)B!1h*LOkZ|w4T=D;^Blfi~|95nE`Fw}{F|zw?ZNIUr zg<5T^yuNMrq_5w%OlVm*p(S64XNt{<^KABF8};|JoqZH&I9q(t1UvT|*H69BdAD+j z=MR2?1!p$}-@du>yi%`H&;57$#q8$;O>SJj>|nM1+~#}FW7}f(tDbDioqcy-+dT#5 z8^^rWa~ax=CYEtNc{@G)+MU&0E}7Ad3vL}(Jb1$7ZG+Ua0+TOoDpH#pSf;ccJW+g% zv6yEv53ksj*9ML9t7?-(N}j#W?6a3{l|8+74y*9gP@S_M)V3LK%n6N5U81#mMG(&& z=Ek_JxPJP?TY-}~VaqFAR5l;%HSPDl zUZe0c<@U0JIcrukoj7Kw)Zd~L!S!I>O9zA8v+XAiZtQl?`~H#rJeT`{rj5!5cV*uR zG==^@;2oaDE~UDF@u*whjmb?vk4mmB0SG}VN*R=q5$KJFlW;iX4=_@<9>kx}Y0 zQOeytoo{!%)98p1+Ho%9MUSTHLTL%-^SpNoLRMY+-jZhMy`_9t+0yLy!91(??(6G% zZGPa^(Yt(jl$}a@V08G9sc)+EC)U%2 z?}{>C?W(Gn=q(#=TD9cduJG;j zrwd~E3N}lhop*ybKZ|!^{bO^lhM<{MTw*>Cdy zd2U;$K4jRcy3h4+?*H)j1>wBgoZJ6McgQrvD4y1=IX%sC+YHS!*a?JKTPF zet)e%@&6}xpMO@KBF*xw=yiRk_xY`Ao!f)9ZJ(+jq_X`I>;CwB&AC7NOT zr~cSzo~h>2vG>tk4X*yvFGI8M`TUOX-+5QTw$#U3CHa|@;NmH6S5o`3cTO{8yMIE~ zQcTu0IXlOm?NYcw+;#UW9}aMG&)px?cQv~4OYVXs=2bUZ-j}D`{kJ(kP2vZ~>>DAU z8OuILwMc)^jXN#;gLx|dg4cY#b3WeK(D~iuUqg1+qugaW7JDD@+r(*WKiD1m)9Z$H zMN3qzNksn3M*lq4?40e7UmaZKFy~zB+QlE&ZS{-){jX}<2hjx|rrs&75OG`h`+^+% zyks}UVh8aF4Y#H_+Az(yFBkks;z$pZb-_uo5`DdWj(04WuP|7Iq`R)Uye4vzSa(=7 zo7%xy$Bsy?W%v^uBVXL4w_*R~M zxFTHhP<&Q7S5M^K?))p)b~ShJxxSu1E^NZo%{PLx$`3T3Dr8tPUHEhM_LJU!jk-;q z**>}O>&=H(&Gld7UOeYdn4D)QJIj8`E$*<$Ef&_H?lZ)f?`2)lQ~0*-D*yX3e+6Ar z!M@^J)_cOw&Wk2YO<4YBh2Q2`M|aG)`a$%Cz0DQ*%X>JOGrC(lTu5{H z>pN`y_@w=p%6`31PHIUfj)YEpp(7{rcP9JNiBH$;7P8^UJDq-nEjXekQ_XI&+@o7N zzkR8SeIofRBz(`*;O=bU>Fc~!`JMv$cix!MQ=;CGQCy^Taz~X%%iPRwzw>qkP3gUQU9{6}?iC%O-Z$0)Hgj@<>$Lmt zyjU63yJVqMIdgNPFwe;oQj+sdGhLSry3Y9Gc@GD#ayO5r>}A2;H6N1?B(O4+-Yr{u zv4Ug&t@|8odwmlMngv(A(&Sc4P`#3``1jxDuPpIRrTs4JW*gk=JF)fPqR)@x?HE%( zwx{&CGiUX=Kf7_|>%!AI58B`A<%WKK)};O?eBOeDgtyw!PR2gH{XsDvKfWXsA7vEm zOjuH;U9dG(hjIJd!t@v6r@tJ#mLJhIH?{T4dE;-#m5wo_Sfxv9UV6j+Ps-rKib|Iy z2j;C8fAPNXxAw1%Jm-J<@|i!Jcu;fpGKG5vH{K_G>FzdO+U{aKH(Yt%WS;MBr}NxG z&G)$^*qMFt3>3KF8f>Dm;`yQ;!_u(k?^7D@}$o^S*7jeVbl+?!cwB zf*mf+i%n0me!KE-(jQrNH<2DEuiV&v8|es{8#yPrSKn8?5wrhL@KzqVS;yto&RE{11#>zVfzWn|Ee189*{^`f3AOC-8 z*WrH~+Vz{YS#N*0ul@Jq9tmyUHCDv=m95z3Z*RJ1>>MMf*hGZn!D5@St!KRcUc7%wZT{I?_KiX1LR|gR`n{YD zIhDIkFio>vGmq`bya}r%pB?$A*0!{dS?cTBK1pTC+5@(wXV&kXxv43A!-BGZOEsl8jVhwbAB{bdVw zzF!sGr^&jzSo(8~SWJiGh7&9Sb59=8)XS*ZDi=4e(E3pIp|cYW%d3@MtXUuUVZxD< zH)38g?0eWGsbD>5$T$^^K1k9Rk+X3z&1wTh{F)=%^HYQPi_2M|D9> zuNAxC>Bxg=+aJ}Wt#?zGoA6XJp<#n#;*+-;yRDp}I&T@x*0Mf#-i*DwB}F^gF z99EX3Y8diNFio)At?H?ok<`Z|{dfoGe4YEZCRQe2VD>cF%yyX3_(D^K%jfz%G4cM* z;2Dn>lk*}S{_%wM#2+|vME!BIAzMbEh_Q0?vE$$Sv=?t^$}!xhBmMH!`*r1S|K8et zO+{OCO+hJZ@P-4PviqcS=4_DjTxrH8^5oKrF7G834Sd&GXQqCgDbsi5d)oJ3Zo%*J zes8@U)WmmFfHVx6$CT%p%jAyhtVe ziBqC-|1uW+^bb+DY?QjWPf*d^HHBMf*T;1-{kpS5dqcwHKW&IESoZf}0Pi%ZikIoe z;SDPei*Tpyf8JQMJH~4#Us!n7n^V)9FW%N{JKsLPJNw%LmW!QH_d|AH(=>ZgK1)1d z>WhSx$^6}E?u&O=?Y;X{zG(jRi0@w#42pXq`V)>v7~Xlg)b)?_wKX@Q_AP&Wx{6_Q z{gs%;RmHaJ9&1)rbSd`wDjl8qdhMkn&)2SBIMI|{I!aqtMMseX7A5{y!ZWyYW3fTi^}$i z>!j~`JNtsq_8GQW$GFQuHPChcj$UaN)g;w?UNO#~KB*(U2{ z|Jd%w%xu4z@^9D8HnP7pWu4O6PTl3TJiZHa^vta9NUaw;yQPtH`+L6K3%Ltlt_$W7 zj^8!$JL?g_S88i)(2X(74nnhyEpJ_~<)k$=I%`tv7!`}FmfNA2G=JI^)QS?sZMT6(ig_C*B@`535mN+%Y%HG_R1yAVJSWvz1Y{U*X*J3BHxZj zGq(KgOpJV{Dtu*i-%7(ZM~$cMxbScym%n?D7Egx35{Ky;jFP_t-~HqdpLy;4rXKUX zb+fZWR(Clq+7!HW$=Z(1XYA+CkNUUo0nhpe+u}+$ZC}NEBv;)obCJL-AK9%>`eH+z z#Fs>FJ$l3Fa>^U-UeA(%)y^%>Zfx#_j{iBnF1;bQGPreKf^GL4rueC45iL1JGjCmP z68k*KoQZptV{~`hrM?Zzx|+>Q7Rzs2c&|X9A@IPQzz+{5@l0!bnwA%LKq6V_P~ios zO$SdF{{6!8dDgG_uDZ&ze?Akt$=AtPeX8`^Om~?#4tnP<9;vk8UvYGKUyA9EBm5rq zN?VHyR{IrRJiW~&x4-IS#oAp$(_0cxcCP4HvgeR*cm3-Jb(d~86&3_fQ7$=tWXkFN z1qIF%XWliq@gi|uS^T;(jw26?IbvpYDIGoPFL>6nD^g@p`qB(R-PiM#XR&ZC6-ZQ$ z+0UOD^l6s;`(9}=C9h(Ej~D7?&-9vo(7(M!@$c8H--S<7Z~f%^;F zGKqWkeDCvq}OD zRwA$Qbe)IH0){OA+|o~{r4~t9r$3I#{9luv7Qd$~=Y)6YS38*rH#V=|Y`yus&1Po3 zbhe@mf8P9)sAuyJRR5FkZ}%kw$upmnD*pUeJaBA(H^XPWLx&}! z*!s4+H0=^dIr_}g!TQb#e#iT|+8Za$l=i(VFy$_9Zh6kpbx(iwy?)=5n>j~}d*j;9 z%bmGX4cI0cn>o#>b3YLvTX)>0Wno60%L5HKBj23+!!|MfaN6qiESq9 zjGo{$Ly?b(vdId~;;CykA5g0B*|))LRnABCS#qnDyOJ#zd3oHdGLi8sw7heE$Gr_E zlAl^b+*D5)*L51dzN)HN`p7jS<)Ea|)|lXKA(a%rY3>*Q{n%}OaO<9PAyGw(CcRKR z)8uJ!kJ&`ZeNKQd(~XTHLML}KWzXPFQ997|x#!mnP1kw$of+P1IvM|2Jnl5EEKzrA z-7&wQB~Ynq5t~V$v(~1N)GnSWObmx!v1(h+XqvC<@O_%f#fIm5j0|o@ZGCb&vB5ge zMbjeku0GdgaUE%vmxAUxR}bCpvzx-{Sa?wAQI}kc;5CgtgHQ8v)mmT8b2M706Rl+0 zUAl11lr&%I`r0||7VC7hH||o(nEbirh}X(34sVPX8L{zCKK8enZC$4kr%6xM#1lEn zJk_#+>{FMW_^P92u;^INyUkv_Mzxziz0R*<)QS1_i($>VcUDo?Z_ww&`on&k4^;QqSJr zqL(fCW!t)o^%q3vCf~j+%Bn1MI&ZFG+`To{yRw&_d3wRECrhSf;nN?<5mt*-=2hxR zZ@#eoqWiX*XB8*^eVNgpa3|)Vp8uEco#k(KWWSLpnOS&Rbhce?=Z5+0k@Iv75~VjT zEhztNdr7pCXA6gXXu*ufS!-qpZ>Ztg#^Sw+@9KdEwl<#{{^q;%6bU|yyj0hDhhZQ0 zy!msb<~`lD&p^?5$@+%>2Q7>5Oi(R$zk2>n%5)RgNd`jREo*&_xHhc`a@)GVa$>Tc z%uD;j$`ZjhGIpORU3bggMf#a$L`wGCr)e@*CU07|dRJETf8H6N=cV`Om^63Wtm}C4 z@4&1Sg?CxmhZQ@`|14QCMIcYEZ(azw0H6FE)lS?@E@n@tLOs<^UrsAFV%|nyd z_21S-)g4*9*@s-@pL+-fa7~-UIBo9&WBr-ZBIb$$t?fx$ zIepE|rkFf$erhE8@Th_C7a0aEkNry;BImwQj_}Lvo18X(mBzIOugs(QTfcNK>w49b zmM3TPyJ4ErRZc6N1%YkPjU)FK?YL(i;}rh?O6lIymyXK&MBaXTK+EcY=1Ue<%~7XxhTEl z%C4vjR+p0=ece>m7A;(pP?;H?rzZ#r;+4 z-#kcoy)i^JZ_)g{3)7`DpFT*CkCl;mv!+qs^-S)v^4=Xgn|VufreDk`V%%OHvNQib z*T2x@xEYfU7D;A2Q@Po2@ww3A^LP6%ez#`{=&@xKVLWg^YeWC#t&)@dcbhHxxP6cI zp|Uk9UUMQdW<5SJ&+T5%(b$}Q*H{J5p67VGMTTY1M|RcQ*)h@|`qn$0+|;%2)cGy` z0jHlF-+%Rhm2IQi^V$y(@u20%wH#^?p?oO+lG4qebEc|kG(SCKGH#I+O z>%@OP@F`zo5K$iy^CbCuq^ZP>vgeC$Y~qy<&3#u<_u-V)cD4PHOzV$xOkJtt{vh9- z`%ue^y-WUnw7%2+ctOW)ryJrc9)AnkrgZumOJun*$+%4|=1raQVVsN17)QF@KoQ|H6JA|W&6@};Kd#hU3J6ji^Xb7{)&++8xA z3l)zrbt|?_7kMLBrQhnOx`NeqzrLuCz!{EqOCz5&IpLkJJeM&Ydzv?OdBDOcoNUh* zJeKx+Cn8y~ukq>^X&&jQhV0pb+gAKu+s2{&`%fjS_12Hu7b+QTZ5R5&^YQm~iIzL+ z9u-scy)Ln?^`CR^r~JM@e`ov5h_F%Zo#C7082;bKn1h*r@;e`)Sy}Fe(Xy!b)Ab3#UM~YVj<&CCFyHCK%>AKe!cK1`yLo5*>zm5`>MZtK?El-sTUlRMU0GI~ zyl4L`Y4u}YPyYG#=gYfCDS0vX&#qsecg|sHzQknPbHBH(z7AQw{U+8o|CWQm-p|@P z7nv_ADX{t6a`Vv5Rb8@WqSW^b!kad`IXMMf4YUmT`+lzZ?zn#4+lHmHg7pFqSSMHK z-aB{hxU~7>3e}x{0qXo6y6K-k%$-;1HGSuGj=aOS_V}0W-|)&F(s5x%qy}1)Vl&bl#KpeOZzDam{j>t7}&d)KcQ7rABz zPn=zvpt--OSH$DqE$5FPcbInuYkt?Q^LUY|u&4IyvUTEmcLP53e-*jRzhVAW>6kB9 z@?(lQ+&5-c9k}dn|3h@M$eS*=l_@=|l#V+|9AGrdidpiZ;o+sSb5C2`_hl`8v84Wp zY@zmoqI!jWXZ~DTFL`FV&%-#IgabQYb$npEb+~p}Z^E(3{I7Qx{7n_jv%7m|ANR>~ zdYrp!&iY)D$hADWr<$ck`~S7b6;J0G+XX8;et*Gg9$WY=ez(PMljLH~if`GTJzYL# z@eWJh9d0LenpFGudl$seSj&8(dmO;yUkmH`h+ntiLYsZ>4ar z+Jk$){-(cVZhI{idLZ(UU(o_tBhRVLrkgHEe-oV)r8HZ9%0GvnHckp3dSeFkEJ2>V*h?EJ>ScL7a81o^isN<#Wfi2JzlbMF&Ec?A4;OU z3nnaECR%buxW=v%?dzxvCaXMSue6FL$9??_~| z&Ait$i+`T8jB4G@u+S-cU*v{W(&?w~X@_ggZr^XP>h!){J1$Pj=RN%(Au3t@t?lUxermag=W32$>`Ry6TE`F{Ss_#3aE76on% zcHAnPE1=KeZ8Pg<(zBgx`Vx|R9_(QKv2<6&lAw)2OiyrSPOILvrn;_mrX&fk7z zdG&_>-;(&u-V>sR+Pt&siAAgbie zw7;kOc8b$?gKLVP)HPRKx#xF3pq2gXUa_d<7mL0;ivRP`-@Z{`=NcV@9cO+{$?^Q6 z$8+sj%~`kLbvf%-mn_I>+`78W>+``H;py7*%2%wqJ5lq^!kR5bZC>AR7oI(Epz>X} z!U<=|9TQ9DnD{xVe|e<9H%aB&RPmIZvpJR@i=(Dt?~1`liofF&BEVncWxA)-Tvb1mW=0< zcig<R__Z@_*_ImJiNK1rL-aN9^d+x7ADz-?6hldV9wom2b2DOn2AZ@M7xMN9P_t-N|&R zEdEk&`vLZY7IT-q$n22%bWmfN!>YLnYLC{s%t)8e4c}D!E{f^!!W)*;nF?MmS?aKG z_1CP!%Ue0^Rgdg8iwl1_%SSbH-sVo0Kv5l!g1sO5#rQ;{_pVY)oWm*S)x;KFJa2nl zq4tejo>&pdtVy%dR{0m)K6dQIl|d+t(QmqiVF_SdFzDg)@}W;HE)(z$kJEe^t_+4Pv8hV?HRi8Vc`Ct?uM&s zk2#iT6dYc%?sZSW+IfkGBDNeiluY-36+7F}QT3=f!$)DWc`N*!tZ#hPHZq>HU8P9s>y!tRtKT~=Il4+e=k-dy zwCIJ7?~Oa3q@)~Fm_5b1Kk@sV6d@1PAmwD|CK29Yoc)b zzUMp7ZJ%@QY-i5xNX25!kZGd#nV*&HK3<%W8@POy&DY{x+g`HIzu{r_?j!5t=e%ou z`W_xnXA{b{TE#wHV@i$bw!M*|Z0nOEAJ-gIeOnft^>JG_Fn+&(|&YWn3qKRQt< z)*-#Sbq8DY;gf86$F6;u(UT{?`Jb#X`(}^5Dkp^OH@~h#PKFZYCZEL!(P>T<%yEzM?p zd{^3H^J|$GXDobSVwBf(RJCg_OV7&~rTqA%hiW<7r9hAt0ccs$=miP zqVqKqb8L89;G|YZGbWxrf3$To7F>8EvSxv^Ur&3NX%lCbndt5q$(OBuY7r(+PwmQZ zF*$scr;)Y!CI68JV3g1-aph<84S}qpcLi0JLP61wo~g&IF}S~a^0o+zm8DEi45ByH z+*B#mf5`8(OX@z$*~80TO>wc*ubx)wANC)7itwG-yZN`>cMS}VJ)owsqHjdY>P;Z4saj{f^T(SDNpNxzK@cMor{Guftd_hZE$t4T^b zBL%OuSDbI_3`r2$cK?lqlFjA1jtY+Rr<)58vDeJmY?&lc9Jy%jk=t7zSJgVD{`UPf zQ{xZUrdxN9>nnx}nC@X>y~=nqqHeKo(3`)3(~aD z!taEZx;}f0Y*p5vU;pSjI*?uFVe}2&X zrzzZ1h1wD;YKpEuHC|@T+aZubfr5^e- zeoxxm<*n{$ans3t#c~mmu$@2ePKh{kE=6AZ|IuagCx!U4tc&B~-R*8p%GD2A`{JgQ zc$3!4-Op}B&$xb3&X3U{>Yw`dhA7z_^)oW}H#qly|Nl&P0?+P9E4vEb{OoDRS8P!8 zyl_M<#nMiL_2|qjwRibzDU??_%iYI>LV?? z*G@S4+uVNdzN)Y5TKAn2R^K{j?+wRU)|qGL`K^1oaNoPO_RGaiEjOyy&%0^-~SZOHP8@^c~wRZRcd_Ve5BX&GOozke-%s^%S5F7#!i z^mXZV+kB^(|Ni$Y?N#lxN;{T#@g@6QW@~z1Y0gx9%_{eMzvx`!YHe?oyDxLhCeHcK zQTpc9v}6Ul+RVi#zsLFC=l+qvT>nnsYeI#wxj(nkUE713J z=RD@mx81(9zU_}V^+O=si05fs*okzB<$W8xI=^-XgwPLJH5n z{@uwwNu(!EV#nNh54R}4n=Petf6*J32YZwl`7f?KyyD9)Pak2&KL?IDFs8_Um6>R~ zr75_O^|{`{Q^y`2YZge9Xw$RzKc92GD!tlKXWzXkq0Vtv`KJ~xAw?zq zhs(nz{D==_zFv31@xyNK28(Y?BXhMjib$Gr?}&L-@uz;RO56AMQ;rz)dA2#ubIY9K z!&WKba!|vEP5hvS-15l^`z0=4SMk1F_{id!tl$Bq^9(z_=R{%Y&`+r7E| zlU14<#e0@7F0d+_TXuY5k?)yYoyGgXdvMmoI{Fvd;la_#EPh4$5$nXx zH9-Y)v@%&9eSLFgov+8~-ngKp=hAYQe@nBSw{xHNye+JTe!uq_``v$jlXXXo&8`o8 zMH>naEJ*5TlDD$tUD2NNsOI)o-ya4xe4jZPa{Ts6>1tOoTZEm;@LvCBuGaa}i=E3% z8TcOxzFhTGF6Y~kUK!(QPyE|c?^JJyne}5i<4*2M_2w$_>wE0VT->^ zS82XCD=dHRvzHquGb|8&vZmy2quhCSA614)*({0|t^6+r6$huy4S06!Q|iiyjZ>AL zv9q(ZI>_uQtoXRGx;1KJQ}~vX+6&xv>LuGNWtype7x8MgYD@V0VX2E>jicJ)r6$3f zbyq*z786pLep^IWn89Pk#MEE@tNyFqas5{ObaCc3wH*vm5})|Er{u=wN6g|rI(wxw zzq@5r$IVrC%#tg_m;Ts#X;!kU+3Cdp|6{dW?snMw z8)`|X9z2#?^H`|ym>Yli|L~3Z;Lh)zIp_0k8}J;9Upk#pb_0jfS9^!JiAqUfgdt9nq zm;^qF2ivE1SH0qW;CbZPM8)RCvKfJ1yJi=ZPLh_2SkYg&D^D%ruB||rtrH^`XUm3? zO*H|WlE3tVzFv`4aQEuieB#+8!>11YO#Ks{q_rnz=2_j({Ty{?oARw&yx-3DEk3|u zX`-fgnf2PT^f_K3#+#KYM3 zlzH0Th>DF0v(7%-peWaz7v#Kl;s1S=VNV4k!?$m2N?h3$8!sa%DJeOT{fO)`fhEEd z3g5|Sre+`f)zk3%uElo2ZNdUU4By{v_|V?8>eZY}RfhT-+K!}IJP~<4olhX1>)9%s$>2NB1eu5Bn;ai`10 z{9GGn>NtqOVB`xJmUXzTipmzJk-OCzP)@WZ- zD|(`AGi%OeZQ~g)Eqc__ixU=wZ@KHDQe>v0@ZC~>vo~AO{LdAO(l-}cP53=WU3Tp=yS@4xoSR>I zxV|f1H}BQXlAU>P&xGyr{Pbl{sodKJ%ZHUeYquHPKBKkr{HN1~DsfjYC#lqBeQgR4 zn*aIh5$%=df10uz2F;FaQ1QDudBqaD=dV3Og64mo_~b^0on^Py!!zm=gy;24NwX8r zh&eR#JgZ06CR^Wi;wwL2-*9E6sm@g8vs2f}e)PXwnf36@b4`!TXT^=F+X|i)H_kJd z6?Ir@bCaCr>6&xjN*Mel+-B*;PJ1~=U)C<1ceVQ|qdDpdsWZ?1G!2Y7nQ_itDgCnW zN);o2hf|-Xr$0RDbauOXm6`2DuT7s=mgu-wip|rxQd6Cj9^D;q+WuT$M4|3mi+KO7 zIge{p>ddMiO$~WeV}DM&^YG8y6y&6=v`FZ({X*aZ!?yK5FuDF>U zyOk`JHpS&yT zN*RN{Sk}Ihw>N*qwzu3CKE8XB`W?N^>J94LrqPd66y)Zo&$Ja{eEjicF8c?U3rf{Z z6-wQY3Y*-&nCyI8rBak+!}r1EgOWe{N0&tvHC1bzPVD?s(eL8dbDVJ=M`YSe2LBeF zkNz$5eEnsGEDhz@E0n&xim{1Y@zZAG=9equZ=7xWdwE4KbNAVso9fs#xpmh0%Qqi=l6OcpdFqSSiJcMgtTwYP^;pvSO!xA4JqDYJWi#h7 z%+tB@W~Yej^Gm_~E*CRDTQ{ihTEp%Pa@%je4_9pNmZ)_3zbUt8bv;mG;} zp#^o%`|I+>AB(>ZjWWDDukGuVYhn^2@qI5>iXN_B?f1y@fK8>X;3hSeN1WHWf)CtV zHL=#mc2diPs+XT?eUIMLYFK{j-l~az;~4yfo^V$AX$$2<_}{3PzUJJj`}%3tLAjN( z*LFnD-ovG(zm&Nm>+#;uEZ@wQE8fdD&D9d{*E{sVW`pTdL;t&*Cz_qz5-ub1BX!kB zt)M82?;bi6)#}cb_c_|^%qo9f_GN?VG(rD|f)^$`G)K3Hz3}cj`OD~ zo9+AmGt(z6_;v5*lK-sp7b*)KX_8;9u#~klUo@zCd7b&o2k(L!)T3F|^U__!<u(=HI;Jj^!DX{clvy ziORU6d33@@h(PrTGrq?o#He~ed$dNeEB{y7~}M5lqnQ2mHP9YxPq2_ zo2GEBY{~iU`k|UO=dVv+B{Glk^ptloQtYNJQ$*)A@7ptdq1|P}Rr+lgTz(f>9|&K2 zzc%iLwv!k4h1L+ec?P>*Ich4-%ei`^ex|$H%g-AADt+ObC%YZ0`&jxqo#*Gil(1+C zsV~BFG#_MdzHC#lRDgG$v$2NiI*~=YPn_)*p5Po;=do*zz}@f1L$o|zv1}~+5qa?T zif7eJwkX)f$20hE>x!wdEK?FVAv}@!m(gE`^=RY1L&^$ESBb3pym_yiKQD9Tq6~-l#X;A&(m#V! zPji z!soB;+MEjYbqju8nr1q~D_!i{&NdgzCH851MfpmF>Ze4mx1ZN5tdMWg^=x+~oA#%6) z>G|p3T|@g%Tk=Ym6K$SNcS$PeHd1n`Ld%&Ak`wn`-%D{kds^4T@$BW39I2*=@anxW$Nk;XHsJ7 z1%*N<{F`8Z*5Heo`dW^^kx!ntHSP(Vs*p5MNh_N3OZ)bzx=f!W9INK<;Yw=zeAVfg z@Pu7PjGynVn!R3Zak^oYo5z;cFVDkICeBa%cxkf%v)I#hMH#Gd(OW#k-&eX^oqxb&7^BdSWK7&HH*!dxmmCy+A&X_&YIARJiCFzA_~XAN z7xGk>+BR-(JF?(s`U*w|`l7s#}bpU%7L(tK-VZ)W(VOvc38noxkt+r=-Gm)_#{*r0|p%{kvX8Yw8}6 zPCnT&Wlod%I{OL7IWEmVy^G7SPTjP0ag5~S&8L`VEvP))&9f)swW7qgvw}j+&*V3) zKe6e^qT07E4B2swADgFtQ{Uq+R#&^g%|&kG)W1oHtw$F8blw;) z2`c?%2cJs`P2TX|xlepMyNWg6Ud=vd_R8c1U)zPQt%JrF@^M#!hFI=ZpPsv~iojU9m>wPw0uKUe_hNUaYm@UhbZB z;g2(?x^CDyl}CH0Z}SrOKfNc6=hLxUmlg-@*Irt2?)shsHf|GKeV#^fw0~7i?NQZY zefx7`Xv>knyZ^uby*mH!zGGV!*>{-tb$wjy&ZGQG>gJ-RGvU8Lnz)y&6Uq5}gP~@f zVqwNV#yjPWZ~h!Uf42L#zQer=lm8#WEuNTXm9!ta4bI1H8qGgA^FPMSTN9$`(WbwV z`}>0Df3_@_>zw=<6iV)&`yV84xm@(^nZ||*^_qUO+beq%x@Fq?(+@q$bEu!%6y33O z#rc-j2=AX?*QMqNfUKP8y}G0Of^!=?D0N+C5@fCB?s(XGsIrIulZ4|l!Z~V&s@mS==`riG{h21TSpLJ_TfQqV#Z}~ZciuZSU zGFX>f_#o?g7=XYz8@_Ph7OkABKve$?y!ng6L?`^Ida-U`=x zy=az4hD~plT$^^fYNfLSr^}R0n-n$g=rz~Y8Aq6vg&%hKc3rtJb~OE8*%1avuf|3IJS+W(-~yZ^M{G+ zr@YU7J8P#XPi|eg&|J%`yuZ_<3xAw{-kvd0 zUVqP*hZjBVPf3S=^`N5BD0(fQ-SUp9R#gl2ug^dH z*kF>vhuH3GRzfe^zOsK%JK_1OxuQoQ{dNBWFWK6Iu~Tg)EnqHG_>}$X))&6RMKWxa z!dvRXm%7KazJA`YTT4++`NYkj^E*~w()Ubyw{FjiQ*OWO@9(qAjsJGuKm6?DcZI)y zs{j7<>y~ZI{yY2a?!M#8pLh1%-@DHqwm*0N|0nbN7V9_LzdincN9Nn?<(?!?u5CSQB*%P3{CaN>HY3nsU=EjXBLd8pI;&~+v+ zsgHlB|9bAaZd#Jc?Z&nTm(tZWK3NAl@!r3$<>h;5OZ|Ee%lX$$rpROnEIsrpLvWd< zoxk{|b{(B~4wIBfZfx|@J~oBlgd_Y!=r^C) zr)RXqw(QIMNthh&e!k$=i^s6Kq3g%U1II?VK&P{r^=nJp^pOX9gr#m{m3f|nv zaVc-L!ll^;7u05XWIWiAWap9et9g3MahHmFA0!NqUOm8ZXyP{e?AR0GGk1O0h>?~v z?X1&Z`m@$?iL8W|h3c~7(FStOneESSb?xLT{a&4Rb+)izMuN^omnu&WpCw-twK==@ z{&}zI)56E2HjATp7r*$QGM6(uQaU|mdL*qi?42IP`E#nD(A$No$$3vy1Kka!*=D>^ z`tYQ7Bmbo!LFU7q*Y=tjaP-dpcwSTI)zV|dufkYXtY~CBTB91eEBI=#;z7sd??u^C z6)O@v44XGUJ$ueoNUQ7NhAiW{`$my(WR9-QThr*+s&HxBnklaPpYPlJ;EQeW3f7f8 zJz6Z%`HX=V6Z>>h4fluhEOKIR6J2C$y<9-_;GVasAzu`F6tt2OVlM7cWXtkVU=6ys z=tNJ~A}>xGgAFevW;nb}x);o|FJH2G#e~L*uG^PRI`Uoo+T)E~$0Qg{(pFw*TIEXb@7Eblf_Nk z-en;vwKW&>{P^G9JLb~AyedBSM3SzJZMn0*l;m1|gQ(aeJjv5~{)J0aZZz|~x5z*x z;pX1!vU^<>B*WwrJLHbfa7mPzocQ4Q+IMw__P#&&tKeM_f3<;RpnOtELN@avg9)WE z+eH+`PJA)Hlx^>&+IVuySHrd!ox#gxWcw%f^~g<;RN=iYw@vx;dp~y>Gym=9`~UB& zIr8{fZt0!>@6SC;d(-Em60_y#;leaMj?kFnpVXEdHuB>$Sh&}*L)zM4>DKfECG#ER zdX99mweH;X{ws^!uHEwr*E9#rYfN0o-d}O;e$pdnqe%rCXBYXhYgMw`+H_90WWf{< zLD9&P6M9P@Ys_Q|&TR5==6PKi^q>7$L4KC(iU&6LESFlZ{&z!nzPrw|DKoDq6|o<6 zyEkKH-KnCBF8}{TU9PCQYg1EES$pe_&6~d0)9>EiSNXsE`;D5a8~1ar|LWiU_1ovy z>(|X%pPw(C9{-x>#gEG$%fA2ok+|71=RNE14?li=*ku0y??eCD@@3`Kz2ENrefI0a zpI@8mZ^_EWHBFxJp+xAn_1)mG-^b7MuWtYQF?Db5z5g#?|KIiR@b>>dKAZ2~<&{wP z{nrmm*1G!I+#`FoDO_iJa;u>tb90{QT=nlatE#WoZ2zD5J+=PM*}rBJ{`_0@^Yc6J z;Ig-Z^Y%+aQy7I4}13Q*m3v%UDMT9m;d$N{PV-vzt3J?ez*I%|5@Mv_rt+6)?mzzg`r)$guKyGN z*8KQ#yZdza>2mc_vClt0=@tFdGd`5KW8%AlpXW-OPL~_|*3ZyN`4GI1;jGQSg2ux5 zeXBL=I~C*ib)WhEX%S~xi_7Jj&6YMc^0W8<`Sks~|L%77T$kwI&mJe1SMR^LtG@2f z+tzQp-v9eu{y(Q~;o{Ps|LSiU7lhtzSYNw8A^PCev$A`y{%y)DJl%RnVCpyS55?DA z57^JV=k(={kJ{;&MA=k~kz-)=v9y7OkRs+6pYNxs(_mdkaI zAHRL~?rAY|c{?}nwrsn+`T6Dlz5aiiy?y)k`PN#q+uNV(&sy>C`hv;xpmoOsk1Bw=}y9RKkC-Yvh_^8W^0X+a@#xOI zAm7yvj;@}%zn^{ycQ5@VST~pBtGvzKl*qmRY+v8tbf2}{W3}*)?BfTNH*eY1{8G?G zP2K*?x?4$Rb9aUJ9^3Nw;a>af%IR;Di#G{>~HK=2lub#?hD;`&Qc6ni7_F>g79^Mz-8PFAEE9%l>oSs_|j7)!#aYtFNa!a_4@3wtxDh zQ**2oHr&~DFH>-P%(eIDd!HO-wz~5A)Q$NaOV6$PE_)zQ=)8KK#Ewrpf3|V-3j z+H0reqoRA<_u^UXf~Q*ZbCydkdggDk{>3WgU6%u=q;;w<3F)=dTQ+&gY@HeU4BzMO z%DVbePq@kLq|WokzIQ@DVnX$2S8Y5lYx{X+obSw@|H0w~>!V$NSyU|HOPiJXEN!;# z*Uh}oW_`50G^f~k_7a8jy`7&OW_hUZ+kC_R@qq{5`&i0%K6Dk0eP#0`P^Fyz{b8#& zwNEY-I#+2dOMIaDt?ogm#9o~y)u*958&)rqKKgUkMROIVH?KcWSDGBL__Nz;n~Nv5 zaIRasaCe)i#(&Mt*B1V2a}t-DHs}7=j@rSj&0X>}Ec=6bJ?{8jaY;a_J0r)umcff@OGt_dV8cw;Bf;c!6msAr#?8^_Ua zua(YUe!Y3~)vT*Cj+=7qZLJCS>L8V=*O8_MhX6 z+PQZd&vk2W${GnQnLDOZ`5V$$4vM-xi%&d2QF$zuyGr z?%Zm3|MA9aZ*BRuyt(!(sozC+?|nVX$rqyH-_@>PbM@Y#Ls9W>Ynv0&75guVh3qzv zW1PVvp>NTw(!?7mom`Tgyu`((dfgMop!k~Aj*B@iYsVXJez2%}%JV(nERBrBg97K8 zzmUsl*jMF!?U>DlLqFE7FxbX+&q=mp3Ws??(X^I@A4IEnJJ$Y_eaN?+%Sk1~XKIg; z*msYsp(_n8_xQnsDA2L3xb2bTI6Km6zXM@~g`<)UeAR_x46CM>XIyF4Xb+01g4 zUd>|j1-(~JbwvEtx$@lNW?Mth!G^>so32|<@_Ih?+gtbWp9M_k6R-N49Fsa>lI9g! z<)Aq^w&<}tbQLLGA# zGc5=RSa!c_)9N2jKlfv+lk;XQR!ENf94gxEWIVB&d!Lvn zLrmQBruR0F{fzHqL`q%?uHO3O2A8v^P~Mj4?T=LK&bqb;@*h+ymgxHII^z{XN`1w; z&F3$iALU>(JMiqX{ff_D{|n?W z)HzYp@8kJ*)e~JN<@`gf?%AjO8FzP-?(Gj>wkl%NjHsTuZnkqu0~FW9*VVeV7wONh zGhU>((WKhd@Ascl%c}PR*Xx%=NBiG45UI8zdYw_5d5|v zdaiQM*Ns;focYb`w)6WYt?oxcFIF7SZ4~bH-P^Hr>)9g@}6AKl@i#zDWW+waN~}u^tB5m&oW39i}J=V@_b!zskGvf)PjSv-bHyED_whR z>XOr`u|kjBsbd$=t1gGe`4{H&tCs#c&sO7;ET2&vX(8}%|EKba z$ENVlS$^Q{ehnwbcPhK)AFuD0I5FqOGS!!DVvUpf1&%szIL6VYn^2<3a7xwnUJctb z-rABgVh-mwpKO+3Q!SjN*`yt7B;j^Ug0p2&KmQe0Gs%0`iVM6pOmX_kv6U;OSh=|% zEA31d&j%5a&ukJ})7Yz53cK%p-y~yG`NDhZ3H}2`DsdGz{3^S;lkXpMP7vDmV*OKP z8Ky5Glcc*mZmsUqkrHSwaN^sW)>P@wl- zZdJ@%qJ?IrbHWqU=Fk5@#8iRTA# z^^}dp_KMb@mVc-^)4Fx)v*okra9mRFlu%n9By-}wUP6K2--lz830ap#B(=Uaei_Xdb5=1=)5Ub1pjh(*bKSx4eEBMbP!RR|Lx80b0_U2Q`r?{_Vd z(%ftin|)lZ)&8ZgE*=$ii7?;(>F3GL!h*63yRxO%ipiPE+eusz4z9U=fBm$* z3CC;eIJ)dFsR{n<(p~nWNTIEL{qC%<4*zc%RGyHKJGX1+%C#BIGaCyGPd?y~In2ou z^tj?w|Lt6#;^x#N%cPIyJ>p+mafCUoP0zgDS$<#SkvSTLv6p*fPUp=R6L^1qPwDj8 zv)-G{{ax8JoqK;{e*yCi3+AkEI;V|eC)(L3Z994E?XABy=XcDp>HKrRrvBKG$~1*X z7N?(E-}w}E@6D_4$#R+~kwYEjK8-u*dCy+RE=csyq)G$c5jTDA61 zYJO7v6Q-RE`rGc>RtPcV-duN=zwtrBuI0;@-#1=xBYdu8^6m6v|JZlCy>x7^30`r# zbZ4@U>DecL5@)YsJ*R)u^HNp&hCl2d67%O5o$$W*X@>LCCu=wCe|VqS`<~{Nz%bEj zjtw>n0TTQ6gq+*v_0&Q;__*$4=3v{9r=7F%Blo1--%@dMU*gB0pVy9_j{R|neeq=V zRr@1#r_>&f()fKRN<&$#zEC&B@!@|imYrfb;=wo7yI0QaF4>vuqdv`atLfhKRmoT9 zzN)IvDJ)(zQ_Nh=sv_X_gZSr4^<2zltVIh}tx4xQd+)-E-6v+BC^h)rHP_+CrwLb> z=OjL4*d2SeFvL4F_wJAVmWMTLgkI-~@XcO!_3SR6s7hC?R8mJ&#ZI09CXIPGvc|7 zkCw(v_FHUxG9o*fAKgm5KK=M&?M#<<&k}?SPuoAMVB(t6v&Z=Dy;F}DemeL*=YQlE zxsZ?dr~i=EeWLwBqpqGy_;22f;#{#ceHAjN7gsy`hRQ1%&O2?j{GgOf=jjto+IsQT z3F{TE#FfZtTJDt#V3xJn_)~aFv+Hd8Wc^wB|Ni8*zENc{Xm9rVpHZi8bCXeL>ZHR* z;zYZqKI^lpZ*LEiko)79JyWQJy)Nn5#W>qMQ@_jQGnW)Tey?m0n4s-F|{a@6+yzbeXc9ozbza&=~&anCw)XumzKAC&zk!iIn_!Km!%~zHF^6JT) zxtpf%@9C?z+G~~ke73z?`tj-N{qpwjo@8^0DKBX_@La@pL8YL8@q;ouS(!$TrCZ(w zzuV04MB3zRxxu!N$M%V<)f{}Vnp^jVq)PUQ9rm_GwW(67hBK6JpL=`7rfbfn$&B+Z zR5+9ytIIx`uF&%3dglR=GaD9g7|&$l6rPr_DMYE7(Ywivt066_kjzaG$(v) zuW6d7v(P!J>fP_0a)o0N%=uF4s)@pEMN^pgpvs^zp>SEFWMTfO!I3oi%T;)%v>9ws}}S1j^Vq!6`gz&fJ*ctn9fi>{;Ty9(%rhx)-<~ zu*^?%Vf%M)ajW`6HHA$_eYc#wQ1`4MNwE60;k>mfehL}_d}gb9?V|ISoZocdq3ov4 zrp$GdpB#DDnW(m0lUwoI0+l5$YInFgT$X0N>%47rx5ME_gW|0kpPQajtUQ^-3fY1+ zGsJ}YC;O=#y<*XOa6zF|^Q;giuSI6b5h9Btd_Epfbu`^r@mcWlsg%zLzZd%*pUuzd zaet1o%K3-oM$y-+eM4T&3Y>gdqv?#8j7wDIi5b0DiX@*-&B&X|>%#m{)?n&>f1{70 zNrmrs^_na`#CwKO)bY~!P30}F0<-svMQlpgE-ODlgDY*`cG;Z{5&R#SG!18zioM$Y z<;g=ct{ZbJwk_JT_>G#aeRkTRNEW|WVw*3NvIK2wIx?H7d&Rkz&IHx8@2&Md ze|JLn15c&T9qRr|X0o0W7yO#eDAH(rs!*bN_3`BG9Ez8?m^%MXIlhDS?WtEfAO6-V zU7G%QlI8y6ajG#!2GhSX9cPz*dGB;#YEjcB#yM~MWDVa}F}mc3c^_I7ZCM??Gx(9g zG6zOyb%D*TlP&5vzKJO`IZW6vC3Txq!_DUBHkMuL-r{YhI>zFU=KlTAJ}2ncl1FDX zK08Ql|0Bul#56@petufhidjESP2^o!RuwFCbZh$^u@%jXr$i%C1bjlgwx@m04CctS zyRnvo=e!tWtK!kR722y+mNMN8oHr@!)XMPNU8x6_DOO*6k)`DpP-c@|rr$bobx-ow zSIN=GuH9g=5%g~h(K#%>svz^@mCVC0R;v`I<-|MLs0y?vB=pWn*!xpp$D-CLjj_tE zuQSi`F^ecMM5<(#$8Olyw2)h4V)IIdc_$7me&x5+JvZgd#cbu(X`fGA|7hEFY~G8q z-BW)$^KB`6bgB85MO&!+@sQcaC%)OU_%p-rrsnVos*w|SELd~k=H681-z)zMFa)$Y zs)h?XSv0;rqQ_Rw8Z&p-zPRP<^4~7f<7(VF-#_NoUvH1s*F86LIX85)KRJ5HljGLA ziho+uZb!x0L{@UnTNvRgI?2m`d&kk1Q_A(m$7Z$YTU?kP-6Xb2N+s;QC}ZU^Gk)cq z=;nQ0F0q$isbu|)?e&|xLwu?kq>?WQ+ z>y2OT*tZ~oXU5^vj~AAIf3MDcCQUJM;fo5@8+N7jw=5>aZcl5AJso1$mCtkHU)Q1q zm2BItHS93Bc)9&-!meaCx5Ez2H48RA-t>Xb#%rtC1093Zn>8~W11|JzTjy|W!3v*A zHy4~qs5$Rs^G!M4_lBI-Y3550tO^e9Zt(PX=bP2OO}b5wDdUd#LM4qOdP*@xT?Jmw z=gj4k#aZ+i^fo1YE^J%R)LeM}&(3vHR@3S(pPyvDKY~GI@1NNpR1H=ZJbbC9XTe|f zd9`MdPSf4eckY|(ZkjOr%N)GFUgUb|bLXj1?-qB;C#a;Z4%?b|!T2B>*ZaSMF1nKo zBo|)4ywv}Ph~C*7hnBwT-BA|0==0C`wHfl8P3{&?xwK?*(G@ek+$S2f(=5E!+XOb< zI&dXiPQ}=rv1R3tMP@U06!PR~YfHKQ>MS;4`aIEsYt0X9_Nuj$e2O+DeBm#!8I? zwntx|VR~@E-g1ZdEVIoYz3#}La_)MUC7CE@GqbpyHEculqL=eme?8^vxMGEf>w`xX z0c=ZCW++-5d3~Q z_;iO&MrQ3ZtpjH#ccrUks2St}6Le)qVW+tSi>$|HmgsOH~`m= zNBU;_ef@T5M!(*y4fFfr=ErRIe{3H8LELri^ySkV{yh3Lo$KG`$FCoM?!LY|;I{4x z?(@HXeR}lFm-X%I)3eR<%M`B8x;~*r-&?G2{`~nN6P!+;{P|OFjT`qhrJjXnzh=EF zEZo|?dDhjY%^NhIFJHWQ)rQAC5fq>cEkU!on7>j^RwJvZ7*1wZ!X<0_>PbN=55=LON^AZusfICzA3zY zZtUT$Clvl|-g?YMczbI5?N+}G*)XqZrZr*Q%-)f;Sx46|@stZ=(~x}qa9v>3l&e}( zzD`P>DUdCCRd9tY^QyT&e(U~-7P@r1Wm@~v{U0|RHLa4$vCoy<>8j(!c{+E}zRh#3k^#hF_h zt5-TL^jx^eclnmo+kfR+({FHpIr=R5`SH9zmOGIcsbJa!K76<67+e?GiMXy&1XHD*6A*Eo1a zZk)1)#dT_^XH@8-xAT}^m+tV`x7_#_gNup&t+X#%-|szpd@k$cQK77RE1%7L&>3`Y zT~GRR^Yg2d-W<+RT)l4Rj@>)+)}`lbYkiuRyeGv*pvXq|$sF~|8OHIOgCidp{Is2T zmG6H~*RshcEK}F5$=_vRaq@9l|F^2+8M{>5jn8-`&AEE~?F-uvU-qtJ%dq**XMFc{ zwf7mr^ZVwy*zEUm+;>WOX}rray|nQ2GmR$R@jv=B{Z`{K4(0}d7ws`2CTBP13H_QE zndcpO`OB}rhcAe$`u=lXo$=+rj!2ZsN1I3;rRAl+5A0%2xXXUi*+3_U^LkNp&Dz;J zPo85=c+Qw1a(|k9m38zvbMC-?uZ|lR9-D}Ya#c@dN~vAO&1k#Jfj=O6?p~KjlfcTO z{vU%yf>{g=pDPO{8pcj#+9@YIT~6*o^X;z^swE*4@4CJg&zXMl+x^$Kzx};g!@uOD zkxWKVYS>iHExTteJhq`xkI{kg_+ytB$K!0wE-6}npOTdMo0CDrp2M`l(dp>(gJG}c zvE`V?I5_QKSktl~`;g|j-RF1KiJx0yD;~%3VT;?#tyv*_sSgi+61lr#R>eC$}wRW{9=?=xTNH--&;+wi9;NJZ(@|pLK%o z@>Xl%>*tv3!>s?C@)Xwoo@aXJ{^rk2-x>6u=*_eJJ%M+h06f2$c`4zK- zypGbYyOxE&xBk)A3Yn3|I3)7`HSH1Rl zot-WeGHI<-{mSNIxrW)iOzQ3RH@f|Go}9hZBdT1w$Ni_+gT;4#pV%-%1cH6zJmZYx;x%|SYw$Dq`ckQ&On=5v!9p+uDC+@rXi#(`ASrY4;zt}+F zuXapW^^IPsD7)(Dt<$}(uF6`ky>^a6^t6Osg+VL-FaN9hGx@dT?S#V?8(uEWI&r{; zcV2trcNyVAr>PoJvPV-6YlWVjqZN8~W#}TgB|S+_>{n}d-pgmT+4^bP%YADMpR^dc ze&lgDxxweQqS`LM+lK3QZrCKbp=j6hiqq*^Vz;h4eYAeM_P!a%MBVS*d%e(i>wNBf zyHqG{S#|qbv;V=vmZg(Y?;lq6S#`Gl+L~F@3oeJvJKVo6hRwP4ka(fX+zYF%?liwh zo#4pQczXT2)DxEuy>nZCD|cbfa-&_{Z@IEHXH?zVYPRg!>qGmiBNDa+C$nn1*Znxm z@pI~5kAIbS>s!)3QH<|*DOC3=%UbZ*pc}_662(v0JVl`)gQPTmS4I! zx2$>JwTBtm8r`Gu~pkPNMTt9sRjXQj>G(nnGKsg^y3njyP$ESkRVY-IhvL!I?t zMn7yXueti+bg@)WliMd9t0ul{{+DuB zwCYYiFpvK|Z-r5T{-6RuGkqUu|8#RXmh!|NydiB$>{-yp z%R13~hYQ}^TQZZa-){I^c5B0Dy{xrM;{FJGoZPT4B0fRitZqrl>CPwXwlCV`Gi#yi z#An|%quhQw?atP*lCD^tt>B{2*17hAZY_uP=U2?Lnj$LeH%651Fj-YCcX36>t2meS zJ>}V%=Yu{jyLUh8*%AZJrIyDv^TVc}mN}k%GG4gl!{Tk$I_2EupV`+f)t@CW#q)Gg z?8nn>rcQ^H z)*?#9TDEuB*Bn$aDw%Dt`0+EwIR~2NuCVUeII)mz(dm=otmgv@?7E-%ELWNOb)nTa znbi!M!R22Us>v44xV$;+YD)aI&l>f7wQl!c%yEcs=y++A=k3yBu!GTlE@vm>(H8>3 zM{HNM-!rM2&ggib%dMtG`uGx&OxC7a!RXpJo7hiz4^wZMcNMyO?CVH&JKkY*u`Qi)W7NHh*P)fdQ-T2sgF#9j{g$#4Q@R5Jo6$BJW^5p+1pFTfk{uzGF&-j+`KcNI&dDaJh+%e?} z{0qLHeetoFYuc(=mlMjDKRNt6$3AU((YL~uA4a<)ZgkIB<>4dpOLMMMv6o0@@N>@D zecnm>feXx^Y5dUA5q+>cSXTF=*mJ$e14ny~MNZifRuPlA;9kl+-_NccGAEBu<@_xB zzGPq7Het)Ydj}3)zj(i?WX3kWRZ9f|^ZEH1%I%npUb8HE-d|>Ck_&vOF zjq}&i;Hlbo4b*o2{rzh-XVB5&*sjn^tlhhRUXS|lL&18kOJ>6&akF(x9Sf&#-|N^T zr>0UG^V~#4qsTOrrJaexWln#8M%C$~-hbWg?`{rUb?efh({3SdrL}8+c${d+D!3xJ zSMgQLuEv$c0{3?5{{5j*_0D&{>8ezDG0ENYHl;?*?n@K6l%VbE6m&lHp4#GqO568$ z8*=$WL<+OHn|}ASBwf4YJX6hR%buB6J-GWS{>X0dd1o2^soXPj*TN2Q!yR`Ry1hF- zo9Ejc`epU4$%K)>YF|R${xq=1c?Id$va}pIBbWzmjZGcxkfr zAMkl4Yhq9K-7ypRE2`+g%xQ3}<5twE7+z^Ri4#Yct8`c@@4P!>+pUbuv-{rmUBdw&_L_db~J zaZYEVVh;09<##=Qid?=vT|DQ}M*d9=IbRx?11829?fJX*a`&-_xgNFe<}O_<^K?(Z z(Kj0X6Mnb-lDP4v;PWcagRbU&&+D)H++3BfxMr5-%P$8{S5(ZIW$wXmcrUDc*EFpy zp*tJDc6Dv>6Jy$IdrI};jgWGeLt1Yooo^{g=5!{l?!U5dRwR#-OqB7m{Y%fxT*1du zsuwa%X4U)qv#*y_dtTns$TEA??wrN_PQMqZMa8Aqn2IMpOJ6%bu`=lSBfb>>YVoyC z%a?jQIy^Z@^VPoG)oJ%m_J!Dg@%{Jl{5q2}w|~gZ-nW1Dg1V|>nk(FnY@2lT&~j1k z7{|1ukJp`wOk7cPe%0rzPB)A+N>6IcmR{>0Vld&&zFQg@1#`6wvtA`>WZYCgFRi*n zdRaj7k%#tEz2=lOS_Bw2-4|VCuRrzFjM*je*M<7$>k78H3(eI%IQ2nVc6zl)>mG^1 zcX|3pn9|k+YoD8tIJ>^^-C~i?E)Fg-!WZWC^q%zm+R(GKAR_;?rp69Nw`mEH^55b& z)_ycGdAn^^`w8i(E^~AqY~FriTj6bmw|5Uu7rI)M{=(Y3%GZB))|Jb>?MteUe3D@= zd=)-1;nR+`2!k4rWs5&A@lxs!Ioe~}Ui3AY`LW5*5AVL7{B);&^FgT;#@l~>Y(K>H zW|x)sq8ZaQIQ=KSc>7hQs(PZ!9>G|ZMHY^WrvH6dcqC-K>U^6!;kn5bZ&@da{Ry0z z@+R;nm)5?Ale|@pW~NQtU+$rN{`kB$!~VJ53*^sFQjK@N-177HFJ%7a#j&&*=vKnOWa@ z<{#eqt)RCjxvgX3t(VqPw|6P;eOo8L;K%dz$#ts_FFiB0H}}G2buPmokyHB)B>P0X zZ;B|s&iVY9P-9$rPkM52-Wi_kSB*LnCuSY~d)0TF>#AuvOHIBQ{kS>B_JXFg$>hJh zFBg^_W}IJkx%bEPTJJ`g<9{1Ye3PwQ5>>tA)Ow|>tW7@_JeOnD_m_Ne+jp=1musS0 z(YGeuTX|M+NkZ_y$7vnW`^}72)U*XkyP55MQ?1+@wqA4cM)CTC)i+p<+Eu<0HDE7! zwn}`H&7F+GlJUo53#_E-#-s$uAatf$8oa4CBzv@bWCfRx9y+u zL~HXbk@Ppu`dp@1-d6VeJ%4-g?JlNEEUSAhPZTL{U#HVBS^i>4T%3^Vp2?P8ZLUVU zX7km~IK9C{dD^LItN$k@$BQW6TqqZ{SbkkuT*{s_SyiP%h0A;XCWfER|cX3BvT0Q!GYHp%jpjg|xGQ}JFHhFw-o^kxnu7by0KlcSay!Rk8WXJ8v z6W(j5^35{;`|@wd<<*TYCw)!NPtKU|{c`i~iCHHuXz!Sw#Ka-6+elh<(KD@w8~Ii- z&8+2amcM&yQPczXiNW(ro;~~+%&olQ%B2q5;17^i)126|eX|V&>ZXP+UA0O?il^m3 z*xoMznfkFSgRY+T5}Ym2WX5>J-|Qy)Ywj;cUrEkR==ZJr*2ZRIHlLk;Tlyc~g9o3_ z{;+P<;o`mPml&7^RVH7vzO!g5*QHGt=C;Ufn07X8azmz%$B7hfxRV3?=FAaamv_^BiFEK?(gN*jyp5L+*Uikvx;VY zvGwTx_NbErMLvccz7bE(DYvSA(m(vj;=-kQ6WwG&=ZY*(v3~Mr^J6AeOCzN(5|7qg zHM-uI^zERoz{I)@i%sWCDpl5q2>vcH%Q0Q_wEAMxr0|7TSISRfo15sg^v4_*RW7f^ z+l;^0IIDzbX-GL1tbKbR#hyLv!R#~7TK&}&wCr=&o6gz1B7T#!^}DhOO4mhxhD~^} zQRCdwI+r6n1z+mkC|dO&lXx|~LE`XTKG!oofeHQg(%bJoHGQwMkH6;3wMiNud?%J( z;kGTG71vu}|gHC5MfDlfQ&k3vax6R8(K?Ja4{;`^6otbL?8|%gy*L&C(8BKEmBUi>r8M z`l%oO7q|9SO*fvRyQSY)`RyFTV6kK2+dp4x3^yyxVJVoPeB=QiXN<1-j5RAdOtLLB z%lA$z*&Zmu@Sbb_4wshlrT$Pu7nVMd%Y!Zb?&88AJ+QKna1I5EtzvL=kuDs3siiW zR^H(|bk$g8;mPeOvX2%XSW$f-W%{}Xb_u=y!S7<@tNl6e zngxWH+&iT-cORoT`!WVY*BSbT!ahHa%`W{pabfl|-ecbkYE6utmiO1bQd)GXsp8Nx zz2j3W?cy{~{PX(xK5^fpWs?tfopsOMq*SDOQn$2k(LJGv!slVS%RR5>iN#KocbO2T z-tNk=rEanZ4Qf z=)UQ(&$pKNu$ABBYWc==?}xr1i&2C4eg55jxATg&pWNK5r@Y@aV4b$Yipf*{d@uKJ zO^=)SWoO-K`}=RMpB4NvyXIIy@%$?n4e<(ah6(_GxGE$;#ixFY0G4e^@ln{lwoLyq_ftV%Fxc zMu!BPoacYjs$0^oY~>jtiK#t-?GkQ_oaZ`9Hl7u34|7@Y_{rrXD^)tP)F-X@Ceu0D zN$A;!B_|f_R%9 zm;2e2*zBF{*D5=>oz|(JcrE?7w!L`a&Gp;&hflcRb@-%Rn7iG#iZ;s~?{Wenmm4xE zH|q6DK3H=8M%g*Bb!zw4Y&@}i;@!2KcitLb{+}$z?uf$}PIErRDe)i-H@S|Eg}d{`#=1P^=501BPHUZEI&YU-z*VMi^&nB+ zT0!Q!K~QwhwX;GZRa2fE;{X0EYNfx&=|v$%jkEeW&0bsI@sqo%DJXW~WsmBdpI%>G z$`zY*yY8H=6S#VL>C07p1+w?$a()ODbJ}&}>0SHNQ6xFxgO%$Fq4eYIi!OB=XyorZREho$Q#g+2YPBl#BiI~hQxOr)I%bo}OEbd)= zvEsk|%)fWeaTUK5omM7zqtol4c+%zPF041$HU~B`ZO z)Re@hUMF^H{*T~i+tB!+q`D;Zp@^t`Y0Td<>qX!4t4}HDdJ!96XQw@((j~EF)+g@n zKQEW8u5O}jcOcV2rA97S2?B6xRdI$zEzb6U(4uC$=o;(RiIYX#mLDh- z6^NX%$2~ayRB)`!szsLWidH3}&1b81)N9xL@e}gMbQAW-Jm$0{i&0ke2DgC3bw!JV z!mVE)-8dqeYm#OJ%Ku2UG)QCEaAiW^Hty$Jz8$+Ny2EH{ z^}ld0AL(P}?2olgFHUCnaQ{(x&b&qE+MM^rI|?8Do{;x5;ikn2``TJ`$}b_AK8a1)jR8whi6}n>DH>`DaN?p8M?|yEpeG zr`6WEnyEE4w|{6Z6{%cZF1YTpji&P2lFeCKhoWAK&6?vhIZ|Wq>5H3J2XFYZTS4!+ zuwUkcn-UH0ShhapeiWcz`QFM}>bZmdBL>Glfpd53Wy`)><*418_xrbM`yH>f>5C#h zK2F%Mo^!zt1$e`PxbnE}SiIx2fU8Ts@dl^eJ@)g*x|0XXxz+ZGO*FEfrS$sI z^__txs_Y4~l`e~=Or0Jswg2Ya(uJ&ZLiq(xOE1;fQ@nhG+~a^WiOfIViHwDwd{!K0 zR+HWMZ{{=EPnjE--((ia&m7YzB=BDHycF^{`PYU>HxZsq36lkf9(^j$wc+aPLR&9g5I zTG?~^4*i?(>(;tLM(d5qd5<2pW!Gt#cDDFEi#e6rcSHP2a=6zz4t>RG=W2>RAAIt9 z%aj+p86O847&Ezr_h{d|MZiLf$w9k(qy>B!4SDArkUpkjXDY*E78X`!b=}9T zpxJnW-q}l+3#?LIFZgzPzFKrjpm6REhFF$)XX1=@N>4VsGA(euaENUW-+~zJ6441> zX}2eO+uYL&>dhDKSeWU4T#e;&)|qRsvb!%!x<0<0q4QnKzfSRN-}Xh{4xdZg9bL(q zmYkV(TJhEN>-UzlMr`-#y`fV7jQeSl}SaPp{+idCyIKyYTSg#JKb)CG8BHmd}3+Wmo9cJ#f7J^@C7Jg`?{~ zCw18`8oche-wQ1|aW{Gg*W$Ca+fVP>*7&YqZtnWjGQ;yTY@e+;em_X5-rQ=zWiv<$ zWpeYbO5!uP)lfD?ZSmb*kNC4DHl5Qy(X4gCZC?@VdRCU0h7*d4uAL`W{_;GqXF}`* zeji&dRaXu5O>E5Bhm{J<_1=D%G-r;BQjWP=iuENAtqf&VuZyihEBpK$U5>8eRFoE6 zo4I{X&4*<=tR4Bm+79V_i`aHY`>7fvKVNWW>I36h4R29ErL=zE7M$#Dfvuf+S#KmQk!kB zx_^TFhyK!YZ(27`IlA<>T1Nh6@pJFqoSSo5&N^@QuM;v${VI-7P;2xjjTYQA`(W4(J7hk&i2Nv#55%2wz zv!Ii~=G$Va4=-EFj6W_Yntc2!-+`^O-TRH3|J5Fu&%EW0$&L4A(<5(heV`r1XC%9z zcG*JS+*^6-->)*uX+5~{%BeGTaX+tm--gXsU;V5$T=Mrqnb};fZFh?H9~W-?$8)bj zXXg}=YR`pj&ek(`l$!C%Z#Q2s^TIdPANuv0+_&~htzY=O{$=v}OAo(r$!7R%Fv&Hx zy0N@I?cc4Py{iwcI#lt)itBAs)1uR77Y8ZW-8O%9bfrm@-u4+5&T6Jxj-H%uujzVo z#RQ3-kLDqL7bL5n{qEe)z}~l?_tAE#3ke>Mo^_k9+Wua9dD_;~Uozvn6eldY}g7T7IE%7f_X&sy#U^8cm%kvA*mo5B#MrR3gdeb~k{&O-Gb9X&x z^6po@!*Z~DOTcHvyB51&<Z2!r{`gP)VEy%TKT|*N1cO&=zrMQUSy7@O-^%yIJ+``fRkowy6ET^5 zxqkk)Kd#GMV-7tV+ixdwEBm(FpQRP4(pw!J^tNtOh%w_^yZl$!-u0)Ji_7k^)3o~Z zHffWKx2eO%bI$TF{~Y4|+HG5P`~KnycU595bSQWV+js4S;xcFa(&Ftr5wmxsY^yCdPiL68sZIUMVbkLw*V>ad zuRX=|u)|G%n)I>dJ~K4fHg*|o6E@^GU$1rDk2z-V=P9fP#q5?R?)};0+Mv4Ty6zku z?%bLvqcnyix6dpxJJuuawoUT+&7(J;vM}4ueAF)SQaJhQ-b5eks4dl|R|6OQi@41B zF-Bfwt7g5d=~lC82kj2OPyPLN;W-o5yfbPW-TI%s*}A7jA$pHY5rw6SkiPx^X;n1&pKdSxfm= zYD`l6_x;=6xmRy?t%#0Lwvf+1e*J^mcg^zep(~f&nS5)@+KgQv<>eCF7cKdFzUbTY zi$O2fY+uf&sP1DO!V~b2Q@O_0&*GX|ckEsBZ4%#1l5eli>kMxz^h{VKU$aMAysEh2 z=+cRWl9N1=Shgumh&e0T?i!kP>ul)NrP=3a|ZW>nHmO9Cp4iWm0K|{+#84je9FEM)@7tu$S@4GL;ks<7MF+H?laK zmtCtH%EA9%Qmf{;ni^B^k$$&rB6aEP0UQkv%PscBpORmno%WOW>X(3L?ED$#UjKh@ z^Uy0>oL;r?Vrba9yNq8AxAH3b+c;_;7qKzk%DMJ?w{gF~`|#O6PtKnc3z^QFn(%yq z$86oT6TKV18s*$*h-;I*8|7=N{!PF-xA;Zw`7Povx_jkU%6k>|nwjTs73p4d;{9S3 zq0$-A+ape#zG2_+NbUcE%!t%aXXl(jp7hWB z9luA3mEo|8*u6GIg~t6o&lPXg*aRnBKY0 zc%Ap2@D&w1Zz&2_fVy-Nt0dMwp^{X|GD?IMZo?=ar!q;6tX;#?p;_t&B{3SvG}UZE=PMVoR^vQ;*YYN zP`i;qvSsdyO_`U&HD_3a=>OL`H=%F#Vg6lxwALtFU?Tdw7ud1-w9`7 zd#xEqU6ZnzKM8EL)?K#TBE2&3%*O>+^k&=(auj{n`t?krar;Huqa!>Rs=+|EC1L8_FH; z%AI(2XYTE9oAO_9F|XOGmw!t(Il*Ky|C~0>p2;>=m99trhcnvbZDlFuc*(HDgp7~{%w@;BQjg+)%5b$5)}x#8^E z?|dbTE(e;eKP9p9Vx{i?Cq3DP)1<@scei&uEti-$W06(iqJ;e3^^Xk{VqZk%XnBW+ zUkI$fQjxW)<=5-AzLN?%tz%DR9jZL-`CU7S)A#Jwb2;`}Zlzi8yuY7%5dSYPUUv8X zlqWBnzpvgVoYthTu;W~sWT%;6%ZiuvKc4NdUVrte#+%yS#U?X48uk@r%$@f7@itbD zk5@W1efMp(*OJ@2d2;WS)l%zN6uJT*csU3i{o(j-`Wf!XklRA*MZ6MS{@bn4y}vx} zTEMnl`?rZ^ZRlH*abbyc%Dj|0kGc}9SF2id=PcB#KWllUWr=%6@ub}!A6r+&PWpV) zbywWXgNu&qd^>q`8-Jy+gsI1al-zd-o^!0Db{+6)czLMd$KlwpVtxaMCyyQK_bs2< zv~1hz`%QipwadBKcxraNIG%LW9Ve3CMr3LD4?%f-~9jI)h{d?))cn*|{#EEhc-X z;dvRBPoD)GCWT&1;dDLmI`qT0BNe89-e1x9sDC;j@zP{wuEfsllE!@t=HC6RF?a6j z+V3H4JB{)M93H%S;T!wx$m+WbrlfJ$ohrID#l$Q}MQZ`p3H|xV88vHM1 zuAi(2w`Zrs9?S!k!=nAUNwcmjTktg@*LU_ZH-F#rEE%e<1{spaX{tY^7$*S+}2s=qF- zYhA=7_eg_N7d{=o)aa7xw6v+`ZRWmKq1`K^R$Ho@=kH>OQY(McpA|64yYTI-gREQm zCU1)CF*NvciQyafu7E8&CuW=#-y6}ld&3p~>mFha3xquu?|RInx%I#z_kcfanN@8^ zCyU;E`h|a%!o9m4H9oHo>@VwDxGDd0mK{sR%&z)&bB3bhk#85~HE%fKYj^wkujHK- zQS0X4@Ao-mWEt})CToM5ZO%Wd`e@nZc_BXzC@xXB%g+AryXw0|YyWwO-#;SajEY$b_iPZWY@IWUamjw zUTfZ-Vkdm3;@F-3H}hhr7Oob~>|7VM?naJTF~9KK*rz|&w#>e^{@%)qm!G~?+_h!q zwD(6U4*lp+%sF*eo-J(u*#@&YGUm~8^HxqVt-pBY9nVzyI&Fw-yKbQ^Q1C!Z}q%=YfpShGWBp5Fzoa?SyRY5>y5d-izZu< zF2k9CM8Srm*(nCdD!MsBTJb$Okl_v&u^aJDk(Vq`25x@@2>MqunxUEDX-O5d)3)!zv$C4 zkJ&AzuBc#}9$l5=`r78XT5WtZ_p=1nb2FCyasKq>=;ns&lS58g+17h_$oDrdw7p?6<)ILyQw9b8EAPxZqvnsH}A8UcY1jy9GoF|bx(Z2^p~

576z zKA&EJWBXpsI3Rc^^vC)pMGmv2_oF%23#n{aw*Iog_jB>*G$_0F`ZLQ^_#9=SO0g2$R0&TN7Lk6x&p>zV0k zlWo1`*@WwlSSt))ZQp&X%&O%f+sAm{((=;K+W1iR9br3+GWdVI4=~evdFF@V`;}@( z#0@rH%wM$VwSmspH7sXr4j!tUWMi9d{XeqiO8x~G>j0swk7<%ukD09M&FnYx*d#pb zgS&WXXyf_6fyGSCriWH{q)h%7mE{>_wf{r3z1Ji7XO{RXjJEb*cxoZU`tz1)E@ zRu}WHy)g;vX#3zX$@lj5PuA0Io{FXhX$rkq?eWI~vqphzBk#7$ z3P-Fy&N*0R$+{$wsn_;Jeab<})wjiG6`k8+D*IyVu|HE<{0sF2lvI6y+3ww$^=pCwNe#7(_Oy5{Gqkz_mu`E^VRw)NxJVG zt>^PMKAv{VcUr;Y+G5W+Gvay|J1yDv@qWYU)W8X$*IqSSJo38f+{&Jqw42jWL0?$S zOgh-v#xZe=uNEV-ZsHdIx5g~=_O*&7_WO4)S=(*DT)u6Y@YnO=q#J&d z)h5SXOnNn`x~}=!BE8To0WA?;HNp2kuB4Vl@7i_TPH5tZlXufJPd^pCbx>U3=(^|} z4rVvbD~{KA@>O3LN1skitWWNIswwk2UCwl!TepKyQ0Rqf^+^raW?y<;&BHrml>uwR zy6z<$GvB1%@SPH`V7+qpj5IEl`Dup7r$zR>6|FETOUdy)8&J-0OGb_3{;LGWlw1v= zJB9}PLK`a-oxl6{xAYjL`)_LJTmOwi@$PojeKE6Hs^7iqi#uf-7+`G27H77U(=FU~i~>))3>eRd$A?OL`?^~KD_jo#ZU8nO>%3am<9Y4OT6Otm*JXqnJsALWnN zZ#-Twaa#XfrEkSSF6HW%1u`cp*FAOR+|Bf){E5k9UL~J)p`UIKC9KpXGIc|$_P^Y9 zL2n697f*+N@vY`QTaiOD&u%yOL_{8TjGIt@n(zCATa6zCil6aE&*7Af-;2f4<=slVbS%v1iV)Gkf_9vktt?ax!U9?ol)U9umd!X8ZoOlWRoJ&$u4v zZX4Flbf+}Vw1aC`@N%ZQYx*{M97j9mUlo}s{JiOJp7qZM*PnF?%A73Cj5_`P{&Q}w zITQKHRs7Qu`B^Yb@uS*h;hHrrSwXzCsN5CJB()w z#%9ji;}uo1^asbcHwyWce2b>8aOyF;(8sY-`_kSS<{K^)UQpz@-nv-H?b#<4v+2*D z$$U)s$NIJQ{{GyAdo`TGQuE)7A+13e$&K3pd_Uyx?An8PR1Ain!a?Y&GWy0 z4|BLoSf7V;e%!M8)<*}Uf*OPHga6gHou8=a@6r;jaDARc+`7b*?fm)T9lkf>^X#(3 z#isxMvpt4)-A>Lwg*Q&!5n0AHMS4QuuF!L<#QG}cp4ML6anVNV`I*UIS`I&%Tawi~ zXYKosuYddc_b$}WS(1=G_2Alq^tDOs^R8G%85IdsmQFlfc51@z6KXed?{av$&TyM@ zYSs1Ec6GnOaY03gukicJ~zkQ&BXyT`S>4Y|Jd`)f0cJ=QJ&`6 zW3#@Tp0Db1VAkxKn{Q&4XP;gD%(%Mo-GorDu1V7-UHUO4Q*_hgJq*)rCksy5e)?TS z_*HqEdCO8+WZeIEM>)1HYdNf(#a_i}eBn>S*w{Br z(N(sTuKgQLG`v?lZ%#ZaN-wj#Gk50PpSK=HN&?pLaX*q zSURsa%igxsM}+;Z&#@*Q^{7V|I=4zKDpkpyTzN`H^>pr}bT#J{U&a4L`8#c9XbR`M zH+i|8LD2T#!|%mrTiM?I(xAs&@VvDo_wZ}WCWmDGRm!$`JIb%zc;T~>Oh0JXw$~b|Oz}!uy-kydE_@{kgfJQ*hIa zS|=GfMQ{D$2Rr_p`2Jw3=yu!3iC@na-G2T0fo;r%RU4G{g)Ut)Z=>A2nW~}I!G9Mr zDZb!c%rvoj(Z<-vbzn$K{ z{Ppxh_q*#4D*_g-+5PXA{-W3Vy)h3Q8G3Cv%fBi=?Y=s>^zKWOi@d_WJNH^!ZlBO2 zIL+^Z_p*%G82-ziCc7QqUT%ym+46SFkC;;>nxX*)7Q@Gt6aZr>)xmh z4=M_Tp0_EUYK&wG-L11#>}ShaV@G{emiS+h+u4W{#7 z|5PGt_ufmjZ`M-ww-3!%7H_M3y=`~%q3j^V`EQ?}T3)HVt@`M%w0r7_Pp65P-L|d$ z8?syS_Or7$-ideL)||hYFY)3T;qVO!!u*YX!u4AGxqfGOA3F(d~0)cWbUo zJXy4DW=sAvt%_e=wgUp3)lQB`8ro-tWG+v(^0$jmR?d?%F|OxkZex@_K?eK*e)nOMK} zm)W9aeg5Zt&->4{4yU;N%C38nbs zlW#J;&JepH-5==cCG)Y|Cwfls*^J$NYi}9P?7R8kRR-JiMW@?S7H*H$*Xm@}REwEl z8JJ&HcBU-Mee>o640rx4{BHg*K>n?FSBtjYf@e7vR=(2$pM(d7aIY^-FF!La%zg8g zHXiMH{bzraE@Mxfp)qsq%DyyT+aoc`fmbH81-Se1{rAY1vn|WKkZAw>xk3G}T~0sB zJ$CP0cJtc)8EK1GFP4n86e*r*x8%~*ck5?y+dqD*d0_hKCY5W;OtW|DzU5PHPIF$n zSTbunQ+yHg&~M@Ctd)M3EpP68820X+%%p4Yze?90@%SdY z+|c4G^CcmL&gJ#a@>}byEPCp!EH0diKUMW0W#XBa;!39{GJL##_=U$~rI&1~Ssjz# z=2=hVH+VTQovl!Pex_7>-MpOeMR}`N)CTT&kl`3RqjBZ;z^6~FGvCZxC!O>s_>G+0 z8o{ioZqGs|ybGOh?Nge=tU!yIMduwP1*;d_UcJ0J%ys+Rg|jbBvg|u^_~_xMU$;Kh zGyl?lV11|5wZP9D2dmuG-7UAp%t)Q2oaTSmZfdzZ_x8lU&!^X$ymUV%duh4wuazu3{^kt?{7Hf`|z-rTd~AkWepCghdW!NmqbLo%W%=&tbfn-r|jQLpMMm-_uCzA z+I-A^n&%li>yLML?%Lk;K2P*M^YS_Go9~;>{3rI1@5S9;7eY?v_5ZN>K25sj$M1K4 z#sAgI)Ni!Yx!!wx=l>JRsS&MVt6BH?70uHhZc|%L{*N<(l8=*c@Rm zp}$@DeN0VuoN3zQN{rjb3mif=qF77VR z>^6&1i9L2yZ>QEJ-(~#&Udc8`OiYy-?)Qr3o7BbMz43HHk)NZ+z2p6T@1?tp7#A5a z*UmHxJjuDL^Oy9*wL0nSkG}6cF5$BHZBL;x|Kc#Wrl}$)Wr`I~PEhSVqWu4;%|~~R zDSwVA9ev)~>n_u}F~-sUd{^kc@2h8bUtiz;T|jTrTI;IS|5c^pb?@HH>9vqB+M^ho zviBM5o0sOQe0tXZH+WC(c&L!Y)Z?R>oXz08*g$H3ublbf=*wlPlcv3wX5E_CRa-b$ z_tk0j%EwZtQuKE;X%oE!ON@=fSeTR9;N)p$IE+G;>nJMt(yel$${fo=FC1!s%`WKPi^RsmIEn`*YW+OH$DVNC&Hd8ff zq-LtDJ2UC%OD&I*H*rDDoIi3i!_PW}8(vGlrN!qp(@Ave7G-_`zs&TLCpW%O>@u6R zFYd+4l3Uj4J2S&`y4&wGC|};pmwC+e-c{2hmpi@HmzLLl|Mst{sQTmM@2fcP`$pYJ zblLyp?@Tw*HRWEB?fOf4N?*I~IGU+a^6QR4-`2nY<5}lZ-Ij(YTluwz+>Ji;bEDa= zob{o}w(F#_?rTbCUANP%w-ovtEPQG1w^+^Ird4_w2UP#WgNM7%K-YDP>T#@`Enhb& z;oQ`!Tkahp8x_4WJsf6-F15Mv&GlE(*Pi+f9~}y=IQ!2wO{h2Kc|3EYt@G_}$NWc) zjh_>y{XhEu&G!#K7cM?#cC@Mf^PS-2$XzF9OcnZRANYO}8#)O$IuE9#nL?wt7FXC?Jb?;5Y)MDHzeSA&vQb`^hQ z-#EG`Kj%2KkYSl;uTA2 zS=E2OXVs_LM3hgI)A--ncH+nD+ZTUa`uRhOzoyrG-<)I9&mO;C`QY`QkA_nB)9m)` zX5Y8ld|%VC?Q{FzUuC|(T7O^coQpqxX*`|ud*AZx?Bm^~kE{2mJ=w!t^zNQ$tqJFK z>8HCEU$k7O%H`W^@6LW>hwl@eiN`x{UpcPu^kBvug|h*(GV*$5HynQWV!gTl?-QF( z{91mwLh5e)7IE!f<(u_>-}f(E>dr6h@=&)aHu-C)*n*yGX*OPbr+NKNue0ah+44Km zNpvBX)b*4bo(oQutE|eA(^|12kZGMpOzpw{`m!s2_Gi{4sQ>@*xieVvN@0NiL)krx zIrr$Oe(Zb6!M;iKk`iWyEG^;ar?@f`YV zmoxt`hri!~JCjy5=3Xk?&3{#Q7t6z3*?TDyIWGMW){5A{{3y+1`Q%kuOC~RyMO*z+Wl1LwcDgDvE?R{4vC(c((B#c>esttPD`4QLBUp+(#4V~_s*r7 zcb`!ydvP-P(u1U<&PJyDGMz+sC@yT@w!7N%&(6154-fuTj!fsgoD!L|ZlR>f$+cPA z5}20+1w>5T6r)hi8CkY+`~J1+76w;1jCTg8%)IR~i_i1Ty;HZVCQEpGByhac>h?^y zHO(*0$#iXB{((E=Yh>SMJ$CyL>Z5SMK6CBW=~L&6 zM`>(X@Z^dUl^T|30g z$ns6+1C9NwbDlMRESK``Se-s)*4NKD`x~#Q%-)zEzL8Nht!l>A>?KBz9z8wq#58lB z`rhn>ssBz~KK3A>f&DbwJhoob(~B}HZuW)!{>W5i8yCZv^}~r+C@EM~%nTcbDe0>)YDmey%^MTK004=7Oics?vh> zduM$Lexl3Z9@tVVRy$>Hcduq&b{Xqwhh7=p-Bq$tKF5u|Td!`(Ep$%czwkHUm}a4# z|JHy%z0VADg@anyt}YCAn=Km_eK3o8XU_#E2D=wgyGlwT{&}%(<~I!yZg^_wx%Q&! zx|`3!v+VlU=57u?8)R#%)U>p6-`9V(Twe`DEo_(0xSIQ6*5$dmUXOCq{n$7z`Fshv zF>}RFhaYN;neqw0*Klg+8&Cc!FLBMIo0+RZIP>?PUrS96#`KF{xD>FUgY$pD*D2Vihzf6<>bc>6hb{d)*6a;&=j% zERKu2R`0-Hd2N%^Y2njSXDWSEa(g68+Kxr5WL~(!>y`iE$m(y_lO62-=SRM~{m4O3 z_3y_+tk2t?JIeEIfBSm-s5G>a@tL|LI(3`F$JByDPN5 z{M_!et-UGYgNMU>LlG|1%fC1+@3ibRx@~Wpn6lvOl$TW}mz_3mNXnh5bmGt3X};3d z?{q{s^(`DN_=2sbcgfsSQM`Fvx_|%gBeHwr?K*#ar@*UuiuQNn6StnzUp|xQ9ghCrs<`8c`Ifn&zvjnXJGw$T}o*wU$gX# z*$>O69j{zy(dlqQ@6m>{^JTs;xpXc(-_rH<^P6xTjWyvin=bYE&62xd8xU}scO6&B zhfR_b3(maTyiBr(wb65J-2P_^*37f&+_Uq-=f@9tiZ&kl;>jh+k|8MkP|=M!@mDdI zk+sdygO-!67ijeEubXt4l1B zI~(>K_`9q^QzhY-yU%}*otM0(?K^Ppk&Hy8s(1LWyUEWKyl?Ik3Y!pd{lk^R+MCy2 zT5P~*aZ$tR@KGga4pxqZ+=(&IZaN(}zJ}+}Rcp3?F$}M_@&4Vpd6(_V*P&@*;vbll zPG&UOe_thNW~(qe(y4V;QCV?y`S;hnJKUv%rfO_`$8FoZ{_X`%iJP-EuJc!(;&r-z z@a;N1Q?b?Y_hwHyA0hZRN9OK1`-W_#2VN$M&29{N&r|sVUEhE4+w0wLqWt7+{`=dy zxhIkZwB?#3<`zG0YWlQCI()m$MzKAS5y?h-%I2R6VgB>>-8cVD{ycmc()D{9+8*0l zcD6q-e$l$H`t&!=s;8^vrF>%kHocxLeoSw6;}^@|1t!Pmwuo>~NLm#sv&=YpVc7oe z(1(rRFB^NQe_CSS%JaVLaiewLUdwnXj@{;^myZ`H`f9jsKeR6E&ZTQ995WguxvUPp z@KDc~_A7Ya`bJLAKc6S)U*Eb-@QJ%O)!R1aJeoTq!5DSK6@YqpA?(9V*X z6EASc%#mXIb?Z>JjN*1JQK4%~*d=1_L$GQG@V6kD|>rb2O=G`snH}Aci75wH~WW3hqxvD2iIqE~6ulil0 zcYm(Te7Rp7=kiV`cs%Z0Rql}QHtCPdq4^ElgE*^qu4-8F_x_d5`}6Mq|F?bFYv+ZL z{JZYUU&?J%l~y?W^u)fTKk*yShlWm(H+8xpB{L~8H`TfSnEJDiGm8RRKCkcWu>UK0 zWI~S5gQ@@4XB~U>`{9Mhh1Z!c9-b%n;OCn6q9M1P!dh2pUcS6MX1zkal2ed<@%NQ( zp^H7mZcVLpFVTG8;!}FeeX6I=uR zi@)5se>FjHZtb1zf2BpWOr|BXF5?aJ<=6H(&6xd7(n$7VhZBeUyY8l0if4tteq>_5 zdZ}T}&ya=hcitD8mbrSyslVIqmG1T7eUuTMb=>M#--pvxbEl;-UC7aXq%3nIf;Z;O ztBfUICh~s|k8QquQ~B=QCz=*&kG>jICY=>h^E(n&d2OOln(vb*x%Zw#WHoY~35}Jl zW_vfAjjQoppHIs2^WVzB&DSZhzQs)j0((De7rk5=<@_UH!{wI?%WuD2_*{TxW$BxS zvSt7G-Bi(DskR`T?Q7%7)9;?8#=q*DcjM5h^>z-c@~TfS)DxL?MkX=lb}akT-)82; zD#0Q>PTi8bZLh1&Xl3_#p{~oqoXfLdj;Z5{f`c1xwk3#s{dP61If75t^O(JJbUu%) zk^Z*zm+U6QOozmmZ1jsS|%+5#OqFeu~E;w%1GZIg&zMY@54e z#2lvGvSdD0dg@5b$-=XK(KZ1!SGu_FPJ3u__Um=$l6BXLW1S-p)upa&a=9zy=%6WLWO*i!N;9&onV}&QXG~WTZc1(SxTMA4eyn!(wV)e5p^PF4_8kkSd*`74{m}Mg$t98b++O&pc z5*d4gX9^za&UgRE%J29OoJ5Me&oH)`-w-fpEGaLsyQ4G1&%`)!`ITg2o+?M-Cs73# zTJ7~F1jiiM-lpcXzMoZ_edfHF08ZOQJS$W0&>t@!a7qc)$lx}I)a zH{XoQ2gBxUh;vftZPYBQ*m3N@|J>StFP=^JV{BS>bb97yp%+4bQr|!Nw_2zC6Z5C5 z)6N~Zwj+gYwa%IA52uR%o#e8!RO?IKs|lB-OE)d6`umFEd+eS2hDDBEu?q7JOqwqc zXyuZ;-SP~N&Xft(wY)o;=I!)ZwJa&z@w`yHdghZ;k`K0<%x983nCP9XxAYOm=PNsA z*2?gF@A;t*4yGfqr}J(b2<-W;UBUT^VdH`6agLL{^;wHvt_*kf&2e!^S~)FddHwyl zv34RV8jpfYr*QCA(zu6*k!-=(>0e9asUaCl7D6=hjT(Wc-qi=*-;HfwJ8e)XS=QudM z=4Lt+yD0eFsrnypSXf+_#aQ)A|Iy-$F1@tQIaZEs|NiG*n`Y=R)}<&KSZ$b>a4Obo z!{Wy`G8>KW2H$_!zd_~G4|m&d#YJT^axSKy?sVgsa+_m+o09$K0~?J0XnkRBTv0i} zvuw%kcXe$_SIs{DK6|Di>uK5X`+PscStIW`u9<#R<>iE3xk7Tgwlu3Si`;WLrB}dZ zl&$kq#$`^T%`|i24=F`Q^#AX9vDmIjPon5x)AIYq)$8Loo1eQ8dtCINOZ>T4TXpp( z7+=~QAm-5W!NgWfS4idiXB(fD9Cu|zV;=1HTsuR4`>7jlX@^r!wO#PH6^u=uki6br zlc&EzENpc_R&Sc(7n3Q<6ANlyMM$^JXkc3Rq~x7)nq~2E&U5!#&p5w+_i#f-&l+Y? zKQ%)+!RZ`sSjLf!vkxgGV)T#xn+}L|oi$mwi|B7I}EQR+AU#kAG=6vY4X5&H5 zGO^HDy^hZd`WCAwEZK9}EQwq1xc?Es#aB#ZD?g-MHb2)fqvY~F`Qy2lnkSbYZOPm0 zV_`3Iv~J$---jpE%7~oWxV`hu%?m3&%#HT6jd%KWO8i$Q2U~g0?=!KvW{M885A?8Z zU*z_-v`2gX-^TKg-#=$D|M#r@aKd8B+Cu)y$a&nF?|p9@sJZR@>CfI=@7R;~KXdIH zgWU&T7gt#rpP(DCU~j#G11ba;XTD|a-R$TB|F4rGweK7 zA-y~L^`ce60XL^uG5$QXlOZIkoNq$57u%jP7b-bx#5-?gQ?^R zF}3KBN$;l_Ub?9C_Vs3+RYyzRwsT+K>C<*Aeb$86La#O4-syC+thlr;j$x+J@fVOR zv?catp0v40?Y4bQ{IwI5&d&J#Xn{x5631Sv%!wur@?0EIZYw8TD^uO+`ETEJ>*GRm z5-%~eB}S^8pHqEq?;fG88nH~Af|8kGscdhZ*{@$`)-n;=wZ**e+cTRR=^DzCPRm^w zTeufUDDfW=RzBn-x;Po1GNkWo| zIjbZta!VJgrAG0644b${P;C#xB^?G%y%bU9M-q+_9w$3edR2^NaZz=j44V2H};(>?P7C#xl6h;dSXm_;hM~AKTh786TL39XOH9*gS{7C=CIAI zX1kyf!p1qbW!>eDN`*th%50*#*)3DgNOyGPb|=j0w5o1z>AfA1pt4!gC$K4^Og7mo zobjd*i|rya9m7YdoQI4;*;Y@S=BT{Fp)~D-Yv|`I#wIS$U-ACGvh$kY)l(BTL}Y5N zYG`2=QZp=Cc>3Ei*WIiOgDq}Jf8KRL^SsBUOZTjP_ZlYhEL3KTnjCZeZQYYI4oee49!M!La(Y{;xK@c=DG-{;^M{hsLJ+$rrJ0Xnl=BPL!1;B~y_qw) z=l)IMjXimy!mU-vHL&$U;Y9NZTjT>ZJ69SrmpcS$+}d1ziQ`+-yuEuruDqhPt58Fr ztS976CX@2y&mKZCIl?N2lXmc(nANCRv1FF2y6*Kz<(WH!ZYD`eY`k^Bvii4))k?uo z+ukW0Ju(ZW6rP$as$CFZwbpG>fo#T;olMGFk+K3`drtXnjeo77Yx?OMo14>TD~0fo zR*_FzBu#P(RVQ#RY|dF*B3s-Obfn+((W)yR()>$uHixpR*eGjyDa2(gaalRBqi2Vf zq^SShuMP4`^Bpc zb9bESH<1M&@9)1b+j8Fd|9AAli_Nq0+|Rz%II#a#-3zD4u zsB#&{%1LwjXD!ow-oNZ}W9&UYkB|w<$L#H7L;$#uC90yr}ozVW$FE6 zinHfR2R(_gPh^`>V3`o$VW{-8$Wcr-e%so{lGjrrGw%3rWbFQVN7~?my6R@nld*nz z=6COB{JC3Ezda_ueDX~GM=4kCc&nKFwUg;P*L~Te+E|vi_4d70i(i`SHPo>$J>Tc` z^~7Gw6yuP|i(Tpre2!^;! zpYi8<+1}X;)R*ghf7EjS!KCWkryrvXRsD1&-|sFEj*aIv%3C)lD=+)Df4Sac z$Phnh-|sC0frj~);}bLWn**Jg7K<$N(rY#o3J`13nzu@Xr&EOK(88Ab`@4&s9%apr zx>s{&?&Hnp3zwWPTk7Qd&+X5RT@N@DoNgYSEzbI{rpIYr*w3tKG1n~SOKuT=y4oUI zVuNl_MdYLvE?F^kU#l+XcW%r7E$b+mvhK)iN%_SuHb(}9bez1j!ZaiH_L0Tk*4NDl zy>|cY`St?g13Y)uYy2s!5NJAE_PS-mMnxvOE!S2Us>fa0rG8xUxWMz-;sVVi&npk)mKp`Lhb(xyU+QkMlFOEfGEcrs-6+*w zZ}{2s%DeJCbGi00Y%)&Q>M1L~@a@8xPy0V=%-Wk|xo7)r?Opu0eOi8NJ2fWN_GCTb z2wa?gyt-yqb&tQ;o0+@y=2vvzWBn^s5n}o4(DZbTf_&yZwvSl&`4z+;H{Pyik*<5+ zBa`3AD`|Bv#bEYEMHPkg;CEGi^>&Z+W}mzJ@^Vf<`+Eh&PaUgo{L_6ky+e7ri?v+1 z(#OLd&k7?P=AUkup`P@t;CWd`yTMPc{y$OMl?-DK%>Cui(wWis;k!9vzu1P8P zP0wC_8FK%K`=113<)>b=$`b-iGiRr_B^(Twdm3fC!`W~N-}FyALdB;aoOD-qf9blv zQjg~tZJai7s;R^(gNHd2Y=h0Kxg&opla^4>5}G#4?Ushhrwt}St2KmQWh~j2Cd_G& zm8GjyesWu^*aEkeh0GTk*ru^IIwoqlI4@<^)jQ3^yeNQU(%XAX*Vpa|fBDv7 zF^7_4h=NH(dX}k<$Zn(WU)kkvZ#&IYk+a8oTFq`5{_F>f9k-kCUvO|&*yd`?z_YzY zE##)^RIS+$H%eQo@JJ?ZE%uX`*Q<8Or*KV&muE($=l^HF%#16+=O4U@_4b!G6tH_9 zKO;KOTywUL_ldO*E3_0sJi~1bRn$e z@e(dRm3a%Vi}vp-WtnXzXMX&1=yQFU)yGa0u}pKnC34>4{?1=J19c_i?%%EZ`|snc z&&#uy$QQQw#nheHuX#Z@m)mM)N3@4bc4haGrMu4Pb_U0$H_a%0@z8U!ytZNIk%gyL zn>sf4tUY_TrNw_rVfx0L*uBX%1&f)Ee(^7U7$q!zWGYi`Zd2j%8QRT~&zu8%C;nvk zzvxZH+>nPeN`GsvEHsSWdV)vzM#7_g7Z1s=C^fG8wRlhEqm+HYY%Kq{Kg3tmP4l)s zyLA5hGM~fer~K#nlRi)0yEfpIrN;A*9((mxy!O4~|5VS`(b)FyJ&*Gx3uMwl@7(@w z^1|6)a=P5(h&gjZrz>}zcG-5#o=4_sPo~bz4T;Sa$A8t`4;4D!bdoz#YSGs3tV_~O zcGzY&+~My~-m|CX(44LQDc3iuPSuN2N#*s*+?c}Vy_4A|^J2=`j9qWzczvT5YQ8Gy zl9CJU?z+jOmDRE9Y)9X%Ox}xutr>e-JC;f0pP$Y5EsJMT-SqT{yjin<+1E40WGU|C zXq;$7u=2y)0jgre8Fdy#3l&V#}#7 z$;zy{ud8Prl$>oB%zMuEnXV;A?zQQ+i(TZmrX9CFvA*(yskUlX@se+Oo{c3&i!_et z|D3p2>a#P?bcetlvidty5>2K~Xb%tjuBA<=^2QTmpxe*&M% zt8G4d`XkpJr8c&;3mrmxcor@+(>ULy9r9=H6XnYE$u1X7?;lU;(D=^DS-j+=**PAQ zh7~Jcu&?}F-NZfd-a-~mWA>-IB#{_()M(SJ&#(T)#W4_r^m7g==CWL8I+{NefM z)OG)bnKFvymU5hXu_)2n?R2L`wEC%8Kb|(Lw#dfyJUhsAuD4<9w$cj=-h37Pp*KOf zOzZp}f$PybCP;idkmeT`ka~W-+hMno3mhlZ1-VY$KJwQ%>*9k#u?vA!OmRE5UfEc& zH)!wVP11kt44%96t?sQ5wA=eRG)v=^TEzTbMDrQE`@a>BgxS2VbES0sjd zZS8woxQ%n4fJW#t{pCXIr{-*q-z=Av&$KDo&RWalzuTTiN;SGSJl}ab=3F}=>E^Mi z$~Y}=%Ua!b^F8~1y#KtdChl&?n>N?D4$gzGXB=n!7jpjcg0S7aW|wx&nryoGonvJ{ zrQ`o8Ngv;Qx*bvR%d9>n@ZV#h@4uFMeSbuM3utc3;ka++ zrxaVVcga+}w}+oz@hTT=N-cbG^M=ucUsvk)8E@uhs~6b)(m6hf>G#2NXWpGT$Fslp zpE&nqlkG~s(lT8Zj^F;ny#Ms-n%<)HrV_&`X%V1 zy69U9V;j@ADQgwj&m7s3Gyit7y<~50{EvCElGjd@3!NAIc%ygn#?0ToCmNYfoU=QZ z7V{_J`pyO2-)(9dd-K$|S`<%~X6$J+58yf^ZNNKYvGDbIJKpg<;tun=E{L%>*5ZEuTW~xhy@nTRGFXBKny?b?~zb_av@OeB9@^Cg5ocLw#$y3g7k8 z=KhvUbw8nZ{r}}|7FeGsO;PRQ>Tfex`$GTE?8oWf=1k3GQ;Q6kvoZGAHerE|tLbm@ z=Lo&H`g&=}ttY(3>mEFx6|+X7zctBdW>@UB?;*FG{&HmTu+>VY_&)qOZO#U{GP5wV{!?75$AeqrvH)dNC z3fEpJ-Z?#DhJ1covf$^5xkqfeT3=eEiCjJXpjM)Br)hGzRrQsdf0OuLy{yv8-{)_< zNbAtImy0~UW^9e*l|OLlr_Qu9iOWn2kD31JYFjzG$S_99g!I=(&bfMVV#j_mC~KmC$xcaVsP5SEjLda zo%wjdux0gx2F6zwoSh36p1UI^ns;MEmKD<{>UIb%Q9QW&344dnF@2k#-Oq3Phl%DmtUKUsaD{vQy*Es=#7p!7 zCL2~wPkLSTvrKQb($Rb0uT{n`dlLHPBLB6!k~bT7r5m|1*2Mlz@OH83Ha}2yV7UsX zY^a;VWYpb>ARg2~KtOynD=UAGvnIVxr;XEr{~Px*XtBl>MMPIZus#f*O_lste^D5?PSDSN8a<* z-7n6kZhANWdx1dhjGLF&w5*-r#(CKyMM8}y+_}FmBD3N{dc0cI-@ZDDJ1+$PS-qXV zC=Etv)9OaD%M@A`vv zN}_8UbJWePvi6;C|6dW>q<$=@QqfA_nahJ5%8IW?xUxj@VKpT>!r|bH)C2NTfe&`m2OSr8?7A8DRc!j|Q;7_^%e6y&mwpa(n)yY6@#M;zTUM;_4Zb1!V;p+7I%Zy%pu|Le!Y;Dkd}A7pow1%9n_e7x&Got{V2lpjw_?WBG3ZTxk) zxjSpj-LL2-yyrI4-Ok#3&EUSe(}RtW4aa9u0{>`fU&+l`NuNG(={Pd2k(&TKh#UBgfIg$sRP6Ttr{o6Op|9f8fcA^8(aqa2k(7UoARiY|QXKBww(<}4=hrgI-z z_NT4e&w2mSlsWm)p8B(e+t&(uDXsaF8no7SPTzsm?EI74Hg3KUKKWZu*~N6(_Rrm$ z)Q(KE&G}j3ay=v8>f$jwEhppny}NFvm_45|`OJY6F;n(k@Lj%abLryAX7aaI|7UwM z|NYf}A9tJA9uBTF&JKK(|EM8MT`GE}%@5hPSs9*olV;U8c?AZrWwn{N>d$!5RkHHa zUdH4{|1#B7%};!)U|i+*>dNsN*$cCk%u*||6WZQ~ZgdXmWB;X-xoGX|BiqZqD;|E* zbLPnNZ%mtu^^Z%Yy`StL{^{YR4P{$5q}4O9Sg(9P$4kUGz9`AL#>J3jVd%vp(pNH` zHnv4Q|5ehc#kcoh?17b^zb!4aReh5DpeQh7h6BTExvH7-%DY+PrW`x_WxX-1sZ-t+!vlPS)(XzGJug z%m*qWs!3OcKDpd~wpKx8#{#veIddj^)C&EN{idE*T7J^tgfmCEV}(({^}X=%c@$>MLqE8 zY)lT1xW8WJL73spSOsg<9aXFOBH3p#Hi;@G{9nem>CEbF63V~3cN)H*-}OfE%e|`k z_VphBe|-5jzkYuW*X8f=c7JBJy)>G2m&-zGyZhXn=C3^Fo*R1~E$R4l>HBAmlc$T6 zPkjp8vGU!-i5bba_KMsHsPEH$J#|6buR6U;ALeE;@{0cpu~_{4)4uKwzQ8iQsxmx@+jPe4Y4#kE9s$yoU6DI3E52_Pah$T| z)S2&&P5h4E{8CD+H)R|wG}%E`p6N8(F{F#_xNPe4%Q4)ca|#&m{}IyJ4+x zz|Q`SMc(m$b2wzVg4e!Wa_shMd#&P(8S05mzg(N0Uqem~d=nd)f7?xl}Q zUhL)HqSqzi^e|-WUFH|g7dRGe*%Z2Zo0ewhg!uV0BZE{#U-@u-QRJV-ImvqSb)NFH z^yk`J&a1Q}Y~8iu!=8?bmtO=#KPvRLsf}!K&0&!AowrSB*NN>;N)B!>8_vc45#1j9 zkb||h>G}1>oX5}HJ(akRE<2vFX+iIVExX=Nb-yc;DtK#s#rjRQpL0J2RJ>Qes9kY? zhoGCEUB+|&@bHsj&okt>;$#lpw+rZK4fT4Q4+}e4)IKJMHGK zb6dmqb$9QLTD-a0t4ieXe#wu@3z;S3E{O&3>ZR_T%OJn0yjipCrJ>Wr(^6DhdQKmTPAS7f6OB{rNU)up#2W*A73V@)Sqo#{=H+m_1p9Q zsvBSMZ~pn|iImRcE0s5N_MUIGzTzy{v+?E)&!?vR%-17ge`m+v?rHm+@%X zi#Ph4Tob;D=7>zLZJpKfc>gz_{PJ^VQsuj!r5-K2^)*Ux>p8dN$*E$Sr}Y|bc-VA) zPKMdTvPr9>bFJfDXPU|>UwJA1cFWgQb++8v+6z7vuHTxazWT}0?j`O5^Q2E^N~zTu z&ae*&x>*x^$3^CXl9k=D{o&ia*T?;z8j~bYGcko>annTuCxPFhwP%#4Bv))!;@D?+ zqowj%qq18sOI`l;i_x!HB5xWT(7F@Y6rQ=aLGa1(p2#I-Cng*<*Y-@Dt7v+=(eI_L zy}h1N)a_~}-z7dO9>+7Mis(uQ^a;ON`+EBR30Ga(QeA?4U;2n$sOntVxGZ%Cds5c9 zLe+nYXXYCwv7RdH-c+7&%jZOcp0Ky7r|Qh<2|WIFi9cTRFl$w5N{Ds0b6&{)E398v zBULi*kdRoh|K%_Le#Y*eb}Rdrseib0c#ZGHudKl(Q)7S2$`x3uT8dXL?s6%~I5BbM zRQ;RVRvn2k;MQ9H;-0ff{<*eI4)w3vZtl1`|7>C?v;3Z4%3aBt!F`1`>0jR0+??fm zE9B>_cY3eut1s{U`}g|p?11}wr}_0hI+xuNxG_xnVNZBp*ShiLB_rug159-%hv{5HtVVcUcM-~ zde7GN65oEPZrL??&AkrpGtU_QzkI)4?9Z{wf#r!GBbIm^VYt8Ci=R2_K}>m0=D&Y_m|E4@WYa2*4}A8JEu4us=8m1-#gJwv4qj=y5shu z9VTIx`n&FI2^9PiB|BH^_1>U+8QBlIEDsh+^th@NytM3Nz4xlfHFZV4;2JlJ^GniC zajEuv<1@6I^YlPuwnWrXo7Y8wA11DxcqyyxL1IgMtLuWaLyn?T8SLCD-tT-@6!zia zN``k_h2mRS^yF4)EZo#r;AY3f!0`Y7mATgWOK%ps{`YDZTd>dSJ^P$VjguO!CLdV9 z?CzK2;5FyP{_3^6Qa;ygx4heyc)(cMck<;w^PY#iy|s0G{Wh?RB zlk_}jcgeoD#c6sIeeN4h)d+)zH_unu2Y02IY?y)$n-EvD@%*0Kr7YiAP>;06` z|9rl__Qsm!^K-6UKK(lJ`dKaWbx|_4FaAiS%U(Mrw=~MV+&V$%b|&{v%k|scpUw#k zPCa?;&eYsQRxRn!ti-*MQ@5#G8{fLkcKmhX$8$j`^JU%aJ)cKOo#xHpvpa3$mK@s8 zdo1Xuq4%*v#oG2#A;qh0-px99sAR))Ez`{hf4-el`dG{I@%}#hl0$5H=9Ba{OP%h^ zOqy)k`~2&_44a12dn)+Nt~b^s+P`^oXYt0Td;H>m|E!q(@I;5nO(U6|R@{?~#mlbB zb{^{c+_UxhbE)MW{@cIU|9)=Ss{ZfuqgVgG&Hw*H+xolt{{P4K|34mo^8mwc|EK;8 z_m=R!Mft<|20{2%xUL@UJ@a6pH=cRL6bU$e@gx$Oxn7vwrUAM%5p*TSFe%8 zwHFI(uj%^#tydL$Wy87Q$)`CCRUeaM#LE-z|B<^dzu4#himMghJCYNP{OvcdT|Rv~ zv;4vwwfDC=+4>e9aai_&Z`S6h1PjRtlfBfozk46S_GZ(YbgUM<{r`sa;@8_vC|aF;*4(z?BMO*9XOUPZ{-8O&uT>Jqj|sF&Y5 zeKO#U8vpfs;f>}`=XTuEeHnQA=WLe(Wk$mt!VSyvs&h(r<}%kX#dJ>;*ErI&Q7Ol0 z`P-PYNArZA*+2jOow30(CqwY;&S^IUKSUjU6ML1TJNm}F%hdu5537%t7giU{cz$?a z#81@=-0yGfYWr4pDxWF){d`}4#trNbmPOaG-r*PA&SLtyzhn2lXCF_i*K596ztdIb zwhA3^oA%`t z8)ZxBlgHb1-e^A&`qydI(iB*^;OW|$(hd8LoX|cHt8S?%&c$)>!ET$Sdzc%J?R}l~ z!{*zoMelZA6D@M|52&@O?5=J|vZz6dg>;9K<@v4f#q8_FP|Uv?RMhmN>CZ>Q@-w=iGvTg9f@GCa`-ly)>K*KwXW#q+_*$XL@Vj1`i|2H*+d>Y|%NV>o%iq zM*CzzS%3B4N6&4p{rRTvi_?0um~~Ds>_wsl?-!10j>v!x+WB7f1gPncT*MFsdC9c{&c=~n6 z`;3xA{)YlTUKH7T3fxS3+0cD+j$B{s`$EU(#~y7|tdd#B*2uE@XgJU0_q!&`tnMt? zzo2;c#%e;Nq;+M!aX5UiWBQ@xPT{ecEwd!i&wv6XH(#Jrqoi_&G1!i6@v_ zf$eXwsLz3bYZHA~I#i!LanVbfQx(6jbMGf5mDZw!NtM^crS=t^V9em3H`{y7YtKt| z-t+IUv~fOjIKHjRF@Irk!k-47i4VKZ-P~hjxk)yxWd5nj@`Z16AEfP>ZgjNp(yo(_ zy}T=cmYK-cCig;X=9v%go%feLPT0t^W|38x^n(Ot-qOS)Ud#^Zb`vV^G;p%tOfEH(6m-6s z8zl9h)wJo%ga-`!UOGHG=G7)(Dv}xX#9)KeegVDZJ9#>J{OetxWyZ+I^aL03>zJ}n z6}%X=Pt4eF0X(iH0~yjOb*O5EJ^?Y8n=d2Pv9hJCN)8Lx`J(Yx>#qqLjS1=|vi@>R<97FAa*|?_B&+Npio!<O}lNr_zg-qJnXWVUzGQ1kwz`mwd z`t!#5Z{K{f?EeywaZsjJ_{`OvizG}+c$an9>qv^Y%m~>zPhxjo-vst^g=R7ya*Wg8 z237M|IPUXk-njR&s-5*YsVmb1inUDgALYc{{CMk!&ifTUChK`5F0ZZ%oHlEQUBP;_ z*(@F(YTTba5?QkNz1X^4fu;KrbdGKH*}@bZxmj~_W3=Ogtm*}~yi8XGbg@PMjL0|1 z6Jp$Hcu-_h?4|ZKlEsz3Izw&u?veY(v2p6@)r*pCy-pr(VNTmJ=k&glD=L1@dOcI& zpjE?~r|X|L@bDP+2`}A!@~F(ZzOLgl<)_ZpnqZK+^Tx#YIftf{JJ+=!M^KSYUUUgZfo4$q`(k9qu})8 zrWye;zQ(0nmWXyuo_A&1qj?6bhVt)oF1jE7HLHl(!;h=QG`INHisK$nHz#nW?Vr!| z+0^~=oViz53q*X`tCD)`n@8t~sA*L{erv934HEfTC>*&l+O;@wPu7$@&jXg#)r&K! z7Dky0|5|col5>J$nb_7@TYTr9-1q4{WBln@&AOx4+0$Y^fBzBnKW^VPd8IdhJErHi z*DcR1DcviVIqfEg;;BRao7g1{beu%yjW}I~iecX8r7A+7Z)*^?#p@*{m%lvUlNz`8lhe@cV7vDVFCMR4JIr zUMMxA^^l6--7{-E+UA(eS6#8ek9T{_$4Mue^dGJlTIh4D@1tKIn-s$@*}VIooj>s} zUSlI9w)WEUz}apZx$DLL>lEb3);;WM{_$kB=k^zqiZz;j(z#B$G>Fao`mnAjUUSV9 zQMJXNoOWf0s4y40m@PO~Kj~B4`^ih|KImz7Pr7KkZH8q-;|8%io6q&Pc5axqe7@AR z%cr+H%P-~pvu)QO9g`d(saSVo;kMHsjIrq7JXlE}pw>Qg3G9KO@Z zek$#$&%e{T+PgEFA2dt7E&5=~I4O2sm;{HWaV*oTJrkEW|JY@e9hPf)|3US;4a$o) zizhs>c*A_5W7eF;l_w>qGcn2~{CKK)RZFJmp5KL(^a8B{{T6GpyHT?gC*3va=}yb} z#X0L${^cN@vI{$NKKJD%8dW)K?_jt4Ui0byQ>o9}A|<;LY@HTe3;58yREcr(&N)tM zEt)e0oN^=56&N0r^KN|dXtuBFVd3;r_P9$Y-`hxD5373bX8Opf_elSijeqP4rny^J zUF>dr%_l#f35w`tO)GuDzAX${FNxW^&_-wubr{ zeKP#qS2wta__m!2=bIa~d5_w&lUZRZxf9Z3IyxFJ-dw=2uXz1a>o^OJg4Mft531et zzEqTOMoUtEhK?GO+=0*+Z0SjS|2M=fULv?aE-2#3e!B#wAY-;!=O=rVJ>MIm^kkBY z&Q=Bq=?Cu?J=$yZXy^I^d2Bu!4|+YmyovTWWgzBTAulbiGI3|jea)L@3y*)|Qah@+ z{l?U!t!(^(-`>2kmVd#vUhVUfGfU=2+_-$Y@JIPp>lr)xxb}pV#$0O_|G0N;)JA>J z(CpX~TK#EP*KF8naP91^aMz_TA{abR{+O2S!VwcJVVS9yLka&UERP|;fFkXjyn zUG>Nl{18eg|b9{pxXt1SnNW$gZ+-%Hnle!p|7trJ ze>#QjXTJDNvFqA;iFf`1U+T_){Hx)`P_}u^ob4KgJX7^JgD&pu{OJ_C^V4~*5T~aO zz82Gsa!)T(YVax3W`9u@Fei-f^3zvYwvq26RhraxMSG>b(hEddJI7d+)|rfuIR_o*~=Le~18 z4bq!l-wDjwuGmr2oxN^zn1Ipx4VwO&{^jWgP2uj9=!U2oV=^_ww!%GsJFN3GIW+tyh|bARCC`th{oLaFy%mb2S* zuTw)9MHcQazTy(Qd1 zYFDvJ&e?s6WquzgAE;J&U*W|i!mMu0x5@Rw)vNbIR&xC3oczT0d~it1#y6{$EqceL zad_X^z$=G0$Sz{Zs5$w4ax3#8KAD77e95aSTeTQ>Y3=7c@c8>7=hFwBnGO9p{>s^J zy#DJn|5@w4il1dK%1?C4t4=+l#u~I>XLs|qEXNp4@?X!QIg7(oeUIcc9!iXxBKO68o%@P)T2F6$nUtz&zEZE$ zbVGIU)6R4;d*5qs;yt$cBr4cMZ!_`ZxPR@pW&IUyv((q2YSBksIKM?KGIm%PC&Kz@ z%G}qVS+kp+wOc}UWESg*t)3pK#nNyf`E`yx(>^E8d0RJzdLOZM+Vgd;!eYx^;fph0 z9l5n?r`C}PHy^(!3w)K!wEX8RZ2{FiUlZ@i-TwC_n7gv-XW5Iz4q5T8o0hx2teC~3 z^SkLLUy@w3+CPWl{=N5>NZp*ag^SUA^~ddJ1cTS^yuF9}{L8TGx0j|&&N;Bjc6v?y zjddz2k+uFSZ$t;bFf37p=5xViUtT3x*4|9y{yhI} zT;C?w9M>=DFX!=V@z`(E?_oLdE2MAU9fz=ns~m@vyzZah?Q=TvjOUg|8&dp_tVAaZZa8!PWDrBo0YfGlYLokSj-yfl{qbE>dLb2XD@2|@o4(8 z138m(x1>5PG7z$FD%e)nXmqiW<)7f@4fCZgsed_Tr+v9x+tth1J)g0Bl3ZT)omm(7 zOf{lbTwRs(%qwg4^ke$FkG7d`*LVaT-|CgEsQkr4Cit0A&OVzs&Dp>Eb{8ExUmzR9 zxX66b>}efVYs2QG@gLil7teN{>EkhOG&hxWD`6{)%7lW%+;e z8ETttgZ}kb70GY>we_jl|6P;!Y`atUbH!7$7h2J$xwidaVUUrZykXJu{@IdIW&UqV zCQbN$R%wcP=)%RC3yRm7ojs7V;$J>^vlWx?L#AMnj1vqu zJ}|Cr-_EjB(|L&!yU9kT9Hqu-o0xVxvn^oL%lOX)R(xgd-F)feqDSZ7-QQHnsS~}Z zysRv(EWyHod%3^ng<9@}B~GvSudG<86*yT-@6Z14fB2?9>NygT*|ngcsb!LfUU~Za zJN?DycP`2E|FC_kRDbY_z3bch9@MO=*t}xZ_6rT)nyr^zm{pV+nUL7MXtC1In;Yv& z8#Q+?Hk#!yO+ajh|wcfm6GWp{pNS%{v@>g{kzDSACi&HRWrtF`;(D~n_^SHGCunQ>M3En}yH(qR>| zwDMibK0nWeJHMM*zU9TqvnpCsJEdKwN*#E&%B zZd_674cis?O6nVf=jHx0c51X^)SkfBJB;((UkzwFjonkZagB z*{ez5Ko!fvQj&q0jyuVV!oHO-UXIRpu71b;b3G3G0 zGk&~H@ngpC3y~7mPg{l3t=d~xX*MMV2B`>$bg^crUg=xOyu?_HwSh@jo8gf2HPiiN zDUW%M31{(p2>(@#owd)AE+cU-e$NufjCu&*lr@DWL?GvbZYFSu4^;Rv=@<3dG+2#cWomM?6~}AhsDtuQcBB&LZ!|L zgiSf1{n(UA;-m*d@`2RQD^K&BQ|+8gGnRNeUV6LTee(p*+-D5@YtJ4uF5RH#d`(^4 zI&eM94Ias-dUb);GPol=D{nQ$vG3foqmQ}N7b@Sa-Zk(L_3L*cb7n}a zdB5mDtG?4g-U*x&6I5DTwp`(Cc%UH7#2m$_7AhFIz~|!T3)UHauclqQrTzGUhQpG> zS1;U?ITNv%U-fdcVJ_RpJ2Qgs9^$`zDCFH5pVMpPWB7jrZ`g8s-Ud(IEzO-74rUYo zv2na-_^x$1Y-7XCWr5PgPOp|9iN3z!aZ5^hwt#lz`;{)9+59nAmWpwx9AiwGecO4< zw23onqq{bmE2VJ7GVxukX!*2oa?$-ILDpHzolo#Ai{{fapPjTk$$#P!mdrJcZ!WIl zJm<$ZKhO2;N!gpW%Q{W3x-AG@_&ez3j>YdUG`TiayanR3#iM$Lf z6V_?;+qurS`xk!X!O@=k{co4c8dq2z;t5+Nck&rq(bE)mjvYOpSxzrJ-EytuoUO0j z1a0Sa8Y;SibqYsfpX`$hVOW1u>GZaFzS9o4x9mvXYCie0XBV5u>!Vk0nH=-WSk=Om zYGY{Y;Hc#zBavx$*gvGn=EhsIdzDH>35NeH9!TtswPWUKSD86?&cf;Dw>{@w`x7I% z{4wud86#H(o|0o%7frL;o^p}nsP18_<_DZnPa|0kED}A=gxoWE>)k)WWrZK(i@9_A z7UeCo;V4zcMPFYJ26`ix{@)X9XQg zTPi@g5@Tcj*|E#klI$o^d5_X#M({ES#W}7I>YdSIS6b1FIg+3OwxX2t_ z=UcmUOS)0()Z;PFGnPHf*|mPEM(^PX+HC?0dGlnXIA=CawVGtC-P!ihtE_JAPc=KJSGl5R=Fcx5)9`Z)}!LH!`wjhsp zy<>w#;9G_x6Y8^XGG1?YyUP^!V#65+)*Xdjp+dbHr=!Yr`i1Nr@5|`4{d>CPQEDnz z{Tb``kw;Glh85lml1!WRWL1R3W5L3Ui=Y1Fde;2WIrqF>rR0qNfr1JaF^jX0F52>1 z@RUIV18eH+Jtqnn1w!h19Ui9?u{y+821$O{*Y<^3W&5;Q>tj+2n3&463h4sUCeDJYFCj+sU{Tjf&1q= zA13oJ66}j!a5^dkDZ8pyW=@f2UZnSyxrH(DO>yF~`iABW_7nOSZexgUv}1bJaCzqL zm*zbW<(kFU>&z_S z3%mN6Q*uo>@62p$GgQ?*vijwY_I=Zv_q?$@aXOH1lTqC-c4mniDvlE8vlmN!wHFMtZ)L1ijZv=HZ8W7Y zCvbD8q2b{-WlXi@X?lwPX0AD=j3tGYXVbBMQnXb zl7kK$kP+TtWzau`l{IaL0aNoaHlK!-Tjp3Ft$I+BUs_UdAT>iwJtFGG)GeMV5xRwy zdO6Z6-4pJumTaCfb4BbzS*OCeb*fsQ>irfx@1OYcUD3;F@drHO_iyGk z>brxcxAx1;YRzDe;tl#Csgay@Y0@s$?H$t&vvt3gurM@i;F>CtE0$CeZlrbKR2y5z z+l4_fM(33-DQxsgFky+wX}_#^G~twF)&2uAu=U@WZDq7sRbYaz+z}^EYhyN@h@)3RW`3R~(b&=dHnhWdMWm5w z`3bi!iL-&fm}cm`NO>k3ZD{n6VIjxP%+eE!q^pf{SA5@TzU9&HwXc45KYLpK%gj(U zRYR+sMSPjR&QMn8;k{AZl9*IB`>#umMfufkF=y^UMz9{z=lk zZO_d1`6-UW&!V!y=GE?wY3XjxYae`0{qbbeL+Vjlm z#v^~1pCntVfG_7IYRG}1BsV_Y%v+hma zZfqMVrI?|k(CCvQExJ$a0q2g)Pdp2s6>B_`kY2T_gsofu!y@J-g})k=UG;J{@aeII zw|6Y_^|}zSjImTcFOF|o)WK`-Ihap16*Z{8im6kj;#xw(|h;Qt7SIs*?dwmHK(^; z$V*-lv#Tz;lw;KywS~ruSPreS`qQZ;($cP4xhB+m%4Zv{6Jh_ZslA(wJTwZBIAm+Z`j_j^k4EZ&U9DQSz(mLs=za; zX+y4Lu#!{&`{T`zpG?bW`e|G{iKD=qcjxp|d)EAU(*N_q)Khz8mKp_rJEijQl=?Bl zM;d9f?yPv3ru8R*V_W!B_VY%`X3Kb{G+6CCXm@bCuF9fMWh;)}7Ew0*lqy#iq}n#y zNy3|N-jv{55@-6dZYN0oigKB`ZS{Be?q5@rCNP~y3NV}S@@n6{X$k2)atf!nbjfrt zb==&pwP038Q>0=~04!B!_|%&zs;23{yG-kImbyn;!@%FO8L)~H;v~{UwkG#G(q^+Bo1To8x0Ln zfwqgzwUy`bInMg6Wmj>_^vt_Q@8n|Qb_lLuGgOnvvMdwjnsG6~?^4dP^(WaXcvZw! zJS{*ues}` z)bVSaMp2s4^Y~{6*!h|}?z_vZzu;-Gv}RzQstkkXWcR;?s~4(>EY3dh$>uK08pR{u zbQ#ypU2S`caqX(3K_(};pRAl{V6e3*_3|W!BRY29Cg`~6tV+AHA=yCa#F2pd(0`Q$ zv&-hh|NHTFxBQP)Q|orpcY62Pw!##By>m?a?XEoT{J-UH-u2~e`PU*pu6}y= z#+~v?ctj{=T95+w!xE&u%^U=2__Mv+Q#JzM8w;u(z?^eWPZhq~D(_-`D^D zdHB2dzd8Kn(;dS9TfA9cU;b77|K*}RzkH`H-hJbKnrB~4DOdK^Ke}=E^vboNJL{@HK7RS^?@PDUALoj_EGb_4|8v1sy+gOn zXSdJKy%)FkKF7KnwMDN_RUZBNY;*d*9`@Iz8+oq#f7h@4`|j1(hdUR>&c3^QzGl_> zF|VyPh9-E&W|Tpa0DByE4yiKI@r( z?Db@I^Y@iCuYL9J=a|>me9ikF+q8RkX-FrPf4=%Dzt8Ib<@fuqo!y=6DRJoL&!7L84W7R~y!MF%|N4@t`u-_7Gu|=R zpQ_$>?a`}kcYoJZyn1^2-@J9pKON0lmwZb7uilQIzq;LHj!r(CSikv#-R8-E-7bc0 z)BAApURmzxKVK)x^NF9oA9n1>Mc$InH6OU;Ufg8gKA(x%`s4k-@7UYd7Tr+VJ@eD@ z-#ey>I_Acaz+c-R~4m|5G?Uv03MLv(8^fyB~$I|N7@G;(WOL_r|l^{Vw+0 z{ySOT^5|d3Y0B)8-`FF6HUD7;E&b|=Immlhfv2W?ibsu7)Y9xbYN-rm`s;d2EgIGQ z4@_s4y}_8YFd|Z;@XdX8-ns1jXK>}a*2H)pq4$x;9JpQ~?eN{uvIVOaHmg}dZb$&GV1|9|fP zlJ`pT^hD-)Cwgw!+mz=%-zEPwsAB87Q%N5Scb!?T?fYn7^aY_>U4Gw1N%gyP{G>fj z+N-}jsdJjOe)~r6=Di)Nk-pQs58aD;b;@IMa8>k%m)}l>h0U5e^XBXK?)q<=d{(w; z^?u_PoP2Gi_shRmmPS2aJCB8<(%^#X3=ZaXE?(yyeA{ZiW_GH@UAk%5zKm=CY3~Jl z6b?xT32xSWy7D7qz-QNLpU3@zO`rNr3{G73Q2DX5r<0yReR>kS%K8tAwHZTi?X0$ba+O_hn?Nh%b%d5ORQj<0;y_9l- z|5d8Lh+xqIt00DOo^zXhTcmb&2A%Gl^db9yfCHPnyMKwxjt;mWEb|2dxv?Ia%t}d7_m+c%6~tFnPgZeN<1EDeL;h5XN&c7wm67 zJYeK!>Rl9L-g-LRU3QMWf=FM~dxj7WMh*=V8H)w=5^qWv-c;LPxnc1$l+DoPVMm1I zOV%qN3@*sMu*+6hEb(Dp{@jK4_t)&X6CY{mUly|W{?3(oZKwA~z29!S<<80KD89nq z??s+ih1&Pp|=4A2WUZZoL@+;FgFI;hc`+ers zJEwDfZ=6Z*Ph!*6+i+Q1@`R%_%a0|+fvH-ST;)GfZ64-*^OKfQyn9^m5}Uin`^OyT z<$kZT*4N@$GWo$-&iEg>H4pO-bN{ja8(iQhRhiLPc1Xf-#~-Nf^^Ir#d<3x}4qiJ8e}D4u>^{Mdr~(S!5+tjVW~8gp{;U!FU&JlU>P&AaON z-IU8I^Hi^$TeeR6Ope<5B}pbZFWVo^d~9)i?&ll>37N`!A0w_^@pm@}VJ zGCLRV)jNIOWqSR#XV+%k+@kRA?gc-Y)@5&J#%MR4Jbh|U)jv0}yV=@vPgFdt+Ew;d z??-`d@N~V@#8ls-3nzcOuzl*>r?ax_rw8fppDzCN?6Onh;n|P9Z=N>#fA`kCn45?8 zl%1VjR65nWc<<|9CwI)SYK`5U8mN2M_2=4pjhA(Ck(w({{rpuHb<=yZ=Kd^y?b%O1 zRiChLWHvnIS{4^}>rkoY;{U>+0`$t=+kG+D3mYE(wsB?N)!A6E<+|Pb6G8`WD9>PU zHsxFr3Nqya*-0Yxpqk-4&{FhAGtgEYj{g40i*k6Ay zbNZ%o@%*})-_oKV^UK%&eSQ1+$7zqx{y4jS?~LQ^;+uc}3bi?CEPq{mcenV*&tHG? z%b!|js~vv6;>Ya1=H2zR-_Gss@HgYPukV=t@ASJ*k$VoEJzn``@s7IV_ut3uIb;9l z&(+rz#pfUUAG=-q|Iw$S@At*s4)WW_u6r8w@x|Tv_qIPzo8Py)dAIh%-FNHDb9{w)LX+dw={)`WvlZS5td3QvUthvzw>Cuj>?_U;oJdy!_vn`X8;!|3AL> zx7vT-XSsd*zCStm^YQWB>-Se~*}ePr{n{^2?# zHeB!jdV~Gn!^37a^);gNUw#*VKX31jn(D8DHRAE#Z&%Eme*gVE``-mv*Kg% zo)hVXOcj4m=l^ljPyTu0yX^jwzZdHgy(@pdik-7aU+G+6k)^el&QJgOcXb7`_;vez?;m{rem8yo+jsv@&prPrqxfg=oTdMNY+P>mcmF4+ z_40KepPfA&o_>D+t$)!v%;)?6T&~|+_xaItiD~9_Uz)>b{+}k_VC*XQDsF#-@~Y?{ zU3s$x{p&$NIu}%Wd?Te)J+GylU-oUK=jB6d^!+y85dZ0tYcui7hqwNP7Qyv9uU+en z@>sU@Z1}W*Z$i>DyHmn3x?&X%an7Y=S@#`dBrp}!=gj!5yPS_(J zr54dv#=4X-R^)4{)H@SFp752?wukTdo@#O|5$)8B&ovZ#@TcnT)mg=-mhBDnDhbvEAo+>MDg_Tn`c^SbaGZ zHaYgb(cQG;iL2(G4p`c`nVCO&t7Gn|sC*;O%-5W6&9dL#UiNEU*S%dwZoP`k3d)K2 zpni+qU(x#8z&O_J?K`whHuS(w(~o4D$YGswt2qk)11?} zHqYy=&uRYk$o(?odW3n#IqkV$T9*7hczHGZwa3238gX9JC2TUfHU&Lj^5x*>Mzh;4 zZ>RW*-G;W(%PpYkFUzs z*?OTuEc22ap9$0VWLXvGGphQ9t9I?&yizq@mf7Im%Be+#N8LBfzN^^z_tiT4oo_5y zTCNA*RsVIsCAFB@{PVeI`-<4MrZdbcwmbCHXU_%JcmCVA&1>A5B3WV{qA_cRWAn*Z zdiu+lSJlsEebDeiYhifmo4{Y6HI-ieb5OY}uRQ5n`fCf1%x4zO-_J@|B$&yB%d}^{ zzfmOo+gRd}=6%m3&Z+MXxoyz7BwCi)B&)R}uqM;ELB#mXlv79j4s6J9xl}8g?Z+Rt zyR~~;dPV)lPcPp+`P|3f>~`nr^Cj}fi%geECY+wOF3E zXRO^G|6AMR{Uis4?J2LHhTO`@xUO~I`ShLkIv3fn1<4Q3hGz8disJA&^Jw9fgl>-A zY171b)2#mP{8#a1&%qg*5qg)GXITC`^7^%I%f+wh+m9#jk4p1b^7ziq^75ZV)0R?S z|D6WQ-<7HS-k`9swpjM{lGrV5S0&t+Sgd>ADc!$WV3qn$lQY|E52abJX}Oepd&0&0 zX&anOx+C&8`Feh5{Z*@N5|#UIcG-?C4Sicu1YMSt9WQ;?RA8X~r8O<^`kS_FmbWjh z_FaF!Wc{jxLS9*${2GtGvJTBNyV5iD?HjfEQ&8FyPv!3wk0)5@C{MJ6xz+LefvL;7 z1dqcEmoFB5&n#GPr4`hg9{pJOTj$XySL=d;ScNYe?QQnHYPETZXYWqCX-y#>zMLXk zbcCc{%uIN9+b?onWpu)HnV*)X@lu8d4sEh`VX^pneAmYB>`a-TKQ8?Je0g~P9?Oz; z7Q2s|lIFdfC7?aYS})R)>B6QT^R{0odf>l%xBtQ8mtPonF4c%#G`UOc!=)@o_4acI zWOtaB?wveWPi)@4rE#CG3w_zZE7)c%#>wlIEW{WzcPn2+Zqp8hU(?%kx9qV$ZM)Hb zx-f^`bk<8>X53;^oBWYM;*QTT8+ARN1AG9dAUsDo7LB@xjl`d zb9Z0Nxt1dT!sxkmbWU#R_3$9!Ew0D@T=*lkk!RVe0?lt4dnYZu=Afd&{qr?o&d{%Nv6KT=;v6|E~PQb~m3>8y8p`1b*68eVm1RW`J1X zpH{Q|3%>38+50VKOP4FZbza3=R{I19RLGLG}dCZQ71!o#;Pw|f1zhsV4 z==|BCm2CMkx4-x+T@n4y`myUqmgha^Qy*vTY%)KV;PvoT?>-s zQmO(Eq^xgS6+GSL#kD0IJMS_bO4{hOAVrq3_nFo#>0DWIGA+BrDQ}|eM^R>v9?x5w)~8!Oba^A>&n+#`J=Rf9QS8--VgpT2tBqv?J@Pv|!D@HLhJ z&nGR4&E2bZa#BdM%)h2-s-_&G>I_>_ymDt<&|WSty7tM_LpRtZM2*v}r!?3r&nr6h z=Baa%!G_qxoZ0mi@^7zz+M-P;}x<7h43clCeW_^A`!r|{za{_c_k1giy ze&RjzzQ+TT%%ba`c&dzRnHY|%_dW6#e(87F>HG4Gg}}yl zzTx(dbLT(ytJ|zw`mO1K%IrPvE?jS~&RtgP!}^i!#{VhL+AF;ij~gd7En1&^ZE|G? z=k=2vWs_KM>5greQ(o?AB!2CTyDSIH0Av?e}QSU zD>cL!j6}Qh{5U5T#qbn;$asG)qCYc)g|TW&e!2Dc#n_dzpWyMhPrCYCz@owdgHb=F3ZhcJL__~+2-(SF1J&$Qt8b;(|UBcLqqP) z?Oez$!oK(59Mv_if{yF$RnU;_J7T)S)>mHk-zuqutt-|%YMAAd5WL$yDb+UeYGMWHrL9*=upY*6O1djS9&EMyK?2$p|m2ItKsJiw{>JGI!t<EoRl=ula1|#D=S-S%yPH*v{p^fChLQ)Ple8y`&DgHB_G!V!6Az@4 z7vyhNZ#LI>rhAg3D~ffm|1;m52_NR|tGndva7W4G+g`;hd|O?U6!MrqOKnbwNqK#U zxunMH=b;y>SDq|p-EZgXV{z$3FCT}4y^)HiSfS49=CB*$k1w8SNL0DWTwS(ta<}R8 zzZ=dz>5Vv`sZ~5JSGYs{ozHonD3{dF%XOz3DlK8mH20gt8IG(9Z+FXF59_e= zLeh-$R$VsVrn!8QdWNu=?*1hH46Sd<%6nXR_sNxQ)n$9mENi(r;g8wri&MUOo_PL` z>(fqquAg(x2`O`M2~MtSQW9zB{dZZlr0D9QDO{I$A8vE_cO>b7s`?%C+zACoGDZ4g zGuK%d=q*diJ^dwWefa|aup}9uC#MZxT9;>=X5}&c?aQ5PVR6hkYu(fMBy*MiNt55* zdU)(*ozE`OoRv?@_i9Bj{?>C@!g73Nm!tJ}SzmuOVcPO$$H9zg4&An|)THtZn}HqHeQ&df^X$e4EYn=T-xQzh}i`o(xmgt{tK5JJaS~ z=DZoYyFh2%;w5S}ORxMqai#Mr`wCC>Y13{jl~Q!RbSu^1j=R}5FLyz=Q zos&PgI9<4xSzb$mWj_x;zhV9E0~_+QvJAT=y1N!Q-OBc~KKy2$i1=yQqtoU|o_Csa zq0e%r$fqORs!@?LAK5yUrRFdEC0d~SJhXiMhS@rYQ*t)#$rOnEb9zJUJl(#{9Q#gg zlGr$@@Mw;a*Jo>)uSy^{+~mw5TF)eYaeWNPfQ z16!X}Ff-gs+g4DN*=oku|B_+;Qk&$mLw$$K;smBKUQP2)U6hg>^)c1cVYlV1yO*3N z=jo}o*iDKR(bS9ZHJ`k%<667Uf~Hq@^yX}o(MhOXvdeHOXIbReHS^!89n75mwX0tki!TIgFbJQ2k`JJut{GXUc`kd##&C)k|orsv^!Ev)W z<;y82R+Y?P%iWJ`=KJp4XtY+^le^^Fb6uCJxzhw4ie$95#oSu|N#MN2T@B_pFI%FW zzTQv~o638Z_ptY@fLN6!{Wk&?VEey-^+&|bG>&iSE8VtH zFZO-X=~ry0YBghD8>q>~ymH9jeri3(o@Aes1tEs33@1-NS|XcO^Qdvt#%m_eb;{rW zH3_k>Di!?Pb=jnW^}gZMrQJEd=7qj0ogH=boOjNi?zSI7JjX3Rdz|Z-*YIl1&%G>j zE~`DT>3nGOW&WHmN9`+qJzTh7>ZbP@k9}P6owK=o!dG9Maij2O*7Vt-Y@44 z(4xzE)}8IrMe6m-OU$;vO7ocHR=N1`##7CPoAt9-o^A1qt%%BgqyI*wLjPI*rp&3z z)7NO`e6CMkdT8w(v)|KgUVSprTN#|s)w-%C^!);H!_A9Myq(d_d#$y-o1^LA!-Sm? zNrmQXW4`U4arFx%}*W`t{ha zlAcow9>i>mG`3KkCC{|*k>7HT6(>HfNPcAbfJuCe2RN7Smx2B*cewsSZ za!$XFn4>&RMQKjHyAH#jMYkMy%X*wIbecT<6}|D+xy}z3_Zb4DYy49aiZ*KATYRg) zc}bf`ZH&KZ)jnH^voe*ERo${|$@>_SxAXgJKQiOmhjWtF}2FE8Kj zvBq=D(c_;qGv1{-EB-st^?gH3aL4I3r#b3R;vGBkvsuf*D2a;S|4=rhn)_b%j;`1Zv^1ZuxGA?VyoZ6x5-0}RBmRdWX&&`U7e;f}O zl_i#Q?K$YY@>J0~p7fYSk&T^SSHJ6xbPSzv$a0&o&k4d`$i3 zR`U4aI!)`!9eKiL_Y0RTeJOD%N9DVjmRA0CuZsWgjOu4@f3(}W<HUf7eXwDGjsYv%utAD{5v9r9GIQmsj6QOpUUu+4ReC*lwNR4It?JE9 z>q2L2s3_m^{GKH1dI8I=y_egT$S%|lG5BA3O&Tw%Fc$n)`c}OC3_EqsjBY#^)zWW}3 z{y#}tEl{8~d2=yq)bk}O>Fs+q>!~H*(|TT8cFp|MaczD1{~ss+efK~2pxu=>a*wVi zf8A#u{&w=yJ^cJn_we^m{d~;p!ip&hrxwgiw@xuyXvnzU>rSZKtlOT8mUqlut=@Iw zMX~SGg4-z)lS}lcM%<1Rdi~yk;rQY?KOLR#UI{n2>TP!P*6E%Y(f+$L&%Jqc*lT-v zid>tBSjNr7tBy(U`A?lq+Z>@;FLis*zKJCzp4QWNI+BdUmM+*-mb*8Lds>kEGNrcv z9u-VR%VwQA8MW3owTQ`M_Fbo7!>KB2lY&yue5^;aczRnNt$>Oi7skZsXqYYaiYH z<>M;*v~GB5F;3nZpzC%Z!|iDCgibAf_DpVXck@Vr@@pM;5*bofY)W~w@~!C=n;qGS zFB`aptq+(!IH0%hRLzq$TLtGi-`}_K_S)6^<=$*n607JmKuU&PF=bsy6tn|>^AN=u!}AbK`6x~<*sw?N=_ zJ`1LjnzI)7Pdz+flD^?ilN{T;uCEQ3o40EpukzfL@hhM$ZOipz+mvlt)7D&Tdi2n- znPIDxm;Q_Lm_NsMzWucNecPt*9d2i~TTEOxfv5W3)>+af!qMsqbC`B))M_iYnYVUc z_3_(TY-jS^PVQmjeciO=z-pHA=-LXG2O{rE_5bMDsr>)UoN8wk7|*~zUtZ(-g@emw zWovdd@U3H<^8HgE!_0__%8J)lt>afph%K+4CE;N6PNT8eKivIKK&8z`?y!(9{8Ra?40bWd+7K?^^R?mF3-8PX!f!8L!O7`Z?VtQ zai7a1link{eetqmO4XNm=GCq$`)?qt-of`FZjovG)1(tC1>}nksA-$+ka>UdO?$SJ z%lWuT3a36v@I|Zlos@i%9d-TXqm2c;+BLT}9$L;F@o?6UV~W$he(I@_30u@Osa(%y zXB$`Q@wRU9)h;#7mF7b7o9Y;kU)n8y^hDJm(}={dJu#xZEKeSr>b2ReJi)m*?`7Hh z<;>5R&PpzdeasTe&#N2aZOkP0oT=2(Z+d!g&S62fgpFq+ljiq|n_3SrN=d>^*daa!aaRoM6XI=?$nu%SHW%ggaQMRtM^X|Epid(Pm z_U<-5cjw`@lGlRsw#~3eT;}^=LfMXgj|H5rwk%!eyL;c$FwhHr?8i#Z1@>Fw&{~% z^PK)B+TUGQUdsM!Q)A4kz=^+VAGo;rDePx>_roL4*JX0m8JmKyZH84_TAuNQezE3i ze)&^ksdum7!vJl^4S%ksWQs{%h<)?-LU&)y%PQaIoALeA=V%zZ#xhM`yzc0c?u5tv zGyX*>nPS;g2MadDs4+J%2tiq0?fXY$wkEEn|Xz>)~(PFFT#|EGC()!ys0 zZ(*sD<@h&!Mg7h#wsyP=^GkE5JPXcOvADf7tw3hir1Ez+7fgJ$N#|{)LDHOuVOOjl zs2k3@8nz<8k@Idt+$;Z`FVbsSooj9x9$C&U@hEUxynkHf_ERk-&f>>!?07HcJ6-DC z^R|F38--1Eqh0=0oXHcY@jmD9m^&a`#cC;~W-}0bnL;BYv2jT@bU+IZEn7t=*J)2t9?Pb%N^nXld?~s-D@NZT_qE}s)wv}-0jHA-!iZ=duYQ^l!vMN4vFk7XK`}%C&Ugq>= z5{u5Sx@UOyWK`Oo*2Jm~@dtkvD;{0Gdcvd2%u9Zh2nNlW$1*2-TE*V--Tl9q5?j-< zW3DOZPd7729(#2G0k{J+&=dSjvP+rmY*F7XK;H-wwHl>T9T_2xNa zNu<+l*$=CJ9a*&H$m9>lmX$TNSWQ{A{b14#`+|hcosChAezSFi+t*S279q5{8nOZIkd?OLzd8X`0K4xV9pxh8_Y*y3lq zWz|jV1FQx!-MnotrE4ynyla~LqfY_>PbRL6mCu>=EY)0ey7V>oV>`Rg?GPkcbpLVs}`)cUnDw(^%8r?@?UvqP~^rocV zUc2yy-^AL7diu57^SnNb{S|kRdMhXSF0F(yV8srHfQ6EqObhzwPFS7j-Mv6fbnmjh zbGu%t6oolU{@eZV`G0HMxH=A#@{6Z`Y2EtqrNhi_FJo@Z_Y6+`&O^O5mohR6gs$~o zvSc}`82mN)->TiW6SY(=Tl8m7pZjh}GWYJBW#+!VDtF&~3Go!_Syl7)=q`(?jhELo zq^4<}w|lnUw1q=Nx=}@@=IMQp{fpPl*yX3Bx$WB8qIq5Kmh9Q}_%+u=qx=J!riIh4 zG~CIXS-aJ7V{(p^Q^v+=ziy;mxnX;}WD&pA&a`Fi4CZ%k_SnwPoW;58fvKB?r^lf; zIvbDP`1)a9)T`O$kGiBZj>T80tG}ORt2*z#TWzfHhR4ei50_1R`=TMaC`Q-WqFInH z^WI~=BhT%$q?#j(`M*W2-yoM_w3KOjz2T2Ke&v1pcG*=`Rs5{vh*J>UE%N`x!{|<~ z(^J~{GsTorGUwLqE>+k1^mg87XUohhCTr7Ho!Is@r^PB;V5X^f>lst+_{?lk_3lX- z?ack&UtG5>)6dbfW4kM(a9irFP0G?mmUb2j8#SZcU(Y?e@UF{>#50vEvMvX!rAi!} zx07?ZZLoyv3az4P7CF^@_uSoC`nKquRj$&rQJry+^-+~f^O>G4V$q^27#;q;^|(I6 z@Ye>DrkeYg&KTUA^Wg8RyN9RB_em(9dpPUdhERtOZ5*2v7Oz#5SbC-5aaGTOXG$;5 zMIMws)OdE|weU^iaz8g$AK=fgoNaVp_wMue$^|>SqU`>1T>11;aBEE!bJowYy_fyM zuIjdZYrbN%Z;YwaUA6(J_OwW*t6yM0R9if2u&_}+v2&Zb`eJGX5`AfwJy*(S!zTRg=?7ysS0ZReYeCZ@Ip zXBP-MotYlhkTA1 zY9;Qy_f%=;nWr;OuiI5A%#bBB?_{*XBhTy$9A?X|Z!k*tEUuk7E8kmu-icWD_#l4P z$3E|lFN?o@YhUN0vtmciSxq`2UG&P*O58Z`WAgN0()z3qS93hOtlaeT3mePltRS9M z#wxeIc~|g#)mhvAZ^!l(MjPfyS8}93cj4}PC2D7JE8>b&z(ZYe^?%nk-JaNN9VJvO zvD;?p2ZMAQ$pW)!ua<80Gk>LJS>Wk>Rr$({+)I;IZtcsPetB(A?nM4`{u?^)#m#5a zoUd^Cis|KUyICT~6?zo*&HADJZth|&t378^+1pblT`P5$bB`61oI6W^F8Q?y@b#Ek7t&5SEQ9?dQ4C?iTOV9&`qIfqATX!ntv#0a_$``sl)xc zOKhIxr=>ngpIdlYLTtsc^vund&Q&DyvP5{M{aElNYH9dn#t$O9H<)S58a+`LnvyL3 z?XsSrU3sq)Yua^r<`YHBe=K>)`ZIvP>jdk<_1}tjDT!2e{N56{+~w)of9{z()J`pk z;3%E-NKMe-)@Lh|m2VDw+xw(URnWn!w_*9j@Fy$Pc%E%jUr=TsQT)gMh_TY1(BzuC zZ>MNI$~E7%GH1r#N9#Rp8ZRmyT5?4z>rdOVb>;7J^xOl>uT6~W`Sm$u*8$TK7ek2~ zGksq_HK^j{udO=ZJYVn8!sphxFAXlFTVxosDEUkjnCsvhdBO59c7_vwXD?pf zGDTNb`pWeb?o+plT4Lr+;g0K3m2XuO-srhayPCwDFmr_2?5TYNjTrpd?&dtA7+ zykY};-u;`u%l}>J%kyXX>i_=Rt9as|&%5U9)1Fn| zuPgX`wR^g`e%$tX)ur#1MHhb-FML)JD*m?m{=Iw8_~+LbKU?xRKK>)a%KdMChu^jC z`t#Yl=;!-8_xA1hdDr*)kD5KVYVFSDJMR7U{dfE8`|JPRonK;Y_un)XvAq<@#T`7H3~Z2QkXcHx63p3je7c=vyF`5x2X zyX|YfsMY*vxF1)_b*J`n-t(_p=YOe~`1SIqC-=IG&;H4HB*xxyeqYVMoAL8&Kb|e0 zZ(A>>KT&_*zi0Dn(&D$}<^P=WSN-3so16FB*8kM8<2HX^^XK{f{~!6~_dn~8`2YQu z=|7)iEkCWl+4Rdf_`j3on!o2=z>g>Q7JfLn)A`|V`Fr;#e3O>4_lPh5Eq_C(?|KjC zckwxq!vCZ}tHYYOlJ+|bfcv>`=0@i~@(??I|FfpotLZ6{2h48Vn0;@B@m)WE6|0j> z7d1{fyBuK2W>8kR{_|6H-Ep=zDk`#P`?g%V#P4})dQs@kQ%{Tk?4M%)z;B1n-Ut3a z_I&x2E!HYuB3*MfZ^NHM`5XQu?msy7?gGDgylu_w_3aN67D`!atM5D|z3+lPThA;t zJ6m}J|D#bkd%3p9wMMT$v^M-I{nSe^Ohd92|e#Jb7oD`;$5B^6PTyCzT~|4 zL`tb|;oNpk?-D*4#sv#q#V&83(7hs3@6xFX+i@BCOrQ_ru8Gg+e7(i_6g#2DmqPEf8` ziov<)e(J)n%KXZI;QU8?-qfC| zm~A=sIwyjzB`~}wkMoXPEB0#dj_3&+owT`j>OQ%QH?y_!inrR|{->gH|KII#`lg|3=h1t;vPN9)!0VWU^Vhd2Msn`XdKZ4S zF8D;Z#ojZaH}?9oPk(%pVSeD{{`ZgSTGUs}ld}DywDnVrYxB*jFKJ~?#lqWS>#s)I zZ8lmnE9r&o`IU#>UA}i-O={l1tXT_X%hp9D?k>K?wLWV3bM^bP(!Oi#d38dn^2E2V zqW66~)`>=CvVr6N+|4odZnOb?pPCw_$l}Tuo zn7W1X{A|l&_H~Lci@y6rRqs8|)fZVMmu35RFJ2wFG<{wDzZmsbl-yteLl z-BP0!uG`|@SN0_vc&@l!e(LEb_jUV&wWivIwCl$|QGF?Xeaf5orUT~j``%1>8hG7j zl6^tre`TZZ6JM69KbzL6ywp=7vrBi{ydy7dXU=>aUw=aTztW_%uQv_e>1q9%Fh$6J zSCM?mg%iKi%fh~y3_uwd$HlyEFbywk7o-K zWlnGEG`-cGVb!CyEYi?^(ochF8E-yY{C#|SN%TCIZZD(RJzC}`?>hdno4o6Cy59Gw zzmY0|u|^Sh%F{3ItMtj+dUf*(`O`Bx*XOHVN>cIpbv0#~YLBp_Vt>w+_w%L1^cLN$ z*w-VtfBu}=Y7ZZusp(e}?6u#$SMI2-?Ow_6i#oro{Bm!~+RqEOMBF+w(>-L_+|Xk( zszr@@vRm?%UhdS`TX#);!qI8rXHKaoneM*Jx^}{j5atcGD}ODPEM3~R^IpwX?Q6R4 zW>+j?<)6ILBu~TDtN8unizi~-dpZuj)o7h}^5V1akI&^Ve=b{GQIuF`pW}Js>dqU} z7mFWu`Q}z07!_tSuP;e6>XzASKe7IxO5I29H-7z^J*W7`>%z}FiXEl<`mEIxcjxx` zML)YRM|PXl@%Zzz+jWb}?payqwi_kf3f%JM&6eo+*B?UDjXjQce#x|tDtUad<|eCn z(eCF#X9Mr^>@J^p=Ube}eNWZhLRvoZ_7(2#pE@p8j7V1BCUFE{gmv-_-&a4+lBlqc? z*4Z5MdQNlLw)q~$i@v^7OT5(l^UFz-@>BCwgrx3zh5Y~dT(4|Ha+%lb$qn2gZS3dG zV|~*<&gD6tzMJie_x4<|b2fRi>X*J*YQ;1`;?WPsS2Fx!yZe4ianwp|DByCuG4bK# zf9I1nO+I&Z`{VZv!a3QSqxT-kJNw?=hiiI)cI}p~rV}r(?_E%TcQgAmS=NIK-dA20 zT9dxlZI{gc_yt0-9yb$R*!|hK)4v?Ib-8W0#N}nXz4H;b%bV0c9l04%q4eGN*5>^m z8y>#pb=Nt3NmVIS?!?Pt3*W`>vvT;2rl?wYFPknp^-_-Yrhi&LuFOfj5G;E_+d^~N z;w6*$mMC4Ab=Pa@rtf`Me4d%@TzF~mPUGIK$C)(FKj~RGp_=!`E06n!|9=pW-#T&r z_mjp=XHKV=M7O`?PPUd_fAHVwFDpz|&sKdVvi0vVd+C{Oe^jr>`D)Jo_qF~-!cw&l zKi)<79ei!*k=VO)et^#bwntN&a+!55PG#7|l*>G!^4cr)X_FYOVtGXw-Co9Is~NcQ1?!NcFX+EM+&DN`~9=Z5H%B+K1F!}S5nf&fbfF1)e8T9Sc>uNwcW{A zr)wI}S){WewDjlaz?8!ad0nGIudiDBTbCgwD!ks*)Ha-J=NTPQoe8^RRxjNDLbTPL zq25XR)59s(FUEZ`SD;N1QFvye`?F-h>Q~siDFIf2D>QbTW-A#@> zU;I=uW3I?PshLt?DEvA0Ma%>jMbFlqt3S+i`djeCY*h)@V$r55<*C(-Vm!4cG-uu1 zxw1t^v(hv)EK|wimz|BqzS4-q-1QR{pF8_tQf#u&`t2X;KbadP%70t+|6Z-f^5mJE z`_5#Yy8qIoY*TMg*PlNc){cbF=`C>bzh(YK!*R=8*jV62Kcd^E1)NsUneRkmU z=0=9PhVR^qK7$d36I0>Z7pf(7U^VlmebyKq3Rvi?O$r!b3Z>i z`|k9Y1?k_v*-yC}UG(^bXv;&URJNQ5TtAFUZw@Eas*RmBH$G^0==XjQ zQmx)3DxBTFRla6mIC$-B!pY+=AFMO~^#0#&#bW7ypKti>_PF{*A@s8TlB_@4p}|YC zs+2-cuMRT3yHu+zj5&DM8>{#F8CSpDw|9JbuJ7oqiHf!Eaz7@==I*dMcjJ}koP8Hp zz1$h*EB{>FcFyysx@EbgP04|V8{&B8i9acv{rB{#q@wrdHhXV4YNh1DTOGf;R&O$M z>6NIvAKDKj?by>6&wpcSoI$lK|BrxlVVU%KOm6ABieB56G$br!Ut4Ni#Le~Xi{yjZ zA@!5*PI-H+IAP{*<3Np-o0e}*zkK6q^#7!=1ioGGKRc|?zj@S7r(ouih?!*{oHoB$ z<0~uOS(g9({@!~Mb8q@@(#V@HbfJN{j8#7Be(omzd)cDRZvvOsS||tfGfw_>vCjPX zCb9UZ`CGH9)`ea^{?nCzzOMNjv%KnBF&&3`>1^{uAo?iWWa=SN-)e^&f@ZGmrDifPCO=104qv864k zd>}plcl=>h7bB~pDDI>FSC;14_5_B^eS0*n_HOFm(zhSuHZL(hmUWoxKZnZ1A6BK>UAlE3eE zoLjRu#PL7hwyQ~t+kbNO&sJ#MTaz3YZXd57D(xg}Y-T6FL$@)aX?f>Hi90{f-ER+l zT)a}s{+#|VrBLU#+Y7$GGC#ad?ttdeMJtM&ZDh6Xy|BA|>DQ&jQy1;#S2LgJdU3}e z)}-WvJM11tpBL-5|Ev+bI(+S!?r#t0gg^dU{K>U3uy3Bi^*JxA0u<83wkO6$&pFl3 zo4GtG#!h>_ysmIz+BIe46)*3|*ngX$>3{P3oK?RRkH@WIn=pIF3|?)kS2b2TvNLY_ zoPRBSYt8Ppe@{&5wLDkJ<2Er#`Y~g^g7tabk54!LcU#rQzEUb~`l`q4gXVtdf7ltc z_NLCg`mj|G*M$UI>=Jd}rxkKoGvw{r+X*f_zVklHC1rKYv|;AuEvk<+wBL6mS{Y*G6pr_*(t4&Stx6Vb3g_Rp)kCL3(O&QCh_@LX*3+gT5N zu2mS%dNJGjaBJsH!`JaOUS@JOLUR>z6`ji#y2S7T11A zXv}@{DRvI)X-~(S5038Mq`GhS*LU>>O?SK%ip;-kYN z!DakyenOt_6Q+-IXXL;6@lmI6@3Qjaq3`;xUtM?i>bnoeKf1hrc3I+$`&#RFLFRMp zn%`{N@F&hgp}+dy3E}djQ*5Gds_rne8D*V~U1zB9B>Q{l>%QedVV(Usm!3 zU3*|8Jz-{W^TZT6rpA@sMeCMJ{+Jl9_;?S40EdifLFZM&=^Rt-zUn_Zo*^h>D7+`B z@A0Kq8#LWNGp{~fAo9oeZubkRRpM4IIzP2-x<&PlA5HW)7XI;iX;Mw^-fJ?>!67Vj z;wQh!YQNGK?YZNobG=#lf!kKEl+|}n{l3d6r}m}becR+`Q?>6^NnAbX)Kt8+UGQGd zWu+ZL&f?y`zP4Pit`yvLD$}*bC+Es?Z+i*8iE#=)rmoKXd*E}q)AujRb>9W|*Z=MC zj(TmQb-BHEpOJ%vDCcY4l`nFR_^=7i`|a<&J2j1g`S!8bzN!6|xyd>b&N`tviRJIt zZ7eY1TcEndwougOb6(S(6ZNNlzJ2H#m-KSMlJZ;0y>UV(ORnWMEIq23_oDbteMO_R zv%8EW)9Nj|A3Qr6mY3C4`16Lo*723~<;vdI*wua;HT_!mDf?<%Hs|BIz@5L&yyn!) zjB`4c?6t32cv^_E!_g~zyEsdq6>$o*@_$NHD^yNcKH1<#{)#iLvbR8AD=%TJKud})6>6eI$Eub`|K*ugtWXVi}@sEeydFE z?Bv~7oOh=DPHQT4|NThCHs;e6&xJ`1+LGs(58QecFm-D8ChNJ$OqZs2BtJU8Ah_%L zg5--A_Y`ESA6ar~R_d-&7yaYMpK!}Z?{)Dj{4-zMM091C$i@|wUsNCc(8^X^DRyw{ zF`JyGjW;5`Wd%&hxnHH{!@Ss+x4*l#o-&&nq9pMVDAi zbL2AK^sRs4r%igktX(VrTQB$!^zYZt3HGlX-g;#^uetcj`L~{LuK&^tkrnyz-v3_} zSHGH(v#ByQGpLW7KRJ}6_1iB~y;T2&iJ$r`POV=a|3@(VgR0$C2fxF0XS3Nu69m$Z ztu9@D;`s9&3q0;=TLqlHp;!5KhMtmqkn0jv077-xm4m>RQW(wWrj@5&39e+PE+9#Nn?5Ubpx+3Rw z?c%22!J>EUKdHuR$wZ=-RGlq6c23KaO?bORL=7^DCIO zG+kOtaJB8bF0E?APG$`~!_#sxn#t>%j+yoZL_ELqi1F3g?pC?wCEpf`Zi=Z|(7iwN zg3sA=vtK3m?DS$Z3BQqG9Q4Z4#T>>4z7hb^pHH`N?ZuwP?s;>B#+?V%%SG#uvD#W}RGDT6%5qd&8|chhJ5H zEL?p$_L9_btN91??ylXv`*f@*ORbD_!TC8=UtT2?EWUHdXzlj1E{E3ME{nZ0_wua3 z1`F$AfoT>y54u0~SbFiHxz>)@(1Pk%*6X{u^8VeJx8lK0&cDSnJLYPgNadNiwlZz| z^pJwx;ooMQ3Eg8iKSN^X6CQ_9#`dU94`*ijWqdmSZ$Z=TV9`5vpH%x-2DCo=b7`4v z3*W>udh^eOR>t|PvMaq9yE*p8tI9`f)f9`uy%zIb_I>&J&`-mCuj8&TNZ0mXQq2jT zwL^;4(Rs_3*j+Q5>wH_aHqLVT$87BW)NC4yTEMRfQ6G}#Jy5LQG$A@)MmmQ*u=Xm4 zV{+@RqP1(i>-KtBd!!ZV*xy;Ae$3&T+0Pcftr0g_IdA{^!^twEP?y0=PNZ>lZps01 z&g-j+a((xxr-UuzjF^!*(=j~NZ`aYP&^0rvGM5H!uiGs1*z@x&-`HoWFZP>pr>x7g zD7cgRThF#cko+7Hu}>}T(1 z_;amBcGt-_R?<_=eu?Ym|FGCBY4N#6poyXTaOW4!Ft(=?_#OCz&QTpBxv{TIwH=$O2+^bvdhKIrXSr_h^6nZI;S{WIfgVPBp5 zwX@+NC;jSPFK=EGX}n`mQ@4=t@BAgU&TL;f7@A9BH(1qi^{{yqu^w*Vy~A^T%LNCO zs~TFKyVr`(FE?e`_d`>sWy_9Nb>}kR&{-zOUD%Sh?BykIkCoh~UpRy=uUnzKZ>d+#kxg?yvp>kHO**@# zWQDOwI+tUViqE;q$FmN6yxMTwv?n2L*NP32#WQ=hHayolwm{@Jql?|$Y_EG$mPc&K zo?sB2>abh-tMa3?6rL&ZLIw(a{r?5?Vr%ns3-2BHaobwKb=CGg`8q<=5^@B7_T=fR zw|(=FZ<2q(H0hqX*vxaAm-lj*<&;m6IP~gN>~<5?`_=$s8a8*pGwcqWCP^D>N zD!!s2msgiw?q^(nU}^IuHR*7^XDXYX=w|G@cxAbYXxS8(YnRuSlr1@IA(MGpGxPez zhdjn-<{w|aM3eVTirt-pvl26++HKkTt`~hwt8rT=dQtVnF_x!?`ldv+M>+026v^;o z*M=VMziLIX>whlm9ts{n-~>yjK`ko}T8_+f^Cc($sFXSa)ml!q~&Y zH-tYQdu^H2{I+xn%YwsqwwSea@SlCbczkQ>jh4l|-+s+GC)dFpvhKzATRqo!okUio zYx~{!ISDvOSq-66;3iQ=-Z8>!^ zjos+Q6iyGTb$5g6-yZJfTX2A@K~iyMa9q=eTPANzPP#6g<$PUDG3}|$w2Mj0F7G(E zge&cWdhzucGSjma=h)oVX4_*lLq2V8;v(hM92W{Ko9{-h`f#2_y{TF6hLG5V_Zw$y z^J|qonI^aEM?|t<)S5o$fNPt-nl0^$oEr1LW7&1x!p{EJ`r9m8F6~K;awyZ%wq|bH9?TfZvy{9XB*=gdz23E9>@J*9fz^jQA=-A*ztAAhAke0`JK z-uX#@Zcy6g*yG=gR~mc0n62BYVt0D}yI-!mpD({P*LTv-+5f6s&C|M z1BcX&r`dLP=U5^q_88;_oGs0ml9%gvRXBOy@n;7M|N2QeGk@M>v+T^vBU;fs2UHG9 zAMt#xe$cVtGg||PPlNh`uCIHQHPm#uX=l{#*N)J$JUKElLd5?YG+^244nTKr(q8Gln zdE6w%!lC-roby}irp}1@bvx!n=CX^+16AyL%(VXZ{nEIbY%VZ;s_NbKtx^p~4y<4h zy+8lTzTkUHOaAjNEf)*F#lL;h?pqbA(JbtTFDdU^v6t^v*NhwARHt;+9le$!wV}Xep++ms!wdS>O8Ao;9y{4GtB6cpAq9|{=8|O3Uk=21s@%~FL;<_ zoZX`MqECqdJhMCHZfxIe4<42W%(~Ym?E2bW>+2_&z&~;MlW(Wj=N!M(lbqjRqta)Z z?0q+9Q^e6x*D6lak{Nl+%(-&K2XzctEyJ>=I z*=-xEHcP)9%fH_1d3fh=nAqWOAC$nB^@LFf| zS*vnh>uvMbk4~4y)>LlOn|6BA!&$q_WMnEBujn{$vG?gIeD)ys`K!k5g%Weuq-;>{c&IC&0BW#}p1Pkk|NQf!jL;{mmhJ4hY+kyouX*7L?mNm` zZa3e0p1*^;SynpVKe*z$&W-i40v^EfzZp`7gVG561wWqB8bz7%5s>j{Zrs3p`xSeZ{h49ol^lEXI3J68xYGl}m&*RHG7o3%^_I}I7F+Z- zP(?l|+H&5a*xb}luT+A(2y z=_f{Bhrh9iA4pOuF61k#;ETVt!Q%DFxZlyYzAgU{ynQVn$C)6GML8?n+g7G8xprjR ztZh&C^p$WDxdgu2hAbX|I5iTXRbtz7pHtYUb6)IJe z^yM4(#P4ZNrLjk%wmLUm`oDM4L5b>;bH~%JNz`TQN_8-a>Hqe>*rFj)yP+&%?eE}{ zBb(=!mdthG$=+RX#BTSwN}27l`!>&6l+5b{@){3Det#Zb#0cFR9jH~Mwap;pB>lie?DPR>}jW6$B#|_ zwdnLO#f^LReX`s9NBjRC)-y}*E_E}Xp)$q;KNgw=jzSQnbo$uLjsIfbE?n1@? zd-i^r*T`3JSM;%O1Gm1{@+wZfDF2>>=0op04K~%CIxTWVdf(mqKb9O?eLh=Zk8NY* zg39-a`jcl0PfRYbwiT6;TKM%w?l#XR1Enj+BPZWWyY#ZuNj_{%r1pwwy-STZKTLCR zSoK%&apJ6Ld9qx~vwPT9eE;_1UWL^n?l%)3%;Mhcd0X2;Zrx42UEj}1^vt>$CgE{W zb0@=@;c&|G_fqjLcHTW&s_Axb z{SSTGz4YVLZ6^C{Vx=6)rkcLXz5D#usa)@%lNtQFET6-+Sl;<(sqxJx|Ef`jJcsS+ zlV9?KqLuIEosPUD&~*9Hi`I65C4P#@3q04$2$XZ3zI^FI%jMrkc_UcDb1w`2@LkQn z>~l$u>Xivx@WtWHX5Tesb9~ z;EC+d!mjN#d`k*_cwKMZyPzM^Vj;Gi~h+7#r)5me|Yu!ny&Sw9Cw&>c-EUQtLNNo zzpl%#u>8bn{Y#f0>au@3t{=Gkp$Qw~ots?xi{A9lo>#p0#Fd*thnCJ}*3afUl5{Fa z?U{+`bKcg!XV3qx{4HQu+WYc}S-j^C{flk$xA!}C?QJu$fBecq@Mg`XxU(%fmsfSL zX>rv}n_5>d{xsjQ?w^jkLs9#gESL4pGFjPog^Kd3zC8~0EKk_CJ3Zu z&pc8-#bRReck9ywsT{#+A^%+3Hcgs#ZC~n~fRi3Sc&1L3iDa|gq#-c3)%sG_wY2b( zqZeah`Q}&07~TBN+@^EB)$YjML>|us{^w3i_e!~+H^0|xZ_}D1D=AzOdbs4okKNM@ zqgQhn*loM!cj3ghn;V!~xBqHM@j73YleJeH^uOj=tQbboSVlI<1-i|LJYI&-7bZ$VFB2ihfM@>MG$M zSKemFJy_XiAI*N|b?bMeMO_q` zEZ+8cwod6SQYraWm`8{1VU(X`CdY?G4O(a(jf6R&Z~g$TFS@hqwIV?OZEKe ziRT2WTgJb+@9wa43uy0X3OPPtG(rOcl+5B!jT3-1<#axuP&*G?2d5XD71|V78F=e}hFY5A_gDXA*MD89IKQz}D9GTR z)yII@2}$SW9h9ZHrhWHpH@LlqJtI$Hh5MnjvVF_K`JYdo6#SRFwr#`PuKi52_@xXC zSm$nQzrX~x{mR@(|0iw&$LG)Wf2e-MP%TeBd3NX&@rv`+TO1GT&31K4vk*#HQuF=F z`di7XYI#z^wI`~Z$SpfxR9Y(gzrI(DIic+eOYg~*vsv%2^|G*TDxDRrcxtO!^y0I# zmfc+NZCXUcx#Ba-$1aM9EpW?G%X)t01yk93->h&td_F8h^H0>G3Ecj^t#2&uO%J;E-d^Iyo4-?*hx5G7 zT<>}-Gj4s^_Vdp_8lIjw`TE;!(xE$jGqx?e_Q=!WzyuElHP5!A_O40!jE`C}-WW%3 zbqJlg>|{`g{%rkUivs+%^-OvyQ{gzV^Gt^GyCZi#7fhLG<9sWj@!qwfRQGQxk?Oq{ z+mwEN$Z4o=y*6QK#O56vrIyU|Vl}m$b?4ip zM|UnnEs7B~%+?FtAzyr|=)$WbucdEuo6E{fI#84#Xp(a3RIBrwss{!hatk8Pc1fHx z<#Xw4;$+}pD3(jfKKGDU>895UD4%b&8#D(OJm;t(fpOWBj+ldH1KvpTa@ zY&@tTB{_#-PJ6{sZQrsJAIhHW;K^3_+94|4>l-siMZdvDU@K%WtWNHu2rKwdn1KhDpJ9Hk|V2r8E2=aj}wJ2&U3=1(?X zW1fBGua@(xm(Eg~d)0WV?_8s*XX|dR%y=il_hg-9v!~dTc=HGBMb$?*J*JtgHx)0D z-!`>(%kubT<@Q1k9CxU++|^jZYQ%C|!CS+#=NZFQIjE0nZNHPLw>bW5Y42 zUo*KhJcP7Qo!%LwFzd$`@6xFB2afz-j4!Ba3Witi|8U`?n&O=+P7T{%Ye-KlzuNuD z;qDu;&S25b%Nsp1PBC3H>E(PjOYimr=hdR`6_(0OTl4kGvMn7a-5v9NB{U8n68@~u z>>ZTY-*E1Nmi+4mhOAXC)3uICMgFQ%5AjG0h-P40!l!w*>HZWACSF}8)hBy+9`dZw zU{F29@xxh)<%!EG?_Z7Lrr{0dMyidH52bpfn=c-z5;;iQR4kpIx{s{^jRcHSFvEV5eGoQ@^ZK-GBr-e5A zPU)Y>wR1v4^>pi2leJf5Cu=%oJ07|!#LVbmmoIr%bM@x^;n(Ze%IQ76Uzcxx%)fq% z;q{=O6D;iBoxaap+v0t(ernwt4Xw72mG-iwEKbLMZkOo1^RP-Vek*^Wb=sktcNNdC zeY~h&xZ1_;{32Wa>z<3`?e6o;*#6_2M?Xb^ZerO3B_`?MXRLINi?SY=%;opU7H`Ciruhp_AM8PZz18rx58c=|5;_IA5j z@w?`A=IrR!@4a{GRHfc2m!A6F1}7_zdsj(sT6WLq--6!W=bNW|j5@bX`F`k=`lD;| znI~=WJ#M&c%e+gxB1Y{WpDo?&9{Y?_P<-ay-CXQjWwm?%==6Hz_d8#^@^|0cMvu;& zQ+^+0Z#tT^v{w0T@P^m^vbs^3Wt(ynGpi>~{(XFPyMO%SzuWGvJH7ns-_$wtUaX3U zHmNgovo4#ycmgwiY9D zpRc}K=znQWp4HiX?;qUt3}1G>mv7#3arv|r5~eS%_@*W4-CoHvoyGRRrku9^{*LLs zwl%3)U$b`y?cJw+wM^;i5ua6WLsrd^a0mq4>qW?y(r^(%WITmHA8sPN^#vX_WN2p%FiC! z&DnPNQ~ZhfKkGIYZIjLSUpJ8}pg-44b!)!N!yf@R_IwQ}STD=vItZWMlg(d|o>C9adv^;F~wY`f~Bs#bXr?iO5ecONjIrox{h9#He zzFk@|UH<#WqX(boAGmJw;@nhr*?7s=oOz%5+b?t{Z;jdb)=OgUE@z9X_7&v^zr}Do z6!&_5HhkC4+wY!z&|Y=#|Gl>E!ZQ8GJB7}LUR+Z7Y~JCb^Nu^i552lOFRg~*sjr{q zG_EI}3jVB;nJU;6LFfxfM7%;TtHeBEl@M;KPo$xGj1yhTb zLk5GycE)3A3}?1)DdFC{b|aTT7~?TEhOF(JD{|cynDHrWGpo5_QE@|yZENz`B&LO2 z9D5mpo|jb>g{PN?FfWwiFm1Hp>L_MpVV7UkYqulWO_uk_MF$z-j@1o2#2r33PtKY@ zYlm}=i9k4Wq38rRhSj38|IE?&x^SKM9kH<8y?x*1yxAWwGtZpg{V8BApXQ;Q?K2NM zd=A{p)F{0AS5!**^CuGoL>sK7ERRZ)+k$QR#S4z z{%Pw^hp<1g35f|E-~Vm>*DL;uSF7&e=BqZhmIQM8Uc7SfpyvhA|7QXhzAF`bS>&mc z&3g4wzK`hU%N5nZ=O*u1VRpFXNWS&D$!Xl%)c1+&3r8F~DSaquWuvUhMGF!BeQ&Gd zj&EAC{ny(szyF&5p6A!;${yg%`mZX*>TN{Qq)!Ka8c(sPPkYijQRUPE9h*k)R^@&Z zUlGL?p=Wy(zR#EAydCbdC6%!)H-tAaC|UFCLB`~B#gROBs$i5lkj(EexT-R%4u(^5akwWSB_leO&l^6%-3ztsmPZD~=i+sL%-$I>6?b>cTqvf<+T z)Nu6nN&an#MW>8P@=jjYxXt;v;XwKS4XSqdxyqe> zk&68PcXWK>n(ZGp+r;n0_9c%Dg=4wI;%ufZ{r_`S%^sfkgA$rQH&u0VnJKdGn=Gh* zLrHY5X>a*dj=e9+Za!*TyjWNK?neeUjs(TkH^SH4m{uQoX`hN^#ObXKVrQF--!nX0 z*``|4Jb`Ile_!nHTg@SDTeW8WPw+79l-T$Fj~oR4zKh@3dD3;UlV(%F9JQ+% zDi5zrkvgn?sX4StbBpHF_J3c$-^+>aVm$kC;#|M-^zwA^XJ=;zw{DdGsp&pZE8C+b@6v?cby9K?|WUEKd-uP^}Km^mmmM9D;697`p%7GYj*R*NzCp}k~+97dG0Sq zi}St)2TIOgJX^3v?O#yxEqAMkMU(eQCI0;Tyr=C$u2G)N7Q@{3yfU$+%d^&PwfT@e zY1zl~S*2T}Lhq$@drjFB>by85ZttoUI!`)%)q}sB+VP0%HEZl5#`wt@tG-pvSS9yw z>jT*yvC;*fY-10JZJzy@gZaYjXL9FTw_4eR*xG~^$yCROSS(uIJX!zGndRGL<9Q#e zL?ktOU5+z2dUosUo0jLT7dojd%=EnE*qdUMawK)Dz0luHuQ=xHxcfsZy_M_y=caz$ zX)jgZH1!+}dN!rx4U5obo7SsIS3|_6tgc^t;a!*8YA1sQt}(f@Pw1Ug-fy5|o1125 zdSZu$z@cYH%WKbsn&pP&tIcF7tUk;3vv0;+H;d4@SNCU4dgNQT{_(lKjLkmR!&)r) zHI1`)-cNk7l5>99w#R4WpC0%aUif(O-@?a#)HeL9xp|WH$33MznRQzEt)Dl23o0my z<$IlWU4N%|8BZOLdeWo*AW?VioS2-{JNAW-beMJiYuW@D%>Vr%{iWAo=ZVUKesbGo zZq~Z}F6eliC_DSc&HhL8*zWqts9&_2A#~Fq>VT$N;FM3Yn~#d5`zfTJ> zfMm72&3~RL*Qg{n-H^V-CH&LHjZ1U=TFxm4Tz&GErMG2F$(*#LVxz~Sqj%(X$7Kg@ zm|$~Ki!E-##QA$vU1S9r@=c{~X+1f&smUl;bB_D7^02c?3)aWp?wF~0qD1JD=a-c# zg=VcM7A1-wQaaM}cbUSP+=tuKIlY^tx1Q8KeTFO9-T01SftYUdMoWp;Gb48-Y}s{- z(e=Qt){|eddkaVITJDr01WUJAI@4e{i4k zO>A_&w5v#6Tl~Z0OA7DoeBW1*wYp(KKx>rTgjGUkw?L9&L+Wa>3hZZKm?%j+EU`SJ$Vp z-?uB{KHIz2M*iFL!oux4W8?GhJ(l6iyHa^V?Y-@i(h1X_{+re%!X;uJd~iqg*_Y1A zMPF_&oS$Ir*m1dk&oaIz_jlbm7iF0u`|rup&hS{1mR**b^Zh-4*8Kjb6gSapWy1~! z=Oc~PmRE0oX>u=j-u~QT*46X%mnOW)`~7Lt9si?jQ+K3Z|Kr0u=|=qOsT>m&%|sov(lSRlw^{_g?&eT~K^`TA6;C?#YEl^K3uPe=lOUsQ>@%*8Lk} zXT1Er{tM6ZH_6W@b06IhyL`h!j=oEi{CaZNKf3a>?QPM=!#{8K->)zK_vWhk{?ki; zF)+{LtF8KT^=5Wm&DILH=azdr>?iElcWd3wF2}~=$a}u3yzSgN-L{;&I>zsVzR^1aA+_X>hNK0P;Be)03<_2Q>?O^x^zdC~jI zJJqf{<<}*bB`%h%X50VW>y4A+&38&X^OaPVX1&{W=gz+L*K@^G*Df^Bdw)V)Z29?* zxgVwe+dL1o(A&DIuK2>^)52d<{(gH>e16`E?ds;or%bBc*nihEy0UUp-R?hkCf|7R z?Nt-k$@st*ep}Vo?=W9|_Uhk5ece0u-F2T^`&N6}{F?87^#V-S%-?4>^W2AdPTaB; zck=qS9q&2y_3}#7HK}zU(!MX4l$Aeu{(A?1yK9YgyLjKM`OVvTJoNz!r%hpke9+X? zCe0qdtYhplUv93PaNPTf`o?QKDw7W{UDU&)HDBxRw}ABq2I~%7X=CP4OcQBnXm-@O zV9&#Mp}=p>+$__zt5>ss$+=|eZryjVRmoYFUF{ohk<;zU3E~Ap?c9%fX0S0N$xJ9< z6WTZZ`n6|VC$D6!77RPGcaKe^!rXu&mR2JV#Um^W^$j<_VmWUdd17_>YonzZNpb?F zQ|2@*lMyPNIYUUlch4C~+c#geO%M3=Y_lljuOv6~?edW}r&HcNJk0q^d;mU?-tW9ccX%dbZW(|u(4;-$p^xVII zwck0+Eo5%1*~B#)cLWK|eR$*4>LV@zTXr{mVrt6o|LM?Qcz@=exqoK~9=3Kqb@1F9 z@i!KS62h2-n{CXa?w@vcuvUHom0gR{Odh!SiDw-;a$QD5BB$I9}gaJyZ451z1kc-39;P2 zyfIlb@)Q5mAH1AjwdEYsPIiw&o383V`FgNjis@$F2@!>3lTr`OnS0W2%cny!QLN26 z9Zme4jgEQm*UUO;y@jjKDb+}7I{VGv(ih}-H+e~IvTS&n}scBk$gk8>VZFg3oF*e-#z8M%sV~EvHt3-@U;?` zddqmPWbq4VwTZBFS|64>=U;1aUM8mdhMn7l6hBEre-k} zrnm+adR|!(D}A29=QgX!gtbX-avlr|7EfI^J$(B|@fn+sR?kjZAMX>wczV{JUMD7v zwGD6BMTAZ*V}4Mm@w)Wa)?+_j1fN+LCNAXA>eSa2#PRpqDQ>n2$7Bq2c~m%R{yY|4 zu>Y>ly=!&Oy~#eCIMkix&ogXpeHd6Ip;CUt{Swa#&6)kI7S4O?)~?tmcEd|9RF194 z&ZnPs{jLf%iQJWi7OXeKA22ZOIMCRgqn4k(Kl6fOrvJn1Up_@mFeu!_E+GCP=*0Eb zIU4*7Aw7F;p3D}V8@r`WCy|9MW7V!{9ycv#9@DQ`9vAe1!9kIKiB;Fc&th2g@5YjPUzEVu*iGJak)=PJwL^UdZrB{oby_euK3t2rw={{)9VR+<^C!K$ZU zlk+sRCwi}W{HiiHw%8*K3Kd)T%sqMgmcFFq1zQ!>zcc?bMKTJwB&_(*qs|y%bxem* zhJS{7_3u*Wk286eM!6o0Sw4}AeZ}pQbEGQ`wQsg@FmN}UpwGQ+bpci> zM%I%{uGQ8lJF|E&G`zjja59qF!1nx$iUdK{H$l_&WmJt;iE@2Pn)Ia1C@^wna^JCS zpZpFOwf}H<#HFUlrn{C|`lQc2y#-6Lq`zI>uIs9PWl4#h?zp2>V_x0q^We;}$ z;8uuZ@b$XFCFY|#O*2jNZ$OX2&Vw>Hf6hKRg(-WX)HbQtOrLDlw9T1WlsvngLFCqv z_+_h)ez00veeloT%|8@&|Ij{J*QnUM^1Ivq1*#u?o-@lFViei_E^%rn3qghkb5A;;xd2V<{HJ@KYp`=+Ym8xFY+Ex z;BW~)bRk00eZ$@QmQSzT*Gdc6d=M%se>_*qKQ8rnl>V}977qpLo3=$69ywUHU1($P zg+00dk4m16*%Rrq@d97@go|hII!~{9?IZV7jpO2u7f+@($)DOLe~N#<=W6A=-4*{> z`KSGOYT!}r_?j8i|4x}3$#=(s$0c9n#H6i1ETZ1mw_FKkHeU3}l*8bKL0(r%;JfgT zhkZHPc-Hm*WIwX~YkAoIrd=D`I;5(rUc0RbT_fBvl5|6yjLHR}X^K9?J%_wLNxU!`K;W%_ULyII#C-b{QgY|hL+%k!Y?sl-!U zyvlK3eV8xL{={*<=4Wi(8b|)9M=SPzUc+B_n7{ugPq(;^*57TnCpYYV=2?F2{(|*o zjUPL6Z`Ae7){eilj4xr=sr>zh^V`*V`c-0n3ba3Qss9?^DR@2no3kO0@6^}UkB?q> ze}bd#%zs87)`_jl8LF9t-&@-E{JIvtH`q|z`v0fL)uJ<5&i(J4{qt8^K#0|X1__gs zxBqSX#csB1`NKse&(+s%)m1gUGVkk~Gk0U_x%p1r)@0HD&8uSj_^nzkx9C0VX+rDg z%6|wruvp4EOk8%#?C*)|YRvr^g!a#spHlO>vUs|OU;YYhd*0@ic3<^v9{ZjBsJjJ74j)^3H}D#sd$^CU#Vv(!2X{R@ud6@B6LNv(LTqZ8%VO`1*my zlozh@THHdn-1gQS`Tb9PJzv#SJ|+!AQ$@Yyn-)0zw933tT*q-#tEzzSl%<1>K9h3% z*X{n7^-X46+&n#G?pgM&1_sk+*i;Tb>rL4WxgWy!+&sY@=dby2Zt1NG zMZ?-1mfq^0?|B_s{Ok4seT9j${=NA#A*OQL>R%-`0k3^(c{)=$4+ovEyc^H!*BsxG z@LwkGt<{6_S_9UkZ8yc=X(i66ef2y2wvcMiYNn?=I|Ml-dET0{dPrTo67TtN(VQTz z>$85}4rGkKuxD9v#X0MHxBu#EUuU2HWQXRj3D4G7oZWM8f6&yo-noarC9l#o@UK13 zs3iJN`@kpRZ5>{`Tlf6`zOw6j_=C@@xL@se=8xFBY@7eeg;|x?Hb0+~-_Uzg>$iN2 z)!kn^=D%L?_3HJ_Yu*~GRNwm`=^MTI?X%#z5Q+XrJpy@O%Wu?Z>^y5!dSKeKx#ca9 z3>D{Y1zUZ7Q~CDa^@mnxJ~PzKH9z^a>wC>U&r?pHcAtscJ-2@Gr(ajwAL}r-JwKQz zP%n6u*Wra_%-^IbYQ8$2aoIDZRx|#4{BUVn@x1N4e=O%2h)tESdDAPRw*TC#?Qy;P zDi+1>JNN6(-yetl5|yPK~q{oJ!Q z+@0>By;891-k+6)S_xCjYNzhoW%f*R{oSx+m6vwE(i`&H8*6twGJXAOmDv8Me*eAa zq}lR!yEt5az9RYG)`QzC4lmALUlE!S^&)?@e{#k24|U1;Z!dbp^xK`cZa(_v{5I~H zm-uXoex%>OzW?*jNk(r!GB4+-zIWjNCoSO&Z8srg=t#y7_#MwR4xpf0dQb&L8`|p(RBxINmiZ zrIh!>=NfuWa+5Q|FbWGu7z6YI)|x zI2#TKDHpUyux68rJi|J_ z&YmobRSz5I>Th|W+Y@)?SUy`#^2U!|>(4IjTlUfZ?7Q|)-nw=#F3;a{ZttC~3s}s4 zZgAnYH$U-y=c`Dg&&|7Pqry@$Vv-YgT2aAlI{`&Re)@`|_} zsS~rRt{7Z-{B=A3*Xec7^83pEOMkyMO}ppE;|I^P?|I(5$N%;H)CJ*;o4$&tslSP5 z$Ygx?^Yk(^rWZ#v7*A|lo4)Vqjj5uRnTOup)i1ks_xZKoHjlS5v(!Yt(Y9?%ewgl< z^VszJ@fBO9hSVS482|sS_xn_#YXM6n+Jx*4kN;>epL%HDv#+z-(u`A=+)BL|KKEmge{N~1+7_a{~^SFW9@(JgJ zzcs3dG23P@bJcgVEdQ_b=3MnpU6cKvjYCbs^nK<39!&qj$@AD|*%W)VfQZ1*gGadE z->4MZ+@`j|=+9OCi$bB-kG6(9sC*{1nnmY~(u4>}?!}hH_dcD^$@_ZpbgShyQC8Kq zRk!~go7wuBum7>U@XP|crt7-vzs~ykENAX@q51##qV)~p9~$2LY^JuKb?Kw_4GF8< z8+X4dyq|Pr?~kqbr^Q~heCQri+CO*SYhJMrbIMC+ehoCOn7b|J>)CVBWoPD^9}0gL z{)f$xt=3oY^epp5*E^2qI;gwEY+m;M&yOSTc~(ES5iu;>=NPk(d)>a@vcIMGAM9)Q zm^JgdhUCvhP4(~VI?aDDzQ15{U($WUpC4ORS9)B19I*EBd5#Io*z_%u*VleLYp#3U z?L*~T}-2{_fw>mVR ztC-z7(WL*S-W2{tHEU~Le=KI)Qgx^FYxnU#ANx*B<1f8EUqmW%w@k4~x4c2yqWOns zsLJ+-9pCqQeD%QE_%IYqTQL7m&E_uU2iQ?2<;ohKQtJ1qUJA~V`<%C9rt_U!_@_ib3=s_ELmcKpXR^Yo`I z7P~q!Cz*vB>`0VcUt#cft`U3j>181WUw>b!JRvR2daX0#uwcB5DF;tn&9?sy6LNO7 zu4~JiKi_w0+V>q^+46BSeE07XY4Kr5b&QIMpI`JP@Za~UZpq_TTZGmwwblPS)5yZA zJ^8i9q?KPJO4Wqi-q?sbtiHbH`uCQYjo*z*y{upJo!s3S8u4?@bw7QrvKf8X_g@q{ zJoWR-<#pGxpVWq$?ysz!n%D2m|5$Uvy~ond&atPD+-c!n^KZtzC*9{CFFw@#QTf}g z_j=^`hL>^ZRo4E(kooH2O)o{b9K| z8Z#J@Y&rza-~9J0uX11BFV$H)MRwP&I%adG{`cp|{4HD>?mcxcOu2{x&K-(}GWT<2vVET(J44xu}h0i{k@*g~bK;4j+%*@{GAW$2RQN zEyk7phw2aX2h2XfAoe2l?0K0>i#A`@I58tgu3nwB<;SAf^%JwtgfHCIZ4^*eR)2D% zNs>+eHsQ@Lv;w5(p1!exYr};ktsTB?aGnZ6c?S3cj)Z5NEUtnpr>e)-n zE}i-^|LeU^@fAKt4IccEPIz2+^nLR0bZw)f^Y+F55_;DmfBSZ_-E#S3&yx)#0>3C5 z_)R!ki~ zR(#5dnzY-tX{IU$J`)VKC%8S)`y-uwdHupiw_UmJ+s#Zak72#DYW~-_AKzmV4m|w! zrJi%&q&HP(2=cJh5M^X$3N zd*Rg^D~8oSZ`|wWdq3&FRSNfy&vV`jU6P33e9u_@AH%#W(dsdCpr{v81-5{>`&?!D^&uUm3Tua%seF-L9N@paql`fp$J>kWLi=KR(B3zdIfNMUC?EK}j@ zl*(taQ23Wj>``(1oTmniCgp9bqgB$U&%Lnt{kHuUr#5jj{#jgmAU@JwR(47DUN(CT z|E~)qUO!#T{=ZU@A=tn{DouGuh}`ppC9DF*dz^IR_;>g0@fNJ_<_#C-c4@* z*IYkUf4A^j!Yg?Lub`!$`_J<0)*dc@b8o)ZzrTyUet(+w>G84JH`W`aU4C?HZg$_~ z(0=&a`9o5Z7xr4@UFO%9*nMhsLtV}Kuea4Vyp2~n_WCp{lNP7)zVBswzganVJ>GG+ z(z>4e&he8ecZwop*osAh7+4=kEc!7^{8h#41i91dsmtGl>sV->Vhxrx8a zJHNlY(z!$D==uezGd2Hw{o6hHigsDL#TA+Cx7zkMZc7Er>rc`s*qUp%+MqJ#sFD5# zg^9u@wSp&7X2l)9bmociT(j*?y2?wAt>rQ^U$St*t@=xs>u&KogytDPkU05PqWfJo8RT|^I_Pvhd&*c z>)rb5ceJrA;%3&eo0l#yzViGNaNpzq>B{fTMqYQmS{hGmxV>=ukL`6IRi>^MTl!4!KO0wSzrR$m?LkMv z*3Hki&Ewl#F_CZ1-TT+S?sK2B;z`T$!|#&Kwpi{BKdry-a`J=b3j1m6za%I;zOvo^ zTjK0bZr+8HCzSR)yXv2M>66&94H2g6y`O){gPY_rbA5$c6?mH0 zvrLn}U+D1kpSyv)o?PnFOMHtJGcTWX2sL<}f4Xl$`L^gDv%7*Rk3}~f(4D_7F5Pxz z6JO##U5Re#Yf~%TFV9w1kV$eqv}cFHlzAoBHzdy0;+bB$H^5~Bug-;O(NoQAU!P)> zDKkh|dOd1`me8zUi5V9EzOG|^9Z|G{RnbDhw(Nzr8uQe;gZ)Q-O15UEuB%gz(QKbz z>N@dk!O>&RQo2h&MohPR^XvYvTZ=!Q3l%)r&lM)d=khZ6?7n-V)@i>wg(0=f;@_w;wxuKj}YX;-U3to06YLhsoB? z-Cnyvj|MsuHW<@TVr=okiZOQqK{{&{#ZmJf26f(tZW8}tXD+^1+&T8AdZ@lv} z)92m)tlE0pzuncn7a9+omvXHQnilxGYW{br*8HPOof7TBx7{(R(^~4NrE%it%2WT| zn7cfPJ6F78XJ)E%+x+U#zfXT2o6>UUkoJbkVu>>^G&VHOtNvE4|EjiL|BcxFkiWNV z*H8UBclG&S=h}JqUHm(1#{R!2H|Q1c+01x4d-Z(dV*=NLX7C*n$=s9Ub!V0OCG~lC zFIm*?ep48B<@<}nau1g6KVQ97FLc66HTjzT%f4}F><{d};+$|{`+;SijY@2*XPQ1L z&v)W@D!ar*@vixy-WhinUy)dK_}!deZ}-lxvs=fZH-A^4{JNOuZ|}!V-5^@ERDFN? zv)ZHVwI5^do#5EN$zsQ%i)n?M<&1+l%AdYE`zQOS)s2-_nM-_Fr###qbim-}qe<6Z zw{4V)+4|`4iyw``zir=#-d?-w)3yGq^Y3gob8h%+d3S!upPxE!zJ?U!yiqPax)00*;Ek{d@3GGa0z0;=LkE##QUg>dZZttlwrmw1cKkS^; z=YPJp*LzD;dW!5#iP@4F&#mXh?mfMrWXbxsp#k#iXO>QFy4-O=T7qejZt+JZ_WzdJ z(;puB_x<0sy(R2%%S$GP#P0j@Dl_=vYv0e!JALylDs~wk3P|_dm8?`h|NA@M_Vk=9 zY?bYW_VF4K22QtL-r96)_lCQ7Tz}o}U3;P}dqR1S_y0A)H{zP6D{EYJ$%~es|5<9C z(y5k?Yd064N>HrKeYPij!icwkPN5h6{$)olY|a81_EZ`ZnEv zg;%nPZEEbEDOJt!g%9snZ~ORU{%+3{21Y~f)GM|3^7q{+sjq!oT%Nu|u&Tc_Q~vmb zxb^zZo7eQ*`I7qC>h<0}HM_K+5~OHdvLL?w zz(>3M9gL~%`>&mv^{kfLYMPRso^a&BiGM#j<@C*c5W!-6bnp9SX%5Y)f$p-p=iY8K znvox+_iXpRAII+Vlyim85~#o3_tonD^WO45rOD4Ogc_u+Ub}qnXNQE=XMF3QZ;39s z9kS`dWs{1zYIooLDpB?`)7sAF^7{1Gjdt@)zP}O9cK^S5vgL%92Wju#fB$QW!x5Ed|zX@F78`*dy~6*Lly-b2xQr?~ggx&%I;3)N9zo?7GqY_qz6XH*F7ht=shA<-LNvKdKT! z#dg%cbNPB?*VhAg9yF>2@m|;Vk$7S^E%ei!WaZBxJ{M14x3j%7`=+xC8s>&sKiw^)6OwFX^QQZY`|OWT=N;LXF1>c8o0y;I ztPj<1pZnz4Ki|9dd6U-r8+_p%SI%zObnj=y7VlTl$KL$%&YyYmi1CsuefO9{?05Z` z63%zmE-%7ioAo@+iVj&mzRqqnSBg@ z|3jnp^`<>uhqYZ_2+mXcv*-Tf-)zR*)da>IP-b$j!Z|xSjA0xhf~G$0t*(Y z#?8n&#&xRkJ==2DV=Z=PV$Z+6&-i!S&YAXQibDGXzKDc&JnegZf7+Bwer}wh85YLI zoo8+C>wiCQe)ROpdf)PQRr?ODT(H~a)8$^>1?p+FE{Q85-KSI>XIJ%bWOJ7lOVfN9 zTGCPZR?O@7{=XXQB*nv3eNt|<9u3`dzWVH;coW@HzgDK#b5|riyTJ9uwS99ugV?Tj z%(_f9oM+dFojzhIP;m8WW)$bSX@Aa@@6n7mzWUm2fuHy)u@cqakHasYsjXQ5hpqTu z=(+m2AEzBU&*GM_gn!|C|LZ>l0v~*}nbEN%<(+fViK|r+vC~tR@cd|w+EVjl-t~fJ zVIDu#y~$G?H+=qHYjEd*p+Ij=)D$)O^b=bPqBeR9ZcBMkzGd;2FM^vS-!f>b8Z`?| z$=Us7-n4a}uSIWI_xalDMaM5Nmd$GBZ%Dlyyx8*n_6KLQ-?lO+i!HVdxpw{i?$rUyHEGbgQD^hM%5@6$QYc@?>5*|l!Fo+$fTdCN=t=cXai=eMZHpSvLZ!f|=T zyU%ekGat>LH@&$xW5<~e^~&mVn-7G(zLM*)AS3DUeZ!AAS7uEY@cwRaXW>EZ54N%Y zYk%?ozruHc&pmX$Wcd88EC=U&SChVSce{gUHIKQk<#eNX{wYb)eT%Zfdn#?xTz{Op z6Lp{IyI!vBq*$rg{)oo73SWsGwZE^r&35cQpV)PbV|ieH>gO8$T(?lAx?4>j&GPf@ zclkH2+kbA3NA~giY7ZC}axA?q^Zwtid-kHe>00ehHBKqF^0w}|9{=v7eD4F>KRg+? zF4SmyX>B^JZuWfd*0~Qh8-}XPtYlEB^I&jqUa+2f^&XyJ{#%cJ`t_D+8*I6-HNyYx zT%GHJ9*$r0uUGbNZTl-1R==qchtZL*JCwE&G;Lc_@7p zFo;-?wB>%)bFq56_v&R`S2=tO9=!kj znDy8AdY#b1Wr>@5mTZu{thGhHg!9$h`$C&V%eK5Y8>%+XI$vk+k+I+@B#} zHgW3W=60?q{rBrKwicdUJt1E8%Ud41U_CLp-c@>>(+hs{&u`sky+)Ct|DqMo-a=dZ zT``y0=eWkq=hF8(@%Q$1gN9EN{JyBXsNCeBQoFa`B7YY{^^wXQ%hq)lKTnnrE0|pS zb-g&E?%!WpM5m?t;Zpek`<4#KCt~i zXDxs2p4n4<7D=un!C__-h70we1B*uRFx?e>pI~R6FZtj73%o@y0QO3{rZf%ccOyi37FTPh|70r0xwr}m4JAN$7b_#~FX&k;A zwZc+FIQ}lHi0isFG8cazvvB%xk6pVq^Cb`C9_#h9#GOt*+q3=K(ZIeHEwOFh$A8Uk z%G&iY`H|z7)}M0v3r{^w+8X`KDkMewyGF^IS;xNJ_}Md|>d&*})qm}H=FI1R<5)7LiCU}b ze3r*ZJi#4t4sV#JQ$5ybgQmkVl$D7i-Id=Q@aNi18$ho}G zY;kD1v!IZMT_xLu(3pgb>E>dXQ9k4e64M3qvF2CM^$~__k8bO#Tu5S zpV^eywRR-T`cc6D;`r`YHBR3TS2!ocE!;0Jr+*~GL!3kZlHsplwL`||DLtJaDl- zl}(?=;|>a# zQl7>MMigB9vY5+cHiPdxHcz{9hnvE|zI&nzeKtS8YyJ4D{j`6PY_BEj+z+3BP<`*V zb=x)-mKHbVRgJ6Xo;)r-)9*$4^yJw$Hyz!t)&5yg@3nYU;mPTY%o(;^u`iOIF|Nu^ z_o;opYp?SH0~xJ*dqwyDJ{!D)Lx8`k@r(oir)H-k*S-JE`F_c%b=&-}tF-Q(EVw+y z=c|IqMLC<4f*>3DcvEHpH~Ga9`iGp@eKnmH{Ec)?5Bi{JiPkJ7;crk$a)G z`OS-;|KEL%V?O+Ls@Z*(t6T1WoX(h?$n^Hyp*ClcB?k_6u-c}rORKxMDCjA->6y~h zwC7^o0xjy#YW7)tmFJcFvaYwZ{^Nu?-~B1G7z2;Bu=8Z?IP=kDX}@Dfa+cHk?-7ra zdJgN{ynoBW{#bz7>B)UrE4?+QJ`9*&Tlb8ye(!F(d&RtGA8zFQ{5)y<@j2f=&2yGD z)}Ck3rhP6ZSl;F2qvsNnL@vK@erOh1^y_Nt^y}}6QdMk!+-%EZbCdNtmS=C<`o8i# zgAeDsn;ecS!aSQNe6f3LlZLVu0OjPm)e($9|`&arm9Ef8Q|EApCGam$6( z_gGUO{9Ci{Q%CZ3O_pEF^xLn`c*>}ts36bAE&D0y!_7T=%;)Vqyt{PO^@^Q|dmrAs z-}vcw&zu04hmRdptLHfI-jn=L>LpRx=4zbv?b6hFhtGYkzV~}a`g4xk#?DJ5qc-vx zKHt0M@WIm$E068_$x?B}_-f0K&Q)9-PhYYa>ZX{?K41J}p83wL-;(ZpHJH1Ux7jNH zPy6a0?fE6u>UM8)ws5@s@achGMX|iz`y)RlF-mlcrEitAf2pY)#I#>8!usrthP`T& zB#Pr0zm>n8aXo^|`a(q6sUI$Ha()Kh|9AN2xDHX@)%BrKD;NsaUQd0c7^|wHqtf=P_?Kl= zT&HNQYvhD93=+k6A*toj<&8hdF<8q$u zD~LTe+*$f2}=cByxVH@tmpOK zf|GAcmn{klZ%MkAym@N&tiY(xlG71uc;H0K0Mp=^4qS9mjg16 zTYr7^ePjHGM5|?|yI(7peRG=EIzcDF@%pVdpHA$`WROw3x7L5vXYK21VGgn9udkVP zqTOkQ)dQcuh7V3W+arE&=7&i3>xbU_I{50#o6_FnCz=)2>%Q}GmsSWKWqq8x_IPAS ztc=+7u7>018(elBEBx4X_CTwh+E&I(;nUh!ny>ekTP!)Fx#Y(Cx+#zJg^m?Tto*RW z@Rj}Q=^=%}Wi2b;Rc&@*ygK*u?dDAa_qFtd@8?H{+Up4RRR=;1x8=tsf z-|O#t+8BCf8m?xQ5w5R&A@T0dwm;h+USIsW>Th`EwH?1FS9P$Ob6q_$bKtvtKJB_YBvfPX6nEl*%LuqwSL=|4evjZ7h=D zz4_H{=VF`dJ(1jgSIq5SNp4=^Ys2g1dGztzb&D43Ilg|q$DDD;#m_pLhqm;scpqi@ zUGWa@>pO~n`Yq$5`FAqu@_ct;{qf9$;01$dX7lx*l!V6WGbxCUf_99XWQ?5Q)>*W}!q{O?Wp=QYm4 zRjxl?pRIiVQ()G?M>7uc8rNI%mARj3Jgi)nk+Y$B|2l>UiRm+cN}sX%pQ9)j&!<^9 zHO}w8ZO!KiyQldo-1Gl;yd^UKgk|NNBM3_ZQlVaFb5T5;@~`J)y4! zyXWP9*jDVK?X&C1>)_6a53KXw*K~BfoyV{ECS>Xs$vV;6)_7Y{$93|JC2`d(sw!PLMsoT4B&)8B|?- zujFZRDtFDX)la`~%n2pS)-UPX$aG(eEPha|Lq}A!Myy@WT!}J-H^rQzcxF5 zU0ApFgzLg3udcEA)GwGgt7`H+{j(aPj){}Pj>p;M^zT0b%J*+NXY}9eI_&FuC-u?$ zr?I<#Eu63Vee;a}=eW7E$|Y_uZ@hNShkKvu6u+zYj-J_UFj+{1%jxawKr!`4FRw=b z(ti1~>c=f^!N!RRVN2}ZY~1@?_dgqG&^Bf6O~JzoJgnBI7POpxdZXc&zGBo<_K9pZ zJk1vy@9jJMJ0y+i+LXC#w;WGSvtzgveQ)-MOG@`5y*~Zh(RGn)txP2MhTMmWmz!mq z56ycR(p`1y-PZNyhnBABZrsh#zWz$rrM|zs?>G7{)MrmJd!>Ks^hINvo=|sgj<;1> zepOd}oVUN;A3h+2>aYyW%{6afT`2!471CAc_JxhJPiQrZ``&fsC+G2fY;@DqU3YI)+xO*(HT<`Jx_ry~;CtDa;ofJn{eD-M zIN!+n|9{qlfXl5Dx0+|!7s*%NX_nmih5zx18%a~RW2T;T(P$83D-++k%U5=C!?ZQ4 zFYM|}y?H0$?o!hScFktq(>FL~?_;{=vcPry0%fIuvMG^EmNH5Eom{5&!1;m0^J}VV zYR%tNXUyt3m3mHpQXH`#BXJLq$o0<1UL7-)QiW&3qgF4^s z53OE5_etY_moAe_UvBv3hlJbu9uM*?Sta;?!|@v#Vbd53gZGY z+Z>z7$l_fY|e|~=pV|R@KpJT9P;29IKuV?RV@%^Lb;PREJ zptHBkPk||9!@U=qZXR!nm^LwH%jqhUlaDjsbDdCIJL%V~rSW?gudDdp84zq2DkgDn zf8e2S7a8BOb`yVZ-{9g-d6YPtjIBZWt?UkasMt` zlK*tkm4DXrv59T|@bUhZjR()Yny!7f^#7gJb6?F_72PzkrTDaOSyiuTArMC0UH?4rSKdToq`=)<9c*9UgrTu!h$DOx#|Agn4 z`J~)hyzfo1^6OsiZAz*~oKo4k+-lRFwvQy5k|i zlAL_=hWV4%+9#s}f4uXSpY?0WA_s}hva7ZV%>8E`akZo+?Mh3f(8mwS@A(W1zn)xt ze=_6Q_P~Qt6V6_%J<3kf@pg3$1fk-*D}1zo{}vlu+)F=c}~?Uj4}EL)~kl=om=tT;nMA+zrU^$ zUTR-`eDZ|PVN==KG_M}La6Z&L?cLvi*$zjZh^xDnbM13`c%3nC*S*=x58vCQ`y^n= zx`(1&P8RAJDk)_mojc@iS~XQ+?WwZjUGukJlow4CTp`2r^3+k`S+3h6Z!a{P zxHh%=xtdk^#IH4Xx@R4ih_(Orj(MJU{35<{8xMXC+yNlDI`O#R^56asueZMCJlW5{XyhmpmGvzuwsi4(Cv!u|=z^})@9F2~YoC{QZ6aL5IrwYRMPjNfIMR2&UVLun zoO0$5J;&NwX77vrdS`+89JW;wCxR8z&X!I%s@kFy`u0e1v)zeuO~DLVPMv8w#=-x7 zcW+Iq78%-6E0 zH7{S#u>R8P7YvVcQ(wE3MP1#XzuDnwspbL!{pJ7X{)7p%{Qara;&Zx3%Aq`}zGi_zG9y<> zE>HX4zLi{d({4TFpW4oJ>iWwq z%xXX8=1zZFR-iRwdS2AD$LuSArwX2L@(Z+t>`T8gS zoXhw;ZQgwq{cH2QtQ|M9ZZ!PXaDSWPSy82b0X7N_3*LP_d1CVBi%oBy@7-3%Ip^Ei zP~n?*--@5~$lh@O!`VPl>EA}4tZygtJ7sNTpYkW9VDWyAn+~sxJlyzFl4k$nV6n76 z>20z{pw+cTXnOMRImauf|5)}!c|7dyf52LY#n*WC15~bH=`O5Z7 ze)%Q8ctX8MbJ40*8-w=0zJ0CYkM*15jIU=Tyz!mq@pY}S;K{#x3h(lBgl@Z+xy%0g zO0kXxos;Vgvs{!{al8z#+<0Nv&HVngI~wy*8CBuSlDy?rN^27B zrhZjwKNA(ZCnr#4wubeJ{X1?SzB={U6>aU$Q+=!M@*dqOQ~f44`7+P67j?pNaW{PV z1yh}NEjT)%;&tV9&Z7N$KjpBkvy=O}tj1jUW=hc33D-VZ%=lwG`P_=iAGYg11r zcL#cfK3Z;4+9xsP-IXmXmpUl?D&-Gxe&BV%bECl_wdWJp|Moroj`#7aH50d2-C+K5 z+syx0&*moBdwC0`3<3IoAz@kSE8qPZdXWwNuNMo%`u4+pBuzlO|TU}3u zMK12iyuYEWa!&cm`$n^kBN_WjpC>EFmOo&VKXzo&?uKg(zUldU@=c~5|N65kmi_MO zh5or0eRuACIc52_mG5^On%Z1j`d>_f?f$je4+r`rtna1Q?osUf^LkCcbJw?ev%C#Y zJN4!Z-rJlImSMkvRXjJiqIRFh0dtP`Q@;jge*1MSTuym!Zg2hqpUuBN#vPQ7Twt(J zt?9_ZnDl-76fUT}*tW_fcTs79k(Jezy^~a}=W(oB?VjPBGyTbVfrqCn=W4C)o*MtR z+3m+<-K*`Z@&adDT!|HVy|L9JT-hnG^#{klhx&YbubaJJ$DC;!dgrn2jbFlCJ*&9$ zr(9-Mx_C17enq&|)|F+p1j!Cb3x<_2(`_s$+Oixt)dzLxf z)Ka18{(0-`f5l?syc!oaNPp{`W~i&w#GT*$b@|jt&51usawq=#Sp7foTtvQkyOCwX zcdoosKNqa&cpPar-S&|Ds?#^lUR=$}&2(c{rgZ7GvU{Psw_kccQNOa-;zrp`nJSqh zzQ0{1 zBU^ZK_3P`=%c|R)zFc;TnHXMwE#bFJfB<8Jf>5AJYW~k(MfaB0Pit(}77P*aP5--$ zTl&Q(S7+(FZfCW&d+CJvy4Mz*(bu~3u(9tskMqmsO9@YdO(0yLY-${Mb~(s<3;@8}2W&HglV_Ja75Rrw=!)D+jJ!8pC^A_YI%SzlD8{ zdym(77cXvKmLXF0;#A9}O`2!aKI=Q4R+A~Y{QgmyMr3=N(YxodzpM?imt4O(>wT5{ zn`?~kYFAH^_>^|+bLZxJ3oaE*T_^MJyW9QUcb(f-inGi9JSw8T@y%~RWVx9M|+0eG@HuEIY zj+-ZIy3a)>t(KAd?`QNQzH-uu?>UoXNlcQ*Fzo{;j=MDg&e-M9I>s_gsTp9y#=R6SX> z*Wzsf=lQSip77~6C_NArcbO#4d?QV(an;FNYA@zEZ(Y8uD>|6#V@y6Df9{$(?ZY#? zcCjlR(?0Vd=ZE>^@_d=lehV{x4+Ca)55M=n%QSTEKbD&)cC!9zxy;5nrv!y8rzFgn zqqx^yjqP3F$@Txz;sSPWo_AXB$F+AWm2E`6|Jq!if5JI$4ezS^>t_AdPT<^m`b*UN z#Ba>@HvT2<_wwY64%3tTtPu$ezOQ7 zcqIRyuA2Y%?8Nm;o2>;W%2cRrQ`K2<{?3%7oY$=e0jHM#d3}OmhN-W-v}BFuUd<10 zUf*3?U3*#jiw%$H^3VGeqt|wqrhnPoHL+jG-`4AD!P;2M&p%(vAHDtOgJybJ@*@7+ z!)@W`tS{HhzpzVVo`S~X6-`Eg%gUeF?En2Sbi*4BJLBW_@y{7ou065%O@PbN^_)h{ z3Xf;%m&kv=cfUf7rzt`s#AtcU`&V1r%_e;5&3!XD#N4Yb-b%nHQtgHmM_SmwCF|eU z=pVZCTUVQ>mi1Tdma1>}Yn;}xTJx|xTQTEl$DKgO5V88_+H-#2p7p!IHOrxxamx_5L}zJ`!7%KeKW4XPx50XmLxpLnynz-7=A;F&As*V<8%Kmh}@gw6r6GT`bUFJ zH!|}-e*CsC?pxmM#%>F_jplBzo9ZUSJ%1=sQ8k5C!=dl@)crr}U;o~o)Oq|(L*wJ~ zv(FUE*z*ZI|Hoy=R{J$LgHid*!p}S9l5*o`&z9w}Z&_4#YQKk$_?jo3uX@(*syViK z!`0PaBL$)}TV@>JuV%ot-sPyPsC?Ee-HUThpV>6^<}UI0+M~I zzs|>e^St)t-51}aL^Pzz7`u|1-(zdEsK$(3IlkJ?_} zy;oeX)Z?tgoFC7p=6^bsyt`xFjodvxM_E!Hb8C4`TsG%g_5UNAO}f5K%gdi>o^@Mr ztH%}o+t1XpPIFmp%m%QU|MZ7J!x;W-`?fdUckKdkeIpcmmw(-oxa;=DyM}GyL zxpU3h%q;iVd_~*UPyZd`SF`j#?<+WCzD@#X;K6%7E$?*C-@11DaC7_SxEa$b(`WuF zI>?)PJn!Gp{vv}C$sz9QdMVDEGBqKy$J?@7ps206xdb?CM|Eqh-1!P}vK;`*u4*Z0c>e%!mx zB79~2SAD%*`DgeR@?`|_Mo&rJ`|iSaeyamr9~(bDD_-Q-(R)gJvet%!&8?orQ+ww; z|52!X|3_e+R>f7VIc15)!N<4su>|E^m;b5}Z+SqRokvddr()*LYqRUF@1A->>Y{xQy4mIvxU%WT^=k~&uuSr#Vzwf*nUKitgn7vVSi`9absJMh@)_huZ7T?0} z|H<&wSkLv{?CvKU-z|?AoBn)^~iH33`G{#cQ2jo8KLsBMs&h&8_8=| zl+RA(h>UGZ?TugexN)nP(Ug}l`P$(#yyngqlXC0X_;kVb$BWdj{V!PkX-DYWXQBUp zwLiaZU;Jx->4slF?KJvt1sIB-SZ1aZXZ=|I&z;|EqxMAY-m}ez{g(a4Yvs0b-{{)-pZ%D&e16Il1s zE8P6ns?Yo8?@;=4VUJ~6&c~LLBPut2SdRq@Bz7FVTz>!h?uY*QA5${y`zk&KmKnr} zF>Rix({qw5tEKZ4Tga!NxYujB=a{qHcgw3wyrXgE%GXubO0US)&wAW*;laZv4aO&> z%roBSRz$x3x;tL5t@Q+lR^D=P`QL1k)~hcD$e9Gn?+x7`elgYWW7Wf_zgKb9%uLLE zYFW!^d1k7{ae1!%{qGaEe5?3(V#S1yZdaZp?Kt-}k5en}Rjhpw=h-h0L+g1t-wI5+ zn02pr%NwU(TY^6(d{?(?l3d_1vo+~iQRTYod$l*Fd^^>ybXWY|k1Mxtyp|BSro*y& zz31%Oz0uW%4dyIo4od&MYM+oJ_uE}dtK-~)k576 z#&XZg?qCzpngE+-u>Bma=iz4;4RKZlfh{`s&o?wVwkL z>Mq7C`Rw8N{*1qL7|Y+TDSw)a+Uk0*e$l*Bt2HmDLeg^A1fRf3B~kh=E=%9XyqC^D zqdu*4>4%^r&qZC_HoN^7oaQ)r?o8)b{x7QDK5zWI+9iLj7JRZ5A3i!{3m2l ze9h@>oAMfwYwx6w-1)U(A`5fy|JQqe%(;JpqbD@Su0)ni{`}XxpK({WEosztsC%k> zZTY8D?~GCpu8z=W)wI=^)AU26JMQZb#Ru(oCH#&**7E(oIQ>Rk&##@3TyI#B96Ad`U}sO&wtCb>$bhl)KybF_qABhV|+YWF8}DfmTCGdtj5s}d2%QC z^@`5;I@^7G7k~Y%vIWltw~hL@W`1{;t7>Up`TM*LhlS|wuz;BteYz57%Y1e`cf0K0 zuh|XU+xNXt?5kj#Bz=EIN1$MeGe_pRD~vhzbJqR)a=mMd<@D^*y|2P!i}xMpD5)wp z`JH|*jg{q@TH9~8v)tKY>8EObS8o3&lIe2vx!jbNOU2)m+dd!n5wgwGezDL~kt?Zc znSlSf&qh;26B*siuJX@h_&#Oo4c)hVIrYzGnyBR5SMH5tc=90f<@DE|?|yr1cYcQ3 z#^pb+dM9>x2C)5IQvYm1#}VN>HtZs|{`h+q*uUTX+t8>?4F;una9L?EH8-dD!X*Uw4KV4Tl{gA-R=^=-B#Fw2ZV(^o$4o%-!i;^)0P z#O}u(c8@fQiAv3Te)s#r1$!?3URL4|XK*oS`sclGe_!ywdb!<*i?JrAr&^W!+9NXw zp976bUp99bu~!(DKXyKTJ>-^%ZI}B*|Ld6yL36!+#M?bHyS-0xdbiAs?BITe*=;P< z^U80VKW^xDtCz@%{$;s7U~blT?b&;Urnt1t+$D17RmYJ(Tjkx~Ph6$+dj5BlsUGcr z6a4SUy!%#bcj9QzDLLo5FUCTT&OBUo{?YE&yH^ItYIW}aH216IZ*PNcpX2Zw*f0ZgYKg3lfZ)2{$c0EpX>e^{<_tbyT zIJv;iQsU0@qjCyO?zN{X@9oN;E$>=+_klsu?w?ne{p7pnDHwCy1Yd=2W3)IIk6+phfMzxT8)THd{q?IfGUn|0r}z1@H6z?v1?&p!#( zJ6g86KV<#`$DGEtmi(hByI&o5nEdw8`3vFO);wWOTzc-sbB5^UDbt^wE57qFBr8GT z-#&@L7yDZ(=dFHTd3)adwtS8KDpU8H*IiT=W#XGZsblXRt|RPOSq^WS?>=q)AN6aV zcX(ReuG5jeGWo#|mmIJB#`u4eV68!}+w8*|Jd&bC>IKcxOTQg&^>$m@u9W!*0f=|`PrU*W9fmzaIFd|TbW67S5}xS^OEoGXR3YAk7{um^7&^S z*Va=_R&APEn*R6pfrTq(uidQo=VIxlh|-zYw`;S#uLyf`GrpFI^_=AUga2i+)>Wm? zmbku5`tsF7J8jO@#QgU%%hj0HV$%~fXI|{4l`L~V^WWd|w0o(Q`P0abeaVhCp&Osb zZDpFh_;9DV+2@R_|0h&V%+p#HS#-2rw)gD=trrJ$rU)+6&7+xeQp$I5NO{daAX zElb6UZN3(5=qk82^$fT0$_a(5%=e2vkv=s>>NORu%6!xBH_lE|1Vb~@t5()I>x|eLmtt-&!zWz`PT`tmMV&_eOmIwm|c{m zoZC}aIA>Y9n$-c1J1K?h{!BZNX7&BoO}V|h?39(Kh&iMJnMeEj=&oJXNncwPq zvg23HA79}J`7IsENX*lwDI-#fpXcgek#+ZaT@Os#iISN9i>UU~h`IYH6& zWnnG*J!|jX{d(B?(t`7{s-~&yr;1&@^vW~$@BbU|N9O-$snWNolU^gvl2rE5>OJ4~ z7`MXnd4FT1zkRk!KCw|o=?u#kaifIDoF1Eu4cz&ed&=%k-Fm=TyZ79@X_p|s{oA<}uzi4j>VXxY|GmcNIik-iwz;*rcg5?SZ0oxjO=4ss( z|L>E}VA!=MD?M$M-?`^6Up)`An!DJ1-||`2`+~NJ|Lxy;P*ncWI`K90H}3WEd;KH7 zPQGD^S9{WyES1{IH5rwudzQ_ceV={*JMC4!#4gWTz*n+z$FaKVa)CdGmoIHNkyH91 zZxg%65&rOf9;ugwr z_d4!=SIqhMVzAx0-Jhq%w@miEXEEcDf=ffty3ctZ8Rh5uC+=7s@-v_POpE)9#5q$s zJcaK(Yv5L2dSCW@Mu<|4Q0$$nA^($F+M74LuC}xL@gU=BLTZEeyYt;MrxeU9f82cC z#@YR9`qJ3O@85qmeGTPpWYKsa=Ae8`+f9(OBVXtG^WRcQMGqAv=I@x1@aV-VsT5hh zUhDh!t{8V*>U)^p_C|31?+u^dezyKw_3D%ElQ0XIOoyKd^i;@2<~+hgYTtTq!MIerdbp zy@z2(_+PBE6kgYLuddunK7ZrvVE%u69~sY{46G^Nd)!PwO6pn7kEy$k-}lx(w0V|$ zSo>7DSH7nAp5Ohdv@bEhK_*H6U*AjD6+)M<7yESPuuZ+myK+rkLTucRj}vXIjDB>i zwMq7uIQJ^9(%8A88t=qH+IzgFTOuFN6^=*>1f}c=94>* zz239?o@dTh-zSk*FMV5G=im}^mHFE}(KFToN|VjMu~^1-bmt%0x4}K`Eza&a@N876P z|H19wn7OBU85B62!-bNPWR5TRy*^>SdLlFbl8{UM28k*4=hqzPt9y6kWuDbLlO4ym z^!2_z_v@$Mxz~a|3gYkniJY`}*5dMX@BaGZ9~)Rw#UHl%b8Wv+RrvjA2v0&^+k{gS z`m-I}9!{Rp9S63oW^T09T@9Y*?JO+?k$jAs{;T%XrQcGlnf&?6^l3#xNh#6O<~Zyw zI(Ygnk6Nj-de!swJGbqx^0+7`+ZpB(Vm?dy@I$jd8!RHWF5X^p{>k$dyW^ycnmWTc zzAcaV-xMUO#&qP3fQD)Q*A>B>t>>?|iigN<`QtCkT|4`F_WsrPM7Z<>-+pOUSym7{ zzp{E?_q{8UvmX?2XE-c78~E4YliD)(j!TB-C&T=6USBkAc)jav^Y4>8ID{sAy)@T$ z`9Bf1_n-OJSJz$qoRlT-OeK)_MCq)>Z?@fk`p2xcVDqmFrOtU>XE+Nb(t2mu9(gnK zz`EV?;<>8~%)bA6C;p1z`?bFzY>QMbr(dyaIb9tu`|eYHR@XTO1ta+{CO%*Jthea? z)B9?CXNLCIeKv-@^>4S&2vFrz`#gzJb(`0$M%fU9D^d6USpD6z`{mzrcIzcR%>BT) z{JCAbyPUUWFJzhz#sb*GI%%DoSV7rD28O-mQjHh*sR*N{uOgXseI!mlj}I?H*& z^Gp`W?fbn*-l^S>eL?)^FeUrKJ*ysuSuNAfy8AwU@BWO$VKiGTU)qkRbW=!$%uz7~-x4vJ0zPoa9^IOXu!%{Rj*=9Fy8|BIor-!xh#4%&z}jv1o_!WWVTB zyPLHg#kU)N{#-FYpRPYkChGjT{9GZj_Tj$iav3H~PG*np z&73G}_wCosMeJH3D^#5mXKguGTX)yit7XUK;By^5b0az1+NPC9+iZ>$+Qq(^dr8@c z7U5}KXKa3n`|)$~hKrP7Yhc=G=5 zJ@1-?YXw^N?n>KoyMFA^VOim9YSnE0ahJif)i0xEG9TL?sq9}EFV~sSY8krJJ@{nw zu3ys+XDsY*w-LF#LGGYIzMt*-zw5rV3%$D{V{CYN@AKfV4z`tQ>`ZqpL@b%6Eo4b! zQM`Lizo%)brpC)HRoYBSzwRVSx_mF)pKqHctH0*Hq34DFCstew>#urk*d915pZDO0 zTsbx6{G6vdnifr;dMHuj!`>G&7GB%)Qt_cjA7_9`xCEE_uSu;-v%2d=mdx*4^U1~{ z{9?@cgBCqU5-v79U32NSZ*twTTjy>~)D-*kR^BILZMXF-_kAMjqQ(ktZH&ejT3U`A zUK4R$RA+awM6l+Cg88p6F@HF5oU^5&rEzjUr}X0N3c=&KcjpzJTEWHr^~XlN9W04~ zH)aTwl$uPct@h&IYiX17x^Lx{;LH;YziZadR(|B(k@!eMq>^KKY&-j;l~tXo(c$JP zfeQ2Y*&bW_f4^SR^_rZiLaN4ng15uGu3uc!m{gJd_I!_U_oU?1oD`?|ua!PFF3B)m znBc#A>7g5~?xzy@N~5Por`+@Xo_*f_Tld+8_GgVR^lW=z!R>KUhYO}@BNC(QEHGq3iHL;q?@0}st?KX|=<4fkqeB?({ohE+Tt z*GxLM=)ub7ZAaT}-rZWqbMx!JLOBK=^|swUNpm`P{y5xbvq9J0_h@dRkZRshjaK8j zi_dp)eVgj0vzjf|Q1mEYqjvj-nM*xx*LCmqetZ3|O49w;PN9Bxc>X`~)b^9zQap+E z+lIH{(a zRiB@3`E%v<_s>^z6=y`{9#OYAy{SMl^jBtusM6hSda28l&mO*?{%50J?i!BJ)=OgN z52UZqIe$U@f9vgQx%=Xt?pYM{Q@(Ig=)#$SMoUf|zfje!-wAFI`@A)@t^G&fWXYOEMRU7?*6*y2^N5y*J;$#)(-l+9p_Ksr4j1ohAF{I~)G} zopq@=)MJxE(Ravz6jQ%KBimJn-pVZ%%w=Yd=8=+2zjyq2#0#!Kd**shk~QaXS^sG1 z-oOGmz6abl)E@-w`7hYgzCS=ZH!Nf63tqdUN{&38J`7t6_yf&9`BhK+;L)s;v0>Vl z{IX=$i$!?Vlg!tydJk6+_2oi@3>*h65#{?H*!lm zybE?*w!QdT-Gu80KE0aYrm@1RS)o^?G9^7k?8=R|*(W0>94W9{efO=Kz}2bd=Q2;Z z9^-8kyg%XjO6mW%A7(5sVp@88*KJ(|O|2-d7dN#$6h0n&@-J||-_0MgoJC3A((A>} zpRU@y@1u!CgM;#_V-JiLEMB)p*Q{>B>Sa53#ViYbUnW{4KH>PK1(Qs~7z@+VGdPZ9 zoPVF-)$iW7ZOiW4x(@`V9&Gq#_@-#WtCt*8=Vat>{g<+}e>zWs_nwV+yJJ(TxJtNJ zalBsG;VYtag!!Y0=win|JU3%I&zLb6zx;RCg2#0Aw3LN)UYEBVxal0BzirZz{lU1~5&Z-Tr zy35>p*PP()i9KyGQ&SJ+Z(47>>*C@;cLcn6G>O<}!1k z+y%E|>u<7mv<6tVtM7bSp(0`-w7ziW!*@B~;^s_PE`7A$D*l}0)%r@E6vm?Z)bN?# znvOfHW?8UycjxNmw;!EV((vB??zh79=@$eRF)%pwJk)G9kVpvGUS;@tF2i&2j)PZ! z-^~lNk+6!$&}}GMV&ChLy3Fgw+=~g-Xlyqt@VgQ=#-4l5AIqB8c1{= zFSvWJd#1dKl3&7{pQ(F`_&8KDn=ZKaR#`46S;6sCX;sFXYk|M!Im$i$^+%!Tz2eT(afF~4?o`dUfia|ZP})B zNb6tUEN0~_M%6Tx+O_u4pE7teX3T&4?XOLM>$Aos`8<(1?y85HcTI6#`_yZ9T;(k{ zkMn6k?~dxNdTzjIx%NT%+2>qQf~S7)yq&vI+c0F_!gqXUp67`(+3rd*s7|@E$WvNr zGn0r}(WbAHR39FlmY{Y1qbO^_+p?pZN&|WWgb!6Pw;C;8B%u5=>#;^giA}2uXXUrQ za^-6)jhYu-TGW@ob$QQGo;y==K20-KdAdw%YFO>hJg?jQ9uqEd@07g|qy5&s^<9v3 z^f5h0t4U&czhB!OI5F`;`IDJf9KW+XWWQ*kZ!-0D()VzqwS|8kKYMZgyVIMx55HEm z9+;qE(9yrnP;W-tlF0XEmEHPNr`z>p*IcVV;P&o7lZnid@VygSoD`>ewjP)GzrnfU zl)!UEN6#JW#Y56r)-=x&XLdhg?{iMua?g&Y{MVsNu9p>vA1T@1J;y!m$E-QCuXw$i z7^LICpnQJb*VoqXgT4ve54^kcHt(6*--~WF9$4kso^kWCb;~Ln_U!F_x)=FG+?4Np z7x&ScJoVEq;mE^hc%xLa(|s!yd+Tq=PSZKbHc9^DQN25x0&cNRh_PF_po(GIN+rv$ z(f2l`Ps|CPw{6R|{qy6W-9NJQ;AXDF8nvNqm!9^zecE;6x#7pd_X4L`uS{L`d|w=s z(W#n=x3*6+cbIb`E?nc;)Jdmr*vh>+-M6oO|9s{yuey0h%?tafCs(Jp$VT$)HTii5dV*hNr`W%L&ZD*B`~n-_ zItfvy@HO(WacZY>;-3gE4^XweHs?d0`DQzjIHnk0PuC-i^A28kYp26^EUz)N*nUd( z^S`@OOZSCb*wv+w`A}a(_HDz4jn>)Q4+a?=@IP04KR&HsiU8Z(wLNRx7uPe2Gi|sO zmb2#{&#yP{1myOw5#KTKvK8ma>HtH@MF$pSDBEnldq1@4$doU$&(DtSy81*gcCKYl zris4NeEK#=_UB#Rz}U!j_s`E% z$v4r|ve3H0chJPt!$F?W;BJpFd%8Rid)>!N0a}BZJj!+?^YDKXJ&h6jW}hxgT%Rdf?si zRTavcQqC(V)rYdG-6~c)_h*ixHKXIf|2Is16951CyZ-;<^Xs=H?yorXWd61Pzm%dr z{$3KtqxDB@rFdE6VZ(yHWjU&cQjN9-<#~E-o7@x2pBU2+|90M|mm4HJ7OV?+=;A$T zV{?lapJuO%%GDdZKK=*GW(38R@9t=MReS2nV&f$|r>^_Hwb6*5v5`BZYv-l~Qa0tg z6}|-CUGlQo$c#mmLrrKZCo(pX&Hs&d1O*zc^eZkh* zcVE5u?A7pP+dToz^#-#v64|}_dxJu%xSKNY})(jUzsdEC|JKp@=lS^ zaN4}pr(?sVK3Dfw2m;^!0b-Cy{W_U$T{HD9Q6Hl@I^L9k-7Ex$c@4S3Dm%ynN) zc-pp4sf_TOwd{91Q(a6;No?PL1%X3fPJ7DSu552?&^mPe?{|$^J6O9NWm_peU*otA1-)paQety zku@6qa|$hg^T?jM67N-*;KruSzpb`z>X+5M)z^P{M3%pj?f<-Yg)`fVqA&b~j}EiV zVfmq2+-C6BYRhXWnH^g+9hz$ocF0d zi?=BE9bn0etdwCp&CYCg^N&C(^W%M;H^03-DjShsCZ);tXOqe#ttGo$AC@mtn(lkY z!gzZ5ol7|u`)6lubYPgiLS^2ySAqI$+nx^ z6T{Xm{(XMQ*-T99?TAN;xHV{My7O_%TrN zPR8}^w!!ZAgURrf>!0pt^%o1! zWjkOKknq?yy4z^UQJP~yu zpRlXzwM2PZWJIi7n77g;r^qeE^2vvp)f!%z^>=?hoU8UXF5V%oW22{63QOmDhTq<= zUv%s|yWw}v_npV~nw{P~cgF?Bk0*8ZBr#V7I$K=zWl)~HxU>55Bw3;8`S-pbDoagR z)Wz+!Jm97D9G=vPyY}h_H0~>$XCGi(f85vA@qo>mZ{hEIg{>y8b66Z_wy^W}9o2Q| z@vB4B*JmFWVPN^RL5gjWgQ%W|yHury7U^ zXk_2gbCchO*R!^C>+-zk`#LJ-rsb?##3ZrYZ?W;oHLGT&Zn&@A`sq**Q_qyods`F# z1l$g}x!Tuq*Bu9j{X26e?bKIkHZYyGE&uH4pZ6Adyj+xTiWz`k$*6C#XHZ=$P#{@FFtpc%~I!2ZhrLUzSi{!^?G&}=NY-q zSx$V*7m4Un)gTp6ZeyKS-d}IGq)Ge1;T=X@BO+=gUfc zs+*wQWW|4xgJ(q^W5Lu*;l42|FNfb^pV<4XR-gaetK=r}ZMV)(Uo`FEF547I-#e>g zN@Fg`=a}0&6zT4eeDq<;6lTYG!6_^aH#hvf*Qt_tgJwJLMJQ;t_D<$)S{E{hN(yczpg`ak^Fae&^C}dzQZ2*FF9E zMvinA2WP; z;G#Oy!}RK=&HIEoZ38$iC~-e#*}_=x*fT3z=xk-RanS7a-X~vXYkljG^FEfPVsO=s zY3Zu$k1`qiX72C_SXw!2M@7E6-lKglb$>jm^Uj#eVj8eYfP2+jeWPt1pYrupegF4q zU*(RI-H}ojqkgr1jpFLF0sJ2|g~R#&CC-mEw5p7CU2s4%#6e;QW6`w>-)1RHQR%#W zpZDnMJtl80fBU@bk=XiBm)EvO+$`j%>H-~u^TKNHG7Jt+&zbt{&g?xa4+V9s*#5|4 zrpO09Lu*-CI{~$IA*#BbM>j8?UM{dYtkmvhvZ6r9*P{+6zT6f1#BNx)^h@lVzn^Dj z{Ok1&Rt;?E-?Lcu*5W14bbhsO_?>fna!FC}wW4c`sW~|jjjLJHe5PJ_A}jk%{I+pTROI$ z{Sz)(bfdH)WMPrvf}V3$45eIF_4lSg8V(L=g*mQpZDV0 z230|qF0-q_xr=(Ztk@?y73*>B5-a+B|NKARjgxn*eet&~Oe$;Y-0#*WXECg-jB#J{ zCqE{J-P`ThwyK{!(>Zs_RbOl`WDB@bKXvuWRU&;m^}Q@tTv{jjkcS=@Wt}`h3dQhWqf;lhecg?-?HTy zMS-hs?3lcHp}Jw^b0%GLEgoR0o%5O<>{KN8O#hbbvr>2}KE|Hy6CV%VQ$+7fdLs4cGUHLhxgonOm*v(!UQ}W}Pjt!Wl5^6p-fXBmQr}TT1!Y`e_Px-~H zEUZ|Z?9khOpCRbl;%RmPp1ar9Pb{AJXUF`l^3P)q^gW7nGwLZ3_X>15?qT%z$)1HW zX^&2o&-uo3L}_p7h10z=OAoWnNDnwC-xtIiu~=tsXY_Z@)o-lI%FnTeJt&gaX5$gu z+xRV`&ni@wM}P56ey@xZdt)c9o3oGAp-<=0frYZK?H(|yu-C}_*q!w}{gd|r!}Y7z zAAh+y<+Gp250#gP)EvJ0z4N|tAZVh-ynA!DTfM&(XjpMAKZChY`tQ=1ml-~62hN44 z`&>Stb#iOY{_kEfuG^J2s0=g;S@|30zgI7gH1ck8_HeMa8am3c=eb?uAtG~3gtzMHQo zc@4YqLy0+7TG`#b|9DFs-KH^hM(bob#4eKkVxBkoT1Dc-%2wk!J1p+_nR-vucMX}; zJY8xQzv!VIZ=XL+m-}?x^qAJ!oBTB?O>K<-dlc`n<()G|aZTNx77c8X*7 ztQ``Y&;LEbz4+ez!bY>lJpm28#}}G?~O0GwUik3W2e+A>FilibiROVb8St1S?7nF>u)nIJ+p9%_LXSI zoegaaJnj12{I_)@H|XTQ)S7=y;NGW4tFBiB8!~b{WR7fJbMK+=@woXrTu)_bHa}JR zu+Mze5l@A;lQbvqVrVo@*~H=bSy+7Qj<)ix%w{e3B|rR;^f8;X=#ha!_~o5zbT;|l znHwInJ7&H5>+?G#%nfIyg)xNjZa95JWU;Z>wgsm5PB~oubjzSyc=|uzurRKYyyqQR zZI4b|G-b8;5E=jEYr_LC+sC!~^&wCA1s5}S=$b0LKO=u#y}Ki( zka0Fcf`*Uw?5qh}um3&Lq*s}JA}IKKooxAkwWH|=%X1V`g!f3Fv1=$dbD5MA^UUGJ zq3=(Q9hKjA;P~s5vt0u0{Ch<{b>5w1U&!6EuIJZQY4L8AIbDhO7fH7ZNx2lNJimD3 z_Yql6?}m%t9v^G{z;(UjCZE!J~)*n9}@*&d%fiQyK{m){F^sQj;a^l0M0 zC*M@Q%P1Q*+`RgvH^B7XhGprmTCe}rzWhmD&*ty*NuPdH-FffoH_tuDzPem#+`?W!oVzIryDXZOp#rFUj`g!1`@?FmkJ;2O zlk_Cp)A2&|!fzigU;Xs=o@}A*o<~oQPd%isxqjK}1==r;us44`cjEQz^Gh^rD*3PQ z-`$a;ec(8=OoC_BKK8!$lHMOhHIJrg_)d&D^|Io5#IN#`uVd#wOKoJlD6X2zz_-%2 z=Gu42p|CY`FLE*{g0`hMrN6asKls<(BL0s~2@B_zu9K%NT~h@9q&}|?zLAacis(U{zs7kS$0A!jlUJUm6dp7vcey?oL-riCu?wH_Vuh! zvw0uoNj{TNvR&)2=GcvTm0*J1?91G~osQjxRqyYT!xOzwmsz z^ry$=b~=vkza0&Dx7;|f`;fq6-%Sf8**sV6sutcOR~^Xr!SRmcK4(d;uMbalw})$3 zFl#)zdRN>-V`=q`*>!EN84@KAF|{k3+A=#VRH|E4wzPZqnpH<1+p#|3(((-1{$_pB zDuV|X-`VhfS91uL)_cctwMstURYhD}&uX%hfq_r;!mG;M?YI7@MLr9^(-!sg*W2%l zvL-xb(mESmd30q*!n&O3n@8uq^!skRPNZS)%Sn+^48BY!wtM$6Zb@c~?3>cRdi6s? zLsoCgUC&?IHB?XN_{O(%{+DAtM~ZAU^vnC+X2o8OYg3MY_&v#+X~vSo^7MB3l7A;2 z62{x_wr}pv?r;8i zxA`Pf%0#jFS6>oX!z8!K>K%?$+?EPjlOSoDF6KZXiHDYmCIa{)q8G#w90u= z>dYrCwEe`YV5!%Su6=ho_dIgz)ED#EJp&bIF4k9RIs3%Pp?K<@dtJNr&$V{GiVElc z-aMD1s&mh+3%61xtM?-tu6j_!zlOa}UaeiF}CE zsXruA@H0nOE^5W;mfvTB<~?OG%lBd_g!$folW?~`p)QggT`cOSXD;DLkLx5CWci&^gj?X$MG z_$^f5xqOi!^F1+9cZCB!SD${(4)n0~iCBEU_neW%3$;7OItd2~IBN@S5^L-h|8f_( z5-xE6@ub}ct}JNfQevC0^FprU-qtI3cRDy-(DSnqU$i6mfp*rGDAtILUp9Du=Y4tT z;d|dW$Kca~^SV2iGXFZc!ZCOLJN;9aJ}i6U@#c}9>Z#v44=v~MFdPv-SZdMuYvbbH zwYLPM?;owToA%28z3s2Ky;qHzl{n)zT)YsgyGn1S)vg`B?2juSKe}Id(X7$jeUr-# z(^?A&jhKb$@6XNlJN$X|q)*i`o(?w`)w!&nIp>i6(qnFH$G+Q^dWZZh-fpiHKlT5~ z@T8=_zx~BtpZX{HS3h9=o8*aUoAz@T=-d^H@a5?`eeA^9KK-o^Q-PcvMx&{?vK<6YA@>$T|ir)QwM_=II%?bo!s}_gihbtsl(wyH}W+ z!@RxC&fxD3;q;NvZ{2Gsp76sebNaMbZco11 z-%*RVLb+W>|6bm1vCibT$$zPz_TVzt zh&i`~@$Gtc-<;@%-G>>#Vl8uh^Y54mw7vf)>f+BUkndU>5M#~}wZNn5#ac@-Q;p6| zq8Z`cTVt%-|9wAa?Da;WBtpT!?6=_}jiNLQ`S-I=O#R9&;M?OIr?<2!?tA;vE7I$f zKP}P?6`$(;JTaO(2a>h_6ZXnJk0*gzQexdj>CcSm-`gftGhq(s0;{O7p}_4Qn}f59fP4Fd%INM zBk^aBb7niv%bl*h^Uj&p9bJza-s^_mlrmD_ad_bE6KuslXQHcXYtCv3+aoEF8}A0p zY2sii3SZoCZQH%&k9k`TtZvFWye4K>;)DfVJS_#& z4FxgQHb;Zij(BPd2{`#$?YDL9Fh~xm-1%Umb2FP;+{=;~DX%?tHagBd(ObfN>CBa< zPqpmUcC52Bc=0nlalMp@OSJmufYrYRGWyTI4&|v+8R?K(406=Lh$fmvyKW z#~)IddUbNx=?!y@yaSp-HMI1f%gH?0<@2mjru<>`0*TK>vRc=RGnVkm1evt)R`sm8 zqBNJ?w}>y<_)mXK)6yvIP2no$T%|9Hg@w5;7i`jZF+Py%va~YqZ_x|YFJ3R@blm4v zZJJcayWnf;JmH-SIp(hT6R~?w3|qttB?XSAg{uD?f5c2YD73ToVrQ;on_=4XMi+(F z!w;CM?!;}av=CKobz6BSqGY1NrSE~8LiMh-T?%FYHvN)9#tr$YKG)qA)l1*;jONcf z^D2HrgL!I@=Gt!Nnzm1z7BinDovfO$o?rEi$JEpP*Eh2@gsUa1vNNtekRWnpGsooT zYT~k08?~jZ&Yf7B;iqt%r_Snz%@cczyeT;a&xLoc>xkYSF>@|^*OwE&9<*nlbXj>O zYr(>x|8vhZi*LVGb~oV5&B}(d*fW-$QhghCOfX6-a?~wJSb2xx`U8PqYT3^}N_uKI zDLS+ocZvTB-`*M_w4!Cv#Lr##`(q=It+87jnA*!!z!bnLuxZ66r|3$Ta+SIe;X=z? zd$Gvfo|o0Pe)i>N^}m?)WMj~j6ss+lYad#~U66d)^{3*btnmJoFN7|*Foj45ENfJq za%!o&PtKVe>3_4LE-Y|m&*S?Z@-I2DBJhB_?vWp1dWByf?6$gc^W&kPZhF4Ak8C*h z^_hDX@2WNXUDmBRu}tjqv-USt87B5mAC`aGlASQgF>#64B%VAa@gM(!w%wVrb@sG3 zwuWW5-gdtImG!tf*TZ$U(M4;$8*KN!oa?<=$zaFIP$^}1v~h*5CfCf^2L+XLPrP0G z+FC-QwoGo0+~qd!v(Nv99zA7H+9dnde*iZ%lft@xpky z;vH4p(?1@H=)TX~aAMu&X;y*@vJx9|9sQOsUa3;W@~3vw{frj{zVZFJasRtMbBpPD z)~?mho+=RadTyq--@Ms9%2#BstjrBt_q@h2aqSIbEvCQw82?Uw%-vV2b^YeLNiTK3 zCx6>n8KUbUquUbi_jyLZ^9EZLYpc2O`p4hRno}M(zmu1FQrkc0RU7s;ZPUCZ<9ZiNCS=`I*V*%RkrszwXc1*ZcLfU`Cj6hyRxMZnwX0lDE=$#pV&7 ztMj`|;I={8665cWkFNjz`fbrZqxa6`^B(2gdwZsRZsmTNM{_HSH}CyTfGe>|&y8qYg(@5bNIt8tOp2{(+U?>HeY{)yL^|89+@-`Oj& z>w01eEL%!nowc0z?1KMs>CHXQe%;;E61p$tP~n81l}q8ItaI!oVA_bTG}{KM}`e*XPQ;D4u5SlyaK(>|9N%O1`-_R{mhXWyRFmAlU@ z5B^i+?w^0|vefy+FvIfik1cH9?Ku7N+?+$V?kiMGD`(@*422P%tNwqtqzf8P4VO`6IiP8oIUE1BjLEK$m zje~=O&-(g)nJ6^3uF%Fpw~=Wni%9SZL8eo3uC6Ojs#;D>*sQ=QEz#b|mAUdM*UytD zmpZ((nZRMNktw*T&#BNZiskUxCKc5UmNO67OrJHQN%u}?k=EQrEFv%146BYAUR7f= z+&b$QTh%caCi&W&G|A%)ekSa9z1VULo8F}}uQg`Pt@gNTdgY4wG2KpW-vIlqkOm5u zC+jgEE(>RI2JW^+O)19034PkW;fb-A7gyKX zFJB#vURExx`sw=e*G@}?b$Twr8|_vYTs7Tr;k>S&Im6m_%;2`qlGwZXw+sa8^Zs#V zS1;uDOnzRiD|~56d)SJSyGv|+qNX}Dtk5-BAb!-b% ze&J8X1hcbg`;VHuzAJV=zjgBhwy;~cG-EI3Wmn~~EnK+d#;esK*4n$4$?rYu^kuPb*+%)yrKUND zBTut^S)6s&zG46LU;E@!+NZr|zO(A~?}lxeTh?`M*JQqV_~5AmyLWeOzl6V2T9bB} zjnC0}RjtSNrBA<1c35TN!<0HpQ8zVs|MVSueNS6*#O8&tm$vS$j58LnvbB|%Q!!sR z{;!U-{)1!Z&R$&pY5&Pi`MW;pHP!)+rsI=h-a&>Fa)J&NK736OKn5zSJjMe`9rp zlKb90e{QsHcko)x7WHj!?VZReznARJlWOqLEBv5;v~$M)S-Mh}-$?wC_{^&R{>BF{ zol^b9@2=~IKVRh9vqQ~E!-XnA|$*>0Yw_UxStk3~FS>-g1u;-&S~FT6{hp4`x~ zP3+P+&EoYPzca&*e&7E7?z>6Z{G|*9t0m1o1};ARFv@quhsIU^PRw_>u%W*??Z8*P zDfO3bwg^OpzTc`8-JP+V>*=f6wv z&!4!0&Y+BiZ>u{vU7t0-R&topU8ww4a^Yjg6-qB<%{iA{Hi!}4eN!W@zl80G^`|mU zCqsdv-e8gWb5>2a!SiPno7%i4{ZWl9sC z^G;W8f54NuPorN^SEar6Qty(`3yz$o_uY$l#94zDc1vBYv9@;N+fXd3@Xx{3(a~*Y z$2^Xhkj5ZACd~;xZ$C8JJNe`sIk&s-x!b#0TwCP6t0i%t+N>(18gPEHo6EvE8y=2Q`V! zQ^hvFoUvEzU;DlD`_J2Y3bLr4W?H;!@ow2b)fq}N8HB!1+!^=y$mPV@FRbfwcc{4Z41eI!upZj-B`KsZr-|^ ziyGH2`0LI2Q|IM_tG~Dw7weqU(mQ!CZq5B;Au87jVw5LEcP~G_Jn5p3Q~1h|H_I1k zU*A=~^~skR+K-|mjj|8%)_&$*82##HQS7?AcRjv(C`D8l>KzSqXcBI+nS5fC=hF{T z_s`9KE}ooW@i{8&&zwq4=|{)nPg*@X!yV~9r$YAjbg4SY+YJxH5AG3UmRxx;Z0@#4 zPiAE+rBwcuy?cDU&F91a9$YEOj-LO2x|w}-yyE{2iEg(IP9J9b86Usz-{_-HFoC^a)w^{lzQXtvN?eZ zA`9l8(m3a-KYQMnTf9XgHJhdeY|^>e-|*CA+nh+&jZ>kfIv9EG#8FP{0ozN9U2v&NczQEA`2<_ooFG#R$O?m4`iSCajF?Fq>j zTUPflFXxqPKU;f3^1_zYJ{srQKepU2`Td1UCAy)_$|&S;gk5`7$J{y4O6;{_;POfCZ;sxT{)nU*vkO z`rzRrp1ik$6@g3_LTnR;bE0;L_ga!yHTR6*~y~+ZJB=zu;@E;?2K{ zGMA@ZdDHDItC{q>%T_NxBTnU>Mfj>0SL^q!pJkTi#+^Mex+n2WK$iZdim2}suWf(- zjPdp*V~gsDDVbHCI+vPyCTl-$b#=S?&3Tf~mJ8GSlol#FbB0gk7O}d!Lf`?fYO>qD zGRMTf2OeCIU6^%8ZAPtPrBUJQ9U`k5ECTkjtnRpb{qUBiMNdy`o|IrBwtLHGDUZ~q z&g_B;h2(A5lP4s7U)(p_VSnwURU7XxdPjw=Pr4u5+06e-(AC}jg(d}E_vwl9*QWhPzHn zA7Pui%)nZJ<&UnGn*9#lTZ?&2E+|{>XzzdX@O0g|ds8`>UU^2o*L#rbdS58?&5LDk z)i0PN_BPKnOJuGyZwj4Pp}4O2Q=YTJ0kbEm(v#IsJ-!(4+QD7^qNmjApvRw70R^WH zVaMLe<(?6a3ksTBR5tzc_~@ymbh@MUUv+)Vo(Z{pWt@5q0j#p8j9tGoFlmdJ1k7A= z_m=1~t@5Zh2V)GA1fPoeC1+2P5D-)KTvW2Kd-qF*tqS6q_5J(AUYI3?I!^6f+Nu0B zPtfSbt&|TAyqa+_n?JNZ%Q&nv?M~H%+Wy<}(O1{^#C3(n37+ekX0@o%qF>#AV&04P z1!88Ok6c)iaJO(yq|vu-RWBRQi5ttGd}6)f;^XI#t8A~{u#L}>d2{Iz$qBh4*)mDD zdwZC3lDi&%$TB>VSde>NqV3wZ6>W`Mc_rGe&Yv9k``>=$%)1YM{$!S|Wel1a`2U3K zYaOFswxV^}jPNKM%b9w{y9NlCJa?k(4#Oy!U2?Rr+a1zTNPpEO2dI!j#M) zcKOL&Zrrn?Y=0YTRd2BgZ`S9WQEgJst0-j($IKg& zJoRWk)@YyHpj0GVu|)a!jpHnWhtr*pD_Ctx3Yl_eZVQ{(%8JM3X5V{?%w{N6 zwM=Zi<5AEv{f@$>xH2W@CDFA!>{4Ad58oIr+tB%5HE&|d+@)`%_>M8Q6{bvi)miZ6 zZ<7Ahhgz@q9DJI%u>F={Qe?8eE2cMWtKXP7^ ztgQUHFL{@;=nlIVGYloS1q)k$_t~u_WZ{#|Iq>6;zhn*tJ*8fSao4J4g zUHfkbIHz-7)^cCBYK3;aW`)AbmwImsi;rzJYG>ZP`S9gi4`x2)kXZV(XOfnrX~G*O z8Jq8!)BGj3ZqRkFF)r}dsPMe)bHIsbrH|*YfJf7+BT%t2 z%wlzEr&!sXmd538pUf~2{JC6&xpI-0v_TpZ$M<9N?q2n*z1CT_f6+15IZKTkHA`aO zmb9-?nO8I4)^b{sDWl??{RWZqCa&Mi+&@wDSDEMfbH^(dKIEMr*t6Z@T4H6#o~ljU zw?6Bf;1!FSdV1f7iK;z9rcWAJ_I~7J=UXx-WrMYMgz~cX11S+ppKDc$yx}#v%>OCH z<%C{N50`w=ce7(ZbeqDgN|@}c8*(LVs{@K8tgU5b+|Hc~X)CGRSq?AR08thfF5ak)wpnA7m8-eQAhl(i|Drt&Yu3G< zHc2u#@JLVU$LUWzat|E6r1v;5B!KZ?!M1468&#YRXF}{fUdvy$JEu~yZh@-MhKSEk z9p;C9W%T7+5s%jj0g*EnbCO0Hv^64^>zGMY+i+gd!1=iL5j zr{XhjhKa(od0{6#JQTY6rn_xhnQF}Sza?8-X^BzuX5NL;Q>;3s1|B^o*MFrecJk#D zTX&1EnGi5%!C#vRTfdwNUG&}k(q&y0j--A2;!EZ!Zr;?9cp%3oRYq^EQND!E>ki|9 zo0hjU0-_e))$rM-Z^|=CY`b*p39|$Vh1<3~habx)WNcl-vv!#|&)et?d(R24zVQCs z1-V647wwI={3!q7WnZ-AtMK-37njQz!xHNcEO8Vm7W`FC@d~ zakQsjO3h&NTCSuZtv$c!4oi6CN9W#H!=ilYb#qH)ep@9zIWY6&vTaLbCiF5de|Ta? zPxOr~g|5dm8L>UqgtbpMCEwNE;4 z-;-Zj?i(t0nU^&q^VG^KN}50J>z-r@>F7BTV!BAB?U&G=73U(vQ&>*r#!YE|y`VmO z0{`mPUfskbNtT5$eba1p6{E!>%oD;7D>0iV9oZ-@%km-b6N6@nEZ?dv(^**pIrrF} z{BZEjMO(Ksr^rQy=Eq0At z*!=5u=8}YlsCBh6LR-&w$XoraR=FFh$L3=cRvS^P*nX9_P~uW`(?tp4MVERes+|`Q z&w7`$Y}caYSw75b=C6EnK;ljyQ#&Jv;I9=2Hk&)dx=)+;K45cON}J*3OUn*-WFE~w zTyb;8MT@AY*GDzNZmGIWy!0+fL|ylrMc1U<0|stUrB5`R{>@o?Q|X7bj{N?fZ=XK1 zZ~G>czg}W??Q*?kV)Dit%iQ~?=>D;-znTAk;+EX`J4@y3^X`A(hzm6KuN25Eu>Lst z&odT317XWG&P5H5GWt^{q;Jsb$~pb1TPSovnA5EGInQh!K5*VD)ODYAe&}plHP>!EIWrBlq`)^BTq`0t*_Uql^+jdU)o({mY{{G+F51BKuEw$b z(k8{r-7ss~^3iYAa$0t6B@#OBT^<)?XYcizGxMC|na^oiF>mWK zWS<;)dHCZz8Q*T7OObNdCf)yR@+v4Qdg7mDR}btzJMUk|5-}6$BNzRSwFO?8)bUv2 z7Wd6I!7c5Z+df|YaoeIQDkD$Ex;LUvdHL%}l1I@2~To9{v5} zayz~pc2&=}O09n1R0P_$S1(h!dynnY{(W*x866UC=eQ)BKdLHdd41N-?G^kOyTS8k zYWVr*0k8CoLzk58NtnDodwOP=?)@xOJyQYIw&?3aTl=A5xU*z(N7 zW>2+R@RaUj?UGNO_83gcE#vr>)Y)}MuWVU6!>m_-a=Fi(@LJ?>dSYw978W+4Z9Q($ z>td@tr>Yv~F?;459(iW>m(SLf;&qp}_nxln z?bspyw_YIQ>3Rq4daf<^oL-b}*gEZa9ZU4j%q>&@ows}7yrp#Cv-6)m$zK#(^!w+9 zD=}ivg}ZNhwe|LFXY@#8JRbMa>jY!@IalwS55-gG1PLe2b?tOaj4G;K_t*OFhedA$ zlvaPqwLUw|F^uoF%xC5ty#$S=OMTdMCyJ;(n0xgKtMl3Ge!E>n_-1p6elWe|W&Xxn zhhzJG@dA^rcPG0p^IYZ15>wJ}e7l_T-0ep!OpmXg;hdY1))o1Y*|<_?-}hIddJ`go zE(Bi>Oji#+6yNAo+%soJt!l~&W6=kbjBa!u)KLozu+ZN6;M8Z<>oeDGI(ARuNtTx2 z%}*k3o7rZzoBUT~xN!M))2@=mPvhC{TDVDUSiDI2#F-gOjaOJYWba>Aao( zKRjl;xY+(>+l4jjelnVPr`G*AjojzCC#$J6TlVQ}@+(@x zvEs42%i3ErIoH^%FIp_fmOgQ^q49F}r$QeN)jZL6h_tz8vHHH#LXMsb&9x^_{ouH} z#pg%w8mnhZ7v@Mt?vxDqeIbT_q3NFGZQm?SpXw}sdxW7Rc6Gc~{k67Ir^PD_7jYe~ zI4iWt`Sn5Ze}arR?{QdtH7Gl>W%}i9;vGy|uId^)#NS?5T+1!9oY`BZ=c>dOnGE$n z$)&aVCpJbL@_V;7P*TC?(Zq~MmL7GV-Mg$(%cKsAKG?Bt{;K%=!~(wJU5*Ba+09wf zG*9q0Xg~U(|9{DyYVrEAz`fq}7q{Qxws#NOd)n@H|2^0L@<$@iK3bDk7^eNFPC9*W z}Yc%42Wwch;i^S8{t>wg%>|5D!L^j2n*x0?35BI%ZcO-;@d8fqp* zy_eFwIy+^a&W+_>4Ceg8+D~pvyh~f)`Yt+rV#=`;5veyf5({5BCeO^XG;QuOWRj6u zwYB;}aYEgN$vuq)Pu!%sOjEC4Y_?~uytbg-Q0UYi9#OUs(GBH#Pu}hLx)|9o3~{WI_Vn|DZ*@%D%v&dCm8vVN4ejYI5Wl3|eL`9qsdA3ytUR*v3A@5$3y z)7o1zO-pWk*qdymoByPw#zZPAJK~)}-~rAfPogG#Zd+@)C@7cPAth`20S%L^A9q4r zw3~B$_N31Iztq&^fHW(g;pCFJ9s3QA&*`uaY(6a0-Ti0pre}gW>Ax0Uy2ZK5%3z<< zQkK^#Y|G!Sh`(=SVwO8YQ?_(nlk!>571PWYEUMmJx_|mDiM&#e&#p_v8H{3e`hu)I zIYr;71)YktU+Q?`+R-Gl>Y&y?QBKZ^LCE|qSkFWR7?aVaC6^$yL8p0c<%1iin&G9*0 zCV6m+ztTqeGZ~Fj7V>R8^7Tc`;+X;u9_GxF^DqhtO0E9Hes-FHHIr_T&a_z}o7Q$b z*O@MoS$Ji0ci#WB>cbcER#r`|nAUoN_uu1Ft6Xm#`!*q>I>dSAjE%Pw;-|GFTzImv z`J;mVeG#9Xua<4|Y1o^4TUOb`f|Lz6}Re!j#{YcuM z2O_ol>wj?--da@OxZQK}m&LhhR&{I6`hQe@>viCd#cYva^HXx4JmY$7TO#*z%ub0h z-?vWt`{LIVtE)DCRd(84e<^o&y{6*b`7gI^^qD4nSy)p{^bljGz}pFa50|OWIG{28 z#;I+kcle4rro6lGe~IIv28~C0Q?2t8Yow|!U;21>?Y%s=V8aQ>ufooU4F*_aR>*S`aIXc5dmczclP5tkI z+iP;TwBW$dgvm#%S*Mfy@vhA$IGo7<~H z(YK55tXR>~Rc@10_=)R^9*50_=Q3MfY_R`3r6cgv_zq`OWjORCz%bEb z>rF2c1jQz7XW;Cs@)pZk*ePMfx@^s!^obLsFO)Dyud%)A*HMzdr}pcW>FOIo+Znbv z++2Lp=duS=iVuf*iTH~rx2@lnUGB^Go?y;V%lBrw?%fH$rtMuWtZty2dz=IOH$I-@B7}c zOq9_)D{wjW*Mt+dFLlaXTA!Ku_^x3E$Bv^V?PduJxhLs;GYnbH8K`qocXfxmQaabH z5E+AW7mcR;QT7d5^)SUTvzq(QxnuEf${0J(PYPVWMU6Si^n+Z~j{_amtrzq&xy6sgyY0od{)Y}d3)fDK-?aang|Nt_ zs(rSe%X(PWxld8MHYt7S=7i~q3Y&#(gEw^Z$b`-5vFLhRb)@y~5q7P+tO1;yDvzA) zGGY`wUD5?6@(Aqy*r2oau~UZd4cY4pM2i_kcqZFsztK0zs=8f#|DEAlDHby&Q`c=T z0>pgH&Zs_IWnlL50!uOPW;G_8-!c_@3*P9eHAY^X{H-$L-sPJ)7Tbg^FLrZ2Im$U% z)0xfNP2=+A=LtVFZ=FlH(7)BY=cWDxGuLN#Eq2=->EGnO_j>on*T#Q1b{}%I-?vWT zYX3UPdAm23#_p7lydL@F_|@|p!e;r%%jNF>SF`t>`+W`zMT;9cOwR=lEAuu9er{w} zmDs{-)>-!C!x5hae>p2PZ!n98vT`i`#@FVVqj>yAt*(TvOJD2cuEZ${irgAc*i2h~ ztN2`-e*DS~MY%-tv<-{c)O#z7%NzwdHU(T(-1X#5nUTPs3lY8oK8dlcDpFc=!YqS1 zg_0|M9_|$Qlz6?MuOdt^b>g>a?%hu-%HC(b%(JxS+Th-he(ckP3JC|5PgiGk2(|>P z=56&WIm5Ti;;nb*E-Q_Tx7WFyQukV=zGB(_D^uAsyq<(f-0X-c^N^aBpMH_)$iU#LN z_^tYtbG8rJZ*A55$CTFJa*2D>YtI+$H*#j}VEne>%ZEeRaqZGE*VBJ2G+lp~d(F=c zUk_zX(%rk@*YSzV{#I`N__l6e{$qRh7q2Zo|Ik+4z5C12d$!&FvYUPjtL}c>Cg!}j z!OmjNn*%Mn#{#{pMK@WL8SZ_THGiU!VDsc&8BImU<`@Yvf1}AMFCyn@X5U_ULRLTV zUuG*DH>DU3z9}Fh{(2 z{9@{@+iwjWs;62BN^e=zu*0V7ZOt^R84vw8a_)%<3bN|`;m!NczNT<4v7-AMFJl#Ua(x&r2AgDs%L?jWc8wz zB7Q5sDZJ#`Hqk3!Y0lHj%E`vcjrSHTb3Npiy&z`V#hqtQSjzn_fBeb);Ia0!0EJJF z*CnjU_AJ}B_4T(ES@YRk=QY38Y5ldZEH};mLfYz6yqjn0?RG4yZIe$jW+-9K@jAZy zq3Prb^Br<~o%OfKCB?=i_`2dEu25N3PJX zlRbtTxsqpdaYb#G@t(;*jcV*WSo35IpszxVc!nYsgnqj$SV|+ta((jo|ADTwkrf8Lw zgs;@NncF^JTaONrziDQwg!dY$YyccRMQxyyiRH6b1_D~BhO|X z(PG{k#_jDPtNB9xOXbp~Q$E$%mTYA|RqF0w&u8cxre+ZDw0BY ztqZxoJAPN#_vNpu|EiT`HS8{k_;aQ)?2^Qd34E4fAxEFqdWOHXj8VG3Zoy$jfe%a* z@A&DnoI#_YdWjGx4|C zDlwc1>Dq9w=*}$B7Yz&kw>c^Z?)e+eV=>#{ai7#o#wQkGVt&U?T9s_%o5?6$CboFy z-KYMoE7;7KYTwwUv)Q$N=h72tC->dEp)y9YkXT800+ML_$Tc2F7sE*}&^Ij#fPV3Me*KV=+ZSSolejR(e?(%`t-fA{^DjJ^uTmp}=%$RcP>~Y-*=Y-STr}#{B zU*`ITZAwE?vdoqJg$}*~xvI659p|sIZ2fa0i@Q|bxh7@tgK1Kx>#nJ8J%2EEqWUf4 z#2YmpOB}B_{N~Z+wu$1lQf>RtVq5(3wsNrZm#Ip;Nqrjp0hWChO9O7^ePQ`@deqLo|Acdrss{kiu`)URF# zMs1d|K;~sS|7yap1$~3YPKPXS@kA1TJh2_hl zyf-oZj`l@q%bp)QJN4nOK;vk~yfZQPPxa5Rw0nH?^qQNM7meB*?nLYiJKR5I{=r*Q zcK`bG=jYe-%Afp9m0GO6Ta^!)FWsGXT|6+MM0nRXrQ~vuqnXXZeT9ZHH(0 zr7)$xkRbPjxSW{&Zbo&Ww{oVBS^%I&qM`$_4Qs`0Y> zCO2wKnQxQ)-TCL+@SQ94-khv$nOU>?ZkfQz_gk71tnW5HasSmV7V`XoM!_nxmefwe zj%>#h%rh3OdR3^ktZOY}#OfCcZ&N<)VlxXn8rsCEXRr7BZ0)0`r>&=~u}KZ?+s9s| z{^Y6pb~E3Oo44!^`d{7m<7Rf{x?1K%L0?!j_|;B$FZ#Moe)6HS54W!Rn=G2TYUZOe zPLHNAK3uGc?pZ#N%eU^2Lb-GNKugQenk4 zlcXA$f@(rqMZDtV@3cSIB+R=0$wnu}*~|~mGE}+OJGiZo{m>kzE6?- zaK%khbhFOJYn@_CUw_TIl6CN!fnacj*1xtQ;SY-pXHKfMXj;2B?P1hRS4Q3iAMR-` z(Fs{B+B#EZlkVMBe}7arpWu*7URSYGLZD=Rvqt#g$ma`WS2*2XtF!geWv$m6_q1i- z>*vdHW71p}_Uln~LA_X9nKR!cr5fhfT!z^}HD6Lr<|}$~dLBzTwBUu*DfSrW+j(4D z?X~uZw$BZS5KdBgzOzW&`sfcm1A&fhpS8B{G}9B=q9&izbay?QZ)ENkp&y6VW{7^+ z%6gIOf}!h?uKUxk9^<-y{m9X-d+BmXtoI-Obm^-7EYT_U>-z1`ZE}%sv|j(XlO6u{ z;)1&$H*A>rQ=#O3X7|Bu=a*$Yyydsu>H9=K!MV&ln*`3XD*5s}o8u$E^JMGAeTVCq z^UVwmno`&fSp+&VpVEG6XQ`3g_oHRc(S$7SzZaOi-fQJ5?0)Jyg|Q-V#Zw=KFq8WM zhQc?3RWC@3W&BfXpQ710uR=89-y*q$?Lu5DsxRoV+RmQ2$7RbzS*K*y)9a?Z6$**) z{<{CIYu~H`jPLoFm+7|7U|72(>X%E_Nv5<*-^+O&UWoKDJyz-Bap1J!UfQ(7F{SIg zh{gI(M;3Igy0pT7X}3n(>RTwvfB88kJk)p10-Fk4KX; zrhYto;v&~$+lv{cFBixwO+ETO$7S`Yw1AIYk4{cmbTy@0wUk5bLkaVn(p{or7yLY~ zI`#1R3M{RAAaRhJ$xtew=hlz#kiQ{HTGJ;=>CX|{(_HPQt;{2>!GA((>D!}6J;RpY zIu@s?HR~J4CpE?bu}=&$S8K(3{BsTGcsr}B!}kPBl5dOdsrI6YtmS5RZhzV5P{h~Z z(OPsspW%EL^Tp0Ne6dz$TiSJ0{Z6&Bf9u@y+=b)Qv~a$l30j@&XYFCH_lfHZmpa?Q zQo2%AeICBp+?*NC_3yoYSV_e!jNNb3%Jf;;pNGW^ps;8r{-i z{9;-fe3|dMt>^kJb`qy=EoJoGpR(moZIVIMuYLd3qrS;%x-NNQE^Qk1?%tiQsa5T2 zqMF6`y=1gMG8|R#yB9y%V@mzg>6hcrt+$(d|Lo-L@2AAJqquWVi%tf9zY^ImXVWq7ZqKBnpY$U6_N-%z`jv7cPWehq z{nQT$1#_P%Uc39~v*Bxrd4D3)=ct&U{NTFD=2^Xc_bdC|lKuVC#+$U<)kKXqo%%V& zxqr^-y-%l1m6>%m%1qnx$Eu}s|4L6Q`xYN_YwMX6(f5q5rpivsyr%d5&3B#m^PjE0 z`bTT$pDlZKM91h)etr7MyTdj+WA2=K|8Hl+Ik%Hv-{#cKu9sZ(ksRgGTt8_f*dG|B#Fgl)u@=I5^` z>FG^gY_HNib?c3>-rEwtH)ns9=4Q$K zb;flEC#XjnJ}5dq+wirxj9n(*@84bb%98Wc3opz4SR48BP|qBllDN~y7nc4@+j?oG zjdnOv^cEm3WK!%fO~BPuaUB#?q%>o_G1pzWe!$>nuM_Hx))2Zt^kMT$9D{AZ**M zn?J8Us!uvEia`3w}>lmgoEN_3)pvc{TI9rkq*8 zygN7acbvq7>Mf>){PQ1o)_q=Qt7vdg`bnj#2Se3LGqLm*m0dsVN^_^O>j&qpOv-w- zAgPbd%Zkazw^BQ!R(rK{_4@>pwv-wd`^XHtf;w)Pw++e-@{uHhnrdyI=T#7_wMzKFzcXvMZA?y( ze0#Ks^Wu|*-j08`SyH)fE?B}QzJ%#S=MC||ry}2GYzvJ3X_EbR@$`w-RWA>^sFuxj zdhfIBKnMd{S9lb=hi$?U5rkPZBtXO@G%US>$`bE%?5#RXJtL5j8_RM8(#_;E?Lkx^@Jj)NAurQ zwV8ow;xm}Ec5TXRp8QgT)q^u-z43&bpI2%+@5@_og)=sU!FS4%ADS|2r=H?Fl=5-? zkyK+xFOeFBO~x)F8mpG@o)2?rbh)&_W+_YY(Q3|1eI3FliaXeNS!ZrwKc%p_X#*b% z|H{SM%U*pG4_7hM$x_;tw(!pq%?W=5SdMiaSJ^+ijWaIwev?fbo6>g1#q3&#g)|lk zOuOf>JKft(Bso}3TGwShV~^Ov^9*j>8Iz(=V zxBe<`-TH5un*OZm4QpR~7CpaHsg2F6!Dqt9?4zAO&K`K#De~;GiEwaI`5YJhpC`EI z$-Ms_5LUeNyv`|CPM`VbUtYBne|m4`|9HJq$0P-!-*LnTto`elJ?YxgSxZXq&013T z?SJ6oNWHyhH{40K4rgWizd`FxbK}4FI;k^{1?WEQ?ml>q^RDrf^zPHAQ*8bnf23zw zzwg(cS!eUZ&fmUoyMNZ+{Zglwh`q0`v$OwwGR9YL(s#pjTfx$K>xHWg=bwEp{%OKo z9|pC(EAIZ*^6p@L_H**b3Yqfr>W3d1eA;*7*p9%dJWtODsa$@y@4cN)*vY3(TfT=I z{?%WXFZMaIsIvNR@ut_SVvMGG|C+mFqxh~~;dhq*zjo?ue(~k<@{^q3>vl!N#njF^ zJK4VL|AsyDYJQm6eEaL zdHq?t*iOt8nS495Vw!l^s^0Y_Ef!n_+OrOw$a-7N!#2J4ifg6FsTanQf6pe}-?9Jq z@7d;WSDfzDUAel+5#RoJ^){(IJ@<2e)}Be>(R)rO zT@n#!NM4qEM?ol3ch)LSy==>6he}&Ftea97zM!}>)p5Vln&mBD8{ZhYym`5BamwZ! z70D+3(zE`ZP!jOcPn6bX*txV|#WL4jKAKa^9gTICg}GWSI8-dOyM6zI{t0{m8OjYO zH}!^UeP4MbyD3a*^MZgSDaWQP*|njoLh=3*6YphtQccOhM~})F?G)8@^1HpJs6lsU z*s6@zX;EeSHmwl~6-nYT+tyB#(d~NQ^wUsySCO!FHW0@P(9IVZ1 z6{bBiYub&3f=RlIIt;w4cOSbjX_-!0Ny(Cw6B0pdZOR{ohc8*Q>cVv9HK(kWzP_Ym z_rR=6m2t=FUm6cQ4%ExMk*cU^yuMUZVo@R&_XVX{Idd+tJy$waBV}VgMe7E`hXo5d zC4E~h0$%VoZ&LZ>HjPrxO)dueIOqInFg5^;W}iT;6GmVJs)T#&oH=oTCMWg`p5orex?P)tn@bBHnC?3J0= zR1{T_qGj96(ZRE&t%iYxsY_UU@l?}oFA}{^^=aOi;bNJ}d|>LlOkKe}ho@YZNL8>n zv1ONY<*j+oGp>HzTm7-?a-oLH>R$d+ZrZ)Z5r+nsUBi-3^tGD$O<_7qxpwpOcGeC3}gn$@-=xOb&#&xV-v zjIP3j1()rNYNXGI9ABo@ee7F-`5I=H9*60d>bEiKnar-a_AQ3@()>B1J~49Kk9Hc^ z`*?cZU8Sm{#FENCm+8;8hh>`zR9~?ilerhl5i--4@fyo(y_etXutFf7;qT_Zf?-I36fpaeW~rolN@KY7+XXM_sl!M(UrxSRAT5Q7Pb>*Nu`>UY&&@rJoFr zbZPx$0tLX5xfgj4EAY64pX6w8J`kPqKeOt5i0F#mS*z~ECrgInE;JB>gY^)7*KZyu`5Q%GS`xD=q!Ry(^<@RXUeWWs^+IrV#dx3ada>h5R`aYUOZwES2+T{2?3{Gb zvUjT4X|>sxHe6W}x#~iA!KLzdsTKbjZC{;G6pzzgxcD#q{l-A}Xuh5i>R}5A~_ne!m%f~KxU-WM>JKNI-j?D(a7q*3m%x4XKp7=WL zUBaAlo#mOWrOY>414J$rYlLfx-Tv3>TPV6D`OEXVj(yL%-?6^{ufJO|*D>#o0gvl< zTi5T5Y?E|OU)sn1Vc+-t?*A8CZ?P#f(%~wZDpr{OM|Gme&-*VK1g9-enyU)p!+`|lU)@1L*# zxvPI&+V9;dHaA~{dOrJlvCw^^oM6spw*0cT(XPOVs|7DEry$ zJ1djdMY9SxNNs;nb;e!9eqOHd?vy6ByG1%pP zo);lmbh^cl`IT(!+cWo7X3v_M@gt=<;+2(S>M|1_!7N_`r8O?xULuuqn3UbPi|Yzm zrKV)~ERAIH6)8XKttu$jSbAuG-Oj3t$0Y$Dx3LumWr|3xS$*WqnXEt0SIv((=D5{w z?WUg6(9~Uq59N5{X5Lho#h$a}MeK%Ot#|&JS+yQ5JGA0Z(B}#*J(KcT9H-A5zi?RT z^Br3qL;3rB+-J(aZP-(Dowxh+d-+9|iiA(C*znJK-`Ous)8@<1jJxpOBPM?37w-$# z`t=vzeyX>t_V~kF{6?4R4nNf5-(zU5_Ms>6TtTfdd*C#l=l1VBkH&dgJ{K}y)Bo_u zYguL&Ewyt@*_$6s3pkUxdGCR&9b2ACTErEW1{+jtV%*`i>)40WyUxTM;qzP~x}aKi z_wO_EG4rR&@_o*J#HZcpHb22Msz~B_@ky7dyA|SJg>10Wmf*8maG=OfP(5ASJcL)$ z*=uc>d^(R>;=zQ!k+=8k&g0MWo#0|=*%@Rt;lixkj{<^*w=Z8Sx)~e&D(cp+)VXr5 z748p8C9k0;em=DL^|yT+heNc?1M zrl1G=m6g|L=$Y-Zip%7aW3^H_VKL`h!}-gn8@+3imK1&~yuA9T?y8yo#**z@&0iO& z2AKaApF1%nELd!9FmIB<)Q4VA7y>poabI;VRLOgwbM4b4!TeKKdE{a;3$Mk8TXC-z zX*n)t&hTa7H*Q(R6=}!%8u@)EEXiRkmzr#I^2!3;<*_wQ1uDsodLKH^ZsBL&;Ig}K z-}G~TjN;CI{>SpnBT}yQ*QwscMH{e7hm0~ z9rlQm*~-NC#pelj-6)zo~3{Ix0_F1^WDk1E5C5&&w#9m6m?@O zEyMfPhnPMu(9~J~{8V4}>CewMY}qr{LQAK7YWJyA`nii1S-Jmgp7iVgiz3rk*V_My z-xrp6_f=BaV9)aWx9?v>|7LW#mH#4oreVIU_?6k3Kg!*_Kh&N)T9I{0{I7#*y#73P zPF6F1-pN`yVq$Az3vMaCZj{`gD-rx%@?Ed>sv}L0t*&QEmp4QOaof6ZhnFWj(TlWL zIbG1pqf%t%0gkmd9=z~q(ss95wB7b-=PAv?vwk9zcLg?TGe26Q8ln55UGnMIr-$Mk zHvdvNdZU=RLVZ48YWBgDOF}ZzaW__LX9z9J+hO-qd(Ab)xQ(7ms$EX+(%;;F`PTta zrTl3PuOyaDQ2A?o^U}u~7mqOom-J|Ru9p7TF>SI}x!sqgE@f9Y#l~sXE$Dw*bkKLF z#^Z}ucl2<FQVleScFEdy@X2b?Zf$SoMG1(1_r6O_qS4dl-D|zO;w9^2oxsRxE8?Z~b~SP{&u00Zw#dO+?0NRNZKanp z3V(53@II{C7yh_L?MH&vM%(ONH!p;`$XFfUZj=}Mc9Z5kJuLaX+gAw)OO|6Jzb?I z)-y{*zSB}S=U+P^dF_U~Rr@Qmzb$*cG-wiYxt4*;hJpiM-u!%ft?>J+yNai0cL^A& z3w3@H-5t31n2BNV#C_M_{SfG~&u84?5xF_>#N%C0Hr}m%!W1rf-nveX+r6YBx}l~y zRXeKT`qYMf`Qci=F}tn2?ix*V3B5K=!>b~RH}l6zUA@BQa%UE zr?T%S)hxJk!+ayB<#cTe2DKF_%?BlBC48GGzG`oLYw!JIXAO&OWlf*Y&9O>5xBaIu zq;2P&_t-$dC0}L2qk4Px3w7`6`&V9X(!AKYmW}PE)du0|H_raMQmmbJPv>sc%-+cD zQF_${%fr%+o?ks>^@Fc&VUqe@08Zc)niOiq8L|tmG zWu%*aRuK zS5!Zi?cuf0idv%bO+lN{M6_d%#WuFG`kFK>5`A;i<5_kEm zL&mJH3j#Lubtjk9EJ%3TYv7nG{%?)b)O|8p+XQquECVujzBt~xte~$b)u_Do<4J>u zTw65wRgGgVmTil8FKlyn%E4cb$-G@rY|LN3Jo(tcD7)yyj#*EF^ZP&h*vR0L8UKC(9;a#(6kjOJ@QA4Gz%Ta>Y8&;q>|kvc9o% zTzP*u|2qGa(aF4(Wu2Jj`|r8khNP)2$8Zcs9rD_u5*5bV7gpyr;@-uhJE*DSD+b*f>v;Oj&(mD52 zf0e#2o$>kT-FKJ7pYAz#DLnShI-?0zaqc_4SH>M(`E8-*=6b>9QS}lv1s4xbUy`vj zCUm-dAzxaXs=C*Y7Kdv*dd7Wrt!tI{_H5Xv?wr{q!?a)qr?q%uD~EDVZ#PrTB7-9@ zj5h`ykxR>3ld>oN8UOKQ z*){dcv~ty*b2p||NpDNI#8x`xvyMrb{5yXAQQi_FX1#mjCp9IeK7q+o zU3)$WGt4e>Jozf$b$XbnyW{WPy9GrYW%U}qS`!*{&um>-8m82&s5DEc(PPG%7q<>- zZgb?$6+d%3^xIk1zU(t^8TQJ)G5a4;^+~G!gQSJ8y~LF{ZSQkb<2KK?e_-}&#tbXp zI3z8zvi$Ywi&i@&EzAgdh z1ZK%x&q<%ngj&DXcG)>hXJR&d`6$|9*7XEyB?y~BP@ zKk8sfw&1KDry{Mc2NB_#%g?1QV=@sr>3n&*4(qjdfo{%LSMI8XS3P}EKQ&s(>{^OI zKs1x_C$Rwkc8 z&)^Vodm}piP{|CfPwy|TU*>(W{Mq?K~}U+G?2qrj`Yk#$k*s^zPk7I#W~Fp2)Sk=5(< zTr0n(3bw_{N+lDuXWu$%#PGrXZT`y->klk%|7!d~mj6fkf!*?-1>ZcYv}3sYcZR=0 zx&0I2183tOx8MFd!T*36|3~Mybtlvvtl#%Yr`a3Z-M2jRw*2<8zcUZZ{I%5W7w~Yh zeZ%;{<7jfk>MlL`n_?$FB|bi+tMH`NJJG1QXa35gAsN=|^6eu^LJFMp`m%khO#bQ` zi|9r~nS7NrjjAejm{GW9*6meaQ{uX2ty`q1962lDci39TlS!2>`=9N}vTe2RD*No` znemZr|GG^}(<58g$;^~q-m0s}@a>XESWbj!eW07PY_e|z~@3i1IFOQyD@?rPHqH|_*Eq-pF`Y1>%@Am&s z%Yq8M|9qbA^G$q3^<&lV^RL^L^k01xJ$vWhcMrDOZ=QL1lR!W}+ucj2%4R=xC^vk3 ztt*S`Kvh?q&*adUVclcQ=3Cx>7YFJ6ZAfFNIkR$=8_f zaG14SkE(lIX2Y2N^ip1q@TrM^&(ylRu#go^H{mjX&x^R7lv*df$ z#b+Z_B!26KDvM{U?tW9U)9|(9k)B5^|6?Rtrp{k1JWKHD)+nAd-4@Ti`<9-aw&84& zz0{Ym1NjRdd@0ra6CytG?AfVlB3E^mSPK>iUcC1(ZQ=JLR`pkAZrZEg_HuKn!O_qL zh0adfcLJ*zcHJv^?YKvrPf?L=9}nNk!#SJV9!}UNckr0y({kHg;T^W8X7GQo>Yl`Z z!Rqu;{tZ?3&y<&(lRDjhIWp;2pw;>Y`Nf;#z9@gOInsOnbN9}RmggTGe-@dzd*aW{ zT6?80?5#Zf@9X*R@pfG1?wjYSE3p_aIJ@JUYV4#WGm|gjE5ELHn~&4zo$Uzx8_|7*~Q80w}e~WTq%3_oX-IUri8n) zCm6QrzL}t`&!pj{-%>YY+Ql8&8-6_WE7OS7lILEQC!Tt(Ej`+?yJu0g$>yamYId;R zF`RN?@`rN?KSiDTH(lvJKl%1Ex92ybN|HZUOT2b}R?=SlxageWofUJMdCb-Pr_B?e zIN9RSvB#C}b24mfS>{H}F~87##6JJXw*Vm(9k#ypuohF>alGR(Y5G4(9Bg+0r|^KC>*E>(Q^C@${^L z)y5yoj&v1Vxn3lmDmc$^r%WNsiMJ&Ue4;yknii~=c&@8oG?()+*OBY3I?-)HI~L@- z8}rPnG3ftRIxj7Cw$}VpHd|TKx*kNIS1F0wa{lg~%T?7HGi)~ddn9jU1@CGz3ptkx?OQbHf0&}zWh>Fo_z3F)de>f{<=5Mesm`^EOg(b zb?)206AYhh+w*?4)($tnaPH7u-p$3*kJxVhjJ_lAJMzuG%?EDt zKVSa0lQnLiqiVbNIS;ApHV$|s*`csOLX2ZhZ;jNf z?A0A>6fBxH?kZIK^<(M_tvP9}4u_-yq_>q!{h6L2s5$#;%9a3~vS^FB2LleDW#`JQ z+Yra~jb~z~LyXat%Ns7b1|Pii^8MpKp>iqV8}56Av4{Ms3V3Gr;;Wg-#p$iKQsMEF zBhGGI^mr}z1Ezk~YuyRm&*P-^Z7+z&3x{&fkXa~}@Tt*2-Ko`_tC=H

`{56;@>urAG*_%7O8!P$D5A3VnT32zl zc*nugTY8lXOIK}~bKuuM$-D?(Z4vzy`(9U>FZs9QTS#r53WILt{>cpU9)I4yf0u^% zcGi3U&N1cN$DI78E>;m`Vj#Ocb>l-LiNtA3dDRVcgqWXnPdJQlX=d>Q|CRPH`9GI_ zcDyXU(Y#fUYo6=Omn8?IWD8rm)|BOLer2>c`Y5Bv@dsQkZA|uWE8ePXcHzG+WF*S8 zTjFru;S*Px=UaZ;ecVr^w`JbM?2WSu3y!mggg2}YdHLh$DqD>ppS{;F^j$59>4=Xz z?O#|vMN59cySUXgO*?-p&R57=xqDB=?6ooWx1QyHOwKi{|LbABI?w!E+Tknxn>M$U zCBJzRzC-Za<~KFTJ=^8?1^*UK-sAJ%%bIbQXGxQ%vT8MJ!v^uhZL6df#`HWaT`%DH zIQMSiw3`zpf+KSKSd)`1pMC!tTz|-hpD8^-gt=D~%gb+ePq1Ilu|4fs#jZp9XFs-WzrDK4;O?U!!F}e(Z{MHw z`0ahQ^xwh7HquOwj-;Nrs(MH&eM5mjD{H*BhU&4^vDGb8zf~HaWPECFt18WXfbZA> zQ-Oce!*e%IJCqgW8=<;bLe<5bW3$Yc*}1~!wlqpxteU!1LhD#cT4d{l>q<_#qJJl} z6n-_dHlFgpd+oIRj3eE?Tr>X&=`(y&sCi%@xoTt3rCA*djSr@z2{Rs+3RX7r4@&x zlV|X9TK?@WeZw!dZr_wL!i4JnoN+qUKQHppkB!FNPWDC5BLD1|x&LVYtj}GQhQ|E` z%4u>BkDorD^mc9Ly?<}rx7wSYRbF*(&ej`B6LeX{n>FW%+3md`=_0jrUEHto6`DfV z#11wwohhCfa;58%<;-$LKbzCqsdp6iADptmPj}A~#={cR^;I6qmS0a=S=T*py==|K zwpyvgE35u<>vD4awiEI$F)E&C`qOv&m5$Qhk2e&jU3wd|wLhcVZf)UTy{RJMQ5!m2 zUn-pPmut@XrC)1fSFj@L^Qz~I?;c+7Zp37J=+=p-$AMGIUw_$b(jGcT{Ol{<=0ds6 zc^A!Rr^c}Fdep-ius@zJ(V(+px}=8fG{%jB^}8_SnC-*R@P#dff4&F51#H|}7?QJg@5&o-Oz%qN*Z+I=@zdo;spUVOyBRXTMQFeYtn8nJ4 z5*L=QDZR17u}!Jf!1z#8t>T}HUB@DtTkBPdc#hx7xZHGTlj4up^(iwi%~fX)yC9%2 zDRA=_6`OBo`Z}0wPcbpyoz|GPZQ8*+cJB>|J}L1L6wK6HeyMmJR7!4q(=K1-dTyi4o`!c82z`X2S=UQ>g&)0Vs7N4r$vm)}8t$NzI z`S0A$oPU)2D{^nW{NJzVKRxePjX7$me&a-!z>bSL|0_4&?)7eS?KF71%6nS5{UbY} z*OO`kb<>@z|F8IMe`c-N`JV2lQ?}iW=v#R6QdRny^Ss{w%PQtP&GJ0{*oo0);ncHh z&gNKH9Z^+zqcZD7P;ks++3Jn`r`q#%KbK#!-5h$^q(d=#YR=_NTZ%q!IrVDyrA@kEB5yY|gUHuqB(W!^dGthdMWrS&Qmg7RK*FS3$iJZuk4zZN6Y z&ihCpD5qlTi&qo7riZO>DRMq7ct(T4+g+ma&Flv{>caP;FI#@!+SJVC%{6sldBV(- z&KJKl>HntQ%Yt)*7?#Y9%sXtrL-&X(O zRrO8jS)#&^yZmyJ-4xl6H`%PIXjOW&+4srR@M_`d^Ew}%Vf|Bl|AEE^l@H1)SLL)n zrpm3@_^tiA*9DwY`Sr=(UO{fN7k%L+4TL}thO8SVQX*N z1b7>S1@7DUDv9@cBRfC)&IS#Q|EjrBb!KPwPEFq~_EYGk*kz7yhkqs~hJ;N1Gw0dU z<*Aj2QYEzt>^*x<{Iu!suFlWA-Z;xK;KUBCr&|BS4Vzfci%O=I<)<2CzN}X(|7ZB@ zbS#gl{`R_whu!b&zw}o$xn-Y2<&6CcZ8FPStCiOWt78G&At!ZlN8i^we5_}^oK-uhQPU)m<$yRvD$O7k{8al6f- z+ZL(X#uj;ho+tGCRLk5&^M7e=nlL?6Y1-;ep<%4Ax_ej+Pge5^ z-kwwASm|2OFD&}oVZlM(=GRQo-@2}zd2IGYjLkhDM}j5URHE%b!CfBagd2Hn{q<|) z7q{2*EpKwSXOX(tEdMs?%Z=l^EUR9`>sxRurCF`r^WpQh%fG<4XZPIgEInkv!}g%_ zfog*FIf*y>eZHZ=ffQG>}2x}UDw1}{+nO6o{;+6eXRfb9R8#@fv7j;?_TyYP2W6cdz>&w zx<9Xpb*zH-?%R11`a3LYX8rCKI<0#%^v$EqKbN&XaSaf2eDPRY>CKtr=N84jUHf`U z>XdI~QO7rz%*>9vQ?bRk+J3t-xA)W)pKU*B*tt3w_p&_L@<7k?@>P$^k5}oqNvzV6 z3-4oo6ZIheCwED~l^1gFwwLXTxTSq?nlv-l;vk0V@O2dnE1UIR9xRBPy7Y4IuP%YD zGqUE~y`*Te%Gh#eMUnoS&L2OwGWnR+tnN8A#m3KoCu*+f;Z^nT*Z=cg7=P|y1yk;e zmW6_Ax(oHKO<8 zW-eEM=_cWCr{|~psn>42CfbtDDy(0&Tw5YhWX{*tyG*>%G{NcwLY{yYSX+~8vhE^#JZPGU94xcf9e;nM^-UWQ{LyOa(PwG|C}T8 zx5P5<#EE~*^WEnjzLwuRV}i{RaUb@slwkXpO34C=1!^jqQsT--&VE{IT(xnls&A#3 z!c%kmP`zSJMH|tOMN8NVrj+m9ReWkT`@h~jryF9{_Z+Xc=H+v*PhZ@3tnRjRuiHP! zB$BS7vemuBT-im*vd?lCJ(jt4K-ucp!-Fn4HL$&exAUakh1%9HUjCvr-{bQGOZf#i z8khy!#J4;uEt=@y!OR3`;B9pXXdiy%XhD;UbbrY ztN;J+9Gd!PvUhd7-tzM4+gmH^4Sye9Q#V&qQsU3Wk3Tmn-uJb=^0sVs@ICz~&%bL{ z&Not@8>x78=CNlxH)p-K>6&-`cAC*{)6HqNQELmUF0FdC;dowbckP8$%WHaa^9t*` zRNfx?ek(co*|M*f&iMWO8prnkbLH~lD5+_Y_rBR0>TI5pZ&{KOFV_*Qa`V&mO**PK z{{%0R{mZ&Y_OH0>?n!dFN3@SMb%ihUQ@wX_zw*8JT~9a7nDy~)PKEW(nKNf^+__ip zOvR=Nuj^)?amy{E19e*oLbAF9(dCIqx%Be3>a-`~wCokReMBQkK)atZgTj8C%PnmGs zdc>vLcs~69zIw4;RdQ!1U)%GLOTDwTxax8WbGSSw{>zM-k*0(o=i%MoxqkUoBDj8B+s;?ZyjQG-R#Z$Vz~(Vd)B3M0f};QLO0zuAEnauu z_j8i%uhqfnS66Nh`jBQj+iPNIc}AqVz~yhf-f!!ozs(OTdG>Xu*Tv6XEQRZoI)d2+ zYc|Jt#l|l^dN?ukzWkY$RRVifv9;g$7Tx@K>dL;nV{NM2-k-0&|Nle(_xz>&hZlzI z%RKz)^P_2sJF@JqnckYuX0k`MY}aD0{}wAn9-mg`+&g8`&o#2ud3LMM{CsV!G&NH5 z=!88p9-MvE;q~89Q1`-m?l<4o80zo7esT4*)6W+6-TD>nz4G(cD-oxX+?8VajQ5pZ zOjf*{USK&lMsMlqZ7jEn_o~o zfK{(-)V57i&e`qtIOmB;lV6h2=SDVO(*nL}Zcf%hLixqlUN2a+p<{yQ7bVW=yytZI z8jrGnr{c*<*8^guLtW8RMyi;bxO!Q_F__jALFV$|co+|5N zo6|>^o=-T!8sW8Y`B4G(sbYVA-Y61$!~Ws%E}hzyu_Qo>aIi))a zAI~+7aBj1Hef|(f@s+r_32#>ImfbF2I`{3|+3Dh;jqR2h0n6Ao?CchHsz}p`Jyjxn zDm<$#B*ysXQt=xZ0gQn*9M?`q{^UDyG%@k^_k`(8DtFZrR&95D$@j$W)WY@)%od9x zrn9-mIi3yrV14ELrnJa=pZun_8u~k%Zcm~H> zGd}7#qmgtek@ajzVpLS7@1`ZQ-4wL7g{L`bq;f_SbGjb1;*D6?_*DD$BSyx3PLH*1 zTrIxZ2tB=7A`mXH$?2oz=Xtz6V%cTt%G_<7ldh-cycXz<6cc{9;ALDzLe#re8_(=3 z3QKys-g@ z`{|35_SFQ&{z$UgHLGk%{p8jD`dtUVJbt>|fBNNvi>yt;-=+GeNQr10^KsjEw>|n% zwtHe;gV;=aqkZmd*F2YBwtV(aeQnt56=n;3?Q`85Gd~{Hax-nO-!o6=Y=zR~2jv@& zx0`?VG&FjA^sM^k_21sEdY!qqZfm|=ey z_1{+y7apuJ{8>~PZDV2jOsy)%{`-a7`zj;TZn<1osba9}fVF5#0Nd%;DlJTHN24D_ zJEVU7@bP=`&5YLLA;+r@7|&evck}yS&E@OQ*UQY=Tid+)ef7zEW&5lD2LC^69jq67 zKyni=77q7IFQ$4wd)$hPTwdOtNiO zX^(l!@0FW2QO%|EFr=dV>M z-}hFYfBlShCfCe2h1+lE+A$uT@j~UUdecjz8U7(FEi2zua3}bvXaKHeiR$s_}k6EIW`L~^c+7f|99-KvI zkF516WM1s>)#brF_InHF3eG!GYqR3}jf_c~-q^S=sY!7tdcNb}5wWzdrdr$Q#3l*+ zH+Uj!w&GGtiKT1ML_xte0|%AcGjiWN67-nIm?ps3IBP|qkISM@{}Ojx|H!R+FU@ZX zzay*M&I5%!2b5U!ADl}0^uh1woc{|6NblS|ScoOW8#YVY_eX@y1~gLBG}eUDSCABBca zOgh&bEZeZS?U~iKGqnlRzFVY4tov?ump!$zKe_G6t(`^k6S52a#O=G>^eW*r zziEW-8b6zVYM;0LMB>m>^__Au3h(^$(mYSwLwMLN< zrV}16dUCKu`oT%}F2|A&rV-{ZHa`0@f8Q4`ecMHrx8GkV7R=f8UsP+k{wXK_{Z8el z^5Pb5OiI<(&z4xOa7jpgfrEJ+Pe$SdL7lv{NrGK`8mx+Q3q7wr*zB{INASTOr~7;! zH?Nr*F5ouOY-r(^X&M0VzGcu*ha%YOP=38nH+b_i_fIP#cLw-(mzRFekohMCCne}XuO3-|VFqLzMuFu%m zAUwe{eQ!l~oXEOg5=u){+ynwrPZx_nyDhQi%ao9Yd0$VpUUA>t;h^7iIaK(*tAJre zvRsDPr!|Uy*4Mn+^?E7a{L*V)vgvQuOg{T+`(ih<)%AV9BKC96*_vorx9eq6Eql7} z7x^{S^%j#kx7`2!_={`gidm_1&)zb3_`R_#{-WPW58sZImg^E`Yb}^|otkABDZZ;@ z$Cm|$-<&?YJmhllh4PDyCpc8UqQXrTCsEfpfu@^CDIWuq(zazSg7o zEkNd8#LKCX^LP`(*)A&vDpel3yY%91?@J8VSX)vjFO%5#TkwO?mj&i*%cOFyFG zJ-R`6@{eh5Mcfu%pC`yI_0nSUn)-|Y!W9mGei)@{<<-OYMmnIhp^xF4 zL55t_m$w>Ax5k|;3p;sBpeX#re(-_GQ|5XLH5+iWa}$n|~qpeSOELg`NF& zOS;ePFqnHr;fL#klLzHi4hK3ZEkKx)@HpyvL=G{9Ne6v&wb+Qzf{a z>h0}1PfUqTIX3Ui?h70<#KZG99ayJqt3NYOENJI5jiY|jrx?{`uPxX%^P?iy=9gKU z&0USoZ<^2df?49}?aIg7!ViR`%%1uw{n=KZd2c1fWW}fWy`8^e|GaHCEJ|#h?+Y&9 z_+8fY#b)!kVwDZtK|7o`o_#GQUHrU=%}bg)^KDO(n9_}s+Q}_NiSst4U7X$Z2fP)F zX>Jj3R4KnzI^&jFfs&)PFQS4I(m6~vrY5pj1u*Vpge-QOGBz~if`8Xj! z;{zNbfve$)k(rtGG@4(bn*!nrV`KU$-7h%ZZz5 zQ6dKAUSFhFXsQ2CbI#TGnr`5Knai|y#x9XP>@OtGsjzQOd0@2Yrd*@Oz8!M2gO>>g zi|g33$R6UHx_io_dH%=zto50lb}kDo7MQT9qQ*v+ed;>iMSU%LdHXe9-u=H)aET?G zHf}LOJ+yl9{l8 zl8s?~;a9!*UW;oUvCg+QsfDC%vlX7et+D@{&q@Q8=c^^zpZsx===+??*KBA~;i&P8 z&rPIbazjhv4n>8k4d)z8X2@%vU|m-qJmHFFhb8OA+p-hdroJ?0-8i`^KlD(Rm=$}H%Q^J(38gm)3i0{RXExl}$o#4K_D&&z-RcV8 z3S&eR6{ctVGfff~-L(68NuuVvN4)kTOA1mO#DWfQ-@EU*gF}^3%m*(~owokTu^-EX zK33lTv@p(dewlH`Pm3BW+w2Y@=0fgkd!%OQuW>oD>3LP((nY(roVioXbzX=!)hppm z!U_(qS|wpdN7vOqn|~zv_*qO^y=7m;x_RrPhmg#Y;S^{6Xolo>R_DI$xWyP%Kik>Sw6{Kp<^(9?g?6kdKclJ)ux|BJkb9ZLoY6FuSv2DRh`d^PQ`=}ay zDqU#RJ7ZIY+~SSa>-|GzqPCZ8$#@ig^TO4`TiF;-dbe#X$~z#&;FzHC)ll@5=a)%G zEtCJ6u}La!b6G9rxBaKVQh}%ww>H23^jYtvTCSRcXZeSs|L>OA$6JIRbqo8k#OuMj zI)S~{BvQ7_S$IS#wBgLWu0{bqH5-SbqOkjwH@3So6)`?lQ7H7Vn#sp}sh4w6!54)S z8WOgQ#$2xQp92-#p2rKcSu+KNpFeX^e&_i!Ke?{kbDp^Ov)%ks^sa~US7q6@rT?4g z_iv#kd-hYYW%4f<$mc$6yzo`yLFT_ZIiEAs3uDi{{IK)jlP!4*c_)-y=+`g*e8%oi zU0sQJ__vAgZo2=n(CgaJe|qcW^p$PWnvpL|Iva0U_UGtLOph?VbF<)8MLkz%JM;S; zNz>2f9$mrsC1!=(mJJz2?vwn3b7$^ZV)U|Y$-mB|%eMI~6Ajq5FeNk}VYvE!@A8D7 zs~FeJT)3$A>Z8u!WVK-F{{_0MWqk8{8Y-*VmKT;e7b=*oaWqi3+_Idt-2Cb`llZ55 zeTB{Uw>X$zOgd!abi4Mcy~wQ!&snKV7s`7we|+x>ZF{EiS5fA`=G(G{tCvile@)Os zqvW#Hv&5b$CZ{ZWBP>G~2A-6<+B@xu?EWHObDdf1zrWspIY6N&pxmnC@#V9#9=-T- z^Wtyy({SxukudWrS&yW{z@vp|DMt~$tX_Lx@MA;OaGah z63?!=9DKZ3dE2*tQ*63jTRkpm|6HpWX>Mg~(HK<85_$VhY|^iQIH{#3FY`G9Yrg87 zeOqL6ZSAUKX~(tCE9>i*M09@LX>hdoe&uq9zSxH8-Y#FRq}4JuiJ7nUGpS2>v-y)s zxSy<#YSmM_42S&Ye+g27TXt2xlW$aNy{l_qf8fyl=7?GEnfE+D!may5=GVfb;l3Fb zWt|Iz*fyB$Xl!d)cD0jXV(ru&JtlTVPh9Wys%RK-e3>*Y>f*f1vVn3h&ahsLzdKQ- z=XpUV?_$e0d50tT>K_oMsPI0OS50Flo zYn^o4fyZV2B)hXk|8MU;!yEJT-}DnU0V>l&e4KhiBerBXar4v}i+lg?X!+IF!lwV2 zjeY6VIe!G%dwJPfL*Fx9dO9O!?t+b`O%sZ`4Gx%Br8S-UkbJQ+a9M;AYpH5dK$>O2 zg^0up_3xeua`bNH{c`YbOu>a6t&Wdx-+RR1_`KXNsHeG5SHt{Y(2z58Suv&2Cf~f5C?hD3^N0pSPo=j-ncv6gy`*QAw zMDADmS419_2nL!8d|z4Y)Uf)_{g4*{x||24SiRn#zdhw>$Fj+quBsZ!6OB%uczDp@ zh{)Qchck-9gV{sw635OG<6OUp~cCJTyDqiJ^8-ixXPE~2NPr;E#A0s;oX-%-x{wxTd{U? z{G;t>58A!lcIM&tJ!Lo77eqhh5Q>|<$9chR=3hrQ{+7!B;l9B8UQ47;TA*a7PSJDU z>r?i)u&Omk92WS@nWSQKP;17;qn#%5A`COlo%j!H%#e&;a?EV=&eSKew^s->Yh|mo zzYmd!*pqzp>NB(7PnGl%4~99~m`#=nJK&nkJ7+}!>+xx4Oy#Xh%5L5ZHdxx0Ak(C= zT=`AzWG`Du(+KN_@=vZv|Cn z-s-PYmzZnbPMG{Z-^-`}(UF$x5zS+S&WunfMwM`$FjF zsn@gpTc?_+U+$Z$&g?sPl4HrN>%Y1$R;(@UmrYCOvvoQDHpA{EqsCQ-K+pdo=M)@O zb4%K%?Q^`qJO7=D zFJCA>kd8JumnV64mcO~cx166>zt<&wk3DiF_v_j-Z@2%{tA4fhhuzOdTfh75c)0c3 zzx?Xly`{`|ra=a)rywTkuC4q3O=RzXTdV%IRPD^%XW9-EmvpU6b>U0@7PHs-+fE-Q}$lW~I-}N?iSQ_Jd2Oe;%0}ue*KWVcyf3 zYnn?k=843L1esiwv}I~u_FwL7!^R+8oevv?`M*SbmV6!k%zN7rHeH)3RT|4LEo`3L znX2b+c|&i_q}GiucR!V!v8tF$q9b@(4p+c7w!803bP{?+%lR&8XzR)Iw)8*NwP!v1 zqa!4H$LiLziFbA$_@}@pwbr_2aoIDz2M^_+^W2Z%kL04t-R$1pgI^@yJ z`qPE$*NVl)d$-hc&R>7w>P3~JhicO2;+uCK^(#H>C(rYY)%vRUn~?f9y86E}96B=- z4~a`m5D*JEx_-mHq$5kWMQ=6r`@JIe^TVv5nGG!Nk2zGOWUXSnAM|EEpZ{xuRb}*- zkBSGDr_~rQS*X3`-zmYCk5BjXn`t|iOUni6UA&=~Vqf}d8Q;^m`j~Tbn0(And`{!5 z`0F0~|D)le>J6`Xt_u51`!si#)(fvQ+0W9B_UelD@`i?eTk2uinRLE!ZpMR5?gxvq z6{6}kc=_%)Pb*2BI_bnZ@S*2@jHFHbmTT6L5gqW~fsoLA@f3#%5 zQcl4ice_|i0(?a-O}x1$WIESXuHw#_mFy=uUz*C6ZeUQF&!WpN+pV3KaPW-AvhxA9 zkqtddY%-S~EDa1^Gs8u=)?UK(m~mOtf=!Qd+RC?ni(y^y`L)xdDOVUd)os2PZ+9?W zXu0Fli?gqV9Nr!k`P%8QG);L*z1HG`<%%-9EMF{3%-Mcs$$Td}=CZzDUyz&dN2mNoCg0<8N}t#Z=coS@=sU+$&fuQjXkODS`h@r1 z4W&H`tvkHV9eDfVjO;e=H!hb$Mar^zuWP?CIsQHV&6M&tAr+e9H!?5(+H>A~DzCL- z(Ym=6nK@gJw$43u&hpSz1$CdPfuYOqEjXRkFq8Fo@4sIHZ}ony*nZ<=+vn>Ec^iXo zYPf?_*;Ma0A$4zb*U$X(!=(Iu1Gj(d4$tsY3T;2kr}+Mio>8l}K-71kM8HgScAgjN z`FAcRY>3;~^0_SQIsew>YUcl)mq#x(w+If*SMh)N(YaNt;zPV?wpkZS0c zS~S1v+stF~r~XbT@O%0HLyL0v-Lm`F^fZOPu)`W2yQkebA?Q+D+v@YO;HHyp0Dt|H zixYjlf3_aD&EcScK(n-^@RtTR*E_TF#0|3en)d$r zKUKiO%I_b8#1@wCpX5u+{y*Yp7yo`q{*C7ML;e4jl;7+xP&+w$nrE?1LiSP3;t30zgC^J*?@q2wI<#T&d1?O|TjBFduU&j0n=P&*d8?rL)3pz# zEYp{NxODmSvv?0@$ug^>QdMCkE{%too*cPzM6Kt{YKOdq^H%>oxmy~O73Nvfum0tV!wy)kMy@OryHft+ZUbX zT46tR{aM4=agysEU2|~0JpEi~!i|KxQ#=>)+%;u-u3#b6_)kD0*0!9XXWEYHpZrk^ z>OZ-X5W6 zzj4mrjd9lw*6cm}b-({ZH?s=oExHyH?o^fVOTKDMPMZ-eU=_T_=%>RKuL&V9H0&x@ zC6pPz-(J-H_}bq37yGA*%WRLU`26z!zb*2W>l+{b=*SN^H~Y-wASG2Nlf)BCCH^^9 zWv^;9T-UP9sJ7&8i1}`V4o#UWxwHSoM9=%xzN1B#>s89<`BSE@e0`Iv^-orQTjqXpv)9wU ziO$E)N-MViUuAB0thvbT_-E@K$&Vu$3*C=d>&567DsKF=abNhYphM^RlT4N+H2%}) zUb;AIq3G(*0-KK+z13-K-;l7O!_atPTL#lRrX6-he?Z}n@h){=SI_uH*6<+eHB zpUcR>(ZnScqdLvROl+?OU>d($U!}7gLewF;auXZN;_N@L} z(|R}iug+LkZH`-{e~CGmOpV zHDx;?rIY$fO@DI3E#{K6n4FU>$HMANub0=d>ULDA{iwa* zyXZ)qZ(Z2U*x5Tjo3*EjEay77P+aY-qKtRy|PMzeV*{YQzHHsxO?P0FL=vO{q*wBRq<1ek+ZpKSNNQXe>f#c&4MwQkL{gx zokdFNj)m%z{pNVpKfGw*`TXTf=M^_w*K9d6;|1fs0P9nhzDxHfEI#^XPmj8Oz@8a< z4Wt!pswQ^!dhgKwdv@Yx^*`~Qvje9TyPsXLVQ2C)6Q&2fGZr6v)<6BB*4w^mkB{Bi zX!K_4o{2><5Bnwy2i}rYeZS&E(ea-Od3N{8=Nz-y&yaE8n`p@CH`kr+N<{c-Za?6a z6U@6l`TXXfcMDIgQdfvrQ0!}IG)Jv%i{bgVsjHqncTcQXJdYB+ezln+&EO zsVUFYuVr31Id6?lMgz~JSu0vS)flZ3GF~Ug>%Hm{Iprb2wlJn6Uq8unq0vX*#~Tl; z&R<^o34Ek3Ev&T zVkyS2$4>7!BCDJH|HH9U8-;f%KQ$?S(ldFZWA)-ELX*ojxBr<|WtpQCD}Axg^RczY zRldE8gD#8tPhU||xbV`KC(ldwi5{6bweHHZ*22n%8a`&rQhTHhGc28_w?=Nt`LGj{ z9=PoKG_Ua7mW!Y7y?ZJ)ds%wwrCNP^AJ%^@ewS6POc#DIXH9mU9^^5FSFvZ&S0Qm%D# z_g;yfcu39ru)@5|+2JQSbE@BX=z3{R{T{Ua(Er{~x<;%TFTVXWcXW;4uzWKw^L3A) z!%1QJTO3OG7ROZH`}SM;7W0L}*QN`7i>TmOczYY0>JknXP5zkwwPoB}WBEeW)g%k+ z0+i-4+F$E-%=65T^}d{-{_B2?;OnW&a!+kkW?l1_VeKB)R;|6~zSgL4`We1lo3HG$ zVz1dEFV^jCJ2j#dIOp#cwzylPwPmfy5rdUiH>#_CD*m#cmHq4NOMfG7c|UmLel+~h zvkar(&CfC({&0S_q~#&+jK|x59DZu??aslXn(FcuJPdDmrxZ$69)7YzyL`f)gB!%_*zt1vBxJL^t+CA@6mk;Mj!7nXq zmU3GJ?)x_VrxU9v^IE+<{zm)}Z&wt5R#)2m_o(i6#p6A>T(|fa2<=EHy&TrKHAdW9-cj45jq(~9|?ThnD?|&BvJ6*s~%$$Q?Z2eUr1oqADM zeK=*s%!=kGTr;0-k@_Ae@uTmzh5P01_qWaGidF3I-M?x7g}F&zzP+CR|JQl@GI8I7 zHw_-%{K2y2WoJhDeVOJR&PyK7sr5@2 zs&;H+V9RytzZL9z_x-b{adj4Yw;fmikBj44^{c}>Y01C;=l>qR*Ok zFBfL-=F}-J2vQT`vv@oIu8XzwEyo)%GoAYGg@qi@m~L3Xny&Ztvgy}_w#qa8^<_^S zyXkxNEF1rcJ)2IZ?|pN5kLlIEV3|0pPkI}UY~g;%IrF{9nTrOAC+7s#AKWCtnNla- znUt6oyE8RiE`+me*0*mRg%#$t&gWj|9kt0d-=a6^?AXlh2rqJ!M2@v_0d_Saf;E#KYC1XI4iKw^*MXqZIwT8WA~@Ua*txaKc2li zyjDixo~it+ihH8X)CF78Ti(b@$mytCE}hKGsWK>k8A`9eSspzo}OHhZ9Fn z%t={><8cq-{#~5#LGNFq!(DItjJ|uV@|{b|Z~8CNI_GNtP5S$!c&5ElISvv0fAbuE z*qZsA{(q6LX4^tz+wa`=3l){j4^BCKYL?}LBmT?GMHJlTCv04M&Ufjx7m-)kvfMv9 z-2Sm9@@9ZmUF z_RovN5B)!xwm>3$$+yNE#Rqp9Fx>ni#BsKr^I8V`@%ig+{7?%F`6$8l<;9lWvuATX zKf{v!K;v=Va+9+?23lMHpJJG@i8mvPHFSZ|VX2m_8`@VCY|79rY6vpw`VpeirR%j* zE#h+GL6K$ z$%`I!%Q`LWX3RRKcOql+9>GtXJiFGcoZ0O8XUYBU1)^Lp86LUh z?`!fD{B$WQ?@Ya#mU_%0cC|Ad8zfrPihiej^Vsm}C7bs7{OL*=o z8b_^q*I*fFwCADG6{WogjlBNd3$R>Qz-z4=sSV1y)_rm?2KRte5N>VX? z=A-Pu&Ux>e`YHc~OJ{8Ow~%{wAy8Z-52 z-+67Hp>yx5y~2{}x5pWu#{PVm`5^ZD!Bbz>{gQb2ZQW1xeVpdE4<47}ke{E&KEe8B z>cU&gm#;QfHPh~y;$k1&E_^GkYR&TSJX5i!U5qSO02@eFS@O+=$L$+ki}emPG)pevpP?!B;gZ!N z_Z|9IlRPw7wEsUkDIqQN|7A?r^q{igEY*XyJ!7{Y>MVoFV#NY@WJ!n z(a39DS(~j`@^`fDFZ;dbdiux5zm)PGd!K*w>GQVbA8&5nvGYy+vcsQS(?7OVyk~gd zS8}afH+@QS;zYv>%hvi{V4E1VW}4LHd5NFBEniyQxbtGt%A=*m3Jo4d#osYVBnWKM z>am`3xn)Zy6U(bRYT9ud>n@dT3o_!qsg^KRe_s0Z$&w-mL?7PetI*2iU$X7qPE)JA z0M}!xGkFUgZT#*pQM0k%aT0Q}#+13zxU7G)SC;DqKQH@-bLJoZzJFL_`D&S| zhD+tsj*T-MLjq&>pJ7R;l348hUWfVa3U!Uio$-3w8P{TNa4~;8k~4Xl-PxeyymUY(e3DCQzky?g?Jha4DJe7d zU+&xxvnJH}JHLnhUZ%FCtvr3LLemly*X&^qjrYBOa?atl`40{mZstExeC0*+Kb@>k zeWpCpdz6h1KYQ14X2Ztcx~;x<8K)&W@AuAqZ*=?l%CBsiYY)lvRoI3<{g%T}@$cH7 z=Dih}4&URSU)L56id1#jIyE&d+Onaf`vye&X)2V-JeQx=jIeU$vU{z0* zh|w*b?z8tGxKjxgT+g^Lzt6kT=;e6ok^67lhdy9G6a_xSIFA|eqpL*q9vyoNS+kfJRw#i-8 z%gT)XpxB*zHpX)6RqJ(gR(o5t*S?ML<30T~Ct_Lp;ZK*h%#e9jaIfn2CZD~jl{N_( zcSA$I#Jt>>IrH4Ir;q+wW}3}j&~-;zHd!sXYga>ukgoCHON$#D?lR8bxOvs2u=N4S5r;gh3{EvqdNAYZ-0;e>q}Zm6 zg~H;TAAL>p!fFh-ujXY-%$T$vf3Nj_eRG`rW-ALu2{%xBzfri;jxxa&&#C|DV?Ru4_x^F;$x(8_R^$)W1I3* z#8uDFJ^a-%;_gim#;n$$LgTBdS`&W#!Z(kZ#pORI;$f2Q0N&Z*OjKsFVmX+Cw*0C zoxpQ!^^DT4wJ~8=eX7=puMhdHwdRDE?z1I@u4|j7_FhVv>|D3Uu-`PN$u{c1p{ly? zwii}^++E^vV<7@Oja5HeRuc%C)S`XEb5ud=Y71u<{@z7f6_*lZ-J}Z3m3~=o0YiQ%rCPo zNV_U=U%Gn+-}|VSmrNJFoZ`1x(Q-?+`#bM4C6@~E9D9qLl?IH(>;EcTSn}<{ggljN zB5zV-1x)6?%Z?6`OyJYIGlQ2;{btSa3MT!^Lkg)c3TOQ}C&0{Q{`u17zLuAzu8P4L zl0CuawhBcZd?n^wUDL6od7o2jKZoUoxywpAZiXB@vasc0=fBnW-BMreSAEtK`1r_j zsen@(U-ue%dA%qN%iSa6{a^QuW%4|yL+N%gUXOOC9=gQG%;nT}Xv;Bit%}Rin{3m0 z8m=rbeD~)`thvl-VQv?%n!T#W>(u(ye%`MVryPd);?o>WK?89*S zPD0$no~G||Y;QKjES1{iTd~5!aPpL|O2^)BjK6<+v(@g|7aDWzBF}ATPc`sohDs&+}3vDkI?c(&$y?&I^8MB-2NqF z!<+N_%-pwhFt)v27i`cJo3T6K&#p?LuDIRXrF&wx9~JJ3xxdumPF1E*N0j&%V-aKf z;J+S{C%Rn4x{W5J#_($~GiOA;dwg%?pGOJw;FuB+K^irz<(pl?(5sQwC6mp zH%;*{Xi?dk!m7u4w1el_mv!H+3Gw_rKhfnpXUB@Dh$p*mF$+Cd{^W#XfS^{_spsk+ zmG#ONd8+nmExBaW-lWvwYIiJUSAjuu`r;+Cf6efme8O7w!^)%A*xe4csunK!J@x#p zoP@hx9UL~-UD&Vo9`0FF_DSqbY0}R$x0_p;n>nkO#h-lBdP+s!7`B~PT=_+i_ zEseii+CED3OV5moFy-(lFi$K^-L;V;kuA=9f%B~c691zX*)aaqTNtMCZEXXG+dlJD zj-z*tr*pXM{l1Iq=$`Gq+^&1V=Qw@*wq^?R#WeHkCBiad4C|*b#=Yfc`0934-O1J} zh&MevDff{{dydZ~gF_3C)y1@Z(NTRk^RSb3VzsKV%(v6wTJPeY9JzMl+rP*y547ed z_}LfioXQ`6$YY{=%)aYEjoVb-)y?6VcXHydS29T)i{n4@x*1Q)@&3^{!N*+A;sJ;F z^F8ic43%z*c{(o9GHNeQImD>`YWDoRy;J%_uAOh`xT3;&!C)P$BA3qUnYxBkCc9=U zWM{?m3$M1Vbga?OVGmq-(zn~)tIPa>huu?_-lJ~%el5lwPyP4opVX|lm~Z>cHD>d8 zJkF(*6|9@IIX&&`g0L0ZXJ!bpEON-!|GCG0o1x*ehG&x>aQ^sy@5I6v<;7MKzwf0R ziu_y`esIV4dAAp?`2JAG$?$thu)?Fg_30Y-CO`W=QEcD8;;ldT?232a|1WHBXW9O6 zK|zft^OrunFTC^IR*uuFc4^fu?kzD|GFk5Yw5w6Gy8UdVR~((!QCYXSW8JFXD_-rq z@OXdva$jlY+Y67fEUtR%qP5s&^73L06NBFu1>GJfz=Z_AP#caopOn7%! zZ;^iYi$uZD-L|KCR<|0NRH*(B<-NG;nC1B#kEzeNCv&g7G-b7jZRLW%zs`%NPnS2l zem#2Om$!fRtljZTV6Mm0(=Wo_&CR|39kgJlNcY!4f13?e)!QGorIr{!Z`e_{qWpSo0Xeyw@=>%g@yceyX# ze(`)sMta^fwa%q0FDJ%E7eC~UzL8PpQ6 zWz5SG#mtl68O+<^di?&x^{bw=wLSc~^LJ6{|98P9L7}?6_tw6<7Wl_W^NG9bs%T^1 zh$WL{A5Pda!L!)3Y{t*#F9*MAv3XQKd3E95+3cDJE5B(vX(wK~ZS!fX+nHIdq6fNy z^zOG@U*nkmD0dOpm;C5+Rqt+do^~iVHL#Nn4X7!+XA{o+L!o$07Ub3U|vZtGFyr>om0&JEqP<4?Rox3!y?wXaz99Gz{d-E$SXb5AD8 zD|XkmfVkb+d7As%qwnQiUu|E~xI(?F(lD)R>4lERn!8_|y!P#qa(3Y7Z)?(W(v5b# z^7(W&cJAN1d!Gq%q(3m9&601{ct?lD?A>hH=DcnFv-zw6#D{-sw}zFSxPL~owWQ_+8!>wo;`Jv@K@{8z0% zcgk8FJElARNWI;9jeuV453w{p^c_doq#&#&jtum2HkUAK5=KkI?(?m2$~*zeZY{P~cy_oe%tCs&ot zo|)YH@aMlk*Zozmwb|AOs(zRp{(YxRG3)=LU+wB^O2o9E?94FAakKezJJ7)9qrSTH z_WJFci&tOTXSFZ9bNctLWx{8#ufE5ho?gFum-Q0!?f-YIef#U%*}@n1YvMnDU%`GT zwC?+}Z=0UX-u?dkX~p`RrSY+Q*S~$-D8q4Ry2#<5JE!f_l4JYAuGwPzZ1v{NoAv+h zjh{PbPR+;n%Ysi! zt*7f6WMpS%BW)&I@vcDwfM+xe?{SN3D~`FGoYe6RogxcpVchnT|XsVq+tzkK!x>I^o% z&1tW4fcd84-hgjA^*rufkjeKr$*;IG$yfBVhndD{zvSg7uQ|C{$)zm3cZ}OSWWRJd zOHHpz1k2@}s@?9!#+6WpI9EV)uB)Z4M?b zh0}4uJago3y*_^bd;7P?ciX?SpJ|f*A@{H3eRjIL!N*t2-DM2!Nk3lx@6h_(#^2&q zn(5UMXHOG$|5&E%D@qK)QTA+lt-0m%N{|zm_rlZhTowiPF=9-D*#M zRtE2#85R0Ep6{hx-gl!#)jOtKc51zx@#bMl&2{EWh3%;^MU~Shu>JdV_v!Zff9JbT z=l}b0+kVc9`1rq5S>IfpZ9n%;pLc!D?Yvu!(x&V4;`#G#{yZM5WI)WB$kC)w%Qc1sU$Wo!27z^WeS0I5(?> zDsr=)EbWt(y&^p=r-4cDk)w}y_1C|(%Kp5fX3~;Rqjj&Od$S&By}K!QllaSKS^w{k zRZTr}dbT~DVk9@~$gEf!XTNd!xx{t$aq~HoSIs(<+m&u(Q~IG{JI{Ho34hcc zD88}Ur@7*cobcpqPov4!>yk90c|*^CyJa!+^yfuy@&nr>dR{GXm|$IfIA#4tt)qEa z9L;loJ>2*1&aFbTlEI@%%2SXW8%R^DOYmcN@82hB=6mb$!2|T zaORtq)-=C=-gWXSnU_vnwr6lI|EBkkyC8S!_oZsPKgWCa2_L?!U~~GAak@>v1Wn-DR3k^s&h8J?EdMte3iL)c@~w+ar^woE3SkMPID{n{NIu_EbpC z>)o*{r8TN|MfaT&-Zg3YormXB7{qKAGn*Ist$Vz>@O_Z?`gCNlc^|xNH~c$y&*o;dvZQV6<=$G(&o#~w9X5N7x1=4lIJCOCblM!> zkk=DG|G0E-M$#+IgXO`l4IFDv9a?;7nU&#f@A4V!7G7t9Jb$T_vAd;TJr`%sUm&*X zP-e{6qPh7gy5?7ET&GOr3qNAep=r~v7}dtH{g<;K=e`#r|9oz3%gR2&VC~>z+OL0G z<4%e}=bXjr-LiX}l$cuo{&;mWZin7I&*@FiZRC$T&gHiYv@u)NX0I@KpFP23N@5zC$RcJ6bjr(I{1LY?c_yYNFE0OZdHab~Y43|=D=u-b+dS9tsOUvwucIg9vNClT z&j$ZHocYQ4GsE7AXapa>s}*c=!fhw#eiT$rUen=xXr7DL>mN}Ulk>k!l?wSPH@W}$3?G1srSe2klQD}`OYUxT;`a+NsfCPTFWS)$9Z4)9{xvNm}-IS=uQ^XC=e_N%v`OAZS4%UeU z|2{P&r{r(Bd(-;2{+yoNM?#+U&-cH%r}B~SYTn})A*!NJGpf}UIq#US`S-e}TeR=e zS|@|+stgtdJLaw_-86l(_K4fhxpPAEq&$!1e%8^rG(t>x7nq!vDKKA$FRMn%Z|AJ&1mK>TCaWLrX zj5p!ao;M0ACu|o_JDa~uiS-*B&+XpQ&dPal%_n>ASUgw!6ypC;++kMwbLLE6$(AQ} z@h4ROdHvAmfe{}zu{jtOJGj_qDxb%gtBDgkLb-VzU~|1!@g+q zp=}yZs)MKP*%>C$l(ir*cp}5W$uqO3>pzjHe?22qa);Ken{h=eCWkdHI`u~ULQ41o z1BM06)zYl~4(q>76WDx0ahg){#m*a!S44`>x%z+Gh|i!X8YI)50WnDM?cQ@UX`7a+|ZHIZJarwO?6$; z_nUFA#n{!Jo=!Ml%HrKJ&AMK|`_EOy4!zQ#ooBvnn(Qp}r0?_7yaLsa4(78DeOY02 z{?BL7$Oci#X@tZ#HWBB~lLff`l##^*K(fk)=+w?_YR%~`ti0AH~YH9zEPM9!J z;=}n4**NuTY1czT_}=i_p27*mv7ZfVrW(0Ni}U__?0w`&$*hoXIW1SM z>o=!#9pZ^p@r|2Zwz>M<#0)0zOb-q$SMdyVT>oK$JP!#VqK zSN+Y128G8fT-4q^s4$ziM{UM}9Brma@t>phCt9%{4NVLzce@fbMc&QqOR>%D+VUgu z6>D#VSc(cRy>YaC(~kUvmhh%-p|qp?Q)+`Tes@p%Z2WcUL(As9emXy<|MOnPs%~~y;*4W{tIQ)ygvEv z1g#>D-A_!G91^*{m09qp)xKRy?>mzkPjSuJknGnH=G3@;`OP>}e{-+Zo3^_2C?p!5 zI`sB!>?PN{RURql<{XX6pY$)9_n+Lht(9h{+`}T5T#?+nYT~z9?A3-Bg`z*Xl95?6t0WXSF_9eru2xlc*D~_m2L=+8|k6<{rBJ7juwArnIL2vK#xQ zZkivzX6}&X?<08q$Ag&sSOtHJ6mAjciK`?IrKzr-@woY({sKwYWhq=y8pjfMuh#d9 zm5KP(bJ4r6TJ3a=vTj7ea)avscOJY-h&-`PY}v#goqHX)J-5v9_;-;(WzvSdjQJ&3 zpZ!@@&N?y8Yw;=br7j+MYp$M)+doD8&PSeGTdssvdonP@KL|Q`gR50~llP3??j@&~ ze?@<67IrL~SWv#B&HwDws6d^?20WR^US~~z!0=~_YOzSx{YK939}_tRbhls9Pur1Zk(_TPt<;$JI3vxicgK2EN- zDX7`#z0vv|FDLlxOPE{bF^w1;wl4Htr1ZI?u@8BR$3TL)CQstP?9b z11BwCBAsA*HEqS@-W22W+bNQAeTF7xVVxrM8?Ty#+Rdv6%ZdtYZ%A`BbAA7LQ zKUm_H+q7|?@J;6QlYIyM5_Vp5UgB^-#8u+_6SV`}D-5@<3t1cL_kHP_uPhZeBE0WS zG?=k!W%Gl-=k8V3>|McdVQr__*(iQj+X@jTN!^_tJlp}*K?}RLFr}Q2z3v^LtthDV z?v2{*1Oq4QxTRi7*UfJ4UKhq(tC(m|pEYTv#wy;oZ(^sd77nU8fArLr+4-|N8Wo#P zNzQpCa!2mV{094prEky0vCLZ2ebO_nsa)jVv1xNu6$)p4vgu#glKMC2Mcv`I9vo}z zBj0Nm%Ej;UnYJouMaJBG6^Ex~rqNqDJv}tMcwZ>4KA2W2JN>U%@2MMy9<8(SI@4zI zCXlmKMC$IXoARY{cQul--sV7$JXxnUJ zOJ!dnEw%E6<)im0>pQN#ytU|ba`C}=xtnLCKj{loIau(zN@R7=^$_RIi-M;@9Cw}; zIqMr{fB(Av>-|ktOlvFzef}(4ty=bNUATILPRyl^?;kN|9+^?yB=_i;^7h+~b8V-j z1(d#f#O$y>I5di<;ImL%!=-H-q%tpOOTsg0X{TQ^|R zLyscC-rSQlszu`G?=;Czcp7{5L`&U9^Lg$@dOT5*{!z)cCQI5*@LZUv;Jq~VySeg$ zst0=9tJFGM8fE(L$4!hs^=ALQb+7lAt+`dieK^nMe_ea|ocQnUUM3nZ1RJjX@Sda* z2 znB(TI4onHNPWr~ay_jPjYs+fhh?7Ov-hbXW_xSe8yGBktMV~gwF9>9RFjLd$`Pqy# z_dxxdv)*;yIQd_+yyDWbTRUy~$`AU6aR2URu{f!z|83pvNaf?zK}Yz#P%i!pfMhSJ(aad;P6-@gkn{KBscq>+JWPF7wV%K5wp<_U_tw zk=8|fjPoW`N`G>eTo+lq-6L2cdw*S8m0Es|+dZ~A7*zPlrsHl1 z$I2!NM&a^`^tNi`)v08Z_lFE zrKEo_Gv(F@oN)Kon{@3McBb@)E?bedi2grd#mF8 zf6O_IUKqNDiR~5K>vm`J^-|{}rrB1%kKe9$pJDslUrzYA^pU5#AH3RqFMsYo>7440 z1v6)EcRVdV_i^=g?>z_ktE6@vdfySh;ZMc%)soyx?(_EqFJ|=!Y+l$n^Gy2BXS0`O z$A2i?q8k2&@x?z~^Qm9_{--KklB}QF_@K4_TzEi7r;_;nEq@uV@P1j5wf9$R$I_ds ze>NCtvCi7lwa&F->PP3LoAi%-@;#av`!_vo;g>&W^_GNPKXtkG>z3=Yf9WgF_}*kO z?XBjIfA2PKy#9fE;<|+r3#|(t-aqxp*4=LXftR*S>zqtkwJg89dH?H)_{^sk&xC)~ z?EhtGUiirQtM!|&;fE(I*AQX|;eDbWuD7S|>T1iRUoY<7{Nt7^R35ml=fn%{)NSou z`~mKLf8u`nIvlIz={ddV!DcPLj!LoRZ^ZoVp6LJRW{cZ${(bKD7owM*@;}=id3^!9 z(z8j;Tc`7;S1*vCG3nM_?@cMq5{Zj8nO*y}{&&^X&--Epte@!zWr%J%=&vI)mVx ztB`J;W|G{bc8Wc4U)Z^tKQRnz)1Li*(LV7YkJ9;R{H4+JMWixUzggNLX20QQR~28b znAcP;?m61ZO^^TGSuHQ^CO>6~#ARi>h@+()s5LJv;l@aDx}huR_9wt_!qe{LD<> zKjC1v+Fr|V4{a|r9$<-#{c!!!+&q~bFAqEapZ9P-_j+yalgcl4DM*#PS>0_?ojm1d zPIKKFIm3OQJMS+!^j+il)n)em_s(DcUN~=k_qKoB2Ze4-X3p=5`Ev7GTyXy>E}PQx zr%Il_I(}^Julk$&pL`S0@-RBhbu;pO&8>u=0k4$(Yxxz+Y&U2u7Ey9&zF+>#JpC!l z8dibJDmhw-A1?Xr`E&3}`Kcc-qRm>HR^OZcEyGIfTax-B-uC*!s|p5h;FVQ=QPvfSW?x?g2^cX>Va>eh^MA_P{!jnEiCyk1%}|Z<&W`zI>{?L5 zSKYeWW7(nPD|0WDI?FAM2|8HYzIUJcldiqf7e?ROXsz;|Eqmjs#Px6ELc-*&(`GHy zZPR`p>u>wU^wYjobMEhvTN-_TY5PYNkN1%-4vw*DMmBTH7yY?6e}cZ<`JOU2`MQnQ z<-?P6N z{F}k2kgYEG$TB)UUbp``uf41B@|x}ZPiM6M%dh9FUab57QXWIqV?nF-<^R60wC`<` zzy9+j&o-%|xQ_>O*Is%j((P}sFZ4;5<|L0Z@^_zf#~b8FIj#-6Ypws9{p<<<VDe@7~IO@MQNMCfl`+>5ucZdYZ)88uvH!9Gds>gx^0g?_WFrtcQ5@kFuBE6>kgHZ@0?-e#|TbMA_Z`Rl~@t@Yoz zd2+Vi`x-xIy-N1_pI`5k@SHmKxmMp+X-2?9Z85P(^(%E%Jd7_GR2K=x`RuDmTXbk| zjF56!d`4+WY{Si(oc9Y4?|!nM? za$%mpw5{Kdr1ytU$=Trb>m{4LL89@3b^X;^=}xN_{Wo-+{_)Qh2i>|Aj&mY3HmNRM zV!n3fZaJ@2k4``T8TTpP|72LX@AsZ_nU5;g?EShY&s+U#ZEDZ2n6I*0llWcB5)95X zicgvP%t3h9!t>Wc=ln?2Y~x(8^KMM6lI7|(EpoM6OCM>R)?@jw{afSOSHH?aCg@f3 z)&9^g{Okd*7e>CFmgK9CGu@_U&%Ux(zcn%3pr;b;GIY;hIhSfipBpq~@q@ zS$}4|{I{r|>u-N{e))?%ZIAZlpU022PxJf!H|)K?=>LB!FZta&6z$RZZr+-dbkRfc zVTIKy+#wb@f8X$fYTTZ=zU$^%3AAi4dgk7BKw`u93$q!d-`8`lUnQ%0qcVI|Cfkzr z{O|tvclocBxwYWf-Veu>duuPXiC6KKpL=h2@W#KV(!w7e8?m+sKl@ZG@m995Em?n^ zz3{Q0(JKALmmaIFf25Ic*x^)5(`mz+?&Xz=>&*3*)o+x$_mb!Qyn=8op()pY=IuZB z_5M_GzU@q%@CWyS0_Oa?R4)Tl{BhWVf;;zvLF1&0R6KTR%en#7(t% zjL)l&ifv;rmCuvqn$G@SKj?Hw{}1E(hkmxf@y++|l{$VsY2UNO?dan`6{Ve7i|tRZ zd7_zKDD>)imrT&*UT!1x*>UR@8~!l9v+Zf8<W!ce-}_rtrLziu3#4>V18bcdqvN z#(fq3{WI+ryjxzTP;H=dO!EG}InL6Dq@%lf`6REe@cSF$7q#t(rp{E(n+g${@hAF) zAGAyeUsL~G-TcVCt^-|nmIZA6neqJO#QK}(me2E^^XTa6JrPD5CEl+Ke%pNcipeeO zDaU(0B|4t@B6h7herC6Cr>a7PoiVO4)YnX}rs(TPd4%-Ck9ARjv5y{eHjD**>AW*D3|) z8U??Vs!$5dH440&d$l5Ka%GlH=(3f*%U14QE9ISQ!3E~^D!&Rc!LXZ9JNdV4FwTq8q}wV9JEU+RUfxp+zK@};|By;IF*PA!Xe z4Z4*QbSuB{gy-xtp5^Zs1zu7M2FXq|n>q2@_fVB3zG_SEhE41@o7w+uhw7z^YL_qG z4eRYSo7wxXuEgk8iV?`(i)zIeV}m0WFY;ZssJi9ijEu=MGi*ZD7Wt|zs&{wpY&V

Q;)>tz6N_jLDH1*LMkfW=!^ck+=Go**?jWP=Hn3)>&#}>z1x=cX7kB6o9#nY=KHG6{~c`l?q%;uA4iqFSG)*vh89XAF~)A!sx$jP9gu{4TcYS%hi)>Y2}OnB@QMT4X79_IlPl%Wr4Q3umSEnSTEMc$($5 zGqV!|jE+zG8Fkk1cwgmrF|B72hVRezwpp5;*}Xl$;CR!|sI&UV>wcEW`|2OB`Wbar z?|4~dxa&@t(@%G=+WGW`?*82=i>4)Sty!BkEqQZI`I^qB5jywvW>!AEpYGn)sJ)l%HnN;{^8L%c9Zznk-mjas@=1iM{bZY&Pj0B(uR7pTq%-Mymz?Fd z6Wg`SdS$YoWSe%&L_hhxf0j$1>Zh%8sTv@aBSzmJbp0JSP8?E+*86V$hd9Rq^XrWHu^{#ss z-;R}sUOu+bY~SixrhRKa8W&GC>0A0S>Z0WFa~0XSA;&fv?F%zLw$X5(v7hjcwU~x*_sDwqcQl z*wJiPf0^n>)qFG5`bS$6lp`Be?s3XnJ-Q+IzTDMSM*Gp$MT&jAAJ4X_ zbtF6P3Hx$*qkNq9tA`Q%@430Q9Ns9q?=#cn!y9Gdw0Awc!FyjMJ~69!Buozh3gJHCcbpSB9*I5#0a533p3uY@eJa&mJ$i@9t3_`D+{Y6mn*~_${Bf zI^!%)ns9HtS(k|BuVu&OdCP9DGddl%G;GJJt%vkihbh|M|x$5O1$>_ElH+&)?{<@bB8Jx9=al(we$I zbnTzN9}91Ox^8;@+j04K>x=&WT-AHl{@HJP`~POoLZ$1!pY#{~{Qv8n;-?>fX`D-z z?bOU%qTCU`D!YEo9_cSt4S&w`^+ne`ym3PBP}s+Aai6l3MLOMw7!N)Fv~<_Ih-w+d z+Z(s4C$aq8R%v&J`-XM??Y9diU4E-Of$1*mJzb&fNym}}zj1wXYuntAFJBP-ZAQ_A zFrKulJj<#Msj7%bzUaGPVzT9ZN$s!p4-z>^n|{so zc*bqvu>QQsyVLjXCg^yZF!wd{I9i%A?6#PA_T;T_g&Yr&|e8vc1!xNzCY_8Z~0nlHTy{k(}TSN`ja#G8{~?ne0vwi?8!8(Il_KtrO!{L?z5s~&-+=sypqezDDz**j}y^9e05hcyWY~4IwxGGX}EEpyG{Pm2f>^_oEJTt z>F>Jcdye~u3F}HHY!6!Ene@Zf{UHDSetyOmXKWcJ7ghbdc;FzvrP7s8^SYJ3uXo7! z$9c5x<|B!Vr!-}cWZdB8oH?_yyEms(XGK%7yVEtprONBKF$IX;*}~k$@z-&myqZz# zhM&fo{|?>OU6Ux$V#mLkQ)}&(a1qIgDT>?Q)$BihMbZ7L(N*Epi!2|+bhi3`m>!Z5 zk;J`oU!mRHhXNJfK0cAZb2e!0g^95zGo`9iYp&i}`M|vJY15A)&l|VDX$fx-F}1R^ zTYX;V4|AN2`TF$JGVb?^?r$=hF(ZG2eZr9`eJA6tY*?!N^Ne}7qPdLMc45T@@*kZ# z4sAT#uywE*8KtTi#&4~OM;X{y)?eEAY@urPob5-B6(zBqWcFQuWLmwF@9~WcC(k{!d%D`#+$pHV_O;+! zhG&!IpIl>@oAd1ymx`$O>e`+&-;#bEJhX93`FaPd7UezL*!}j}AD?o2iiI@ui(ZMQ zl+bT0gnz!0ygj38UG4vAmK)gRnhOLcc-yVnxcSSGtlS;jGp*fAuSbT(H7sO`_GsH% zn7Mw*QIv6WvsX< z>(u)^FS~a0_XNgCN8hh}zV(WpNLbmr!*LVU9=<#)zVAfgouEfd!M=TW9wvHs??0<3 zE2lA;#k%@l&?UJ#=M<^GhqRI(w_ecuB*XG=YHX*>{hc!N&N2%vTp>Q`+q;iRnt8F|`f?`k%D?J%N^^$u#;(U}Z$9cOn;j(f z2Eq|S8lc6ixb!}PpU;Fucw5QIyck#Z#6kktYM0Ry;VBR|BA+xkJ-UXllNY?5qx{w zX<^ugHeRXMb9=?_YFv>wW)fjMl_zHSBYLLG2ZdkU74mMu2UZuVi~QMiH8xnx{b$Vi zea}V34#lLbVA!VdwmW%md8@2atmX=fh$(jQ8-7k$yCJwH!;9PN^L1VR8o8Jr$@6n> zuUKayX|#Alj6uPk>$?2s4@`aQJkPTCs(5byAraYqRX+J!;-mw7H2s!Hebe}R>~7`5 z^_c~MDr>kLj+Vx+Tlslr+)CZWllN&KNP4Dv=y89?|6kJQR(@W%Hn4i_sfkB}kE;Ed zwfc?M>y2^N5^n>a$-esbUSOA|**-J5?^(0risgO(e|ajXZ?kyrjfJ)eTb&oH?=31> zZG4dPRN6yk9>5xX5AF<;v9wJ7UdG?QH+? zf6dwW?PkB$M!r|qx8MF^^V*v`W^P&OX|6Mm*S7YB*WGJ#N-q`vs(U;8m)prX+^;i& z^jMP9A33F@H109_NzEzl}c4&e94d;c`<_rD14C8;SHojLJ zeM@Klp$|Qb*3IrY^50}`%lfF^R%}x{)pBO$j(h71yKN7ZI6kpnAKi1ro5hdg!A!2y zibP9`3kCBZ6kRxcqb6=Y^Y69Ef&Mv3Ds`76Cr?#O>wdjlW$A{=FH}!;oVnuawD;co zmq$K_R#<+?zE%9}Z`ble@01SuTbmu8x8lKHaC3ai+?x~cS_rwuN^+}l2uRm92*)`5 z_nlGQuu76C%k{~5moM#3S+-A;8$0iu^W9_694z~2_TOebk5(S(${G8EKds+$SZ;pV zkCH!I<&GLYexTKQ^JS{yl`ZGL`N_T&_givjd(1)8=lKCDwK@*=87aRexGwa2pdq+m z{`M6n%CF1g9Ri*fimVkmx9rEg_g~vAR%-gIGsQ&*ZgmRJt2c@4dup@i^50`qeyz6t zfA>(4+>9(vl|zyNEy;J-J!Tv}$&uc&VNSb)@@tE~#jiHRC<^^C7bG$ww zuP(h-611>3pWmKp^?g@^k(BDGr*?fjJB?zy96FM`qpId^TQY;6Z(9!UW3QVp%`~Uj zL|L8x@WR4;FYEb~{Fz2oExa=nZ@+k}>^9}}z8k-NEglQsVt%nO&lmnZ<#6IT<+T}U#?wAq`@h-0Zp&s(4a-lPraG1DW$u&HIB8bgaw=AEQQ?VC z3zi$@|MWd`vQi>H*EIRL`E*bLvg^=$A@es~aHTzksv|0BaSh6B{;nso{dJk#(cZUvp2nHEzPrEcm{7pCi9)uVS@U+ymav)kmN)pozQujf zhgLQl-#>mP(7^u9pBGO>T}}%Gdwj|&$$h-;S(djx(cEA0 z{kY<#4;TJ_{ihr4ZQg#u_uDy_EXREX!5g*&foSNny z$+x*wTmCL{@SPh|*#xpH z+Op$@b+Cr?%Z{KM={FZWoLSrCWcOpnUiUAZ|K#)+UV6GEFZW8nv*)&Vay$FN4qcTI zGM~=>{NLXG@JYM;Z}F&J_G#SHa`ay3k~FRZ_W9}upZ{o#nbG-TNlxk+-_JXX_BH;t zYl&n3e~kaO>zhT_es=(R$5iVY))4SPlr_; zk^l0&wybN0&~?@Vmlu!9c6DCpn*Fx4i1*_jQMC&y{J3v)bbnW0&FdoXymjvlay_IMT#lG{jGOn|V*Z88)+uhzldXMP`?cG5 z|C2=@xm4F5p6~zf%HnHv-yOf)bM7v4M8@2%W6!>{`u+g$TDDcO3n+t#K$voCM` z$>!#H{^tKn3BDx@w(kpA(9b&QfkGOSq~z&K`z^|1r|Kss-d;Jo^0wTOU!wkZ%Ksf( zSuawN;5YTif@rtY(v{QicsFY(B{=i!$}zlE9k`1-FQ>$J#ow}z;VG#vRCiZuFWbG& zdwb-bl`EEg((qbpS#t0B-;Zr~Tw zudXGLJfeLH^W9{*wjLEZe1d!b*DQt$+Aj{?KfZKwBSV|stmRt_}K2CQ>%^c$D6jA(NA{&+X{CCTG_U-LSDh5yHCS^FzNZwd3 zbXYC!n`M0NJavc6x$D%J=WhsT3Fz|@xa$kyc~OGhFE%#$UomobQRoxW);^KS1=f-c_{a(6L7;=tB&Qq1Y6v*WLFiFGN zdHLpTzw#=Q(k@K<;ghGfY`N+31J`%%JsK?Dr!;TvmiK>d1{D0&c$`-vS->Z=SMQ|l zZR@j!^ZBC=3x52XzH&NCM&z_tFQmoUo|rE?Z_^>nebjnd>~Z=k^$hZtB@kz5RxC zTBxKg@6Iw4*X337?*~+T`0MAcD7drCbsp#RH3ynjeND+f7pUIL;4YYd*?j8XUD?dq zUCW;D*7578Z3(D!c>hbeQBb^kdByXzd0!tz9N8(~An@Yc)1Bp-ytC$H?8@h8GZr^| zR&W39k@2KW-F8QpswnKf&1^jV@2qEC)7!X9eTtYTgiee9p&A!2vRU%f9#PGC#kOAm z#03n$c7{CLBDnaychi)@$7LeHXMd*M5?!%P;{N5=Vonb^6h3h2#vT7&8|@P7E#7t1 zy-M%#iLADx_abfg@A<{FJp1^h{ejmORkeLn(4V=e%q7e$&Lmcvi{W{Vu~v1me{cS; zy8P;H>#5TFx*E@g?fa(3eBi`yr3L#he!M>Y-rt)2w(p`pSbu+e<@Nt1e`1PjgZK>> z3M`ysap}^lqVIu;EXqMWGjodnn%}Ql-?vzCX3MMIEEDK)!yx4GGMc(u^d;M6mG~d7f)_Xops?Pa{aode+)!m3CV3ieXz zW!{^)><#=`^EBW1M755r4zp>#Km@0aUQn*%*ei;VIk*L+oi{T*=0IA_tuFm`g-&1-=B*&%D%b8 zY%AY-_59U$KlTKQe=d>Nf9iRCdz0n03e76k=cV0yi|aY;4069bShw{5wXKh=&NLP& z38m!3B-h3A8C=wh{*~`@ZRZ`4k2|ik3(YTC7FYiLes#v|YdQ=M*v-`xGq^Q&#Jt;X z>(l+{R`Z+3FFzUC&%B`iEaBsvmv);P*Jal*uDsk9`RjPehHcxFCn{BQb9qk>QoeBF z<-HiT20?#kh8Y!ITus(u{|z+%#a>@4f1_IF`keFfXL66r3e9*e^w%f$2v>Z-;lA2{ zk28KdJIpyXN$TwSCG&6SUB7%vI3l;O=B@7JJg#cP12=B)2<&=YuzK(11DkeFQDuw0 zG=27Y=G_fm>ytJJwf|sa6pQS(+4}rx#JlZ#?k+dl_PetB<9y-AA@TnPD<|fh7oBn-=KHjDrQOdjPJeEw$X?Xh5#Z*@zQca=Q>8QC+Fmn> z?bK6CTesYxP+nwz{L!83_j)^PH_94tPnekhlHqSs{)~6Ycg0o|O)uToUt9QPR)o0o zeTkK~=JAy&vNe5MYF{5ywdz#;J!9>fpj$4y3r_sB`~CUnol-;P#nwL?>XM&uHPr3w zKP+Uga>U_F&Geu5oqYBMcU~%=COp-+xrs58ft}^&y!+-UYvbA8eDG_3UBSoA15kiq^juimR20o6RY0;{QI=}N!r%y4o`0_|8?{8%#-ol8#I(xT5Xl$NX7uRIXj{eNyq;{471^ILN{Hr4-b z=j()7D`YQK#>ID05|2D2HR_{?s zWBrCR!AC9+H2*Pc1UF7&Re+PuuI@V=(X$Li%0Q!`pCPg~vEsKFE5 zyfR3@zv>)8lRF_q9%m+Kk3rbKVSapc-+KYGDho+>jnScJ(`@+vs6#v zfyVX8g+Z&+q^#t->kB+M=fA96cm1Vue9Ggy(i$Q)mCI8Pzd80zCnLQgjJ3pJPWRr) zYq+$x-jbgGJnq-VDGNlLv>aY@EuMQrr?qpx+=k^R|M%6Jn+v~Kx;IDT_0uX_v%Lzp z|Jv?9y=ijt8J_RO7tL?H&HT7O`2P<_1I55cmebdMI9Yy^{aU75%B09XujFm|d7+a; zz5abl;c8hR+F!AKa^70^f65=OZ_<0Qe(&kDCkz{wTYEgz=x%)xc>bH;?1^*hGZxF7 zmCt+FpBUM3-fYSPiSCz^Zi?8-9;}XecKzh6FGAZs@7=bnV8zKqm$|*4?>_DqJG1|c zNSSHyjsM&IO();I>QmNVd)REm4#&?~!9(5}TH@lC-1xZdl%QOZa?{{D z_PZ^8c*;$U@9fulFV?hs7U#Q-fhUjUha2y|TRUyyy>)3-)hm*2-gujpw!MC8fX